From 10cbb52ae7b79ca6e9d25abf9d8b103847924d76 Mon Sep 17 00:00:00 2001 From: Volth Date: Thu, 27 Jul 2017 05:49:18 +0000 Subject: [PATCH 001/814] nixos/networking-scripted: restore bridge slaves dynamically added by libvirt --- nixos/modules/tasks/network-interfaces-scripted.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/nixos/modules/tasks/network-interfaces-scripted.nix b/nixos/modules/tasks/network-interfaces-scripted.nix index f6f104ce7a68..8328eed076ec 100644 --- a/nixos/modules/tasks/network-interfaces-scripted.nix +++ b/nixos/modules/tasks/network-interfaces-scripted.nix @@ -251,6 +251,13 @@ let ${i} '')}" > /run/${n}.interfaces + ${optionalString config.virtualisation.libvirtd.enable '' + # Enslave dynamically added interfaces which may be lost on nixos-rebuild + for dom in $(${pkgs.libvirt}/bin/virsh list --name); do + ${pkgs.libvirt}/bin/virsh dumpxml "$dom" | ${pkgs.xmlstarlet}/bin/xmlstarlet sel -t -m "//domain/devices/interface[@type='bridge']" -v "concat('ip link set ',target/@dev,' master ',source/@bridge)" | ${pkgs.bash}/bin/bash + done + ''} + # Enable stp on the interface ${optionalString v.rstp '' echo 2 >/sys/class/net/${n}/bridge/stp_state From d48b12c27c62496cb484872f2e51ea0e620738aa Mon Sep 17 00:00:00 2001 From: Volth Date: Tue, 1 Aug 2017 10:30:58 +0000 Subject: [PATCH 002/814] support lxc:/// and ignore weird bridges (like openvswitch) --- nixos/modules/tasks/network-interfaces-scripted.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/nixos/modules/tasks/network-interfaces-scripted.nix b/nixos/modules/tasks/network-interfaces-scripted.nix index 8328eed076ec..0cfb8d525e33 100644 --- a/nixos/modules/tasks/network-interfaces-scripted.nix +++ b/nixos/modules/tasks/network-interfaces-scripted.nix @@ -253,8 +253,12 @@ let ${optionalString config.virtualisation.libvirtd.enable '' # Enslave dynamically added interfaces which may be lost on nixos-rebuild - for dom in $(${pkgs.libvirt}/bin/virsh list --name); do - ${pkgs.libvirt}/bin/virsh dumpxml "$dom" | ${pkgs.xmlstarlet}/bin/xmlstarlet sel -t -m "//domain/devices/interface[@type='bridge']" -v "concat('ip link set ',target/@dev,' master ',source/@bridge)" | ${pkgs.bash}/bin/bash + for uri in qemu:///system lxc:///; do + for dom in $(${pkgs.libvirt}/bin/virsh -c $uri list --name); do + ${pkgs.libvirt}/bin/virsh -c $uri dumpxml "$dom" | \ + ${pkgs.xmlstarlet}/bin/xmlstarlet sel -t -m "//domain/devices/interface[@type='bridge'][target/@dev][source/@bridge]" -v "concat('ip link set ',target/@dev,' master ',source/@bridge)" | \ + ${pkgs.bash}/bin/bash + done done ''} From e123631ed3e9466147dce40a376a8b9355cc00c5 Mon Sep 17 00:00:00 2001 From: Volth Date: Mon, 21 Aug 2017 16:47:59 +0000 Subject: [PATCH 003/814] add separator in case if a VM connected to more than 1 bridge --- nixos/modules/tasks/network-interfaces-scripted.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/tasks/network-interfaces-scripted.nix b/nixos/modules/tasks/network-interfaces-scripted.nix index 0cfb8d525e33..0560176bf579 100644 --- a/nixos/modules/tasks/network-interfaces-scripted.nix +++ b/nixos/modules/tasks/network-interfaces-scripted.nix @@ -256,7 +256,7 @@ let for uri in qemu:///system lxc:///; do for dom in $(${pkgs.libvirt}/bin/virsh -c $uri list --name); do ${pkgs.libvirt}/bin/virsh -c $uri dumpxml "$dom" | \ - ${pkgs.xmlstarlet}/bin/xmlstarlet sel -t -m "//domain/devices/interface[@type='bridge'][target/@dev][source/@bridge]" -v "concat('ip link set ',target/@dev,' master ',source/@bridge)" | \ + ${pkgs.xmlstarlet}/bin/xmlstarlet sel -t -m "//domain/devices/interface[@type='bridge'][source/@bridge='${n}'][target/@dev]" -v "concat('ip link set ',target/@dev,' master ',source/@bridge,';')" | \ ${pkgs.bash}/bin/bash done done From 3963dfe22208b997c5235e2fddf5808f002b7637 Mon Sep 17 00:00:00 2001 From: MERCIER Michael Date: Wed, 13 Sep 2017 10:59:49 +0200 Subject: [PATCH 004/814] (pass): Add tomb plugin --- pkgs/tools/security/pass/default.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/pass/default.nix b/pkgs/tools/security/pass/default.nix index 24922db2e775..b338f4f0cb8f 100644 --- a/pkgs/tools/security/pass/default.nix +++ b/pkgs/tools/security/pass/default.nix @@ -4,6 +4,7 @@ , xclip ? null, xdotool ? null, dmenu ? null , x11Support ? !stdenv.isDarwin +, tomb }: with lib; @@ -18,8 +19,12 @@ let repo = "pass-${p.name}"; inherit (p) rev sha256; })) [ - { name = "import"; rev = "491935bd275f29ceac2b876b3a288011d1ce31e7"; sha256 = "02mbh05ab8h7kc30hz718d1d1vkjz43b96c7p0xnd92610d2q66q"; } - { name = "update"; rev = "cf576c9036fd18efb9ed29e0e9f811207b556fde"; sha256 = "1hhbrg6a2walrvla6q4cd3pgrqbcrf9brzjkb748735shxfn52hd"; } + { name = "import"; + rev = "491935bd275f29ceac2b876b3a288011d1ce31e7"; sha256 = "02mbh05ab8h7kc30hz718d1d1vkjz43b96c7p0xnd92610d2q66q"; } + { name = "update"; + rev = "cf576c9036fd18efb9ed29e0e9f811207b556fde"; sha256 = "1hhbrg6a2walrvla6q4cd3pgrqbcrf9brzjkb748735shxfn52hd"; } + { name = "tomb"; + rev = "3368134898a42c1b758fabac625ec240e125c6be"; sha256 = "0qqmxfg4w3r088qhlkhs44036mya82vjflsjjhw2hk8y0wd2i6ds"; } ]; in stdenv.mkDerivation rec { @@ -64,6 +69,7 @@ in stdenv.mkDerivation rec { tree which qrencode + tomb ] ++ stdenv.lib.optional stdenv.isLinux procps ++ ifEnable x11Support [ dmenu xclip xdotool ]); From d514dc220e9fad27a46ef329360bb8db2cdf22ea Mon Sep 17 00:00:00 2001 From: Joerg Thalheim Date: Mon, 25 Sep 2017 10:43:37 +0100 Subject: [PATCH 005/814] networkd: also load builtin modules --- nixos/modules/system/boot/networkd.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/nixos/modules/system/boot/networkd.nix b/nixos/modules/system/boot/networkd.nix index 9d2cea3ad165..b7beff1e3c36 100644 --- a/nixos/modules/system/boot/networkd.nix +++ b/nixos/modules/system/boot/networkd.nix @@ -649,7 +649,11 @@ let unitFiles = map (name: { target = "systemd/network/${name}"; source = "${cfg.units.${name}.unit}/${name}"; - }) (attrNames cfg.units); + }) (attrNames cfg.units) ++ + (map (entry: { + target = "systemd/network/${entry}"; + source = "${config.systemd.package}/lib/systemd/network/${entry}"; + }) (attrNames (builtins.readDir "${config.systemd.package}/lib/systemd/network"))); in { From 8158cd6d5e6464adaea135ada586f11b9dfca766 Mon Sep 17 00:00:00 2001 From: Symphorien Gibol Date: Sat, 14 Oct 2017 18:08:25 +0200 Subject: [PATCH 006/814] nixos/luksroot.nix: fallback to interactive password entry when no keyfile found --- nixos/modules/system/boot/luksroot.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/nixos/modules/system/boot/luksroot.nix b/nixos/modules/system/boot/luksroot.nix index 06f004fb06ec..19ca2a2c1bd6 100644 --- a/nixos/modules/system/boot/luksroot.nix +++ b/nixos/modules/system/boot/luksroot.nix @@ -43,8 +43,15 @@ let open_normally() { echo luksOpen ${device} ${name} ${optionalString allowDiscards "--allow-discards"} \ ${optionalString (header != null) "--header=${header}"} \ - ${optionalString (keyFile != null) "--key-file=${keyFile} ${optionalString (keyFileSize != null) "--keyfile-size=${toString keyFileSize}"}"} \ > /.luksopen_args + ${optionalString (keyFile != null) '' + if [ -e ${keyFile} ]; then + echo " --key-file=${keyFile} ${optionalString (keyFileSize != null) "--keyfile-size=${toString keyFileSize}"}" \ + >> /.luksopen_args + else + echo "keyfile ${keyFile} not found -- fallback to interactive unlocking" + fi + ''} cryptsetup-askpass rm /.luksopen_args } From b00a3fc6fd82834114771f2115a2b032f0ebfe29 Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Sat, 14 Oct 2017 21:19:07 +0200 Subject: [PATCH 007/814] nixos: inline set-environment for bash and zsh --- nixos/modules/programs/bash/bash.nix | 2 +- nixos/modules/programs/zsh/zsh.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/programs/bash/bash.nix b/nixos/modules/programs/bash/bash.nix index e23849d350b4..26b00fb389e1 100644 --- a/nixos/modules/programs/bash/bash.nix +++ b/nixos/modules/programs/bash/bash.nix @@ -123,7 +123,7 @@ in programs.bash = { shellInit = '' - . ${config.system.build.setEnvironment} + ${config.system.build.setEnvironment.text} ${cfge.shellInit} ''; diff --git a/nixos/modules/programs/zsh/zsh.nix b/nixos/modules/programs/zsh/zsh.nix index 615e54c326b7..97c2d14a2fd5 100644 --- a/nixos/modules/programs/zsh/zsh.nix +++ b/nixos/modules/programs/zsh/zsh.nix @@ -107,7 +107,7 @@ in if [ -n "$__ETC_ZSHENV_SOURCED" ]; then return; fi export __ETC_ZSHENV_SOURCED=1 - . ${config.system.build.setEnvironment} + ${config.system.build.setEnvironment.text} ${cfge.shellInit} From 601fc20248d7c1b4cd3c33209fbc419af8ae0c04 Mon Sep 17 00:00:00 2001 From: Symphorien Gibol Date: Mon, 23 Oct 2017 22:22:26 +0200 Subject: [PATCH 008/814] nixos/luksroot.nix: add option boot.initrd.luks.devices..fallback This option, if set to true, enables fallbacking to an interactive passphrase prompt when the specified keyFile is not found. The default is false, which is compatible with previous behavior and doesn't prevent unattended boot. --- nixos/modules/system/boot/luksroot.nix | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/nixos/modules/system/boot/luksroot.nix b/nixos/modules/system/boot/luksroot.nix index 19ca2a2c1bd6..a5581b2bdc49 100644 --- a/nixos/modules/system/boot/luksroot.nix +++ b/nixos/modules/system/boot/luksroot.nix @@ -5,7 +5,7 @@ with lib; let luks = config.boot.initrd.luks; - openCommand = name': { name, device, header, keyFile, keyFileSize, allowDiscards, yubikey, ... }: assert name' == name; '' + openCommand = name': { name, device, header, keyFile, keyFileSize, allowDiscards, yubikey, fallback, ... }: assert name' == name; '' # Wait for a target (e.g. device, keyFile, header, ...) to appear. wait_target() { @@ -45,13 +45,15 @@ let ${optionalString (header != null) "--header=${header}"} \ > /.luksopen_args ${optionalString (keyFile != null) '' - if [ -e ${keyFile} ]; then + ${optionalString fallback "if [ -e ${keyFile} ]; then"} echo " --key-file=${keyFile} ${optionalString (keyFileSize != null) "--keyfile-size=${toString keyFileSize}"}" \ >> /.luksopen_args + ${optionalString fallback '' else echo "keyfile ${keyFile} not found -- fallback to interactive unlocking" fi ''} + ''} cryptsetup-askpass rm /.luksopen_args } @@ -330,6 +332,16 @@ in ''; }; + fallback = mkOption { + default = false; + type = types.bool; + description = '' + Whether to fallback to interactive passphrase prompt if the keyfile + cannot be found. This will prevent unattended boot should the keyfile + go missing. + ''; + }; + yubikey = mkOption { default = null; description = '' From 25865688a729d15dbb2dc21ebd9fbf74e2cffc4b Mon Sep 17 00:00:00 2001 From: Parnell Springmeyer Date: Fri, 1 Dec 2017 21:00:52 -0600 Subject: [PATCH 009/814] docker: init fetchdocker nix code for docker2nix This change adds granular, non-docker daemon docker image fetchers and a docker image layer compositor to be used in conjunction with the `docker2nix` utility provided by the `haskellPackages.hocker` package. This change includes a hackage package version bump and updated sha256 for recent fixes released to `hocker` resulting from formulating this patch. --- .../build-support/fetchdocker/credentials.nix | 38 ++++++++ pkgs/build-support/fetchdocker/default.nix | 61 ++++++++++++ .../fetchdocker/fetchDockerConfig.nix | 13 +++ .../fetchdocker/fetchDockerLayer.nix | 13 +++ .../fetchdocker/fetchdocker-builder.sh | 28 ++++++ .../fetchdocker/generic-fetcher.nix | 97 +++++++++++++++++++ .../haskell-modules/hackage-packages.nix | 4 +- pkgs/top-level/all-packages.nix | 6 ++ 8 files changed, 258 insertions(+), 2 deletions(-) create mode 100644 pkgs/build-support/fetchdocker/credentials.nix create mode 100644 pkgs/build-support/fetchdocker/default.nix create mode 100644 pkgs/build-support/fetchdocker/fetchDockerConfig.nix create mode 100644 pkgs/build-support/fetchdocker/fetchDockerLayer.nix create mode 100644 pkgs/build-support/fetchdocker/fetchdocker-builder.sh create mode 100644 pkgs/build-support/fetchdocker/generic-fetcher.nix diff --git a/pkgs/build-support/fetchdocker/credentials.nix b/pkgs/build-support/fetchdocker/credentials.nix new file mode 100644 index 000000000000..c01288dbf53a --- /dev/null +++ b/pkgs/build-support/fetchdocker/credentials.nix @@ -0,0 +1,38 @@ +# We provide three paths to get the credentials into the builder's +# environment: +# +# 1. Via impureEnvVars. This method is difficult for multi-user Nix +# installations (but works very well for single-user Nix +# installations!) because it requires setting the environment +# variables on the nix-daemon which is either complicated or unsafe +# (i.e: configuring via Nix means the secrets will be persisted +# into the store) +# +# 2. If the DOCKER_CREDENTIALS key with a path to a credentials file +# is added to the NIX_PATH (usually via the '-I ' argument to most +# Nix tools) then an attempt will be made to read credentials from +# it. The semantics are simple, the file should contain two lines +# for the username and password based authentication: +# +# $ cat ./credentials-file.txt +# DOCKER_USER=myusername +# DOCKER_PASS=mypassword +# +# ... and a single line for the token based authentication: +# +# $ cat ./credentials-file.txt +# DOCKER_TOKEN=mytoken +# +# 3. A credential file at /etc/nix-docker-credentials.txt with the +# same format as the file described in #2 can also be used to +# communicate credentials to the builder. This is necessary for +# situations (like Hydra) where you cannot customize the NIX_PATH +# given to the nix-build invocation to provide it with the +# DOCKER_CREDENTIALS path +let + pathParts = + (builtins.filter + ({path, prefix}: "DOCKER_CREDENTIALS" == prefix) + builtins.nixPath); +in + if (pathParts != []) then (builtins.head pathParts).path else "" diff --git a/pkgs/build-support/fetchdocker/default.nix b/pkgs/build-support/fetchdocker/default.nix new file mode 100644 index 000000000000..ae3ae4185e05 --- /dev/null +++ b/pkgs/build-support/fetchdocker/default.nix @@ -0,0 +1,61 @@ +{ stdenv, lib, coreutils, bash, gnutar, jq, writeText }: +let + stripScheme = + builtins.replaceStrings [ "https://" "http://" ] [ "" "" ]; + stripNixStore = + s: lib.removePrefix "/nix/store/" s; +in +{ name +, registry ? "https://registry-1.docker.io/v2/" +, repository ? "library" +, imageName +, tag +, imageLayers +, imageConfig +, image ? "${stripScheme registry}/${repository}/${imageName}:${tag}" +}: + +# Make sure there are *no* slashes in the repository or container +# names since we use these to make the output derivation name for the +# nix-store path. +assert null == lib.findFirst (c: "/"==c) null (lib.stringToCharacters repository); +assert null == lib.findFirst (c: "/"==c) null (lib.stringToCharacters imageName); + +let + # Abuse `builtins.toPath` to collapse possible double slashes + repoTag0 = builtins.toString (builtins.toPath "/${stripScheme registry}/${repository}/${imageName}"); + repoTag1 = lib.removePrefix "/" repoTag0; + + layers = builtins.map stripNixStore imageLayers; + + manifest = + writeText "manifest.json" (builtins.toJSON [ + { Config = stripNixStore imageConfig; + Layers = layers; + RepoTags = [ "${repoTag1}:${tag}" ]; + }]); + + repositories = + writeText "repositories" (builtins.toJSON { + "${repoTag1}" = { + "${tag}" = lib.last layers; + }; + }); + + imageFileStorePaths = + writeText "imageFileStorePaths.txt" + (lib.concatStringsSep "\n" ((lib.unique imageLayers) ++ [imageConfig])); +in +stdenv.mkDerivation { + builder = ./fetchdocker-builder.sh; + buildInputs = [ coreutils ]; + preferLocalBuild = true; + + inherit name imageName repository tag; + inherit bash gnutar manifest repositories; + inherit imageFileStorePaths; + + passthru = { + inherit image; + }; +} diff --git a/pkgs/build-support/fetchdocker/fetchDockerConfig.nix b/pkgs/build-support/fetchdocker/fetchDockerConfig.nix new file mode 100644 index 000000000000..9fd813bfa575 --- /dev/null +++ b/pkgs/build-support/fetchdocker/fetchDockerConfig.nix @@ -0,0 +1,13 @@ +pkgargs@{ stdenv, lib, haskellPackages, writeText, gawk }: +let + generic-fetcher = + import ./generic-fetcher.nix pkgargs; +in + +args@{ repository ? "library", imageName, tag, ... }: + +generic-fetcher ({ + fetcher = "hocker-config"; + name = "${repository}_${imageName}_${tag}-config.json"; + tag = "unused"; +} // args) diff --git a/pkgs/build-support/fetchdocker/fetchDockerLayer.nix b/pkgs/build-support/fetchdocker/fetchDockerLayer.nix new file mode 100644 index 000000000000..869ba637429c --- /dev/null +++ b/pkgs/build-support/fetchdocker/fetchDockerLayer.nix @@ -0,0 +1,13 @@ +pkgargs@{ stdenv, lib, haskellPackages, writeText, gawk }: +let + generic-fetcher = + import ./generic-fetcher.nix pkgargs; +in + +args@{ layerDigest, ... }: + +generic-fetcher ({ + fetcher = "hocker-layer"; + name = "docker-layer-${layerDigest}.tar.gz"; + tag = "unused"; +} // args) diff --git a/pkgs/build-support/fetchdocker/fetchdocker-builder.sh b/pkgs/build-support/fetchdocker/fetchdocker-builder.sh new file mode 100644 index 000000000000..7443591e6569 --- /dev/null +++ b/pkgs/build-support/fetchdocker/fetchdocker-builder.sh @@ -0,0 +1,28 @@ +source "${stdenv}/setup" +header "exporting ${repository}/${imageName} (tag: ${tag}) into ${out}" +mkdir -p "${out}" + +cat < "${out}/compositeImage.sh" +#! ${bash}/bin/bash +# +# Create a tar archive of a docker image's layers, docker image config +# json, manifest.json, and repositories json; this streams directly to +# stdout and is intended to be used in concert with docker load, i.e: +# +# ${out}/compositeImage.sh | docker load + +# The first character follow the 's' command for sed becomes the +# delimiter sed will use; this makes the transformation regex easy to +# read. We feed tar a file listing the files we want in the archive, +# because the paths are absolute and docker load wants them flattened in +# the archive, we need to transform all of the paths going in by +# stripping everything *including* the last solidus so that we end up +# with the basename of the path. +${gnutar}/bin/tar \ + --transform='s=.*/==' \ + --transform="s=.*-manifest.json=manifest.json=" \ + --transform="s=.*-repositories=repositories=" \ + -c "${manifest}" "${repositories}" -T "${imageFileStorePaths}" +EOF +chmod +x "${out}/compositeImage.sh" +stopNest diff --git a/pkgs/build-support/fetchdocker/generic-fetcher.nix b/pkgs/build-support/fetchdocker/generic-fetcher.nix new file mode 100644 index 000000000000..e051cee08432 --- /dev/null +++ b/pkgs/build-support/fetchdocker/generic-fetcher.nix @@ -0,0 +1,97 @@ +{ stdenv, lib, haskellPackages, writeText, gawk }: +let + awk = "${gawk}/bin/awk"; + dockerCredentialsFile = import ./credentials.nix; + stripScheme = + builtins.replaceStrings [ "https://" "http://" ] [ "" "" ]; +in +{ fetcher +, name + , registry ? "https://registry-1.docker.io/v2/" + , repository ? "library" + , imageName + , sha256 + , tag ? "" + , layerDigest ? "" +}: + +# There must be no slashes in the repository or container names since +# we use these to make the output derivation name for the nix store +# path +assert null == lib.findFirst (c: "/"==c) null (lib.stringToCharacters repository); +assert null == lib.findFirst (c: "/"==c) null (lib.stringToCharacters imageName); + +# Only allow hocker-config and hocker-layer as fetchers for now +assert (builtins.elem fetcher ["hocker-config" "hocker-layer"]); + +# If layerDigest is non-empty then it must not have a 'sha256:' prefix! +assert + (if layerDigest != "" + then !lib.hasPrefix "sha256:" layerDigest + else true); + +let + layerDigestFlag = + lib.optionalString (layerDigest != "") "--layer ${layerDigest}"; +in +stdenv.mkDerivation { + inherit name; + builder = writeText "${fetcher}-builder.sh" '' + source "$stdenv/setup" + header "${fetcher} exporting to $out" + + declare -A creds + + # This is a hack for Hydra since we have no way of adding values + # to the NIX_PATH for Hydra jobsets!! + staticCredentialsFile="/etc/nix-docker-credentials.txt" + if [ ! -f "$dockerCredentialsFile" -a -f "$staticCredentialsFile" ]; then + echo "credentials file not set, falling back on static credentials file at: $staticCredentialsFile" + dockerCredentialsFile=$staticCredentialsFile + fi + + if [ -f "$dockerCredentialsFile" ]; then + header "using credentials from $dockerCredentialsFile" + + CREDSFILE=$(cat "$dockerCredentialsFile") + creds[token]=$(${awk} -F'=' '/DOCKER_TOKEN/ {print $2}' <<< "$CREDSFILE" | head -n1) + + # Prefer DOCKER_TOKEN over the username and password + # authentication method + if [ -z "''${creds[token]}" ]; then + creds[user]=$(${awk} -F'=' '/DOCKER_USER/ {print $2}' <<< "$CREDSFILE" | head -n1) + creds[pass]=$(${awk} -F'=' '/DOCKER_PASS/ {print $2}' <<< "$CREDSFILE" | head -n1) + fi + fi + + # These variables will be filled in first by the impureEnvVars, if + # those variables are empty then they will default to the + # credentials that may have been read in from the 'DOCKER_CREDENTIALS' + DOCKER_USER="''${DOCKER_USER:-''${creds[user]}}" + DOCKER_PASS="''${DOCKER_PASS:-''${creds[pass]}}" + DOCKER_TOKEN="''${DOCKER_TOKEN:-''${creds[token]}}" + + ${fetcher} --out="$out" \ + ''${registry:+--registry "$registry"} \ + ''${DOCKER_USER:+--username "$DOCKER_USER"} \ + ''${DOCKER_PASS:+--password "$DOCKER_PASS"} \ + ''${DOCKER_TOKEN:+--token "$DOCKER_TOKEN"} \ + ${layerDigestFlag} \ + "${repository}/${imageName}" \ + "${tag}" + + stopNest + ''; + + buildInputs = [ haskellPackages.hocker ]; + + outputHashAlgo = "sha256"; + outputHashMode = "flat"; + outputHash = sha256; + + preferLocalBuild = true; + + impureEnvVars = [ "DOCKER_USER" "DOCKER_PASS" "DOCKER_TOKEN" ]; + + inherit registry dockerCredentialsFile; +} diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index 3107d29b0901..c4860ac90240 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -103952,8 +103952,8 @@ self: { }: mkDerivation { pname = "hocker"; - version = "1.0.0"; - sha256 = "16indvxpf2zzdkb7hp09zfnn1zkjwc1pcg2560x2vj7x4akh25mv"; + version = "1.0.2"; + sha256 = "1bdzbggvin83m778qq6367mpv2cwgwpbahhlzf290iwikmhmhgr2"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2f7cd77bd58b..a9566c1df717 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -146,6 +146,12 @@ with pkgs; fetchdarcs = callPackage ../build-support/fetchdarcs { }; + fetchdocker = callPackage ../build-support/fetchdocker { }; + + fetchDockerConfig = callPackage ../build-support/fetchdocker/fetchDockerConfig.nix { }; + + fetchDockerLayer = callPackage ../build-support/fetchdocker/fetchDockerLayer.nix { }; + fetchfossil = callPackage ../build-support/fetchfossil { }; fetchgit = callPackage ../build-support/fetchgit { From c1eb962516abb1ab7900d1f19f423f3a4318b849 Mon Sep 17 00:00:00 2001 From: Parnell Springmeyer Date: Fri, 1 Dec 2017 21:06:16 -0600 Subject: [PATCH 010/814] fetchdocker: Integration test exercising hocker and fetchdocker This change adds a simple integration test exercising the fetchdocker Nix code and hocker utilities for the simple `hello-world` docker container. We exercise: - Fetching the docker image configuration json - Fetching the docker image layers - Building a compositor script - Loading the `hello-world` docker image into docker using the compositor script and `docker load` - Running that loaded container --- nixos/release.nix | 1 + nixos/tests/hocker-fetchdocker/default.nix | 15 +++++++++ .../hello-world-container.nix | 19 ++++++++++++ nixos/tests/hocker-fetchdocker/machine.nix | 31 +++++++++++++++++++ 4 files changed, 66 insertions(+) create mode 100644 nixos/tests/hocker-fetchdocker/default.nix create mode 100644 nixos/tests/hocker-fetchdocker/hello-world-container.nix create mode 100644 nixos/tests/hocker-fetchdocker/machine.nix diff --git a/nixos/release.nix b/nixos/release.nix index ac4dd3d78923..bb6a73eb68ec 100644 --- a/nixos/release.nix +++ b/nixos/release.nix @@ -262,6 +262,7 @@ in rec { tests.hardened = callTest tests/hardened.nix { }; tests.hibernate = callTest tests/hibernate.nix {}; tests.hound = callTest tests/hound.nix {}; + tests.hocker-fetchdocker = callTest tests/hocker-fetchdocker {}; tests.i3wm = callTest tests/i3wm.nix {}; tests.initrd-network-ssh = callTest tests/initrd-network-ssh {}; tests.installer = callSubTests tests/installer.nix {}; diff --git a/nixos/tests/hocker-fetchdocker/default.nix b/nixos/tests/hocker-fetchdocker/default.nix new file mode 100644 index 000000000000..4f30f01e4032 --- /dev/null +++ b/nixos/tests/hocker-fetchdocker/default.nix @@ -0,0 +1,15 @@ +import ../make-test.nix ({ pkgs, ...} : { + name = "test-hocker-fetchdocker"; + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ ixmatus ]; + }; + + machine = import ./machine.nix; + + testScript = '' + startAll; + + $machine->waitForUnit("sockets.target"); + $machine->waitUntilSucceeds("docker run registry-1.docker.io/v2/library/hello-world:latest"); + ''; +}) diff --git a/nixos/tests/hocker-fetchdocker/hello-world-container.nix b/nixos/tests/hocker-fetchdocker/hello-world-container.nix new file mode 100644 index 000000000000..a127875264e9 --- /dev/null +++ b/nixos/tests/hocker-fetchdocker/hello-world-container.nix @@ -0,0 +1,19 @@ +{ fetchDockerConfig, fetchDockerLayer, fetchdocker }: +fetchdocker rec { + name = "hello-world"; + registry = "https://registry-1.docker.io/v2/"; + repository = "library"; + imageName = "hello-world"; + tag = "latest"; + imageConfig = fetchDockerConfig { + inherit tag registry repository imageName; + sha256 = "1ivbd23hyindkahzfw4kahgzi6ibzz2ablmgsz6340vc6qr1gagj"; + }; + imageLayers = let + layer0 = fetchDockerLayer { + inherit registry repository imageName; + layerDigest = "ca4f61b1923c10e9eb81228bd46bee1dfba02b9c7dac1844527a734752688ede"; + sha256 = "1plfd194fwvsa921ib3xkhms1yqxxrmx92r2h7myj41wjaqn2kya"; + }; + in [ layer0 ]; + } diff --git a/nixos/tests/hocker-fetchdocker/machine.nix b/nixos/tests/hocker-fetchdocker/machine.nix new file mode 100644 index 000000000000..0d71aedd054d --- /dev/null +++ b/nixos/tests/hocker-fetchdocker/machine.nix @@ -0,0 +1,31 @@ +{ config, pkgs, ... }: +{ nixpkgs.config.packageOverrides = pkgs': { + hello-world-container = pkgs'.callPackage ./hello-world-container.nix { }; + haskellPackages = pkgs'.haskellPackages.override { + overrides = new: old: { + hocker = pkgs'.haskell.lib.dontCheck old.hocker; + }; + }; + }; + + virtualisation.docker = { + enable = true; + package = pkgs.docker; + }; + + systemd.services.docker-load-fetchdocker-image = { + description = "Docker load hello-world-container"; + wantedBy = [ "multi-user.target" ]; + wants = [ "docker.service" "local-fs.target" ]; + after = [ "docker.service" "local-fs.target" ]; + + script = '' + ${pkgs.hello-world-container}/compositeImage.sh | ${pkgs.docker}/bin/docker load + ''; + + serviceConfig = { + Type = "oneshot"; + }; + }; +} + From 6c9de3f6009fbbebeb92593577622da6d7d05408 Mon Sep 17 00:00:00 2001 From: Parnell Springmeyer Date: Sat, 2 Dec 2017 09:20:22 -0600 Subject: [PATCH 011/814] hocker: Don't check package and wrap the binaries with PATH to nix --- nixos/tests/hocker-fetchdocker/machine.nix | 5 --- .../haskell-modules/configuration-common.nix | 34 +++++++++++++++++++ 2 files changed, 34 insertions(+), 5 deletions(-) diff --git a/nixos/tests/hocker-fetchdocker/machine.nix b/nixos/tests/hocker-fetchdocker/machine.nix index 0d71aedd054d..12c58a012243 100644 --- a/nixos/tests/hocker-fetchdocker/machine.nix +++ b/nixos/tests/hocker-fetchdocker/machine.nix @@ -1,11 +1,6 @@ { config, pkgs, ... }: { nixpkgs.config.packageOverrides = pkgs': { hello-world-container = pkgs'.callPackage ./hello-world-container.nix { }; - haskellPackages = pkgs'.haskellPackages.override { - overrides = new: old: { - hocker = pkgs'.haskell.lib.dontCheck old.hocker; - }; - }; }; virtualisation.docker = { diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 84df4d1f0c4d..37b9feb84f02 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -984,4 +984,38 @@ self: super: { }; }).override { language-c = self.language-c_0_7_0; }; + hocker = + overrideCabal + # Not checking because it's failing on a test that needs a data + # file not included in its source distribution; this will be + # removed when that is fixed + ( dontCheck super.hocker ) + ( oldDerivation: { + testToolDepends = + (oldDerivation.testToolDepends or []) ++[ pkgs.nix ]; + buildDepends = + (oldDerivation.buildDepends or []) ++ [ pkgs.makeWrapper ]; + + postInstall = + (oldDerivation.postInstall or "") + '' + # Globbing for hocker-* fails with: Builder called die: + # makeWrapper doesn't understand the arg /nix/store/rsic1v6y6v63q6lkmpn3xmn7cnzx8irk-hocker-1.0.2/bin/hocker-image + wrapProgram $out/bin/hocker-image \ + --suffix PATH : ${pkgs.nix}/bin + + wrapProgram $out/bin/hocker-layer \ + --suffix PATH : ${pkgs.nix}/bin + + wrapProgram $out/bin/hocker-config \ + --suffix PATH : ${pkgs.nix}/bin + + wrapProgram $out/bin/hocker-manifest \ + --suffix PATH : ${pkgs.nix}/bin + + wrapProgram $out/bin/docker2nix \ + --suffix PATH : ${pkgs.nix}/bin + ''; + } + ); + } From f4d1d269faa634482ee13f75b66a16a00aa0a8d6 Mon Sep 17 00:00:00 2001 From: MERCIER Michael Date: Wed, 6 Dec 2017 14:49:35 +0100 Subject: [PATCH 012/814] pass: Make tomb plugin optional (disabled by default) --- pkgs/tools/security/pass/default.nix | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/pkgs/tools/security/pass/default.nix b/pkgs/tools/security/pass/default.nix index b338f4f0cb8f..ad2afa8ed912 100644 --- a/pkgs/tools/security/pass/default.nix +++ b/pkgs/tools/security/pass/default.nix @@ -4,7 +4,7 @@ , xclip ? null, xdotool ? null, dmenu ? null , x11Support ? !stdenv.isDarwin -, tomb +, tombPluginSupport ? false, tomb }: with lib; @@ -18,14 +18,19 @@ let owner = "roddhjav"; repo = "pass-${p.name}"; inherit (p) rev sha256; - })) [ + })) + ([ { name = "import"; - rev = "491935bd275f29ceac2b876b3a288011d1ce31e7"; sha256 = "02mbh05ab8h7kc30hz718d1d1vkjz43b96c7p0xnd92610d2q66q"; } + rev = "491935bd275f29ceac2b876b3a288011d1ce31e7"; + sha256 = "02mbh05ab8h7kc30hz718d1d1vkjz43b96c7p0xnd92610d2q66q"; } { name = "update"; - rev = "cf576c9036fd18efb9ed29e0e9f811207b556fde"; sha256 = "1hhbrg6a2walrvla6q4cd3pgrqbcrf9brzjkb748735shxfn52hd"; } - { name = "tomb"; - rev = "3368134898a42c1b758fabac625ec240e125c6be"; sha256 = "0qqmxfg4w3r088qhlkhs44036mya82vjflsjjhw2hk8y0wd2i6ds"; } - ]; + rev = "cf576c9036fd18efb9ed29e0e9f811207b556fde"; + sha256 = "1hhbrg6a2walrvla6q4cd3pgrqbcrf9brzjkb748735shxfn52hd"; } + ] ++ stdenv.lib.optional tombPluginSupport { + name = "tomb"; + rev = "3368134898a42c1b758fabac625ec240e125c6be"; + sha256 = "0qqmxfg4w3r088qhlkhs44036mya82vjflsjjhw2hk8y0wd2i6ds"; } + ); in stdenv.mkDerivation rec { version = "1.7.1"; @@ -69,8 +74,8 @@ in stdenv.mkDerivation rec { tree which qrencode - tomb - ] ++ stdenv.lib.optional stdenv.isLinux procps + ] ++ optional tombPluginSupport tomb + ++ optional stdenv.isLinux procps ++ ifEnable x11Support [ dmenu xclip xdotool ]); postFixup = '' From b8a85fccd9db8f0fd9ac555605c728ca731b788e Mon Sep 17 00:00:00 2001 From: Symphorien Gibol Date: Thu, 14 Dec 2017 13:43:14 +0100 Subject: [PATCH 013/814] luksroot.nix: rename fallback to fallbackToPassword --- nixos/modules/system/boot/luksroot.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/nixos/modules/system/boot/luksroot.nix b/nixos/modules/system/boot/luksroot.nix index a5581b2bdc49..a23e0c60de98 100644 --- a/nixos/modules/system/boot/luksroot.nix +++ b/nixos/modules/system/boot/luksroot.nix @@ -5,7 +5,7 @@ with lib; let luks = config.boot.initrd.luks; - openCommand = name': { name, device, header, keyFile, keyFileSize, allowDiscards, yubikey, fallback, ... }: assert name' == name; '' + openCommand = name': { name, device, header, keyFile, keyFileSize, allowDiscards, yubikey, fallbackToPassword, ... }: assert name' == name; '' # Wait for a target (e.g. device, keyFile, header, ...) to appear. wait_target() { @@ -45,10 +45,10 @@ let ${optionalString (header != null) "--header=${header}"} \ > /.luksopen_args ${optionalString (keyFile != null) '' - ${optionalString fallback "if [ -e ${keyFile} ]; then"} + ${optionalString fallbackToPassword "if [ -e ${keyFile} ]; then"} echo " --key-file=${keyFile} ${optionalString (keyFileSize != null) "--keyfile-size=${toString keyFileSize}"}" \ >> /.luksopen_args - ${optionalString fallback '' + ${optionalString fallbackToPassword '' else echo "keyfile ${keyFile} not found -- fallback to interactive unlocking" fi @@ -332,7 +332,7 @@ in ''; }; - fallback = mkOption { + fallbackToPassword = mkOption { default = false; type = types.bool; description = '' From 40658a4886d57b7a544a5fb43db2a3804ffefbcf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Tue, 26 Dec 2017 09:08:49 +0100 Subject: [PATCH 014/814] rkt: needs libacl in LD_LIBRARY_PATH at runtime Rkt opens libacl at runtime to apply acls to the journal directory. --- pkgs/applications/virtualization/rkt/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/virtualization/rkt/default.nix b/pkgs/applications/virtualization/rkt/default.nix index 452f082e20e7..947f4454362b 100644 --- a/pkgs/applications/virtualization/rkt/default.nix +++ b/pkgs/applications/virtualization/rkt/default.nix @@ -58,7 +58,7 @@ in stdenv.mkDerivation rec { cp -Rv $BUILDDIR/target/bin/stage1-*.aci $out/${stage1Dir}/ wrapProgram $out/bin/rkt \ - --prefix LD_LIBRARY_PATH : ${systemd.lib}/lib \ + --prefix LD_LIBRARY_PATH : "${systemd.lib}/lib:${acl.out}/lib" \ --prefix PATH : ${iptables}/bin ''; From c94aa7579dea96d126ce9d9eba54642cd3fe13c7 Mon Sep 17 00:00:00 2001 From: Michael Peyton Jones Date: Sun, 7 Jan 2018 11:49:17 +0000 Subject: [PATCH 015/814] nixos: Remove deprecated sshd option: default is true --- nixos/modules/services/networking/ssh/sshd.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/nixos/modules/services/networking/ssh/sshd.nix b/nixos/modules/services/networking/ssh/sshd.nix index aa9c0fa1c09f..1685c7fde7ba 100644 --- a/nixos/modules/services/networking/ssh/sshd.nix +++ b/nixos/modules/services/networking/ssh/sshd.nix @@ -367,9 +367,6 @@ in # LogLevel VERBOSE logs user's key fingerprint on login. # Needed to have a clear audit track of which key was used to log in. LogLevel VERBOSE - - # Use kernel sandbox mechanisms where possible in unprivileged processes. - UsePrivilegeSeparation sandbox ''; assertions = [{ assertion = if cfg.forwardX11 then cfgc.setXAuthLocation else true; From 294a4e6ea5245a7dede7932383813fa7272f277b Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 5 Feb 2018 13:49:24 +0100 Subject: [PATCH 016/814] Use nixUnstable as the default temporarily --- pkgs/tools/package-management/nix/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index 81031c0a547c..ea4b6bfdb38a 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -149,7 +149,7 @@ let in rec { - nix = nixStable; + nix = nixUnstable; nixStable = (common rec { name = "nix-1.11.16"; From 60cb23001a1e8e4102ce905810c5641a7eb3a237 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 5 Feb 2018 19:41:54 +0100 Subject: [PATCH 017/814] Add a "nixos-enter" command This factors out the functionality in nixos-install for running a command inside a NixOS installation (nixos-install --chroot). --- nixos/doc/manual/man-nixos-enter.xml | 119 +++++++++++++++++++ nixos/doc/manual/man-pages.xml | 3 +- nixos/modules/installer/tools/nixos-enter.sh | 58 +++++++++ nixos/modules/installer/tools/tools.nix | 12 +- 4 files changed, 189 insertions(+), 3 deletions(-) create mode 100644 nixos/doc/manual/man-nixos-enter.xml create mode 100644 nixos/modules/installer/tools/nixos-enter.sh diff --git a/nixos/doc/manual/man-nixos-enter.xml b/nixos/doc/manual/man-nixos-enter.xml new file mode 100644 index 000000000000..a2fbe07961db --- /dev/null +++ b/nixos/doc/manual/man-nixos-enter.xml @@ -0,0 +1,119 @@ + + + + nixos-enter + 8 + NixOS + + + + + nixos-enter + run a command in a NixOS chroot environment + + + + + nixos-enter + + + root + + + + system + + + + shell-command + + + + + + + arguments + + + + + +Description + +This command runs a command in a NixOS chroot environment, that +is, in a filesystem hierarchy previously prepared using +nixos-install. + + + +Options + +This command accepts the following options: + + + + + + + The path to the NixOS system you want to enter. It defaults to /mnt. + + + + + + + The NixOS system configuration to use. It defaults to + /nix/var/nix/profiles/system. You can enter + a previous NixOS configuration by specifying a path such as + /nix/var/nix/profiles/system-106-link. + + + + + + + + The bash command to execute. + + + + + + + Interpret the remaining arguments as the program + name and arguments to be invoked. The program is not executed in a + shell. + + + + + + + + +Examples + +Start an interactive shell in the NixOS installation in +/mnt: + + +# nixos-enter /mnt + + +Run a shell command: + + +# nixos-enter -c 'ls -l /; cat /proc/mounts' + + +Run a non-shell command: + + +# nixos-enter -- cat /proc/mounts + + + + + diff --git a/nixos/doc/manual/man-pages.xml b/nixos/doc/manual/man-pages.xml index e945e0e62639..80a8458fbfec 100644 --- a/nixos/doc/manual/man-pages.xml +++ b/nixos/doc/manual/man-pages.xml @@ -15,7 +15,7 @@ - 2007-2015 + 2007-2018 Eelco Dolstra @@ -25,6 +25,7 @@ + diff --git a/nixos/modules/installer/tools/nixos-enter.sh b/nixos/modules/installer/tools/nixos-enter.sh new file mode 100644 index 000000000000..c5c7963b29f3 --- /dev/null +++ b/nixos/modules/installer/tools/nixos-enter.sh @@ -0,0 +1,58 @@ +#! @shell@ + +set -e + +# Re-exec ourselves in a private mount namespace so that our bind +# mounts get cleaned up automatically. +if [ "$(id -u)" = 0 ]; then + if [ -z "$NIXOS_ENTER_REEXEC" ]; then + export NIXOS_ENTER_REEXEC=1 + exec unshare --mount --uts -- "$0" "$@" + else + mount --make-rprivate / + fi +fi + +mountPoint=/mnt +command=("bash" "--login") +system=/nix/var/nix/profiles/system + +while [ "$#" -gt 0 ]; do + i="$1"; shift 1 + case "$i" in + --root) + mountPoint="$1"; shift 1 + ;; + --system) + system="$1"; shift 1 + ;; + --help) + exec man nixos-enter + exit 1 + ;; + --command|-c) + command=("bash" "-c" "$1") + shift 1 + ;; + --) + command=("$@") + break + ;; + *) + echo "$0: unknown option \`$i'" + exit 1 + ;; + esac +done + +# Set up some bind mounts we'll want regardless of chroot or not +mkdir -m 0755 -p "$mountPoint/dev" "$mountPoint/proc" "$mountPoint/sys" "$mountPoint/run" +mount --rbind /dev "$mountPoint/dev" +mount -t proc none "$mountPoint/proc" +mount -t sysfs none "$mountPoint/sys" +mount -t tmpfs none "$mountPoint/run" + +# Run the activation script. Set $LOCALE_ARCHIVE to supress some Perl locale warnings. +LOCALE_ARCHIVE=$system/sw/lib/locale/locale-archive chroot "$mountPoint" "$system/activate" >&2 + +exec chroot "$mountPoint" "${command[@]}" diff --git a/nixos/modules/installer/tools/tools.nix b/nixos/modules/installer/tools/tools.nix index a3bae78c0ffc..9398e2dc1ebc 100644 --- a/nixos/modules/installer/tools/tools.nix +++ b/nixos/modules/installer/tools/tools.nix @@ -1,7 +1,9 @@ # This module generates nixos-install, nixos-rebuild, # nixos-generate-config, etc. -{ config, pkgs, modulesPath, ... }: +{ config, lib, pkgs, modulesPath, ... }: + +with lib; let cfg = config.installer; @@ -69,6 +71,11 @@ let inherit (config.system) nixosVersion nixosCodeName nixosRevision; }; + nixos-enter = makeProg { + name = "nixos-enter"; + src = ./nixos-enter.sh; + }; + in { @@ -83,10 +90,11 @@ in nixos-generate-config nixos-option nixos-version + nixos-enter ]; system.build = { - inherit nixos-install nixos-prepare-root nixos-generate-config nixos-option nixos-rebuild; + inherit nixos-install nixos-prepare-root nixos-generate-config nixos-option nixos-rebuild nixos-enter; }; }; From e88f28965a7d76e83478d3ae6fcddc165b1c94f1 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 5 Feb 2018 19:50:36 +0100 Subject: [PATCH 018/814] nixos-install: Make compatible with Nix 2.0 The use of Nix 2.0 significantly simplifies the installer, since we can just pass a different store URI (--store /mnt) - it's no longer needed to set up a chroot environment for the build, and to bootstrap Nix into the chroot. Also, commands that need to run in the installation (namely boot loader installation and setting a root password) are now executed using nixos-enter. This also removes the need for nixos-prepare-root since any required initialisation is done by Nix or by the activation script. --- .../manual/development/testing-installer.xml | 6 +- .../modules/installer/tools/nixos-install.sh | 183 ++++++------------ nixos/modules/installer/tools/tools.nix | 11 +- 3 files changed, 61 insertions(+), 139 deletions(-) diff --git a/nixos/doc/manual/development/testing-installer.xml b/nixos/doc/manual/development/testing-installer.xml index 20c8d51815ad..16bc8125d9ff 100644 --- a/nixos/doc/manual/development/testing-installer.xml +++ b/nixos/doc/manual/development/testing-installer.xml @@ -11,15 +11,17 @@ tedious, so here is a quick way to see if the installer works properly: -$ nix-build -A config.system.build.nixos-install # mount -t tmpfs none /mnt +# nixos-generate-config --root /mnt +$ nix-build '<nixpkgs/nixos>' -A config.system.build.nixos-install # ./result/bin/nixos-install To start a login shell in the new NixOS installation in /mnt: -# ./result/bin/nixos-install --chroot +$ nix-build '<nixpkgs/nixos>' -A config.system.build.nixos-enter +# ./result/bin/nixos-enter diff --git a/nixos/modules/installer/tools/nixos-install.sh b/nixos/modules/installer/tools/nixos-install.sh index f994d5b4bde1..69371f3e4132 100644 --- a/nixos/modules/installer/tools/nixos-install.sh +++ b/nixos/modules/installer/tools/nixos-install.sh @@ -1,30 +1,17 @@ #! @shell@ -# - make Nix store etc. -# - copy closure of Nix to target device -# - register validity -# - with a chroot to the target device: -# * nix-env -p /nix/var/nix/profiles/system -i -# * install the boot loader +set -e +shopt -s nullglob + +export PATH=@path@:$PATH # Ensure a consistent umask. umask 0022 -# Re-exec ourselves in a private mount namespace so that our bind -# mounts get cleaned up automatically. -if [ "$(id -u)" = 0 ]; then - if [ -z "$NIXOS_INSTALL_REEXEC" ]; then - export NIXOS_INSTALL_REEXEC=1 - exec unshare --mount --uts -- "$0" "$@" - else - mount --make-rprivate / - fi -fi - # Parse the command line for the -I flag extraBuildFlags=() -chrootCommand=(/run/current-system/sw/bin/bash) -buildUsersGroup="nixbld" + +mountPoint=/mnt while [ "$#" -gt 0 ]; do i="$1"; shift 1 @@ -42,8 +29,8 @@ while [ "$#" -gt 0 ]; do mountPoint="$1"; shift 1 ;; --closure) - closure="$1"; shift 1 - buildUsersGroup="" + # FIXME: --closure is a misnomer + system="$1"; shift 1 ;; --no-channel-copy) noChannelCopy=1 @@ -57,17 +44,13 @@ while [ "$#" -gt 0 ]; do --show-trace) extraBuildFlags+=("$i") ;; - --chroot) - runChroot=1 - if [[ "$@" != "" ]]; then - chrootCommand=("$@") - fi - break - ;; --help) exec man nixos-install exit 1 ;; + --debug) + set -x + ;; *) echo "$0: unknown option \`$i'" exit 1 @@ -75,132 +58,78 @@ while [ "$#" -gt 0 ]; do esac done -set -e -shopt -s nullglob - -if test -z "$mountPoint"; then - mountPoint=/mnt -fi - if ! test -e "$mountPoint"; then echo "mount point $mountPoint doesn't exist" exit 1 fi # Get the path of the NixOS configuration file. -if test -z "$NIXOS_CONFIG"; then - NIXOS_CONFIG=/etc/nixos/configuration.nix +if [[ -z $NIXOS_CONFIG ]]; then + NIXOS_CONFIG=$mountPoint/etc/nixos/configuration.nix fi -if [ ! -e "$mountPoint/$NIXOS_CONFIG" ] && [ -z "$closure" ]; then - echo "configuration file $mountPoint/$NIXOS_CONFIG doesn't exist" +if [[ ${NIXOS_CONFIG:0:1} != / ]]; then + echo "$0: \$NIXOS_CONFIG is not an absolute path" exit 1 fi - -# Builds will use users that are members of this group -extraBuildFlags+=(--option "build-users-group" "$buildUsersGroup") - -# Inherit binary caches from the host -# TODO: will this still work with Nix 1.12 now that it has no perl? Probably not... -binary_caches="$(@perl@/bin/perl -I @nix@/lib/perl5/site_perl/*/* -e 'use Nix::Config; Nix::Config::readConfig; print $Nix::Config::config{"binary-caches"};')" -extraBuildFlags+=(--option "binary-caches" "$binary_caches") - -# We only need nixpkgs in the path if we don't already have a system closure to install -if [[ -z "$closure" ]]; then - nixpkgs="$(readlink -f "$(nix-instantiate --find-file nixpkgs)")" - export NIX_PATH="nixpkgs=$nixpkgs:nixos-config=$mountPoint/$NIXOS_CONFIG" -fi -unset NIXOS_CONFIG - -# These get created in nixos-prepare-root as well, but we want to make sure they're here in case we're -# running with --chroot. TODO: --chroot should just be split into a separate tool. -mkdir -m 0755 -p "$mountPoint/dev" "$mountPoint/proc" "$mountPoint/sys" - -# Set up some bind mounts we'll want regardless of chroot or not -mount --rbind /dev "$mountPoint/dev" -mount --rbind /proc "$mountPoint/proc" -mount --rbind /sys "$mountPoint/sys" - -# If we asked for a chroot, that means we're not actually installing anything (yeah I was confused too) -# and we just want to run a command in the context of a $mountPoint that we're assuming has already been -# set up by a previous nixos-install invocation. In that case we set up some remaining bind mounts and -# exec the requested command, skipping the rest of the installation procedure. -if [ -n "$runChroot" ]; then - mount -t tmpfs -o "mode=0755" none $mountPoint/run - rm -rf $mountPoint/var/run - ln -s /run $mountPoint/var/run - for f in /etc/resolv.conf /etc/hosts; do rm -f $mountPoint/$f; [ -f "$f" ] && cp -Lf $f $mountPoint/etc/; done - for f in /etc/passwd /etc/group; do touch $mountPoint/$f; [ -f "$f" ] && mount --rbind -o ro $f $mountPoint/$f; done - - if ! [ -L $mountPoint/nix/var/nix/profiles/system ]; then - echo "$0: installation not finished; cannot chroot into installation directory" - exit 1 - fi - ln -s /nix/var/nix/profiles/system $mountPoint/run/current-system - exec chroot $mountPoint "${chrootCommand[@]}" +if [ ! -e "$NIXOS_CONFIG" ] && [ -z "$closure" ]; then + echo "configuration file $NIXOS_CONFIG doesn't exist" + exit 1 fi -# A place to drop temporary closures +# A place to drop temporary stuff. trap "rm -rf $tmpdir" EXIT tmpdir="$(mktemp -d)" -# Build a closure (on the host; we then copy it into the guest) -function closure() { - nix-build "${extraBuildFlags[@]}" --no-out-link -E "with import {}; runCommand \"closure\" { exportReferencesGraph = [ \"x\" (buildEnv { name = \"env\"; paths = [ ($1) stdenv ]; }) ]; } \"cp x \$out\"" -} +subs="local?trusted=1 https://cache.nixos.org/" -system_closure="$tmpdir/system.closure" -# Use a FIFO for piping nix-store --export into nix-store --import, saving disk -# I/O and space. nix-store --import is run by nixos-prepare-root. -mkfifo $system_closure - -if [ -z "$closure" ]; then - expr="(import {}).system" - system_root="$(nix-build -E "$expr")" - system_closure="$(closure "$expr")" -else - system_root=$closure - # Create a temporary file ending in .closure (so nixos-prepare-root knows to --import it) to transport the store closure - # to the filesytem we're preparing. Also delete it on exit! - # Run in background to avoid blocking while trying to write to the FIFO - # $system_closure refers to - nix-store --export $(nix-store -qR $closure) > $system_closure & +# Build the system configuration in the target filesystem. +if [[ -z $system ]]; then + echo "building the configuration in $NIXOS_CONFIG..." + outLink="$tmpdir/system" + nix build --out-link "$outLink" --store "$mountPoint" "${extraBuildFlags[@]}" \ + --substituters "$subs" \ + -f '' system -I "nixos-config=$NIXOS_CONFIG" + system=$(readlink -f $outLink) fi -channel_root="$(nix-env -p /nix/var/nix/profiles/per-user/root/channels -q nixos --no-name --out-path 2>/dev/null || echo -n "")" -channel_closure="$tmpdir/channel.closure" -nix-store --export $channel_root > $channel_closure +# Set the system profile to point to the configuration. TODO: combine +# this with the previous step once we have a nix-env replacement with +# a progress bar. +nix-env --store "$mountPoint" "${extraBuildFlags[@]}" \ + --substituters "$subs" \ + -p $mountPoint/nix/var/nix/profiles/system --set "$system" -# Populate the target root directory with the basics -@prepare_root@/bin/nixos-prepare-root "$mountPoint" "$channel_root" "$system_root" @nixClosure@ "$system_closure" "$channel_closure" +# Copy the NixOS/Nixpkgs sources to the target as the initial contents +# of the NixOS channel. +if [[ -z $noChannelCopy ]]; then + channelPath="$(nix-env -p /nix/var/nix/profiles/per-user/root/channels -q nixos --no-name --out-path 2>/dev/null || echo -n "")" + if [[ -n $channelPath ]]; then + echo "copying channel..." + mkdir -p $mountPoint/nix/var/nix/profiles/per-user/root + nix-env --store "$mountPoint" --substituters 'local?trusted=1' "${extraBuildFlags[@]}" \ + -p $mountPoint/nix/var/nix/profiles/per-user/root/channels --set "$channelPath" --quiet + fi +fi -# nixos-prepare-root doesn't currently do anything with file ownership, so we set it up here instead -chown @root_uid@:@nixbld_gid@ $mountPoint/nix/store - - - -# Grub needs an mtab. -ln -sfn /proc/mounts $mountPoint/etc/mtab +# Mark the target as a NixOS installation, otherwise switch-to-configuration will chicken out. +touch "$mountPoint/etc/NIXOS" # Switch to the new system configuration. This will install Grub with # a menu default pointing at the kernel/initrd/etc of the new # configuration. -echo "finalising the installation..." -if [ -z "$noBootLoader" ]; then - NIXOS_INSTALL_BOOTLOADER=1 chroot $mountPoint \ - /nix/var/nix/profiles/system/bin/switch-to-configuration boot +if [[ -z $noBootLoader ]]; then + echo "installing the boot loader..." + # Grub needs an mtab. + ln -sfn /proc/mounts $mountPoint/etc/mtab + NIXOS_INSTALL_BOOTLOADER=1 nixos-enter --root "$mountPoint" -- /run/current-system/bin/switch-to-configuration boot fi -# Run the activation script. -chroot $mountPoint /nix/var/nix/profiles/system/activate - - -# Ask the user to set a root password. -if [ -z "$noRootPasswd" ] && chroot $mountPoint [ -x /run/wrappers/bin/passwd ] && [ -t 0 ]; then - echo "setting root password..." - chroot $mountPoint /run/wrappers/bin/passwd +# Ask the user to set a root password, but only if the passwd command +# exists (i.e. when mutable user accounts are enabled). +if [[ -z $noRootPasswd ]] && [ -t 0 ]; then + nixos-enter --root "$mountPoint" -c '[[ -e /nix/var/nix/profiles/system/sw/bin/passwd ]] && echo "setting root password..." && /nix/var/nix/profiles/system/sw/bin/passwd' fi - echo "installation finished!" diff --git a/nixos/modules/installer/tools/tools.nix b/nixos/modules/installer/tools/tools.nix index 9398e2dc1ebc..7be59e4ce258 100644 --- a/nixos/modules/installer/tools/tools.nix +++ b/nixos/modules/installer/tools/tools.nix @@ -29,17 +29,8 @@ let nixos-install = makeProg { name = "nixos-install"; src = ./nixos-install.sh; - - inherit (pkgs) perl pathsFromGraph rsync; nix = config.nix.package.out; - cacert = "${pkgs.cacert}/etc/ssl/certs/ca-bundle.crt"; - root_uid = config.ids.uids.root; - nixbld_gid = config.ids.gids.nixbld; - prepare_root = nixos-prepare-root; - - nixClosure = pkgs.runCommand "closure" - { exportReferencesGraph = ["refs" config.nix.package.out]; } - "cp refs $out"; + path = makeBinPath [ nixos-enter ]; }; nixos-rebuild = From 1346923ffa144fa4b596588e1611c02694b48fba Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 5 Feb 2018 21:04:40 +0100 Subject: [PATCH 019/814] modprobe activation: Order after specialfs It requires the existence of /proc. --- nixos/modules/system/boot/modprobe.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/system/boot/modprobe.nix b/nixos/modules/system/boot/modprobe.nix index b915a98d5375..dee0ab470c99 100644 --- a/nixos/modules/system/boot/modprobe.nix +++ b/nixos/modules/system/boot/modprobe.nix @@ -54,7 +54,7 @@ with lib; environment.systemPackages = [ pkgs.kmod ]; - system.activationScripts.modprobe = + system.activationScripts.modprobe = stringAfter ["specialfs"] '' # Allow the kernel to find our wrapped modprobe (which searches # in the right location in the Nix store for kernel modules). From f9e64dbe764745f05ccf5ac458e804044196f571 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 5 Feb 2018 21:05:02 +0100 Subject: [PATCH 020/814] nixos-enter: Don't mount special filesystems The activation script already does this. --- nixos/modules/installer/tools/nixos-enter.sh | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/nixos/modules/installer/tools/nixos-enter.sh b/nixos/modules/installer/tools/nixos-enter.sh index c5c7963b29f3..96b6a017b810 100644 --- a/nixos/modules/installer/tools/nixos-enter.sh +++ b/nixos/modules/installer/tools/nixos-enter.sh @@ -45,12 +45,8 @@ while [ "$#" -gt 0 ]; do esac done -# Set up some bind mounts we'll want regardless of chroot or not -mkdir -m 0755 -p "$mountPoint/dev" "$mountPoint/proc" "$mountPoint/sys" "$mountPoint/run" +mkdir -m 0755 -p "$mountPoint/dev" mount --rbind /dev "$mountPoint/dev" -mount -t proc none "$mountPoint/proc" -mount -t sysfs none "$mountPoint/sys" -mount -t tmpfs none "$mountPoint/run" # Run the activation script. Set $LOCALE_ARCHIVE to supress some Perl locale warnings. LOCALE_ARCHIVE=$system/sw/lib/locale/locale-archive chroot "$mountPoint" "$system/activate" >&2 From cc0caac098b56b67300778c8a1738f8a16e08442 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 5 Feb 2018 21:12:17 +0100 Subject: [PATCH 021/814] Move creation of /root to the activation script ...so it appears in a new installation before rebooting the system. --- nixos/modules/config/users-groups.nix | 2 ++ nixos/modules/system/boot/stage-2-init.sh | 1 - 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/nixos/modules/config/users-groups.nix b/nixos/modules/config/users-groups.nix index c1102d558101..92670ba31f50 100644 --- a/nixos/modules/config/users-groups.nix +++ b/nixos/modules/config/users-groups.nix @@ -533,6 +533,8 @@ in { -I${pkgs.perlPackages.FileSlurp}/lib/perl5/site_perl \ -I${pkgs.perlPackages.JSON}/lib/perl5/site_perl \ ${./update-users-groups.pl} ${spec} + + install -m 0700 -d /root ''; # for backwards compatibility diff --git a/nixos/modules/system/boot/stage-2-init.sh b/nixos/modules/system/boot/stage-2-init.sh index 46aed44bf10f..9d2c580d62a7 100644 --- a/nixos/modules/system/boot/stage-2-init.sh +++ b/nixos/modules/system/boot/stage-2-init.sh @@ -82,7 +82,6 @@ ln -s /proc/mounts /etc/mtab mkdir -m 01777 -p /tmp mkdir -m 0755 -p /var/{log,lib,db} /nix/var /etc/nixos/ \ /run/lock /home /bin # for the /bin/sh symlink -install -m 0700 -d /root # Miscellaneous boot time cleanup. From 11a9e1c3c0b2595ea37b8812736427ffb32a0787 Mon Sep 17 00:00:00 2001 From: Matthieu Coudron Date: Tue, 31 Oct 2017 20:08:05 +0900 Subject: [PATCH 022/814] l2tp: 1.2.4 -> 1.2.8 the new version brings a new panel in IPsec settings which allows to reenable old algorithms for IPsec phases 1/2 (dropped in recent libreswan/strongswan etc). Also updates the homepage with the new one. --- pkgs/tools/networking/network-manager/l2tp.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/networking/network-manager/l2tp.nix b/pkgs/tools/networking/network-manager/l2tp.nix index b40afa605e3b..f8047abe1bd6 100644 --- a/pkgs/tools/networking/network-manager/l2tp.nix +++ b/pkgs/tools/networking/network-manager/l2tp.nix @@ -22,6 +22,9 @@ stdenv.mkDerivation rec { postPatch = '' sed -i -e 's%"\(/usr/sbin\|/usr/pkg/sbin\|/usr/local/sbin\)/[^"]*",%%g' ./src/nm-l2tp-service.c + substituteInPlace ./Makefile.am \ + --replace '$(sysconfdir)/dbus-1/system.d' "$out/etc/dbus-1/system.d" + substituteInPlace ./src/nm-l2tp-service.c \ --replace /sbin/ipsec ${strongswan}/bin/ipsec \ --replace /sbin/xl2tpd ${xl2tpd}/bin/xl2tpd @@ -38,11 +41,16 @@ stdenv.mkDerivation rec { ]; enableParallelBuilding = true; + configureFlags = [ + "--with-gnome=${if withGnome then "yes" else "no"}" + "--localstatedir=/var" + ] ; + meta = with stdenv.lib; { description = "L2TP plugin for NetworkManager"; inherit (networkmanager.meta) platforms; - homepage = https://github.com/nm-l2tp/network-manager-l2tp; + homepage = http://github.com/nm-l2tp/network-manager-l2tp; license = licenses.gpl2; maintainers = with maintainers; [ abbradar obadz ]; }; From fe4f4de1c92714aa9a2add7ffb3ca83a861d6d4e Mon Sep 17 00:00:00 2001 From: Matthieu Coudron Date: Tue, 31 Oct 2017 20:14:00 +0900 Subject: [PATCH 023/814] strongswan module: make it work with ipsec l2tp l2tp saves its secrets into /etc/ipsec.d but strongswan would not read them. l2tp checks for /etc/ipsec.secrets includes /etc/ipsec.d and if not tries to write into it. Solution: Have the strongswan module create /etc/ipsec.d and /etc/ipsec.secrets when networkmanager_l2tp is installed. Include /etc/ipsec.secrets in /nix/store/hash-strongswan/etc/ipsec.secrets so that it can find l2tp secrets. Also when the ppp 'nopeerdns' option is used, the DNS resolver tries to write into an alternate file /etc/ppp/resolv.conf. This fails when /etc/ppp does not exist so the module creates it by default. --- .../services/networking/networkmanager.nix | 1 + .../services/networking/strongswan.nix | 23 +++++++++++++++---- .../tools/networking/network-manager/l2tp.nix | 7 +----- pkgs/tools/networking/strongswan/default.nix | 5 ++++ 4 files changed, 26 insertions(+), 10 deletions(-) diff --git a/nixos/modules/services/networking/networkmanager.nix b/nixos/modules/services/networking/networkmanager.nix index 62afbf32c2f6..a5ca6cc74cf5 100644 --- a/nixos/modules/services/networking/networkmanager.nix +++ b/nixos/modules/services/networking/networkmanager.nix @@ -335,6 +335,7 @@ in { preStart = '' mkdir -m 700 -p /etc/NetworkManager/system-connections + mkdir -m 700 -p /etc/ipsec.d mkdir -m 755 -p ${stateDirs} ''; }; diff --git a/nixos/modules/services/networking/strongswan.nix b/nixos/modules/services/networking/strongswan.nix index 3a3f64221c42..707d24b9220f 100644 --- a/nixos/modules/services/networking/strongswan.nix +++ b/nixos/modules/services/networking/strongswan.nix @@ -32,13 +32,13 @@ let ${caConf} ''; - strongswanConf = {setup, connections, ca, secrets, managePlugins, enabledPlugins}: toFile "strongswan.conf" '' + strongswanConf = {setup, connections, ca, secretsFile, managePlugins, enabledPlugins}: toFile "strongswan.conf" '' charon { ${if managePlugins then "load_modular = no" else ""} ${if managePlugins then ("load = " + (concatStringsSep " " enabledPlugins)) else ""} plugins { stroke { - secrets_file = ${ipsecSecrets secrets} + secrets_file = ${secretsFile} } } } @@ -135,7 +135,18 @@ in }; }; - config = with cfg; mkIf enable { + + config = with cfg; + let + secretsFile = ipsecSecrets cfg.secrets; + in + mkIf enable + { + + # here we should use the default strongswan ipsec.secrets and + # append to it (default one is empty so not a pb for now) + environment.etc."ipsec.secrets".source = secretsFile; + systemd.services.strongswan = { description = "strongSwan IPSec Service"; wantedBy = [ "multi-user.target" ]; @@ -143,11 +154,15 @@ in wants = [ "keys.target" ]; after = [ "network-online.target" "keys.target" ]; environment = { - STRONGSWAN_CONF = strongswanConf { inherit setup connections ca secrets managePlugins enabledPlugins; }; + STRONGSWAN_CONF = strongswanConf { inherit setup connections ca secretsFile managePlugins enabledPlugins; }; }; serviceConfig = { ExecStart = "${pkgs.strongswan}/sbin/ipsec start --nofork"; }; + preStart = '' + # with 'nopeerdns' setting, ppp writes into this folder + mkdir -m 700 -p /etc/ppp + ''; }; }; } diff --git a/pkgs/tools/networking/network-manager/l2tp.nix b/pkgs/tools/networking/network-manager/l2tp.nix index f8047abe1bd6..e01197a0f750 100644 --- a/pkgs/tools/networking/network-manager/l2tp.nix +++ b/pkgs/tools/networking/network-manager/l2tp.nix @@ -41,16 +41,11 @@ stdenv.mkDerivation rec { ]; enableParallelBuilding = true; - configureFlags = [ - "--with-gnome=${if withGnome then "yes" else "no"}" - "--localstatedir=/var" - ] ; - meta = with stdenv.lib; { description = "L2TP plugin for NetworkManager"; inherit (networkmanager.meta) platforms; - homepage = http://github.com/nm-l2tp/network-manager-l2tp; + homepage = https://github.com/nm-l2tp/network-manager-l2tp; license = licenses.gpl2; maintainers = with maintainers; [ abbradar obadz ]; }; diff --git a/pkgs/tools/networking/strongswan/default.nix b/pkgs/tools/networking/strongswan/default.nix index eff498a174eb..7c682704592b 100644 --- a/pkgs/tools/networking/strongswan/default.nix +++ b/pkgs/tools/networking/strongswan/default.nix @@ -76,6 +76,11 @@ stdenv.mkDerivation rec { "--enable-sqlite" ] ++ optional enableNetworkManager "--enable-nm"; + postInstall = '' + # this is needed for l2tp + echo "include /etc/ipsec.secrets" >> $out/etc/ipsec.secrets + ''; + NIX_LDFLAGS = "-lgcc_s" ; meta = { From 5193807750853a592bb7d0202a998d1f2c780cf2 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 7 Feb 2018 15:47:19 +0100 Subject: [PATCH 024/814] VM tests: Initialize the Nix database with correct NAR hashes/sizes --- nixos/tests/misc.nix | 11 +++++- pkgs/build-support/closure-info.nix | 55 ++++++++--------------------- 2 files changed, 25 insertions(+), 41 deletions(-) diff --git a/nixos/tests/misc.nix b/nixos/tests/misc.nix index 6de17518214c..4fd9466dc502 100644 --- a/nixos/tests/misc.nix +++ b/nixos/tests/misc.nix @@ -1,11 +1,13 @@ # Miscellaneous small tests that don't warrant their own VM run. -import ./make-test.nix ({ pkgs, ...} : { +import ./make-test.nix ({ pkgs, ...} : rec { name = "misc"; meta = with pkgs.stdenv.lib.maintainers; { maintainers = [ eelco chaoflow ]; }; + foo = pkgs.writeText "foo" "Hello World"; + machine = { config, lib, pkgs, ... }: with lib; @@ -27,10 +29,17 @@ import ./make-test.nix ({ pkgs, ...} : { security.sudo = { enable = true; wheelNeedsPassword = false; }; boot.kernel.sysctl."vm.swappiness" = 1; boot.kernelParams = [ "vsyscall=emulate" ]; + system.extraDependencies = [ foo ]; }; testScript = '' + subtest "nix-db", sub { + my $json = $machine->succeed("nix path-info --json ${foo}"); + $json =~ /"narHash":"sha256:0afw0d9j1hvwiz066z93jiddc33nxg6i6qyp26vnqyglpyfivlq5"/ or die "narHash not set"; + $json =~ /"narSize":128/ or die "narSize not set"; + }; + subtest "nixos-version", sub { $machine->succeed("[ `nixos-version | wc -w` = 2 ]"); }; diff --git a/pkgs/build-support/closure-info.nix b/pkgs/build-support/closure-info.nix index 4d178ac96c5d..54b1fe59b66d 100644 --- a/pkgs/build-support/closure-info.nix +++ b/pkgs/build-support/closure-info.nix @@ -8,51 +8,26 @@ { rootPaths }: -#if builtins.langVersion >= 5 then -# FIXME: it doesn't work on Hydra, failing to find mkdir; -# perhaps .attrs.sh clobbers PATH with new nix? -if false then +assert builtins.langVersion >= 5; - # Nix >= 1.12: Include NAR hash / size info. +stdenv.mkDerivation { + name = "closure-info"; - stdenv.mkDerivation { - name = "closure-info"; + __structuredAttrs = true; - __structuredAttrs = true; + exportReferencesGraph.closure = rootPaths; - exportReferencesGraph.closure = rootPaths; + PATH = "${coreutils}/bin:${jq}/bin"; - PATH = "${coreutils}/bin:${jq}/bin"; + builder = builtins.toFile "builder" + '' + if [ -e .attrs.sh ]; then . .attrs.sh; fi - builder = builtins.toFile "builder" - '' - if [ -e .attrs.sh ]; then . .attrs.sh; fi + out=''${outputs[out]} - out=''${outputs[out]} + mkdir $out - mkdir $out - - jq -r '.closure | map([.path, .narHash, .narSize, "", (.references | length)] + .references) | add | map("\(.)\n") | add' < .attrs.json | head -n -1 > $out/registration - jq -r .closure[].path < .attrs.json > $out/store-paths - ''; - } - -else - - # Nix < 1.12 - - stdenv.mkDerivation { - name = "closure-info"; - - exportReferencesGraph = - map (x: [("closure-" + baseNameOf x) x]) rootPaths; - - buildInputs = [ perl ]; - - buildCommand = - '' - mkdir $out - printRegistration=1 perl ${pathsFromGraph} closure-* > $out/registration - perl ${pathsFromGraph} closure-* > $out/store-paths - ''; - } + jq -r '.closure | map([.path, .narHash, .narSize, "", (.references | length)] + .references) | add | map("\(.)\n") | add' < .attrs.json | head -n -1 > $out/registration + jq -r .closure[].path < .attrs.json > $out/store-paths + ''; +} From df117acab7bf345500ffada26c240c9f815b7c21 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 7 Feb 2018 16:50:47 +0100 Subject: [PATCH 025/814] ISO images: Initialize the Nix database with correct NAR hashes/sizes The boot test now runs "nix verify" to ensure that all hashes are correct. --- nixos/lib/make-iso9660-image.nix | 9 ++--- nixos/lib/make-iso9660-image.sh | 7 ++-- nixos/lib/make-squashfs.nix | 42 +++----------------- nixos/modules/installer/cd-dvd/iso-image.nix | 8 +--- nixos/tests/boot.nix | 1 + 5 files changed, 15 insertions(+), 52 deletions(-) diff --git a/nixos/lib/make-iso9660-image.nix b/nixos/lib/make-iso9660-image.nix index 75be70dbcb2b..c6bafd48f9db 100644 --- a/nixos/lib/make-iso9660-image.nix +++ b/nixos/lib/make-iso9660-image.nix @@ -1,4 +1,4 @@ -{ stdenv, perl, pathsFromGraph, xorriso, syslinux +{ stdenv, perl, closureInfo, xorriso, syslinux , # The file name of the resulting ISO image. isoName ? "cd.iso" @@ -48,9 +48,9 @@ assert usbBootable -> isohybridMbrImage != ""; stdenv.mkDerivation { name = isoName; builder = ./make-iso9660-image.sh; - buildInputs = [perl xorriso syslinux]; + buildInputs = [ xorriso syslinux ]; - inherit isoName bootable bootImage compressImage volumeID pathsFromGraph efiBootImage efiBootable isohybridMbrImage usbBootable; + inherit isoName bootable bootImage compressImage volumeID efiBootImage efiBootable isohybridMbrImage usbBootable; # !!! should use XML. sources = map (x: x.source) contents; @@ -61,6 +61,5 @@ stdenv.mkDerivation { symlinks = map (x: x.symlink) storeContents; # For obtaining the closure of `storeContents'. - exportReferencesGraph = - map (x: [("closure-" + baseNameOf x.object) x.object]) storeContents; + closureInfo = closureInfo { rootPaths = map (x: x.object) storeContents; }; } diff --git a/nixos/lib/make-iso9660-image.sh b/nixos/lib/make-iso9660-image.sh index c623436f6c5b..45cdef1ef4df 100644 --- a/nixos/lib/make-iso9660-image.sh +++ b/nixos/lib/make-iso9660-image.sh @@ -72,16 +72,15 @@ done # Add the closures of the top-level store objects. -storePaths=$(perl $pathsFromGraph closure-*) -for i in $storePaths; do +for i in $(< $closureInfo/store-paths); do addPath "${i:1}" "$i" done # Also include a manifest of the closures in a format suitable for # nix-store --load-db. -if [ -n "$object" ]; then - printRegistration=1 perl $pathsFromGraph closure-* > nix-path-registration +if [[ ${#objects[*]} != 0 ]]; then + cp $closureInfo/registration nix-path-registration addPath "nix-path-registration" "nix-path-registration" fi diff --git a/nixos/lib/make-squashfs.nix b/nixos/lib/make-squashfs.nix index 9d47a3222cc2..7ab84e47f53b 100644 --- a/nixos/lib/make-squashfs.nix +++ b/nixos/lib/make-squashfs.nix @@ -1,4 +1,4 @@ -{ stdenv, squashfsTools, perl, pathsFromGraph +{ stdenv, squashfsTools, closureInfo , # The root directory of the squashfs filesystem is filled with the # closures of the Nix store paths listed here. @@ -8,50 +8,18 @@ stdenv.mkDerivation { name = "squashfs.img"; - nativeBuildInputs = [perl squashfsTools]; - - # For obtaining the closure of `storeContents'. - exportReferencesGraph = - map (x: [("closure-" + baseNameOf x) x]) storeContents; + nativeBuildInputs = [ squashfsTools ]; buildCommand = '' - # Add the closures of the top-level store objects. - storePaths=$(perl ${pathsFromGraph} closure-*) - - # If a Hydra slave happens to have store paths with bad permissions/mtime, - # abort now so that they don't end up in ISO images in the channel. - # https://github.com/NixOS/nixpkgs/issues/32242 - hasBadPaths="" - for path in $storePaths; do - if [ -h "$path" ]; then - continue - fi - - mtime=$(stat -c %Y "$path") - mode=$(stat -c %a "$path") - - if [ "$mtime" != 1 ]; then - echo "Store path '$path' has an invalid mtime." - hasBadPaths=1 - fi - if [ "$mode" != 444 ] && [ "$mode" != 555 ]; then - echo "Store path '$path' has invalid permissions ($mode)." - hasBadPaths=1 - fi - done - - if [ -n "$hasBadPaths" ]; then - echo "You have bad paths in your store, please fix them." - exit 1 - fi + closureInfo=${closureInfo { rootPaths = storeContents; }} # Also include a manifest of the closures in a format suitable # for nix-store --load-db. - printRegistration=1 perl ${pathsFromGraph} closure-* > nix-path-registration + cp $closureInfo/registration nix-path-registration # Generate the squashfs image. - mksquashfs nix-path-registration $storePaths $out \ + mksquashfs nix-path-registration $(cat $closureInfo/store-paths) $out \ -keep-as-directory -all-root -b 1048576 -comp xz -Xdict-size 100% ''; } diff --git a/nixos/modules/installer/cd-dvd/iso-image.nix b/nixos/modules/installer/cd-dvd/iso-image.nix index a039f7fdcb6e..bf9db8249f13 100644 --- a/nixos/modules/installer/cd-dvd/iso-image.nix +++ b/nixos/modules/installer/cd-dvd/iso-image.nix @@ -331,8 +331,7 @@ in config.system.build.toplevel.drvPath; # Create the squashfs image that contains the Nix store. - system.build.squashfsStore = import ../../../lib/make-squashfs.nix { - inherit (pkgs) stdenv squashfsTools perl pathsFromGraph; + system.build.squashfsStore = pkgs.callPackage ../../../lib/make-squashfs.nix { storeContents = config.isoImage.storeContents; }; @@ -383,11 +382,8 @@ in boot.loader.timeout = 10; # Create the ISO image. - system.build.isoImage = import ../../../lib/make-iso9660-image.nix ({ - inherit (pkgs) stdenv perl pathsFromGraph xorriso syslinux; - + system.build.isoImage = pkgs.callPackage ../../../lib/make-iso9660-image.nix ({ inherit (config.isoImage) isoName compressImage volumeID contents; - bootable = true; bootImage = "/isolinux/isolinux.bin"; } // optionalAttrs config.isoImage.makeUsbBootable { diff --git a/nixos/tests/boot.nix b/nixos/tests/boot.nix index fc52cd09f209..0ba8a2704e63 100644 --- a/nixos/tests/boot.nix +++ b/nixos/tests/boot.nix @@ -24,6 +24,7 @@ let my $machine = createMachine({ ${machineConfig}, qemuFlags => '-m 768' }); $machine->start; $machine->waitForUnit("multi-user.target"); + $machine->succeed("nix verify -r --no-trust /run/current-system"); $machine->shutdown; ''; }; From f0979ca30e657b16a840fe8977fb833c762d53c3 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 7 Feb 2018 17:20:26 +0100 Subject: [PATCH 026/814] nixos-install: Don't require root E.g. nixos-install --root /tmp/mnt/ --no-bootloader --no-root-passwd now works for non-root users. --- nixos/modules/installer/tools/nixos-install.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/installer/tools/nixos-install.sh b/nixos/modules/installer/tools/nixos-install.sh index 69371f3e4132..222211df2789 100644 --- a/nixos/modules/installer/tools/nixos-install.sh +++ b/nixos/modules/installer/tools/nixos-install.sh @@ -82,7 +82,7 @@ fi trap "rm -rf $tmpdir" EXIT tmpdir="$(mktemp -d)" -subs="local?trusted=1 https://cache.nixos.org/" +subs="auto?trusted=1 https://cache.nixos.org/" # Build the system configuration in the target filesystem. if [[ -z $system ]]; then @@ -108,7 +108,7 @@ if [[ -z $noChannelCopy ]]; then if [[ -n $channelPath ]]; then echo "copying channel..." mkdir -p $mountPoint/nix/var/nix/profiles/per-user/root - nix-env --store "$mountPoint" --substituters 'local?trusted=1' "${extraBuildFlags[@]}" \ + nix-env --store "$mountPoint" --substituters 'auto?trusted=1' "${extraBuildFlags[@]}" \ -p $mountPoint/nix/var/nix/profiles/per-user/root/channels --set "$channelPath" --quiet fi fi From bb030ece3b4dc6ca892907927345e8d109e42678 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 7 Feb 2018 17:23:05 +0100 Subject: [PATCH 027/814] nixos-enter: Check whether --root denotes a NixOS installation --- nixos/modules/installer/tools/nixos-enter.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/nixos/modules/installer/tools/nixos-enter.sh b/nixos/modules/installer/tools/nixos-enter.sh index 96b6a017b810..fcd0c54f5db9 100644 --- a/nixos/modules/installer/tools/nixos-enter.sh +++ b/nixos/modules/installer/tools/nixos-enter.sh @@ -45,6 +45,11 @@ while [ "$#" -gt 0 ]; do esac done +if [[ ! -e $mountPoint/etc/NIXOS ]]; then + echo "$0: '$mountPoint' is not a NixOS installation" >&2 + exit 126 +fi + mkdir -m 0755 -p "$mountPoint/dev" mount --rbind /dev "$mountPoint/dev" From 16bdaf3d036fed3321d26e5b1ed7b2a5f67b2a51 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 7 Feb 2018 17:58:21 +0100 Subject: [PATCH 028/814] Remove creation of /dev/{fd,stdin,stdout,stderr} This is already provided by devtmpfs. --- nixos/modules/system/activation/activation-script.nix | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/nixos/modules/system/activation/activation-script.nix b/nixos/modules/system/activation/activation-script.nix index c2ac731d433d..8c9b35fe524f 100644 --- a/nixos/modules/system/activation/activation-script.nix +++ b/nixos/modules/system/activation/activation-script.nix @@ -117,14 +117,7 @@ in config = { - system.activationScripts.stdio = - '' - # Needed by some programs. - ln -sfn /proc/self/fd /dev/fd - ln -sfn /proc/self/fd/0 /dev/stdin - ln -sfn /proc/self/fd/1 /dev/stdout - ln -sfn /proc/self/fd/2 /dev/stderr - ''; + system.activationScripts.stdio = ""; # obsolete system.activationScripts.var = '' From da702a4034a14f6ea106a9ac5e4ed4cabfc2ef00 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 7 Feb 2018 17:59:04 +0100 Subject: [PATCH 029/814] nixos-enter: Don't require root Of course, you'll get a bunch of warnings from the activation script: $ nixos-enter --root /tmp/mnt/ setting up /etc... mount: /dev: permission denied. mount: /dev/pts: permission denied. mount: /dev/shm: permission denied. mount: /sys: permission denied. /nix/var/nix/profiles/system/activate: line 74: /proc/sys/kernel/modprobe: Permission denied chown: changing ownership of '/run/wrappers/wrappers.0pKlU8JsvV/dbus-daemon-launch-helper': Invalid argument NOTE: Under Linux, effective file capabilities must either be empty, or exactly match the union of selected permitted and inheritable bits. Failed to set capabilities on file `/run/wrappers/wrappers.0pKlU8JsvV/ping' (Operation not permitted) chown: changing ownership of '/run/wrappers/wrappers.0pKlU8JsvV/unix_chkpwd': Invalid argument [root@nixos:/]# --- nixos/modules/installer/tools/nixos-enter.sh | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/nixos/modules/installer/tools/nixos-enter.sh b/nixos/modules/installer/tools/nixos-enter.sh index fcd0c54f5db9..122d9fdcd29b 100644 --- a/nixos/modules/installer/tools/nixos-enter.sh +++ b/nixos/modules/installer/tools/nixos-enter.sh @@ -4,13 +4,14 @@ set -e # Re-exec ourselves in a private mount namespace so that our bind # mounts get cleaned up automatically. -if [ "$(id -u)" = 0 ]; then - if [ -z "$NIXOS_ENTER_REEXEC" ]; then - export NIXOS_ENTER_REEXEC=1 - exec unshare --mount --uts -- "$0" "$@" - else - mount --make-rprivate / +if [ -z "$NIXOS_ENTER_REEXEC" ]; then + export NIXOS_ENTER_REEXEC=1 + if [ "$(id -u)" != 0 ]; then + extraFlags="-r" fi + exec unshare --fork --mount --uts --mount-proc --pid $extraFlags -- "$0" "$@" +else + mount --make-rprivate / fi mountPoint=/mnt @@ -54,6 +55,6 @@ mkdir -m 0755 -p "$mountPoint/dev" mount --rbind /dev "$mountPoint/dev" # Run the activation script. Set $LOCALE_ARCHIVE to supress some Perl locale warnings. -LOCALE_ARCHIVE=$system/sw/lib/locale/locale-archive chroot "$mountPoint" "$system/activate" >&2 +LOCALE_ARCHIVE=$system/sw/lib/locale/locale-archive chroot "$mountPoint" "$system/activate" >&2 || true exec chroot "$mountPoint" "${command[@]}" From 6daad9b3c564ada1900d7be4bf8b3888de1ec197 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 7 Feb 2018 18:22:05 +0100 Subject: [PATCH 030/814] nixos-install: Fix --closure --- nixos/modules/installer/tools/nixos-install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/installer/tools/nixos-install.sh b/nixos/modules/installer/tools/nixos-install.sh index 222211df2789..4f1b234b0e0f 100644 --- a/nixos/modules/installer/tools/nixos-install.sh +++ b/nixos/modules/installer/tools/nixos-install.sh @@ -73,7 +73,7 @@ if [[ ${NIXOS_CONFIG:0:1} != / ]]; then exit 1 fi -if [ ! -e "$NIXOS_CONFIG" ] && [ -z "$closure" ]; then +if [[ ! -e $NIXOS_CONFIG && -z $system ]]; then echo "configuration file $NIXOS_CONFIG doesn't exist" exit 1 fi From 598a3f5b30c39aa923ab5d85234fc263796b8b6c Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 7 Feb 2018 19:10:13 +0100 Subject: [PATCH 031/814] nixos-install: Create /etc --- nixos/modules/installer/tools/nixos-install.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/installer/tools/nixos-install.sh b/nixos/modules/installer/tools/nixos-install.sh index 4f1b234b0e0f..40ec491a65f3 100644 --- a/nixos/modules/installer/tools/nixos-install.sh +++ b/nixos/modules/installer/tools/nixos-install.sh @@ -114,6 +114,7 @@ if [[ -z $noChannelCopy ]]; then fi # Mark the target as a NixOS installation, otherwise switch-to-configuration will chicken out. +mkdir -m 0755 "$mountPoint/etc" touch "$mountPoint/etc/NIXOS" # Switch to the new system configuration. This will install Grub with From e76849dca216654bed475366147636d1e5cb46ff Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 7 Feb 2018 19:32:12 +0100 Subject: [PATCH 032/814] nixUnstable: 2.0pre5889_c287d731 -> 2.0pre5914_48c192ca --- pkgs/tools/package-management/nix/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index ea4b6bfdb38a..d8246c5da936 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -161,12 +161,12 @@ in rec { nixUnstable = (lib.lowPrio (common rec { name = "nix-2.0${suffix}"; - suffix = "pre5889_c287d731"; + suffix = "pre5914_48c192ca"; src = fetchFromGitHub { owner = "NixOS"; repo = "nix"; - rev = "c287d7312103bae5e154c0c4dd493371a22ea207"; - sha256 = "1dwhz93dlk62prh3wfwf8vxfcqjdn21wk0ms65kf5r8ahkfgpgq4"; + rev = "48c192ca2d5bc65b69d2336c8577258f8eb80cf8"; + sha256 = "0xfb9dwyzdy31hbi5y9mlia8wsck2lay0f0phbfalgs4y7i3r3r1"; }; fromGit = true; })) // { perl-bindings = perl-bindings { nix = nixUnstable; }; }; From f64a4af32864ade24784718d64d8cbdc7fc18fcd Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 7 Feb 2018 19:32:41 +0100 Subject: [PATCH 033/814] Fix comments --- nixos/tests/installer.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix index 637cbb45709d..c2b573dd1c34 100644 --- a/nixos/tests/installer.nix +++ b/nixos/tests/installer.nix @@ -145,7 +145,7 @@ let # Check that the daemon works, and that non-root users can run builds (this will build a new profile generation through the daemon) $machine->succeed("su alice -l -c 'nix-env -iA nixos.procps' >&2"); - # We need to a writable nix-store on next boot. + # We need a writable Nix store on next boot. $machine->copyFileFromHost( "${ makeConfig { inherit bootLoader grubVersion grubDevice grubIdentifier grubUseEfi extraConfig; forceGrubReinstallCount = 1; } }", "/etc/nixos/configuration.nix"); @@ -195,8 +195,7 @@ let }; nodes = { - # The configuration of the machine used to run "nixos-install". It - # also has a web server that simulates cache.nixos.org. + # The configuration of the machine used to run "nixos-install". machine = { config, lib, pkgs, ... }: From 5d8860b919fec1db38298a305f6526476453bf25 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 7 Feb 2018 19:33:22 +0100 Subject: [PATCH 034/814] nixos-install: Accept --substituters This is useful in tests where we don't have network access. Passing --substituters "" prevents wasting time by checking cache.nixos.org. --- nixos/modules/installer/tools/nixos-install.sh | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/nixos/modules/installer/tools/nixos-install.sh b/nixos/modules/installer/tools/nixos-install.sh index 40ec491a65f3..87bc2785f907 100644 --- a/nixos/modules/installer/tools/nixos-install.sh +++ b/nixos/modules/installer/tools/nixos-install.sh @@ -16,7 +16,7 @@ mountPoint=/mnt while [ "$#" -gt 0 ]; do i="$1"; shift 1 case "$i" in - --max-jobs|-j|--cores|-I) + --max-jobs|-j|--cores|-I|--substituters) j="$1"; shift 1 extraBuildFlags+=("$i" "$j") ;; @@ -82,14 +82,14 @@ fi trap "rm -rf $tmpdir" EXIT tmpdir="$(mktemp -d)" -subs="auto?trusted=1 https://cache.nixos.org/" +sub="auto?trusted=1" # Build the system configuration in the target filesystem. if [[ -z $system ]]; then echo "building the configuration in $NIXOS_CONFIG..." outLink="$tmpdir/system" nix build --out-link "$outLink" --store "$mountPoint" "${extraBuildFlags[@]}" \ - --substituters "$subs" \ + --extra-substituters "$sub" \ -f '' system -I "nixos-config=$NIXOS_CONFIG" system=$(readlink -f $outLink) fi @@ -98,7 +98,7 @@ fi # this with the previous step once we have a nix-env replacement with # a progress bar. nix-env --store "$mountPoint" "${extraBuildFlags[@]}" \ - --substituters "$subs" \ + --extra-substituters "$sub" \ -p $mountPoint/nix/var/nix/profiles/system --set "$system" # Copy the NixOS/Nixpkgs sources to the target as the initial contents @@ -108,7 +108,7 @@ if [[ -z $noChannelCopy ]]; then if [[ -n $channelPath ]]; then echo "copying channel..." mkdir -p $mountPoint/nix/var/nix/profiles/per-user/root - nix-env --store "$mountPoint" --substituters 'auto?trusted=1' "${extraBuildFlags[@]}" \ + nix-env --store "$mountPoint" "${extraBuildFlags[@]}" --extra-substituters "$sub" \ -p $mountPoint/nix/var/nix/profiles/per-user/root/channels --set "$channelPath" --quiet fi fi From 9802da517fe4da41d68516029b01c5c1f175b3e4 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 7 Feb 2018 19:35:43 +0100 Subject: [PATCH 035/814] make-disk-image.nix: Use nixos-install again Since nixos-install doesn't require any special privileges anymore, this Just Works. No more need for fakeroot / nixos-prepare-root. --- nixos/lib/make-disk-image.nix | 47 +++++++++++++++++++---------------- 1 file changed, 25 insertions(+), 22 deletions(-) diff --git a/nixos/lib/make-disk-image.nix b/nixos/lib/make-disk-image.nix index 8a3d8ed17701..6269e4279380 100644 --- a/nixos/lib/make-disk-image.nix +++ b/nixos/lib/make-disk-image.nix @@ -51,7 +51,7 @@ with lib; let format' = format; in let - format = if (format' == "qcow2-compressed") then "qcow2" else format'; + format = if format' == "qcow2-compressed" then "qcow2" else format'; compress = optionalString (format' == "qcow2-compressed") "-c"; @@ -84,6 +84,7 @@ let format' = format; in let nixpkgs = cleanSource pkgs.path; + # FIXME: merge with channel.nix / make-channel.nix. channelSources = pkgs.runCommand "nixos-${config.system.nixosVersion}" {} '' mkdir -p $out cp -prd ${nixpkgs} $out/nixos @@ -95,13 +96,16 @@ let format' = format; in let echo -n ${config.system.nixosVersionSuffix} > $out/nixos/.version-suffix ''; - metaClosure = pkgs.writeText "meta" '' - ${config.system.build.toplevel} - ${config.nix.package.out} - ${channelSources} - ''; - - prepareImageInputs = with pkgs; [ rsync utillinux parted e2fsprogs lkl fakeroot config.system.build.nixos-prepare-root ] ++ stdenv.initialPath; + binPath = with pkgs; makeBinPath ( + [ rsync + utillinux + parted + e2fsprogs + lkl + config.system.build.nixos-install + config.system.build.nixos-enter + nix + ] ++ stdenv.initialPath); # I'm preserving the line below because I'm going to search for it across nixpkgs to consolidate # image building logic. The comment right below this now appears in 4 different places in nixpkgs :) @@ -109,8 +113,10 @@ let format' = format; in let sources = map (x: x.source) contents; targets = map (x: x.target) contents; + closureInfo = pkgs.closureInfo { rootPaths = [ config.system.build.toplevel channelSources ]; }; + prepareImage = '' - export PATH=${makeBinPath prepareImageInputs} + export PATH=${binPath} # Yes, mkfs.ext4 takes different units in different contexts. Fun. sectorsToKilobytes() { @@ -168,11 +174,14 @@ let format' = format; in let fi done - # TODO: Nix really likes to chown things it creates to its current user... - fakeroot nixos-prepare-root $root ${channelSources} ${config.system.build.toplevel} closure + export HOME=$TMPDIR - # fakeroot seems to always give the owner write permissions, which we do not want - find $root/nix/store -mindepth 1 -maxdepth 1 -type f -o -type d | xargs chmod -R a-w + # Provide a Nix database so that nixos-install can copy closures. + export NIX_STATE_DIR=$TMPDIR/state + nix-store --load-db < ${closureInfo}/registration + + echo "running nixos-install..." + nixos-install --root $root --no-bootloader --no-root-passwd --closure ${config.system.build.toplevel} --substituters "" echo "copying staging root to image..." cptofs -p ${optionalString (partitionTableType != "none") "-P ${rootPartition}"} -t ${fsType} -i $diskImage $root/* / @@ -181,7 +190,6 @@ in pkgs.vmTools.runInLinuxVM ( pkgs.runCommand name { preVM = prepareImage; buildInputs = with pkgs; [ utillinux e2fsprogs dosfstools ]; - exportReferencesGraph = [ "closure" metaClosure ]; postVM = '' ${if format == "raw" then '' mv $diskImage $out/${filename} @@ -194,6 +202,8 @@ in pkgs.vmTools.runInLinuxVM ( memSize = 1024; } '' + export PATH=${binPath}:$PATH + rootDisk=${if partitionTableType != "none" then "/dev/vda${rootPartition}" else "/dev/vda"} # Some tools assume these exist @@ -218,15 +228,8 @@ in pkgs.vmTools.runInLinuxVM ( cp ${configFile} /mnt/etc/nixos/configuration.nix ''} - mount --rbind /dev $mountPoint/dev - mount --rbind /proc $mountPoint/proc - mount --rbind /sys $mountPoint/sys - # Set up core system link, GRUB, etc. - NIXOS_INSTALL_BOOTLOADER=1 chroot $mountPoint /nix/var/nix/profiles/system/bin/switch-to-configuration boot - - # TODO: figure out if I should activate, but for now I won't - # chroot $mountPoint /nix/var/nix/profiles/system/activate + NIXOS_INSTALL_BOOTLOADER=1 nixos-enter --root $mountPoint -- /nix/var/nix/profiles/system/bin/switch-to-configuration boot # The above scripts will generate a random machine-id and we don't want to bake a single ID into all our images rm -f $mountPoint/etc/machine-id From 0f5d5970b28c9d85e7166f85ecfa3f86064d3f25 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 7 Feb 2018 19:37:53 +0100 Subject: [PATCH 036/814] nixos-prepare-root: Remove This is no longer needed thanks to Nix 2.0 magic. --- .../installer/tools/nixos-prepare-root.sh | 104 ------------------ nixos/modules/installer/tools/tools.nix | 9 -- 2 files changed, 113 deletions(-) delete mode 100644 nixos/modules/installer/tools/nixos-prepare-root.sh diff --git a/nixos/modules/installer/tools/nixos-prepare-root.sh b/nixos/modules/installer/tools/nixos-prepare-root.sh deleted file mode 100644 index ed5af234fec9..000000000000 --- a/nixos/modules/installer/tools/nixos-prepare-root.sh +++ /dev/null @@ -1,104 +0,0 @@ -#! @shell@ - -# This script's goal is to perform all "static" setup of a filesystem structure from pre-built store paths. Everything -# in here should run in a non-root context and inside a Nix builder. It's designed primarily to be called from image- -# building scripts and from nixos-install, but because it makes very few assumptions about the context in which it runs, -# it could be useful in other contexts as well. -# -# Current behavior: -# - set up basic filesystem structure -# - make Nix store etc. -# - copy Nix, system, channel, and misceallaneous closures to target Nix store -# - register validity of all paths in the target store -# - set up channel and system profiles - -# Ensure a consistent umask. -umask 0022 - -set -e - -mountPoint="$1" -channel="$2" -system="$3" -shift 3 -closures="$@" - -PATH="@coreutils@/bin:@nix@/bin:@perl@/bin:@utillinux@/bin:@rsync@/bin" - -if ! test -e "$mountPoint"; then - echo "mount point $mountPoint doesn't exist" - exit 1 -fi - -# Create a few of the standard directories in the target root directory. -install -m 0755 -d $mountPoint/dev $mountPoint/proc $mountPoint/sys $mountPoint/etc $mountPoint/run $mountPoint/home -install -m 01777 -d $mountPoint/tmp -install -m 0755 -d $mountPoint/tmp/root -install -m 0755 -d $mountPoint/var -install -m 0700 -d $mountPoint/root - -ln -sf /run $mountPoint/var/run - -# Create the necessary Nix directories on the target device -install -m 0755 -d \ - $mountPoint/nix/var/nix/gcroots \ - $mountPoint/nix/var/nix/temproots \ - $mountPoint/nix/var/nix/userpool \ - $mountPoint/nix/var/nix/profiles \ - $mountPoint/nix/var/nix/db \ - $mountPoint/nix/var/log/nix/drvs - -install -m 1775 -d $mountPoint/nix/store - -# All Nix operations below should operate on our target store, not /nix/store. -# N.B: this relies on Nix 1.12 or higher -export NIX_REMOTE=local?root=$mountPoint - -# Copy our closures to the Nix store on the target mount point, unless they're already there. -for i in $closures; do - # We support closures both in the format produced by `nix-store --export` and by `exportReferencesGraph`, - # mostly because there doesn't seem to be a single format that can be produced outside of a nix build and - # inside one. See https://github.com/NixOS/nix/issues/1242 for more discussion. - if [[ "$i" =~ \.closure$ ]]; then - echo "importing serialized closure $i to $mountPoint..." - nix-store --import < $i - else - # There has to be a better way to do this, right? - echo "copying closure $i to $mountPoint..." - for j in $(perl @pathsFromGraph@ $i); do - echo " $j... " - rsync -a $j $mountPoint/nix/store/ - done - - nix-store --option build-users-group root --register-validity < $i - fi -done - -# Create the required /bin/sh symlink; otherwise lots of things -# (notably the system() function) won't work. -if [ ! -x $mountPoint/@shell@ ]; then - echo "Error: @shell@ wasn't included in the closure" >&2 - exit 1 -fi -install -m 0755 -d $mountPoint/bin -ln -sf @shell@ $mountPoint/bin/sh - -echo "setting the system closure to '$system'..." -nix-env "${extraBuildFlags[@]}" -p $mountPoint/nix/var/nix/profiles/system --set "$system" - -ln -sfn /nix/var/nix/profiles/system $mountPoint/run/current-system - -# Copy the NixOS/Nixpkgs sources to the target as the initial contents of the NixOS channel. -install -m 0755 -d $mountPoint/nix/var/nix/profiles -install -m 1777 -d $mountPoint/nix/var/nix/profiles/per-user -install -m 0755 -d $mountPoint/nix/var/nix/profiles/per-user/root - -if [ -z "$noChannelCopy" ] && [ -n "$channel" ]; then - echo "copying channel..." - nix-env --option build-use-substitutes false "${extraBuildFlags[@]}" -p $mountPoint/nix/var/nix/profiles/per-user/root/channels --set "$channel" --quiet -fi -install -m 0700 -d $mountPoint/root/.nix-defexpr -ln -sfn /nix/var/nix/profiles/per-user/root/channels $mountPoint/root/.nix-defexpr/channels - -# Mark the target as a NixOS installation, otherwise switch-to-configuration will chicken out. -touch $mountPoint/etc/NIXOS diff --git a/nixos/modules/installer/tools/tools.nix b/nixos/modules/installer/tools/tools.nix index 7be59e4ce258..cdd561b68403 100644 --- a/nixos/modules/installer/tools/tools.nix +++ b/nixos/modules/installer/tools/tools.nix @@ -18,14 +18,6 @@ let src = ./nixos-build-vms/nixos-build-vms.sh; }; - nixos-prepare-root = makeProg { - name = "nixos-prepare-root"; - src = ./nixos-prepare-root.sh; - - nix = pkgs.nixUnstable; - inherit (pkgs) perl pathsFromGraph rsync utillinux coreutils; - }; - nixos-install = makeProg { name = "nixos-install"; src = ./nixos-install.sh; @@ -75,7 +67,6 @@ in environment.systemPackages = [ nixos-build-vms - nixos-prepare-root nixos-install nixos-rebuild nixos-generate-config From 847ea13be390923a7b7cb8766b1ab8e8465a18eb Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 7 Feb 2018 19:47:03 +0100 Subject: [PATCH 037/814] Doh --- nixos/modules/installer/tools/nixos-install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/installer/tools/nixos-install.sh b/nixos/modules/installer/tools/nixos-install.sh index 87bc2785f907..b51779cfb957 100644 --- a/nixos/modules/installer/tools/nixos-install.sh +++ b/nixos/modules/installer/tools/nixos-install.sh @@ -114,7 +114,7 @@ if [[ -z $noChannelCopy ]]; then fi # Mark the target as a NixOS installation, otherwise switch-to-configuration will chicken out. -mkdir -m 0755 "$mountPoint/etc" +mkdir -m 0755 -p "$mountPoint/etc" touch "$mountPoint/etc/NIXOS" # Switch to the new system configuration. This will install Grub with From a5e28a554e6b1fde424af8b7834bcfccf49a9abd Mon Sep 17 00:00:00 2001 From: Matthew Justin Bauer Date: Thu, 15 Feb 2018 17:30:59 -0600 Subject: [PATCH 038/814] nix-buffer: make eshell-path-env be inherited --- pkgs/build-support/emacs/buffer.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/build-support/emacs/buffer.nix b/pkgs/build-support/emacs/buffer.nix index 550163ddd696..8f824f4e1a57 100644 --- a/pkgs/build-support/emacs/buffer.nix +++ b/pkgs/build-support/emacs/buffer.nix @@ -45,6 +45,8 @@ rec { (setenv "PATH" (concat "${lib.makeSearchPath "bin" pkgs}:" (getenv "PATH"))) (inherit-local-permanent exec-path (append '(${builtins.concatStringsSep " " (map (p: "\"${p}/bin\"") pkgs)}) exec-path)) + (inherit-local-permanent eshell-path-env (concat "${lib.makeSearchPath "bin" pkgs}:" eshell-path-env)) + (setq nixpkgs--is-nixpkgs-buffer t) (inherit-local 'nixpkgs--is-nixpkgs-buffer) From a88a712f7f15ff16df55b309225c947bae3f7bc9 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Sun, 18 Feb 2018 22:06:12 +0800 Subject: [PATCH 039/814] nodejs: Set correct meta.position attribute --- pkgs/development/web/nodejs/nodejs.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/web/nodejs/nodejs.nix b/pkgs/development/web/nodejs/nodejs.nix index eafaf956ee02..8d8a253f01d1 100644 --- a/pkgs/development/web/nodejs/nodejs.nix +++ b/pkgs/development/web/nodejs/nodejs.nix @@ -5,7 +5,7 @@ with stdenv.lib; -{ enableNpm ? true, version, sha256, patches }: +{ enableNpm ? true, version, sha256, patches } @args: let @@ -54,6 +54,8 @@ in setupHook = ./setup-hook.sh; + pos = builtins.unsafeGetAttrPos "version" args; + inherit patches; preBuild = optionalString stdenv.isDarwin '' From e1bd5b33b66d95d4dac3800e283ecabff28dae86 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Sun, 18 Feb 2018 22:17:43 +0800 Subject: [PATCH 040/814] nodejs: Add release keys update script --- .../web/nodejs/nodejs-release-keys.asc | 776 ++++++++++++++++++ pkgs/development/web/nodejs/update-keyring | 18 + 2 files changed, 794 insertions(+) create mode 100644 pkgs/development/web/nodejs/nodejs-release-keys.asc create mode 100755 pkgs/development/web/nodejs/update-keyring diff --git a/pkgs/development/web/nodejs/nodejs-release-keys.asc b/pkgs/development/web/nodejs/nodejs-release-keys.asc new file mode 100644 index 000000000000..c89b3b37f876 --- /dev/null +++ b/pkgs/development/web/nodejs/nodejs-release-keys.asc @@ -0,0 +1,776 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- + +mQENBFKKodABCADiE7Ex8GXnQNgipqbTADO5+BfufYFeq9YLEKkuOUfnjAZ8Wzle +4eLL4rdfFSuwuUO0rkSFOpNjkjKqxfRo0RkmlMxdHwT2auf/yrfX4EyhyKDn1Vh8 +MP2JecXQN3FVa1yR8AMGfT0zOP138MNp21tNp3Dy9r/ds6ZhttrnR+mrKnhKMmTj +1J+MX/LKw3o9ERIz0O8dxw75pA27npX1EcSCM1Vcq1bam7xD6d3cfQtfQsidXkQ/ +nFpD7BQFU+nemYaa6Vkuy4VJ11AMLNvzoWc2iHofD0kO60am3z6x8t63m+BUSU5I +r7B5GNbatekJqu/Qn1qrCjyuXcExEsGnCJl/ABEBAAG0ElJvZCBWYWdnIDxyQHZh +LmdnPokBOAQTAQIAIgUCUoqh0AIbAwYLCQgHAwIGFQgCCQoLBBYCAwECHgECF4AA +CgkQwnN5L32DVF2cywf/Vws0J68vxn+ngUzq/wcWlQANfwMFUcD/8eM0N1B3OMXQ +9+GSlsuEUvh6/oxYxn4EPIgdqsV25SB/fAUz4uN50qvc0ft+wTgh20pnMP0qLf7/ +adb/dBf/NTV4TWzHaUDAkwPXqPd4He7AI5/PZeaMGmJPJmeR8ZM0ZrvLsNTmYV6N +byWcqYvbbRSNSn4ypb/QbYjFQZB2QKrC1LAW9jpdNnfQViYeZDmoSRaCTOv7SeSy +TkzOhMFRZDP9NmUvnl3chWNdmBoLls3/lO1Kpuc8h+nXkgU1hUyvsPjs8zBaqUDI +oMudExnECyEUHlZvVLlfpocznOPqlBhxjR0Q9VRYYokCHAQQAQIABgUCWL7qpAAK +CRCVUaCxpuKXzorJEACb96lsYyavUJOsFd6w8pgOENJjxZF64JR0Dx1rSsC4VgUa +m5zVVasJ29oAnzpeCQzt0sazTgLYrzxA4RY/guI7FBmI3p1nwhUCprG5QMuE1iZ+ +PXVvkTNnNWDlpGGSkDyiC0ER3kWVlECaJhDmSDHxVNl+IwXgd6Jmx47RHYv64rON +FERHfMjzCUi5uLs+zoIU2V8sy3j7Hv10+/zUGBSy3wSaUlmNK+7wkI9WS3BkcQ/1 +6Afet+De5XSVdDJu2TwhESEyXHFgXv9UQAbj5e8/fG8S/kPalQKnzQxp4eYtgC7a +cq1LGOX5BS0eFdwCnyNkZUhuHkjSYqg6GjEhmgEhUmow9FzaAD2JO8lXMYXtiXTX +U3VeY92b7gEt76HdefuAhPFRo2DppSQB2Qh1d6+WRWjxfIcVZcMjby3cDzBYZvfj +Jhzxv+3qSlzeYeDSLZUkyARRshLcd1LvlZiHntveiMuvehemVLcQ2XtCJh6mCfFJ +HwkRloAswSW1XiDEaybcc/Cok5aPjk/sozVCH1g9lyeQTIQ7QCYQzA2TrfCLOvL0 +9pguTGRFC22ikZzgPD9dC5vo1MvjRczT2g3gDxqrjvt35v3+ZlQ4ZJ+U2G9Ew+XF +Jn9bo4ZXxffj6jPnFiELZfSwIGP9EUaPXMXh/lov8IMfr37cQsE360A82RRAd4kC +IgQTAQgADAUCVw1LygWDB4YfgAAKCRDnO8ZBzBH0yHMND/46YV031EzwZL67h+ZC +SWka9SR+o1XHVWvjLGOcSOeBnD+8C170Q30NYVMEgSwtF8kY0M5k6GlEpIKNuOYq +NphXkNfn00ysqJ1G8WIGmGnsA/g/4LYSGt4ttL8roW582Ps3ITAYR/OVgHBccssL +6QdylghWW6wKYs5yoOn51pr0Ff0WyARfQxiaFNtwrZseSRrFlgCgX0+Hrfin1iHz +l8m/I8BIywM+fW+kk6ixitkFPszvT+9sgLj5viUl7+pJzLIs3GwODkLVCWCetLfO +XP7XDrcBQpU6OExpaC4ua4tVhfiaTJkYFB43Za0rP8egx8u7tBs9WC6rU3wygsLJ +uD9sdahFHY4c52eBRdIvAQow1oEj3WW3JIN72TiSOFbCMiFNR1t1nezaokef89pN +LMlJnzJ6BeKWmiSMsmOcT3Uq8cmmQpmbF3N0cZyOy2MMrnBtm0iIwY4NJ/YlLbAj +1f4urrAWkFInzWCdE/L6VO93WwD7sHLOcq8fKWv/2/QY7kGP8Cbut59ie6wUr53S +IEM7B21/zdcrI2ND7R9Bdo0h867NgIuve6EN/W08QbCsTAu8ukdtKOISprqBXQ7y +7CEUGRFlHbiLfhyaNs1IHtSDVpt6Rq/U5X35Zk3MSsL44ZuTqS7HE/QMjQy8oQ2U +tJyhZrnOkqHjT+g/kz1bKZ+JPbQXUm9kIFZhZ2cgPHJvZEB2YWdnLm9yZz6JATgE +EwECACIFAlKKo5ACGwMGCwkIBwMCBhUIAgkKCwQWAgMBAh4BAheAAAoJEMJzeS99 +g1RdocEIAJCkX71Kddk6B1HD9V80dpTVvm+YMup2qca6LqLtsiYE/O/XZHRZZ1WJ +RdxTGqGLKLkHgea0PUaxrcUxSzibDFJqEcRBz90ojaVu2jXb8Wbr9PkNcV0ABivy +PCpx0IFUxKj3+94akK9DOzwLpAf2QMSm0JlQhdql8K0JCRyk9ehkBCxcssVKocgZ +TCRur475lYNDU4SiQoJJ7iFirf1SvNAoeXwXiqDAR2q/k5VrANmfzKvmQ4UMciEx +vQaxc+q7LsBI0/EzFtWCnhPabEzhY8lzqsxlfdEbFXWFO1V6206FBYuymTE6IDxg +trhVg6FZgmWSrxnWWasJSZxv2iWhwgKJAhwEEAECAAYFAli+6qQACgkQlVGgsabi +l843ZRAAsPXN0qd5njBzcSMOTSwYVOX5/1NNWI4ac0kbtdgh9bvcWxL1OtR0nkiA +6evmTtC7HuMSKtviMtpHwIHp1TVu4nuosFUJaLRkxv43U7ReQSk8nxFWBcucLIaL +8/V89YmLH6LAWEr6zaP2KoRwDLJr5mfpU8GLaBVittGzxN9llkmPRA12uS7HHgRq +i1D8bcZVj4EHoB4Lj5U0L/GpqgU/UitUR32fmmfvzQFMWVRMfJHP389Y2lRbcqC/ +rZXa2USH5WC+oDejhRq50S3B/v1jB8jtYtWZXmYQCk98KCUB+4ck8uSLYZGtZpt4 +lb2ZSFb3IhGAzJR5DBgZI6YrfwnBfOxdt0VWv/pU0PzNGbl/iLRWFI1aIOcIsWkV +0+XDegde8kTdhvrlbE+Dst8sBdIKN+4BJxkGVlugKFnlLcTPiMAsz1W3b0wT3PgA +zSYgf32KUCtxSgJO7rkKOf1vzcuH8L/MYH6X3CV9Zm4ZXXbTSyMp04LCJZMO3K/L +4lc+sYs/KFJCl5mt7zCXs56ta522TFgg+4JV7ZyI+74ZPA+MJB647cdHiNYMIh3r +FUiz4PJRQCu3NdeyCktChASFKag2AMIKEKeow5z+e3EE6zRy7ErBBLb9T/14BBPn +5FRSv0A3iiQVw77i30Ds1YuROX7sWsN74sgJfytLiy9vdT3Jiz+JAiIEEwEIAAwF +AlcNS7sFgweGH4AACgkQ5zvGQcwR9MiizBAA5IaFWe3L1TckdaIu+z/OlxEsL8jF +NJVCXdjUoOUk4PKf2BpMbWXM9N+JrZw3kjyWX//S6Dl5Do/tO9JTMX0btwIfhZUk +uvx7H4Oh38UKwkDl207DF9JMDeU6/h/rsWjAmzVLxMhdbEGIDQlhjYgsZbJjC5be +ZDuYfDKOye65HUa++O6h5EOBd2qLRl/pGJHLlAiGPLtwY3jewEZlCrlO958aTkPl +AHxh+ltRWLd2zYF0xnBaWvpFOVArjDNkTSuyYYNtBa6OmKPZ4BkPQb5Av9b9GCwJ +2dxdlUf7GexBHlANRbAcw0kXmCJOYLxxOx8jQRnQ8TLiL9Rds4c+XlloJfYsD/Rx +vIvUAKMqFEXmMlBnO9VJeiw4r0F7pNH6VYp7bnz1NiW3Mimk0Kjz2TTOVpfR+kht +hMFO+oCpJShsfqq9WWX2+MM/dC11oIGfr/kGqK6DSkIbflkqFnBEVuM+uUe0OeDV +IWrEF5O22+pGeC0Yezrzp4x+3lL8ObsFKGWwxTdmbpIcR4zT+Er3dPAdLBFcm/Le +0Odjv1sj/LLOC6FKg7qKG7raglkQSMEF8DAtWkE2H1P2ywvky8HArk5OM0LXcxub +Mo849kZrLhGblt8+zp32fafsQEIsNAzoqCR50XSHJhMb0zmPmvXCAfsk1wWKlgFg +M7vo0zXSYLg8ifa5AQ0EUoqh0AEIANGUbt///24seQv1o9hgAWJ6i7sjC79jCH1m +tPlLjAsUcGg+16fTwAlII1Z2ffXYKs9MvcGBNVdxkR8S1g+aYM/ds3hY2CglHe7z +N+/pkYr5I1jchmCE6LQDbGA/yIfiufMkUFB1Pry34P+G3mcnENfeETns/26yCSJ9 +plysIggJiPKS3ihrPnp8qjCEByzBn70HRkliS4nnjws1aSG67aWUn0RdELrK7Mgm +EWRacrMu308pgdn7XQ/hUUPcsOAqiI9tc0xeG2FXEg2WS7aklqAw7yjEpJK7qid0 +ntEbKy3Erlu29ZxzH/kphNJH5eQFgXJ0guhG/Sm4ljt45nn7H+8AEQEAAYkBHwQY +AQIACQUCUoqh0AIbDAAKCRDCc3kvfYNUXVfxCAC1ajXnKPFswIU2RgJETuY1GgUH +NL8oU3bp5oGhocKPcDPQL8rLZkAhTfKYkRoc6hLS5wcgz8FSEEz5oMesBWCXSZBS +8xTW0vgncbrTUVnVmCAz88qeQ7SA9RVmgnpgKnVAv46azZQkB+x1FR2scSEf7uoo +Go5zxB7LvSwRX+bgyct5TRcs37lLLaaGlgsy7yrcZYqqUXjEOGrZ78KMNDifK+X0 +XYoGY+p4sCfl4Uf46qANa4shQMZjKaWGZpiqs673aIg0MoZPCyTTO6Atfsv2Li8E +ossDZpvJuroJFZw5zvIEy7AiDAcCZjMj8FLoLzom0A1FNxCvgzOraMITOobsmQIN +BFM7JpoBEACmf7uB5P5QJ8X38ARQn+dr+/O+6/wzkKzUcoFvRArwZTcpdEO/0C12 +kNSpK2UkVMh4sorYwA8W0yv3spZJWU3TiIfCVryxqZaAWEIU+dwsQ0P6EAUythjd +QEs81bG6aN0dUqE26fWjGL/mU7BPtAwfzg6lty2cwZJP5zaNCl/PjRUeTKC2oNas +3M5dWoOqWq6HLPqnTEPHPlZ/mhkOfLOnJA6r669sQcml5R+Lhwd8wdJp+ANiDLW6 +61MmaiA4VqjEXwsXKK0KISWftEgd9WGBsHH8rn4KdKj9u6EtnDlA3vaPmADZmf7R +VSMRoMkdiswFqEIMQuhTVbqS69vyhtByQs1fhriYrPy3OMeSMjJ/zNDCnHTBuKxo +NHgMcznVu1tjz+ggso7Whd0IiXEaHXhF5ASWnJJa+xLxXQRQV2X1RXEK0bAySX5B ++NmxJRVY+ixpO5TVhQhzzzL9Ivz4z0odlvt5VJJIHHFIAWkgXRNAo0wgDzfe+jHO +E7nz9uzYsqDBV25Zo22oMZURTBN87WZ1TFpDiORvvjR8QXJIBIUvMHAhG/ZlEkVo +poNaznUOplnr/ToDpA1RDrdxeUAQ1i99EeBtXRREFgByFvETnVCkX/pvQA1yFrhG +FgqCYBpN4IK0UcUx1MuwPBrfZxbL/cy+FhmJqutB6ufaJzatMQHu5QARAQABtClr +ZXliYXNlLmlvL2Zpc2hyb2NrIDxmaXNocm9ja0BrZXliYXNlLmlvPokBHAQQAQIA +BgUCVu4HLwAKCRDCc3kvfYNUXW4MB/9dLmaZaaPUPrEaUQfN6UngTKRNLOJj22FW +2S+e7ALUcA808o80BaK/9dk6mmQCD8L8INRzsNOyBGfN3KL/hV0Zg7BtX2R5ed5p +0S1CmJzsutV6AAsXJvu73bOCy0QosnpsJDRx51k/4+1jUt6PkTMy4YxbVDDBRQTG +DApi2EeX5kwaw1jNiubsfOPtBbyuZbXS0IBKQREFwXtbwUmEc9amw2QopNj8N8Oh +eXbmc6AjiZUdDjOj3tZ9oflc3t6lDVH5EypuKZbcR6fOf4AlrXnuE3uHYMW57D/h +QL5/BMIe1fmK0HYEwg4BaLqCu9lgsYTYJtcTHHfisRDMs7F9Wxw7iQIcBBABAgAG +BQJYvupKAAoJEJVRoLGm4pfOzKsQAMVG0EblgGmcLA+VKZkuHtOgasrBBJXkxDnG +B5Xepg+1hOduxkO1rR5tGvejlWhcX8S17o1hdnl2LFdyzHwBU+i3BYYDkUFOWkO/ +mkUvB3SPyHuNMRxZtNne3aZ08Sl/3yxIJFiEvg9ZPS3NDS9G/jxcGzP4b9FHE170 +34BxSorHQxER7upkow1eO7dhjTCRVeDggMqWPYUjPGLDypiZHfkeItHvjTYaueQ9 +oUzFzRPLOBaGVl+aIlojkIWWv010Dk54/uisEBbFuVoX9b76dBx1INEVLEb66MvC +BLhqsDH16fyj0tQEaTjSSdkJNul6n9DH2idjEkIf/+sZ11B7rW3FxuodtCB+se3Z +c4xWWtuvahTV+UwNiPC10pOUZbEnqeo69VpETSVK5h3jQ7HsLiTIgAVgwEUjPpLD +GsFbJ9VB9m/OYNmN8gtk67OVTu5IjHY06eifrHzBNXNf7A+udJgs+PSxfFd3jOuP +uaR80cU3gbhbzu5LzDWo37Zj9o1MPmSENKEGnW576RKZ6lJYWkpD7XJlwYs9mPse +LScqT2z09G4N0R/cgxGo1UCSuzWxc7eTFG8Q4kEBul7KjA2t3jxyzALbbcGDbnqS +Ufvsr5jQQdwh0LU/xDL2sAm8Z+4yrU4mqQFicWHDCOQPUF/C0GCMbKfbqqCC56Vs +sToI7UaTiQIiBBMBCAAMBQJXDUv7BYMHhh+AAAoJEOc7xkHMEfTIBaUP/jguidAV +f1iW4N/Hk059nISZM0RbjxXJh6PbEgroTzyEEJljV4c8Yv21/wMXiCklNmVhVgcc +OoEqZMwDAz2vu4uDwDk/z41rM6lkFNVdMvBx92de+WjYYsdIBQYfklRY3LeImrkV +vHW9YW/yyqjh/wqVKpfMTuUUufaXgr+hbB9u5UMGY2dgq+3bTj/MqgDHa6sazam2 +uU0C95CCW/rY0GzX6azVEJkEacSlue5sX2/y2UCpCI2oCc5w1NUASSYpiBrTajnE +loDYpgt00deEonGrhTZ4zCRdHSBaaAZbzZ5KQ7AYfRnk6C8Iawlhhm4TirQb2bXq +Oj20E2ly7tpzeo1F0ZdOQQXuolfp7Gf5UQOitMqdUeTQQ0HelWqfOoGPBkbXcOwJ +Kz7ptfESnBD1JjNVXtBIxyG9rCeqwJxNcTt+bWrXaqfybJFUldYwKmdITnsbjlj4 +3ArxOUm/wfxgg3uVcshZ1g6etU3t+57rTQHT32VdPSKKW2AfzZS7um6+LypnIch2 +ve16PzM22HUWpounMmKc43BNa729+3R64EJ1/0qftiFuYoF+IAIkePcLc8qxJxJ/ +TJbsmSpThLz65645wbGD/b7Bnbb80ewBFMwivtwc58WSi+0oWhbuGUSAzCZfN/7I +hcPbWtQjN0W4Fc6KCmAiIyTML8Z1CJs83k+LiQI9BBMBCgAnAhsvBQkSzAMABQsJ +CAcDBRUKCQgLBRYCAwEAAh4BAheABQJXBCGnAAoJEAn+RHNOt5kOLQEP+QHDbHiZ +FTkJNwmx+3+WV9VeJanGXSjccM/yA/lS14PcD5ic3rm0ttI3xa8FmzePZyH17hQB +R7eawYSrWNErJr3ODd+P8rgXy2PVr3nUdQP+jIgCcbLiGgcFaTtYnAiBXNVzZHrS +xVKyzxECHQAtnkarIzMmVTpm985nwcSEUdj87cqFRwS4LIBDme8q+0lI+WMR0QaG +18wO/70/7jnw1vP8J4Qn6W9dt1GTTBpTnIw+PF552YRQy4V+WSPVcijOp5/8+sdI +DD+g11TtJLpoMsJtqNJS8XCal0LONqN7noXGc15BU9Y8LnhEvs7aG/7R1CEOeR75 +ifWnuUIrKj75xg96TPHhwzKKyuhoc2UYf4hhMgDaZhY6YrZ2LAie7CQneh9uWZn9 +Ku93UMWB01f/LyVnDrr0scvZG5g0T70h6woYuf3hIoUokma/cck4svcrv19gQ+UA +gw7PbxbL32oaX5TShLh6j13O6UNqwYZbDslnuyp2TJy72TM0m1ESCZqF5BKZXvrB +vvRwIkD5Oi+Y7EJBuT9ZCu3rPyTNoRfxKKAcNV3lSkQx32tucu3IYwYS3twi9y7/ +uC0fU8UQw4wDATi91vq6t8+nFMBfuZC4ZklG8ztSbF/G259WpsSuQsprFge3KKBU +oIEde3zdEC5i7U/Tv84ON1iEoTyalDnfPDjoiQI9BBMBCgAnBQJTOyaaAhsvBQkS +zAMABQsJCAcDBRUKCQgLBRYCAwEAAh4BAheAAAoJEAn+RHNOt5kOgmwP/i9jLD0h +yEyusmJaIo26TW7wlN4gc1rk43AU4WXrlar2nCbW3wd5Mq5sqZPCqmOhGxXdCVP0 +Y1bXSunSQnmGWaWRxo/H+rhWYOSwICGnc3JAjSnSHndgHPBkqyw1qGivI92xghT7 +WPAn/aBDH/VgQ0LuDPeJReDFc0KFCpnxBql/eBVS5/D25LYyNhFaZcCZJItNzieP +dJfhGdml9NoC92AP2qHTO6UgrmPJKlxDOWIEs8ITwClZp9Y5jWnSY1xhQYPfoa2M +87WbDJRZ9XMrhUyGuqdoADdsnSIKIr+So2QOM3dPsQ/Fq6tkK9tTBlT2n9wHgmuc +uTuT3n27GkFIF5Npz1/TnsGM8WzIsBmfOaUh8DVcurhW0ovmq+drLV15FillcV4r +hAMBLKYquj35BjoxXaX39NKjKe7+Ngh4gUZVeQPeQtQq0jZ4rEd26x5Pj0DH3Jkz +OaphQjS4K1Im9fZ5EL+mJ89AMKGSmMNAGnivIt84CUd6i4sT2a1YxUkq8HKQJpgr +nPMkWpsXpq0+xnr/43CC6vnalEUjrKsT63ToHOQGRxK7RLBbUioBVy0tWKKr3ujp +W9iPefELT8Refw5PIXHXedb8cpr0jmblQ77DM0mXXljQuTjxE9VaakHA+RwBYy0Z +zdMMKKTcUXcHOJJgZ22RTA+07RO5c7NLkC2ziQJABBMBCgAqAhsvBQkSzAMABQsJ +CAcDBRUKCQgLBRYCAwEAAh4BAheABQJXBCF2AhkBAAoJEAn+RHNOt5kOABMP/2Df +9RUECEKAoxnUQvDpdki0UTEJvgjdQVDonztdpGw7kaquH7KLQBxacIU0J3KDr5Da +60RyKL1InGugbLRIt/iMbLn+ENPsIGOHAJNmIBXvChwUGFzGmSRKxZG921DJmI89 +qjtFbK0nSy3m5AUpPAmj3UD+JXGGc5QIxmhOZLcPcY9YGv0oQA51ukiycgy8s4uZ +7SuT+VYk9wMA3EoDlMbh6nwJjaiz9eunlqMF2aB25Ri6SxtXLNJDhuTzEJSVZQTO +k068wBR6271Y5gC6K9+DPqBQeVXoKrFzCFfGmaMAkiK25WFfwqJJKvejkWNi0FwE +tlBKOc3KzCG3rV+0FYu/4rzNL5j9EQuMZIsu+drCz76/hA4j/sWOz1wqwRMf0197 +/EqnRVXHPnDIa9h5WbCGTKFbVaXth0bP0EXgCZ1IxFsZh7JjtVSUHYDSfZc61npe +zXshg1JKEk9f4XIW4PoVpjrIKWFMJ0ILsE7GQA/MlW2gK4CpEMAxH8EuXQPXEHA0 +yJ1pKdpVfO35ChqYdVBIp/oNkAbYp+hwUe44/TJsWN7ARVioH9JK+EHef+QskZl0 +796cQLNW9I5txkOpSQ7cSbEF4SEaCGS/gHVtFo8xCEhVBt2ElBHeQ4Y7B4Zbv62e +yM44mcJTTxP2SoZ/dwyFMUEbJ6PA8HScDLbFZL74tC5KZXJlbWlhaCBTZW5rcGll +bCA8ZmlzaHJvY2sxMjNAcm9ja2V0bWFpbC5jb20+iQIcBBABAgAGBQJYvupKAAoJ +EJVRoLGm4pfOpIQP/36ItdPwRczrB8eH3ifzqXCJXoeOZ8a1Ys/XWtzGp2j7+wwO +PwL/t5YY8oxbZarQr3QX2RRCIiz2Ftjfea3/AN0J+AgFs+0t4zEuBkVX17SUrp5T +Gc8EeyH39KHX2B42VgFmZyQPQMxbg/yTnhH6qUeUuteiZ+mFBhap/od+ORHfZzk4 +19ybLpOYPZPjSYw+XKgv+mLt+59h2Tt8fCy1mZUYuQOGb+YJ64Hi4IQAtLdL3x8d +dhhG6pAsXDU5ezb8obHpySQkBqVUOcUWSYPU6p92nM0klXA5QvYuynxl8LRUy1Mx +FL74o7aisQ3CKzIxXFkoAeorYWAAzBVDOIOiI3aEFMxHu0FQIebfI3ln0mCwSCKE +IlrTWdeBFfJ1m9gTmbrA9ljnkMXaTcDWNszCjB9btcxV0nRqQGyEZ9wBFMwrLVy9 +cNiJ2qophrha5OmAN2lwVlKUTwTM7zisgpAPs60Z4OPsKUQ0wTjqLp6Xmv2xiTdX +ezBEQPIBGRRcUSwO8dvKt0zRZqYBChIsgWxyTK2a5eeiTpqD4g0W8rSwf7i1GZUl +ZR4PqgeEAuRw8ERz0o9lMuYYLBqnyMnoar+MPF/tewiKgQsiaVwBGsy/UFLP6fEA +BE0cjueF3AtZscR5WU7oT1Qn8DzoVC54GG5QfGmV9bgRmeyon4ksMFl/6SDciQIi +BBMBCAAMBQJXDUv7BYMHhh+AAAoJEOc7xkHMEfTI5dYQALdHmZ+NlBsDOrGCY/kn +qdsDreLnmHWjoK3cMrU5jkO7PgpZybjlyx7fI0A/q5HP20ZSg6BuqEn2wmLPHW34 +Xpdcr14XXjU2fZkRDFV2X4XM30to+MViQLDxcy32qguuC6HhoZBbGGgUHZ9kJQOY +bBb6BerpEsF+5/1kUeLuHDy5BBLHWmU+qt78Qqrp1mOWE06abKpkrdkIR91FVgmQ +a7ILIPjXWfLq/AukgZgv/Pqxq7b8wbSAKn15t7v4NjCtMHYVSfNPyRotO08H7cME +6KxdnIbyVBwoCx0K8CAl3vq2654Z5hy+Y7Cj+ecxXxld8RHpZqzIUaqGaG6bf2gW +uuRpFcOqDUKT7DhHK6Pg+TkyaVoh+K0ORk1B49EPY2v29WGe2TlrUJhgmecVLdi0 +ylvHF9FkBsyqxMFFm7Ph4xqa1O6Okyng3KLX/A/Il5qlI90dRCiVUMY8zZd9B1Qm +q2Es15bDdI13YG/9K61eoO94kD6af8w+PAPmTWok7nxr/YlZ8hgo5o8cApyDHOnI +iKF+Kk1NUeZqLjI5Ht0dzcCyE1+Kjqh8EGQFAN4AijT2ERApj1ipRqs/KxDpoUkJ +jkJ5V3gfIKfsTZDYLVh5aqm46A2pg8jd8rhF1dZCl8XjUYylSZCrl0bLZkV2/sFS +Y1w5mrUJlwzd5Fp7PhWWbKR4iQI9BBMBCgAnBQJXBCFqAhsvBQkSzAMABQsJCAcD +BRUKCQgLBRYCAwEAAh4BAheAAAoJEAn+RHNOt5kOMjkP+gL22iXwbP4B4WVRScj5 +FFjT0lm3/5nP8Mg+RYL63E66ZLcVH76B63s8le0u7IGtUpj8U4DX6EJx0ihJqROp +o3cZrBKj0OYUz8yUDFk4BnvhqpTmACiBaVBNSlQHdTMT4PR+j3BuWpzOiwthPjYg +tDd7Dm51hsJYg7kuFJWDYPdnP+BqwWksHx75TSLiFWzUXmFRaAvLFUIxu+9/fptd +ITHKAOBkJRAInAd/NcAiJBjDFTYjqqztST6xv5cJgtDSpR1Nd+dw5A+y+cfcN1vm +3prZgpKbj5F40q9kDqE5GHJB3gEMh9PF+SPdPeudkafLPU7tQ5x6yo/82NyH1Vvz +mPJ9S5fBK5NWvhs2WIvtnU+3DiCbDX+m1lVDJzusuBAJKvR4Qku+CT2OcjONpNpv +09MwOro075fgKmFrtssOexDPp82k28qrA14HjuRH3I0Af4KfGhU3cL4DE1GB0nib +QSjPGp516eiQtU2YTZUDrONNfquNIbKAVmHsW8+JCXS3Mxn4ShWv4+rG3bcVMKAC +hi0bm+/U8lFiIEmB3d+Oa5CFV483pAofbyPbC665t9rS9ihLJDI6684qnK+FmLYO +xuhPT1U4WL9E/+09VpnafrL+vrHXNNhLf/V+uJ+DvqI744j6d3zBlxl7Re5nOGV7 +j3jsizc0PAyTfQy1SOvc+1r/iQJABBMBCgAqAhsvBQkSzAMABQsJCAcDBRUKCQgL +BRYCAwEAAh4BAheABQJXBCGnAhkBAAoJEAn+RHNOt5kON3AP/2RfLbVPFTNaNktN +RRBzO3AdX9F5WvvyTuISP1yPXTyirrdTyzr/mYzc9/hj3Cl0aXGmhtTMqyw2RkG4 +Xvy/Sz8XlDxDb7+6H+DnNrJvAPaspCL0Nt8xQNKqnfJaQzpWOH9BMuO2DbBSYcdH +gbWtrj7WRVJHMrvkMb+ZxFQBoXGGK1qYRy/APqYLWEA7iwahlkfF9hLsqKxq0QQF +kn/j3C4vir5GX2D5sE6DMTOwbk/WjbR5B7ClsLrcsJOjRQS/VR7bAfmSz5SbQaLG +ODshpWmm02cVBSYFrFy3rI5c1XWsRPUyVMgeV4Xet3IqPIeF2V+fUAa4pAZ/Kum1 +D+2+ww04s5ClLxIDDDzQtNMs51Rysp4e+512i3PlFHThpzOdyecTUuJ4rzdlkFab ++xF+GgWb3e2RbWO7cuqsreMNKJZb1B6qLBgpzKkgdhUyh3oWvm5VCGwxyrmI/fgt +PCfhV6W5MrZon9KJ4Bjac6YqurfEJNJNY977N7pe6+bDpCMIVTAzI5Ts0ghcticQ +vMONTPqtEkQ8tBpGglJ5AxdyeRqC1SFinLwcRt+BjB1rgMA0/Jq2/E7ztMdKcWDH +vdX334gTEaNZnlWcHcVh0vEoQAQCKrslnfvHktxbFvkDTC2LpSasjWkelObbVfxz +qpGa21qQV9ZfDn1tpdG/vfz6FTxDuQINBFM7JpoBEAC8b4+YhGkK7yqWzWXMk3oJ +HWN8wYU8GkbURn52jg1yuYS4cJOH9C3T/iKAMsUYGIjIJD384FQX+V/vOJEWo32b +O0L44LHhQtZSxO27Zpm4dp4jGVK0vQTN7w0ov8Eve708nRK+9uHO0S8Y6/6Ex1iB +EfU+4s8vOLMg6jW+D5rfU/y/O6iFbZDJWXDrVLmEM5yViQNR8/EpD67T9+8wBRcE +Bxwa6zeezh3Y9p4GOqK5JLwx8LDrr/mPfgOpLlq8l+yJHSHVz5ZoJLwY8TE4+K+I +7WqtNcuEnDqSHrOocihIwFycY5Rp9Ta+PkjQPssymMfAIQhaBx45SZGwTybp4GB7 +j2oQ11dUYQtCBV+8eB8UQQoo5EocZfuSEvFU9kvdmFCt4Q8tebveGm+MHu4FQEox +pplg4ei2F891R38ldG3VlDbjMJJ2oaknvHWsglZZWj0QztCrTC2+7eDq28s9/zKg +4FxDsG+LcFhg4qkABkQZp3s33vWkxWN5Vgm8tvXn3mcibBt07jZhRPjBXSjHJRO3 +HYxJGvWm2++Jc1CuQKjvhDR0IzTD+XBHYg4ajmYcpIsGXGQGNOHTWfoi/0AJYYCq +nAm+1kqUHsub2DNccUzZY88n3LSelEMZLYiO1S+yGtbte2LCO0zmIQF4JOyWFkfO +mAEO/Q9QYdTL344e3H0uVQARAQABiQREBBgBCgAPBQJTOyaaAhsuBQkSzAMAAikJ +EAn+RHNOt5kOwV0gBBkBCgAGBQJTOyaaAAoJEEX17r2BPa6OgjMP/1lduIq+zHYM +EWBfdBeOsxZPVc9zt2/XHghbblvsJarQ4blasMiAkJu5R+nnu2DsL5gUvPmOekrk +e3y6/Ioe2SBtLS0i41pKsObpfmoLF5GG3JAoqOgpKcr4WPgZ5Kj+FZDeMnQIIPFA +0XXcDrpiD/IPbtqlrTV/0YtoRQiISNtcvpeAudADAJwROTEcFY+WbVdPs/U4SMui +ixZFZSLvbatrHnm71Hi5zLeZPtjcMMhuGcnl8GBSD/jFz0XaJfImqtiZHnH1nPjk +KcXV7afBZJRJ0dCVyM9uJZmsIqE4OCXDcyTTCZY/V+A0mDxNcfHZl200grdIAmhU +Z74McRpPAvyj0fLdmt3XJ74NaF4rooRibOf/5kwWNoSSThKbpxfdmFrzfPvBS1P6 +MtGKfJ/bCq7BUZ1wnDwxSQ2G/X1U9sW2b5XOJX59uI6KZy4qyrp4XWNSJdKiw4qH +qy1z/6H4nk/TQLQ5LL4q7vD0FndpN7eK6DIZYoekC1AC3iXTsKFTIqh09uhpIxeI +j5c/lyjQpm3sWCEoLsGfW20kOPvQiBuo266IPCFoeEZgHHD3RGmB1c7f7Bu2DsHY +5SYGYvNMlU1Yju+ozMi9onLRkLBKE1IJhPUVmTST8Cw6LF7kZuGGLujwMKgBkLWc +z7EdivTjrXc2U+znZupWTxzlM76i02APtQ0QAJB3IZr6yWl0cwtWt25tq0FUlqsf +dZ3S9QfcFrkiv02NISmKKNGhB59sfXBJRXT8C1BjYvA7OG58UYrnE2s5U+g9Nspc +3V9TAKS2xoQYOu/ZGmv9OJi6o6wATbpR58rvK8ppv2cRVsE+rohBGXylISqbFsoP +3MFukjr7ZYsxb4+ck9bPl/aDc/F20Wl95V6rSjbb4vqx0YcfxC5Cr/qh3t9IHW28 +fHM9ey7Dsy9QtGgaeqHZ/ffoPMyiEFt+zauIj4iTrru44XhGss1F8NVFvk+INxMC +4cZoO0mNSkGWsb1Y1mXCOj2TdaFRYU+FrhkqJEga9OH4LjAmYl5HnW7jU6VCMQXg +wlOBmIZZlKdMpu/3jYW9dCkrPkOC3o1oYNzERc6PmiE/xVaUtl6XwfydyiWM0RxP +bL5JTcLyjerTHO/qNOVlH+mLXkTGRniZ/tVB0+QvBSvCnXQcxG3ynEIGNOe8QHAx +UvKrV+jnPdzO/cuJZbxEFi1MFn+wW/bFFxqt91V4ZjmvtkpGGWQmPovzH3peKTsP +lv0blKIgSLpdfdk4hqJXiYN8NpUW4gic92tTQGDWOoFZBkOqMS99EdggNCl3cCHF +u/nonTa2Xqzb2AxPl1hEUTs6FonQIKmGwfrqpw+9YiazJDc51UnsBTd+4VEVUiBD +CiiFOkooIgZMny7WmQINBFZypZgBEADeIdm42LaylSWw5CosOAte2m6S9DgAGEBr +g/yHSFTZWz341EZrlq1fghIC9nHh09wVlJNOOo3orB9tYoJ3LArB0MQb7Ha7dcnf +n98O1od0T4QTlEroEeJaOfuElLD+5b9HVYqhdRtMIFiUTfSTbEXbQcvZhaLf3M8a +I1G+poPRYNVRx30pX9PM5N8DDmW8Q/xYg3T1uHuYUmd6HlzBiESNE2WWcJoxoKuQ +R2Lk4Wkt+qYnxdHH0vYIsk9mN0yDySpPEv+kzrAU/UuZ9Ve0GhlLsVLL3yHFUjLQ +Ox1gV/ofrV/v0vcWM3+rRovU1cFPUUv75mzA/TJ8aseAbboAY84RyF0b4jQLOmiT +HWdDMSZwDVR05r82JqynI0GGfXRgztNpnnebiYk5QLAqvUzzdfRMyrU0SSl6VDCX +UQAEz3CyODwJ8GGk6PaTQ9/9vmt3OY4leEEf3SrSwH+l4E8Z59gCvAUx/ao1pIac +PdCd/kdx1mPVcwxTjiPDMp8sIeBSdLt9Lo8jt5m/92nKoH9SnE6L4snJVvB21mfw +RxRj1cWmeZ1+BAC7+5WfcJRM6xhr7XXeEmZO+QQYjLzKS1t+zIsv1modQMl/f2ci +Si1RTO82mIEaCfRBXVEpewsRV+nikjsAJ9FOV+kr4NAUIg6zg9QRiHtTulm3P/c7 +iRKFnbdehQARAQABtB1FdmFuIEx1Y2FzIDxldmFubHVjYXNAbWUuY29tPokBHAQQ +AQIABgUCVu4HGAAKCRDCc3kvfYNUXfVmB/9pxeCKnQlj56TKRyKwp1vg1UyWnse+ +OF546ILttRf7/6GE5BfmOQZ6S6SnvEr3l7+2QGlV3mPEydKpxwpn4hCWgjwosDNJ +tBxbNLwypMkAGNxkb554Fuj7jU9qg90oX/EqEQpj2nrM1/pjsaDHOF1wH7M7k2fX +sWMCjoC7o6EzS9OzuNlyAlb50t9eUB1ZoaqS3LHaMwoGb/Ou1emZbd2k5Z5zzp+j +cZXHlxPCJ2OCLOtlrnQMW6QrAMF1Me5c3hOy34GhlzkIWJUv7dQk+GGM7/YRIDmY +sSSpyllMU/oSGN8uAwVxfqWi9RAoNqHP68uRKhAJDtsARh1wS91kg65RiQEcBBAB +CAAGBQJXyhfIAAoJEImmV2CeyUCYHYoIAImOHk6YWRJYvC1mq1qnctJuhXoZOt3j +aeF9gIzc9qyPAxf0tChn1g4pmhmBbgZmoIjxHuB1BqgcV1Y2P/1tW8mHJdJNbhy/ +ndQl36EgMYzVEt2mbuj01BE/eW12h10KYC1Ul3rXLrhUy/Ig5KUT5aGIrDawx3kx +xDXafsjS7R9hBhwz6M3LujgBvvsyGgN2Crh/h/hERYZ5ckXNlixbjez2cB2DZQFB +vE4eKqBGRAj/Ij2JQljHKt/FczBBhXDCVTW7SSeGi9wPlpgj6w6NsTSiKRCi85s3 +BtVAH7zIy0YxxmECUEeqRQ91gQTcg9YqFdhIJY9/ze7xMQKTRWqR2JeJAhwEEAEC +AAYFAli+6tAACgkQlVGgsabil87JwQ/+JT/RooAGS4d5Bg3TyZQOSfw3v4iHyV+V +P1U2lyf4s9/xUiAMw1d6JH1Evu2K5EcS9biC7JcnRNWOGlnxTzShBm9dP+itpeLx +hAEoWjRBYATgWn48PpiUIejWzlkp8ulNR8s3cf7Pj9osXHx4ml8I+bOfESKffilB +a05iaJusPraZvdxkGzI3oPmFY0wMKWq0YPWDosik499ceBZvLku8a49GFPDB0yoe +0QJnYpx7J+Gp84tXO9YiOB2hAZUiLBlEJ7DAxxiFCrzWxhKNVuh5kz9/aJnL2slY +AuifQ3fwIBJvV0fgzwuAgQf0nX14zhlRXnKS04nKfJVcDaZ8FsMliYndvNBImQFY +Xey7HNEZyutEnS1p1BZJRDEc/vp9jBfKyQNU8EO6WZ5gy36CRf1cd8zf3QB/7FlR +WlDxvqrrfrjSwEm/cyA8IEoBbAhUssMMloV1pxtb9mGZZk/QXt6eZTcNTBVZjNQY +VNwnuKPfNfgX3JQ92pwqg+pb23BPi4NRxXBAzupLpcwG1lTC5cG4PLdJtut1LJSu +p+0Fbm0/AesHCXDSpHz/vgmlcAX8feaEzq3TDsj0ZOD/Fn9EN9127WebR41XYQk+ +Xj4V70VWy6esS5ECLioir9rIba0KhJlGBKh+AFnMM1nKiv7mzjNfssOuwKC7kSka ++VY9/qqUvFiJAiIEEwEIAAwFAlcNTBIFgweGH4AACgkQ5zvGQcwR9MitRRAAyWkY +hvT5ctDMhxj6KgQVn2Vf+j5d49Zqu5e0piNMDtjoeudTeFFDhEHZPiP04vRre3+d +rPdgUbm7UpFOSh82cIODf/1NhLiSjKL4BKS7UF+boD9vcRbnb9VDzsMnaxyfZ68n +0lAm1hu2GD/At+bfOKFbdvTkDlk6byikMEKAeLROC1+07aQbtscnpJTDqEyi39gN +65SXheghpmDZUrjt3LGlSgeEPncKhL6Dqb5CitEnX02Bs9LG/f9yk4PaiqSkkGsP +3AXLrCRAEloq3+8JhlZI643uz2SYsQPv4PTrCuYhPua3+/nL5ONxJ04vhDwckVb/ +hupEdg0hpbWmen0149YcdkGdqnNrL8W2lDFETO1zN0vKO09L0wJ8aSshts6/sU1g +vqDjogPhyL99XMdeaZn1b2czq3J6jTRaKV4fSub54Msm9UbggHhxZrO2LByTPzEk +bCbK4tAwpQm/sZa0/V3ORHGZd1KuwtAn3fkQwNDsrFZl8YdgZk/TAgGR7Iq6DkYp +UG5mtFjOrjRNEmgXDFESJsMmOMlhL/uZJfE0g5qlRkOFfqci5sc9ovy5F2OmrtSG +g7ZTFsG8eF9Cdlem+6iwLVeccHHOjCPRiVfJEIe3VrhZVpMV/MUWjnc3ikzrw+T9 +ryio7Y3Zv7VTM9D75nHDD9CBtBjWw9EParmqWS6JAj0EEwEKACcFAlZypZgCGwMF +CQeGH4AFCwkIBwMFFQoJCAsFFgIDAQACHgECF4AACgkQtjtTWkwgbKmCbg//VXdM +k2GkmI9QVg7rAfBqMIVbIj4hxTvm+yz3DTutJjzlPHpiQsiA0ezGU8xrohz2s8Ve +M2ICtSBGdWtuDOPN4vudwarno+56nIdwBlZSgPaJDxTU7CTrdEJG7j0xs7VPvmUn +4lJzaWO4TANH+a2VaB4NQSDkr/Y87fxI+Dz0SqIjAe39MEnkJGMl6I6tYpXGQ2CL +pPYpencQ/Ji4HOR6CXAiyIbgVIag5RDB/9cjg6qKJwyTFEoSajmRPtV6esyesAXj +AviBhnn6fFMiL7prU/PZdia0uY/ugyz0QuyCqKPWXHSsHV/3q1+L33ntrqKwy/7u +uKDdaLWBHmXc+e9a6vmIqU5cqgPuJL5s8ZelbM9IW1TrJLbSzk640JGfsLuuHeFa +XM6Jnr7KmXBE6yMMvtJZ4JDsbEHYdPOZDv14If2m0Yw5Fne28VpHTGr5n2NKHmh4 +tfzVlogWZ/DzNxBYTSDVYAoy3X8A/oByeEhWQl1plXMSHpaPZGdGcIeui1Yg4RwH +xNnv6a/rUN+4VuUo9y4GFJUypBS+IkpXIm+hCi+wTZpkbZgw6XZ+kJOQmV490yKo +xp6cFMoHDcZrNb79mbR6q9nT5p1SU/JM60IUB2hN8ky8nk468D5xQN9OATmhJpHQ +mwFVfUJOlHxlex39qydECOk86S6LVTdkHJWButiJAkAEEwEKACoCGwMFCQeGH4AF +CwkIBwMFFQoJCAsFFgIDAQACHgECF4AFAlZyph4CGQEACgkQtjtTWkwgbKnJPRAA +qjncEbZ3/19r6nbDsYrD48b7X2+IxQtY9Pa7FnF5jqFURcaYa4l+2PhGtfqcAEnj +B0elD9YC6WyEjFSqAcQ6dJ/derE8R+Sj3quaPcXInkQKDbm88UHRAK8ApHeeOS7+ +CtUpWEzVlGcRAhwpBxHKVANyQTmM3db5CU0u9waMdNszqw19hU19DWn9qXbjRxbE +Nm+6dVo91yBDdGA7x0plginapUEX8WC/u6mpHdde9CC6pj2aYyLVPoy5C+3e1lzY +CPBI/99DgcoDZ7XYFGYngeNDoM7r8nttJQh4wExdtm2w+4MnNXrQCGQoLQhYiwqK +ayUztMApMt8HrI0UxJ8+Z/FZc/11i5ZQhDrum94liVSoB1FD+wD9xFCE0+eLAbgx +JxxO/Ns4W2mBo3DyUAloNISkxHR580GotAmoEhJcK5vns9pCvztUekA3aPT/8ca6 +YZej6Ce5x44L4FfJLqB/zpZTdxOEmeEzhFNGvdPUASpqIpMkk7ZS/7q+ePuL+6S5 +yhaE9tSQ+UqPiVHoeolyRwyHdsns+AoGRoekrbEmbGwyencabrfkkzMqAzmblrjo +wR8d2Yt7UjJDsz2khn71Y90j6IJ7hneLT1PaxggfX7TFv9fc7OE8/BtI+/JaJj18 +oFIiimequgSNJ/aTeOQ59pdVBhfUTfhWXQDZAsMNdkC0IUV2YW4gTHVjYXMgPGV2 +YW5sdWNhc0BrZXliYXNlLmlvPokBHAQQAQIABgUCVu4HGAAKCRDCc3kvfYNUXeF0 +CACDdJ1DfgFZGy0j6krl7GF78r6RKjixOOZHBVaVKl+K3sWqbFQxCfVGWJDaxRBO +ACngV8pPdp7Kj3vbWE3lENaaPushB2++8PdkHSAvJohwRLNbhuRmDck/dUy/nw3r +9lFKp2eRr4fkHRdnWelsfxqD5Eye7Id9bOaeIF7XfIcKbK9HRmfs2ZJVWX6tQGVK +LcC6mYk2iIRTnzKBGJ1Jf9fGj+JnBhH31ct4SpNHTq0+85Bo7biG9l6jIrbl14V9 +cfIV0ZHGnIrKC4E7r/l0cYX4UPgl92A6J6DqtGi8AWXodtPnQTdZm6kq7zMCX7iN +qkednlohGP5JhwKFvlzhn+OZiQEcBBABCAAGBQJXyhfOAAoJEImmV2CeyUCYd3QH +/AtbL+UtD9Tqcay9nHTeM1aXP/edzjjui2+5nE8+fIWxrFRL4X7Qs9Xps0KQnrY3 +n0b7OMxk2cJgI6Bl5gVu83Oz7Pljpp1+W22BXS5a0pU1VNjjsXqW08ICRDnqBzIH +hsoPsUcLPD5v1+cW9O/SO3ucg28sonE7fuVraLc5T3hgxe3AQFYOBsGwypNjO1VV +fWl+PTuyZlHW5+IH1Hv0omIaauEnr81ONu3KGf+ckQW3Qt6D/Nu/DeplA/NANhT6 +tlRybWNxFDn3pLfMM0Xn/EoNZAnyd8GArE9j6aRAvVN7pWqr5AbSlhC9Um3/64nc +gTomS+iy4H06o7qODEXlBT2JAhwEEAECAAYFAli+6tAACgkQlVGgsabil87mdQ/+ +NPKWzfFwdQVHmQVcm1jFvnQA5VNLGs0pYXwhNYXF0V78FODZi1N7P5Eag4+VvBzE +tMuBfYUwq6ZLxsqlyGXMaHsPdtdJ2S5UBByP7UQzJmEjraUUgpaO210mekrCGSUl +I3quCEiC0+ytaM9bvBh2EeNfupSIknXZ/0aTs+jYMTmttNU9QuFdgEVR21Vx9WC3 +0qLdiDnuBBENddGCfDWXGw+n7JulWNQhsxxqbsynRQV4rK9fCGfgLIIf5Mb0VI9p ++hDlKqNtVRQt1S6npE5SU7Ilqgj5SGE6j9ClCh3FOGxxqGhpF6fwk4tl67wmdC7/ +JR7zPAb+JtTY/ayRl0QsuqvOMFuAUEG+LE23IhLGpD8VwWdx9hYFn60C2Q/bC2WU +pdS/ZWhkCuA1Gdi+DvLMmSIv5V+o0N2bM7Wv6JwrXIbjg//+aYN1hlTvlj2rOmp+ +5iICTLkVUvFgnJeVhES4sVchUnOpLQkTn4JsMGpqX1++UDsUb1cdLW3Br6E1jFm+ +EO8yOJJ7Xu10qvVOdhk+H1AhWFTKngsPxp+M92NPFp+ZtkXkZJX+pLzW1YYHL2OJ +JJYxjvo0RhGNuZAzsNGOo6MP0guy0SCf9Z8vLyQxz7GcUlJb0I9xe5oclcw8KiGp +zq5iziLImz8PBQ72FvYTft5GVm6NcEZ9c7o2KudBzkeJAiIEEwEIAAwFAlcNTBIF +gweGH4AACgkQ5zvGQcwR9MiKAxAAlcAV4pEvw0Sj2fBJLEVblqwE+ACLR/reTP+e +sFOCv08zr1EDNPKM3PVqP4jZrPhANa02GmzZEdslgn/PasCmgqxmnHCquyf2gkkT +uPPgdbweYQ6wiR9PWvedNMQhgHySYSO7n4Rxd83isfoUAiwe66FH7r8+T4Z6pOS6 +XJocE88eIvh3zghBcaeg70ME0goq6TDhrpGfKhExvMXotyx3iOiqx/vUbmDTvp0g +kQtWcBfX07cyGzgIR0NSqeKFK7F6USUc257uKRCGiaXMwIwFyN7eb+KsdA7+emNG +ChwdIQHOjfEiq7c8LyUGY5Z1ZMMbi2F0WuWQlhpBmKCK29HXCOffkH/NIyMf8VAb +bi56b73y2kwH5KKFb48XpIxMcV0abPCJCsbcgAUmDytTHbLBuPM8VbHWP5uIhto8 +Ff68zb75iv6F2nYHDZUJ1EGLWb8tZWacoxd/+Wx9TEAc0S/o25gOG4c1ZwF94b8M +2jsOT2Df1JMcrrQsoIf+mN9wLS1kGbj6tyfKF+k1oWpDmaBQEVgF2vrxMJ/w7wPO +JuHV5CRDRxQPZNbCwo6B8PXyY8oL6vLg0bDP7OLSZL9rF3u7wGShezgz42yCWeii +ErOwBKprp+9zxA2Oahrimgi7Cl9Lhvm4Mti0zHKAXV6O/EIpZX63QAqjJkiNj1FM +uYWsBNuJAj0EEwEKACcFAlZyphUCGwMFCQeGH4AFCwkIBwMFFQoJCAsFFgIDAQAC +HgECF4AACgkQtjtTWkwgbKkB0g/9GcjCZXIIdEMWfqImVGQif5UN+fo2JWWiu7ZU +URomUadJm5dpiT74u9AtvbVIkIk9TUJT88OYA4FJUparbEKiD1ZUN1Rks3fiCCoY +ElZAUxgWaVMWtiYMetI7sU/GLj9SX/xSa88g5X6CQswkunj7hoReHZ0PWU69Y9fa +1XFpR4ynby2kvoXVEcQdTMXuG/4STWhN9Y8gMiXrlbyne9VQ4b5UmLeIVLL9Xf9H +/Fsj7rHiqstA+IGXFBDyddpdqpHPsLNjTG5GH1ertcbm2mJUeC8uvp+tkUFCIKfH +ZQsMukULwX7mYRlBSmlrr27Q78RtJ/alV0jopeoU2dA24d8/655fBCQBk6NA0gfU +eLgIcmEbiIfVMD0UuOCC/86uIyZ6JjPdo6FT28NcS928yplJWIbTcsHMRLPYsZ9E +GO7JTs+MUwp5E3wGLJescTzBdWnSfhnqWF8JUCjVxUaJ5Tlr6FKcL1dZDXZSV+QT +AT/tzYUNAGnDZQK6LvQ9BNi6ZY7Z0/Trv4cfuiMLJSL3i0ZBbMks5vP5/bLRMhZh +gaDIGJ7ZdpiuQ7vWuX+/LGBdBXzMy9aSpI6m6DNb91bJE9AYTppLjrY2AiRZ526O +uXRVmoAba9+4RuIJZf5I4RYD31FmAa8haMiQqx4ESyVC9EIsw46L0r8fQGp4yOct +/ke7vgG5Ag0EVnKlmAEQALpPU/Kd58YIaCOGMh59cGBLH13dflRycXj4m4wbru0R +q7VtcEC5y9sP8VkA5ziwJfUr/If4Ky+9NqbcKJXwiQkYGAiPhWRaU1uL/NC+DDX5 +vM5hFW2HnvGHnxIdQ0cimXtxwUsw6GYKNR8BqTrEL89V/Re0rXfZmP64RPwST320 +Jl+nFpm5GZGRy0h1KeXfkCOZXhZv6XhGztJV/EfwmwOm7w8gXyuwZTUk1NVy6MZq +JPcYHm8mPM7ZCesLazc8TZMOCf2MMKz+L9Tg2BysDgEmHxB0fggi6X9TyUZ5Bxkl +vn+K7zKAGqP5nKWku0eiULrVesUm1NvZfaYgs7A6qvIcu6LO5KRk6lMbbWGB1DgW +eymcXrIW85e4cPVFY2BTuN6wBJgEbGkdHL+jDPB69LGq9zGe/f0/hHUEyaD1HqHH +qd9ArrSLAibVcHVTpcVuX2akiCuJ+jit5uwZqJeDUNGFuU57uogKq84zPsN2QUKk +LM1JsGf/ctmcOU/h/K7v/7LrRJTnmUvCnk+YLa4mSUH0tgdEq9QsrcrHlWRd+1jH +LsOS0clOkmlT8zV2tAUNghKSJBQ4cqExid2vh/A0CBITW5DvKbd9QXgRfcWi7CHV +bXwYvrY+RxXaLlWQT4F6/Tt0Gie6ee3OkdGpm6Wyn03Q+L/efqzu0zHyhHz2h7x7 +ABEBAAGJAiUEGAEKAA8FAlZypZgCGwwFCQeGH4AACgkQtjtTWkwgbKmagA//YZXg +hn9XaW39IRjnhDnViFFpAcZP75y96aR8IhAsn6dY5IMUllRpmLA0XuwLdTRytcwn +zsCKzkvETkQgWqqMqf9xtNlfhr0l3u42ihlC8bNPzbnOv3wwfwaj09l2h1xLDC0t +/oL+A9rZVgjpfvCl18FLVFpQH1Jb49fRH+tBHq5ZXJSdPXvGT228fMXJq7EECbRR +Z33oLcjjO8e6Osfch/tCiX59YEMxlnuUyMh35/cjH57Lf2WxpJVleJE/YabKOk+K +Una0417UGP3ox8R6/SjCXdTPksmuFPL33NB19Q1UuBeW6+yUr9bOmk2Y5df67dfD +hzendAv2q3JdrL22/auyLX0dQuk8TkWRm6WxxsOttQgRzIBzUJOrRLTAm9W+c821 +QiI6SIsY2VMhmlWnp7e+LXrkGbgrHsrDEQvK4TTukkm/o9seN9sPhRMYY8HEZrf3 +L+HvaeHSG/vcS/gcMNEDCBCEAuEewvV5fJzqQwzEteE1Hdb8B0GrYEMgPWqPiDXk +WoGdWZw4snv0ABuzND7ZKHTw+Y8bDTwPSIAayq86yZZb7j5LbToQh8qXjd4t388w +TWi34UA56lP0JeRDFoCz5kfusqaXHyaajC6PBfQJvWOmRq0eElkCypjwpSNJeoV9 +WM8eCXEvI//zLCCL8wGXBKdNO1sfIqaoPK2zU8+ZAg0EVpWOlAEQAO39kLgWyyQ8 +2QCAurbjQr4KM8nOr/Ry4TIAEl4BV5hYkVQlFxvM0cFXOvzm9bSkQolQbJPJXEZX +U/1XOSpovlFGK6lWLALmV/jw/vx8IyARrbPgsi2eUiJacnVSUN5O8tzUOIsLFaCx +hNFGP7HvT+wvoSYfuVoTUL/lGWeQae7EzhWCu5xPVQwexkkT+R58973k2HMm276K +L+/fjlmoeGwY/J94lhXYKJLaJMirG/K+uWJ2tXCGqKt3UIou6/T778VjnQ7xOrjF +vsrP20hA4O0JIGx7HbiwHZrAe3dF0LCZbt30XpkGZbJwqWUW25eM1/RsM0Ikty1U +DLBQrbyXCOtDDzrLdU72S2ZUINKxIEl3RNuEPthSe+RqdMnNaEX68KhDBqsK4Phl +1pYG+UtMgW/ReMntUDb5GXBG5i9M3Y+UhHMu/Gvj4mIiKi6cacEflbIBXF27p6da +x0goIia6ObQlSq9Jcsm1j+ZTktQjJoZ73AGc4PFF5K2808JZp6GALzc0cyQ7u34C +f3MO6aYNkXebPBRlE7w1c8CjCbD5f5i37juNQ4C6UddquOJG6ibQidbfr0kn1lSZ +3Wb2kKahD5X9g9pDnrLmuIjPhbgcmoBqqSyHi87QkzIivdUmMEPFVHpAD1QwdXY9 +NVQAUD29hO6/3FNdXfIckV7BfjjYfrtbABEBAAG0IU15bGVzIEJvcmlucyA8bWJv +cmluc0Bnb29nbGUuY29tPokCHAQQAQIABgUCWL7qvwAKCRCVUaCxpuKXztn0D/9k +JpQL0eqVj7xr3vPFsBRugEuQB/sbhjVK+E9ZOq+Ssvs9QRSkJAiQrLVVDQZEIx7z +56U67lAOIRyxNeT9eL+9MTNaWop8F9bFyAoD7s/eH6LGA+h5BLK5DfAORJbUwzBm +fqleTgIToU7ckr/83wOyH14KItOz2JGvuo5P209pFNYZ114TCJgtg8aVZRZQCx9y +fOI4kXHy+wHmiPHv2/shnDEISUlfgrmWJgg4fkauQbgD6G9U9Kf0rpJodidWG/dy +TX+j5KsTKmV5XiY/5+0dkN+hjx98QZE6RAmtq58aerirYAntZYMrkknM+1bgJnEG +yKUredZbSIVaYgc9tAUk793aCCD7Ew9JVLl1prP8a1HA+ZeRbzSw6lGmuK+YKSyt +/01Tz6i05Bi7wdDVjiU70r8gR5ZnP/OduOSmvMoFXCq91YzePt+bJioPPIIPX6Z/ +1dTpOvBK8AlJwp79Vb/+iyuxATKk6RwRSETSDRcqA8p3yoRSMv+2/OtlyIFU5GxQ +VimdJVHMnwnxJ0OgrqNq+Bsk70qWeqDyJKBBRDm5HkyW59XIZ9B0QEdnFTGsNS89 +hfCGyUuNJt7U+uL2cQdf5UWX4FAo8B6UIiqzul2dw8umXCHA+DxuolEoK8JsvSb1 +UKnt5qtKUtckbRzkffcQyKNClwqNuZOqahLLjZKvJIkCOQQTAQgAIwUCWJCxOAIb +AwcLCQgHAwIBBhUIAgkKCwQWAgMBAh4BAheAAAoJEOc7xkHMEfTImAMQAJvksYVm +iDOXoqK6eTTDiGM2DsK57v8z5UajvYhw+Dnc//fobtC13uQxGlMiLYIIWmvmMuFv +rnl+8xiytCOmosNeuoSUcD5CC/vUObwJM7QJlvx6y00onjsdLuHAyM57dmZgFWuj +aI//iyXkkRTCEs7X2JrgkJzE7zCn9P1qLqZ6sGuHfDKSbQs75UV9wOE33cr5O4/r +rE1QvJtHE8kjuqLcDoRPM9to/2j3IelTQHtwKRgNevpzxLpfrdp5O2g06+VETEOB +vriPuaSo88254NWBNEslGjABPrdnLEzRS2UNjAC3A7LKzptsb56znkGj2/I1ZNPc +a0cmUvxao95/roP7JD6w11Oa+V3iYSV+EGYRq9UD+T5nfQPK76/PW9T/GjcFUPON +kr2ItrEZ5vURhz1ChHUkkP9FIfDzZthwsVV8aR3ktM9YzAT6tNhanBWzMDQc/MMm +4Zo4Idh8U1lf/rLrEIDR0RzH8d4uW8T/K0GF7XA6JUO5bFk6+E6MwV3pUtMn/pcm +jJoNuWOJsE8LoGjkaTjIID+DA4tbmVVhegPQjiRayVkIflAFjO1bczoyxU/6J3QN +ePLiLqp3SJSePCa9dCnm7rtRCZ3GwQOKbKMLjBcpCtQAiaMXrxCtE4580JsCZDif +PqQRMqA+pGQgchifOfRdtxYoCJudmNyfiMkutCFNeWxlcyBCb3JpbnMgPG1ib3Jp +bnNAdXMuaWJtLmNvbT6JARwEEAECAAYFAlbuBzsACgkQwnN5L32DVF2YRgf/Y45C +QErahooYrXghHqN0q3Tt7iGuJr/GyLCEcQFkEeUj8G25Q6PdnAWSb5/qm1De7LY8 +UcOFDo/seVj5ANNxrVnWXXLlpEZwrtN2CWDVbWEUHxxpDESH+0FrAN1F589bT8DI +L7Vq5z2dh+ulXnymqiGSwQkFzMlZYbrS05/O5+Ljpxv1ZYKQ3N1ulJJi+Z68GTpr +rtkMEns4S+la0cj9Aw/S/94uGvXA82k5mvhKbsqz1nFvnde8QhPyVDTwMCJ0f++J +n1KzPNXnHjzMes+fBuCNVV97jOoPZZF1TMJvJeAOgRqQkxNAEzb7E4W41WMsPRMB +SsoyDiFkFXeoHbp3SYkCHAQQAQgABgUCV+ReKgAKCRAUXU4NeXB5mqlZD/sGvm6o +pVbHlshEu3hmsEzBzWgaa94VFJ21mO5h7joDX+lSM6ozTKjCovklLGybGUj9caUw +3DuZx472HBsATcJH70koSNJcrD5ePzK35YLtkuZq0rWr/o1GxelEzoeJgjmsZqEj +6vGVkyZc6+NW5dBhMcKkITHMrFprq5R9do6v7dYlNbnBySMT1FOTTay1yhoHw3Az +/afTE6DsH0s9MUJExmok1hSn5cpcWQjnY1GeL17UikO7BGaHQD9n3/4+KOX/Ga40 +dLUUtBL4sL6l31HlyTbcPO1AQPvHzUdvsBIbZKk7MilzBPz13GLcoMQEQb/UMIqB +dc5M18oHMzckVbOoAMjKujPgP68m7+wYnaj7Xl9uYtfTgj9RtzVsh7JRoWxmPPx1 +Rx6VaHO50QkALtrgr0BXuFqjzkVqmb4nEi1OaI4Mv1grBXkoYl48P98MMVNfmtJk +LE45NrHEsZAqOaU4eTeOmcedivTFilku6lKKdkBwLuLr+UHeVDEFCLKPY5jVdEbr +vYnfitDFsY+x/QUKkaLrqEEFgeHCAMUp7mtDXhGgE8j3UY+U6ftrtOgbt3SUF5nB +nFD6aPplWZW8FDlGecVjxuG3NHPCyg92GMa5pIBlnlDnZuS0u4Mc1CpzFgcrg2u4 +8kQnpHGHJ7Xo2R7F6r0CLUGayK5lAtxhX43W64kCHAQQAQgABgUCV+VoygAKCRDU +L1Awh3AmJ1dYD/wNSDzkUZpH+5rubJROIdVnR8DNDQkqVZln/ZVWXc8bghK3OlR1 +35NmjiFrtvEEudHMxkLdoJBFuDBNR1yf4Y0nJU25El/WehqYzQe/rMNPyJ/uPOmT +P1AQrNUBc1x4nrMJbZq/1yiTst8mJu7ZRnEvM0F1JOy+rDwySNM8918aOuX+ZqNf +vL4oAALkLvLL0x0pj5gdgVu666X29z+wZJ3b4sJKZAuZfYWS9WS+Y7AELu5oiH97 +DJo04vgyqcJOpcrNp17B+3yoAxjTHv0jW3xPg3MLfHRx2ZSfnSV7QNc0DWj0KU1i +MaQYRM593BFOXLwJrEw3xiCONnArgrUC7L7DsaveJtuVN8BLKZDT709Bi6p4DpQn +IvsSztiAPapgg+e7Lt/V1f6kWcXub5ga5wTMubZYAlkk61vh5nPAwQymcKyAIMEp +4Q7vrQhqv8/COYRnYhwIrvdPRay4lgLQ0OJz0A3X1RtRlaH7ODOapsrZn0LT5Syc +MDIk76fnhg857jxhfnpWjc3Xp0JB/twaBdvUWWDjpIb5t3d4l4nO5DkXNKfSQEmw +PWKUetQlMjEzPD7B1nPZrmbZNK0RXe21ZfVjHvXXvXiHXp+HT3RxAMNCH4mVX3LR +SQzz8OOEieLFO50vNc4mxDN+AknM0Q7aC1FiEcJtEXdiFkPbtL460R62R4kCHAQQ +AQgABgUCV/Ok/gAKCRCYZCyGIK9H1tkUD/0TnHwIF8sGbrPQWvKNrNSpuTEx8i5P +w/To8yyrI+59abcJSHWh8uYJ/bm7Z9HQsguKF7Fdi2pwWxsjC4ND80x+a9f0DGS6 +AoIJDtYXdVInsbaAkBqLp7JMWI0gmCgnTdHRPSmJXM/l0BX0zFAGQbWGC7XBYc8M +cBpjiVMJXyDqYFm9QEBLW9zShB3Pb8y0lEiAPmsCfsnwiOIAFJw7eBtimdYo/e9O +5VAxFFImZ5Yk14nvyUdL80e4RX7O+lZ9JJq0wIz98fmR1aaPcKTQirTuJRLft43g +nFdxeH43REzkqyj+9PB99ewjF16+0RGNWm+vpk5TyM80UGj7Ok/pzkxr82qzQwJi +XDl5XmvgTAuagVeglKqh4onQHtvXTh9sVKg4zJqm/+eesjh0YrNn5qWOWOjtyfCX +3/WlcKBbvZ1X7S0l4mkG7iKAfOB+sgs66Nq2a+sf1EUou4iz40wLfxpz1fB3SLgN +oQQxkB4k7PDntjM6y8FiXRUvELKF46QJ8OIbEjsdDOpY8fA2M1Mwd8WgpcJpFxDj +DYUPW8e6m1KvIwwpkcpYSSVna7KzBGtTCy+3+R/RB6c7MpJgl+sSIt3yL+S22M36 +LSW5Yh+gtm7BZS22bEB2NL0kQEDY1S+j4y6qDQmTxR/X904ofsQLj9gJ0gxsQ3w4 +cXwFJWEnG2vmZYkCHwQwAQgACQUCWJCxHgIdAAAKCRDnO8ZBzBH0yCq/EADbu9TZ +i8AlVAgk9D1uxMuLGYrSheOlX/NJKVQmyMBLzp4oLNiSSmScUlzXQjRxHOf12pF4 +GLrvQZo2VxxoGt+WQlL64n/IT+imVM8qesHuKODtPlHRiltFtK8J+w/WnMXyAq6Y +4WyOYly4ilTPAtkKPW4x12fItB2xB/JEKRW8oeWFe4KXJaq1hImOuSSAObfkkC9+ +9wdF39Lu6U8KECOEvCfgaQ2yxCvT6b1tDQjUP8/O3CCFz0/66QJFSNq+/Gmzvkpx +cxpHflqS7vVZuR4lLAhlg9pSH2QEganBDcg4Pm5cZhJiOcAYfjxDtZrXmAYfbF5B +oZZICVmv2K7eXzVdvTv7mkTjynaUehv0W7OTWWsdUHI1qiAtbK/IXfzd6fcNqtyA +CtWIxtWocHrdkZdMS+9Hd/0FGV3aPn3ApyYDsdOmhFgSUF/bmpY0jcW88b0QJtz2 +CXl5IIrmqTfmgWWA7NmLj/F0zw3TU5M/NKBtL/wDVHEzfiFEj2uNXFrI5waxbtjk +iwvGLsAb3TIDVBdBhKQWPflHy/kvxaRrQX5Z5HhNJKtFFbk9CfP7p/dFB0VN7FDH +1ANbfLUOhdA5zgI2+zoLcIf54Yx5MD9NlSXMruo4x7+GkqdeDV4JxjeCpeCbjXGE +ZJxwzBcMjR+Q9nJtwlU/FAKyDWgm8b6z5pB8G4kCIgQTAQoADAUCV9/YSAWDB4Yf +gAAKCRCBhnRIn7wSfqyDD/48iOpq+Rm1+oHRdmz0iYdVsyt8E435PtlkW7l6NE0k +1BgGnubLkNbDgbJBbdr3AgTAzotBqAQmAnRLdirlWeCYaTIM0Ng2lYRfWmlmHkcb +1P/f4aBzVjsCz68IzYIrRlsSxg2Imm0klSNN8IGL9Xl7unBS8Gk+1o1/d8HY8y6x +eWkpqcLJ4wVCwuCBbRlxOmp0n0Wk2cPi9KWzKWonb+KwYrfDLKzoxvlcs6B3PPSs +FDyIIdLfwFAHlbJBACWVZHKCNZXG6GsqT/pW+xdcXAhG8a/Is1GCGHBURxtZeLbi +qrcsrtIx0fEQjINKA0v00vPU7OoJF8BGrKntVqHzP6BHaqo4nZzgyOZqIBwH/YIU +X3RJOQNAMKqK10ywYauL6YnOL1rr8DrYrXBHCCmBl6QsQPlmAhHgdPl9ZKiYDpLh +VPSDW+4eXYm4i+IEUJ/GuNZhxjI1V7gjJ/bsKD64qAiGYjPBxfnqM5xNF0p7JiU7 +/D4FXUOllNFM8yx5vRzBwo7Q1l5yVlZ80fpcKk99QUrHBuBZ6Hd6tlNRCYiyARwe +Ezzw0tybVpYDQ0Hhp47Mp1tMyuSo4eJwQDExDz9lFlO2uBnmC2OnUrRnpe2D2ZM7 +FJUFq+xFIVnPpDC186gDSN3w4h5+pAzokfy1xtGDFm7EUbwLlNwphNG/GE+AJw+R +dIkCMQQTAQoAGwUCVpWOlAIbAwMLCQcDFQoIAh4BAheAAxYCAQAKCRDnO8ZBzBH0 +yHnBEACIuAutkvqNa3eWm3WjH50Mkxgvcp1ox9UT6YoUctnBvR7lbZJQIsrtBbV+ +DMwN/Z76surTP10Tj6QKDfVz4nL2zka+tlatWDDUujWuC/wSjqSJ4DZnAA9l6m+x +8v3/s/HFB9f+iDRBGjOWXMfcdoePdyVFW0ZbPMceernITA9g5trNfeaXUI1YPVPE ++e7LDawNjB2OEUccOyUVeT3rbZoNJOk4mmlaPgYwG3u65HvlnRyTXn7bQrCBvD+P +61/K4ZxViWVqQYwYFRXi9okhocckGynHxoa4bFnook4P8L8N3qYh/3B0s/XvHF8A +gbTimbo7+kk655eYtG7kxziks+YGQKe0AlBqF0ztaLVjMswQXkYgy9yh5ot5sxmS +Rle1ZJk/A+0vJghVeaE/o+886BzT4YogfYWvZX1vq90vDMqX6RhZzb459jt2L158 +APQVbnWk0pNzUAMUudj4zWBGs7LzXjo07nsicKARDO/ratkwV58u9gfYf20ZevCh +pFbrh4WuMCh0zGtFa4Wiwksxauk05iZgYOdwWoIlyjkR4oU1fPOuulKI9qBCMwzd +S+wvcIzdhvoEQoxck6W+DezYEfxWUG4SRcd9a49hgJixb/bZL/DsOwTFGq2arwG/ +FCRIvpcBDlazeJUbxQ61WTxGP4btqla5IClHHer9oF+XEkNWv7QlTXlsZXMgQm9y +aW5zIDxteWxlcy5ib3JpbnNAZ21haWwuY29tPokBHAQQAQIABgUCVu4HOwAKCRDC +c3kvfYNUXeyIB/0b87yed4qZ+YYYBGvrm68OP6zanl1XlNfJS9sUMZLlFzvP6RX7 +3LzvZTRqMsXCjiimbgU2E069xiSfpozFb/fQl5l4V2981D+rI5MGkxMK9UV8nPTK +wXd6S12CY5Pr+k4452vHEt2lcoEBGlTxEzuvN2OKSKbgThDBVKXH4IXdWa1Bh8I4 +U5JwfQykdLeiCXUwURdfyE7Ky+4/aBPvTTIv8nbdOuj+ivrBN2V1+CBKMx4UC71x +RyyiUUnZSOsVnrzgKYZ2ukmljJ/tbknYepZd2CY0pX3f8b1bVUXj6vOjnetPj2fH +6ITbOwEwneHKDA0P7/+gB0Cunbet1xa2d/4FiQIcBBABAgAGBQJYvuq/AAoJEJVR +oLGm4pfOs0MP/3IZxRCUfuwRHrO0tViAz3OH4G0BNOU3qdzKZ2/sDEaZKUbMRgyO +XF+GhHkhAJdB+JrepdlugTKdvgZ8iGwse3ojmxgAGXPtKbi6nP1DrZ6p5vBluCdc +z/MC+LFA2iQUKMbLcj9NUwQW+9/Hw6D/WHs2JALIi6B76sGOtQHrYCpwCtNzCoGE +UsNd/K20FIRkmt2zEOnuDrF59U1Y6439nv+WCtYVg8T41hyKs0H4aNZOGC9CaAbN +mxeNLbTGthsnXsNKVyw3Hvm0wIOOIo5qG7W434a2bULuZVQEHW/LRV4kXuWbg1SL +n2gt+QZrI/eJ+qHnWMzxBFuwqYCGus0zciOmDbKnCwsZxq2kPXFyXz4rZzZoOcpN +jFZ07hpooGzulL6oVz+1QDc1fnatbgeKMQEoRw+4Va1aiYbGQDTsww4knpejEJyS +MlbIy71R5ZOtRKEfu01BIn0MiX+RDQTpV4oY013lkVSHYe+4JcEM4yZy++lVLfea +rRkQi2mdT6aSeIWeb822ptt2REt5QS7MFresD30JLQRAuaJVlQ3NEWntQq+LAwcc +uvubDGwqVLAMK6tmQ43bLEwasZ+AYawc8Q/5SjTylASdyxSJUUK63JyCYfnqdw9s +uCLcSVS4by0NUqS8Gr3++GLlyfZ5Wt5JdjsQfbcTHLdnYJ85g/r6371/iQIcBBAB +CAAGBQJX5F4pAAoJEBRdTg15cHmaWzQP/3TDwyDrjOaXZZrp16rvBcRoXgBmE2l1 +idK77k7dyrZ0IdzCdmAeALC0S7b5hnOJCyHj9Si7/qPwBOIdlT2E8+0WkUktsFtr +ZqVgQFYvAWdyxiYMh6s1jvmbPQvq/u1BxZlwlLiPUo+V3NKz+hl890hc3duhIzmJ +7X3SkW4pMFMLI/9H5ulqvvQyAbhXlQ5j50RcgGVpduAJGy37Cc6QxdxUkGXF6FPx +Ne7lhVGmDn6cU8jpZZ05p79cDh3Qh4HsR7SHC2YzxKLIwsdgn41bGbqQOuh/ZXfz +aGC6EsxZWo2QMkeCz9ayNNz3E2QxH7o5TajFCFAwb5HW+ufxGd3O6IY79r1R667g +sTF+W1yo6vMMFpoP/MDEvf2cOzaiJ1JiQ7iq+XkPVDGw72+FzsyzQ+m0ajb31fIQ +zSiW7BdnMjn7IvHOO/2/KvKCLRZMK1H4sUUsERnPOAT6gkL+WIvAboLb6sx/l35S +aHHKIyNSjc8jTR9FxtmTZATjcz6Wj3+MR/4VRr/LZpCc4TG585emJnjoTp5JmQz4 +mnU+M1urKh8lNcoJV6oKAEJZmejWs6C1s/UF+7MqfUXh925FE3HDkLfm6R7CWUHc +XrB9FGRwRd1kK2+f9TtQlQOC0tJH9ntufPFkfDpV/oMD5x6UIW9qEWIUlFbPYtMa +DwNrvtY5gwg5iQIcBBABCAAGBQJX5WjFAAoJENQvUDCHcCYnJYIQALbnxsnzyh8L +MXRH0LSM7xuCh1U+xKupAKMC19Yy9sc0HRzYwjdcqY3QbaaxOjexHRHii6hXCUjs +woefVtg6/Xw+NiGaK3VEwK7VGMq4ZBObSJHGmZOzv/NOTOtW07xtsJ5Cta1njbHq +znsklgFW5u/PJ1Id9EsROzm80CDK9ZAhqhT5s7bzBPV4ThDxGyaiDIVXX7TxGkp8 ++BQfAzvj6QZgwXfl8pr6ReES/4qL+SyFrQkmz7ZEirhWFnN6dEa4WjHkH0NMasgM +bB5uRuOP5BP2DKYSUpx4J3LHHW0kqhwoJ7y/k2agcMtu2VvorehsmTJYCJroCg/5 +drtyHKVu6NCDAir58c5ZLpgSyKCAa/xTUtd7+Yce0HHixwt1LW23iqC3BSKMT9OZ +ZGTDv+khWzM0vTuIobm+KmuCJq3MOXk0OTYkRV4O1JsytQRWhw8w0zw3Ziq0eepw +h+emUey/ammePNuaHBx0MTnV0rgnlqRgTIFK3fC1YJQQ4vi0OqiSDMnCfAO1u6ht +GS6TDULOb3grSQnZBl1IFB1594VsZ6KaMxpA4Ko7Vc1ZlPsvfJdonDEhjZFNa3Ue +z19ZPIKhj8vuxWFwakUVM4g3724F3bjI8H+cbF851n92LM591nR5uYddr/DVK8d6 +yW5qYmpUBsLw7CRLTQjNzI0o0iZn6dIKiQIcBBABCAAGBQJX86T5AAoJEJhkLIYg +r0fW1fgQALygE1VC6TN3afQ+UkALedXqZ07b2ypYeL6wE5aSFI3qhTOwcrRFkwll +iZ0Ou0xhKOUkvfMoCfujrpK1VNQQ5LK4OYu64ga5K8WU4AzePgYzPY7Nn5LoSWl7 +tXSoxFMuk8AWpIt7XJ9hQqa9PsbDLwvKgQ0ZPkp26dSzx0Epic5lqzy9/u13H6IE +hQDhdHbQlPNSr/JxivIzhvg93k+zFbmreryVp8VN33rWnPdkv7NJs868hNztaBIa +Wm4ZtIoQBEtSsVTJ8llSLJEfwMN0fRNM76skmK1jzmtrnngsHvvZIdU6HwAwisg4 +ZLcpsrv0M/MLXH/tjHfdMudnj6HZenkDG07mRvRuNKxFBgoPC5KWrJ63+JqhR35S +D5HfVhl7WWeDS/bsQEWK+hu82Jl0W5uoG7TgIO1S8viKN7Zdcv8NhDjSV9VRaGgC +Nt4KS1lhWIRQZo7hww4Ex/dh0QVbHthnvcwEdn3DbJ7NdjR3hu9howgXzhEZfTgf +c4PyN7h9jgdtbcaL+dQzA1lkSxe0DtVNLurOlTJnUBVHOb0evz9QcqkT0abh3Itr +vpcz8aOoI2r1Jjgtm6toDpELa/9WTHiECW3oxAUrZFrzYigVShWym1FGrz8lk3w2 +sDO+A6YqGgN7ar0PdmeaRFUYwNzQmhrKfW4a82gd70s2BEdFAR8CiQIiBBMBCgAM +BQJX39hIBYMHhh+AAAoJEIGGdEifvBJ+SBsQAKgXFN+vYHwj+tRSLYOLU9mzM5Jl +JUeCV1RVxb/hbTh4RdcRJ3Do7WmXt0qTQ+1yMgfvTad84y9w7QA7xI64s3uv3kD4 +vWBgw1pLqxix+FIXZTIHNe3OaNkEfcTdMoJyvuWVpOXUz8xbWFZIJke41aA3QJXK +KLy132/NGiieKoYlGgJ4kaXzM4/17qfS1gnfiOw/sAMKna6FlV9qZwxtS3PqeYbV +iZZ5yPIuXb2CD+nG8Fnj98KrZWOI4/YAZiIe16ccCNxcdXjROXHzBdOY1OG/6Np5 +c+BtCaG0D+Oa7U5K6ZHfu6TTCo7c+L25ekZp8YGn5Whb2HNzfRjn1NkKmDKxa5ar +hTIHGgB3Zizcf22PwNnrUx3godC20ELTWA4MV/JB596MKp+p6j5hxhoJrZnJl33Y +P1jALLSmO3CukOmRUgw5MPSgaloInO4yyJgL9vmZ71ikPJ4D1sEFeKAia/hvTU+Y +dOb8jg7wtuBrwF+2vgbjbfCzIMvi/7hLJjmDF6qVs6hRjCSQVPPsBXaM4gtrhNOh +ZwNPL70bkg0icsal1Hdua2MXoPmY3eX9g4CatuWcnVu9oL0mtAmAzP1I/gP8OPYd +R5YA7mXSdCp2smutC1hvW/kWyv9SrU7oIu0/e1nkx4O3Xv5LbK1TRXMk4YDrVLrg +nIuFf+gUxkeck51AiQI0BBMBCgAeBQJWlY6UAhsDAwsJBwMVCggCHgECF4ADFgIB +AhkBAAoJEOc7xkHMEfTIB1IP/jd39peJKGZkKeK7X4fUB6CmnxWAWX7aTe4cZA9/ +Rpbts7O6LRYaErlabEqYW3RUXIiuqr34Z/2sw9JGaPCmXWBP2d6mwSaCyJW4d8+m +rv+BzAcoWjdf6XdohLCNp/9XwAsE9Pe/i4I1oxLWYRsnlJBEK8ANpseDImiwR4D5 +HLnelCEt73Jhl0stDtlALz+4Ex5nq0PL+QYDKE6Ol6Blut3Zr0InL77PLBHcfl6C +TKPs3jbHZVS2zve8Zz2iI73mpqzSkSqB5ZZmdPCof5a1d5Tm+hcfu9VG4xPASuAI +GuB/wLQX9BK7t18LFH7oPej6pn97WmkchnO+SQzhVxG1OKdNNCA8/qikUAxHi+TN +z990hQU8AaUR0LPcmoreY+QZX7EJjn1rpa4KKmxigNGFwiTLqScBekwpIv9VDOoV +EnPJ2MjFfHTXpFED2btey4bKWneisqAgiUxLcBv8h7ibBG/TdgBxmKzofeuDSLRZ +H206wfMhff+YAqADF/Rg8CafZBMErNM1BUNg3IBgwH/GKqsX5Qt2IyVQf3NYAkRX +ZUHWMqB+/TEON3gAkd7ZvYDP1KEINUnVA3xDwztA+bP2tlBnJdLkBis/nOYFZtsi +8AkityhOzVC+7dnKw1QoqwuGBxwJgX9hmqgtETJw0HabXEPosyAngh57iDVFPSaK +4+sntCVNeWxlcyBCb3JpbnMgPG15bGVzYm9yaW5zQGdvb2dsZS5jb20+iQIcBBAB +AgAGBQJYvuq/AAoJEJVRoLGm4pfO3mIQAIIR/5JwKuwuu1H4NYG58A3TXB8Izy2Y +GGrwmF0YfrwLDvHsXMeMkl46PmSWz6qJcs1fnyNwTurP/3qknPEH5spdjyLECXdG +ps1MyeYyEjVFu7cxA5qpvil+TU7tn89mwf4CaHDKi5Li/RsgQT0kcSAX0EQ690rO +m1xOkWjpDas5tfJPXX35e6lPvlzhlRDzVuxRgRzi6CDhMy+KtYyzABpG0xt+ak++ +aonL7yWiHoKZGNUmstGR3ZfcvgYa7A/jA3/EPKxovqj5k7KzC0MkUU2OyrhmUK3m +HnY7/hqtc7LLE2HfmBctprZ06fGkgmY+tn8E3sRCT/nncGn4Ur2ovdNtFcwSWvfK +9uGR3N6Sa5OFCVt6Uxgt7yL3PEryDsq7x+ycbtUYr1n0GxMxPQYee0kah1RHqIKk +JaNJuUL4pkgzAEXHZUXoEE09UjoJQRPcebFV42ssONz3ENLFMKUEd6xbzkVWa9RV +h+CPTRLagYkfnpvJd4qSbqeo9bjtFQyqhhfeBekVxzj1bixG6tKQ/mMpqSkLHXFU +WzbNJWBx0yG1LvW/0IfjpkNoTETGii+JeVUD4Z3N0tCXR8tgyatiptZGjp87jfxD +KTF5A5aIZPMQzlNqZdJ6y2MAFvNLtBwqi2Rn1HFP3p5vaEe4XyuVI2QiaR4jFhnD +lYnp2NFwjxz6iQI3BBMBCgAhBQJYkWsOAhsDBQsJCAcDBRUKCQgLBRYCAwEAAh4B +AheAAAoJEOc7xkHMEfTI8s8QAK1qXN5jxhzPYDLiz4NvjchC5wTNZYD+g74bxyYg +jJOA7u6HIBLwCs3xaptzlYseci9nDsPVZ1fzCDHQemjWHMlFfVeZlK9nc3qyj9BY +woUI1eQgZMGOFYf56gnbDSHOHPzSmQfw1CzDmXHdv4h/5HMT00Q/wJXjN/F1MpjR +fm4vIigHRcZ8cJCHjJOtr9qppRdMQqxYg2KLA/Ly6UO04chkqj643Zmv0UGwlCzA +/yfrZd9LeKDw7WXt2S2M0AslB8J6I8LYXDx4n3ri32G3bQ/ifCIvsTuTsHpqIdAU +CiqQErMSuw5kFQley3YkJEYDuFsNfFrizCq+1JyNlUARGKANUbjLiLgb3pDe1LCk +dCxQTlHhLpd5H2xy6/0SVy9XYzYHR3gRVX0TId14MRspgC/TKE6GvOcu4lP0qd0x +WxbIdO0YW3qjmkCoyAGN0S/842x1RyEbzlSguBIetGh0dpoVc9teSOaotoRO9hv1 +LkY1bUroaJLIcJE5M9eihvZIVfzCW5rMAmJ5hT+i83x+3IforsdbCRKatd/T//uQ +8QXv4/Qu9JfhGL9fbN9r4aCR+YgrrqfxWX/5hdJnGvzdh/TqTXo2XSWhhmphiSFC +93EojKtcrHjMuIhTdA4pYVTLkS8AXCD76Lmzxi9K/Fvvanm2WFnsLYjn/PNkbr5U +8URriQI5BBMBCAAjBQJYngOvAhsDBwsJCAcDAgEGFQgCCQoLBBYCAwECHgECF4AA +CgkQ5zvGQcwR9MjdFRAApqCfPXRkjRZRdhtCVnT15QbMPPEDyCmwwCgRvfX6+jdv +AUnyGUStKRZ79awehoXvLQGKpaVRiJt2kqt2Y2eK9uyPlNNvkwSd0/+Qpix8pBm1 +s1nA/khNTeUpUQ8cIFlsNhBYo91AFKr/qq9DUPX+VKvpUSEwvSn9dsXL2y3baMyp +NaJIS7rEfI5/u3r6eItwu4Gj951H/6M4QXyqLMZhlpRHt4W1GRYPkjzLyw9a2OOJ +GZudX/Vhwk19koM27hF5XNeH2IkG3eILwdjWdQWjaJzZtnfWh3CkYut95se0vreP +K7sFbUauVArs3CtBuAWDZ4+k0K/rY/PP4tSReXhQfZAoVEGEn4wyar1PHgggBStw +7H/Bzb3ZLz5U6gfjThJynzLXd2xbi/Via9s7vOhuiYV5MDVNnfvWrs6q6bG0KXYH +yCcAXHME8ftbo7dgdKzbMSnC13evbRVL9ZnajCXz4cvWEaDUBj4sJUGxfgGIEX/h +7iqv/oGCG9JzGKYtshOFL2MskImzSOmGE8q51Lt0wBC94ZKVYlQnWy0uqhaSZC6j +Sd0Csu2cdAX6kVG01xoiqafZk5Az4YP3U/EiUyZH+HB0rNV/pvmdzC99LZ2LTJKX +y/nRKAG9lNsub8LZCHlVwH02iXNUeogK2hU798Pgjc+BLnYCx3HoN56rXzzKhdS0 +P015bGVzIEJvcmlucyAoTm90IHVzZWQgYWZ0ZXIgSmFudWFyeSAyMDE3KSA8bWJv +cmluc0B1cy5pYm0uY29tPokCHAQQAQIABgUCWL7qvwAKCRCVUaCxpuKXziHaEACN +U6bIrEP229xDXRmhcx0xQ6nJ30wBbX0uNS7WJXxmyo2AuSfxx2dIjrF3O9UDDHpl +u3hsL6rdaIzYO0tg/Vgy1KJVYhbwpFuOWz/NRW24KbY7mnyq7rx31jmTPCMptM4P +yYv6mC/9j0ZOH+xzOjzmXuE6fuZIB4GCqqlWPBzJiqxh++sRxMejYGe5HVfe0t17 +TJNTHk0RKViM8c3bBnQi6RLASUn9wGFI/yPbEE7R0+dPgqLe/10Hrc74vv5RDJhL +UimiyL4hTodhsV9bcaOBio9DiB8gAC9hfYBNw4ps7HaVBnqrJNSPuIMk6boXjtTz +XENBU15BWsyKMUQ2gpBqDcspnHZqRTzNDjplMB6d6pMoKZpLljnflBu+F/kq3TSE +u9JthqxeevAGa+IS8ZGJ/P7HO3b5SDyh/wdIMstTgGrfB3fA0fGfGUUQIqLOZWqW +S+Ud7k4XdydaUeGlfK+1x7/41WYDULad0UlIM/G1Z7FaEJAouBfGM0TAkQnGsA1+ +QhUOaIJqUjP2szzfzn/gswr6eYBGwvojVVClbPCvBn3RUB+Y+NgOMKhF/xJiYA38 +nYv27TW8MQASoh1prLQsci9gtwoR+MUlA8eCKcf+TyOgVz/f/N271vWSEWesqLj3 +wtx37edD10AWgzTFMsNSJMtbBpy1csDgWT7aNwclzIkCOQQTAQgAIwUCWKFlowIb +AwcLCQgHAwIBBhUIAgkKCwQWAgMBAh4BAheAAAoJEOc7xkHMEfTIvsIQANvVntac +LCksR8dYkAV9syIn8uHzbVTYJPPZ4kq6UW6nR3k+9dbGRL6kBk/YOn0/ib3mVz/q +MPZLFqmoWTkRh3qCGeBLfZtOd4HjLQ5vvpFsnkWmN4BW3Ji/lSeYHyXU5Zv9Z9YO +xbo1y9tOHvhrsre3kh31E9AN5rb9x2KVS3dwfmN4PIx+m0aC6JqfNlf78hDUbGdu +Pm6TkHcmEVfbJT/XqqzUTcJsNVk7047rGxZGo+TxbW8Ri3CPoe7QR/LhQ/IxIPp1 +eNu6oMWycY6m7EYhNiagf76j/Jv9T7R5XmRtxZq21z4985cRNC5auooD+apdOiVj +ft3gAbey/DZPhpY6P2Dtzq1MFXdHRfoW5an40Bg5IgnbRhqcg9EY1+182WNB2iaz +ntR43IeNNZXXlkLIVxW4oAG3vq6DV37lwNuOYLTsdGUvbkMd/u1zmecfX9C8wU4/ +Exefk676SE1v5shA54UDUvUhaGnDbLZZ66MfiXfitE/RuG3/uFfkxeKc3/CsUKk3 +RYbtKA3Ou/0O9C6pKIVCiQhUe/HVSidkk0GAZ3Fq64Cqajd2Byz0QFDHwKv16BSY ++E4mmAWXYw2aV7pO+tivib6XXbLHU/WgJ1qbm/Qr3uo+ZYv4k7f4IwYi0kbSb9nx +tbft90fuq3xmJk/BzY6NZ2f6FIO8aaJzTIGbuQENBFaVjpQBCAC3wjTlC5/jdi2j +nIophctvA8XaqmrQeD6GaLugfCfy1zzU/7LbzGbb0mzPdnF1OT8htQFu+CWNrInU +DqM2sHE0tqx2EQ82KoK9uQduFjyX33GK0FFkQh+cDHkTDSIQkoqx67FHP+jgehv8 +rAzpwc/G4QgoWppj+q1GwcPe34WMCazsfUMYyr/+iyw6PY0WZyQNMUgOItwGlvq7 +QsYqW2rF8bl6qO8KPlXxXK7f7ERm1ScLvec6W7DbaQcO3KlK+tUgsFVAkHEYwz7M +Gy2ybNN/fHTjS0uB9ODkyRFFGsEXcg1BhJsgHNy+mWTs6dOmtKEZW41BeXL6pgpp ++xQcCfCVABEBAAGJA0QEGAEKAA8FAlaVjpQFCQ8JnAACGwwBKQkQ5zvGQcwR9MjA +XSAEGQEKAAYFAlaVjpQACgkQ3qFjcZdAMaXgNAgAkmmQPq02lPA7cjdkWtbYF0tx +YnnjPcIhj8metii3YseDkfJcsVc5IVDMqg3Ns6W2cudSR9cgfw+Jc5MeVtEgBerR +w6UXAfvGK7khVXe9TFe46Fx1TEJ1rW/hc0lNKNNcJfQhYPIlsjFRiYQEvOi7A9VK +cpatFXqHDRGSvjWnZfavJEpQL7f5eFd/GXzFTNOzKYwTRqOn3ESQEzY65lbORQwb +wTT4V704i6x3aBhwjmqnOMFaPlU69QQgrmPZkaSk+R7NkUS/AcpDFJ5t1L/z2HiK +F/XeG5U6lmDy/Pna0et6jnTFEkDOkMPQSpuV5kVrmYychbWiSbX2xLSnHOWh3un+ +D/9zafSr+LbYbKsp8lmSrcucZZeuD7OLJCk5MnGboNzdGuwMmxKmtRSuL+lk9L/k +gNLRIvy4XlgnVycVUDFoKcUCNxgIwN/P7vkEbvfdYVeqcS4QWGyPYh0XdBvDWl3E +Wt5iCyHItkRu4gYwphMuqH0HT1ukilwxwyVi7grJr+b6BAWmfLyWEuN1ewaxNoII +q302TraoPGlbrQb3klqtkiL1i1y6zIbkwsycxkSZ6TX02hKLBB0bvAPBA6wJpL6y +mUrKAJSynTvg0YFmT1A8qdKvpGaIjNx23d8Ak/wxOW0aBjsOXowJbWxAzsjzYWgz +UjHxqjlu5M0L1eAgAjB7uHWM/CQvUKevn3NB/QvvSTxBKF3idebMrGBjeIIbpefM +v4q84+6msPeNpZOAjL86uHi6+Afd/R/eZU36mAuLepEO27M+5Y1dZbtbSsSy85Xb +DPJwdnPnZm9iASoxLdUqKYPTn3P6grmlFR6PaxSlvH4VOwOJZ/00ZocUkwev8xQF +babOCpb8+LhtqHx+4fU36HzPl/DnFclgXwld4yxw8ui7HQahjfvkIM+wdpp/G+2+ +iGggWWZZ3aJ8AGx9NgbZg6Tt5VvS8o/B1BQR4li0Lq3qyzINz5tCrlaUXFpAJB/j +l3Gu785wMDCEQb/ea29LIKzfYiqK6KOG9K+VaYi6STifNbkBDQRWlY6UAQgAveYL +9Vh+G8jdNcPxr7oneutYclTxbLDAXcF1cPygn4h71dGrE3tNpbsLxG8K3C8nxQdc +L0NwBnRp5LAF/QNLhxWLbFRnxXlULU9McWc9oUC6VFKSBGOmtdbuyzKneBIri0BT +Xqrjmc4lI3dwvHxRRX1Bf4krbk8UTeM2P5tt6NciJ1yQliXvPk6iHVeP+LWv+k6A +kG6KLn5TVwZjHbEflGcPrwX/1vWQPySp/36kx91t9+xbw/LW+Sa8bxyNvovH8oXQ +aEFmHlk0BhgN1nyftutFpT7FcJfglf6ljXPx5WJynib1baAnu70VsPsL6SVlXxQn +mfNyeS+ts2y7hqJdQwARAQABiQNEBBgBCgAPBQJWlY6UBQkPCZwAAhsiASkJEOc7 +xkHMEfTIwF0gBBkBCgAGBQJWlY6UAAoJEJM7AfQLXKlG4xgH/2rkUtqEPcpZHPHT +6Yd6qvyQVLA4YDad7VwIHHI+XtOReq6GbEOlHUJaaQthwobO9HfZ07winb9DeMnM +mx+QY3yrdMidS57vSp0Z1sJsA69UaOCcMO4HEZEoMC4W45YRZhMHJ5V/uL47uCHj +be+Ss7RwGn9+1DrmFApNPQqJ/KYZC4uXJxbS8qStZtcjbEdcKYsoegAdtzXOMaI1 +G1YACZgzrPmATp5jQ7xpo4l5YCyCbqH4dDMnUiXDjl4Av2dczX0Jbd9DKpw2U9rL +AsGTbRtEv36hWKDPW9Cb0FcqO9e8w4Mxv6teOip4+WQMgITkoVZ3BOaLi3BYi1NJ +RajTpN60AQ/+O0ElgIoCFsHcVYI4NSWDzmmFXqeE1jllVw2wnA2rO8gp3q0fcjEd +57LjowC3GVFBZfrwKX94G0Jtl4WHtzNUymUxnuz6z35jT6C5ijNNDgd/+uAszaGg +Shp61pl0hFTibIx4rUT4fXYuQhwu+JsYgiE7kLjGG4wNaOP1EqtoBrhR+vud+Obi +2K/iz2wlfbhF45Lrh/om8B795uA2kn42X+FhgYwrf2x++2jkO2McJ3VvZdv5AoVx +zQYkkUb3pJrCPhK/l7Awgf7qpRvrrQcOX+tpnlhJ2keWUSjd1Kk1QcbFPKWQG4kU +nMUcMWp8VG+WCLBu1MleYF5DFAwkGrGQV6pQNdMOs14Qy5xZJoVYrNuL349BYeKr +AxPbkNhNPYxXhdNi35jmXvXIExnoe0scJgcjhcHC9rgX3NOVmD9HEY4MzAZnNLzi +5EUsbtWV1/Sui/tjnojbnCxq7uncPvBZNiMS8voKsFIXXjewhctO+VNLRBbvM18M +JOaK/QJVeR8lwvvsDzly9QcvA8YPpyOZVr83MXl3nk0fkGT0rjZzHzvNhvL0zWSo +LbGK3K95XCBzNHuOUqJCMlRDcdgW43WYMzzpLvMOGSxlm36n4EyncCo4bDMl9OMP +mp78cAZSaannJqbKrGZp4bNzIgnoupPeo3DurGIiTvr0weuQZHymNlqZAg0EV/eG +ZgEQALphDJCKCF/WZ5TWAbw7KOV9GnsowkkebG0GO0fl9a0zwhYJ2ZmcKhSA1skc +hgPYWfeH+KNfj9L/j3aZvKZp2ZbbgPuZh1784G4BAKZ9+PKkEJRLkaFmZkXS270O +DhyflnH6ZyGe3ffSbtPpxSt5ZHX8KIFcg0lZDohK7A7wwNb85Iok3KtF2t/gervc +8MGRKQcrdrBdUfId/Kl4k/jh+oFZsb6PjfvFYkUSqdVIiEyWTnL6pLtOhlOaPJur +QDzy18xnO1K5S/oICkZVtL/PFKnJisVtJbW9kr2CWtnaomxZlgIGW3rXtbU/mdZg +ik/pPY0s6bHoeT2iRAv5NWt84awGR0wEj8oGVX1KXFAWXAg9KPbhrt9SOmM/zYHH +yx0StQz8NESevt6ktTzyN0vFrNbLAj7KH6sR8TgD72jGlybHAm2nM/vaxWWhaFpU +uNYNtpIn4Au+QWv0+Y5rbufGdFi3vsPkAxa22ePKha9Lx8nkFyb43u1utUE5GqTr +VYIkOa4r2CEKBD9icLV7s8YSHFRVh8kRT6b40gA9w4TSW/ecdJMC6d+kjMfAj1NO +R30qPisfPG1Bb62ZOh4Y7SCGcGPqnvjWvMxh1UcRHmKy8PfpWKPdtbR/6oki0htw +OnCI8wFQ4g8HmxpnOfu2hc0yj5+ZgA3jileTfwiadkzkXSWNABEBAAG0JUdpYnNv +biBGYWhuZXN0b2NrIDxnaWJmYWhuQGdtYWlsLmNvbT6JAjkEEwEIACMFAlf3hmYC +GwMHCwkIBwMCAQYVCAIJCgsEFgIDAQIeAQIXgAAKCRCwH7uSghxYerFZD/4yuqSl +Hdrm+1PPnen6mBT/VcBGvz88hJMgsD3r0Vlnidpc/JSlggJWdUyCziwW7tfwPkjS +1JSZUMPXNAffn53xKDF3nYCCseDWBdrwPJzc09qYbXIPmtUH/5B2ETzfiSW+z+Ub +9hmsBJDVWtEfrFWZ0ECcYQ/X2MnbFJAYqJ3OzejRKPc5nyAyVZFgnGbL6eeG64oZ +lZvpT5xBc/xsxPN/hHGGCaLrqyeYvd9999rxgaD+EyJbabRtfL3+f2MBleOKHMYO +KeA9i/pWHas7yU9b7ChVZf9L/n2ejVDuYJbskQzH68PyS55P85i+EOBcLKWpKSIP +ORpNDO70dFMi3Q4NIhzSBXWvqsWkqgGW6gkXg9Fdu3BiIz72EdP+UWaHhFesvgq9 +u3WQ7BOEJZASJHagN3w7e/hGD+Y10eNdpJSceZMNqBkTDtAu4gCVAIBAr88g3urQ +JWnNr8DfmuVZy6T3lHHlNhy09+BPdXMNe2rCy23HNKx54M3FJRfrNHYyoAyDw8tI +g3izFJDkPAOgWMZ7MO3RIXP5/Wxks5fVlDq+pJ4YrhLczS2bzoxo0PcXwh7WjWD9 +PGtkdVpJh0teGmQTE4TRNbam97QSEEMuMNzqe0T+S9Kcymii7rEYDVCn8Gu2og0E +6rXrq5muYKO67P6e6WSiv9PdFvN2TFMNluxwUrkCDQRX94ZmARAAp8o5b/A2nI5E +BaXq1fGWWEUV8IQdlDLwZnmWCj56Bocs1c2swcsbmw4HlHDRMhIS3tHFYnpvXMwk +hvZbKG8bkCpADRnwT6gvqmwoSiCQRaSuHrs2PbcGeYNCVjmuPMvH8yP2VWJaGxye +rtEkNRcrradu0OdkYhtay2ppZ1EUDGG/ensm8MCuNMR01Btk/DJOpyamJTsGdfFs +DG0mNTfYOD1EVZ2YrjO5GohWIBOy08XwxYPwPP/EF02jSgBbJ3hXA2wsc2OozLz/ +iPZA1Ok0PKpwGvfZoJq9TckzGUGHVuEBjqMoQm7MMVYC0vo1X26He8RsqU1Jby/X +OBJS0LLmYP7+RTpEBhJcicUNrl/1Np/8NVR8U0A4LwHCDT/yctSMMZm+zQ+T6T1x +pXtyQx/oNNGScc5rX48766q/6LNYfXTktSVEr1kPpuA8brHenT0zX1C5nTn9DTx/ +XWVvn0jVAnriR07PVLjlW2UR8L7puwKsQJZ/oWTpy8gVvfnMRuUDLdmxktIyT8yR +ltGUAWHrkA+b7Phj3RGP5mWq0FgadOBaHsE+lyhZ8sdx4cdFXja9tDeVg3NQ9iCi +kq0DcA3WQRyT8Y48Wpc4eF4MKiROnEudIKNotwdQS9yQwyILgGMLsoyf1ZCCercW +OWM0pGV3xWGRcu8If3DFmPEL+e1FQl8AEQEAAYkCHwQYAQgACQUCV/eGZgIbDAAK +CRCwH7uSghxYerY9EACRtMAzk3Ax3oFTvZi6HLemr6/ptsgppqq9XcsN9F0AEDrs +BaYQK7kHMteX4V4oIQOxrQnZZf1/p+14CFrvhzYq35QxfoaMdV4wX1yG+wF/uhtu +mCBHABhMMnWAZmfT6SbiAxny8FcmgW3Sf+OQeKLcTAP59tEOiUFTE39OYSPnVDxR +dWQHAMJupxrtsdrzho5hZjlLN+asj3YU5twztHr7pk2iZzPKNw4ZBLjrj1NKi4Ly +66KWiJyOFn5PS5texF9sCYw59kedG/kaBbxz4O/5xSYwvW7zGFAOX/cLehpoDwhh +mwmIRJm85brDfjvXldO8ZQZi8GWdKD4WdnRXVUQyRntux2bRseiXkTfN/NTrFYPr +gZvYmNflMdSQKqP1P0rjQpHabfWR6aSqzjtDSKdfj09HXWs3NbvpVnLBOIvInggt +PCU7lWaeIyM0rqvCgl8pRVWWJ0/CCsuTQ71FigPd9ifvu4DIdgj+QAIOGpkEre+u +4RAaaXzvzIRhDtELzsVp7UYGOzZ6TD1M35fmnqu8/jy4I/jOQ0H/6CKBr0tfyzjy +luh/yZ6zHR8uYECpweWWG4T1PhbGUvq5GwB+nODHR1Ag9qk4efHq187DNJTNkGkp +XD/6E+tsVumhHOmMNIB7Rd4+6JNxVsZkhC2OwCAmwrq36YYemlZOuL8qhmYVIpkC +DQRYhpLWARAA6AT3VJMFQPXTVYs9sMW/nt14mkGnrEh70UXg6TqVkO8rsNsi3cXl +Hq+iHsXKI3v4tfMfng+xRdYIvi6NidS1SEXIUwsdrxrPT9omFtYsqQkZfPQu9rKt +Gh8+koltDgHLZORTibZTsnLmKRq2vGyqsk5PHp9e7OhMoxHL0OeBVmnK4i8+n5NW +Z1d5gSIstNyFhDmlVMSL5rgTPDEEVF2J/wcVF9VaaNKqan/arV0e0G4lMo0zf3R1 +M978WE9uumnxLDphToHVNi8LGbDSgElJx7EczTHjKkyKKRA9zC1R9SL8bABMpZQN +HxB1daQhCPLnuhm7359qNK/hslwGRQe6ScHkiSpxeJJry34+muaP1ARtSVkAQWRZ +Z46QmReYS/FupXXDI9HghA9jxGxRohIq5Dc48lNbFHrEpbi7LznOH869D2BQTRgJ +/UjU5RKuRaQrm8KbJirGQ6v1FmmPX0oLgv1IUXuqJJ7cubMCrZKeISq60z48FFUz +f38HYIhyhfzSKL3T/r4SLZL9+KQXKhfPbnT17bAx7cqNQZte3sxV1Rl1kp8H8KfS +nS1ZyFxmynts9XKZrzNwCNUGlqZdpwPm132BVWqx4U6fp1rOT80lFxCLQ/Sta0lG +vVc+qEMdVqbDPWWYt6xeLCoUkXNq9VQVKHhE0Iz84ytM7EqnQOFcBgUAEQEAAbQj +SXRhbG8gQS4gQ2FzYXMgPG1lQGl0YWxvYWNhc2FzLmNvbT6JAiIEEgEIAAwFAlia +OQsFgweGH4AACgkQ5zvGQcwR9MjBjxAAtLf1vcDkOsYtU+RCrpfWotwaFoYLRDlc +DIjFLO1bX2TIy1YFXDA9c0x8J5Pbt3wmhtkFojgmaGqvWpCJkb7lnudx9Qi/a2gx +ys7HS9heaUDoYM8kgeXVHJe1UcVi4veOthg8wp/hQJDUuKba1Xw9ujVi1PqbBNCw +5ALJK1iNcFmgjtk4Ab2rgCFHqTr/KOUNtYLs/uI9YOHGnzUAW0SrLgHQFD2B6TWv +kFBsRkR+LrY1xGinzt2V34BWmTgIvivC/DNdibhVoU2tSEj0VFkJuyKNSEj2PLA3 +lzaDteCezITqkn0TFpWVkl0NH8c39WV9d9OE60zvTPKfWYteio7VKIQpnCIMGhwr +ojt0RD0EEznmc5UV+RWKRcoWk7B2BqsZxFp94XRBqFjVOmWeK/hMZxoMl7I0V4gk +NyLbPMRyi87ZrVmof+wv7B7Vs8eBKiPDQu9W53bozX4bSf2oyZ3EWSPg+GCCSFc6 +NbBfkq8kdyA5LTKGRgxYZseiKaGvAP20AgRVSYhikl1zlcnGtnjjv6PeAAb4PlQc +ANhLLZ27XUVOWAtUdm9WQyGC7ONNKF7VbR1ikT04JaQMHb7a+cSiLlsV27B+9gk0 +bqIDSr8LOT1EDYFb4Xpw1eWCHlepbCFGl0MHOSuOzr4MXgZAjPiGrW6fCk7zCFlc +bjfaMmOafUSJAjgEEwEIACwFAliGktYJECPv7+k8TP/+AhsDBQkeEzgAAhkBBAsH +CQMFFQgKAgMEFgABAgAAx9IQANh9VjRLD8cLrsjVgKeC8/ncD6cpk7OqbH5vKjse +56RK0ABpU3ZSS9rzJdT+h3vTnIgRKCUBaw2xcv7oN+GCNT3VJ7MmyF4NyDTOjBiP +o/Wvck1C81n2t4+05INt6AL7Zn5HfeEGWVLo7zbzReCXdm3kmoifYxxwIEnPZeJa +Ly3nJRUlTMWm59lfU88q0RCyBZdI9+muiD7voSIR5Nu6Uf/Erw+YryXcBLlRIG9k +1nML5cAcH1qhvhyu9Fj6B2SeDcBHK37KyxiOmsIY5H1KsX7ijdR1MrLUSIbqODpi +pN4qFHPR+IzDyAWXs2QdEAEruh33SCzYX1rcVpVQU0buARBlGK+XzxwIXUn/V1Ku +2bTRl5eKbgvn4bB6V9fxrUvN3g/mdmB/pGLCt9imEqPcVoiApnLbTJ6HIIFT/rNe +RomqK5iDNG27HjGxofIKbkqhFJ2j/JEBJKpG4DHrVEkup6GTxzAzCHLr6Rkmyp32 +LQUq5yrV6u7e7tV6HoyaEDo6ywafAuBTfh3DAcfMandkpFdujGVniGrj9PJ8Ux4/ +Jxu1pN151uHifMITuVCkmjrS6gfFzCoSzcQV7yjNecvnse5ipCcyo6QJ2yCkwK+f +u+VcWy5JVw+FOvS44tgGLcsBexPPOtZPxVeZ1GCMVjPawNMjOjmB0jLBA2lmvDJk +iSumuQINBFiGktYBEACvROrJShVGFXjlldqr+DpTMsN7HBirnM7v6esapd1HGJNB +QNhK16vGC6NwD7fpOJ5bn0AzE1RPNKZ/CXOEoCne70M4XuzskUlqR74kwvRcxkV1 +WAHN+ABUIOXmfIVQZiQ9bM8FlUFFoW75MXDd8UeaOnMaxOMfYMQn0zCk+0w2o6UH +KtyTJEQ6L9XfFePaxTqxpWlWgDL50JeLPcqQbF5av851xppPqRrrSMat0E4T5I4h +W2m96A4KTCXt0TyrcziYSJ1elhiXZpgJ+ZlwEpk3lD32JDjar49gpcx2Nno4qj2i +Mdx62D2/OxpckLoRNaj25sdgC7JZBzmGGwbuSbE1q5QTwjMInbNccsUmFNECWPBM +vpJK/RC+/Htz8q373t/45W4d7zXNgQxlAKF99NVhZ1EBD5CSy3Q6qPqdrbdJh3Dl +VH/KnFl+hLwxsnjV0VhXPJgsg62TzIGDlS/N6N5C62lj9cCW6biek4QULgN1/Ni0 +hedK6aBdzDtpS4CR1s1rca+rgqimrgOtl6qJW3+MSxtiLsDLLDAYsZdhWnuBhUB7 +XIyBBtNir5rFibLNjkdxUF4Ug89U99m8vNOFiTaOBjy3rTvF9XtEqY3qg/KSUf75 +Wwp4ys1LuA7RoKkNET/WXsGiU47eS0dD6DOQmSKrrAIPfqseW9phJD+hbbrPWQAR +AQABiQI1BBgBCAApBQJYhpLWCRAj7+/pPEz//gIbDAUJHhM4AAQLBwkDBRUICgID +BBYAAQIAAAsJD/0aaHE3/txaeMU1bfDs0nWIBmSrqhVvHEvyzIzWK30D6Nfmv7bP +81hILfa2PfxjIgOCHtdA4xtAqV3G2/+7UeWLKlv0tuiZmx8p8mQkA6MsOnuDR4sW +TQ8Vd0arkTyzlBOwvz/SL8YXDSxWeSAgSSbQ+Ri7XrwwE+BjcWSeKabqmgQ4Hp7L +bQ0IvQ5f+hBWfLvugCgHI/7PRPhQbpallIdQLE7Qoavl8aDG8AqeN6tBLfjn19RR +kottbntbUlSG+WoYk2hYiydZGRlKwkNfcsuaaNF0p9pH0HR6RrsknrqxT+l8DaLm +4BwIMFXjnSuCEPfiJ3kV4bzRRND7iOfokdjJioj4ChrFR6461kDl7zqdkGIqU45q +Q+aklo0WTFvfiiTrsMXLpIhrCNn8oGST0eM8u3GCfmMFbxhO897NTDYnz1wOMcXu +MVqJ489aDKKvEV8zLljjUjJiZVDnbq0QE1abzVdmBtJRA3732buBwrzlHL5z4Bca +Zwe1bQsPHAzyC9EpJn7PtJcdDkfBk1PsGWx9cmPvqvX1Xbm8UoVie0x+wge5SM77 +5JeDdR41lHndWw67Ry59GgQapkOoargTqKyNYMYAxZBqKvdvIhS8jdAt5ldagJpV +quRCpSq91OAxMG0TFGCBXKjtqzsHk58WtAalk49TvO/0r0inTnfWSORiKQ== +=jVEm +-----END PGP PUBLIC KEY BLOCK----- diff --git a/pkgs/development/web/nodejs/update-keyring b/pkgs/development/web/nodejs/update-keyring new file mode 100755 index 000000000000..39737758e765 --- /dev/null +++ b/pkgs/development/web/nodejs/update-keyring @@ -0,0 +1,18 @@ +#!/usr/bin/env nix-shell +#! nix-shell --pure -i bash -p coreutils findutils gnupg curl + +# https://github.com/nodejs/node#release-team +HOME=`mktemp -d` +keyserver="pool.sks-keyservers.net" +cat << EOF | xargs -P 4 -n 1 gpg --keyserver $keyserver --recv-keys +94AE36675C464D64BAFA68DD7434390BDBE9B9C5 +FD3A5288F042B6850C66B31F09FE44734EB7990E +71DCFD284A79C3B38668286BC97EC7A07EDE3FC1 +DD8F2338BAE7501E3DD5AC78C273792F7D83545D +C4F0DFFF4E8C1A8236409D08E73BC641CC11F4C8 +B9AE9905FFD7803F25714661B63B535A4C206CA9 +56730D5401028683275BD23C23EFEFE93C4CFFFE +77984A986EBC2AA786BC0F66B01FBB92821C587A +EOF + +gpg -a --export > nodejs-release-keys.asc From 43cf893d44aede3ecb62399f5c28c0046a5148f4 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Sun, 18 Feb 2018 22:19:01 +0800 Subject: [PATCH 041/814] nodejs: Add updater script --- pkgs/development/web/nodejs/nodejs.nix | 9 +++++++++ pkgs/development/web/nodejs/update.nix | 27 ++++++++++++++++++++++++++ 2 files changed, 36 insertions(+) create mode 100644 pkgs/development/web/nodejs/update.nix diff --git a/pkgs/development/web/nodejs/nodejs.nix b/pkgs/development/web/nodejs/nodejs.nix index 8d8a253f01d1..263de2ec96b1 100644 --- a/pkgs/development/web/nodejs/nodejs.nix +++ b/pkgs/development/web/nodejs/nodejs.nix @@ -1,5 +1,8 @@ { stdenv, fetchurl, openssl, python2, zlib, libuv, utillinux, http-parser , pkgconfig, which +# Updater dependencies +, writeScript, coreutils, gnugrep, jq, curl, common-updater-scripts, nix +, gnupg , darwin ? null }: @@ -78,6 +81,12 @@ in ''} ''; + passthru.updateScript = import ./update.nix { + inherit writeScript coreutils gnugrep jq curl common-updater-scripts gnupg nix; + inherit (stdenv) lib; + majorVersion = with stdenv.lib; elemAt (splitString "." version) 0; + }; + meta = { description = "Event-driven I/O framework for the V8 JavaScript engine"; homepage = https://nodejs.org; diff --git a/pkgs/development/web/nodejs/update.nix b/pkgs/development/web/nodejs/update.nix new file mode 100644 index 000000000000..9ff11982b656 --- /dev/null +++ b/pkgs/development/web/nodejs/update.nix @@ -0,0 +1,27 @@ +{ lib +, writeScript +, coreutils +, curl +, gnugrep +, jq +, gnupg +, common-updater-scripts +, majorVersion +, nix +}: + +writeScript "update-nodejs" '' + PATH=${lib.makeBinPath [ common-updater-scripts coreutils curl gnugrep jq gnupg nix ]} + + HOME=`mktemp -d` + cat ${./nodejs-release-keys.asc} | gpg --import + + tags=`curl --silent https://api.github.com/repos/nodejs/node/git/refs/tags` + version=`echo $tags | jq -r '.[] | select(.ref | startswith("refs/tags/v${majorVersion}")) | .ref' | sort --version-sort | tail -1 | grep -oP "^refs/tags/v\K.*"` + + curl --silent -o $HOME/SHASUMS256.txt.asc https://nodejs.org/dist/v''${version}/SHASUMS256.txt.asc + hash_hex=`gpgv --keyring=$HOME/.gnupg/pubring.kbx --output - $HOME/SHASUMS256.txt.asc | grep -oP "^([0-9a-f]{64})(?=\s+node-v''${version}.tar.xz$)"` + hash=`nix-hash --type sha256 --to-base32 ''${hash_hex}` + + update-source-version nodejs-${majorVersion}_x "''${version}" "''${hash}" +'' From 88dae1a1c8e37029dd678f901962d1588a2ed39b Mon Sep 17 00:00:00 2001 From: Matthieu Coudron Date: Sun, 11 Feb 2018 10:25:38 +0900 Subject: [PATCH 042/814] protocol: module to application protocol really is a "buildPythonApplication" rather than a buildPythonPackage". --- .../networking}/protocol/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 2 ++ pkgs/top-level/python-packages.nix | 2 -- 3 files changed, 4 insertions(+), 4 deletions(-) rename pkgs/{development/python-modules => applications/networking}/protocol/default.nix (85%) diff --git a/pkgs/development/python-modules/protocol/default.nix b/pkgs/applications/networking/protocol/default.nix similarity index 85% rename from pkgs/development/python-modules/protocol/default.nix rename to pkgs/applications/networking/protocol/default.nix index f8ff177437c3..305aceec62b5 100644 --- a/pkgs/development/python-modules/protocol/default.nix +++ b/pkgs/applications/networking/protocol/default.nix @@ -1,6 +1,6 @@ -{ stdenv, buildPythonPackage, fetchFromGitHub }: +{ stdenv, buildPythonApplication, fetchFromGitHub }: -buildPythonPackage rec { +buildPythonApplication rec { pname = "protocol"; version = "20171226"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 55b51326859d..a05fe8b759be 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20118,6 +20118,8 @@ with pkgs; pt = callPackage ../applications/misc/pt { }; + protocol = python3Packages.callPackage ../applications/networking/protocol { }; + pykms = callPackage ../tools/networking/pykms { }; pyload = callPackage ../applications/networking/pyload {}; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 5608cd85ef26..4fd50fc053c3 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -20998,8 +20998,6 @@ EOF trezor = callPackage ../development/python-modules/trezor { }; - protocol = callPackage ../development/python-modules/protocol { }; - trezor_agent = buildPythonPackage rec{ name = "${pname}-${version}"; pname = "trezor_agent"; From 32af695a228669a6b35160f2b424417428cebcfa Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 22 Feb 2018 16:40:02 +0100 Subject: [PATCH 043/814] nix: 1.11.16 -> 2.0 --- .../modules/installer/tools/nix-fallback-paths.nix | 8 ++++---- pkgs/tools/package-management/nix/default.nix | 14 +++++++++++--- pkgs/top-level/all-packages.nix | 11 ++++------- 3 files changed, 19 insertions(+), 14 deletions(-) diff --git a/nixos/modules/installer/tools/nix-fallback-paths.nix b/nixos/modules/installer/tools/nix-fallback-paths.nix index 131c779b1ab1..4774cf39c030 100644 --- a/nixos/modules/installer/tools/nix-fallback-paths.nix +++ b/nixos/modules/installer/tools/nix-fallback-paths.nix @@ -1,6 +1,6 @@ { - x86_64-linux = "/nix/store/gy4yv67gv3j6in0lalw37j353zdmfcwm-nix-1.11.16"; - i686-linux = "/nix/store/ifmyq5ryfxhhrzh62hiq65xyz1fwffga-nix-1.11.16"; - aarch64-linux = "/nix/store/y9mfv3sx75mbfibf1zna1kq9v98fk2nb-nix-1.11.16"; - x86_64-darwin = "/nix/store/hwpp7kia2f0in5ns2hiw41q38k30jpj2-nix-1.11.16"; + x86_64-linux = "/nix/store/6p2gambjac7xdkd2a7w1dsxdk1q5cq4d-nix-2.0"; + i686-linux = "/nix/store/zznnaijjk3nwx0cmpczxsvngmqzhl7r4-nix-2.0"; + aarch64-linux = "/nix/store/ci96w9kxfkmlc7x2vwqiz4da0r6abxnq-nix-2.0"; + x86_64-darwin = "/nix/store/xmi4fylvx4qc79ji9v5q3zfy9vfdy4sv-nix-2.0"; } diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index d8246c5da936..2eb753e54b4d 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -149,13 +149,21 @@ let in rec { - nix = nixUnstable; + nix = nixStable; - nixStable = (common rec { + nix1 = (common rec { name = "nix-1.11.16"; src = fetchurl { url = "http://nixos.org/releases/nix/${name}/${name}.tar.xz"; - sha256 = "0ca5782fc37d62238d13a620a7b4bff6a200bab1bd63003709249a776162357c"; + sha256 = "7024d327314bf92c1d3e6cccd944929828a44b24093954036bfb0115a92f5a14"; + }; + }) // { perl-bindings = nixStable; }; + + nixStable = (common rec { + name = "nix-2.0"; + src = fetchurl { + url = "http://nixos.org/releases/nix/${name}/${name}.tar.xz"; + sha256 = "7024d327314bf92c1d3e6cccd944929828a44b24093954036bfb0115a92f5a14"; }; }) // { perl-bindings = nixStable; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 92f81ee28613..4544eb15cf68 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3950,9 +3950,7 @@ with pkgs; p7zip = callPackage ../tools/archivers/p7zip { }; - packagekit = callPackage ../tools/package-management/packagekit { - nix = nixUnstable; - }; + packagekit = callPackage ../tools/package-management/packagekit { }; packetdrill = callPackage ../tools/networking/packetdrill { }; @@ -6815,8 +6813,6 @@ with pkgs; mujs = callPackage ../development/interpreters/mujs { }; nix-exec = callPackage ../development/interpreters/nix-exec { - nix = nixUnstable; - git = gitMinimal; }; @@ -10350,7 +10346,7 @@ with pkgs; }; libnghttp2 = nghttp2.lib; - nix-plugins = callPackage ../development/libraries/nix-plugins {}; + nix-plugins = callPackage ../development/libraries/nix-plugins { }; nlohmann_json = callPackage ../development/libraries/nlohmann_json { }; @@ -19852,6 +19848,7 @@ with pkgs; stateDir = config.nix.stateDir or "/nix/var"; }) nix + nix1 nixStable nixUnstable; @@ -19861,7 +19858,7 @@ with pkgs; nixui = callPackage ../tools/package-management/nixui { node_webkit = nwjs_0_12; }; - nix-bundle = callPackage ../tools/package-management/nix-bundle { nix = nixUnstable; }; + nix-bundle = callPackage ../tools/package-management/nix-bundle { }; nix-delegate = haskell.lib.justStaticExecutables haskellPackages.nix-delegate; nix-deploy = haskell.lib.justStaticExecutables haskellPackages.nix-deploy; From bae19ef9f64cce817a103e659fb78ce416a0163b Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 22 Feb 2018 17:20:59 +0100 Subject: [PATCH 044/814] Doh --- pkgs/tools/package-management/nix/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index 2eb753e54b4d..f837a699e2a9 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -155,7 +155,7 @@ in rec { name = "nix-1.11.16"; src = fetchurl { url = "http://nixos.org/releases/nix/${name}/${name}.tar.xz"; - sha256 = "7024d327314bf92c1d3e6cccd944929828a44b24093954036bfb0115a92f5a14"; + sha256 = "0ca5782fc37d62238d13a620a7b4bff6a200bab1bd63003709249a776162357c"; }; }) // { perl-bindings = nixStable; }; From fab12188b855d9ac1f64f486ee38f1cf7d53c8f4 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 22 Feb 2018 17:26:16 +0100 Subject: [PATCH 045/814] Doh --- pkgs/tools/package-management/nix/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index f837a699e2a9..9f41e00ac0e9 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -165,7 +165,7 @@ in rec { url = "http://nixos.org/releases/nix/${name}/${name}.tar.xz"; sha256 = "7024d327314bf92c1d3e6cccd944929828a44b24093954036bfb0115a92f5a14"; }; - }) // { perl-bindings = nixStable; }; + }) // { perl-bindings = perl-bindings { nix = nixStable; }; }; nixUnstable = (lib.lowPrio (common rec { name = "nix-2.0${suffix}"; From 776a5e6ebfacc6831527bc6c3c1a58ef2087c819 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 8 Feb 2018 13:56:54 +0100 Subject: [PATCH 046/814] makeInitrd: Use closureInfo --- pkgs/build-support/closure-info.nix | 2 +- pkgs/build-support/kernel/make-initrd.nix | 9 +++------ pkgs/build-support/kernel/make-initrd.sh | 6 +----- pkgs/build-support/kernel/paths-from-graph.pl | 2 ++ 4 files changed, 7 insertions(+), 12 deletions(-) diff --git a/pkgs/build-support/closure-info.nix b/pkgs/build-support/closure-info.nix index 54b1fe59b66d..25978e974cf5 100644 --- a/pkgs/build-support/closure-info.nix +++ b/pkgs/build-support/closure-info.nix @@ -4,7 +4,7 @@ # "nix-store --load-db" and "nix-store --register-validity # --hash-given". -{ stdenv, coreutils, jq, perl, pathsFromGraph }: +{ stdenv, coreutils, jq }: { rootPaths }: diff --git a/pkgs/build-support/kernel/make-initrd.nix b/pkgs/build-support/kernel/make-initrd.nix index 5353ae828410..a4d162dc8b51 100644 --- a/pkgs/build-support/kernel/make-initrd.nix +++ b/pkgs/build-support/kernel/make-initrd.nix @@ -12,7 +12,7 @@ # `contents = {object = ...; symlink = /init;}' is a typical # argument. -{ stdenv, perl, cpio, contents, compressor, prepend, ubootTools +{ stdenv, closureInfo, cpio, contents, compressor, prepend, ubootTools , hostPlatform }: @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { makeUInitrd = hostPlatform.platform.kernelTarget == "uImage"; - nativeBuildInputs = [ perl cpio ] + nativeBuildInputs = [ cpio ] ++ stdenv.lib.optional makeUInitrd ubootTools; # !!! should use XML. @@ -30,10 +30,7 @@ stdenv.mkDerivation rec { symlinks = map (x: x.symlink) contents; suffices = map (x: if x ? suffix then x.suffix else "none") contents; - # For obtaining the closure of `contents'. - exportReferencesGraph = - map (x: [("closure-" + baseNameOf x.symlink) x.object]) contents; - pathsFromGraph = ./paths-from-graph.pl; + closure = closureInfo { rootPaths = (map (x: x.object) contents); }; inherit compressor prepend; } diff --git a/pkgs/build-support/kernel/make-initrd.sh b/pkgs/build-support/kernel/make-initrd.sh index 0aeaedeb3724..2e64eeb81c1b 100644 --- a/pkgs/build-support/kernel/make-initrd.sh +++ b/pkgs/build-support/kernel/make-initrd.sh @@ -25,13 +25,9 @@ for ((n = 0; n < ${#objects[*]}; n++)); do done -# Get the paths in the closure of `object'. -storePaths=$(perl $pathsFromGraph closure-*) - - # Paths in cpio archives *must* be relative, otherwise the kernel # won't unpack 'em. -(cd root && cp -prd --parents $storePaths .) +(cd root && cp -prd --parents $(cat $closure/store-paths) .) # Put the closure in a gzipped cpio archive. diff --git a/pkgs/build-support/kernel/paths-from-graph.pl b/pkgs/build-support/kernel/paths-from-graph.pl index 747e1edec811..1465b73fddb6 100644 --- a/pkgs/build-support/kernel/paths-from-graph.pl +++ b/pkgs/build-support/kernel/paths-from-graph.pl @@ -1,3 +1,5 @@ +# NOTE: this script is deprecated. Use closureInfo instead. + # Parses a /nix/store/*-closure file and prints # various information. # By default, the nodes in the graph are printed to stdout. From adf8074abeed31453739dcecdd4f4a32c8c53eb6 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Fri, 23 Feb 2018 10:52:37 -0500 Subject: [PATCH 047/814] closureInfo: Report the total closure size. This can be useful for e.g. preallocating disk image sizes. --- pkgs/build-support/closure-info.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/build-support/closure-info.nix b/pkgs/build-support/closure-info.nix index 54b1fe59b66d..96c37bccf2e9 100644 --- a/pkgs/build-support/closure-info.nix +++ b/pkgs/build-support/closure-info.nix @@ -27,6 +27,7 @@ stdenv.mkDerivation { mkdir $out + jq -r ".closure | map(.narSize) | add" < .attrs.json > $out/total-nar-size jq -r '.closure | map([.path, .narHash, .narSize, "", (.references | length)] + .references) | add | map("\(.)\n") | add' < .attrs.json | head -n -1 > $out/registration jq -r .closure[].path < .attrs.json > $out/store-paths ''; From 1dbb82848adbc347bffa3c933496b83da1256d6a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 18 Feb 2018 16:59:52 +0100 Subject: [PATCH 048/814] hydra: fix build with gcc7, incl. libpqxx update It builds, but it's otherwise untested. --- pkgs/development/libraries/libpqxx/default.nix | 16 ++++++++++------ pkgs/development/tools/misc/hydra/default.nix | 11 ----------- pkgs/top-level/all-packages.nix | 4 +--- 3 files changed, 11 insertions(+), 20 deletions(-) diff --git a/pkgs/development/libraries/libpqxx/default.nix b/pkgs/development/libraries/libpqxx/default.nix index 51cb1c48e54c..f51171ade681 100644 --- a/pkgs/development/libraries/libpqxx/default.nix +++ b/pkgs/development/libraries/libpqxx/default.nix @@ -1,14 +1,18 @@ -{ lib, stdenv, fetchurl, postgresql, python2, gnused }: +{ lib, stdenv, fetchFromGitHub, postgresql, python2, gnused }: stdenv.mkDerivation rec { - name = "libpqxx-4.0.1"; + name = "libpqxx-${version}"; + version = "6.1.0"; - src = fetchurl { - url = "http://pqxx.org/download/software/libpqxx/${name}.tar.gz"; - sha256 = "0f6wxspp6rx12fkasanb0z2g2gc8dhcfwnxagx8wwqbpg6ifsz09"; + src = fetchFromGitHub { + owner = "jtv"; + repo = "libpqxx"; + rev = version; + sha256 = "1dv96h10njg115216n2zm6fsvi4kb502hmhhn8cjhlfbxr9vc84q"; }; - buildInputs = [ postgresql python2 gnused ]; + nativeBuildInputs = [ gnused python2 ]; + buildInputs = [ postgresql ]; preConfigure = '' patchShebangs . diff --git a/pkgs/development/tools/misc/hydra/default.nix b/pkgs/development/tools/misc/hydra/default.nix index 613a4fec8530..cf9057d35e2c 100644 --- a/pkgs/development/tools/misc/hydra/default.nix +++ b/pkgs/development/tools/misc/hydra/default.nix @@ -79,17 +79,6 @@ in releaseTools.nixBuild rec { guile # optional, for Guile + Guix support perlDeps perl nixUnstable postgresql # for running the tests - (lib.overrideDerivation (aws-sdk-cpp.override { - apis = ["s3"]; - customMemoryManagement = false; - }) (attrs: { - src = fetchFromGitHub { - owner = "edolstra"; - repo = "aws-sdk-cpp"; - rev = "local"; - sha256 = "1vhgsxkhpai9a7dk38q4r239l6dsz2jvl8hii24c194lsga3g84h"; - }; - })) ]; hydraPath = lib.makeBinPath ( diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d24de9f0f6da..6603e35f1c00 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10049,9 +10049,7 @@ with pkgs; libpfm = callPackage ../development/libraries/libpfm { }; - libpqxx = callPackage ../development/libraries/libpqxx { - gnused = gnused_422; - }; + libpqxx = callPackage ../development/libraries/libpqxx { }; libproxy = callPackage ../development/libraries/libproxy { inherit (darwin.apple_sdk.frameworks) SystemConfiguration CoreFoundation JavaScriptCore; From 6166507ca5eda4dae1c731b054938b816c644911 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=A4in=C3=B6=20J=C3=A4rvel=C3=A4?= Date: Fri, 23 Feb 2018 20:34:26 +0200 Subject: [PATCH 049/814] gst-plugins-bad: Add Darwin support Had to remove mjpegtools and Cocoa support because of compile problems. --- pkgs/development/libraries/gstreamer/bad/default.nix | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/gstreamer/bad/default.nix b/pkgs/development/libraries/gstreamer/bad/default.nix index c033140d8dc3..69ade8899195 100644 --- a/pkgs/development/libraries/gstreamer/bad/default.nix +++ b/pkgs/development/libraries/gstreamer/bad/default.nix @@ -35,9 +35,13 @@ stdenv.mkDerivation rec { a real live maintainer, or some actual wide use. ''; license = licenses.lgpl2Plus; - platforms = platforms.linux; + platforms = platforms.linux ++ platforms.darwin; }; + # TODO: Fix Cocoa build. The problem was ARC, which might be related to too + # old version of Apple SDK's. + configureFlags = optional stdenv.isDarwin "--disable-cocoa"; + patchPhase = '' sed -i 's/openjpeg-2.2/openjpeg-${openJpegVersion}/' ext/openjpeg/* ''; @@ -58,7 +62,7 @@ stdenv.mkDerivation rec { openjpeg libopus librsvg fluidsynth libvdpau libwebp xvidcore gnutls mesa - mjpegtools libgme openssl x265 libxml2 + libgme openssl x265 libxml2 ] ++ libintlOrEmpty ++ optional faacSupport faac @@ -67,7 +71,9 @@ stdenv.mkDerivation rec { ++ optional stdenv.isLinux wayland # wildmidi requires apple's OpenAL # TODO: package apple's OpenAL, fix wildmidi, include on Darwin - ++ optional (!stdenv.isDarwin) wildmidi; + ++ optional (!stdenv.isDarwin) wildmidi + # TODO: mjpegtools uint64_t is not compatible with guint64 on Darwin + ++ optional (!stdenv.isDarwin) mjpegtools; LDFLAGS = optionalString stdenv.isDarwin "-lintl"; From e9ef15c32206864555b39b53465562271c9153c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=A4in=C3=B6=20J=C3=A4rvel=C3=A4?= Date: Fri, 23 Feb 2018 20:36:19 +0200 Subject: [PATCH 050/814] glib-networking: Fix Darwin support --- pkgs/development/libraries/glib-networking/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/libraries/glib-networking/default.nix b/pkgs/development/libraries/glib-networking/default.nix index 87f3c78a82e8..9336e5bbae91 100644 --- a/pkgs/development/libraries/glib-networking/default.nix +++ b/pkgs/development/libraries/glib-networking/default.nix @@ -17,6 +17,8 @@ stdenv.mkDerivation rec { configureFlags = "--with-ca-certificates=/etc/ssl/certs/ca-certificates.crt"; + LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-lintl"; + preBuild = '' sed -e "s@${glib.out}/lib/gio/modules@$out/lib/gio/modules@g" -i $(find . -name Makefile) ''; From 74d6d40bdf3c73a2fba7bef5453a16058c719e43 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=A4in=C3=B6=20J=C3=A4rvel=C3=A4?= Date: Fri, 23 Feb 2018 20:36:52 +0200 Subject: [PATCH 051/814] mopidy: Remove dbus-python on Darwin Darwin doesn't have dbus. --- pkgs/applications/audio/mopidy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/mopidy/default.nix b/pkgs/applications/audio/mopidy/default.nix index 8541ec6e2727..cfb7b57bc475 100644 --- a/pkgs/applications/audio/mopidy/default.nix +++ b/pkgs/applications/audio/mopidy/default.nix @@ -22,8 +22,8 @@ pythonPackages.buildPythonApplication rec { ]; propagatedBuildInputs = with pythonPackages; [ - gst-python pygobject3 pykka tornado requests dbus-python - ]; + gst-python pygobject3 pykka tornado requests + ] ++ stdenv.lib.optional (!stdenv.isDarwin) dbus-python; # There are no tests doCheck = false; From e8a336b154c09bc139f689843d81c1d554a9ae9f Mon Sep 17 00:00:00 2001 From: Alexei Boronine Date: Fri, 23 Feb 2018 03:20:03 +0100 Subject: [PATCH 052/814] perlPackages.TextBibTex: fix dylib path for Darwin --- pkgs/top-level/perl-packages.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index ed13a00b6fc7..c1e29bb7f438 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -14573,6 +14573,15 @@ let self = _self // overrides; _self = with self; { sha256 = "0dig1zlglm8rwm8fhnz087lx6gixj9jx10kxn1fx3swdkfblhsmf"; }; perlPreHook = "export LD=$CC"; + perlPostHook = stdenv.lib.optionalString stdenv.isDarwin '' + oldPath="$(pwd)/btparse/src/libbtparse.dylib" + newPath="$out/lib/libbtparse.dylib" + + install_name_tool -id "$newPath" "$newPath" + install_name_tool -change "$oldPath" "$newPath" "$out/bin/biblex" + install_name_tool -change "$oldPath" "$newPath" "$out/bin/bibparse" + install_name_tool -change "$oldPath" "$newPath" "$out/bin/dumpnames" + ''; meta = { description = "Interface to read and parse BibTeX files"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; From cafcd6e9f4442011da2dc35f6be5cbbd0868455d Mon Sep 17 00:00:00 2001 From: Alexei Boronine Date: Sat, 24 Feb 2018 03:46:09 +0100 Subject: [PATCH 053/814] perlPackages.TextBibTeX: also patch .bundle file --- pkgs/top-level/perl-packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index c1e29bb7f438..5b2b8f26eb9b 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -14581,6 +14581,7 @@ let self = _self // overrides; _self = with self; { install_name_tool -change "$oldPath" "$newPath" "$out/bin/biblex" install_name_tool -change "$oldPath" "$newPath" "$out/bin/bibparse" install_name_tool -change "$oldPath" "$newPath" "$out/bin/dumpnames" + install_name_tool -change "$oldPath" "$newPath" "$out/lib/perl5/site_perl/5.24.3/darwin-2level/auto/Text/BibTeX/BibTeX.bundle" ''; meta = { description = "Interface to read and parse BibTeX files"; From 381cb8b5ad5a66e06a96eb0c2854293e5756a9ee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=A4in=C3=B6=20J=C3=A4rvel=C3=A4?= Date: Fri, 23 Feb 2018 21:15:47 +0200 Subject: [PATCH 054/814] gst-plugins-ugly: Add mpg123 to enable mpg123audiodec in gstreamer Adds support for MP3 playback. --- pkgs/development/libraries/gstreamer/ugly/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gstreamer/ugly/default.nix b/pkgs/development/libraries/gstreamer/ugly/default.nix index 3aa8eb886d79..cdaa88ce350f 100644 --- a/pkgs/development/libraries/gstreamer/ugly/default.nix +++ b/pkgs/development/libraries/gstreamer/ugly/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, pkgconfig, python , gst-plugins-base, orc , a52dec, libcdio, libdvdread -, lame, libmad, libmpeg2, x264, libintlOrEmpty +, lame, libmad, libmpeg2, x264, libintlOrEmpty, mpg123 }: stdenv.mkDerivation rec { @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { buildInputs = [ gst-plugins-base orc a52dec libcdio libdvdread - lame libmad libmpeg2 x264 + lame libmad libmpeg2 x264 mpg123 ] ++ libintlOrEmpty; NIX_LDFLAGS = if stdenv.isDarwin then "-lintl" else null; From 5291c2079b6241f7b18c04e9af6fe6d49ef948bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=A4in=C3=B6=20J=C3=A4rvel=C3=A4?= Date: Sat, 24 Feb 2018 07:53:35 +0200 Subject: [PATCH 055/814] glib-networking: Disable ca-certificates on Darwin macOS does not have certificates at /etc/ssl/certs. cacerts package has been deprecated. And there is a long standing issue at https://github.com/NixOS/nixpkgs/issues/8247 for figuring out how to handle certificates. Disabling glib-networking ca-certificates on Darwin removes constant warnings when opening remote connections. --- pkgs/development/libraries/glib-networking/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/glib-networking/default.nix b/pkgs/development/libraries/glib-networking/default.nix index 9336e5bbae91..954e5d1f6b5e 100644 --- a/pkgs/development/libraries/glib-networking/default.nix +++ b/pkgs/development/libraries/glib-networking/default.nix @@ -15,7 +15,8 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; # to deal with propagatedBuildInputs - configureFlags = "--with-ca-certificates=/etc/ssl/certs/ca-certificates.crt"; + configureFlags = if stdenv.isDarwin then "--without-ca-certificates" + else "--with-ca-certificates=/etc/ssl/certs/ca-certificates.crt"; LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-lintl"; From 8da9b485ec008c9c7c4adcfa604a289b3050c2c6 Mon Sep 17 00:00:00 2001 From: "Alexander V. Nikolaev" Date: Wed, 31 Jan 2018 16:50:24 +0200 Subject: [PATCH 056/814] mesa: provide default aliases for libGL/GLU Provide default aliases libGL, libGLU for using as default build time providers. This change shouldn't invalidate any hashes. --- pkgs/top-level/all-packages.nix | 33 ++++++++++++++++++++++++++++----- 1 file changed, 28 insertions(+), 5 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7e208b9c08c6..54666152c87c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10371,9 +10371,28 @@ with pkgs; mergerfs = callPackage ../tools/filesystems/mergerfs { }; + ## libGL/libGLU/Mesa stuff + + # Default libGL implementation, should provide headers and libGL.so/libEGL.so/... to link agains them + # Default implementation is `mesa`, but can be eventually replaced with `libglvnd`, + # or other runtime dispatcher + libGL = mesa_noglu; + + # Default libGLU + libGLU = mesa_glu; + + # Combined derivation, contains both libGL and libGLU + # Please, avoid using this attribute. It was meant as transitional hack + # for packages that assume that libGLU and libGL live in the same prefix. + # libGLU_combined propagates both libGL and libGLU + libGLU_combined = mesa; + + # Default derivation with libGL.so.1 to link into /run/opengl-drivers (if need) + libGL_driver = mesa_drivers; + mesaSupported = lib.elem system lib.platforms.mesaPlatforms; - mesaDarwinOr = alternative: if stdenv.isDarwin + libGLDarwinOr = alternative: if stdenv.isDarwin then callPackage ../development/libraries/mesa-darwin { inherit (darwin.apple_sdk.frameworks) OpenGL; inherit (darwin.apple_sdk.libs) Xplugin; @@ -10381,14 +10400,16 @@ with pkgs; } else alternative; - mesa_noglu = mesaDarwinOr (callPackage ../development/libraries/mesa { + # FIXME: should be `libGL = libGLDarwinOr mesa_nonglu` but this change cause mass rebuild, + # until all packages will refer to libGL/GLU/GLU combined + mesa_noglu = libGLDarwinOr (callPackage ../development/libraries/mesa { # makes it slower, but during runtime we link against just mesa_drivers # through /run/opengl-driver*, which is overriden according to config.grsecurity # grsecEnabled = true; # no more support in nixpkgs ATM }); - mesa_glu = mesaDarwinOr (callPackage ../development/libraries/mesa-glu { }); - mesa_drivers = mesaDarwinOr ( + mesa_glu = libGLDarwinOr (callPackage ../development/libraries/mesa-glu { }); + mesa_drivers = libGLDarwinOr ( let mo = mesa_noglu.override { grsecEnabled = config.grsecurity or false; enableTextureFloats = true; @@ -10400,7 +10421,7 @@ with pkgs; # for packages that assume that libGLU and libGL live in the same prefix. # Otherwise it's better to use mesa_glu or mesa_noglu, depending on whether # you need libGLU or not (_glu propagates _noglu). - mesa = mesaDarwinOr (buildEnv { + mesa = libGLDarwinOr (buildEnv { name = "mesa-${mesa_noglu.version}"; paths = [ mesa_noglu.dev mesa_noglu.out mesa_glu mesa_glu.dev ]; meta = { @@ -10408,6 +10429,8 @@ with pkgs; }; }); + ## End libGL/libGLU/Mesa stuff + meterbridge = callPackage ../applications/audio/meterbridge { }; mhddfs = callPackage ../tools/filesystems/mhddfs { }; From 8f2a22935c31140891591ed3bb3e6baf230bc4f0 Mon Sep 17 00:00:00 2001 From: "Alexander V. Nikolaev" Date: Sat, 24 Feb 2018 14:06:44 +0200 Subject: [PATCH 057/814] treewide: transition from mesa_noglu to libGL --- .../mozilla-plugins/google-talk-plugin/default.nix | 4 ++-- .../networking/instant-messengers/hipchat/default.nix | 4 ++-- pkgs/applications/video/natron/default.nix | 6 +++--- pkgs/applications/window-managers/compton/default.nix | 4 ++-- pkgs/desktops/maxx/default.nix | 4 ++-- pkgs/development/compilers/jetbrains-jdk/default.nix | 4 ++-- pkgs/development/compilers/oraclejdk/jdk-linux-base.nix | 4 ++-- pkgs/development/compilers/oraclejdk/jdk9-linux.nix | 4 ++-- pkgs/development/compilers/zulu/8.nix | 4 ++-- pkgs/development/compilers/zulu/default.nix | 4 ++-- pkgs/development/haskell-modules/configuration-nix.nix | 2 +- pkgs/development/libraries/SDL/default.nix | 4 ++-- pkgs/development/libraries/SDL2/default.nix | 6 +++--- pkgs/development/libraries/SDL2_ttf/default.nix | 4 ++-- pkgs/development/libraries/beignet/default.nix | 4 ++-- pkgs/development/libraries/cairo/default.nix | 6 +++--- pkgs/development/libraries/cogl/default.nix | 4 ++-- pkgs/development/libraries/freeglut/default.nix | 8 ++++---- pkgs/development/libraries/glfw/2.x.nix | 4 ++-- pkgs/development/libraries/glfw/3.x.nix | 4 ++-- pkgs/development/libraries/libdevil/default.nix | 4 ++-- pkgs/development/libraries/libva/default.nix | 6 +++--- pkgs/development/libraries/libvdpau/default.nix | 4 ++-- pkgs/development/libraries/ocl-icd/default.nix | 4 ++-- pkgs/development/libraries/opensubdiv/default.nix | 4 ++-- pkgs/development/libraries/pangolin/default.nix | 4 ++-- pkgs/development/libraries/vaapi-intel/default.nix | 4 ++-- pkgs/development/libraries/vulkan-loader/default.nix | 4 ++-- pkgs/development/libraries/wlc/default.nix | 4 ++-- pkgs/development/libraries/wlroots/default.nix | 4 ++-- pkgs/development/libraries/wxwidgets/2.8/default.nix | 6 +++--- pkgs/development/libraries/wxwidgets/2.9/default.nix | 6 +++--- pkgs/development/libraries/wxwidgets/3.0/default.nix | 6 +++--- pkgs/development/mobile/genymotion/default.nix | 4 ++-- pkgs/games/commandergenius/default.nix | 4 ++-- pkgs/games/dwarf-fortress/unfuck.nix | 4 ++-- pkgs/games/eternity-engine/default.nix | 4 ++-- pkgs/games/factorio/default.nix | 4 ++-- pkgs/games/gzdoom/default.nix | 4 ++-- pkgs/games/neverball/default.nix | 4 ++-- pkgs/games/openjk/default.nix | 4 ++-- pkgs/games/openmw/tes3mp.nix | 4 ++-- pkgs/games/openspades/default.nix | 4 ++-- pkgs/games/quake3/wrapper/default.nix | 4 ++-- pkgs/misc/emulators/openmsx/default.nix | 4 ++-- pkgs/misc/emulators/wine/base.nix | 2 +- pkgs/os-specific/linux/amdgpu-pro/default.nix | 4 ++-- pkgs/os-specific/linux/kmscube/default.nix | 4 ++-- pkgs/tools/graphics/asymptote/default.nix | 4 ++-- pkgs/tools/graphics/glxinfo/default.nix | 4 ++-- 50 files changed, 107 insertions(+), 107 deletions(-) diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix index 461db272b12e..f3c58725a7a9 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/google-talk-plugin/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, rpm, cpio, mesa_noglu, xorg, cairo +{ stdenv, fetchurl, rpm, cpio, libGL, xorg, cairo , libpng, gtk2, glib, gdk_pixbuf, fontconfig, freetype, curl , dbus_glib, alsaLib, libpulseaudio, systemd, pango }: @@ -10,7 +10,7 @@ let baseURL = "http://dl.google.com/linux/talkplugin/deb/pool/main/g/google-talkplugin"; rpathPlugin = makeLibraryPath - [ mesa_noglu + [ libGL xorg.libXt xorg.libX11 xorg.libXrender diff --git a/pkgs/applications/networking/instant-messengers/hipchat/default.nix b/pkgs/applications/networking/instant-messengers/hipchat/default.nix index 3caa75acb070..e24ea5e6fb37 100644 --- a/pkgs/applications/networking/instant-messengers/hipchat/default.nix +++ b/pkgs/applications/networking/instant-messengers/hipchat/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, xorg, freetype, fontconfig, openssl, glib, nss, nspr, expat , alsaLib, dbus, zlib, libxml2, libxslt, makeWrapper, xkeyboard_config, systemd -, mesa_noglu, xcbutilkeysyms, xdg_utils, libtool }: +, libGL, xcbutilkeysyms, xdg_utils, libtool }: let @@ -37,7 +37,7 @@ let expat xcbutilkeysyms systemd - mesa_noglu + libGL ] + ":${stdenv.cc.cc.lib}/lib64"; src = diff --git a/pkgs/applications/video/natron/default.nix b/pkgs/applications/video/natron/default.nix index 518cd3d94bac..1eb725d10bbc 100644 --- a/pkgs/applications/video/natron/default.nix +++ b/pkgs/applications/video/natron/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchurl, qt4, pkgconfig, boost, expat, cairo, python2Packages, cmake, flex, bison, pango, librsvg, librevenge, libxml2, libcdr, libzip, poppler, imagemagick, glew, openexr, ffmpeg, opencolorio, openimageio, - qmake4Hook, libpng, mesa_noglu, lndir }: + qmake4Hook, libpng, libGL, lndir }: let minorVersion = "2.1"; @@ -68,7 +68,7 @@ let sha256 = "0s196i9fkgr9iw92c94mxgs1lkxbhynkf83vmsgrldflmf0xjky7"; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - libpng ffmpeg openexr opencolorio openimageio boost mesa_noglu + libpng ffmpeg openexr opencolorio openimageio boost libGL seexpr ]; }) @@ -76,7 +76,7 @@ let pluginName = "misc"; sha256 = "02h79jrll0c17azxj16as1mks3lmypm4m3da4mms9sg31l3n82qi"; buildInputs = [ - mesa_noglu + libGL ]; preConfigure = '' cp ${CImgh} CImg/CImg.h diff --git a/pkgs/applications/window-managers/compton/default.nix b/pkgs/applications/window-managers/compton/default.nix index 17baffbe8c73..d79d8c3325d7 100644 --- a/pkgs/applications/window-managers/compton/default.nix +++ b/pkgs/applications/window-managers/compton/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, fetchFromGitHub, pkgconfig, asciidoc, docbook_xml_dtd_45 , docbook_xsl, libxslt, libxml2, makeWrapper -, dbus, libconfig, libdrm, mesa_noglu, pcre, libX11, libXcomposite, libXdamage +, dbus, libconfig, libdrm, libGL, pcre, libX11, libXcomposite, libXdamage , libXinerama, libXrandr, libXrender, libXext, xwininfo }: stdenv.mkDerivation rec { @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { pcre libconfig dbus - mesa_noglu + libGL ]; nativeBuildInputs = [ diff --git a/pkgs/desktops/maxx/default.nix b/pkgs/desktops/maxx/default.nix index 4a404b89ff6d..69d16c9b20a1 100644 --- a/pkgs/desktops/maxx/default.nix +++ b/pkgs/desktops/maxx/default.nix @@ -2,7 +2,7 @@ , libX11, libXext, libXi, libXau, libXrender, libXft, libXmu, libSM, libXcomposite, libXfixes, libXpm , libXinerama, libXdamage, libICE, libXtst, libXaw, fontconfig, pango, cairo, glib, libxml2, atk, gtk2 -, gdk_pixbuf, mesa_noglu, ncurses +, gdk_pixbuf, libGL, ncurses , xclock, xsettingsd }: @@ -12,7 +12,7 @@ let deps = [ stdenv.cc.cc libX11 libXext libXi libXau libXrender libXft libXmu libSM libXcomposite libXfixes libXpm libXinerama libXdamage libICE libXtst libXaw fontconfig pango cairo glib libxml2 atk gtk2 - gdk_pixbuf mesa_noglu ncurses + gdk_pixbuf libGL ncurses ]; runtime_deps = [ xclock xsettingsd diff --git a/pkgs/development/compilers/jetbrains-jdk/default.nix b/pkgs/development/compilers/jetbrains-jdk/default.nix index 7f23a4d507e7..604474e01fe9 100644 --- a/pkgs/development/compilers/jetbrains-jdk/default.nix +++ b/pkgs/development/compilers/jetbrains-jdk/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchurl, file, glib, libxml2, libav_0_8, ffmpeg, libxslt -, mesa_noglu , xorg, alsaLib, fontconfig, freetype, pango, gtk2, cairo +, libGL , xorg, alsaLib, fontconfig, freetype, pango, gtk2, cairo , gdk_pixbuf, atk }: # TODO: Investigate building from source instead of patching binaries. @@ -51,7 +51,7 @@ let drv = stdenv.mkDerivation rec { ''; rpath = lib.makeLibraryPath ([ - stdenv.cc.cc stdenv.cc.libc glib libxml2 libav_0_8 ffmpeg libxslt mesa_noglu + stdenv.cc.cc stdenv.cc.libc glib libxml2 libav_0_8 ffmpeg libxslt libGL alsaLib fontconfig freetype pango gtk2 cairo gdk_pixbuf atk ] ++ (with xorg; [ libX11 libXext libXtst libXi libXp libXt libXrender libXxf86vm diff --git a/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix b/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix index 04fe377fab3b..baa136b798d9 100644 --- a/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix +++ b/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix @@ -22,7 +22,7 @@ , libav_0_8 , ffmpeg , libxslt -, mesa_noglu +, libGL , freetype , fontconfig , gtk2 @@ -177,7 +177,7 @@ let result = stdenv.mkDerivation rec { * libXt is only needed on amd64 */ libraries = - [stdenv.cc.libc glib libxml2 libav_0_8 ffmpeg libxslt mesa_noglu xorg.libXxf86vm alsaLib fontconfig freetype pango gtk2 cairo gdk_pixbuf atk] ++ + [stdenv.cc.libc glib libxml2 libav_0_8 ffmpeg libxslt libGL xorg.libXxf86vm alsaLib fontconfig freetype pango gtk2 cairo gdk_pixbuf atk] ++ (if swingSupport then [xorg.libX11 xorg.libXext xorg.libXtst xorg.libXi xorg.libXp xorg.libXt xorg.libXrender stdenv.cc.cc] else []); rpath = stdenv.lib.strings.makeLibraryPath libraries; diff --git a/pkgs/development/compilers/oraclejdk/jdk9-linux.nix b/pkgs/development/compilers/oraclejdk/jdk9-linux.nix index f9b48f239fa7..87f2e49b4431 100644 --- a/pkgs/development/compilers/oraclejdk/jdk9-linux.nix +++ b/pkgs/development/compilers/oraclejdk/jdk9-linux.nix @@ -11,7 +11,7 @@ , libxml2 , ffmpeg_2 , libxslt -, mesa_noglu +, libGL , freetype , fontconfig , gtk2 @@ -136,7 +136,7 @@ let result = stdenv.mkDerivation rec { * libXt is only needed on amd64 */ libraries = - [stdenv.cc.libc glib libxml2 ffmpeg_2 libxslt mesa_noglu xorg.libXxf86vm alsaLib fontconfig freetype pango gtk2 cairo gdk_pixbuf atk zlib elfutils] ++ + [stdenv.cc.libc glib libxml2 ffmpeg_2 libxslt libGL xorg.libXxf86vm alsaLib fontconfig freetype pango gtk2 cairo gdk_pixbuf atk zlib elfutils] ++ (if swingSupport then [xorg.libX11 xorg.libXext xorg.libXtst xorg.libXi xorg.libXp xorg.libXt xorg.libXrender stdenv.cc.cc] else []); rpath = stdenv.lib.strings.makeLibraryPath libraries; diff --git a/pkgs/development/compilers/zulu/8.nix b/pkgs/development/compilers/zulu/8.nix index 1be0247c5ec3..23ae8ba06bb5 100644 --- a/pkgs/development/compilers/zulu/8.nix +++ b/pkgs/development/compilers/zulu/8.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchurl, unzip, makeWrapper, setJavaClassPath -, zulu, glib, libxml2, libav_0_8, ffmpeg, libxslt, mesa_noglu, alsaLib +, zulu, glib, libxml2, libav_0_8, ffmpeg, libxslt, libGL, alsaLib , fontconfig, freetype, gnome2, cairo, gdk_pixbuf, atk, xorg , swingSupport ? true }: @@ -15,7 +15,7 @@ let extension = if stdenv.isDarwin then "zip" else "tar.gz"; libraries = [ - stdenv.cc.libc glib libxml2 libav_0_8 ffmpeg libxslt mesa_noglu + stdenv.cc.libc glib libxml2 libav_0_8 ffmpeg libxslt libGL xorg.libXxf86vm alsaLib fontconfig freetype gnome2.pango gnome2.gtk cairo gdk_pixbuf atk ] ++ (lib.optionals swingSupport (with xorg; [ diff --git a/pkgs/development/compilers/zulu/default.nix b/pkgs/development/compilers/zulu/default.nix index 63551d282475..040af83ece20 100644 --- a/pkgs/development/compilers/zulu/default.nix +++ b/pkgs/development/compilers/zulu/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchurl, unzip, makeWrapper, setJavaClassPath -, zulu, glib, libxml2, libav_0_8, ffmpeg, libxslt, mesa_noglu, alsaLib +, zulu, glib, libxml2, libav_0_8, ffmpeg, libxslt, libGL, alsaLib , fontconfig, freetype, gnome2, cairo, gdk_pixbuf, atk, xorg, zlib , swingSupport ? true }: @@ -15,7 +15,7 @@ let extension = if stdenv.isDarwin then "zip" else "tar.gz"; libraries = [ - stdenv.cc.libc glib libxml2 libav_0_8 ffmpeg libxslt mesa_noglu + stdenv.cc.libc glib libxml2 libav_0_8 ffmpeg libxslt libGL xorg.libXxf86vm alsaLib fontconfig freetype gnome2.pango gnome2.gtk cairo gdk_pixbuf atk zlib ] ++ (lib.optionals swingSupport (with xorg; [ diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index edec2724d84d..03299d775f4f 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -350,7 +350,7 @@ self: super: builtins.intersectAttrs super { # https://github.com/deech/fltkhs/issues/16 fltkhs = overrideCabal super.fltkhs (drv: { libraryToolDepends = (drv.libraryToolDepends or []) ++ [pkgs.autoconf]; - librarySystemDepends = (drv.librarySystemDepends or []) ++ [pkgs.fltk13 pkgs.mesa_noglu pkgs.libjpeg]; + librarySystemDepends = (drv.librarySystemDepends or []) ++ [pkgs.fltk13 pkgs.libGL pkgs.libjpeg]; }); # https://github.com/skogsbaer/hscurses/pull/26 diff --git a/pkgs/development/libraries/SDL/default.nix b/pkgs/development/libraries/SDL/default.nix index 82051854799c..c1b1f244941a 100644 --- a/pkgs/development/libraries/SDL/default.nix +++ b/pkgs/development/libraries/SDL/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, fetchpatch, pkgconfig, audiofile, libcap, libiconv -, openglSupport ? false, mesa_noglu, mesa_glu +, openglSupport ? false, libGL, mesa_glu , alsaSupport ? true, alsaLib , x11Support ? hostPlatform == buildPlatform, libXext, libICE, libXrandr , pulseaudioSupport ? true, libpulseaudio @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { optionals x11Support [ libXext libICE libXrandr ] ++ optional alsaSupport alsaLib ++ optional stdenv.isLinux libcap ++ - optionals openglSupport [ mesa_noglu mesa_glu ] ++ + optionals openglSupport [ libGL mesa_glu ] ++ optional pulseaudioSupport libpulseaudio ++ optional stdenv.isDarwin Cocoa; diff --git a/pkgs/development/libraries/SDL2/default.nix b/pkgs/development/libraries/SDL2/default.nix index 6b6c9599c282..f87e1d5067da 100644 --- a/pkgs/development/libraries/SDL2/default.nix +++ b/pkgs/development/libraries/SDL2/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchurl, pkgconfig, audiofile -, openglSupport ? false, mesa_noglu +, openglSupport ? false, libGL , alsaSupport ? true, alsaLib , x11Support ? true, libICE, libXi, libXScrnSaver, libXcursor, libXinerama, libXext, libXxf86vm, libXrandr , waylandSupport ? true, wayland, wayland-protocols, libxkbcommon @@ -15,7 +15,7 @@ # PulseAudio. assert !stdenv.isDarwin -> alsaSupport || pulseaudioSupport; -assert openglSupport -> (stdenv.isDarwin || mesa_noglu != null && x11Support); +assert openglSupport -> (stdenv.isDarwin || libGL != null && x11Support); let configureFlagsFun = attrs: [ @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { ++ [ libiconv ]; buildInputs = [ audiofile ] ++ - lib.optional openglSupport mesa_noglu ++ + lib.optional openglSupport libGL ++ lib.optional alsaSupport alsaLib ++ lib.optional dbusSupport dbus ++ lib.optional udevSupport udev ++ diff --git a/pkgs/development/libraries/SDL2_ttf/default.nix b/pkgs/development/libraries/SDL2_ttf/default.nix index 87436119ef47..4558317ce3e3 100644 --- a/pkgs/development/libraries/SDL2_ttf/default.nix +++ b/pkgs/development/libraries/SDL2_ttf/default.nix @@ -1,4 +1,4 @@ -{ stdenv, darwin, fetchurl, SDL2, freetype, mesa_noglu }: +{ stdenv, darwin, fetchurl, SDL2, freetype, libGL }: stdenv.mkDerivation rec { name = "SDL2_ttf-${version}"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "0xljwcpvd2knrjdfag5b257xqayplz55mqlszrqp0kpnphh5xnrl"; }; - buildInputs = [ SDL2 freetype mesa_noglu ] + buildInputs = [ SDL2 freetype libGL ] ++ stdenv.lib.optional stdenv.isDarwin darwin.libobjc; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/beignet/default.nix b/pkgs/development/libraries/beignet/default.nix index 2484e287016b..02c67d7dbf8b 100644 --- a/pkgs/development/libraries/beignet/default.nix +++ b/pkgs/development/libraries/beignet/default.nix @@ -12,7 +12,7 @@ , libXext , python3 , ocl-icd -, mesa_noglu +, libGL , makeWrapper , beignet }: @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { libXdmcp libXdamage ocl-icd - mesa_noglu + libGL ]; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/cairo/default.nix b/pkgs/development/libraries/cairo/default.nix index 7c0e36d40689..64b86d66913c 100644 --- a/pkgs/development/libraries/cairo/default.nix +++ b/pkgs/development/libraries/cairo/default.nix @@ -2,12 +2,12 @@ , libintlOrEmpty, expat, zlib, libpng, pixman, fontconfig, freetype, xorg , gobjectSupport ? true, glib , xcbSupport ? true # no longer experimental since 1.12 -, glSupport ? true, mesa_noglu ? null # mesa is no longer a big dependency +, glSupport ? true, libGL ? null # mesa is no longer a big dependency , pdfSupport ? true , darwin }: -assert glSupport -> mesa_noglu != null; +assert glSupport -> libGL != null; let inherit (stdenv.lib) optional optionals; in @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { with xorg; [ libXext fontconfig expat freetype pixman zlib libpng libXrender ] ++ optionals xcbSupport [ libxcb xcbutil ] ++ optional gobjectSupport glib - ++ optional glSupport mesa_noglu + ++ optional glSupport libGL ; # TODO: maybe liblzo but what would it be for here? configureFlags = if stdenv.isDarwin then [ diff --git a/pkgs/development/libraries/cogl/default.nix b/pkgs/development/libraries/cogl/default.nix index 1ac34f7608bc..08d208fa1fe3 100644 --- a/pkgs/development/libraries/cogl/default.nix +++ b/pkgs/development/libraries/cogl/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, mesa_noglu, glib, gdk_pixbuf, xorg, libintlOrEmpty +{ stdenv, fetchurl, pkgconfig, libGL, glib, gdk_pixbuf, xorg, libintlOrEmpty , pangoSupport ? true, pango, cairo, gobjectIntrospection, wayland , gstreamerSupport ? true, gst_all_1 }: @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = with xorg; [ glib gdk_pixbuf gobjectIntrospection wayland - mesa_noglu libXrandr libXfixes libXcomposite libXdamage + libGL libXrandr libXfixes libXcomposite libXdamage ] ++ libintlOrEmpty ++ stdenv.lib.optionals gstreamerSupport [ gst_all_1.gstreamer diff --git a/pkgs/development/libraries/freeglut/default.nix b/pkgs/development/libraries/freeglut/default.nix index 6737e059b212..954af72f9c15 100644 --- a/pkgs/development/libraries/freeglut/default.nix +++ b/pkgs/development/libraries/freeglut/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libXi, libXrandr, libXxf86vm, mesa_noglu, mesa_glu, xlibsWrapper, cmake }: +{ stdenv, fetchurl, libXi, libXrandr, libXxf86vm, libGL, mesa_glu, xlibsWrapper, cmake }: let version = "3.0.0"; in stdenv.mkDerivation { @@ -11,11 +11,11 @@ in stdenv.mkDerivation { outputs = [ "out" "dev" ]; - buildInputs = [ libXi libXrandr libXxf86vm mesa_noglu mesa_glu xlibsWrapper cmake ]; + buildInputs = [ libXi libXrandr libXxf86vm libGL mesa_glu xlibsWrapper cmake ]; cmakeFlags = stdenv.lib.optionals stdenv.isDarwin [ - "-DOPENGL_INCLUDE_DIR=${mesa_noglu}/include" - "-DOPENGL_gl_LIBRARY:FILEPATH=${mesa_noglu}/lib/libGL.dylib" + "-DOPENGL_INCLUDE_DIR=${libGL}/include" + "-DOPENGL_gl_LIBRARY:FILEPATH=${libGL}/lib/libGL.dylib" "-DOPENGL_glu_LIBRARY:FILEPATH=${mesa_glu}/lib/libGLU.dylib" "-DFREEGLUT_BUILD_DEMOS:BOOL=OFF" "-DFREEGLUT_BUILD_STATIC:BOOL=OFF" diff --git a/pkgs/development/libraries/glfw/2.x.nix b/pkgs/development/libraries/glfw/2.x.nix index a017ff3d988c..a4f14c9a0147 100644 --- a/pkgs/development/libraries/glfw/2.x.nix +++ b/pkgs/development/libraries/glfw/2.x.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, mesa_glu, mesa_noglu, libX11, libXext }: +{ stdenv, fetchurl, mesa_glu, libGL, libX11, libXext }: stdenv.mkDerivation rec { name = "glfw-2.7.9"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "17c2msdcb7pn3p8f83805h1c216bmdqnbn9hgzr1j8wnwjcpxx6i"; }; - buildInputs = [ mesa_glu mesa_noglu libX11 libXext ]; + buildInputs = [ mesa_glu libGL libX11 libXext ]; buildPhase = '' make x11 diff --git a/pkgs/development/libraries/glfw/3.x.nix b/pkgs/development/libraries/glfw/3.x.nix index c10b3c05986a..8d4d4d10038a 100644 --- a/pkgs/development/libraries/glfw/3.x.nix +++ b/pkgs/development/libraries/glfw/3.x.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, cmake, mesa_noglu, libXrandr, libXinerama, libXcursor, libX11 +{ stdenv, lib, fetchFromGitHub, cmake, libGL, libXrandr, libXinerama, libXcursor, libX11 , darwin, fixDarwinDylibNames }: @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - propagatedBuildInputs = [ mesa_noglu ]; + propagatedBuildInputs = [ libGL ]; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/libdevil/default.nix b/pkgs/development/libraries/libdevil/default.nix index 20e74cdc1517..f88d20bee703 100644 --- a/pkgs/development/libraries/libdevil/default.nix +++ b/pkgs/development/libraries/libdevil/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libjpeg, libpng, libmng, lcms1, libtiff, openexr, mesa_noglu +{ stdenv, fetchurl, libjpeg, libpng, libmng, lcms1, libtiff, openexr, libGL , libX11, pkgconfig, OpenGL }: @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; - buildInputs = [ libjpeg libpng libmng lcms1 libtiff openexr mesa_noglu libX11 ] + buildInputs = [ libjpeg libpng libmng lcms1 libtiff openexr libGL libX11 ] ++ stdenv.lib.optionals stdenv.isDarwin [ OpenGL ]; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/libva/default.nix b/pkgs/development/libraries/libva/default.nix index dca548a6f9d0..7979eaec7742 100644 --- a/pkgs/development/libraries/libva/default.nix +++ b/pkgs/development/libraries/libva/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, fetchFromGitHub, autoreconfHook, pkgconfig , libXext, libdrm, libXfixes, wayland, libffi, libX11 -, mesa_noglu +, libGL , minimal ? true, libva }: @@ -20,13 +20,13 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook pkgconfig ]; buildInputs = [ libdrm ] - ++ lib.optionals (!minimal) [ libva libX11 libXext libXfixes wayland libffi mesa_noglu ]; + ++ lib.optionals (!minimal) [ libva libX11 libXext libXfixes wayland libffi libGL ]; # TODO: share libs between minimal and !minimal - perhaps just symlink them enableParallelBuilding = true; configureFlags = [ - "--with-drivers-path=${mesa_noglu.driverLink}/lib/dri" + "--with-drivers-path=${libGL.driverLink}/lib/dri" ] ++ lib.optionals (!minimal) [ "--enable-glx" ]; installFlags = [ diff --git a/pkgs/development/libraries/libvdpau/default.nix b/pkgs/development/libraries/libvdpau/default.nix index eccee83fa85e..eebdc2941974 100644 --- a/pkgs/development/libraries/libvdpau/default.nix +++ b/pkgs/development/libraries/libvdpau/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, xorg, mesa_noglu }: +{ stdenv, fetchurl, pkgconfig, xorg, libGL }: stdenv.mkDerivation rec { name = "libvdpau-1.1.1"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ xorg.libX11 ]; configureFlags = stdenv.lib.optional stdenv.isLinux - "--with-module-dir=${mesa_noglu.driverLink}/lib/vdpau"; + "--with-module-dir=${libGL.driverLink}/lib/vdpau"; installFlags = [ "moduledir=$(out)/lib/vdpau" ]; diff --git a/pkgs/development/libraries/ocl-icd/default.nix b/pkgs/development/libraries/ocl-icd/default.nix index 75dda07494d9..afd2a7b12dfa 100644 --- a/pkgs/development/libraries/ocl-icd/default.nix +++ b/pkgs/development/libraries/ocl-icd/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, ruby, opencl-headers, mesa_noglu }: +{stdenv, fetchurl, ruby, opencl-headers, libGL }: stdenv.mkDerivation rec { name = "ocl-icd-${version}"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { buildInputs = [ opencl-headers ]; postPatch = '' - sed -i 's,"/etc/OpenCL/vendors","${mesa_noglu.driverLink}/etc/OpenCL/vendors",g' ocl_icd_loader.c + sed -i 's,"/etc/OpenCL/vendors","${libGL.driverLink}/etc/OpenCL/vendors",g' ocl_icd_loader.c ''; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/opensubdiv/default.nix b/pkgs/development/libraries/opensubdiv/default.nix index 91899ad8da43..e79c0e4e436d 100644 --- a/pkgs/development/libraries/opensubdiv/default.nix +++ b/pkgs/development/libraries/opensubdiv/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, fetchFromGitHub, cmake, pkgconfig, xorg, mesa_glu -, mesa_noglu, glew, ocl-icd, python3 +, libGL, glew, ocl-icd, python3 , cudaSupport ? false, cudatoolkit }: @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; buildInputs = - [ cmake pkgconfig mesa_glu mesa_noglu ocl-icd python3 + [ cmake pkgconfig mesa_glu libGL ocl-icd python3 # FIXME: these are not actually needed, but the configure script wants them. glew xorg.libX11 xorg.libXrandr xorg.libXxf86vm xorg.libXcursor xorg.libXinerama xorg.libXi diff --git a/pkgs/development/libraries/pangolin/default.nix b/pkgs/development/libraries/pangolin/default.nix index 09cbd86eb92b..6fb123f50949 100644 --- a/pkgs/development/libraries/pangolin/default.nix +++ b/pkgs/development/libraries/pangolin/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, cmake, pkgconfig, doxygen, mesa_noglu, glew +{ stdenv, lib, fetchFromGitHub, cmake, pkgconfig, doxygen, libGL, glew , xorg , ffmpeg, python3 , libjpeg, libpng, libtiff, eigen , Carbon ? null, Cocoa ? null }: @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkgconfig doxygen ]; buildInputs = [ - mesa_noglu + libGL glew xorg.libX11 ffmpeg diff --git a/pkgs/development/libraries/vaapi-intel/default.nix b/pkgs/development/libraries/vaapi-intel/default.nix index 7bd036cf2e5a..a784461c96bc 100644 --- a/pkgs/development/libraries/vaapi-intel/default.nix +++ b/pkgs/development/libraries/vaapi-intel/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, autoreconfHook, gnum4, pkgconfig, python2 -, intel-gpu-tools, libdrm, libva, libX11, mesa_noglu, wayland, libXext +, intel-gpu-tools, libdrm, libva, libX11, libGL, wayland, libXext }: stdenv.mkDerivation rec { @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook gnum4 pkgconfig python2 ]; - buildInputs = [ intel-gpu-tools libdrm libva libX11 libXext mesa_noglu wayland ]; + buildInputs = [ intel-gpu-tools libdrm libva libX11 libXext libGL wayland ]; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/vulkan-loader/default.nix b/pkgs/development/libraries/vulkan-loader/default.nix index 5110dd1db647..4bc642030517 100644 --- a/pkgs/development/libraries/vulkan-loader/default.nix +++ b/pkgs/development/libraries/vulkan-loader/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchgit, fetchFromGitHub, cmake, pkgconfig, git, python3, python3Packages, glslang, spirv-tools, x11, libxcb, libXrandr, - libXext, wayland, mesa_noglu, makeWrapper }: + libXext, wayland, libGL, makeWrapper }: let version = "1.0.61.1"; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DBUILD_WSI_MIR_SUPPORT=OFF" - "-DFALLBACK_DATA_DIRS=${mesa_noglu.driverLink}/share:/usr/local/share:/usr/share" + "-DFALLBACK_DATA_DIRS=${libGL.driverLink}/share:/usr/local/share:/usr/share" ]; outputs = [ "out" "dev" "demos" ]; diff --git a/pkgs/development/libraries/wlc/default.nix b/pkgs/development/libraries/wlc/default.nix index 02066253d0f9..846e710b0a48 100644 --- a/pkgs/development/libraries/wlc/default.nix +++ b/pkgs/development/libraries/wlc/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, fetchpatch, cmake, pkgconfig -, wayland, pixman, libxkbcommon, libinput, xcbutilwm, xcbutilimage, mesa_noglu +, wayland, pixman, libxkbcommon, libinput, xcbutilwm, xcbutilimage, libGL , libX11, dbus_libs, wayland-protocols , libpthreadstubs, libXdmcp, libXext , withOptionalPackages ? true, zlib, valgrind, doxygen @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkgconfig ]; buildInputs = [ - wayland pixman libxkbcommon libinput xcbutilwm xcbutilimage mesa_noglu + wayland pixman libxkbcommon libinput xcbutilwm xcbutilimage libGL libX11 dbus_libs wayland-protocols libpthreadstubs libXdmcp libXext ] ++ stdenv.lib.optionals withOptionalPackages [ zlib valgrind doxygen ]; diff --git a/pkgs/development/libraries/wlroots/default.nix b/pkgs/development/libraries/wlroots/default.nix index c32f0a3b9384..a5ec872c3602 100644 --- a/pkgs/development/libraries/wlroots/default.nix +++ b/pkgs/development/libraries/wlroots/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, meson, ninja, pkgconfig -, wayland, mesa_noglu, wayland-protocols, libinput, libxkbcommon, pixman +, wayland, libGL, wayland-protocols, libinput, libxkbcommon, pixman , xcbutilwm, libX11, libcap, xcbutilimage }: @@ -24,7 +24,7 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja pkgconfig ]; buildInputs = [ - wayland mesa_noglu wayland-protocols libinput libxkbcommon pixman + wayland libGL wayland-protocols libinput libxkbcommon pixman xcbutilwm libX11 libcap xcbutilimage ]; diff --git a/pkgs/development/libraries/wxwidgets/2.8/default.nix b/pkgs/development/libraries/wxwidgets/2.8/default.nix index 9ce8e95d9e94..35fc07b249b6 100644 --- a/pkgs/development/libraries/wxwidgets/2.8/default.nix +++ b/pkgs/development/libraries/wxwidgets/2.8/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl, pkgconfig, gtk2, libXinerama, libSM, libXxf86vm, xf86vidmodeproto , gstreamer, gst-plugins-base, GConf, libX11, cairo -, withMesa ? true, mesa_glu ? null, mesa_noglu ? null +, withMesa ? true, mesa_glu ? null, libGL ? null , compat24 ? false, compat26 ? true, unicode ? true, }: -assert withMesa -> mesa_glu != null && mesa_noglu != null; +assert withMesa -> mesa_glu != null && libGL != null; with stdenv.lib; @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { "${libXinerama.dev}/include ${libSM.dev}/include ${libXxf86vm.dev}/include"; SEARCH_LIB = "${libXinerama.out}/lib ${libSM.out}/lib ${libXxf86vm.out}/lib " - + optionalString withMesa "${mesa_glu.out}/lib ${mesa_noglu.out}/lib "; + + optionalString withMesa "${mesa_glu.out}/lib ${libGL.out}/lib "; # Work around a bug in configure. NIX_CFLAGS_COMPILE = [ "-DHAVE_X11_XLIB_H=1" "-lX11" "-lcairo" "-Wno-narrowing" ]; diff --git a/pkgs/development/libraries/wxwidgets/2.9/default.nix b/pkgs/development/libraries/wxwidgets/2.9/default.nix index 6230536b33ab..64c486819cc9 100644 --- a/pkgs/development/libraries/wxwidgets/2.9/default.nix +++ b/pkgs/development/libraries/wxwidgets/2.9/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, gtk2, libXinerama, libSM, libXxf86vm, xf86vidmodeproto , gstreamer, gst-plugins-base, GConf, setfile -, withMesa ? true, mesa_glu ? null, mesa_noglu ? null +, withMesa ? true, mesa_glu ? null, libGL ? null , compat24 ? false, compat26 ? true, unicode ? true , Carbon ? null, Cocoa ? null, Kernel ? null, QuickTime ? null, AGL ? null }: -assert withMesa -> mesa_glu != null && mesa_noglu != null; +assert withMesa -> mesa_glu != null && libGL != null; with stdenv.lib; @@ -48,7 +48,7 @@ stdenv.mkDerivation { # allow building on 64-bit [ "--with-cocoa" "--enable-universal-binaries" "--with-macosx-version-min=10.7" ]; - SEARCH_LIB = "${mesa_glu.out}/lib ${mesa_noglu.out}/lib "; + SEARCH_LIB = "${mesa_glu.out}/lib ${libGL.out}/lib "; preConfigure = " substituteInPlace configure --replace 'SEARCH_INCLUDE=' 'DUMMY_SEARCH_INCLUDE=' diff --git a/pkgs/development/libraries/wxwidgets/3.0/default.nix b/pkgs/development/libraries/wxwidgets/3.0/default.nix index 951f27f7d547..c96d2eb8661a 100644 --- a/pkgs/development/libraries/wxwidgets/3.0/default.nix +++ b/pkgs/development/libraries/wxwidgets/3.0/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, fetchurl, fetchpatch, pkgconfig , gtk2, gtk3, libXinerama, libSM, libXxf86vm , xf86vidmodeproto , gstreamer, gst-plugins-base, GConf, setfile -, withMesa ? true, mesa_glu ? null, mesa_noglu ? null +, withMesa ? true, mesa_glu ? null, libGL ? null , compat24 ? false, compat26 ? true, unicode ? true , withGtk2 ? true , withWebKit ? false, webkitgtk24x-gtk2 ? null, webkitgtk218x ? null @@ -9,7 +9,7 @@ }: -assert withMesa -> mesa_glu != null && mesa_noglu != null; +assert withMesa -> mesa_glu != null && libGL != null; assert withWebKit -> (if withGtk2 then webkitgtk24x-gtk2 else webkitgtk218x) != null; with stdenv.lib; @@ -62,7 +62,7 @@ stdenv.mkDerivation { ++ optionals withWebKit ["--enable-webview" "--enable-webview-webkit"]; - SEARCH_LIB = "${mesa_glu.out}/lib ${mesa_noglu.out}/lib "; + SEARCH_LIB = "${mesa_glu.out}/lib ${libGL.out}/lib "; preConfigure = " substituteInPlace configure --replace 'SEARCH_INCLUDE=' 'DUMMY_SEARCH_INCLUDE=' diff --git a/pkgs/development/mobile/genymotion/default.nix b/pkgs/development/mobile/genymotion/default.nix index 745111171bb6..db3cb07765b9 100644 --- a/pkgs/development/mobile/genymotion/default.nix +++ b/pkgs/development/mobile/genymotion/default.nix @@ -1,4 +1,4 @@ -{ stdenv, requireFile, makeWrapper, which, zlib, mesa_noglu, glib, xorg, libxkbcommon +{ stdenv, requireFile, makeWrapper, which, zlib, libGL, glib, xorg, libxkbcommon , xdg_utils # For glewinfo , libXmu, libXi, libXext }: @@ -7,7 +7,7 @@ let packages = [ stdenv.cc.cc zlib glib xorg.libX11 libxkbcommon libXmu libXi libXext ]; - libPath = "${stdenv.lib.makeLibraryPath packages}:${mesa_noglu.driverLink}/lib"; + libPath = "${stdenv.lib.makeLibraryPath packages}:${libGL.driverLink}/lib"; in stdenv.mkDerivation rec { name = "genymotion-${version}"; diff --git a/pkgs/games/commandergenius/default.nix b/pkgs/games/commandergenius/default.nix index b2a0b2884254..f77dfe8ba945 100644 --- a/pkgs/games/commandergenius/default.nix +++ b/pkgs/games/commandergenius/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, SDL2, SDL2_image, pkgconfig -, libvorbis, mesa_noglu, boost, cmake }: +, libvorbis, libGL, boost, cmake }: stdenv.mkDerivation rec { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "07vxg8p1dnnkajzs5nifxpwn4mdd1hxsw05jl25gvaimpl9p2qc8"; }; - buildInputs = [ SDL2 SDL2_image mesa_noglu boost libvorbis ]; + buildInputs = [ SDL2 SDL2_image libGL boost libvorbis ]; nativeBuildInputs = [ cmake pkgconfig ]; diff --git a/pkgs/games/dwarf-fortress/unfuck.nix b/pkgs/games/dwarf-fortress/unfuck.nix index 8d7a5a0d1a9d..89e98f4b4518 100644 --- a/pkgs/games/dwarf-fortress/unfuck.nix +++ b/pkgs/games/dwarf-fortress/unfuck.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, cmake -, mesa_noglu, libSM, SDL, SDL_image, SDL_ttf, glew, openalSoft +, libGL, libSM, SDL, SDL_image, SDL_ttf, glew, openalSoft , ncurses, glib, gtk2, libsndfile, zlib }: @@ -23,7 +23,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ cmake ]; buildInputs = [ libSM SDL SDL_image SDL_ttf glew openalSoft - ncurses gtk2 libsndfile zlib mesa_noglu + ncurses gtk2 libsndfile zlib libGL ]; installPhase = '' diff --git a/pkgs/games/eternity-engine/default.nix b/pkgs/games/eternity-engine/default.nix index 453afe9e985b..911308a078a5 100644 --- a/pkgs/games/eternity-engine/default.nix +++ b/pkgs/games/eternity-engine/default.nix @@ -1,4 +1,4 @@ -{ stdenv, cmake, mesa_noglu, SDL, SDL_mixer, SDL_net, fetchFromGitHub, makeWrapper }: +{ stdenv, cmake, libGL, SDL, SDL_mixer, SDL_net, fetchFromGitHub, makeWrapper }: stdenv.mkDerivation rec { name = "eternity-engine-${version}"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ cmake makeWrapper ]; - buildInputs = [ mesa_noglu SDL SDL_mixer SDL_net ]; + buildInputs = [ libGL SDL SDL_mixer SDL_net ]; enableParallelBuilding = true; diff --git a/pkgs/games/factorio/default.nix b/pkgs/games/factorio/default.nix index 6a5cea0634da..b3319bae9733 100644 --- a/pkgs/games/factorio/default.nix +++ b/pkgs/games/factorio/default.nix @@ -1,5 +1,5 @@ { stdenv, callPackage, fetchurl, makeWrapper -, alsaLib, libX11, libXcursor, libXinerama, libXrandr, libXi, mesa_noglu +, alsaLib, libX11, libXcursor, libXinerama, libXrandr, libXi, libGL , factorio-utils , releaseType , mods ? [] @@ -140,7 +140,7 @@ let libXinerama libXrandr libXi - mesa_noglu + libGL ]; installPhase = base.installPhase + '' diff --git a/pkgs/games/gzdoom/default.nix b/pkgs/games/gzdoom/default.nix index 2110dfee11ef..459c75ac290e 100644 --- a/pkgs/games/gzdoom/default.nix +++ b/pkgs/games/gzdoom/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, cmake, zdoom, makeWrapper -, openal, fluidsynth, soundfont-fluid, mesa_noglu, SDL2 +, openal, fluidsynth, soundfont-fluid, libGL, SDL2 , bzip2, zlib, libjpeg, libsndfile, mpg123, game-music-emu }: stdenv.mkDerivation rec { @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake makeWrapper ]; buildInputs = [ - SDL2 mesa_noglu openal fluidsynth bzip2 zlib libjpeg libsndfile mpg123 + SDL2 libGL openal fluidsynth bzip2 zlib libjpeg libsndfile mpg123 game-music-emu ]; diff --git a/pkgs/games/neverball/default.nix b/pkgs/games/neverball/default.nix index 62d89c7c31e5..50f96a7ee2c8 100644 --- a/pkgs/games/neverball/default.nix +++ b/pkgs/games/neverball/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, SDL2, mesa_noglu, libpng, libjpeg, SDL2_ttf, libvorbis, gettext +{ stdenv, fetchurl, SDL2, libGL, libpng, libjpeg, SDL2_ttf, libvorbis, gettext , physfs }: stdenv.mkDerivation rec { @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "184gm36c6p6vaa6gwrfzmfh86klhnb03pl40ahsjsvprlk667zkk"; }; - buildInputs = [ libpng SDL2 mesa_noglu libjpeg SDL2_ttf libvorbis gettext physfs ]; + buildInputs = [ libpng SDL2 libGL libjpeg SDL2_ttf libvorbis gettext physfs ]; dontPatchElf = true; diff --git a/pkgs/games/openjk/default.nix b/pkgs/games/openjk/default.nix index c65dad7bd4fa..fd662fe9743e 100644 --- a/pkgs/games/openjk/default.nix +++ b/pkgs/games/openjk/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, makeDesktopItem, makeWrapper, cmake, libjpeg, zlib, libpng, mesa_noglu, SDL2 }: +{ stdenv, fetchFromGitHub, makeDesktopItem, makeWrapper, cmake, libjpeg, zlib, libpng, libGL, SDL2 }: let jamp = makeDesktopItem rec { @@ -33,7 +33,7 @@ in stdenv.mkDerivation rec { enableParallelBuilding = true; nativeBuildInputs = [ makeWrapper cmake ]; - buildInputs = [ libjpeg zlib libpng mesa_noglu SDL2 ]; + buildInputs = [ libjpeg zlib libpng libGL SDL2 ]; # move from $out/JediAcademy to $out/opt/JediAcademy preConfigure = '' diff --git a/pkgs/games/openmw/tes3mp.nix b/pkgs/games/openmw/tes3mp.nix index cb9e296cdd4f..aba92ac087e8 100644 --- a/pkgs/games/openmw/tes3mp.nix +++ b/pkgs/games/openmw/tes3mp.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, qtbase, openscenegraph, mygui, bullet, ffmpeg, boost, cmake, SDL2, unshield, openal -, libXt, writeScriptBin, makeWrapper, symlinkJoin, ncurses, mesa_noglu, terra }: +, libXt, writeScriptBin, makeWrapper, symlinkJoin, ncurses, libGL, terra }: let mygui_ = mygui.override { @@ -58,7 +58,7 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ cmake makeWrapper fakegit ]; buildInputs = [ boost ffmpeg qtbase bullet mygui_ openscenegraph SDL2 unshield openal libXt - ncurses mesa_noglu ]; + ncurses libGL ]; buildPhase = '' mkdir dependencies keepers diff --git a/pkgs/games/openspades/default.nix b/pkgs/games/openspades/default.nix index 02e4e9c608f0..0da2b24b3a20 100644 --- a/pkgs/games/openspades/default.nix +++ b/pkgs/games/openspades/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchurl, fetchFromGitHub, cmake, unzip, zip, file -, curl, glew , mesa_noglu, SDL2, SDL2_image, zlib, freetype, imagemagick +, curl, glew , libGL, SDL2, SDL2_image, zlib, freetype, imagemagick , openal , opusfile, libogg }: @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake imagemagick unzip zip file ]; buildInputs = [ - freetype SDL2 SDL2_image mesa_noglu zlib curl glew opusfile openal libogg + freetype SDL2 SDL2_image libGL zlib curl glew opusfile openal libogg ]; cmakeFlags = [ diff --git a/pkgs/games/quake3/wrapper/default.nix b/pkgs/games/quake3/wrapper/default.nix index 5f65d26140c8..69b166664be4 100644 --- a/pkgs/games/quake3/wrapper/default.nix +++ b/pkgs/games/quake3/wrapper/default.nix @@ -1,9 +1,9 @@ -{ stdenv, buildEnv, lib, fetchurl, mesa_noglu, ioquake3, makeWrapper }: +{ stdenv, buildEnv, lib, fetchurl, libGL, ioquake3, makeWrapper }: { paks, name ? (stdenv.lib.head paks).name, description ? "" }: let - libPath = lib.makeLibraryPath [ mesa_noglu stdenv.cc.cc ]; + libPath = lib.makeLibraryPath [ libGL stdenv.cc.cc ]; env = buildEnv { name = "quake3-env"; paths = [ ioquake3 ] ++ paks; diff --git a/pkgs/misc/emulators/openmsx/default.nix b/pkgs/misc/emulators/openmsx/default.nix index bb954582de5d..d2539cbc8171 100644 --- a/pkgs/misc/emulators/openmsx/default.nix +++ b/pkgs/misc/emulators/openmsx/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, pkgconfig , python -, alsaLib, glew, mesa_noglu, libpng +, alsaLib, glew, libGL, libpng , libogg, libtheora, libvorbis , SDL, SDL_image, SDL_ttf , freetype, tcl, zlib @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig python ]; - buildInputs = [ alsaLib glew mesa_noglu libpng + buildInputs = [ alsaLib glew libGL libpng libogg libtheora libvorbis freetype SDL SDL_image SDL_ttf tcl zlib ]; diff --git a/pkgs/misc/emulators/wine/base.nix b/pkgs/misc/emulators/wine/base.nix index 82e2384cf0bd..a09274804440 100644 --- a/pkgs/misc/emulators/wine/base.nix +++ b/pkgs/misc/emulators/wine/base.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation ((lib.optionalAttrs (! isNull buildScript) { ++ lib.optionals openclSupport [ pkgs.opencl-headers pkgs.ocl-icd ] ++ lib.optionals xmlSupport [ pkgs.libxml2 pkgs.libxslt ] ++ lib.optionals tlsSupport [ pkgs.openssl pkgs.gnutls ] - ++ lib.optionals openglSupport [ pkgs.mesa pkgs.mesa_noglu.osmesa pkgs.libdrm ] + ++ lib.optionals openglSupport [ pkgs.mesa pkgs.libGL.osmesa pkgs.libdrm ] ++ (with pkgs.xorg; [ libX11 libXi libXcursor libXrandr libXrender libXxf86vm libXcomposite libXext ]))); diff --git a/pkgs/os-specific/linux/amdgpu-pro/default.nix b/pkgs/os-specific/linux/amdgpu-pro/default.nix index e7825a0ebd69..0272eccd800e 100644 --- a/pkgs/os-specific/linux/amdgpu-pro/default.nix +++ b/pkgs/os-specific/linux/amdgpu-pro/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, elfutils, mesa_noglu +{ stdenv, fetchurl, elfutils, libGL , xorg, patchelf, openssl, libdrm, libudev , libxcb, libxshmfence, epoxy, perl, zlib , fetchFromGitHub, ncurses @@ -13,7 +13,7 @@ let kernelDir = if libsOnly then null else kernel.dev; - inherit (mesa_noglu) driverLink; + inherit (libGL) driverLink; bitness = if stdenv.is64bit then "64" else "32"; diff --git a/pkgs/os-specific/linux/kmscube/default.nix b/pkgs/os-specific/linux/kmscube/default.nix index c1389f30b059..6c16803b5090 100644 --- a/pkgs/os-specific/linux/kmscube/default.nix +++ b/pkgs/os-specific/linux/kmscube/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, autoreconfHook, libdrm, libX11, mesa_noglu, pkgconfig }: +{ stdenv, fetchgit, autoreconfHook, libdrm, libX11, libGL, pkgconfig }: stdenv.mkDerivation rec { name = "kmscube-2017-03-19"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; - buildInputs = [ libdrm libX11 mesa_noglu ]; + buildInputs = [ libdrm libX11 libGL ]; meta = with stdenv.lib; { description = "Example OpenGL app using KMS/GBM"; diff --git a/pkgs/tools/graphics/asymptote/default.nix b/pkgs/tools/graphics/asymptote/default.nix index 6c6a93dc73ac..40f4dc89366e 100644 --- a/pkgs/tools/graphics/asymptote/default.nix +++ b/pkgs/tools/graphics/asymptote/default.nix @@ -1,6 +1,6 @@ {stdenv, fetchurl , freeglut, ghostscriptX, imagemagick, fftw - , boehmgc, mesa_glu, mesa_noglu, ncurses, readline, gsl, libsigsegv + , boehmgc, mesa_glu, libGL, ncurses, readline, gsl, libsigsegv , python, zlib, perl, texLive, texinfo, xz , darwin }: @@ -20,7 +20,7 @@ let boehmgc ncurses readline gsl libsigsegv python zlib perl texLive texinfo xz ] ++ stdenv.lib.optionals stdenv.isLinux - [ freeglut mesa_glu mesa_noglu mesa_noglu.osmesa ] + [ freeglut mesa_glu libGL mesa_noglu.osmesa ] ++ stdenv.lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ OpenGL GLUT Cocoa ]) ; diff --git a/pkgs/tools/graphics/glxinfo/default.nix b/pkgs/tools/graphics/glxinfo/default.nix index 03be1e909307..5960b8b6f047 100644 --- a/pkgs/tools/graphics/glxinfo/default.nix +++ b/pkgs/tools/graphics/glxinfo/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, xlibsWrapper, mesa_noglu }: +{ stdenv, fetchurl, xlibsWrapper, libGL }: let version = "8.3.0"; in @@ -10,7 +10,7 @@ stdenv.mkDerivation { sha256 = "1vqb7s5m3fcg2csbiz45mha1pys2xx6rhw94fcyvapqdpm5iawy1"; }; - buildInputs = [ xlibsWrapper mesa_noglu ]; + buildInputs = [ xlibsWrapper libGL ]; configurePhase = "true"; From 1bc1909e5b89ec8d0e4ecadcbb5c66de0cb4fb5a Mon Sep 17 00:00:00 2001 From: "Alexander V. Nikolaev" Date: Sat, 24 Feb 2018 14:59:47 +0200 Subject: [PATCH 058/814] treewide: transition from mesa_glu to libGLU --- pkgs/applications/audio/fmit/default.nix | 2 +- pkgs/applications/audio/x42-plugins/default.nix | 4 ++-- pkgs/applications/graphics/meshlab/default.nix | 4 ++-- pkgs/applications/graphics/rapcad/default.nix | 4 ++-- pkgs/applications/graphics/solvespace/default.nix | 4 ++-- pkgs/applications/misc/houdini/runtime.nix | 4 ++-- pkgs/applications/misc/mupdf/default.nix | 6 +++--- pkgs/applications/misc/slic3r-prusa3d/default.nix | 4 ++-- pkgs/applications/science/chemistry/molden/default.nix | 4 ++-- pkgs/applications/science/math/gmsh/default.nix | 4 ++-- pkgs/applications/video/lightworks/default.nix | 4 ++-- pkgs/desktops/enlightenment/enlightenment.nix | 2 +- pkgs/desktops/plasma-5/kinfocenter.nix | 4 ++-- pkgs/development/compilers/factor-lang/default.nix | 8 ++++---- pkgs/development/libraries/SDL/default.nix | 4 ++-- pkgs/development/libraries/freeglut/default.nix | 6 +++--- pkgs/development/libraries/glew/1.10.nix | 4 ++-- pkgs/development/libraries/glew/default.nix | 4 ++-- pkgs/development/libraries/glfw/2.x.nix | 4 ++-- pkgs/development/libraries/libvdpau-va-gl/default.nix | 4 ++-- pkgs/development/libraries/opensubdiv/default.nix | 4 ++-- pkgs/development/libraries/wxwidgets/2.8/default.nix | 8 ++++---- pkgs/development/libraries/wxwidgets/2.9/default.nix | 8 ++++---- pkgs/development/libraries/wxwidgets/3.0/default.nix | 8 ++++---- pkgs/development/tools/glslviewer/default.nix | 4 ++-- pkgs/development/tools/godot/default.nix | 4 ++-- pkgs/development/tools/unity3d/default.nix | 4 ++-- pkgs/development/tools/vogl/default.nix | 4 ++-- pkgs/games/amoeba/default.nix | 4 ++-- pkgs/games/mar1d/default.nix | 4 ++-- pkgs/games/megaglest/default.nix | 6 +++--- pkgs/games/openrct2/default.nix | 4 ++-- pkgs/games/scrolls/default.nix | 4 ++-- pkgs/games/steam/runtime-wrapped.nix | 2 +- pkgs/games/teeworlds/default.nix | 4 ++-- pkgs/games/tome4/default.nix | 4 ++-- pkgs/games/torcs/default.nix | 4 ++-- pkgs/misc/emulators/desmume/default.nix | 4 ++-- pkgs/misc/emulators/nestopia/default.nix | 4 ++-- pkgs/os-specific/linux/v4l-utils/default.nix | 4 ++-- pkgs/tools/admin/tigervnc/default.nix | 4 ++-- pkgs/tools/graphics/asymptote/default.nix | 4 ++-- 42 files changed, 92 insertions(+), 92 deletions(-) diff --git a/pkgs/applications/audio/fmit/default.nix b/pkgs/applications/audio/fmit/default.nix index ba3f31d05014..e238f8831421 100644 --- a/pkgs/applications/audio/fmit/default.nix +++ b/pkgs/applications/audio/fmit/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fftw, freeglut, mesa_glu, qtbase, qtmultimedia, qmake +{ stdenv, fetchFromGitHub, fftw, freeglut, libGLU, qtbase, qtmultimedia, qmake , alsaSupport ? true, alsaLib ? null , jackSupport ? false, libjack2 ? null , portaudioSupport ? false, portaudio ? null }: diff --git a/pkgs/applications/audio/x42-plugins/default.nix b/pkgs/applications/audio/x42-plugins/default.nix index 0c151697e897..4c4f958ec493 100644 --- a/pkgs/applications/audio/x42-plugins/default.nix +++ b/pkgs/applications/audio/x42-plugins/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pkgconfig , libltc, libsndfile, libsamplerate, ftgl, freefont_ttf, libjack2 -, mesa_glu, lv2, gtk2, cairo, pango, fftwFloat, zita-convolver }: +, libGLU, lv2, gtk2, cairo, pango, fftwFloat, zita-convolver }: stdenv.mkDerivation rec { version = "20170428"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ mesa_glu ftgl freefont_ttf libjack2 libltc libsndfile libsamplerate lv2 gtk2 cairo pango fftwFloat zita-convolver ]; + buildInputs = [ libGLU ftgl freefont_ttf libjack2 libltc libsndfile libsamplerate lv2 gtk2 cairo pango fftwFloat zita-convolver ]; # Don't remove this. The default fails with 'do not know how to unpack source archive' # every now and then on Hydra. No idea why. diff --git a/pkgs/applications/graphics/meshlab/default.nix b/pkgs/applications/graphics/meshlab/default.nix index 1e76743eccf4..adb1ec29237e 100644 --- a/pkgs/applications/graphics/meshlab/default.nix +++ b/pkgs/applications/graphics/meshlab/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, mesa_glu, qtbase, qtscript, qtxmlpatterns }: +{ stdenv, fetchFromGitHub, libGLU, qtbase, qtscript, qtxmlpatterns }: let meshlabRev = "5700f5474c8f90696a8925e2a209a0a8ab506662"; @@ -53,7 +53,7 @@ in stdenv.mkDerivation { ln -s $out/opt/meshlab/meshlabserver $out/bin/meshlabserver ''; - buildInputs = [ mesa_glu qtbase qtscript qtxmlpatterns ]; + buildInputs = [ libGLU qtbase qtscript qtxmlpatterns ]; meta = { description = "A system for processing and editing 3D triangular meshes."; diff --git a/pkgs/applications/graphics/rapcad/default.nix b/pkgs/applications/graphics/rapcad/default.nix index 451eaae79b2e..c8327b9bca19 100644 --- a/pkgs/applications/graphics/rapcad/default.nix +++ b/pkgs/applications/graphics/rapcad/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, fetchurl, cgal, boost, gmp, mpfr, flex, bison, dxflib, readline -, qtbase, qmake, mesa_glu +, qtbase, qmake, libGLU }: stdenv.mkDerivation rec { @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ qmake ]; - buildInputs = [ qtbase cgal boost gmp mpfr flex bison dxflib readline mesa_glu ]; + buildInputs = [ qtbase cgal boost gmp mpfr flex bison dxflib readline libGLU ]; meta = with stdenv.lib; { license = licenses.gpl3; diff --git a/pkgs/applications/graphics/solvespace/default.nix b/pkgs/applications/graphics/solvespace/default.nix index be1a799a9ecf..08ce9c1fc2e4 100644 --- a/pkgs/applications/graphics/solvespace/default.nix +++ b/pkgs/applications/graphics/solvespace/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchgit, cmake, pkgconfig, zlib, libpng, cairo, freetype -, json_c, fontconfig, gtkmm3, pangomm, glew, mesa_glu, xlibs, pcre +, json_c, fontconfig, gtkmm3, pangomm, glew, libGLU, xlibs, pcre , wrapGAppsHook }: stdenv.mkDerivation rec { @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ zlib libpng cairo freetype - json_c fontconfig gtkmm3 pangomm glew mesa_glu + json_c fontconfig gtkmm3 pangomm glew libGLU xlibs.libpthreadstubs xlibs.libXdmcp pcre ]; enableParallelBuilding = true; diff --git a/pkgs/applications/misc/houdini/runtime.nix b/pkgs/applications/misc/houdini/runtime.nix index b3ce98895e6f..e58ff06b29cb 100644 --- a/pkgs/applications/misc/houdini/runtime.nix +++ b/pkgs/applications/misc/houdini/runtime.nix @@ -1,11 +1,11 @@ -{ stdenv, requireFile, zlib, libpng, libSM, libICE, fontconfig, xorg, mesa_glu, alsaLib, dbus, xkeyboardconfig, bc }: +{ stdenv, requireFile, zlib, libpng, libSM, libICE, fontconfig, xorg, libGLU, alsaLib, dbus, xkeyboardconfig, bc }: let ld_library_path = builtins.concatStringsSep ":" [ "${stdenv.cc.cc.lib}/lib64" "/run/opengl-driver/lib" (stdenv.lib.makeLibraryPath [ - mesa_glu + libGLU xorg.libXmu xorg.libXi xorg.libXext diff --git a/pkgs/applications/misc/mupdf/default.nix b/pkgs/applications/misc/mupdf/default.nix index 5326f948d894..b0d8ba3bb08e 100644 --- a/pkgs/applications/misc/mupdf/default.nix +++ b/pkgs/applications/misc/mupdf/default.nix @@ -2,7 +2,7 @@ , jbig2dec, libjpeg , darwin , enableX11 ? true, libX11, libXext, libXi, libXrandr , enableCurl ? true, curl, openssl -, enableGL ? true, freeglut, mesa_glu +, enableGL ? true, freeglut, libGLU }: let @@ -53,14 +53,14 @@ in stdenv.mkDerivation rec { makeFlags = [ "prefix=$(out)" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ freetype harfbuzz openjpeg jbig2dec libjpeg freeglut mesa_glu ] + buildInputs = [ freetype harfbuzz openjpeg jbig2dec libjpeg freeglut libGLU ] ++ lib.optionals enableX11 [ libX11 libXext libXi libXrandr ] ++ lib.optionals enableCurl [ curl openssl ] ++ lib.optionals enableGL ( if stdenv.isDarwin then with darwin.apple_sdk.frameworks; [ GLUT OpenGL ] else - [ freeglut mesa_glu ]) + [ freeglut libGLU ]) ; outputs = [ "bin" "dev" "out" "man" "doc" ]; diff --git a/pkgs/applications/misc/slic3r-prusa3d/default.nix b/pkgs/applications/misc/slic3r-prusa3d/default.nix index a4ac924cfae0..88cb42e3f5c8 100644 --- a/pkgs/applications/misc/slic3r-prusa3d/default.nix +++ b/pkgs/applications/misc/slic3r-prusa3d/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, makeWrapper, which, cmake, perl, perlPackages, - boost, tbb, wxGTK30, pkgconfig, gtk3, fetchurl, gtk2, bash, mesa_glu, + boost, tbb, wxGTK30, pkgconfig, gtk3, fetchurl, gtk2, bash, libGLU, glew, eigen }: let AlienWxWidgets = perlPackages.buildPerlPackage rec { @@ -27,7 +27,7 @@ let url = "mirror://cpan/authors/id/M/MB/MBARBON/${name}.tar.gz"; sha256 = "1q4gvj4gdx4l8k4mkgiix24p9mdfy1miv7abidf0my3gy2gw5lka"; }; - propagatedBuildInputs = [ Wx perlPackages.OpenGL mesa_glu ]; + propagatedBuildInputs = [ Wx perlPackages.OpenGL libGLU ]; doCheck = false; }; in diff --git a/pkgs/applications/science/chemistry/molden/default.nix b/pkgs/applications/science/chemistry/molden/default.nix index 98499ca009af..1472b4b2af9e 100644 --- a/pkgs/applications/science/chemistry/molden/default.nix +++ b/pkgs/applications/science/chemistry/molden/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, which, gfortran, mesa_glu, xorg } : +{ stdenv, fetchurl, which, gfortran, libGLU, xorg } : stdenv.mkDerivation rec { version = "5.7"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ which ]; - buildInputs = [ gfortran mesa_glu xorg.libX11 xorg.libXmu ]; + buildInputs = [ gfortran libGLU xorg.libX11 xorg.libXmu ]; postPatch = '' substituteInPlace ./makefile --replace '-L/usr/X11R6/lib' "" \ diff --git a/pkgs/applications/science/math/gmsh/default.nix b/pkgs/applications/science/math/gmsh/default.nix index bb24ac9bd499..31c4fe984770 100644 --- a/pkgs/applications/science/math/gmsh/default.nix +++ b/pkgs/applications/science/math/gmsh/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, cmake, blas, liblapack, gfortran, gmm, fltk, libjpeg -, zlib, mesa, mesa_glu, xorg }: +, zlib, mesa, libGLU, xorg }: let version = "3.0.5"; in @@ -16,7 +16,7 @@ stdenv.mkDerivation { patches = [ ./CMakeLists.txt.patch ]; buildInputs = [ cmake blas liblapack gfortran gmm fltk libjpeg zlib mesa - mesa_glu xorg.libXrender xorg.libXcursor xorg.libXfixes xorg.libXext + libGLU xorg.libXrender xorg.libXcursor xorg.libXfixes xorg.libXext xorg.libXft xorg.libXinerama xorg.libX11 xorg.libSM xorg.libICE ]; diff --git a/pkgs/applications/video/lightworks/default.nix b/pkgs/applications/video/lightworks/default.nix index 9c6a49c55136..d0376ca7e3de 100644 --- a/pkgs/applications/video/lightworks/default.nix +++ b/pkgs/applications/video/lightworks/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, dpkg, makeWrapper, patchelf, buildFHSUserEnv -, gtk3, gnome3, gdk_pixbuf, cairo, libjpeg_original, glib, gnome2, mesa_glu +, gtk3, gnome3, gdk_pixbuf, cairo, libjpeg_original, glib, gnome2, libGLU , nvidia_cg_toolkit, zlib, openssl, portaudio }: let @@ -11,7 +11,7 @@ let libjpeg_original glib gnome2.pango - mesa_glu + libGLU nvidia_cg_toolkit zlib openssl diff --git a/pkgs/desktops/enlightenment/enlightenment.nix b/pkgs/desktops/enlightenment/enlightenment.nix index cb479f062d62..58fff802080f 100644 --- a/pkgs/desktops/enlightenment/enlightenment.nix +++ b/pkgs/desktops/enlightenment/enlightenment.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, meson, ninja, pkgconfig, gettext, efl, xcbutilkeysyms, libXrandr, libXdmcp, libxcb, libffi, pam, alsaLib, - luajit, bzip2, libpthreadstubs, gdbm, libcap, mesa_glu, + luajit, bzip2, libpthreadstubs, gdbm, libcap, libGLU, xkeyboard_config, pcre }: diff --git a/pkgs/desktops/plasma-5/kinfocenter.nix b/pkgs/desktops/plasma-5/kinfocenter.nix index d366aa4b36e4..b35493929ff3 100644 --- a/pkgs/desktops/plasma-5/kinfocenter.nix +++ b/pkgs/desktops/plasma-5/kinfocenter.nix @@ -3,7 +3,7 @@ extra-cmake-modules, kdoctools, kcmutils, kcompletion, kconfig, kconfigwidgets, kcoreaddons, kdbusaddons, kdeclarative, kdelibs4support, ki18n, kiconthemes, kio, kpackage, kservice, - kwayland, kwidgetsaddons, kxmlgui, libraw1394, mesa_glu, pciutils, solid + kwayland, kwidgetsaddons, kxmlgui, libraw1394, libGLU, pciutils, solid }: mkDerivation { @@ -12,6 +12,6 @@ mkDerivation { buildInputs = [ kcmutils kcompletion kconfig kconfigwidgets kcoreaddons kdbusaddons kdeclarative kdelibs4support ki18n kiconthemes kio kpackage kservice - kwayland kwidgetsaddons kxmlgui libraw1394 mesa_glu pciutils solid + kwayland kwidgetsaddons kxmlgui libraw1394 libGLU pciutils solid ]; } diff --git a/pkgs/development/compilers/factor-lang/default.nix b/pkgs/development/compilers/factor-lang/default.nix index ae2d39d604a6..ce1987866007 100644 --- a/pkgs/development/compilers/factor-lang/default.nix +++ b/pkgs/development/compilers/factor-lang/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, fetchFromGitHub, glib, glibc, git, rlwrap, curl, pkgconfig, perl, makeWrapper, tzdata, ncurses, libX11, pango, cairo, gtk2, gdk_pixbuf, gtkglext, - mesa_glu, libXmu, libXt, libICE, libSM }: + libGLU, libXmu, libXt, libICE, libSM }: stdenv.mkDerivation rec { name = "factor-lang-${version}"; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ git rlwrap curl perl makeWrapper libX11 pango cairo gtk2 gdk_pixbuf gtkglext - mesa_glu libXmu libXt libICE libSM ]; + libGLU libXmu libXt libICE libSM ]; buildPhase = '' make $(bash ./build-support/factor.sh make-target) GIT_LABEL=heads/master-${rev} @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { # to be a generic solution here. find $(echo ${stdenv.lib.makeLibraryPath [ glib libX11 pango cairo gtk2 gdk_pixbuf gtkglext - mesa_glu libXmu libXt libICE libSM ]} | sed -e 's#:# #g') -name \*.so.\* > $TMPDIR/so.lst + libGLU libXmu libXt libICE libSM ]} | sed -e 's#:# #g') -name \*.so.\* > $TMPDIR/so.lst (echo $(cat $TMPDIR/so.lst | wc -l) "libs found in cache \`/etc/ld.so.cache'"; for l in $(<$TMPDIR/so.lst); @@ -72,7 +72,7 @@ stdenv.mkDerivation rec { wrapProgram $out/bin/factor --prefix LD_LIBRARY_PATH : \ "${stdenv.lib.makeLibraryPath [ glib libX11 pango cairo gtk2 gdk_pixbuf gtkglext - mesa_glu libXmu libXt libICE libSM ]}" + libGLU libXmu libXt libICE libSM ]}" sed -ie 's#/bin/.factor-wrapped#/lib/factor/factor#g' $out/bin/factor mv $out/bin/.factor-wrapped $out/lib/factor/factor diff --git a/pkgs/development/libraries/SDL/default.nix b/pkgs/development/libraries/SDL/default.nix index c1b1f244941a..a752fbcbcdd5 100644 --- a/pkgs/development/libraries/SDL/default.nix +++ b/pkgs/development/libraries/SDL/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, fetchpatch, pkgconfig, audiofile, libcap, libiconv -, openglSupport ? false, libGL, mesa_glu +, openglSupport ? false, libGL, libGLU , alsaSupport ? true, alsaLib , x11Support ? hostPlatform == buildPlatform, libXext, libICE, libXrandr , pulseaudioSupport ? true, libpulseaudio @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { optionals x11Support [ libXext libICE libXrandr ] ++ optional alsaSupport alsaLib ++ optional stdenv.isLinux libcap ++ - optionals openglSupport [ libGL mesa_glu ] ++ + optionals openglSupport [ libGL libGLU ] ++ optional pulseaudioSupport libpulseaudio ++ optional stdenv.isDarwin Cocoa; diff --git a/pkgs/development/libraries/freeglut/default.nix b/pkgs/development/libraries/freeglut/default.nix index 954af72f9c15..c34d9591d386 100644 --- a/pkgs/development/libraries/freeglut/default.nix +++ b/pkgs/development/libraries/freeglut/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libXi, libXrandr, libXxf86vm, libGL, mesa_glu, xlibsWrapper, cmake }: +{ stdenv, fetchurl, libXi, libXrandr, libXxf86vm, libGL, libGLU, xlibsWrapper, cmake }: let version = "3.0.0"; in stdenv.mkDerivation { @@ -11,12 +11,12 @@ in stdenv.mkDerivation { outputs = [ "out" "dev" ]; - buildInputs = [ libXi libXrandr libXxf86vm libGL mesa_glu xlibsWrapper cmake ]; + buildInputs = [ libXi libXrandr libXxf86vm libGL libGLU xlibsWrapper cmake ]; cmakeFlags = stdenv.lib.optionals stdenv.isDarwin [ "-DOPENGL_INCLUDE_DIR=${libGL}/include" "-DOPENGL_gl_LIBRARY:FILEPATH=${libGL}/lib/libGL.dylib" - "-DOPENGL_glu_LIBRARY:FILEPATH=${mesa_glu}/lib/libGLU.dylib" + "-DOPENGL_glu_LIBRARY:FILEPATH=${libGLU}/lib/libGLU.dylib" "-DFREEGLUT_BUILD_DEMOS:BOOL=OFF" "-DFREEGLUT_BUILD_STATIC:BOOL=OFF" ]; diff --git a/pkgs/development/libraries/glew/1.10.nix b/pkgs/development/libraries/glew/1.10.nix index 3f8119d36d65..fafcf82258ab 100644 --- a/pkgs/development/libraries/glew/1.10.nix +++ b/pkgs/development/libraries/glew/1.10.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, mesa_glu, x11, libXmu, libXi +{ stdenv, fetchurl, libGLU, x11, libXmu, libXi , buildPlatform, hostPlatform , AGL ? null }: @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ x11 libXmu libXi ] ++ optionals stdenv.isDarwin [ AGL ]; - propagatedBuildInputs = [ mesa_glu ]; # GL/glew.h includes GL/glu.h + propagatedBuildInputs = [ libGLU ]; # GL/glew.h includes GL/glu.h patchPhase = '' sed -i 's|lib64|lib|' config/Makefile.linux diff --git a/pkgs/development/libraries/glew/default.nix b/pkgs/development/libraries/glew/default.nix index 38b303bde856..eebf4dded4ad 100644 --- a/pkgs/development/libraries/glew/default.nix +++ b/pkgs/development/libraries/glew/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, mesa_glu, xlibsWrapper, libXmu, libXi +{ stdenv, fetchurl, libGLU, xlibsWrapper, libXmu, libXi , buildPlatform, hostPlatform }: @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { outputs = [ "bin" "out" "dev" "doc" ]; buildInputs = [ xlibsWrapper libXmu libXi ]; - propagatedBuildInputs = [ mesa_glu ]; # GL/glew.h includes GL/glu.h + propagatedBuildInputs = [ libGLU ]; # GL/glew.h includes GL/glu.h patchPhase = '' sed -i 's|lib64|lib|' config/Makefile.linux diff --git a/pkgs/development/libraries/glfw/2.x.nix b/pkgs/development/libraries/glfw/2.x.nix index a4f14c9a0147..b1118b473b6f 100644 --- a/pkgs/development/libraries/glfw/2.x.nix +++ b/pkgs/development/libraries/glfw/2.x.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, mesa_glu, libGL, libX11, libXext }: +{ stdenv, fetchurl, libGLU, libGL, libX11, libXext }: stdenv.mkDerivation rec { name = "glfw-2.7.9"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "17c2msdcb7pn3p8f83805h1c216bmdqnbn9hgzr1j8wnwjcpxx6i"; }; - buildInputs = [ mesa_glu libGL libX11 libXext ]; + buildInputs = [ libGLU libGL libX11 libXext ]; buildPhase = '' make x11 diff --git a/pkgs/development/libraries/libvdpau-va-gl/default.nix b/pkgs/development/libraries/libvdpau-va-gl/default.nix index 4285b05a6250..3ea0155b4f42 100644 --- a/pkgs/development/libraries/libvdpau-va-gl/default.nix +++ b/pkgs/development/libraries/libvdpau-va-gl/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, cmake, pkgconfig, libX11, libpthreadstubs, libXau, libXdmcp -, libXext, libvdpau, glib, libva, ffmpeg, mesa_glu }: +, libXext, libvdpau, glib, libva, ffmpeg, libGLU }: stdenv.mkDerivation rec { name = "libvdpau-va-gl-${version}"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ cmake pkgconfig ]; - buildInputs = [ libX11 libpthreadstubs libXau libXdmcp libXext libvdpau glib libva ffmpeg mesa_glu ]; + buildInputs = [ libX11 libpthreadstubs libXau libXdmcp libXext libvdpau glib libva ffmpeg libGLU ]; meta = with stdenv.lib; { homepage = https://github.com/i-rinat/libvdpau-va-gl; diff --git a/pkgs/development/libraries/opensubdiv/default.nix b/pkgs/development/libraries/opensubdiv/default.nix index e79c0e4e436d..2e63d0a8e883 100644 --- a/pkgs/development/libraries/opensubdiv/default.nix +++ b/pkgs/development/libraries/opensubdiv/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchFromGitHub, cmake, pkgconfig, xorg, mesa_glu +{ lib, stdenv, fetchurl, fetchFromGitHub, cmake, pkgconfig, xorg, libGLU , libGL, glew, ocl-icd, python3 , cudaSupport ? false, cudatoolkit }: @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; buildInputs = - [ cmake pkgconfig mesa_glu libGL ocl-icd python3 + [ cmake pkgconfig libGLU libGL ocl-icd python3 # FIXME: these are not actually needed, but the configure script wants them. glew xorg.libX11 xorg.libXrandr xorg.libXxf86vm xorg.libXcursor xorg.libXinerama xorg.libXi diff --git a/pkgs/development/libraries/wxwidgets/2.8/default.nix b/pkgs/development/libraries/wxwidgets/2.8/default.nix index 35fc07b249b6..bbb3b0faf347 100644 --- a/pkgs/development/libraries/wxwidgets/2.8/default.nix +++ b/pkgs/development/libraries/wxwidgets/2.8/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl, pkgconfig, gtk2, libXinerama, libSM, libXxf86vm, xf86vidmodeproto , gstreamer, gst-plugins-base, GConf, libX11, cairo -, withMesa ? true, mesa_glu ? null, libGL ? null +, withMesa ? true, libGLU ? null, libGL ? null , compat24 ? false, compat26 ? true, unicode ? true, }: -assert withMesa -> mesa_glu != null && libGL != null; +assert withMesa -> libGLU != null && libGL != null; with stdenv.lib; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ gtk2 libXinerama libSM libXxf86vm xf86vidmodeproto gstreamer gst-plugins-base GConf libX11 cairo ] - ++ optional withMesa mesa_glu; + ++ optional withMesa libGLU; nativeBuildInputs = [ pkgconfig ]; @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { "${libXinerama.dev}/include ${libSM.dev}/include ${libXxf86vm.dev}/include"; SEARCH_LIB = "${libXinerama.out}/lib ${libSM.out}/lib ${libXxf86vm.out}/lib " - + optionalString withMesa "${mesa_glu.out}/lib ${libGL.out}/lib "; + + optionalString withMesa "${libGLU.out}/lib ${libGL.out}/lib "; # Work around a bug in configure. NIX_CFLAGS_COMPILE = [ "-DHAVE_X11_XLIB_H=1" "-lX11" "-lcairo" "-Wno-narrowing" ]; diff --git a/pkgs/development/libraries/wxwidgets/2.9/default.nix b/pkgs/development/libraries/wxwidgets/2.9/default.nix index 64c486819cc9..19c3ca307c5e 100644 --- a/pkgs/development/libraries/wxwidgets/2.9/default.nix +++ b/pkgs/development/libraries/wxwidgets/2.9/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, gtk2, libXinerama, libSM, libXxf86vm, xf86vidmodeproto , gstreamer, gst-plugins-base, GConf, setfile -, withMesa ? true, mesa_glu ? null, libGL ? null +, withMesa ? true, libGLU ? null, libGL ? null , compat24 ? false, compat26 ? true, unicode ? true , Carbon ? null, Cocoa ? null, Kernel ? null, QuickTime ? null, AGL ? null }: -assert withMesa -> mesa_glu != null && libGL != null; +assert withMesa -> libGLU != null && libGL != null; with stdenv.lib; @@ -31,7 +31,7 @@ stdenv.mkDerivation { buildInputs = [ gtk2 libXinerama libSM libXxf86vm xf86vidmodeproto gstreamer gst-plugins-base GConf ] - ++ optional withMesa mesa_glu + ++ optional withMesa libGLU ++ optionals stdenv.isDarwin [ setfile Carbon Cocoa Kernel QuickTime ]; nativeBuildInputs = [ pkgconfig ]; @@ -48,7 +48,7 @@ stdenv.mkDerivation { # allow building on 64-bit [ "--with-cocoa" "--enable-universal-binaries" "--with-macosx-version-min=10.7" ]; - SEARCH_LIB = "${mesa_glu.out}/lib ${libGL.out}/lib "; + SEARCH_LIB = "${libGLU.out}/lib ${libGL.out}/lib "; preConfigure = " substituteInPlace configure --replace 'SEARCH_INCLUDE=' 'DUMMY_SEARCH_INCLUDE=' diff --git a/pkgs/development/libraries/wxwidgets/3.0/default.nix b/pkgs/development/libraries/wxwidgets/3.0/default.nix index c96d2eb8661a..98621bb781e8 100644 --- a/pkgs/development/libraries/wxwidgets/3.0/default.nix +++ b/pkgs/development/libraries/wxwidgets/3.0/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, fetchurl, fetchpatch, pkgconfig , gtk2, gtk3, libXinerama, libSM, libXxf86vm , xf86vidmodeproto , gstreamer, gst-plugins-base, GConf, setfile -, withMesa ? true, mesa_glu ? null, libGL ? null +, withMesa ? true, libGLU ? null, libGL ? null , compat24 ? false, compat26 ? true, unicode ? true , withGtk2 ? true , withWebKit ? false, webkitgtk24x-gtk2 ? null, webkitgtk218x ? null @@ -9,7 +9,7 @@ }: -assert withMesa -> mesa_glu != null && libGL != null; +assert withMesa -> libGLU != null && libGL != null; assert withWebKit -> (if withGtk2 then webkitgtk24x-gtk2 else webkitgtk218x) != null; with stdenv.lib; @@ -30,7 +30,7 @@ stdenv.mkDerivation { buildInputs = [ (if withGtk2 then gtk2 else gtk3) libXinerama libSM libXxf86vm xf86vidmodeproto gstreamer gst-plugins-base GConf ] - ++ optional withMesa mesa_glu + ++ optional withMesa libGLU ++ optional withWebKit (if withGtk2 then webkitgtk24x-gtk2 else webkitgtk218x) ++ optionals stdenv.isDarwin [ setfile Carbon Cocoa Kernel QTKit ]; @@ -62,7 +62,7 @@ stdenv.mkDerivation { ++ optionals withWebKit ["--enable-webview" "--enable-webview-webkit"]; - SEARCH_LIB = "${mesa_glu.out}/lib ${libGL.out}/lib "; + SEARCH_LIB = "${libGLU.out}/lib ${libGL.out}/lib "; preConfigure = " substituteInPlace configure --replace 'SEARCH_INCLUDE=' 'DUMMY_SEARCH_INCLUDE=' diff --git a/pkgs/development/tools/glslviewer/default.nix b/pkgs/development/tools/glslviewer/default.nix index 86f78891b2fc..7a28f86562f6 100644 --- a/pkgs/development/tools/glslviewer/default.nix +++ b/pkgs/development/tools/glslviewer/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, glfw, pkgconfig, libXrandr, libXdamage , libXext, libXrender, libXinerama, libXcursor, libXxf86vm, libXi -, libX11, mesa_glu, Cocoa +, libX11, libGLU, Cocoa }: stdenv.mkDerivation rec { @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - glfw mesa_glu glfw libXrandr libXdamage + glfw libGLU glfw libXrandr libXdamage libXext libXrender libXinerama libXcursor libXxf86vm libXi libX11 ] ++ stdenv.lib.optional stdenv.isDarwin Cocoa; diff --git a/pkgs/development/tools/godot/default.nix b/pkgs/development/tools/godot/default.nix index 54e0c53d692c..1ea4d160b4cb 100644 --- a/pkgs/development/tools/godot/default.nix +++ b/pkgs/development/tools/godot/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, gcc5, scons, pkgconfig, libX11, libXcursor , libXinerama, libXrandr, libXrender, freetype, openssl, alsaLib -, libpulseaudio, mesa_glu, zlib }: +, libpulseaudio, libGLU, zlib }: stdenv.mkDerivation rec { name = "godot-${version}"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ gcc5 scons libX11 libXcursor libXinerama libXrandr libXrender - freetype openssl alsaLib libpulseaudio mesa_glu zlib + freetype openssl alsaLib libpulseaudio libGLU zlib ]; patches = [ ./pkg_config_additions.patch ]; diff --git a/pkgs/development/tools/unity3d/default.nix b/pkgs/development/tools/unity3d/default.nix index c7ba985d0f75..e507e3898c38 100644 --- a/pkgs/development/tools/unity3d/default.nix +++ b/pkgs/development/tools/unity3d/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchurl, makeWrapper, fakeroot, file, getopt -, gtk2, gdk_pixbuf, glib, mesa_glu, postgresql, nss, nspr, udev +, gtk2, gdk_pixbuf, glib, libGLU, postgresql, nss, nspr, udev , alsaLib, GConf, cups, libcap, fontconfig, freetype, pango , cairo, dbus, expat, zlib, libpng12, nodejs, gnutar, gcc, gcc_32bit , libX11, libXcursor, libXdamage, libXfixes, libXrender, libXi @@ -9,7 +9,7 @@ let libPath64 = lib.makeLibraryPath [ - gcc.cc gtk2 gdk_pixbuf glib mesa_glu postgresql nss nspr + gcc.cc gtk2 gdk_pixbuf glib libGLU postgresql nss nspr alsaLib GConf cups libcap fontconfig freetype pango cairo dbus expat zlib libpng12 udev libX11 libXcursor libXdamage libXfixes libXrender libXi diff --git a/pkgs/development/tools/vogl/default.nix b/pkgs/development/tools/vogl/default.nix index 9230d99efcc7..e87ba2b52c14 100644 --- a/pkgs/development/tools/vogl/default.nix +++ b/pkgs/development/tools/vogl/default.nix @@ -3,7 +3,7 @@ , qtbase, qtx11extras , libdwarf, libjpeg_turbo, libunwind, lzma, tinyxml, libX11 , SDL2, SDL2_gfx, SDL2_image, SDL2_ttf -, freeglut, mesa_glu +, freeglut, libGLU , fetchpatch }: @@ -33,7 +33,7 @@ mkDerivation rec { qtbase qtx11extras libdwarf libjpeg_turbo libunwind lzma tinyxml libX11 SDL2 SDL2_gfx SDL2_image SDL2_ttf - freeglut mesa_glu + freeglut libGLU ]; dontUseCmakeBuildDir = true; diff --git a/pkgs/games/amoeba/default.nix b/pkgs/games/amoeba/default.nix index 4e5f85f7d5ae..491b20d99690 100644 --- a/pkgs/games/amoeba/default.nix +++ b/pkgs/games/amoeba/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, amoeba-data, alsaLib, expat, freetype, gtk2, libvorbis, mesa_glu, pkgconfig }: +{ stdenv, fetchurl, amoeba-data, alsaLib, expat, freetype, gtk2, libvorbis, libGLU, pkgconfig }: stdenv.mkDerivation rec { name = "amoeba-${version}-${debver}"; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { ''; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ alsaLib expat freetype gtk2 libvorbis mesa_glu ]; + buildInputs = [ alsaLib expat freetype gtk2 libvorbis libGLU ]; installPhase = '' mkdir -p $out/bin $out/share/man/man1/ diff --git a/pkgs/games/mar1d/default.nix b/pkgs/games/mar1d/default.nix index 5494e32b16b6..9e1e512d711e 100644 --- a/pkgs/games/mar1d/default.nix +++ b/pkgs/games/mar1d/default.nix @@ -1,7 +1,7 @@ { stdenv , fetchFromGitHub , cmake -, mesa_glu +, libGLU , x11 , xorg , xinput_calibrator @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { doxygen libao libpthreadstubs - mesa_glu + libGLU x11 xinput_calibrator xorg.libXrandr diff --git a/pkgs/games/megaglest/default.nix b/pkgs/games/megaglest/default.nix index d43904bca6ca..de67afe45a94 100644 --- a/pkgs/games/megaglest/default.nix +++ b/pkgs/games/megaglest/default.nix @@ -1,6 +1,6 @@ { stdenv, cmake, pkgconfig, git, curl, SDL2, xercesc, openal, lua, vlc , libjpeg, wxGTK, cppunit, ftgl, glew, libogg, libvorbis, buildEnv, libpng -, fontconfig, freetype, xorg, makeWrapper, bash, which, gnome3, mesa_glu, glib +, fontconfig, freetype, xorg, makeWrapper, bash, which, gnome3, libGLU, glib , fetchFromGitHub }: let @@ -9,7 +9,7 @@ let name = "megaglest-lib-env"; paths = [ SDL2 xorg.libSM xorg.libICE xorg.libX11 xorg.libXext xercesc openal libvorbis lua libjpeg libpng curl fontconfig ftgl freetype - stdenv.cc.cc glew mesa_glu wxGTK ]; + stdenv.cc.cc glew libGLU wxGTK ]; }; path-env = buildEnv { name = "megaglest-path-env"; @@ -29,7 +29,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ cmake git curl SDL2 xercesc openal lua libpng libjpeg vlc wxGTK - glib cppunit fontconfig freetype ftgl glew libogg libvorbis makeWrapper mesa_glu ]; + glib cppunit fontconfig freetype ftgl glew libogg libvorbis makeWrapper libGLU ]; configurePhase = '' cmake -DCMAKE_INSTALL_PREFIX=$out \ diff --git a/pkgs/games/openrct2/default.nix b/pkgs/games/openrct2/default.nix index 6881767cbb90..03d296d30053 100644 --- a/pkgs/games/openrct2/default.nix +++ b/pkgs/games/openrct2/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, fetchFromGitHub, SDL2, cmake, curl, fontconfig, freetype, jansson, libiconv, libpng, - libpthreadstubs, libzip, mesa_glu, openssl, pkgconfig, speexdsp, zlib + libpthreadstubs, libzip, libGLU, openssl, pkgconfig, speexdsp, zlib }: let @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { libpng libpthreadstubs libzip - mesa_glu + libGLU openssl pkgconfig speexdsp diff --git a/pkgs/games/scrolls/default.nix b/pkgs/games/scrolls/default.nix index c2beeb13cadf..5f1e1a17553b 100644 --- a/pkgs/games/scrolls/default.nix +++ b/pkgs/games/scrolls/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, gcc -, mesa_glu, libX11, libXext, libXcursor, libpulseaudio +, libGLU, libX11, libXext, libXcursor, libpulseaudio }: stdenv.mkDerivation { name = "scrolls-2015-10-13"; @@ -21,7 +21,7 @@ stdenv.mkDerivation { libPath = stdenv.lib.makeLibraryPath [ gcc - mesa_glu + libGLU libX11 libXext libXcursor diff --git a/pkgs/games/steam/runtime-wrapped.nix b/pkgs/games/steam/runtime-wrapped.nix index c5e5e525f365..525ea8eeec81 100644 --- a/pkgs/games/steam/runtime-wrapped.nix +++ b/pkgs/games/steam/runtime-wrapped.nix @@ -48,7 +48,7 @@ let # Verified games requirements xlibs.libXmu xlibs.libxcb - mesa_glu + libGLU libuuid libogg libvorbis diff --git a/pkgs/games/teeworlds/default.nix b/pkgs/games/teeworlds/default.nix index bd37ba0f01fb..7c5074c07085 100644 --- a/pkgs/games/teeworlds/default.nix +++ b/pkgs/games/teeworlds/default.nix @@ -1,5 +1,5 @@ { fetchurl, stdenv, makeWrapper, python, alsaLib -, libX11, mesa_glu, SDL, lua5, zlib, bam, freetype +, libX11, libGLU, SDL, lua5, zlib, bam, freetype }: stdenv.mkDerivation rec { @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { postPatch = "rm -r other/{freetype,sdl}/{include,lib32,lib64}"; buildInputs = [ - python makeWrapper alsaLib libX11 mesa_glu SDL lua5 zlib bam freetype + python makeWrapper alsaLib libX11 libGLU SDL lua5 zlib bam freetype ]; buildPhase = '' diff --git a/pkgs/games/tome4/default.nix b/pkgs/games/tome4/default.nix index f07fd88fbaf3..390ab1eefd18 100644 --- a/pkgs/games/tome4/default.nix +++ b/pkgs/games/tome4/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, openal, libpng, libvorbis, mesa_glu, premake4, SDL2, SDL2_image, SDL2_ttf }: +{stdenv, fetchurl, openal, libpng, libvorbis, libGLU, premake4, SDL2, SDL2_image, SDL2_ttf }: stdenv.mkDerivation rec { version = "1.4.9"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ premake4 ]; buildInputs = [ - mesa_glu openal libpng libvorbis SDL2 SDL2_ttf SDL2_image + libGLU openal libpng libvorbis SDL2 SDL2_ttf SDL2_image ]; NIX_CFLAGS_COMPILE = [ "-I${SDL2_image}/include/SDL2" diff --git a/pkgs/games/torcs/default.nix b/pkgs/games/torcs/default.nix index 26f0fe534f3f..522a1a2857d5 100644 --- a/pkgs/games/torcs/default.nix +++ b/pkgs/games/torcs/default.nix @@ -1,4 +1,4 @@ -{ fetchpatch, fetchurl, stdenv, mesa_glu, freeglut, libX11, plib, openal, freealut, libXrandr, xproto, +{ fetchpatch, fetchurl, stdenv, libGLU, freeglut, libX11, plib, openal, freealut, libXrandr, xproto, libXext, libSM, libICE, libXi, libXt, libXrender, libXxf86vm, libvorbis, libpng, zlib, bash, makeWrapper }: @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { sed -i -e s,/bin/bash,`type -P bash`, src/linux/torcs.in ''; - buildInputs = [ mesa_glu freeglut libX11 plib openal freealut libXrandr xproto + buildInputs = [ libGLU freeglut libX11 plib openal freealut libXrandr xproto libXext libSM libICE libXi libXt libXrender libXxf86vm libpng zlib libvorbis makeWrapper ]; installTargets = "install datainstall"; diff --git a/pkgs/misc/emulators/desmume/default.nix b/pkgs/misc/emulators/desmume/default.nix index 3e7b033b5788..54ad4bee3cd4 100644 --- a/pkgs/misc/emulators/desmume/default.nix +++ b/pkgs/misc/emulators/desmume/default.nix @@ -5,7 +5,7 @@ , agg, alsaLib, soundtouch, openal , desktop_file_utils , gtk2, gtkglext, libglade, pangox_compat -, mesa_glu, libpcap, SDL, zziplib }: +, libGLU, libpcap, SDL, zziplib }: with stdenv.lib; stdenv.mkDerivation rec { @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig libtool intltool libXmu lua agg alsaLib soundtouch openal desktop_file_utils gtk2 gtkglext libglade pangox_compat - mesa_glu libpcap SDL zziplib ]; + libGLU libpcap SDL zziplib ]; configureFlags = [ "--disable-glade" # Failing on compile step diff --git a/pkgs/misc/emulators/nestopia/default.nix b/pkgs/misc/emulators/nestopia/default.nix index ef4485ef33fa..6cec834e985f 100644 --- a/pkgs/misc/emulators/nestopia/default.nix +++ b/pkgs/misc/emulators/nestopia/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchpatch, pkgconfig, SDL2, alsaLib, gtk3, mesa_glu +{ stdenv, fetchFromGitHub, fetchpatch, pkgconfig, SDL2, alsaLib, gtk3, libGLU , makeWrapper, mesa, libarchive, libao, unzip, xdg_utils, gsettings_desktop_schemas , epoxy, gdk_pixbuf, gnome3, wrapGAppsHook }: @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { epoxy gtk3 gdk_pixbuf - mesa_glu + libGLU mesa libarchive libao diff --git a/pkgs/os-specific/linux/v4l-utils/default.nix b/pkgs/os-specific/linux/v4l-utils/default.nix index 3adedf8c1dd1..84b31d4d516b 100644 --- a/pkgs/os-specific/linux/v4l-utils/default.nix +++ b/pkgs/os-specific/linux/v4l-utils/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchurl, pkgconfig, perl , libjpeg, udev , withUtils ? true -, withGUI ? true, alsaLib, libX11, qtbase, mesa_glu +, withGUI ? true, alsaLib, libX11, qtbase, libGLU }: # See libv4l in all-packages.nix for the libs only (overrides alsa, libX11 & QT) @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig perl ]; - buildInputs = [ udev ] ++ lib.optionals (withUtils && withGUI) [ alsaLib libX11 qtbase mesa_glu ]; + buildInputs = [ udev ] ++ lib.optionals (withUtils && withGUI) [ alsaLib libX11 qtbase libGLU ]; propagatedBuildInputs = [ libjpeg ]; diff --git a/pkgs/tools/admin/tigervnc/default.nix b/pkgs/tools/admin/tigervnc/default.nix index e4b206f54488..3818f361cb53 100644 --- a/pkgs/tools/admin/tigervnc/default.nix +++ b/pkgs/tools/admin/tigervnc/default.nix @@ -3,7 +3,7 @@ , libjpeg_turbo, pixman, fltk , fontDirectories , cmake, gettext, libtool -, glproto, mesa_glu +, glproto, libGLU , gnutls, pam, nettle , xterm, openssh }: @@ -84,7 +84,7 @@ stdenv.mkDerivation rec { fontsproto videoproto scrnsaverproto resourceproto presentproto utilmacros libXtst libXext libX11 libXext libICE libXi libSM libXft libxkbfile libXfont2 libpciaccess xineramaproto - glproto mesa_glu + glproto libGLU ] ++ xorgserver.buildInputs; nativeBuildInputs = with xorg; [ cmake zlib gettext libtool utilmacros fontutil ] diff --git a/pkgs/tools/graphics/asymptote/default.nix b/pkgs/tools/graphics/asymptote/default.nix index 40f4dc89366e..ec0508d1a62c 100644 --- a/pkgs/tools/graphics/asymptote/default.nix +++ b/pkgs/tools/graphics/asymptote/default.nix @@ -1,6 +1,6 @@ {stdenv, fetchurl , freeglut, ghostscriptX, imagemagick, fftw - , boehmgc, mesa_glu, libGL, ncurses, readline, gsl, libsigsegv + , boehmgc, libGLU, libGL, ncurses, readline, gsl, libsigsegv , python, zlib, perl, texLive, texinfo, xz , darwin }: @@ -20,7 +20,7 @@ let boehmgc ncurses readline gsl libsigsegv python zlib perl texLive texinfo xz ] ++ stdenv.lib.optionals stdenv.isLinux - [ freeglut mesa_glu libGL mesa_noglu.osmesa ] + [ freeglut libGLU libGL mesa_noglu.osmesa ] ++ stdenv.lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ OpenGL GLUT Cocoa ]) ; From 0acec7e984ff38b7a296a459ba4b539a3b719c1b Mon Sep 17 00:00:00 2001 From: "Alexander V. Nikolaev" Date: Sat, 24 Feb 2018 15:12:44 +0200 Subject: [PATCH 059/814] treewide: transition mesa to libGLU_combined --- pkgs/applications/audio/helm/default.nix | 4 ++-- .../audio/jack-oscrolloscope/default.nix | 4 ++-- pkgs/applications/audio/meters_lv2/default.nix | 4 ++-- pkgs/applications/audio/pianobooster/default.nix | 6 +++--- pkgs/applications/audio/setbfree/default.nix | 4 ++-- pkgs/applications/audio/sisco.lv2/default.nix | 4 ++-- .../audio/soundscape-renderer/default.nix | 4 ++-- pkgs/applications/audio/yoshimi/default.nix | 4 ++-- pkgs/applications/audio/zam-plugins/default.nix | 4 ++-- pkgs/applications/editors/kodestudio/default.nix | 4 ++-- pkgs/applications/graphics/antimony/default.nix | 4 ++-- pkgs/applications/graphics/ao/default.nix | 4 ++-- pkgs/applications/graphics/cinepaint/default.nix | 4 ++-- pkgs/applications/graphics/digikam/default.nix | 4 ++-- .../applications/graphics/draftsight/default.nix | 4 ++-- .../applications/graphics/exrdisplay/default.nix | 4 ++-- pkgs/applications/graphics/freepv/default.nix | 4 ++-- pkgs/applications/graphics/hugin/default.nix | 4 ++-- pkgs/applications/graphics/k3d/default.nix | 4 ++-- pkgs/applications/graphics/openscad/default.nix | 4 ++-- pkgs/applications/graphics/paraview/default.nix | 4 ++-- pkgs/applications/graphics/seg3d/default.nix | 4 ++-- pkgs/applications/misc/blender/default.nix | 4 ++-- pkgs/applications/misc/cpp-ethereum/default.nix | 4 ++-- pkgs/applications/misc/googleearth/default.nix | 4 ++-- pkgs/applications/misc/icesl/default.nix | 4 ++-- pkgs/applications/misc/navit/default.nix | 4 ++-- pkgs/applications/misc/openbrf/default.nix | 4 ++-- .../networking/browsers/chromium/common.nix | 4 ++-- .../networking/browsers/firefox-bin/default.nix | 4 ++-- .../networking/browsers/firefox/common.nix | 4 ++-- .../networking/browsers/palemoon/default.nix | 4 ++-- .../instant-messengers/viber/default.nix | 4 ++-- .../instant-messengers/zoom-us/default.nix | 2 +- .../mailreaders/thunderbird-bin/default.nix | 4 ++-- .../mailreaders/thunderbird/default.nix | 4 ++-- pkgs/applications/office/impressive/default.nix | 2 +- pkgs/applications/office/libreoffice/default.nix | 4 ++-- pkgs/applications/office/libreoffice/still.nix | 4 ++-- .../science/astronomy/celestia/default.nix | 4 ++-- .../science/astronomy/gravit/default.nix | 4 ++-- .../science/astronomy/stellarium/default.nix | 4 ++-- .../science/chemistry/avogadro/default.nix | 6 +++--- .../science/electronics/kicad/default.nix | 4 ++-- .../science/electronics/kicad/unstable.nix | 4 ++-- .../science/electronics/librepcb/default.nix | 2 +- .../science/electronics/pcb/default.nix | 4 ++-- .../applications/science/logic/mcrl2/default.nix | 4 ++-- pkgs/applications/science/math/giac/default.nix | 6 +++--- .../applications/science/math/glsurf/default.nix | 4 ++-- pkgs/applications/science/math/gmsh/default.nix | 4 ++-- .../science/medicine/aliza/default.nix | 4 ++-- pkgs/applications/science/misc/boinc/default.nix | 4 ++-- pkgs/applications/science/misc/golly/beta.nix | 4 ++-- pkgs/applications/science/misc/golly/default.nix | 4 ++-- .../science/misc/gplates/default.nix | 4 ++-- pkgs/applications/science/misc/root/default.nix | 4 ++-- pkgs/applications/science/misc/tulip/default.nix | 4 ++-- pkgs/applications/science/misc/vite/default.nix | 4 ++-- .../version-management/gource/default.nix | 4 ++-- pkgs/applications/video/aegisub/default.nix | 4 ++-- pkgs/applications/video/bomi/default.nix | 4 ++-- pkgs/applications/video/kodi/default.nix | 4 ++-- pkgs/applications/video/makemkv/default.nix | 6 +++--- pkgs/applications/video/mplayer/default.nix | 6 +++--- pkgs/applications/video/mpv/default.nix | 6 +++--- pkgs/applications/video/mythtv/default.nix | 4 ++-- .../video/simplescreenrecorder/default.nix | 4 ++-- .../virtualization/bochs/default.nix | 4 ++-- .../applications/window-managers/compton/git.nix | 4 ++-- .../window-managers/weston/default.nix | 4 ++-- pkgs/desktops/enlightenment/efl.nix | 4 ++-- .../gnome-2/platform/gtkglext/default.nix | 4 ++-- .../gnome-2/platform/gtkglextmm/default.nix | 4 ++-- .../haskell-modules/configuration-common.nix | 2 +- .../haskell-modules/configuration-nix.nix | 2 +- .../interpreters/erlang/generic-builder.nix | 6 +++--- pkgs/development/interpreters/io/default.nix | 4 ++-- pkgs/development/interpreters/love/0.10.nix | 4 ++-- pkgs/development/interpreters/love/0.7.nix | 4 ++-- pkgs/development/interpreters/love/0.8.nix | 4 ++-- pkgs/development/interpreters/love/0.9.nix | 4 ++-- pkgs/development/interpreters/lush/default.nix | 4 ++-- pkgs/development/interpreters/octave/default.nix | 4 ++-- pkgs/development/interpreters/renpy/default.nix | 6 +++--- .../libraries/AntTweakBar/default.nix | 4 ++-- pkgs/development/libraries/allegro/5.nix | 4 ++-- pkgs/development/libraries/allegro/default.nix | 4 ++-- pkgs/development/libraries/box2d/default.nix | 4 ++-- pkgs/development/libraries/bullet/default.nix | 4 ++-- pkgs/development/libraries/cairo/default.nix | 2 +- pkgs/development/libraries/chipmunk/default.nix | 4 ++-- pkgs/development/libraries/cl/default.nix | 2 +- pkgs/development/libraries/clutter/default.nix | 4 ++-- pkgs/development/libraries/coin3d/default.nix | 4 ++-- pkgs/development/libraries/epoxy/default.nix | 4 ++-- pkgs/development/libraries/esdl/default.nix | 4 ++-- .../libraries/ffmpeg-full/default.nix | 6 +++--- pkgs/development/libraries/ffmpeg/generic.nix | 6 +++--- pkgs/development/libraries/fltk/default.nix | 4 ++-- pkgs/development/libraries/fox/fox-1.6.nix | 4 ++-- pkgs/development/libraries/freenect/default.nix | 4 ++-- pkgs/development/libraries/ftgl/default.nix | 4 ++-- pkgs/development/libraries/gle/default.nix | 4 ++-- pkgs/development/libraries/glui/default.nix | 4 ++-- .../libraries/gstreamer/bad/default.nix | 4 ++-- .../libraries/gstreamer/vaapi/default.nix | 4 ++-- pkgs/development/libraries/irrlicht/default.nix | 4 ++-- pkgs/development/libraries/java/swt/default.nix | 4 ++-- pkgs/development/libraries/libagar/default.nix | 6 +++--- pkgs/development/libraries/libglvnd/default.nix | 4 ++-- pkgs/development/libraries/libqtav/default.nix | 10 +++++----- pkgs/development/libraries/libtcod/default.nix | 4 ++-- .../libraries/libtxc_dxtn/default.nix | 4 ++-- .../libraries/libtxc_dxtn_s2tc/default.nix | 4 ++-- pkgs/development/libraries/libwebp/default.nix | 6 +++--- pkgs/development/libraries/liquidfun/default.nix | 4 ++-- .../libraries/mediastreamer/default.nix | 4 ++-- pkgs/development/libraries/mygui/default.nix | 4 ++-- pkgs/development/libraries/ogre/1.9.x.nix | 4 ++-- pkgs/development/libraries/ogre/default.nix | 4 ++-- .../libraries/opencascade/default.nix | 4 ++-- pkgs/development/libraries/opencsg/default.nix | 4 ++-- .../libraries/openexrid-unstable/default.nix | 4 ++-- pkgs/development/libraries/partio/default.nix | 4 ++-- pkgs/development/libraries/phonon/default.nix | 4 ++-- .../libraries/physics/geant4/default.nix | 8 ++++---- pkgs/development/libraries/plib/default.nix | 4 ++-- pkgs/development/libraries/qt-3/default.nix | 6 +++--- pkgs/development/libraries/quesoglc/default.nix | 4 ++-- pkgs/development/libraries/simgear/default.nix | 4 ++-- pkgs/development/libraries/smpeg/default.nix | 4 ++-- .../libraries/vaapi-vdpau/default.nix | 4 ++-- pkgs/development/libraries/vrpn/default.nix | 4 ++-- pkgs/development/libraries/vtk/default.nix | 4 ++-- pkgs/development/libraries/webkitgtk/2.18.nix | 4 ++-- pkgs/development/libraries/xine-lib/default.nix | 4 ++-- pkgs/development/misc/amdapp-sdk/default.nix | 4 ++-- .../development/mobile/androidenv/androidsdk.nix | 4 ++-- pkgs/development/mobile/androidenv/default.nix | 2 +- .../development/ocaml-modules/lablgl/default.nix | 4 ++-- pkgs/development/pharo/vm/build-vm-legacy.nix | 6 +++--- pkgs/development/pharo/vm/build-vm.nix | 6 +++--- pkgs/development/pharo/vm/vms.nix | 2 +- pkgs/development/pure-modules/gl/default.nix | 4 ++-- .../python-modules/pyftgl/default.nix | 4 ++-- .../python-modules/pyglet/default.nix | 4 ++-- pkgs/development/r-modules/default.nix | 2 +- .../tools/godot/pkg_config_additions.patch | 2 +- pkgs/development/tools/simavr/default.nix | 4 ++-- pkgs/games/0ad/game.nix | 4 ++-- pkgs/games/adom/default.nix | 4 ++-- pkgs/games/alienarena/default.nix | 6 +++--- pkgs/games/armagetronad/default.nix | 4 ++-- pkgs/games/arx-libertatis/default.nix | 4 ++-- pkgs/games/astromenace/default.nix | 4 ++-- pkgs/games/bitsnbots/default.nix | 4 ++-- pkgs/games/blackshades/default.nix | 4 ++-- pkgs/games/blackshadeselite/default.nix | 4 ++-- pkgs/games/blobby/default.nix | 4 ++-- pkgs/games/btanks/default.nix | 4 ++-- pkgs/games/bzflag/default.nix | 4 ++-- pkgs/games/construo/default.nix | 4 ++-- pkgs/games/crack-attack/default.nix | 4 ++-- pkgs/games/crawl/default.nix | 4 ++-- pkgs/games/crrcsim/default.nix | 4 ++-- pkgs/games/dhewm3/default.nix | 6 +++--- pkgs/games/dwarf-fortress/dfhack/default.nix | 4 ++-- pkgs/games/dxx-rebirth/default.nix | 4 ++-- pkgs/games/eduke32/default.nix | 8 ++++---- pkgs/games/egoboo/default.nix | 4 ++-- pkgs/games/extremetuxracer/default.nix | 4 ++-- pkgs/games/ezquake/default.nix | 4 ++-- pkgs/games/flightgear/default.nix | 4 ++-- pkgs/games/freeorion/default.nix | 4 ++-- pkgs/games/fsg/default.nix | 4 ++-- pkgs/games/gl-117/default.nix | 4 ++-- pkgs/games/globulation/default.nix | 4 ++-- pkgs/games/gltron/default.nix | 4 ++-- pkgs/games/hedgewars/default.nix | 6 +++--- pkgs/games/kobodeluxe/default.nix | 4 ++-- pkgs/games/lincity/ng.nix | 4 ++-- pkgs/games/liquidwar/default.nix | 4 ++-- pkgs/games/mars/default.nix | 4 ++-- pkgs/games/minecraft/default.nix | 4 ++-- pkgs/games/minetest/default.nix | 4 ++-- pkgs/games/naev/default.nix | 4 ++-- pkgs/games/newtonwars/default.nix | 6 +++--- pkgs/games/nexuiz/default.nix | 4 ++-- pkgs/games/openrw/default.nix | 4 ++-- pkgs/games/openxcom/default.nix | 4 ++-- pkgs/games/pingus/default.nix | 4 ++-- pkgs/games/pioneer/default.nix | 4 ++-- pkgs/games/prboom/default.nix | 4 ++-- pkgs/games/privateer/default.nix | 4 ++-- pkgs/games/quake3/ioquake/default.nix | 4 ++-- pkgs/games/residualvm/default.nix | 6 +++--- pkgs/games/rigsofrods/default.nix | 4 ++-- pkgs/games/sauerbraten/default.nix | 4 ++-- pkgs/games/scorched3d/default.nix | 4 ++-- pkgs/games/scummvm/default.nix | 4 ++-- pkgs/games/soi/default.nix | 4 ++-- pkgs/games/space-orbit/default.nix | 4 ++-- pkgs/games/speed-dreams/default.nix | 4 ++-- pkgs/games/spring/default.nix | 4 ++-- pkgs/games/stardust/default.nix | 4 ++-- pkgs/games/super-tux-kart/default.nix | 4 ++-- pkgs/games/supertux/default.nix | 4 ++-- pkgs/games/tibia/default.nix | 4 ++-- pkgs/games/trackballs/default.nix | 4 ++-- pkgs/games/tremulous/default.nix | 4 ++-- pkgs/games/trigger/default.nix | 4 ++-- pkgs/games/ufoai/default.nix | 4 ++-- pkgs/games/ultimatestunts/default.nix | 4 ++-- pkgs/games/ultrastardx/default.nix | 4 ++-- pkgs/games/unvanquished/default.nix | 4 ++-- pkgs/games/uqm/default.nix | 4 ++-- pkgs/games/urbanterror/default.nix | 6 +++--- pkgs/games/vdrift/default.nix | 4 ++-- pkgs/games/voxelands/default.nix | 4 ++-- pkgs/games/warsow/default.nix | 6 +++--- pkgs/games/worldofgoo/default.nix | 4 ++-- pkgs/games/xmoto/default.nix | 4 ++-- pkgs/games/xonotic/default.nix | 4 ++-- pkgs/games/xpilot/bloodspilot-client.nix | 4 ++-- pkgs/games/xpilot/default.nix | 4 ++-- pkgs/games/zandronum/default.nix | 4 ++-- pkgs/misc/emulators/atari800/default.nix | 4 ++-- pkgs/misc/emulators/attract-mode/default.nix | 4 ++-- pkgs/misc/emulators/dolphin-emu/default.nix | 4 ++-- pkgs/misc/emulators/dolphin-emu/master.nix | 4 ++-- pkgs/misc/emulators/dosbox/default.nix | 4 ++-- pkgs/misc/emulators/dosbox/unstable.nix | 4 ++-- pkgs/misc/emulators/emulationstation/default.nix | 4 ++-- pkgs/misc/emulators/fakenes/default.nix | 4 ++-- pkgs/misc/emulators/fs-uae/default.nix | 4 ++-- pkgs/misc/emulators/gens-gs/default.nix | 4 ++-- pkgs/misc/emulators/higan/default.nix | 4 ++-- pkgs/misc/emulators/mednafen/default.nix | 4 ++-- pkgs/misc/emulators/mess/default.nix | 4 ++-- pkgs/misc/emulators/nestopia/default.nix | 4 ++-- pkgs/misc/emulators/retroarch/cores.nix | 16 ++++++++-------- pkgs/misc/emulators/retroarch/default.nix | 4 ++-- pkgs/misc/emulators/vbam/default.nix | 4 ++-- pkgs/misc/emulators/vice/default.nix | 4 ++-- pkgs/misc/emulators/wine/base.nix | 2 +- pkgs/misc/emulators/wxmupen64plus/default.nix | 4 ++-- pkgs/misc/emulators/yabause/default.nix | 4 ++-- pkgs/misc/emulators/zsnes/default.nix | 4 ++-- pkgs/misc/gnash/default.nix | 10 +++++----- pkgs/misc/screensavers/electricsheep/default.nix | 4 ++-- pkgs/misc/screensavers/rss-glx/default.nix | 4 ++-- pkgs/misc/screensavers/xscreensaver/default.nix | 4 ++-- pkgs/os-specific/linux/ati-drivers/builder.sh | 4 ++-- pkgs/os-specific/linux/ati-drivers/default.nix | 8 ++++---- pkgs/os-specific/linux/kmscon/default.nix | 4 ++-- pkgs/os-specific/linux/kmscube/default.nix | 2 +- pkgs/tools/X11/virtualgl/lib.nix | 4 ++-- pkgs/tools/graphics/asymptote/default.nix | 2 +- pkgs/tools/graphics/enblend-enfuse/default.nix | 4 ++-- pkgs/tools/graphics/glee/default.nix | 4 ++-- pkgs/tools/graphics/glmark2/default.nix | 4 ++-- pkgs/tools/graphics/glxinfo/default.nix | 2 +- pkgs/tools/graphics/logstalgia/default.nix | 4 ++-- pkgs/tools/graphics/maim/default.nix | 4 ++-- pkgs/tools/graphics/pfstools/default.nix | 4 ++-- pkgs/tools/inputmethods/touchegg/default.nix | 4 ++-- pkgs/tools/misc/kisslicer/default.nix | 6 +++--- pkgs/tools/misc/ocz-ssd-guru/default.nix | 4 ++-- pkgs/tools/misc/pipelight/default.nix | 4 ++-- pkgs/tools/misc/slop/default.nix | 4 ++-- pkgs/tools/security/enpass/default.nix | 4 ++-- pkgs/tools/text/mpage/default.nix | 4 ++-- 273 files changed, 572 insertions(+), 572 deletions(-) diff --git a/pkgs/applications/audio/helm/default.nix b/pkgs/applications/audio/helm/default.nix index 80fb6a9ef923..fa76a1a26e82 100644 --- a/pkgs/applications/audio/helm/default.nix +++ b/pkgs/applications/audio/helm/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub , xorg, freetype, alsaLib, curl, libjack2 - , lv2, pkgconfig, mesa }: + , lv2, pkgconfig, libGLU_combined }: stdenv.mkDerivation rec { version = "0.9.0"; @@ -15,7 +15,7 @@ buildInputs = [ xorg.libX11 xorg.libXcomposite xorg.libXcursor xorg.libXext xorg.libXinerama xorg.libXrender xorg.libXrandr - freetype alsaLib curl libjack2 pkgconfig mesa lv2 + freetype alsaLib curl libjack2 pkgconfig libGLU_combined lv2 ]; CXXFLAGS = "-DHAVE_LROUND"; diff --git a/pkgs/applications/audio/jack-oscrolloscope/default.nix b/pkgs/applications/audio/jack-oscrolloscope/default.nix index a75513ff059e..75a8a6a4b1a1 100644 --- a/pkgs/applications/audio/jack-oscrolloscope/default.nix +++ b/pkgs/applications/audio/jack-oscrolloscope/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, SDL, libjack2, mesa, pkgconfig }: +{ stdenv, fetchurl, SDL, libjack2, libGLU_combined, pkgconfig }: stdenv.mkDerivation rec { name = "jack_oscrolloscope-${version}"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ SDL libjack2 mesa ]; + buildInputs = [ SDL libjack2 libGLU_combined ]; installPhase = '' mkdir -p $out/bin diff --git a/pkgs/applications/audio/meters_lv2/default.nix b/pkgs/applications/audio/meters_lv2/default.nix index f4245b0a51e3..669ffbb2688a 100644 --- a/pkgs/applications/audio/meters_lv2/default.nix +++ b/pkgs/applications/audio/meters_lv2/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig -, lv2, mesa, gtk2, cairo, pango, fftw }: +, lv2, libGLU_combined, gtk2, cairo, pango, fftw }: let version = "0.8.1"; @@ -26,7 +26,7 @@ stdenv.mkDerivation { inherit name; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ lv2 mesa gtk2 cairo pango fftw ]; + buildInputs = [ lv2 libGLU_combined gtk2 cairo pango fftw ]; srcs = [ src robtkSrc ]; sourceRoot = name; diff --git a/pkgs/applications/audio/pianobooster/default.nix b/pkgs/applications/audio/pianobooster/default.nix index 67848cdc804b..d013a26277e8 100644 --- a/pkgs/applications/audio/pianobooster/default.nix +++ b/pkgs/applications/audio/pianobooster/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, alsaLib, cmake, mesa, makeWrapper, qt4 }: +{ stdenv, fetchurl, alsaLib, cmake, libGLU_combined, makeWrapper, qt4 }: stdenv.mkDerivation rec { name = "pianobooster-${version}"; @@ -16,11 +16,11 @@ stdenv.mkDerivation rec { preConfigure = "cd src"; - buildInputs = [ alsaLib cmake makeWrapper mesa qt4 ]; + buildInputs = [ alsaLib cmake makeWrapper libGLU_combined qt4 ]; postInstall = '' wrapProgram $out/bin/pianobooster \ - --prefix LD_LIBRARY_PATH : ${mesa}/lib + --prefix LD_LIBRARY_PATH : ${libGLU_combined}/lib ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/audio/setbfree/default.nix b/pkgs/applications/audio/setbfree/default.nix index 63705d40c3f6..4d8435454239 100644 --- a/pkgs/applications/audio/setbfree/default.nix +++ b/pkgs/applications/audio/setbfree/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, alsaLib, freetype, ftgl, libjack2, libX11, lv2 -, mesa, pkgconfig, ttf_bitstream_vera +, libGLU_combined, pkgconfig, ttf_bitstream_vera }: stdenv.mkDerivation rec { @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - alsaLib freetype ftgl libjack2 libX11 lv2 mesa + alsaLib freetype ftgl libjack2 libX11 lv2 libGLU_combined ttf_bitstream_vera ]; diff --git a/pkgs/applications/audio/sisco.lv2/default.nix b/pkgs/applications/audio/sisco.lv2/default.nix index a60c3bef0daa..32cfd0f74940 100644 --- a/pkgs/applications/audio/sisco.lv2/default.nix +++ b/pkgs/applications/audio/sisco.lv2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, lv2, pkgconfig, mesa, cairo, pango, libjack2 }: +{ stdenv, fetchFromGitHub, lv2, pkgconfig, libGLU_combined, cairo, pango, libjack2 }: let name = "sisco.lv2-${version}"; @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { sourceRoot = src.name; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ lv2 pango cairo libjack2 mesa ]; + buildInputs = [ lv2 pango cairo libjack2 libGLU_combined ]; postUnpack = "chmod u+w -R ${robtkName}-src; mv ${robtkName}-src/* ${sourceRoot}/robtk"; sisco_VERSION = version; diff --git a/pkgs/applications/audio/soundscape-renderer/default.nix b/pkgs/applications/audio/soundscape-renderer/default.nix index 44c3bd70d3dc..47851adc3aaf 100644 --- a/pkgs/applications/audio/soundscape-renderer/default.nix +++ b/pkgs/applications/audio/soundscape-renderer/default.nix @@ -11,7 +11,7 @@ , boost , ecasound , glibcLocales -, mesa # Needed because help2man basically does a ./ssr-binaural --help and ssr-binaural needs libGL +, libGLU_combined # Needed because help2man basically does a ./ssr-binaural --help and ssr-binaural needs libGL }: stdenv.mkDerivation rec { @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { LC_ALL = "en_US.UTF-8"; nativeBuildInputs = [ autoreconfHook pkgconfig ]; - buildInputs = [ boost boost.dev ecasound mesa help2man libsndfile fftwFloat libjack2 libxml2 qt4 glibcLocales ]; + buildInputs = [ boost boost.dev ecasound libGLU_combined help2man libsndfile fftwFloat libjack2 libxml2 qt4 glibcLocales ]; # 1) Fix detecting version. https://github.com/SoundScapeRenderer/ssr/pull/53 # 2) Make it find ecasound headers diff --git a/pkgs/applications/audio/yoshimi/default.nix b/pkgs/applications/audio/yoshimi/default.nix index 27d82942d343..cdf84cb7e46f 100644 --- a/pkgs/applications/audio/yoshimi/default.nix +++ b/pkgs/applications/audio/yoshimi/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, alsaLib, boost, cairo, cmake, fftwSinglePrec, fltk, pcre -, libjack2, libsndfile, libXdmcp, readline, lv2, mesa, minixml, pkgconfig, zlib, xorg +, libjack2, libsndfile, libXdmcp, readline, lv2, libGLU_combined, minixml, pkgconfig, zlib, xorg }: assert stdenv ? glibc; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ - alsaLib boost cairo fftwSinglePrec fltk libjack2 libsndfile libXdmcp readline lv2 mesa + alsaLib boost cairo fftwSinglePrec fltk libjack2 libsndfile libXdmcp readline lv2 libGLU_combined minixml zlib xorg.libpthreadstubs pcre ]; diff --git a/pkgs/applications/audio/zam-plugins/default.nix b/pkgs/applications/audio/zam-plugins/default.nix index e9a445ec1427..210d0f7e989d 100644 --- a/pkgs/applications/audio/zam-plugins/default.nix +++ b/pkgs/applications/audio/zam-plugins/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit , boost, libX11, mesa, liblo, libjack2, ladspaH, lv2, pkgconfig, rubberband, libsndfile, fftwFloat, libsamplerate }: +{ stdenv, fetchgit , boost, libX11, libGLU_combined, liblo, libjack2, ladspaH, lv2, pkgconfig, rubberband, libsndfile, fftwFloat, libsamplerate }: stdenv.mkDerivation rec { name = "zam-plugins-${version}"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ boost libX11 mesa liblo libjack2 ladspaH lv2 rubberband libsndfile fftwFloat libsamplerate ]; + buildInputs = [ boost libX11 libGLU_combined liblo libjack2 ladspaH lv2 rubberband libsndfile fftwFloat libsamplerate ]; patchPhase = '' patchShebangs ./dpf/utils/generate-ttl.sh diff --git a/pkgs/applications/editors/kodestudio/default.nix b/pkgs/applications/editors/kodestudio/default.nix index a0e941289099..8eb2f392ddc0 100644 --- a/pkgs/applications/editors/kodestudio/default.nix +++ b/pkgs/applications/editors/kodestudio/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, callPackage, fetchurl, makeDesktopItem, makeWrapper , # Patchelf dependencies: - alsaLib, atomEnv, boehmgc, flac, libogg, libvorbis, libXScrnSaver, mesa + alsaLib, atomEnv, boehmgc, flac, libogg, libvorbis, libXScrnSaver, libGLU_combined , openssl, xlibs, xorg, zlib }: @@ -55,7 +55,7 @@ in $out/kodestudio patchelf \ --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath ".:${stdenv.cc.libc}/lib:${xorg.libXinerama}/lib:${xorg.libX11}/lib:${alsaLib}/lib:${mesa}/lib:${openssl.out}/lib" \ + --set-rpath ".:${stdenv.cc.libc}/lib:${xorg.libXinerama}/lib:${xorg.libX11}/lib:${alsaLib}/lib:${libGLU_combined}/lib:${openssl.out}/lib" \ $out/resources/app/extensions/krom/Krom/linux/Krom patchelf \ --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ diff --git a/pkgs/applications/graphics/antimony/default.nix b/pkgs/applications/graphics/antimony/default.nix index f9ea2b9aa84e..334a5a33dadf 100644 --- a/pkgs/applications/graphics/antimony/default.nix +++ b/pkgs/applications/graphics/antimony/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, libpng, python3, boost, mesa, qtbase, ncurses, cmake, flex, lemon }: +{ stdenv, fetchFromGitHub, libpng, python3, boost, libGLU_combined, qtbase, ncurses, cmake, flex, lemon }: let gitRev = "020910c25614a3752383511ede5a1f5551a8bd39"; @@ -24,7 +24,7 @@ in buildInputs = [ libpng python3 (boost.override { python = python3; }) - mesa qtbase ncurses + libGLU_combined qtbase ncurses ]; nativeBuildInputs = [ cmake flex lemon ]; diff --git a/pkgs/applications/graphics/ao/default.nix b/pkgs/applications/graphics/ao/default.nix index 990fee8cc37c..d415df1bae80 100644 --- a/pkgs/applications/graphics/ao/default.nix +++ b/pkgs/applications/graphics/ao/default.nix @@ -1,5 +1,5 @@ {stdenv, fetchgit, cmake, ninja, boost, libpng, glfw3, epoxy, guile, pkgconfig -, mesa, libX11, libpthreadstubs, libXau, libXdmcp, libXrandr, libXext +, libGLU_combined, libX11, libpthreadstubs, libXau, libXdmcp, libXrandr, libXext , libXinerama, libXxf86vm, libXcursor, libXfixes }: stdenv.mkDerivation rec { @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - cmake ninja boost libpng glfw3 epoxy guile mesa libX11 + cmake ninja boost libpng glfw3 epoxy guile libGLU_combined libX11 libpthreadstubs libXau libXdmcp libXrandr libXext libXinerama libXxf86vm libXcursor libXfixes ]; diff --git a/pkgs/applications/graphics/cinepaint/default.nix b/pkgs/applications/graphics/cinepaint/default.nix index 22ac473bdd95..d46128c62c02 100644 --- a/pkgs/applications/graphics/cinepaint/default.nix +++ b/pkgs/applications/graphics/cinepaint/default.nix @@ -2,7 +2,7 @@ flex, libtiff, libjpeg, libpng, libexif, zlib, perl, libX11, perlXMLParser, pythonPackages, gettext, intltool, babl, gegl, glib, makedepend, xf86vidmodeproto, xineramaproto, libXmu, openexr, - mesa, libXext, libXpm, libXau, libXxf86vm, pixman, libpthreadstubs, fltk } : + libGLU_combined, libXext, libXpm, libXau, libXxf86vm, pixman, libpthreadstubs, fltk } : let inherit (pythonPackages) python pygtk; @@ -16,7 +16,7 @@ in stdenv.mkDerivation rec { buildInputs = [ libpng gtk2 freetype fontconfig lcms flex libtiff libjpeg libexif zlib perl libX11 perlXMLParser python pygtk gettext intltool babl - gegl glib makedepend xf86vidmodeproto xineramaproto libXmu openexr mesa + gegl glib makedepend xf86vidmodeproto xineramaproto libXmu openexr libGLU_combined libXext libXpm libXau libXxf86vm pixman libpthreadstubs fltk ]; diff --git a/pkgs/applications/graphics/digikam/default.nix b/pkgs/applications/graphics/digikam/default.nix index d2ef35fcca80..9dd0722541f4 100644 --- a/pkgs/applications/graphics/digikam/default.nix +++ b/pkgs/applications/graphics/digikam/default.nix @@ -34,7 +34,7 @@ , libqtav , libusb1 , marble -, mesa +, libGLU_combined , mysql , opencv3 , pcre @@ -76,7 +76,7 @@ mkDerivation rec { liblqr1 libqtav libusb1 - mesa + libGLU_combined opencv3 pcre diff --git a/pkgs/applications/graphics/draftsight/default.nix b/pkgs/applications/graphics/draftsight/default.nix index 17334c5b366c..9ab43ff94337 100644 --- a/pkgs/applications/graphics/draftsight/default.nix +++ b/pkgs/applications/graphics/draftsight/default.nix @@ -1,4 +1,4 @@ -{ stdenv, requireFile, dpkg, makeWrapper, gcc, mesa, xdg_utils, +{ stdenv, requireFile, dpkg, makeWrapper, gcc, libGLU_combined, xdg_utils, dbus_tools, alsaLib, cups, fontconfig, glib, icu, libpng12, xkeyboard_config, gstreamer, zlib, libxslt, libxml2, sqlite, orc, libX11, libXcursor, libXrandr, libxcb, libXi, libSM, libICE, @@ -59,7 +59,7 @@ stdenv.mkDerivation { sha256 = "04i3dqza6y4p2059pqg5inp3qzr5jmiqplzzk7h1a6gh380v1rbr"; }; - libPath = stdenv.lib.makeLibraryPath [ gcc.cc mesa xdg_utils + libPath = stdenv.lib.makeLibraryPath [ gcc.cc libGLU_combined xdg_utils dbus_tools alsaLib cups.lib fontconfig glib icu libpng12 xkeyboard_config gstreamer zlib libxslt libxml2 sqlite orc libX11 libXcursor libXrandr libxcb libXi libSM libICE libXrender diff --git a/pkgs/applications/graphics/exrdisplay/default.nix b/pkgs/applications/graphics/exrdisplay/default.nix index 3386d75e81e1..aee65803e53f 100644 --- a/pkgs/applications/graphics/exrdisplay/default.nix +++ b/pkgs/applications/graphics/exrdisplay/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, fltk, openexr, mesa, openexr_ctl }: +{ stdenv, fetchurl, pkgconfig, fltk, openexr, libGLU_combined, openexr_ctl }: assert fltk.glSupport; @@ -19,7 +19,7 @@ stdenv.mkDerivation { ''; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ openexr fltk mesa openexr_ctl ]; + buildInputs = [ openexr fltk libGLU_combined openexr_ctl ]; meta = { description = "Application for viewing OpenEXR images on a display at various exposure settings"; diff --git a/pkgs/applications/graphics/freepv/default.nix b/pkgs/applications/graphics/freepv/default.nix index e6d8a06a5193..0bd3421f1b10 100644 --- a/pkgs/applications/graphics/freepv/default.nix +++ b/pkgs/applications/graphics/freepv/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libjpeg, mesa, freeglut, zlib, cmake, libX11, libxml2, libpng, +{ stdenv, fetchurl, libjpeg, libGLU_combined, freeglut, zlib, cmake, libX11, libxml2, libpng, libXxf86vm }: stdenv.mkDerivation { @@ -9,7 +9,7 @@ stdenv.mkDerivation { sha256 = "1w19abqjn64w47m35alg7bcdl1p97nf11zn64cp4p0dydihmhv56"; }; - buildInputs = [ libjpeg mesa freeglut zlib cmake libX11 libxml2 libpng + buildInputs = [ libjpeg libGLU_combined freeglut zlib cmake libX11 libxml2 libpng libXxf86vm ]; postPatch = '' diff --git a/pkgs/applications/graphics/hugin/default.nix b/pkgs/applications/graphics/hugin/default.nix index 9acd8357cb71..82741665161f 100644 --- a/pkgs/applications/graphics/hugin/default.nix +++ b/pkgs/applications/graphics/hugin/default.nix @@ -1,7 +1,7 @@ { stdenv, cmake, fetchurl, gnumake, makeWrapper, pkgconfig , autopanosiftc, boost, cairo, enblend-enfuse, exiv2, fftw, flann, gettext , glew, ilmbase, lcms2, lensfun, libjpeg, libpng, libtiff, libX11, libXi -, libXmu, mesa, openexr, panotools, perlPackages, sqlite, vigra, wxGTK, zlib +, libXmu, libGLU_combined, openexr, panotools, perlPackages, sqlite, vigra, wxGTK, zlib }: stdenv.mkDerivation rec { @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { buildInputs = [ boost cairo exiv2 fftw flann gettext glew ilmbase lcms2 lensfun libjpeg - libpng libtiff libX11 libXi libXmu mesa openexr panotools sqlite vigra + libpng libtiff libX11 libXi libXmu libGLU_combined openexr panotools sqlite vigra wxGTK zlib ]; diff --git a/pkgs/applications/graphics/k3d/default.nix b/pkgs/applications/graphics/k3d/default.nix index ce315ebc5120..eb59b6ff6d65 100644 --- a/pkgs/applications/graphics/k3d/default.nix +++ b/pkgs/applications/graphics/k3d/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, fetchpatch, unzip, ftgl, glew, asciidoc -, cmake, mesa, zlib, python, expat, libxml2, libsigcxx, libuuid, freetype +, cmake, libGLU_combined, zlib, python, expat, libxml2, libsigcxx, libuuid, freetype , libpng, boost, doxygen, cairomm, pkgconfig, imagemagick, libjpeg, libtiff , gettext, intltool, perl, gtkmm2, glibmm, gtkglext, pangox_compat, libXmu }: @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { ''; buildInputs = [ - cmake mesa zlib python expat libxml2 libsigcxx libuuid freetype libpng + cmake libGLU_combined zlib python expat libxml2 libsigcxx libuuid freetype libpng boost doxygen cairomm pkgconfig imagemagick libjpeg libtiff gettext intltool perl unzip ftgl glew asciidoc gtkmm2 glibmm gtkglext pangox_compat libXmu diff --git a/pkgs/applications/graphics/openscad/default.nix b/pkgs/applications/graphics/openscad/default.nix index 06a1a946cdf6..33fddf6c8d01 100644 --- a/pkgs/applications/graphics/openscad/default.nix +++ b/pkgs/applications/graphics/openscad/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, qt4, qmake4Hook, bison, flex, eigen, boost, mesa, glew, opencsg, cgal +{ stdenv, fetchurl, qt4, qmake4Hook, bison, flex, eigen, boost, libGLU_combined, glew, opencsg, cgal , mpfr, gmp, glib, pkgconfig, harfbuzz, qscintilla, gettext }: @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ - qt4 qmake4Hook bison flex eigen boost mesa glew opencsg cgal mpfr gmp glib + qt4 qmake4Hook bison flex eigen boost libGLU_combined glew opencsg cgal mpfr gmp glib pkgconfig harfbuzz qscintilla gettext ]; diff --git a/pkgs/applications/graphics/paraview/default.nix b/pkgs/applications/graphics/paraview/default.nix index 8b532a7ad44f..42b69e249267 100644 --- a/pkgs/applications/graphics/paraview/default.nix +++ b/pkgs/applications/graphics/paraview/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, cmake -,qtbase, qttools, python, mesa +,qtbase, qttools, python, libGLU_combined ,libXt, qtx11extras, qtxmlpatterns }: @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { buildInputs = [ python - mesa + libGLU_combined libXt qtbase qtx11extras diff --git a/pkgs/applications/graphics/seg3d/default.nix b/pkgs/applications/graphics/seg3d/default.nix index e97278148f99..80987a8c7411 100644 --- a/pkgs/applications/graphics/seg3d/default.nix +++ b/pkgs/applications/graphics/seg3d/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, cmake, wxGTK, itk, mesa, libXft, libXext, libXi, zlib, libXmu, +{ fetchurl, stdenv, cmake, wxGTK, itk, libGLU_combined, libXft, libXext, libXi, zlib, libXmu, libuuid }: assert (stdenv ? glibc); @@ -47,7 +47,7 @@ stdenv.mkDerivation { exit 1 ''; - buildInputs = [ cmake wxGTK itk mesa libXft libXext libXi zlib libXmu libuuid ]; + buildInputs = [ cmake wxGTK itk libGLU_combined libXft libXext libXi zlib libXmu libuuid ]; meta = { broken = true; diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix index b348f253b350..7391652fa8ea 100644 --- a/pkgs/applications/misc/blender/default.nix +++ b/pkgs/applications/misc/blender/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchurl, boost, cmake, ffmpeg, gettext, glew , ilmbase, libXi, libX11, libXext, libXrender , libjpeg, libpng, libsamplerate, libsndfile -, libtiff, mesa, openal, opencolorio, openexr, openimageio, openjpeg_1, python +, libtiff, libGLU_combined, openal, opencolorio, openexr, openimageio, openjpeg_1, python , zlib, fftw, opensubdiv, freetype, jemalloc, ocl-icd , jackaudioSupport ? false, libjack2 , cudaSupport ? false, cudatoolkit @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { buildInputs = [ boost cmake ffmpeg gettext glew ilmbase libXi libX11 libXext libXrender - freetype libjpeg libpng libsamplerate libsndfile libtiff mesa openal + freetype libjpeg libpng libsamplerate libsndfile libtiff libGLU_combined openal opencolorio openexr openimageio openjpeg_1 python zlib fftw jemalloc (opensubdiv.override { inherit cudaSupport; }) ] diff --git a/pkgs/applications/misc/cpp-ethereum/default.nix b/pkgs/applications/misc/cpp-ethereum/default.nix index 150c900ba9fb..857254c3cb03 100644 --- a/pkgs/applications/misc/cpp-ethereum/default.nix +++ b/pkgs/applications/misc/cpp-ethereum/default.nix @@ -13,7 +13,7 @@ , miniupnpc , libmicrohttpd , gmp -, mesa +, libGLU_combined , extraCmakeFlags ? [] }: stdenv.mkDerivation rec { @@ -69,7 +69,7 @@ stdenv.mkDerivation rec { miniupnpc libmicrohttpd gmp - mesa + libGLU_combined ]; dontStrip = true; diff --git a/pkgs/applications/misc/googleearth/default.nix b/pkgs/applications/misc/googleearth/default.nix index 52903a1f8014..f8ba66c4197c 100644 --- a/pkgs/applications/misc/googleearth/default.nix +++ b/pkgs/applications/misc/googleearth/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, glibc, mesa, freetype, glib, libSM, libICE, libXi, libXv +{ stdenv, fetchurl, glibc, libGLU_combined, freetype, glib, libSM, libICE, libXi, libXv , libXrender, libXrandr, libXfixes, libXcursor, libXinerama, libXext, libX11, qt4 , zlib, fontconfig, dpkg }: @@ -19,7 +19,7 @@ let libICE libXi libXv - mesa + libGLU_combined libXrender libXrandr libXfixes diff --git a/pkgs/applications/misc/icesl/default.nix b/pkgs/applications/misc/icesl/default.nix index d39d734dd7b9..2295e15cc3d3 100644 --- a/pkgs/applications/misc/icesl/default.nix +++ b/pkgs/applications/misc/icesl/default.nix @@ -1,6 +1,6 @@ -{ stdenv, lib, fetchzip, patchelf, freeglut, libXmu, libXi, libX11, libICE, mesa, libSM, libXext, dialog, makeWrapper }: +{ stdenv, lib, fetchzip, patchelf, freeglut, libXmu, libXi, libX11, libICE, libGLU_combined, libSM, libXext, dialog, makeWrapper }: let - lpath = stdenv.lib.makeLibraryPath [ libXmu libXi libX11 freeglut libICE mesa libSM libXext ]; + lpath = stdenv.lib.makeLibraryPath [ libXmu libXi libX11 freeglut libICE libGLU_combined libSM libXext ]; in stdenv.mkDerivation rec { name = "iceSL-${version}"; diff --git a/pkgs/applications/misc/navit/default.nix b/pkgs/applications/misc/navit/default.nix index 51b29a5c04c4..92269e03e58d 100644 --- a/pkgs/applications/misc/navit/default.nix +++ b/pkgs/applications/misc/navit/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchsvn, pkgconfig, gtk2, SDL, fontconfig, freetype, imlib2, SDL_image, mesa, +{ stdenv, fetchsvn, pkgconfig, gtk2, SDL, fontconfig, freetype, imlib2, SDL_image, libGLU_combined, libXmu, freeglut, python, gettext, quesoglc, gd, postgresql, cmake, qt4, SDL_ttf, fribidi}: stdenv.mkDerivation rec { name = "navit-svn-3537"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; - buildInputs = [ gtk2 SDL fontconfig freetype imlib2 SDL_image mesa + buildInputs = [ gtk2 SDL fontconfig freetype imlib2 SDL_image libGLU_combined libXmu freeglut python gettext quesoglc gd postgresql qt4 SDL_ttf fribidi ]; nativeBuildInputs = [ pkgconfig cmake ]; diff --git a/pkgs/applications/misc/openbrf/default.nix b/pkgs/applications/misc/openbrf/default.nix index 4aebd3bb2a96..b8b6e42d5cf5 100644 --- a/pkgs/applications/misc/openbrf/default.nix +++ b/pkgs/applications/misc/openbrf/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, qtbase, vcg, glew, qmake, mesa }: +{ stdenv, fetchFromGitHub, qtbase, vcg, glew, qmake, libGLU_combined }: stdenv.mkDerivation { @@ -28,7 +28,7 @@ stdenv.mkDerivation { install -Dm644 reference.brf $out/share/openBrf/reference.brf patchelf \ - --set-rpath "${stdenv.lib.makeLibraryPath [ qtbase glew stdenv.cc.cc mesa ]}" \ + --set-rpath "${stdenv.lib.makeLibraryPath [ qtbase glew stdenv.cc.cc libGLU_combined ]}" \ $out/share/openBrf/openBrf mkdir -p "$out/bin" diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index bb5a7046dd49..a63f621e9bee 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -12,7 +12,7 @@ , utillinux, alsaLib , bison, gperf , glib, gtk2, gtk3, dbus_glib -, libXScrnSaver, libXcursor, libXtst, mesa +, libXScrnSaver, libXcursor, libXtst, libGLU_combined , protobuf, speechd, libXdamage, cups , ffmpeg, harfbuzz, harfbuzz-icu, libxslt, libxml2 @@ -126,7 +126,7 @@ let utillinux alsaLib bison gperf kerberos glib gtk2 gtk3 dbus_glib - libXScrnSaver libXcursor libXtst mesa + libXScrnSaver libXcursor libXtst libGLU_combined pciutils protobuf speechd libXdamage ] ++ optional gnomeKeyringSupport libgnome_keyring3 ++ optionals gnomeSupport [ gnome.GConf libgcrypt ] diff --git a/pkgs/applications/networking/browsers/firefox-bin/default.nix b/pkgs/applications/networking/browsers/firefox-bin/default.nix index 347ceba9ab4a..9faa67cfc557 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/default.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/default.nix @@ -31,7 +31,7 @@ , libgnome , libgnomeui , defaultIconTheme -, mesa +, libGLU_combined , nspr , nss , pango @@ -118,7 +118,7 @@ stdenv.mkDerivation { libcanberra_gtk2 libgnome libgnomeui - mesa + libGLU_combined nspr nss pango diff --git a/pkgs/applications/networking/browsers/firefox/common.nix b/pkgs/applications/networking/browsers/firefox/common.nix index 69e935d78762..2b3407d0175c 100644 --- a/pkgs/applications/networking/browsers/firefox/common.nix +++ b/pkgs/applications/networking/browsers/firefox/common.nix @@ -5,7 +5,7 @@ { lib, stdenv, pkgconfig, pango, perl, python, zip, libIDL , libjpeg, zlib, dbus, dbus_glib, bzip2, xorg , freetype, fontconfig, file, nspr, nss, libnotify -, yasm, mesa, sqlite, unzip, makeWrapper +, yasm, libGLU_combined, sqlite, unzip, makeWrapper , hunspell, libevent, libstartup_notification, libvpx , cairo, icu, libpng, jemalloc , autoconf213, which, gnused, cargo, rustc, llvmPackages @@ -75,7 +75,7 @@ stdenv.mkDerivation (rec { gtk2 perl zip libIDL libjpeg zlib bzip2 dbus dbus_glib pango freetype fontconfig xorg.libXi xorg.libX11 xorg.libXrender xorg.libXft xorg.libXt file - nspr libnotify xorg.pixman yasm mesa + nspr libnotify xorg.pixman yasm libGLU_combined xorg.libXScrnSaver xorg.scrnsaverproto xorg.libXext xorg.xextproto sqlite unzip makeWrapper hunspell libevent libstartup_notification libvpx /* cairo */ diff --git a/pkgs/applications/networking/browsers/palemoon/default.nix b/pkgs/applications/networking/browsers/palemoon/default.nix index cd4f95097889..a5c5472f1c78 100644 --- a/pkgs/applications/networking/browsers/palemoon/default.nix +++ b/pkgs/applications/networking/browsers/palemoon/default.nix @@ -3,7 +3,7 @@ , dbus, dbus_glib, file, fontconfig, freetype , gstreamer, gst-plugins-base, gst_all_1 , gtk2, hunspell, icu, libevent, libjpeg, libnotify -, libstartup_notification, libvpx, makeWrapper, mesa +, libstartup_notification, libvpx, makeWrapper, libGLU_combined , nspr, nss, pango, perl, python, libpulseaudio, sqlite , unzip, xlibs, which, yasm, zip, zlib }: @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { alsaLib bzip2 cairo dbus dbus_glib file fontconfig freetype gst-plugins-base gstreamer gst_all_1.gst-plugins-base gtk2 hunspell icu libevent libjpeg libnotify libstartup_notification - libvpx makeWrapper mesa nspr nss pango perl pkgconfig python + libvpx makeWrapper libGLU_combined nspr nss pango perl pkgconfig python libpulseaudio sqlite unzip which yasm zip zlib ] ++ (with xlibs; [ libX11 libXext libXft libXi libXrender libXScrnSaver diff --git a/pkgs/applications/networking/instant-messengers/viber/default.nix b/pkgs/applications/networking/instant-messengers/viber/default.nix index d7e960d2329e..3c164820019b 100644 --- a/pkgs/applications/networking/instant-messengers/viber/default.nix +++ b/pkgs/applications/networking/instant-messengers/viber/default.nix @@ -1,6 +1,6 @@ {fetchurl, stdenv, dpkg, makeWrapper, alsaLib, cups, curl, dbus, expat, fontconfig, freetype, glib, gst_all_1, harfbuzz, libcap, - libpulseaudio, libxml2, libxslt, mesa, nspr, nss, openssl, systemd, wayland, xorg, zlib, ... + libpulseaudio, libxml2, libxslt, libGLU_combined, nspr, nss, openssl, systemd, wayland, xorg, zlib, ... }: assert stdenv.system == "x86_64-linux"; @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { libpulseaudio libxml2 libxslt - mesa + libGLU_combined nspr nss openssl diff --git a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix index b6a4e7944d3c..e13f0001f02b 100644 --- a/pkgs/applications/networking/instant-messengers/zoom-us/default.nix +++ b/pkgs/applications/networking/instant-messengers/zoom-us/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, system, makeWrapper, alsaLib, dbus, glib, gstreamer, fontconfig, freetype, libpulseaudio, libxml2, - libxslt, mesa, nspr, nss, sqlite, utillinux, zlib, xorg, udev, expat, libv4l }: + libxslt, libGLU_combined, nspr, nss, sqlite, utillinux, zlib, xorg, udev, expat, libv4l }: let diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix index 4f714cabf79b..15c251f38579 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix @@ -31,7 +31,7 @@ , libgnome , libgnomeui , defaultIconTheme -, mesa +, libGLU_combined , nspr , nss , pango @@ -111,7 +111,7 @@ stdenv.mkDerivation { libcanberra_gtk2 libgnome libgnomeui - mesa + libGLU_combined nspr nss pango diff --git a/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/pkgs/applications/networking/mailreaders/thunderbird/default.nix index bfbd97001973..4d90d4c94d86 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird/default.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchurl, pkgconfig, gtk2, pango, perl, python, zip, libIDL , libjpeg, zlib, dbus, dbus_glib, bzip2, xorg , freetype, fontconfig, file, nspr, nss, libnotify -, yasm, mesa, sqlite, unzip +, yasm, libGLU_combined, sqlite, unzip , hunspell, libevent, libstartup_notification , cairo, gstreamer, gst-plugins-base, icu, libpng, jemalloc , autoconf213, which, m4 @@ -41,7 +41,7 @@ in stdenv.mkDerivation rec { [ gtk2 zip libIDL libjpeg zlib bzip2 dbus dbus_glib pango freetype fontconfig xorg.libXi xorg.libX11 xorg.libXrender xorg.libXft xorg.libXt file - nspr nss libnotify xorg.pixman yasm mesa + nspr nss libnotify xorg.pixman yasm libGLU_combined xorg.libXScrnSaver xorg.scrnsaverproto xorg.libXext xorg.xextproto sqlite unzip hunspell libevent libstartup_notification /* cairo */ diff --git a/pkgs/applications/office/impressive/default.nix b/pkgs/applications/office/impressive/default.nix index 59249d1a6eb0..c2a10d85eb1a 100644 --- a/pkgs/applications/office/impressive/default.nix +++ b/pkgs/applications/office/impressive/default.nix @@ -1,5 +1,5 @@ { fetchurl, stdenv, python2, makeWrapper, lib -, mesa, SDL, freeglut, ghostscript, pdftk, dejavu_fonts }: +, libGLU_combined, SDL, freeglut, ghostscript, pdftk, dejavu_fonts }: let version = "0.11.1"; diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix index c8948d13cf7f..e0df9cae2ea6 100644 --- a/pkgs/applications/office/libreoffice/default.nix +++ b/pkgs/applications/office/libreoffice/default.nix @@ -4,7 +4,7 @@ , bison, flex, zip, unzip, gtk3, gtk2, libmspack, getopt, file, cairo, which , icu, boost, jdk, ant, cups, xorg, libcmis , openssl, gperf, cppunit, GConf, ORBit2, poppler -, librsvg, gnome_vfs, mesa, bsh, CoinMP, libwps, libabw +, librsvg, gnome_vfs, libGLU_combined, bsh, CoinMP, libwps, libabw , autoconf, automake, openldap, bash, hunspell, librdf_redland, nss, nspr , libwpg, dbus_glib, glibc, qt4, clucene_core, libcdr, lcms, vigra , unixODBC, mdds, sane-backends, mythes, libexttextcat, libvisio @@ -247,7 +247,7 @@ in stdenv.mkDerivation rec { hunspell icu jdk lcms libcdr libexttextcat unixODBC libjpeg libmspack librdf_redland librsvg libsndfile libvisio libwpd libwpg libX11 libXaw libXext libXi libXinerama libxml2 libxslt libXtst - libXdmcp libpthreadstubs mesa mythes gst_all_1.gstreamer + libXdmcp libpthreadstubs libGLU_combined mythes gst_all_1.gstreamer gst_all_1.gst-plugins-base glib neon nspr nss openldap openssl ORBit2 pam perl pkgconfig poppler python3 sablotron sane-backends unzip vigra which zip zlib diff --git a/pkgs/applications/office/libreoffice/still.nix b/pkgs/applications/office/libreoffice/still.nix index 5070de5262e5..05c058960922 100644 --- a/pkgs/applications/office/libreoffice/still.nix +++ b/pkgs/applications/office/libreoffice/still.nix @@ -4,7 +4,7 @@ , bison, flex, zip, unzip, gtk3, gtk2, libmspack, getopt, file, cairo, which , icu, boost, jdk, ant, cups, xorg, libcmis , openssl, gperf, cppunit, GConf, ORBit2, poppler -, librsvg, gnome_vfs, mesa, bsh, CoinMP, libwps, libabw, libzmf +, librsvg, gnome_vfs, libGLU_combined, bsh, CoinMP, libwps, libabw, libzmf , autoconf, automake, openldap, bash, hunspell, librdf_redland, nss, nspr , libwpg, dbus_glib, glibc, qt4, clucene_core, libcdr, lcms, vigra , unixODBC, mdds, sane-backends, mythes, libexttextcat, libvisio @@ -240,7 +240,7 @@ in stdenv.mkDerivation rec { hunspell icu jdk lcms libcdr libexttextcat unixODBC libjpeg libmspack librdf_redland librsvg libsndfile libvisio libwpd libwpg libX11 libXaw libXext libXi libXinerama libxml2 libxslt libXtst - libXdmcp libpthreadstubs mesa mythes gst_all_1.gstreamer + libXdmcp libpthreadstubs libGLU_combined mythes gst_all_1.gstreamer gst_all_1.gst-plugins-base glib neon nspr nss openldap openssl ORBit2 pam perl pkgconfig poppler python3 sablotron sane-backends unzip vigra which zip zlib diff --git a/pkgs/applications/science/astronomy/celestia/default.nix b/pkgs/applications/science/astronomy/celestia/default.nix index fe6a3a41a236..328253c53437 100644 --- a/pkgs/applications/science/astronomy/celestia/default.nix +++ b/pkgs/applications/science/astronomy/celestia/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, freeglut, gtk2, gtkglext, libjpeg_turbo, libtheora, libXmu -, lua, mesa, pkgconfig, perl, autoreconfHook, glib, cairo +, lua, libGLU_combined, pkgconfig, perl, autoreconfHook, glib, cairo , pango, gdk_pixbuf, atk }: @@ -45,7 +45,7 @@ stdenv.mkDerivation { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ freeglut gtk2 gtkglext libjpeg_turbo libtheora libXmu mesa lua + buildInputs = [ freeglut gtk2 gtkglext libjpeg_turbo libtheora libXmu libGLU_combined lua perl autoreconfHook ]; patchPhase = '' diff --git a/pkgs/applications/science/astronomy/gravit/default.nix b/pkgs/applications/science/astronomy/gravit/default.nix index 190186db1810..d572dd55b2b2 100644 --- a/pkgs/applications/science/astronomy/gravit/default.nix +++ b/pkgs/applications/science/astronomy/gravit/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, SDL, SDL_ttf, SDL_image, libSM, libICE, mesa, libpng, lua5, autoconf, automake }: +{ stdenv, fetchurl, SDL, SDL_ttf, SDL_image, libSM, libICE, libGLU_combined, libpng, lua5, autoconf, automake }: stdenv.mkDerivation rec { name = "gravit-0.5.1"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "14vf7zj2bgrl96wsl3f1knsggc8h9624354ajzd72l46y09x5ky7"; }; - buildInputs = [ mesa SDL SDL_ttf SDL_image lua5 libpng libSM libICE ]; + buildInputs = [ libGLU_combined SDL SDL_ttf SDL_image lua5 libpng libSM libICE ]; nativeBuildInputs = [ autoconf automake ]; diff --git a/pkgs/applications/science/astronomy/stellarium/default.nix b/pkgs/applications/science/astronomy/stellarium/default.nix index 32eaa37375f8..3c7af809b884 100644 --- a/pkgs/applications/science/astronomy/stellarium/default.nix +++ b/pkgs/applications/science/astronomy/stellarium/default.nix @@ -1,5 +1,5 @@ { mkDerivation, lib, fetchurl -, cmake, freetype, libpng, mesa, gettext, openssl, perl, libiconv +, cmake, freetype, libpng, libGLU_combined, gettext, openssl, perl, libiconv , qtscript, qtserialport, qttools , qtmultimedia, qtlocation }: @@ -16,7 +16,7 @@ mkDerivation rec { nativeBuildInputs = [ cmake perl ]; buildInputs = [ - freetype libpng mesa openssl libiconv qtscript qtserialport qttools + freetype libpng libGLU_combined openssl libiconv qtscript qtserialport qttools qtmultimedia qtlocation ]; diff --git a/pkgs/applications/science/chemistry/avogadro/default.nix b/pkgs/applications/science/chemistry/avogadro/default.nix index 878dfde8f4e2..78cda9d115ce 100644 --- a/pkgs/applications/science/chemistry/avogadro/default.nix +++ b/pkgs/applications/science/chemistry/avogadro/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, qt4, zlib, eigen, openbabel, pkgconfig, mesa, libX11, doxygen }: +{ stdenv, fetchurl, cmake, qt4, zlib, eigen, openbabel, pkgconfig, libGLU_combined, libX11, doxygen }: stdenv.mkDerivation rec { name = "avogadro-1.1.1"; @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { sha256 = "050ag9p4vg7jg8hj1wqfv7lsm6ar2isxjw2vw85s49vsl7g7nvzy"; }; - buildInputs = [ qt4 eigen zlib openbabel mesa libX11 ]; + buildInputs = [ qt4 eigen zlib openbabel libGLU_combined libX11 ]; nativeBuildInputs = [ cmake pkgconfig doxygen ]; - NIX_CFLAGS_COMPILE = "-include ${mesa}/include/GL/glu.h"; + NIX_CFLAGS_COMPILE = "-include ${libGLU_combined}/include/GL/glu.h"; meta = { description = "Molecule editor and visualizer"; diff --git a/pkgs/applications/science/electronics/kicad/default.nix b/pkgs/applications/science/electronics/kicad/default.nix index dc13f751b89f..8e98bad55c3d 100644 --- a/pkgs/applications/science/electronics/kicad/default.nix +++ b/pkgs/applications/science/electronics/kicad/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchbzr, cmake, mesa, wxGTK, zlib, libX11, gettext, glew, cairo, curl, openssl, boost, pkgconfig, doxygen }: +{ stdenv, fetchurl, fetchbzr, cmake, libGLU_combined, wxGTK, zlib, libX11, gettext, glew, cairo, curl, openssl, boost, pkgconfig, doxygen }: stdenv.mkDerivation rec { name = "kicad-${version}"; @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; # often fails on Hydra: fatal error: pcb_plot_params_lexer.h: No such file or directory nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ cmake mesa wxGTK zlib libX11 gettext glew cairo curl openssl boost doxygen ]; + buildInputs = [ cmake libGLU_combined wxGTK zlib libX11 gettext glew cairo curl openssl boost doxygen ]; # They say they only support installs to /usr or /usr/local, # so we have to handle this. diff --git a/pkgs/applications/science/electronics/kicad/unstable.nix b/pkgs/applications/science/electronics/kicad/unstable.nix index f954bf5b70ca..46689dfc9745 100644 --- a/pkgs/applications/science/electronics/kicad/unstable.nix +++ b/pkgs/applications/science/electronics/kicad/unstable.nix @@ -1,4 +1,4 @@ -{ wxGTK, lib, stdenv, fetchFromGitHub, cmake, mesa, zlib +{ wxGTK, lib, stdenv, fetchFromGitHub, cmake, libGLU_combined, zlib , libX11, gettext, glew, glm, cairo, curl, openssl, boost, pkgconfig , doxygen, pcre, libpthreadstubs, libXdmcp @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake doxygen pkgconfig ]; buildInputs = [ - mesa zlib libX11 wxGTK pcre libXdmcp gettext glew glm libpthreadstubs + libGLU_combined zlib libX11 wxGTK pcre libXdmcp gettext glew glm libpthreadstubs cairo curl openssl boost ] ++ optional (oceSupport) opencascade_oce ++ optional (ngspiceSupport) ngspice diff --git a/pkgs/applications/science/electronics/librepcb/default.nix b/pkgs/applications/science/electronics/librepcb/default.nix index f4418f535632..ea0ebd52b3eb 100644 --- a/pkgs/applications/science/electronics/librepcb/default.nix +++ b/pkgs/applications/science/electronics/librepcb/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, qtbase, qttools, qmake, mesa, openssl, zlib }: +{ stdenv, fetchFromGitHub, qtbase, qttools, qmake, libGLU_combined, openssl, zlib }: stdenv.mkDerivation rec { name = "librepcb-${version}"; diff --git a/pkgs/applications/science/electronics/pcb/default.nix b/pkgs/applications/science/electronics/pcb/default.nix index 6b792310e8b4..34bdd3d47c86 100644 --- a/pkgs/applications/science/electronics/pcb/default.nix +++ b/pkgs/applications/science/electronics/pcb/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, gtk2, bison, intltool, flex, netpbm, imagemagick, dbus, xlibsWrapper, mesa, shared_mime_info, tcl, tk, gnome2, pangox_compat, gd, xorg }: +{ stdenv, fetchurl, pkgconfig, gtk2, bison, intltool, flex, netpbm, imagemagick, dbus, xlibsWrapper, libGLU_combined, shared_mime_info, tcl, tk, gnome2, pangox_compat, gd, xorg }: stdenv.mkDerivation rec { name = "pcb-${version}"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ gtk2 bison intltool flex netpbm imagemagick dbus xlibsWrapper mesa tcl shared_mime_info tk gnome2.gtkglext pangox_compat gd xorg.libXmu ]; + buildInputs = [ gtk2 bison intltool flex netpbm imagemagick dbus xlibsWrapper libGLU_combined tcl shared_mime_info tk gnome2.gtkglext pangox_compat gd xorg.libXmu ]; configureFlags = ["--disable-update-desktop-database"]; diff --git a/pkgs/applications/science/logic/mcrl2/default.nix b/pkgs/applications/science/logic/mcrl2/default.nix index c9016a5ee0ce..c84f81740c79 100644 --- a/pkgs/applications/science/logic/mcrl2/default.nix +++ b/pkgs/applications/science/logic/mcrl2/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, xlibs, cmake, subversion, mesa, qt5, boost, +{stdenv, fetchurl, xlibs, cmake, subversion, libGLU_combined, qt5, boost, python27, python27Packages}: stdenv.mkDerivation rec { @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "1c8h94ja7271ph61zrcgnjgblxppld6v22f7f900prjgzbcfy14m"; }; - buildInputs = [ cmake mesa qt5.qtbase boost ]; + buildInputs = [ cmake libGLU_combined qt5.qtbase boost ]; enableParallelBuilding = true; diff --git a/pkgs/applications/science/math/giac/default.nix b/pkgs/applications/science/math/giac/default.nix index b2b052bdb159..e29ff24e250f 100644 --- a/pkgs/applications/science/math/giac/default.nix +++ b/pkgs/applications/science/math/giac/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl, texlive, bison, flex , gmp, mpfr, pari, ntl, gsl, blas, mpfi, liblapackWithAtlas , readline, gettext, libpng, libao, gfortran, perl -, enableGUI ? false, mesa ? null, xorg ? null, fltk ? null +, enableGUI ? false, libGLU_combined ? null, xorg ? null, fltk ? null }: -assert enableGUI -> mesa != null && xorg != null && fltk != null; +assert enableGUI -> libGLU_combined != null && xorg != null && fltk != null; stdenv.mkDerivation rec { name = "${attr}-${version}"; @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { # we want libgfortran.so.3 instead (stdenv.lib.getLib gfortran.cc) ] ++ stdenv.lib.optionals enableGUI [ - mesa fltk xorg.libX11 + libGLU_combined fltk xorg.libX11 ]; outputs = [ "out" ]; diff --git a/pkgs/applications/science/math/glsurf/default.nix b/pkgs/applications/science/math/glsurf/default.nix index 67dcfd8dc1de..798141b6b438 100644 --- a/pkgs/applications/science/math/glsurf/default.nix +++ b/pkgs/applications/science/math/glsurf/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ocamlPackages, mesa, freeglut +{ stdenv, fetchurl, ocamlPackages, libGLU_combined, freeglut , mysql, mpfr, gmp, libtiff, libjpeg, libpng, giflib }: @@ -10,7 +10,7 @@ stdenv.mkDerivation { sha256 = "0w8xxfnw2snflz8wdr2ca9f5g91w5vbyp1hwlx1v7vg83d4bwqs7"; }; - buildInputs = [ freeglut mesa mysql.connector-c mpfr gmp + buildInputs = [ freeglut libGLU_combined mysql.connector-c mpfr gmp libtiff libjpeg libpng giflib ] ++ (with ocamlPackages; [ ocaml findlib ocaml_mysql lablgl camlimages_4_0 mlgmpidl diff --git a/pkgs/applications/science/math/gmsh/default.nix b/pkgs/applications/science/math/gmsh/default.nix index 31c4fe984770..96b800661a76 100644 --- a/pkgs/applications/science/math/gmsh/default.nix +++ b/pkgs/applications/science/math/gmsh/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, cmake, blas, liblapack, gfortran, gmm, fltk, libjpeg -, zlib, mesa, libGLU, xorg }: +, zlib, libGLU_combined, libGLU, xorg }: let version = "3.0.5"; in @@ -15,7 +15,7 @@ stdenv.mkDerivation { # that is supposed to work without Fortran but didn't for me. patches = [ ./CMakeLists.txt.patch ]; - buildInputs = [ cmake blas liblapack gfortran gmm fltk libjpeg zlib mesa + buildInputs = [ cmake blas liblapack gfortran gmm fltk libjpeg zlib libGLU_combined libGLU xorg.libXrender xorg.libXcursor xorg.libXfixes xorg.libXext xorg.libXft xorg.libXinerama xorg.libX11 xorg.libSM xorg.libICE ]; diff --git a/pkgs/applications/science/medicine/aliza/default.nix b/pkgs/applications/science/medicine/aliza/default.nix index d8e8d49bb706..ff25bc974900 100644 --- a/pkgs/applications/science/medicine/aliza/default.nix +++ b/pkgs/applications/science/medicine/aliza/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, rpmextract, makeWrapper, patchelf, qt4, zlib, libX11, libXt, libSM, libICE, libXext, mesa }: +{ stdenv, fetchurl, rpmextract, makeWrapper, patchelf, qt4, zlib, libX11, libXt, libSM, libICE, libXext, libGLU_combined }: with stdenv.lib; stdenv.mkDerivation { @@ -26,7 +26,7 @@ stdenv.mkDerivation { ''; postInstall = let - libs = stdenv.lib.makeLibraryPath [ qt4 zlib stdenv.cc.cc libSM libICE libX11 libXext libXt mesa ]; + libs = stdenv.lib.makeLibraryPath [ qt4 zlib stdenv.cc.cc libSM libICE libX11 libXext libXt libGLU_combined ]; in '' ${patchelf}/bin/patchelf \ --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ diff --git a/pkgs/applications/science/misc/boinc/default.nix b/pkgs/applications/science/misc/boinc/default.nix index 716d6d9687c5..a1b8769617c9 100644 --- a/pkgs/applications/science/misc/boinc/default.nix +++ b/pkgs/applications/science/misc/boinc/default.nix @@ -1,5 +1,5 @@ { fetchFromGitHub, stdenv, autoconf, automake, pkgconfig, m4, curl, -mesa, libXmu, libXi, freeglut, libjpeg, libtool, wxGTK, xcbutil, +libGLU_combined, libXmu, libXi, freeglut, libjpeg, libtool, wxGTK, xcbutil, sqlite, gtk2, patchelf, libXScrnSaver, libnotify, libX11, libxcb }: let @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ libtool automake autoconf m4 pkgconfig ]; buildInputs = [ - curl mesa libXmu libXi freeglut libjpeg wxGTK sqlite gtk2 libXScrnSaver + curl libGLU_combined libXmu libXi freeglut libjpeg wxGTK sqlite gtk2 libXScrnSaver libnotify patchelf libX11 libxcb xcbutil ]; diff --git a/pkgs/applications/science/misc/golly/beta.nix b/pkgs/applications/science/misc/golly/beta.nix index 5fe72e44842d..5b210fa4bf6b 100644 --- a/pkgs/applications/science/misc/golly/beta.nix +++ b/pkgs/applications/science/misc/golly/beta.nix @@ -1,5 +1,5 @@ {stdenv, fetchurl, fetchgit -, wxGTK, perl, python2, zlib, mesa, libX11 +, wxGTK, perl, python2, zlib, libGLU_combined, libX11 , automake, autoconf }: let @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [autoconf automake]; buildInputs = [ - wxGTK perl python2 zlib mesa libX11 + wxGTK perl python2 zlib libGLU_combined libX11 ]; # Link against Python explicitly as it is needed for scripts diff --git a/pkgs/applications/science/misc/golly/default.nix b/pkgs/applications/science/misc/golly/default.nix index f4bf24a73433..8ecbf656a821 100644 --- a/pkgs/applications/science/misc/golly/default.nix +++ b/pkgs/applications/science/misc/golly/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, wxGTK, perl, python2, zlib, mesa, libX11}: +{stdenv, fetchurl, wxGTK, perl, python2, zlib, libGLU_combined, libX11}: stdenv.mkDerivation rec { baseName="golly"; version = "3.1"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ - wxGTK perl python2 zlib mesa libX11 + wxGTK perl python2 zlib libGLU_combined libX11 ]; setSourceRoot = '' diff --git a/pkgs/applications/science/misc/gplates/default.nix b/pkgs/applications/science/misc/gplates/default.nix index c8f89c398b12..8b6c7497e547 100644 --- a/pkgs/applications/science/misc/gplates/default.nix +++ b/pkgs/applications/science/misc/gplates/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, qt4, qwt6_qt4, mesa, glew, gdal_1_11, cgal +{ stdenv, fetchurl, qt4, qwt6_qt4, libGLU_combined, glew, gdal_1_11, cgal , proj, boost, cmake, python2, doxygen, graphviz, gmp }: stdenv.mkDerivation rec { @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - qt4 qwt6_qt4 mesa glew gdal_1_11 cgal proj boost cmake python2 + qt4 qwt6_qt4 libGLU_combined glew gdal_1_11 cgal proj boost cmake python2 doxygen graphviz gmp ]; diff --git a/pkgs/applications/science/misc/root/default.nix b/pkgs/applications/science/misc/root/default.nix index 676395d03d53..a7b3d2292be0 100644 --- a/pkgs/applications/science/misc/root/default.nix +++ b/pkgs/applications/science/misc/root/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, fetchpatch, cmake, pcre, pkgconfig, python2 -, libX11, libXpm, libXft, libXext, mesa, zlib, libxml2, lz4, lzma, gsl, xxHash +, libX11, libXpm, libXft, libXext, libGLU_combined, zlib, libxml2, lz4, lzma, gsl, xxHash , Cocoa, OpenGL, noSplash ? false }: stdenv.mkDerivation rec { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ cmake pcre python2 zlib libxml2 lz4 lzma gsl xxHash ] - ++ stdenv.lib.optionals (!stdenv.isDarwin) [ libX11 libXpm libXft libXext mesa ] + ++ stdenv.lib.optionals (!stdenv.isDarwin) [ libX11 libXpm libXft libXext libGLU_combined ] ++ stdenv.lib.optionals (stdenv.isDarwin) [ Cocoa OpenGL ] ; diff --git a/pkgs/applications/science/misc/tulip/default.nix b/pkgs/applications/science/misc/tulip/default.nix index 9b8035fcefe7..d2590bc0b8d4 100644 --- a/pkgs/applications/science/misc/tulip/default.nix +++ b/pkgs/applications/science/misc/tulip/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, libxml2, freetype, mesa, glew, qt4 +{ fetchurl, stdenv, libxml2, freetype, libGLU_combined, glew, qt4 , cmake, makeWrapper, libjpeg, python }: let version = "4.9.0"; in @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "0phc7972brvm0v6lfk4ghq9b2b4jsj6c15xlbgnvhhcxhc99wba3"; }; - buildInputs = [ libxml2 freetype glew mesa qt4 libjpeg python ]; + buildInputs = [ libxml2 freetype glew libGLU_combined qt4 libjpeg python ]; nativeBuildInputs = [ cmake makeWrapper ]; diff --git a/pkgs/applications/science/misc/vite/default.nix b/pkgs/applications/science/misc/vite/default.nix index 510c56b66c88..64482ddd74bc 100644 --- a/pkgs/applications/science/misc/vite/default.nix +++ b/pkgs/applications/science/misc/vite/default.nix @@ -1,4 +1,4 @@ -{ fetchsvn, stdenv, cmake, qt4, mesa }: +{ fetchsvn, stdenv, cmake, qt4, libGLU_combined }: # ViTE 1.1 has several bugs, so use the SVN version. let @@ -23,7 +23,7 @@ stdenv.mkDerivation { ln -sv "${externals}" externals ''; - buildInputs = [ cmake qt4 mesa ]; + buildInputs = [ cmake qt4 libGLU_combined ]; NIX_LDFLAGS = "-lGLU"; diff --git a/pkgs/applications/version-management/gource/default.nix b/pkgs/applications/version-management/gource/default.nix index 13852261e863..e201add472bf 100644 --- a/pkgs/applications/version-management/gource/default.nix +++ b/pkgs/applications/version-management/gource/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, SDL2, ftgl, pkgconfig, libpng, libjpeg, pcre -, SDL2_image, freetype, glew, mesa, boost, glm +, SDL2_image, freetype, glew, libGLU_combined, boost, glm }: stdenv.mkDerivation rec { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - glew SDL2 ftgl libpng libjpeg pcre SDL2_image mesa + glew SDL2 ftgl libpng libjpeg pcre SDL2_image libGLU_combined boost glm freetype ]; diff --git a/pkgs/applications/video/aegisub/default.nix b/pkgs/applications/video/aegisub/default.nix index ebc1249dc11d..ade81de2f04e 100644 --- a/pkgs/applications/video/aegisub/default.nix +++ b/pkgs/applications/video/aegisub/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl , libX11, wxGTK , libiconv, fontconfig, freetype -, mesa +, libGLU_combined , libass, fftw, ffms , ffmpeg, pkgconfig, zlib # Undocumented (?) dependencies , icu, boost, intltool # New dependencies @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { postPatch = "sed '1i#include ' -i src/utils.cpp"; buildInputs = with stdenv.lib; - [ pkgconfig intltool libX11 wxGTK fontconfig freetype mesa + [ pkgconfig intltool libX11 wxGTK fontconfig freetype libGLU_combined libass fftw ffms ffmpeg zlib icu boost boost.out libiconv ] ++ optional spellcheckSupport hunspell diff --git a/pkgs/applications/video/bomi/default.nix b/pkgs/applications/video/bomi/default.nix index a9e2654f731b..671d67946354 100644 --- a/pkgs/applications/video/bomi/default.nix +++ b/pkgs/applications/video/bomi/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, fetchpatch, pkgconfig, perl, python, which -, libX11, libxcb, mesa +, libX11, libxcb, libGLU_combined , qtbase, qtdeclarative, qtquickcontrols, qttools, qtx11extras, qmake, makeWrapper , libchardet , ffmpeg @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { buildInputs = with stdenv.lib; [ libX11 libxcb - mesa + libGLU_combined qtbase qtx11extras qtdeclarative diff --git a/pkgs/applications/video/kodi/default.nix b/pkgs/applications/video/kodi/default.nix index 28577a429bd2..ff5c590952ca 100644 --- a/pkgs/applications/video/kodi/default.nix +++ b/pkgs/applications/video/kodi/default.nix @@ -8,7 +8,7 @@ , libXt, libXmu, libXext, xextproto , libXinerama, libXrandr, randrproto , libXtst, libXfixes, fixesproto, systemd -, alsaLib, mesa, glew, fontconfig, freetype, ftgl +, alsaLib, libGLU_combined, glew, fontconfig, freetype, ftgl , libjpeg, jasper, libpng, libtiff , libmpeg2, libsamplerate, libmad , libogg, libvorbis, flac, libxslt @@ -125,7 +125,7 @@ in stdenv.mkDerivation rec { openssl gperf tinyxml2 taglib libssh swig jre libX11 xproto inputproto libXt libXmu libXext xextproto libXinerama libXrandr randrproto libXtst libXfixes fixesproto - alsaLib mesa glew fontconfig freetype ftgl + alsaLib libGLU_combined glew fontconfig freetype ftgl libjpeg jasper libpng libtiff wayland libmpeg2 libsamplerate libmad libogg libvorbis flac libxslt systemd diff --git a/pkgs/applications/video/makemkv/default.nix b/pkgs/applications/video/makemkv/default.nix index 1e890c24db1a..a4b08e1ce47c 100644 --- a/pkgs/applications/video/makemkv/default.nix +++ b/pkgs/applications/video/makemkv/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl -, openssl, qt4, mesa, zlib, pkgconfig, libav +, openssl, qt4, libGLU_combined, zlib, pkgconfig, libav }: stdenv.mkDerivation rec { @@ -18,9 +18,9 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [openssl qt4 mesa zlib libav]; + buildInputs = [openssl qt4 libGLU_combined zlib libav]; - libPath = stdenv.lib.makeLibraryPath [stdenv.cc.cc openssl mesa qt4 zlib ] + libPath = stdenv.lib.makeLibraryPath [stdenv.cc.cc openssl libGLU_combined qt4 zlib ] + ":" + stdenv.cc.cc + "/lib64"; meta = with stdenv.lib; { diff --git a/pkgs/applications/video/mplayer/default.nix b/pkgs/applications/video/mplayer/default.nix index fe6090c3230e..f2d40c2ac808 100644 --- a/pkgs/applications/video/mplayer/default.nix +++ b/pkgs/applications/video/mplayer/default.nix @@ -2,7 +2,7 @@ , aalibSupport ? true, aalib ? null , fontconfigSupport ? true, fontconfig ? null, freefont_ttf ? null , fribidiSupport ? true, fribidi ? null -, x11Support ? true, libX11 ? null, libXext ? null, mesa ? null +, x11Support ? true, libX11 ? null, libXext ? null, libGLU_combined ? null , xineramaSupport ? true, libXinerama ? null , xvSupport ? true, libXv ? null , alsaSupport ? stdenv.isLinux, alsaLib ? null @@ -32,7 +32,7 @@ assert fontconfigSupport -> (fontconfig != null); assert (!fontconfigSupport) -> (freefont_ttf != null); assert fribidiSupport -> (fribidi != null); -assert x11Support -> (libX11 != null && libXext != null && mesa != null); +assert x11Support -> (libX11 != null && libXext != null && libGLU_combined != null); assert xineramaSupport -> (libXinerama != null && x11Support); assert xvSupport -> (libXv != null && x11Support); assert alsaSupport -> alsaLib != null; @@ -109,7 +109,7 @@ stdenv.mkDerivation rec { ++ optional aalibSupport aalib ++ optional fontconfigSupport fontconfig ++ optional fribidiSupport fribidi - ++ optionals x11Support [ libX11 libXext mesa ] + ++ optionals x11Support [ libX11 libXext libGLU_combined ] ++ optional alsaSupport alsaLib ++ optional xvSupport libXv ++ optional theoraSupport libtheora diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix index 403fc7e4ee11..c42afa69c41f 100644 --- a/pkgs/applications/video/mpv/default.nix +++ b/pkgs/applications/video/mpv/default.nix @@ -4,7 +4,7 @@ , lua, lua5_sockets, libuchardet, libiconv ? null, darwin , x11Support ? true, - mesa ? null, + libGLU_combined ? null, libX11 ? null, libXext ? null, libXxf86vm ? null @@ -45,7 +45,7 @@ with stdenv.lib; let available = x: x != null; in -assert x11Support -> all available [mesa libX11 libXext libXxf86vm]; +assert x11Support -> all available [libGLU_combined libX11 libXext libXxf86vm]; assert waylandSupport -> all available [wayland libxkbcommon]; assert rubberbandSupport -> available rubberband; assert xineramaSupport -> x11Support && available libXinerama; @@ -156,7 +156,7 @@ in stdenv.mkDerivation rec { ++ optional vapoursynthSupport vapoursynth ++ optional archiveSupport libarchive ++ optionals dvdnavSupport [ libdvdnav libdvdnav.libdvdread ] - ++ optionals x11Support [ libX11 libXext mesa libXxf86vm ] + ++ optionals x11Support [ libX11 libXext libGLU_combined libXxf86vm ] ++ optionals waylandSupport [ wayland libxkbcommon ]; enableParallelBuilding = true; diff --git a/pkgs/applications/video/mythtv/default.nix b/pkgs/applications/video/mythtv/default.nix index 167c5bdba40a..6f7ebb8c20af 100644 --- a/pkgs/applications/video/mythtv/default.nix +++ b/pkgs/applications/video/mythtv/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, which, qt4, xlibsWrapper, libpulseaudio, fftwSinglePrec -, lame, zlib, mesa, alsaLib, freetype, perl, pkgconfig +, lame, zlib, libGLU_combined, alsaLib, freetype, perl, pkgconfig , libX11, libXv, libXrandr, libXvMC, libXinerama, libXxf86vm, libXmu , yasm, libuuid, taglib, libtool, autoconf, automake, file }: @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { sourceRoot = "${name}/mythtv"; buildInputs = [ - freetype qt4 lame zlib xlibsWrapper mesa perl alsaLib libpulseaudio fftwSinglePrec + freetype qt4 lame zlib xlibsWrapper libGLU_combined perl alsaLib libpulseaudio fftwSinglePrec libX11 libXv libXrandr libXvMC libXmu libXinerama libXxf86vm libXmu libuuid taglib ]; diff --git a/pkgs/applications/video/simplescreenrecorder/default.nix b/pkgs/applications/video/simplescreenrecorder/default.nix index 75bd398b2080..5b9ae0119039 100644 --- a/pkgs/applications/video/simplescreenrecorder/default.nix +++ b/pkgs/applications/video/simplescreenrecorder/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, alsaLib, ffmpeg, libjack2, libX11, libXext -, libXfixes, mesa, pkgconfig, libpulseaudio, qt4, cmake, ninja +, libXfixes, libGLU_combined, pkgconfig, libpulseaudio, qt4, cmake, ninja }: stdenv.mkDerivation rec { @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig cmake ninja ]; buildInputs = [ - alsaLib ffmpeg libjack2 libX11 libXext libXfixes mesa + alsaLib ffmpeg libjack2 libX11 libXext libXfixes libGLU_combined libpulseaudio qt4 ]; diff --git a/pkgs/applications/virtualization/bochs/default.nix b/pkgs/applications/virtualization/bochs/default.nix index 4ad8f0213261..f9d7128330fb 100644 --- a/pkgs/applications/virtualization/bochs/default.nix +++ b/pkgs/applications/virtualization/bochs/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl , pkgconfig, libtool -, gtk2, mesa, readline, libX11, libXpm +, gtk2, libGLU_combined, readline, libX11, libXpm , docbook_xml_dtd_45, docbook_xsl , sdlSupport ? true, SDL2 ? null , termSupport ? true, ncurses ? null @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { patches = [ ./bochs-2.6.9-glibc-2.26.patch ]; buildInputs = with stdenv.lib; - [ pkgconfig libtool gtk2 mesa readline libX11 libXpm docbook_xml_dtd_45 docbook_xsl ] + [ pkgconfig libtool gtk2 libGLU_combined readline libX11 libXpm docbook_xml_dtd_45 docbook_xsl ] ++ optionals termSupport [ ncurses ] ++ optionals sdlSupport [ SDL2 ] ++ optionals wxSupport [ wxGTK ] diff --git a/pkgs/applications/window-managers/compton/git.nix b/pkgs/applications/window-managers/compton/git.nix index 159468f79047..53bcd158aedd 100644 --- a/pkgs/applications/window-managers/compton/git.nix +++ b/pkgs/applications/window-managers/compton/git.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, asciidoc, dbus, docbook_xml_dtd_45, - docbook_xml_xslt, libconfig, libdrm, libxml2, libxslt, mesa, pcre, + docbook_xml_xslt, libconfig, libdrm, libxml2, libxslt, libGLU_combined, pcre, pkgconfig, libXcomposite, libXdamage, libXext, libXfixes, libXinerama, libXrandr, libXrender, xwininfo }: @@ -33,7 +33,7 @@ stdenv.mkDerivation { libdrm libxml2 libxslt - mesa + libGLU_combined pcre ]; diff --git a/pkgs/applications/window-managers/weston/default.nix b/pkgs/applications/window-managers/weston/default.nix index 0b78debdc589..bd40a73d264c 100644 --- a/pkgs/applications/window-managers/weston/default.nix +++ b/pkgs/applications/window-managers/weston/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, wayland, mesa, libxkbcommon, cairo, libxcb +{ stdenv, fetchurl, pkgconfig, wayland, libGLU_combined, libxkbcommon, cairo, libxcb , libXcursor, xlibsWrapper, udev, libdrm, mtdev, libjpeg, pam, dbus, libinput , pango ? null, libunwind ? null, freerdp ? null, vaapi ? null, libva ? null , libwebp ? null, xwayland ? null, wayland-protocols @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - wayland mesa libxkbcommon cairo libxcb libXcursor xlibsWrapper udev libdrm + wayland libGLU_combined libxkbcommon cairo libxcb libXcursor xlibsWrapper udev libdrm mtdev libjpeg pam dbus libinput pango libunwind freerdp vaapi libva libwebp wayland-protocols ]; diff --git a/pkgs/desktops/enlightenment/efl.nix b/pkgs/desktops/enlightenment/efl.nix index fac97e72a6c3..fff15a9981d2 100644 --- a/pkgs/desktops/enlightenment/efl.nix +++ b/pkgs/desktops/enlightenment/efl.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, openssl, libjpeg, zlib, lz4, freetype, fontconfig -, fribidi, SDL2, SDL, mesa, giflib, libpng, libtiff, glib, gst_all_1, libpulseaudio +, fribidi, SDL2, SDL, libGLU_combined, giflib, libpng, libtiff, glib, gst_all_1, libpulseaudio , libsndfile, xorg, libdrm, libxkbcommon, udev, utillinux, dbus, bullet, luajit , python27Packages, openjpeg, doxygen, expat, harfbuzz, jbig2dec, librsvg , dbus_libs, alsaLib, poppler, ghostscript, libraw, libspectre, xineLib, libwebp @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ openssl zlib lz4 freetype fontconfig SDL mesa + buildInputs = [ openssl zlib lz4 freetype fontconfig SDL libGLU_combined giflib libpng libtiff glib gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-plugins-good gst_all_1.gst-libav libpulseaudio libsndfile xorg.libXcursor xorg.printproto xorg.libX11 udev systemd ]; diff --git a/pkgs/desktops/gnome-2/platform/gtkglext/default.nix b/pkgs/desktops/gnome-2/platform/gtkglext/default.nix index d5be7137c8fa..3a316f71f082 100644 --- a/pkgs/desktops/gnome-2/platform/gtkglext/default.nix +++ b/pkgs/desktops/gnome-2/platform/gtkglext/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, glib, gtk, mesa, pango, pangox_compat, xorg }: +{ stdenv, fetchurl, pkgconfig, glib, gtk, libGLU_combined, pango, pangox_compat, xorg }: stdenv.mkDerivation rec { name = "gtkglext-1.2.0"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { }; buildInputs = with xorg; - [ pkgconfig glib gtk mesa pango libX11 libXmu ]; + [ pkgconfig glib gtk libGLU_combined pango libX11 libXmu ]; propagatedBuildInputs = [ pangox_compat ]; # The library uses `GTK_WIDGET_REALIZED', `GTK_WIDGET_TOPLEVEL', and diff --git a/pkgs/desktops/gnome-2/platform/gtkglextmm/default.nix b/pkgs/desktops/gnome-2/platform/gtkglextmm/default.nix index 152c1d98b8c8..63e33aa578ef 100644 --- a/pkgs/desktops/gnome-2/platform/gtkglextmm/default.nix +++ b/pkgs/desktops/gnome-2/platform/gtkglextmm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, gtkglext, gtkmm, gtk, mesa, gdk_pixbuf +{ stdenv, fetchurl, pkgconfig, gtkglext, gtkmm, gtk, libGLU_combined, gdk_pixbuf , pangox_compat, libXmu }: @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [pkgconfig]; - propagatedBuildInputs = [ gtkglext gtkmm gtk mesa gdk_pixbuf ]; + propagatedBuildInputs = [ gtkglext gtkmm gtk libGLU_combined gdk_pixbuf ]; meta = { description = "C++ wrappers for GtkGLExt"; diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 39897f824059..39ffd364c813 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -632,7 +632,7 @@ self: super: { phash = markBroken super.phash; # https://github.com/deech/fltkhs/issues/16 - # linking fails because the build doesn't pull in the mesa libraries + # linking fails because the build doesn't pull in the libGLU_combined libraries fltkhs = markBroken super.fltkhs; fltkhs-fluid-examples = dontDistribute super.fltkhs-fluid-examples; diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index 03299d775f4f..bac5210953e9 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -221,7 +221,7 @@ self: super: builtins.intersectAttrs super { wxcore = super.wxcore.override { wxGTK = pkgs.wxGTK30; }; # Test suite wants to connect to $DISPLAY. - hsqml = dontCheck (addExtraLibrary (super.hsqml.override { qt5 = pkgs.qt5Full; }) pkgs.mesa); + hsqml = dontCheck (addExtraLibrary (super.hsqml.override { qt5 = pkgs.qt5Full; }) pkgs.libGLU_combined); # Tests attempt to use NPM to install from the network into # /homeless-shelter. Disabled. diff --git a/pkgs/development/interpreters/erlang/generic-builder.nix b/pkgs/development/interpreters/erlang/generic-builder.nix index eae4a50aa20e..1d2b79074fb4 100644 --- a/pkgs/development/interpreters/erlang/generic-builder.nix +++ b/pkgs/development/interpreters/erlang/generic-builder.nix @@ -2,7 +2,7 @@ , libxml2, libxslt, ncurses, openssl, perl, autoreconfHook , openjdk ? null # javacSupport , unixODBC ? null # odbcSupport -, mesa ? null, wxGTK ? null, wxmac ? null, xorg ? null # wxSupport +, libGLU_combined ? null, wxGTK ? null, wxmac ? null, xorg ? null # wxSupport }: { baseName ? "erlang" @@ -17,7 +17,7 @@ , enableKernelPoll ? true , javacSupport ? false, javacPackages ? [ openjdk ] , odbcSupport ? false, odbcPackages ? [ unixODBC ] -, wxSupport ? true, wxPackages ? [ mesa wxGTK xorg.libX11 ] +, wxSupport ? true, wxPackages ? [ libGLU_combined wxGTK xorg.libX11 ] , preUnpack ? "", postUnpack ? "" , patches ? [], patchPhase ? "", prePatch ? "", postPatch ? "" , configureFlags ? [], configurePhase ? "", preConfigure ? "", postConfigure ? "" @@ -31,7 +31,7 @@ assert wxSupport -> (if stdenv.isDarwin then wxmac != null - else mesa != null && wxGTK != null && xorg != null); + else libGLU_combined != null && wxGTK != null && xorg != null); assert odbcSupport -> unixODBC != null; assert javacSupport -> openjdk != null; diff --git a/pkgs/development/interpreters/io/default.nix b/pkgs/development/interpreters/io/default.nix index 773a2c86028b..6c0568d68134 100644 --- a/pkgs/development/interpreters/io/default.nix +++ b/pkgs/development/interpreters/io/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, cmake, zlib, sqlite, gmp, libffi, cairo, - ncurses, freetype, mesa, libpng, libtiff, libjpeg, readline, libsndfile, + ncurses, freetype, libGLU_combined, libpng, libtiff, libjpeg, readline, libsndfile, libxml2, freeglut, libsamplerate, pcre, libevent, libedit, yajl, python3, openssl, glfw, pkgconfig, libpthreadstubs, libXdmcp, libmemcached }: @@ -19,7 +19,7 @@ stdenv.mkDerivation { buildInputs = [ zlib sqlite gmp libffi cairo ncurses freetype - mesa libpng libtiff libjpeg readline libsndfile libxml2 + libGLU_combined libpng libtiff libjpeg readline libsndfile libxml2 freeglut libsamplerate pcre libevent libedit yajl pkgconfig glfw openssl libpthreadstubs libXdmcp libmemcached python3 diff --git a/pkgs/development/interpreters/love/0.10.nix b/pkgs/development/interpreters/love/0.10.nix index 255bd0351298..07ce9347cf70 100644 --- a/pkgs/development/interpreters/love/0.10.nix +++ b/pkgs/development/interpreters/love/0.10.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromBitbucket, pkgconfig, SDL2, mesa, openal, luajit, +{ stdenv, fetchFromBitbucket, pkgconfig, SDL2, libGLU_combined, openal, luajit, libdevil, freetype, physfs, libmodplug, mpg123, libvorbis, libogg, libtheora, which, autoconf, automake, libtool }: @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - SDL2 mesa openal luajit libdevil freetype physfs libmodplug mpg123 + SDL2 libGLU_combined openal luajit libdevil freetype physfs libmodplug mpg123 libvorbis libogg libtheora autoconf which libtool automake ]; diff --git a/pkgs/development/interpreters/love/0.7.nix b/pkgs/development/interpreters/love/0.7.nix index 114749e90da3..884225b6483e 100644 --- a/pkgs/development/interpreters/love/0.7.nix +++ b/pkgs/development/interpreters/love/0.7.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig -, SDL, mesa, openal, lua +, SDL, libGLU_combined, openal, lua , libdevil, freetype, physfs , libmodplug, mpg123, libvorbis, libogg }: @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - SDL mesa openal lua + SDL libGLU_combined openal lua libdevil freetype physfs libmodplug mpg123 libvorbis libogg ]; diff --git a/pkgs/development/interpreters/love/0.8.nix b/pkgs/development/interpreters/love/0.8.nix index 4e999eca9eeb..5fbb34bf213a 100644 --- a/pkgs/development/interpreters/love/0.8.nix +++ b/pkgs/development/interpreters/love/0.8.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig -, SDL, mesa, openal, lua +, SDL, libGLU_combined, openal, lua , libdevil, freetype, physfs , libmodplug, mpg123, libvorbis, libogg }: @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - SDL mesa openal lua + SDL libGLU_combined openal lua libdevil freetype physfs libmodplug mpg123 libvorbis libogg ]; diff --git a/pkgs/development/interpreters/love/0.9.nix b/pkgs/development/interpreters/love/0.9.nix index 83c485f065dd..425239af2242 100644 --- a/pkgs/development/interpreters/love/0.9.nix +++ b/pkgs/development/interpreters/love/0.9.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig -, SDL2, mesa, openal, luajit +, SDL2, libGLU_combined, openal, luajit , libdevil, freetype, physfs , libmodplug, mpg123, libvorbis, libogg }: @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - SDL2 mesa openal luajit + SDL2 libGLU_combined openal luajit libdevil freetype physfs libmodplug mpg123 libvorbis libogg ]; diff --git a/pkgs/development/interpreters/lush/default.nix b/pkgs/development/interpreters/lush/default.nix index 6958bd2465f5..9575409f9868 100644 --- a/pkgs/development/interpreters/lush/default.nix +++ b/pkgs/development/interpreters/lush/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, libX11, xproto, indent, readline, gsl, freeglut, mesa, SDL +{stdenv, fetchurl, libX11, xproto, indent, readline, gsl, freeglut, libGLU_combined, SDL , blas, libbfd, intltool, gettext, zlib, libSM}: stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ - libX11 libSM xproto indent readline gsl freeglut mesa SDL blas libbfd + libX11 libSM xproto indent readline gsl freeglut libGLU_combined SDL blas libbfd intltool gettext zlib ]; diff --git a/pkgs/development/interpreters/octave/default.nix b/pkgs/development/interpreters/octave/default.nix index ab1dc4b5fe1d..c13d862267fb 100644 --- a/pkgs/development/interpreters/octave/default.nix +++ b/pkgs/development/interpreters/octave/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, gfortran, readline, ncurses, perl, flex, texinfo, qhull -, libsndfile, portaudio, libX11, graphicsmagick, pcre, pkgconfig, mesa, fltk +, libsndfile, portaudio, libX11, graphicsmagick, pcre, pkgconfig, libGLU_combined, fltk , fftw, fftwSinglePrec, zlib, curl, qrupdate, openblas, arpack, libwebp , qt ? null, qscintilla ? null, ghostscript ? null, llvm ? null, hdf5 ? null,glpk ? null , suitesparse ? null, gnuplot ? null, jdk ? null, python ? null, overridePlatforms ? null @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { ++ (stdenv.lib.optional (jdk != null) jdk) ++ (stdenv.lib.optional (gnuplot != null) gnuplot) ++ (stdenv.lib.optional (python != null) python) - ++ (stdenv.lib.optionals (!stdenv.isDarwin) [ mesa libX11 ]) + ++ (stdenv.lib.optionals (!stdenv.isDarwin) [ libGLU_combined libX11 ]) ; # makeinfo is required by Octave at runtime to display help diff --git a/pkgs/development/interpreters/renpy/default.nix b/pkgs/development/interpreters/renpy/default.nix index cc3eba52bf2d..658c5aebe5cb 100644 --- a/pkgs/development/interpreters/renpy/default.nix +++ b/pkgs/development/interpreters/renpy/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pythonPackages, pkgconfig, SDL2 -, libpng, ffmpeg, freetype, glew, mesa, fribidi, zlib +, libpng, ffmpeg, freetype, glew, libGLU_combined, fribidi, zlib , glib }: @@ -26,13 +26,13 @@ stdenv.mkDerivation { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ python cython wrapPython - SDL2 libpng ffmpeg freetype glew mesa fribidi zlib pygame_sdl2 glib + SDL2 libpng ffmpeg freetype glew libGLU_combined fribidi zlib pygame_sdl2 glib ]; pythonPath = [ pygame_sdl2 ]; RENPY_DEPS_INSTALL = stdenv.lib.concatStringsSep "::" (map (path: "${path}") [ - SDL2 SDL2.dev libpng ffmpeg ffmpeg.out freetype glew.dev glew.out mesa fribidi zlib + SDL2 SDL2.dev libpng ffmpeg ffmpeg.out freetype glew.dev glew.out libGLU_combined fribidi zlib ]); buildPhase = '' diff --git a/pkgs/development/libraries/AntTweakBar/default.nix b/pkgs/development/libraries/AntTweakBar/default.nix index dc30fee954f6..108a11ece58b 100644 --- a/pkgs/development/libraries/AntTweakBar/default.nix +++ b/pkgs/development/libraries/AntTweakBar/default.nix @@ -1,9 +1,9 @@ -{ stdenv, fetchurl, unzip, xlibs, mesa }: +{ stdenv, fetchurl, unzip, xlibs, libGLU_combined }: stdenv.mkDerivation rec { name = "AntTweakBar-1.16"; - buildInputs = [ unzip xlibs.libX11 mesa ]; + buildInputs = [ unzip xlibs.libX11 libGLU_combined ]; src = fetchurl { url = "mirror://sourceforge/project/anttweakbar/AntTweakBar_116.zip"; diff --git a/pkgs/development/libraries/allegro/5.nix b/pkgs/development/libraries/allegro/5.nix index dc2775b1979d..30e0f9a09838 100644 --- a/pkgs/development/libraries/allegro/5.nix +++ b/pkgs/development/libraries/allegro/5.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, texinfo, libXext, xextproto, libX11, xproto , libXpm, libXt, libXcursor, alsaLib, cmake, zlib, libpng, libvorbis , libXxf86dga, libXxf86misc, xf86dgaproto, xf86miscproto -, xf86vidmodeproto, libXxf86vm, openal, mesa, kbproto, libjpeg, flac +, xf86vidmodeproto, libXxf86vm, openal, libGLU_combined, kbproto, libjpeg, flac , inputproto, libXi, fixesproto, libXfixes, freetype, libopus, libtheora , physfs, enet, pkgconfig, gtk2, pcre, libpulseaudio, libpthreadstubs , libXdmcp @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { buildInputs = [ texinfo libXext xextproto libX11 xproto libXpm libXt libXcursor alsaLib cmake zlib libpng libvorbis libXxf86dga libXxf86misc - xf86dgaproto xf86miscproto xf86vidmodeproto libXxf86vm openal mesa + xf86dgaproto xf86miscproto xf86vidmodeproto libXxf86vm openal libGLU_combined kbproto libjpeg flac inputproto libXi fixesproto libXfixes enet libtheora freetype physfs libopus pkgconfig gtk2 pcre libXdmcp diff --git a/pkgs/development/libraries/allegro/default.nix b/pkgs/development/libraries/allegro/default.nix index c0451486c144..12b2cbf07071 100644 --- a/pkgs/development/libraries/allegro/default.nix +++ b/pkgs/development/libraries/allegro/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, texinfo, libXext, xextproto, libX11, xproto , libXpm, libXt, libXcursor, alsaLib, cmake, zlib, libpng, libvorbis , libXxf86dga, libXxf86misc, xf86dgaproto, xf86miscproto -, xf86vidmodeproto, libXxf86vm, openal, mesa }: +, xf86vidmodeproto, libXxf86vm, openal, libGLU_combined }: stdenv.mkDerivation rec { name = "allegro-${version}"; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { buildInputs = [ texinfo libXext xextproto libX11 xproto libXpm libXt libXcursor alsaLib cmake zlib libpng libvorbis libXxf86dga libXxf86misc - xf86dgaproto xf86miscproto xf86vidmodeproto libXxf86vm openal mesa + xf86dgaproto xf86miscproto xf86vidmodeproto libXxf86vm openal libGLU_combined ]; hardeningDisable = [ "format" ]; diff --git a/pkgs/development/libraries/box2d/default.nix b/pkgs/development/libraries/box2d/default.nix index 61f0fac7ffd0..e65980be320e 100644 --- a/pkgs/development/libraries/box2d/default.nix +++ b/pkgs/development/libraries/box2d/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip, cmake, mesa, freeglut, libX11, xproto, inputproto +{ stdenv, fetchurl, unzip, cmake, libGLU_combined, freeglut, libX11, xproto, inputproto , libXi, pkgconfig }: stdenv.mkDerivation rec { @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - unzip cmake mesa freeglut libX11 xproto inputproto libXi + unzip cmake libGLU_combined freeglut libX11 xproto inputproto libXi ]; cmakeFlags = [ "-DBOX2D_INSTALL=ON" "-DBOX2D_BUILD_SHARED=ON" ]; diff --git a/pkgs/development/libraries/bullet/default.nix b/pkgs/development/libraries/bullet/default.nix index 39a5a9869ba7..4d94faa9566a 100644 --- a/pkgs/development/libraries/bullet/default.nix +++ b/pkgs/development/libraries/bullet/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, mesa, freeglut, darwin }: +{ stdenv, fetchFromGitHub, cmake, libGLU_combined, freeglut, darwin }: stdenv.mkDerivation rec { name = "bullet-${version}"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { buildInputs = [ cmake ] ++ (if stdenv.isDarwin then with darwin.apple_sdk.frameworks; [ Cocoa OpenGL ] - else [mesa freeglut]); + else [libGLU_combined freeglut]); patches = [ ./gwen-narrowing.patch ]; diff --git a/pkgs/development/libraries/cairo/default.nix b/pkgs/development/libraries/cairo/default.nix index 64b86d66913c..6aa184e4204e 100644 --- a/pkgs/development/libraries/cairo/default.nix +++ b/pkgs/development/libraries/cairo/default.nix @@ -2,7 +2,7 @@ , libintlOrEmpty, expat, zlib, libpng, pixman, fontconfig, freetype, xorg , gobjectSupport ? true, glib , xcbSupport ? true # no longer experimental since 1.12 -, glSupport ? true, libGL ? null # mesa is no longer a big dependency +, glSupport ? true, libGL ? null # libGLU_combined is no longer a big dependency , pdfSupport ? true , darwin }: diff --git a/pkgs/development/libraries/chipmunk/default.nix b/pkgs/development/libraries/chipmunk/default.nix index 2c50d8138057..ad233402f198 100644 --- a/pkgs/development/libraries/chipmunk/default.nix +++ b/pkgs/development/libraries/chipmunk/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, freeglut, mesa, glfw2, glew, libX11, xproto +{ stdenv, fetchurl, cmake, freeglut, libGLU_combined, glfw2, glew, libX11, xproto , inputproto, libXi, libXmu }: @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = - [ freeglut mesa glfw2 glew libX11 xproto inputproto libXi libXmu ]; + [ freeglut libGLU_combined glfw2 glew libX11 xproto inputproto libXi libXmu ]; postInstall = '' mkdir -p $out/bin diff --git a/pkgs/development/libraries/cl/default.nix b/pkgs/development/libraries/cl/default.nix index b26327dd7754..7c44c2e0ab0c 100644 --- a/pkgs/development/libraries/cl/default.nix +++ b/pkgs/development/libraries/cl/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchFromGitHub, SDL, mesa, rebar, erlang, opencl-headers, ocl-icd }: +{stdenv, fetchFromGitHub, SDL, libGLU_combined, rebar, erlang, opencl-headers, ocl-icd }: stdenv.mkDerivation rec { version = "1.2.3"; diff --git a/pkgs/development/libraries/clutter/default.nix b/pkgs/development/libraries/clutter/default.nix index 3292c8e353fe..19f6729e1fca 100644 --- a/pkgs/development/libraries/clutter/default.nix +++ b/pkgs/development/libraries/clutter/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, glib, pkgconfig, mesa, libX11, libXext, libXfixes +{ stdenv, fetchurl, glib, pkgconfig, libGLU_combined, libX11, libXext, libXfixes , libXdamage, libXcomposite, libXi, libxcb, cogl, pango, atk, json_glib, gobjectIntrospection, gtk3 }: @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { buildInputs = [ gtk3 ]; nativeBuildInputs = [ pkgconfig ]; propagatedBuildInputs = - [ libX11 mesa libXext libXfixes libXdamage libXcomposite libXi cogl pango + [ libX11 libGLU_combined libXext libXfixes libXdamage libXcomposite libXi cogl pango atk json_glib gobjectIntrospection libxcb ]; diff --git a/pkgs/development/libraries/coin3d/default.nix b/pkgs/development/libraries/coin3d/default.nix index ce78a6fc1347..442ed2a4b9a5 100644 --- a/pkgs/development/libraries/coin3d/default.nix +++ b/pkgs/development/libraries/coin3d/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, mesa }: +{ fetchurl, stdenv, libGLU_combined }: stdenv.mkDerivation rec { name = "coin3d-${version}"; @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { ./sbhashentry.patch ]; - buildInputs = [ mesa ]; + buildInputs = [ libGLU_combined ]; meta = { homepage = http://www.coin3d.org/; diff --git a/pkgs/development/libraries/epoxy/default.nix b/pkgs/development/libraries/epoxy/default.nix index 18ce05af07a8..483300b13f57 100644 --- a/pkgs/development/libraries/epoxy/default.nix +++ b/pkgs/development/libraries/epoxy/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, autoreconfHook, pkgconfig, utilmacros, python -, mesa, libX11 +, libGLU_combined, libX11 }: stdenv.mkDerivation rec { @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; nativeBuildInputs = [ autoreconfHook pkgconfig utilmacros python ]; - buildInputs = [ mesa libX11 ]; + buildInputs = [ libGLU_combined libX11 ]; preConfigure = stdenv.lib.optional stdenv.isDarwin '' substituteInPlace configure --replace build_glx=no build_glx=yes diff --git a/pkgs/development/libraries/esdl/default.nix b/pkgs/development/libraries/esdl/default.nix index af8258a01966..7b40359837a3 100644 --- a/pkgs/development/libraries/esdl/default.nix +++ b/pkgs/development/libraries/esdl/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, SDL, mesa, rebar, erlang}: +{stdenv, fetchurl, SDL, libGLU_combined, rebar, erlang}: stdenv.mkDerivation rec { name = "esdl-1.3.1"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ erlang rebar ]; - propagatedBuildInputs = [ SDL mesa ]; + propagatedBuildInputs = [ SDL libGLU_combined ]; buildPhase = '' rebar compile diff --git a/pkgs/development/libraries/ffmpeg-full/default.nix b/pkgs/development/libraries/ffmpeg-full/default.nix index 689b13a394dc..67e364715f09 100644 --- a/pkgs/development/libraries/ffmpeg-full/default.nix +++ b/pkgs/development/libraries/ffmpeg-full/default.nix @@ -102,7 +102,7 @@ #, opencl ? null # OpenCL code , opencore-amr ? null # AMR-NB de/encoder & AMR-WB decoder #, opencv ? null # Video filtering -, openglExtlib ? false, mesa ? null # OpenGL rendering +, openglExtlib ? false, libGLU_combined ? null # OpenGL rendering #, openh264 ? null # H.264/AVC encoder , openjpeg_1 ? null # JPEG 2000 de/encoder , opensslExtlib ? false, openssl ? null @@ -225,7 +225,7 @@ assert gnutls != null -> !opensslExtlib; assert libxcbshmExtlib -> libxcb != null; assert libxcbxfixesExtlib -> libxcb != null; assert libxcbshapeExtlib -> libxcb != null; -assert openglExtlib -> mesa != null; +assert openglExtlib -> libGLU_combined != null; assert opensslExtlib -> gnutls == null && openssl != null && nonfreeLicensing; assert nvenc -> nvidia-video-sdk != null && nonfreeLicensing; @@ -406,7 +406,7 @@ stdenv.mkDerivation rec { libogg libopus libssh libtheora libvdpau libvorbis libvpx libwebp libX11 libxcb libXv lzma openal openjpeg_1 libpulseaudio rtmpdump opencore-amr samba SDL2 soxr speex vid-stab wavpack x264 x265 xavs xvidcore zeromq4 zlib - ] ++ optional openglExtlib mesa + ] ++ optional openglExtlib libGLU_combined ++ optionals nonfreeLicensing [ fdk_aac openssl ] ++ optional ((isLinux || isFreeBSD) && libva != null) libva ++ optionals isLinux [ alsaLib libraw1394 libv4l ] diff --git a/pkgs/development/libraries/ffmpeg/generic.nix b/pkgs/development/libraries/ffmpeg/generic.nix index 906a15c419d6..985f328a22dd 100644 --- a/pkgs/development/libraries/ffmpeg/generic.nix +++ b/pkgs/development/libraries/ffmpeg/generic.nix @@ -3,7 +3,7 @@ , libtheora, libva, libvorbis, libvpx, lzma, libpulseaudio, soxr , x264, x265, xvidcore, zlib, libopus , hostPlatform -, openglSupport ? false, mesa ? null +, openglSupport ? false, libGLU_combined ? null # Build options , runtimeCpuDetectBuild ? true # Detect CPU capabilities at runtime , multithreadBuild ? true # Multithreading via pthreads/win32 threads @@ -60,7 +60,7 @@ let vaapiSupport = reqMin "0.6" && ((isLinux || isFreeBSD) && !isArm); in -assert openglSupport -> mesa != null; +assert openglSupport -> libGLU_combined != null; stdenv.mkDerivation rec { @@ -152,7 +152,7 @@ stdenv.mkDerivation rec { buildInputs = [ bzip2 fontconfig freetype gnutls libiconv lame libass libogg libtheora libvdpau libvorbis lzma soxr x264 x265 xvidcore zlib libopus - ] ++ optional openglSupport mesa + ] ++ optional openglSupport libGLU_combined ++ optionals (!isDarwin && !isArm) [ libvpx libpulseaudio ] # Need to be fixed on Darwin and ARM ++ optional ((isLinux || isFreeBSD) && !isArm) libva ++ optional isLinux alsaLib diff --git a/pkgs/development/libraries/fltk/default.nix b/pkgs/development/libraries/fltk/default.nix index a1e4bb8274e0..ddc962d0aab6 100644 --- a/pkgs/development/libraries/fltk/default.nix +++ b/pkgs/development/libraries/fltk/default.nix @@ -1,5 +1,5 @@ { stdenv, composableDerivation, fetchurl, pkgconfig, xlibsWrapper, inputproto, libXi -, freeglut, mesa, libjpeg, zlib, libXinerama, libXft, libpng +, freeglut, libGLU_combined, libjpeg, zlib, libXinerama, libXft, libpng , cfg ? {} , darwin, libtiff, freetype }: @@ -29,7 +29,7 @@ composableDerivation.composableDerivation {} { # this could be tidied up (?).. eg why does it require freeglut without glSupport? edf { name = "cygwin"; } # use the CygWin libraries default=no // edf { name = "debug"; } # turn on debugging default=no - // edf { name = "gl"; enable = { buildInputs = [ mesa ]; }; } # turn on OpenGL support default=yes + // edf { name = "gl"; enable = { buildInputs = [ libGLU_combined ]; }; } # turn on OpenGL support default=yes // edf { name = "shared"; } # turn on shared libraries default=no // edf { name = "threads"; } # enable multi-threading support // edf { name = "quartz"; enable = { buildInputs = "quartz"; }; } # don't konw yet what quartz is # use Quartz instead of Quickdraw (default=no) diff --git a/pkgs/development/libraries/fox/fox-1.6.nix b/pkgs/development/libraries/fox/fox-1.6.nix index 63ec62336163..0d62656e6e74 100644 --- a/pkgs/development/libraries/fox/fox-1.6.nix +++ b/pkgs/development/libraries/fox/fox-1.6.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, xlibsWrapper, libpng, libjpeg, libtiff, zlib, bzip2, libXcursor -, libXrandr, mesa, libXft, libXfixes, xinput +, libXrandr, libGLU_combined, libXft, libXfixes, xinput , CoreServices }: let @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { buildInputs = [ xlibsWrapper libpng libjpeg libtiff zlib bzip2 libXcursor libXrandr - libXft mesa libXfixes xinput + libXft libGLU_combined libXfixes xinput ] ++ stdenv.lib.optional stdenv.isDarwin CoreServices; doCheck = true; diff --git a/pkgs/development/libraries/freenect/default.nix b/pkgs/development/libraries/freenect/default.nix index c77c3b3640b7..d6767a4cbd3b 100644 --- a/pkgs/development/libraries/freenect/default.nix +++ b/pkgs/development/libraries/freenect/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, libusb, pkgconfig, freeglut, mesa, libXi, libXmu }: +{ stdenv, fetchFromGitHub, cmake, libusb, pkgconfig, freeglut, libGLU_combined, libXi, libXmu }: stdenv.mkDerivation rec { name = "freenect-${version}"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0qmbagfkxjgbwd2ajn7i5lkic9gx5y02bsnmqm7cjay99zfw9ifx"; }; - buildInputs = [ libusb freeglut mesa libXi libXmu ]; + buildInputs = [ libusb freeglut libGLU_combined libXi libXmu ]; nativeBuildInputs = [ cmake pkgconfig ]; meta = { diff --git a/pkgs/development/libraries/ftgl/default.nix b/pkgs/development/libraries/ftgl/default.nix index 432f51823451..8808af49f9e4 100644 --- a/pkgs/development/libraries/ftgl/default.nix +++ b/pkgs/development/libraries/ftgl/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, freetype, mesa}: +{stdenv, fetchurl, freetype, libGLU_combined}: let name = "ftgl-2.1.3-rc5"; @@ -11,7 +11,7 @@ stdenv.mkDerivation { sha256 = "0nsn4s6vnv5xcgxcw6q031amvh2zfj2smy1r5mbnjj2548hxcn2l"; }; - buildInputs = [ freetype mesa ]; + buildInputs = [ freetype libGLU_combined ]; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/gle/default.nix b/pkgs/development/libraries/gle/default.nix index 64f51a56fd37..1980c633474f 100644 --- a/pkgs/development/libraries/gle/default.nix +++ b/pkgs/development/libraries/gle/default.nix @@ -1,7 +1,7 @@ -{stdenv, fetchurl, mesa, freeglut, libX11, libXt, libXmu, libXi, libXext}: +{stdenv, fetchurl, libGLU_combined, freeglut, libX11, libXt, libXmu, libXi, libXext}: stdenv.mkDerivation { name = "gle-3.1.0"; - buildInputs = [mesa freeglut libX11 libXt libXmu libXi libXext]; + buildInputs = [libGLU_combined freeglut libX11 libXt libXmu libXi libXext]; src = fetchurl { urls = [ "mirror://sourceforge/project/gle/gle/gle-3.1.0/gle-3.1.0.tar.gz" diff --git a/pkgs/development/libraries/glui/default.nix b/pkgs/development/libraries/glui/default.nix index 35d97712fa40..59357bf6fb1b 100644 --- a/pkgs/development/libraries/glui/default.nix +++ b/pkgs/development/libraries/glui/default.nix @@ -1,7 +1,7 @@ -{stdenv, fetchurl, freeglut, mesa, libXmu, libXext, libX11, libXi}: +{stdenv, fetchurl, freeglut, libGLU_combined, libXmu, libXext, libX11, libXi}: stdenv.mkDerivation { name = "glui-2.35"; - buildInputs = [freeglut mesa libXmu libXext libX11 libXi]; + buildInputs = [freeglut libGLU_combined libXmu libXext libX11 libXi]; preConfigure = ''cd src''; installPhase = '' mkdir -p "$out"/{bin,lib,share/glui/doc,include} diff --git a/pkgs/development/libraries/gstreamer/bad/default.nix b/pkgs/development/libraries/gstreamer/bad/default.nix index c033140d8dc3..3a115bbaf2c4 100644 --- a/pkgs/development/libraries/gstreamer/bad/default.nix +++ b/pkgs/development/libraries/gstreamer/bad/default.nix @@ -6,7 +6,7 @@ , openjpeg, libopus, librsvg , wildmidi, fluidsynth, libvdpau, wayland , libwebp, xvidcore, gnutls, mjpegtools -, mesa, libintlOrEmpty, libgme +, libGLU_combined, libintlOrEmpty, libgme , openssl, x265, libxml2 }: @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { libmodplug mpeg2dec mpg123 openjpeg libopus librsvg fluidsynth libvdpau - libwebp xvidcore gnutls mesa + libwebp xvidcore gnutls libGLU_combined mjpegtools libgme openssl x265 libxml2 ] ++ libintlOrEmpty diff --git a/pkgs/development/libraries/gstreamer/vaapi/default.nix b/pkgs/development/libraries/gstreamer/vaapi/default.nix index 2033c07d9527..8351cfd65b1e 100644 --- a/pkgs/development/libraries/gstreamer/vaapi/default.nix +++ b/pkgs/development/libraries/gstreamer/vaapi/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, gst-plugins-base, bzip2, libva, wayland -, libdrm, udev, xorg, mesa, yasm, gstreamer, gst-plugins-bad, nasm +, libdrm, udev, xorg, libGLU_combined, yasm, gstreamer, gst-plugins-bad, nasm , libvpx, python }: @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { buildInputs = [ gstreamer gst-plugins-base gst-plugins-bad libva wayland libdrm udev xorg.libX11 xorg.libXext xorg.libXv xorg.libXrandr xorg.libSM - xorg.libICE mesa nasm libvpx python + xorg.libICE libGLU_combined nasm libvpx python ]; preConfigure = " diff --git a/pkgs/development/libraries/irrlicht/default.nix b/pkgs/development/libraries/irrlicht/default.nix index 336f446cdf10..d28ae012e574 100644 --- a/pkgs/development/libraries/irrlicht/default.nix +++ b/pkgs/development/libraries/irrlicht/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, mesa, unzip, libXrandr, libX11, libXxf86vm }: +{ stdenv, fetchzip, libGLU_combined, unzip, libXrandr, libX11, libXxf86vm }: stdenv.mkDerivation rec { @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { mkdir -p $out/lib ''; - buildInputs = [ unzip mesa libXrandr libX11 libXxf86vm ]; + buildInputs = [ unzip libGLU_combined libXrandr libX11 libXxf86vm ]; meta = { homepage = http://irrlicht.sourceforge.net/; diff --git a/pkgs/development/libraries/java/swt/default.nix b/pkgs/development/libraries/java/swt/default.nix index 2cf08e345758..1a7153f99e67 100644 --- a/pkgs/development/libraries/java/swt/default.nix +++ b/pkgs/development/libraries/java/swt/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchurl, unzip, jdk, pkgconfig, gtk2 -, libXt, libXtst, libXi, mesa, webkit, libsoup, xorg +, libXt, libXtst, libXi, libGLU_combined, webkit, libsoup, xorg , pango, gdk_pixbuf, glib }: @@ -36,7 +36,7 @@ in stdenv.mkDerivation rec { sourceRoot = "."; nativeBuildInputs = [ unzip pkgconfig ]; - buildInputs = [ jdk gtk2 libXt libXtst libXi mesa webkit libsoup ]; + buildInputs = [ jdk gtk2 libXt libXtst libXi libGLU_combined webkit libsoup ]; NIX_LFLAGS = (map (x: "-L${lib.getLib x}/lib") [ xorg.libX11 pango gdk_pixbuf glib ]) ++ [ "-lX11" "-lpango-1.0" "-lgdk_pixbuf-2.0" "-lglib-2.0" ]; diff --git a/pkgs/development/libraries/libagar/default.nix b/pkgs/development/libraries/libagar/default.nix index ee984a53b4c9..49e5bcdd9058 100644 --- a/pkgs/development/libraries/libagar/default.nix +++ b/pkgs/development/libraries/libagar/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, libtool, perl, bsdbuild, gettext, mandoc -, libpng, libjpeg, xlibsWrapper, libXinerama, freetype, SDL, mesa +, libpng, libjpeg, xlibsWrapper, libXinerama, freetype, SDL, libGLU_combined , libsndfile, portaudio, mysql, fontconfig }: @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { "--enable-nls=yes" "--with-gettext=${gettext}" "--with-jpeg=${libjpeg.dev}" - "--with-gl=${mesa}" + "--with-gl=${libGLU_combined}" "--with-mysql=${mysql.connector-c}" "--with-manpages=yes" ]; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig libtool gettext ]; buildInputs = [ - bsdbuild perl xlibsWrapper libXinerama SDL mesa mysql.connector-c mandoc + bsdbuild perl xlibsWrapper libXinerama SDL libGLU_combined mysql.connector-c mandoc freetype.dev libpng libjpeg.dev fontconfig portaudio libsndfile ]; diff --git a/pkgs/development/libraries/libglvnd/default.nix b/pkgs/development/libraries/libglvnd/default.nix index cc285979c6c1..ebcbdb23e9fb 100644 --- a/pkgs/development/libraries/libglvnd/default.nix +++ b/pkgs/development/libraries/libglvnd/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchFromGitHub, autoreconfHook, python2, pkgconfig, mesa_noglu, libX11, libXext, glproto }: +{stdenv, fetchFromGitHub, autoreconfHook, python2, pkgconfig, libGLU_combined_noglu, libX11, libXext, glproto }: # Git version is needed for EGL and GLES handling. @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = [ "-UDEFAULT_EGL_VENDOR_CONFIG_DIRS" - "-DDEFAULT_EGL_VENDOR_CONFIG_DIRS=\"${mesa_noglu.driverLink}/share/glvnd/egl_vendor.d\"" + "-DDEFAULT_EGL_VENDOR_CONFIG_DIRS=\"${libGLU_combined_noglu.driverLink}/share/glvnd/egl_vendor.d\"" ]; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/libqtav/default.nix b/pkgs/development/libraries/libqtav/default.nix index 93d8ced49cea..b291ec2fdf0b 100644 --- a/pkgs/development/libraries/libqtav/default.nix +++ b/pkgs/development/libraries/libqtav/default.nix @@ -1,6 +1,6 @@ { mkDerivation, lib, fetchFromGitHub, extra-cmake-modules , qtbase, qtmultimedia, qtquick1, qttools -, mesa, libX11 +, libGLU_combined, libX11 , libass, openal, ffmpeg, libuchardet , alsaLib, libpulseaudio, libva }: @@ -14,7 +14,7 @@ mkDerivation rec { nativeBuildInputs = [ extra-cmake-modules qttools ]; buildInputs = [ qtbase qtmultimedia qtquick1 - mesa libX11 + libGLU_combined libX11 libass openal ffmpeg libuchardet alsaLib libpulseaudio libva ]; @@ -28,9 +28,9 @@ mkDerivation rec { }; # Make sure libqtav finds its libGL dependancy at both link and run time - # by adding mesa to rpath. Not sure why it wasn't done automatically like - # the other libraries as `mesa` is part of our `buildInputs`. - NIX_CFLAGS_LINK = [ "-Wl,-rpath,${mesa}/lib"]; + # by adding libGLU_combined to rpath. Not sure why it wasn't done automatically like + # the other libraries as `libGLU_combined` is part of our `buildInputs`. + NIX_CFLAGS_LINK = [ "-Wl,-rpath,${libGLU_combined}/lib"]; preFixup = '' mkdir -p "$out/bin" diff --git a/pkgs/development/libraries/libtcod/default.nix b/pkgs/development/libraries/libtcod/default.nix index 0374c7f89b7a..4e859c282276 100644 --- a/pkgs/development/libraries/libtcod/default.nix +++ b/pkgs/development/libraries/libtcod/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromBitbucket, cmake, SDL, mesa, upx, zlib }: +{ stdenv, fetchFromBitbucket, cmake, SDL, libGLU_combined, upx, zlib }: stdenv.mkDerivation rec { @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { cmakeFlags="-DLIBTCOD_SAMPLES=OFF"; - buildInputs = [ cmake SDL mesa upx zlib ]; + buildInputs = [ cmake SDL libGLU_combined upx zlib ]; meta = { description = "API for roguelike games"; diff --git a/pkgs/development/libraries/libtxc_dxtn/default.nix b/pkgs/development/libraries/libtxc_dxtn/default.nix index 82aba6b89f5a..977570050158 100644 --- a/pkgs/development/libraries/libtxc_dxtn/default.nix +++ b/pkgs/development/libraries/libtxc_dxtn/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, autoreconfHook, mesa }: +{ stdenv, fetchurl, autoreconfHook, libGLU_combined }: let version = "1.0.1"; in @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ autoreconfHook ]; - buildInputs = [ mesa ]; + buildInputs = [ libGLU_combined ]; meta = { homepage = http://dri.freedesktop.org/wiki/S3TC; diff --git a/pkgs/development/libraries/libtxc_dxtn_s2tc/default.nix b/pkgs/development/libraries/libtxc_dxtn_s2tc/default.nix index 387dbb22a816..aad8ae00c114 100644 --- a/pkgs/development/libraries/libtxc_dxtn_s2tc/default.nix +++ b/pkgs/development/libraries/libtxc_dxtn_s2tc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, autoreconfHook, mesa }: +{ stdenv, fetchurl, autoreconfHook, libGLU_combined }: let version = "1.0"; in @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ autoreconfHook ]; - buildInputs = [ mesa ]; + buildInputs = [ libGLU_combined ]; meta = { description = "A patent-free S3TC compatible implementation"; diff --git a/pkgs/development/libraries/libwebp/default.nix b/pkgs/development/libraries/libwebp/default.nix index 79a5bef30fcf..f7d4fc3b3675 100644 --- a/pkgs/development/libraries/libwebp/default.nix +++ b/pkgs/development/libraries/libwebp/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl , threadingSupport ? true # multi-threading -, openglSupport ? false, freeglut ? null, mesa ? null # OpenGL (required for vwebp) +, openglSupport ? false, freeglut ? null, libGLU_combined ? null # OpenGL (required for vwebp) , pngSupport ? true, libpng ? null # PNG image format , jpegSupport ? true, libjpeg ? null # JPEG image format , tiffSupport ? true, libtiff ? null # TIFF image format @@ -14,7 +14,7 @@ , libwebpdecoderSupport ? true # Build libwebpdecoder }: -assert openglSupport -> ((freeglut != null) && (mesa != null)); +assert openglSupport -> ((freeglut != null) && (libGLU_combined != null)); assert pngSupport -> (libpng != null); assert jpegSupport -> (libjpeg != null); assert tiffSupport -> (libtiff != null); @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ ] - ++ optionals openglSupport [ freeglut mesa ] + ++ optionals openglSupport [ freeglut libGLU_combined ] ++ optional pngSupport libpng ++ optional jpegSupport libjpeg ++ optional tiffSupport libtiff diff --git a/pkgs/development/libraries/liquidfun/default.nix b/pkgs/development/libraries/liquidfun/default.nix index a4dc7b5e93d1..9c1815f840b4 100644 --- a/pkgs/development/libraries/liquidfun/default.nix +++ b/pkgs/development/libraries/liquidfun/default.nix @@ -1,4 +1,4 @@ -{ stdenv, requireFile, cmake, mesa, libX11, libXi }: +{ stdenv, requireFile, cmake, libGLU_combined, libX11, libXi }: let sourceInfo = rec { @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { }; inherit (sourceInfo) name version; - buildInputs = [ cmake mesa libX11 libXi ]; + buildInputs = [ cmake libGLU_combined libX11 libXi ]; sourceRoot = "liquidfun/Box2D/"; diff --git a/pkgs/development/libraries/mediastreamer/default.nix b/pkgs/development/libraries/mediastreamer/default.nix index 90f154367643..8b756e338e48 100644 --- a/pkgs/development/libraries/mediastreamer/default.nix +++ b/pkgs/development/libraries/mediastreamer/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, intltool, alsaLib, libpulseaudio, speex, gsm -, libopus, ffmpeg, libX11, libXv, mesa, glew, libtheora, libvpx, SDL, libupnp +, libopus, ffmpeg, libX11, libXv, libGLU_combined, glew, libtheora, libvpx, SDL, libupnp , ortp, libv4l, libpcap, srtp, fetchFromGitHub, cmake, bctoolbox, doxygen , python, libXext, libmatroska, openssl, fetchpatch }: @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ alsaLib libpulseaudio speex gsm libopus - ffmpeg libX11 libXv mesa glew libtheora libvpx SDL libupnp + ffmpeg libX11 libXv libGLU_combined glew libtheora libvpx SDL libupnp ortp libv4l libpcap srtp bctoolbox libXext libmatroska openssl ]; diff --git a/pkgs/development/libraries/mygui/default.nix b/pkgs/development/libraries/mygui/default.nix index 715d2cb90f47..f4a869255f8c 100644 --- a/pkgs/development/libraries/mygui/default.nix +++ b/pkgs/development/libraries/mygui/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, libX11, unzip, cmake, ois, freetype, libuuid, - boost, pkgconfig, withOgre ? false, ogre ? null, mesa ? null } : + boost, pkgconfig, withOgre ? false, ogre ? null, libGLU_combined ? null } : let renderSystem = if withOgre then "3" else "4"; @@ -17,7 +17,7 @@ in stdenv.mkDerivation rec { enableParallelBuilding = true; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ libX11 unzip cmake ois freetype libuuid boost (if withOgre then ogre else mesa) ]; + buildInputs = [ libX11 unzip cmake ois freetype libuuid boost (if withOgre then ogre else libGLU_combined) ]; # Tools are disabled due to compilation failures. cmakeFlags = [ "-DMYGUI_BUILD_TOOLS=OFF" "-DMYGUI_BUILD_DEMOS=OFF" "-DMYGUI_RENDERSYSTEM=${renderSystem}" ]; diff --git a/pkgs/development/libraries/ogre/1.9.x.nix b/pkgs/development/libraries/ogre/1.9.x.nix index b3b6e918bdea..694fbaa50c1c 100644 --- a/pkgs/development/libraries/ogre/1.9.x.nix +++ b/pkgs/development/libraries/ogre/1.9.x.nix @@ -1,5 +1,5 @@ { fetchFromGitHub, stdenv, lib -, cmake, mesa +, cmake, libGLU_combined , freetype, freeimage, zziplib, randrproto, libXrandr , libXaw, freeglut, libXt, libpng, boost, ois , xproto, libX11, libXmu, libSM, pkgconfig @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; buildInputs = - [ cmake mesa + [ cmake libGLU_combined freetype freeimage zziplib randrproto libXrandr libXaw freeglut libXt libpng boost ois xproto libX11 libXmu libSM pkgconfig diff --git a/pkgs/development/libraries/ogre/default.nix b/pkgs/development/libraries/ogre/default.nix index e0d6d2fa41c7..0b7202459f9e 100644 --- a/pkgs/development/libraries/ogre/default.nix +++ b/pkgs/development/libraries/ogre/default.nix @@ -1,5 +1,5 @@ { fetchurl, stdenv, lib -, cmake, mesa +, cmake, libGLU_combined , freetype, freeimage, zziplib, randrproto, libXrandr , libXaw, freeglut, libXt, libpng, boost, ois , xproto, libX11, libXmu, libSM, pkgconfig @@ -24,7 +24,7 @@ stdenv.mkDerivation { enableParallelBuilding = true; buildInputs = - [ cmake mesa + [ cmake libGLU_combined freetype freeimage zziplib randrproto libXrandr libXaw freeglut libXt libpng boost ois xproto libX11 libXmu libSM pkgconfig diff --git a/pkgs/development/libraries/opencascade/default.nix b/pkgs/development/libraries/opencascade/default.nix index c2fba26ba686..6af15d90cefd 100644 --- a/pkgs/development/libraries/opencascade/default.nix +++ b/pkgs/development/libraries/opencascade/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, mesa, tcl, tk, file, libXmu, cmake, libtool, qt4, +{stdenv, fetchurl, libGLU_combined, tcl, tk, file, libXmu, cmake, libtool, qt4, ftgl, freetype}: stdenv.mkDerivation rec { @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "0vpmnb0k5y2f7lpmwx9pg9yfq24zjvnsak5alzacncfm1hv9b6cd"; }; - buildInputs = [ mesa tcl tk file libXmu libtool qt4 ftgl freetype cmake ]; + buildInputs = [ libGLU_combined tcl tk file libXmu libtool qt4 ftgl freetype cmake ]; # Fix for glibc 2.26 postPatch = '' diff --git a/pkgs/development/libraries/opencsg/default.nix b/pkgs/development/libraries/opencsg/default.nix index c5f79b8613ec..22960d2c691f 100644 --- a/pkgs/development/libraries/opencsg/default.nix +++ b/pkgs/development/libraries/opencsg/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, mesa, freeglut, glew, libXmu, libXext, libX11 +{stdenv, fetchurl, libGLU_combined, freeglut, glew, libXmu, libXext, libX11 }: stdenv.mkDerivation rec { @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "13c73jxadm27h7spdh3qj1v6rnn81v4xwqlv5a6k72pv9kjnpd7c"; }; - buildInputs = [mesa freeglut glew libXmu libXext libX11]; + buildInputs = [libGLU_combined freeglut glew libXmu libXext libX11]; doCheck = false; diff --git a/pkgs/development/libraries/openexrid-unstable/default.nix b/pkgs/development/libraries/openexrid-unstable/default.nix index fcf4c2c2468f..d8198357c641 100644 --- a/pkgs/development/libraries/openexrid-unstable/default.nix +++ b/pkgs/development/libraries/openexrid-unstable/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, unzip, re2, openfx, zlib, ilmbase, mesa, openexr }: +{ stdenv, fetchFromGitHub, unzip, re2, openfx, zlib, ilmbase, libGLU_combined, openexr }: stdenv.mkDerivation rec { @@ -21,7 +21,7 @@ stdenv.mkDerivation rec -I${openfx.dev}/include/OpenFX ''; - buildInputs = [ unzip re2 openfx zlib ilmbase mesa openexr ]; + buildInputs = [ unzip re2 openfx zlib ilmbase libGLU_combined openexr ]; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/partio/default.nix b/pkgs/development/libraries/partio/default.nix index 4f93ed562115..18df541d955a 100644 --- a/pkgs/development/libraries/partio/default.nix +++ b/pkgs/development/libraries/partio/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, unzip, cmake, freeglut, mesa, zlib, swig, python, doxygen, xorg }: +{ stdenv, fetchFromGitHub, unzip, cmake, freeglut, libGLU_combined, zlib, swig, python, doxygen, xorg }: stdenv.mkDerivation rec { @@ -14,7 +14,7 @@ stdenv.mkDerivation rec outputs = [ "dev" "out" "lib" ]; - buildInputs = [ unzip cmake freeglut mesa zlib swig python doxygen xorg.libXi xorg.libXmu ]; + buildInputs = [ unzip cmake freeglut libGLU_combined zlib swig python doxygen xorg.libXi xorg.libXmu ]; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/phonon/default.nix b/pkgs/development/libraries/phonon/default.nix index 2cb2dde33f7e..8e1ee8196c30 100644 --- a/pkgs/development/libraries/phonon/default.nix +++ b/pkgs/development/libraries/phonon/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, cmake, mesa, pkgconfig, libpulseaudio +{ stdenv, lib, fetchurl, cmake, libGLU_combined, pkgconfig, libpulseaudio , qt4 ? null, extra-cmake-modules ? null, qtbase ? null, qttools ? null , withQt5 ? false , debug ? false }: @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { }; buildInputs = - [ mesa libpulseaudio ] + [ libGLU_combined libpulseaudio ] ++ (if withQt5 then [ qtbase qttools ] else [ qt4 ]); nativeBuildInputs = diff --git a/pkgs/development/libraries/physics/geant4/default.nix b/pkgs/development/libraries/physics/geant4/default.nix index 2c07c1e08580..794d0b24c778 100644 --- a/pkgs/development/libraries/physics/geant4/default.nix +++ b/pkgs/development/libraries/physics/geant4/default.nix @@ -25,7 +25,7 @@ , motif ? null # motif or lesstif # For enableQT, enableXM, enableOpenGLX11, enableRaytracerX11. -, mesa ? null +, libGLU_combined ? null , xlibsWrapper ? null , libXmu ? null }: @@ -40,7 +40,7 @@ assert enableQT -> qt != null; assert enableXM -> motif != null; # OpenGL/X11 User Interface and Visualisation drivers. -assert enableQT || enableXM || enableOpenGLX11 || enableRaytracerX11 -> mesa != null; +assert enableQT || enableXM || enableOpenGLX11 || enableRaytracerX11 -> libGLU_combined != null; assert enableQT || enableXM || enableOpenGLX11 || enableRaytracerX11 -> xlibsWrapper != null; assert enableQT || enableXM || enableOpenGLX11 || enableRaytracerX11 -> libXmu != null; @@ -81,8 +81,8 @@ let }; enableParallelBuilding = true; - buildInputs = [ cmake clhep expat zlib xercesc qt motif mesa xlibsWrapper libXmu ]; - propagatedBuildInputs = [ g4data clhep expat zlib xercesc qt motif mesa xlibsWrapper libXmu ]; + buildInputs = [ cmake clhep expat zlib xercesc qt motif libGLU_combined xlibsWrapper libXmu ]; + propagatedBuildInputs = [ g4data clhep expat zlib xercesc qt motif libGLU_combined xlibsWrapper libXmu ]; setupHook = ./setup-hook.sh; diff --git a/pkgs/development/libraries/plib/default.nix b/pkgs/development/libraries/plib/default.nix index 4030be2996cc..c9e8c632c7f1 100644 --- a/pkgs/development/libraries/plib/default.nix +++ b/pkgs/development/libraries/plib/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, fetchpatch, stdenv, mesa, freeglut, SDL +{ fetchurl, fetchpatch, stdenv, libGLU_combined, freeglut, SDL , libXi, libSM, libXmu, libXext, libX11 }: stdenv.mkDerivation rec { @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { ]; propagatedBuildInputs = [ - mesa freeglut SDL + libGLU_combined freeglut SDL # The following libs ought to be propagated build inputs of Mesa. libXi libSM libXmu libXext libX11 diff --git a/pkgs/development/libraries/qt-3/default.nix b/pkgs/development/libraries/qt-3/default.nix index 1bc4fd1085e1..174be6a8f53a 100644 --- a/pkgs/development/libraries/qt-3/default.nix +++ b/pkgs/development/libraries/qt-3/default.nix @@ -6,7 +6,7 @@ , cursorSupport ? true, libXcursor ? null , threadSupport ? true , mysqlSupport ? false, mysql ? null -, openglSupport ? false, mesa ? null, libXmu ? null +, openglSupport ? false, libGLU_combined ? null, libXmu ? null , xlibsWrapper, xextproto, zlib, libjpeg, libpng, which }: @@ -15,7 +15,7 @@ assert xrenderSupport -> xftSupport && libXrender != null; assert xrandrSupport -> libXrandr != null && randrproto != null; assert cursorSupport -> libXcursor != null; assert mysqlSupport -> mysql != null; -assert openglSupport -> mesa != null && libXmu != null; +assert openglSupport -> libGLU_combined != null && libXmu != null; stdenv.mkDerivation { name = "qt-3.3.8"; @@ -40,7 +40,7 @@ stdenv.mkDerivation { -qt-gif -I${xextproto}/include ${if openglSupport then "-dlopen-opengl - -L${mesa}/lib -I${mesa}/include + -L${libGLU_combined}/lib -I${mesa}/include -L${libXmu.out}/lib -I${libXmu.dev}/include" else ""} ${if threadSupport then "-thread" else "-no-thread"} ${if xrenderSupport then "-xrender -L${libXrender.out}/lib -I${libXrender.dev}/include" else "-no-xrender"} diff --git a/pkgs/development/libraries/quesoglc/default.nix b/pkgs/development/libraries/quesoglc/default.nix index 33e8d49454c1..84be9876c1cb 100644 --- a/pkgs/development/libraries/quesoglc/default.nix +++ b/pkgs/development/libraries/quesoglc/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, mesa, glew, freetype, fontconfig, fribidi, libX11 }: +{ stdenv, fetchurl, libGLU_combined, glew, freetype, fontconfig, fribidi, libX11 }: stdenv.mkDerivation rec { pname = "quesoglc"; version = "0.7.2"; @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { url = "mirror://sourceforge/${pname}/${name}.tar.bz2"; sha256 = "0cf9ljdzii5d4i2m23gdmf3kn521ljcldzq69lsdywjid3pg5zjl"; }; - buildInputs = [ mesa glew freetype fontconfig fribidi libX11 ]; + buildInputs = [ libGLU_combined glew freetype fontconfig fribidi libX11 ]; # FIXME: Configure fails to use system glew. meta = with stdenv.lib; { description = "A free implementation of the OpenGL Character Renderer"; diff --git a/pkgs/development/libraries/simgear/default.nix b/pkgs/development/libraries/simgear/default.nix index d724ebbf3738..28b96d17aa60 100644 --- a/pkgs/development/libraries/simgear/default.nix +++ b/pkgs/development/libraries/simgear/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, plib, freeglut, xproto, libX11, libXext, xextproto, libXi -, inputproto, libICE, libSM, libXt, libXmu, mesa, boost, zlib, libjpeg, freealut +, inputproto, libICE, libSM, libXt, libXmu, libGLU_combined, boost, zlib, libjpeg, freealut , openscenegraph, openal, expat, cmake, apr , curl }: @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ plib freeglut xproto libX11 libXext xextproto libXi inputproto - libICE libSM libXt libXmu mesa boost zlib libjpeg freealut + libICE libSM libXt libXmu libGLU_combined boost zlib libjpeg freealut openscenegraph openal expat cmake apr curl ]; enableParallelBuilding = true; diff --git a/pkgs/development/libraries/smpeg/default.nix b/pkgs/development/libraries/smpeg/default.nix index f248d65e2ed6..7119f76c55fd 100644 --- a/pkgs/development/libraries/smpeg/default.nix +++ b/pkgs/development/libraries/smpeg/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchsvn, SDL, autoconf, automake, libtool, gtk2, m4, pkgconfig, mesa, makeWrapper }: +{ stdenv, fetchsvn, SDL, autoconf, automake, libtool, gtk2, m4, pkgconfig, libGLU_combined, makeWrapper }: stdenv.mkDerivation rec { name = "smpeg-svn${version}"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - buildInputs = [ SDL gtk2 mesa ]; + buildInputs = [ SDL gtk2 libGLU_combined ]; nativeBuildInputs = [ autoconf automake libtool m4 pkgconfig makeWrapper ]; diff --git a/pkgs/development/libraries/vaapi-vdpau/default.nix b/pkgs/development/libraries/vaapi-vdpau/default.nix index f0089110c3c8..013af68cb6c4 100644 --- a/pkgs/development/libraries/vaapi-vdpau/default.nix +++ b/pkgs/development/libraries/vaapi-vdpau/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libvdpau, mesa, libva, pkgconfig }: +{ stdenv, fetchurl, libvdpau, libGLU_combined, libva, pkgconfig }: let libvdpau08patch = (fetchurl { url = "http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/x11-libs/libva-vdpau-driver/files/libva-vdpau-driver-0.7.4-libvdpau-0.8.patch?revision=1.1"; name = "libva-vdpau-driver-0.7.4-libvdpau-0.8.patch"; @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { }) ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ libvdpau mesa libva ]; + buildInputs = [ libvdpau libGLU_combined libva ]; preConfigure = '' patch -p0 < ${libvdpau08patch} # use -p0 instead of -p1 diff --git a/pkgs/development/libraries/vrpn/default.nix b/pkgs/development/libraries/vrpn/default.nix index 5250b7815906..ddeecce21c61 100644 --- a/pkgs/development/libraries/vrpn/default.nix +++ b/pkgs/development/libraries/vrpn/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, unzip, cmake, mesa }: +{ stdenv, fetchFromGitHub, unzip, cmake, libGLU_combined }: stdenv.mkDerivation rec { name = "${pname}-${date}"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "032q295d68w34rk5q8nfqdd29s55n00bfik84y7xzkjrpspaprlh"; }; - buildInputs = [ unzip cmake mesa ]; + buildInputs = [ unzip cmake libGLU_combined ]; doCheck = false; # FIXME: test failure checkTarget = "test"; diff --git a/pkgs/development/libraries/vtk/default.nix b/pkgs/development/libraries/vtk/default.nix index 5b0bdb4ee741..984a106236ce 100644 --- a/pkgs/development/libraries/vtk/default.nix +++ b/pkgs/development/libraries/vtk/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchpatch, cmake, mesa, libX11, xproto, libXt +{ stdenv, fetchurl, fetchpatch, cmake, libGLU_combined, libX11, xproto, libXt , qtLib ? null # Darwin support , Cocoa, CoreServices, DiskArbitration, IOKit, CFNetwork, Security, GLUT, OpenGL @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { buildInputs = if !stdenv.isDarwin - then [ cmake mesa libX11 xproto libXt ] ++ optional (qtLib != null) qtLib + then [ cmake libGLU_combined libX11 xproto libXt ] ++ optional (qtLib != null) qtLib else [ cmake qtLib xpc CoreServices DiskArbitration IOKit cf-private CFNetwork Security ApplicationServices CoreText IOSurface ImageIO OpenGL GLUT ]; diff --git a/pkgs/development/libraries/webkitgtk/2.18.nix b/pkgs/development/libraries/webkitgtk/2.18.nix index d3e3163a8afe..b62e83349053 100644 --- a/pkgs/development/libraries/webkitgtk/2.18.nix +++ b/pkgs/development/libraries/webkitgtk/2.18.nix @@ -2,7 +2,7 @@ , pkgconfig, gettext, gobjectIntrospection, libnotify, gnutls , gtk3, wayland, libwebp, enchant, xlibs, libxkbcommon, epoxy, at_spi2_core , libxml2, libsoup, libsecret, libxslt, harfbuzz, libpthreadstubs, pcre, nettle, libtasn1, p11_kit -, libidn, libedit, readline, mesa, libintlOrEmpty +, libidn, libedit, readline, libGLU_combined, libintlOrEmpty , enableGeoLocation ? true, geoclue2, sqlite , enableGtk2Plugins ? false, gtk2 ? null , gst-plugins-base, gst-plugins-bad @@ -93,7 +93,7 @@ stdenv.mkDerivation rec { ] ++ optional enableGeoLocation geoclue2 ++ optional enableGtk2Plugins gtk2 ++ (with xlibs; [ libXdmcp libXt libXtst ]) - ++ optionals stdenv.isDarwin [ libedit readline mesa ] + ++ optionals stdenv.isDarwin [ libedit readline libGLU_combined ] ++ optional stdenv.isLinux wayland; propagatedBuildInputs = [ diff --git a/pkgs/development/libraries/xine-lib/default.nix b/pkgs/development/libraries/xine-lib/default.nix index 83c75dcfa8a1..9bb9f7986e6d 100644 --- a/pkgs/development/libraries/xine-lib/default.nix +++ b/pkgs/development/libraries/xine-lib/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, xorg, alsaLib, mesa, aalib +{ stdenv, fetchurl, pkgconfig, xorg, alsaLib, libGLU_combined, aalib , libvorbis, libtheora, speex, zlib, libdvdcss, perl, ffmpeg , flac, libcaca, libpulseaudio, libmng, libcdio, libv4l, vcdimager , libmpcdec @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { buildInputs = [ xorg.libX11 xorg.libXv xorg.libXinerama xorg.libxcb xorg.libXext - alsaLib mesa aalib libvorbis libtheora speex perl ffmpeg flac + alsaLib libGLU_combined aalib libvorbis libtheora speex perl ffmpeg flac libcaca libpulseaudio libmng libcdio libv4l vcdimager libmpcdec ]; diff --git a/pkgs/development/misc/amdapp-sdk/default.nix b/pkgs/development/misc/amdapp-sdk/default.nix index 7775716a7122..d0e64a16fddf 100644 --- a/pkgs/development/misc/amdapp-sdk/default.nix +++ b/pkgs/development/misc/amdapp-sdk/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, makeWrapper, perl, mesa, xorg, +{ stdenv, fetchurl, makeWrapper, perl, libGLU_combined, xorg, version? "2.8", # What version samples? false # Should samples be installed }: @@ -46,7 +46,7 @@ in stdenv.mkDerivation rec { patches = stdenv.lib.attrByPath [version "patches"] [] src_info; patchFlags = "-p0"; - buildInputs = [ makeWrapper perl mesa xorg.libX11 xorg.libXext xorg.libXaw xorg.libXi xorg.libXxf86vm ]; + buildInputs = [ makeWrapper perl libGLU_combined xorg.libX11 xorg.libXext xorg.libXaw xorg.libXi xorg.libXxf86vm ]; propagatedBuildInputs = [ stdenv.cc ]; NIX_LDFLAGS = "-lX11 -lXext -lXmu -lXi -lXxf86vm"; doCheck = false; diff --git a/pkgs/development/mobile/androidenv/androidsdk.nix b/pkgs/development/mobile/androidenv/androidsdk.nix index b766d9d9c31a..699af16cf041 100644 --- a/pkgs/development/mobile/androidenv/androidsdk.nix +++ b/pkgs/development/mobile/androidenv/androidsdk.nix @@ -1,6 +1,6 @@ { stdenv, stdenv_32bit, fetchurl, unzip, makeWrapper , platformTools, buildTools, support, supportRepository, platforms, sysimages, addons, sources -, libX11, libXext, libXrender, libxcb, libXau, libXdmcp, libXtst, mesa, alsaLib +, libX11, libXext, libXrender, libxcb, libXau, libXdmcp, libXtst, libGLU_combined, alsaLib , freetype, fontconfig, glib, gtk2, atk, file, jdk, coreutils, libpulseaudio, dbus , zlib, glxinfo, xkeyboardconfig , includeSources @@ -86,7 +86,7 @@ stdenv.mkDerivation rec { do wrapProgram `pwd`/$i \ --prefix PATH : ${stdenv.lib.makeBinPath [ file glxinfo ]} \ - --suffix LD_LIBRARY_PATH : `pwd`/lib64:`pwd`/lib64/qt/lib:${makeLibraryPath [ stdenv.cc.cc libX11 libxcb libXau libXdmcp libXext mesa alsaLib zlib libpulseaudio dbus.lib ]} \ + --suffix LD_LIBRARY_PATH : `pwd`/lib64:`pwd`/lib64/qt/lib:${makeLibraryPath [ stdenv.cc.cc libX11 libxcb libXau libXdmcp libXext libGLU_combined alsaLib zlib libpulseaudio dbus.lib ]} \ --suffix QT_XKB_CONFIG_ROOT : ${xkeyboardconfig}/share/X11/xkb done ''} diff --git a/pkgs/development/mobile/androidenv/default.nix b/pkgs/development/mobile/androidenv/default.nix index 98531eeb069e..3891ea4c6be2 100644 --- a/pkgs/development/mobile/androidenv/default.nix +++ b/pkgs/development/mobile/androidenv/default.nix @@ -47,7 +47,7 @@ rec { androidsdk = import ./androidsdk.nix { inherit (pkgs) stdenv fetchurl unzip makeWrapper; - inherit (pkgs) zlib glxinfo freetype fontconfig glib gtk2 atk mesa file alsaLib jdk coreutils libpulseaudio dbus; + inherit (pkgs) zlib glxinfo freetype fontconfig glib gtk2 atk libGLU_combined file alsaLib jdk coreutils libpulseaudio dbus; inherit (pkgs.xorg) libX11 libXext libXrender libxcb libXau libXdmcp libXtst xkeyboardconfig; inherit platformTools buildTools support supportRepository platforms sysimages addons sources includeSources; diff --git a/pkgs/development/ocaml-modules/lablgl/default.nix b/pkgs/development/ocaml-modules/lablgl/default.nix index f54df0c17d40..427d0d5a0e14 100644 --- a/pkgs/development/ocaml-modules/lablgl/default.nix +++ b/pkgs/development/ocaml-modules/lablgl/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, ocaml, lablgtk, findlib, mesa, freeglut, camlp4 } : +{stdenv, fetchurl, ocaml, lablgtk, findlib, libGLU_combined, freeglut, camlp4 } : let pname = "lablgl"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ocaml findlib lablgtk freeglut camlp4]; - propagatedBuildInputs = [ mesa ]; + propagatedBuildInputs = [ libGLU_combined ]; patches = [ ./Makefile.config.patch ./META.patch ]; diff --git a/pkgs/development/pharo/vm/build-vm-legacy.nix b/pkgs/development/pharo/vm/build-vm-legacy.nix index b2e37344afc3..66cef77e5a94 100644 --- a/pkgs/development/pharo/vm/build-vm-legacy.nix +++ b/pkgs/development/pharo/vm/build-vm-legacy.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, bash, unzip, glibc, openssl, gcc, mesa, freetype, xorg, alsaLib, cairo, libuuid, makeWrapper, ... }: +{ stdenv, fetchurl, cmake, bash, unzip, glibc, openssl, gcc, libGLU_combined, freetype, xorg, alsaLib, cairo, libuuid, makeWrapper, ... }: { name, src, ... }: @@ -47,9 +47,9 @@ stdenv.mkDerivation rec { ln -s "${pharo-share}/lib/"*.sources $prefix/lib/$name ''; - LD_LIBRARY_PATH = stdenv.lib.makeLibraryPath [ cairo mesa freetype openssl libuuid alsaLib xorg.libICE xorg.libSM ]; + LD_LIBRARY_PATH = stdenv.lib.makeLibraryPath [ cairo libGLU_combined freetype openssl libuuid alsaLib xorg.libICE xorg.libSM ]; nativeBuildInputs = [ unzip cmake gcc makeWrapper ]; - buildInputs = [ bash glibc openssl mesa freetype xorg.libX11 xorg.libICE xorg.libSM alsaLib cairo pharo-share ]; + buildInputs = [ bash glibc openssl libGLU_combined freetype xorg.libX11 xorg.libICE xorg.libSM alsaLib cairo pharo-share ]; meta = { description = "Clean and innovative Smalltalk-inspired environment"; diff --git a/pkgs/development/pharo/vm/build-vm.nix b/pkgs/development/pharo/vm/build-vm.nix index b72b1851024a..82b3da7a37c4 100644 --- a/pkgs/development/pharo/vm/build-vm.nix +++ b/pkgs/development/pharo/vm/build-vm.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, bash, unzip, glibc, openssl, gcc, mesa, freetype, xorg, alsaLib, cairo, libuuid, autoreconfHook, gcc48, ... }: +{ stdenv, fetchurl, bash, unzip, glibc, openssl, gcc, libGLU_combined, freetype, xorg, alsaLib, cairo, libuuid, autoreconfHook, gcc48, ... }: { name, src, version, source-date, source-url, ... }: @@ -83,7 +83,7 @@ stdenv.mkDerivation rec { mkdir -p "$out/bin" # Note: include ELF rpath in LD_LIBRARY_PATH for finding libc. - libs=$out:$(patchelf --print-rpath "$out/pharo"):${cairo}/lib:${mesa}/lib:${freetype}/lib:${openssl}/lib:${libuuid}/lib:${alsaLib}/lib:${xorg.libICE}/lib:${xorg.libSM}/lib + libs=$out:$(patchelf --print-rpath "$out/pharo"):${cairo}/lib:${libGLU_combined}/lib:${freetype}/lib:${openssl}/lib:${libuuid}/lib:${alsaLib}/lib:${xorg.libICE}/lib:${xorg.libSM}/lib # Create the script cat > "$out/bin/${cmd}" < $out/bin/minecraft << EOF #!${stdenv.shell} - export LD_LIBRARY_PATH=\$LD_LIBRARY_PATH:${makeLibraryPath [ libX11 libXext libXcursor libXrandr libXxf86vm mesa openal ]} + export LD_LIBRARY_PATH=\$LD_LIBRARY_PATH:${makeLibraryPath [ libX11 libXext libXcursor libXrandr libXxf86vm libGLU_combined openal ]} ${if useAlsa then "${alsaOss}/bin/aoss" else "" } \ ${jre}/bin/java -jar $out/minecraft.jar EOF diff --git a/pkgs/games/minetest/default.nix b/pkgs/games/minetest/default.nix index 49750997a904..fee8919bb236 100644 --- a/pkgs/games/minetest/default.nix +++ b/pkgs/games/minetest/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, cmake, irrlicht, libpng, bzip2, curl, libogg, jsoncpp -, libjpeg, libXxf86vm, mesa, openal, libvorbis, xlibsWrapper, sqlite, luajit +, libjpeg, libXxf86vm, libGLU_combined, openal, libvorbis, xlibsWrapper, sqlite, luajit , freetype, gettext, doxygen, ncurses, leveldb }: @@ -36,7 +36,7 @@ in stdenv.mkDerivation { NIX_CFLAGS_COMPILE = [ "-DluaL_reg=luaL_Reg" ]; # needed since luajit-2.1.0-beta3 buildInputs = [ - cmake irrlicht libpng bzip2 libjpeg curl libogg jsoncpp libXxf86vm mesa + cmake irrlicht libpng bzip2 libjpeg curl libogg jsoncpp libXxf86vm libGLU_combined openal libvorbis xlibsWrapper sqlite luajit freetype gettext doxygen ncurses leveldb ]; diff --git a/pkgs/games/naev/default.nix b/pkgs/games/naev/default.nix index 3fd20e6221e6..d8a4e32faaab 100644 --- a/pkgs/games/naev/default.nix +++ b/pkgs/games/naev/default.nix @@ -1,5 +1,5 @@ { fetchurl, stdenv, SDL, openal, SDL_mixer, libxml2, pkgconfig, libvorbis -, libpng, mesa, makeWrapper, zlib, freetype }: +, libpng, libGLU_combined, makeWrapper, zlib, freetype }: let pname = "naev"; @@ -19,7 +19,7 @@ stdenv.mkDerivation { sha256 = "0gahi91lmpra0wvxsz49zwwb28q9w2v1s3y7r70252hq6v80kanb"; }; - buildInputs = [ SDL SDL_mixer openal libxml2 libvorbis libpng mesa zlib freetype ]; + buildInputs = [ SDL SDL_mixer openal libxml2 libvorbis libpng libGLU_combined zlib freetype ]; nativeBuildInputs = [ pkgconfig makeWrapper ]; diff --git a/pkgs/games/newtonwars/default.nix b/pkgs/games/newtonwars/default.nix index 7bbc797b4f16..0fe9d1ee0f57 100644 --- a/pkgs/games/newtonwars/default.nix +++ b/pkgs/games/newtonwars/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, makeWrapper, freeglut, mesa }: +{ stdenv, fetchFromGitHub, makeWrapper, freeglut, libGLU_combined }: stdenv.mkDerivation rec { name = "newtonwars-${version}"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0g63fwfcdxxlnqlagj1fb8ngm385gmv8f7p8b4r1z5cny2znxdvs"; }; - buildInputs = [ makeWrapper freeglut mesa ]; + buildInputs = [ makeWrapper freeglut libGLU_combined ]; patchPhase = '' sed -i "s;font24.raw;$out/share/font24.raw;g" display.c @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { wrapProgram $out/bin/nw \ --prefix LD_LIBRARY_PATH ":" ${freeglut}/lib \ - --prefix LD_LIBRARY_PATH ":" ${mesa}/lib + --prefix LD_LIBRARY_PATH ":" ${libGLU_combined}/lib ''; meta = with stdenv.lib; { diff --git a/pkgs/games/nexuiz/default.nix b/pkgs/games/nexuiz/default.nix index bde567a19033..39b3ae36f506 100644 --- a/pkgs/games/nexuiz/default.nix +++ b/pkgs/games/nexuiz/default.nix @@ -3,7 +3,7 @@ unzip, zlib, curl, libjpeg, libpng, libvorbis, libtheora , libogg, libmodplug , # glx - libX11, mesa, libXpm, libXext, libXxf86vm, libXxf86dga, alsaLib + libX11, libGLU_combined, libXpm, libXext, libXxf86vm, libXxf86dga, alsaLib , # sdl SDL }: @@ -24,7 +24,7 @@ in stdenv.mkDerivation { # required for both unzip # glx - libX11 mesa libXpm libXext libXxf86vm libXxf86dga alsaLib + libX11 libGLU_combined libXpm libXext libXxf86vm libXxf86dga alsaLib # sdl SDL ]; diff --git a/pkgs/games/openrw/default.nix b/pkgs/games/openrw/default.nix index 6dd098ee7b8e..5a8a8d244bf6 100644 --- a/pkgs/games/openrw/default.nix +++ b/pkgs/games/openrw/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, cmake, sfml, mesa, bullet, glm, libmad, x11, openal +{ stdenv, fetchgit, cmake, sfml, libGLU_combined, bullet, glm, libmad, x11, openal , SDL2, boost, ffmpeg }: stdenv.mkDerivation rec { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ - cmake sfml mesa bullet glm libmad x11 openal SDL2 boost ffmpeg + cmake sfml libGLU_combined bullet glm libmad x11 openal SDL2 boost ffmpeg ]; meta = with stdenv.lib; { diff --git a/pkgs/games/openxcom/default.nix b/pkgs/games/openxcom/default.nix index bf451af9ad73..30470e98c58d 100644 --- a/pkgs/games/openxcom/default.nix +++ b/pkgs/games/openxcom/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchFromGitHub, fetchpatch, cmake, mesa, zlib, openssl, libyamlcpp, boost +{stdenv, fetchFromGitHub, fetchpatch, cmake, libGLU_combined, zlib, openssl, libyamlcpp, boost , SDL, SDL_image, SDL_mixer, SDL_gfx }: let version = "1.0.0.2018.01.28"; in @@ -12,7 +12,7 @@ stdenv.mkDerivation { }; nativeBuildInputs = [ cmake ]; - buildInputs = [ SDL SDL_gfx SDL_image SDL_mixer boost libyamlcpp mesa openssl zlib ]; + buildInputs = [ SDL SDL_gfx SDL_image SDL_mixer boost libyamlcpp libGLU_combined openssl zlib ]; meta = { description = "Open source clone of UFO: Enemy Unknown"; diff --git a/pkgs/games/pingus/default.nix b/pkgs/games/pingus/default.nix index 9704cb93e6b4..68257fc9e9e4 100644 --- a/pkgs/games/pingus/default.nix +++ b/pkgs/games/pingus/default.nix @@ -1,5 +1,5 @@ {stdenv, fetchurl, scons, SDL, SDL_image, boost, libpng, SDL_mixer, pkgconfig -, mesa}: +, libGLU_combined}: let s = # Generated upstream information rec { @@ -14,7 +14,7 @@ in stdenv.mkDerivation rec { inherit (s) name version; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [scons SDL SDL_image boost libpng SDL_mixer mesa]; + buildInputs = [scons SDL SDL_image boost libpng SDL_mixer libGLU_combined]; src = fetchurl { inherit (s) url sha256; }; diff --git a/pkgs/games/pioneer/default.nix b/pkgs/games/pioneer/default.nix index c0053088db76..e6989908c65f 100644 --- a/pkgs/games/pioneer/default.nix +++ b/pkgs/games/pioneer/default.nix @@ -1,5 +1,5 @@ { fetchFromGitHub, stdenv, autoconf, automake, pkgconfig -, curl, libsigcxx, SDL2, SDL2_image, freetype, libvorbis, libpng, assimp, mesa +, curl, libsigcxx, SDL2, SDL2_image, freetype, libvorbis, libpng, assimp, libGLU_combined }: stdenv.mkDerivation rec { @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoconf automake pkgconfig ]; - buildInputs = [ curl libsigcxx SDL2 SDL2_image freetype libvorbis libpng assimp mesa ]; + buildInputs = [ curl libsigcxx SDL2 SDL2_image freetype libvorbis libpng assimp libGLU_combined ]; NIX_CFLAGS_COMPILE = [ "-I${SDL2}/include/SDL2" diff --git a/pkgs/games/prboom/default.nix b/pkgs/games/prboom/default.nix index 95ad53cb1ae3..4babc1caea5a 100644 --- a/pkgs/games/prboom/default.nix +++ b/pkgs/games/prboom/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, SDL, SDL_mixer, SDL_net, mesa}: +{stdenv, fetchurl, SDL, SDL_mixer, SDL_net, libGLU_combined}: stdenv.mkDerivation { name = "prboom-2.5.0"; @@ -7,7 +7,7 @@ stdenv.mkDerivation { sha256 = "1bjb04q8dk232956k30qlpq6q0hxb904yh1nflr87jcc1x3iqv12"; }; - buildInputs = [ SDL SDL_mixer SDL_net mesa ]; + buildInputs = [ SDL SDL_mixer SDL_net libGLU_combined ]; crossAttrs = { propagatedBuildInputs = [ SDL.crossDrv SDL_mixer.crossDrv SDL_net.crossDrv ]; configureFlags = "--disable-gl --disable-cpu-opt --without-x --disable-sdltest diff --git a/pkgs/games/privateer/default.nix b/pkgs/games/privateer/default.nix index e3116ae6e9da..f6f3e6001825 100644 --- a/pkgs/games/privateer/default.nix +++ b/pkgs/games/privateer/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchsvn, boost, cmake, ffmpeg, freeglut, glib, gtk2, libjpeg, libpng, libpthreadstubs, libvorbis, libXau, libXdmcp, - libXmu, mesa, openal, pixman, pkgconfig, python27, SDL }: + libXmu, libGLU_combined, openal, pixman, pkgconfig, python27, SDL }: stdenv.mkDerivation { name = "privateer-1.03"; @@ -14,7 +14,7 @@ stdenv.mkDerivation { buildInputs = [ boost cmake ffmpeg freeglut glib gtk2 libjpeg libpng - libpthreadstubs libvorbis libXau libXdmcp libXmu mesa openal + libpthreadstubs libvorbis libXau libXdmcp libXmu libGLU_combined openal pixman pkgconfig python27 SDL ]; patches = [ ./0001-fix-VSFile-constructor.patch ]; diff --git a/pkgs/games/quake3/ioquake/default.nix b/pkgs/games/quake3/ioquake/default.nix index d94a1f9a8d4d..70e330fa1ce4 100644 --- a/pkgs/games/quake3/ioquake/default.nix +++ b/pkgs/games/quake3/ioquake/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, which, pkgconfig, xlibsWrapper, SDL2, mesa, openalSoft +{ lib, stdenv, fetchFromGitHub, which, pkgconfig, xlibsWrapper, SDL2, libGLU_combined, openalSoft , curl, speex, opusfile, libogg, libopus, libjpeg, mumble, freetype }: @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ which pkgconfig ]; - buildInputs = [ xlibsWrapper SDL2 mesa openalSoft curl speex opusfile libogg libopus libjpeg freetype mumble ]; + buildInputs = [ xlibsWrapper SDL2 libGLU_combined openalSoft curl speex opusfile libogg libopus libjpeg freetype mumble ]; enableParallelBuilding = true; diff --git a/pkgs/games/residualvm/default.nix b/pkgs/games/residualvm/default.nix index d916ff0d3444..d0f1d500eaf5 100644 --- a/pkgs/games/residualvm/default.nix +++ b/pkgs/games/residualvm/default.nix @@ -1,8 +1,8 @@ { stdenv, fetchurl, SDL, zlib, libmpeg2, libmad, libogg, libvorbis, flac, alsaLib -, openglSupport ? false, mesa ? null +, openglSupport ? false, libGLU_combined ? null }: -assert openglSupport -> mesa != null; +assert openglSupport -> libGLU_combined != null; with stdenv.lib; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ stdenv SDL zlib libmpeg2 libmad libogg libvorbis flac alsaLib ] - ++ optional openglSupport mesa; + ++ optional openglSupport libGLU_combined; configureFlags = [ "--enable-all-engines" ]; diff --git a/pkgs/games/rigsofrods/default.nix b/pkgs/games/rigsofrods/default.nix index 0d0602524e79..a038957f701e 100644 --- a/pkgs/games/rigsofrods/default.nix +++ b/pkgs/games/rigsofrods/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, fetchFromGitHub, stdenv, wxGTK30, freeimage, cmake, zziplib, mesa, boost, +{ fetchurl, fetchFromGitHub, stdenv, wxGTK30, freeimage, cmake, zziplib, libGLU_combined, boost, pkgconfig, libuuid, openal, ogre, ois, curl, gtk2, pixman, mygui, unzip, angelscript, ogrepaged, mysocketw, libxcb }: @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { ''; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ wxGTK30 freeimage cmake zziplib mesa boost + buildInputs = [ wxGTK30 freeimage cmake zziplib libGLU_combined boost libuuid openal ogre ois curl gtk2 mygui unzip angelscript ogrepaged mysocketw libxcb ]; diff --git a/pkgs/games/sauerbraten/default.nix b/pkgs/games/sauerbraten/default.nix index 61a9310ae212..f48736a56d60 100644 --- a/pkgs/games/sauerbraten/default.nix +++ b/pkgs/games/sauerbraten/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchsvn, mesa, SDL, SDL_image, SDL_mixer +{ stdenv, fetchsvn, libGLU_combined, SDL, SDL_image, SDL_mixer , libpng, zlib, libjpeg, imagemagick, libX11 }: @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ - mesa SDL SDL_image SDL_mixer libpng zlib libjpeg imagemagick + libGLU_combined SDL SDL_image SDL_mixer libpng zlib libjpeg imagemagick libX11 ]; diff --git a/pkgs/games/scorched3d/default.nix b/pkgs/games/scorched3d/default.nix index 0c2952696e2c..430b22c9ba97 100644 --- a/pkgs/games/scorched3d/default.nix +++ b/pkgs/games/scorched3d/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, mesa, glew, pkgconfig, openalSoft, freealut, wxGTK, libogg +{ stdenv, fetchurl, libGLU_combined, glew, pkgconfig, openalSoft, freealut, wxGTK, libogg , freetype, libvorbis, fftwSinglePrec, SDL, SDL_net, expat, libjpeg, libpng }: stdenv.mkDerivation rec { @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; buildInputs = - [ mesa glew openalSoft freealut wxGTK libogg freetype libvorbis + [ libGLU_combined glew openalSoft freealut wxGTK libogg freetype libvorbis SDL SDL_net expat libjpeg libpng fftwSinglePrec ]; diff --git a/pkgs/games/scummvm/default.nix b/pkgs/games/scummvm/default.nix index 29b44f9d8576..fcde5b5ea59f 100644 --- a/pkgs/games/scummvm/default.nix +++ b/pkgs/games/scummvm/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, nasm -, alsaLib, flac, fluidsynth, freetype, libjpeg, libmad, libmpeg2, libogg, libvorbis, mesa, SDL2, zlib +, alsaLib, flac, fluidsynth, freetype, libjpeg, libmad, libmpeg2, libogg, libvorbis, libGLU_combined, SDL2, zlib , hostPlatform }: @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ nasm ]; buildInputs = [ - alsaLib freetype flac fluidsynth libjpeg libmad libmpeg2 libogg libvorbis mesa SDL2 zlib + alsaLib freetype flac fluidsynth libjpeg libmad libmpeg2 libogg libvorbis libGLU_combined SDL2 zlib ]; enableParallelBuilding = true; diff --git a/pkgs/games/soi/default.nix b/pkgs/games/soi/default.nix index 96a38a10c6c8..8d102e98433b 100644 --- a/pkgs/games/soi/default.nix +++ b/pkgs/games/soi/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, cmake -, boost, eigen2, lua, luabind, mesa, SDL }: +, boost, eigen2, lua, luabind, libGLU_combined, SDL }: stdenv.mkDerivation rec { name = "soi-${version}"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ cmake ]; - buildInputs = [ boost lua luabind mesa SDL ]; + buildInputs = [ boost lua luabind libGLU_combined SDL ]; cmakeFlags = [ "-DEIGEN_INCLUDE_DIR=${eigen2}/include/eigen2" diff --git a/pkgs/games/space-orbit/default.nix b/pkgs/games/space-orbit/default.nix index e41ecf16136f..162db9672699 100644 --- a/pkgs/games/space-orbit/default.nix +++ b/pkgs/games/space-orbit/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl -, mesa, libXi, libXt, libXext, libX11, libXmu, freeglut +, libGLU_combined, libXi, libXt, libXext, libX11, libXmu, freeglut }: stdenv.mkDerivation rec { @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { version = "1.01"; patchversion = "9"; - buildInputs = [ mesa libXi libXt libXext libX11 libXmu freeglut ]; + buildInputs = [ libGLU_combined libXi libXt libXext libX11 libXmu freeglut ]; src = fetchurl { url = "mirror://debian/pool/main/s/space-orbit/space-orbit_${version}.orig.tar.gz"; diff --git a/pkgs/games/speed-dreams/default.nix b/pkgs/games/speed-dreams/default.nix index cb7a345900af..10ce55f4e217 100644 --- a/pkgs/games/speed-dreams/default.nix +++ b/pkgs/games/speed-dreams/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, mesa, freeglut, libX11, plib, openal, freealut, libXrandr, xproto, +{ fetchurl, stdenv, libGLU_combined, freeglut, libX11, plib, openal, freealut, libXrandr, xproto, libXext, libSM, libICE, libXi, libXt, libXrender, libXxf86vm, openscenegraph, expat, libpng, zlib, bash, SDL2, enet, libjpeg, cmake, pkgconfig, libvorbis}: @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig cmake ]; - buildInputs = [ libpng mesa freeglut libX11 plib openal freealut libXrandr xproto + buildInputs = [ libpng libGLU_combined freeglut libX11 plib openal freealut libXrandr xproto libXext libSM libICE libXi libXt libXrender libXxf86vm zlib bash expat SDL2 enet libjpeg openscenegraph libvorbis ]; diff --git a/pkgs/games/spring/default.nix b/pkgs/games/spring/default.nix index 40e97567d394..3bb69359f162 100644 --- a/pkgs/games/spring/default.nix +++ b/pkgs/games/spring/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, cmake, lzma, boost, libdevil, zlib, p7zip -, openal, libvorbis, glew, freetype, xorg, SDL2, mesa, binutils +, openal, libvorbis, glew, freetype, xorg, SDL2, libGLU_combined, binutils , asciidoc, libxslt, docbook_xsl, docbook_xsl_ns, curl, makeWrapper , jdk ? null, python ? null, systemd, libunwind, glibc, which, minizip , withAI ? true # support for AI Interfaces and Skirmish AIs @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { "-DPREFER_STATIC_LIBS:BOOL=OFF"]; buildInputs = [ cmake lzma boost libdevil zlib p7zip openal libvorbis freetype SDL2 - xorg.libX11 xorg.libXcursor mesa glew asciidoc libxslt docbook_xsl curl makeWrapper + xorg.libX11 xorg.libXcursor libGLU_combined glew asciidoc libxslt docbook_xsl curl makeWrapper docbook_xsl_ns systemd libunwind glibc.dev glibc.static which minizip ] ++ stdenv.lib.optional withAI jdk ++ stdenv.lib.optional withAI python; diff --git a/pkgs/games/stardust/default.nix b/pkgs/games/stardust/default.nix index 74d9bdcb35dc..5130db6cb3c8 100644 --- a/pkgs/games/stardust/default.nix +++ b/pkgs/games/stardust/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, zlib, libtiff, libxml2, SDL, xproto, libX11 -, libXi, inputproto, libXmu, libXext, xextproto, mesa }: +, libXi, inputproto, libXmu, libXext, xextproto, libGLU_combined }: stdenv.mkDerivation rec { name = "stardust-${version}"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { buildInputs = [ zlib libtiff libxml2 SDL xproto libX11 libXi inputproto - libXmu libXext xextproto mesa + libXmu libXext xextproto libGLU_combined ]; installFlags = [ "bindir=\${out}/bin" ]; diff --git a/pkgs/games/super-tux-kart/default.nix b/pkgs/games/super-tux-kart/default.nix index df5d7e7b4fa8..a7b82b8913f5 100644 --- a/pkgs/games/super-tux-kart/default.nix +++ b/pkgs/games/super-tux-kart/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, fetchsvn, cmake, pkgconfig -, openal, freealut, mesa, libvorbis, libogg, gettext, curl, freetype +, openal, freealut, libGLU_combined, libvorbis, libogg, gettext, curl, freetype , fribidi, libtool, bluez, libjpeg, libpng, zlib, libX11, libXrandr }: let @@ -30,7 +30,7 @@ in stdenv.mkDerivation rec { buildInputs = [ libX11 libXrandr - openal freealut mesa libvorbis libogg zlib freetype + openal freealut libGLU_combined libvorbis libogg zlib freetype curl fribidi bluez libjpeg libpng ]; diff --git a/pkgs/games/supertux/default.nix b/pkgs/games/supertux/default.nix index bb297c1af4ee..cf6ba4648687 100644 --- a/pkgs/games/supertux/default.nix +++ b/pkgs/games/supertux/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, cmake, pkgconfig, SDL2, SDL2_image , curl -, libogg, libvorbis, mesa, openal, boost, glew +, libogg, libvorbis, libGLU_combined, openal, boost, glew }: stdenv.mkDerivation rec { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig cmake ]; - buildInputs = [ SDL2 SDL2_image curl libogg libvorbis mesa openal boost glew ]; + buildInputs = [ SDL2 SDL2_image curl libogg libvorbis libGLU_combined openal boost glew ]; cmakeFlags = [ "-DENABLE_BOOST_STATIC_LIBS=OFF" ]; diff --git a/pkgs/games/tibia/default.nix b/pkgs/games/tibia/default.nix index 3594a04f03bf..e5bb211eb227 100644 --- a/pkgs/games/tibia/default.nix +++ b/pkgs/games/tibia/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, patchelf, glibc, libX11, mesa }: +{ stdenv, fetchurl, patchelf, glibc, libX11, libGLU_combined }: with stdenv.lib; assert stdenv.isi686; @@ -25,7 +25,7 @@ stdenv.mkDerivation { cp -r * $out/res patchelf --set-interpreter ${glibc.out}/lib/ld-linux.so.2 \ - --set-rpath ${stdenv.lib.makeLibraryPath [ stdenv.cc.cc libX11 mesa ]} \ + --set-rpath ${stdenv.lib.makeLibraryPath [ stdenv.cc.cc libX11 libGLU_combined ]} \ "$out/res/Tibia" # We've patchelf'd the files. The main ‘Tibia’ binary is a bit diff --git a/pkgs/games/trackballs/default.nix b/pkgs/games/trackballs/default.nix index 50ffb693f70b..19be3f64045d 100644 --- a/pkgs/games/trackballs/default.nix +++ b/pkgs/games/trackballs/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, cmake, SDL2, SDL2_ttf, gettext, zlib, SDL2_mixer, SDL2_image, guile, mesa }: +{ stdenv, fetchFromGitHub, cmake, SDL2, SDL2_ttf, gettext, zlib, SDL2_mixer, SDL2_image, guile, libGLU_combined }: with stdenv.lib; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "0y5y8xzfsjd0rxl5wnxdq7m9n97s5xvcqyjsckz4qxrjcc3lk297"; }; - buildInputs = [ cmake zlib SDL2 SDL2_ttf SDL2_mixer SDL2_image guile gettext mesa ]; + buildInputs = [ cmake zlib SDL2 SDL2_ttf SDL2_mixer SDL2_image guile gettext libGLU_combined ]; meta = { homepage = https://trackballs.github.io/; diff --git a/pkgs/games/tremulous/default.nix b/pkgs/games/tremulous/default.nix index f62a9976fe3e..ce30be7be0b9 100644 --- a/pkgs/games/tremulous/default.nix +++ b/pkgs/games/tremulous/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip, mesa, libX11, SDL, openal }: +{ stdenv, fetchurl, unzip, libGLU_combined, libX11, SDL, openal }: stdenv.mkDerivation rec { name = "tremulous-${version}"; version = "1.1.0"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { url = "http://releases.mercenariesguild.net/tremded/mg_tremded_source_1.01.tar.gz"; sha256 = "1njrqlhzjvy9myddzkagszwdcf3m4h08wip888w2rmbshs6kz6ql"; }; - buildInputs = [ unzip mesa libX11 SDL openal ]; + buildInputs = [ unzip libGLU_combined libX11 SDL openal ]; unpackPhase = '' unzip $src1 cd tremulous diff --git a/pkgs/games/trigger/default.nix b/pkgs/games/trigger/default.nix index df005af39e57..fc6a45ace57b 100644 --- a/pkgs/games/trigger/default.nix +++ b/pkgs/games/trigger/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, SDL2, freealut, SDL2_image, openal, physfs, zlib, mesa, glew }: +{ fetchurl, stdenv, SDL2, freealut, SDL2_image, openal, physfs, zlib, libGLU_combined, glew }: stdenv.mkDerivation rec { name = "trigger-rally-0.6.5"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "095s4sx0s1ijlarkh84rvzlv4nxh9llrsal1lb3m3pf0v228gnzj"; }; - buildInputs = [ SDL2 freealut SDL2_image openal physfs zlib mesa glew ]; + buildInputs = [ SDL2 freealut SDL2_image openal physfs zlib libGLU_combined glew ]; preConfigure = '' sed s,/usr/local,$out, -i bin/*defs diff --git a/pkgs/games/ufoai/default.nix b/pkgs/games/ufoai/default.nix index 0d909e1c43c1..f699a6a05c62 100644 --- a/pkgs/games/ufoai/default.nix +++ b/pkgs/games/ufoai/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libtheora, xvidcore, mesa, SDL, SDL_ttf, SDL_mixer +{ stdenv, fetchurl, libtheora, xvidcore, libGLU_combined, SDL, SDL_ttf, SDL_mixer , curl, libjpeg, libpng, gettext, cunit, enableEditor?false }: stdenv.mkDerivation rec { @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { ++ stdenv.lib.optional enableEditor "--enable-uforadiant"; buildInputs = [ - libtheora xvidcore mesa SDL SDL_ttf SDL_mixer + libtheora xvidcore libGLU_combined SDL SDL_ttf SDL_mixer curl libjpeg libpng gettext cunit ]; diff --git a/pkgs/games/ultimatestunts/default.nix b/pkgs/games/ultimatestunts/default.nix index ce0fc3f6c90f..63da46854857 100644 --- a/pkgs/games/ultimatestunts/default.nix +++ b/pkgs/games/ultimatestunts/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, SDL, mesa, SDL_image, freealut, openal, libvorbis, +{stdenv, fetchurl, SDL, libGLU_combined, SDL_image, freealut, openal, libvorbis, pkgconfig}: stdenv.mkDerivation rec { @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ SDL mesa SDL_image freealut openal libvorbis ]; + buildInputs = [ SDL libGLU_combined SDL_image freealut openal libvorbis ]; postPatch = '' sed -e '1i#include ' -i $(find . -name '*.c' -o -name '*.cpp') diff --git a/pkgs/games/ultrastardx/default.nix b/pkgs/games/ultrastardx/default.nix index 67991987c311..2e9b3cf8d8ca 100644 --- a/pkgs/games/ultrastardx/default.nix +++ b/pkgs/games/ultrastardx/default.nix @@ -1,13 +1,13 @@ { stdenv, autoreconfHook, fetchFromGitHub, pkgconfig , lua, fpc, pcre, portaudio, freetype, libpng , SDL2, SDL2_image, SDL2_gfx, SDL2_mixer, SDL2_net, SDL2_ttf -, ffmpeg, sqlite, zlib, libX11, mesa }: +, ffmpeg, sqlite, zlib, libX11, libGLU_combined }: let sharedLibs = [ pcre portaudio freetype SDL2 SDL2_image SDL2_gfx SDL2_mixer SDL2_net SDL2_ttf - sqlite lua zlib libX11 mesa ffmpeg + sqlite lua zlib libX11 libGLU_combined ffmpeg ]; in stdenv.mkDerivation rec { diff --git a/pkgs/games/unvanquished/default.nix b/pkgs/games/unvanquished/default.nix index af50759fd2fe..5ea84b9ef41f 100644 --- a/pkgs/games/unvanquished/default.nix +++ b/pkgs/games/unvanquished/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, mesa, SDL, libjpeg, libpng, glew, libwebp, ncurses +{ stdenv, fetchurl, cmake, libGLU_combined, SDL, libjpeg, libpng, glew, libwebp, ncurses , gmp, curl, nettle, openal, speex, libogg, libvorbis, libtheora, xvidcore , makeWrapper }: stdenv.mkDerivation rec { @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { url = "https://github.com/Unvanquished/Unvanquished/archive/v${version}.tar.gz"; sha256 = "1k7mlpwalimn6xb2s760f124xncpg455qvls6z3x0ii5x0wc1mp2"; }; - buildInputs = [ cmake mesa SDL libjpeg libpng glew libwebp ncurses gmp curl + buildInputs = [ cmake libGLU_combined SDL libjpeg libpng glew libwebp ncurses gmp curl nettle openal speex libogg libvorbis libtheora xvidcore makeWrapper ]; preConfigure = ''prefix="$prefix/opt"''; diff --git a/pkgs/games/uqm/default.nix b/pkgs/games/uqm/default.nix index d8dcdf6b7b60..dd60c0efb599 100644 --- a/pkgs/games/uqm/default.nix +++ b/pkgs/games/uqm/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, pkgconfig, mesa +{ stdenv, lib, fetchurl, pkgconfig, libGLU_combined , SDL, SDL_image, libpng, zlib, libvorbis, libogg, libmikmod , use3DOVideos ? false, requireFile ? null, writeText ? null @@ -51,7 +51,7 @@ in stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ SDL SDL_image libpng libvorbis libogg libmikmod mesa ]; + buildInputs = [ SDL SDL_image libpng libvorbis libogg libmikmod libGLU_combined ]; postUnpack = '' mkdir -p uqm-${version}/content/packages diff --git a/pkgs/games/urbanterror/default.nix b/pkgs/games/urbanterror/default.nix index bc293a881079..ceea9b3e158b 100644 --- a/pkgs/games/urbanterror/default.nix +++ b/pkgs/games/urbanterror/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip, SDL, mesa, openal, curl, libXxf86vm }: +{ stdenv, fetchurl, unzip, SDL, libGLU_combined, openal, curl, libXxf86vm }: stdenv.mkDerivation rec { name = "urbanterror-${version}"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { }) ]; - buildInputs = [ unzip SDL mesa openal curl libXxf86vm ]; + buildInputs = [ unzip SDL libGLU_combined openal curl libXxf86vm ]; sourceRoot = "ioq3-for-UrbanTerror-4-release-${version}"; configurePhase = '' @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { postFixup = '' p=$out/opt/urbanterror/Quake3-UrT cur_rpath=$(patchelf --print-rpath $p) - patchelf --set-rpath $cur_rpath:${mesa}/lib $p + patchelf --set-rpath $cur_rpath:${libGLU_combined}/lib $p ''; hardeningDisable = [ "format" ]; diff --git a/pkgs/games/vdrift/default.nix b/pkgs/games/vdrift/default.nix index 81b95ddb9e1c..ce20d1b3f177 100644 --- a/pkgs/games/vdrift/default.nix +++ b/pkgs/games/vdrift/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, fetchsvn, pkgconfig, scons, mesa, SDL2, SDL2_image +{ stdenv, fetchFromGitHub, fetchsvn, pkgconfig, scons, libGLU_combined, SDL2, SDL2_image , libvorbis, bullet, curl, gettext, writeTextFile, writeShellScriptBin , data ? fetchsvn { @@ -20,7 +20,7 @@ let }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ scons mesa SDL2 SDL2_image libvorbis bullet curl gettext ]; + buildInputs = [ scons libGLU_combined SDL2 SDL2_image libvorbis bullet curl gettext ]; patches = [ ./0001-Ignore-missing-data-for-installation.patch ]; diff --git a/pkgs/games/voxelands/default.nix b/pkgs/games/voxelands/default.nix index c3ec47273d8f..9990c9108c49 100644 --- a/pkgs/games/voxelands/default.nix +++ b/pkgs/games/voxelands/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, cmake, irrlicht, libpng, bzip2, sqlite -, libjpeg, libXxf86vm, mesa, openal, libvorbis, xlibsWrapper, pkgconfig }: +, libjpeg, libXxf86vm, libGLU_combined, openal, libvorbis, xlibsWrapper, pkgconfig }: stdenv.mkDerivation rec { name = "voxelands-${version}"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { buildInputs = [ cmake irrlicht libpng bzip2 libjpeg sqlite - libXxf86vm mesa openal libvorbis xlibsWrapper pkgconfig + libXxf86vm libGLU_combined openal libvorbis xlibsWrapper pkgconfig ]; meta = with stdenv.lib; { diff --git a/pkgs/games/warsow/default.nix b/pkgs/games/warsow/default.nix index 85246aea2d5f..3e1729e20915 100644 --- a/pkgs/games/warsow/default.nix +++ b/pkgs/games/warsow/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, unzip, pkgconfig, zlib, curl, libjpeg, libpng, libvorbis -, libtheora, libXxf86dga, libXxf86vm, libXinerama, SDL, mesa, openal, freetype +, libtheora, libXxf86dga, libXxf86vm, libXinerama, SDL, libGLU_combined, openal, freetype , makeWrapper }: stdenv.mkDerivation rec { @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { ''; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ unzip zlib curl libjpeg libpng libvorbis libtheora - libXxf86dga libXxf86vm libXinerama SDL mesa openal makeWrapper + libXxf86dga libXxf86vm libXinerama SDL libGLU_combined openal makeWrapper ]; installPhase = '' dest=$out/opt/warsow @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { postFixup = '' p=$out/opt/warsow/warsow.* cur_rpath=$(patchelf --print-rpath $p) - patchelf --set-rpath $cur_rpath:${mesa}/lib $p + patchelf --set-rpath $cur_rpath:${libGLU_combined}/lib $p ''; meta = with stdenv.lib; { description = "Multiplayer FPS game designed for competitive gaming"; diff --git a/pkgs/games/worldofgoo/default.nix b/pkgs/games/worldofgoo/default.nix index ba887d91de19..6cad72a44045 100644 --- a/pkgs/games/worldofgoo/default.nix +++ b/pkgs/games/worldofgoo/default.nix @@ -1,5 +1,5 @@ { stdenv, config, requireFile, fetchurl -, libX11, libXext, libXau, libxcb, libXdmcp , SDL, SDL_mixer, libvorbis, mesa +, libX11, libXext, libXau, libxcb, libXdmcp , SDL, SDL_mixer, libvorbis, libGLU_combined , demo ? false }: # TODO: add i686 support @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { # XXX: stdenv.lib.makeLibraryPath doesn't pick up /lib64 libPath = stdenv.lib.makeLibraryPath [ stdenv.cc.cc stdenv.cc.libc ] - + ":" + stdenv.lib.makeLibraryPath [libX11 libXext libXau libxcb libXdmcp SDL SDL_mixer libvorbis mesa ] + + ":" + stdenv.lib.makeLibraryPath [libX11 libXext libXau libxcb libXdmcp SDL SDL_mixer libvorbis libGLU_combined ] + ":" + stdenv.cc.cc + "/lib64"; installPhase = '' diff --git a/pkgs/games/xmoto/default.nix b/pkgs/games/xmoto/default.nix index 7d4f2e53a941..ea70049c6c44 100644 --- a/pkgs/games/xmoto/default.nix +++ b/pkgs/games/xmoto/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, chipmunk, sqlite, curl, zlib, bzip2, libjpeg -, libpng, freeglut, mesa, SDL, SDL_mixer, SDL_image, SDL_net +, libpng, freeglut, libGLU_combined, SDL, SDL_mixer, SDL_image, SDL_net , SDL_ttf, lua5, ode, libxdg_basedir, libxml2 }: stdenv.mkDerivation rec { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { buildInputs = [ chipmunk sqlite curl zlib bzip2 libjpeg libpng - freeglut mesa SDL SDL_mixer SDL_image SDL_net SDL_ttf + freeglut libGLU_combined SDL SDL_mixer SDL_image SDL_net SDL_ttf lua5 ode libxdg_basedir libxml2 ]; diff --git a/pkgs/games/xonotic/default.nix b/pkgs/games/xonotic/default.nix index 531560fd309e..7fd5612bf886 100644 --- a/pkgs/games/xonotic/default.nix +++ b/pkgs/games/xonotic/default.nix @@ -2,7 +2,7 @@ , # required for both unzip, libjpeg, zlib, libvorbis, curl, patchelf , # glx - libX11, mesa, libXpm, libXext, libXxf86vm, alsaLib + libX11, libGLU_combined, libXpm, libXext, libXxf86vm, alsaLib , # sdl SDL2 }: @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { # required for both unzip libjpeg # glx - libX11 mesa libXpm libXext libXxf86vm alsaLib + libX11 libGLU_combined libXpm libXext libXxf86vm alsaLib # sdl SDL2 zlib libvorbis curl diff --git a/pkgs/games/xpilot/bloodspilot-client.nix b/pkgs/games/xpilot/bloodspilot-client.nix index 90c1ad6f8ebc..cd927a820aaa 100644 --- a/pkgs/games/xpilot/bloodspilot-client.nix +++ b/pkgs/games/xpilot/bloodspilot-client.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libX11, SDL, mesa, expat, zlib, SDL_ttf, SDL_image }: +{ stdenv, fetchurl, libX11, SDL, libGLU_combined, expat, zlib, SDL_ttf, SDL_image }: stdenv.mkDerivation rec { version = "1.5.0"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ - libX11 SDL SDL_ttf SDL_image mesa expat zlib + libX11 SDL SDL_ttf SDL_image libGLU_combined expat zlib ]; NIX_LDFLAGS = [ "-lX11" ]; diff --git a/pkgs/games/xpilot/default.nix b/pkgs/games/xpilot/default.nix index 514dd2f41db4..86412c0fa768 100644 --- a/pkgs/games/xpilot/default.nix +++ b/pkgs/games/xpilot/default.nix @@ -1,7 +1,7 @@ -{stdenv, fetchurl, libX11, libSM, SDL, mesa, expat, SDL_ttf, SDL_image, zlib}: +{stdenv, fetchurl, libX11, libSM, SDL, libGLU_combined, expat, SDL_ttf, SDL_image, zlib}: let buildInputs = [ - libX11 libSM SDL SDL_ttf SDL_image mesa expat zlib + libX11 libSM SDL SDL_ttf SDL_image libGLU_combined expat zlib ]; in stdenv.mkDerivation rec { diff --git a/pkgs/games/zandronum/default.nix b/pkgs/games/zandronum/default.nix index df58304b38d8..377741ef5447 100644 --- a/pkgs/games/zandronum/default.nix +++ b/pkgs/games/zandronum/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchhg, cmake, pkgconfig, makeWrapper, callPackage -, soundfont-fluid, SDL, mesa, glew, bzip2, zlib, libjpeg, fluidsynth, openssl, gtk2, python3 +, soundfont-fluid, SDL, libGLU_combined, glew, bzip2, zlib, libjpeg, fluidsynth, openssl, gtk2, python3 , serverOnly ? false }: @@ -28,7 +28,7 @@ in stdenv.mkDerivation { # I have no idea why would SDL and libjpeg be needed for the server part! # But they are. buildInputs = [ openssl bzip2 zlib SDL libjpeg sqlite ] - ++ lib.optionals (!serverOnly) [ mesa glew fmod fluidsynth gtk2 ]; + ++ lib.optionals (!serverOnly) [ libGLU_combined glew fmod fluidsynth gtk2 ]; nativeBuildInputs = [ cmake pkgconfig makeWrapper python3 ]; diff --git a/pkgs/misc/emulators/atari800/default.nix b/pkgs/misc/emulators/atari800/default.nix index cc5d57ab6f9c..9467345db1c2 100644 --- a/pkgs/misc/emulators/atari800/default.nix +++ b/pkgs/misc/emulators/atari800/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl -, unzip, zlib, SDL, readline, mesa, libX11 }: +, unzip, zlib, SDL, readline, libGLU_combined, libX11 }: with stdenv.lib; stdenv.mkDerivation rec{ @@ -11,7 +11,7 @@ stdenv.mkDerivation rec{ sha256 = "030yz5l1wyq9l0dmiimiiwpzrjr43whycd409xhhpnrdx76046wh"; }; - buildInputs = [ unzip zlib SDL readline mesa libX11 ]; + buildInputs = [ unzip zlib SDL readline libGLU_combined libX11 ]; configureFlags = "--target=default --with-video=sdl --with-sound=sdl --with-readline --with-opengl --with-x --enable-riodevice"; diff --git a/pkgs/misc/emulators/attract-mode/default.nix b/pkgs/misc/emulators/attract-mode/default.nix index 4b8378368a3f..601503dc07ec 100644 --- a/pkgs/misc/emulators/attract-mode/default.nix +++ b/pkgs/misc/emulators/attract-mode/default.nix @@ -1,5 +1,5 @@ { expat, fetchFromGitHub, ffmpeg, fontconfig, freetype, libarchive, libjpeg -, mesa, openal, pkgconfig, sfml, stdenv, zlib +, libGLU_combined, openal, pkgconfig, sfml, stdenv, zlib }: stdenv.mkDerivation rec { @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { ''; buildInputs = [ - expat ffmpeg fontconfig freetype libarchive libjpeg mesa openal sfml zlib + expat ffmpeg fontconfig freetype libarchive libjpeg libGLU_combined openal sfml zlib ]; meta = with stdenv.lib; { diff --git a/pkgs/misc/emulators/dolphin-emu/default.nix b/pkgs/misc/emulators/dolphin-emu/default.nix index 8025cf766f07..01e1847973c7 100644 --- a/pkgs/misc/emulators/dolphin-emu/default.nix +++ b/pkgs/misc/emulators/dolphin-emu/default.nix @@ -1,4 +1,4 @@ -{ stdenv, pkgconfig, cmake, bluez, ffmpeg, libao, gtk2, glib, mesa +{ stdenv, pkgconfig, cmake, bluez, ffmpeg, libao, gtk2, glib, libGLU_combined , gettext, libpthreadstubs, libXrandr, libXext, readline, openal , libXdmcp, portaudio, fetchFromGitHub, libusb, libevdev , wxGTK30, soundtouch, miniupnpc, mbedtls, curl, lzo, sfml @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ cmake bluez ffmpeg libao mesa gtk2 glib + buildInputs = [ cmake bluez ffmpeg libao libGLU_combined gtk2 glib gettext libpthreadstubs libXrandr libXext readline openal libevdev libXdmcp portaudio libusb libpulseaudio libevdev libXdmcp portaudio libusb libpulseaudio diff --git a/pkgs/misc/emulators/dolphin-emu/master.nix b/pkgs/misc/emulators/dolphin-emu/master.nix index c18a63f720dd..e2bac5d3884c 100644 --- a/pkgs/misc/emulators/dolphin-emu/master.nix +++ b/pkgs/misc/emulators/dolphin-emu/master.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, cmake, bluez, ffmpeg, libao, mesa, gtk2, glib +{ stdenv, fetchFromGitHub, pkgconfig, cmake, bluez, ffmpeg, libao, libGLU_combined, gtk2, glib , pcre, gettext, libpthreadstubs, libXrandr, libXext, libSM, readline , openal, libXdmcp, portaudio, libusb, libevdev , libpulseaudio ? null @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkgconfig ]; - buildInputs = [ curl ffmpeg libao mesa gtk2 glib pcre + buildInputs = [ curl ffmpeg libao libGLU_combined gtk2 glib pcre gettext libpthreadstubs libXrandr libXext libSM readline openal libXdmcp portaudio libusb libpulseaudio libpng hidapi ] ++ stdenv.lib.optionals stdenv.isDarwin [ wxGTK CoreBluetooth cf-private ForceFeedback IOKit OpenGL ] diff --git a/pkgs/misc/emulators/dosbox/default.nix b/pkgs/misc/emulators/dosbox/default.nix index 48696f6b3008..57e76a964376 100644 --- a/pkgs/misc/emulators/dosbox/default.nix +++ b/pkgs/misc/emulators/dosbox/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, SDL, makeDesktopItem, mesa }: +{ stdenv, lib, fetchurl, SDL, makeDesktopItem, libGLU_combined }: stdenv.mkDerivation rec { name = "dosbox-0.74"; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; - buildInputs = [ SDL mesa ]; + buildInputs = [ SDL libGLU_combined ]; configureFlags = lib.optional stdenv.isDarwin "--disable-sdltest"; diff --git a/pkgs/misc/emulators/dosbox/unstable.nix b/pkgs/misc/emulators/dosbox/unstable.nix index a17dd6a775ea..86dfd25d175f 100644 --- a/pkgs/misc/emulators/dosbox/unstable.nix +++ b/pkgs/misc/emulators/dosbox/unstable.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchsvn, SDL, SDL_net, SDL_sound, libpng, makeDesktopItem, mesa, autoreconfHook }: +{ stdenv, fetchurl, fetchsvn, SDL, SDL_net, SDL_sound, libpng, makeDesktopItem, libGLU_combined, autoreconfHook }: let revision = "4025"; revisionDate = "2017-07-02"; @@ -15,7 +15,7 @@ in stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; nativeBuildInputs = [ autoreconfHook ]; - buildInputs = [ SDL SDL_net SDL_sound libpng mesa ]; + buildInputs = [ SDL SDL_net SDL_sound libpng libGLU_combined ]; desktopItem = makeDesktopItem { name = "dosbox"; diff --git a/pkgs/misc/emulators/emulationstation/default.nix b/pkgs/misc/emulators/emulationstation/default.nix index b700b22807c4..16cb7af3d600 100644 --- a/pkgs/misc/emulators/emulationstation/default.nix +++ b/pkgs/misc/emulators/emulationstation/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, pkgconfig, cmake, curl, boost, eigen -, freeimage, freetype, mesa, SDL2, alsaLib, libarchive }: +, freeimage, freetype, libGLU_combined, SDL2, alsaLib, libarchive }: stdenv.mkDerivation rec { name = "emulationstation-${version}"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ cmake alsaLib boost curl eigen freeimage freetype libarchive mesa SDL2 ]; + buildInputs = [ cmake alsaLib boost curl eigen freeimage freetype libarchive libGLU_combined SDL2 ]; buildPhase = "cmake . && make"; installPhase = '' diff --git a/pkgs/misc/emulators/fakenes/default.nix b/pkgs/misc/emulators/fakenes/default.nix index 4d698563469e..eb7964cc017d 100644 --- a/pkgs/misc/emulators/fakenes/default.nix +++ b/pkgs/misc/emulators/fakenes/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, allegro, openal, mesa, zlib, hawknl, freeglut, libX11, +{stdenv, fetchurl, allegro, openal, libGLU_combined, zlib, hawknl, freeglut, libX11, libXxf86vm, libXcursor, libXpm }: stdenv.mkDerivation { @@ -8,7 +8,7 @@ stdenv.mkDerivation { sha256 = "026h67s4pzc1vma59pmzk02iy379255qbai2q74wln9bxqcpniy4"; }; - buildInputs = [ allegro openal mesa zlib hawknl freeglut libX11 + buildInputs = [ allegro openal libGLU_combined zlib hawknl freeglut libX11 libXxf86vm libXcursor libXpm ]; hardeningDisable = [ "format" ]; diff --git a/pkgs/misc/emulators/fs-uae/default.nix b/pkgs/misc/emulators/fs-uae/default.nix index 8b2409b74c33..6ba5290fa424 100644 --- a/pkgs/misc/emulators/fs-uae/default.nix +++ b/pkgs/misc/emulators/fs-uae/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig -, gettext, gtk2, SDL2, zlib, glib, openal, mesa, lua, freetype, libmpeg2, zip }: +, gettext, gtk2, SDL2, zlib, glib, openal, libGLU_combined, lua, freetype, libmpeg2, zip }: with stdenv.lib; stdenv.mkDerivation rec { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ gettext gtk2 SDL2 zlib glib openal mesa lua freetype libmpeg2 zip ]; + buildInputs = [ gettext gtk2 SDL2 zlib glib openal libGLU_combined lua freetype libmpeg2 zip ]; meta = { description = "An accurate, customizable Amiga Emulator"; diff --git a/pkgs/misc/emulators/gens-gs/default.nix b/pkgs/misc/emulators/gens-gs/default.nix index 74aa29e84ef8..f5ba2ef218d1 100644 --- a/pkgs/misc/emulators/gens-gs/default.nix +++ b/pkgs/misc/emulators/gens-gs/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, gtk2, SDL, nasm, zlib, libpng, mesa }: +{ stdenv, fetchurl, pkgconfig, gtk2, SDL, nasm, zlib, libpng, libGLU_combined }: stdenv.mkDerivation { name = "gens-gs-7"; @@ -9,7 +9,7 @@ stdenv.mkDerivation { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ gtk2 SDL nasm zlib libpng mesa ]; + buildInputs = [ gtk2 SDL nasm zlib libpng libGLU_combined ]; # Work around build failures on recent GTK+. # See http://ubuntuforums.org/showthread.php?p=10535837 diff --git a/pkgs/misc/emulators/higan/default.nix b/pkgs/misc/emulators/higan/default.nix index 87e619358c8c..7b42e8d60339 100644 --- a/pkgs/misc/emulators/higan/default.nix +++ b/pkgs/misc/emulators/higan/default.nix @@ -2,7 +2,7 @@ , p7zip, pkgconfig , libX11, libXv , udev -, mesa, SDL +, libGLU_combined, SDL , libao, openal, libpulseaudio , gtk2, gtksourceview }: @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { postPatch = "sed '1i#include ' -i higan/fc/ppu/ppu.cpp"; buildInputs = - [ p7zip pkgconfig libX11 libXv udev mesa SDL libao openal libpulseaudio gtk2 gtksourceview ]; + [ p7zip pkgconfig libX11 libXv udev libGLU_combined SDL libao openal libpulseaudio gtk2 gtksourceview ]; unpackPhase = '' 7z x $src diff --git a/pkgs/misc/emulators/mednafen/default.nix b/pkgs/misc/emulators/mednafen/default.nix index 1172a89caf32..9101c1587c25 100644 --- a/pkgs/misc/emulators/mednafen/default.nix +++ b/pkgs/misc/emulators/mednafen/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, freeglut, mesa, libcdio, libjack2 +{ stdenv, fetchurl, pkgconfig, freeglut, libGLU_combined, libcdio, libjack2 , libsamplerate, libsndfile, libX11, SDL, SDL_net, zlib }: stdenv.mkDerivation rec { @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { buildInputs = [ freeglut - mesa + libGLU_combined libcdio libjack2 libsamplerate diff --git a/pkgs/misc/emulators/mess/default.nix b/pkgs/misc/emulators/mess/default.nix index 98bd8bae3e02..65867de61a23 100644 --- a/pkgs/misc/emulators/mess/default.nix +++ b/pkgs/misc/emulators/mess/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, unzip, pkgconfig, SDL, gtk2, GConf, mesa +{ stdenv, fetchurl, unzip, pkgconfig, SDL, gtk2, GConf, libGLU_combined , expat, zlib }: let @@ -32,7 +32,7 @@ stdenv.mkDerivation { makeFlags = "TARGET=mess BUILD_EXPAT= BUILD_ZLIB= NOWERROR=1"; buildInputs = - [ unzip pkgconfig SDL gtk2 GConf mesa expat zlib ]; + [ unzip pkgconfig SDL gtk2 GConf libGLU_combined expat zlib ]; installPhase = '' diff --git a/pkgs/misc/emulators/nestopia/default.nix b/pkgs/misc/emulators/nestopia/default.nix index 6cec834e985f..6bb91b2213a5 100644 --- a/pkgs/misc/emulators/nestopia/default.nix +++ b/pkgs/misc/emulators/nestopia/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, fetchpatch, pkgconfig, SDL2, alsaLib, gtk3, libGLU -, makeWrapper, mesa, libarchive, libao, unzip, xdg_utils, gsettings_desktop_schemas +, makeWrapper, libGLU_combined, libarchive, libao, unzip, xdg_utils, gsettings_desktop_schemas , epoxy, gdk_pixbuf, gnome3, wrapGAppsHook }: @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { gtk3 gdk_pixbuf libGLU - mesa + libGLU_combined libarchive libao unzip diff --git a/pkgs/misc/emulators/retroarch/cores.nix b/pkgs/misc/emulators/retroarch/cores.nix index 605cb7261a2e..ec7c55171714 100644 --- a/pkgs/misc/emulators/retroarch/cores.nix +++ b/pkgs/misc/emulators/retroarch/cores.nix @@ -1,5 +1,5 @@ { stdenv, fetchgit, cmake, pkgconfig, makeWrapper, python27, retroarch -, alsaLib, fluidsynth, curl, hidapi, mesa, gettext, glib, gtk2, portaudio, SDL +, alsaLib, fluidsynth, curl, hidapi, libGLU_combined, gettext, glib, gtk2, portaudio, SDL , ffmpeg, pcre, libevdev, libpng, libjpeg, libudev, libvorbis , miniupnpc, sfml, xorg, zlib }: @@ -140,7 +140,7 @@ in description = "Port of Dolphin to libretro"; extraBuildInputs = [ - cmake curl mesa pcre pkgconfig sfml miniupnpc + cmake curl libGLU_combined pcre pkgconfig sfml miniupnpc gettext glib gtk2 hidapi libevdev libudev ] ++ (with xorg; [ libSM libX11 libXi libpthreadstubs libxcb xcbutil ]); @@ -213,7 +213,7 @@ in }; description = "Port of MAME to libretro"; - extraBuildInputs = [ alsaLib mesa portaudio python27 xorg.libX11 ]; + extraBuildInputs = [ alsaLib libGLU_combined portaudio python27 xorg.libX11 ]; }).override { postPatch = '' # Prevent the failure during the parallel building of: @@ -241,7 +241,7 @@ in }; description = "Libretro port of Mupen64 Plus, GL only"; - extraBuildInputs = [ mesa libpng ]; + extraBuildInputs = [ libGLU_combined libpng ]; }).override { buildPhase = "make WITH_DYNAREC=${if stdenv.system == "x86_64-linux" then "x86_64" else "x86"}"; }; @@ -267,7 +267,7 @@ in }; description = "Parallel Mupen64plus rewrite for libretro."; - extraBuildInputs = [ mesa libpng ]; + extraBuildInputs = [ libGLU_combined libpng ]; }).override { buildPhase = "make WITH_DYNAREC=${if stdenv.system == "x86_64-linux" then "x86_64" else "x86"}"; }; @@ -295,7 +295,7 @@ in sha256 = "06k1gzmypz61dslynrw4b5i161rhj43y6wnr2nhbzvwcv5bw8w8r"; }; description = "ppsspp libretro port"; - extraBuildInputs = [ mesa ffmpeg ]; + extraBuildInputs = [ libGLU_combined ffmpeg ]; }).override { buildPhase = "cd libretro && make"; }; @@ -332,7 +332,7 @@ in sha256 = "0d8wzpv7pcyh437gmvi439vim26wyrjmi5hj97wvyvggywjwrx8m"; }; description = "Reicast libretro port"; - extraBuildInputs = [ mesa ]; + extraBuildInputs = [ libGLU_combined ]; }).override { buildPhase = "make"; }; @@ -345,7 +345,7 @@ in sha256 = "097i2dq3hw14hicsplrs36j1qa3r45vhzny5v4aw6qw4aj34hksy"; }; description = "Libretro port of ScummVM"; - extraBuildInputs = [ fluidsynth libjpeg libvorbis mesa SDL ]; + extraBuildInputs = [ fluidsynth libjpeg libvorbis libGLU_combined SDL ]; }).override { buildPhase = "cd backends/platform/libretro/build && make"; }; diff --git a/pkgs/misc/emulators/retroarch/default.nix b/pkgs/misc/emulators/retroarch/default.nix index 5e5ce9edca4b..f30d50ef4d0c 100644 --- a/pkgs/misc/emulators/retroarch/default.nix +++ b/pkgs/misc/emulators/retroarch/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, makeDesktopItem, coreutils, which, pkgconfig -, ffmpeg, mesa, freetype, libxml2, python34 +, ffmpeg, libGLU_combined, freetype, libxml2, python34 , enableNvidiaCgToolkit ? false, nvidia_cg_toolkit ? null , alsaLib ? null, libv4l ? null , udev ? null, libX11 ? null, libXext ? null, libXxf86vm ? null @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ ffmpeg mesa freetype libxml2 coreutils python34 which SDL ] + buildInputs = [ ffmpeg libGLU_combined freetype libxml2 coreutils python34 which SDL ] ++ optional enableNvidiaCgToolkit nvidia_cg_toolkit ++ optionals stdenv.isLinux [ udev alsaLib libX11 libXext libXxf86vm libXdmcp libv4l libpulseaudio ]; diff --git a/pkgs/misc/emulators/vbam/default.nix b/pkgs/misc/emulators/vbam/default.nix index 9f1cbdf39089..66ea5b125757 100644 --- a/pkgs/misc/emulators/vbam/default.nix +++ b/pkgs/misc/emulators/vbam/default.nix @@ -9,7 +9,7 @@ , libpthreadstubs , libXdmcp , libxshmfence -, mesa +, libGLU_combined , openal , pkgconfig , SDL2 @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { ffmpeg gettext gtk2-x11 - mesa + libGLU_combined openal pkgconfig SDL2 diff --git a/pkgs/misc/emulators/vice/default.nix b/pkgs/misc/emulators/vice/default.nix index 0b56cb21dc0d..010c4721dc2d 100644 --- a/pkgs/misc/emulators/vice/default.nix +++ b/pkgs/misc/emulators/vice/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, bison, flex, perl, libpng, giflib, libjpeg, alsaLib, readline, mesa, libX11, libXaw +{ stdenv, fetchurl, bison, flex, perl, libpng, giflib, libjpeg, alsaLib, readline, libGLU_combined, libX11, libXaw , pkgconfig, gtk2, SDL, autoreconfHook, makeDesktopItem }: @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "0h0jbml02s2a36hr78dxv1zshmfhxp1wadpcdl09aq416fb1bf1y"; }; - buildInputs = [ bison flex perl libpng giflib libjpeg alsaLib readline mesa + buildInputs = [ bison flex perl libpng giflib libjpeg alsaLib readline libGLU_combined pkgconfig gtk2 SDL autoreconfHook libXaw ]; dontDisableStatic = true; configureFlags = "--enable-fullscreen --enable-gnomeui"; diff --git a/pkgs/misc/emulators/wine/base.nix b/pkgs/misc/emulators/wine/base.nix index a09274804440..a147c986674e 100644 --- a/pkgs/misc/emulators/wine/base.nix +++ b/pkgs/misc/emulators/wine/base.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation ((lib.optionalAttrs (! isNull buildScript) { ++ lib.optionals openclSupport [ pkgs.opencl-headers pkgs.ocl-icd ] ++ lib.optionals xmlSupport [ pkgs.libxml2 pkgs.libxslt ] ++ lib.optionals tlsSupport [ pkgs.openssl pkgs.gnutls ] - ++ lib.optionals openglSupport [ pkgs.mesa pkgs.libGL.osmesa pkgs.libdrm ] + ++ lib.optionals openglSupport [ pkgs.libGLU_combined pkgs.libGL.osmesa pkgs.libdrm ] ++ (with pkgs.xorg; [ libX11 libXi libXcursor libXrandr libXrender libXxf86vm libXcomposite libXext ]))); diff --git a/pkgs/misc/emulators/wxmupen64plus/default.nix b/pkgs/misc/emulators/wxmupen64plus/default.nix index e13abb6fe2b6..7be911763181 100644 --- a/pkgs/misc/emulators/wxmupen64plus/default.nix +++ b/pkgs/misc/emulators/wxmupen64plus/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, python, wxGTK29, mupen64plus, SDL, libX11, mesa}: +{stdenv, fetchurl, python, wxGTK29, mupen64plus, SDL, libX11, libGLU_combined}: stdenv.mkDerivation { name = "wxmupen64plus-0.3"; @@ -7,7 +7,7 @@ stdenv.mkDerivation { sha256 = "1mnxi4k011dd300k35li2p6x4wccwi6im21qz8dkznnz397ps67c"; }; - buildInputs = [ python wxGTK29 SDL libX11 mesa ]; + buildInputs = [ python wxGTK29 SDL libX11 libGLU_combined ]; configurePhase = '' tar xf ${mupen64plus.src} diff --git a/pkgs/misc/emulators/yabause/default.nix b/pkgs/misc/emulators/yabause/default.nix index fb99421a61ae..e7237fd4454c 100644 --- a/pkgs/misc/emulators/yabause/default.nix +++ b/pkgs/misc/emulators/yabause/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, pkgconfig, qtbase, mesa +{ stdenv, fetchurl, cmake, pkgconfig, qtbase, libGLU_combined , freeglut ? null, openal ? null, SDL2 ? null }: stdenv.mkDerivation rec { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ cmake pkgconfig ]; - buildInputs = [ qtbase mesa freeglut openal SDL2 ]; + buildInputs = [ qtbase libGLU_combined freeglut openal SDL2 ]; patches = [ ./emu-compatibility.com.patch ./linkage-rwx-linux-elf.patch ]; diff --git a/pkgs/misc/emulators/zsnes/default.nix b/pkgs/misc/emulators/zsnes/default.nix index ad80cb13f78c..1ea8d7e68d3c 100644 --- a/pkgs/misc/emulators/zsnes/default.nix +++ b/pkgs/misc/emulators/zsnes/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchFromGitHub, nasm, SDL, zlib, libpng, ncurses, mesa +{stdenv, fetchFromGitHub, nasm, SDL, zlib, libpng, ncurses, libGLU_combined , makeDesktopItem }: let @@ -22,7 +22,7 @@ in stdenv.mkDerivation { sha256 = "1gy79d5wdaacph0cc1amw7mqm7i0716n6mvav16p1svi26iz193v"; }; - buildInputs = [ nasm SDL zlib libpng ncurses mesa ]; + buildInputs = [ nasm SDL zlib libpng ncurses libGLU_combined ]; prePatch = '' for i in $(cat debian/patches/series); do diff --git a/pkgs/misc/gnash/default.nix b/pkgs/misc/gnash/default.nix index d7a6cebcc563..c0b86336163d 100644 --- a/pkgs/misc/gnash/default.nix +++ b/pkgs/misc/gnash/default.nix @@ -6,7 +6,7 @@ # renderers , enableAGG ? true, agg ? null , enableCairo ? false, cairo ? null -, enableOpenGL ? false, mesa ? null +, enableOpenGL ? false, libGLU_combined ? null # GUI toolkits , enableGTK ? true, gtk2 ? null, gnome2 ? null, gnome3 ? null @@ -49,7 +49,7 @@ in # renderers assert enableAGG -> available agg; assert enableCairo -> available cairo; -assert enableOpenGL -> available mesa; +assert enableOpenGL -> available libGLU_combined; # GUI toolkits assert enableGTK -> all available [ gtk2 gnome2.gtkglext gnome3.gconf ]; @@ -62,7 +62,7 @@ assert enableGstreamer -> all available [ gst-plugins-base gst-plugins-ugly gst- # misc assert enableJemalloc -> available jemalloc; -assert enableHwAccel -> available mesa; +assert enableHwAccel -> available libGLU_combined; assert enablePlugins -> all available [ xulrunner npapi_sdk ]; assert length toolkits == 0 -> throw "at least one GUI toolkit must be enabled"; @@ -90,11 +90,11 @@ stdenv.mkDerivation rec { libpng libjpeg giflib pango atk ] ++ optional enableAGG agg ++ optional enableCairo cairo - ++ optional enableOpenGL mesa + ++ optional enableOpenGL libGLU_combined ++ optional enableQt qt4 ++ optional enableFFmpeg ffmpeg_2 ++ optional enableJemalloc jemalloc - ++ optional enableHwAccel mesa + ++ optional enableHwAccel libGLU_combined ++ optionals enablePlugins [ xulrunner npapi_sdk ] ++ optionals enableGTK [ gtk2 gnome2.gtkglext gnome3.gconf ] ++ optionals enableGstreamer [ gst-plugins-base gst-plugins-ugly gst-ffmpeg ]; diff --git a/pkgs/misc/screensavers/electricsheep/default.nix b/pkgs/misc/screensavers/electricsheep/default.nix index 4a51facb4aa4..17cf99d8b00c 100644 --- a/pkgs/misc/screensavers/electricsheep/default.nix +++ b/pkgs/misc/screensavers/electricsheep/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, autoreconfHook, wxGTK30, libav, lua5_1, curl -, libpng, xorg, pkgconfig, flam3, libgtop, boost, tinyxml, freeglut, mesa +, libpng, xorg, pkgconfig, flam3, libgtop, boost, tinyxml, freeglut, libGLU_combined , glee }: stdenv.mkDerivation rec { @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { buildInputs = [ wxGTK30 libav lua5_1 curl libpng xorg.libXrender - flam3 libgtop boost tinyxml freeglut mesa glee + flam3 libgtop boost tinyxml freeglut libGLU_combined glee ]; preAutoreconf = '' diff --git a/pkgs/misc/screensavers/rss-glx/default.nix b/pkgs/misc/screensavers/rss-glx/default.nix index 7b280d770b38..e8b9346a8727 100644 --- a/pkgs/misc/screensavers/rss-glx/default.nix +++ b/pkgs/misc/screensavers/rss-glx/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, pkgconfig, xlibsWrapper, libXext, mesa, imagemagick, libtiff, bzip2}: +{stdenv, fetchurl, pkgconfig, xlibsWrapper, libXext, libGLU_combined, imagemagick, libtiff, bzip2}: stdenv.mkDerivation rec { version = "0.9.1"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ mesa xlibsWrapper imagemagick libtiff bzip2 ]; + buildInputs = [ libGLU_combined xlibsWrapper imagemagick libtiff bzip2 ]; NIX_CFLAGS_COMPILE = "-I${imagemagick.dev}/include/ImageMagick"; NIX_LDFLAGS= "-rpath ${libXext}/lib"; diff --git a/pkgs/misc/screensavers/xscreensaver/default.nix b/pkgs/misc/screensavers/xscreensaver/default.nix index b07c11a23dd3..b337b6cb0e90 100644 --- a/pkgs/misc/screensavers/xscreensaver/default.nix +++ b/pkgs/misc/screensavers/xscreensaver/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, bc, perl, pam, libXext, libXScrnSaver, libX11 -, libXrandr, libXmu, libXxf86vm, libXrender, libXxf86misc, libjpeg, mesa, gtk2 +, libXrandr, libXmu, libXxf86vm, libXrender, libXxf86misc, libjpeg, libGLU_combined, gtk2 , libxml2, libglade, intltool, xorg, makeWrapper, gle , forceInstallAllHacks ? false }: @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { }; buildInputs = - [ pkgconfig bc perl libjpeg mesa gtk2 libxml2 libglade pam + [ pkgconfig bc perl libjpeg libGLU_combined gtk2 libxml2 libglade pam libXext libXScrnSaver libX11 libXrandr libXmu libXxf86vm libXrender libXxf86misc intltool xorg.appres makeWrapper gle ]; diff --git a/pkgs/os-specific/linux/ati-drivers/builder.sh b/pkgs/os-specific/linux/ati-drivers/builder.sh index 2b907bde10ae..6cb8cacbffac 100644 --- a/pkgs/os-specific/linux/ati-drivers/builder.sh +++ b/pkgs/os-specific/linux/ati-drivers/builder.sh @@ -246,9 +246,9 @@ if test -z "$libsOnly"; then ( # build and install fgl_glxgears cd fgl_glxgears; gcc -DGL_ARB_texture_multisample=1 -g \ - -I$mesa/include \ + -I$libGLU_combined/include \ -I$out/include \ - -L$mesa/lib -lGL -lGLU -lX11 -lm \ + -L$libGLU_combined/lib -lGL -lGLU -lX11 -lm \ -o $out/bin/fgl_glxgears -Wall fgl_glxgears.c ) diff --git a/pkgs/os-specific/linux/ati-drivers/default.nix b/pkgs/os-specific/linux/ati-drivers/default.nix index d9e6ec3cf624..df6fa3555fee 100644 --- a/pkgs/os-specific/linux/ati-drivers/default.nix +++ b/pkgs/os-specific/linux/ati-drivers/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, fetchurl, kernel ? null, which , xorg, makeWrapper, glibc, patchelf, unzip -, fontconfig, freetype, mesa # for fgl_glxgears +, fontconfig, freetype, libGLU_combined # for fgl_glxgears , # Whether to build the libraries only (i.e. not the kernel module or # driver utils). Used to support 32-bit binaries on 64-bit # Linux. @@ -90,7 +90,7 @@ stdenv.mkDerivation rec { xorg.libXrandr xorg.libXxf86vm xorg.xf86vidmodeproto xorg.imake xorg.libICE patchelf unzip - mesa + libGLU_combined fontconfig freetype makeWrapper @@ -108,7 +108,7 @@ stdenv.mkDerivation rec { LD_LIBRARY_PATH = makeLibraryPath [ xorg.libXrender xorg.libXext xorg.libX11 xorg.libXinerama xorg.libSM xorg.libXrandr xorg.libXxf86vm xorg.xf86vidmodeproto xorg.imake xorg.libICE - mesa + libGLU_combined fontconfig freetype stdenv.cc.cc @@ -122,7 +122,7 @@ stdenv.mkDerivation rec { xorg.libX11.out xorg.libXinerama.out xorg.libSM.out xorg.libICE.out ]; - inherit mesa; # only required to build the examples + inherit libGLU_combined; # only required to build the examples enableParallelBuilding = true; diff --git a/pkgs/os-specific/linux/kmscon/default.nix b/pkgs/os-specific/linux/kmscon/default.nix index bc7b254e19e9..d3d6cfd4c58b 100644 --- a/pkgs/os-specific/linux/kmscon/default.nix +++ b/pkgs/os-specific/linux/kmscon/default.nix @@ -4,7 +4,7 @@ , systemd , libxkbcommon , libdrm -, mesa +, libGLU_combined , pango , pixman , pkgconfig @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { systemd libxkbcommon libdrm - mesa + libGLU_combined pango pixman pkgconfig diff --git a/pkgs/os-specific/linux/kmscube/default.nix b/pkgs/os-specific/linux/kmscube/default.nix index 6c16803b5090..2fb4fe93cc81 100644 --- a/pkgs/os-specific/linux/kmscube/default.nix +++ b/pkgs/os-specific/linux/kmscube/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "kmscube-2017-03-19"; src = fetchgit { - url = git://anongit.freedesktop.org/mesa/kmscube; + url = git://anongit.freedesktop.org/libGLU_combined/kmscube; rev = "b88a44d95eceaeebc5b9c6972ffcbfe9eca00aea"; sha256 = "029ccslfavz6jllqv980sr6mj9bdbr0kx7bi21ra0q9yl2vh0yca"; }; diff --git a/pkgs/tools/X11/virtualgl/lib.nix b/pkgs/tools/X11/virtualgl/lib.nix index ece08fd5cd48..c552011f3844 100644 --- a/pkgs/tools/X11/virtualgl/lib.nix +++ b/pkgs/tools/X11/virtualgl/lib.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, mesa, libX11, libXv, libjpeg_turbo, fltk }: +{ stdenv, fetchurl, cmake, libGLU_combined, libX11, libXv, libjpeg_turbo, fltk }: stdenv.mkDerivation rec { name = "virtualgl-lib-${version}"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - buildInputs = [ libjpeg_turbo mesa fltk libX11 libXv ]; + buildInputs = [ libjpeg_turbo libGLU_combined fltk libX11 libXv ]; enableParallelBuilding = true; diff --git a/pkgs/tools/graphics/asymptote/default.nix b/pkgs/tools/graphics/asymptote/default.nix index ec0508d1a62c..c32624f5885d 100644 --- a/pkgs/tools/graphics/asymptote/default.nix +++ b/pkgs/tools/graphics/asymptote/default.nix @@ -20,7 +20,7 @@ let boehmgc ncurses readline gsl libsigsegv python zlib perl texLive texinfo xz ] ++ stdenv.lib.optionals stdenv.isLinux - [ freeglut libGLU libGL mesa_noglu.osmesa ] + [ freeglut libGLU libGL libGLU_combined_noglu.osmesa ] ++ stdenv.lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ OpenGL GLUT Cocoa ]) ; diff --git a/pkgs/tools/graphics/enblend-enfuse/default.nix b/pkgs/tools/graphics/enblend-enfuse/default.nix index d0f78f80c3e9..2ffe4eb7f809 100644 --- a/pkgs/tools/graphics/enblend-enfuse/default.nix +++ b/pkgs/tools/graphics/enblend-enfuse/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl -, boost, freeglut, glew, gsl, lcms2, libpng, libtiff, mesa, vigra +, boost, freeglut, glew, gsl, lcms2, libpng, libtiff, libGLU_combined, vigra , help2man, pkgconfig, perl, texlive }: stdenv.mkDerivation rec { @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "0j5x011ilalb47ssah50ag0a4phgh1b0wdgxdbbp1gcyjcjf60w7"; }; - buildInputs = [ boost freeglut glew gsl lcms2 libpng libtiff mesa vigra ]; + buildInputs = [ boost freeglut glew gsl lcms2 libpng libtiff libGLU_combined vigra ]; nativeBuildInputs = [ help2man perl pkgconfig texlive.combined.scheme-small ]; diff --git a/pkgs/tools/graphics/glee/default.nix b/pkgs/tools/graphics/glee/default.nix index bdfecb9de735..52f5a0997274 100644 --- a/pkgs/tools/graphics/glee/default.nix +++ b/pkgs/tools/graphics/glee/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchgit, cmake, mesa, xorg }: +{stdenv, fetchgit, cmake, libGLU_combined, xorg }: stdenv.mkDerivation rec { name = "${pname}-${version}"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; - buildInputs = [ mesa xorg.libX11 ]; + buildInputs = [ libGLU_combined xorg.libX11 ]; configureScript = '' cmake diff --git a/pkgs/tools/graphics/glmark2/default.nix b/pkgs/tools/graphics/glmark2/default.nix index 0d31f8f1a6f7..8a75fea33ce8 100644 --- a/pkgs/tools/graphics/glmark2/default.nix +++ b/pkgs/tools/graphics/glmark2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, pkgconfig, libjpeg, libpng, xorg, libX11, mesa, libdrm, +{ stdenv, fetchFromGitHub, pkgconfig, libjpeg, libpng, xorg, libX11, libGLU_combined, libdrm, python27, wayland, libudev }: stdenv.mkDerivation rec { @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig ]; buildInputs = [ - libjpeg libpng xorg.libxcb libX11 mesa libdrm python27 wayland libudev + libjpeg libpng xorg.libxcb libX11 libGLU_combined libdrm python27 wayland libudev ]; buildPhase = '' diff --git a/pkgs/tools/graphics/glxinfo/default.nix b/pkgs/tools/graphics/glxinfo/default.nix index 5960b8b6f047..b4b881e6c500 100644 --- a/pkgs/tools/graphics/glxinfo/default.nix +++ b/pkgs/tools/graphics/glxinfo/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation { name = "glxinfo-${version}"; src = fetchurl { - url = "ftp://ftp.freedesktop.org/pub/mesa/demos/${version}/mesa-demos-${version}.tar.bz2"; + url = "ftp://ftp.freedesktop.org/pub/libGLU_combined/demos/${version}/mesa-demos-${version}.tar.bz2"; sha256 = "1vqb7s5m3fcg2csbiz45mha1pys2xx6rhw94fcyvapqdpm5iawy1"; }; diff --git a/pkgs/tools/graphics/logstalgia/default.nix b/pkgs/tools/graphics/logstalgia/default.nix index 2f18857b2a16..e767b7564ecf 100644 --- a/pkgs/tools/graphics/logstalgia/default.nix +++ b/pkgs/tools/graphics/logstalgia/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, SDL2, ftgl, pkgconfig, libpng, libjpeg, pcre, SDL2_image, glew -, mesa, boost, glm, freetype }: +, libGLU_combined, boost, glm, freetype }: stdenv.mkDerivation rec { name = "logstalgia-${version}"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ glew SDL2 ftgl libpng libjpeg pcre SDL2_image mesa boost + buildInputs = [ glew SDL2 ftgl libpng libjpeg pcre SDL2_image libGLU_combined boost glm freetype ]; meta = with stdenv.lib; { diff --git a/pkgs/tools/graphics/maim/default.nix b/pkgs/tools/graphics/maim/default.nix index aaf7b68d177f..c7e8dc966e8d 100644 --- a/pkgs/tools/graphics/maim/default.nix +++ b/pkgs/tools/graphics/maim/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, cmake, pkgconfig , zlib, libpng, libjpeg -, mesa, glm, libX11, libXext, libXfixes, libXrandr, libXcomposite, slop, icu }: +, libGLU_combined, glm, libX11, libXext, libXfixes, libXrandr, libXcomposite, slop, icu }: stdenv.mkDerivation rec { name = "maim-${version}"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkgconfig ]; buildInputs = - [ zlib libpng libjpeg mesa glm libX11 libXext libXfixes libXrandr + [ zlib libpng libjpeg libGLU_combined glm libX11 libXext libXfixes libXrandr libXcomposite slop icu ]; doCheck = false; diff --git a/pkgs/tools/graphics/pfstools/default.nix b/pkgs/tools/graphics/pfstools/default.nix index a74d83e9a1e2..4c1ff5024331 100644 --- a/pkgs/tools/graphics/pfstools/default.nix +++ b/pkgs/tools/graphics/pfstools/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, cmake, pkgconfig -, openexr, zlib, imagemagick, mesa, freeglut, fftwFloat +, openexr, zlib, imagemagick, libGLU_combined, freeglut, fftwFloat , fftw, gsl, libexif, perl, opencv, qt4 }: @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake pkgconfig ]; buildInputs = [ - openexr zlib imagemagick mesa freeglut fftwFloat + openexr zlib imagemagick libGLU_combined freeglut fftwFloat fftw gsl libexif perl opencv qt4 ]; diff --git a/pkgs/tools/inputmethods/touchegg/default.nix b/pkgs/tools/inputmethods/touchegg/default.nix index bdcbc939a07b..82dd387f536d 100644 --- a/pkgs/tools/inputmethods/touchegg/default.nix +++ b/pkgs/tools/inputmethods/touchegg/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, xorg, xorgserver, qt4, mesa, geis, qmake4Hook }: +{ stdenv, fetchurl, xorg, xorgserver, qt4, libGLU_combined, geis, qmake4Hook }: stdenv.mkDerivation rec { name = "touchegg-${version}"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "95734815c7219d9a71282f3144b3526f2542b4fa270a8e69d644722d024b4038"; }; - buildInputs = [ xorgserver mesa xorg.libX11 xorg.libXtst xorg.libXext qt4 geis ]; + buildInputs = [ xorgserver libGLU_combined xorg.libX11 xorg.libXtst xorg.libXext qt4 geis ]; nativeBuildInputs = [ qmake4Hook ]; diff --git a/pkgs/tools/misc/kisslicer/default.nix b/pkgs/tools/misc/kisslicer/default.nix index 588511638bea..2ec795e78e90 100644 --- a/pkgs/tools/misc/kisslicer/default.nix +++ b/pkgs/tools/misc/kisslicer/default.nix @@ -1,6 +1,6 @@ { fetchzip , libX11 -, mesa +, libGLU_combined , makeWrapper , stdenv }: @@ -8,7 +8,7 @@ let libPath = stdenv.lib.makeLibraryPath [ - mesa + libGLU_combined stdenv.cc.cc libX11 ]; @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { buildInputs = [ makeWrapper - mesa + libGLU_combined libX11 ]; diff --git a/pkgs/tools/misc/ocz-ssd-guru/default.nix b/pkgs/tools/misc/ocz-ssd-guru/default.nix index 21786f3f15f5..afe7a81ebac8 100644 --- a/pkgs/tools/misc/ocz-ssd-guru/default.nix +++ b/pkgs/tools/misc/ocz-ssd-guru/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, xorg, freetype, fontconfig, mesa, glibc, makeWrapper }: +{ fetchurl, stdenv, xorg, freetype, fontconfig, libGLU_combined, glibc, makeWrapper }: let system = if stdenv.system == "x86_64-linux" then "linux64" else "linux32"; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { xorg.libXrender stdenv.cc.cc glibc - mesa + libGLU_combined ]; installPhase = '' diff --git a/pkgs/tools/misc/pipelight/default.nix b/pkgs/tools/misc/pipelight/default.nix index 3493e7ffa7ba..f5c15775777f 100644 --- a/pkgs/tools/misc/pipelight/default.nix +++ b/pkgs/tools/misc/pipelight/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, bash, cabextract, curl, gnupg, libX11, mesa, perl, wineStaging +{ stdenv, fetchurl, bash, cabextract, curl, gnupg, libX11, libGLU_combined, perl, wineStaging }: let @@ -18,7 +18,7 @@ in stdenv.mkDerivation rec { sha256 = "1i440rf22fmd2w86dlm1mpi3nb7410rfczc0yldnhgsvp5p3sm5f"; }; - buildInputs = [ wine_custom libX11 mesa curl ]; + buildInputs = [ wine_custom libX11 libGLU_combined curl ]; propagatedbuildInputs = [ curl cabextract ]; diff --git a/pkgs/tools/misc/slop/default.nix b/pkgs/tools/misc/slop/default.nix index d1e5a2451a79..ad1c2b64e65d 100644 --- a/pkgs/tools/misc/slop/default.nix +++ b/pkgs/tools/misc/slop/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, cmake, pkgconfig -, glew, glm, mesa, libX11, libXext, libXrender, cppcheck, icu}: +, glew, glm, libGLU_combined, libX11, libXext, libXrender, cppcheck, icu}: stdenv.mkDerivation rec { name = "slop-${version}"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ cmake pkgconfig ]; - buildInputs = [ glew glm mesa libX11 libXext libXrender icu ] + buildInputs = [ glew glm libGLU_combined libX11 libXext libXrender icu ] ++ stdenv.lib.optional doCheck cppcheck; doCheck = false; diff --git a/pkgs/tools/security/enpass/default.nix b/pkgs/tools/security/enpass/default.nix index 1bf5a9033b99..38104b8b213d 100644 --- a/pkgs/tools/security/enpass/default.nix +++ b/pkgs/tools/security/enpass/default.nix @@ -1,5 +1,5 @@ {stdenv, system, fetchurl, dpkg, openssl, xorg -, glib, mesa, libpulseaudio, zlib, dbus, fontconfig, freetype +, glib, libGLU_combined, libpulseaudio, zlib, dbus, fontconfig, freetype , gtk2, pango, atk, cairo, gdk_pixbuf, jasper, xkeyboardconfig , makeWrapper , makeDesktopItem, python, pythonPackages, lib , libredirect, lsof}: @@ -18,7 +18,7 @@ let # used of both wrappers and libpath libPath = lib.makeLibraryPath (with xorg; [ openssl - mesa + libGLU_combined fontconfig freetype libpulseaudio diff --git a/pkgs/tools/text/mpage/default.nix b/pkgs/tools/text/mpage/default.nix index 4ebe62ef9a5f..47e6766d21fa 100644 --- a/pkgs/tools/text/mpage/default.nix +++ b/pkgs/tools/text/mpage/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { name = "mpage-2.5.6"; src = fetchurl { - url = "http://www.mesa.nl/pub/mpage/${name}.tgz"; + url = "http://www.libGLU_combined.nl/pub/mpage/${name}.tgz"; sha256 = "016w9sm06sn1d2lim4p8fzl6wbmad3wigxhflsybzi7p4zy6vrjg"; }; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ''; license = "liberal"; # a non-copyleft license, see `Copyright' file - homepage = http://www.mesa.nl/pub/mpage/; + homepage = http://www.libGLU_combined.nl/pub/mpage/; platforms = stdenv.lib.platforms.linux; }; } From e94cd63bf50781ab65c7d4387f1abeaf4bd7841e Mon Sep 17 00:00:00 2001 From: "Alexander V. Nikolaev" Date: Sat, 24 Feb 2018 15:38:25 +0200 Subject: [PATCH 060/814] treewide: transition libGL/libGLU for qt Also rename mesaSupported to libGLSupported --- .../libraries/qt-4.x/4.8/default.nix | 6 +++--- .../libraries/qt-5/5.10/default.nix | 4 ++-- .../development/libraries/qt-5/5.6/default.nix | 4 ++-- .../development/libraries/qt-5/5.9/default.nix | 4 ++-- .../libraries/qt-5/modules/qtbase.nix | 14 +++++++------- pkgs/top-level/all-packages.nix | 18 +++++++++--------- 6 files changed, 25 insertions(+), 25 deletions(-) diff --git a/pkgs/development/libraries/qt-4.x/4.8/default.nix b/pkgs/development/libraries/qt-4.x/4.8/default.nix index 8b3fd8c66781..bafe36647359 100644 --- a/pkgs/development/libraries/qt-4.x/4.8/default.nix +++ b/pkgs/development/libraries/qt-4.x/4.8/default.nix @@ -2,7 +2,7 @@ , hostPlatform , libXrender, libXinerama, libXcursor, libXmu, libXv, libXext , libXfixes, libXrandr, libSM, freetype, fontconfig, zlib, libjpeg, libpng -, libmng, which, mesaSupported, mesa, mesa_glu, openssl, dbus, cups, pkgconfig +, libmng, which, libGLSupported, libGL, libGLU, openssl, dbus, cups, pkgconfig , libtiff, glib, icu, mysql, postgresql, sqlite, perl, coreutils, libXi , buildMultimedia ? stdenv.isLinux, alsaLib, gstreamer, gst-plugins-base , buildWebkit ? (stdenv.isLinux || stdenv.isDarwin) @@ -76,7 +76,7 @@ stdenv.mkDerivation rec { icu = icu.out; libXfixes = libXfixes.out; glibc = stdenv.cc.libc.out; - openglDriver = if mesaSupported then mesa.driverLink else "/no-such-path"; + openglDriver = if libGLSupported then libGL.driverLink else "/no-such-path"; }) (fetchpatch { name = "fix-medium-font.patch"; @@ -159,7 +159,7 @@ stdenv.mkDerivation rec { [ libXrender libXrandr libXinerama libXcursor libXext libXfixes libXv libXi libSM zlib libpng openssl dbus freetype fontconfig glib ] # Qt doesn't directly need GLU (just GL), but many apps use, it's small and doesn't remain a runtime-dep if not used - ++ optional mesaSupported mesa_glu + ++ optional libGLSupported libGLU ++ optional ((buildWebkit || buildMultimedia) && stdenv.isLinux ) alsaLib ++ optionals (buildWebkit || buildMultimedia) [ gstreamer gst-plugins-base ]; diff --git a/pkgs/development/libraries/qt-5/5.10/default.nix b/pkgs/development/libraries/qt-5/5.10/default.nix index eeff34568332..2ff9a46bc772 100644 --- a/pkgs/development/libraries/qt-5/5.10/default.nix +++ b/pkgs/development/libraries/qt-5/5.10/default.nix @@ -18,7 +18,7 @@ top-level attribute to `top-level/all-packages.nix`. { newScope, stdenv, fetchurl, makeSetupHook, makeWrapper, - bison, cups ? null, harfbuzz, mesa, perl, + bison, cups ? null, harfbuzz, libGL, perl, gstreamer, gst-plugins-base, gtk3, dconf, # options @@ -66,7 +66,7 @@ let qtbase = callPackage ../modules/qtbase.nix { inherit (srcs.qtbase) src version; patches = patches.qtbase; - inherit bison cups harfbuzz mesa; + inherit bison cups harfbuzz libGL; withGtk3 = true; inherit dconf gtk3; inherit developerBuild decryptSslTraffic; }; diff --git a/pkgs/development/libraries/qt-5/5.6/default.nix b/pkgs/development/libraries/qt-5/5.6/default.nix index 8793b2bb9f01..b9ed5eddd5cf 100644 --- a/pkgs/development/libraries/qt-5/5.6/default.nix +++ b/pkgs/development/libraries/qt-5/5.6/default.nix @@ -27,7 +27,7 @@ existing packages here and modify it as necessary. { newScope, stdenv, fetchurl, makeSetupHook, makeWrapper, - bison, cups ? null, harfbuzz, mesa, perl, + bison, cups ? null, harfbuzz, libGL, perl, gstreamer, gst-plugins-base, # options @@ -74,7 +74,7 @@ let inherit mkDerivation; qtbase = callPackage ../modules/qtbase.nix { - inherit bison cups harfbuzz mesa; + inherit bison cups harfbuzz libGL; inherit (srcs.qtbase) src version; patches = patches.qtbase; inherit developerBuild decryptSslTraffic; diff --git a/pkgs/development/libraries/qt-5/5.9/default.nix b/pkgs/development/libraries/qt-5/5.9/default.nix index 5afcdaa430e5..e109fe447aa2 100644 --- a/pkgs/development/libraries/qt-5/5.9/default.nix +++ b/pkgs/development/libraries/qt-5/5.9/default.nix @@ -18,7 +18,7 @@ top-level attribute to `top-level/all-packages.nix`. { newScope, stdenv, fetchurl, makeSetupHook, makeWrapper, - bison, cups ? null, harfbuzz, mesa, perl, + bison, cups ? null, harfbuzz, libGL, perl, gstreamer, gst-plugins-base, gtk3, dconf, # options @@ -66,7 +66,7 @@ let qtbase = callPackage ../modules/qtbase.nix { inherit (srcs.qtbase) src version; patches = patches.qtbase; - inherit bison cups harfbuzz mesa; + inherit bison cups harfbuzz libGL; withGtk3 = true; inherit dconf gtk3; inherit developerBuild decryptSslTraffic; }; diff --git a/pkgs/development/libraries/qt-5/modules/qtbase.nix b/pkgs/development/libraries/qt-5/modules/qtbase.nix index aa4449504bb9..3a0a7326f762 100644 --- a/pkgs/development/libraries/qt-5/modules/qtbase.nix +++ b/pkgs/development/libraries/qt-5/modules/qtbase.nix @@ -18,8 +18,8 @@ withGtk3 ? false, dconf ? null, gtk3 ? null, # options - mesaSupported ? (!stdenv.isDarwin), - mesa, + libGLSupported ? (!stdenv.isDarwin), + libGL, buildExamples ? false, buildTests ? false, developerBuild ? false, @@ -69,7 +69,7 @@ stdenv.mkDerivation { libX11 libXcomposite libXext libXi libXrender libxcb libxkbcommon xcbutil xcbutilimage xcbutilkeysyms xcbutilrenderutil xcbutilwm ] - ++ lib.optional mesaSupported mesa + ++ lib.optional libGLSupported libGL ); buildInputs = @@ -142,11 +142,11 @@ stdenv.mkDerivation { # Note on the above: \x27 is a way if including a single-quote # character in the sed string arguments. else - lib.optionalString mesaSupported + lib.optionalString libGLSupported '' sed -i mkspecs/common/linux.conf \ - -e "/^QMAKE_INCDIR_OPENGL/ s|$|${mesa.dev or mesa}/include|" \ - -e "/^QMAKE_LIBDIR_OPENGL/ s|$|${mesa.out}/lib|" + -e "/^QMAKE_INCDIR_OPENGL/ s|$|${libGL.dev or libGL}/include|" \ + -e "/^QMAKE_LIBDIR_OPENGL/ s|$|${libGL.out}/lib|" '' ); @@ -208,7 +208,7 @@ stdenv.mkDerivation { # 10.10 ] else - lib.optional mesaSupported ''-DNIXPKGS_MESA_GL="${mesa.out}/lib/libGL"'' + lib.optional libGLSupported ''-DNIXPKGS_MESA_GL="${libGL.out}/lib/libGL"'' ++ lib.optionals withGtk3 [ ''-DNIXPKGS_QGTK3_XDG_DATA_DIRS="${gtk3}/share/gsettings-schemas/${gtk3.name}"'' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 54666152c87c..6d3bcc3b23fa 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10390,7 +10390,7 @@ with pkgs; # Default derivation with libGL.so.1 to link into /run/opengl-drivers (if need) libGL_driver = mesa_drivers; - mesaSupported = lib.elem system lib.platforms.mesaPlatforms; + libGLSupported = lib.elem system lib.platforms.mesaPlatforms; libGLDarwinOr = alternative: if stdenv.isDarwin then callPackage ../development/libraries/mesa-darwin { @@ -10853,7 +10853,7 @@ with pkgs; qoauth = callPackage ../development/libraries/qoauth { }; qt3 = callPackage ../development/libraries/qt-3 { - openglSupport = mesaSupported; + openglSupport = libGLSupported; libpng = libpng12; }; @@ -10861,13 +10861,13 @@ with pkgs; qt48 = callPackage ../development/libraries/qt-4.x/4.8 { # GNOME dependencies are not used unless gtkStyle == true - mesa = mesa_noglu; inherit (pkgs.gnome2) libgnomeui GConf gnome_vfs; cups = if stdenv.isLinux then cups else null; # XXX: mariadb doesn't built on fbsd as of nov 2015 mysql = if (!stdenv.isFreeBSD) then mysql else null; + inherit libGL; inherit (pkgs.darwin) cf-private libobjc; inherit (pkgs.darwin.apple_sdk.frameworks) ApplicationServices OpenGL Cocoa AGL; }; @@ -10892,7 +10892,7 @@ with pkgs; bison = bison2; # error: too few arguments to function 'int yylex(... inherit cups; harfbuzz = harfbuzz-icu; - mesa = mesa_noglu; + inherit libGL; inherit perl; inherit (gst_all_1) gstreamer gst-plugins-base; }); @@ -10906,7 +10906,7 @@ with pkgs; bison = bison2; # error: too few arguments to function 'int yylex(... inherit cups; harfbuzz = harfbuzz-icu; - mesa = mesa_noglu; + inherit libGL; inherit perl; inherit (gst_all_1) gstreamer gst-plugins-base; inherit (gnome3) gtk3 dconf; @@ -10921,7 +10921,7 @@ with pkgs; bison = bison2; # error: too few arguments to function 'int yylex(... inherit cups; harfbuzz = harfbuzz-icu; - mesa = mesa_noglu; + inherit libGL; inherit perl; inherit (gst_all_1) gstreamer gst-plugins-base; inherit (gnome3) gtk3 dconf; @@ -11172,7 +11172,7 @@ with pkgs; schroedinger = callPackage ../development/libraries/schroedinger { }; SDL = callPackage ../development/libraries/SDL { - openglSupport = mesaSupported; + openglSupport = libGLSupported; alsaSupport = stdenv.isLinux; x11Support = !stdenv.isCygwin; pulseaudioSupport = config.pulseaudio or stdenv.isLinux; @@ -11196,7 +11196,7 @@ with pkgs; SDL_ttf = callPackage ../development/libraries/SDL_ttf { }; SDL2 = callPackage ../development/libraries/SDL2 { - openglSupport = mesaSupported; + openglSupport = libGLSupported; alsaSupport = stdenv.isLinux; x11Support = !stdenv.isCygwin; waylandSupport = stdenv.isLinux; @@ -18887,7 +18887,7 @@ with pkgs; racer = callPackage ../games/racer { }; residualvm = callPackage ../games/residualvm { - openglSupport = mesaSupported; + openglSupport = libGLSupported; }; rftg = callPackage ../games/rftg { }; From 13e0038f5d354aa7e6a439200b75306e2cc4aa5a Mon Sep 17 00:00:00 2001 From: "Alexander V. Nikolaev" Date: Sat, 24 Feb 2018 15:50:27 +0200 Subject: [PATCH 061/814] perl-packages: libGL/libGLU transition --- pkgs/top-level/perl-packages.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 4beb076667cc..e8b29224ac42 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -10714,7 +10714,8 @@ let self = _self // overrides; _self = with self; { sha256 = "1q3lz168q081iwl9jg21fbzhp9la79gav9mv6nmh2jab83s2l3mj"; }; - buildInputs = with pkgs; [ mesa mesa_glu freeglut xorg.libX11 xorg.libXi xorg.libXmu xorg.libXext xdummy ]; + # FIXME: try with libGL + libGLU instead of libGLU_combined + buildInputs = with pkgs; [ libGLU_combined libGLU freeglut xorg.libX11 xorg.libXi xorg.libXmu xorg.libXext xdummy ]; patches = [ ../development/perl-modules/perl-opengl.patch ]; @@ -15935,7 +15936,7 @@ let self = _self // overrides; _self = with self; { url = "mirror://cpan/authors/id/M/MB/MBARBON/${name}.tar.gz"; sha256 = "1q4gvj4gdx4l8k4mkgiix24p9mdfy1miv7abidf0my3gy2gw5lka"; }; - propagatedBuildInputs = [ Wx OpenGL pkgs.mesa_glu ]; + propagatedBuildInputs = [ Wx OpenGL pkgs.libGLU ]; doCheck = false; }; From 33daafd4c50af808b1cbaf8c39e41d5f11e4e285 Mon Sep 17 00:00:00 2001 From: "Alexander V. Nikolaev" Date: Sat, 24 Feb 2018 15:50:46 +0200 Subject: [PATCH 062/814] python-packages: libGL/libGLU transition --- pkgs/top-level/python-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 1b53c0f279f2..6d12f1c1eaf8 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -14444,11 +14444,11 @@ in { url = "mirror://pypi/P/PyOpenGL/PyOpenGL-${version}.tar.gz"; sha256 = "9b47c5c3a094fa518ca88aeed35ae75834d53e4285512c61879f67a48c94ddaf"; }; - propagatedBuildInputs = [ pkgs.mesa pkgs.freeglut self.pillow ]; + propagatedBuildInputs = [ pkgs.libGLU_combined pkgs.freeglut self.pillow ]; patchPhase = '' sed -i "s|util.find_library( name )|name|" OpenGL/platform/ctypesloader.py sed -i "s|'GL',|'libGL.so',|" OpenGL/platform/glx.py - sed -i "s|'GLU',|'${pkgs.mesa}/lib/libGLU.so',|" OpenGL/platform/glx.py + sed -i "s|'GLU',|'${pkgs.libGLU_combined}/lib/libGLU.so',|" OpenGL/platform/glx.py sed -i "s|'glut',|'${pkgs.freeglut}/lib/libglut.so',|" OpenGL/platform/glx.py ''; meta = { @@ -21583,7 +21583,7 @@ EOF sha256 = "18n14ha2d3j3ghg2f2aqnf2mks94nn7ma9ii7vkiwcay93zm82cf"; }; disabled = isPy3k; # Judging from SyntaxError - buildInputs = with self; [ pkgs.swig1 pkgs.coin3d pkgs.soqt pkgs.mesa pkgs.xorg.libXi ]; + buildInputs = with self; [ pkgs.swig1 pkgs.coin3d pkgs.soqt pkgs.libGLU_combined pkgs.xorg.libXi ]; }; smugpy = callPackage ../development/python-modules/smugpy { }; From 77b23a8e7c3c221cf56cdfe359fa98c23b7ebe00 Mon Sep 17 00:00:00 2001 From: "Alexander V. Nikolaev" Date: Sat, 24 Feb 2018 16:09:16 +0200 Subject: [PATCH 063/814] asymptote: direct reference to mesa_noglu.osmesa --- pkgs/tools/graphics/asymptote/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/graphics/asymptote/default.nix b/pkgs/tools/graphics/asymptote/default.nix index c32624f5885d..04863d6ce625 100644 --- a/pkgs/tools/graphics/asymptote/default.nix +++ b/pkgs/tools/graphics/asymptote/default.nix @@ -1,6 +1,6 @@ {stdenv, fetchurl , freeglut, ghostscriptX, imagemagick, fftw - , boehmgc, libGLU, libGL, ncurses, readline, gsl, libsigsegv + , boehmgc, libGLU, libGL, mesa_noglu, ncurses, readline, gsl, libsigsegv , python, zlib, perl, texLive, texinfo, xz , darwin }: @@ -20,7 +20,7 @@ let boehmgc ncurses readline gsl libsigsegv python zlib perl texLive texinfo xz ] ++ stdenv.lib.optionals stdenv.isLinux - [ freeglut libGLU libGL libGLU_combined_noglu.osmesa ] + [ freeglut libGLU libGL mesa_noglu.osmesa ] ++ stdenv.lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ OpenGL GLUT Cocoa ]) ; From 38bd1d7664f7829d6f9cf40cd80806f5ec2fc7da Mon Sep 17 00:00:00 2001 From: "Alexander V. Nikolaev" Date: Sat, 24 Feb 2018 16:11:51 +0200 Subject: [PATCH 064/814] construo: fix build after libGL transition --- pkgs/games/construo/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/games/construo/default.nix b/pkgs/games/construo/default.nix index cfcf057dd1ab..7db641367311 100644 --- a/pkgs/games/construo/default.nix +++ b/pkgs/games/construo/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libX11, zlib, xproto, libGLU_combined ? null, freeglut ? null }: +{ stdenv, fetchurl, libX11, zlib, xproto, libGL ? null, freeglut ? null }: stdenv.mkDerivation rec { name = "construo-${version}"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ libX11 zlib xproto ] - ++ stdenv.lib.optional (libGLU_combined != null) mesa + ++ stdenv.lib.optional (libGL != null) libGL ++ stdenv.lib.optional (freeglut != null) freeglut; preConfigure = '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6d3bcc3b23fa..f740c390f04a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18543,12 +18543,13 @@ with pkgs; confd = callPackage ../tools/system/confd { }; construoBase = lowPrio (callPackage ../games/construo { - mesa = null; + libGL = null; freeglut = null; }); construo = construoBase.override { - inherit mesa freeglut; + inherit freeglut; + libGL = libGLU_combined; }; crack_attack = callPackage ../games/crack-attack { }; From ea04aa17207318554f0004010e1cb5f7f13e9f42 Mon Sep 17 00:00:00 2001 From: "Alexander V. Nikolaev" Date: Sat, 24 Feb 2018 16:21:43 +0200 Subject: [PATCH 065/814] libdevil: fix build after libGL/libGLU transition --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f740c390f04a..aea7979ceda7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9543,7 +9543,7 @@ with pkgs; libdevil-nox = libdevil.override { libX11 = null; - mesa_noglu = null; + libGL = null; }; libdigidoc = callPackage ../development/libraries/libdigidoc { }; From 42dcaa91d61dc5ad4076c984d914ece9eddfd46a Mon Sep 17 00:00:00 2001 From: "Alexander V. Nikolaev" Date: Sat, 24 Feb 2018 16:31:03 +0200 Subject: [PATCH 066/814] libglvnd: refer to driversLink via libGL_driver --- pkgs/development/libraries/libglvnd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libglvnd/default.nix b/pkgs/development/libraries/libglvnd/default.nix index ebcbdb23e9fb..7ea1ecdd0522 100644 --- a/pkgs/development/libraries/libglvnd/default.nix +++ b/pkgs/development/libraries/libglvnd/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchFromGitHub, autoreconfHook, python2, pkgconfig, libGLU_combined_noglu, libX11, libXext, glproto }: +{stdenv, fetchFromGitHub, autoreconfHook, python2, pkgconfig, libGL_driver, libX11, libXext, glproto }: # Git version is needed for EGL and GLES handling. @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = [ "-UDEFAULT_EGL_VENDOR_CONFIG_DIRS" - "-DDEFAULT_EGL_VENDOR_CONFIG_DIRS=\"${libGLU_combined_noglu.driverLink}/share/glvnd/egl_vendor.d\"" + "-DDEFAULT_EGL_VENDOR_CONFIG_DIRS=\"${libGL_driver.driverLink}/share/glvnd/egl_vendor.d\"" ]; outputs = [ "out" "dev" ]; From 25a78f7234ced8840610178a695078b5b08d9e6b Mon Sep 17 00:00:00 2001 From: "Alexander V. Nikolaev" Date: Sat, 24 Feb 2018 16:33:33 +0200 Subject: [PATCH 067/814] qt-3: fix build after libGL transition --- pkgs/development/libraries/qt-3/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/qt-3/default.nix b/pkgs/development/libraries/qt-3/default.nix index 174be6a8f53a..32841c9b9331 100644 --- a/pkgs/development/libraries/qt-3/default.nix +++ b/pkgs/development/libraries/qt-3/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation { -qt-gif -I${xextproto}/include ${if openglSupport then "-dlopen-opengl - -L${libGLU_combined}/lib -I${mesa}/include + -L${libGLU_combined}/lib -I${libGLU_combined}/include -L${libXmu.out}/lib -I${libXmu.dev}/include" else ""} ${if threadSupport then "-thread" else "-no-thread"} ${if xrenderSupport then "-xrender -L${libXrender.out}/lib -I${libXrender.dev}/include" else "-no-xrender"} From c73cfd5c1b29a8f72a092044dd29f46d0780c01d Mon Sep 17 00:00:00 2001 From: Alex Griffin Date: Sat, 24 Feb 2018 14:17:43 -0600 Subject: [PATCH 068/814] mblaze: 0.3.1 -> 0.3.2 --- pkgs/applications/networking/mailreaders/mblaze/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/mblaze/default.nix b/pkgs/applications/networking/mailreaders/mblaze/default.nix index dac9475665f5..ff4507991e40 100644 --- a/pkgs/applications/networking/mailreaders/mblaze/default.nix +++ b/pkgs/applications/networking/mailreaders/mblaze/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { name = "mblaze-${version}"; - version = "0.3.1"; + version = "0.3.2"; buildInputs = stdenv.lib.optionals stdenv.isDarwin [ libiconv ]; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { owner = "chneukirchen"; repo = "mblaze"; rev = "v${version}"; - sha256 = "1a4rqadq3dm6r11v7akng1qy88zpiq5qbqdryb8df3pxkv62nm1a"; + sha256 = "0sgzcf7lpgdix7x4p6wp1jjv9h62rrkca6325c7a9j8r0dbg1fdg"; }; makeFlags = "PREFIX=$(out)"; From 9d37c059d39f7938493ed7ed47ea5e5856248906 Mon Sep 17 00:00:00 2001 From: "Andrew R. M" Date: Sat, 24 Feb 2018 16:37:58 -0500 Subject: [PATCH 069/814] hy: 0.13.1 -> 0.14.0 --- pkgs/development/interpreters/hy/default.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/hy/default.nix b/pkgs/development/interpreters/hy/default.nix index 41e5e3d93be6..3f08ca8f7c22 100644 --- a/pkgs/development/interpreters/hy/default.nix +++ b/pkgs/development/interpreters/hy/default.nix @@ -2,15 +2,21 @@ pythonPackages.buildPythonApplication rec { name = "hy-${version}"; - version = "0.13.1"; + version = "0.14.0"; src = fetchurl { url = "mirror://pypi/h/hy/${name}.tar.gz"; - sha256 = "1fjip998k336r26i1gpri18syvfjg7z46wng1n58dmc238wm53sx"; + sha256 = "0cbdh1q0zm00p4h7i44kir4qhw0p6sid78xf6llrx2p21llsnv98"; }; propagatedBuildInputs = with pythonPackages; [ appdirs clint astor rply ]; + # The build generates a .json parser file in the home directory under .cache. + # This is needed to get it to not try and open files in /homeless-shelter + preConfigure = '' + export HOME=$TMP + ''; + meta = { description = "A LISP dialect embedded in Python"; homepage = http://hylang.org/; From c255b108188cab1131f50631c923936e3dcceb99 Mon Sep 17 00:00:00 2001 From: Linus Heckemann Date: Sun, 25 Feb 2018 16:33:28 +0000 Subject: [PATCH 070/814] nixos/opengl: unhide and document enable option --- nixos/modules/hardware/opengl.nix | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/nixos/modules/hardware/opengl.nix b/nixos/modules/hardware/opengl.nix index c2c36f02a143..d9646704e6f6 100644 --- a/nixos/modules/hardware/opengl.nix +++ b/nixos/modules/hardware/opengl.nix @@ -34,10 +34,17 @@ in { options = { hardware.opengl.enable = mkOption { - description = "Whether this configuration requires OpenGL."; + description = '' + Whether to enable OpenGL drivers. This is needed to enable + OpenGL support in X11 systems, as well as for Wayland compositors + like sway, way-cooler and Weston. It is enabled by default + by the corresponding modules, so you do not usually have to + set it yourself, only if there is no module for your wayland + compositor of choice. See services.xserver.enable, + programs.sway.enable, and programs.way-cooler.enable. + ''; type = types.bool; default = false; - internal = true; }; hardware.opengl.driSupport = mkOption { From caa9a38e2de34e87bfa9a009b010fb23567b3fb7 Mon Sep 17 00:00:00 2001 From: Ryan Mulligan Date: Sun, 25 Feb 2018 21:29:20 -0800 Subject: [PATCH 071/814] flyway: 4.2.0 -> 5.0.7 Semi-automatic update. These checks were performed: - built on NixOS - ran `/nix/store/lzmkkf5v0xf3dxqn3gzcwww8a30gwgma-flyway-5.0.7/bin/flyway -h` got 0 exit code - ran `/nix/store/lzmkkf5v0xf3dxqn3gzcwww8a30gwgma-flyway-5.0.7/bin/flyway --help` got 0 exit code - ran `/nix/store/lzmkkf5v0xf3dxqn3gzcwww8a30gwgma-flyway-5.0.7/bin/flyway help` got 0 exit code - ran `/nix/store/lzmkkf5v0xf3dxqn3gzcwww8a30gwgma-flyway-5.0.7/bin/flyway -V` and found version 5.0.7 - ran `/nix/store/lzmkkf5v0xf3dxqn3gzcwww8a30gwgma-flyway-5.0.7/bin/flyway -v` and found version 5.0.7 - ran `/nix/store/lzmkkf5v0xf3dxqn3gzcwww8a30gwgma-flyway-5.0.7/bin/flyway --version` and found version 5.0.7 - ran `/nix/store/lzmkkf5v0xf3dxqn3gzcwww8a30gwgma-flyway-5.0.7/bin/flyway -h` and found version 5.0.7 - ran `/nix/store/lzmkkf5v0xf3dxqn3gzcwww8a30gwgma-flyway-5.0.7/bin/flyway --help` and found version 5.0.7 - ran `/nix/store/lzmkkf5v0xf3dxqn3gzcwww8a30gwgma-flyway-5.0.7/bin/flyway help` and found version 5.0.7 - found 5.0.7 with grep in /nix/store/lzmkkf5v0xf3dxqn3gzcwww8a30gwgma-flyway-5.0.7 - found 5.0.7 in filename of file in /nix/store/lzmkkf5v0xf3dxqn3gzcwww8a30gwgma-flyway-5.0.7 --- pkgs/development/tools/flyway/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/flyway/default.nix b/pkgs/development/tools/flyway/default.nix index 0ef6e85297c1..11e2c6d2c5a4 100644 --- a/pkgs/development/tools/flyway/default.nix +++ b/pkgs/development/tools/flyway/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, jre_headless, makeWrapper }: let - version = "4.2.0"; + version = "5.0.7"; in stdenv.mkDerivation { name = "flyway-${version}"; src = fetchurl { - url = "https://repo1.maven.org/maven2/org/flywaydb/flyway-commandline/4.2.0/flyway-commandline-${version}.tar.gz"; - sha256 = "1fxj760qx6apsz50p60c9n79k6bqkjcv2zfgab0awvmdvdy4k661"; + url = "https://repo1.maven.org/maven2/org/flywaydb/flyway-commandline/5.0.7/flyway-commandline-${version}.tar.gz"; + sha256 = "1zmnzz7d5kb2wpmfizryxxhpjs16j5k9mich1hbb2qfkqvygk6sv"; }; buildInputs = [ makeWrapper ]; dontBuild = true; From 3cd8f05e0c9c04783ea94d0ab870e80423afa759 Mon Sep 17 00:00:00 2001 From: Markus Hauck Date: Thu, 22 Feb 2018 20:01:34 +0100 Subject: [PATCH 072/814] insomnia: init at 5.14.7 --- pkgs/development/web/insomnia/default.nix | 66 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 +- 2 files changed, 69 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/web/insomnia/default.nix diff --git a/pkgs/development/web/insomnia/default.nix b/pkgs/development/web/insomnia/default.nix new file mode 100644 index 000000000000..45cf993f25ed --- /dev/null +++ b/pkgs/development/web/insomnia/default.nix @@ -0,0 +1,66 @@ +{ stdenv, lib, makeWrapper, fetchurl, dpkg, + + alsaLib, atk, cairo, cups, dbus_daemon, expat, fontconfig, freetype, gdk_pixbuf, glib, gnome2, gtk2-x11, + nspr, nss, + + libX11, libXScrnSaver, libXcomposite, libXcursor, libXdamage, libXext, libXfixes, libXi, libXrandr, + libXrender, libXtst, libxcb, + + libudev0-shim, glibc, curl +}: + +let + libPath = lib.makeLibraryPath [ + alsaLib atk cairo cups dbus_daemon.lib expat fontconfig freetype gdk_pixbuf glib gnome2.GConf gnome2.pango + gtk2-x11 nspr nss stdenv.cc.cc.lib libX11 libXScrnSaver libXcomposite libXcursor libXdamage libXext libXfixes + libXi libXrandr libXrender libXtst libxcb + ]; + runtimeLibs = lib.makeLibraryPath [ libudev0-shim glibc curl ]; +in stdenv.mkDerivation rec { + name = "insomnia-${version}"; + version = "5.14.7"; + + src = fetchurl { + url = "https://github.com/getinsomnia/insomnia/releases/download/v${version}/insomnia_${version}_amd64.deb"; + sha256 = "1y6bn9kaxxplzyv7jjrcsfkrjnivjqdk5mbdp8vz32hv2bmdvzzy"; + }; + + nativeBuildInputs = [ makeWrapper dpkg ]; + + buildPhase = ":"; + + unpackPhase = "dpkg-deb -x $src ."; + + installPhase = '' + mkdir -p $out/share/insomnia $out/lib $out/bin + + mv usr/share/* $out/share/ + mv opt/Insomnia/* $out/share/insomnia + mv $out/share/insomnia/*.so $out/lib/ + + ln -s $out/share/insomnia/insomnia $out/bin/insomnia + ''; + + preFixup = '' + for lib in $out/lib/*.so; do + patchelf --set-rpath "$out/lib:${libPath}" $lib + done + + for bin in $out/bin/insomnia; do + patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ + --set-rpath "$out/lib:${libPath}" \ + $bin + done + + wrapProgram "$out/bin/insomnia" --prefix LD_LIBRARY_PATH : ${runtimeLibs} + ''; + + meta = with stdenv.lib; { + homepage = https://insomnia.rest/; + description = "The most intuitive cross-platform REST API Client"; + license = stdenv.lib.licenses.mit; + platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [ markus1189 ]; + }; + +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 81f48f203a74..3bfb7ab8f64a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7792,7 +7792,9 @@ with pkgs; inotify-tools = callPackage ../development/tools/misc/inotify-tools { }; - intel-gpu-tools = callPackage ../development/tools/misc/intel-gpu-tools {}; + intel-gpu-tools = callPackage ../development/tools/misc/intel-gpu-tools { }; + + insomnia = callPackage ../development/web/insomnia { }; iozone = callPackage ../development/tools/misc/iozone { }; From 6ffd08db7a2c40c525bb5b5741979e8c1cf8d36c Mon Sep 17 00:00:00 2001 From: Vladyslav M Date: Mon, 26 Feb 2018 12:45:16 +0200 Subject: [PATCH 073/814] libgphoto2: 2.5.12 -> 2.5.16 --- pkgs/development/libraries/libgphoto2/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/libgphoto2/default.nix b/pkgs/development/libraries/libgphoto2/default.nix index c498871956a8..9c0ea4a3a73e 100644 --- a/pkgs/development/libraries/libgphoto2/default.nix +++ b/pkgs/development/libraries/libgphoto2/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { owner = "gphoto"; repo = "libgphoto2"; rev = "${meta.tag}"; - sha256 = "0chwnw3d2d1k8g4xidzkpy9f3ci30yz7yvxq1mipp2rbndl1y2am"; + sha256 = "1svbpmxqm56pqkv0rxhlyk4vw7mjgjz8zz4p669qvmw630082yj9"; }; patches = []; @@ -33,8 +33,8 @@ stdenv.mkDerivation rec { MTP, and other vendor specific protocols for controlling and transferring data from digital cameras. ''; - version = "2.5.12"; - tag = "libgphoto2-2_5_12-release"; + version = "2.5.16"; + tag = "libgphoto2-2_5_16-release"; # XXX: the homepage claims LGPL, but several src files are lgpl21Plus license = stdenv.lib.licenses.lgpl21Plus; platforms = with stdenv.lib.platforms; unix; From 969674ff3dcde111ac3cfb9147fbc67275f9de47 Mon Sep 17 00:00:00 2001 From: Vladyslav M Date: Mon, 26 Feb 2018 12:45:39 +0200 Subject: [PATCH 074/814] gphoto2: 2.5.11 -> 2.5.15 --- pkgs/applications/misc/gphoto2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/gphoto2/default.nix b/pkgs/applications/misc/gphoto2/default.nix index 46278f42e7bb..77e7b592f647 100644 --- a/pkgs/applications/misc/gphoto2/default.nix +++ b/pkgs/applications/misc/gphoto2/default.nix @@ -3,11 +3,11 @@ }: stdenv.mkDerivation rec { - name = "gphoto2-2.5.11"; + name = "gphoto2-2.5.15"; src = fetchurl { url = "mirror://sourceforge/gphoto/${name}.tar.bz2"; - sha256 = "1sgr6rsvzzagcwhc8fxbnvz3k02wr2hab0vrbvcb04k5l3b48a1r"; + sha256 = "0xsa12k5fz49v8y4h3zahzr427a3ylxaf0k7hybrkp43g4i1lmxf"; }; nativeBuildInputs = [ pkgconfig gettext libtool ]; From aadaf2097084a3ba21815cc8cee68e0d666324c0 Mon Sep 17 00:00:00 2001 From: Ryan Mulligan Date: Mon, 26 Feb 2018 06:21:03 -0800 Subject: [PATCH 075/814] fprintd: 0.7.0 -> 0.8.0 Semi-automatic update. These checks were performed: - built on NixOS - ran `/nix/store/7rn5cnfv36fyzqfvw2b8gn17amav65im-fprintd-0.8.0/bin/fprintd-verify -h` got 0 exit code - ran `/nix/store/7rn5cnfv36fyzqfvw2b8gn17amav65im-fprintd-0.8.0/bin/fprintd-verify --help` got 0 exit code - ran `/nix/store/7rn5cnfv36fyzqfvw2b8gn17amav65im-fprintd-0.8.0/bin/fprintd-enroll -h` got 0 exit code - ran `/nix/store/7rn5cnfv36fyzqfvw2b8gn17amav65im-fprintd-0.8.0/bin/fprintd-enroll --help` got 0 exit code - found 0.8.0 with grep in /nix/store/7rn5cnfv36fyzqfvw2b8gn17amav65im-fprintd-0.8.0 - found 0.8.0 in filename of file in /nix/store/7rn5cnfv36fyzqfvw2b8gn17amav65im-fprintd-0.8.0 cc "@abbradar" --- pkgs/tools/security/fprintd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/fprintd/default.nix b/pkgs/tools/security/fprintd/default.nix index effdaaecb18a..52bc59abb4cb 100644 --- a/pkgs/tools/security/fprintd/default.nix +++ b/pkgs/tools/security/fprintd/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "fprintd-${version}"; - version = "0.7.0"; + version = "0.8.0"; src = fetchurl { url = "http://people.freedesktop.org/~hadess/${name}.tar.xz"; - sha256 = "05915i0bv7q62fqrs5diqwr8dz3pwqa1c1ivcgggkjyw0xk4ldp5"; + sha256 = "00i21ycaya4x2qf94mys6s94xnbj5cfm8zhhd5sc91lvqjk4r99k"; }; buildInputs = [ libfprint glib dbus-glib polkit nss pam systemd ]; From a2d109e36b4a7336850c3c02f27e40beb493c873 Mon Sep 17 00:00:00 2001 From: Ryan Mulligan Date: Mon, 26 Feb 2018 19:39:25 -0800 Subject: [PATCH 076/814] jruby: 9.1.13.0 -> 9.1.16.0 Semi-automatic update. These checks were performed: - built on NixOS - ran `/nix/store/yxs5d6pasfvp6000pm1sqhj89iirj3mv-jruby-9.1.16.0/bin/jruby -h` got 0 exit code - ran `/nix/store/yxs5d6pasfvp6000pm1sqhj89iirj3mv-jruby-9.1.16.0/bin/jruby --help` got 0 exit code - ran `/nix/store/yxs5d6pasfvp6000pm1sqhj89iirj3mv-jruby-9.1.16.0/bin/jruby -v` and found version 9.1.16.0 - ran `/nix/store/yxs5d6pasfvp6000pm1sqhj89iirj3mv-jruby-9.1.16.0/bin/jruby --version` and found version 9.1.16.0 - ran `/nix/store/yxs5d6pasfvp6000pm1sqhj89iirj3mv-jruby-9.1.16.0/bin/jruby.bash -h` got 0 exit code - ran `/nix/store/yxs5d6pasfvp6000pm1sqhj89iirj3mv-jruby-9.1.16.0/bin/jruby.bash --help` got 0 exit code - ran `/nix/store/yxs5d6pasfvp6000pm1sqhj89iirj3mv-jruby-9.1.16.0/bin/jruby.bash -v` and found version 9.1.16.0 - ran `/nix/store/yxs5d6pasfvp6000pm1sqhj89iirj3mv-jruby-9.1.16.0/bin/jruby.bash --version` and found version 9.1.16.0 - found 9.1.16.0 with grep in /nix/store/yxs5d6pasfvp6000pm1sqhj89iirj3mv-jruby-9.1.16.0 --- pkgs/development/interpreters/jruby/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/jruby/default.nix b/pkgs/development/interpreters/jruby/default.nix index 2224a13ba7c0..b9cc38ee68a3 100644 --- a/pkgs/development/interpreters/jruby/default.nix +++ b/pkgs/development/interpreters/jruby/default.nix @@ -6,11 +6,11 @@ rubyVersion = callPackage ../ruby/ruby-version.nix {} "2" "3" "3" ""; jruby = stdenv.mkDerivation rec { name = "jruby-${version}"; - version = "9.1.13.0"; + version = "9.1.16.0"; src = fetchurl { url = "https://s3.amazonaws.com/jruby.org/downloads/${version}/jruby-bin-${version}.tar.gz"; - sha256 = "021rmm5c18js569i4z6vj1bb193j4nska43jfiqz5hisc936c5cx"; + sha256 = "0nj8v4dcg4jj0z3fk661v6mzrgg4613xr0k9xzzsz81jkqsjnb6r"; }; buildInputs = [ makeWrapper ]; From 38fa748d995ec96fbb1c5697cb1cd902c670ea66 Mon Sep 17 00:00:00 2001 From: Ryan Mulligan Date: Mon, 26 Feb 2018 20:10:09 -0800 Subject: [PATCH 077/814] libbson: 1.8.0 -> 1.9.2 Semi-automatic update. These checks were performed: - built on NixOS - found 1.9.2 with grep in /nix/store/5y9552xapnwpn686pmjgjkdsddrfppr8-libbson-1.9.2 - found 1.9.2 in filename of file in /nix/store/5y9552xapnwpn686pmjgjkdsddrfppr8-libbson-1.9.2 --- pkgs/development/libraries/libbson/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libbson/default.nix b/pkgs/development/libraries/libbson/default.nix index 28a6aee67c1e..f3c58baf5a11 100644 --- a/pkgs/development/libraries/libbson/default.nix +++ b/pkgs/development/libraries/libbson/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "libbson-${version}"; - version = "1.8.0"; + version = "1.9.2"; src = fetchFromGitHub { owner = "mongodb"; repo = "libbson"; rev = version; - sha256 = "1bd9z07q3faq5k4521d9inv0j836w6hrsd0vj2sapjlq8jmqgslg"; + sha256 = "1dlmcqsb43269z4pa3xmqb1gf1jsji82sk5yyibq0ndhk326iyck"; }; nativeBuildInputs = [ cmake ]; From 9827b819adfcaa1037bbf07526c6382d8547eac9 Mon Sep 17 00:00:00 2001 From: Ryan Mulligan Date: Mon, 26 Feb 2018 20:21:32 -0800 Subject: [PATCH 078/814] libebur128: 1.0.2 -> 1.2.4 Semi-automatic update. These checks were performed: - built on NixOS - found 1.2.4 with grep in /nix/store/m2zvs6x1g15cz7gbf97wdn89gw7swwal-libebur128-1.2.4 - found 1.2.4 in filename of file in /nix/store/m2zvs6x1g15cz7gbf97wdn89gw7swwal-libebur128-1.2.4 cc "@andrewrk" --- pkgs/development/libraries/libebur128/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libebur128/default.nix b/pkgs/development/libraries/libebur128/default.nix index 8281036e7491..6a4078f92cf3 100644 --- a/pkgs/development/libraries/libebur128/default.nix +++ b/pkgs/development/libraries/libebur128/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, cmake, speexdsp, pkgconfig }: stdenv.mkDerivation rec { - version = "1.0.2"; + version = "1.2.4"; name = "libebur128-${version}"; src = fetchFromGitHub { owner = "jiixyj"; repo = "libebur128"; rev = "v${version}"; - sha256 = "19vy3ldbf931hjvn9jf9dvw1di3yx9ljxyk2yp5cnac1wqiza3jm"; + sha256 = "0n81rnm8dm1zmibkr2v3q79rsd609y0dbbsrbay18njcjva88p0g"; }; nativeBuildInputs = [ pkgconfig ]; From b7ec621e91b2653d8ddb72cc8bb8e5972d30717d Mon Sep 17 00:00:00 2001 From: adisbladis Date: Tue, 27 Feb 2018 20:07:35 +0800 Subject: [PATCH 079/814] jquery & jquery-ui: Move to nixos/lib/testing/ These (outdated) derivations are only used by nixos/lib/testing.nix. If we want to provide jquery & jquery-ui packages this is better done in nodePackages. --- nixos/lib/testing.nix | 10 +++++++--- .../default.nix => nixos/lib/testing/jquery-ui.nix | 0 .../jquery/default.nix => nixos/lib/testing/jquery.nix | 0 pkgs/top-level/aliases.nix | 1 - pkgs/top-level/all-packages.nix | 4 ---- 5 files changed, 7 insertions(+), 8 deletions(-) rename pkgs/development/libraries/javascript/jquery-ui/default.nix => nixos/lib/testing/jquery-ui.nix (100%) rename pkgs/development/libraries/javascript/jquery/default.nix => nixos/lib/testing/jquery.nix (100%) diff --git a/nixos/lib/testing.nix b/nixos/lib/testing.nix index efcafbaa5554..d990a5f8b6ac 100644 --- a/nixos/lib/testing.nix +++ b/nixos/lib/testing.nix @@ -3,7 +3,11 @@ with import ./build-vms.nix { inherit system minimal config; }; with pkgs; -rec { +let + jquery-ui = callPackage ./testing/jquery-ui.nix { }; + jquery = callPackage ./testing/jquery.nix { }; + +in rec { inherit pkgs; @@ -143,8 +147,8 @@ rec { test = passMeta (runTests driver); report = passMeta (releaseTools.gcovReport { coverageRuns = [ test ]; }); - in (if makeCoverageReport then report else test) // { - inherit nodes driver test; + in (if makeCoverageReport then report else test) // { + inherit nodes driver test; }; runInMachine = diff --git a/pkgs/development/libraries/javascript/jquery-ui/default.nix b/nixos/lib/testing/jquery-ui.nix similarity index 100% rename from pkgs/development/libraries/javascript/jquery-ui/default.nix rename to nixos/lib/testing/jquery-ui.nix diff --git a/pkgs/development/libraries/javascript/jquery/default.nix b/nixos/lib/testing/jquery.nix similarity index 100% rename from pkgs/development/libraries/javascript/jquery/default.nix rename to nixos/lib/testing/jquery.nix diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 06da21813ae3..c65d3efb3681 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -103,7 +103,6 @@ mapAliases (rec { inotifyTools = inotify-tools; joseki = apache-jena-fuseki; # added 2016-02-28 json_glib = json-glib; # added 2018-02-25 - jquery_ui = jquery-ui; # added 2014-09-07 kdiff3-qt5 = kdiff3; # added 2017-02-18 keepassx2-http = keepassx-reboot; # added 2016-10-17 keepassx-reboot = keepassx-community; # added 2017-02-01 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1ba3e8f29793..9708a5bf856a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11873,10 +11873,6 @@ with pkgs; ### DEVELOPMENT / LIBRARIES / JAVASCRIPT - jquery = callPackage ../development/libraries/javascript/jquery { }; - - jquery-ui = callPackage ../development/libraries/javascript/jquery-ui { }; - yuicompressor = callPackage ../development/tools/yuicompressor { }; ### DEVELOPMENT / BOWER MODULES (JAVASCRIPT) From 11483338b997f323291ae34944a9c82ac06df5ec Mon Sep 17 00:00:00 2001 From: Linus Heckemann Date: Tue, 27 Feb 2018 12:48:39 +0000 Subject: [PATCH 080/814] vboot_reference: disable host autodetection --- pkgs/tools/system/vboot_reference/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/system/vboot_reference/default.nix b/pkgs/tools/system/vboot_reference/default.nix index e410ef1cee50..8bde7c775022 100644 --- a/pkgs/tools/system/vboot_reference/default.nix +++ b/pkgs/tools/system/vboot_reference/default.nix @@ -25,6 +25,7 @@ stdenv.mkDerivation rec { makeFlags = [ "DESTDIR=$(out)" + "HOST_ARCH=${stdenv.hostPlatform.parsed.cpu.name}" ]; postInstall = '' From 2970a9e5dbe663c0d0536f6339fa83cae5ea0f55 Mon Sep 17 00:00:00 2001 From: Linus Heckemann Date: Tue, 27 Feb 2018 12:48:54 +0000 Subject: [PATCH 081/814] vboot_reference: add self as maintainer --- pkgs/tools/system/vboot_reference/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/system/vboot_reference/default.nix b/pkgs/tools/system/vboot_reference/default.nix index 8bde7c775022..ba885555cde1 100644 --- a/pkgs/tools/system/vboot_reference/default.nix +++ b/pkgs/tools/system/vboot_reference/default.nix @@ -33,9 +33,10 @@ stdenv.mkDerivation rec { cp -r tests/devkeys* $out/share/vboot/ ''; - meta = { + meta = with stdenv.lib; { description = "Chrome OS partitioning and kernel signing tools"; - license = stdenv.lib.licenses.bsd3; - platforms = stdenv.lib.platforms.linux; + license = licenses.bsd3; + platforms = platforms.linux; + maintainers = with maintainers; [ lheckemann ]; }; } From 21dcead5f0c3d548ad4642a4e8663e3c9c97536e Mon Sep 17 00:00:00 2001 From: Rodney Lorrimar Date: Sat, 24 Feb 2018 08:44:27 +0000 Subject: [PATCH 082/814] nixos/pump.io: remove This would probably be better maintained in a separate repo as an external NixOS module which gets imported into user's configuration. --- nixos/modules/misc/ids.nix | 2 +- nixos/modules/module-list.nix | 1 - .../services/web-apps/pump.io-configure.js | 23 - nixos/modules/services/web-apps/pump.io.nix | 438 -- nixos/release.nix | 1 - nixos/tests/pump.io.nix | 89 - pkgs/servers/web-apps/pump.io/composition.nix | 16 - pkgs/servers/web-apps/pump.io/default.nix | 53 - pkgs/servers/web-apps/pump.io/generate.sh | 37 - .../web-apps/pump.io/node-packages.json | 7 - .../web-apps/pump.io/node-packages.nix | 4889 ----------------- pkgs/top-level/all-packages.nix | 2 - 12 files changed, 1 insertion(+), 5557 deletions(-) delete mode 100644 nixos/modules/services/web-apps/pump.io-configure.js delete mode 100644 nixos/modules/services/web-apps/pump.io.nix delete mode 100644 nixos/tests/pump.io.nix delete mode 100644 pkgs/servers/web-apps/pump.io/composition.nix delete mode 100644 pkgs/servers/web-apps/pump.io/default.nix delete mode 100755 pkgs/servers/web-apps/pump.io/generate.sh delete mode 100644 pkgs/servers/web-apps/pump.io/node-packages.json delete mode 100644 pkgs/servers/web-apps/pump.io/node-packages.nix diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix index c0c6a6ef9244..89ae647dc3d8 100644 --- a/nixos/modules/misc/ids.nix +++ b/nixos/modules/misc/ids.nix @@ -233,7 +233,7 @@ calibre-server = 213; heapster = 214; bepasty = 215; - pumpio = 216; + # pumpio = 216; # unused, removed 2018-02-24 nm-openvpn = 217; mathics = 218; ejabberd = 219; diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 3b92bc76b97e..d71fece99d2b 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -639,7 +639,6 @@ ./services/web-apps/nexus.nix ./services/web-apps/pgpkeyserver-lite.nix ./services/web-apps/matomo.nix - ./services/web-apps/pump.io.nix ./services/web-apps/restya-board.nix ./services/web-apps/tt-rss.nix ./services/web-apps/selfoss.nix diff --git a/nixos/modules/services/web-apps/pump.io-configure.js b/nixos/modules/services/web-apps/pump.io-configure.js deleted file mode 100644 index 1fbf346a34c4..000000000000 --- a/nixos/modules/services/web-apps/pump.io-configure.js +++ /dev/null @@ -1,23 +0,0 @@ -var fs = require('fs'); - -var opts = JSON.parse(fs.readFileSync("/dev/stdin").toString()); -var config = opts.config; - -var readSecret = function(filename) { - return fs.readFileSync(filename).toString().trim(); -}; - -if (opts.secretFile) { - config.secret = readSecret(opts.secretFile); -} -if (opts.dbPasswordFile) { - config.params.dbpass = readSecret(opts.dbPasswordFile); -} -if (opts.smtpPasswordFile) { - config.smtppass = readSecret(opts.smtpPasswordFile); -} -if (opts.spamClientSecretFile) { - config.spamclientsecret = readSecret(opts.opts.spamClientSecretFile); -} - -fs.writeFileSync(opts.outputFile, JSON.stringify(config)); diff --git a/nixos/modules/services/web-apps/pump.io.nix b/nixos/modules/services/web-apps/pump.io.nix deleted file mode 100644 index 27ae68516367..000000000000 --- a/nixos/modules/services/web-apps/pump.io.nix +++ /dev/null @@ -1,438 +0,0 @@ -{ config, lib, pkgs, ... }: - -with lib; - -let - cfg = config.services.pumpio; - dataDir = "/var/lib/pump.io"; - runDir = "/run/pump.io"; - user = "pumpio"; - - optionalSet = condition: value: if condition then value else {}; - - configScript = ./pump.io-configure.js; - configOptions = { - outputFile = "${runDir}/config.json"; - config = - (optionalSet (cfg.driver != "disk") { - driver = cfg.driver; - }) // - { - params = (optionalSet (cfg.driver == "disk") { dir = dataDir; }) // - (optionalSet (cfg.driver == "mongodb" || cfg.driver == "redis") { - host = cfg.dbHost; - port = cfg.dbPort; - dbname = cfg.dbName; - dbuser = cfg.dbUser; - dbpass = cfg.dbPassword; - }) // - (optionalSet (cfg.driver == "memcached") { - host = cfg.dbHost; - port = cfg.dbPort; - }) // cfg.driverParams; - secret = cfg.secret; - - address = cfg.address; - port = cfg.port; - - noweb = false; - urlPort = cfg.urlPort; - hostname = cfg.hostname; - favicon = cfg.favicon; - - site = cfg.site; - owner = cfg.owner; - ownerURL = cfg.ownerURL; - - key = cfg.sslKey; - cert = cfg.sslCert; - bounce = false; - - spamhost = cfg.spamHost; - spamclientid = cfg.spamClientId; - spamclientsecret = cfg.spamClientSecret; - - requireEmail = cfg.requireEmail; - smtpserver = cfg.smtpHost; - smtpport = cfg.smtpPort; - smtpuser = cfg.smtpUser; - smtppass = cfg.smtpPassword; - smtpusessl = cfg.smtpUseSSL; - smtpfrom = cfg.smtpFrom; - - nologger = false; - enableUploads = cfg.enableUploads; - datadir = dataDir; - debugClient = false; - firehose = cfg.firehose; - disableRegistration = cfg.disableRegistration; - - inherit (cfg) secretFile dbPasswordFile smtpPasswordFile spamClientSecretFile; - } // - (optionalSet (cfg.port < 1024) { - serverUser = user; # have pump.io listen then drop privileges - }) // cfg.extraConfig; -}; in { - options = { - - services.pumpio = { - - enable = mkEnableOption "Pump.io social streams server"; - - secret = mkOption { - type = types.nullOr types.str; - default = null; - example = "my dog has fleas"; - description = '' - A session-generating secret, server-wide password. Warning: - this is stored in cleartext in the Nix store! - ''; - }; - - secretFile = mkOption { - type = types.nullOr types.path; - default = null; - example = "/run/keys/pump.io-secret"; - description = '' - A file containing the session-generating secret, - server-wide password. - ''; - }; - - site = mkOption { - type = types.str; - example = "Awesome Sauce"; - description = "Name of the server"; - }; - - owner = mkOption { - type = types.str; - default = ""; - example = "Awesome Inc."; - description = "Name of owning entity, if you want to link to it."; - }; - - ownerURL = mkOption { - type = types.str; - default = ""; - example = "https://pump.io"; - description = "URL of owning entity, if you want to link to it."; - }; - - address = mkOption { - type = types.str; - default = "localhost"; - description = '' - Web server listen address. - ''; - }; - - port = mkOption { - type = types.int; - default = 31337; - description = '' - Port to listen on. Defaults to 31337, which is suitable for - running behind a reverse proxy. For a standalone server, - use 443. - ''; - }; - - hostname = mkOption { - type = types.nullOr types.str; - default = "localhost"; - description = '' - The hostname of the server, used for generating - URLs. Defaults to "localhost" which doesn't do much for you. - ''; - }; - - urlPort = mkOption { - type = types.int; - default = 443; - description = '' - Port to use for generating URLs. This basically has to be - either 80 or 443 because the host-meta and Webfinger - protocols don't make any provision for HTTP/HTTPS servers - running on other ports. - ''; - }; - - favicon = mkOption { - type = types.nullOr types.path; - default = null; - description = '' - Local filesystem path to the favicon.ico file to use. This - will be served as "/favicon.ico" by the server. - ''; - }; - - enableUploads = mkOption { - type = types.bool; - default = true; - description = '' - If you want to disable file uploads, set this to false. Uploaded files will be stored - in ${dataDir}/uploads. - ''; - }; - - sslKey = mkOption { - type = types.path; - example = "${dataDir}/myserver.key"; - default = ""; - description = '' - The path to the server certificate private key. The - certificate is required, but it can be self-signed. - ''; - }; - - sslCert = mkOption { - type = types.path; - example = "${dataDir}/myserver.crt"; - default = ""; - description = '' - The path to the server certificate. The certificate is - required, but it can be self-signed. - ''; - }; - - firehose = mkOption { - type = types.str; - default = "ofirehose.com"; - description = '' - Firehose host running the ofirehose software. Defaults to - "ofirehose.com". Public notices will be ping this firehose - server and from there go out to search engines and the - world. If you want to disconnect from the public web, set - this to something falsy. - ''; - }; - - disableRegistration = mkOption { - type = types.bool; - default = false; - description = '' - Disables registering new users on the site through the Web - or the API. - ''; - }; - - requireEmail = mkOption { - type = types.bool; - default = false; - description = "Require an e-mail address to register."; - }; - - extraConfig = mkOption { - default = { }; - description = '' - Extra configuration options which are serialized to json and added - to the pump.io.json config file. - ''; - }; - - driver = mkOption { - type = types.enum [ "mongodb" "disk" "lrucache" "memcached" "redis" ]; - default = "mongodb"; - description = "Type of database. Corresponds to a nodejs databank driver."; - }; - - driverParams = mkOption { - default = { }; - description = "Extra parameters for the driver."; - }; - - dbHost = mkOption { - type = types.str; - default = "localhost"; - description = "The database host to connect to."; - }; - - dbPort = mkOption { - type = types.int; - default = 27017; - description = "The port that the database is listening on."; - }; - - dbName = mkOption { - type = types.str; - default = "pumpio"; - description = "The name of the database to use."; - }; - - dbUser = mkOption { - type = types.nullOr types.str; - default = null; - description = '' - The username. Defaults to null, meaning no authentication. - ''; - }; - - dbPassword = mkOption { - type = types.nullOr types.str; - default = null; - description = '' - The password corresponding to dbUser. Warning: this is - stored in cleartext in the Nix store! - ''; - }; - - dbPasswordFile = mkOption { - type = types.nullOr types.path; - default = null; - example = "/run/keys/pump.io-dbpassword"; - description = '' - A file containing the password corresponding to dbUser. - ''; - }; - - smtpHost = mkOption { - type = types.nullOr types.str; - default = null; - example = "localhost"; - description = '' - Server to use for sending transactional email. If it's not - set up, no email is sent and features like password recovery - and email notification won't work. - ''; - }; - - smtpPort = mkOption { - type = types.int; - default = 25; - description = '' - Port to connect to on SMTP server. - ''; - }; - - smtpUser = mkOption { - type = types.nullOr types.str; - default = null; - description = '' - Username to use to connect to SMTP server. Might not be - necessary for some servers. - ''; - }; - - smtpPassword = mkOption { - type = types.nullOr types.str; - default = null; - description = '' - Password to use to connect to SMTP server. Might not be - necessary for some servers. Warning: this is stored in - cleartext in the Nix store! - ''; - }; - - smtpPasswordFile = mkOption { - type = types.nullOr types.path; - default = null; - example = "/run/keys/pump.io-smtppassword"; - description = '' - A file containing the password used to connect to SMTP - server. Might not be necessary for some servers. - ''; - }; - - - smtpUseSSL = mkOption { - type = types.bool; - default = false; - description = '' - Only use SSL with the SMTP server. By default, a SSL - connection is negotiated using TLS. You may need to change - the smtpPort value if you set this. - ''; - }; - - smtpFrom = mkOption { - type = types.nullOr types.str; - default = null; - description = '' - Email address to use in the "From:" header of outgoing - notifications. Defaults to 'no-reply@' plus the site - hostname. - ''; - }; - - spamHost = mkOption { - type = types.nullOr types.str; - default = null; - description = '' - Host running activityspam software to use to test updates - for spam. - ''; - }; - spamClientId = mkOption { - type = types.nullOr types.str; - default = null; - description = "OAuth pair for spam server."; - }; - spamClientSecret = mkOption { - type = types.nullOr types.str; - default = null; - description = '' - OAuth pair for spam server. Warning: this is - stored in cleartext in the Nix store! - ''; - }; - spamClientSecretFile = mkOption { - type = types.nullOr types.path; - default = null; - example = "/run/keys/pump.io-spamclientsecret"; - description = '' - A file containing the OAuth key for the spam server. - ''; - }; - }; - - }; - - config = mkIf cfg.enable { - warnings = let warn = k: optional (cfg.${k} != null) - "config.services.pumpio.${k} is insecure. Use ${k}File instead."; - in concatMap warn [ "secret" "dbPassword" "smtpPassword" "spamClientSecret" ]; - - assertions = [ - { assertion = !(isNull cfg.secret && isNull cfg.secretFile); - message = "pump.io needs a secretFile configured"; - } - ]; - - systemd.services."pump.io" = - { description = "Pump.io - stream server that does most of what people really want from a social network"; - after = [ "network.target" ]; - wantedBy = [ "multi-user.target" ]; - - preStart = '' - mkdir -p ${dataDir}/uploads - mkdir -p ${runDir} - chown pumpio:pumpio ${dataDir}/uploads ${runDir} - chmod 770 ${dataDir}/uploads ${runDir} - - ${pkgs.nodejs}/bin/node ${configScript} <waitForUnit("pump.io.service"); - $one->waitUntilSucceeds("curl -k https://localhost"); - ''; -}) diff --git a/pkgs/servers/web-apps/pump.io/composition.nix b/pkgs/servers/web-apps/pump.io/composition.nix deleted file mode 100644 index da8cc0e73b13..000000000000 --- a/pkgs/servers/web-apps/pump.io/composition.nix +++ /dev/null @@ -1,16 +0,0 @@ -# This file has been generated by node2nix 1.2.0. Do not edit! - -{pkgs ? import { - inherit system; - }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-6_x"}: - -let - nodeEnv = import ../../../development/node-packages/node-env.nix { - inherit (pkgs) stdenv python2 utillinux runCommand writeTextFile; - inherit nodejs; - }; -in -import ./node-packages.nix { - inherit (pkgs) fetchurl fetchgit; - inherit nodeEnv; -} diff --git a/pkgs/servers/web-apps/pump.io/default.nix b/pkgs/servers/web-apps/pump.io/default.nix deleted file mode 100644 index f888566cad66..000000000000 --- a/pkgs/servers/web-apps/pump.io/default.nix +++ /dev/null @@ -1,53 +0,0 @@ -{ pkgs, system, stdenv, fetchurl, makeWrapper, nodejs, graphicsmagick }: - -with stdenv.lib; - -let - # To regenerate composition.nix, run generate.sh. - nodePackages = import ./composition.nix { - inherit pkgs system nodejs; - }; -in -nodePackages.package.override (oldAttrs: { - buildInputs = oldAttrs.buildInputs ++ [ makeWrapper ]; - - postInstall = '' - for prog in pump pump-authorize pump-follow pump-post-note pump-register-app pump-register-user pump-stop-following; do - wrapProgram "$out/bin/$prog" \ - --prefix PATH : ${graphicsmagick}/bin:$out/bin - done - ''; - - passthru.names = ["pump.io"]; - - meta = { - description = "Social server with an ActivityStreams API"; - homepage = http://pump.io/; - license = licenses.asl20; - platforms = platforms.unix; - maintainers = [ maintainers.rvl ]; - longDescription = '' - This is pump.io. It's a stream server that does most of what - people really want from a social network. - - What's it for? - - I post something and my followers see it. That's the rough idea - behind the pump. - - There's an API defined in the API.md file. It uses - activitystrea.ms JSON as the main data and command format. - - You can post almost anything that can be represented with - activity streams -- short or long text, bookmarks, images, - video, audio, events, geo checkins. You can follow friends, - create lists of people, and so on. - - The software is useful for at least these scenarios: - - * Mobile-first social networking - * Activity stream functionality for an existing app - * Experimenting with social software - ''; - }; -}) diff --git a/pkgs/servers/web-apps/pump.io/generate.sh b/pkgs/servers/web-apps/pump.io/generate.sh deleted file mode 100755 index 6dc91c72c09e..000000000000 --- a/pkgs/servers/web-apps/pump.io/generate.sh +++ /dev/null @@ -1,37 +0,0 @@ -#! /usr/bin/env nix-shell -#! nix-shell -i bash -p nodePackages.node2nix curl jshon - -set -e - -# Normally, this node2nix invocation would be sufficient: -# exec node2nix --input node-packages.json --composition composition.nix -# -# But pump.io soft-depends on extra modules, which have to be *inside* -# its own node_modules, not beside them. -# -# So we hack these extra deps into package.json and feed that into -# node2nix. -# -# Also jshon does funny things with slashes in strings, which can be -# fixed with sed. - -VERSION="3.0.0" -URL="https://registry.npmjs.org/pump.io/-/pump.io-$VERSION.tgz" -SHA1="ycfm7ak83xi8mgafhp9q0n6n3kzmdz16" - -curl https://raw.githubusercontent.com/e14n/pump.io/v$VERSION/package.json | \ - jshon -e dependencies \ - -s '*' -i databank-mongodb \ - -s '*' -i databank-redis \ - -s '*' -i databank-lrucache \ - -p | sed 's=\\/=/=g' > full-package.json - -node2nix --input full-package.json --composition composition.nix --node-env ../../../development/node-packages/node-env.nix - -# overriding nodePackages src doesn't seem to work, so... -sed -i "s|src = ./.|src = fetchurl { url = \"$URL\"; sha1 = \"$SHA1\"; }|" node-packages.nix - -# fetchgit or node2nix is having problems with submodules or something. -# This is the sha256 for connect-auth which is a npm dep hosted on -# github and containing submodules. -sed -i "s|d08fecbb72aff14ecb39dc310e8965ba92228f0c0def41fbde3db5ea7a1aac19|1b052xpj10hanx21286i5w0jrwxxkiwbdzpdngg9s2j1m7a9543b|" node-packages.nix diff --git a/pkgs/servers/web-apps/pump.io/node-packages.json b/pkgs/servers/web-apps/pump.io/node-packages.json deleted file mode 100644 index 294da7ab2f1c..000000000000 --- a/pkgs/servers/web-apps/pump.io/node-packages.json +++ /dev/null @@ -1,7 +0,0 @@ -[ - "pump.io", - "databank-mongodb", - "databank-redis", - "databank-memcached", - "databank-lrucache" -] diff --git a/pkgs/servers/web-apps/pump.io/node-packages.nix b/pkgs/servers/web-apps/pump.io/node-packages.nix deleted file mode 100644 index ca27c79fab90..000000000000 --- a/pkgs/servers/web-apps/pump.io/node-packages.nix +++ /dev/null @@ -1,4889 +0,0 @@ -# This file has been generated by node2nix 1.2.0. Do not edit! - -{nodeEnv, fetchurl, fetchgit, globalBuildInputs ? []}: - -let - sources = { - "bcrypt-0.8.7" = { - name = "bcrypt"; - packageName = "bcrypt"; - version = "0.8.7"; - src = fetchurl { - url = "https://registry.npmjs.org/bcrypt/-/bcrypt-0.8.7.tgz"; - sha1 = "bc3875a9afd0a7b2cd231a6a7f218a5ce156b093"; - }; - }; - "bunyan-1.8.9" = { - name = "bunyan"; - packageName = "bunyan"; - version = "1.8.9"; - src = fetchurl { - url = "https://registry.npmjs.org/bunyan/-/bunyan-1.8.9.tgz"; - sha1 = "2c7c9d422ea64ee2465d52b4decd72de0657401a"; - }; - }; - "colors-1.1.2" = { - name = "colors"; - packageName = "colors"; - version = "1.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/colors/-/colors-1.1.2.tgz"; - sha1 = "168a4701756b6a7f51a12ce0c97bfa28c084ed63"; - }; - }; - "connect-2.30.2" = { - name = "connect"; - packageName = "connect"; - version = "2.30.2"; - src = fetchurl { - url = "https://registry.npmjs.org/connect/-/connect-2.30.2.tgz"; - sha1 = "8da9bcbe8a054d3d318d74dfec903b5c39a1b609"; - }; - }; - "connect-auth-git://github.com/e14n/connect-auth" = { - name = "connect-auth"; - packageName = "connect-auth"; - version = "0.6.0"; - src = fetchgit { - url = "git://github.com/e14n/connect-auth"; - rev = "ae4e3c4c86a5d266be7bd91c2b99856f9a37b1ec"; - sha256 = "1b052xpj10hanx21286i5w0jrwxxkiwbdzpdngg9s2j1m7a9543b"; - }; - }; - "connect-databank-1.0.3" = { - name = "connect-databank"; - packageName = "connect-databank"; - version = "1.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/connect-databank/-/connect-databank-1.0.3.tgz"; - sha1 = "dad24f08dc385d9c3a94f1a52730aec0c7d13b02"; - }; - }; - "connect-multiparty-2.0.0" = { - name = "connect-multiparty"; - packageName = "connect-multiparty"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/connect-multiparty/-/connect-multiparty-2.0.0.tgz"; - sha1 = "57a7b61cc7b31b6eef4a62878d60d771b23699ab"; - }; - }; - "crypto-cacerts-0.1.0" = { - name = "crypto-cacerts"; - packageName = "crypto-cacerts"; - version = "0.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/crypto-cacerts/-/crypto-cacerts-0.1.0.tgz"; - sha1 = "3499c6dff949ab005d4ad4a3f09c48ced6c88a41"; - }; - }; - "databank-0.19.8" = { - name = "databank"; - packageName = "databank"; - version = "0.19.8"; - src = fetchurl { - url = "https://registry.npmjs.org/databank/-/databank-0.19.8.tgz"; - sha1 = "bf73d6b4fc002045793faeff2b1c3fabc9999844"; - }; - }; - "dateformat-1.0.12" = { - name = "dateformat"; - packageName = "dateformat"; - version = "1.0.12"; - src = fetchurl { - url = "https://registry.npmjs.org/dateformat/-/dateformat-1.0.12.tgz"; - sha1 = "9f124b67594c937ff706932e4a642cca8dbbfee9"; - }; - }; - "dialback-client-0.2.0" = { - name = "dialback-client"; - packageName = "dialback-client"; - version = "0.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/dialback-client/-/dialback-client-0.2.0.tgz"; - sha1 = "051806a88a6cc18ffb25adf13eda232e354ebcb6"; - }; - }; - "dompurify-0.8.5" = { - name = "dompurify"; - packageName = "dompurify"; - version = "0.8.5"; - src = fetchurl { - url = "https://registry.npmjs.org/dompurify/-/dompurify-0.8.5.tgz"; - sha1 = "5bc591b61e222243cc827ca382d7a2e2660c1a44"; - }; - }; - "emailjs-1.0.8" = { - name = "emailjs"; - packageName = "emailjs"; - version = "1.0.8"; - src = fetchurl { - url = "https://registry.npmjs.org/emailjs/-/emailjs-1.0.8.tgz"; - sha1 = "d4240db7670dc78aff97352092d8460edc130f66"; - }; - }; - "express-3.21.2" = { - name = "express"; - packageName = "express"; - version = "3.21.2"; - src = fetchurl { - url = "https://registry.npmjs.org/express/-/express-3.21.2.tgz"; - sha1 = "0c2903ee5c54e63d65a96170764703550665a3de"; - }; - }; - "express-session-1.15.2" = { - name = "express-session"; - packageName = "express-session"; - version = "1.15.2"; - src = fetchurl { - url = "https://registry.npmjs.org/express-session/-/express-session-1.15.2.tgz"; - sha1 = "d98516443a4ccb8688e1725ae584c02daa4093d4"; - }; - }; - "gm-1.23.0" = { - name = "gm"; - packageName = "gm"; - version = "1.23.0"; - src = fetchurl { - url = "https://registry.npmjs.org/gm/-/gm-1.23.0.tgz"; - sha1 = "80a2fe9cbf131515024846444658461269f52661"; - }; - }; - "helmet-3.5.0" = { - name = "helmet"; - packageName = "helmet"; - version = "3.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/helmet/-/helmet-3.5.0.tgz"; - sha1 = "e1d6de27d2e3317d3182e00d672df3d0e1e12539"; - }; - }; - "jade-1.11.0" = { - name = "jade"; - packageName = "jade"; - version = "1.11.0"; - src = fetchurl { - url = "https://registry.npmjs.org/jade/-/jade-1.11.0.tgz"; - sha1 = "9c80e538c12d3fb95c8d9bb9559fa0cc040405fd"; - }; - }; - "jankyqueue-0.1.1" = { - name = "jankyqueue"; - packageName = "jankyqueue"; - version = "0.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/jankyqueue/-/jankyqueue-0.1.1.tgz"; - sha1 = "4181b0318fb32e77aee8c54af73f97660f2e88d2"; - }; - }; - "jsdom-7.2.2" = { - name = "jsdom"; - packageName = "jsdom"; - version = "7.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/jsdom/-/jsdom-7.2.2.tgz"; - sha1 = "40b402770c2bda23469096bee91ab675e3b1fc6e"; - }; - }; - "method-override-2.3.8" = { - name = "method-override"; - packageName = "method-override"; - version = "2.3.8"; - src = fetchurl { - url = "https://registry.npmjs.org/method-override/-/method-override-2.3.8.tgz"; - sha1 = "178234bf4bab869f89df9444b06fc6147b44828c"; - }; - }; - "mkdirp-0.5.1" = { - name = "mkdirp"; - packageName = "mkdirp"; - version = "0.5.1"; - src = fetchurl { - url = "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.1.tgz"; - sha1 = "30057438eac6cf7f8c4767f38648d6697d75c903"; - }; - }; - "oauth-evanp-0.9.10-evanp.2" = { - name = "oauth-evanp"; - packageName = "oauth-evanp"; - version = "0.9.10-evanp.2"; - src = fetchurl { - url = "https://registry.npmjs.org/oauth-evanp/-/oauth-evanp-0.9.10-evanp.2.tgz"; - sha1 = "9b5fb3508cea584420855957d56531405cf53a02"; - }; - }; - "octal-1.0.0" = { - name = "octal"; - packageName = "octal"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/octal/-/octal-1.0.0.tgz"; - sha1 = "63e7162a68efbeb9e213588d58e989d1e5c4530b"; - }; - }; - "optimist-0.6.1" = { - name = "optimist"; - packageName = "optimist"; - version = "0.6.1"; - src = fetchurl { - url = "https://registry.npmjs.org/optimist/-/optimist-0.6.1.tgz"; - sha1 = "da3ea74686fa21a19a111c326e90eb15a0196686"; - }; - }; - "rimraf-2.6.1" = { - name = "rimraf"; - packageName = "rimraf"; - version = "2.6.1"; - src = fetchurl { - url = "https://registry.npmjs.org/rimraf/-/rimraf-2.6.1.tgz"; - sha1 = "c2338ec643df7a1b7fe5c54fa86f57428a55f33d"; - }; - }; - "sanitize-html-1.14.1" = { - name = "sanitize-html"; - packageName = "sanitize-html"; - version = "1.14.1"; - src = fetchurl { - url = "https://registry.npmjs.org/sanitize-html/-/sanitize-html-1.14.1.tgz"; - sha1 = "730ffa2249bdf18333effe45b286173c9c5ad0b8"; - }; - }; - "schlock-0.2.1" = { - name = "schlock"; - packageName = "schlock"; - version = "0.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/schlock/-/schlock-0.2.1.tgz"; - sha1 = "2a9aaeaa209a5422eadc5dfc005e2c2f15241f99"; - }; - }; - "send-0.13.2" = { - name = "send"; - packageName = "send"; - version = "0.13.2"; - src = fetchurl { - url = "https://registry.npmjs.org/send/-/send-0.13.2.tgz"; - sha1 = "765e7607c8055452bba6f0b052595350986036de"; - }; - }; - "showdown-1.6.4" = { - name = "showdown"; - packageName = "showdown"; - version = "1.6.4"; - src = fetchurl { - url = "https://registry.npmjs.org/showdown/-/showdown-1.6.4.tgz"; - sha1 = "056bbb654ecdb8d8643ae12d6d597893ccaf46c6"; - }; - }; - "sockjs-0.3.18" = { - name = "sockjs"; - packageName = "sockjs"; - version = "0.3.18"; - src = fetchurl { - url = "https://registry.npmjs.org/sockjs/-/sockjs-0.3.18.tgz"; - sha1 = "d9b289316ca7df77595ef299e075f0f937eb4207"; - }; - }; - "ssl-config-0.0.9" = { - name = "ssl-config"; - packageName = "ssl-config"; - version = "0.0.9"; - src = fetchurl { - url = "https://registry.npmjs.org/ssl-config/-/ssl-config-0.0.9.tgz"; - sha1 = "905ed1b7ddd0564aa9395cd4ae7146907351ff2c"; - }; - }; - "step-1.0.0" = { - name = "step"; - packageName = "step"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/step/-/step-1.0.0.tgz"; - sha1 = "b300e9d2ae9057d4d78633aae2303813a94bdff2"; - }; - }; - "ua-parser-js-0.7.12" = { - name = "ua-parser-js"; - packageName = "ua-parser-js"; - version = "0.7.12"; - src = fetchurl { - url = "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-0.7.12.tgz"; - sha1 = "04c81a99bdd5dc52263ea29d24c6bf8d4818a4bb"; - }; - }; - "underscore-1.8.3" = { - name = "underscore"; - packageName = "underscore"; - version = "1.8.3"; - src = fetchurl { - url = "https://registry.npmjs.org/underscore/-/underscore-1.8.3.tgz"; - sha1 = "4f3fb53b106e6097fcf9cb4109f2a5e9bdfa5022"; - }; - }; - "underscore-contrib-0.3.0" = { - name = "underscore-contrib"; - packageName = "underscore-contrib"; - version = "0.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/underscore-contrib/-/underscore-contrib-0.3.0.tgz"; - sha1 = "665b66c24783f8fa2b18c9f8cbb0e2c7d48c26c7"; - }; - }; - "uuid-3.0.1" = { - name = "uuid"; - packageName = "uuid"; - version = "3.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/uuid/-/uuid-3.0.1.tgz"; - sha1 = "6544bba2dfda8c1cf17e629a3a305e2bb1fee6c1"; - }; - }; - "validator-4.4.0" = { - name = "validator"; - packageName = "validator"; - version = "4.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/validator/-/validator-4.4.0.tgz"; - sha1 = "35e29555dd5f7826f970a4eaecff9e6df6df3da6"; - }; - }; - "webfinger-0.4.2" = { - name = "webfinger"; - packageName = "webfinger"; - version = "0.4.2"; - src = fetchurl { - url = "https://registry.npmjs.org/webfinger/-/webfinger-0.4.2.tgz"; - sha1 = "3477a6d97799461896039fcffc650b73468ee76d"; - }; - }; - "databank-mongodb-1.0.0" = { - name = "databank-mongodb"; - packageName = "databank-mongodb"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/databank-mongodb/-/databank-mongodb-1.0.0.tgz"; - sha1 = "66f229698df1d4f7e9e3ad849a30174b2aae527b"; - }; - }; - "databank-redis-0.19.6" = { - name = "databank-redis"; - packageName = "databank-redis"; - version = "0.19.6"; - src = fetchurl { - url = "https://registry.npmjs.org/databank-redis/-/databank-redis-0.19.6.tgz"; - sha1 = "dd476b81b8200269ea0cc85f6b6decd05799bce9"; - }; - }; - "databank-lrucache-0.1.3" = { - name = "databank-lrucache"; - packageName = "databank-lrucache"; - version = "0.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/databank-lrucache/-/databank-lrucache-0.1.3.tgz"; - sha1 = "a68fbf6bb5f2e1dab81f5a410065484889a0eeef"; - }; - }; - "bindings-1.2.1" = { - name = "bindings"; - packageName = "bindings"; - version = "1.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/bindings/-/bindings-1.2.1.tgz"; - sha1 = "14ad6113812d2d37d72e67b4cacb4bb726505f11"; - }; - }; - "nan-2.3.5" = { - name = "nan"; - packageName = "nan"; - version = "2.3.5"; - src = fetchurl { - url = "https://registry.npmjs.org/nan/-/nan-2.3.5.tgz"; - sha1 = "822a0dc266290ce4cd3a12282ca3e7e364668a08"; - }; - }; - "dtrace-provider-0.8.1" = { - name = "dtrace-provider"; - packageName = "dtrace-provider"; - version = "0.8.1"; - src = fetchurl { - url = "https://registry.npmjs.org/dtrace-provider/-/dtrace-provider-0.8.1.tgz"; - sha1 = "cd4d174a233bea1bcf4a1fbfa5798f44f48cda9f"; - }; - }; - "mv-2.1.1" = { - name = "mv"; - packageName = "mv"; - version = "2.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/mv/-/mv-2.1.1.tgz"; - sha1 = "ae6ce0d6f6d5e0a4f7d893798d03c1ea9559b6a2"; - }; - }; - "safe-json-stringify-1.0.4" = { - name = "safe-json-stringify"; - packageName = "safe-json-stringify"; - version = "1.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/safe-json-stringify/-/safe-json-stringify-1.0.4.tgz"; - sha1 = "81a098f447e4bbc3ff3312a243521bc060ef5911"; - }; - }; - "moment-2.18.1" = { - name = "moment"; - packageName = "moment"; - version = "2.18.1"; - src = fetchurl { - url = "https://registry.npmjs.org/moment/-/moment-2.18.1.tgz"; - sha1 = "c36193dd3ce1c2eed2adb7c802dbbc77a81b1c0f"; - }; - }; - "nan-2.5.1" = { - name = "nan"; - packageName = "nan"; - version = "2.5.1"; - src = fetchurl { - url = "https://registry.npmjs.org/nan/-/nan-2.5.1.tgz"; - sha1 = "d5b01691253326a97a2bbee9e61c55d8d60351e2"; - }; - }; - "ncp-2.0.0" = { - name = "ncp"; - packageName = "ncp"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/ncp/-/ncp-2.0.0.tgz"; - sha1 = "195a21d6c46e361d2fb1281ba38b91e9df7bdbb3"; - }; - }; - "rimraf-2.4.5" = { - name = "rimraf"; - packageName = "rimraf"; - version = "2.4.5"; - src = fetchurl { - url = "https://registry.npmjs.org/rimraf/-/rimraf-2.4.5.tgz"; - sha1 = "ee710ce5d93a8fdb856fb5ea8ff0e2d75934b2da"; - }; - }; - "glob-6.0.4" = { - name = "glob"; - packageName = "glob"; - version = "6.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/glob/-/glob-6.0.4.tgz"; - sha1 = "0f08860f6a155127b2fadd4f9ce24b1aab6e4d22"; - }; - }; - "inflight-1.0.6" = { - name = "inflight"; - packageName = "inflight"; - version = "1.0.6"; - src = fetchurl { - url = "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz"; - sha1 = "49bd6331d7d02d0c09bc910a1075ba8165b56df9"; - }; - }; - "inherits-2.0.3" = { - name = "inherits"; - packageName = "inherits"; - version = "2.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz"; - sha1 = "633c2c83e3da42a502f52466022480f4208261de"; - }; - }; - "minimatch-3.0.3" = { - name = "minimatch"; - packageName = "minimatch"; - version = "3.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/minimatch/-/minimatch-3.0.3.tgz"; - sha1 = "2a4e4090b96b2db06a9d7df01055a62a77c9b774"; - }; - }; - "once-1.4.0" = { - name = "once"; - packageName = "once"; - version = "1.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/once/-/once-1.4.0.tgz"; - sha1 = "583b1aa775961d4b113ac17d9c50baef9dd76bd1"; - }; - }; - "path-is-absolute-1.0.1" = { - name = "path-is-absolute"; - packageName = "path-is-absolute"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz"; - sha1 = "174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"; - }; - }; - "wrappy-1.0.2" = { - name = "wrappy"; - packageName = "wrappy"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz"; - sha1 = "b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"; - }; - }; - "brace-expansion-1.1.6" = { - name = "brace-expansion"; - packageName = "brace-expansion"; - version = "1.1.6"; - src = fetchurl { - url = "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.6.tgz"; - sha1 = "7197d7eaa9b87e648390ea61fc66c84427420df9"; - }; - }; - "balanced-match-0.4.2" = { - name = "balanced-match"; - packageName = "balanced-match"; - version = "0.4.2"; - src = fetchurl { - url = "https://registry.npmjs.org/balanced-match/-/balanced-match-0.4.2.tgz"; - sha1 = "cb3f3e3c732dc0f01ee70b403f302e61d7709838"; - }; - }; - "concat-map-0.0.1" = { - name = "concat-map"; - packageName = "concat-map"; - version = "0.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"; - sha1 = "d8a96bd77fd68df7793a73036a3ba0d5405d477b"; - }; - }; - "basic-auth-connect-1.0.0" = { - name = "basic-auth-connect"; - packageName = "basic-auth-connect"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/basic-auth-connect/-/basic-auth-connect-1.0.0.tgz"; - sha1 = "fdb0b43962ca7b40456a7c2bb48fe173da2d2122"; - }; - }; - "body-parser-1.13.3" = { - name = "body-parser"; - packageName = "body-parser"; - version = "1.13.3"; - src = fetchurl { - url = "https://registry.npmjs.org/body-parser/-/body-parser-1.13.3.tgz"; - sha1 = "c08cf330c3358e151016a05746f13f029c97fa97"; - }; - }; - "bytes-2.1.0" = { - name = "bytes"; - packageName = "bytes"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/bytes/-/bytes-2.1.0.tgz"; - sha1 = "ac93c410e2ffc9cc7cf4b464b38289067f5e47b4"; - }; - }; - "cookie-0.1.3" = { - name = "cookie"; - packageName = "cookie"; - version = "0.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/cookie/-/cookie-0.1.3.tgz"; - sha1 = "e734a5c1417fce472d5aef82c381cabb64d1a435"; - }; - }; - "cookie-parser-1.3.5" = { - name = "cookie-parser"; - packageName = "cookie-parser"; - version = "1.3.5"; - src = fetchurl { - url = "https://registry.npmjs.org/cookie-parser/-/cookie-parser-1.3.5.tgz"; - sha1 = "9d755570fb5d17890771227a02314d9be7cf8356"; - }; - }; - "cookie-signature-1.0.6" = { - name = "cookie-signature"; - packageName = "cookie-signature"; - version = "1.0.6"; - src = fetchurl { - url = "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz"; - sha1 = "e303a882b342cc3ee8ca513a79999734dab3ae2c"; - }; - }; - "compression-1.5.2" = { - name = "compression"; - packageName = "compression"; - version = "1.5.2"; - src = fetchurl { - url = "https://registry.npmjs.org/compression/-/compression-1.5.2.tgz"; - sha1 = "b03b8d86e6f8ad29683cba8df91ddc6ffc77b395"; - }; - }; - "connect-timeout-1.6.2" = { - name = "connect-timeout"; - packageName = "connect-timeout"; - version = "1.6.2"; - src = fetchurl { - url = "https://registry.npmjs.org/connect-timeout/-/connect-timeout-1.6.2.tgz"; - sha1 = "de9a5ec61e33a12b6edaab7b5f062e98c599b88e"; - }; - }; - "content-type-1.0.2" = { - name = "content-type"; - packageName = "content-type"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/content-type/-/content-type-1.0.2.tgz"; - sha1 = "b7d113aee7a8dd27bd21133c4dc2529df1721eed"; - }; - }; - "csurf-1.8.3" = { - name = "csurf"; - packageName = "csurf"; - version = "1.8.3"; - src = fetchurl { - url = "https://registry.npmjs.org/csurf/-/csurf-1.8.3.tgz"; - sha1 = "23f2a13bf1d8fce1d0c996588394442cba86a56a"; - }; - }; - "debug-2.2.0" = { - name = "debug"; - packageName = "debug"; - version = "2.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/debug/-/debug-2.2.0.tgz"; - sha1 = "f87057e995b1a1f6ae6a4960664137bc56f039da"; - }; - }; - "depd-1.0.1" = { - name = "depd"; - packageName = "depd"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/depd/-/depd-1.0.1.tgz"; - sha1 = "80aec64c9d6d97e65cc2a9caa93c0aa6abf73aaa"; - }; - }; - "errorhandler-1.4.3" = { - name = "errorhandler"; - packageName = "errorhandler"; - version = "1.4.3"; - src = fetchurl { - url = "https://registry.npmjs.org/errorhandler/-/errorhandler-1.4.3.tgz"; - sha1 = "b7b70ed8f359e9db88092f2d20c0f831420ad83f"; - }; - }; - "express-session-1.11.3" = { - name = "express-session"; - packageName = "express-session"; - version = "1.11.3"; - src = fetchurl { - url = "https://registry.npmjs.org/express-session/-/express-session-1.11.3.tgz"; - sha1 = "5cc98f3f5ff84ed835f91cbf0aabd0c7107400af"; - }; - }; - "finalhandler-0.4.0" = { - name = "finalhandler"; - packageName = "finalhandler"; - version = "0.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/finalhandler/-/finalhandler-0.4.0.tgz"; - sha1 = "965a52d9e8d05d2b857548541fb89b53a2497d9b"; - }; - }; - "fresh-0.3.0" = { - name = "fresh"; - packageName = "fresh"; - version = "0.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/fresh/-/fresh-0.3.0.tgz"; - sha1 = "651f838e22424e7566de161d8358caa199f83d4f"; - }; - }; - "http-errors-1.3.1" = { - name = "http-errors"; - packageName = "http-errors"; - version = "1.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/http-errors/-/http-errors-1.3.1.tgz"; - sha1 = "197e22cdebd4198585e8694ef6786197b91ed942"; - }; - }; - "morgan-1.6.1" = { - name = "morgan"; - packageName = "morgan"; - version = "1.6.1"; - src = fetchurl { - url = "https://registry.npmjs.org/morgan/-/morgan-1.6.1.tgz"; - sha1 = "5fd818398c6819cba28a7cd6664f292fe1c0bbf2"; - }; - }; - "multiparty-3.3.2" = { - name = "multiparty"; - packageName = "multiparty"; - version = "3.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/multiparty/-/multiparty-3.3.2.tgz"; - sha1 = "35de6804dc19643e5249f3d3e3bdc6c8ce301d3f"; - }; - }; - "on-headers-1.0.1" = { - name = "on-headers"; - packageName = "on-headers"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/on-headers/-/on-headers-1.0.1.tgz"; - sha1 = "928f5d0f470d49342651ea6794b0857c100693f7"; - }; - }; - "parseurl-1.3.1" = { - name = "parseurl"; - packageName = "parseurl"; - version = "1.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/parseurl/-/parseurl-1.3.1.tgz"; - sha1 = "c8ab8c9223ba34888aa64a297b28853bec18da56"; - }; - }; - "pause-0.1.0" = { - name = "pause"; - packageName = "pause"; - version = "0.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/pause/-/pause-0.1.0.tgz"; - sha1 = "ebc8a4a8619ff0b8a81ac1513c3434ff469fdb74"; - }; - }; - "qs-4.0.0" = { - name = "qs"; - packageName = "qs"; - version = "4.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/qs/-/qs-4.0.0.tgz"; - sha1 = "c31d9b74ec27df75e543a86c78728ed8d4623607"; - }; - }; - "response-time-2.3.2" = { - name = "response-time"; - packageName = "response-time"; - version = "2.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/response-time/-/response-time-2.3.2.tgz"; - sha1 = "ffa71bab952d62f7c1d49b7434355fbc68dffc5a"; - }; - }; - "serve-favicon-2.3.2" = { - name = "serve-favicon"; - packageName = "serve-favicon"; - version = "2.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/serve-favicon/-/serve-favicon-2.3.2.tgz"; - sha1 = "dd419e268de012ab72b319d337f2105013f9381f"; - }; - }; - "serve-index-1.7.3" = { - name = "serve-index"; - packageName = "serve-index"; - version = "1.7.3"; - src = fetchurl { - url = "https://registry.npmjs.org/serve-index/-/serve-index-1.7.3.tgz"; - sha1 = "7a057fc6ee28dc63f64566e5fa57b111a86aecd2"; - }; - }; - "serve-static-1.10.3" = { - name = "serve-static"; - packageName = "serve-static"; - version = "1.10.3"; - src = fetchurl { - url = "https://registry.npmjs.org/serve-static/-/serve-static-1.10.3.tgz"; - sha1 = "ce5a6ecd3101fed5ec09827dac22a9c29bfb0535"; - }; - }; - "type-is-1.6.14" = { - name = "type-is"; - packageName = "type-is"; - version = "1.6.14"; - src = fetchurl { - url = "https://registry.npmjs.org/type-is/-/type-is-1.6.14.tgz"; - sha1 = "e219639c17ded1ca0789092dd54a03826b817cb2"; - }; - }; - "utils-merge-1.0.0" = { - name = "utils-merge"; - packageName = "utils-merge"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.0.tgz"; - sha1 = "0294fb922bb9375153541c4f7096231f287c8af8"; - }; - }; - "vhost-3.0.2" = { - name = "vhost"; - packageName = "vhost"; - version = "3.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/vhost/-/vhost-3.0.2.tgz"; - sha1 = "2fb1decd4c466aa88b0f9341af33dc1aff2478d5"; - }; - }; - "iconv-lite-0.4.11" = { - name = "iconv-lite"; - packageName = "iconv-lite"; - version = "0.4.11"; - src = fetchurl { - url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.11.tgz"; - sha1 = "2ecb42fd294744922209a2e7c404dac8793d8ade"; - }; - }; - "on-finished-2.3.0" = { - name = "on-finished"; - packageName = "on-finished"; - version = "2.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz"; - sha1 = "20f1336481b083cd75337992a16971aa2d906947"; - }; - }; - "raw-body-2.1.7" = { - name = "raw-body"; - packageName = "raw-body"; - version = "2.1.7"; - src = fetchurl { - url = "https://registry.npmjs.org/raw-body/-/raw-body-2.1.7.tgz"; - sha1 = "adfeace2e4fb3098058014d08c072dcc59758774"; - }; - }; - "ee-first-1.1.1" = { - name = "ee-first"; - packageName = "ee-first"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz"; - sha1 = "590c61156b0ae2f4f0255732a158b266bc56b21d"; - }; - }; - "bytes-2.4.0" = { - name = "bytes"; - packageName = "bytes"; - version = "2.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/bytes/-/bytes-2.4.0.tgz"; - sha1 = "7d97196f9d5baf7f6935e25985549edd2a6c2339"; - }; - }; - "iconv-lite-0.4.13" = { - name = "iconv-lite"; - packageName = "iconv-lite"; - version = "0.4.13"; - src = fetchurl { - url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.13.tgz"; - sha1 = "1f88aba4ab0b1508e8312acc39345f36e992e2f2"; - }; - }; - "unpipe-1.0.0" = { - name = "unpipe"; - packageName = "unpipe"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz"; - sha1 = "b2bf4ee8514aae6165b4817829d21b2ef49904ec"; - }; - }; - "accepts-1.2.13" = { - name = "accepts"; - packageName = "accepts"; - version = "1.2.13"; - src = fetchurl { - url = "https://registry.npmjs.org/accepts/-/accepts-1.2.13.tgz"; - sha1 = "e5f1f3928c6d95fd96558c36ec3d9d0de4a6ecea"; - }; - }; - "compressible-2.0.10" = { - name = "compressible"; - packageName = "compressible"; - version = "2.0.10"; - src = fetchurl { - url = "https://registry.npmjs.org/compressible/-/compressible-2.0.10.tgz"; - sha1 = "feda1c7f7617912732b29bf8cf26252a20b9eecd"; - }; - }; - "vary-1.0.1" = { - name = "vary"; - packageName = "vary"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/vary/-/vary-1.0.1.tgz"; - sha1 = "99e4981566a286118dfb2b817357df7993376d10"; - }; - }; - "mime-types-2.1.15" = { - name = "mime-types"; - packageName = "mime-types"; - version = "2.1.15"; - src = fetchurl { - url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.15.tgz"; - sha1 = "a4ebf5064094569237b8cf70046776d09fc92aed"; - }; - }; - "negotiator-0.5.3" = { - name = "negotiator"; - packageName = "negotiator"; - version = "0.5.3"; - src = fetchurl { - url = "https://registry.npmjs.org/negotiator/-/negotiator-0.5.3.tgz"; - sha1 = "269d5c476810ec92edbe7b6c2f28316384f9a7e8"; - }; - }; - "mime-db-1.27.0" = { - name = "mime-db"; - packageName = "mime-db"; - version = "1.27.0"; - src = fetchurl { - url = "https://registry.npmjs.org/mime-db/-/mime-db-1.27.0.tgz"; - sha1 = "820f572296bbd20ec25ed55e5b5de869e5436eb1"; - }; - }; - "ms-0.7.1" = { - name = "ms"; - packageName = "ms"; - version = "0.7.1"; - src = fetchurl { - url = "https://registry.npmjs.org/ms/-/ms-0.7.1.tgz"; - sha1 = "9cd13c03adbff25b65effde7ce864ee952017098"; - }; - }; - "csrf-3.0.6" = { - name = "csrf"; - packageName = "csrf"; - version = "3.0.6"; - src = fetchurl { - url = "https://registry.npmjs.org/csrf/-/csrf-3.0.6.tgz"; - sha1 = "b61120ddceeafc91e76ed5313bb5c0b2667b710a"; - }; - }; - "rndm-1.2.0" = { - name = "rndm"; - packageName = "rndm"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/rndm/-/rndm-1.2.0.tgz"; - sha1 = "f33fe9cfb52bbfd520aa18323bc65db110a1b76c"; - }; - }; - "tsscmp-1.0.5" = { - name = "tsscmp"; - packageName = "tsscmp"; - version = "1.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/tsscmp/-/tsscmp-1.0.5.tgz"; - sha1 = "7dc4a33af71581ab4337da91d85ca5427ebd9a97"; - }; - }; - "uid-safe-2.1.4" = { - name = "uid-safe"; - packageName = "uid-safe"; - version = "2.1.4"; - src = fetchurl { - url = "https://registry.npmjs.org/uid-safe/-/uid-safe-2.1.4.tgz"; - sha1 = "3ad6f38368c6d4c8c75ec17623fb79aa1d071d81"; - }; - }; - "random-bytes-1.0.0" = { - name = "random-bytes"; - packageName = "random-bytes"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/random-bytes/-/random-bytes-1.0.0.tgz"; - sha1 = "4f68a1dc0ae58bd3fb95848c30324db75d64360b"; - }; - }; - "accepts-1.3.3" = { - name = "accepts"; - packageName = "accepts"; - version = "1.3.3"; - src = fetchurl { - url = "https://registry.npmjs.org/accepts/-/accepts-1.3.3.tgz"; - sha1 = "c3ca7434938648c3e0d9c1e328dd68b622c284ca"; - }; - }; - "escape-html-1.0.3" = { - name = "escape-html"; - packageName = "escape-html"; - version = "1.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz"; - sha1 = "0258eae4d3d0c0974de1c169188ef0051d1d1988"; - }; - }; - "negotiator-0.6.1" = { - name = "negotiator"; - packageName = "negotiator"; - version = "0.6.1"; - src = fetchurl { - url = "https://registry.npmjs.org/negotiator/-/negotiator-0.6.1.tgz"; - sha1 = "2b327184e8992101177b28563fb5e7102acd0ca9"; - }; - }; - "crc-3.3.0" = { - name = "crc"; - packageName = "crc"; - version = "3.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/crc/-/crc-3.3.0.tgz"; - sha1 = "fa622e1bc388bf257309082d6b65200ce67090ba"; - }; - }; - "uid-safe-2.0.0" = { - name = "uid-safe"; - packageName = "uid-safe"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/uid-safe/-/uid-safe-2.0.0.tgz"; - sha1 = "a7f3c6ca64a1f6a5d04ec0ef3e4c3d5367317137"; - }; - }; - "base64-url-1.2.1" = { - name = "base64-url"; - packageName = "base64-url"; - version = "1.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/base64-url/-/base64-url-1.2.1.tgz"; - sha1 = "199fd661702a0e7b7dcae6e0698bb089c52f6d78"; - }; - }; - "escape-html-1.0.2" = { - name = "escape-html"; - packageName = "escape-html"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/escape-html/-/escape-html-1.0.2.tgz"; - sha1 = "d77d32fa98e38c2f41ae85e9278e0e0e6ba1022c"; - }; - }; - "statuses-1.3.1" = { - name = "statuses"; - packageName = "statuses"; - version = "1.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/statuses/-/statuses-1.3.1.tgz"; - sha1 = "faf51b9eb74aaef3b3acf4ad5f61abf24cb7b93e"; - }; - }; - "basic-auth-1.0.4" = { - name = "basic-auth"; - packageName = "basic-auth"; - version = "1.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/basic-auth/-/basic-auth-1.0.4.tgz"; - sha1 = "030935b01de7c9b94a824b29f3fccb750d3a5290"; - }; - }; - "readable-stream-1.1.14" = { - name = "readable-stream"; - packageName = "readable-stream"; - version = "1.1.14"; - src = fetchurl { - url = "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz"; - sha1 = "7cf4c54ef648e3813084c636dd2079e166c081d9"; - }; - }; - "stream-counter-0.2.0" = { - name = "stream-counter"; - packageName = "stream-counter"; - version = "0.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/stream-counter/-/stream-counter-0.2.0.tgz"; - sha1 = "ded266556319c8b0e222812b9cf3b26fa7d947de"; - }; - }; - "core-util-is-1.0.2" = { - name = "core-util-is"; - packageName = "core-util-is"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz"; - sha1 = "b5fd54220aa2bc5ab57aab7140c940754503c1a7"; - }; - }; - "isarray-0.0.1" = { - name = "isarray"; - packageName = "isarray"; - version = "0.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz"; - sha1 = "8a18acfca9a8f4177e09abfc6038939b05d1eedf"; - }; - }; - "string_decoder-0.10.31" = { - name = "string_decoder"; - packageName = "string_decoder"; - version = "0.10.31"; - src = fetchurl { - url = "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"; - sha1 = "62e203bc41766c6c28c9fc84301dab1c5310fa94"; - }; - }; - "depd-1.1.0" = { - name = "depd"; - packageName = "depd"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/depd/-/depd-1.1.0.tgz"; - sha1 = "e1bd82c6aab6ced965b97b88b17ed3e528ca18c3"; - }; - }; - "etag-1.7.0" = { - name = "etag"; - packageName = "etag"; - version = "1.7.0"; - src = fetchurl { - url = "https://registry.npmjs.org/etag/-/etag-1.7.0.tgz"; - sha1 = "03d30b5f67dd6e632d2945d30d6652731a34d5d8"; - }; - }; - "ms-0.7.2" = { - name = "ms"; - packageName = "ms"; - version = "0.7.2"; - src = fetchurl { - url = "https://registry.npmjs.org/ms/-/ms-0.7.2.tgz"; - sha1 = "ae25cf2512b3885a1d95d7f037868d8431124765"; - }; - }; - "batch-0.5.3" = { - name = "batch"; - packageName = "batch"; - version = "0.5.3"; - src = fetchurl { - url = "https://registry.npmjs.org/batch/-/batch-0.5.3.tgz"; - sha1 = "3f3414f380321743bfc1042f9a83ff1d5824d464"; - }; - }; - "media-typer-0.3.0" = { - name = "media-typer"; - packageName = "media-typer"; - version = "0.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz"; - sha1 = "8710d7af0aa626f8fffa1ce00168545263255748"; - }; - }; - "oauth-0.9.7" = { - name = "oauth"; - packageName = "oauth"; - version = "0.9.7"; - src = fetchurl { - url = "https://registry.npmjs.org/oauth/-/oauth-0.9.7.tgz"; - sha1 = "c2554d0368c966eb3050bec96584625577ad1ecd"; - }; - }; - "openid-0.4.1" = { - name = "openid"; - packageName = "openid"; - version = "0.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/openid/-/openid-0.4.1.tgz"; - sha1 = "de0eb5e381d34dc4aa5a77a98678bedafd11f387"; - }; - }; - "async-1.5.2" = { - name = "async"; - packageName = "async"; - version = "1.5.2"; - src = fetchurl { - url = "https://registry.npmjs.org/async/-/async-1.5.2.tgz"; - sha1 = "ec6a61ae56480c0c3cb241c95618e20892f9672a"; - }; - }; - "node-uuid-1.4.8" = { - name = "node-uuid"; - packageName = "node-uuid"; - version = "1.4.8"; - src = fetchurl { - url = "https://registry.npmjs.org/node-uuid/-/node-uuid-1.4.8.tgz"; - sha1 = "b040eb0923968afabf8d32fb1f17f1167fdab907"; - }; - }; - "set-immediate-0.1.1" = { - name = "set-immediate"; - packageName = "set-immediate"; - version = "0.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/set-immediate/-/set-immediate-0.1.1.tgz"; - sha1 = "8986e4a773bf8ec165f24d579107673bfac141de"; - }; - }; - "multiparty-4.1.3" = { - name = "multiparty"; - packageName = "multiparty"; - version = "4.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/multiparty/-/multiparty-4.1.3.tgz"; - sha1 = "3c43c7fcb1896e17460436a9dd0b6ef1668e4f94"; - }; - }; - "fd-slicer-1.0.1" = { - name = "fd-slicer"; - packageName = "fd-slicer"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/fd-slicer/-/fd-slicer-1.0.1.tgz"; - sha1 = "8b5bcbd9ec327c5041bf9ab023fd6750f1177e65"; - }; - }; - "pend-1.2.0" = { - name = "pend"; - packageName = "pend"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/pend/-/pend-1.2.0.tgz"; - sha1 = "7a57eb550a6783f9115331fcf4663d5c8e007a50"; - }; - }; - "get-stdin-4.0.1" = { - name = "get-stdin"; - packageName = "get-stdin"; - version = "4.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz"; - sha1 = "b968c6b0a04384324902e8bf1a5df32579a450fe"; - }; - }; - "meow-3.7.0" = { - name = "meow"; - packageName = "meow"; - version = "3.7.0"; - src = fetchurl { - url = "https://registry.npmjs.org/meow/-/meow-3.7.0.tgz"; - sha1 = "72cb668b425228290abbfa856892587308a801fb"; - }; - }; - "camelcase-keys-2.1.0" = { - name = "camelcase-keys"; - packageName = "camelcase-keys"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-2.1.0.tgz"; - sha1 = "308beeaffdf28119051efa1d932213c91b8f92e7"; - }; - }; - "decamelize-1.2.0" = { - name = "decamelize"; - packageName = "decamelize"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz"; - sha1 = "f6534d15148269b20352e7bee26f501f9a191290"; - }; - }; - "loud-rejection-1.6.0" = { - name = "loud-rejection"; - packageName = "loud-rejection"; - version = "1.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/loud-rejection/-/loud-rejection-1.6.0.tgz"; - sha1 = "5b46f80147edee578870f086d04821cf998e551f"; - }; - }; - "map-obj-1.0.1" = { - name = "map-obj"; - packageName = "map-obj"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/map-obj/-/map-obj-1.0.1.tgz"; - sha1 = "d933ceb9205d82bdcf4886f6742bdc2b4dea146d"; - }; - }; - "minimist-1.2.0" = { - name = "minimist"; - packageName = "minimist"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz"; - sha1 = "a35008b20f41383eec1fb914f4cd5df79a264284"; - }; - }; - "normalize-package-data-2.3.6" = { - name = "normalize-package-data"; - packageName = "normalize-package-data"; - version = "2.3.6"; - src = fetchurl { - url = "https://registry.npmjs.org/normalize-package-data/-/normalize-package-data-2.3.6.tgz"; - sha1 = "498fa420c96401f787402ba21e600def9f981fff"; - }; - }; - "object-assign-4.1.1" = { - name = "object-assign"; - packageName = "object-assign"; - version = "4.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz"; - sha1 = "2109adc7965887cfc05cbbd442cac8bfbb360863"; - }; - }; - "read-pkg-up-1.0.1" = { - name = "read-pkg-up"; - packageName = "read-pkg-up"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz"; - sha1 = "9d63c13276c065918d57f002a57f40a1b643fb02"; - }; - }; - "redent-1.0.0" = { - name = "redent"; - packageName = "redent"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/redent/-/redent-1.0.0.tgz"; - sha1 = "cf916ab1fd5f1f16dfb20822dd6ec7f730c2afde"; - }; - }; - "trim-newlines-1.0.0" = { - name = "trim-newlines"; - packageName = "trim-newlines"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/trim-newlines/-/trim-newlines-1.0.0.tgz"; - sha1 = "5887966bb582a4503a41eb524f7d35011815a613"; - }; - }; - "camelcase-2.1.1" = { - name = "camelcase"; - packageName = "camelcase"; - version = "2.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/camelcase/-/camelcase-2.1.1.tgz"; - sha1 = "7c1d16d679a1bbe59ca02cacecfb011e201f5a1f"; - }; - }; - "currently-unhandled-0.4.1" = { - name = "currently-unhandled"; - packageName = "currently-unhandled"; - version = "0.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/currently-unhandled/-/currently-unhandled-0.4.1.tgz"; - sha1 = "988df33feab191ef799a61369dd76c17adf957ea"; - }; - }; - "signal-exit-3.0.2" = { - name = "signal-exit"; - packageName = "signal-exit"; - version = "3.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.2.tgz"; - sha1 = "b5fdc08f1287ea1178628e415e25132b73646c6d"; - }; - }; - "array-find-index-1.0.2" = { - name = "array-find-index"; - packageName = "array-find-index"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/array-find-index/-/array-find-index-1.0.2.tgz"; - sha1 = "df010aa1287e164bbda6f9723b0a96a1ec4187a1"; - }; - }; - "hosted-git-info-2.4.1" = { - name = "hosted-git-info"; - packageName = "hosted-git-info"; - version = "2.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.4.1.tgz"; - sha1 = "4b0445e41c004a8bd1337773a4ff790ca40318c8"; - }; - }; - "is-builtin-module-1.0.0" = { - name = "is-builtin-module"; - packageName = "is-builtin-module"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/is-builtin-module/-/is-builtin-module-1.0.0.tgz"; - sha1 = "540572d34f7ac3119f8f76c30cbc1b1e037affbe"; - }; - }; - "semver-5.3.0" = { - name = "semver"; - packageName = "semver"; - version = "5.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/semver/-/semver-5.3.0.tgz"; - sha1 = "9b2ce5d3de02d17c6012ad326aa6b4d0cf54f94f"; - }; - }; - "validate-npm-package-license-3.0.1" = { - name = "validate-npm-package-license"; - packageName = "validate-npm-package-license"; - version = "3.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/validate-npm-package-license/-/validate-npm-package-license-3.0.1.tgz"; - sha1 = "2804babe712ad3379459acfbe24746ab2c303fbc"; - }; - }; - "builtin-modules-1.1.1" = { - name = "builtin-modules"; - packageName = "builtin-modules"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/builtin-modules/-/builtin-modules-1.1.1.tgz"; - sha1 = "270f076c5a72c02f5b65a47df94c5fe3a278892f"; - }; - }; - "spdx-correct-1.0.2" = { - name = "spdx-correct"; - packageName = "spdx-correct"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/spdx-correct/-/spdx-correct-1.0.2.tgz"; - sha1 = "4b3073d933ff51f3912f03ac5519498a4150db40"; - }; - }; - "spdx-expression-parse-1.0.4" = { - name = "spdx-expression-parse"; - packageName = "spdx-expression-parse"; - version = "1.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/spdx-expression-parse/-/spdx-expression-parse-1.0.4.tgz"; - sha1 = "9bdf2f20e1f40ed447fbe273266191fced51626c"; - }; - }; - "spdx-license-ids-1.2.2" = { - name = "spdx-license-ids"; - packageName = "spdx-license-ids"; - version = "1.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/spdx-license-ids/-/spdx-license-ids-1.2.2.tgz"; - sha1 = "c9df7a3424594ade6bd11900d596696dc06bac57"; - }; - }; - "find-up-1.1.2" = { - name = "find-up"; - packageName = "find-up"; - version = "1.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz"; - sha1 = "6b2e9822b1a2ce0a60ab64d610eccad53cb24d0f"; - }; - }; - "read-pkg-1.1.0" = { - name = "read-pkg"; - packageName = "read-pkg"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz"; - sha1 = "f5ffaa5ecd29cb31c0474bca7d756b6bb29e3f28"; - }; - }; - "path-exists-2.1.0" = { - name = "path-exists"; - packageName = "path-exists"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz"; - sha1 = "0feb6c64f0fc518d9a754dd5efb62c7022761f4b"; - }; - }; - "pinkie-promise-2.0.1" = { - name = "pinkie-promise"; - packageName = "pinkie-promise"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz"; - sha1 = "2135d6dfa7a358c069ac9b178776288228450ffa"; - }; - }; - "pinkie-2.0.4" = { - name = "pinkie"; - packageName = "pinkie"; - version = "2.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz"; - sha1 = "72556b80cfa0d48a974e80e77248e80ed4f7f870"; - }; - }; - "load-json-file-1.1.0" = { - name = "load-json-file"; - packageName = "load-json-file"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz"; - sha1 = "956905708d58b4bab4c2261b04f59f31c99374c0"; - }; - }; - "path-type-1.1.0" = { - name = "path-type"; - packageName = "path-type"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz"; - sha1 = "59c44f7ee491da704da415da5a4070ba4f8fe441"; - }; - }; - "graceful-fs-4.1.11" = { - name = "graceful-fs"; - packageName = "graceful-fs"; - version = "4.1.11"; - src = fetchurl { - url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.11.tgz"; - sha1 = "0e8bdfe4d1ddb8854d64e04ea7c00e2a026e5658"; - }; - }; - "parse-json-2.2.0" = { - name = "parse-json"; - packageName = "parse-json"; - version = "2.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz"; - sha1 = "f480f40434ef80741f8469099f8dea18f55a4dc9"; - }; - }; - "pify-2.3.0" = { - name = "pify"; - packageName = "pify"; - version = "2.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz"; - sha1 = "ed141a6ac043a849ea588498e7dca8b15330e90c"; - }; - }; - "strip-bom-2.0.0" = { - name = "strip-bom"; - packageName = "strip-bom"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz"; - sha1 = "6219a85616520491f35788bdbf1447a99c7e6b0e"; - }; - }; - "error-ex-1.3.1" = { - name = "error-ex"; - packageName = "error-ex"; - version = "1.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/error-ex/-/error-ex-1.3.1.tgz"; - sha1 = "f855a86ce61adc4e8621c3cda21e7a7612c3a8dc"; - }; - }; - "is-arrayish-0.2.1" = { - name = "is-arrayish"; - packageName = "is-arrayish"; - version = "0.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz"; - sha1 = "77c99840527aa8ecb1a8ba697b80645a7a926a9d"; - }; - }; - "is-utf8-0.2.1" = { - name = "is-utf8"; - packageName = "is-utf8"; - version = "0.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz"; - sha1 = "4b0da1442104d1b336340e80797e865cf39f7d72"; - }; - }; - "indent-string-2.1.0" = { - name = "indent-string"; - packageName = "indent-string"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/indent-string/-/indent-string-2.1.0.tgz"; - sha1 = "8e2d48348742121b4a8218b7a137e9a52049dc80"; - }; - }; - "strip-indent-1.0.1" = { - name = "strip-indent"; - packageName = "strip-indent"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/strip-indent/-/strip-indent-1.0.1.tgz"; - sha1 = "0c7962a6adefa7bbd4ac366460a638552ae1a0a2"; - }; - }; - "repeating-2.0.1" = { - name = "repeating"; - packageName = "repeating"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/repeating/-/repeating-2.0.1.tgz"; - sha1 = "5214c53a926d3552707527fbab415dbc08d06dda"; - }; - }; - "is-finite-1.0.2" = { - name = "is-finite"; - packageName = "is-finite"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/is-finite/-/is-finite-1.0.2.tgz"; - sha1 = "cc6677695602be550ef11e8b4aa6305342b6d0aa"; - }; - }; - "number-is-nan-1.0.1" = { - name = "number-is-nan"; - packageName = "number-is-nan"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz"; - sha1 = "097b602b53422a522c1afb8790318336941a011d"; - }; - }; - "underscore-1.5.2" = { - name = "underscore"; - packageName = "underscore"; - version = "1.5.2"; - src = fetchurl { - url = "https://registry.npmjs.org/underscore/-/underscore-1.5.2.tgz"; - sha1 = "1335c5e4f5e6d33bbb4b006ba8c86a00f556de08"; - }; - }; - "step-0.0.6" = { - name = "step"; - packageName = "step"; - version = "0.0.6"; - src = fetchurl { - url = "https://registry.npmjs.org/step/-/step-0.0.6.tgz"; - sha1 = "143e7849a5d7d3f4a088fe29af94915216eeede2"; - }; - }; - "addressparser-0.3.2" = { - name = "addressparser"; - packageName = "addressparser"; - version = "0.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/addressparser/-/addressparser-0.3.2.tgz"; - sha1 = "59873f35e8fcf6c7361c10239261d76e15348bb2"; - }; - }; - "mimelib-0.2.14" = { - name = "mimelib"; - packageName = "mimelib"; - version = "0.2.14"; - src = fetchurl { - url = "https://registry.npmjs.org/mimelib/-/mimelib-0.2.14.tgz"; - sha1 = "2a1aa724bd190b85bd526e6317ab6106edfd6831"; - }; - }; - "moment-2.11.2" = { - name = "moment"; - packageName = "moment"; - version = "2.11.2"; - src = fetchurl { - url = "https://registry.npmjs.org/moment/-/moment-2.11.2.tgz"; - sha1 = "87968e5f95ac038c2e42ac959c75819cd3f52901"; - }; - }; - "starttls-1.0.1" = { - name = "starttls"; - packageName = "starttls"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/starttls/-/starttls-1.0.1.tgz"; - sha1 = "e6081c25de6b178f5a75f8f271c1487449183b42"; - }; - }; - "bufferjs-1.1.0" = { - name = "bufferjs"; - packageName = "bufferjs"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/bufferjs/-/bufferjs-1.1.0.tgz"; - sha1 = "095ffa39c5e6b40a2178a1169c9effc584a73201"; - }; - }; - "encoding-0.1.12" = { - name = "encoding"; - packageName = "encoding"; - version = "0.1.12"; - src = fetchurl { - url = "https://registry.npmjs.org/encoding/-/encoding-0.1.12.tgz"; - sha1 = "538b66f3ee62cd1ab51ec323829d1f9480c74beb"; - }; - }; - "addressparser-0.2.1" = { - name = "addressparser"; - packageName = "addressparser"; - version = "0.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/addressparser/-/addressparser-0.2.1.tgz"; - sha1 = "d11a5b2eeda04cfefebdf3196c10ae13db6cd607"; - }; - }; - "iconv-lite-0.4.15" = { - name = "iconv-lite"; - packageName = "iconv-lite"; - version = "0.4.15"; - src = fetchurl { - url = "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.15.tgz"; - sha1 = "fe265a218ac6a57cfe854927e9d04c19825eddeb"; - }; - }; - "content-disposition-0.5.0" = { - name = "content-disposition"; - packageName = "content-disposition"; - version = "0.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.0.tgz"; - sha1 = "4284fe6ae0630874639e44e80a418c2934135e9e"; - }; - }; - "commander-2.6.0" = { - name = "commander"; - packageName = "commander"; - version = "2.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/commander/-/commander-2.6.0.tgz"; - sha1 = "9df7e52fb2a0cb0fb89058ee80c3104225f37e1d"; - }; - }; - "merge-descriptors-1.0.0" = { - name = "merge-descriptors"; - packageName = "merge-descriptors"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.0.tgz"; - sha1 = "2169cf7538e1b0cc87fb88e1502d8474bbf79864"; - }; - }; - "methods-1.1.2" = { - name = "methods"; - packageName = "methods"; - version = "1.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz"; - sha1 = "5529a4d67654134edcc5266656835b0f851afcee"; - }; - }; - "proxy-addr-1.0.10" = { - name = "proxy-addr"; - packageName = "proxy-addr"; - version = "1.0.10"; - src = fetchurl { - url = "https://registry.npmjs.org/proxy-addr/-/proxy-addr-1.0.10.tgz"; - sha1 = "0d40a82f801fc355567d2ecb65efe3f077f121c5"; - }; - }; - "range-parser-1.0.3" = { - name = "range-parser"; - packageName = "range-parser"; - version = "1.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/range-parser/-/range-parser-1.0.3.tgz"; - sha1 = "6872823535c692e2c2a0103826afd82c2e0ff175"; - }; - }; - "send-0.13.0" = { - name = "send"; - packageName = "send"; - version = "0.13.0"; - src = fetchurl { - url = "https://registry.npmjs.org/send/-/send-0.13.0.tgz"; - sha1 = "518f921aeb0560aec7dcab2990b14cf6f3cce5de"; - }; - }; - "forwarded-0.1.0" = { - name = "forwarded"; - packageName = "forwarded"; - version = "0.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/forwarded/-/forwarded-0.1.0.tgz"; - sha1 = "19ef9874c4ae1c297bcf078fde63a09b66a84363"; - }; - }; - "ipaddr.js-1.0.5" = { - name = "ipaddr.js"; - packageName = "ipaddr.js"; - version = "1.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.0.5.tgz"; - sha1 = "5fa78cf301b825c78abc3042d812723049ea23c7"; - }; - }; - "destroy-1.0.3" = { - name = "destroy"; - packageName = "destroy"; - version = "1.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/destroy/-/destroy-1.0.3.tgz"; - sha1 = "b433b4724e71fd8551d9885174851c5fc377e2c9"; - }; - }; - "mime-1.3.4" = { - name = "mime"; - packageName = "mime"; - version = "1.3.4"; - src = fetchurl { - url = "https://registry.npmjs.org/mime/-/mime-1.3.4.tgz"; - sha1 = "115f9e3b6b3daf2959983cb38f149a2d40eb5d53"; - }; - }; - "statuses-1.2.1" = { - name = "statuses"; - packageName = "statuses"; - version = "1.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/statuses/-/statuses-1.2.1.tgz"; - sha1 = "dded45cc18256d51ed40aec142489d5c61026d28"; - }; - }; - "cookie-0.3.1" = { - name = "cookie"; - packageName = "cookie"; - version = "0.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/cookie/-/cookie-0.3.1.tgz"; - sha1 = "e7e0a1f9ef43b4c8ba925c5c5a96e806d16873bb"; - }; - }; - "crc-3.4.4" = { - name = "crc"; - packageName = "crc"; - version = "3.4.4"; - src = fetchurl { - url = "https://registry.npmjs.org/crc/-/crc-3.4.4.tgz"; - sha1 = "9da1e980e3bd44fc5c93bf5ab3da3378d85e466b"; - }; - }; - "debug-2.6.3" = { - name = "debug"; - packageName = "debug"; - version = "2.6.3"; - src = fetchurl { - url = "https://registry.npmjs.org/debug/-/debug-2.6.3.tgz"; - sha1 = "0f7eb8c30965ec08c72accfa0130c8b79984141d"; - }; - }; - "array-parallel-0.1.3" = { - name = "array-parallel"; - packageName = "array-parallel"; - version = "0.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/array-parallel/-/array-parallel-0.1.3.tgz"; - sha1 = "8f785308926ed5aa478c47e64d1b334b6c0c947d"; - }; - }; - "array-series-0.1.5" = { - name = "array-series"; - packageName = "array-series"; - version = "0.1.5"; - src = fetchurl { - url = "https://registry.npmjs.org/array-series/-/array-series-0.1.5.tgz"; - sha1 = "df5d37bfc5c2ef0755e2aa4f92feae7d4b5a972f"; - }; - }; - "cross-spawn-4.0.2" = { - name = "cross-spawn"; - packageName = "cross-spawn"; - version = "4.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/cross-spawn/-/cross-spawn-4.0.2.tgz"; - sha1 = "7b9247621c23adfdd3856004a823cbe397424d41"; - }; - }; - "lru-cache-4.0.2" = { - name = "lru-cache"; - packageName = "lru-cache"; - version = "4.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/lru-cache/-/lru-cache-4.0.2.tgz"; - sha1 = "1d17679c069cda5d040991a09dbc2c0db377e55e"; - }; - }; - "which-1.2.14" = { - name = "which"; - packageName = "which"; - version = "1.2.14"; - src = fetchurl { - url = "https://registry.npmjs.org/which/-/which-1.2.14.tgz"; - sha1 = "9a87c4378f03e827cecaf1acdf56c736c01c14e5"; - }; - }; - "pseudomap-1.0.2" = { - name = "pseudomap"; - packageName = "pseudomap"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz"; - sha1 = "f052a28da70e618917ef0a8ac34c1ae5a68286b3"; - }; - }; - "yallist-2.1.2" = { - name = "yallist"; - packageName = "yallist"; - version = "2.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz"; - sha1 = "1c11f9218f076089a47dd512f93c6699a6a81d52"; - }; - }; - "isexe-2.0.0" = { - name = "isexe"; - packageName = "isexe"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz"; - sha1 = "e8fbf374dc556ff8947a10dcb0572d633f2cfa10"; - }; - }; - "connect-3.6.0" = { - name = "connect"; - packageName = "connect"; - version = "3.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/connect/-/connect-3.6.0.tgz"; - sha1 = "f09a4f7dcd17324b663b725c815bdb1c4158a46e"; - }; - }; - "dns-prefetch-control-0.1.0" = { - name = "dns-prefetch-control"; - packageName = "dns-prefetch-control"; - version = "0.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/dns-prefetch-control/-/dns-prefetch-control-0.1.0.tgz"; - sha1 = "60ddb457774e178f1f9415f0cabb0e85b0b300b2"; - }; - }; - "dont-sniff-mimetype-1.0.0" = { - name = "dont-sniff-mimetype"; - packageName = "dont-sniff-mimetype"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/dont-sniff-mimetype/-/dont-sniff-mimetype-1.0.0.tgz"; - sha1 = "5932890dc9f4e2f19e5eb02a20026e5e5efc8f58"; - }; - }; - "frameguard-3.0.0" = { - name = "frameguard"; - packageName = "frameguard"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/frameguard/-/frameguard-3.0.0.tgz"; - sha1 = "7bcad469ee7b96e91d12ceb3959c78235a9272e9"; - }; - }; - "helmet-csp-2.4.0" = { - name = "helmet-csp"; - packageName = "helmet-csp"; - version = "2.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/helmet-csp/-/helmet-csp-2.4.0.tgz"; - sha1 = "7e53a157167a0645aadd7177d12ae6c605c1842e"; - }; - }; - "hide-powered-by-1.0.0" = { - name = "hide-powered-by"; - packageName = "hide-powered-by"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/hide-powered-by/-/hide-powered-by-1.0.0.tgz"; - sha1 = "4a85ad65881f62857fc70af7174a1184dccce32b"; - }; - }; - "hpkp-2.0.0" = { - name = "hpkp"; - packageName = "hpkp"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/hpkp/-/hpkp-2.0.0.tgz"; - sha1 = "10e142264e76215a5d30c44ec43de64dee6d1672"; - }; - }; - "hsts-2.0.0" = { - name = "hsts"; - packageName = "hsts"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/hsts/-/hsts-2.0.0.tgz"; - sha1 = "a52234c6070decf214b2b6b70bb144d07e4776c7"; - }; - }; - "ienoopen-1.0.0" = { - name = "ienoopen"; - packageName = "ienoopen"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/ienoopen/-/ienoopen-1.0.0.tgz"; - sha1 = "346a428f474aac8f50cf3784ea2d0f16f62bda6b"; - }; - }; - "nocache-2.0.0" = { - name = "nocache"; - packageName = "nocache"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/nocache/-/nocache-2.0.0.tgz"; - sha1 = "202b48021a0c4cbde2df80de15a17443c8b43980"; - }; - }; - "referrer-policy-1.1.0" = { - name = "referrer-policy"; - packageName = "referrer-policy"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/referrer-policy/-/referrer-policy-1.1.0.tgz"; - sha1 = "35774eb735bf50fb6c078e83334b472350207d79"; - }; - }; - "x-xss-protection-1.0.0" = { - name = "x-xss-protection"; - packageName = "x-xss-protection"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/x-xss-protection/-/x-xss-protection-1.0.0.tgz"; - sha1 = "898afb93869b24661cf9c52f9ee8db8ed0764dd9"; - }; - }; - "debug-2.6.1" = { - name = "debug"; - packageName = "debug"; - version = "2.6.1"; - src = fetchurl { - url = "https://registry.npmjs.org/debug/-/debug-2.6.1.tgz"; - sha1 = "79855090ba2c4e3115cc7d8769491d58f0491351"; - }; - }; - "finalhandler-1.0.0" = { - name = "finalhandler"; - packageName = "finalhandler"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/finalhandler/-/finalhandler-1.0.0.tgz"; - sha1 = "b5691c2c0912092f18ac23e9416bde5cd7dc6755"; - }; - }; - "encodeurl-1.0.1" = { - name = "encodeurl"; - packageName = "encodeurl"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.1.tgz"; - sha1 = "79e3d58655346909fe6f0f45a5de68103b294d20"; - }; - }; - "camelize-1.0.0" = { - name = "camelize"; - packageName = "camelize"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/camelize/-/camelize-1.0.0.tgz"; - sha1 = "164a5483e630fa4321e5af07020e531831b2609b"; - }; - }; - "content-security-policy-builder-1.1.0" = { - name = "content-security-policy-builder"; - packageName = "content-security-policy-builder"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/content-security-policy-builder/-/content-security-policy-builder-1.1.0.tgz"; - sha1 = "d91f1b076236c119850c7dee9924bf55e05772b3"; - }; - }; - "dasherize-2.0.0" = { - name = "dasherize"; - packageName = "dasherize"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/dasherize/-/dasherize-2.0.0.tgz"; - sha1 = "6d809c9cd0cf7bb8952d80fc84fa13d47ddb1308"; - }; - }; - "lodash.reduce-4.6.0" = { - name = "lodash.reduce"; - packageName = "lodash.reduce"; - version = "4.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.reduce/-/lodash.reduce-4.6.0.tgz"; - sha1 = "f1ab6b839299ad48f784abbf476596f03b914d3b"; - }; - }; - "platform-1.3.3" = { - name = "platform"; - packageName = "platform"; - version = "1.3.3"; - src = fetchurl { - url = "https://registry.npmjs.org/platform/-/platform-1.3.3.tgz"; - sha1 = "646c77011899870b6a0903e75e997e8e51da7461"; - }; - }; - "dashify-0.2.2" = { - name = "dashify"; - packageName = "dashify"; - version = "0.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/dashify/-/dashify-0.2.2.tgz"; - sha1 = "6a07415a01c91faf4a32e38d9dfba71f61cb20fe"; - }; - }; - "character-parser-1.2.1" = { - name = "character-parser"; - packageName = "character-parser"; - version = "1.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/character-parser/-/character-parser-1.2.1.tgz"; - sha1 = "c0dde4ab182713b919b970959a123ecc1a30fcd6"; - }; - }; - "clean-css-3.4.25" = { - name = "clean-css"; - packageName = "clean-css"; - version = "3.4.25"; - src = fetchurl { - url = "https://registry.npmjs.org/clean-css/-/clean-css-3.4.25.tgz"; - sha1 = "9e9a52d5c1e6bc5123e1b2783fa65fe958946ede"; - }; - }; - "constantinople-3.0.2" = { - name = "constantinople"; - packageName = "constantinople"; - version = "3.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/constantinople/-/constantinople-3.0.2.tgz"; - sha1 = "4b945d9937907bcd98ee575122c3817516544141"; - }; - }; - "jstransformer-0.0.2" = { - name = "jstransformer"; - packageName = "jstransformer"; - version = "0.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/jstransformer/-/jstransformer-0.0.2.tgz"; - sha1 = "7aae29a903d196cfa0973d885d3e47947ecd76ab"; - }; - }; - "transformers-2.1.0" = { - name = "transformers"; - packageName = "transformers"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/transformers/-/transformers-2.1.0.tgz"; - sha1 = "5d23cb35561dd85dc67fb8482309b47d53cce9a7"; - }; - }; - "uglify-js-2.8.20" = { - name = "uglify-js"; - packageName = "uglify-js"; - version = "2.8.20"; - src = fetchurl { - url = "https://registry.npmjs.org/uglify-js/-/uglify-js-2.8.20.tgz"; - sha1 = "be87100fbc18de3876ed606e9d24b4568311cecf"; - }; - }; - "void-elements-2.0.1" = { - name = "void-elements"; - packageName = "void-elements"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/void-elements/-/void-elements-2.0.1.tgz"; - sha1 = "c066afb582bb1cb4128d60ea92392e94d5e9dbec"; - }; - }; - "with-4.0.3" = { - name = "with"; - packageName = "with"; - version = "4.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/with/-/with-4.0.3.tgz"; - sha1 = "eefd154e9e79d2c8d3417b647a8f14d9fecce14e"; - }; - }; - "commander-2.8.1" = { - name = "commander"; - packageName = "commander"; - version = "2.8.1"; - src = fetchurl { - url = "https://registry.npmjs.org/commander/-/commander-2.8.1.tgz"; - sha1 = "06be367febfda0c330aa1e2a072d3dc9762425d4"; - }; - }; - "source-map-0.4.4" = { - name = "source-map"; - packageName = "source-map"; - version = "0.4.4"; - src = fetchurl { - url = "https://registry.npmjs.org/source-map/-/source-map-0.4.4.tgz"; - sha1 = "eba4f5da9c0dc999de68032d8b4f76173652036b"; - }; - }; - "graceful-readlink-1.0.1" = { - name = "graceful-readlink"; - packageName = "graceful-readlink"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/graceful-readlink/-/graceful-readlink-1.0.1.tgz"; - sha1 = "4cafad76bc62f02fa039b2f94e9a3dd3a391a725"; - }; - }; - "amdefine-1.0.1" = { - name = "amdefine"; - packageName = "amdefine"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/amdefine/-/amdefine-1.0.1.tgz"; - sha1 = "4a5282ac164729e93619bcfd3ad151f817ce91f5"; - }; - }; - "acorn-2.7.0" = { - name = "acorn"; - packageName = "acorn"; - version = "2.7.0"; - src = fetchurl { - url = "https://registry.npmjs.org/acorn/-/acorn-2.7.0.tgz"; - sha1 = "ab6e7d9d886aaca8b085bc3312b79a198433f0e7"; - }; - }; - "is-promise-2.1.0" = { - name = "is-promise"; - packageName = "is-promise"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/is-promise/-/is-promise-2.1.0.tgz"; - sha1 = "79a2a9ece7f096e80f36d2b2f3bc16c1ff4bf3fa"; - }; - }; - "promise-6.1.0" = { - name = "promise"; - packageName = "promise"; - version = "6.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/promise/-/promise-6.1.0.tgz"; - sha1 = "2ce729f6b94b45c26891ad0602c5c90e04c6eef6"; - }; - }; - "asap-1.0.0" = { - name = "asap"; - packageName = "asap"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/asap/-/asap-1.0.0.tgz"; - sha1 = "b2a45da5fdfa20b0496fc3768cc27c12fa916a7d"; - }; - }; - "promise-2.0.0" = { - name = "promise"; - packageName = "promise"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/promise/-/promise-2.0.0.tgz"; - sha1 = "46648aa9d605af5d2e70c3024bf59436da02b80e"; - }; - }; - "css-1.0.8" = { - name = "css"; - packageName = "css"; - version = "1.0.8"; - src = fetchurl { - url = "https://registry.npmjs.org/css/-/css-1.0.8.tgz"; - sha1 = "9386811ca82bccc9ee7fb5a732b1e2a317c8a3e7"; - }; - }; - "uglify-js-2.2.5" = { - name = "uglify-js"; - packageName = "uglify-js"; - version = "2.2.5"; - src = fetchurl { - url = "https://registry.npmjs.org/uglify-js/-/uglify-js-2.2.5.tgz"; - sha1 = "a6e02a70d839792b9780488b7b8b184c095c99c7"; - }; - }; - "is-promise-1.0.1" = { - name = "is-promise"; - packageName = "is-promise"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/is-promise/-/is-promise-1.0.1.tgz"; - sha1 = "31573761c057e33c2e91aab9e96da08cefbe76e5"; - }; - }; - "css-parse-1.0.4" = { - name = "css-parse"; - packageName = "css-parse"; - version = "1.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/css-parse/-/css-parse-1.0.4.tgz"; - sha1 = "38b0503fbf9da9f54e9c1dbda60e145c77117bdd"; - }; - }; - "css-stringify-1.0.5" = { - name = "css-stringify"; - packageName = "css-stringify"; - version = "1.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/css-stringify/-/css-stringify-1.0.5.tgz"; - sha1 = "b0d042946db2953bb9d292900a6cb5f6d0122031"; - }; - }; - "source-map-0.1.43" = { - name = "source-map"; - packageName = "source-map"; - version = "0.1.43"; - src = fetchurl { - url = "https://registry.npmjs.org/source-map/-/source-map-0.1.43.tgz"; - sha1 = "c24bc146ca517c1471f5dacbe2571b2b7f9e3346"; - }; - }; - "optimist-0.3.7" = { - name = "optimist"; - packageName = "optimist"; - version = "0.3.7"; - src = fetchurl { - url = "https://registry.npmjs.org/optimist/-/optimist-0.3.7.tgz"; - sha1 = "c90941ad59e4273328923074d2cf2e7cbc6ec0d9"; - }; - }; - "wordwrap-0.0.3" = { - name = "wordwrap"; - packageName = "wordwrap"; - version = "0.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.3.tgz"; - sha1 = "a3d5da6cd5c0bc0008d37234bbaf1bed63059107"; - }; - }; - "source-map-0.5.6" = { - name = "source-map"; - packageName = "source-map"; - version = "0.5.6"; - src = fetchurl { - url = "https://registry.npmjs.org/source-map/-/source-map-0.5.6.tgz"; - sha1 = "75ce38f52bf0733c5a7f0c118d81334a2bb5f412"; - }; - }; - "yargs-3.10.0" = { - name = "yargs"; - packageName = "yargs"; - version = "3.10.0"; - src = fetchurl { - url = "https://registry.npmjs.org/yargs/-/yargs-3.10.0.tgz"; - sha1 = "f7ee7bd857dd7c1d2d38c0e74efbd681d1431fd1"; - }; - }; - "uglify-to-browserify-1.0.2" = { - name = "uglify-to-browserify"; - packageName = "uglify-to-browserify"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/uglify-to-browserify/-/uglify-to-browserify-1.0.2.tgz"; - sha1 = "6e0924d6bda6b5afe349e39a6d632850a0f882b7"; - }; - }; - "camelcase-1.2.1" = { - name = "camelcase"; - packageName = "camelcase"; - version = "1.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/camelcase/-/camelcase-1.2.1.tgz"; - sha1 = "9bb5304d2e0b56698b2c758b08a3eaa9daa58a39"; - }; - }; - "cliui-2.1.0" = { - name = "cliui"; - packageName = "cliui"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/cliui/-/cliui-2.1.0.tgz"; - sha1 = "4b475760ff80264c762c3a1719032e91c7fea0d1"; - }; - }; - "window-size-0.1.0" = { - name = "window-size"; - packageName = "window-size"; - version = "0.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/window-size/-/window-size-0.1.0.tgz"; - sha1 = "5438cd2ea93b202efa3a19fe8887aee7c94f9c9d"; - }; - }; - "center-align-0.1.3" = { - name = "center-align"; - packageName = "center-align"; - version = "0.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/center-align/-/center-align-0.1.3.tgz"; - sha1 = "aa0d32629b6ee972200411cbd4461c907bc2b7ad"; - }; - }; - "right-align-0.1.3" = { - name = "right-align"; - packageName = "right-align"; - version = "0.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/right-align/-/right-align-0.1.3.tgz"; - sha1 = "61339b722fe6a3515689210d24e14c96148613ef"; - }; - }; - "wordwrap-0.0.2" = { - name = "wordwrap"; - packageName = "wordwrap"; - version = "0.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/wordwrap/-/wordwrap-0.0.2.tgz"; - sha1 = "b79669bb42ecb409f83d583cad52ca17eaa1643f"; - }; - }; - "align-text-0.1.4" = { - name = "align-text"; - packageName = "align-text"; - version = "0.1.4"; - src = fetchurl { - url = "https://registry.npmjs.org/align-text/-/align-text-0.1.4.tgz"; - sha1 = "0cd90a561093f35d0a99256c22b7069433fad117"; - }; - }; - "lazy-cache-1.0.4" = { - name = "lazy-cache"; - packageName = "lazy-cache"; - version = "1.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/lazy-cache/-/lazy-cache-1.0.4.tgz"; - sha1 = "a1d78fc3a50474cb80845d3b3b6e1da49a446e8e"; - }; - }; - "kind-of-3.1.0" = { - name = "kind-of"; - packageName = "kind-of"; - version = "3.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/kind-of/-/kind-of-3.1.0.tgz"; - sha1 = "475d698a5e49ff5e53d14e3e732429dc8bf4cf47"; - }; - }; - "longest-1.0.1" = { - name = "longest"; - packageName = "longest"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/longest/-/longest-1.0.1.tgz"; - sha1 = "30a0b2da38f73770e8294a0d22e6625ed77d0097"; - }; - }; - "repeat-string-1.6.1" = { - name = "repeat-string"; - packageName = "repeat-string"; - version = "1.6.1"; - src = fetchurl { - url = "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz"; - sha1 = "8dcae470e1c88abc2d600fff4a776286da75e637"; - }; - }; - "is-buffer-1.1.5" = { - name = "is-buffer"; - packageName = "is-buffer"; - version = "1.1.5"; - src = fetchurl { - url = "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.5.tgz"; - sha1 = "1f3b26ef613b214b88cbca23cc6c01d87961eecc"; - }; - }; - "acorn-1.2.2" = { - name = "acorn"; - packageName = "acorn"; - version = "1.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/acorn/-/acorn-1.2.2.tgz"; - sha1 = "c8ce27de0acc76d896d2b1fad3df588d9e82f014"; - }; - }; - "acorn-globals-1.0.9" = { - name = "acorn-globals"; - packageName = "acorn-globals"; - version = "1.0.9"; - src = fetchurl { - url = "https://registry.npmjs.org/acorn-globals/-/acorn-globals-1.0.9.tgz"; - sha1 = "55bb5e98691507b74579d0513413217c380c54cf"; - }; - }; - "abab-1.0.3" = { - name = "abab"; - packageName = "abab"; - version = "1.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/abab/-/abab-1.0.3.tgz"; - sha1 = "b81de5f7274ec4e756d797cd834f303642724e5d"; - }; - }; - "cssom-0.3.2" = { - name = "cssom"; - packageName = "cssom"; - version = "0.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/cssom/-/cssom-0.3.2.tgz"; - sha1 = "b8036170c79f07a90ff2f16e22284027a243848b"; - }; - }; - "cssstyle-0.2.37" = { - name = "cssstyle"; - packageName = "cssstyle"; - version = "0.2.37"; - src = fetchurl { - url = "https://registry.npmjs.org/cssstyle/-/cssstyle-0.2.37.tgz"; - sha1 = "541097234cb2513c83ceed3acddc27ff27987d54"; - }; - }; - "escodegen-1.8.1" = { - name = "escodegen"; - packageName = "escodegen"; - version = "1.8.1"; - src = fetchurl { - url = "https://registry.npmjs.org/escodegen/-/escodegen-1.8.1.tgz"; - sha1 = "5a5b53af4693110bebb0867aa3430dd3b70a1018"; - }; - }; - "nwmatcher-1.3.9" = { - name = "nwmatcher"; - packageName = "nwmatcher"; - version = "1.3.9"; - src = fetchurl { - url = "https://registry.npmjs.org/nwmatcher/-/nwmatcher-1.3.9.tgz"; - sha1 = "8bab486ff7fa3dfd086656bbe8b17116d3692d2a"; - }; - }; - "parse5-1.5.1" = { - name = "parse5"; - packageName = "parse5"; - version = "1.5.1"; - src = fetchurl { - url = "https://registry.npmjs.org/parse5/-/parse5-1.5.1.tgz"; - sha1 = "9b7f3b0de32be78dc2401b17573ccaf0f6f59d94"; - }; - }; - "request-2.81.0" = { - name = "request"; - packageName = "request"; - version = "2.81.0"; - src = fetchurl { - url = "https://registry.npmjs.org/request/-/request-2.81.0.tgz"; - sha1 = "c6928946a0e06c5f8d6f8a9333469ffda46298a0"; - }; - }; - "sax-1.2.2" = { - name = "sax"; - packageName = "sax"; - version = "1.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/sax/-/sax-1.2.2.tgz"; - sha1 = "fd8631a23bc7826bef5d871bdb87378c95647828"; - }; - }; - "symbol-tree-3.2.2" = { - name = "symbol-tree"; - packageName = "symbol-tree"; - version = "3.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/symbol-tree/-/symbol-tree-3.2.2.tgz"; - sha1 = "ae27db38f660a7ae2e1c3b7d1bc290819b8519e6"; - }; - }; - "tough-cookie-2.3.2" = { - name = "tough-cookie"; - packageName = "tough-cookie"; - version = "2.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/tough-cookie/-/tough-cookie-2.3.2.tgz"; - sha1 = "f081f76e4c85720e6c37a5faced737150d84072a"; - }; - }; - "webidl-conversions-2.0.1" = { - name = "webidl-conversions"; - packageName = "webidl-conversions"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-2.0.1.tgz"; - sha1 = "3bf8258f7d318c7443c36f2e169402a1a6703506"; - }; - }; - "whatwg-url-compat-0.6.5" = { - name = "whatwg-url-compat"; - packageName = "whatwg-url-compat"; - version = "0.6.5"; - src = fetchurl { - url = "https://registry.npmjs.org/whatwg-url-compat/-/whatwg-url-compat-0.6.5.tgz"; - sha1 = "00898111af689bb097541cd5a45ca6c8798445bf"; - }; - }; - "xml-name-validator-2.0.1" = { - name = "xml-name-validator"; - packageName = "xml-name-validator"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/xml-name-validator/-/xml-name-validator-2.0.1.tgz"; - sha1 = "4d8b8f1eccd3419aa362061becef515e1e559635"; - }; - }; - "estraverse-1.9.3" = { - name = "estraverse"; - packageName = "estraverse"; - version = "1.9.3"; - src = fetchurl { - url = "https://registry.npmjs.org/estraverse/-/estraverse-1.9.3.tgz"; - sha1 = "af67f2dc922582415950926091a4005d29c9bb44"; - }; - }; - "esutils-2.0.2" = { - name = "esutils"; - packageName = "esutils"; - version = "2.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/esutils/-/esutils-2.0.2.tgz"; - sha1 = "0abf4f1caa5bcb1f7a9d8acc6dea4faaa04bac9b"; - }; - }; - "esprima-2.7.3" = { - name = "esprima"; - packageName = "esprima"; - version = "2.7.3"; - src = fetchurl { - url = "https://registry.npmjs.org/esprima/-/esprima-2.7.3.tgz"; - sha1 = "96e3b70d5779f6ad49cd032673d1c312767ba581"; - }; - }; - "optionator-0.8.2" = { - name = "optionator"; - packageName = "optionator"; - version = "0.8.2"; - src = fetchurl { - url = "https://registry.npmjs.org/optionator/-/optionator-0.8.2.tgz"; - sha1 = "364c5e409d3f4d6301d6c0b4c05bba50180aeb64"; - }; - }; - "source-map-0.2.0" = { - name = "source-map"; - packageName = "source-map"; - version = "0.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/source-map/-/source-map-0.2.0.tgz"; - sha1 = "dab73fbcfc2ba819b4de03bd6f6eaa48164b3f9d"; - }; - }; - "prelude-ls-1.1.2" = { - name = "prelude-ls"; - packageName = "prelude-ls"; - version = "1.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.2.tgz"; - sha1 = "21932a549f5e52ffd9a827f570e04be62a97da54"; - }; - }; - "deep-is-0.1.3" = { - name = "deep-is"; - packageName = "deep-is"; - version = "0.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz"; - sha1 = "b369d6fb5dbc13eecf524f91b070feedc357cf34"; - }; - }; - "wordwrap-1.0.0" = { - name = "wordwrap"; - packageName = "wordwrap"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz"; - sha1 = "27584810891456a4171c8d0226441ade90cbcaeb"; - }; - }; - "type-check-0.3.2" = { - name = "type-check"; - packageName = "type-check"; - version = "0.3.2"; - src = fetchurl { - url = "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz"; - sha1 = "5884cab512cf1d355e3fb784f30804b2b520db72"; - }; - }; - "levn-0.3.0" = { - name = "levn"; - packageName = "levn"; - version = "0.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/levn/-/levn-0.3.0.tgz"; - sha1 = "3b09924edf9f083c0490fdd4c0bc4421e04764ee"; - }; - }; - "fast-levenshtein-2.0.6" = { - name = "fast-levenshtein"; - packageName = "fast-levenshtein"; - version = "2.0.6"; - src = fetchurl { - url = "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz"; - sha1 = "3d8a5c66883a16a30ca8643e851f19baa7797917"; - }; - }; - "aws-sign2-0.6.0" = { - name = "aws-sign2"; - packageName = "aws-sign2"; - version = "0.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/aws-sign2/-/aws-sign2-0.6.0.tgz"; - sha1 = "14342dd38dbcc94d0e5b87d763cd63612c0e794f"; - }; - }; - "aws4-1.6.0" = { - name = "aws4"; - packageName = "aws4"; - version = "1.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/aws4/-/aws4-1.6.0.tgz"; - sha1 = "83ef5ca860b2b32e4a0deedee8c771b9db57471e"; - }; - }; - "caseless-0.12.0" = { - name = "caseless"; - packageName = "caseless"; - version = "0.12.0"; - src = fetchurl { - url = "https://registry.npmjs.org/caseless/-/caseless-0.12.0.tgz"; - sha1 = "1b681c21ff84033c826543090689420d187151dc"; - }; - }; - "combined-stream-1.0.5" = { - name = "combined-stream"; - packageName = "combined-stream"; - version = "1.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.5.tgz"; - sha1 = "938370a57b4a51dea2c77c15d5c5fdf895164009"; - }; - }; - "extend-3.0.0" = { - name = "extend"; - packageName = "extend"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/extend/-/extend-3.0.0.tgz"; - sha1 = "5a474353b9f3353ddd8176dfd37b91c83a46f1d4"; - }; - }; - "forever-agent-0.6.1" = { - name = "forever-agent"; - packageName = "forever-agent"; - version = "0.6.1"; - src = fetchurl { - url = "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz"; - sha1 = "fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"; - }; - }; - "form-data-2.1.2" = { - name = "form-data"; - packageName = "form-data"; - version = "2.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/form-data/-/form-data-2.1.2.tgz"; - sha1 = "89c3534008b97eada4cbb157d58f6f5df025eae4"; - }; - }; - "har-validator-4.2.1" = { - name = "har-validator"; - packageName = "har-validator"; - version = "4.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/har-validator/-/har-validator-4.2.1.tgz"; - sha1 = "33481d0f1bbff600dd203d75812a6a5fba002e2a"; - }; - }; - "hawk-3.1.3" = { - name = "hawk"; - packageName = "hawk"; - version = "3.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/hawk/-/hawk-3.1.3.tgz"; - sha1 = "078444bd7c1640b0fe540d2c9b73d59678e8e1c4"; - }; - }; - "http-signature-1.1.1" = { - name = "http-signature"; - packageName = "http-signature"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/http-signature/-/http-signature-1.1.1.tgz"; - sha1 = "df72e267066cd0ac67fb76adf8e134a8fbcf91bf"; - }; - }; - "is-typedarray-1.0.0" = { - name = "is-typedarray"; - packageName = "is-typedarray"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz"; - sha1 = "e479c80858df0c1b11ddda6940f96011fcda4a9a"; - }; - }; - "isstream-0.1.2" = { - name = "isstream"; - packageName = "isstream"; - version = "0.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz"; - sha1 = "47e63f7af55afa6f92e1500e690eb8b8529c099a"; - }; - }; - "json-stringify-safe-5.0.1" = { - name = "json-stringify-safe"; - packageName = "json-stringify-safe"; - version = "5.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz"; - sha1 = "1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"; - }; - }; - "oauth-sign-0.8.2" = { - name = "oauth-sign"; - packageName = "oauth-sign"; - version = "0.8.2"; - src = fetchurl { - url = "https://registry.npmjs.org/oauth-sign/-/oauth-sign-0.8.2.tgz"; - sha1 = "46a6ab7f0aead8deae9ec0565780b7d4efeb9d43"; - }; - }; - "performance-now-0.2.0" = { - name = "performance-now"; - packageName = "performance-now"; - version = "0.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/performance-now/-/performance-now-0.2.0.tgz"; - sha1 = "33ef30c5c77d4ea21c5a53869d91b56d8f2555e5"; - }; - }; - "qs-6.4.0" = { - name = "qs"; - packageName = "qs"; - version = "6.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/qs/-/qs-6.4.0.tgz"; - sha1 = "13e26d28ad6b0ffaa91312cd3bf708ed351e7233"; - }; - }; - "safe-buffer-5.0.1" = { - name = "safe-buffer"; - packageName = "safe-buffer"; - version = "5.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.0.1.tgz"; - sha1 = "d263ca54696cd8a306b5ca6551e92de57918fbe7"; - }; - }; - "stringstream-0.0.5" = { - name = "stringstream"; - packageName = "stringstream"; - version = "0.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/stringstream/-/stringstream-0.0.5.tgz"; - sha1 = "4e484cd4de5a0bbbee18e46307710a8a81621878"; - }; - }; - "tunnel-agent-0.6.0" = { - name = "tunnel-agent"; - packageName = "tunnel-agent"; - version = "0.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz"; - sha1 = "27a5dea06b36b04a0a9966774b290868f0fc40fd"; - }; - }; - "delayed-stream-1.0.0" = { - name = "delayed-stream"; - packageName = "delayed-stream"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz"; - sha1 = "df3ae199acadfb7d440aaae0b29e2272b24ec619"; - }; - }; - "asynckit-0.4.0" = { - name = "asynckit"; - packageName = "asynckit"; - version = "0.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz"; - sha1 = "c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"; - }; - }; - "ajv-4.11.5" = { - name = "ajv"; - packageName = "ajv"; - version = "4.11.5"; - src = fetchurl { - url = "https://registry.npmjs.org/ajv/-/ajv-4.11.5.tgz"; - sha1 = "b6ee74657b993a01dce44b7944d56f485828d5bd"; - }; - }; - "har-schema-1.0.5" = { - name = "har-schema"; - packageName = "har-schema"; - version = "1.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/har-schema/-/har-schema-1.0.5.tgz"; - sha1 = "d263135f43307c02c602afc8fe95970c0151369e"; - }; - }; - "co-4.6.0" = { - name = "co"; - packageName = "co"; - version = "4.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/co/-/co-4.6.0.tgz"; - sha1 = "6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184"; - }; - }; - "json-stable-stringify-1.0.1" = { - name = "json-stable-stringify"; - packageName = "json-stable-stringify"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz"; - sha1 = "9a759d39c5f2ff503fd5300646ed445f88c4f9af"; - }; - }; - "jsonify-0.0.0" = { - name = "jsonify"; - packageName = "jsonify"; - version = "0.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/jsonify/-/jsonify-0.0.0.tgz"; - sha1 = "2c74b6ee41d93ca51b7b5aaee8f503631d252a73"; - }; - }; - "hoek-2.16.3" = { - name = "hoek"; - packageName = "hoek"; - version = "2.16.3"; - src = fetchurl { - url = "https://registry.npmjs.org/hoek/-/hoek-2.16.3.tgz"; - sha1 = "20bb7403d3cea398e91dc4710a8ff1b8274a25ed"; - }; - }; - "boom-2.10.1" = { - name = "boom"; - packageName = "boom"; - version = "2.10.1"; - src = fetchurl { - url = "https://registry.npmjs.org/boom/-/boom-2.10.1.tgz"; - sha1 = "39c8918ceff5799f83f9492a848f625add0c766f"; - }; - }; - "cryptiles-2.0.5" = { - name = "cryptiles"; - packageName = "cryptiles"; - version = "2.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/cryptiles/-/cryptiles-2.0.5.tgz"; - sha1 = "3bdfecdc608147c1c67202fa291e7dca59eaa3b8"; - }; - }; - "sntp-1.0.9" = { - name = "sntp"; - packageName = "sntp"; - version = "1.0.9"; - src = fetchurl { - url = "https://registry.npmjs.org/sntp/-/sntp-1.0.9.tgz"; - sha1 = "6541184cc90aeea6c6e7b35e2659082443c66198"; - }; - }; - "assert-plus-0.2.0" = { - name = "assert-plus"; - packageName = "assert-plus"; - version = "0.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/assert-plus/-/assert-plus-0.2.0.tgz"; - sha1 = "d74e1b87e7affc0db8aadb7021f3fe48101ab234"; - }; - }; - "jsprim-1.4.0" = { - name = "jsprim"; - packageName = "jsprim"; - version = "1.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/jsprim/-/jsprim-1.4.0.tgz"; - sha1 = "a3b87e40298d8c380552d8cc7628a0bb95a22918"; - }; - }; - "sshpk-1.11.0" = { - name = "sshpk"; - packageName = "sshpk"; - version = "1.11.0"; - src = fetchurl { - url = "https://registry.npmjs.org/sshpk/-/sshpk-1.11.0.tgz"; - sha1 = "2d8d5ebb4a6fab28ffba37fa62a90f4a3ea59d77"; - }; - }; - "assert-plus-1.0.0" = { - name = "assert-plus"; - packageName = "assert-plus"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/assert-plus/-/assert-plus-1.0.0.tgz"; - sha1 = "f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525"; - }; - }; - "extsprintf-1.0.2" = { - name = "extsprintf"; - packageName = "extsprintf"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/extsprintf/-/extsprintf-1.0.2.tgz"; - sha1 = "e1080e0658e300b06294990cc70e1502235fd550"; - }; - }; - "json-schema-0.2.3" = { - name = "json-schema"; - packageName = "json-schema"; - version = "0.2.3"; - src = fetchurl { - url = "https://registry.npmjs.org/json-schema/-/json-schema-0.2.3.tgz"; - sha1 = "b480c892e59a2f05954ce727bd3f2a4e882f9e13"; - }; - }; - "verror-1.3.6" = { - name = "verror"; - packageName = "verror"; - version = "1.3.6"; - src = fetchurl { - url = "https://registry.npmjs.org/verror/-/verror-1.3.6.tgz"; - sha1 = "cff5df12946d297d2baaefaa2689e25be01c005c"; - }; - }; - "asn1-0.2.3" = { - name = "asn1"; - packageName = "asn1"; - version = "0.2.3"; - src = fetchurl { - url = "https://registry.npmjs.org/asn1/-/asn1-0.2.3.tgz"; - sha1 = "dac8787713c9966849fc8180777ebe9c1ddf3b86"; - }; - }; - "dashdash-1.14.1" = { - name = "dashdash"; - packageName = "dashdash"; - version = "1.14.1"; - src = fetchurl { - url = "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz"; - sha1 = "853cfa0f7cbe2fed5de20326b8dd581035f6e2f0"; - }; - }; - "getpass-0.1.6" = { - name = "getpass"; - packageName = "getpass"; - version = "0.1.6"; - src = fetchurl { - url = "https://registry.npmjs.org/getpass/-/getpass-0.1.6.tgz"; - sha1 = "283ffd9fc1256840875311c1b60e8c40187110e6"; - }; - }; - "jsbn-0.1.1" = { - name = "jsbn"; - packageName = "jsbn"; - version = "0.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz"; - sha1 = "a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"; - }; - }; - "tweetnacl-0.14.5" = { - name = "tweetnacl"; - packageName = "tweetnacl"; - version = "0.14.5"; - src = fetchurl { - url = "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz"; - sha1 = "5ae68177f192d4456269d108afa93ff8743f4f64"; - }; - }; - "jodid25519-1.0.2" = { - name = "jodid25519"; - packageName = "jodid25519"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/jodid25519/-/jodid25519-1.0.2.tgz"; - sha1 = "06d4912255093419477d425633606e0e90782967"; - }; - }; - "ecc-jsbn-0.1.1" = { - name = "ecc-jsbn"; - packageName = "ecc-jsbn"; - version = "0.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.1.tgz"; - sha1 = "0fc73a9ed5f0d53c38193398523ef7e543777505"; - }; - }; - "bcrypt-pbkdf-1.0.1" = { - name = "bcrypt-pbkdf"; - packageName = "bcrypt-pbkdf"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/bcrypt-pbkdf/-/bcrypt-pbkdf-1.0.1.tgz"; - sha1 = "63bc5dcb61331b92bc05fd528953c33462a06f8d"; - }; - }; - "punycode-1.4.1" = { - name = "punycode"; - packageName = "punycode"; - version = "1.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz"; - sha1 = "c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"; - }; - }; - "tr46-0.0.3" = { - name = "tr46"; - packageName = "tr46"; - version = "0.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz"; - sha1 = "8184fd347dac9cdc185992f3a6622e14b9d9ab6a"; - }; - }; - "vary-1.1.1" = { - name = "vary"; - packageName = "vary"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/vary/-/vary-1.1.1.tgz"; - sha1 = "67535ebb694c1d52257457984665323f587e8d37"; - }; - }; - "minimist-0.0.8" = { - name = "minimist"; - packageName = "minimist"; - version = "0.0.8"; - src = fetchurl { - url = "https://registry.npmjs.org/minimist/-/minimist-0.0.8.tgz"; - sha1 = "857fcabfc3397d2625b8228262e86aa7a011b05d"; - }; - }; - "minimist-0.0.10" = { - name = "minimist"; - packageName = "minimist"; - version = "0.0.10"; - src = fetchurl { - url = "https://registry.npmjs.org/minimist/-/minimist-0.0.10.tgz"; - sha1 = "de3f98543dbf96082be48ad1a0c7cda836301dcf"; - }; - }; - "glob-7.1.1" = { - name = "glob"; - packageName = "glob"; - version = "7.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/glob/-/glob-7.1.1.tgz"; - sha1 = "805211df04faaf1c63a3600306cdf5ade50b2ec8"; - }; - }; - "fs.realpath-1.0.0" = { - name = "fs.realpath"; - packageName = "fs.realpath"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz"; - sha1 = "1504ad2523158caa40db4a2787cb01411994ea4f"; - }; - }; - "htmlparser2-3.9.2" = { - name = "htmlparser2"; - packageName = "htmlparser2"; - version = "3.9.2"; - src = fetchurl { - url = "https://registry.npmjs.org/htmlparser2/-/htmlparser2-3.9.2.tgz"; - sha1 = "1bdf87acca0f3f9e53fa4fcceb0f4b4cbb00b338"; - }; - }; - "regexp-quote-0.0.0" = { - name = "regexp-quote"; - packageName = "regexp-quote"; - version = "0.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/regexp-quote/-/regexp-quote-0.0.0.tgz"; - sha1 = "1e0f4650c862dcbfed54fd42b148e9bb1721fcf2"; - }; - }; - "xtend-4.0.1" = { - name = "xtend"; - packageName = "xtend"; - version = "4.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/xtend/-/xtend-4.0.1.tgz"; - sha1 = "a5c6d532be656e23db820efb943a1f04998d63af"; - }; - }; - "domelementtype-1.3.0" = { - name = "domelementtype"; - packageName = "domelementtype"; - version = "1.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/domelementtype/-/domelementtype-1.3.0.tgz"; - sha1 = "b17aed82e8ab59e52dd9c19b1756e0fc187204c2"; - }; - }; - "domhandler-2.3.0" = { - name = "domhandler"; - packageName = "domhandler"; - version = "2.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/domhandler/-/domhandler-2.3.0.tgz"; - sha1 = "2de59a0822d5027fabff6f032c2b25a2a8abe738"; - }; - }; - "domutils-1.5.1" = { - name = "domutils"; - packageName = "domutils"; - version = "1.5.1"; - src = fetchurl { - url = "https://registry.npmjs.org/domutils/-/domutils-1.5.1.tgz"; - sha1 = "dcd8488a26f563d61079e48c9f7b7e32373682cf"; - }; - }; - "entities-1.1.1" = { - name = "entities"; - packageName = "entities"; - version = "1.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/entities/-/entities-1.1.1.tgz"; - sha1 = "6e5c2d0a5621b5dadaecef80b90edfb5cd7772f0"; - }; - }; - "readable-stream-2.2.6" = { - name = "readable-stream"; - packageName = "readable-stream"; - version = "2.2.6"; - src = fetchurl { - url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.2.6.tgz"; - sha1 = "8b43aed76e71483938d12a8d46c6cf1a00b1f816"; - }; - }; - "dom-serializer-0.1.0" = { - name = "dom-serializer"; - packageName = "dom-serializer"; - version = "0.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/dom-serializer/-/dom-serializer-0.1.0.tgz"; - sha1 = "073c697546ce0780ce23be4a28e293e40bc30c82"; - }; - }; - "domelementtype-1.1.3" = { - name = "domelementtype"; - packageName = "domelementtype"; - version = "1.1.3"; - src = fetchurl { - url = "https://registry.npmjs.org/domelementtype/-/domelementtype-1.1.3.tgz"; - sha1 = "bd28773e2642881aec51544924299c5cd822185b"; - }; - }; - "buffer-shims-1.0.0" = { - name = "buffer-shims"; - packageName = "buffer-shims"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/buffer-shims/-/buffer-shims-1.0.0.tgz"; - sha1 = "9978ce317388c649ad8793028c3477ef044a8b51"; - }; - }; - "isarray-1.0.0" = { - name = "isarray"; - packageName = "isarray"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz"; - sha1 = "bb935d48582cba168c06834957a54a3e07124f11"; - }; - }; - "process-nextick-args-1.0.7" = { - name = "process-nextick-args"; - packageName = "process-nextick-args"; - version = "1.0.7"; - src = fetchurl { - url = "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz"; - sha1 = "150e20b756590ad3f91093f25a4f2ad8bff30ba3"; - }; - }; - "util-deprecate-1.0.2" = { - name = "util-deprecate"; - packageName = "util-deprecate"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz"; - sha1 = "450d4dc9fa70de732762fbd2d4a28981419a0ccf"; - }; - }; - "destroy-1.0.4" = { - name = "destroy"; - packageName = "destroy"; - version = "1.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz"; - sha1 = "978857442c44749e4206613e37946205826abd80"; - }; - }; - "yargs-6.6.0" = { - name = "yargs"; - packageName = "yargs"; - version = "6.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/yargs/-/yargs-6.6.0.tgz"; - sha1 = "782ec21ef403345f830a808ca3d513af56065208"; - }; - }; - "camelcase-3.0.0" = { - name = "camelcase"; - packageName = "camelcase"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/camelcase/-/camelcase-3.0.0.tgz"; - sha1 = "32fc4b9fcdaf845fcdf7e73bb97cac2261f0ab0a"; - }; - }; - "cliui-3.2.0" = { - name = "cliui"; - packageName = "cliui"; - version = "3.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/cliui/-/cliui-3.2.0.tgz"; - sha1 = "120601537a916d29940f934da3b48d585a39213d"; - }; - }; - "get-caller-file-1.0.2" = { - name = "get-caller-file"; - packageName = "get-caller-file"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/get-caller-file/-/get-caller-file-1.0.2.tgz"; - sha1 = "f702e63127e7e231c160a80c1554acb70d5047e5"; - }; - }; - "os-locale-1.4.0" = { - name = "os-locale"; - packageName = "os-locale"; - version = "1.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz"; - sha1 = "20f9f17ae29ed345e8bde583b13d2009803c14d9"; - }; - }; - "require-directory-2.1.1" = { - name = "require-directory"; - packageName = "require-directory"; - version = "2.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz"; - sha1 = "8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"; - }; - }; - "require-main-filename-1.0.1" = { - name = "require-main-filename"; - packageName = "require-main-filename"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz"; - sha1 = "97f717b69d48784f5f526a6c5aa8ffdda055a4d1"; - }; - }; - "set-blocking-2.0.0" = { - name = "set-blocking"; - packageName = "set-blocking"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz"; - sha1 = "045f9782d011ae9a6803ddd382b24392b3d890f7"; - }; - }; - "string-width-1.0.2" = { - name = "string-width"; - packageName = "string-width"; - version = "1.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz"; - sha1 = "118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3"; - }; - }; - "which-module-1.0.0" = { - name = "which-module"; - packageName = "which-module"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/which-module/-/which-module-1.0.0.tgz"; - sha1 = "bba63ca861948994ff307736089e3b96026c2a4f"; - }; - }; - "y18n-3.2.1" = { - name = "y18n"; - packageName = "y18n"; - version = "3.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/y18n/-/y18n-3.2.1.tgz"; - sha1 = "6d15fba884c08679c0d77e88e7759e811e07fa41"; - }; - }; - "yargs-parser-4.2.1" = { - name = "yargs-parser"; - packageName = "yargs-parser"; - version = "4.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-4.2.1.tgz"; - sha1 = "29cceac0dc4f03c6c87b4a9f217dd18c9f74871c"; - }; - }; - "strip-ansi-3.0.1" = { - name = "strip-ansi"; - packageName = "strip-ansi"; - version = "3.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz"; - sha1 = "6a385fb8853d952d5ff05d0e8aaf94278dc63dcf"; - }; - }; - "wrap-ansi-2.1.0" = { - name = "wrap-ansi"; - packageName = "wrap-ansi"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz"; - sha1 = "d8fc3d284dd05794fe84973caecdd1cf824fdd85"; - }; - }; - "ansi-regex-2.1.1" = { - name = "ansi-regex"; - packageName = "ansi-regex"; - version = "2.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/ansi-regex/-/ansi-regex-2.1.1.tgz"; - sha1 = "c3b33ab5ee360d86e0e628f0468ae7ef27d654df"; - }; - }; - "lcid-1.0.0" = { - name = "lcid"; - packageName = "lcid"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lcid/-/lcid-1.0.0.tgz"; - sha1 = "308accafa0bc483a3867b4b6f2b9506251d1b835"; - }; - }; - "invert-kv-1.0.0" = { - name = "invert-kv"; - packageName = "invert-kv"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/invert-kv/-/invert-kv-1.0.0.tgz"; - sha1 = "104a8e4aaca6d3d8cd157a8ef8bfab2d7a3ffdb6"; - }; - }; - "code-point-at-1.1.0" = { - name = "code-point-at"; - packageName = "code-point-at"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/code-point-at/-/code-point-at-1.1.0.tgz"; - sha1 = "0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"; - }; - }; - "is-fullwidth-code-point-1.0.0" = { - name = "is-fullwidth-code-point"; - packageName = "is-fullwidth-code-point"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz"; - sha1 = "ef9e31386f031a7f0d643af82fde50c457ef00cb"; - }; - }; - "faye-websocket-0.10.0" = { - name = "faye-websocket"; - packageName = "faye-websocket"; - version = "0.10.0"; - src = fetchurl { - url = "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.10.0.tgz"; - sha1 = "4e492f8d04dfb6f89003507f6edbf2d501e7c6f4"; - }; - }; - "uuid-2.0.3" = { - name = "uuid"; - packageName = "uuid"; - version = "2.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/uuid/-/uuid-2.0.3.tgz"; - sha1 = "67e2e863797215530dff318e5bf9dcebfd47b21a"; - }; - }; - "websocket-driver-0.6.5" = { - name = "websocket-driver"; - packageName = "websocket-driver"; - version = "0.6.5"; - src = fetchurl { - url = "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.6.5.tgz"; - sha1 = "5cb2556ceb85f4373c6d8238aa691c8454e13a36"; - }; - }; - "websocket-extensions-0.1.1" = { - name = "websocket-extensions"; - packageName = "websocket-extensions"; - version = "0.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.1.tgz"; - sha1 = "76899499c184b6ef754377c2dbb0cd6cb55d29e7"; - }; - }; - "assert-1.4.1" = { - name = "assert"; - packageName = "assert"; - version = "1.4.1"; - src = fetchurl { - url = "https://registry.npmjs.org/assert/-/assert-1.4.1.tgz"; - sha1 = "99912d591836b5a6f5b345c0f07eefc08fc65d91"; - }; - }; - "es6-shim-0.27.1" = { - name = "es6-shim"; - packageName = "es6-shim"; - version = "0.27.1"; - src = fetchurl { - url = "https://registry.npmjs.org/es6-shim/-/es6-shim-0.27.1.tgz"; - sha1 = "bd3f870663eac2ede8e8943e2a6d23c052d53fc6"; - }; - }; - "minimum-tls-version-0.0.1" = { - name = "minimum-tls-version"; - packageName = "minimum-tls-version"; - version = "0.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/minimum-tls-version/-/minimum-tls-version-0.0.1.tgz"; - sha1 = "42220187e52700e253218cfa8ad974920b73ea74"; - }; - }; - "util-0.10.3" = { - name = "util"; - packageName = "util"; - version = "0.10.3"; - src = fetchurl { - url = "https://registry.npmjs.org/util/-/util-0.10.3.tgz"; - sha1 = "7afb1afe50805246489e3db7fe0ed379336ac0f9"; - }; - }; - "inherits-2.0.1" = { - name = "inherits"; - packageName = "inherits"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"; - sha1 = "b17d08d326b4423e568eff719f91b0b1cbdf69f1"; - }; - }; - "underscore-1.6.0" = { - name = "underscore"; - packageName = "underscore"; - version = "1.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/underscore/-/underscore-1.6.0.tgz"; - sha1 = "8b38b10cacdef63337b8b24e4ff86d45aea529a8"; - }; - }; - "xml2js-0.1.14" = { - name = "xml2js"; - packageName = "xml2js"; - version = "0.1.14"; - src = fetchurl { - url = "https://registry.npmjs.org/xml2js/-/xml2js-0.1.14.tgz"; - sha1 = "5274e67f5a64c5f92974cd85139e0332adc6b90c"; - }; - }; - "databank-1.0.1" = { - name = "databank"; - packageName = "databank"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/databank/-/databank-1.0.1.tgz"; - sha1 = "ef063df1f1aaceb8507ce70f7de6cb32980e874b"; - }; - }; - "mongodb-2.2.25" = { - name = "mongodb"; - packageName = "mongodb"; - version = "2.2.25"; - src = fetchurl { - url = "https://registry.npmjs.org/mongodb/-/mongodb-2.2.25.tgz"; - sha1 = "d3b25dad00eda2bdfcbc996210ba082ac686a6b6"; - }; - }; - "setimmediate-1.0.5" = { - name = "setimmediate"; - packageName = "setimmediate"; - version = "1.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz"; - sha1 = "290cbb232e306942d7d7ea9b83732ab7856f8285"; - }; - }; - "es6-promise-3.2.1" = { - name = "es6-promise"; - packageName = "es6-promise"; - version = "3.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/es6-promise/-/es6-promise-3.2.1.tgz"; - sha1 = "ec56233868032909207170c39448e24449dd1fc4"; - }; - }; - "mongodb-core-2.1.9" = { - name = "mongodb-core"; - packageName = "mongodb-core"; - version = "2.1.9"; - src = fetchurl { - url = "https://registry.npmjs.org/mongodb-core/-/mongodb-core-2.1.9.tgz"; - sha1 = "85aa71ee4fb716196e06b787557bf139f801daf5"; - }; - }; - "readable-stream-2.1.5" = { - name = "readable-stream"; - packageName = "readable-stream"; - version = "2.1.5"; - src = fetchurl { - url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.1.5.tgz"; - sha1 = "66fa8b720e1438b364681f2ad1a63c618448c9d0"; - }; - }; - "bson-1.0.4" = { - name = "bson"; - packageName = "bson"; - version = "1.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/bson/-/bson-1.0.4.tgz"; - sha1 = "93c10d39eaa5b58415cbc4052f3e53e562b0b72c"; - }; - }; - "require_optional-1.0.0" = { - name = "require_optional"; - packageName = "require_optional"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/require_optional/-/require_optional-1.0.0.tgz"; - sha1 = "52a86137a849728eb60a55533617f8f914f59abf"; - }; - }; - "resolve-from-2.0.0" = { - name = "resolve-from"; - packageName = "resolve-from"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/resolve-from/-/resolve-from-2.0.0.tgz"; - sha1 = "9480ab20e94ffa1d9e80a804c7ea147611966b57"; - }; - }; - "async-0.9.2" = { - name = "async"; - packageName = "async"; - version = "0.9.2"; - src = fetchurl { - url = "https://registry.npmjs.org/async/-/async-0.9.2.tgz"; - sha1 = "aea74d5e61c1f899613bf64bda66d4c78f2fd17d"; - }; - }; - "redis-0.10.3" = { - name = "redis"; - packageName = "redis"; - version = "0.10.3"; - src = fetchurl { - url = "https://registry.npmjs.org/redis/-/redis-0.10.3.tgz"; - sha1 = "8927fe2110ee39617bcf3fd37b89d8e123911bb6"; - }; - }; - }; - args = { - name = "pump.io"; - packageName = "pump.io"; - version = "3.0.0"; - src = fetchurl { url = "https://registry.npmjs.org/pump.io/-/pump.io-3.0.0.tgz"; sha1 = "ycfm7ak83xi8mgafhp9q0n6n3kzmdz16"; }; - dependencies = [ - (sources."bcrypt-0.8.7" // { - dependencies = [ - sources."bindings-1.2.1" - sources."nan-2.3.5" - ]; - }) - (sources."bunyan-1.8.9" // { - dependencies = [ - (sources."dtrace-provider-0.8.1" // { - dependencies = [ - sources."nan-2.5.1" - ]; - }) - (sources."mv-2.1.1" // { - dependencies = [ - sources."ncp-2.0.0" - (sources."rimraf-2.4.5" // { - dependencies = [ - (sources."glob-6.0.4" // { - dependencies = [ - (sources."inflight-1.0.6" // { - dependencies = [ - sources."wrappy-1.0.2" - ]; - }) - sources."inherits-2.0.3" - (sources."minimatch-3.0.3" // { - dependencies = [ - (sources."brace-expansion-1.1.6" // { - dependencies = [ - sources."balanced-match-0.4.2" - sources."concat-map-0.0.1" - ]; - }) - ]; - }) - (sources."once-1.4.0" // { - dependencies = [ - sources."wrappy-1.0.2" - ]; - }) - sources."path-is-absolute-1.0.1" - ]; - }) - ]; - }) - ]; - }) - sources."safe-json-stringify-1.0.4" - sources."moment-2.18.1" - ]; - }) - sources."colors-1.1.2" - (sources."connect-2.30.2" // { - dependencies = [ - sources."basic-auth-connect-1.0.0" - (sources."body-parser-1.13.3" // { - dependencies = [ - sources."iconv-lite-0.4.11" - (sources."on-finished-2.3.0" // { - dependencies = [ - sources."ee-first-1.1.1" - ]; - }) - (sources."raw-body-2.1.7" // { - dependencies = [ - sources."bytes-2.4.0" - sources."iconv-lite-0.4.13" - sources."unpipe-1.0.0" - ]; - }) - ]; - }) - sources."bytes-2.1.0" - sources."cookie-0.1.3" - sources."cookie-parser-1.3.5" - sources."cookie-signature-1.0.6" - (sources."compression-1.5.2" // { - dependencies = [ - (sources."accepts-1.2.13" // { - dependencies = [ - (sources."mime-types-2.1.15" // { - dependencies = [ - sources."mime-db-1.27.0" - ]; - }) - sources."negotiator-0.5.3" - ]; - }) - (sources."compressible-2.0.10" // { - dependencies = [ - sources."mime-db-1.27.0" - ]; - }) - sources."vary-1.0.1" - ]; - }) - (sources."connect-timeout-1.6.2" // { - dependencies = [ - sources."ms-0.7.1" - ]; - }) - sources."content-type-1.0.2" - (sources."csurf-1.8.3" // { - dependencies = [ - (sources."csrf-3.0.6" // { - dependencies = [ - sources."rndm-1.2.0" - sources."tsscmp-1.0.5" - (sources."uid-safe-2.1.4" // { - dependencies = [ - sources."random-bytes-1.0.0" - ]; - }) - ]; - }) - ]; - }) - (sources."debug-2.2.0" // { - dependencies = [ - sources."ms-0.7.1" - ]; - }) - sources."depd-1.0.1" - (sources."errorhandler-1.4.3" // { - dependencies = [ - (sources."accepts-1.3.3" // { - dependencies = [ - (sources."mime-types-2.1.15" // { - dependencies = [ - sources."mime-db-1.27.0" - ]; - }) - sources."negotiator-0.6.1" - ]; - }) - sources."escape-html-1.0.3" - ]; - }) - (sources."express-session-1.11.3" // { - dependencies = [ - sources."crc-3.3.0" - (sources."uid-safe-2.0.0" // { - dependencies = [ - sources."base64-url-1.2.1" - ]; - }) - ]; - }) - (sources."finalhandler-0.4.0" // { - dependencies = [ - sources."escape-html-1.0.2" - (sources."on-finished-2.3.0" // { - dependencies = [ - sources."ee-first-1.1.1" - ]; - }) - sources."unpipe-1.0.0" - ]; - }) - sources."fresh-0.3.0" - (sources."http-errors-1.3.1" // { - dependencies = [ - sources."inherits-2.0.3" - sources."statuses-1.3.1" - ]; - }) - (sources."morgan-1.6.1" // { - dependencies = [ - sources."basic-auth-1.0.4" - (sources."on-finished-2.3.0" // { - dependencies = [ - sources."ee-first-1.1.1" - ]; - }) - ]; - }) - (sources."multiparty-3.3.2" // { - dependencies = [ - (sources."readable-stream-1.1.14" // { - dependencies = [ - sources."core-util-is-1.0.2" - sources."isarray-0.0.1" - sources."string_decoder-0.10.31" - sources."inherits-2.0.3" - ]; - }) - sources."stream-counter-0.2.0" - ]; - }) - sources."on-headers-1.0.1" - sources."parseurl-1.3.1" - sources."pause-0.1.0" - sources."qs-4.0.0" - (sources."response-time-2.3.2" // { - dependencies = [ - sources."depd-1.1.0" - ]; - }) - (sources."serve-favicon-2.3.2" // { - dependencies = [ - sources."etag-1.7.0" - sources."ms-0.7.2" - ]; - }) - (sources."serve-index-1.7.3" // { - dependencies = [ - (sources."accepts-1.2.13" // { - dependencies = [ - sources."negotiator-0.5.3" - ]; - }) - sources."batch-0.5.3" - sources."escape-html-1.0.3" - (sources."mime-types-2.1.15" // { - dependencies = [ - sources."mime-db-1.27.0" - ]; - }) - ]; - }) - (sources."serve-static-1.10.3" // { - dependencies = [ - sources."escape-html-1.0.3" - ]; - }) - (sources."type-is-1.6.14" // { - dependencies = [ - sources."media-typer-0.3.0" - (sources."mime-types-2.1.15" // { - dependencies = [ - sources."mime-db-1.27.0" - ]; - }) - ]; - }) - sources."utils-merge-1.0.0" - sources."vhost-3.0.2" - ]; - }) - (sources."connect-auth-git://github.com/e14n/connect-auth" // { - dependencies = [ - sources."oauth-0.9.7" - sources."openid-0.4.1" - ]; - }) - (sources."connect-databank-1.0.3" // { - dependencies = [ - sources."async-1.5.2" - sources."node-uuid-1.4.8" - sources."set-immediate-0.1.1" - ]; - }) - (sources."connect-multiparty-2.0.0" // { - dependencies = [ - (sources."multiparty-4.1.3" // { - dependencies = [ - (sources."fd-slicer-1.0.1" // { - dependencies = [ - sources."pend-1.2.0" - ]; - }) - ]; - }) - (sources."on-finished-2.3.0" // { - dependencies = [ - sources."ee-first-1.1.1" - ]; - }) - sources."qs-4.0.0" - (sources."type-is-1.6.14" // { - dependencies = [ - sources."media-typer-0.3.0" - (sources."mime-types-2.1.15" // { - dependencies = [ - sources."mime-db-1.27.0" - ]; - }) - ]; - }) - ]; - }) - sources."crypto-cacerts-0.1.0" - (sources."databank-0.19.8" // { - dependencies = [ - sources."set-immediate-0.1.1" - ]; - }) - (sources."dateformat-1.0.12" // { - dependencies = [ - sources."get-stdin-4.0.1" - (sources."meow-3.7.0" // { - dependencies = [ - (sources."camelcase-keys-2.1.0" // { - dependencies = [ - sources."camelcase-2.1.1" - ]; - }) - sources."decamelize-1.2.0" - (sources."loud-rejection-1.6.0" // { - dependencies = [ - (sources."currently-unhandled-0.4.1" // { - dependencies = [ - sources."array-find-index-1.0.2" - ]; - }) - sources."signal-exit-3.0.2" - ]; - }) - sources."map-obj-1.0.1" - sources."minimist-1.2.0" - (sources."normalize-package-data-2.3.6" // { - dependencies = [ - sources."hosted-git-info-2.4.1" - (sources."is-builtin-module-1.0.0" // { - dependencies = [ - sources."builtin-modules-1.1.1" - ]; - }) - sources."semver-5.3.0" - (sources."validate-npm-package-license-3.0.1" // { - dependencies = [ - (sources."spdx-correct-1.0.2" // { - dependencies = [ - sources."spdx-license-ids-1.2.2" - ]; - }) - sources."spdx-expression-parse-1.0.4" - ]; - }) - ]; - }) - sources."object-assign-4.1.1" - (sources."read-pkg-up-1.0.1" // { - dependencies = [ - (sources."find-up-1.1.2" // { - dependencies = [ - sources."path-exists-2.1.0" - (sources."pinkie-promise-2.0.1" // { - dependencies = [ - sources."pinkie-2.0.4" - ]; - }) - ]; - }) - (sources."read-pkg-1.1.0" // { - dependencies = [ - (sources."load-json-file-1.1.0" // { - dependencies = [ - sources."graceful-fs-4.1.11" - (sources."parse-json-2.2.0" // { - dependencies = [ - (sources."error-ex-1.3.1" // { - dependencies = [ - sources."is-arrayish-0.2.1" - ]; - }) - ]; - }) - sources."pify-2.3.0" - (sources."pinkie-promise-2.0.1" // { - dependencies = [ - sources."pinkie-2.0.4" - ]; - }) - (sources."strip-bom-2.0.0" // { - dependencies = [ - sources."is-utf8-0.2.1" - ]; - }) - ]; - }) - (sources."path-type-1.1.0" // { - dependencies = [ - sources."graceful-fs-4.1.11" - sources."pify-2.3.0" - (sources."pinkie-promise-2.0.1" // { - dependencies = [ - sources."pinkie-2.0.4" - ]; - }) - ]; - }) - ]; - }) - ]; - }) - (sources."redent-1.0.0" // { - dependencies = [ - (sources."indent-string-2.1.0" // { - dependencies = [ - (sources."repeating-2.0.1" // { - dependencies = [ - (sources."is-finite-1.0.2" // { - dependencies = [ - sources."number-is-nan-1.0.1" - ]; - }) - ]; - }) - ]; - }) - sources."strip-indent-1.0.1" - ]; - }) - sources."trim-newlines-1.0.0" - ]; - }) - ]; - }) - (sources."dialback-client-0.2.0" // { - dependencies = [ - sources."underscore-1.5.2" - sources."step-0.0.6" - ]; - }) - sources."dompurify-0.8.5" - (sources."emailjs-1.0.8" // { - dependencies = [ - sources."addressparser-0.3.2" - (sources."mimelib-0.2.14" // { - dependencies = [ - (sources."encoding-0.1.12" // { - dependencies = [ - sources."iconv-lite-0.4.15" - ]; - }) - sources."addressparser-0.2.1" - ]; - }) - sources."moment-2.11.2" - sources."starttls-1.0.1" - sources."bufferjs-1.1.0" - ]; - }) - (sources."express-3.21.2" // { - dependencies = [ - sources."basic-auth-1.0.4" - sources."content-disposition-0.5.0" - sources."content-type-1.0.2" - sources."commander-2.6.0" - sources."cookie-0.1.3" - sources."cookie-signature-1.0.6" - (sources."debug-2.2.0" // { - dependencies = [ - sources."ms-0.7.1" - ]; - }) - sources."depd-1.0.1" - sources."escape-html-1.0.2" - sources."etag-1.7.0" - sources."fresh-0.3.0" - sources."merge-descriptors-1.0.0" - sources."methods-1.1.2" - sources."parseurl-1.3.1" - (sources."proxy-addr-1.0.10" // { - dependencies = [ - sources."forwarded-0.1.0" - sources."ipaddr.js-1.0.5" - ]; - }) - sources."range-parser-1.0.3" - (sources."send-0.13.0" // { - dependencies = [ - sources."destroy-1.0.3" - (sources."http-errors-1.3.1" // { - dependencies = [ - sources."inherits-2.0.3" - ]; - }) - sources."mime-1.3.4" - sources."ms-0.7.1" - (sources."on-finished-2.3.0" // { - dependencies = [ - sources."ee-first-1.1.1" - ]; - }) - sources."statuses-1.2.1" - ]; - }) - sources."utils-merge-1.0.0" - sources."vary-1.0.1" - ]; - }) - (sources."express-session-1.15.2" // { - dependencies = [ - sources."cookie-0.3.1" - sources."cookie-signature-1.0.6" - sources."crc-3.4.4" - (sources."debug-2.6.3" // { - dependencies = [ - sources."ms-0.7.2" - ]; - }) - sources."depd-1.1.0" - sources."on-headers-1.0.1" - sources."parseurl-1.3.1" - (sources."uid-safe-2.1.4" // { - dependencies = [ - sources."random-bytes-1.0.0" - ]; - }) - sources."utils-merge-1.0.0" - ]; - }) - (sources."gm-1.23.0" // { - dependencies = [ - sources."array-parallel-0.1.3" - sources."array-series-0.1.5" - (sources."cross-spawn-4.0.2" // { - dependencies = [ - (sources."lru-cache-4.0.2" // { - dependencies = [ - sources."pseudomap-1.0.2" - sources."yallist-2.1.2" - ]; - }) - (sources."which-1.2.14" // { - dependencies = [ - sources."isexe-2.0.0" - ]; - }) - ]; - }) - (sources."debug-2.2.0" // { - dependencies = [ - sources."ms-0.7.1" - ]; - }) - ]; - }) - (sources."helmet-3.5.0" // { - dependencies = [ - (sources."connect-3.6.0" // { - dependencies = [ - (sources."debug-2.6.1" // { - dependencies = [ - sources."ms-0.7.2" - ]; - }) - (sources."finalhandler-1.0.0" // { - dependencies = [ - sources."encodeurl-1.0.1" - sources."escape-html-1.0.3" - (sources."on-finished-2.3.0" // { - dependencies = [ - sources."ee-first-1.1.1" - ]; - }) - sources."statuses-1.3.1" - sources."unpipe-1.0.0" - ]; - }) - sources."parseurl-1.3.1" - sources."utils-merge-1.0.0" - ]; - }) - sources."dns-prefetch-control-0.1.0" - sources."dont-sniff-mimetype-1.0.0" - sources."frameguard-3.0.0" - (sources."helmet-csp-2.4.0" // { - dependencies = [ - sources."camelize-1.0.0" - (sources."content-security-policy-builder-1.1.0" // { - dependencies = [ - sources."dashify-0.2.2" - ]; - }) - sources."dasherize-2.0.0" - sources."lodash.reduce-4.6.0" - sources."platform-1.3.3" - ]; - }) - sources."hide-powered-by-1.0.0" - sources."hpkp-2.0.0" - (sources."hsts-2.0.0" // { - dependencies = [ - sources."core-util-is-1.0.2" - ]; - }) - sources."ienoopen-1.0.0" - sources."nocache-2.0.0" - sources."referrer-policy-1.1.0" - sources."x-xss-protection-1.0.0" - ]; - }) - (sources."jade-1.11.0" // { - dependencies = [ - sources."character-parser-1.2.1" - (sources."clean-css-3.4.25" // { - dependencies = [ - (sources."commander-2.8.1" // { - dependencies = [ - sources."graceful-readlink-1.0.1" - ]; - }) - (sources."source-map-0.4.4" // { - dependencies = [ - sources."amdefine-1.0.1" - ]; - }) - ]; - }) - sources."commander-2.6.0" - (sources."constantinople-3.0.2" // { - dependencies = [ - sources."acorn-2.7.0" - ]; - }) - (sources."jstransformer-0.0.2" // { - dependencies = [ - sources."is-promise-2.1.0" - (sources."promise-6.1.0" // { - dependencies = [ - sources."asap-1.0.0" - ]; - }) - ]; - }) - (sources."transformers-2.1.0" // { - dependencies = [ - (sources."promise-2.0.0" // { - dependencies = [ - sources."is-promise-1.0.1" - ]; - }) - (sources."css-1.0.8" // { - dependencies = [ - sources."css-parse-1.0.4" - sources."css-stringify-1.0.5" - ]; - }) - (sources."uglify-js-2.2.5" // { - dependencies = [ - (sources."source-map-0.1.43" // { - dependencies = [ - sources."amdefine-1.0.1" - ]; - }) - (sources."optimist-0.3.7" // { - dependencies = [ - sources."wordwrap-0.0.3" - ]; - }) - ]; - }) - ]; - }) - (sources."uglify-js-2.8.20" // { - dependencies = [ - sources."source-map-0.5.6" - (sources."yargs-3.10.0" // { - dependencies = [ - sources."camelcase-1.2.1" - (sources."cliui-2.1.0" // { - dependencies = [ - (sources."center-align-0.1.3" // { - dependencies = [ - (sources."align-text-0.1.4" // { - dependencies = [ - (sources."kind-of-3.1.0" // { - dependencies = [ - sources."is-buffer-1.1.5" - ]; - }) - sources."longest-1.0.1" - sources."repeat-string-1.6.1" - ]; - }) - sources."lazy-cache-1.0.4" - ]; - }) - (sources."right-align-0.1.3" // { - dependencies = [ - (sources."align-text-0.1.4" // { - dependencies = [ - (sources."kind-of-3.1.0" // { - dependencies = [ - sources."is-buffer-1.1.5" - ]; - }) - sources."longest-1.0.1" - sources."repeat-string-1.6.1" - ]; - }) - ]; - }) - sources."wordwrap-0.0.2" - ]; - }) - sources."decamelize-1.2.0" - sources."window-size-0.1.0" - ]; - }) - sources."uglify-to-browserify-1.0.2" - ]; - }) - sources."void-elements-2.0.1" - (sources."with-4.0.3" // { - dependencies = [ - sources."acorn-1.2.2" - (sources."acorn-globals-1.0.9" // { - dependencies = [ - sources."acorn-2.7.0" - ]; - }) - ]; - }) - ]; - }) - sources."jankyqueue-0.1.1" - (sources."jsdom-7.2.2" // { - dependencies = [ - sources."abab-1.0.3" - sources."acorn-2.7.0" - sources."acorn-globals-1.0.9" - sources."cssom-0.3.2" - sources."cssstyle-0.2.37" - (sources."escodegen-1.8.1" // { - dependencies = [ - sources."estraverse-1.9.3" - sources."esutils-2.0.2" - sources."esprima-2.7.3" - (sources."optionator-0.8.2" // { - dependencies = [ - sources."prelude-ls-1.1.2" - sources."deep-is-0.1.3" - sources."wordwrap-1.0.0" - sources."type-check-0.3.2" - sources."levn-0.3.0" - sources."fast-levenshtein-2.0.6" - ]; - }) - (sources."source-map-0.2.0" // { - dependencies = [ - sources."amdefine-1.0.1" - ]; - }) - ]; - }) - sources."nwmatcher-1.3.9" - sources."parse5-1.5.1" - (sources."request-2.81.0" // { - dependencies = [ - sources."aws-sign2-0.6.0" - sources."aws4-1.6.0" - sources."caseless-0.12.0" - (sources."combined-stream-1.0.5" // { - dependencies = [ - sources."delayed-stream-1.0.0" - ]; - }) - sources."extend-3.0.0" - sources."forever-agent-0.6.1" - (sources."form-data-2.1.2" // { - dependencies = [ - sources."asynckit-0.4.0" - ]; - }) - (sources."har-validator-4.2.1" // { - dependencies = [ - (sources."ajv-4.11.5" // { - dependencies = [ - sources."co-4.6.0" - (sources."json-stable-stringify-1.0.1" // { - dependencies = [ - sources."jsonify-0.0.0" - ]; - }) - ]; - }) - sources."har-schema-1.0.5" - ]; - }) - (sources."hawk-3.1.3" // { - dependencies = [ - sources."hoek-2.16.3" - sources."boom-2.10.1" - sources."cryptiles-2.0.5" - sources."sntp-1.0.9" - ]; - }) - (sources."http-signature-1.1.1" // { - dependencies = [ - sources."assert-plus-0.2.0" - (sources."jsprim-1.4.0" // { - dependencies = [ - sources."assert-plus-1.0.0" - sources."extsprintf-1.0.2" - sources."json-schema-0.2.3" - sources."verror-1.3.6" - ]; - }) - (sources."sshpk-1.11.0" // { - dependencies = [ - sources."asn1-0.2.3" - sources."assert-plus-1.0.0" - sources."dashdash-1.14.1" - sources."getpass-0.1.6" - sources."jsbn-0.1.1" - sources."tweetnacl-0.14.5" - sources."jodid25519-1.0.2" - sources."ecc-jsbn-0.1.1" - sources."bcrypt-pbkdf-1.0.1" - ]; - }) - ]; - }) - sources."is-typedarray-1.0.0" - sources."isstream-0.1.2" - sources."json-stringify-safe-5.0.1" - (sources."mime-types-2.1.15" // { - dependencies = [ - sources."mime-db-1.27.0" - ]; - }) - sources."oauth-sign-0.8.2" - sources."performance-now-0.2.0" - sources."qs-6.4.0" - sources."safe-buffer-5.0.1" - sources."stringstream-0.0.5" - sources."tunnel-agent-0.6.0" - ]; - }) - sources."sax-1.2.2" - sources."symbol-tree-3.2.2" - (sources."tough-cookie-2.3.2" // { - dependencies = [ - sources."punycode-1.4.1" - ]; - }) - sources."webidl-conversions-2.0.1" - (sources."whatwg-url-compat-0.6.5" // { - dependencies = [ - sources."tr46-0.0.3" - ]; - }) - sources."xml-name-validator-2.0.1" - ]; - }) - (sources."method-override-2.3.8" // { - dependencies = [ - (sources."debug-2.6.3" // { - dependencies = [ - sources."ms-0.7.2" - ]; - }) - sources."methods-1.1.2" - sources."parseurl-1.3.1" - sources."vary-1.1.1" - ]; - }) - (sources."mkdirp-0.5.1" // { - dependencies = [ - sources."minimist-0.0.8" - ]; - }) - sources."oauth-evanp-0.9.10-evanp.2" - sources."octal-1.0.0" - (sources."optimist-0.6.1" // { - dependencies = [ - sources."wordwrap-0.0.3" - sources."minimist-0.0.10" - ]; - }) - (sources."rimraf-2.6.1" // { - dependencies = [ - (sources."glob-7.1.1" // { - dependencies = [ - sources."fs.realpath-1.0.0" - (sources."inflight-1.0.6" // { - dependencies = [ - sources."wrappy-1.0.2" - ]; - }) - sources."inherits-2.0.3" - (sources."minimatch-3.0.3" // { - dependencies = [ - (sources."brace-expansion-1.1.6" // { - dependencies = [ - sources."balanced-match-0.4.2" - sources."concat-map-0.0.1" - ]; - }) - ]; - }) - (sources."once-1.4.0" // { - dependencies = [ - sources."wrappy-1.0.2" - ]; - }) - sources."path-is-absolute-1.0.1" - ]; - }) - ]; - }) - (sources."sanitize-html-1.14.1" // { - dependencies = [ - (sources."htmlparser2-3.9.2" // { - dependencies = [ - sources."domelementtype-1.3.0" - sources."domhandler-2.3.0" - (sources."domutils-1.5.1" // { - dependencies = [ - (sources."dom-serializer-0.1.0" // { - dependencies = [ - sources."domelementtype-1.1.3" - ]; - }) - ]; - }) - sources."entities-1.1.1" - sources."inherits-2.0.3" - (sources."readable-stream-2.2.6" // { - dependencies = [ - sources."buffer-shims-1.0.0" - sources."core-util-is-1.0.2" - sources."isarray-1.0.0" - sources."process-nextick-args-1.0.7" - sources."string_decoder-0.10.31" - sources."util-deprecate-1.0.2" - ]; - }) - ]; - }) - sources."regexp-quote-0.0.0" - sources."xtend-4.0.1" - ]; - }) - sources."schlock-0.2.1" - (sources."send-0.13.2" // { - dependencies = [ - sources."debug-2.2.0" - sources."depd-1.1.0" - sources."destroy-1.0.4" - sources."escape-html-1.0.3" - sources."etag-1.7.0" - sources."fresh-0.3.0" - (sources."http-errors-1.3.1" // { - dependencies = [ - sources."inherits-2.0.3" - ]; - }) - sources."mime-1.3.4" - sources."ms-0.7.1" - (sources."on-finished-2.3.0" // { - dependencies = [ - sources."ee-first-1.1.1" - ]; - }) - sources."range-parser-1.0.3" - sources."statuses-1.2.1" - ]; - }) - (sources."showdown-1.6.4" // { - dependencies = [ - (sources."yargs-6.6.0" // { - dependencies = [ - sources."camelcase-3.0.0" - (sources."cliui-3.2.0" // { - dependencies = [ - (sources."strip-ansi-3.0.1" // { - dependencies = [ - sources."ansi-regex-2.1.1" - ]; - }) - sources."wrap-ansi-2.1.0" - ]; - }) - sources."decamelize-1.2.0" - sources."get-caller-file-1.0.2" - (sources."os-locale-1.4.0" // { - dependencies = [ - (sources."lcid-1.0.0" // { - dependencies = [ - sources."invert-kv-1.0.0" - ]; - }) - ]; - }) - (sources."read-pkg-up-1.0.1" // { - dependencies = [ - (sources."find-up-1.1.2" // { - dependencies = [ - sources."path-exists-2.1.0" - (sources."pinkie-promise-2.0.1" // { - dependencies = [ - sources."pinkie-2.0.4" - ]; - }) - ]; - }) - (sources."read-pkg-1.1.0" // { - dependencies = [ - (sources."load-json-file-1.1.0" // { - dependencies = [ - sources."graceful-fs-4.1.11" - (sources."parse-json-2.2.0" // { - dependencies = [ - (sources."error-ex-1.3.1" // { - dependencies = [ - sources."is-arrayish-0.2.1" - ]; - }) - ]; - }) - sources."pify-2.3.0" - (sources."pinkie-promise-2.0.1" // { - dependencies = [ - sources."pinkie-2.0.4" - ]; - }) - (sources."strip-bom-2.0.0" // { - dependencies = [ - sources."is-utf8-0.2.1" - ]; - }) - ]; - }) - (sources."normalize-package-data-2.3.6" // { - dependencies = [ - sources."hosted-git-info-2.4.1" - (sources."is-builtin-module-1.0.0" // { - dependencies = [ - sources."builtin-modules-1.1.1" - ]; - }) - sources."semver-5.3.0" - (sources."validate-npm-package-license-3.0.1" // { - dependencies = [ - (sources."spdx-correct-1.0.2" // { - dependencies = [ - sources."spdx-license-ids-1.2.2" - ]; - }) - sources."spdx-expression-parse-1.0.4" - ]; - }) - ]; - }) - (sources."path-type-1.1.0" // { - dependencies = [ - sources."graceful-fs-4.1.11" - sources."pify-2.3.0" - (sources."pinkie-promise-2.0.1" // { - dependencies = [ - sources."pinkie-2.0.4" - ]; - }) - ]; - }) - ]; - }) - ]; - }) - sources."require-directory-2.1.1" - sources."require-main-filename-1.0.1" - sources."set-blocking-2.0.0" - (sources."string-width-1.0.2" // { - dependencies = [ - sources."code-point-at-1.1.0" - (sources."is-fullwidth-code-point-1.0.0" // { - dependencies = [ - sources."number-is-nan-1.0.1" - ]; - }) - (sources."strip-ansi-3.0.1" // { - dependencies = [ - sources."ansi-regex-2.1.1" - ]; - }) - ]; - }) - sources."which-module-1.0.0" - sources."y18n-3.2.1" - sources."yargs-parser-4.2.1" - ]; - }) - ]; - }) - (sources."sockjs-0.3.18" // { - dependencies = [ - (sources."faye-websocket-0.10.0" // { - dependencies = [ - (sources."websocket-driver-0.6.5" // { - dependencies = [ - sources."websocket-extensions-0.1.1" - ]; - }) - ]; - }) - sources."uuid-2.0.3" - ]; - }) - (sources."ssl-config-0.0.9" // { - dependencies = [ - (sources."assert-1.4.1" // { - dependencies = [ - (sources."util-0.10.3" // { - dependencies = [ - sources."inherits-2.0.1" - ]; - }) - ]; - }) - sources."es6-shim-0.27.1" - sources."minimum-tls-version-0.0.1" - ]; - }) - sources."step-1.0.0" - sources."ua-parser-js-0.7.12" - sources."underscore-1.8.3" - (sources."underscore-contrib-0.3.0" // { - dependencies = [ - sources."underscore-1.6.0" - ]; - }) - sources."uuid-3.0.1" - sources."validator-4.4.0" - (sources."webfinger-0.4.2" // { - dependencies = [ - sources."step-0.0.6" - (sources."xml2js-0.1.14" // { - dependencies = [ - sources."sax-1.2.2" - ]; - }) - ]; - }) - (sources."databank-mongodb-1.0.0" // { - dependencies = [ - (sources."databank-1.0.1" // { - dependencies = [ - sources."setimmediate-1.0.5" - ]; - }) - (sources."debug-2.6.3" // { - dependencies = [ - sources."ms-0.7.2" - ]; - }) - (sources."mongodb-2.2.25" // { - dependencies = [ - sources."es6-promise-3.2.1" - (sources."mongodb-core-2.1.9" // { - dependencies = [ - sources."bson-1.0.4" - (sources."require_optional-1.0.0" // { - dependencies = [ - sources."semver-5.3.0" - sources."resolve-from-2.0.0" - ]; - }) - ]; - }) - (sources."readable-stream-2.1.5" // { - dependencies = [ - sources."buffer-shims-1.0.0" - sources."core-util-is-1.0.2" - sources."inherits-2.0.3" - sources."isarray-1.0.0" - sources."process-nextick-args-1.0.7" - sources."string_decoder-0.10.31" - sources."util-deprecate-1.0.2" - ]; - }) - ]; - }) - ]; - }) - (sources."databank-redis-0.19.6" // { - dependencies = [ - sources."async-0.9.2" - sources."redis-0.10.3" - sources."underscore-1.6.0" - ]; - }) - (sources."databank-lrucache-0.1.3" // { - dependencies = [ - sources."databank-1.0.1" - (sources."lru-cache-4.0.2" // { - dependencies = [ - sources."pseudomap-1.0.2" - sources."yallist-2.1.2" - ]; - }) - sources."setimmediate-1.0.5" - ]; - }) - ]; - buildInputs = globalBuildInputs; - meta = { - homepage = http://pump.io/; - license = "Apache-2.0"; - }; - production = true; - }; -in -{ - tarball = nodeEnv.buildNodeSourceDist args; - package = nodeEnv.buildNodePackage args; - shell = nodeEnv.buildNodeShell args; -} \ No newline at end of file diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d92d2b46bdb9..d00c7c2eb088 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12505,8 +12505,6 @@ with pkgs; psqlodbc = callPackage ../servers/sql/postgresql/psqlodbc { }; - pumpio = callPackage ../servers/web-apps/pump.io { }; - pure-ftpd = callPackage ../servers/ftp/pure-ftpd { }; pyIRCt = callPackage ../servers/xmpp/pyIRCt {}; From c95ef47c51226acfe5a36bb6895fdd88f63d35ec Mon Sep 17 00:00:00 2001 From: Rodney Lorrimar Date: Tue, 27 Feb 2018 09:43:39 +0000 Subject: [PATCH 083/814] Release notes: mention removal of pump.io module --- nixos/doc/manual/release-notes/rl-1803.xml | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/nixos/doc/manual/release-notes/rl-1803.xml b/nixos/doc/manual/release-notes/rl-1803.xml index 29b252753830..42603d0ee7ce 100644 --- a/nixos/doc/manual/release-notes/rl-1803.xml +++ b/nixos/doc/manual/release-notes/rl-1803.xml @@ -296,6 +296,13 @@ following incompatible changes: nodejs-4_x, nodejs-slim-4_x and nodePackages_4_x are removed. + + + The pump.io NixOS module was removed. + It is now maintained as an + external module. + + From eb36e7187d74bbd5d78552a8912d02ff64d375de Mon Sep 17 00:00:00 2001 From: Ryan Mulligan Date: Tue, 27 Feb 2018 06:08:50 -0800 Subject: [PATCH 084/814] mkdocs: 0.16.3 -> 0.17.2 Semi-automatic update. These checks were performed: - built on NixOS - ran `/nix/store/hndrgmyp176jgfgy4iyf0wdf21hhbdwv-mkdocs-0.17.2/bin/.mkdocs-wrapped -h` got 0 exit code - ran `/nix/store/hndrgmyp176jgfgy4iyf0wdf21hhbdwv-mkdocs-0.17.2/bin/.mkdocs-wrapped --help` got 0 exit code - ran `/nix/store/hndrgmyp176jgfgy4iyf0wdf21hhbdwv-mkdocs-0.17.2/bin/.mkdocs-wrapped -V` and found version 0.17.2 - ran `/nix/store/hndrgmyp176jgfgy4iyf0wdf21hhbdwv-mkdocs-0.17.2/bin/.mkdocs-wrapped --version` and found version 0.17.2 - ran `/nix/store/hndrgmyp176jgfgy4iyf0wdf21hhbdwv-mkdocs-0.17.2/bin/mkdocs -h` got 0 exit code - ran `/nix/store/hndrgmyp176jgfgy4iyf0wdf21hhbdwv-mkdocs-0.17.2/bin/mkdocs --help` got 0 exit code - ran `/nix/store/hndrgmyp176jgfgy4iyf0wdf21hhbdwv-mkdocs-0.17.2/bin/mkdocs -V` and found version 0.17.2 - ran `/nix/store/hndrgmyp176jgfgy4iyf0wdf21hhbdwv-mkdocs-0.17.2/bin/mkdocs --version` and found version 0.17.2 - found 0.17.2 with grep in /nix/store/hndrgmyp176jgfgy4iyf0wdf21hhbdwv-mkdocs-0.17.2 - found 0.17.2 in filename of file in /nix/store/hndrgmyp176jgfgy4iyf0wdf21hhbdwv-mkdocs-0.17.2 --- pkgs/development/tools/documentation/mkdocs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/documentation/mkdocs/default.nix b/pkgs/development/tools/documentation/mkdocs/default.nix index 144bd059634f..b6daade32e78 100644 --- a/pkgs/development/tools/documentation/mkdocs/default.nix +++ b/pkgs/development/tools/documentation/mkdocs/default.nix @@ -4,14 +4,14 @@ with python.pkgs; buildPythonApplication rec { pname = "mkdocs"; - version = "0.16.3"; + version = "0.17.2"; name = "${pname}-${version}"; src = fetchFromGitHub { owner = "mkdocs"; repo = "mkdocs"; rev = version; - sha256 = "0gssa5gbd1y2v3azdhf2zh7ayx4ncfag4r2a6fi96jbic64r3qrs"; + sha256 = "0hpjs9qj0nr57a249yv8xvl61d3d2rrdfqxp1fm28z77l2xjj772"; }; checkInputs = [ From 7c6a529da0c8c9c2605b7c8b10fd4b77e1e971c9 Mon Sep 17 00:00:00 2001 From: Ryan Mulligan Date: Tue, 27 Feb 2018 06:09:52 -0800 Subject: [PATCH 085/814] mlmmj: 1.2.19.0 -> 1.3.0 Semi-automatic update. These checks were performed: - built on NixOS - ran `/nix/store/a9ndyb3f81ssfkxhiyls76nqcba3rlnn-mlmmj-1.3.0/bin/mlmmj-send -h` got 0 exit code - ran `/nix/store/a9ndyb3f81ssfkxhiyls76nqcba3rlnn-mlmmj-1.3.0/bin/mlmmj-send --help` got 0 exit code - ran `/nix/store/a9ndyb3f81ssfkxhiyls76nqcba3rlnn-mlmmj-1.3.0/bin/mlmmj-send -V` and found version 1.3.0 - ran `/nix/store/a9ndyb3f81ssfkxhiyls76nqcba3rlnn-mlmmj-1.3.0/bin/mlmmj-send -h` and found version 1.3.0 - ran `/nix/store/a9ndyb3f81ssfkxhiyls76nqcba3rlnn-mlmmj-1.3.0/bin/mlmmj-send --help` and found version 1.3.0 - ran `/nix/store/a9ndyb3f81ssfkxhiyls76nqcba3rlnn-mlmmj-1.3.0/bin/mlmmj-receive -h` got 0 exit code - ran `/nix/store/a9ndyb3f81ssfkxhiyls76nqcba3rlnn-mlmmj-1.3.0/bin/mlmmj-receive --help` got 0 exit code - ran `/nix/store/a9ndyb3f81ssfkxhiyls76nqcba3rlnn-mlmmj-1.3.0/bin/mlmmj-receive -V` and found version 1.3.0 - ran `/nix/store/a9ndyb3f81ssfkxhiyls76nqcba3rlnn-mlmmj-1.3.0/bin/mlmmj-receive -h` and found version 1.3.0 - ran `/nix/store/a9ndyb3f81ssfkxhiyls76nqcba3rlnn-mlmmj-1.3.0/bin/mlmmj-receive --help` and found version 1.3.0 - ran `/nix/store/a9ndyb3f81ssfkxhiyls76nqcba3rlnn-mlmmj-1.3.0/bin/mlmmj-process -h` got 0 exit code - ran `/nix/store/a9ndyb3f81ssfkxhiyls76nqcba3rlnn-mlmmj-1.3.0/bin/mlmmj-process --help` got 0 exit code - ran `/nix/store/a9ndyb3f81ssfkxhiyls76nqcba3rlnn-mlmmj-1.3.0/bin/mlmmj-process -V` and found version 1.3.0 - ran `/nix/store/a9ndyb3f81ssfkxhiyls76nqcba3rlnn-mlmmj-1.3.0/bin/mlmmj-process -h` and found version 1.3.0 - ran `/nix/store/a9ndyb3f81ssfkxhiyls76nqcba3rlnn-mlmmj-1.3.0/bin/mlmmj-process --help` and found version 1.3.0 - ran `/nix/store/a9ndyb3f81ssfkxhiyls76nqcba3rlnn-mlmmj-1.3.0/bin/mlmmj-sub -h` got 0 exit code - ran `/nix/store/a9ndyb3f81ssfkxhiyls76nqcba3rlnn-mlmmj-1.3.0/bin/mlmmj-sub --help` got 0 exit code - ran `/nix/store/a9ndyb3f81ssfkxhiyls76nqcba3rlnn-mlmmj-1.3.0/bin/mlmmj-sub -V` and found version 1.3.0 - ran `/nix/store/a9ndyb3f81ssfkxhiyls76nqcba3rlnn-mlmmj-1.3.0/bin/mlmmj-sub -h` and found version 1.3.0 - ran `/nix/store/a9ndyb3f81ssfkxhiyls76nqcba3rlnn-mlmmj-1.3.0/bin/mlmmj-sub --help` and found version 1.3.0 - ran `/nix/store/a9ndyb3f81ssfkxhiyls76nqcba3rlnn-mlmmj-1.3.0/bin/mlmmj-unsub -h` got 0 exit code - ran `/nix/store/a9ndyb3f81ssfkxhiyls76nqcba3rlnn-mlmmj-1.3.0/bin/mlmmj-unsub --help` got 0 exit code - ran `/nix/store/a9ndyb3f81ssfkxhiyls76nqcba3rlnn-mlmmj-1.3.0/bin/mlmmj-unsub -V` and found version 1.3.0 - ran `/nix/store/a9ndyb3f81ssfkxhiyls76nqcba3rlnn-mlmmj-1.3.0/bin/mlmmj-unsub -h` and found version 1.3.0 - ran `/nix/store/a9ndyb3f81ssfkxhiyls76nqcba3rlnn-mlmmj-1.3.0/bin/mlmmj-unsub --help` and found version 1.3.0 - ran `/nix/store/a9ndyb3f81ssfkxhiyls76nqcba3rlnn-mlmmj-1.3.0/bin/mlmmj-bounce -h` got 0 exit code - ran `/nix/store/a9ndyb3f81ssfkxhiyls76nqcba3rlnn-mlmmj-1.3.0/bin/mlmmj-bounce --help` got 0 exit code - ran `/nix/store/a9ndyb3f81ssfkxhiyls76nqcba3rlnn-mlmmj-1.3.0/bin/mlmmj-bounce -V` and found version 1.3.0 - ran `/nix/store/a9ndyb3f81ssfkxhiyls76nqcba3rlnn-mlmmj-1.3.0/bin/mlmmj-bounce -h` and found version 1.3.0 - ran `/nix/store/a9ndyb3f81ssfkxhiyls76nqcba3rlnn-mlmmj-1.3.0/bin/mlmmj-bounce --help` and found version 1.3.0 - ran `/nix/store/a9ndyb3f81ssfkxhiyls76nqcba3rlnn-mlmmj-1.3.0/bin/mlmmj-maintd -h` got 0 exit code - ran `/nix/store/a9ndyb3f81ssfkxhiyls76nqcba3rlnn-mlmmj-1.3.0/bin/mlmmj-maintd --help` got 0 exit code - ran `/nix/store/a9ndyb3f81ssfkxhiyls76nqcba3rlnn-mlmmj-1.3.0/bin/mlmmj-maintd -V` and found version 1.3.0 - ran `/nix/store/a9ndyb3f81ssfkxhiyls76nqcba3rlnn-mlmmj-1.3.0/bin/mlmmj-maintd -h` and found version 1.3.0 - ran `/nix/store/a9ndyb3f81ssfkxhiyls76nqcba3rlnn-mlmmj-1.3.0/bin/mlmmj-maintd --help` and found version 1.3.0 - ran `/nix/store/a9ndyb3f81ssfkxhiyls76nqcba3rlnn-mlmmj-1.3.0/bin/mlmmj-list -h` got 0 exit code - ran `/nix/store/a9ndyb3f81ssfkxhiyls76nqcba3rlnn-mlmmj-1.3.0/bin/mlmmj-list --help` got 0 exit code - ran `/nix/store/a9ndyb3f81ssfkxhiyls76nqcba3rlnn-mlmmj-1.3.0/bin/mlmmj-list -V` and found version 1.3.0 - ran `/nix/store/a9ndyb3f81ssfkxhiyls76nqcba3rlnn-mlmmj-1.3.0/bin/mlmmj-list -h` and found version 1.3.0 - ran `/nix/store/a9ndyb3f81ssfkxhiyls76nqcba3rlnn-mlmmj-1.3.0/bin/mlmmj-list --help` and found version 1.3.0 - ran `/nix/store/a9ndyb3f81ssfkxhiyls76nqcba3rlnn-mlmmj-1.3.0/bin/mlmmj-make-ml -h` got 0 exit code - ran `/nix/store/a9ndyb3f81ssfkxhiyls76nqcba3rlnn-mlmmj-1.3.0/bin/mlmmj-make-ml -h` and found version 1.3.0 - found 1.3.0 with grep in /nix/store/a9ndyb3f81ssfkxhiyls76nqcba3rlnn-mlmmj-1.3.0 - found 1.3.0 in filename of file in /nix/store/a9ndyb3f81ssfkxhiyls76nqcba3rlnn-mlmmj-1.3.0 cc "@edwtjo" --- pkgs/servers/mail/mlmmj/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/mail/mlmmj/default.nix b/pkgs/servers/mail/mlmmj/default.nix index ddf4fd5d880d..f11400c190af 100644 --- a/pkgs/servers/mail/mlmmj/default.nix +++ b/pkgs/servers/mail/mlmmj/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "mlmmj-${version}"; - version = "1.2.19.0"; + version = "1.3.0"; src = fetchurl { url = "http://mlmmj.org/releases/${name}.tar.gz"; - sha256 = "18n7b41nfdj7acvmqzkkz984d26xvz14xk8kmrnzv23dkda364m0"; + sha256 = "1sghqvwizvm1a9w56r34qy5njaq1c26bagj85r60h32gh3fx02bn"; }; postInstall = '' From d4f0c2373dc33d865fbcfa6ae7fe981dc18eab86 Mon Sep 17 00:00:00 2001 From: Ryan Mulligan Date: Tue, 27 Feb 2018 07:48:21 -0800 Subject: [PATCH 086/814] msilbc: 2.0.3 -> 2.1.2 Semi-automatic update. These checks were performed: - built on NixOS - found 2.1.2 with grep in /nix/store/382shdj4qs6hl916ycw7ai4c7xz1sd40-msilbc-2.1.2 - found 2.1.2 in filename of file in /nix/store/382shdj4qs6hl916ycw7ai4c7xz1sd40-msilbc-2.1.2 --- pkgs/development/libraries/msilbc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/msilbc/default.nix b/pkgs/development/libraries/msilbc/default.nix index c7d65f156b8b..cfb02ddbf9dd 100644 --- a/pkgs/development/libraries/msilbc/default.nix +++ b/pkgs/development/libraries/msilbc/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, ilbc, mediastreamer, pkgconfig }: stdenv.mkDerivation rec { - name = "msilbc-2.0.3"; + name = "msilbc-2.1.2"; src = fetchurl { url = "mirror://savannah/linphone/plugins/sources/${name}.tar.gz"; - sha256 = "125yadpc0w1q84839dadin3ahs0gxxfas0zmc4c18mjmf58dmm7d"; + sha256 = "07j02y994ybh274fp7ydjvi76h34y2c34ndwjpjfcwwr03b48cfp"; }; propagatedBuildInputs = [ ilbc mediastreamer ]; From f6f8818f72187b7ff34b1c7c8b8bbf99d2b12620 Mon Sep 17 00:00:00 2001 From: Ryan Mulligan Date: Tue, 27 Feb 2018 07:49:01 -0800 Subject: [PATCH 087/814] msitools: 0.94 -> 0.97 Semi-automatic update. These checks were performed: - built on NixOS - ran `/nix/store/xmsjbixyip29vcxgh0wkhlvvb9zpbhz2-msitools-0.97/bin/msiinfo -h` got 0 exit code - ran `/nix/store/xmsjbixyip29vcxgh0wkhlvvb9zpbhz2-msitools-0.97/bin/msiinfo --help` got 0 exit code - ran `/nix/store/xmsjbixyip29vcxgh0wkhlvvb9zpbhz2-msitools-0.97/bin/msiinfo help` got 0 exit code - ran `/nix/store/xmsjbixyip29vcxgh0wkhlvvb9zpbhz2-msitools-0.97/bin/msiinfo -v` and found version 0.97 - ran `/nix/store/xmsjbixyip29vcxgh0wkhlvvb9zpbhz2-msitools-0.97/bin/msiinfo --version` and found version 0.97 - ran `/nix/store/xmsjbixyip29vcxgh0wkhlvvb9zpbhz2-msitools-0.97/bin/msiextract -h` got 0 exit code - ran `/nix/store/xmsjbixyip29vcxgh0wkhlvvb9zpbhz2-msitools-0.97/bin/msiextract --help` got 0 exit code - ran `/nix/store/xmsjbixyip29vcxgh0wkhlvvb9zpbhz2-msitools-0.97/bin/msiextract help` got 0 exit code - ran `/nix/store/xmsjbixyip29vcxgh0wkhlvvb9zpbhz2-msitools-0.97/bin/msiextract --version` and found version 0.97 - ran `/nix/store/xmsjbixyip29vcxgh0wkhlvvb9zpbhz2-msitools-0.97/bin/wixl -h` got 0 exit code - ran `/nix/store/xmsjbixyip29vcxgh0wkhlvvb9zpbhz2-msitools-0.97/bin/wixl --help` got 0 exit code - ran `/nix/store/xmsjbixyip29vcxgh0wkhlvvb9zpbhz2-msitools-0.97/bin/wixl --version` and found version 0.97 - ran `/nix/store/xmsjbixyip29vcxgh0wkhlvvb9zpbhz2-msitools-0.97/bin/wixl-heat -h` got 0 exit code - ran `/nix/store/xmsjbixyip29vcxgh0wkhlvvb9zpbhz2-msitools-0.97/bin/wixl-heat --help` got 0 exit code - ran `/nix/store/xmsjbixyip29vcxgh0wkhlvvb9zpbhz2-msitools-0.97/bin/msidump -h` got 0 exit code - ran `/nix/store/xmsjbixyip29vcxgh0wkhlvvb9zpbhz2-msitools-0.97/bin/msidump --help` got 0 exit code - ran `/nix/store/xmsjbixyip29vcxgh0wkhlvvb9zpbhz2-msitools-0.97/bin/msidump -v` and found version 0.97 - ran `/nix/store/xmsjbixyip29vcxgh0wkhlvvb9zpbhz2-msitools-0.97/bin/msidump --version` and found version 0.97 - ran `/nix/store/xmsjbixyip29vcxgh0wkhlvvb9zpbhz2-msitools-0.97/bin/msidiff -h` got 0 exit code - ran `/nix/store/xmsjbixyip29vcxgh0wkhlvvb9zpbhz2-msitools-0.97/bin/msidiff --help` got 0 exit code - ran `/nix/store/xmsjbixyip29vcxgh0wkhlvvb9zpbhz2-msitools-0.97/bin/msidiff -v` and found version 0.97 - ran `/nix/store/xmsjbixyip29vcxgh0wkhlvvb9zpbhz2-msitools-0.97/bin/msidiff --version` and found version 0.97 - found 0.97 with grep in /nix/store/xmsjbixyip29vcxgh0wkhlvvb9zpbhz2-msitools-0.97 - found 0.97 in filename of file in /nix/store/xmsjbixyip29vcxgh0wkhlvvb9zpbhz2-msitools-0.97 cc "@vcunat" --- pkgs/development/tools/misc/msitools/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/misc/msitools/default.nix b/pkgs/development/tools/misc/msitools/default.nix index acfc8c54f641..4ffad650f20c 100644 --- a/pkgs/development/tools/misc/msitools/default.nix +++ b/pkgs/development/tools/misc/msitools/default.nix @@ -1,12 +1,12 @@ {stdenv, fetchurl, intltool, glib, pkgconfig, libgsf, libuuid, gcab, bzip2}: stdenv.mkDerivation rec { - version = "0.94"; + version = "0.97"; name = "msitools-${version}"; src = fetchurl { - url = "http://ftp.gnome.org/pub/GNOME/sources/msitools/0.94/${name}.tar.xz"; - sha256 = "0bndnm3mgcqkw5dhwy5l1zri4lqvjbhbn5rxz651fkxlkhab8bhm"; + url = "http://ftp.gnome.org/pub/GNOME/sources/msitools/0.97/${name}.tar.xz"; + sha256 = "0pn6izlgwi4ngpk9jk2n38gcjjpk29nm15aad89bg9z3k9n2hnrs"; }; nativeBuildInputs = [ pkgconfig ]; From 40b7b893535e48569e4861f2cd63499be9ebffcc Mon Sep 17 00:00:00 2001 From: Ryan Mulligan Date: Tue, 27 Feb 2018 07:56:25 -0800 Subject: [PATCH 088/814] nanoflann: 1.1.9 -> 1.2.3 Semi-automatic update. These checks were performed: - built on NixOS - found 1.2.3 with grep in /nix/store/gglvdgfxscxg7hhdgbxyzdvd01kv4nxa-nanoflann-1.2.3 - found 1.2.3 in filename of file in /nix/store/gglvdgfxscxg7hhdgbxyzdvd01kv4nxa-nanoflann-1.2.3 --- pkgs/development/libraries/nanoflann/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/nanoflann/default.nix b/pkgs/development/libraries/nanoflann/default.nix index 387632a890f0..b5d4ea0f4ebf 100644 --- a/pkgs/development/libraries/nanoflann/default.nix +++ b/pkgs/development/libraries/nanoflann/default.nix @@ -1,14 +1,14 @@ {stdenv, fetchFromGitHub, cmake}: stdenv.mkDerivation rec { - version = "1.1.9"; + version = "1.2.3"; name = "nanoflann-${version}"; src = fetchFromGitHub { owner = "jlblancoc"; repo = "nanoflann"; rev = "v${version}"; - sha256 = "1q588cf2aark45bp4ciqjiz3dkdv8dcijkhm1ybzs8qjdzz9fimn"; + sha256 = "1jrh73kjvdv7s7zc1sc3z254i17lpvn77b19wx32nvzsfxs4g44i"; }; buildInputs = [ cmake ]; From 1be526832600431154cb046f5c6bb06f648ac78c Mon Sep 17 00:00:00 2001 From: Ryan Mulligan Date: Tue, 27 Feb 2018 08:00:02 -0800 Subject: [PATCH 089/814] neo4j: 3.1.2 -> 3.3.2 Semi-automatic update. These checks were performed: - built on NixOS - ran `/nix/store/h7gmk2gjradg84isbn8hpb05cirpkind-neo4j-3.3.2/bin/neo4j help` got 0 exit code - ran `/nix/store/h7gmk2gjradg84isbn8hpb05cirpkind-neo4j-3.3.2/bin/neo4j --version` and found version 3.3.2 - ran `/nix/store/h7gmk2gjradg84isbn8hpb05cirpkind-neo4j-3.3.2/bin/neo4j version` and found version 3.3.2 - ran `/nix/store/h7gmk2gjradg84isbn8hpb05cirpkind-neo4j-3.3.2/bin/neo4j help` and found version 3.3.2 - ran `/nix/store/h7gmk2gjradg84isbn8hpb05cirpkind-neo4j-3.3.2/bin/neo4j-admin help` got 0 exit code - ran `/nix/store/h7gmk2gjradg84isbn8hpb05cirpkind-neo4j-3.3.2/bin/neo4j-admin --version` and found version 3.3.2 - ran `/nix/store/h7gmk2gjradg84isbn8hpb05cirpkind-neo4j-3.3.2/bin/neo4j-import --help` got 0 exit code - ran `/nix/store/h7gmk2gjradg84isbn8hpb05cirpkind-neo4j-3.3.2/bin/neo4j-import help` got 0 exit code - ran `/nix/store/h7gmk2gjradg84isbn8hpb05cirpkind-neo4j-3.3.2/bin/neo4j-shell -h` got 0 exit code - ran `/nix/store/h7gmk2gjradg84isbn8hpb05cirpkind-neo4j-3.3.2/bin/neo4j-shell --help` got 0 exit code - ran `/nix/store/h7gmk2gjradg84isbn8hpb05cirpkind-neo4j-3.3.2/bin/neo4j-shell --version` and found version 3.3.2 - found 3.3.2 with grep in /nix/store/h7gmk2gjradg84isbn8hpb05cirpkind-neo4j-3.3.2 - found 3.3.2 in filename of file in /nix/store/h7gmk2gjradg84isbn8hpb05cirpkind-neo4j-3.3.2 cc "@offline" --- pkgs/servers/nosql/neo4j/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/nosql/neo4j/default.nix b/pkgs/servers/nosql/neo4j/default.nix index c907f081e22e..3b875576529f 100644 --- a/pkgs/servers/nosql/neo4j/default.nix +++ b/pkgs/servers/nosql/neo4j/default.nix @@ -4,11 +4,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "neo4j-${version}"; - version = "3.1.2"; + version = "3.3.2"; src = fetchurl { url = "http://dist.neo4j.org/neo4j-community-${version}-unix.tar.gz"; - sha256 = "0kvbsm9mjwqyl3q2myif28a0f11i4rfq3hik07w9cdnrwyd75s40"; + sha256 = "0vjzc38sacnbcw781qzng9lqwwahndfc3wia5yvxji094zqp8ala"; }; buildInputs = [ makeWrapper jre8 which gawk ]; From f9c9068120428be18f1b2f42c7ff4c2ca88915b6 Mon Sep 17 00:00:00 2001 From: Ryan Mulligan Date: Tue, 27 Feb 2018 08:10:05 -0800 Subject: [PATCH 090/814] nlohmann_json: 2.1.0 -> 3.1.1 Semi-automatic update. These checks were performed: - built on NixOS - found 3.1.1 with grep in /nix/store/4pydihqzddnsfmlc2zcn6qlwi7m2p1k1-nlohmann_json-3.1.1 - found 3.1.1 in filename of file in /nix/store/4pydihqzddnsfmlc2zcn6qlwi7m2p1k1-nlohmann_json-3.1.1 --- pkgs/development/libraries/nlohmann_json/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/nlohmann_json/default.nix b/pkgs/development/libraries/nlohmann_json/default.nix index 9fb614cd071a..d4699b1c5062 100644 --- a/pkgs/development/libraries/nlohmann_json/default.nix +++ b/pkgs/development/libraries/nlohmann_json/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "nlohmann_json-${version}"; - version = "2.1.0"; + version = "3.1.1"; src = fetchFromGitHub { owner = "nlohmann"; repo = "json"; rev = "v${version}"; - sha256 = "116309lx77m31x4krln0g7mra900g0knk9lbkxbpxnmamkagjyl9"; + sha256 = "0s5xiyvnvxc2k0zkyb12mm5cwn61lavyxlfpknlx5f243g1xi6f6"; }; nativeBuildInputs = [ cmake ]; From fe1a572f8d18fc2f15516bc9e3f7fe85944b4a56 Mon Sep 17 00:00:00 2001 From: Ryan Mulligan Date: Tue, 27 Feb 2018 08:11:24 -0800 Subject: [PATCH 091/814] nomad: 0.6.2 -> 0.7.1 Semi-automatic update. These checks were performed: - built on NixOS - ran `/nix/store/glm49diswdg3qi1vxpffqmdrzmkykvqj-nomad-0.7.1-bin/bin/nomad -h` got 0 exit code - ran `/nix/store/glm49diswdg3qi1vxpffqmdrzmkykvqj-nomad-0.7.1-bin/bin/nomad --help` got 0 exit code - ran `/nix/store/glm49diswdg3qi1vxpffqmdrzmkykvqj-nomad-0.7.1-bin/bin/nomad -v` and found version 0.7.1 - ran `/nix/store/glm49diswdg3qi1vxpffqmdrzmkykvqj-nomad-0.7.1-bin/bin/nomad --version` and found version 0.7.1 - ran `/nix/store/glm49diswdg3qi1vxpffqmdrzmkykvqj-nomad-0.7.1-bin/bin/nomad version` and found version 0.7.1 - found 0.7.1 with grep in /nix/store/glm49diswdg3qi1vxpffqmdrzmkykvqj-nomad-0.7.1-bin - found 0.7.1 in filename of file in /nix/store/glm49diswdg3qi1vxpffqmdrzmkykvqj-nomad-0.7.1-bin cc "@rushmorem @pradeepchhetri @ehmry @lethalman" --- pkgs/applications/networking/cluster/nomad/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/nomad/default.nix b/pkgs/applications/networking/cluster/nomad/default.nix index e39bc59709e5..8486f0d53067 100644 --- a/pkgs/applications/networking/cluster/nomad/default.nix +++ b/pkgs/applications/networking/cluster/nomad/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "nomad-${version}"; - version = "0.6.2"; + version = "0.7.1"; rev = "v${version}"; goPackagePath = "github.com/hashicorp/nomad"; @@ -12,7 +12,7 @@ buildGoPackage rec { owner = "hashicorp"; repo = "nomad"; inherit rev; - sha256 = "12bxqn7yldri5cwyxybd1lwg4c66mxd7g9syf54va5788c0hj8ij"; + sha256 = "0hn80dqzxkwvk1zjk6px725mb2i3c06smqfj0yyjz96vgf7qbqy2"; }; meta = with stdenv.lib; { From 29e318a86f41660399812ee9db6bf11938b879b4 Mon Sep 17 00:00:00 2001 From: Ryan Mulligan Date: Tue, 27 Feb 2018 08:11:44 -0800 Subject: [PATCH 092/814] nq: 0.1 -> 0.2.2 Semi-automatic update. These checks were performed: - built on NixOS - ran `/nix/store/gfc63cqbz4z2fr3isin4lnchlgh0kwfm-nq-0.2.2/bin/nq help` got 0 exit code - ran `/nix/store/gfc63cqbz4z2fr3isin4lnchlgh0kwfm-nq-0.2.2/bin/fq help` got 0 exit code - ran `/nix/store/gfc63cqbz4z2fr3isin4lnchlgh0kwfm-nq-0.2.2/bin/tq help` got 0 exit code - found 0.2.2 with grep in /nix/store/gfc63cqbz4z2fr3isin4lnchlgh0kwfm-nq-0.2.2 - found 0.2.2 in filename of file in /nix/store/gfc63cqbz4z2fr3isin4lnchlgh0kwfm-nq-0.2.2 cc "@cstrahan" --- pkgs/tools/system/nq/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/nq/default.nix b/pkgs/tools/system/nq/default.nix index e8e487694bd8..59980566290d 100644 --- a/pkgs/tools/system/nq/default.nix +++ b/pkgs/tools/system/nq/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { name = "nq-${version}"; - version = "0.1"; + version = "0.2.2"; src = fetchFromGitHub { owner = "chneukirchen"; repo = "nq"; rev = "v${version}"; - sha256 = "17n0yqhpsys3s872ki5rf82ky73ylahz6xi9x0rfrv7fqr5nzsz4"; + sha256 = "0348r3j5y445psm8lj35z100cfvbfp05s7ji6bxd0gg4n66l2c4l"; }; makeFlags = "PREFIX=$(out)"; postPatch = '' From 46bd7f657b0151a51c8d5c514257df38aca08d91 Mon Sep 17 00:00:00 2001 From: Ryan Mulligan Date: Tue, 27 Feb 2018 08:47:49 -0800 Subject: [PATCH 093/814] opendht: 1.3.4 -> 1.5.0 Semi-automatic update. These checks were performed: - built on NixOS - ran `/nix/store/204499k26yrbhl1mq7spslsc5fvmb81b-opendht-1.5.0/bin/dhtnode -h` got 0 exit code - ran `/nix/store/204499k26yrbhl1mq7spslsc5fvmb81b-opendht-1.5.0/bin/dhtnode --help` got 0 exit code - ran `/nix/store/204499k26yrbhl1mq7spslsc5fvmb81b-opendht-1.5.0/bin/dhtchat -h` got 0 exit code - ran `/nix/store/204499k26yrbhl1mq7spslsc5fvmb81b-opendht-1.5.0/bin/dhtchat --help` got 0 exit code - ran `/nix/store/204499k26yrbhl1mq7spslsc5fvmb81b-opendht-1.5.0/bin/dhtscanner -h` got 0 exit code - ran `/nix/store/204499k26yrbhl1mq7spslsc5fvmb81b-opendht-1.5.0/bin/dhtscanner --help` got 0 exit code - ran `/nix/store/204499k26yrbhl1mq7spslsc5fvmb81b-opendht-1.5.0/bin/dhtscanner help` got 0 exit code - ran `/nix/store/204499k26yrbhl1mq7spslsc5fvmb81b-opendht-1.5.0/bin/dhtscanner -V` and found version 1.5.0 - ran `/nix/store/204499k26yrbhl1mq7spslsc5fvmb81b-opendht-1.5.0/bin/dhtscanner --version` and found version 1.5.0 - found 1.5.0 with grep in /nix/store/204499k26yrbhl1mq7spslsc5fvmb81b-opendht-1.5.0 - found 1.5.0 in filename of file in /nix/store/204499k26yrbhl1mq7spslsc5fvmb81b-opendht-1.5.0 cc "@taeer @olynch" --- pkgs/development/libraries/opendht/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/opendht/default.nix b/pkgs/development/libraries/opendht/default.nix index 75d2b090e711..528c19aea5b5 100644 --- a/pkgs/development/libraries/opendht/default.nix +++ b/pkgs/development/libraries/opendht/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { name = "opendht-${version}"; - version = "1.3.4"; + version = "1.5.0"; src = fetchFromGitHub { owner = "savoirfairelinux"; repo = "opendht"; rev = "${version}"; - sha256 = "0karj37f0zq39w0ip8ahrjr6lcrrn9jd6bpzylp1m92jzs8pfki8"; + sha256 = "0zkxvs3vdlc4yzhfi2jh02bsnhh50fbfigqhnkmbx69lssnkyr05"; }; buildInputs = [ From b92174e4bcd75de8ee0bdbd58320532554eaf76b Mon Sep 17 00:00:00 2001 From: Ryan Mulligan Date: Tue, 27 Feb 2018 08:48:08 -0800 Subject: [PATCH 094/814] openfortivpn: 1.5.0 -> 1.6.0 Semi-automatic update. These checks were performed: - built on NixOS - ran `/nix/store/wj4dlazd3lk41w7865iyl082s5pk6g2a-openfortivpn-1.6.0/bin/openfortivpn -h` got 0 exit code - ran `/nix/store/wj4dlazd3lk41w7865iyl082s5pk6g2a-openfortivpn-1.6.0/bin/openfortivpn --help` got 0 exit code - ran `/nix/store/wj4dlazd3lk41w7865iyl082s5pk6g2a-openfortivpn-1.6.0/bin/openfortivpn help` got 0 exit code - ran `/nix/store/wj4dlazd3lk41w7865iyl082s5pk6g2a-openfortivpn-1.6.0/bin/openfortivpn -v` and found version 1.6.0 - ran `/nix/store/wj4dlazd3lk41w7865iyl082s5pk6g2a-openfortivpn-1.6.0/bin/openfortivpn --version` and found version 1.6.0 - ran `/nix/store/wj4dlazd3lk41w7865iyl082s5pk6g2a-openfortivpn-1.6.0/bin/openfortivpn -h` and found version 1.6.0 - ran `/nix/store/wj4dlazd3lk41w7865iyl082s5pk6g2a-openfortivpn-1.6.0/bin/openfortivpn --help` and found version 1.6.0 - found 1.6.0 with grep in /nix/store/wj4dlazd3lk41w7865iyl082s5pk6g2a-openfortivpn-1.6.0 - found 1.6.0 in filename of file in /nix/store/wj4dlazd3lk41w7865iyl082s5pk6g2a-openfortivpn-1.6.0 cc "@madjar" --- pkgs/tools/networking/openfortivpn/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/openfortivpn/default.nix b/pkgs/tools/networking/openfortivpn/default.nix index b1ecc6cba89b..6eafdde10824 100644 --- a/pkgs/tools/networking/openfortivpn/default.nix +++ b/pkgs/tools/networking/openfortivpn/default.nix @@ -3,7 +3,7 @@ with stdenv.lib; let repo = "openfortivpn"; - version = "1.5.0"; + version = "1.6.0"; in stdenv.mkDerivation { name = "${repo}-${version}"; @@ -12,7 +12,7 @@ in stdenv.mkDerivation { owner = "adrienverge"; inherit repo; rev = "v${version}"; - sha256 = "0fm0z73afghwmbshpsn5jfbyyfzz1v8s7scwycnvsk2cgv5f4r86"; + sha256 = "0ca80i8m88f4vhwiq548wjyqwwszpbap92l83bl0wdppvp4nk192"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; From 5ba06d71702bff6f0b3b358d70d9502e8a11c60a Mon Sep 17 00:00:00 2001 From: Ryan Mulligan Date: Tue, 27 Feb 2018 09:02:02 -0800 Subject: [PATCH 095/814] openspades: 0.1.1b -> 0.1.2 Semi-automatic update. These checks were performed: - built on NixOS - ran `/nix/store/8s6lwg583x8867mjc29znp9a1cdiqdri-openspades-0.1.2/bin/openspades -h` got 0 exit code - ran `/nix/store/8s6lwg583x8867mjc29znp9a1cdiqdri-openspades-0.1.2/bin/openspades --help` got 0 exit code - ran `/nix/store/8s6lwg583x8867mjc29znp9a1cdiqdri-openspades-0.1.2/bin/openspades help` got 0 exit code - ran `/nix/store/8s6lwg583x8867mjc29znp9a1cdiqdri-openspades-0.1.2/bin/openspades -V` and found version 0.1.2 - ran `/nix/store/8s6lwg583x8867mjc29znp9a1cdiqdri-openspades-0.1.2/bin/openspades -v` and found version 0.1.2 - ran `/nix/store/8s6lwg583x8867mjc29znp9a1cdiqdri-openspades-0.1.2/bin/openspades --version` and found version 0.1.2 - ran `/nix/store/8s6lwg583x8867mjc29znp9a1cdiqdri-openspades-0.1.2/bin/openspades version` and found version 0.1.2 - ran `/nix/store/8s6lwg583x8867mjc29znp9a1cdiqdri-openspades-0.1.2/bin/openspades -h` and found version 0.1.2 - ran `/nix/store/8s6lwg583x8867mjc29znp9a1cdiqdri-openspades-0.1.2/bin/openspades --help` and found version 0.1.2 - ran `/nix/store/8s6lwg583x8867mjc29znp9a1cdiqdri-openspades-0.1.2/bin/openspades help` and found version 0.1.2 - found 0.1.2 with grep in /nix/store/8s6lwg583x8867mjc29znp9a1cdiqdri-openspades-0.1.2 - found 0.1.2 in filename of file in /nix/store/8s6lwg583x8867mjc29znp9a1cdiqdri-openspades-0.1.2 --- pkgs/games/openspades/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/openspades/default.nix b/pkgs/games/openspades/default.nix index 02e4e9c608f0..6257ce484ecf 100644 --- a/pkgs/games/openspades/default.nix +++ b/pkgs/games/openspades/default.nix @@ -5,14 +5,14 @@ stdenv.mkDerivation rec { name = "openspades-${version}"; - version = "0.1.1b"; + version = "0.1.2"; devPakVersion = "33"; src = fetchFromGitHub { owner = "yvt"; repo = "openspades"; rev = "v${version}"; - sha256 = "1xk3il5ykxg68hvwb42kpspcxppdib7y3ysaxb8anmmcsk1m3drn"; + sha256 = "1mfj46c3pnn1f6awy3b6faxs26i93a5jsrvkdlr12ndsykvi6ng6"; }; nativeBuildInputs = [ cmake imagemagick unzip zip file ]; From f030781be92f3b51ff3b45930027e322b1f2c0de Mon Sep 17 00:00:00 2001 From: Ryan Mulligan Date: Tue, 27 Feb 2018 09:17:16 -0800 Subject: [PATCH 096/814] ostinato: 0.8 -> 0.9 Semi-automatic update. These checks were performed: - built on NixOS - found 0.9 with grep in /nix/store/k19kx1lh4211srqcgnrwq7yfkvqclf9m-ostinato-0.9 - found 0.9 in filename of file in /nix/store/k19kx1lh4211srqcgnrwq7yfkvqclf9m-ostinato-0.9 cc "@rick68" --- pkgs/applications/networking/ostinato/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/ostinato/default.nix b/pkgs/applications/networking/ostinato/default.nix index f2b7a4a4e999..b3a1c1a23b37 100644 --- a/pkgs/applications/networking/ostinato/default.nix +++ b/pkgs/applications/networking/ostinato/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "ostinato-${version}"; - version = "0.8"; + version = "0.9"; src = fetchFromGitHub { owner = "pstavirs"; repo = "ostinato"; rev = "v${version}"; - sha256 = "1b5a5gypcy9i03mj6md3lkrq05rqmdyhfykrr1z0sv8n3q48xca3"; + sha256 = "109gxj6djdsk7rp1nxpx39kfi75xfl9p9qgffh1cpcdpbsbvq5bx"; }; ostinatoIcon = fetchurl { From 52ee1d87e9a79bef7bbb3ff5d4f3d01c90872698 Mon Sep 17 00:00:00 2001 From: Ryan Mulligan Date: Tue, 27 Feb 2018 09:28:09 -0800 Subject: [PATCH 097/814] papirus-icon-theme: 20171102 -> 20180214 Semi-automatic update. These checks were performed: - built on NixOS --- pkgs/data/icons/papirus-icon-theme/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/icons/papirus-icon-theme/default.nix b/pkgs/data/icons/papirus-icon-theme/default.nix index ec3c671e2fd9..df974d8a0359 100644 --- a/pkgs/data/icons/papirus-icon-theme/default.nix +++ b/pkgs/data/icons/papirus-icon-theme/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "papirus-icon-theme-${version}"; - version = "20171102"; + version = "20180214"; src = fetchFromGitHub { owner = "PapirusDevelopmentTeam"; repo = "papirus-icon-theme"; rev = version; - sha256 = "10q7ppizzqi8c564jydqivia43gp4j1z984igfyym2mdwdw71mzq"; + sha256 = "0lsp5cmq5wdqw6vyh6hqqrshgpzxfj8dx87l7qdlgrk73dajjmki"; }; nativeBuildInputs = [ gtk3 ]; From 01dd922ca01312b240aca08ecd3b4cd51cfb3d82 Mon Sep 17 00:00:00 2001 From: Ryan Mulligan Date: Tue, 27 Feb 2018 09:32:04 -0800 Subject: [PATCH 098/814] pastebinit: 1.4.1 -> 1.5 Semi-automatic update. These checks were performed: - built on NixOS - ran `/nix/store/5jkp246zcc0k7lbrkngsr005brnf3giy-pastebinit-1.5/bin/pastebinit -h` got 0 exit code - ran `/nix/store/5jkp246zcc0k7lbrkngsr005brnf3giy-pastebinit-1.5/bin/pastebinit -v` and found version 1.5 - ran `/nix/store/5jkp246zcc0k7lbrkngsr005brnf3giy-pastebinit-1.5/bin/pastebinit -h` and found version 1.5 - found 1.5 with grep in /nix/store/5jkp246zcc0k7lbrkngsr005brnf3giy-pastebinit-1.5 - found 1.5 in filename of file in /nix/store/5jkp246zcc0k7lbrkngsr005brnf3giy-pastebinit-1.5 cc "@lethalman" --- pkgs/tools/misc/pastebinit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/pastebinit/default.nix b/pkgs/tools/misc/pastebinit/default.nix index fd5004302dff..a5e45dc259b9 100644 --- a/pkgs/tools/misc/pastebinit/default.nix +++ b/pkgs/tools/misc/pastebinit/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, python3 }: stdenv.mkDerivation rec { - version = "1.4.1"; + version = "1.5"; name = "pastebinit-${version}"; src = fetchurl { url = "https://launchpad.net/pastebinit/trunk/${version}/+download/${name}.tar.bz2"; - sha256 = "1rl854izwn1fpaaib6zj7a1a9bis8n7w4zfxcapgfffj37zj0dy2"; + sha256 = "0mw48fgm9lyh9d3pw997fccmglzsjccf2y347gxjas74wx6aira2"; }; buildInputs = [ python3 ]; From cc2eeef4abfaf484363d43d6bcce510f0f16dc1d Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 27 Feb 2018 19:58:23 +0100 Subject: [PATCH 099/814] Fix installing the Nixpkgs channel on the installation media And test that it got installed correctly. --- nixos/doc/manual/man-nixos-install.xml | 6 +++--- nixos/lib/make-disk-image.nix | 3 ++- nixos/modules/installer/tools/nixos-install.sh | 11 ++++++++--- nixos/tests/boot.nix | 5 +++++ 4 files changed, 18 insertions(+), 7 deletions(-) diff --git a/nixos/doc/manual/man-nixos-install.xml b/nixos/doc/manual/man-nixos-install.xml index 15c603256ca7..c9887146989b 100644 --- a/nixos/doc/manual/man-nixos-install.xml +++ b/nixos/doc/manual/man-nixos-install.xml @@ -26,8 +26,8 @@ root - - closure + + path @@ -118,7 +118,7 @@ it. - + If this option is provided, nixos-install will install the specified closure rather than attempt to build one from /mnt/etc/nixos/configuration.nix. diff --git a/nixos/lib/make-disk-image.nix b/nixos/lib/make-disk-image.nix index 4da863469032..ebfb09db7b7e 100644 --- a/nixos/lib/make-disk-image.nix +++ b/nixos/lib/make-disk-image.nix @@ -181,7 +181,8 @@ let format' = format; in let nix-store --load-db < ${closureInfo}/registration echo "running nixos-install..." - nixos-install --root $root --no-bootloader --no-root-passwd --closure ${config.system.build.toplevel} --substituters "" + nixos-install --root $root --no-bootloader --no-root-passwd \ + --system ${config.system.build.toplevel} --channel ${channelSources} --substituters "" echo "copying staging root to image..." cptofs -p ${optionalString (partitionTableType != "none") "-P ${rootPartition}"} -t ${fsType} -i $diskImage $root/* / diff --git a/nixos/modules/installer/tools/nixos-install.sh b/nixos/modules/installer/tools/nixos-install.sh index b51779cfb957..87013dc8f977 100644 --- a/nixos/modules/installer/tools/nixos-install.sh +++ b/nixos/modules/installer/tools/nixos-install.sh @@ -12,6 +12,7 @@ umask 0022 extraBuildFlags=() mountPoint=/mnt +channelPath= while [ "$#" -gt 0 ]; do i="$1"; shift 1 @@ -28,10 +29,12 @@ while [ "$#" -gt 0 ]; do --root) mountPoint="$1"; shift 1 ;; - --closure) - # FIXME: --closure is a misnomer + --system|--closure) system="$1"; shift 1 ;; + --channel) + channelPath="$1"; shift 1 + ;; --no-channel-copy) noChannelCopy=1 ;; @@ -104,7 +107,9 @@ nix-env --store "$mountPoint" "${extraBuildFlags[@]}" \ # Copy the NixOS/Nixpkgs sources to the target as the initial contents # of the NixOS channel. if [[ -z $noChannelCopy ]]; then - channelPath="$(nix-env -p /nix/var/nix/profiles/per-user/root/channels -q nixos --no-name --out-path 2>/dev/null || echo -n "")" + if [[ -z $channelPath ]]; then + channelPath="$(nix-env -p /nix/var/nix/profiles/per-user/root/channels -q nixos --no-name --out-path 2>/dev/null || echo -n "")" + fi if [[ -n $channelPath ]]; then echo "copying channel..." mkdir -p $mountPoint/nix/var/nix/profiles/per-user/root diff --git a/nixos/tests/boot.nix b/nixos/tests/boot.nix index 0ba8a2704e63..301d9d0f817f 100644 --- a/nixos/tests/boot.nix +++ b/nixos/tests/boot.nix @@ -25,6 +25,11 @@ let $machine->start; $machine->waitForUnit("multi-user.target"); $machine->succeed("nix verify -r --no-trust /run/current-system"); + + # Test whether the channel got installed correctly. + $machine->succeed("nix-instantiate --dry-run '' -A hello"); + $machine->succeed("nix-env --dry-run -iA nixos.procps"); + $machine->shutdown; ''; }; From 0d0021588015105696eb4981da7a835ec6b2e45b Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 27 Feb 2018 19:59:26 +0100 Subject: [PATCH 100/814] Cleanup --- pkgs/build-support/closure-info.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/build-support/closure-info.nix b/pkgs/build-support/closure-info.nix index 2154432b7e0a..58d70b4b0631 100644 --- a/pkgs/build-support/closure-info.nix +++ b/pkgs/build-support/closure-info.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation { builder = builtins.toFile "builder" '' - if [ -e .attrs.sh ]; then . .attrs.sh; fi + . .attrs.sh out=''${outputs[out]} From 212dd84dd247e83231ffbcc7130fd92a95060702 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 27 Feb 2018 20:03:12 +0100 Subject: [PATCH 101/814] Cleanup --- nixos/modules/services/misc/nix-daemon.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/misc/nix-daemon.nix b/nixos/modules/services/misc/nix-daemon.nix index a169b0f2c784..72b70b28c80f 100644 --- a/nixos/modules/services/misc/nix-daemon.nix +++ b/nixos/modules/services/misc/nix-daemon.nix @@ -33,9 +33,9 @@ let sh = pkgs.stdenv.shell; binshDeps = pkgs.writeReferencesToFile sh; in - pkgs.runCommand "nix.conf" { extraOptions = cfg.extraOptions; inherit binshDeps; } '' + pkgs.runCommand "nix.conf" { extraOptions = cfg.extraOptions; } '' ${optionalString (!isNix20) '' - extraPaths=$(for i in $(cat binshDeps); do if test -d $i; then echo $i; fi; done) + extraPaths=$(for i in $(cat ${binshDeps}); do if test -d $i; then echo $i; fi; done) ''} cat > $out < Date: Tue, 27 Feb 2018 20:09:07 +0100 Subject: [PATCH 102/814] Add the boot test to release-small.nix --- nixos/release-small.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/nixos/release-small.nix b/nixos/release-small.nix index 2b532c70763f..4bfb9a423f7d 100644 --- a/nixos/release-small.nix +++ b/nixos/release-small.nix @@ -50,6 +50,10 @@ in rec { separateBoot simple; }; + boot = { + inherit (nixos'.tests.boot) + biosCdrom; + }; }; }; From 95286d1be27a112754b7b4679b2da15804040e6c Mon Sep 17 00:00:00 2001 From: Ivan Sorokin Date: Tue, 27 Feb 2018 21:58:51 +0300 Subject: [PATCH 103/814] qtox: remove opencv dependency It doesn't depend on it for a long time. --- .../networking/instant-messengers/qtox/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/qtox/default.nix b/pkgs/applications/networking/instant-messengers/qtox/default.nix index c71eb698417e..bbad5a681807 100644 --- a/pkgs/applications/networking/instant-messengers/qtox/default.nix +++ b/pkgs/applications/networking/instant-messengers/qtox/default.nix @@ -3,7 +3,7 @@ libpthreadstubs, libXdmcp, libXScrnSaver, qtbase, qtsvg, qttools, qttranslations, ffmpeg, filter-audio, libexif, libsodium, libopus, - libvpx, openal, opencv, pcre, qrencode, sqlcipher }: + libvpx, openal, pcre, qrencode, sqlcipher }: mkDerivation rec { name = "qtox-${version}"; @@ -21,7 +21,7 @@ mkDerivation rec { libpthreadstubs libXdmcp libXScrnSaver qtbase qtsvg qttranslations ffmpeg filter-audio libexif libopus libsodium - libvpx openal opencv pcre qrencode sqlcipher + libvpx openal pcre qrencode sqlcipher ]; nativeBuildInputs = [ cmake pkgconfig qttools ]; From b14d9e15686366cf456c9d744cfc90759ea1b3e7 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 27 Feb 2018 20:20:37 +0100 Subject: [PATCH 104/814] Add jq to the installation media This is required by closureInfo. --- nixos/modules/profiles/installation-device.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/nixos/modules/profiles/installation-device.nix b/nixos/modules/profiles/installation-device.nix index 506a6ee3eaa8..43f06c219f82 100644 --- a/nixos/modules/profiles/installation-device.nix +++ b/nixos/modules/profiles/installation-device.nix @@ -72,7 +72,13 @@ with lib; # To speed up installation a little bit, include the complete # stdenv in the Nix store on the CD. - system.extraDependencies = with pkgs; [ stdenv stdenvNoCC busybox ]; + system.extraDependencies = with pkgs; + [ + stdenv + stdenvNoCC # for runCommand + busybox + jq # for closureInfo + ]; # Show all debug messages from the kernel but don't log refused packets # because we have the firewall enabled. This makes installs from the From 84f93dd07ab91a4089de2eb329e1bc080fc5a294 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 27 Feb 2018 20:21:23 +0100 Subject: [PATCH 105/814] nixos-install: Create /root/.nix-defexpr This was previously done by nixos-prepare-root. --- nixos/modules/installer/tools/nixos-install.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/modules/installer/tools/nixos-install.sh b/nixos/modules/installer/tools/nixos-install.sh index 87013dc8f977..22c1e0fe9a34 100644 --- a/nixos/modules/installer/tools/nixos-install.sh +++ b/nixos/modules/installer/tools/nixos-install.sh @@ -115,6 +115,8 @@ if [[ -z $noChannelCopy ]]; then mkdir -p $mountPoint/nix/var/nix/profiles/per-user/root nix-env --store "$mountPoint" "${extraBuildFlags[@]}" --extra-substituters "$sub" \ -p $mountPoint/nix/var/nix/profiles/per-user/root/channels --set "$channelPath" --quiet + install -m 0700 -d $mountPoint/root/.nix-defexpr + ln -sfn /nix/var/nix/profiles/per-user/root/channels $mountPoint/root/.nix-defexpr/channels fi fi From 9e8cf40c7e9220900888fa898da11062ffe4f657 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 27 Feb 2018 20:22:14 +0100 Subject: [PATCH 106/814] nixos/tests/installer.nix: Don't use a writable store This is no longer needed. --- nixos/tests/installer.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix index c2b573dd1c34..3e49c5b96682 100644 --- a/nixos/tests/installer.nix +++ b/nixos/tests/installer.nix @@ -207,7 +207,6 @@ let virtualisation.diskSize = 8 * 1024; virtualisation.memorySize = 1024; - virtualisation.writableStore = true; # Use a small /dev/vdb as the root disk for the # installer. This ensures the target disk (/dev/vda) is From 9fc786c3a44cf660adaf67e3d4950ff051cb6418 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 27 Feb 2018 20:28:49 +0100 Subject: [PATCH 107/814] Create /home with the right permissions Without this, it will be created with 700 permissions. --- nixos/modules/config/users-groups.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/nixos/modules/config/users-groups.nix b/nixos/modules/config/users-groups.nix index 92670ba31f50..11e969b760e0 100644 --- a/nixos/modules/config/users-groups.nix +++ b/nixos/modules/config/users-groups.nix @@ -529,12 +529,13 @@ in { system.activationScripts.users = stringAfter [ "stdio" ] '' + install -m 0700 -d /root + install -m 0755 -d /home + ${pkgs.perl}/bin/perl -w \ -I${pkgs.perlPackages.FileSlurp}/lib/perl5/site_perl \ -I${pkgs.perlPackages.JSON}/lib/perl5/site_perl \ ${./update-users-groups.pl} ${spec} - - install -m 0700 -d /root ''; # for backwards compatibility From ceb0a28e8c2d3f3bd0f57dda74f185a570522ecf Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 27 Feb 2018 20:30:06 +0100 Subject: [PATCH 108/814] Don't try hashed mirrors in the installer test --- nixos/tests/installer.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix index 3e49c5b96682..c12919540a30 100644 --- a/nixos/tests/installer.nix +++ b/nixos/tests/installer.nix @@ -243,6 +243,11 @@ let ++ optionals (bootLoader == "grub" && grubVersion == 2) [ pkgs.grub2 pkgs.grub2_efi ]; nix.binaryCaches = mkForce [ ]; + nix.extraOptions = + '' + hashed-mirrors = + connect-timeout = 1 + ''; }; }; From 32cecea9600ec0ab260d5c034508baa19bd32727 Mon Sep 17 00:00:00 2001 From: Ryan Mulligan Date: Tue, 27 Feb 2018 13:03:06 -0800 Subject: [PATCH 109/814] rdkafka: 0.9.5 -> 0.11.3 Semi-automatic update. These checks were performed: - built on NixOS - found 0.11.3 with grep in /nix/store/z53qgvkdj04v2wspk7ril70qy1ckwh8k-rdkafka-0.11.3 - found 0.11.3 in filename of file in /nix/store/z53qgvkdj04v2wspk7ril70qy1ckwh8k-rdkafka-0.11.3 cc "@boothead @wkennington" --- pkgs/development/libraries/rdkafka/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/rdkafka/default.nix b/pkgs/development/libraries/rdkafka/default.nix index ff017279dc64..bb43a49235bd 100644 --- a/pkgs/development/libraries/rdkafka/default.nix +++ b/pkgs/development/libraries/rdkafka/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "rdkafka-${version}"; - version = "0.9.5"; + version = "0.11.3"; src = fetchFromGitHub { owner = "edenhill"; repo = "librdkafka"; rev = "v${version}"; - sha256 = "0yp8vmj3yc564hcmhx46ssyn8qayywnsrg4wg67qk6jw967qgwsn"; + sha256 = "17ghq0kzk2fdpxhr40xgg3s0p0n0gkvd0d85c6jsww3mj8v5xd14"; }; nativeBuildInputs = [ pkgconfig ]; From 8248fbc127cda737964a4ead4b03e23a87ff588a Mon Sep 17 00:00:00 2001 From: Vladyslav M Date: Tue, 27 Feb 2018 23:30:24 +0200 Subject: [PATCH 110/814] nnn: 1.6 -> 1.7 --- pkgs/applications/misc/nnn/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/nnn/default.nix b/pkgs/applications/misc/nnn/default.nix index d651f9ef3b66..ae1c178e5716 100644 --- a/pkgs/applications/misc/nnn/default.nix +++ b/pkgs/applications/misc/nnn/default.nix @@ -4,13 +4,13 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "nnn-${version}"; - version = "1.6"; + version = "1.7"; src = fetchFromGitHub { owner = "jarun"; repo = "nnn"; rev = "v${version}"; - sha256 = "1yl4k39wkh2ins7fz585kc4cg6fagiswgqkh5g36db1bka3v1kn0"; + sha256 = "03cgsdj4l19gla5fx9d1ydqirpsah9d7gx9jaik73x38zqsabr89"; }; configFile = optionalString (conf!=null) (builtins.toFile "nnn.h" conf); From 47d1d9bf91741eb8dd164031c0b86371383323ac Mon Sep 17 00:00:00 2001 From: Ryan Mulligan Date: Tue, 27 Feb 2018 13:30:48 -0800 Subject: [PATCH 111/814] riemann: 0.2.12 -> 0.3.0 Semi-automatic update. These checks were performed: - built on NixOS - ran `/nix/store/5pk3bc05rja1qsq11zlp7x4pz8j2wcin-riemann-0.3.0/bin/.riemann-wrapped -h` got 0 exit code - ran `/nix/store/5pk3bc05rja1qsq11zlp7x4pz8j2wcin-riemann-0.3.0/bin/.riemann-wrapped -h` and found version 0.3.0 - ran `/nix/store/5pk3bc05rja1qsq11zlp7x4pz8j2wcin-riemann-0.3.0/bin/riemann -h` got 0 exit code - ran `/nix/store/5pk3bc05rja1qsq11zlp7x4pz8j2wcin-riemann-0.3.0/bin/riemann -v` and found version 0.3.0 - ran `/nix/store/5pk3bc05rja1qsq11zlp7x4pz8j2wcin-riemann-0.3.0/bin/riemann -h` and found version 0.3.0 - found 0.3.0 with grep in /nix/store/5pk3bc05rja1qsq11zlp7x4pz8j2wcin-riemann-0.3.0 - found 0.3.0 in filename of file in /nix/store/5pk3bc05rja1qsq11zlp7x4pz8j2wcin-riemann-0.3.0 cc "@rickynils" --- pkgs/servers/monitoring/riemann/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/monitoring/riemann/default.nix b/pkgs/servers/monitoring/riemann/default.nix index 64585de51ff3..b930c1ab1f61 100644 --- a/pkgs/servers/monitoring/riemann/default.nix +++ b/pkgs/servers/monitoring/riemann/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "riemann-${version}"; - version = "0.2.12"; + version = "0.3.0"; src = fetchurl { url = "https://github.com/riemann/riemann/releases/download/${version}/${name}.tar.bz2"; - sha256 = "1x57gi301rg6faxm4q5scq9dpp0v9nqiwjpsgigdb8whmjr1zwkr"; + sha256 = "151zd8nkhigphdx6g9jhmza6963qvlnki013j1g7lyqaz43qyk1c"; }; nativeBuildInputs = [ makeWrapper ]; From 1f3780135ea21b38610021bb6db4a2cd9488dd1a Mon Sep 17 00:00:00 2001 From: Michael Brantley Date: Tue, 20 Feb 2018 08:05:59 -0500 Subject: [PATCH 112/814] perlPackages.POE: init at 1.367 Note that I encountered bugs as part of this effort as documented in the following github PRs and CPAN bug tickets: https://github.com/rcaputo/poe/pull/25 https://rt.cpan.org/Ticket/Display.html?id=124495 POE-1.367 failed t/10_units/01_pod/03_pod_no404s.t https://github.com/rcaputo/poe/pull/26 https://rt.cpan.org/Ticket/Display.html?id=124496 POE-1.367 failed t/10_units/01_pod/04_pod_linkcheck.t ... and these bugs are addressed by the perl-POE-1.367-pod_no404s.patch and perl-POE-1.367-pod_linkcheck.patch files included with this patch, respectively. --- .../perl-POE-1.367-pod_linkcheck.patch | 40 ++++++++++++++++ .../perl-POE-1.367-pod_no404s.patch | 46 +++++++++++++++++++ pkgs/top-level/perl-packages.nix | 41 +++++++++++++++++ 3 files changed, 127 insertions(+) create mode 100644 pkgs/development/perl-modules/perl-POE-1.367-pod_linkcheck.patch create mode 100644 pkgs/development/perl-modules/perl-POE-1.367-pod_no404s.patch diff --git a/pkgs/development/perl-modules/perl-POE-1.367-pod_linkcheck.patch b/pkgs/development/perl-modules/perl-POE-1.367-pod_linkcheck.patch new file mode 100644 index 000000000000..e2f604985beb --- /dev/null +++ b/pkgs/development/perl-modules/perl-POE-1.367-pod_linkcheck.patch @@ -0,0 +1,40 @@ +commit 6d985026 +Author: Michael Brantley +Date: Tue Feb 20 07:12:06 2018 -0500 + + Update broken Pod links in lib/POE/Filter/HTTPD.pm + + Update Pod links to refer only to the utf8 module and not its methods, + fix a mis-capitalized internal reference, and convert the dangling + "MaxContent" link into a code reference. + + Resolves bug: https://rt.cpan.org/Public/Bug/Display.html?id=124496 + +diff --git a/lib/POE/Filter/HTTPD.pm b/lib/POE/Filter/HTTPD.pm +index 9d4898e3..517be691 100644 +--- a/lib/POE/Filter/HTTPD.pm ++++ b/lib/POE/Filter/HTTPD.pm +@@ -621,10 +621,10 @@ how to use these objects. + + HTTP headers are not allowed to have UTF-8 characters; they must be + ISO-8859-1. POE::Filter::HTTPD will convert all UTF-8 into the MIME encoded +-equivalent. It uses L for detection-8 and ++equivalent. It uses C for detection-8 and + L for convertion. If L is not + installed, no conversion happens. If L is +-not installed, L is used instead. In this last case, you will ++not installed, C is used instead. In this last case, you will + see a warning if you try to send UTF-8 headers. + + +@@ -651,8 +651,8 @@ streaming mode this filter will return either an HTTP::Request object or a + block of content. The HTTP::Request object's content will return empty. + The blocks of content will be parts of the request's body, up to + Content-Length in size. You distinguish between request objects and content +-blocks using C (See L below). This +-option supersedes L. ++blocks using C (See L below). This ++option supersedes C. + + =head1 CAVEATS + diff --git a/pkgs/development/perl-modules/perl-POE-1.367-pod_no404s.patch b/pkgs/development/perl-modules/perl-POE-1.367-pod_no404s.patch new file mode 100644 index 000000000000..097a7677e517 --- /dev/null +++ b/pkgs/development/perl-modules/perl-POE-1.367-pod_no404s.patch @@ -0,0 +1,46 @@ +commit 32571a21 +Author: Michael Brantley +Date: Tue Feb 20 07:07:22 2018 -0500 + + Update old URLs referenced in Pod + + Remove mention of old URLs, replace mention of canonical SVN repo with + the new git-based one at github.com. + + Resolves bug: https://rt.cpan.org/Public/Bug/Display.html?id=124495 + +diff --git a/lib/POE.pm b/lib/POE.pm +index 80e7feac..0554ff70 100644 +--- a/lib/POE.pm ++++ b/lib/POE.pm +@@ -465,7 +465,7 @@ code snippets there as well. + The following command will fetch the most current version of POE into + the "poe" subdirectory: + +- svn co https://poe.svn.sourceforge.net/svnroot/poe poe ++ git clone https://github.com/rcaputo/poe.git + + =head2 SourceForge + +@@ -535,18 +535,9 @@ https://rt.cpan.org/Dist/Display.html?Status=Active&Queue=POE + + =head2 Repositories and Changes + +-Thanks to the magic of distributed version control, POE is hosted at +-three locations for redundancy. You can browse the source at any one +-of: +- +-https://github.com/rcaputo/poe +- +-https://gitorious.org/poe +- +-http://poe.git.sourceforge.net/git/gitweb-index.cgi +- +-Complete change logs can also be browsed at those sites. They all +-provide RSS news feeds for those who want to follow development in ++You can browse the POE source and complete change logs at ++https://github.com/rcaputo/poe. It also provides an RSS ++news feed for those who want to follow development in + near-realtime. + + =head2 Other Resources diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 815bf73210f6..f0d6e788861e 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -11375,6 +11375,47 @@ let self = _self // overrides; _self = with self; { }; }; + POE = buildPerlPackage rec { + name = "POE-1.367"; + patches = [ + ../development/perl-modules/perl-POE-1.367-pod_linkcheck.patch + ../development/perl-modules/perl-POE-1.367-pod_no404s.patch + ]; + src = fetchurl { + url = "mirror://cpan/authors/id/R/RC/RCAPUTO/POE-1.367.tar.gz"; + sha256 = "0b9s7yxaa2lgzyi56brgygycfjk7lz33d1ddvc1wvwwvm45p4wmp"; + }; + # N.B. removing TestPodLinkCheck from buildInputs because tests requiring + # this module don't disable themselves when "run_network_tests" is + # not present (see below). + buildInputs = [ + Curses EmailMIME HTTPMessage IOTty LWPProtocolHttps POETestLoops + TermReadKey TestPod TestPodCoverage TestPodNo404s YAML + ]; + propagatedBuildInputs = [ pkgs.cacert IOPipely ]; + meta = { + maintainers = [ maintainers.limeytexan ]; + description = "Portable multitasking and networking framework for any event loop"; + license = stdenv.lib.licenses.artistic2; + }; + preCheck = '' + set -x + + : Makefile.PL touches the following file as a "marker" to indicate + : it should perform tests which use the network. Delete this file + : for sandbox builds. + rm -f run_network_tests + + : Certs are required if not running in a sandbox. + export SSL_CERT_FILE=${pkgs.cacert.out}/etc/ssl/certs/ca-bundle.crt + + : The following flag enables extra tests not normally performed. + export RELEASE_TESTING=1 + + set +x + ''; + }; + POETestLoops = buildPerlPackage rec { name = "POE-Test-Loops-1.360"; src = fetchurl { From 2d102cb40831d5bca73c631b6eec47313ecb1317 Mon Sep 17 00:00:00 2001 From: Russell O'Connor Date: Wed, 28 Feb 2018 09:16:26 -0500 Subject: [PATCH 113/814] bitcoin: 0.15.1 -> 0.16.0 Bitcoin 0.16.0 now builds against the lastest Boost. --- pkgs/applications/altcoins/bitcoin.nix | 4 ++-- pkgs/applications/altcoins/default.nix | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/altcoins/bitcoin.nix b/pkgs/applications/altcoins/bitcoin.nix index 63c45b3ba07f..9ccdd7670193 100644 --- a/pkgs/applications/altcoins/bitcoin.nix +++ b/pkgs/applications/altcoins/bitcoin.nix @@ -5,13 +5,13 @@ with stdenv.lib; stdenv.mkDerivation rec{ name = "bitcoin" + (toString (optional (!withGui) "d")) + "-" + version; - version = "0.15.1"; + version = "0.16.0"; src = fetchurl { urls = [ "https://bitcoincore.org/bin/bitcoin-core-${version}/bitcoin-${version}.tar.gz" "https://bitcoin.org/bin/bitcoin-core-${version}/bitcoin-${version}.tar.gz" ]; - sha256 = "1d22fgwdcn343kd95lh389hj417zwbmnhi29cij8n7wc0nz2vpil"; + sha256 = "0h7flgsfjzbqajwv8ih686yyxxljhf8krhm8jxranb4kglww1glc"; }; nativeBuildInputs = [ pkgconfig autoreconfHook ]; diff --git a/pkgs/applications/altcoins/default.nix b/pkgs/applications/altcoins/default.nix index 37df75ae110e..09cf5a057f50 100644 --- a/pkgs/applications/altcoins/default.nix +++ b/pkgs/applications/altcoins/default.nix @@ -1,11 +1,11 @@ -{ callPackage, boost155, boost164, openssl_1_1_0, haskellPackages, darwin, libsForQt5, miniupnpc_2, python3 }: +{ callPackage, boost155, openssl_1_1_0, haskellPackages, darwin, libsForQt5, miniupnpc_2, python3 }: rec { aeon = callPackage ./aeon { }; - bitcoin = libsForQt5.callPackage ./bitcoin.nix { boost = boost164; miniupnpc = miniupnpc_2; withGui = true; }; - bitcoind = callPackage ./bitcoin.nix { boost = boost164; miniupnpc = miniupnpc_2; withGui = false; }; + bitcoin = libsForQt5.callPackage ./bitcoin.nix { miniupnpc = miniupnpc_2; withGui = true; }; + bitcoind = callPackage ./bitcoin.nix { miniupnpc = miniupnpc_2; withGui = false; }; bitcoin-abc = libsForQt5.callPackage ./bitcoin-abc.nix { withGui = true; }; bitcoind-abc = callPackage ./bitcoin-abc.nix { withGui = false; }; From 305fd2110097a7f52b90b9c0f5926d66bd704a94 Mon Sep 17 00:00:00 2001 From: Jon Banafato Date: Thu, 1 Mar 2018 02:43:38 -0500 Subject: [PATCH 114/814] keybase: 1.0.42 -> 1.0.44 --- pkgs/tools/security/keybase/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/keybase/default.nix b/pkgs/tools/security/keybase/default.nix index ee62ef3782ae..331375273edd 100644 --- a/pkgs/tools/security/keybase/default.nix +++ b/pkgs/tools/security/keybase/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "keybase-${version}"; - version = "1.0.42"; + version = "1.0.44"; goPackagePath = "github.com/keybase/client"; subPackages = [ "go/keybase" ]; @@ -13,7 +13,7 @@ buildGoPackage rec { owner = "keybase"; repo = "client"; rev = "v${version}"; - sha256 = "0vjwyg542hiswcs89csh2vbkfyixlzk3zswjn7x7d1pifrckys0r"; + sha256 = "1np8fk15wwqkswzcyygga52r74dp101ny63i3m1wypgfky4hvsbb"; }; buildFlags = [ "-tags production" ]; From ef50bb33950c297b895904251b33a5382c487660 Mon Sep 17 00:00:00 2001 From: Jon Banafato Date: Thu, 1 Mar 2018 02:44:04 -0500 Subject: [PATCH 115/814] kbfs: 1.0.40 -> 1.0.44 --- pkgs/tools/security/kbfs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/kbfs/default.nix b/pkgs/tools/security/kbfs/default.nix index dbd372275bc3..9e1f664f5d84 100644 --- a/pkgs/tools/security/kbfs/default.nix +++ b/pkgs/tools/security/kbfs/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "kbfs-${version}"; - version = "1.0.40"; + version = "1.0.44"; goPackagePath = "github.com/keybase/kbfs"; subPackages = [ "kbfsfuse" "kbfsgit/git-remote-keybase" ]; @@ -13,7 +13,7 @@ buildGoPackage rec { owner = "keybase"; repo = "kbfs"; rev = "v${version}"; - sha256 = "1bgbzk3ykjb6y5sa5i9f6hwcp8b21dndq7iw9m8fdxh4n4mm6n9p"; + sha256 = "1vjgzif8ki9xrlcghpzkvqwfwvaq63llf52s03m3d2vkyigmgp78"; }; buildFlags = [ "-tags production" ]; From 74c785629a7a332d5f2eacf6e9e62b99b9af1db1 Mon Sep 17 00:00:00 2001 From: Jon Banafato Date: Thu, 1 Mar 2018 02:44:29 -0500 Subject: [PATCH 116/814] keybase-gui: 1.0.40 -> 1.0.44 --- pkgs/tools/security/keybase-gui/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/keybase-gui/default.nix b/pkgs/tools/security/keybase-gui/default.nix index b0db3eea5b9e..53b871306d7e 100644 --- a/pkgs/tools/security/keybase-gui/default.nix +++ b/pkgs/tools/security/keybase-gui/default.nix @@ -37,10 +37,10 @@ let in stdenv.mkDerivation rec { name = "keybase-gui-${version}"; - version = "1.0.40-20180127033950.76a4b90c9"; + version = "1.0.44-20180223200436.9a9ccec79"; src = fetchurl { url = "https://s3.amazonaws.com/prerelease.keybase.io/linux_binaries/deb/keybase_${version}_amd64.deb"; - sha256 = "1pskmwif5nx32d53kz8vbijv61i50kpjwyy53a37rz5nx3hgj3ar"; + sha256 = "0dmi0fw39924kpahlsk853hbmpy8a6nj78lrh1wharayjpvj6jv3"; }; phases = ["unpackPhase" "installPhase" "fixupPhase"]; unpackPhase = '' From 48edc140dcf40ba15176b5687827eb29f6dd676d Mon Sep 17 00:00:00 2001 From: adisbladis Date: Thu, 1 Mar 2018 18:21:49 +0800 Subject: [PATCH 117/814] nodePackages_8_x.npm: init at 5.6.0 --- .../node-packages/node-packages-v8.json | 1 + .../node-packages/node-packages-v8.nix | 42 ++++++++++++++++--- 2 files changed, 37 insertions(+), 6 deletions(-) diff --git a/pkgs/development/node-packages/node-packages-v8.json b/pkgs/development/node-packages/node-packages-v8.json index 744894de4ffd..8abdc0e608cd 100644 --- a/pkgs/development/node-packages/node-packages-v8.json +++ b/pkgs/development/node-packages/node-packages-v8.json @@ -11,4 +11,5 @@ , "pnpm" , "semver" , "sloc" +, "npm" ] diff --git a/pkgs/development/node-packages/node-packages-v8.nix b/pkgs/development/node-packages/node-packages-v8.nix index ce7b70b3fdcc..61752e7598c5 100644 --- a/pkgs/development/node-packages/node-packages-v8.nix +++ b/pkgs/development/node-packages/node-packages-v8.nix @@ -283,6 +283,15 @@ let sha512 = "1kvjv5hs1c53b5g2vghpnncn4zj397sa0vpbx1pzpn8ngq52s3xq9923gnl2kzkh1mhyrl277jrh87a766yks89qvz8b4jczr44xr9p"; }; }; + "bencode-2.0.0" = { + name = "bencode"; + packageName = "bencode"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/bencode/-/bencode-2.0.0.tgz"; + sha512 = "3rdjlprrhprwwygnw5aik9pgi1xyr09yvgq3rbr4g3pl1v70mcc1k903x3vh9z782jly6vmnvp44nrskl5rhcxgfdwz19fl1b1qggf2"; + }; + }; "bitfield-rle-2.1.0" = { name = "bitfield-rle"; packageName = "bitfield-rle"; @@ -1768,13 +1777,13 @@ let sha512 = "2nbjxg0x7jsa14zhvx68w1vri68hsxzbxz7b7ap76fdp0jkrgna2rq636yxnax04f3f8i2ambj2fpan6qli6vixmfryz78vrapdip8n"; }; }; - "k-rpc-socket-1.7.2" = { + "k-rpc-socket-1.8.0" = { name = "k-rpc-socket"; packageName = "k-rpc-socket"; - version = "1.7.2"; + version = "1.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/k-rpc-socket/-/k-rpc-socket-1.7.2.tgz"; - sha512 = "02w1ih1lh86i5ap7c3dy2ml7g5a11r0w300iyxdf6v02qr0j1x3vf78hx5q9dgg3drifab018mgm851m457zzzi05i2z2r1s3zlflc3"; + url = "https://registry.npmjs.org/k-rpc-socket/-/k-rpc-socket-1.8.0.tgz"; + sha512 = "0pc9bjnmgfjcgh49lclvz5qnlkzypgirlx5ji2nx15vfn00gwczy5hvfahcxdzcdqsjlwh7q8jw4zj8abdk8qx2cwiqdw8fgg557zvz"; }; }; "kind-of-3.2.2" = { @@ -3514,8 +3523,12 @@ in sources."json-stringify-safe-5.0.1" sources."jsprim-1.4.1" sources."k-bucket-3.3.1" - sources."k-rpc-4.2.1" - sources."k-rpc-socket-1.7.2" + (sources."k-rpc-4.2.1" // { + dependencies = [ + sources."bencode-2.0.0" + ]; + }) + sources."k-rpc-socket-1.8.0" sources."kind-of-3.2.2" sources."last-one-wins-1.0.4" sources."length-prefixed-message-3.0.3" @@ -4127,4 +4140,21 @@ in production = true; bypassCache = true; }; + npm = nodeEnv.buildNodePackage { + name = "npm"; + packageName = "npm"; + version = "5.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/npm/-/npm-5.6.0.tgz"; + sha512 = "0nnr796ik5h8bsd3k9ygivivr3na2ksnf5iipf8dsnn20j10i9sgmhmsnzbimd2pqgjbrpp8gbpl2q7j5c7yjqjfirrh8xcc3v3gpws"; + }; + buildInputs = globalBuildInputs; + meta = { + description = "a package manager for JavaScript"; + homepage = https://docs.npmjs.com/; + license = "Artistic-2.0"; + }; + production = true; + bypassCache = true; + }; } \ No newline at end of file From a0cb8cfd81fc0d4255b7213c69ae0fde1825d28e Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Thu, 1 Mar 2018 11:44:22 +0100 Subject: [PATCH 118/814] rubygems.grpc: fix with gcc7 --- pkgs/development/ruby-modules/gem-config/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/ruby-modules/gem-config/default.nix b/pkgs/development/ruby-modules/gem-config/default.nix index 8da6355e0016..ac0b2dd07f83 100644 --- a/pkgs/development/ruby-modules/gem-config/default.nix +++ b/pkgs/development/ruby-modules/gem-config/default.nix @@ -139,8 +139,9 @@ in }; grpc = attrs: { - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig ]; buildInputs = [ openssl ]; + NIX_CFLAGS_COMPILE = [ "-Wno-error=stringop-overflow" "-Wno-error=implicit-fallthrough" ]; }; hitimes = attrs: { From 565f22d27aba3c53fcf4155dba639f2071d08ed6 Mon Sep 17 00:00:00 2001 From: lejonet Date: Thu, 1 Mar 2018 12:47:13 +0100 Subject: [PATCH 119/814] nixos/ceph: init module (#35299) All 5 daemon types can be enabled and configured through the module and the module both creates the ceph.conf required but also creates and enables specific services for each daemon, based on the systemd service files that upstream provides. --- lib/maintainers.nix | 1 + nixos/modules/misc/ids.nix | 2 + nixos/modules/module-list.nix | 1 + .../services/network-filesystems/ceph.nix | 371 ++++++++++++++++++ nixos/release.nix | 1 + nixos/tests/ceph.nix | 140 +++++++ 6 files changed, 516 insertions(+) create mode 100644 nixos/modules/services/network-filesystems/ceph.nix create mode 100644 nixos/tests/ceph.nix diff --git a/lib/maintainers.nix b/lib/maintainers.nix index a2aa88a807de..71b2a7a08bba 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -380,6 +380,7 @@ ledif = "Adam Fidel "; leemachin = "Lee Machin "; leenaars = "Michiel Leenaars "; + lejonet = "Daniel Kuehn "; leonardoce = "Leonardo Cecchi "; lethalman = "Luca Bruno "; lewo = "Antoine Eiche "; diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix index c0c6a6ef9244..8d775ffc82d3 100644 --- a/nixos/modules/misc/ids.nix +++ b/nixos/modules/misc/ids.nix @@ -304,6 +304,7 @@ mighttpd2 = 285; hass = 286; monero = 287; + ceph = 288; # When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399! @@ -576,6 +577,7 @@ mighttpd2 = 285; hass = 286; monero = 287; + ceph = 288; # When adding a gid, make sure it doesn't match an existing # uid. Users and groups with the same name should have equal diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 13a32b968dcb..3bb65c6b295a 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -439,6 +439,7 @@ ./services/network-filesystems/u9fs.nix ./services/network-filesystems/yandex-disk.nix ./services/network-filesystems/xtreemfs.nix + ./services/network-filesystems/ceph.nix ./services/networking/amuled.nix ./services/networking/aria2.nix ./services/networking/asterisk.nix diff --git a/nixos/modules/services/network-filesystems/ceph.nix b/nixos/modules/services/network-filesystems/ceph.nix new file mode 100644 index 000000000000..5de8ae79a246 --- /dev/null +++ b/nixos/modules/services/network-filesystems/ceph.nix @@ -0,0 +1,371 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + ceph = pkgs.ceph; + cfg = config.services.ceph; + # function that translates "camelCaseOptions" to "camel case options", credits to tilpner in #nixos@freenode + translateOption = replaceStrings upperChars (map (s: " ${s}") lowerChars); + generateDaemonList = (daemonType: daemons: extraServiceConfig: + mkMerge ( + map (daemon: + { "ceph-${daemonType}-${daemon}" = generateServiceFile daemonType daemon cfg.global.clusterName ceph extraServiceConfig; } + ) daemons + ) + ); + generateServiceFile = (daemonType: daemonId: clusterName: ceph: extraServiceConfig: { + enable = true; + description = "Ceph ${builtins.replaceStrings lowerChars upperChars daemonType} daemon ${daemonId}"; + after = [ "network-online.target" "local-fs.target" "time-sync.target" ] ++ optional (daemonType == "osd") "ceph-mon.target"; + wants = [ "network-online.target" "local-fs.target" "time-sync.target" ]; + partOf = [ "ceph-${daemonType}.target" ]; + wantedBy = [ "ceph-${daemonType}.target" ]; + + serviceConfig = { + LimitNOFILE = 1048576; + LimitNPROC = 1048576; + Environment = "CLUSTER=${clusterName}"; + ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; + PrivateDevices = "yes"; + PrivateTmp = "true"; + ProtectHome = "true"; + ProtectSystem = "full"; + Restart = "on-failure"; + StartLimitBurst = "5"; + StartLimitInterval = "30min"; + ExecStart = "${ceph.out}/bin/${if daemonType == "rgw" then "radosgw" else "ceph-${daemonType}"} -f --cluster ${clusterName} --id ${if daemonType == "rgw" then "client.${daemonId}" else daemonId} --setuser ceph --setgroup ceph"; + } // extraServiceConfig + // optionalAttrs (daemonType == "osd") { ExecStartPre = "${ceph.out}/libexec/ceph/ceph-osd-prestart.sh --id ${daemonId} --cluster ${clusterName}"; }; + } // optionalAttrs (builtins.elem daemonType [ "mds" "mon" "rgw" "mgr" ]) { preStart = '' + daemonPath="/var/lib/ceph/${if daemonType == "rgw" then "radosgw" else daemonType}/${clusterName}-${daemonId}" + if [ ! -d ''$daemonPath ]; then + mkdir -m 755 -p ''$daemonPath + chown -R ceph:ceph ''$daemonPath + fi + ''; + } // optionalAttrs (daemonType == "osd") { path = [ pkgs.getopt ]; } + ); + generateTargetFile = (daemonType: + { + "ceph-${daemonType}" = { + description = "Ceph target allowing to start/stop all ceph-${daemonType} services at once"; + partOf = [ "ceph.target" ]; + before = [ "ceph.target" ]; + }; + } + ); +in +{ + options.services.ceph = { + # Ceph has a monolithic configuration file but different sections for + # each daemon, a separate client section and a global section + enable = mkEnableOption "Ceph global configuration"; + + global = { + fsid = mkOption { + type = types.str; + example = '' + 433a2193-4f8a-47a0-95d2-209d7ca2cca5 + ''; + description = '' + Filesystem ID, a generated uuid, its must be generated and set before + attempting to start a cluster + ''; + }; + + clusterName = mkOption { + type = types.str; + default = "ceph"; + description = '' + Name of cluster + ''; + }; + + monInitialMembers = mkOption { + type = with types; nullOr commas; + default = null; + example = '' + node0, node1, node2 + ''; + description = '' + List of hosts that will be used as monitors at startup. + ''; + }; + + monHost = mkOption { + type = with types; nullOr commas; + default = null; + example = '' + 10.10.0.1, 10.10.0.2, 10.10.0.3 + ''; + description = '' + List of hostname shortnames/IP addresses of the initial monitors. + ''; + }; + + maxOpenFiles = mkOption { + type = types.int; + default = 131072; + description = '' + Max open files for each OSD daemon. + ''; + }; + + authClusterRequired = mkOption { + type = types.enum [ "cephx" "none" ]; + default = "cephx"; + description = '' + Enables requiring daemons to authenticate with eachother in the cluster. + ''; + }; + + authServiceRequired = mkOption { + type = types.enum [ "cephx" "none" ]; + default = "cephx"; + description = '' + Enables requiring clients to authenticate with the cluster to access services in the cluster (e.g. radosgw, mds or osd). + ''; + }; + + authClientRequired = mkOption { + type = types.enum [ "cephx" "none" ]; + default = "cephx"; + description = '' + Enables requiring the cluster to authenticate itself to the client. + ''; + }; + + publicNetwork = mkOption { + type = with types; nullOr commas; + default = null; + example = '' + 10.20.0.0/24, 192.168.1.0/24 + ''; + description = '' + A comma-separated list of subnets that will be used as public networks in the cluster. + ''; + }; + + clusterNetwork = mkOption { + type = with types; nullOr commas; + default = null; + example = '' + 10.10.0.0/24, 192.168.0.0/24 + ''; + description = '' + A comma-separated list of subnets that will be used as cluster networks in the cluster. + ''; + }; + }; + + mgr = { + enable = mkEnableOption "Ceph MGR daemon"; + daemons = mkOption { + type = with types; listOf str; + default = []; + example = '' + [ "name1" "name2" ]; + ''; + description = '' + A list of names for manager daemons that should have a service created. The names correspond + to the id part in ceph i.e. [ "name1" ] would result in mgr.name1 + ''; + }; + extraConfig = mkOption { + type = with types; attrsOf str; + default = {}; + description = '' + Extra configuration to add to the global section for manager daemons. + ''; + }; + }; + + mon = { + enable = mkEnableOption "Ceph MON daemon"; + daemons = mkOption { + type = with types; listOf str; + default = []; + example = '' + [ "name1" "name2" ]; + ''; + description = '' + A list of monitor daemons that should have a service created. The names correspond + to the id part in ceph i.e. [ "name1" ] would result in mon.name1 + ''; + }; + extraConfig = mkOption { + type = with types; attrsOf str; + default = {}; + description = '' + Extra configuration to add to the monitor section. + ''; + }; + }; + + osd = { + enable = mkEnableOption "Ceph OSD daemon"; + daemons = mkOption { + type = with types; listOf str; + default = []; + example = '' + [ "name1" "name2" ]; + ''; + description = '' + A list of OSD daemons that should have a service created. The names correspond + to the id part in ceph i.e. [ "name1" ] would result in osd.name1 + ''; + }; + extraConfig = mkOption { + type = with types; attrsOf str; + default = { + "osd journal size" = "10000"; + "osd pool default size" = "3"; + "osd pool default min size" = "2"; + "osd pool default pg num" = "200"; + "osd pool default pgp num" = "200"; + "osd crush chooseleaf type" = "1"; + }; + description = '' + Extra configuration to add to the OSD section. + ''; + }; + }; + + mds = { + enable = mkEnableOption "Ceph MDS daemon"; + daemons = mkOption { + type = with types; listOf str; + default = []; + example = '' + [ "name1" "name2" ]; + ''; + description = '' + A list of metadata service daemons that should have a service created. The names correspond + to the id part in ceph i.e. [ "name1" ] would result in mds.name1 + ''; + }; + extraConfig = mkOption { + type = with types; attrsOf str; + default = {}; + description = '' + Extra configuration to add to the MDS section. + ''; + }; + }; + + rgw = { + enable = mkEnableOption "Ceph RadosGW daemon"; + daemons = mkOption { + type = with types; listOf str; + default = []; + example = '' + [ "name1" "name2" ]; + ''; + description = '' + A list of rados gateway daemons that should have a service created. The names correspond + to the id part in ceph i.e. [ "name1" ] would result in client.name1, radosgw daemons + aren't daemons to cluster in the sense that OSD, MGR or MON daemons are. They are simply + daemons, from ceph, that uses the cluster as a backend. + ''; + }; + }; + + client = { + enable = mkEnableOption "Ceph client configuration"; + extraConfig = mkOption { + type = with types; attrsOf str; + default = {}; + example = '' + { + # This would create a section for a radosgw daemon named node0 and related + # configuration for it + "client.radosgw.node0" = { "some config option" = "true"; }; + }; + ''; + description = '' + Extra configuration to add to the client section. Configuration for rados gateways + would be added here, with their own sections, see example. + ''; + }; + }; + }; + + config = mkIf config.services.ceph.enable { + assertions = [ + { assertion = cfg.global.fsid != ""; + message = "fsid has to be set to a valid uuid for the cluster to function"; + } + { assertion = cfg.mgr.enable == true; + message = "ceph 12.x requires atleast 1 MGR daemon enabled for the cluster to function"; + } + { assertion = cfg.mon.enable == true -> cfg.mon.daemons != []; + message = "have to set id of atleast one MON if you're going to enable Monitor"; + } + { assertion = cfg.mds.enable == true -> cfg.mds.daemons != []; + message = "have to set id of atleast one MDS if you're going to enable Metadata Service"; + } + { assertion = cfg.osd.enable == true -> cfg.osd.daemons != []; + message = "have to set id of atleast one OSD if you're going to enable OSD"; + } + { assertion = cfg.mgr.enable == true -> cfg.mgr.daemons != []; + message = "have to set id of atleast one MGR if you're going to enable MGR"; + } + ]; + + warnings = optional (cfg.global.monInitialMembers == null) + ''Not setting up a list of members in monInitialMembers requires that you set the host variable for each mon daemon or else the cluster won't function''; + + environment.etc."ceph/ceph.conf".text = let + # Translate camelCaseOptions to the expected camel case option for ceph.conf + translatedGlobalConfig = mapAttrs' (name: value: nameValuePair (translateOption name) value) cfg.global; + # Merge the extraConfig set for mgr daemons, as mgr don't have their own section + globalAndMgrConfig = translatedGlobalConfig // optionalAttrs cfg.mgr.enable cfg.mgr.extraConfig; + # Remove all name-value pairs with null values from the attribute set to avoid making empty sections in the ceph.conf + globalConfig = mapAttrs' (name: value: nameValuePair (translateOption name) value) (filterAttrs (name: value: value != null) globalAndMgrConfig); + totalConfig = { + "global" = globalConfig; + } // optionalAttrs (cfg.mon.enable && cfg.mon.extraConfig != {}) { "mon" = cfg.mon.extraConfig; } + // optionalAttrs (cfg.mds.enable && cfg.mds.extraConfig != {}) { "mds" = cfg.mds.extraConfig; } + // optionalAttrs (cfg.osd.enable && cfg.osd.extraConfig != {}) { "osd" = cfg.osd.extraConfig; } + // optionalAttrs (cfg.client.enable && cfg.client.extraConfig != {}) cfg.client.extraConfig; + in + generators.toINI {} totalConfig; + + users.extraUsers = singleton { + name = "ceph"; + uid = config.ids.uids.ceph; + description = "Ceph daemon user"; + }; + + users.extraGroups = singleton { + name = "ceph"; + gid = config.ids.gids.ceph; + }; + + systemd.services = let + services = [] + ++ optional cfg.mon.enable (generateDaemonList "mon" cfg.mon.daemons { RestartSec = "10"; }) + ++ optional cfg.mds.enable (generateDaemonList "mds" cfg.mds.daemons { StartLimitBurst = "3"; }) + ++ optional cfg.osd.enable (generateDaemonList "osd" cfg.osd.daemons { StartLimitBurst = "30"; RestartSec = "20s"; }) + ++ optional cfg.rgw.enable (generateDaemonList "rgw" cfg.rgw.daemons { }) + ++ optional cfg.mgr.enable (generateDaemonList "mgr" cfg.mgr.daemons { StartLimitBurst = "3"; }); + in + mkMerge services; + + systemd.targets = let + targets = [ + { "ceph" = { description = "Ceph target allowing to start/stop all ceph service instances at once"; }; } + ] ++ optional cfg.mon.enable (generateTargetFile "mon") + ++ optional cfg.mds.enable (generateTargetFile "mds") + ++ optional cfg.osd.enable (generateTargetFile "osd") + ++ optional cfg.rgw.enable (generateTargetFile "rgw") + ++ optional cfg.mgr.enable (generateTargetFile "mgr"); + in + mkMerge targets; + + systemd.tmpfiles.rules = [ + "d /run/ceph 0770 ceph ceph -" + ]; + }; +} diff --git a/nixos/release.nix b/nixos/release.nix index 558bbbf9a9d4..473b11313bef 100644 --- a/nixos/release.nix +++ b/nixos/release.nix @@ -230,6 +230,7 @@ in rec { tests.borgbackup = callTest tests/borgbackup.nix {}; tests.buildbot = callTest tests/buildbot.nix {}; tests.cadvisor = callTestOnTheseSystems ["x86_64-linux"] tests/cadvisor.nix {}; + tests.ceph = callTestOnTheseSystems ["x86_64-linux"] tests/ceph.nix {}; tests.chromium = (callSubTestsOnTheseSystems ["x86_64-linux"] tests/chromium.nix {}).stable; tests.cjdns = callTest tests/cjdns.nix {}; tests.cloud-init = callTest tests/cloud-init.nix {}; diff --git a/nixos/tests/ceph.nix b/nixos/tests/ceph.nix new file mode 100644 index 000000000000..b9993062c079 --- /dev/null +++ b/nixos/tests/ceph.nix @@ -0,0 +1,140 @@ +import ./make-test.nix ({pkgs, ...}: rec { + name = "All-in-one-basic-ceph-cluster"; + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ lejonet ]; + }; + + nodes = { + aio = { config, pkgs, ... }: { + virtualisation = { + emptyDiskImages = [ 20480 20480 ]; + vlans = [ 1 ]; + }; + + networking = { + firewall.allowPing = true; + useDHCP = false; + interfaces.eth1.ipv4.addresses = pkgs.lib.mkOverride 0 [ + { address = "192.168.1.1"; prefixLength = 24; } + ]; + }; + + environment.systemPackages = with pkgs; [ + bash + sudo + ceph + xfsprogs + ]; + nixpkgs.config.packageOverrides = super: { + ceph = super.ceph.override({ nss = super.nss; libxfs = super.libxfs; libaio = super.libaio; jemalloc = super.jemalloc; }); + }; + + boot.kernelModules = [ "xfs" ]; + + services.ceph.enable = true; + services.ceph.global = { + fsid = "066ae264-2a5d-4729-8001-6ad265f50b03"; + monInitialMembers = "aio"; + monHost = "192.168.1.1"; + }; + + services.ceph.mon = { + enable = true; + daemons = [ "aio" ]; + }; + + services.ceph.mgr = { + enable = true; + daemons = [ "aio" ]; + }; + + services.ceph.osd = { + enable = true; + daemons = [ "0" "1" ]; + }; + }; + }; + + testScript = { nodes, ... }: '' + startAll; + + $aio->waitForUnit("network.target"); + + # Create the ceph-related directories + $aio->mustSucceed( + "mkdir -p /var/lib/ceph/mgr/ceph-aio/", + "mkdir -p /var/lib/ceph/mon/ceph-aio/", + "mkdir -p /var/lib/ceph/osd/ceph-{0..1}/", + "chown ceph:ceph -R /var/lib/ceph/" + ); + + # Bootstrap ceph-mon daemon + $aio->mustSucceed( + "mkdir -p /var/lib/ceph/bootstrap-osd && chown ceph:ceph /var/lib/ceph/bootstrap-osd", + "sudo -u ceph ceph-authtool --create-keyring /tmp/ceph.mon.keyring --gen-key -n mon. --cap mon 'allow *'", + "ceph-authtool --create-keyring /etc/ceph/ceph.client.admin.keyring --gen-key -n client.admin --set-uid=0 --cap mon 'allow *' --cap osd 'allow *' --cap mds 'allow *' --cap mgr 'allow *'", + "ceph-authtool /tmp/ceph.mon.keyring --import-keyring /etc/ceph/ceph.client.admin.keyring", + "monmaptool --create --add aio 192.168.1.1 --fsid 066ae264-2a5d-4729-8001-6ad265f50b03 /tmp/monmap", + "sudo -u ceph ceph-mon --mkfs -i aio --monmap /tmp/monmap --keyring /tmp/ceph.mon.keyring", + "touch /var/lib/ceph/mon/ceph-aio/done", + "systemctl start ceph-mon-aio" + ); + $aio->waitForUnit("ceph-mon-aio"); + + # Can't check ceph status until a mon is up + $aio->succeed("ceph -s | grep 'mon: 1 daemons'"); + + # Start the ceph-mgr daemon, it has no deps and hardly any setup + $aio->mustSucceed( + "ceph auth get-or-create mgr.aio mon 'allow profile mgr' osd 'allow *' mds 'allow *' > /var/lib/ceph/mgr/ceph-aio/keyring", + "systemctl start ceph-mgr-aio" + ); + $aio->waitForUnit("ceph-mgr-aio"); + $aio->waitUntilSucceeds("ceph -s | grep 'quorum aio'"); + + # Bootstrap both OSDs + $aio->mustSucceed( + "mkfs.xfs /dev/vdb", + "mkfs.xfs /dev/vdc", + "mount /dev/vdb /var/lib/ceph/osd/ceph-0", + "mount /dev/vdc /var/lib/ceph/osd/ceph-1", + "ceph-authtool --create-keyring /var/lib/ceph/osd/ceph-0/keyring --name osd.0 --add-key AQBCEJNa3s8nHRAANvdsr93KqzBznuIWm2gOGg==", + "ceph-authtool --create-keyring /var/lib/ceph/osd/ceph-1/keyring --name osd.1 --add-key AQBEEJNac00kExAAXEgy943BGyOpVH1LLlHafQ==", + "echo '{\"cephx_secret\": \"AQBCEJNa3s8nHRAANvdsr93KqzBznuIWm2gOGg==\"}' | ceph osd new 55ba2294-3e24-478f-bee0-9dca4c231dd9 -i -", + "echo '{\"cephx_secret\": \"AQBEEJNac00kExAAXEgy943BGyOpVH1LLlHafQ==\"}' | ceph osd new 5e97a838-85b6-43b0-8950-cb56d554d1e5 -i -" + ); + + # Initialize the OSDs with regular filestore + $aio->mustSucceed( + "ceph-osd -i 0 --mkfs --osd-uuid 55ba2294-3e24-478f-bee0-9dca4c231dd9", + "ceph-osd -i 1 --mkfs --osd-uuid 5e97a838-85b6-43b0-8950-cb56d554d1e5", + "chown -R ceph:ceph /var/lib/ceph/osd", + "systemctl start ceph-osd-0", + "systemctl start ceph-osd-1" + ); + + $aio->waitUntilSucceeds("ceph osd stat | grep '2 osds: 2 up, 2 in'"); + $aio->waitUntilSucceeds("ceph -s | grep 'mgr: aio(active)'"); + $aio->waitUntilSucceeds("ceph -s | grep 'HEALTH_OK'"); + + $aio->mustSucceed( + "ceph osd pool create aio-test 100 100", + "ceph osd pool ls | grep 'aio-test'", + "ceph osd pool rename aio-test aio-other-test", + "ceph osd pool ls | grep 'aio-other-test'", + "ceph -s | grep '1 pools, 100 pgs'", + "ceph osd getcrushmap -o crush", + "crushtool -d crush -o decrushed", + "sed 's/step chooseleaf firstn 0 type host/step chooseleaf firstn 0 type osd/' decrushed > modcrush", + "crushtool -c modcrush -o recrushed", + "ceph osd setcrushmap -i recrushed", + "ceph osd pool set aio-other-test size 2" + ); + $aio->waitUntilSucceeds("ceph -s | grep 'HEALTH_OK'"); + $aio->waitUntilSucceeds("ceph -s | grep '100 active+clean'"); + $aio->mustFail( + "ceph osd pool ls | grep 'aio-test'", + "ceph osd pool delete aio-other-test aio-other-test --yes-i-really-really-mean-it" + ); + ''; +}) From 6717617247b4e8a436d714fb31de06b28f909622 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Thu, 1 Mar 2018 09:17:58 -0300 Subject: [PATCH 120/814] deepin: add meta package for the Deepin Desktop Environment (DDE) --- pkgs/desktops/deepin/default.nix | 10 ++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 12 insertions(+) create mode 100644 pkgs/desktops/deepin/default.nix diff --git a/pkgs/desktops/deepin/default.nix b/pkgs/desktops/deepin/default.nix new file mode 100644 index 000000000000..b2a98f85652b --- /dev/null +++ b/pkgs/desktops/deepin/default.nix @@ -0,0 +1,10 @@ +{ pkgs, newScope }: + +let + callPackage = newScope self; + + self = rec { + + }; + +in self diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e92cac440e93..60a09473126f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19201,6 +19201,8 @@ with pkgs; clearlooks-phenix = callPackage ../misc/themes/clearlooks-phenix { }; + deepin = recurseIntoAttrs (callPackage ../desktops/deepin { }); + enlightenment = recurseIntoAttrs (callPackage ../desktops/enlightenment { callPackage = newScope pkgs.enlightenment; }); From c0a27fb0059837155ad3e04d8747eedfffa8e0a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Thu, 1 Mar 2018 09:53:56 -0300 Subject: [PATCH 121/814] deepin-terminal: move to deepin meta package --- .../misc => desktops/deepin}/deepin-terminal/default.nix | 0 pkgs/desktops/deepin/default.nix | 7 ++++++- pkgs/tools/networking/zssh/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 5 ----- 4 files changed, 8 insertions(+), 8 deletions(-) rename pkgs/{applications/misc => desktops/deepin}/deepin-terminal/default.nix (100%) diff --git a/pkgs/applications/misc/deepin-terminal/default.nix b/pkgs/desktops/deepin/deepin-terminal/default.nix similarity index 100% rename from pkgs/applications/misc/deepin-terminal/default.nix rename to pkgs/desktops/deepin/deepin-terminal/default.nix diff --git a/pkgs/desktops/deepin/default.nix b/pkgs/desktops/deepin/default.nix index b2a98f85652b..7e48a55d3702 100644 --- a/pkgs/desktops/deepin/default.nix +++ b/pkgs/desktops/deepin/default.nix @@ -4,7 +4,12 @@ let callPackage = newScope self; self = rec { - + + deepin-terminal = callPackage ./deepin-terminal { + inherit (pkgs.gnome3) libgee vte; + wnck = pkgs.libwnck3; + }; + }; in self diff --git a/pkgs/tools/networking/zssh/default.nix b/pkgs/tools/networking/zssh/default.nix index 16c0034e46fc..ac64e135c2fe 100644 --- a/pkgs/tools/networking/zssh/default.nix +++ b/pkgs/tools/networking/zssh/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, readline, deepin-terminal }: +{ stdenv, fetchurl, readline, deepin }: let version = "1.5c"; @@ -32,7 +32,7 @@ in stdenv.mkDerivation rec { description = "SSH and Telnet client with ZMODEM file transfer capability"; homepage = http://zssh.sourceforge.net/; license = stdenv.lib.licenses.gpl2; - maintainers = deepin-terminal.meta.maintainers; # required by deepin-terminal + maintainers = deepin.deepin-terminal.meta.maintainers; # required by deepin-terminal platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 60a09473126f..08f5b0875280 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -17644,11 +17644,6 @@ with pkgs; vte = gnome3.vte; }; - deepin-terminal = callPackage ../applications/misc/deepin-terminal { - inherit (gnome3) libgee vte; - wnck = libwnck3; - }; - termite = callPackage ../applications/misc/termite { vte = gnome3.vte-ng; }; From 562031d815102fece3060ae767921a169a4ece2e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Thu, 1 Mar 2018 10:00:05 -0300 Subject: [PATCH 122/814] deepin-gtk-theme: move to deepin meta package --- .../deepin => desktops/deepin/deepin-gtk-theme}/default.nix | 0 pkgs/desktops/deepin/default.nix | 2 ++ pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 2 insertions(+), 2 deletions(-) rename pkgs/{misc/themes/deepin => desktops/deepin/deepin-gtk-theme}/default.nix (100%) diff --git a/pkgs/misc/themes/deepin/default.nix b/pkgs/desktops/deepin/deepin-gtk-theme/default.nix similarity index 100% rename from pkgs/misc/themes/deepin/default.nix rename to pkgs/desktops/deepin/deepin-gtk-theme/default.nix diff --git a/pkgs/desktops/deepin/default.nix b/pkgs/desktops/deepin/default.nix index 7e48a55d3702..012851485c90 100644 --- a/pkgs/desktops/deepin/default.nix +++ b/pkgs/desktops/deepin/default.nix @@ -5,6 +5,8 @@ let self = rec { + deepin-gtk-theme = callPackage ./deepin-gtk-theme { }; + deepin-terminal = callPackage ./deepin-terminal { inherit (pkgs.gnome3) libgee vte; wnck = pkgs.libwnck3; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 08f5b0875280..bdb53a63deb6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19265,8 +19265,6 @@ with pkgs; orion = callPackage ../misc/themes/orion {}; - deepin-gtk-theme = callPackage ../misc/themes/deepin { }; - elementary-gtk-theme = callPackage ../misc/themes/elementary { }; albatross = callPackage ../misc/themes/albatross { }; From 023d584433de7dd60736d8b53b786e81c1032298 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?V=C3=A4in=C3=B6=20J=C3=A4rvel=C3=A4?= Date: Thu, 1 Mar 2018 14:50:20 +0200 Subject: [PATCH 123/814] wireshark: Add Darwin support --- .../networking/sniffers/wireshark/cmake.patch | 19 ++++++++++++ .../networking/sniffers/wireshark/default.nix | 30 +++++++++++++++---- 2 files changed, 43 insertions(+), 6 deletions(-) create mode 100644 pkgs/applications/networking/sniffers/wireshark/cmake.patch diff --git a/pkgs/applications/networking/sniffers/wireshark/cmake.patch b/pkgs/applications/networking/sniffers/wireshark/cmake.patch new file mode 100644 index 000000000000..890fffedce03 --- /dev/null +++ b/pkgs/applications/networking/sniffers/wireshark/cmake.patch @@ -0,0 +1,19 @@ +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -19,6 +19,7 @@ + # Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + # + ++cmake_minimum_required(VERSION 3.7) + project(Wireshark C CXX) + + # Updated by make-version.pl +@@ -40,7 +41,7 @@ + # Needed for GREATER_EQUAL operator + cmake_minimum_required(VERSION 3.7) + else() +- cmake_minimum_required(VERSION 2.8.8) ++ cmake_minimum_required(VERSION 3.7) + endif() + + # Needs to be set after cmake_minimum_required or cmake_policy(VERSION) diff --git a/pkgs/applications/networking/sniffers/wireshark/default.nix b/pkgs/applications/networking/sniffers/wireshark/default.nix index 682b7d311d71..81859eb1fe33 100644 --- a/pkgs/applications/networking/sniffers/wireshark/default.nix +++ b/pkgs/applications/networking/sniffers/wireshark/default.nix @@ -1,6 +1,6 @@ { stdenv, lib, fetchurl, pkgconfig, pcre, perl, flex, bison, gettext, libpcap, libnl, c-ares , gnutls, libgcrypt, libgpgerror, geoip, openssl, lua5, makeDesktopItem, python, libcap, glib -, libssh, zlib, cmake, extra-cmake-modules, fetchpatch +, libssh, zlib, cmake, extra-cmake-modules, fetchpatch, makeWrapper , withGtk ? false, gtk3 ? null, librsvg ? null, gsettings-desktop-schemas ? null, wrapGAppsHook ? null , withQt ? false, qt5 ? null , ApplicationServices, SystemConfiguration, gmp @@ -26,6 +26,8 @@ in stdenv.mkDerivation { cmakeFlags = [ "-DBUILD_wireshark_gtk=${if withGtk then "ON" else "OFF"}" "-DBUILD_wireshark=${if withQt then "ON" else "OFF"}" + "-DENABLE_QT5=${if withQt then "ON" else "OFF"}" + "-DENABLE_APPLICATION_BUNDLE=${if withQt && stdenv.isDarwin then "ON" else "OFF"}" ]; nativeBuildInputs = [ @@ -34,11 +36,12 @@ in stdenv.mkDerivation { buildInputs = [ gettext pcre perl libpcap lua5 libssh openssl libgcrypt - libgpgerror gnutls geoip c-ares python glib zlib + libgpgerror gnutls geoip c-ares python glib zlib makeWrapper ] ++ optionals withQt (with qt5; [ qtbase qtmultimedia qtsvg qttools ]) ++ optionals withGtk [ gtk3 librsvg gsettings-desktop-schemas ] ++ optionals stdenv.isLinux [ libcap libnl ] - ++ optionals stdenv.isDarwin [ SystemConfiguration ApplicationServices gmp ]; + ++ optionals stdenv.isDarwin [ SystemConfiguration ApplicationServices gmp ] + ++ optionals (withQt && stdenv.isDarwin) (with qt5; [ qtmacextras ]); patches = [ ./wireshark-lookup-dumpcap-in-path.patch ] # https://code.wireshark.org/review/#/c/23728/ @@ -46,9 +49,24 @@ in stdenv.mkDerivation { name = "fix-timeout.patch"; url = "https://code.wireshark.org/review/gitweb?p=wireshark.git;a=commitdiff_plain;h=8b5b843fcbc3e03e0fc45f3caf8cf5fc477e8613;hp=94af9724d140fd132896b650d10c4d060788e4f0"; sha256 = "1g2dm7lwsnanwp68b9xr9swspx7hfj4v3z44sz3yrfmynygk8zlv"; - }); + }) + ++ stdenv.lib.optional stdenv.isDarwin ./cmake.patch; - postInstall = optionalString (withQt || withGtk) '' + postInstall = if stdenv.isDarwin then '' + ${optionalString withQt '' + mkdir -p $out/Applications + mv $out/bin/Wireshark.app $out/Applications/Wireshark.app + + for so in $out/Applications/Wireshark.app/Contents/PlugIns/wireshark/*.so; do + install_name_tool $so -change libwireshark.10.dylib $out/lib/libwireshark.10.dylib + install_name_tool $so -change libwiretap.7.dylib $out/lib/libwiretap.7.dylib + install_name_tool $so -change libwsutil.8.dylib $out/lib/libwsutil.8.dylib + done + + wrapProgram $out/Applications/Wireshark.app/Contents/MacOS/Wireshark \ + --set QT_PLUGIN_PATH ${qt5.qtbase.bin}/${qt5.qtbase.qtPluginPrefix} + ''} + '' else optionalString (withQt || withGtk) '' ${optionalString withGtk '' install -Dm644 -t $out/share/applications ../wireshark-gtk.desktop ''} @@ -75,7 +93,7 @@ in stdenv.mkDerivation { experts. It runs on UNIX, macOS and Windows. ''; - platforms = platforms.linux; + platforms = platforms.linux ++ platforms.darwin; maintainers = with maintainers; [ bjornfor fpletz ]; }; } From 6e21aa65d9667dac255afa82cb1b13415b35446d Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Wed, 28 Feb 2018 23:27:43 +0100 Subject: [PATCH 124/814] mkvtoolnix: 20.0.0. -> 21.0.0 --- .../applications/video/mkvtoolnix/default.nix | 30 +++++++++++-------- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 18 insertions(+), 14 deletions(-) diff --git a/pkgs/applications/video/mkvtoolnix/default.nix b/pkgs/applications/video/mkvtoolnix/default.nix index 9324b08efd72..7afc3b502ad5 100644 --- a/pkgs/applications/video/mkvtoolnix/default.nix +++ b/pkgs/applications/video/mkvtoolnix/default.nix @@ -1,32 +1,36 @@ { stdenv, fetchFromGitLab, pkgconfig, autoconf, automake, libiconv -, drake, ruby, docbook_xsl, file, xdg_utils, gettext, expat, qt5, boost +, drake, ruby, docbook_xsl, file, xdg_utils, gettext, expat, boost , libebml, zlib, libmatroska, libogg, libvorbis, flac, libxslt, cmark , withGUI ? true + , qtbase ? null + , qtmultimedia ? null }: -assert withGUI -> qt5 != null; +assert withGUI -> qtbase != null && qtmultimedia != null; with stdenv.lib; stdenv.mkDerivation rec { name = "mkvtoolnix-${version}"; - version = "20.0.0"; + version = "21.0.0"; src = fetchFromGitLab { - owner = "mbunkus"; - repo = "mkvtoolnix"; - rev = "release-${version}"; - sha256 = "0qrjvvp0pvw9i91rh0zrxpclq7xap2dpjip0s5bm4gv14gh4l4mc"; + owner = "mbunkus"; + repo = "mkvtoolnix"; + rev = "release-${version}"; + sha256 = "06nixp0qqa6g2fv40f7l0i0sqbc7qswpgq4534l98nan08wjbk2r"; }; - nativeBuildInputs = [ pkgconfig autoconf automake gettext drake ruby docbook_xsl libxslt ]; + nativeBuildInputs = [ + pkgconfig autoconf automake gettext + drake ruby docbook_xsl libxslt + ]; buildInputs = [ - expat file xdg_utils boost libebml zlib libmatroska libogg - libvorbis flac cmark - ] - ++ optional stdenv.isDarwin libiconv - ++ optionals withGUI [qt5.qtbase qt5.qtmultimedia]; + expat file xdg_utils boost libebml zlib + libmatroska libogg libvorbis flac cmark + ] ++ optional stdenv.isDarwin libiconv + ++ optionals withGUI [ qtbase qtmultimedia ]; preConfigure = "./autogen.sh; patchShebangs ."; buildPhase = "drake -j $NIX_BUILD_CORES"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e92cac440e93..afb55d874403 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10464,7 +10464,7 @@ with pkgs; ffmpeg = ffmpeg_2; }; - mkvtoolnix = callPackage ../applications/video/mkvtoolnix { }; + mkvtoolnix = libsForQt5.callPackage ../applications/video/mkvtoolnix { }; mkvtoolnix-cli = callPackage ../applications/video/mkvtoolnix { withGUI = false; From 0d9224bdc50272708d24a41970a484804a3773cd Mon Sep 17 00:00:00 2001 From: rnhmjoj Date: Wed, 28 Feb 2018 23:31:09 +0100 Subject: [PATCH 125/814] mpv: use mkvtoolnix-cli --- pkgs/applications/video/mpv/scripts/convert.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/mpv/scripts/convert.nix b/pkgs/applications/video/mpv/scripts/convert.nix index cf77e3dfe663..faa21326fc0e 100644 --- a/pkgs/applications/video/mpv/scripts/convert.nix +++ b/pkgs/applications/video/mpv/scripts/convert.nix @@ -1,5 +1,5 @@ { stdenv, fetchgit, lib -, yad, mkvtoolnix, libnotify }: +, yad, mkvtoolnix-cli, libnotify }: stdenv.mkDerivation { name = "mpv-convert-script-2016-03-18.lua"; @@ -19,7 +19,7 @@ stdenv.mkDerivation { substituteInPlace convert_script.lua \ ${subs "NOTIFY_CMD" "notify-send" "${libnotify}/bin/notify-send"} \ ${subs "YAD_CMD" "yad" "${yad}/bin/yad"} \ - ${subs "MKVMERGE_CMD" "mkvmerge" "${mkvtoolnix}/bin/mkvmerge"} + ${subs "MKVMERGE_CMD" "mkvmerge" "${mkvtoolnix-cli}/bin/mkvmerge"} ''; dontBuild = true; From 13ac2ee2f6a19bb2f2e159906c34e1652139ed17 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 1 Mar 2018 11:03:17 +0100 Subject: [PATCH 126/814] pythonPackages.pydocstyle: correct propagatedBuildInputs --- pkgs/development/python-modules/pydocstyle/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/pydocstyle/default.nix b/pkgs/development/python-modules/pydocstyle/default.nix index fd1f0db0c1e5..bbad0f7a83bb 100644 --- a/pkgs/development/python-modules/pydocstyle/default.nix +++ b/pkgs/development/python-modules/pydocstyle/default.nix @@ -1,5 +1,6 @@ -{ stdenv, buildPythonPackage, fetchPypi, snowballstemmer, configparser, - pytest, pytestpep8, mock, pathlib }: +{ lib, buildPythonPackage, fetchPypi, isPy3k +, snowballstemmer, six, configparser +, pytest, pytestpep8, mock, pathlib }: buildPythonPackage rec { pname = "pydocstyle"; @@ -10,11 +11,11 @@ buildPythonPackage rec { sha256 = "15ssv8l6cvrmzgwcdzw76rnl4np3qf0dbwr1wsx76y0hc7lwsnsd"; }; - propagatedBuildInputs = [ snowballstemmer configparser ]; + propagatedBuildInputs = [ snowballstemmer six ] ++ lib.optional (!isPy3k) configparser; checkInputs = [ pytest pytestpep8 mock pathlib ]; - meta = with stdenv.lib; { + meta = with lib; { description = "Python docstring style checker"; homepage = https://github.com/PyCQA/pydocstyle/; license = licenses.mit; From ca09d1b303ac21aa027dc7f1ec63dd92b9138925 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 1 Mar 2018 11:13:09 +0100 Subject: [PATCH 127/814] pythonPackages.pydocstyle: enable tests --- .../python-modules/pydocstyle/default.nix | 17 +++++++++++++---- 1 file changed, 13 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/pydocstyle/default.nix b/pkgs/development/python-modules/pydocstyle/default.nix index bbad0f7a83bb..e6adb32a3116 100644 --- a/pkgs/development/python-modules/pydocstyle/default.nix +++ b/pkgs/development/python-modules/pydocstyle/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, isPy3k +{ lib, buildPythonPackage, fetchFromGitHub, isPy3k , snowballstemmer, six, configparser , pytest, pytestpep8, mock, pathlib }: @@ -6,15 +6,24 @@ buildPythonPackage rec { pname = "pydocstyle"; version = "2.1.1"; - src = fetchPypi { - inherit pname version; - sha256 = "15ssv8l6cvrmzgwcdzw76rnl4np3qf0dbwr1wsx76y0hc7lwsnsd"; + # no tests on PyPI + # https://github.com/PyCQA/pydocstyle/issues/302 + src = fetchFromGitHub { + owner = "PyCQA"; + repo = pname; + rev = version; + sha256 = "1h0k8lpx14svc8dini62j0kqiam10pck5sdzvxa4xhsx7y689g5l"; }; propagatedBuildInputs = [ snowballstemmer six ] ++ lib.optional (!isPy3k) configparser; checkInputs = [ pytest pytestpep8 mock pathlib ]; + checkPhase = '' + # test_integration.py installs packages via pip + py.test --pep8 --cache-clear -vv src/tests -k "not test_integration" + ''; + meta = with lib; { description = "Python docstring style checker"; homepage = https://github.com/PyCQA/pydocstyle/; From d90fa004b47c4da3e7e89f1f3040e61822ea59b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 1 Mar 2018 11:15:50 +0100 Subject: [PATCH 128/814] pythonPackages.pydocstyle: depend on pathlib for python<3.4 only --- pkgs/development/python-modules/pydocstyle/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pydocstyle/default.nix b/pkgs/development/python-modules/pydocstyle/default.nix index e6adb32a3116..a2f2daa2fe9c 100644 --- a/pkgs/development/python-modules/pydocstyle/default.nix +++ b/pkgs/development/python-modules/pydocstyle/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchFromGitHub, isPy3k +{ lib, buildPythonPackage, fetchFromGitHub, isPy3k, pythonOlder , snowballstemmer, six, configparser , pytest, pytestpep8, mock, pathlib }: @@ -17,7 +17,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ snowballstemmer six ] ++ lib.optional (!isPy3k) configparser; - checkInputs = [ pytest pytestpep8 mock pathlib ]; + checkInputs = [ pytest pytestpep8 mock ] ++ lib.optional (pythonOlder "3.4") pathlib; checkPhase = '' # test_integration.py installs packages via pip From 5f5c41dadcbfe1655448c2000a72e86fdc721250 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 1 Mar 2018 11:44:07 +0100 Subject: [PATCH 129/814] pythonPackages.pylint: add mccabe to propagatedBuildInputs --- pkgs/development/python-modules/pylint/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/pylint/default.nix b/pkgs/development/python-modules/pylint/default.nix index 194d91341d8a..c38b71c7f47c 100644 --- a/pkgs/development/python-modules/pylint/default.nix +++ b/pkgs/development/python-modules/pylint/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { buildInputs = [ pytest pytestrunner mccabe configparser backports_functools_lru_cache ]; - propagatedBuildInputs = [ astroid configparser isort ]; + propagatedBuildInputs = [ astroid configparser isort mccabe ]; postPatch = '' # Remove broken darwin tests From 2937f81e61b9ae170ad1647d417553603391401e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 1 Mar 2018 12:03:48 +0100 Subject: [PATCH 130/814] pythonPackages.pylama: init at 7.4.3 --- .../python-modules/pylama/default.nix | 33 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 35 insertions(+) create mode 100644 pkgs/development/python-modules/pylama/default.nix diff --git a/pkgs/development/python-modules/pylama/default.nix b/pkgs/development/python-modules/pylama/default.nix new file mode 100644 index 000000000000..c4ef98b43ef6 --- /dev/null +++ b/pkgs/development/python-modules/pylama/default.nix @@ -0,0 +1,33 @@ +{ lib, buildPythonPackage, fetchPypi, fetchpatch +, mccabe, pycodestyle, pydocstyle, pyflakes +, pytest, ipdb }: + +buildPythonPackage rec { + pname = "pylama"; + version = "7.4.3"; + + src = fetchPypi { + inherit pname version; + sha256 = "390c1dab1daebdf3d6acc923e551b035c3faa77d8b96b98530c230493f9ec712"; + }; + + patches = fetchpatch { + url = "${meta.homepage}/pull/116.patch"; + sha256 = "00jz5k2w0xahs1m3s603j6l4cwzz92qsbbk81fh17nq0f47999mv"; + }; + + propagatedBuildInputs = [ mccabe pycodestyle pydocstyle pyflakes ]; + + checkInputs = [ pytest ipdb ]; + + # tries to mess with the file system + doCheck = false; + + meta = with lib; { + description = "Code audit tool for python"; + homepage = https://github.com/klen/pylama; + # ambiguous license declarations: https://github.com/klen/pylama/issues/64 + license = licenses.lgpl3; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 32dbef223066..13d380fd0a62 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6024,6 +6024,8 @@ in { pyhomematic = callPackage ../development/python-modules/pyhomematic { }; + pylama = callPackage ../development/python-modules/pylama { }; + pyphen = callPackage ../development/python-modules/pyphen {}; pypoppler = buildPythonPackage rec { From 455dbc4668b9cfbba5e08b2a3bfbff0841ac7edc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 1 Mar 2018 12:08:13 +0100 Subject: [PATCH 131/814] pythonPackages.flake8-import-order: init at 0.17 --- .../flake8-import-order/default.nix | 25 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/development/python-modules/flake8-import-order/default.nix diff --git a/pkgs/development/python-modules/flake8-import-order/default.nix b/pkgs/development/python-modules/flake8-import-order/default.nix new file mode 100644 index 000000000000..128a8d18d819 --- /dev/null +++ b/pkgs/development/python-modules/flake8-import-order/default.nix @@ -0,0 +1,25 @@ +{ lib, buildPythonPackage, fetchPypi, isPy3k, enum34, pycodestyle, pytest, flake8, pylama }: + +buildPythonPackage rec { + pname = "flake8-import-order"; + version = "0.17"; + + src = fetchPypi { + inherit pname version; + sha256 = "60ea6674c77e4d916071beabf2b31b9b45e2f5b3bbda48a34db65766a5b25678"; + }; + + propagatedBuildInputs = [ pycodestyle ] ++ lib.optional (!isPy3k) enum34; + + checkInputs = [ pytest flake8 pycodestyle pylama ]; + + checkPhase = '' + pytest --strict + ''; + + meta = with lib; { + description = "Flake8 and pylama plugin that checks the ordering of import statements"; + homepage = https://github.com/PyCQA/flake8-import-order; + license = with licenses; [ lgpl3 mit ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 13d380fd0a62..3e6f4fcdafc8 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7577,6 +7577,8 @@ in { flake8-future-import = callPackage ../development/python-modules/flake8-future-import { }; + flake8-import-order = callPackage ../development/python-modules/flake8-import-order { }; + flaky = buildPythonPackage rec { name = "flaky-${version}"; version = "3.1.0"; From a69dd6d03fb3824c57c02e1160021211b000af1e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 1 Mar 2018 12:10:19 +0100 Subject: [PATCH 132/814] esptool: 2.1 -> 2.3.1 --- pkgs/tools/misc/esptool/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/esptool/default.nix b/pkgs/tools/misc/esptool/default.nix index 33624302ebcc..30fb96d7beb1 100644 --- a/pkgs/tools/misc/esptool/default.nix +++ b/pkgs/tools/misc/esptool/default.nix @@ -2,16 +2,16 @@ python3.pkgs.buildPythonApplication rec { name = "esptool-${version}"; - version = "2.1"; + version = "2.3.1"; src = fetchFromGitHub { owner = "espressif"; repo = "esptool"; rev = "v${version}"; - sha256 = "137p0kcscly95qpjzgx1yxm8k2wf5y9v3srvlhp2ajniirgv8ijv"; + sha256 = "0gwnl6z5s2ax07l3n38h9hdyz71pn8lzn4fybcwyrii0bj2kapvc"; }; - buildInputs = with python3.pkgs; [ flake8 flake8-future-import ]; + checkInputs = with python3.pkgs; [ flake8 flake8-future-import flake8-import-order ]; propagatedBuildInputs = with python3.pkgs; [ pyserial pyaes ecdsa openssl ]; meta = with stdenv.lib; { From 51f6a946759a3a59587c8517fbd99e9b4bf44fb2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 1 Mar 2018 12:18:14 +0100 Subject: [PATCH 133/814] esptool: add dotlambda as maintainer --- pkgs/tools/misc/esptool/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/misc/esptool/default.nix b/pkgs/tools/misc/esptool/default.nix index 30fb96d7beb1..1d7c47c2c9ab 100644 --- a/pkgs/tools/misc/esptool/default.nix +++ b/pkgs/tools/misc/esptool/default.nix @@ -18,7 +18,7 @@ python3.pkgs.buildPythonApplication rec { description = "ESP8266 and ESP32 serial bootloader utility"; homepage = https://github.com/espressif/esptool; license = licenses.gpl2; - maintainers = [ maintainers.dezgeg ]; + maintainers = with maintainers; [ dezgeg dotlambda ]; platforms = platforms.linux; }; } From 504bf92ee20c1ab3fa5ced2a10fea19ccb115892 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 27 Feb 2018 08:38:19 +0000 Subject: [PATCH 134/814] ocaml: 4.06.0 -> 4.06.1 --- pkgs/development/compilers/ocaml/4.06.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/ocaml/4.06.nix b/pkgs/development/compilers/ocaml/4.06.nix index b913d169e97a..b54b8a6288fe 100644 --- a/pkgs/development/compilers/ocaml/4.06.nix +++ b/pkgs/development/compilers/ocaml/4.06.nix @@ -1,8 +1,8 @@ import ./generic.nix { major_version = "4"; minor_version = "06"; - patch_version = "0"; - sha256 = "1dy542yfnnw10zvh5s9qzswliq11mg7l0bcyss3501qw3vwvadhj"; + patch_version = "1"; + sha256 = "1n3pygfssd6nkrq876wszm5nm3v4605q4k16a66h1nmq9wvf01vg"; # If the executable is stipped it does not work dontStrip = true; From 452f9ca8eff7ab8d55998b005caf2f22e39d9abc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Maximilian=20G=C3=BCntner?= Date: Sat, 24 Feb 2018 23:57:30 +0100 Subject: [PATCH 135/814] geckodriver: use devel version with slog fix fixes #35301 --- pkgs/development/tools/geckodriver/default.nix | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/pkgs/development/tools/geckodriver/default.nix b/pkgs/development/tools/geckodriver/default.nix index 8f6e0dde5899..9bc760bf1126 100644 --- a/pkgs/development/tools/geckodriver/default.nix +++ b/pkgs/development/tools/geckodriver/default.nix @@ -1,20 +1,24 @@ { lib -, fetchurl +, fetchFromGitHub , rustPlatform }: with rustPlatform; buildRustPackage rec { - version = "0.19.1"; + version = "unstable-2018-02-24"; name = "geckodriver-${version}"; - src = fetchurl { - url = "https://github.com/mozilla/geckodriver/archive/v${version}.tar.gz"; - sha256 = "04zpv4aiwbig466yj24hhazl5hrapkyvwlhvg0za5599ykzdv47m"; + src = fetchFromGitHub { + owner = "mozilla"; + repo = "gecko-dev"; + rev = "ecb86060b4c5a9808798b81a57e79e821bb47082"; + sha256 = "1am84a60adw0bb12rlhdqbiwyywhza4qp5sf4f4fmssjl2qcr6nl"; }; - cargoSha256 = "1cny8caqcd9p98hra1k7y4d3lb8sxsyaplr0svbwam0d2qc1c257"; + sourceRoot = "${src.name}/testing/geckodriver"; + + cargoSha256 = "0dvcvdb623jla29i93glx20nf8pbpfw6jj548ii6brzkcpafxxm8"; meta = with lib; { description = "Proxy for using W3C WebDriver-compatible clients to interact with Gecko-based browsers"; From 6b05a22a5719a6d04e1ccb890901435f440f99e5 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Thu, 1 Mar 2018 15:16:15 +0100 Subject: [PATCH 136/814] mysql57: fix build with gcc7 fixes #35692 --- pkgs/servers/sql/mysql/5.7.x.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/servers/sql/mysql/5.7.x.nix b/pkgs/servers/sql/mysql/5.7.x.nix index 0b2778218760..0c04f910e5bb 100644 --- a/pkgs/servers/sql/mysql/5.7.x.nix +++ b/pkgs/servers/sql/mysql/5.7.x.nix @@ -49,6 +49,7 @@ self = stdenv.mkDerivation rec { "-DINSTALL_SHAREDIR=share/mysql" ]; + CXXFLAGS = "-fpermissive"; NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isLinux "-lgcc_s"; prePatch = '' From 55e6c81a264435aceaa286d63c8bec6039a16d07 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Wed, 28 Feb 2018 11:20:52 -0300 Subject: [PATCH 137/814] mpc-qt: init at 17.11 --- pkgs/applications/video/mpc-qt/default.nix | 27 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 29 insertions(+) create mode 100644 pkgs/applications/video/mpc-qt/default.nix diff --git a/pkgs/applications/video/mpc-qt/default.nix b/pkgs/applications/video/mpc-qt/default.nix new file mode 100644 index 000000000000..80ca213c06c1 --- /dev/null +++ b/pkgs/applications/video/mpc-qt/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchFromGitHub, pkgconfig, qmake, qtx11extras, qttools, mpv }: + +stdenv.mkDerivation rec { + name = "mpc-qt-${version}"; + version = "17.11"; + + src = fetchFromGitHub { + owner = "cmdrkotori"; + repo = "mpc-qt"; + rev = "v${version}"; + sha256 = "1vi4zsmbzxj6ms8wls9zv15vrskdrhgnj6l41m1fk4scs4jzvbkm"; + }; + + nativeBuildInputs = [ pkgconfig qmake qttools ]; + + buildInputs = [ mpv qtx11extras ]; + + qmakeFlags = [ "QMAKE_LUPDATE=${qttools.dev}/bin/lupdate" ]; + + meta = with stdenv.lib; { + description = "Media Player Classic Qute Theater"; + homepage = https://github.com/cmdrkotori/mpc-qt; + license = licenses.gpl2; + platforms = platforms.unix; + maintainers = with maintainers; [ romildo ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index afb55d874403..64d2aa8e7dc8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16537,6 +16537,8 @@ with pkgs; mm = callPackage ../applications/networking/instant-messengers/mm { }; + mpc-qt = libsForQt5.callPackage ../applications/video/mpc-qt { }; + mplayer = callPackage ../applications/video/mplayer ({ pulseSupport = config.pulseaudio or false; libdvdnav = libdvdnav_4_2_1; From 7620b004810ffff06951a9e05dd8a475fd5a4e66 Mon Sep 17 00:00:00 2001 From: Ryan Mulligan Date: Tue, 27 Feb 2018 16:49:17 -0800 Subject: [PATCH 138/814] stfl: 0.22 -> 0.24 Semi-automatic update. These checks were performed: - built on NixOS - found 0.24 with grep in /nix/store/9xdm9pfw8ckr8n58f2n2pz7vpz54wj72-stfl-0.24 - found 0.24 in filename of file in /nix/store/9xdm9pfw8ckr8n58f2n2pz7vpz54wj72-stfl-0.24 cc "@lovek323" --- pkgs/development/libraries/stfl/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/stfl/default.nix b/pkgs/development/libraries/stfl/default.nix index 8a8680a498a0..fd9ab5a2036d 100644 --- a/pkgs/development/libraries/stfl/default.nix +++ b/pkgs/development/libraries/stfl/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, ncurses, libiconv }: stdenv.mkDerivation rec { - name = "stfl-0.22"; + name = "stfl-0.24"; src = fetchurl { url = "http://www.clifford.at/stfl/${name}.tar.gz"; - sha256 = "062lqlf3qhp8bcapbpc0k3wym7x6ngncql8jmx5x06p6679szp9d"; + sha256 = "1460d5lc780p3q38l3wc9jfr2a7zlyrcra0li65aynj738cam9yl"; }; buildInputs = [ ncurses libiconv ]; @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { DESTDIR=$out prefix=\"\" make install # some programs rely on libstfl.so.0 to be present, so link it - ln -s $out/lib/libstfl.so.0.22 $out/lib/libstfl.so.0 + ln -s $out/lib/libstfl.so.0.24 $out/lib/libstfl.so.0 ''; meta = { From ede5d948c642e8a67868362a354de6ff1cae58b3 Mon Sep 17 00:00:00 2001 From: Ryan Mulligan Date: Tue, 27 Feb 2018 16:10:45 -0800 Subject: [PATCH 139/814] skrooge: 2.10.5 -> 2.11.0 Semi-automatic update. These checks were performed: - built on NixOS - ran `/nix/store/a0n4s1xpwchl3d7d3pk50bd1pf2acldp-skrooge-2.11.0/bin/skroogeconvert -h` got 0 exit code - ran `/nix/store/a0n4s1xpwchl3d7d3pk50bd1pf2acldp-skrooge-2.11.0/bin/skroogeconvert --help` got 0 exit code - ran `/nix/store/a0n4s1xpwchl3d7d3pk50bd1pf2acldp-skrooge-2.11.0/bin/skroogeconvert -v` and found version 2.11.0 - ran `/nix/store/a0n4s1xpwchl3d7d3pk50bd1pf2acldp-skrooge-2.11.0/bin/skroogeconvert --version` and found version 2.11.0 - ran `/nix/store/a0n4s1xpwchl3d7d3pk50bd1pf2acldp-skrooge-2.11.0/bin/skroogeconvert -h` and found version 2.11.0 - ran `/nix/store/a0n4s1xpwchl3d7d3pk50bd1pf2acldp-skrooge-2.11.0/bin/skroogeconvert --help` and found version 2.11.0 - found 2.11.0 with grep in /nix/store/a0n4s1xpwchl3d7d3pk50bd1pf2acldp-skrooge-2.11.0 cc "@joko" --- pkgs/applications/office/skrooge/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/office/skrooge/default.nix b/pkgs/applications/office/skrooge/default.nix index 0e0cb2ecf1d2..de9bfe64e5cc 100644 --- a/pkgs/applications/office/skrooge/default.nix +++ b/pkgs/applications/office/skrooge/default.nix @@ -7,11 +7,11 @@ mkDerivation rec { name = "skrooge-${version}"; - version = "2.10.5"; + version = "2.11.0"; src = fetchurl { url = "http://download.kde.org/stable/skrooge/${name}.tar.xz"; - sha256 = "1c1yihypb6qgbzfcrw4ylqr9zivyba10xzvibrmfkrilxi6i582n"; + sha256 = "11ns0j3ss09aqd8snfzd52xf0cgsjjcgzalb031p7v17rn14yqaq"; }; nativeBuildInputs = [ From 5e5e38f564b8caedc3abf7285c6d66d88b7b1586 Mon Sep 17 00:00:00 2001 From: Ryan Mulligan Date: Tue, 27 Feb 2018 15:45:28 -0800 Subject: [PATCH 140/814] scanbd: 1.4.4 -> 1.5.1 Semi-automatic update. These checks were performed: - built on NixOS - found 1.5.1 with grep in /nix/store/liydcxfgnz54imzgmgkzbc2g6k0awxkm-scanbd-1.5.1 - found 1.5.1 in filename of file in /nix/store/liydcxfgnz54imzgmgkzbc2g6k0awxkm-scanbd-1.5.1 --- pkgs/tools/graphics/scanbd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/graphics/scanbd/default.nix b/pkgs/tools/graphics/scanbd/default.nix index ba376af1c3cd..402628f0fc8f 100644 --- a/pkgs/tools/graphics/scanbd/default.nix +++ b/pkgs/tools/graphics/scanbd/default.nix @@ -3,10 +3,10 @@ stdenv.mkDerivation rec { name = "scanbd-${version}"; - version = "1.4.4"; + version = "1.5.1"; src = fetchurl { - sha256 = "07a59jk9b2hh49v5lcpckp64f5lny9sq8h0h2p2jcs9cqazf6q9s"; + sha256 = "0pvy4qirfjdfm8aj6x5rkbgl7hk3jfa2s21qkk8ic5dqfjjab75n"; url = "mirror://sourceforge/scanbd/${name}.tgz"; }; From 8a10de3749cedc960dee9cdba088193f70f7e771 Mon Sep 17 00:00:00 2001 From: Ryan Mulligan Date: Tue, 27 Feb 2018 15:39:27 -0800 Subject: [PATCH 141/814] s3cmd: 1.6.1 -> 2.0.1 Semi-automatic update. These checks were performed: - built on NixOS - ran `/nix/store/pfd3ki3ylyx10vjkg99wjzhjs004iwb9-s3cmd-2.0.1/bin/.s3cmd-wrapped -h` got 0 exit code - ran `/nix/store/pfd3ki3ylyx10vjkg99wjzhjs004iwb9-s3cmd-2.0.1/bin/.s3cmd-wrapped --help` got 0 exit code - ran `/nix/store/pfd3ki3ylyx10vjkg99wjzhjs004iwb9-s3cmd-2.0.1/bin/.s3cmd-wrapped --version` and found version 2.0.1 - ran `/nix/store/pfd3ki3ylyx10vjkg99wjzhjs004iwb9-s3cmd-2.0.1/bin/.s3cmd-wrapped -h` and found version 2.0.1 - ran `/nix/store/pfd3ki3ylyx10vjkg99wjzhjs004iwb9-s3cmd-2.0.1/bin/.s3cmd-wrapped --help` and found version 2.0.1 - ran `/nix/store/pfd3ki3ylyx10vjkg99wjzhjs004iwb9-s3cmd-2.0.1/bin/s3cmd -h` got 0 exit code - ran `/nix/store/pfd3ki3ylyx10vjkg99wjzhjs004iwb9-s3cmd-2.0.1/bin/s3cmd --help` got 0 exit code - ran `/nix/store/pfd3ki3ylyx10vjkg99wjzhjs004iwb9-s3cmd-2.0.1/bin/s3cmd --version` and found version 2.0.1 - ran `/nix/store/pfd3ki3ylyx10vjkg99wjzhjs004iwb9-s3cmd-2.0.1/bin/s3cmd -h` and found version 2.0.1 - ran `/nix/store/pfd3ki3ylyx10vjkg99wjzhjs004iwb9-s3cmd-2.0.1/bin/s3cmd --help` and found version 2.0.1 - found 2.0.1 with grep in /nix/store/pfd3ki3ylyx10vjkg99wjzhjs004iwb9-s3cmd-2.0.1 - found 2.0.1 in filename of file in /nix/store/pfd3ki3ylyx10vjkg99wjzhjs004iwb9-s3cmd-2.0.1 cc "@spwhitt" --- pkgs/tools/networking/s3cmd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/s3cmd/default.nix b/pkgs/tools/networking/s3cmd/default.nix index 887cd09b6eb3..c3d60d8e87b9 100644 --- a/pkgs/tools/networking/s3cmd/default.nix +++ b/pkgs/tools/networking/s3cmd/default.nix @@ -2,13 +2,13 @@ python2Packages.buildPythonApplication rec { name = "s3cmd-${version}"; - version = "1.6.1"; + version = "2.0.1"; src = fetchFromGitHub { owner = "s3tools"; repo = "s3cmd"; rev = "v${version}"; - sha256 = "0aan6v1qj0pdkddhhkbaky44d54irm1pa8mkn52i2j86nb2rkcf9"; + sha256 = "198hzzplci57sb8hdan30nbakslawmijfw0j71wjvq85n3xn6qsl"; }; propagatedBuildInputs = with python2Packages; [ python_magic dateutil ]; From c24c0d560d252036e351900861d1aed050341ea1 Mon Sep 17 00:00:00 2001 From: Timofei Kushnir Date: Wed, 28 Feb 2018 10:07:54 +0300 Subject: [PATCH 142/814] ccache: 3.3.5 -> 3.4 --- .../development/tools/misc/ccache/default.nix | 13 ++++-- .../ccache/fix-debug-prefix-map-suite.patch | 42 +++++++++++++++++++ .../misc/ccache/skip-fs-dependent-test.patch | 6 +-- 3 files changed, 54 insertions(+), 7 deletions(-) create mode 100644 pkgs/development/tools/misc/ccache/fix-debug-prefix-map-suite.patch diff --git a/pkgs/development/tools/misc/ccache/default.nix b/pkgs/development/tools/misc/ccache/default.nix index ff4ad83b642c..9d44e0b707ba 100644 --- a/pkgs/development/tools/misc/ccache/default.nix +++ b/pkgs/development/tools/misc/ccache/default.nix @@ -1,18 +1,23 @@ -{ stdenv, fetchurl, fetchpatch, runCommand, zlib, makeWrapper }: +{ stdenv, fetchurl, fetchpatch, runCommand, perl, gcc, zlib, makeWrapper }: let ccache = stdenv.mkDerivation rec { name = "ccache-${version}"; - version = "3.3.5"; + version = "3.4"; src = fetchurl { - sha256 = "1iih5d171rq29366c1z90dri2h8173yyc8rm2740wxiqx6k7c18r"; + sha256 = "0sfisvjs2iham29flxgmnfg7kzqz66bhk6q0qcwbdv1n569say5j"; url = "mirror://samba/ccache/${name}.tar.xz"; }; + nativeBuildInputs = [ perl gcc ]; + buildInputs = [ zlib ]; # non to be fail on filesystems with unconventional blocksizes (zfs on Hydra?) - patches = [ ./skip-fs-dependent-test.patch ]; + patches = [ + ./fix-debug-prefix-map-suite.patch + ./skip-fs-dependent-test.patch + ]; postPatch = '' substituteInPlace Makefile.in --replace 'objs) $(extra_libs)' 'objs)' diff --git a/pkgs/development/tools/misc/ccache/fix-debug-prefix-map-suite.patch b/pkgs/development/tools/misc/ccache/fix-debug-prefix-map-suite.patch new file mode 100644 index 000000000000..98a6fbf10bf1 --- /dev/null +++ b/pkgs/development/tools/misc/ccache/fix-debug-prefix-map-suite.patch @@ -0,0 +1,42 @@ +--- a/test/suites/debug_prefix_map.bash ++++ b/test/suites/debug_prefix_map.bash +@@ -29,7 +29,7 @@ + expect_stat 'cache hit (preprocessed)' 0 + expect_stat 'cache miss' 1 + expect_stat 'files in cache' 2 +- if grep -E "[^=]`pwd`[^=]" test.o >/dev/null 2>&1; then ++ if objdump -g test.o | grep ": `pwd`$" >/dev/null 2>&1; then + test_failed "Source dir (`pwd`) found in test.o" + fi + +@@ -39,7 +39,7 @@ + expect_stat 'cache hit (preprocessed)' 0 + expect_stat 'cache miss' 1 + expect_stat 'files in cache' 2 +- if grep -E "[^=]`pwd`[^=]" test.o >/dev/null 2>&1; then ++ if objdump -g test.o | grep ": `pwd`$" >/dev/null 2>&1; then + test_failed "Source dir (`pwd`) found in test.o" + fi + +@@ -52,10 +52,10 @@ + expect_stat 'cache hit (preprocessed)' 0 + expect_stat 'cache miss' 1 + expect_stat 'files in cache' 2 +- if grep -E "[^=]`pwd`[^=]" test.o >/dev/null 2>&1; then ++ if objdump -g test.o | grep ": `pwd`$" >/dev/null 2>&1; then + test_failed "Source dir (`pwd`) found in test.o" + fi +- if ! grep "name" test.o >/dev/null 2>&1; then ++ if ! objdump -g test.o | grep ": name$" >/dev/null 2>&1; then + test_failed "Relocation (name) not found in test.o" + fi + +@@ -65,7 +65,7 @@ + expect_stat 'cache hit (preprocessed)' 0 + expect_stat 'cache miss' 1 + expect_stat 'files in cache' 2 +- if grep -E "[^=]`pwd`[^=]" test.o >/dev/null 2>&1; then ++ if objdump -g test.o | grep ": `pwd`$" >/dev/null 2>&1; then + test_failed "Source dir (`pwd`) found in test.o" + fi + } diff --git a/pkgs/development/tools/misc/ccache/skip-fs-dependent-test.patch b/pkgs/development/tools/misc/ccache/skip-fs-dependent-test.patch index 3bc3a95e4204..7b233df6531b 100644 --- a/pkgs/development/tools/misc/ccache/skip-fs-dependent-test.patch +++ b/pkgs/development/tools/misc/ccache/skip-fs-dependent-test.patch @@ -1,6 +1,6 @@ ---- a/test.sh -+++ b/test.sh -@@ -2669,23 +2669,6 @@ SUITE_cleanup() { +--- a/test/suites/cleanup.bash ++++ b/test/suites/cleanup.bash +@@ -94,23 +94,6 @@ $CCACHE -F 0 -M 256K >/dev/null CCACHE_LOGFILE=/tmp/foo $CCACHE -c >/dev/null From 15893aab4795d44976151e30459da1e3f7f77de2 Mon Sep 17 00:00:00 2001 From: Timofei Kushnir Date: Wed, 28 Feb 2018 16:51:05 +0300 Subject: [PATCH 143/814] Follow-ups to contributors' comments - `gcc` was removed from `nativeBuildInputs` - ccache version updated to 3.4.1 - added `man` subpackage --- pkgs/development/tools/misc/ccache/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/misc/ccache/default.nix b/pkgs/development/tools/misc/ccache/default.nix index 9d44e0b707ba..34d1d8a829b1 100644 --- a/pkgs/development/tools/misc/ccache/default.nix +++ b/pkgs/development/tools/misc/ccache/default.nix @@ -1,18 +1,20 @@ -{ stdenv, fetchurl, fetchpatch, runCommand, perl, gcc, zlib, makeWrapper }: +{ stdenv, fetchurl, fetchpatch, runCommand, perl, zlib, makeWrapper }: let ccache = stdenv.mkDerivation rec { name = "ccache-${version}"; - version = "3.4"; + version = "3.4.1"; src = fetchurl { - sha256 = "0sfisvjs2iham29flxgmnfg7kzqz66bhk6q0qcwbdv1n569say5j"; + sha256 = "1pppi4jbkkj641cdynmc35jaj40jjicw7gj75ran5qs5886jcblc"; url = "mirror://samba/ccache/${name}.tar.xz"; }; - nativeBuildInputs = [ perl gcc ]; + nativeBuildInputs = [ perl ]; buildInputs = [ zlib ]; + outputs = [ "out" "man" ]; + # non to be fail on filesystems with unconventional blocksizes (zfs on Hydra?) patches = [ ./fix-debug-prefix-map-suite.patch From a09341be65c80622ccda582b5286f6e651a9ef78 Mon Sep 17 00:00:00 2001 From: Ryan Mulligan Date: Tue, 27 Feb 2018 15:33:31 -0800 Subject: [PATCH 144/814] rosegarden: 17.04 -> 17.12.1 Semi-automatic update. These checks were performed: - built on NixOS - ran `/nix/store/6q311ykga5a001jk8x80whj4cr3jp1y5-rosegarden-17.12.1/bin/rosegarden --version` and found version 17.12.1 - found 17.12.1 with grep in /nix/store/6q311ykga5a001jk8x80whj4cr3jp1y5-rosegarden-17.12.1 - found 17.12.1 in filename of file in /nix/store/6q311ykga5a001jk8x80whj4cr3jp1y5-rosegarden-17.12.1 cc "@lebastr" --- pkgs/applications/audio/rosegarden/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/rosegarden/default.nix b/pkgs/applications/audio/rosegarden/default.nix index 5966d4253f51..d881afa7f5f0 100644 --- a/pkgs/applications/audio/rosegarden/default.nix +++ b/pkgs/applications/audio/rosegarden/default.nix @@ -3,12 +3,12 @@ , liblo, liblrdf, libsamplerate, libsndfile, lirc ? null, qtbase }: stdenv.mkDerivation (rec { - version = "17.04"; + version = "17.12.1"; name = "rosegarden-${version}"; src = fetchurl { url = "mirror://sourceforge/rosegarden/${name}.tar.bz2"; - sha256 = "1khfcj22asdhjh0jvhkqsz200wgmigkhsrcz09ffia5hqm0n32lq"; + sha256 = "155kqbxg85wqv0w97cmmx8wq0r4xb3qpnk20lfma04vj8k6hc1mg"; }; patchPhase = '' From a4809a57e1f38e6a70d0dd32696a8f28b635246c Mon Sep 17 00:00:00 2001 From: Ryan Mulligan Date: Tue, 27 Feb 2018 15:20:10 -0800 Subject: [PATCH 145/814] root: 6.10.08 -> 6.12.06 Semi-automatic update. These checks were performed: - built on NixOS - ran `/nix/store/4gcl610xv4sj6vzwnksm825qp29f8ibx-root-6.12.06/bin/genreflex -h` got 0 exit code - ran `/nix/store/4gcl610xv4sj6vzwnksm825qp29f8ibx-root-6.12.06/bin/genreflex --help` got 0 exit code - ran `/nix/store/4gcl610xv4sj6vzwnksm825qp29f8ibx-root-6.12.06/bin/pq2 -h` got 0 exit code - ran `/nix/store/4gcl610xv4sj6vzwnksm825qp29f8ibx-root-6.12.06/bin/rootn.exe -h` got 0 exit code - ran `/nix/store/4gcl610xv4sj6vzwnksm825qp29f8ibx-root-6.12.06/bin/rootn.exe --help` got 0 exit code - ran `/nix/store/4gcl610xv4sj6vzwnksm825qp29f8ibx-root-6.12.06/bin/rootn.exe -h` and found version 6.12.06 - ran `/nix/store/4gcl610xv4sj6vzwnksm825qp29f8ibx-root-6.12.06/bin/rootn.exe --help` and found version 6.12.06 - ran `/nix/store/4gcl610xv4sj6vzwnksm825qp29f8ibx-root-6.12.06/bin/xpdtest -h` got 0 exit code - ran `/nix/store/4gcl610xv4sj6vzwnksm825qp29f8ibx-root-6.12.06/bin/xpdtest --help` got 0 exit code - ran `/nix/store/4gcl610xv4sj6vzwnksm825qp29f8ibx-root-6.12.06/bin/root.exe -h` got 0 exit code - ran `/nix/store/4gcl610xv4sj6vzwnksm825qp29f8ibx-root-6.12.06/bin/root.exe --help` got 0 exit code - ran `/nix/store/4gcl610xv4sj6vzwnksm825qp29f8ibx-root-6.12.06/bin/root.exe -h` and found version 6.12.06 - ran `/nix/store/4gcl610xv4sj6vzwnksm825qp29f8ibx-root-6.12.06/bin/root.exe --help` and found version 6.12.06 - ran `/nix/store/4gcl610xv4sj6vzwnksm825qp29f8ibx-root-6.12.06/bin/root-config --help` got 0 exit code - ran `/nix/store/4gcl610xv4sj6vzwnksm825qp29f8ibx-root-6.12.06/bin/root-config --version` and found version 6.12.06 - ran `/nix/store/4gcl610xv4sj6vzwnksm825qp29f8ibx-root-6.12.06/bin/prepareHistFactory -h` got 0 exit code - ran `/nix/store/4gcl610xv4sj6vzwnksm825qp29f8ibx-root-6.12.06/bin/prepareHistFactory --help` got 0 exit code - ran `/nix/store/4gcl610xv4sj6vzwnksm825qp29f8ibx-root-6.12.06/bin/prepareHistFactory help` got 0 exit code - ran `/nix/store/4gcl610xv4sj6vzwnksm825qp29f8ibx-root-6.12.06/bin/prepareHistFactory -V` and found version 6.12.06 - ran `/nix/store/4gcl610xv4sj6vzwnksm825qp29f8ibx-root-6.12.06/bin/prepareHistFactory -v` and found version 6.12.06 - ran `/nix/store/4gcl610xv4sj6vzwnksm825qp29f8ibx-root-6.12.06/bin/prepareHistFactory --version` and found version 6.12.06 - ran `/nix/store/4gcl610xv4sj6vzwnksm825qp29f8ibx-root-6.12.06/bin/prepareHistFactory version` and found version 6.12.06 - ran `/nix/store/4gcl610xv4sj6vzwnksm825qp29f8ibx-root-6.12.06/bin/prepareHistFactory -h` and found version 6.12.06 - ran `/nix/store/4gcl610xv4sj6vzwnksm825qp29f8ibx-root-6.12.06/bin/prepareHistFactory --help` and found version 6.12.06 - ran `/nix/store/4gcl610xv4sj6vzwnksm825qp29f8ibx-root-6.12.06/bin/prepareHistFactory help` and found version 6.12.06 - found 6.12.06 with grep in /nix/store/4gcl610xv4sj6vzwnksm825qp29f8ibx-root-6.12.06 cc "@veprbl" --- pkgs/applications/science/misc/root/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/misc/root/default.nix b/pkgs/applications/science/misc/root/default.nix index 676395d03d53..2899bee636eb 100644 --- a/pkgs/applications/science/misc/root/default.nix +++ b/pkgs/applications/science/misc/root/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "root-${version}"; - version = "6.10.08"; + version = "6.12.06"; src = fetchurl { url = "https://root.cern.ch/download/root_v${version}.source.tar.gz"; - sha256 = "12mddl6pqwwc9nr4jqzp6h1jm4zycazd3v88dz306m1nmk97dlic"; + sha256 = "1557b9sdragsx9i15qh6lq7fn056bgi87d31kxdl4vl0awigvp5f"; }; nativeBuildInputs = [ pkgconfig ]; From 52f0402a7b3faa031bfb547e3de3c3febf13d4de Mon Sep 17 00:00:00 2001 From: Ryan Mulligan Date: Tue, 27 Feb 2018 13:45:07 -0800 Subject: [PATCH 146/814] rocksndiamonds: 4.0.0.2 -> 4.0.1.1 Semi-automatic update. These checks were performed: - built on NixOS - ran `/nix/store/y37n0z2rpyhf1iv0m0a1n066wy5c87ik-rocksndiamonds-4.0.1.1/bin/rocksndiamonds -h` got 0 exit code - ran `/nix/store/y37n0z2rpyhf1iv0m0a1n066wy5c87ik-rocksndiamonds-4.0.1.1/bin/rocksndiamonds --help` got 0 exit code - ran `/nix/store/y37n0z2rpyhf1iv0m0a1n066wy5c87ik-rocksndiamonds-4.0.1.1/bin/rocksndiamonds -V` and found version 4.0.1.1 - ran `/nix/store/y37n0z2rpyhf1iv0m0a1n066wy5c87ik-rocksndiamonds-4.0.1.1/bin/rocksndiamonds --version` and found version 4.0.1.1 - found 4.0.1.1 with grep in /nix/store/y37n0z2rpyhf1iv0m0a1n066wy5c87ik-rocksndiamonds-4.0.1.1 cc "@orivej" --- pkgs/games/rocksndiamonds/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/rocksndiamonds/default.nix b/pkgs/games/rocksndiamonds/default.nix index caaedc44ee0c..d563a8265b5d 100644 --- a/pkgs/games/rocksndiamonds/default.nix +++ b/pkgs/games/rocksndiamonds/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "${project}-${version}"; project = "rocksndiamonds"; - version = "4.0.0.2"; + version = "4.0.1.1"; src = fetchurl { url = "https://www.artsoft.org/RELEASES/unix/${project}/${name}.tar.gz"; - sha256 = "0dzn6vlayvnkjm64zwva337rn07lc21kq93m2h8zz8j3wpl11pb4"; + sha256 = "0f2m29m53sngg2kv4km91nxbr53rzhchbpqx5dzrv3p5hq1hp936"; }; desktopItem = makeDesktopItem { From 1cddc1ecaf9f4db4f7d173f96332edff283e3118 Mon Sep 17 00:00:00 2001 From: Ryan Mulligan Date: Tue, 27 Feb 2018 13:10:44 -0800 Subject: [PATCH 147/814] remotebox: 2.2 -> 2.4 Semi-automatic update. These checks were performed: - built on NixOS - found 2.4 with grep in /nix/store/5p43l2r5y6m0sdpyxwcwiv381ycglami-remotebox-2.4 - found 2.4 in filename of file in /nix/store/5p43l2r5y6m0sdpyxwcwiv381ycglami-remotebox-2.4 --- pkgs/applications/virtualization/remotebox/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/remotebox/default.nix b/pkgs/applications/virtualization/remotebox/default.nix index cb84ad49aebd..40eadad68d09 100644 --- a/pkgs/applications/virtualization/remotebox/default.nix +++ b/pkgs/applications/virtualization/remotebox/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "remotebox-${version}"; - version = "2.2"; + version = "2.4"; src = fetchurl { url = "http://remotebox.knobgoblin.org.uk/downloads/RemoteBox-${version}.tar.bz2"; - sha256 = "0g7lx5zk9fk5k8alpag45z2zw9bnrlx1zfs63rc3ilfyvm4k4zc5"; + sha256 = "14zcpzpdb5gxkxvckcdwq3mfv8b18zirbdskzddhqxjddkzayckz"; }; buildInputs = with perlPackages; [ perl Glib Gtk2 Pango SOAPLite ]; From f41568614f71972f6890e986c36f7b6c9f970b30 Mon Sep 17 00:00:00 2001 From: Ryan Mulligan Date: Tue, 27 Feb 2018 13:09:58 -0800 Subject: [PATCH 148/814] reiser4progs: 1.1.0 -> 1.2.1 Semi-automatic update. These checks were performed: - built on NixOS - ran `/nix/store/frv798x9wv35ia6733bpwvq94w2mp9hm-reiser4progs-1.2.1/bin/debugfs.reiser4 -h` got 0 exit code - ran `/nix/store/frv798x9wv35ia6733bpwvq94w2mp9hm-reiser4progs-1.2.1/bin/debugfs.reiser4 --help` got 0 exit code - ran `/nix/store/frv798x9wv35ia6733bpwvq94w2mp9hm-reiser4progs-1.2.1/bin/debugfs.reiser4 -V` and found version 1.2.1 - ran `/nix/store/frv798x9wv35ia6733bpwvq94w2mp9hm-reiser4progs-1.2.1/bin/debugfs.reiser4 -v` and found version 1.2.1 - ran `/nix/store/frv798x9wv35ia6733bpwvq94w2mp9hm-reiser4progs-1.2.1/bin/debugfs.reiser4 --version` and found version 1.2.1 - ran `/nix/store/frv798x9wv35ia6733bpwvq94w2mp9hm-reiser4progs-1.2.1/bin/debugfs.reiser4 -h` and found version 1.2.1 - ran `/nix/store/frv798x9wv35ia6733bpwvq94w2mp9hm-reiser4progs-1.2.1/bin/debugfs.reiser4 --help` and found version 1.2.1 - ran `/nix/store/frv798x9wv35ia6733bpwvq94w2mp9hm-reiser4progs-1.2.1/bin/make_reiser4 -h` got 0 exit code - ran `/nix/store/frv798x9wv35ia6733bpwvq94w2mp9hm-reiser4progs-1.2.1/bin/make_reiser4 --help` got 0 exit code - ran `/nix/store/frv798x9wv35ia6733bpwvq94w2mp9hm-reiser4progs-1.2.1/bin/make_reiser4 -V` and found version 1.2.1 - ran `/nix/store/frv798x9wv35ia6733bpwvq94w2mp9hm-reiser4progs-1.2.1/bin/make_reiser4 -v` and found version 1.2.1 - ran `/nix/store/frv798x9wv35ia6733bpwvq94w2mp9hm-reiser4progs-1.2.1/bin/make_reiser4 --version` and found version 1.2.1 - ran `/nix/store/frv798x9wv35ia6733bpwvq94w2mp9hm-reiser4progs-1.2.1/bin/make_reiser4 -h` and found version 1.2.1 - ran `/nix/store/frv798x9wv35ia6733bpwvq94w2mp9hm-reiser4progs-1.2.1/bin/make_reiser4 --help` and found version 1.2.1 - ran `/nix/store/frv798x9wv35ia6733bpwvq94w2mp9hm-reiser4progs-1.2.1/bin/measurefs.reiser4 -h` got 0 exit code - ran `/nix/store/frv798x9wv35ia6733bpwvq94w2mp9hm-reiser4progs-1.2.1/bin/measurefs.reiser4 --help` got 0 exit code - ran `/nix/store/frv798x9wv35ia6733bpwvq94w2mp9hm-reiser4progs-1.2.1/bin/measurefs.reiser4 -V` and found version 1.2.1 - ran `/nix/store/frv798x9wv35ia6733bpwvq94w2mp9hm-reiser4progs-1.2.1/bin/measurefs.reiser4 -v` and found version 1.2.1 - ran `/nix/store/frv798x9wv35ia6733bpwvq94w2mp9hm-reiser4progs-1.2.1/bin/measurefs.reiser4 --version` and found version 1.2.1 - ran `/nix/store/frv798x9wv35ia6733bpwvq94w2mp9hm-reiser4progs-1.2.1/bin/measurefs.reiser4 -h` and found version 1.2.1 - ran `/nix/store/frv798x9wv35ia6733bpwvq94w2mp9hm-reiser4progs-1.2.1/bin/measurefs.reiser4 --help` and found version 1.2.1 - ran `/nix/store/frv798x9wv35ia6733bpwvq94w2mp9hm-reiser4progs-1.2.1/bin/mkfs.reiser4 -h` got 0 exit code - ran `/nix/store/frv798x9wv35ia6733bpwvq94w2mp9hm-reiser4progs-1.2.1/bin/mkfs.reiser4 --help` got 0 exit code - ran `/nix/store/frv798x9wv35ia6733bpwvq94w2mp9hm-reiser4progs-1.2.1/bin/mkfs.reiser4 -V` and found version 1.2.1 - ran `/nix/store/frv798x9wv35ia6733bpwvq94w2mp9hm-reiser4progs-1.2.1/bin/mkfs.reiser4 -v` and found version 1.2.1 - ran `/nix/store/frv798x9wv35ia6733bpwvq94w2mp9hm-reiser4progs-1.2.1/bin/mkfs.reiser4 --version` and found version 1.2.1 - ran `/nix/store/frv798x9wv35ia6733bpwvq94w2mp9hm-reiser4progs-1.2.1/bin/mkfs.reiser4 -h` and found version 1.2.1 - ran `/nix/store/frv798x9wv35ia6733bpwvq94w2mp9hm-reiser4progs-1.2.1/bin/mkfs.reiser4 --help` and found version 1.2.1 - found 1.2.1 with grep in /nix/store/frv798x9wv35ia6733bpwvq94w2mp9hm-reiser4progs-1.2.1 - found 1.2.1 in filename of file in /nix/store/frv798x9wv35ia6733bpwvq94w2mp9hm-reiser4progs-1.2.1 --- pkgs/tools/filesystems/reiser4progs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/filesystems/reiser4progs/default.nix b/pkgs/tools/filesystems/reiser4progs/default.nix index 681fc1c80ef0..59d8e8aa4389 100644 --- a/pkgs/tools/filesystems/reiser4progs/default.nix +++ b/pkgs/tools/filesystems/reiser4progs/default.nix @@ -1,12 +1,12 @@ {stdenv, fetchurl, libaal}: -let version = "1.1.0"; in +let version = "1.2.1"; in stdenv.mkDerivation rec { name = "reiser4progs-${version}"; src = fetchurl { url = "mirror://sourceforge/reiser4/reiser4-utils/${name}.tar.gz"; - sha256 = "18bgv0wd75q53642x5dsk4g0mil1hw1zrp7a4xkb0pxx4bzjlbqg"; + sha256 = "03vdqvpyd48wxrpqpb9kg76giaffw9b8k334kr4wc0zxgybknhl7"; }; buildInputs = [libaal]; From 62f80e5203655a4729bfb541d899888cf09cc741 Mon Sep 17 00:00:00 2001 From: Ryan Mulligan Date: Tue, 27 Feb 2018 13:02:01 -0800 Subject: [PATCH 149/814] radarr: 0.2.0.910 -> 0.2.0.980 Semi-automatic update. These checks were performed: - built on NixOS - found 0.2.0.980 with grep in /nix/store/cwvhpmnp8kiham83ap9hflk8bj12zjzv-radarr-0.2.0.980 - found 0.2.0.980 in filename of file in /nix/store/cwvhpmnp8kiham83ap9hflk8bj12zjzv-radarr-0.2.0.980 cc "@edwtjo" --- pkgs/servers/radarr/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/radarr/default.nix b/pkgs/servers/radarr/default.nix index 3eba04f44fba..dc3bc22af49c 100644 --- a/pkgs/servers/radarr/default.nix +++ b/pkgs/servers/radarr/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "radarr-${version}"; - version = "0.2.0.910"; + version = "0.2.0.980"; src = fetchurl { url = "https://github.com/Radarr/Radarr/releases/download/v${version}/Radarr.develop.${version}.linux.tar.gz"; - sha256 = "0c4msk6hvlqyy81xkjhsvsy4igpc01s4a00zwhqnds2gj4y9yplk"; + sha256 = "1939mmlp9hsmw0hd4c8m8p5fk6igvml30gk9ffi9mfhankas6fnf"; }; buildInputs = [ makeWrapper ]; From da134f8a8a99b699f6cab7707330e9388e1bc53b Mon Sep 17 00:00:00 2001 From: Roel van Dijk Date: Thu, 1 Mar 2018 15:45:15 +0100 Subject: [PATCH 150/814] opencv: flag to enable tbb enableTbb makes opencv use the "threading building blocks" library as the parallel framework --- pkgs/development/libraries/opencv/3.x.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/libraries/opencv/3.x.nix b/pkgs/development/libraries/opencv/3.x.nix index ff3ac3b03635..3f36cca209f8 100644 --- a/pkgs/development/libraries/opencv/3.x.nix +++ b/pkgs/development/libraries/opencv/3.x.nix @@ -25,6 +25,7 @@ , enableFfmpeg ? false, ffmpeg , enableGStreamer ? false, gst_all_1 , enableTesseract ? false, tesseract, leptonica +, enableTbb ? false, tbb , enableOvis ? false, ogre , enableGPhoto2 ? false, libgphoto2 , enableDC1394 ? false, libdc1394 @@ -211,6 +212,7 @@ stdenv.mkDerivation rec { # simply enabled automatically if contrib is built, and it detects # tesseract & leptonica. ++ lib.optionals enableTesseract [ tesseract leptonica ] + ++ lib.optional enableTbb tbb ++ lib.optional enableCuda cudatoolkit ++ lib.optionals stdenv.isDarwin [ AVFoundation Cocoa QTKit VideoDecodeAcceleration bzip2 ] ++ lib.optionals enableDocs [ doxygen graphviz-nox ]; @@ -240,6 +242,7 @@ stdenv.mkDerivation rec { (opencvFlag "OPENEXR" enableEXR) (opencvFlag "CUDA" enableCuda) (opencvFlag "CUBLAS" enableCuda) + (opencvFlag "TBB" enableTbb) ] ++ lib.optionals enableCuda [ "-DCUDA_FAST_MATH=ON" "-DCUDA_HOST_COMPILER=${cudatoolkit.cc}/bin/cc" From 09c5762469469358191a149521e6d3c2d3c65bc2 Mon Sep 17 00:00:00 2001 From: Ryan Mulligan Date: Tue, 27 Feb 2018 12:59:54 -0800 Subject: [PATCH 151/814] rabbitvcs: 0.16 -> 0.17.1 Semi-automatic update. These checks were performed: - built on NixOS - found 0.17.1 with grep in /nix/store/9ywl856gxvav8j93ggk0jy4isclimhk3-rabbitvcs-0.17.1 - found 0.17.1 in filename of file in /nix/store/9ywl856gxvav8j93ggk0jy4isclimhk3-rabbitvcs-0.17.1 cc "@mathnerd314" --- pkgs/applications/version-management/rabbitvcs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/rabbitvcs/default.nix b/pkgs/applications/version-management/rabbitvcs/default.nix index 2d77a9c32656..d3b027fada68 100644 --- a/pkgs/applications/version-management/rabbitvcs/default.nix +++ b/pkgs/applications/version-management/rabbitvcs/default.nix @@ -1,14 +1,14 @@ { fetchFromGitHub, lib, python2Packages, meld, subversion, gvfs, xdg_utils }: python2Packages.buildPythonApplication rec { name = "rabbitvcs-${version}"; - version = "0.16"; + version = "0.17.1"; namePrefix = ""; src = fetchFromGitHub { owner = "rabbitvcs"; repo = "rabbitvcs"; rev = "v${version}"; - sha256 = "0964pdylrx4n9c9l8ncwv4q1p63y4hadb5v4pgvm0m2fah2jlkly"; + sha256 = "01cr16zf3gzsci1hhfli79m34fcx5m1pvswl16rkxxn212yc9fhy"; }; pythonPath = with python2Packages; [ configobj dbus-python pygobject2 pygtk simplejson pysvn dulwich tkinter gvfs xdg_utils ]; From ba5bb2378636778fa926fadf6a275831d1cafb1d Mon Sep 17 00:00:00 2001 From: Ryan Mulligan Date: Tue, 27 Feb 2018 12:56:05 -0800 Subject: [PATCH 152/814] qmidiroute: 0.3.0 -> 0.4.0 Semi-automatic update. These checks were performed: - built on NixOS - ran `/nix/store/w7khf4yy94gb9dq36dwyhd5v11wvlnc0-qmidiroute-0.4.0/bin/qmidiroute -h` got 0 exit code - ran `/nix/store/w7khf4yy94gb9dq36dwyhd5v11wvlnc0-qmidiroute-0.4.0/bin/qmidiroute --help` got 0 exit code - ran `/nix/store/w7khf4yy94gb9dq36dwyhd5v11wvlnc0-qmidiroute-0.4.0/bin/qmidiroute -v` and found version 0.4.0 - ran `/nix/store/w7khf4yy94gb9dq36dwyhd5v11wvlnc0-qmidiroute-0.4.0/bin/qmidiroute --version` and found version 0.4.0 - found 0.4.0 with grep in /nix/store/w7khf4yy94gb9dq36dwyhd5v11wvlnc0-qmidiroute-0.4.0 - found 0.4.0 in filename of file in /nix/store/w7khf4yy94gb9dq36dwyhd5v11wvlnc0-qmidiroute-0.4.0 cc "@lebastr" --- pkgs/applications/audio/qmidiroute/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/qmidiroute/default.nix b/pkgs/applications/audio/qmidiroute/default.nix index 1e76e769937b..7f5191a02c20 100644 --- a/pkgs/applications/audio/qmidiroute/default.nix +++ b/pkgs/applications/audio/qmidiroute/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, pkgconfig, qt4, alsaLib }: stdenv.mkDerivation rec { - version = "0.3.0"; + version = "0.4.0"; name = "qmidiroute-${version}"; src = fetchurl { url = "mirror://sourceforge/project/alsamodular/QMidiRoute/${version}/${name}.tar.gz"; - sha256 = "11bfjz14z37v6hk2xyg4vrw423b5h3qgcbviv07g00ws1fgjygm2"; + sha256 = "0vmjwarsxr5540rafhmdcc62yarf0w2l05bjjl9s28zzr5m39z3n"; }; nativeBuildInputs = [ pkgconfig ]; From 7c77ab5100a91c51b926d46ee1277e4066c3a4e7 Mon Sep 17 00:00:00 2001 From: Ryan Mulligan Date: Tue, 27 Feb 2018 11:44:38 -0800 Subject: [PATCH 153/814] praat: 5.4.17 -> 6.0.37 Semi-automatic update. These checks were performed: - built on NixOS - ran `/nix/store/igl5hb1k2wwkms75y5vfs5cvd7a32i34-praat-6.0.37/bin/praat --help` got 0 exit code - ran `/nix/store/igl5hb1k2wwkms75y5vfs5cvd7a32i34-praat-6.0.37/bin/praat help` got 0 exit code - ran `/nix/store/igl5hb1k2wwkms75y5vfs5cvd7a32i34-praat-6.0.37/bin/praat --version` and found version 6.0.37 - found 6.0.37 with grep in /nix/store/igl5hb1k2wwkms75y5vfs5cvd7a32i34-praat-6.0.37 - found 6.0.37 in filename of file in /nix/store/igl5hb1k2wwkms75y5vfs5cvd7a32i34-praat-6.0.37 --- pkgs/applications/audio/praat/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/praat/default.nix b/pkgs/applications/audio/praat/default.nix index 2bb2960afbf1..94b240ebb028 100644 --- a/pkgs/applications/audio/praat/default.nix +++ b/pkgs/applications/audio/praat/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "praat-${version}"; - version = "5.4.17"; + version = "6.0.37"; src = fetchurl { url = "https://github.com/praat/praat/archive/v${version}.tar.gz"; - sha256 = "0s2hrksghg686059vc90h3ywhd2702pqcvy99icw27q5mdk6dqsx"; + sha256 = "1c675jfzcrwfn8lcswm5y5kmazkhnb0p4mzlf5sim57hms88ffjq"; }; configurePhase = '' From fbaa334bcdfa59ca7603bcc9694d2aa3b7d5e8f4 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Thu, 1 Mar 2018 09:14:01 -0600 Subject: [PATCH 154/814] gecode_3: use bash to run "configure", fix error Error: /configure: ./configure.lineno: line 11561: syntax error: unexpected "(" --- pkgs/development/libraries/gecode/3.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gecode/3.nix b/pkgs/development/libraries/gecode/3.nix index a0f3dc636f92..db2b14d71fdb 100644 --- a/pkgs/development/libraries/gecode/3.nix +++ b/pkgs/development/libraries/gecode/3.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, perl }: +{ stdenv, fetchurl, bash, perl }: stdenv.mkDerivation rec { name = "gecode-${version}"; @@ -9,7 +9,9 @@ stdenv.mkDerivation rec { sha256 = "0k45jas6p3cyldgyir1314ja3174sayn2h2ly3z9b4dl3368pk77"; }; - buildInputs = [ perl ]; + nativeBuildInputs = [ bash perl ]; + + preConfigure = "patchShebangs configure"; meta = with stdenv.lib; { license = licenses.mit; From f82d282c0a4d1109ba838499b183f9613b140593 Mon Sep 17 00:00:00 2001 From: Ryan Mulligan Date: Tue, 27 Feb 2018 13:04:18 -0800 Subject: [PATCH 155/814] readosm: 1.0.0b -> 1.1.0 Semi-automatic update. These checks were performed: - built on NixOS - found 1.1.0 with grep in /nix/store/fxmc6jijyscbyhiyjdflbpmbf7hn9v41-readosm-1.1.0 - found 1.1.0 in filename of file in /nix/store/fxmc6jijyscbyhiyjdflbpmbf7hn9v41-readosm-1.1.0 --- pkgs/development/libraries/readosm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/readosm/default.nix b/pkgs/development/libraries/readosm/default.nix index cabd89dc9350..7faee7e69a2e 100644 --- a/pkgs/development/libraries/readosm/default.nix +++ b/pkgs/development/libraries/readosm/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, expat, zlib, geos, libspatialite }: stdenv.mkDerivation rec { - name = "readosm-1.0.0b"; + name = "readosm-1.1.0"; src = fetchurl { url = "http://www.gaia-gis.it/gaia-sins/readosm-sources/${name}.tar.gz"; - sha256 = "042pv31smc7l6y111rvp0hza5sw86wa8ldg2jyq78xgwzcbhszpd"; + sha256 = "1v20pnda67imjd70fn0zw30aar525xicy3d3v49md5cvqklws265"; }; buildInputs = [ expat zlib geos libspatialite ]; From 798fb575c23d3f457fccfdf1e1e6b126894bd26e Mon Sep 17 00:00:00 2001 From: Ryan Mulligan Date: Tue, 27 Feb 2018 09:41:24 -0800 Subject: [PATCH 156/814] phraseapp-client: 1.4.5 -> 1.6.0 Semi-automatic update. These checks were performed: - built on NixOS - found 1.6.0 with grep in /nix/store/az4qq1mvxnr766djymjci1vv6rlz97k7-phraseapp-client-1.6.0-bin - found 1.6.0 in filename of file in /nix/store/az4qq1mvxnr766djymjci1vv6rlz97k7-phraseapp-client-1.6.0-bin cc "@manveru @ehmry @lethalman" --- pkgs/tools/misc/phraseapp-client/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/phraseapp-client/default.nix b/pkgs/tools/misc/phraseapp-client/default.nix index d5908210cbdd..b4cfe7b26c0e 100644 --- a/pkgs/tools/misc/phraseapp-client/default.nix +++ b/pkgs/tools/misc/phraseapp-client/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { name = "phraseapp-client-${version}"; - version = "1.4.5"; + version = "1.6.0"; goPackagePath = "github.com/phrase/phraseapp-client"; subPackages = [ "." ]; @@ -11,7 +11,7 @@ buildGoPackage rec { owner = "phrase"; repo = "phraseapp-client"; rev = version; - sha256 = "0zky7jcs7h6zmvkb0na4la6h7g63jlrziifqk831fd1gspdzgajp"; + sha256 = "0rgwl0rgkci045hg36s0q8jwkni1hzapqpi0mc0gk3rl7nagw622"; }; meta = with stdenv.lib; { From 5286e3007b22753f75230de651d8be92048084e6 Mon Sep 17 00:00:00 2001 From: Ryan Mulligan Date: Tue, 27 Feb 2018 09:54:59 -0800 Subject: [PATCH 157/814] pioneer: 20171001 -> 20180203 Semi-automatic update. These checks were performed: - built on NixOS - ran `/nix/store/cdss984bbgybydbx2y0vsih49759cigd-pioneer-20180203/bin/pioneer -h` got 0 exit code - ran `/nix/store/cdss984bbgybydbx2y0vsih49759cigd-pioneer-20180203/bin/pioneer --help` got 0 exit code - ran `/nix/store/cdss984bbgybydbx2y0vsih49759cigd-pioneer-20180203/bin/pioneer help` got 0 exit code - ran `/nix/store/cdss984bbgybydbx2y0vsih49759cigd-pioneer-20180203/bin/modelcompiler -h` got 0 exit code - ran `/nix/store/cdss984bbgybydbx2y0vsih49759cigd-pioneer-20180203/bin/modelcompiler --help` got 0 exit code - ran `/nix/store/cdss984bbgybydbx2y0vsih49759cigd-pioneer-20180203/bin/modelcompiler help` got 0 exit code - found 20180203 with grep in /nix/store/cdss984bbgybydbx2y0vsih49759cigd-pioneer-20180203 --- pkgs/games/pioneer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/pioneer/default.nix b/pkgs/games/pioneer/default.nix index c0053088db76..071218c1600e 100644 --- a/pkgs/games/pioneer/default.nix +++ b/pkgs/games/pioneer/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { name = "pioneer-${version}"; - version = "20171001"; + version = "20180203"; src = fetchFromGitHub{ owner = "pioneerspacesim"; repo = "pioneer"; rev = version; - sha256 = "0yxw1zdvidrwc28vxfi3qpx2nq2dix2d6ylwgzq9ph8kgwv9fl5n"; + sha256 = "0hp2mf36kj2v93hka8m8lxw2qhmnjc62wjlpw7c7ix0r8xa01i6h"; }; nativeBuildInputs = [ autoconf automake pkgconfig ]; From f5892d07182c1011816eedde2ec2d7a9bd0f2151 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Thu, 1 Mar 2018 10:32:31 -0500 Subject: [PATCH 158/814] xpdf: fix build on darwin (still broken in runtime) --- pkgs/applications/misc/xpdf/cmake_version.patch | 15 +++++++++++++++ pkgs/applications/misc/xpdf/default.nix | 5 +++++ 2 files changed, 20 insertions(+) create mode 100644 pkgs/applications/misc/xpdf/cmake_version.patch diff --git a/pkgs/applications/misc/xpdf/cmake_version.patch b/pkgs/applications/misc/xpdf/cmake_version.patch new file mode 100644 index 000000000000..59a51f7506d5 --- /dev/null +++ b/pkgs/applications/misc/xpdf/cmake_version.patch @@ -0,0 +1,15 @@ + +Fix "No known features for CXX compiler", see +https://cmake.org/pipermail/cmake/2016-December/064733.html and the note at +https://cmake.org/cmake/help/v3.10/command/cmake_minimum_required.html +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -8,7 +8,7 @@ + # + #======================================================================== + +-cmake_minimum_required(VERSION 2.8.8) ++cmake_minimum_required(VERSION 3.1.0) + + project(xpdf) + diff --git a/pkgs/applications/misc/xpdf/default.nix b/pkgs/applications/misc/xpdf/default.nix index ef031c4b9f4d..87c267bbff14 100644 --- a/pkgs/applications/misc/xpdf/default.nix +++ b/pkgs/applications/misc/xpdf/default.nix @@ -17,6 +17,11 @@ stdenv.mkDerivation { sha256 = "1mhn89738vjva14xr5gblc2zrdgzmpqbbjdflqdmpqv647294ggz"; }; + # Fix "No known features for CXX compiler", see + # https://cmake.org/pipermail/cmake/2016-December/064733.html and the note at + # https://cmake.org/cmake/help/v3.10/command/cmake_minimum_required.html + patches = stdenv.lib.optional stdenv.isDarwin ./cmake_version.patch; + nativeBuildInputs = [ cmake ]; cmakeFlags = ["-DSYSTEM_XPDFRC=/etc/xpdfrc" "-DA4_PAPER=ON"]; From ea66292a1615a1455ccdf0b8a3641bc5f02ca14b Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Thu, 1 Mar 2018 10:50:56 -0500 Subject: [PATCH 159/814] xpdf: fix a runtime error 'This application failed to start because it could not find or load the Qt platform plugin "cocoa" in "".' --- pkgs/applications/misc/xpdf/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/xpdf/default.nix b/pkgs/applications/misc/xpdf/default.nix index 87c267bbff14..42622b62f61b 100644 --- a/pkgs/applications/misc/xpdf/default.nix +++ b/pkgs/applications/misc/xpdf/default.nix @@ -1,6 +1,6 @@ { enableGUI ? true, enablePDFtoPPM ? true, useT1Lib ? false , stdenv, fetchurl, zlib, libpng, freetype ? null, t1lib ? null -, cmake, qtbase ? null +, cmake, qtbase ? null, makeWrapper }: assert enableGUI -> qtbase != null && freetype != null; @@ -22,7 +22,7 @@ stdenv.mkDerivation { # https://cmake.org/cmake/help/v3.10/command/cmake_minimum_required.html patches = stdenv.lib.optional stdenv.isDarwin ./cmake_version.patch; - nativeBuildInputs = [ cmake ]; + nativeBuildInputs = [ cmake makeWrapper ]; cmakeFlags = ["-DSYSTEM_XPDFRC=/etc/xpdfrc" "-DA4_PAPER=ON"]; @@ -36,6 +36,11 @@ stdenv.mkDerivation { hardeningDisable = [ "format" ]; + postInstall = stdenv.lib.optionalString stdenv.isDarwin '' + wrapProgram $out/bin/xpdf \ + --set QT_QPA_PLATFORM_PLUGIN_PATH ${qtbase.bin}/lib/qt-*/plugins/platforms + ''; + meta = { homepage = http://www.foolabs.com/xpdf/; description = "Viewer for Portable Document Format (PDF) files"; From 1d30efed48cc857987812f8181950e800a37ae55 Mon Sep 17 00:00:00 2001 From: Ryan Mulligan Date: Tue, 27 Feb 2018 09:40:46 -0800 Subject: [PATCH 160/814] pgroonga: 1.1.9 -> 2.0.2 Semi-automatic update. These checks were performed: - built on NixOS - found 2.0.2 with grep in /nix/store/6wff31scywzmgmv4hqab1jfj391vv95y-pgroonga-2.0.2 - found 2.0.2 in filename of file in /nix/store/6wff31scywzmgmv4hqab1jfj391vv95y-pgroonga-2.0.2 cc "@DerTim1" --- pkgs/servers/sql/postgresql/pgroonga/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/postgresql/pgroonga/default.nix b/pkgs/servers/sql/postgresql/pgroonga/default.nix index 78ad88bc9047..1e995537c88b 100644 --- a/pkgs/servers/sql/postgresql/pgroonga/default.nix +++ b/pkgs/servers/sql/postgresql/pgroonga/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "pgroonga-${version}"; - version = "1.1.9"; + version = "2.0.2"; src = fetchurl { url = "http://packages.groonga.org/source/pgroonga/${name}.tar.gz"; - sha256 = "07afgwll8nxfb7ziw3qrvw0ryjjw3994vj2f6alrjwpg7ynb46ag"; + sha256 = "0023747i2x3j50z54l78maq7dya5ldd2sdydn6l5l7k6b6g4yr2d"; }; nativeBuildInputs = [ pkgconfig ]; From 87d802636ab6aac49b325fec28f66e9a808106e5 Mon Sep 17 00:00:00 2001 From: Ryan Mulligan Date: Mon, 26 Feb 2018 06:21:52 -0800 Subject: [PATCH 161/814] freecell-solver: 4.8.0 -> 4.16.0 Semi-automatic update. These checks were performed: - built on NixOS - ran `/nix/store/sfcaa32zc84ksyfdl2bkrwf8wvsfhmb5-freecell-solver-4.16.0/bin/fc-solve -h` got 0 exit code - ran `/nix/store/sfcaa32zc84ksyfdl2bkrwf8wvsfhmb5-freecell-solver-4.16.0/bin/fc-solve --help` got 0 exit code - ran `/nix/store/sfcaa32zc84ksyfdl2bkrwf8wvsfhmb5-freecell-solver-4.16.0/bin/fc-solve --version` and found version 4.16.0 - ran `/nix/store/sfcaa32zc84ksyfdl2bkrwf8wvsfhmb5-freecell-solver-4.16.0/bin/pi-make-microsoft-freecell-board -h` got 0 exit code - ran `/nix/store/sfcaa32zc84ksyfdl2bkrwf8wvsfhmb5-freecell-solver-4.16.0/bin/pi-make-microsoft-freecell-board --help` got 0 exit code - ran `/nix/store/sfcaa32zc84ksyfdl2bkrwf8wvsfhmb5-freecell-solver-4.16.0/bin/pi-make-microsoft-freecell-board help` got 0 exit code - found 4.16.0 with grep in /nix/store/sfcaa32zc84ksyfdl2bkrwf8wvsfhmb5-freecell-solver-4.16.0 - found 4.16.0 in filename of file in /nix/store/sfcaa32zc84ksyfdl2bkrwf8wvsfhmb5-freecell-solver-4.16.0 cc "@AndersonTorres" --- pkgs/games/freecell-solver/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/freecell-solver/default.nix b/pkgs/games/freecell-solver/default.nix index dd14edf8eb12..263bf5c29dfc 100644 --- a/pkgs/games/freecell-solver/default.nix +++ b/pkgs/games/freecell-solver/default.nix @@ -6,11 +6,11 @@ with stdenv.lib; stdenv.mkDerivation rec{ name = "freecell-solver-${version}"; - version = "4.8.0"; + version = "4.16.0"; src = fetchurl { url = "http://fc-solve.shlomifish.org/downloads/fc-solve/${name}.tar.xz"; - sha256 = "0274l1p71ps222i62whqfkg80fcc8m4w2hmpbrbbd5gh8kfpman3"; + sha256 = "1ihrmxbsli7c1lm5gw9xgrakyn4nsmaj1zgk5gza2ywnfpgdb0ac"; }; nativeBuildInputs = [ pkgconfig ]; From af6a83d01d15e99fe70b6284af7000606655749b Mon Sep 17 00:00:00 2001 From: Jaakko Luttinen Date: Mon, 26 Feb 2018 13:26:32 +0200 Subject: [PATCH 162/814] rssguard: 3.5.5 -> 3.5.6 --- .../networking/feedreaders/rssguard/default.nix | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/networking/feedreaders/rssguard/default.nix b/pkgs/applications/networking/feedreaders/rssguard/default.nix index 0a89ec6023be..297703cde696 100644 --- a/pkgs/applications/networking/feedreaders/rssguard/default.nix +++ b/pkgs/applications/networking/feedreaders/rssguard/default.nix @@ -3,25 +3,19 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "rssguard"; - version = "3.5.5"; + version = "3.5.6"; src = fetchFromGitHub { owner = "martinrotter"; repo = pname; rev = version; - sha256 = "0swjh664y1yqr1rn3ym2kicyx7r97ypr4qf7qrjl4a5q1spzsv48"; + sha256 = "1pdas7hg3nzykm3qi951fk25c9s6gjb7my82b9xzjn2yd7ks71by"; }; buildInputs = [ qtwebengine qttools ]; nativeBuildInputs = [ qmake wrapGAppsHook ]; qmakeFlags = [ "CONFIG+=release" ]; - # FIXME: This shouldn't be needed after 3.5.5. - # See: https://github.com/martinrotter/rssguard/issues/175 - preConfigure = '' - lrelease rssguard.pro - ''; - meta = with stdenv.lib; { description = "Simple RSS/Atom feed reader with online synchronization"; longDescription = '' From 1759eec2e923702933cb2b28ea45c7b6ef684209 Mon Sep 17 00:00:00 2001 From: Russell O'Connor Date: Thu, 1 Mar 2018 11:21:18 -0500 Subject: [PATCH 163/814] bitcoin: Disable darwin builds bitcoin requires hexdump to build. In theory hexdump is provided by the darwin.shell_cmds, but that packages doesn't seem to build at the moment. --- pkgs/applications/altcoins/bitcoin.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/altcoins/bitcoin.nix b/pkgs/applications/altcoins/bitcoin.nix index 9ccdd7670193..0acd616eeaff 100644 --- a/pkgs/applications/altcoins/bitcoin.nix +++ b/pkgs/applications/altcoins/bitcoin.nix @@ -36,6 +36,7 @@ stdenv.mkDerivation rec{ homepage = http://www.bitcoin.org/; maintainers = with maintainers; [ roconnor AndersonTorres ]; license = licenses.mit; - platforms = platforms.unix; + # bitcoin needs hexdump to build, which doesn't seem to build on darwin at the moment. + platforms = platforms.linux; }; } From 4cd5eaedf12dd0ddd7453960b4ce86312bae77b6 Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Thu, 1 Mar 2018 17:10:05 +0100 Subject: [PATCH 164/814] php70: 7.0.27 -> 7.0.28 Security patches: http://www.php.net/ChangeLog-7.php#7.0.28 --- pkgs/development/interpreters/php/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix index 6940485788e9..07b93f7bf695 100644 --- a/pkgs/development/interpreters/php/default.nix +++ b/pkgs/development/interpreters/php/default.nix @@ -343,8 +343,8 @@ in { }; php70 = generic { - version = "7.0.27"; - sha256 = "0ca174kp2l3fjcp8z0mqnkbjfhijjzz7rs7bkzg1qk2cpdijbylr"; + version = "7.0.28"; + sha256 = "0zrw0saqlfv60f3nmff7288wqfhdsfiqns4ys3ii0drzc6s92m5f"; }; php71 = generic { From b00c22136377ae970a053aa8a5c4c4f030c52560 Mon Sep 17 00:00:00 2001 From: Michiel Leenaars Date: Wed, 28 Feb 2018 18:20:01 +0100 Subject: [PATCH 165/814] searx: 0.13.1 -> 0.14.0 --- pkgs/servers/web-apps/searx/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/web-apps/searx/default.nix b/pkgs/servers/web-apps/searx/default.nix index ac60827aeb7b..3835f5ae3324 100644 --- a/pkgs/servers/web-apps/searx/default.nix +++ b/pkgs/servers/web-apps/searx/default.nix @@ -4,14 +4,14 @@ with pythonPackages; buildPythonApplication rec { pname = "searx"; - version = "0.13.1"; + version = "0.14.0"; # Can not use PyPI because certain test files are missing. src = fetchFromGitHub { owner = "asciimoo"; repo = "searx"; rev = "v${version}"; - sha256 = "0nizxq9ggf9g8f8pxn2hfm0kn20356v65h4cj9s73n742nkv6ani"; + sha256 = "046xg6xcs1mxgahz7kwf3fsmwd99q3hhms6pdjlvyczidlfhpmxl"; }; postPatch = '' From 8d3aa2f2b9e9ce8bb3e24468023af298fd72cdbb Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Thu, 1 Mar 2018 17:48:10 +0100 Subject: [PATCH 166/814] ocamlModules.biniou: fix build --- .../ocaml-modules/biniou/default.nix | 40 ++++++++++--------- 1 file changed, 22 insertions(+), 18 deletions(-) diff --git a/pkgs/development/ocaml-modules/biniou/default.nix b/pkgs/development/ocaml-modules/biniou/default.nix index 7047edf24b3e..97c4750002e6 100644 --- a/pkgs/development/ocaml-modules/biniou/default.nix +++ b/pkgs/development/ocaml-modules/biniou/default.nix @@ -1,26 +1,30 @@ { stdenv, fetchFromGitHub, ocaml, findlib, jbuilder, easy-format }: stdenv.mkDerivation rec { - version = "1.2.0"; - name = "ocaml${ocaml.version}-biniou-${version}"; - src = fetchFromGitHub { - owner = "mjambon"; - repo = "biniou"; - rev = "v${version}"; - sha256 = "0mjpgwyfq2b2izjw0flmlpvdjgqpq8shs89hxj1np2r50csr8dcb"; - }; + version = "1.2.0"; + name = "ocaml${ocaml.version}-biniou-${version}"; + src = fetchFromGitHub { + owner = "mjambon"; + repo = "biniou"; + rev = "v${version}"; + sha256 = "0mjpgwyfq2b2izjw0flmlpvdjgqpq8shs89hxj1np2r50csr8dcb"; + }; - buildInputs = [ ocaml findlib jbuilder ]; + buildInputs = [ ocaml findlib jbuilder ]; - propagatedBuildInputs = [ easy-format ]; + propagatedBuildInputs = [ easy-format ]; - inherit (jbuilder) installPhase; + postPatch = '' + patchShebangs . + ''; - meta = { - inherit (src.meta) homepage; - inherit (ocaml.meta) platforms; - description = "Binary data format designed for speed, safety, ease of use and backward compatibility as protocols evolve"; - maintainers = [ stdenv.lib.maintainers.vbgl ]; - license = stdenv.lib.licenses.bsd3; - }; + inherit (jbuilder) installPhase; + + meta = { + inherit (src.meta) homepage; + inherit (ocaml.meta) platforms; + description = "Binary data format designed for speed, safety, ease of use and backward compatibility as protocols evolve"; + maintainers = [ stdenv.lib.maintainers.vbgl ]; + license = stdenv.lib.licenses.bsd3; + }; } From 5ea2c874645bea73427dca9a80384bcf5579f62b Mon Sep 17 00:00:00 2001 From: WilliButz Date: Thu, 1 Mar 2018 17:07:50 +0100 Subject: [PATCH 167/814] grafana: 4.6.3 -> 5.0.0 --- nixos/modules/services/monitoring/grafana.nix | 2 +- pkgs/servers/monitoring/grafana/default.nix | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/nixos/modules/services/monitoring/grafana.nix b/nixos/modules/services/monitoring/grafana.nix index d48b78ae6d02..921be23f3681 100644 --- a/nixos/modules/services/monitoring/grafana.nix +++ b/nixos/modules/services/monitoring/grafana.nix @@ -249,7 +249,7 @@ in { }; preStart = '' ln -fs ${cfg.package}/share/grafana/conf ${cfg.dataDir} - ln -fs ${cfg.package}/share/grafana/vendor ${cfg.dataDir} + ln -fs ${cfg.package}/share/grafana/tools ${cfg.dataDir} ''; }; diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix index 65304541c8d6..876209b9b029 100644 --- a/pkgs/servers/monitoring/grafana/default.nix +++ b/pkgs/servers/monitoring/grafana/default.nix @@ -1,7 +1,7 @@ { lib, buildGoPackage, fetchurl, fetchFromGitHub, phantomjs2 }: buildGoPackage rec { - version = "4.6.3"; + version = "5.0.0"; name = "grafana-${version}"; goPackagePath = "github.com/grafana/grafana"; @@ -9,20 +9,20 @@ buildGoPackage rec { rev = "v${version}"; owner = "grafana"; repo = "grafana"; - sha256 = "18r35pwarbgamhd7m9z4wpx6x1ymd5qsymvfll58zcgivis6c32j"; + sha256 = "1clkvi651wc4zx9bql5iwwnjgwgrj34dirs7ypi6rdgxissp89p9"; }; srcStatic = fetchurl { url = "https://grafana-releases.s3.amazonaws.com/release/grafana-${version}.linux-x64.tar.gz"; - sha256 = "01f50w57n7p7if37rhj8zy0y0x84qajbxrrdcfrsbi2qi1kzfz03"; + sha256 = "1n2l5ybscc0g1npsa648wjwwb4qrj3f549nf0y6wsifp5k051lhd"; }; preBuild = "export GOPATH=$GOPATH:$NIX_BUILD_TOP/go/src/${goPackagePath}/Godeps/_workspace"; postInstall = '' tar -xvf $srcStatic mkdir -p $bin/share/grafana - mv grafana-*/{public,conf,vendor} $bin/share/grafana/ - ln -sf ${phantomjs2}/bin/phantomjs $bin/share/grafana/vendor/phantomjs/phantomjs + mv grafana-*/{public,conf,tools} $bin/share/grafana/ + ln -sf ${phantomjs2}/bin/phantomjs $bin/share/grafana/tools/phantomjs/phantomjs ''; meta = with lib; { From 48cc8c2fffdae1724b8858e3ba2b7cf4018e1f00 Mon Sep 17 00:00:00 2001 From: Matthew Maurer Date: Thu, 1 Mar 2018 12:12:29 -0500 Subject: [PATCH 168/814] jbuilder: 1.0+beta18 -> 1.0+beta17 jbuilder beta 18 introduces a regression on the final link. This is reflected in BAP 1.4 Rolling back one version until it's fixed. --- pkgs/development/tools/ocaml/jbuilder/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/ocaml/jbuilder/default.nix b/pkgs/development/tools/ocaml/jbuilder/default.nix index 2bfc832a0f0a..d48bc4101113 100644 --- a/pkgs/development/tools/ocaml/jbuilder/default.nix +++ b/pkgs/development/tools/ocaml/jbuilder/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { name = "jbuilder-${version}"; - version = "1.0+beta18"; + version = "1.0+beta17"; src = fetchFromGitHub { owner = "ocaml"; repo = "dune"; rev = "${version}"; - sha256 = "1xw4i5qd2ndnddzb8b14fb52qxnjpr3lr9wx3mprv4f294kdg0l6"; + sha256 = "04pyry459hp2r2s9m5xkcq1glzp20ddz5wb1w8nzp3zgygy0431x"; }; buildInputs = [ ocaml ]; From 6967498370791ef38ec4d8d5c19b3b744ae28882 Mon Sep 17 00:00:00 2001 From: babariviere Date: Thu, 1 Mar 2018 18:03:42 +0100 Subject: [PATCH 169/814] fix LD_PRELOAD error for bear --- lib/maintainers.nix | 1 + .../tools/build-managers/bear/cmakepaths.patch | 13 +++++++++++++ .../tools/build-managers/bear/default.nix | 4 ++-- 3 files changed, 16 insertions(+), 2 deletions(-) create mode 100644 pkgs/development/tools/build-managers/bear/cmakepaths.patch diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 71b2a7a08bba..76379a02ffbb 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -71,6 +71,7 @@ auntie = "Jonathan Glines "; avnik = "Alexander V. Nikolaev "; aycanirican = "Aycan iRiCAN "; + babariviere = "Bastien Riviere "; bachp = "Pascal Bach "; backuitist = "Bruno Bieth"; badi = "Badi' Abdul-Wahid "; diff --git a/pkgs/development/tools/build-managers/bear/cmakepaths.patch b/pkgs/development/tools/build-managers/bear/cmakepaths.patch new file mode 100644 index 000000000000..d237267078e6 --- /dev/null +++ b/pkgs/development/tools/build-managers/bear/cmakepaths.patch @@ -0,0 +1,13 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 04c5c58..429ca47 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -24,7 +24,7 @@ set(CMAKE_OSX_ARCHITECTURES "i386;x86_64" CACHE STRING "Rogue") + + set(EAR_LIB_FILE ${CMAKE_SHARED_LIBRARY_PREFIX}ear${CMAKE_SHARED_LIBRARY_SUFFIX}) + set(EAR_LIB_PATH "${CMAKE_INSTALL_LIBDIR}/bear") +-set(DEFAULT_PRELOAD_FILE ${CMAKE_INSTALL_PREFIX}/${EAR_LIB_PATH}/${EAR_LIB_FILE} CACHE STRING "Default path to libear.") ++set(DEFAULT_PRELOAD_FILE ${EAR_LIB_PATH}/${EAR_LIB_FILE} CACHE STRING "Default path to libear.") + + add_subdirectory(libear) + add_subdirectory(bear) diff --git a/pkgs/development/tools/build-managers/bear/default.nix b/pkgs/development/tools/build-managers/bear/default.nix index 6afec72de5fd..8f352f84b228 100644 --- a/pkgs/development/tools/build-managers/bear/default.nix +++ b/pkgs/development/tools/build-managers/bear/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { doCheck = false; # all fail - patches = [ ./ignore_wrapper.patch ]; + patches = [ ./ignore_wrapper.patch ./cmakepaths.patch ]; meta = with stdenv.lib; { description = "Tool that generates a compilation database for clang tooling"; @@ -28,6 +28,6 @@ stdenv.mkDerivation rec { homepage = https://github.com/rizsotto/Bear; license = licenses.gpl3Plus; platforms = platforms.unix; - maintainers = [ maintainers.vcunat ]; + maintainers = [ maintainers.vcunat maintainers.babariviere ]; }; } From 1aae247be178dcc27c607e1d3fb6097e0009bc6c Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Thu, 1 Mar 2018 17:24:57 +0000 Subject: [PATCH 170/814] exa: fix build on darwin --- pkgs/tools/misc/exa/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/exa/default.nix b/pkgs/tools/misc/exa/default.nix index 503f0df331cf..c07420821ed4 100644 --- a/pkgs/tools/misc/exa/default.nix +++ b/pkgs/tools/misc/exa/default.nix @@ -1,4 +1,6 @@ -{ stdenv, fetchFromGitHub, rustPlatform, cmake, perl, pkgconfig, zlib }: +{ stdenv, fetchFromGitHub, rustPlatform, cmake, perl, pkgconfig, zlib +, darwin, libiconv +}: with rustPlatform; @@ -16,7 +18,10 @@ buildRustPackage rec { }; nativeBuildInputs = [ cmake pkgconfig perl ]; - buildInputs = [ zlib ]; + buildInputs = [ zlib ] + ++ stdenv.lib.optionals stdenv.isDarwin [ + libiconv darwin.apple_sdk.frameworks.Security ] + ; # Some tests fail, but Travis ensures a proper build doCheck = false; From 02fee428a213dec92060b0c88f4aef34db9189f3 Mon Sep 17 00:00:00 2001 From: Daniel Fullmer Date: Thu, 1 Mar 2018 13:30:17 -0500 Subject: [PATCH 171/814] avrbinutils: 2.26 -> 2.30 --- pkgs/development/misc/avr/binutils/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/misc/avr/binutils/default.nix b/pkgs/development/misc/avr/binutils/default.nix index 2fd8c2d39c4e..0826b83ed199 100644 --- a/pkgs/development/misc/avr/binutils/default.nix +++ b/pkgs/development/misc/avr/binutils/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl }: let - version = "2.26"; + version = "2.30"; in stdenv.mkDerivation { name = "avr-binutils-${version}"; src = fetchurl { url = "mirror://gnu/binutils/binutils-${version}.tar.bz2"; - sha256 = "1ngc2h3knhiw8s22l8y6afycfaxr5grviqy7mwvm4bsl14cf9b62"; + sha256 = "028cklfqaab24glva1ks2aqa1zxa6w6xmc8q34zs1sb7h22dxspg"; }; configureFlags = "--target=avr --enable-languages=c,c++"; From 9f4b1ee6867a2734f7b22d67d7b13fdb4e52e715 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 1 Mar 2018 19:53:34 +0100 Subject: [PATCH 172/814] blender: 2.79 -> 2.79a --- pkgs/applications/misc/blender/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix index b348f253b350..cfdc9077bb01 100644 --- a/pkgs/applications/misc/blender/default.nix +++ b/pkgs/applications/misc/blender/default.nix @@ -11,11 +11,11 @@ with lib; stdenv.mkDerivation rec { - name = "blender-2.79"; + name = "blender-2.79a"; src = fetchurl { url = "http://download.blender.org/source/${name}.tar.gz"; - sha256 = "16f84mdzkmwjmqahjj64kbyk4kagdj4mcr8qjazs1952d7kh7pm9"; + sha256 = "1mw45mvfk9f0fhn12vp3g2vwqzinrp3by0m3w01wj87h9ri5zkwc"; }; buildInputs = From 8061a9a46266d7c97272504d936229bad19d4326 Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Thu, 1 Mar 2018 19:52:13 +0100 Subject: [PATCH 173/814] phpPackages.phpcs: 2.6.0 -> 3.2.3 Release notes: https://github.com/squizlabs/PHP_CodeSniffer/releases/tag/3.2.3 Plus an infinite of versions before that. --- pkgs/top-level/php-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index 39044b9ccacd..b91e0bd87bba 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -443,11 +443,11 @@ let phpcs = pkgs.stdenv.mkDerivation rec { name = "phpcs-${version}"; - version = "2.6.0"; + version = "3.2.3"; src = pkgs.fetchurl { url = "https://github.com/squizlabs/PHP_CodeSniffer/releases/download/${version}/phpcs.phar"; - sha256 = "02mlv44x508rnkzkwiyh7lg2ah7aqyxcq65q9ycj06czm0xdzs41"; + sha256 = "193axz56j1kyq458q0y38m99bx31jjjldfg6bv71vgm6zh4rvvs1"; }; phases = [ "installPhase" ]; @@ -464,7 +464,7 @@ let description = "PHP coding standard tool"; license = licenses.bsd3; homepage = https://squizlabs.github.io/PHP_CodeSniffer/; - maintainers = with maintainers; [ javaguirre ]; + maintainers = with maintainers; [ javaguirre etu ]; }; }; From 1e4763f1bedd25a51b02d12fd292244bd2bca3a5 Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Thu, 1 Mar 2018 19:54:08 +0100 Subject: [PATCH 174/814] phpPackages.phpcbf: 2.6.0 -> 3.2.3 Release notes: https://github.com/squizlabs/PHP_CodeSniffer/releases/tag/3.2.3 Plus an infinite of versions before that. --- pkgs/top-level/php-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index b91e0bd87bba..d337c7041f17 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -470,11 +470,11 @@ let phpcbf = pkgs.stdenv.mkDerivation rec { name = "phpcbf-${version}"; - version = "2.6.0"; + version = "3.2.3"; src = pkgs.fetchurl { url = "https://github.com/squizlabs/PHP_CodeSniffer/releases/download/${version}/phpcbf.phar"; - sha256 = "1ijf52cgd85ypvw431nnmzij6156ryhfvmajpkr7plfw0iccqc5j"; + sha256 = "00p0l01shxx1h6g26j2dbfrp9j7im541das4xps4wrsvc4h4da9l"; }; phases = [ "installPhase" ]; @@ -491,7 +491,7 @@ let description = "PHP coding standard beautifier and fixer"; license = licenses.bsd3; homepage = https://squizlabs.github.io/PHP_CodeSniffer/; - maintainers = with maintainers; [ cmcdragonkai ]; + maintainers = with maintainers; [ cmcdragonkai etu ]; }; }; }; in self From 82c884fbc3abd5dc83e36033d0f776081d986b3a Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Thu, 1 Mar 2018 19:57:05 +0100 Subject: [PATCH 175/814] phpPackages.php-parallel-lint: 0.9.2 -> 1.0.0 --- pkgs/top-level/php-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index d337c7041f17..4c91518e4329 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -410,13 +410,13 @@ let php-parallel-lint = pkgs.stdenv.mkDerivation rec { name = "php-parallel-lint-${version}"; - version = "0.9.2"; + version = "1.0.0"; src = pkgs.fetchFromGitHub { owner = "JakubOnderka"; repo = "PHP-Parallel-Lint"; rev = "v${version}"; - sha256 = "0dzyi6arwpwbjgr366vw3qxibc3naq863p75q433ahznbdygzzm1"; + sha256 = "16nv8yyk2z3l213dg067l6di4pigg5rd8yswr5xgd18jwbys2vnw"; }; buildInputs = [ pkgs.makeWrapper composer box ]; From a7c8b8e83138824f1e9d8fedc96919dacfa09b3b Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Thu, 1 Mar 2018 20:06:58 +0100 Subject: [PATCH 176/814] phpPackages.composer: 1.6.2 -> 1.6.3 Changelog: https://github.com/composer/composer/releases/tag/1.6.3 --- pkgs/top-level/php-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index 4c91518e4329..0e00783c61a3 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -328,11 +328,11 @@ let composer = pkgs.stdenv.mkDerivation rec { name = "composer-${version}"; - version = "1.6.2"; + version = "1.6.3"; src = pkgs.fetchurl { url = "https://getcomposer.org/download/${version}/composer.phar"; - sha256 = "0xjjnbpzar6ybpad77r0b4a96bwrayza8s1s9vz6s634ir98dhvf"; + sha256 = "1dna9ng77nw002l7hq60b6vz0f1snmnsxj1l7cg4f877msxppjsj"; }; unpackPhase = ":"; From 555eacccb5a851b9e4d93c80719b16ad992efa70 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Wed, 28 Feb 2018 17:21:16 -0300 Subject: [PATCH 177/814] deepin-icon-theme: init at 15.12.52 --- pkgs/data/icons/deepin-icon-theme/default.nix | 39 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 41 insertions(+) create mode 100644 pkgs/data/icons/deepin-icon-theme/default.nix diff --git a/pkgs/data/icons/deepin-icon-theme/default.nix b/pkgs/data/icons/deepin-icon-theme/default.nix new file mode 100644 index 000000000000..7a422beb9924 --- /dev/null +++ b/pkgs/data/icons/deepin-icon-theme/default.nix @@ -0,0 +1,39 @@ +{ stdenv, fetchFromGitHub, gtk3, papirus-icon-theme }: + +stdenv.mkDerivation rec { + name = "${pname}-${version}"; + pname = "deepin-icon-theme"; + version = "15.12.52"; + + src = fetchFromGitHub { + owner = "linuxdeepin"; + repo = pname; + rev = version; + sha256 = "141in9jlflmckd8rg4605dfks84p1p6b1zdbhbiwrg11xbl66f3l"; + + # Get rid of case collision in file names, which is an issue in + # darwin where file names are case insensitive. + extraPostFetch = '' + rm "$out"/Sea/apps/scalable/TeXmacs.svg + rm "$out"/deepin/apps/48/TeXmacs.svg + ''; + }; + + nativeBuildInputs = [ gtk3 papirus-icon-theme ]; + + makeFlags = [ "PREFIX=$(out)" ]; + + postFixup = '' + for theme in $out/share/icons/*; do + gtk-update-icon-cache $theme + done + ''; + + meta = with stdenv.lib; { + description = "Deepin icon theme"; + homepage = https://github.com/linuxdeepin/deepin-icon-theme; + license = licenses.gpl3; + platforms = platforms.linux; + maintainers = with maintainers; [ romildo ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6c58f98380a6..4f4fc376e5d2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13951,6 +13951,8 @@ with pkgs; crimson = callPackage ../data/fonts/crimson {}; + deepin-icon-theme = callPackage ../data/icons/deepin-icon-theme { }; + dejavu_fonts = lowPrio (callPackage ../data/fonts/dejavu-fonts { inherit (perlPackages) FontTTF; }); From f9f360883bd8e9c7f716f9a5fad9c8ae333f78aa Mon Sep 17 00:00:00 2001 From: Erik Arvstedt Date: Tue, 27 Feb 2018 21:09:36 +0100 Subject: [PATCH 178/814] untrunc: init at 2018.01.13 --- lib/maintainers.nix | 1 + pkgs/tools/video/untrunc/default.nix | 39 ++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 42 insertions(+) create mode 100644 pkgs/tools/video/untrunc/default.nix diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 76379a02ffbb..106d5dfd3735 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -199,6 +199,7 @@ dzabraev = "Maksim Dzabraev "; e-user = "Alexander Kahl "; earldouglas = "James Earl Douglas "; + earvstedt = "Erik Arvstedt "; ebzzry = "Rommel Martinez "; edanaher = "Evan Danaher "; edef = "edef "; diff --git a/pkgs/tools/video/untrunc/default.nix b/pkgs/tools/video/untrunc/default.nix new file mode 100644 index 000000000000..c51c23d62f02 --- /dev/null +++ b/pkgs/tools/video/untrunc/default.nix @@ -0,0 +1,39 @@ +{ stdenv, gcc, libav_12, fetchFromGitHub }: + +stdenv.mkDerivation rec { + name = "untrunc-${version}"; + version = "2018.01.13"; + + src = fetchFromGitHub { + owner = "ponchio"; + repo = "untrunc"; + rev = "3a2e6d0718faf06589f7b9d95c8f966348e537f7"; + sha256 = "03ka4lr69k7mikfpcpd95smzdj62v851ididnjyps5a0j06f8087"; + }; + + buildInputs = [ gcc libav_12 ]; + + # Untrunc uses the internal libav headers 'h264dec.h' and 'config.h'. + # The latter must be created through 'configure'. + libavConfiguredSrc = libav_12.overrideAttrs (oldAttrs: { + name = "libav-configured-src"; + outputs = [ "out" ]; + phases = [ "unpackPhase" "patchPhase" "configurePhase" "installPhase" ]; + installPhase = "cp -r . $out"; + }); + + buildCommand = '' + mkdir -p $out/bin + g++ -o $out/bin/untrunc \ + -Wno-deprecated-declarations \ + $src/file.cpp $src/main.cpp $src/track.cpp $src/atom.cpp $src/mp4.cpp \ + -I$libavConfiguredSrc -lavformat -lavcodec -lavutil + ''; + + meta = with stdenv.lib; { + description = "Restore a damaged (truncated) mp4, m4v, mov, 3gp video from a similar, undamaged video"; + license = licenses.gpl2; + homepage = https://github.com/ponchio/untrunc; + maintainers = [ maintainers.earvstedt ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 64d2aa8e7dc8..f817bc5a3ff0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5140,6 +5140,8 @@ with pkgs; untex = callPackage ../tools/text/untex { }; + untrunc = callPackage ../tools/video/untrunc { }; + upx = callPackage ../tools/compression/upx { }; uqmi = callPackage ../tools/networking/uqmi { }; From 5d4db65494c5f9999f6795ae9a0defd4c50a58d8 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 27 Feb 2018 02:31:02 +0100 Subject: [PATCH 179/814] hackage-packages.nix: automatic Haskell package set update This update was generated by hackage2nix v2.8.2-6-g7dfce29 from Hackage revision https://github.com/commercialhaskell/all-cabal-hashes/commit/292d228e71d6cd6133ea4dcba427135be91eb9dd. --- .../haskell-modules/hackage-packages.nix | 1286 ++++++++++++++--- 1 file changed, 1083 insertions(+), 203 deletions(-) diff --git a/pkgs/development/haskell-modules/hackage-packages.nix b/pkgs/development/haskell-modules/hackage-packages.nix index ae8c14f3d8f6..6bd18f713647 100644 --- a/pkgs/development/haskell-modules/hackage-packages.nix +++ b/pkgs/development/haskell-modules/hackage-packages.nix @@ -6725,6 +6725,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "Glob_0_9_2" = callPackage + ({ mkDerivation, base, containers, directory, dlist, filepath + , HUnit, QuickCheck, test-framework, test-framework-hunit + , test-framework-quickcheck2, transformers, transformers-compat + }: + mkDerivation { + pname = "Glob"; + version = "0.9.2"; + sha256 = "1rbwcq9w9951qsnp13vqcm9r01yax2yh1wk8s4zxa3ckk9717iwg"; + libraryHaskellDepends = [ + base containers directory dlist filepath transformers + transformers-compat + ]; + testHaskellDepends = [ + base containers directory dlist filepath HUnit QuickCheck + test-framework test-framework-hunit test-framework-quickcheck2 + transformers transformers-compat + ]; + homepage = "http://iki.fi/matti.niemenmaa/glob/"; + description = "Globbing library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "GlomeTrace" = callPackage ({ mkDerivation, array, base, GlomeVec }: mkDerivation { @@ -9281,6 +9305,8 @@ self: { pname = "HarmTrace-Base"; version = "1.6.0.0"; sha256 = "03rma29wkrcixvd5whmmlqkhiznxgff3dq8jmw6w7xzr9fn72f9b"; + revision = "1"; + editedCabalFile = "0fldc14b2lj8pvkmxly0ld9mmx33yvswh7sg85g62w4yixsr6fdl"; libraryHaskellDepends = [ base binary containers ghc-prim ListLike uu-parsinglib ]; @@ -9288,7 +9314,7 @@ self: { base binary containers ghc-prim ListLike QuickCheck random uu-parsinglib ]; - homepage = "https://bitbucket.org/bash/harmtrace-base"; + homepage = "https://github.com/chordify/HarmTrace-Base"; description = "Parsing and unambiguously representing musical chords"; license = stdenv.lib.licenses.lgpl3; }) {}; @@ -11614,8 +11640,8 @@ self: { ({ mkDerivation, base, containers, hmatrix, vector }: mkDerivation { pname = "Learning"; - version = "0.0.3"; - sha256 = "0mq98i23gcksvbyz2psxixp4jdqjskmjbjc2z8bz175sy8fyp62a"; + version = "0.1.0"; + sha256 = "14hlr86c605bpfcawvi4vy0hcwph4ji38ql8pic6bawyvcn7pybn"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base containers hmatrix vector ]; @@ -12235,8 +12261,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "Mapping"; - version = "0.1.0.1"; - sha256 = "14gjly5dlz5bdi9niqdg6gzf9hin87xnl9hsqlzdpgbk6hzg0az8"; + version = "2.0.0.0"; + sha256 = "1yz7dgmhlkqmf3fc2y32j9lr01zfjjqy9pnnj3bh03b9khblw0pn"; libraryHaskellDepends = [ base ]; homepage = "https://github.com/zaoqi/Mapping.hs"; description = "Mapping"; @@ -13310,6 +13336,27 @@ self: { license = "unknown"; }) {}; + "Network-NineP_0_4_2" = callPackage + ({ mkDerivation, base, binary, bytestring, containers, convertible + , exceptions, hslogger, monad-loops, monad-peel, mstate, mtl + , network, NineP, regex-posix, stateref, transformers + }: + mkDerivation { + pname = "Network-NineP"; + version = "0.4.2"; + sha256 = "136pqyxpjyml0hfblpj6hmhsy2i8r796shcnl0rwljmvw1mhcg6d"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base binary bytestring containers convertible exceptions hslogger + monad-loops monad-peel mstate mtl network NineP regex-posix + stateref transformers + ]; + description = "High-level abstraction over 9P protocol"; + license = "unknown"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "NewBinary" = callPackage ({ mkDerivation, array, base, integer }: mkDerivation { @@ -29267,6 +29314,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "async-timer_0_2_0_0" = callPackage + ({ mkDerivation, async, base, containers, criterion + , safe-exceptions, tasty, tasty-hunit, unliftio, unliftio-core + }: + mkDerivation { + pname = "async-timer"; + version = "0.2.0.0"; + sha256 = "1q6f0ig8m1ij1yz07b36799gavppb7dkwyvlc724gaj1q72bych6"; + libraryHaskellDepends = [ + async base safe-exceptions unliftio unliftio-core + ]; + testHaskellDepends = [ + async base containers criterion tasty tasty-hunit + ]; + homepage = "https://github.com/mtesseract/async-timer#readme"; + description = "Provides API for timer based execution of IO actions"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "asynchronous-exceptions" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -29674,30 +29741,30 @@ self: { }) {}; "ats-pkg" = callPackage - ({ mkDerivation, ansi-wl-pprint, ats-setup, base, binary - , bytestring, bzlib, Cabal, cli-setup, composition-prelude - , containers, cpphs, dependency, dhall, directory, file-embed - , http-client, http-client-tls, lens, lzma, optparse-applicative - , parallel-io, process, shake, shake-ats, shake-ext, tar, temporary - , text, unix, zip-archive, zlib + ({ mkDerivation, ansi-wl-pprint, base, binary, bytestring, bzlib + , Cabal, cli-setup, composition-prelude, containers, dependency + , dhall, directory, file-embed, filemanip, http-client + , http-client-tls, lzma, microlens, microlens-th + , optparse-applicative, parallel-io, process, shake, shake-ats + , shake-ext, tar, temporary, text, unix, zip-archive, zlib }: mkDerivation { pname = "ats-pkg"; - version = "2.6.1.3"; - sha256 = "0qxzcmbvc0s30w10whlr0lxmj5rcidma1gv03gwih7ax4bnw0ww4"; + version = "2.6.1.16"; + sha256 = "0wbdndrc6vwac8qyihz52cbhd6nv5sjvw7ssrl8g92gziwjbrgf3"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal cli-setup ]; libraryHaskellDepends = [ - ansi-wl-pprint ats-setup base binary bytestring bzlib Cabal + ansi-wl-pprint base binary bytestring bzlib Cabal composition-prelude containers dependency dhall directory - file-embed http-client http-client-tls lens lzma parallel-io - process shake shake-ats shake-ext tar text unix zip-archive zlib + file-embed filemanip http-client http-client-tls lzma microlens + microlens-th parallel-io process shake shake-ats shake-ext tar text + unix zip-archive zlib ]; - libraryToolDepends = [ cpphs ]; executableHaskellDepends = [ - base composition-prelude directory lens optparse-applicative shake - shake-ats temporary text + base composition-prelude directory microlens optparse-applicative + shake shake-ats temporary text ]; homepage = "https://github.com/vmchale/atspkg#readme"; description = "A build tool for ATS"; @@ -33524,8 +33591,8 @@ self: { pname = "bifunctors"; version = "5.5.2"; sha256 = "04fbsysm6zl8kmvqgffmrqa9bxl9dl2gibrd51asqzg737mb4ark"; - revision = "1"; - editedCabalFile = "0jasyhyzn0bjy5b05bvi857vsanf9kgk9rcirlw5mc7wqlxxi6mq"; + revision = "2"; + editedCabalFile = "0glrvir6md8a1ncr6ah95a5mnn7n9v8yl85afvdx24i9z1nr1319"; libraryHaskellDepends = [ base base-orphans comonad containers semigroups tagged template-haskell th-abstraction transformers transformers-compat @@ -42187,8 +42254,8 @@ self: { pname = "case-insensitive"; version = "1.2.0.10"; sha256 = "0v1hclvv0516fnlj5j2izd9xmakl7dshi9cb32iz6dgvzx01qck6"; - revision = "1"; - editedCabalFile = "153x2i7gw7lyhydlf0924vfxmkk53r65c40104bbha2bhp1vj7fi"; + revision = "2"; + editedCabalFile = "197c93pa4lq6rgv59s9q9m11lziyyy6jlizvqap4lz0ijfnmj1gx"; libraryHaskellDepends = [ base bytestring deepseq hashable text ]; testHaskellDepends = [ base bytestring HUnit test-framework test-framework-hunit text @@ -46534,8 +46601,8 @@ self: { }: mkDerivation { pname = "cloudi"; - version = "1.7.2"; - sha256 = "1w6rdmb5a50vdski2k4xwysrbxaycybijgak0hvpsjhnf16yb04f"; + version = "1.7.3"; + sha256 = "10in4z00in2js5w2zgg6ydm7i2n0f0y2ass421p5rqpfv9q7y179"; libraryHaskellDepends = [ array base binary bytestring containers network time unix zlib ]; @@ -48956,8 +49023,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "composition-prelude"; - version = "1.3.0.3"; - sha256 = "050w2h7all9r9rd68xq2d8cxg78ca8xh5b2ys17apla3amm9a7xi"; + version = "1.3.0.4"; + sha256 = "0dsd67ffhwfbq7y9f8c6q9nd05ayyxi85mzvc8kgj7f21cpvclmg"; libraryHaskellDepends = [ base ]; homepage = "https://github.com/vmchale/composition-prelude#readme"; description = "Higher-order function combinators"; @@ -49384,14 +49451,14 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "concurrency_1_4_0_0" = callPackage + "concurrency_1_4_0_1" = callPackage ({ mkDerivation, array, atomic-primops, base, exceptions , monad-control, mtl, stm, transformers }: mkDerivation { pname = "concurrency"; - version = "1.4.0.0"; - sha256 = "0rpljvcswb1smidvxh7nwb6ms2gr8wf0gzs0kapiqc9g3wlr1r9r"; + version = "1.4.0.1"; + sha256 = "17i50sxfir5nf6ldc14h6wfa03ap7z4lmihd8qpl2mb0px5ak7b9"; libraryHaskellDepends = [ array atomic-primops base exceptions monad-control mtl stm transformers @@ -49516,6 +49583,23 @@ self: { license = stdenv.lib.licenses.bsd2; }) {}; + "concurrent-output_1_10_4" = callPackage + ({ mkDerivation, ansi-terminal, async, base, directory, exceptions + , process, stm, terminal-size, text, transformers, unix + }: + mkDerivation { + pname = "concurrent-output"; + version = "1.10.4"; + sha256 = "0zq50g3l9f55vhwjw6s6jf1nqyi0a7f1ih7vas686ckj2z33z9ay"; + libraryHaskellDepends = [ + ansi-terminal async base directory exceptions process stm + terminal-size text transformers unix + ]; + description = "Ungarble output from several threads or commands"; + license = stdenv.lib.licenses.bsd2; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "concurrent-rpc" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -50717,6 +50801,18 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "constaparser" = callPackage + ({ mkDerivation, attoparsec, base, bytestring, vector }: + mkDerivation { + pname = "constaparser"; + version = "0.1.0.0"; + sha256 = "02psvhz05j61b50sqrwhmfsf9cmvgrjd9k3yn2d57139k7qdwr3d"; + libraryHaskellDepends = [ attoparsec base bytestring vector ]; + homepage = "https://github.com/chessai/constaparser"; + description = "Parse ByteStrings of a constant length"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "constrained-categories" = callPackage ({ mkDerivation, base, tagged, void }: mkDerivation { @@ -50772,6 +50868,8 @@ self: { pname = "constrained-normal"; version = "1.0.2"; sha256 = "1mq0w2qndrjx9ap9dkyxvz91fbszsnwlhh4hnm9g2dx020fawgac"; + revision = "1"; + editedCabalFile = "0vlmsqgx7cpl65ibmx23hdqdyplgvbn144j9plkmrcs5aam1jsdj"; libraryHaskellDepends = [ base ]; homepage = "http://dx.doi.org/10.1145/2500365.2500602"; description = "Normalised Deep Embeddings for Constrained Type-Class Instances"; @@ -51225,6 +51323,24 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "contravariant-extras_0_3_4" = callPackage + ({ mkDerivation, base, base-prelude, contravariant, semigroups + , template-haskell, tuple-th + }: + mkDerivation { + pname = "contravariant-extras"; + version = "0.3.4"; + sha256 = "0gg62ccl94kvh7mnvdq09pifqxjx2kgs189si90nmg44bafj7a9n"; + libraryHaskellDepends = [ + base base-prelude contravariant semigroups template-haskell + tuple-th + ]; + homepage = "https://github.com/nikita-volkov/contravariant-extras"; + description = "Extras for the \"contravariant\" package"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "control-bool" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -54414,6 +54530,33 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "csv-conduit_0_6_8" = callPackage + ({ mkDerivation, array, attoparsec, base, blaze-builder, bytestring + , conduit, conduit-extra, containers, data-default, directory + , exceptions, ghc-prim, HUnit, mmorph, monad-control, mtl + , primitive, resourcet, test-framework, test-framework-hunit, text + , transformers, unordered-containers, vector + }: + mkDerivation { + pname = "csv-conduit"; + version = "0.6.8"; + sha256 = "1rb2dkci33gmqr82a4fc74lrdvxrcn0aibh3arlylklhm15y7w7y"; + libraryHaskellDepends = [ + array attoparsec base blaze-builder bytestring conduit + conduit-extra containers data-default exceptions ghc-prim mmorph + monad-control mtl primitive resourcet text transformers + unordered-containers vector + ]; + testHaskellDepends = [ + base bytestring containers directory HUnit mtl primitive + test-framework test-framework-hunit text transformers vector + ]; + homepage = "http://github.com/ozataman/csv-conduit"; + description = "A flexible, fast, conduit-based CSV parser library for Haskell"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "csv-enumerator" = callPackage ({ mkDerivation, attoparsec, attoparsec-enumerator, base , bytestring, containers, directory, enumerator, safe, transformers @@ -54692,6 +54835,8 @@ self: { pname = "cue-sheet"; version = "1.0.1"; sha256 = "13vzay3i385k8i2k56bl9rr9sy7mnhas4b35xc8q7744gbl5hji1"; + revision = "1"; + editedCabalFile = "05f1w3jhwk09jaknq2ipfsfdlh95rg614m1c1diwi2z9s6hwi3cx"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base bytestring containers data-default-class exceptions megaparsec @@ -56846,8 +56991,8 @@ self: { ({ mkDerivation, base }: mkDerivation { pname = "data-list-zigzag"; - version = "0.1.1.0"; - sha256 = "1pywxmwjlhf81vcb6ivcnf341hlmilgf77pi5kj5iad1hdznkp1y"; + version = "0.1.1.1"; + sha256 = "1gfgdn4v9gs2chmrxn1xh66qa8ivn8w4nb5vv1jg9y3isnvjax6q"; libraryHaskellDepends = [ base ]; homepage = "https://github.com/erisco/data-list-zigzag"; description = "A list but with a balanced enumeration of Cartesian product"; @@ -59143,14 +59288,14 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "dejafu_1_1_0_0" = callPackage + "dejafu_1_1_0_1" = callPackage ({ mkDerivation, base, concurrency, containers, deepseq, exceptions , leancheck, profunctors, random, ref-fd, transformers }: mkDerivation { pname = "dejafu"; - version = "1.1.0.0"; - sha256 = "1zrr7h84lgqm1lzl3cm2clvhrixpv2ywrjgbwbmrlfwr054v3mnm"; + version = "1.1.0.1"; + sha256 = "0mhzij16sqgckk62n4mdwnkmrv2vp7884ivr24wnl73xwcyw6v15"; libraryHaskellDepends = [ base concurrency containers deepseq exceptions leancheck profunctors random ref-fd transformers @@ -61764,6 +61909,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "direct-sqlite_2_3_22" = callPackage + ({ mkDerivation, base, base16-bytestring, bytestring, directory + , HUnit, temporary, text + }: + mkDerivation { + pname = "direct-sqlite"; + version = "2.3.22"; + sha256 = "0fv90nm68k3vfj87kw6kfsvmk5kyvvrjcyp73s8m0pm6y7ypgg7a"; + libraryHaskellDepends = [ base bytestring text ]; + testHaskellDepends = [ + base base16-bytestring bytestring directory HUnit temporary text + ]; + homepage = "https://github.com/IreneKnapp/direct-sqlite"; + description = "Low-level binding to SQLite3. Includes UTF8 and BLOB support."; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "directed-cubical" = callPackage ({ mkDerivation, base, bytestring, containers, deepseq, hashable , parallel, QuickCheck, unordered-containers, vector @@ -66530,6 +66693,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "ekg-core_0_1_1_4" = callPackage + ({ mkDerivation, base, containers, ghc-prim, text + , unordered-containers + }: + mkDerivation { + pname = "ekg-core"; + version = "0.1.1.4"; + sha256 = "0dz9iv6viya7b5nx9gxj9g0d1k155pvb7i59azf9272wl369mn36"; + libraryHaskellDepends = [ + base containers ghc-prim text unordered-containers + ]; + benchmarkHaskellDepends = [ base ]; + homepage = "https://github.com/tibbe/ekg-core"; + description = "Tracking of system metrics"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "ekg-elastic" = callPackage ({ mkDerivation, aeson, base, bytestring, ekg-core, hostname , http-client, lens, text, time, unordered-containers, wreq @@ -68614,14 +68795,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "errors_2_2_3" = callPackage + "errors_2_2_4" = callPackage ({ mkDerivation, base, exceptions, safe, text, transformers , transformers-compat, unexceptionalio }: mkDerivation { pname = "errors"; - version = "2.2.3"; - sha256 = "1r33q7nfikm7pzgaag3zx5am60445vwh446wc1zmj1l5miwz3scw"; + version = "2.2.4"; + sha256 = "0v5jdjh6k3wys2m1ff6pgiydy6fzd0r0pn2k3bsisrj6nf6gff7a"; libraryHaskellDepends = [ base exceptions safe text transformers transformers-compat unexceptionalio @@ -68935,6 +69116,44 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "eternity" = callPackage + ({ mkDerivation, attoparsec, base, cereal, directory, foldl, potoki + , potoki-cereal, QuickCheck, quickcheck-instances, rerebase, tasty + , tasty-hunit, tasty-quickcheck, text + }: + mkDerivation { + pname = "eternity"; + version = "0.1"; + sha256 = "04pcfnr1vl1s85gi2bqqca3frwjljw3307mw2psh8aa9h9qrf21b"; + libraryHaskellDepends = [ + attoparsec base cereal directory foldl potoki potoki-cereal text + ]; + testHaskellDepends = [ + cereal directory potoki potoki-cereal QuickCheck + quickcheck-instances rerebase tasty tasty-hunit tasty-quickcheck + ]; + homepage = "https://github.com/metrix-ai/eternity"; + description = "Native event-sourcing database"; + license = stdenv.lib.licenses.mit; + }) {}; + + "eternity-timestamped" = callPackage + ({ mkDerivation, attoparsec, base, cereal, directory, eternity + , foldl, generic-random, hashable, potoki, QuickCheck, text, time + }: + mkDerivation { + pname = "eternity-timestamped"; + version = "0.2.1"; + sha256 = "0pqihqhq2jh1sr30wkk6sy3p5zyw62i3fqqac48lciggzpmajaa2"; + libraryHaskellDepends = [ + attoparsec base cereal directory eternity foldl generic-random + hashable potoki QuickCheck text time + ]; + homepage = "https://github.com/metrix-ai/eternity-timestamped"; + description = "Automatic timestamping for Eternity"; + license = stdenv.lib.licenses.mit; + }) {}; + "ether" = callPackage ({ mkDerivation, base, criterion, deepseq, exceptions, ghc-prim , lens, mmorph, monad-control, mtl, QuickCheck, reflection, tagged @@ -71415,8 +71634,8 @@ self: { }: mkDerivation { pname = "fast-tags"; - version = "1.3"; - sha256 = "1pqz3r2dg0i462fd4fm3fz4p0m05878gic8xr1hxzk2f2ljsc7fq"; + version = "1.4"; + sha256 = "17gnpf5w9a3k4wjwzj6qrsn5fm508pqq8wy4zsqjy3pfprm3239z"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -71925,6 +72144,18 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "fcg" = callPackage + ({ mkDerivation }: + mkDerivation { + pname = "fcg"; + version = "0.0.0"; + sha256 = "07qbka3fkkmc18crafh6c5ahs7fv1a1kfhga8mxfkm75k3h15h3l"; + isLibrary = false; + isExecutable = true; + description = "TBA"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "fckeditor" = callPackage ({ mkDerivation, base, cgi, HaXml, xhtml }: mkDerivation { @@ -72947,14 +73178,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "filecache_0_3_0" = callPackage + "filecache_0_3_1" = callPackage ({ mkDerivation, base, containers, directory, exceptions, filepath , fsnotify, hspec, mtl, stm, strict-base-types, temporary, time }: mkDerivation { pname = "filecache"; - version = "0.3.0"; - sha256 = "0lizyqksip8vw7gf0zi4ggfh07ql43avim25dwdlk9blv7kyxng4"; + version = "0.3.1"; + sha256 = "199npfbnnbf01ygwj559ikz51bfz23pggnvgdmj2azscbd80mbq7"; libraryHaskellDepends = [ base containers directory exceptions filepath fsnotify mtl stm strict-base-types time @@ -73599,8 +73830,8 @@ self: { }: mkDerivation { pname = "fix-imports"; - version = "1.0.5"; - sha256 = "01fy2s94aq7mnnp24g5i8sxvlpb6arnmv8n2fr153lwmg3n2w1qb"; + version = "1.1.0"; + sha256 = "1w2j7l6515khp0zl3cf6pyxsv55c65qqfcxi94vikd8fk88sswd9"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -74041,6 +74272,8 @@ self: { pname = "flac"; version = "0.1.2"; sha256 = "0adc88h5dmazf9m2xah0qkcav3pm0l3jiy8wbg9fxjv1qpgv74jn"; + revision = "1"; + editedCabalFile = "1hl2dgf4ccbk0qk6yqdwr1qbdjp4yi25dhs595lmnf7wrhk7662f"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base bytestring containers data-default-class directory exceptions @@ -80733,8 +80966,8 @@ self: { pname = "ghc-paths"; version = "0.1.0.9"; sha256 = "0ibrr1dxa35xx20cpp8jzgfak1rdmy344dfwq4vlq013c6w8z9mg"; - revision = "2"; - editedCabalFile = "1gs6biqbcabgmrwhc1bq1bdaxdwwh26v4mpvj5c7cfyigc64gwyk"; + revision = "3"; + editedCabalFile = "1gx47xbm3qviqccnbsibzkfnlzljvls33jh1ry4l506yvfnf4j10"; setupHaskellDepends = [ base Cabal directory ]; libraryHaskellDepends = [ base ]; description = "Knowledge of GHC's installation directories"; @@ -82625,14 +82858,14 @@ self: { , sandi, securemem, shakespeare, socks, split, stm, stm-chans , tagsoup, tasty, tasty-hunit, tasty-quickcheck, tasty-rerun , template-haskell, text, time, torrent, transformers, unix - , unix-compat, unordered-containers, utf8-string, uuid, wai + , unix-compat, unordered-containers, utf8-string, uuid, vector, wai , wai-extra, warp, warp-tls, wget, which, yesod, yesod-core , yesod-form, yesod-static }: mkDerivation { pname = "git-annex"; - version = "6.20180112"; - sha256 = "0662780hzv2afajphjmgglm01d5w5vs4rp7xa1px1bznk67yjdxw"; + version = "6.20180227"; + sha256 = "11p77510vcg7sjd1y5grpgbm1299qviilf4d7xw2pr0vk5qn5mgp"; configureFlags = [ "-fassistant" "-fcryptonite" "-fdbus" "-fdesktopnotify" "-fdns" "-ffeed" "-finotify" "-fpairing" "-fproduction" "-fquvi" "-fs3" @@ -82659,8 +82892,8 @@ self: { securemem shakespeare socks split stm stm-chans tagsoup tasty tasty-hunit tasty-quickcheck tasty-rerun template-haskell text time torrent transformers unix unix-compat unordered-containers - utf8-string uuid wai wai-extra warp warp-tls yesod yesod-core - yesod-form yesod-static + utf8-string uuid vector wai wai-extra warp warp-tls yesod + yesod-core yesod-form yesod-static ]; executableSystemDepends = [ bup curl git gnupg lsof openssh perl rsync wget which @@ -83293,6 +83526,25 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "github-webhooks" = callPackage + ({ mkDerivation, aeson, base, base16-bytestring, bytestring + , cryptonite, deepseq, deepseq-generics, hspec, memory, text, time + , vector + }: + mkDerivation { + pname = "github-webhooks"; + version = "0.9.0"; + sha256 = "1gzks7l39il0g9maj2hkfwpz8rnrnmc05fhcsr27a6c08962gn0f"; + libraryHaskellDepends = [ + aeson base base16-bytestring bytestring cryptonite deepseq + deepseq-generics memory text time vector + ]; + testHaskellDepends = [ aeson base bytestring hspec text vector ]; + homepage = "https://github.com/onrock-eng/github-webhooks#readme"; + description = "Aeson instances for GitHub Webhook payloads"; + license = stdenv.lib.licenses.mit; + }) {}; + "gitignore" = callPackage ({ mkDerivation, aeson, base, base64-bytestring, bytestring , http-conduit, network, safe, text @@ -84549,21 +84801,21 @@ self: { }) {}; "gnome-keyring" = callPackage - ({ mkDerivation, base, bytestring, c2hs, gnome-keyring, text, time + ({ mkDerivation, base, bytestring, c2hs, gnome_keyring, text, time }: mkDerivation { pname = "gnome-keyring"; version = "0.3.1"; sha256 = "08fayi4ixqyzin7lxyx2s3yap377y6nrdf4fmv7bi895j2k642l8"; libraryHaskellDepends = [ base bytestring text time ]; - librarySystemDepends = [ gnome-keyring ]; - libraryPkgconfigDepends = [ gnome-keyring ]; + librarySystemDepends = [ gnome_keyring ]; + libraryPkgconfigDepends = [ gnome_keyring ]; libraryToolDepends = [ c2hs ]; homepage = "https://john-millikin.com/software/haskell-gnome-keyring/"; description = "Bindings for libgnome-keyring"; license = stdenv.lib.licenses.gpl3; hydraPlatforms = stdenv.lib.platforms.none; - }) {inherit (pkgs.gnome2) gnome-keyring;}; + }) {gnome_keyring = null;}; "gnomevfs" = callPackage ({ mkDerivation, array, base, containers, glib, gnome_vfs @@ -93497,6 +93749,8 @@ self: { pname = "hasbolt"; version = "0.1.3.0"; sha256 = "0pb6b48g7pnjm9wb062iicwld81r0w9kqwrz223k1h78aygw8vzx"; + revision = "1"; + editedCabalFile = "0420drijspw73092rh3mhyrz4i7pph1fz3m0hcshs1zmngqibvv2"; libraryHaskellDepends = [ base binary bytestring connection containers data-binary-ieee754 data-default hex network text transformers @@ -96517,16 +96771,16 @@ self: { }) {}; "haskelzinc" = callPackage - ({ mkDerivation, base, containers, filepath, parsec3, pretty - , process + ({ mkDerivation, base, containers, directory, filepath, parsec + , pretty, process }: mkDerivation { pname = "haskelzinc"; - version = "0.3.0.9"; - sha256 = "1vg5jxzn69y2pbpsw2qc6ida0p0v4dhgp68psn4rmpxxbjl7n10s"; + version = "0.3.1.0"; + sha256 = "0k3rsqassxjjwxn0cs2g8jl7hl3qmvdvrfdcclc3bf9pjf93jvwh"; enableSeparateDataOutput = true; libraryHaskellDepends = [ - base containers filepath parsec3 pretty process + base containers directory filepath parsec pretty process ]; description = "CP in Haskell through MiniZinc"; license = stdenv.lib.licenses.bsd3; @@ -99378,21 +99632,23 @@ self: { "hedgehog-gen-json" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, exceptions - , hedgehog, lens, protolude, regex-genex, regex-posix, scientific - , tasty, tasty-hedgehog, text, unordered-containers, vector + , hedgehog, lens, protolude, regex-genex, regex-pcre, scientific + , tasty, tasty-hedgehog, text, time, timerep, tz + , unordered-containers, vector }: mkDerivation { pname = "hedgehog-gen-json"; - version = "0.1.0"; - sha256 = "1b2sb33ah8df2v36hq1axf8dc5d3kflvpb70fcs2pbr44wzrv8x4"; + version = "0.2.0"; + sha256 = "1irr4lniz5s176r6fnhd7sjnxbs627yif1yd8nd8jrq9p1rwc5jm"; libraryHaskellDepends = [ aeson base bytestring containers exceptions hedgehog lens protolude - regex-genex scientific text unordered-containers vector + regex-genex scientific text time timerep tz unordered-containers + vector ]; testHaskellDepends = [ aeson base bytestring containers exceptions hedgehog lens protolude - regex-genex regex-posix scientific tasty tasty-hedgehog text - unordered-containers vector + regex-genex regex-pcre scientific tasty tasty-hedgehog text time + timerep tz unordered-containers vector ]; homepage = "https://github.com/githubuser/haskell-hedgehog-gen-json#readme"; description = "JSON generators for Hedgehog"; @@ -100130,6 +100386,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "here_1_2_13" = callPackage + ({ mkDerivation, base, haskell-src-meta, mtl, parsec + , template-haskell + }: + mkDerivation { + pname = "here"; + version = "1.2.13"; + sha256 = "001wfyvigl2xswqysnpignkl124hybf833875mkcsn8yp8krqvs0"; + libraryHaskellDepends = [ + base haskell-src-meta mtl parsec template-haskell + ]; + homepage = "https://github.com/tmhedberg/here"; + description = "Here docs & interpolated strings via quasiquotation"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "heredoc" = callPackage ({ mkDerivation, base, template-haskell }: mkDerivation { @@ -103550,6 +103823,23 @@ self: { license = "GPL"; }) {inherit (pkgs) gsl;}; + "hmatrix-gsl_0_18_2_0" = callPackage + ({ mkDerivation, array, base, gsl, hmatrix, process, random, vector + }: + mkDerivation { + pname = "hmatrix-gsl"; + version = "0.18.2.0"; + sha256 = "0gvghbyavlk808826qwy4r667i9mxf2ml5xjsbna5slx4sbj7jfs"; + libraryHaskellDepends = [ + array base hmatrix process random vector + ]; + libraryPkgconfigDepends = [ gsl ]; + homepage = "https://github.com/albertoruiz/hmatrix"; + description = "Numerical computation"; + license = "GPL"; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) gsl;}; + "hmatrix-gsl-stats" = callPackage ({ mkDerivation, base, binary, gsl, hmatrix, storable-complex , vector @@ -107256,12 +107546,15 @@ self: { }: mkDerivation { pname = "hs-rs-notify"; - version = "0.1.0.3"; - sha256 = "0nrhks103kcj8m0f20gp3bgg21pvi4v1vaif275pra4bv0bzl3nh"; + version = "0.1.0.18"; + sha256 = "0ffs9bbs076i3a44zszhv8kdxalz2m2yfg0fham971jil33gx2pc"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base filepath process protolude text unix ]; - librarySystemDepends = [ notifier ]; + executableHaskellDepends = [ base protolude ]; + executableSystemDepends = [ notifier ]; testHaskellDepends = [ base protolude ]; homepage = "https://github.com/NoRedInk/hs-rs-notify#readme"; description = "Experimental! Wraps this awesome rust library so you can use it in haskell. https://docs.rs/crate/notify"; @@ -108885,6 +109178,29 @@ self: { license = stdenv.lib.licenses.mit; }) {inherit (pkgs) lua5_3;}; + "hslua_0_9_5_1" = callPackage + ({ mkDerivation, base, bytestring, containers, exceptions, fail + , lua5_3, mtl, QuickCheck, quickcheck-instances, tasty + , tasty-expected-failure, tasty-hunit, tasty-quickcheck, text + }: + mkDerivation { + pname = "hslua"; + version = "0.9.5.1"; + sha256 = "1l3lkmzcal3106acw2bvky5dlblz4n331gnl1ly18j79flbzn7v8"; + configureFlags = [ "-fsystem-lua" ]; + libraryHaskellDepends = [ + base bytestring containers exceptions fail mtl text + ]; + librarySystemDepends = [ lua5_3 ]; + testHaskellDepends = [ + base bytestring containers QuickCheck quickcheck-instances tasty + tasty-expected-failure tasty-hunit tasty-quickcheck text + ]; + description = "A Lua language interpreter embedding in Haskell"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) lua5_3;}; + "hslua-aeson" = callPackage ({ mkDerivation, aeson, base, hashable, hslua, hspec, HUnit , ieee754, QuickCheck, quickcheck-instances, scientific, text @@ -110074,20 +110390,18 @@ self: { }) {}; "hspkcs11" = callPackage - ({ mkDerivation, base, bytestring, c2hs, cipher-aes, cprng-aes - , crypto-api, RSA, unix, utf8-string + ({ mkDerivation, base, base64-bytestring, bytestring, c2hs + , cipher-aes, cprng-aes, crypto-api, RSA, unix, utf8-string }: mkDerivation { pname = "hspkcs11"; - version = "0.5"; - sha256 = "028vri05152a983w87c3zm6byhqrcws3zqk9f419anmhmvz0akwx"; - isLibrary = true; - isExecutable = true; + version = "0.6"; + sha256 = "12jjz5r6pcqqlalxagi1bv1igjfwz7npbdr8vm4kznhv44bkhlp7"; libraryHaskellDepends = [ base bytestring unix utf8-string ]; libraryToolDepends = [ c2hs ]; - executableHaskellDepends = [ - base bytestring cipher-aes cprng-aes crypto-api RSA unix - utf8-string + testHaskellDepends = [ + base base64-bytestring bytestring cipher-aes cprng-aes crypto-api + RSA unix utf8-string ]; homepage = "https://github.com/denisenkom/hspkcs11"; description = "Wrapper for PKCS #11 interface"; @@ -112849,12 +113163,12 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "hunit-dejafu_1_0_1_1" = callPackage + "hunit-dejafu_1_0_1_2" = callPackage ({ mkDerivation, base, dejafu, exceptions, HUnit }: mkDerivation { pname = "hunit-dejafu"; - version = "1.0.1.1"; - sha256 = "0q3a9pxmg8w2q3h38rz1yd7hhf0q4j1aq00ssgnnr2pzvnqgizya"; + version = "1.0.1.2"; + sha256 = "1lnw8rr0lf43rzsv3c5knm96kpnsxmpijqh7njhrgbx9wzy81mg7"; libraryHaskellDepends = [ base dejafu exceptions HUnit ]; homepage = "https://github.com/barrucadu/dejafu"; description = "Deja Fu support for the HUnit test framework"; @@ -113373,6 +113687,20 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hw-hspec-hedgehog_0_1_0_2" = callPackage + ({ mkDerivation, base, call-stack, hedgehog, hspec, HUnit }: + mkDerivation { + pname = "hw-hspec-hedgehog"; + version = "0.1.0.2"; + sha256 = "1rafrpys347qc60van79y55n13pjdhdx64j495g4hhvyzf32az67"; + libraryHaskellDepends = [ base call-stack hedgehog hspec HUnit ]; + testHaskellDepends = [ base hedgehog hspec ]; + homepage = "https://github.com/githubuser/hw-hspec-hedgehog#readme"; + description = "Interoperability between hspec and hedgehog"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hw-int" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -114942,6 +115270,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hzenity" = callPackage + ({ mkDerivation, base, containers, data-default, process + , process-extras, text, time + }: + mkDerivation { + pname = "hzenity"; + version = "0.1"; + sha256 = "04y0a72rczwsmxig029f6jgdkc15rmf2fnsbc5pvy26nksh5i7zk"; + libraryHaskellDepends = [ + base containers data-default process process-extras text time + ]; + homepage = "https://github.com/emilaxelsson/hzenity"; + description = "Haskell interface to Zenity dialogs"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "hzk" = callPackage ({ mkDerivation, base, bytestring, resource-pool, tasty , tasty-hunit, time, zookeeper_mt @@ -115350,6 +115694,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "identicon-style-squares" = callPackage + ({ mkDerivation, base, bytestring, cryptohash, identicon + , JuicyPixels, polyvariadic + }: + mkDerivation { + pname = "identicon-style-squares"; + version = "0.1.0.0"; + sha256 = "12iawbazg5dd6n2giyib3ihj42xh9fnp53lgi3a5gd5x8spixwi9"; + libraryHaskellDepends = [ + base identicon JuicyPixels polyvariadic + ]; + testHaskellDepends = [ + base bytestring cryptohash identicon JuicyPixels + ]; + homepage = "https://github.com/fgaz/identicon-styles"; + description = "Squares style for the identicon package"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "identifiers" = callPackage ({ mkDerivation, base, binary, bytestring, cereal, containers , criterion, deepseq, hashable, ListLike, QuickCheck @@ -117459,6 +117822,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "inline-java_0_8_2" = callPackage + ({ mkDerivation, base, bytestring, Cabal, directory, filepath, ghc + , hspec, jni, jvm, language-java, mtl, process, template-haskell + , temporary, text + }: + mkDerivation { + pname = "inline-java"; + version = "0.8.2"; + sha256 = "0f38w4p29xzrzqjdn2r3yfh2m9iai6dwbj52jhrliiy87gnvwwmy"; + libraryHaskellDepends = [ + base bytestring Cabal directory filepath ghc jni jvm language-java + mtl process template-haskell temporary text + ]; + testHaskellDepends = [ base hspec jni jvm text ]; + homepage = "http://github.com/tweag/inline-java#readme"; + description = "Java interop via inline Java code in Haskell modules"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "inline-r" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, criterion , data-default-class, deepseq, directory, exceptions, filepath @@ -119030,7 +119413,7 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "irc-client_1_1_0_0" = callPackage + "irc-client_1_1_0_1" = callPackage ({ mkDerivation, base, bytestring, conduit, connection, containers , contravariant, exceptions, irc-conduit, irc-ctcp, mtl , network-conduit-tls, old-locale, profunctors, stm, stm-chans @@ -119038,8 +119421,8 @@ self: { }: mkDerivation { pname = "irc-client"; - version = "1.1.0.0"; - sha256 = "0xg4carlcrzjh8igvnqwmxp64ha7x2wjp5d5lvadbml36zvq189y"; + version = "1.1.0.1"; + sha256 = "01p3p6x1ww5hcwq25nr7czm5z8xiz3sr998krdwfj94nl6z4n2ag"; libraryHaskellDepends = [ base bytestring conduit connection containers contravariant exceptions irc-conduit irc-ctcp mtl network-conduit-tls old-locale @@ -119394,9 +119777,9 @@ self: { ({ mkDerivation, base, template-haskell }: mkDerivation { pname = "is"; - version = "0.4"; - sha256 = "0bg7irvyzmlay3xkwsqn08waiylpllyvpkj3n3vwib6iwizqnqkz"; - libraryHaskellDepends = [ base ]; + version = "0.4.1"; + sha256 = "1133npzv5rvcfxarafbmm6jfam45qdm3r33wc5qq920m0w60xi2a"; + libraryHaskellDepends = [ base template-haskell ]; testHaskellDepends = [ base template-haskell ]; description = "Generic pattern predicates"; license = stdenv.lib.licenses.bsd3; @@ -120371,8 +120754,8 @@ self: { }: mkDerivation { pname = "jammittools"; - version = "0.5.3.2"; - sha256 = "0wym2mz4bvcmwg10v90dx14n41qhmn58bgccnxy7li9ahqwvj0f0"; + version = "0.5.4"; + sha256 = "0bqvxnysynpznhibwlcmcg849psjm0q158mh50w0bcwa7jx6v441"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -120887,6 +121270,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {inherit (pkgs) jdk;}; + "jni_0_6_0" = callPackage + ({ mkDerivation, base, bytestring, choice, constraints, containers + , cpphs, deepseq, inline-c, jdk, singletons + }: + mkDerivation { + pname = "jni"; + version = "0.6.0"; + sha256 = "04phf6sqfp8g9rqfj2lxg2j43350wlini1dnsjwyr6yvy888z9ba"; + libraryHaskellDepends = [ + base bytestring choice constraints containers deepseq inline-c + singletons + ]; + librarySystemDepends = [ jdk ]; + libraryToolDepends = [ cpphs ]; + homepage = "https://github.com/tweag/inline-java/tree/master/jni#readme"; + description = "Complete JNI raw bindings"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) jdk;}; + "jobqueue" = callPackage ({ mkDerivation, aeson, async, attoparsec, base, bytestring , containers, data-default, directory, fast-logger, HDBC @@ -122436,6 +122839,54 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "jvm_0_4_2" = callPackage + ({ mkDerivation, base, bytestring, choice, constraints, criterion + , deepseq, distributed-closure, exceptions, hspec, jni, singletons + , text, vector + }: + mkDerivation { + pname = "jvm"; + version = "0.4.2"; + sha256 = "1z3lk2f7bmhi8bj4v32fymjr2bf9czjd73qm6gk33z4mxknddwbh"; + libraryHaskellDepends = [ + base bytestring choice constraints distributed-closure exceptions + jni singletons text vector + ]; + testHaskellDepends = [ base bytestring hspec jni text ]; + benchmarkHaskellDepends = [ + base criterion deepseq jni singletons + ]; + homepage = "http://github.com/tweag/inline-java/tree/master/jvm#readme"; + description = "Call JVM methods from Haskell"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + + "jvm-batching" = callPackage + ({ mkDerivation, base, bytestring, Cabal, criterion, deepseq + , distributed-closure, hspec, inline-java, jni, jvm, singletons + , split, text, vector + }: + mkDerivation { + pname = "jvm-batching"; + version = "0.1.1"; + sha256 = "06vxhlpvb8ilj0xm5k7chzpsn0f7m48l7728g2m7likh55rs2dxq"; + setupHaskellDepends = [ base Cabal inline-java ]; + libraryHaskellDepends = [ + base bytestring distributed-closure inline-java jni jvm singletons + text vector + ]; + testHaskellDepends = [ + base bytestring hspec inline-java jvm text vector + ]; + benchmarkHaskellDepends = [ + base criterion deepseq jvm split vector + ]; + homepage = "http://github.com/tweag/inline-java/tree/master/jvm-batching#readme"; + description = "Provides batched marshalling of values between Java and Haskell"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "jvm-binary" = callPackage ({ mkDerivation, base, binary, bytestring, containers, criterion , directory, filepath, tasty, tasty-discover, tasty-hspec @@ -122476,17 +122927,23 @@ self: { }) {}; "jvm-streaming" = callPackage - ({ mkDerivation, base, distributed-closure, hspec, inline-java, jni - , jvm, singletons, streaming + ({ mkDerivation, base, Cabal, criterion, deepseq + , distributed-closure, hspec, inline-java, jni, jvm, jvm-batching + , singletons, streaming, vector }: mkDerivation { pname = "jvm-streaming"; - version = "0.2.2"; - sha256 = "1s0bla6yhw1ic637h2ss8f3aihc26ca5bndhsi5g02fn0gzw644m"; + version = "0.3"; + sha256 = "02qnfs06knia1c2r5hglhf4ahrls7i6q352dykyns4x1ps5kks5r"; + setupHaskellDepends = [ base Cabal inline-java jvm-batching ]; libraryHaskellDepends = [ - base distributed-closure inline-java jni jvm singletons streaming + base distributed-closure inline-java jni jvm jvm-batching + singletons streaming vector ]; testHaskellDepends = [ base hspec inline-java jvm streaming ]; + benchmarkHaskellDepends = [ + base criterion deepseq jvm streaming vector + ]; homepage = "http://github.com/tweag/inline-java/tree/master/jvm-streaming#readme"; description = "Expose Java iterators as streams from the streaming package"; license = stdenv.lib.licenses.bsd3; @@ -124414,6 +124871,8 @@ self: { pname = "kure"; version = "2.16.12"; sha256 = "1n95f1ijxjxgbq8a33jzmd91yk15bgxx8damxs04y99kzih7sgjc"; + revision = "2"; + editedCabalFile = "07x04clvlzl2wr20pmis52jfyw4fanyaq00zx76r2zn7zdcvysy3"; libraryHaskellDepends = [ base dlist transformers ]; homepage = "http://www.ittc.ku.edu/csdl/fpg/software/kure.html"; description = "Combinators for Strategic Programming"; @@ -125408,6 +125867,8 @@ self: { pname = "lame"; version = "0.1.1"; sha256 = "0j35zpfhppb09m6h23awxgsawisvgsnrw7d99f5z3xq2bjihjq5k"; + revision = "1"; + editedCabalFile = "0p7nwbn22bmk2p7vpcpqs89dxxshjg3cbdx1qc1h8pczgaz3c1dl"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base bytestring data-default-class directory exceptions filepath @@ -125442,6 +125903,18 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "lang" = callPackage + ({ mkDerivation, base, bytestring, http-streams, Mapping }: + mkDerivation { + pname = "lang"; + version = "0.2.1"; + sha256 = "1pzj4iyrhlvgbk68d68xmfi75l2nz9ya1nm6iqz1qvmpj9rd3fsy"; + libraryHaskellDepends = [ base bytestring http-streams Mapping ]; + homepage = "语.ml"; + description = "A Lisp"; + license = stdenv.lib.licenses.agpl3; + }) {}; + "language-asn1" = callPackage ({ mkDerivation, base, parsec, syb }: mkDerivation { @@ -125457,19 +125930,19 @@ self: { }) {}; "language-ats" = callPackage - ({ mkDerivation, alex, ansi-terminal, ansi-wl-pprint, array, base + ({ mkDerivation, alex, ansi-wl-pprint, array, base , composition-prelude, containers, criterion, deepseq, happy, hspec - , hspec-dirstream, lens, mtl, recursion-schemes, system-filepath - , transformers + , hspec-dirstream, microlens, microlens-th, mtl, recursion-schemes + , system-filepath, transformers }: mkDerivation { pname = "language-ats"; - version = "1.0.2.1"; - sha256 = "0ijb6fykbm96i8vankidai9ksqi239rf7iwknbxxf0zwxrwynzsj"; + version = "1.2.0.0"; + sha256 = "072a37nd9ngis8m1kx7xlr13kd8v24j3cnzllval2ygy9siw4p1l"; enableSeparateDataOutput = true; libraryHaskellDepends = [ - ansi-terminal ansi-wl-pprint array base composition-prelude - containers deepseq lens mtl recursion-schemes transformers + ansi-wl-pprint array base composition-prelude containers deepseq + microlens microlens-th mtl recursion-schemes transformers ]; libraryToolDepends = [ alex happy ]; testHaskellDepends = [ @@ -131463,8 +131936,8 @@ self: { ({ mkDerivation, base, containers, text, transformers }: mkDerivation { pname = "localization"; - version = "1.0.0.20180213"; - sha256 = "1dpmlmpmb4hbv9b5010l5fypjmas3hb4vfmcnfnrajm7wp7qzg2y"; + version = "1.0.1.20180226"; + sha256 = "1172rmrk5xgqsy9igg9bspbybvhmbpakvjijn6gnp715a01gfadd"; libraryHaskellDepends = [ base containers text transformers ]; description = "Library for localization (l10n)"; license = stdenv.lib.licenses.gpl3; @@ -131994,6 +132467,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "logging-effect_1_2_4" = callPackage + ({ mkDerivation, async, base, bytestring, criterion, exceptions + , fast-logger, free, lifted-async, monad-control, monad-logger, mtl + , semigroups, stm, stm-delay, text, time, transformers + , transformers-base, wl-pprint-text + }: + mkDerivation { + pname = "logging-effect"; + version = "1.2.4"; + sha256 = "14j63172ml4yj7sqscjxdkxxg869w6hvnlysf9s79qzbjnw44h3h"; + libraryHaskellDepends = [ + async base exceptions free monad-control mtl semigroups stm + stm-delay text time transformers transformers-base wl-pprint-text + ]; + benchmarkHaskellDepends = [ + base bytestring criterion fast-logger lifted-async monad-logger + text time wl-pprint-text + ]; + homepage = "https://github.com/ocharles/logging-effect"; + description = "A mtl-style monad transformer for general purpose & compositional logging"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "logging-effect-extra" = callPackage ({ mkDerivation, base, logging-effect, logging-effect-extra-file , logging-effect-extra-handler, wl-pprint-text @@ -137043,21 +137540,18 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "memory_0_14_14" = callPackage + "memory_0_14_16" = callPackage ({ mkDerivation, base, basement, bytestring, deepseq, foundation - , ghc-prim, tasty, tasty-hunit, tasty-quickcheck + , ghc-prim }: mkDerivation { pname = "memory"; - version = "0.14.14"; - sha256 = "03lnb7nqshddiwqbz1vpba7mb6l80nav896rr77vlp8m41b9h6qx"; + version = "0.14.16"; + sha256 = "03rbszi5d4z9rlbfv8ydrl1xf84xsh8z57g07f7j9qccn9587c3v"; libraryHaskellDepends = [ base basement bytestring deepseq foundation ghc-prim ]; - testHaskellDepends = [ - base basement bytestring foundation tasty tasty-hunit - tasty-quickcheck - ]; + testHaskellDepends = [ base basement bytestring foundation ]; homepage = "https://github.com/vincenthz/hs-memory"; description = "memory and related abstraction stuff"; license = stdenv.lib.licenses.bsd3; @@ -139215,7 +139709,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "modern-uri_0_2_0_0" = callPackage + "modern-uri_0_2_1_0" = callPackage ({ mkDerivation, base, bytestring, containers, contravariant , criterion, deepseq, exceptions, hspec, hspec-megaparsec , megaparsec, mtl, profunctors, QuickCheck, reflection, tagged @@ -139223,10 +139717,10 @@ self: { }: mkDerivation { pname = "modern-uri"; - version = "0.2.0.0"; - sha256 = "01wq2w2kfy9zlpsh8pwcs61xjy3xdwbz6nd0skb6g3bigrqs2w8z"; + version = "0.2.1.0"; + sha256 = "06lqkx91s0lvkamxxf070l990kh8g0c5f5yshh2lffjbk5zclnp6"; revision = "1"; - editedCabalFile = "1svq0ndnv5jfz3nhxwdx4vxim5sahfcryj5ik4l4x704jsjbl4bm"; + editedCabalFile = "1rir55ccx5y377mdl7hfzk2n31nv18mdfxw6a0l2jjw7y0w5kpyi"; libraryHaskellDepends = [ base bytestring containers contravariant deepseq exceptions megaparsec mtl profunctors QuickCheck reflection tagged @@ -139670,6 +140164,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "monad-control_1_0_2_3" = callPackage + ({ mkDerivation, base, stm, transformers, transformers-base + , transformers-compat + }: + mkDerivation { + pname = "monad-control"; + version = "1.0.2.3"; + sha256 = "1c92833gr6cadidjdp8mlznkpp8lyxl0w3y7d19y8yi3klc3843c"; + libraryHaskellDepends = [ + base stm transformers transformers-base transformers-compat + ]; + homepage = "https://github.com/basvandijk/monad-control"; + description = "Lift control operations, like exception catching, through monad transformers"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "monad-control-aligned" = callPackage ({ mkDerivation, base, stm, transformers, transformers-base , transformers-compat @@ -140008,6 +140519,27 @@ self: { license = stdenv.lib.licenses.asl20; }) {}; + "monad-logger-prefix_0_1_8" = callPackage + ({ mkDerivation, base, criterion, doctest, exceptions, Glob, hspec + , monad-control, monad-logger, mtl, QuickCheck, resourcet, text + , transformers, transformers-base + }: + mkDerivation { + pname = "monad-logger-prefix"; + version = "0.1.8"; + sha256 = "1p8sqynxl898vf2fq5lw8j7r50jrxp8npbsw6sc2mbsi336j79xj"; + libraryHaskellDepends = [ + base exceptions monad-control monad-logger mtl resourcet text + transformers transformers-base + ]; + testHaskellDepends = [ base doctest Glob hspec QuickCheck ]; + benchmarkHaskellDepends = [ base criterion monad-logger ]; + homepage = "https://github.com/parsonsmatt/monad-logger-prefix#readme"; + description = "Add prefixes to your monad-logger output"; + license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "monad-logger-syslog" = callPackage ({ mkDerivation, base, bytestring, fast-logger, hsyslog , monad-logger, text, transformers @@ -140126,6 +140658,25 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "monad-metrics_0_2_1_1" = callPackage + ({ mkDerivation, base, clock, ekg-core, exceptions, hashable + , microlens, mtl, text, transformers, unordered-containers + }: + mkDerivation { + pname = "monad-metrics"; + version = "0.2.1.1"; + sha256 = "11gr6ir4678alscv9m6w33l6nbn0k1xspy4lzlgdqpfq5narl5zy"; + libraryHaskellDepends = [ + base clock ekg-core exceptions hashable microlens mtl text + transformers unordered-containers + ]; + testHaskellDepends = [ base ]; + homepage = "https://github.com/sellerlabs/monad-metrics#readme"; + description = "A convenient wrapper around EKG metrics"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "monad-mock" = callPackage ({ mkDerivation, base, constraints, exceptions, haskell-src-exts , haskell-src-meta, hspec, monad-control, mtl, template-haskell @@ -146254,8 +146805,8 @@ self: { pname = "network-msgpack-rpc"; version = "0.0.4"; sha256 = "0b9llxfgl2lcjlcz9ai6k6yhrlip6shd0wd56mfgbvv3lbd5n62r"; - revision = "1"; - editedCabalFile = "0v08258721mv2bih7h03ss0jvjx2b87kclvjn15xrksf93nbrbq2"; + revision = "2"; + editedCabalFile = "0nw2pgyw077ncbmiij99xyy414635vvdmb2das7dkzppsfx47rn3"; libraryHaskellDepends = [ base binary binary-conduit bytestring conduit conduit-extra data-default-class data-default-instances-base data-msgpack @@ -149479,8 +150030,8 @@ self: { }: mkDerivation { pname = "ogmarkup"; - version = "4.0"; - sha256 = "06bbh2ylxw33hik1k4ykvmb74qkcn1zda1n1m20lzcp2ji37fp8k"; + version = "5.0"; + sha256 = "19lgfgsfkfk51dbjimc45yclxfh7ncmh21gnc6f7dihsyhkdfsx7"; libraryHaskellDepends = [ base megaparsec mtl ]; testHaskellDepends = [ base hspec hspec-megaparsec megaparsec shakespeare text @@ -151163,6 +151714,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "optparse-applicative_0_14_2_0" = callPackage + ({ mkDerivation, ansi-wl-pprint, base, bytestring, process + , QuickCheck, transformers, transformers-compat + }: + mkDerivation { + pname = "optparse-applicative"; + version = "0.14.2.0"; + sha256 = "0c3z1mvynlyv1garjbdmdd3npm40dabgm75js4r07cf766c1wd71"; + libraryHaskellDepends = [ + ansi-wl-pprint base process transformers transformers-compat + ]; + testHaskellDepends = [ base bytestring QuickCheck ]; + homepage = "https://github.com/pcapriotti/optparse-applicative"; + description = "Utilities and combinators for parsing command line options"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "optparse-applicative-simple" = callPackage ({ mkDerivation, attoparsec, attoparsec-data, base-prelude , optparse-applicative, rerebase, text @@ -152244,6 +152813,8 @@ self: { pname = "pagination"; version = "0.2.1"; sha256 = "0g90xg5nfrwkrrmsfca5d2xf9y8md6pgh91zjk0dl2l3kvkbmp48"; + revision = "1"; + editedCabalFile = "14sirfxb9qa8g57fxmpphg5hph7kp0lpgwxrmkjlj1x8xwh5x6d5"; libraryHaskellDepends = [ base deepseq exceptions ]; testHaskellDepends = [ base exceptions hspec QuickCheck ]; homepage = "https://github.com/mrkkrp/pagination"; @@ -152478,7 +153049,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "pandoc-citeproc_0_14_1_4" = callPackage + "pandoc-citeproc_0_14_1_5" = callPackage ({ mkDerivation, aeson, aeson-pretty, attoparsec, base, bytestring , Cabal, containers, data-default, directory, filepath, hs-bibutils , mtl, old-locale, pandoc, pandoc-types, parsec, process, rfc5051 @@ -152487,8 +153058,8 @@ self: { }: mkDerivation { pname = "pandoc-citeproc"; - version = "0.14.1.4"; - sha256 = "1agc7qh9sfhqy329w0ccbfx081001k93qk9h6br5gx2yqizwbdd0"; + version = "0.14.1.5"; + sha256 = "1jp2pzx2avvcngg6krygsiwszq1nbns5p2bz1v1mlgm2mb6szqi9"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; @@ -152593,8 +153164,8 @@ self: { }: mkDerivation { pname = "pandoc-emphasize-code"; - version = "0.2.2"; - sha256 = "05vf3fli3glq013c9w9bbjggndfwhjb1rqxqspxyfh8pi14sbj9v"; + version = "0.2.3"; + sha256 = "09jk13binvv6yqpdgkadx54npngn4vbg6z7k2q78cj4ypirbcpl0"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -154553,6 +155124,8 @@ self: { pname = "path-io"; version = "1.3.3"; sha256 = "1g9m3qliqjk1img894wsb89diym5zrq51qkkrwhz4sbm9a8hbv1a"; + revision = "1"; + editedCabalFile = "16jfcjpqbzj6jr0sqxq2ys1z9qd2d8xr9k9vyij08ywynmwwvvzm"; libraryHaskellDepends = [ base containers directory dlist exceptions filepath path temporary time transformers unix-compat @@ -154981,6 +155554,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "pcf-font-embed_0_1_2_0" = callPackage + ({ mkDerivation, base, bytestring, pcf-font, template-haskell + , vector + }: + mkDerivation { + pname = "pcf-font-embed"; + version = "0.1.2.0"; + sha256 = "0lgx62ig2rvxcv9sgk53pfr8gkfimb1xm6lxpc2rr74mdzp52pf5"; + libraryHaskellDepends = [ + base bytestring pcf-font template-haskell vector + ]; + homepage = "https://github.com/michael-swan/pcf-font-embed"; + description = "Template Haskell for embedding text rendered using PCF fonts"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "pcg-random" = callPackage ({ mkDerivation, base, bytestring, doctest, entropy, primitive , random @@ -155500,6 +156090,25 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "pem_0_2_3" = callPackage + ({ mkDerivation, base, bytestring, HUnit, memory, mtl, QuickCheck + , test-framework, test-framework-hunit, test-framework-quickcheck2 + }: + mkDerivation { + pname = "pem"; + version = "0.2.3"; + sha256 = "1c8383b5zcwmv88qhfnqcrwpi5md89iqsrfblcdxl8czyvc5x973"; + libraryHaskellDepends = [ base bytestring memory mtl ]; + testHaskellDepends = [ + base bytestring HUnit QuickCheck test-framework + test-framework-hunit test-framework-quickcheck2 + ]; + homepage = "http://github.com/vincenthz/hs-pem"; + description = "Privacy Enhanced Mail (PEM) format reader and writer"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "pencil" = callPackage ({ mkDerivation, base, data-default, directory, doctest , edit-distance, feed, filepath, hashable, hsass, mtl, pandoc @@ -155920,6 +156529,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "persistable-record_0_6_0_1" = callPackage + ({ mkDerivation, array, base, containers, dlist, names-th + , product-isomorphic, quickcheck-simple, template-haskell + , th-data-compat, transformers + }: + mkDerivation { + pname = "persistable-record"; + version = "0.6.0.1"; + sha256 = "1jjydxzjvkw3jzm968ngj0v531fly0h4f7621fjzgbkdcjfgkgm1"; + libraryHaskellDepends = [ + array base containers dlist names-th product-isomorphic + template-haskell th-data-compat transformers + ]; + testHaskellDepends = [ base quickcheck-simple ]; + homepage = "http://khibino.github.io/haskell-relational-record/"; + description = "Binding between SQL database values and haskell records"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "persistable-types-HDBC-pg" = callPackage ({ mkDerivation, base, bytestring, convertible, HDBC , persistable-record, relational-query-HDBC, text-postgresql @@ -156471,7 +157100,7 @@ self: { maintainers = with stdenv.lib.maintainers; [ psibi ]; }) {}; - "persistent-sqlite_2_8_1" = callPackage + "persistent-sqlite_2_8_1_2" = callPackage ({ mkDerivation, aeson, base, bytestring, conduit, containers , hspec, microlens-th, monad-logger, old-locale, persistent , persistent-template, resource-pool, resourcet, temporary, text @@ -156479,8 +157108,8 @@ self: { }: mkDerivation { pname = "persistent-sqlite"; - version = "2.8.1"; - sha256 = "19iqpa99r4s14r2qmimqpv3b8qz3wm9arbkniccrj8bxlw1c8a4d"; + version = "2.8.1.2"; + sha256 = "035dz64h35s7ry39yd57ybqcllkwkfj0wj9ngh6gcw03hgrmfw9g"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -157703,6 +158332,30 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "pipes_4_3_8" = callPackage + ({ mkDerivation, base, criterion, exceptions, mmorph, mtl + , optparse-applicative, QuickCheck, semigroups, test-framework + , test-framework-quickcheck2, transformers, void + }: + mkDerivation { + pname = "pipes"; + version = "4.3.8"; + sha256 = "1wlppz7vlkmbrrvjv6cjrp8x39lhvdqp2sgc9w6hv25y3qirz9wi"; + libraryHaskellDepends = [ + base exceptions mmorph mtl semigroups transformers void + ]; + testHaskellDepends = [ + base mtl QuickCheck test-framework test-framework-quickcheck2 + transformers + ]; + benchmarkHaskellDepends = [ + base criterion mtl optparse-applicative transformers + ]; + description = "Compositional pipelines"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "pipes-aeson" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, pipes , pipes-attoparsec, pipes-bytestring, pipes-parse, transformers @@ -159008,8 +159661,8 @@ self: { pname = "plan-b"; version = "0.2.1"; sha256 = "038w0y90k7fn13ba5vrpyxa6vjn03lxqdnd2vgki9hmb4idxiakv"; - revision = "1"; - editedCabalFile = "0ci5x3vvwgasy47rxmqk2d1z7qakhh34zwgjbc3gydii2vapd7zh"; + revision = "2"; + editedCabalFile = "03vi68kp16lcly2rv6nq5a64k00hd4a5zvdf8pbz76450fik2c1j"; libraryHaskellDepends = [ base exceptions path path-io transformers ]; @@ -161464,8 +162117,8 @@ self: { }: mkDerivation { pname = "potoki"; - version = "0.8"; - sha256 = "00nsnbrwm62cxkx90ihdzzd8210rchgmqqcxfs90srs1awvgfd1w"; + version = "0.9"; + sha256 = "1sxzxg1dpm3280x5vp47pc6faik9dpfn7qp4pwvbkvwq90l32pv8"; libraryHaskellDepends = [ attoparsec base base-prelude bytestring directory foldl hashable potoki-core profunctors text unagi-chan unordered-containers vector @@ -161474,7 +162127,7 @@ self: { attoparsec QuickCheck quickcheck-instances random rerebase tasty tasty-hunit tasty-quickcheck ]; - homepage = "https://github.com/nikita-volkov/potoki"; + homepage = "https://github.com/metrix-ai/potoki"; description = "Simple streaming in IO"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -161486,12 +162139,12 @@ self: { }: mkDerivation { pname = "potoki-cereal"; - version = "0.1.3"; - sha256 = "1r7plcki29gr9jx61qjx752zc9zh9yy47kznrs36q7jgjhnj6mqx"; + version = "0.1.4"; + sha256 = "0502ipxxdlmk4akc2fpsij3y91fi6q3rhrlzm3bf4kl5jfddvz7s"; libraryHaskellDepends = [ base base-prelude bytestring cereal potoki potoki-core text ]; - homepage = "https://github.com/nikita-volkov/potoki-cereal"; + homepage = "https://github.com/metrix-ai/potoki-cereal"; description = "Streaming serialization"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -161504,14 +162157,14 @@ self: { }: mkDerivation { pname = "potoki-core"; - version = "1.5"; - sha256 = "09fla5dc12pc668pxmkgp9988s1nq6cliy3kqqcwv969m6ws3imr"; + version = "1.5.1"; + sha256 = "1c357c5a34k9nd3wjyg246kcc4lfwrrfl01pki2ksdidw9xwclij"; libraryHaskellDepends = [ base profunctors stm ]; testHaskellDepends = [ QuickCheck quickcheck-instances rerebase tasty tasty-hunit tasty-quickcheck ]; - homepage = "https://github.com/nikita-volkov/potoki-core"; + homepage = "https://github.com/metrix-ai/potoki-core"; description = "Low-level components of \"potoki\""; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; @@ -161780,14 +162433,14 @@ self: { }) {}; "pragmatic-show" = callPackage - ({ mkDerivation, base, tasty, tasty-hunit, tasty-quickcheck - , vector-space + ({ mkDerivation, base, containers, tasty, tasty-hunit + , tasty-quickcheck, vector-space }: mkDerivation { pname = "pragmatic-show"; - version = "0.1.1.0"; - sha256 = "0zkvdgghzyarvkx0ggcbpmmcbrkkk9dhbiq6xz4ljvdc9872hya6"; - libraryHaskellDepends = [ base ]; + version = "0.1.2.0"; + sha256 = "1nkwimmnk10p0pnv2hr3mxgfs1r2rjfhiaccmhd68a6279whp6p7"; + libraryHaskellDepends = [ base containers ]; testHaskellDepends = [ base tasty tasty-hunit tasty-quickcheck vector-space ]; @@ -163600,6 +164253,8 @@ self: { pname = "progress-reporting"; version = "1.1.0"; sha256 = "02j1i28hcd54w1j9p0d8xzc1bns7swd8js5f6d6ppikc82hlb9bj"; + revision = "1"; + editedCabalFile = "1a20ziwki29chw069jqrjm2rb64j4sfxbi7xyqxqd6vh9gpwdmm1"; libraryHaskellDepends = [ base deepseq mtl time ]; description = "Functionality for reporting function progress"; license = stdenv.lib.licenses.lgpl3; @@ -164030,8 +164685,8 @@ self: { }: mkDerivation { pname = "propellor"; - version = "5.3.2"; - sha256 = "1jv4yzls8l4blnvmrrbwljx999g92gklpj52pn1r48sh40sqa7l1"; + version = "5.3.3"; + sha256 = "16gj3mc76ld19s58mldx3zsxn9z0xya543906x5hvr1qv6w1sw61"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -166039,8 +166694,8 @@ self: { }: mkDerivation { pname = "qr-imager"; - version = "1.0.1.5"; - sha256 = "1csgghcv093g8hmkaxyj2vm0ym28yw37d7crj4rgk8fs8qhr5ib4"; + version = "1.0.1.6"; + sha256 = "0kc69xkqinvwk7hxblxkspnmj422c1pbdig9kvh3r8sj1in0lpmn"; libraryHaskellDepends = [ aeson base bytestring cryptonite directory either haskell-qrencode jose-jwt JuicyPixels microlens optparse-applicative process split @@ -167041,6 +167696,8 @@ self: { pname = "quickspec"; version = "2"; sha256 = "0hdyw114f5skc66v0n0mghcx1ax8gfgilm42h4wqkwzyj6rkiy6r"; + revision = "1"; + editedCabalFile = "1nic3b13khhnykpvynzw7xjsw7ldvc4jfxdbjfj6xxsyig7lk4qb"; libraryHaskellDepends = [ base constraints containers data-lens-light dlist QuickCheck random reflection template-haskell transformers twee-lib uglymemo @@ -171263,6 +171920,8 @@ self: { pname = "regex-tdfa"; version = "1.2.2"; sha256 = "0f8x8wyr6m21g8dnxvnvalz5bsq37l125l6qhs0fscbvprsxc4nb"; + revision = "1"; + editedCabalFile = "0m2i94gm6a1m6sn3mj47jbnmjp5ksiqmdn6v4pdr7xsv5a15gfwn"; libraryHaskellDepends = [ array base bytestring containers ghc-prim mtl parsec regex-base ]; @@ -172988,6 +173647,8 @@ self: { pname = "resolv"; version = "0.1.1.1"; sha256 = "0wh7wj56l3f2bylz563g5g04a4nydj8acv60hpwa7k3mn792xca9"; + revision = "1"; + editedCabalFile = "15ay4n3x8c09cb3h4z1nan84yd3n9zpgvi6h114hk98bq10k8mma"; libraryHaskellDepends = [ base base16-bytestring binary bytestring containers ]; @@ -173633,6 +174294,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "retry_0_7_6_1" = callPackage + ({ mkDerivation, base, data-default-class, exceptions, ghc-prim + , hedgehog, HUnit, mtl, random, stm, tasty, tasty-hedgehog + , tasty-hunit, time, transformers + }: + mkDerivation { + pname = "retry"; + version = "0.7.6.1"; + sha256 = "052kfbfvadrp2m8l0hnwi4j1jhqcw5m93wl9868863p5bd4w7j82"; + libraryHaskellDepends = [ + base data-default-class exceptions ghc-prim random transformers + ]; + testHaskellDepends = [ + base data-default-class exceptions ghc-prim hedgehog HUnit mtl + random stm tasty tasty-hedgehog tasty-hunit time transformers + ]; + homepage = "http://github.com/Soostone/retry"; + description = "Retry combinators for monadic actions that may fail"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "retryer" = callPackage ({ mkDerivation, base, optparse-applicative, process }: mkDerivation { @@ -176020,6 +176703,8 @@ self: { pname = "safe-exceptions"; version = "0.1.7.0"; sha256 = "0sd0zfsm9pcll5bzzj523rbn45adjrnavdkz52hgmdjjgdcdrk8q"; + revision = "1"; + editedCabalFile = "12rv8mjrchpx9xaw87ph1hccr5hs6mb0g1imxjr8adw45prnvrw4"; libraryHaskellDepends = [ base deepseq exceptions transformers ]; testHaskellDepends = [ base hspec void ]; homepage = "https://github.com/fpco/safe-exceptions#readme"; @@ -178252,8 +178937,8 @@ self: { }: mkDerivation { pname = "scuttlebutt-types"; - version = "0.3.0"; - sha256 = "015pg2y2k0s88wgjjv3h1h8gl3f07lbj2v8s9i1cqk5qzrs7jhrm"; + version = "0.4.0"; + sha256 = "17srdak7xbwwagm3mv7wyqff27yi217a6pjkzl2gz3n5z3h210ri"; libraryHaskellDepends = [ aeson base base64-bytestring bytestring cryptonite ed25519 memory text vector @@ -178880,6 +179565,21 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "securemem_0_1_10" = callPackage + ({ mkDerivation, base, byteable, bytestring, ghc-prim, memory }: + mkDerivation { + pname = "securemem"; + version = "0.1.10"; + sha256 = "19hnw2cfbsfjynxq1bq9f6djbxhsc1k751ml0y1ab3ah913mm29j"; + libraryHaskellDepends = [ + base byteable bytestring ghc-prim memory + ]; + homepage = "https://github.com/vincenthz/hs-securemem"; + description = "abstraction to an auto scrubbing and const time eq, memory chunk"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "sednaDBXML" = callPackage ({ mkDerivation, base, bindings-DSL, bytestring, containers , iteratee, mtl, sedna, text @@ -178905,6 +179605,8 @@ self: { pname = "selda"; version = "0.1.12"; sha256 = "1pbf141p3j2gj91lz4ilfc75kf2b0mzfnzxpjn220knkzianm2d9"; + revision = "1"; + editedCabalFile = "06j1yv9w46nm5hrs15na1bisv63kkscifq01c8qq66li4vm79l8z"; libraryHaskellDepends = [ base bytestring exceptions hashable mtl psqueues text time unordered-containers @@ -178914,6 +179616,24 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "selda_0_1_12_1" = callPackage + ({ mkDerivation, base, bytestring, exceptions, hashable, mtl + , psqueues, text, time, unordered-containers + }: + mkDerivation { + pname = "selda"; + version = "0.1.12.1"; + sha256 = "1iq0fnk17qn74vwl8mjv7zr1y90f3x1hwniy0dmg3h0s5clpcqa9"; + libraryHaskellDepends = [ + base bytestring exceptions hashable mtl psqueues text time + unordered-containers + ]; + homepage = "https://selda.link"; + description = "Multi-backend, high-level EDSL for interacting with SQL databases"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "selda-postgresql" = callPackage ({ mkDerivation, base, bytestring, exceptions, postgresql-libpq , selda, text @@ -178922,6 +179642,8 @@ self: { pname = "selda-postgresql"; version = "0.1.7.1"; sha256 = "1izc27wdi9ldhjmmhwjw99g8pgbcayldwn65p5lsad173nc2rd22"; + revision = "1"; + editedCabalFile = "0nkhzbkvhfcp9nsq6w45ag2l7w848iw7hfllfian16vfhqc4qpld"; libraryHaskellDepends = [ base bytestring exceptions postgresql-libpq selda text ]; @@ -178930,6 +179652,23 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "selda-postgresql_0_1_7_2" = callPackage + ({ mkDerivation, base, bytestring, exceptions, postgresql-libpq + , selda, text + }: + mkDerivation { + pname = "selda-postgresql"; + version = "0.1.7.2"; + sha256 = "06z5zrika018433p5l011wxc308zw7l9ilnkgwcykagsnmai4y7z"; + libraryHaskellDepends = [ + base bytestring exceptions postgresql-libpq selda text + ]; + homepage = "https://github.com/valderman/selda"; + description = "PostgreSQL backend for the Selda database EDSL"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "selda-sqlite" = callPackage ({ mkDerivation, base, direct-sqlite, directory, exceptions, selda , text @@ -178938,6 +179677,8 @@ self: { pname = "selda-sqlite"; version = "0.1.6.0"; sha256 = "1473igqgjs5282rykqj1zg7420mfh3sbqy74nx1cwbm82j8shyy6"; + revision = "1"; + editedCabalFile = "0yf1n9iaaafnllkb2yi38ncyd3q062g4p7ln9ypb6h8gcym8s8m1"; libraryHaskellDepends = [ base direct-sqlite directory exceptions selda text ]; @@ -180442,21 +181183,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "servant-checked-exceptions_1_0_0_0" = callPackage + "servant-checked-exceptions_1_1_0_0" = callPackage ({ mkDerivation, aeson, base, bytestring, deepseq, doctest, Glob , hspec-wai, http-media, http-types, profunctors, servant - , servant-client, servant-docs, servant-server, tagged, tasty - , tasty-hspec, tasty-hunit, text, wai + , servant-client, servant-client-core, servant-docs, servant-server + , tagged, tasty, tasty-hspec, tasty-hunit, text, wai }: mkDerivation { pname = "servant-checked-exceptions"; - version = "1.0.0.0"; - sha256 = "1kdjhjgk9m6giygvpd2b79qs08phjy72q2bh07f7wxkiwjbkq1k6"; + version = "1.1.0.0"; + sha256 = "1zvpha9czj4pnvdd53qcyl609x3w1hkaqxva7hk68bk65zd296jk"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson base bytestring deepseq http-media http-types profunctors - servant servant-client servant-docs servant-server tagged text wai + servant servant-client servant-client-core servant-docs + servant-server tagged text wai ]; testHaskellDepends = [ base bytestring doctest Glob hspec-wai http-types servant @@ -180882,8 +181624,7 @@ self: { description = "Servant combinators to facilitate writing GitHub webhooks"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; - broken = true; - }) {github-webhooks = null;}; + }) {}; "servant-haxl-client" = callPackage ({ mkDerivation, aeson, async, attoparsec, base, bytestring @@ -182858,15 +183599,15 @@ self: { "shake-ats" = callPackage ({ mkDerivation, base, binary, dependency, directory, hs2ats - , language-ats, lens, shake, shake-ext, text + , language-ats, microlens, shake, shake-ext, text }: mkDerivation { pname = "shake-ats"; - version = "1.5.0.4"; - sha256 = "19fhbwrxw5adma9d20l2wnmfcanjc7j14jyvh9c33h8scwiypjaa"; + version = "1.5.0.6"; + sha256 = "166i9v8d4fdbmriakndwkjgx10c4rags141ky0nw6x2ydziyn7n0"; libraryHaskellDepends = [ - base binary dependency directory hs2ats language-ats lens shake - shake-ext text + base binary dependency directory hs2ats language-ats microlens + shake shake-ext text ]; homepage = "https://github.com/vmchale/shake-ats#readme"; description = "Utilities for building ATS projects with shake"; @@ -182892,15 +183633,16 @@ self: { }) {}; "shake-ext" = callPackage - ({ mkDerivation, base, Cabal, directory, mtl, shake - , template-haskell, text + ({ mkDerivation, base, Cabal, composition-prelude, directory, mtl + , shake, template-haskell, text }: mkDerivation { pname = "shake-ext"; - version = "2.5.0.0"; - sha256 = "0bsl49x7y1mif4h3yp4k8p5n39d410nm0awxdpiwvan9pnz692df"; + version = "2.7.0.0"; + sha256 = "1jv5hcmv29ynr5asc4mpz4kh4ip5gd16b8h5qlcfac2f7m7njbwl"; libraryHaskellDepends = [ - base Cabal directory mtl shake template-haskell text + base Cabal composition-prelude directory mtl shake template-haskell + text ]; homepage = "https://hub.darcs.net/vmchale/shake-ext"; description = "Helper functions for linting with shake"; @@ -183784,6 +184526,8 @@ self: { pname = "show-combinators"; version = "0.1.0.0"; sha256 = "11ihjlpa5hgqhcbwcyclldgddppzgdqsz8hx1hqvamchqx3mgi12"; + revision = "1"; + editedCabalFile = "09zd78jap17ralla3833gwv6bwmh93bpjgdshkyf7j06xg2c1mq8"; libraryHaskellDepends = [ base ]; testHaskellDepends = [ base ]; homepage = "https://github.com/Lysxia/show-combinators#readme"; @@ -183824,6 +184568,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "show-prettyprint_0_2_0_2" = callPackage + ({ mkDerivation, ansi-wl-pprint, base, doctest, prettyprinter + , trifecta + }: + mkDerivation { + pname = "show-prettyprint"; + version = "0.2.0.2"; + sha256 = "1snkahqn081rnm6qs54hwgc3y2pwgadrvh8a81lw7rl1mfp261kg"; + libraryHaskellDepends = [ + ansi-wl-pprint base prettyprinter trifecta + ]; + testHaskellDepends = [ base doctest ]; + homepage = "https://github.com/quchen/show-prettyprint#readme"; + description = "Robust prettyprinter for output of auto-generated Show instances"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "show-type" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -186124,6 +186886,8 @@ self: { pname = "slug"; version = "0.1.7"; sha256 = "1pkxcb2ip4mb6szmqz3g7m3m8qfrvknjr5ii0wnd0icbzm1q4vyp"; + revision = "1"; + editedCabalFile = "0xy0zcrnfpdbkhks15p1g2zxl7zmfb0b5511mfcsvzxl9q8salf6"; libraryHaskellDepends = [ aeson base exceptions http-api-data path-pieces persistent QuickCheck text @@ -186348,6 +187112,34 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "smcdel" = callPackage + ({ mkDerivation, alex, ansi-terminal, array, base, containers + , criterion, cudd, directory, file-embed, filepath, graphviz, happy + , HasCacBDD, hspec, js-jquery, lens, process, QuickCheck, scotty + , tagged, template-haskell, temporary, text, time + }: + mkDerivation { + pname = "smcdel"; + version = "1.0.0"; + sha256 = "1yi2qw76i9cch1flnqd7gsradkm2gr31i8595rwf11xgvj3r3s3f"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + array base containers cudd graphviz HasCacBDD lens process + QuickCheck tagged temporary text time + ]; + executableHaskellDepends = [ + ansi-terminal base directory file-embed filepath HasCacBDD + js-jquery process scotty template-haskell text + ]; + executableToolDepends = [ alex happy ]; + testHaskellDepends = [ base containers hspec QuickCheck ]; + benchmarkHaskellDepends = [ base containers criterion time ]; + homepage = "https://github.com/jrclogic/SMCDEL"; + description = "Symbolic Model Checking for Dynamic Epistemic Logic"; + license = stdenv.lib.licenses.gpl2; + }) {}; + "sme" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -188987,23 +189779,23 @@ self: { "sparkle" = callPackage ({ mkDerivation, base, binary, bytestring, Cabal, choice , constraints, distributed-closure, filepath, inline-java, jni, jvm - , jvm-streaming, process, regex-tdfa, singletons, streaming, text - , vector, zip-archive + , jvm-streaming, process, regex-tdfa, singletons, streaming + , temporary, text, unix, vector, zip-archive }: mkDerivation { pname = "sparkle"; - version = "0.7.3"; - sha256 = "1wxp0wdmcvkypnayv128f2bgcdh7ka1b6ap7w5743v1gpxzkqb8b"; + version = "0.7.4"; + sha256 = "174rs21fgj43rq3nshzgff6mydi93n26nkcq9cadq0bzcasc2n3q"; isLibrary = true; isExecutable = true; - enableSeparateDataOutput = true; - setupHaskellDepends = [ base Cabal inline-java ]; + setupHaskellDepends = [ base Cabal inline-java jvm-streaming ]; libraryHaskellDepends = [ base binary bytestring choice constraints distributed-closure inline-java jni jvm jvm-streaming singletons streaming text vector ]; executableHaskellDepends = [ - base bytestring filepath process regex-tdfa text zip-archive + base bytestring filepath process regex-tdfa temporary text unix + zip-archive ]; homepage = "http://github.com/tweag/sparkle#readme"; description = "Distributed Apache Spark applications in Haskell"; @@ -192885,15 +193677,15 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "stratosphere_0_16_0" = callPackage + "stratosphere_0_17_0" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, bytestring, containers , hashable, hspec, hspec-discover, lens, template-haskell, text , unordered-containers }: mkDerivation { pname = "stratosphere"; - version = "0.16.0"; - sha256 = "0rdgp362g0i56kgia8gc9had6mpsh33gal2zscnqapv0nk00hgbs"; + version = "0.17.0"; + sha256 = "1824fgv3jm25wa3sk53v7j76jpq8kqh9fm3jfpp8hlzwnb57zni9"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -197518,6 +198310,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "tagsoup_0_14_6" = callPackage + ({ mkDerivation, base, bytestring, containers, deepseq, directory + , process, QuickCheck, text, time + }: + mkDerivation { + pname = "tagsoup"; + version = "0.14.6"; + sha256 = "1yv3dbyb0i1yqm796jgc4jj5kxkla1sxb3b2klw5ks182kdx8kjb"; + libraryHaskellDepends = [ base bytestring containers text ]; + testHaskellDepends = [ + base bytestring deepseq directory process QuickCheck time + ]; + homepage = "https://github.com/ndmitchell/tagsoup#readme"; + description = "Parsing and extracting information from (possibly malformed) HTML/XML documents"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "tagsoup-ht" = callPackage ({ mkDerivation, base, bytestring, containers, data-accessor , explicit-exception, old-time, tagsoup, transformers, utility-ht @@ -198214,15 +199024,15 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "tasty-discover_4_1_4" = callPackage + "tasty-discover_4_1_5" = callPackage ({ mkDerivation, base, containers, directory, filepath, Glob , hedgehog, tasty, tasty-hedgehog, tasty-hspec, tasty-hunit , tasty-quickcheck, tasty-smallcheck }: mkDerivation { pname = "tasty-discover"; - version = "4.1.4"; - sha256 = "1785i3jqc7qkc021zk6yzvkkbpm66s6b4mhyfsyasm2sslpgvwp2"; + version = "4.1.5"; + sha256 = "1v2g0jyfrcv04klxicp1z6p478ppq5l3szkx4f4hjqnim6kg8pgh"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -203181,14 +203991,14 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; - "time_1_9" = callPackage + "time_1_9_1" = callPackage ({ mkDerivation, base, deepseq, QuickCheck, random, tasty , tasty-hunit, tasty-quickcheck, unix }: mkDerivation { pname = "time"; - version = "1.9"; - sha256 = "13nfiwsh1bq4w9rwmqm1iy9kxwrqbi82qpqlpcd02ywklh21silx"; + version = "1.9.1"; + sha256 = "1nsvkxfm4gvmsmwd88ybpbpbny99b9k9z1f5cdkwlghvr0amg7s7"; libraryHaskellDepends = [ base deepseq ]; testHaskellDepends = [ base deepseq QuickCheck random tasty tasty-hunit tasty-quickcheck @@ -206992,8 +207802,8 @@ self: { }: mkDerivation { pname = "twee"; - version = "2.1.2"; - sha256 = "0i57wva87yh31j0wp3a041jskn3panjy6lh97013d251rcrll8jf"; + version = "2.1.3"; + sha256 = "08grsv9x9a289lh5w9vx401zshs6fa31756mdzmac0w9nk92229k"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -207011,8 +207821,8 @@ self: { }: mkDerivation { pname = "twee-lib"; - version = "2.1.2"; - sha256 = "0mvyzssazd8dggsdq8qpqn3l94970wvshxz99bhyifyfasabwm5h"; + version = "2.1.3"; + sha256 = "0yp6qdm189jhapx9y80yq9r97bv2v2w3n7q070i7hzczmg55rjqi"; libraryHaskellDepends = [ base containers dlist ghc-prim pretty primitive transformers vector ]; @@ -210340,6 +211150,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "unix-time_0_3_8" = callPackage + ({ mkDerivation, base, binary, bytestring, doctest, hspec + , old-locale, old-time, QuickCheck, time + }: + mkDerivation { + pname = "unix-time"; + version = "0.3.8"; + sha256 = "051slgpid5cxiaw203ky0ql3823h28fcjs08axkzd4265wrvv8fw"; + libraryHaskellDepends = [ base binary bytestring old-time ]; + testHaskellDepends = [ + base bytestring doctest hspec old-locale old-time QuickCheck time + ]; + description = "Unix time parser/formatter and utilities"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "unjson" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring, containers , free, hashable, HUnit, invariant, pretty, primitive, scientific @@ -210404,6 +211231,8 @@ self: { pname = "unliftio-core"; version = "0.1.1.0"; sha256 = "1193fplsjm1lcr05xwvkj1rsyzx74i755f6kw3ikmxbsv0bv0l3m"; + revision = "1"; + editedCabalFile = "16bjwcsaghqqmyi69rq65dn3ydifyfaabq3ns37apdm00mwqbcj2"; libraryHaskellDepends = [ base transformers ]; homepage = "https://github.com/fpco/unliftio/tree/master/unliftio-core#readme"; description = "The MonadUnliftIO typeclass for unlifting monads to IO"; @@ -210934,6 +211763,37 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "uri-bytestring_0_3_1_1" = callPackage + ({ mkDerivation, attoparsec, base, base-compat, blaze-builder + , bytestring, containers, criterion, deepseq, deepseq-generics + , fail, generics-sop, HUnit, network-uri, QuickCheck + , quickcheck-instances, semigroups, tasty, tasty-hunit + , tasty-quickcheck, template-haskell, th-lift-instances + , transformers + }: + mkDerivation { + pname = "uri-bytestring"; + version = "0.3.1.1"; + sha256 = "1ysmwf2zqv6kky2656nk6i2azpngzl0rkgy5fab7ja3xhx998y3z"; + libraryHaskellDepends = [ + attoparsec base blaze-builder bytestring containers fail + template-haskell th-lift-instances + ]; + testHaskellDepends = [ + attoparsec base base-compat blaze-builder bytestring containers + generics-sop HUnit QuickCheck quickcheck-instances semigroups tasty + tasty-hunit tasty-quickcheck transformers + ]; + benchmarkHaskellDepends = [ + base blaze-builder bytestring criterion deepseq deepseq-generics + network-uri + ]; + homepage = "https://github.com/Soostone/uri-bytestring"; + description = "Haskell URI parsing as ByteStrings"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "uri-bytestring-aeson" = callPackage ({ mkDerivation, aeson, base, bytestring, text, uri-bytestring }: mkDerivation { @@ -212178,6 +213038,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "validation_1" = callPackage + ({ mkDerivation, base, bifunctors, deepseq, hedgehog, HUnit, lens + , semigroupoids, semigroups + }: + mkDerivation { + pname = "validation"; + version = "1"; + sha256 = "08drmdvyzg2frbb26icy1mlz52xv0l6gi3v8gb7xp0vrcci5libh"; + libraryHaskellDepends = [ + base bifunctors deepseq lens semigroupoids semigroups + ]; + testHaskellDepends = [ base hedgehog HUnit lens semigroups ]; + homepage = "https://github.com/qfpl/validation"; + description = "A data-type like Either but with an accumulating Applicative"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "validations" = callPackage ({ mkDerivation, base, containers, digestive-functors, HUnit, mtl , QuickCheck, test-framework, test-framework-hunit @@ -218917,8 +219795,8 @@ self: { }: mkDerivation { pname = "wrecker-ui"; - version = "3.1.1.0"; - sha256 = "0lsgbjn4fcvk5qaldhlskyz3vq9g6w7an0sqbvndx7r1hvpaznrh"; + version = "3.3.1.0"; + sha256 = "08xlf26c45nir84ayss6zsjimabwa17yk55hzrdl1li9448wq89p"; isLibrary = false; isExecutable = true; enableSeparateDataOutput = true; @@ -221113,8 +221991,8 @@ self: { }: mkDerivation { pname = "xmlbf"; - version = "0.2"; - sha256 = "1jzh5xz4l3va58mqz11bh5ysavlr17jh7qd74qcqbmz2bsfav136"; + version = "0.3"; + sha256 = "0zvv7ajwj45wsm751951i37ncn2lh73d8h5vqhladi2g14pi9yjb"; libraryHaskellDepends = [ base bytestring containers text transformers unordered-containers ]; @@ -221134,8 +222012,8 @@ self: { }: mkDerivation { pname = "xmlbf-xeno"; - version = "0.1"; - sha256 = "0xg7v4jqrh2qnnh6cxqlaaq6ss0vav7182gm92bm6lw0pb9mj5lq"; + version = "0.1.1"; + sha256 = "0cnxcw1sh92ljcpla2j7pg0md8yj7j48jgjlsn0f9ha0j90lw73c"; libraryHaskellDepends = [ base bytestring html-entities text unordered-containers xeno xmlbf ]; @@ -221156,8 +222034,8 @@ self: { }: mkDerivation { pname = "xmlbf-xmlhtml"; - version = "0.1"; - sha256 = "1f8q83jy45nqxmwmw6i47dq3v350cdlrz6c8w6r7dgsczgyda6vd"; + version = "0.1.1"; + sha256 = "0x8fr4dqa1i3ylwh98r69xavrfgl2i97s9iili14wpqap0pg8aa4"; libraryHaskellDepends = [ base bytestring html-entities text unordered-containers xmlbf xmlhtml @@ -221492,8 +222370,8 @@ self: { }: mkDerivation { pname = "xmonad-vanessa"; - version = "0.1.1.6"; - sha256 = "1im97p6g7c7gvcm9an7nzv9k7yipvd5yv39zfgr26q7vnr6hj4dq"; + version = "0.1.1.8"; + sha256 = "17w7hj4bgz1xkirj9dwgkbif4vpqvjnp5g2dvjna7qg5rw2hk3zj"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -224056,8 +224934,8 @@ self: { }: mkDerivation { pname = "yesod-markdown"; - version = "0.12.0"; - sha256 = "0hqpshgjx3agci4wxgzi6v3s8y0q5d4x18gkqlf204a3fynm0fmh"; + version = "0.12.2"; + sha256 = "0bakc1znfqpjmm2yw7sd1gsqkq47bpr3alz6d2fp280qdxjb7hsx"; libraryHaskellDepends = [ base blaze-html blaze-markup bytestring directory pandoc persistent shakespeare text xss-sanitize yesod-core yesod-form @@ -226373,8 +227251,8 @@ self: { pname = "zip"; version = "0.2.0"; sha256 = "18r3n1q4acn8fp3hcb47zr43nmpiab3j7r5m06j7csgm17x93vsr"; - revision = "1"; - editedCabalFile = "1lq4v58kq4mwqczbdly4xnhg0pwsn4a5jmsdm38l2svri3by1hbb"; + revision = "2"; + editedCabalFile = "0vwbgpk6arp1hfndsm9n0f91yhagyqa0byiwvpl77gbiirbzrlwj"; libraryHaskellDepends = [ base bytestring bzlib-conduit case-insensitive cereal conduit conduit-extra containers digest exceptions filepath monad-control @@ -226401,6 +227279,8 @@ self: { pname = "zip"; version = "1.0.0"; sha256 = "166iqyrmghlwwnka1gyxqjh875x7d3h0jnljlaslfvkfjhvb9ym9"; + revision = "1"; + editedCabalFile = "0yplpja4gbfr8lkwvv5q8lx9bia2dzm178hyhlmw1s2hniqjxzkn"; libraryHaskellDepends = [ base bytestring bzlib-conduit case-insensitive cereal conduit conduit-extra containers digest directory dlist exceptions filepath From 8b537488a52632da6d583552e8d6e8cc1fd2c9fb Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 1 Mar 2018 14:52:21 +0100 Subject: [PATCH 180/814] git-annex: update sha256 hash for the new version --- pkgs/development/haskell-modules/configuration-common.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 39897f824059..db92fb310818 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -80,7 +80,7 @@ self: super: { name = "git-annex-${drv.version}-src"; url = "git://git-annex.branchable.com/"; rev = "refs/tags/" + drv.version; - sha256 = "0vvh1k7i6y4bqy6fn8z5i6ndqv6x94hvk2zh5gw99na8kfri7sxq"; + sha256 = "0fdcv9nig896ckl9x51ximxsvja1ii8qysf6c9ickvc0511hvr9w"; }; })).override { dbus = if pkgs.stdenv.isLinux then self.dbus else null; From e05c99cfda7030f7836ddc6b651ba494f4a3f7d2 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 1 Mar 2018 21:58:31 +0100 Subject: [PATCH 181/814] hackage: update database snapshot to latest version --- pkgs/data/misc/hackage/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/misc/hackage/default.nix b/pkgs/data/misc/hackage/default.nix index 55d975e70d27..8a29600f250d 100644 --- a/pkgs/data/misc/hackage/default.nix +++ b/pkgs/data/misc/hackage/default.nix @@ -1,6 +1,6 @@ { fetchurl }: fetchurl { - url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/acac7d958b43c270c8411fc65895a531e496423f.tar.gz"; - sha256 = "15crmzdnj7lpbkhb44vhh7g0ghw0xj4cqkyqyg638dslijc5mjzd"; + url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/9f6344416728bff8b5279e0c45941fd8da361eb9.tar.gz"; + sha256 = "0zm53wxvm7z72605qvgv0dzsfq91lyffpr850cks23r979pjvkv8"; } From 17af21d2316dd13d1602e33fd9e6892725272e82 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Thu, 1 Mar 2018 15:35:15 -0600 Subject: [PATCH 182/814] range-v3: 2017-01-30 -> 0.3.5 --- pkgs/development/libraries/range-v3/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/range-v3/default.nix b/pkgs/development/libraries/range-v3/default.nix index f1d9026b5f92..044a0f86c6c7 100644 --- a/pkgs/development/libraries/range-v3/default.nix +++ b/pkgs/development/libraries/range-v3/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "range-v3-${version}"; - version = "2017-01-30"; + version = "0.3.5"; src = fetchFromGitHub { owner = "ericniebler"; repo = "range-v3"; - rev = "bab29767cce120e11872d79a2537bc6f0be76963"; - sha256 = "0kncpxms3f0nmn6jppp484244xq15d9298g3h3nlm1wvq8ib1jhi"; + rev = version; + sha256 = "00bwm7n3wyf49xpr7zjhm08dzwx3lwibgafi6isvfls3dhk1m4kp"; }; dontBuild = true; From a3c57acef4a0c7ade1e1ee5a5deed748a90da2f9 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Thu, 1 Mar 2018 16:40:10 -0500 Subject: [PATCH 183/814] xpdf: specify paths to Qt plugins On Darwing this fixes icons and "native" look. Fixes: #36188 --- pkgs/applications/misc/xpdf/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/xpdf/default.nix b/pkgs/applications/misc/xpdf/default.nix index 42622b62f61b..3b05c9be451f 100644 --- a/pkgs/applications/misc/xpdf/default.nix +++ b/pkgs/applications/misc/xpdf/default.nix @@ -1,9 +1,9 @@ { enableGUI ? true, enablePDFtoPPM ? true, useT1Lib ? false , stdenv, fetchurl, zlib, libpng, freetype ? null, t1lib ? null -, cmake, qtbase ? null, makeWrapper +, cmake, qtbase ? null, qtsvg ? null, makeWrapper }: -assert enableGUI -> qtbase != null && freetype != null; +assert enableGUI -> qtbase != null && qtsvg != null && freetype != null; assert enablePDFtoPPM -> freetype != null; assert useT1Lib -> t1lib != null; @@ -38,7 +38,7 @@ stdenv.mkDerivation { postInstall = stdenv.lib.optionalString stdenv.isDarwin '' wrapProgram $out/bin/xpdf \ - --set QT_QPA_PLATFORM_PLUGIN_PATH ${qtbase.bin}/lib/qt-*/plugins/platforms + --set QT_PLUGIN_PATH ${qtbase.bin}/${qtbase.qtPluginPrefix}:${qtsvg.bin}/${qtbase.qtPluginPrefix} ''; meta = { From 2e59e03d177ca60fc893735b0936c1c5edea80f2 Mon Sep 17 00:00:00 2001 From: Will Dietz Date: Thu, 1 Mar 2018 15:46:03 -0600 Subject: [PATCH 184/814] range-v3: tests --- pkgs/development/libraries/range-v3/default.nix | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/range-v3/default.nix b/pkgs/development/libraries/range-v3/default.nix index 044a0f86c6c7..bddda1dff552 100644 --- a/pkgs/development/libraries/range-v3/default.nix +++ b/pkgs/development/libraries/range-v3/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub }: +{ stdenv, fetchFromGitHub, cmake }: stdenv.mkDerivation rec { name = "range-v3-${version}"; @@ -11,11 +11,12 @@ stdenv.mkDerivation rec { sha256 = "00bwm7n3wyf49xpr7zjhm08dzwx3lwibgafi6isvfls3dhk1m4kp"; }; - dontBuild = true; - installPhase = '' - mkdir -p $out/include - mv include/ $out/ - ''; + nativeBuildInputs = [ cmake ]; + + doCheck = true; + checkTarget = "test"; + + enableParallelBuilding = true; meta = with stdenv.lib; { description = "Experimental range library for C++11/14/17"; From a9409104a0462bca4ae171bf809d9bbc8ba5933d Mon Sep 17 00:00:00 2001 From: Matthew Maurer Date: Thu, 1 Mar 2018 12:10:41 -0500 Subject: [PATCH 185/814] bap: 1.2 -> 1.4 --- pkgs/development/libraries/libbap/default.nix | 6 +++--- .../development/ocaml-modules/bap/default.nix | 21 +++++++++---------- .../python-modules/bap/default.nix | 6 +++--- pkgs/top-level/all-packages.nix | 2 +- pkgs/top-level/ocaml-packages.nix | 2 +- pkgs/top-level/python-packages.nix | 2 +- 6 files changed, 19 insertions(+), 20 deletions(-) diff --git a/pkgs/development/libraries/libbap/default.nix b/pkgs/development/libraries/libbap/default.nix index a427bd99dd58..54fb89df0451 100644 --- a/pkgs/development/libraries/libbap/default.nix +++ b/pkgs/development/libraries/libbap/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { name = "libbap-${version}"; - version = "master-2017-02-08"; + version = "master-2018-03-01"; src = fetchFromGitHub { owner = "BinaryAnalysisPlatform"; repo = "bap-bindings"; - rev = "b3da5bd5cdb3d646015ccdeb886b5ea8fd85a108"; - sha256 = "0cwfyfpxbi9bm4kkpamyd7mgsm5b6j1rh217fqb5gi05wg45rkbb"; + rev = "bd125c379a784d4265c2ddcf1f6e34bde2e568d4"; + sha256 = "0dp90djyjc262v1b1cw5irp424a8394y86fyprdk8z741wg56m3v"; }; nativeBuildInputs = [ autoreconfHook which ]; diff --git a/pkgs/development/ocaml-modules/bap/default.nix b/pkgs/development/ocaml-modules/bap/default.nix index ea151d1e0e5c..8c42783c9780 100644 --- a/pkgs/development/ocaml-modules/bap/default.nix +++ b/pkgs/development/ocaml-modules/bap/default.nix @@ -1,18 +1,21 @@ -{stdenv, buildOcaml, fetchFromGitHub, fetchurl, camlp4, ocaml_oasis, bitstring, camlzip, cmdliner, core_kernel, ezjsonm, faillib, fileutils, ocaml_lwt, ocamlgraph, ocurl, re, uri, zarith, piqi, piqi-ocaml, uuidm, llvm_38, ulex, easy-format, xmlm, frontc, ounit, utop, which, makeWrapper, writeText, ocaml}: +{stdenv, buildOcaml, fetchFromGitHub, fetchurl, camlp4, ocaml_oasis, + bitstring, camlzip, cmdliner, core_kernel, ezjsonm, faillib, fileutils, ocaml_lwt, ocamlgraph, ocurl, re, uri, zarith, piqi, piqi-ocaml, uuidm, llvm_38, ulex, easy-format, xmlm, frontc, ounit, ppx_jane, parsexp, + utop, + which, makeWrapper, writeText, ocaml}: buildOcaml rec { name = "bap"; - version = "1.2.0"; + version = "1.4.0"; src = fetchFromGitHub { owner = "BinaryAnalysisPlatform"; repo = "bap"; rev = "v${version}"; - sha256 = "0dn1gvj73pma0rsw8r50cmjddibnf42w1kbskb2vpzq0kb79jlkw"; + sha256 = "0329m65x8q5q8vgvsqgyz2vz7q6qkh2rh11j7x29hckk3fzxsf8g"; }; sigs = fetchurl { url = "https://github.com/BinaryAnalysisPlatform/bap/releases/download/v${version}/sigs.zip"; - sha256 = "0mpsq2pinbrynlisnh8j3nrlamlsls7lza0bkqnm9szqjjdmcgfn"; + sha256 = "0k761w82zkmi5dwsfqq61dbjnb8mmmpb2xwp7vp85xs14g5fjz19"; }; createFindlibDestdir = true; @@ -28,7 +31,7 @@ buildOcaml rec { llvm_38 utop ]; - propagatedBuildInputs = [ bitstring camlzip cmdliner core_kernel ezjsonm faillib fileutils ocaml_lwt ocamlgraph ocurl re uri zarith piqi + propagatedBuildInputs = [ bitstring camlzip cmdliner ppx_jane core_kernel ezjsonm faillib fileutils ocaml_lwt ocamlgraph ocurl re uri zarith piqi parsexp piqi-ocaml uuidm frontc ounit ]; installPhase = '' @@ -45,11 +48,7 @@ buildOcaml rec { disableIda = "--disable-ida --disable-fsi-benchmark"; - doCheck = true; - - checkTarget = "check test"; - - configureFlags = "--enable-everything --enable-tests ${disableIda} --with-llvm-config=${llvm_38}/bin/llvm-config"; + configureFlags = "--enable-everything ${disableIda} --with-llvm-config=${llvm_38}/bin/llvm-config"; BAPBUILDFLAGS = "-j $(NIX_BUILD_CORES)"; @@ -58,6 +57,6 @@ buildOcaml rec { homepage = https://github.com/BinaryAnalysisPlatform/bap/; maintainers = [ maintainers.maurer ]; license = licenses.mit; - broken = versionAtLeast ocaml.version "4.03"; + broken = versionOlder ocaml.version "4.03"; }; } diff --git a/pkgs/development/python-modules/bap/default.nix b/pkgs/development/python-modules/bap/default.nix index 6a8e33dc2ee6..2e85a1017b6e 100644 --- a/pkgs/development/python-modules/bap/default.nix +++ b/pkgs/development/python-modules/bap/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "bap"; - version = "1.1.0"; + version = "1.3.1"; name = "${pname}-${version}"; src = fetchFromGitHub { owner = "BinaryAnalysisPlatform"; repo = "bap-python"; - rev = "v${version}"; - sha256 = "0wd46ksxscgb2dci69sbndzxs6drq5cahraqq42cdk114hkrsxs3"; + rev = "${version}"; + sha256 = "1ahkrmcn7qaivps1gar8wd9mq2qqyx6zzvznf5r9rr05h17x5lbp"; }; propagatedBuildInputs = [bap requests]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 64d2aa8e7dc8..3c7c4c1c8b78 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9456,7 +9456,7 @@ with pkgs; libb2 = callPackage ../development/libraries/libb2 { }; libbap = callPackage ../development/libraries/libbap { - inherit (ocamlPackages_4_02) bap ocaml findlib ctypes; + inherit (ocamlPackages) bap ocaml findlib ctypes; }; libbass = (callPackage ../development/libraries/audio/libbass { }).bass; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 03c24de57d4e..4a6e4e815bb6 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -54,7 +54,7 @@ let base64 = callPackage ../development/ocaml-modules/base64 { }; - bap = callPackage ../development/ocaml-modules/bap { cmdliner = cmdliner_0_9; }; + bap = callPackage ../development/ocaml-modules/bap { }; batteries = callPackage ../development/ocaml-modules/batteries { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 3e6f4fcdafc8..82d26e92f2b4 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -184,7 +184,7 @@ in { backports_csv = callPackage ../development/python-modules/backports_csv {}; bap = callPackage ../development/python-modules/bap { - bap = pkgs.ocamlPackages_4_02.bap; + bap = pkgs.ocamlPackages.bap; }; bash_kernel = callPackage ../development/python-modules/bash_kernel { }; From f6de73b4366754f7f1a064a4b7f948543a90d067 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Wed, 28 Feb 2018 09:05:50 +0100 Subject: [PATCH 186/814] libreoffice-fresh: 5.4.1.2 -> 6.0.1.1 One of the newly disabled tests is not a pure rendering test and might be related to data consistency (unfortunately) --- .../libreoffice/default-primary-src.nix | 10 +- .../office/libreoffice/default.nix | 38 +- .../office/libreoffice/libreoffice-srcs.nix | 500 ++++++++++-------- pkgs/top-level/all-packages.nix | 3 + 4 files changed, 302 insertions(+), 249 deletions(-) diff --git a/pkgs/applications/office/libreoffice/default-primary-src.nix b/pkgs/applications/office/libreoffice/default-primary-src.nix index cc3329bdcc9d..6f5da5bea8e4 100644 --- a/pkgs/applications/office/libreoffice/default-primary-src.nix +++ b/pkgs/applications/office/libreoffice/default-primary-src.nix @@ -1,17 +1,17 @@ { fetchurl }: rec { - major = "5"; - minor = "4"; + major = "6"; + minor = "0"; patch = "1"; - tweak = "2"; + tweak = "1"; subdir = "${major}.${minor}.${patch}"; version = "${subdir}${if tweak == "" then "" else "."}${tweak}"; src = fetchurl { - url = "http://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${version}.tar.xz"; - sha256 = "0c17193vcf4nj8l5k9q87byv27px74kzp0hvgr1dfz5700cv086k"; + url = "https://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${version}.tar.xz"; + sha256 = "1abhas5hc0whibz39msk4r7njyrm7w8k0idk0y522ifndsf2m04g"; }; } diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix index 12989a4b8eff..1325d2de2fbc 100644 --- a/pkgs/applications/office/libreoffice/default.nix +++ b/pkgs/applications/office/libreoffice/default.nix @@ -1,14 +1,14 @@ -{ stdenv, fetchurl, pam, python3, libxslt, perl, ArchiveZip +{ stdenv, fetchurl, pam, python3, libxslt, perl, ArchiveZip, gettext , CompressZlib, zlib, libjpeg, expat, pkgconfigUpstream, freetype, libwpd , libxml2, db, sablotron, curl, fontconfig, libsndfile, neon , bison, flex, zip, unzip, gtk3, gtk2, libmspack, getopt, file, cairo, which , icu, boost, jdk, ant, cups, xorg, libcmis -, openssl, gperf, cppunit, GConf, ORBit2, poppler +, openssl, gperf, cppunit, GConf, ORBit2, poppler, utillinux , librsvg, gnome_vfs, mesa, bsh, CoinMP, libwps, libabw , autoconf, automake, openldap, bash, hunspell, librdf_redland, nss, nspr , libwpg, dbus-glib, glibc, qt4, clucene_core, libcdr, lcms, vigra , unixODBC, mdds, sane-backends, mythes, libexttextcat, libvisio -, fontsConf, pkgconfig, libzip, bluez5, libtool, maven +, fontsConf, pkgconfig, libzip, bluez5, libtool, maven, carlito , libatomic_ops, graphite2, harfbuzz, libodfgen, libzmf , librevenge, libe-book, libmwaw, glm, glew, gst_all_1 , gdb, commonsLogging, librdf_rasqal, wrapGAppsHook @@ -29,27 +29,27 @@ let langsSpaces = lib.concatStringsSep " " langs; fetchSrc = {name, sha256}: fetchurl { - url = "http://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${name}-${version}.tar.xz"; + url = "https://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${name}-${version}.tar.xz"; inherit sha256; }; srcs = { third_party = [ (let md5 = "185d60944ea767075d27247c3162b3bc"; in fetchurl rec { - url = "http://dev-www.libreoffice.org/extern/${md5}-${name}"; + url = "https://dev-www.libreoffice.org/extern/${md5}-${name}"; sha256 = "1infwvv1p6i21scywrldsxs22f62x85mns4iq8h6vr6vlx3fdzga"; name = "unowinreg.dll"; }) ] ++ (map (x : ((fetchurl {inherit (x) url sha256 name;}) // {inherit (x) md5name md5;})) (import ./libreoffice-srcs.nix)); translations = fetchSrc { name = "translations"; - sha256 = "1ir1f5jgjhpnxsw6izsryp4wg52ifzmcqyc0gdp9zh03rjf5i4cg"; + sha256 = "0iqhsb6nw5fx2vjmyygqjq0qw76igyrrwpv8126j833zv29wx8jj"; }; # TODO: dictionaries help = fetchSrc { name = "help"; - sha256 = "1apgc57a8q6lsjfq2f7pzdn7wanqm8zkkrkbq2nd4hidp6avgm6f"; + sha256 = "0iynlnj9304qvg4636rpy005pjc7avi1hv37nb3kppgm2k0gyrj4"; }; }; @@ -106,6 +106,11 @@ in stdenv.mkDerivation rec { # BLFS patch for Glibc 2.23 renaming isnan sed -ire "s@isnan@std::&@g" xmloff/source/draw/ximp3dscene.cxx + + # This is required as some cppunittests require fontconfig configured + cp "${fontsConf}" fonts.conf + sed -e '/include/i${carlito}/etc/fonts/conf.d' -i fonts.conf + export FONTCONFIG_FILE="$PWD/fonts.conf" ''; # fetch_Download_item tries to interpret the name as a variable name @@ -115,11 +120,13 @@ in stdenv.mkDerivation rec { sed -e '1ilibreoffice-help-${version}.tar.xz=libreoffice-help-${version}.tar.xz' -i Makefile # unit test sd_tiledrendering seems to be fragile - # http://nabble.documentfoundation.org/libreoffice-5-0-failure-in-CUT-libreofficekit-tiledrendering-td4150319.html + # https://nabble.documentfoundation.org/libreoffice-5-0-failure-in-CUT-libreofficekit-tiledrendering-td4150319.html echo > ./sd/CppunitTest_sd_tiledrendering.mk sed -e /CppunitTest_sd_tiledrendering/d -i sd/Module_sd.mk # one more fragile test? sed -e '/CPPUNIT_TEST(testTdf96536);/d' -i sw/qa/extras/uiwriter/uiwriter.cxx + # this I actually hate, this should be a data consistency test! + sed -e '/CPPUNIT_TEST(testTdf115013);/d' -i sw/qa/extras/uiwriter/uiwriter.cxx # rendering-dependent test sed -e '/CPPUNIT_ASSERT_EQUAL(11148L, pOleObj->GetLogicRect().getWidth());/d ' -i sc/qa/unit/subsequent_filters-test.cxx # tilde expansion in path processing checks the existence of $HOME @@ -138,6 +145,8 @@ in stdenv.mkDerivation rec { sed -zre 's/DesktopLOKTest::testGetFontSubset[^{]*[{]/& return; /' -i desktop/qa/desktop_lib/test_desktop_lib.cxx sed -z -r -e 's/DECLARE_OOXMLEXPORT_TEST[(]testFlipAndRotateCustomShape,[^)]*[)].[{]/& return;/' -i sw/qa/extras/ooxmlexport/ooxmlexport7.cxx sed -z -r -e 's/DECLARE_OOXMLEXPORT_TEST[(]tdf105490_negativeMargins,[^)]*[)].[{]/& return;/' -i sw/qa/extras/ooxmlexport/ooxmlexport9.cxx + sed -z -r -e 's/DECLARE_OOXMLIMPORT_TEST[(]testTdf112443,[^)]*[)].[{]/& return;/' -i sw/qa/extras/ooxmlimport/ooxmlimport.cxx + sed -z -r -e 's/DECLARE_RTFIMPORT_TEST[(]testTdf108947,[^)]*[)].[{]/& return;/' -i sw/qa/extras/rtfimport/rtfimport.cxx # not sure about this fragile test sed -z -r -e 's/DECLARE_OOXMLEXPORT_TEST[(]testTDF87348,[^)]*[)].[{]/& return;/' -i sw/qa/extras/ooxmlexport/ooxmlexport7.cxx ''; @@ -147,9 +156,6 @@ in stdenv.mkDerivation rec { enableParallelBuilding = true; buildPhase = '' - # This is required as some cppunittests require fontconfig configured - export FONTCONFIG_FILE=${fontsConf} - # This to avoid using /lib:/usr/lib at linking sed -i '/gb_LinkTarget_LDFLAGS/{ n; /rpath-link/d;}' solenv/gbuild/platform/unxgcc.mk @@ -229,8 +235,10 @@ in stdenv.mkDerivation rec { "--without-system-liblangtag" "--without-system-libmspub" "--without-system-libpagemaker" - "--without-system-libgltf" "--without-system-libstaroffice" + "--without-system-libepubgen" + "--without-system-libqxp" + "--without-system-mdds" # https://github.com/NixOS/nixpkgs/commit/5c5362427a3fa9aefccfca9e531492a8735d4e6f "--without-system-orcus" ]; @@ -252,9 +260,9 @@ in stdenv.mkDerivation rec { neon nspr nss openldap openssl ORBit2 pam perl pkgconfig poppler python3 sablotron sane-backends unzip vigra which zip zlib mdds bluez5 glibc libcmis libwps libabw libzmf libtool - libxshmfence libatomic_ops graphite2 harfbuzz gpgme + libxshmfence libatomic_ops graphite2 harfbuzz gpgme utillinux librevenge libe-book libmwaw glm glew ncurses xmlsec epoxy - libodfgen CoinMP librdf_rasqal defaultIconTheme + libodfgen CoinMP librdf_rasqal defaultIconTheme gettext gdb ] ++ lib.optional kdeIntegration kdelibs4; @@ -268,7 +276,7 @@ in stdenv.mkDerivation rec { meta = with lib; { description = "Comprehensive, professional-quality productivity suite, a variant of openoffice.org"; - homepage = http://libreoffice.org/; + homepage = https://libreoffice.org/; license = licenses.lgpl3; maintainers = with maintainers; [ viric raskin ]; platforms = platforms.linux; diff --git a/pkgs/applications/office/libreoffice/libreoffice-srcs.nix b/pkgs/applications/office/libreoffice/libreoffice-srcs.nix index d20ec2d0cc80..28c06b65869f 100644 --- a/pkgs/applications/office/libreoffice/libreoffice-srcs.nix +++ b/pkgs/applications/office/libreoffice/libreoffice-srcs.nix @@ -1,45 +1,45 @@ [ { - name = "libabw-0.1.1.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/libabw-0.1.1.tar.bz2"; - sha256 = "7a3d3415cf82ab9894f601d1b3057c4615060304d5279efdec6275e01b96a199"; + name = "libabw-0.1.2.tar.xz"; + url = "http://dev-www.libreoffice.org/src/libabw-0.1.2.tar.xz"; + sha256 = "0b72944d5af81dda0a5c5803ee84cbac4b81441a4d767aa57029adc6744c2485"; md5 = ""; - md5name = "-libabw-0.1.1.tar.bz2"; + md5name = "0b72944d5af81dda0a5c5803ee84cbac4b81441a4d767aa57029adc6744c2485-libabw-0.1.2.tar.xz"; } { name = "commons-logging-1.2-src.tar.gz"; url = "http://dev-www.libreoffice.org/src/commons-logging-1.2-src.tar.gz"; sha256 = "49665da5a60d033e6dff40fe0a7f9173e886ae859ce6096c1afe34c48b677c81"; md5 = ""; - md5name = "-commons-logging-1.2-src.tar.gz"; + md5name = "49665da5a60d033e6dff40fe0a7f9173e886ae859ce6096c1afe34c48b677c81-commons-logging-1.2-src.tar.gz"; } { name = "apr-1.5.2.tar.gz"; url = "http://dev-www.libreoffice.org/src/apr-1.5.2.tar.gz"; sha256 = "1af06e1720a58851d90694a984af18355b65bb0d047be03ec7d659c746d6dbdb"; md5 = ""; - md5name = "-apr-1.5.2.tar.gz"; + md5name = "1af06e1720a58851d90694a984af18355b65bb0d047be03ec7d659c746d6dbdb-apr-1.5.2.tar.gz"; } { name = "apr-util-1.5.4.tar.gz"; url = "http://dev-www.libreoffice.org/src/apr-util-1.5.4.tar.gz"; sha256 = "976a12a59bc286d634a21d7be0841cc74289ea9077aa1af46be19d1a6e844c19"; md5 = ""; - md5name = "-apr-util-1.5.4.tar.gz"; + md5name = "976a12a59bc286d634a21d7be0841cc74289ea9077aa1af46be19d1a6e844c19-apr-util-1.5.4.tar.gz"; } { - name = "boost_1_63_0.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/boost_1_63_0.tar.bz2"; - sha256 = "beae2529f759f6b3bf3f4969a19c2e9d6f0c503edcb2de4a61d1428519fcb3b0"; + name = "boost_1_65_1.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/boost_1_65_1.tar.bz2"; + sha256 = "9807a5d16566c57fd74fb522764e0b134a8bbe6b6e8967b83afefd30dcd3be81"; md5 = ""; - md5name = "-boost_1_63_0.tar.bz2"; + md5name = "9807a5d16566c57fd74fb522764e0b134a8bbe6b6e8967b83afefd30dcd3be81-boost_1_65_1.tar.bz2"; } { name = "breakpad.zip"; url = "http://dev-www.libreoffice.org/src/breakpad.zip"; sha256 = "7060149be16a8789b0ccf596bdeaf63115f03f520acb508f72a14686fb311cb9"; md5 = ""; - md5name = "-breakpad.zip"; + md5name = "7060149be16a8789b0ccf596bdeaf63115f03f520acb508f72a14686fb311cb9-breakpad.zip"; } { name = "bsh-2.0b6-src.zip"; @@ -56,18 +56,18 @@ md5name = "00b516f4704d4a7cb50a1d97e6e8e15b-bzip2-1.0.6.tar.gz"; } { - name = "cairo-1.14.8.tar.xz"; - url = "http://dev-www.libreoffice.org/src/cairo-1.14.8.tar.xz"; - sha256 = "d1f2d98ae9a4111564f6de4e013d639cf77155baf2556582295a0f00a9bc5e20"; + name = "cairo-1.14.10.tar.xz"; + url = "http://dev-www.libreoffice.org/src/cairo-1.14.10.tar.xz"; + sha256 = "7e87878658f2c9951a14fc64114d4958c0e65ac47530b8ac3078b2ce41b66a09"; md5 = ""; - md5name = "-cairo-1.14.8.tar.xz"; + md5name = "7e87878658f2c9951a14fc64114d4958c0e65ac47530b8ac3078b2ce41b66a09-cairo-1.14.10.tar.xz"; } { - name = "libcdr-0.1.3.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/libcdr-0.1.3.tar.bz2"; - sha256 = "5160bbbfefe52bd4880840fad2b07a512813e37bfaf8ccac062fca238f230f4d"; + name = "libcdr-0.1.4.tar.xz"; + url = "http://dev-www.libreoffice.org/src/libcdr-0.1.4.tar.xz"; + sha256 = "e7a7e8b00a3df5798110024d7061fe9d1c3330277d2e4fa9213294f966a4a66d"; md5 = ""; - md5name = "-libcdr-0.1.3.tar.bz2"; + md5name = "e7a7e8b00a3df5798110024d7061fe9d1c3330277d2e4fa9213294f966a4a66d-libcdr-0.1.4.tar.xz"; } { name = "clucene-core-2.3.3.4.tar.gz"; @@ -81,28 +81,21 @@ url = "http://dev-www.libreoffice.org/src/libcmis-0.5.1.tar.gz"; sha256 = "6acbdf22ecdbaba37728729b75bfc085ee5a4b49a6024757cfb86ccd3da27b0e"; md5 = ""; - md5name = "-libcmis-0.5.1.tar.gz"; + md5name = "6acbdf22ecdbaba37728729b75bfc085ee5a4b49a6024757cfb86ccd3da27b0e-libcmis-0.5.1.tar.gz"; } { name = "CoinMP-1.7.6.tgz"; url = "http://dev-www.libreoffice.org/src/CoinMP-1.7.6.tgz"; sha256 = "86c798780b9e1f5921fe4efe651a93cb420623b45aa1fdff57af8c37f116113f"; md5 = ""; - md5name = "-CoinMP-1.7.6.tgz"; - } - { - name = "collada2gltf-master-cb1d97788a.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2"; - sha256 = "b0adb8e71aef80751b999c9c055e419a625c4a05184e407aef2aee28752ad8cb"; - md5 = "4b87018f7fff1d054939d19920b751a0"; - md5name = "4b87018f7fff1d054939d19920b751a0-collada2gltf-master-cb1d97788a.tar.bz2"; + md5name = "86c798780b9e1f5921fe4efe651a93cb420623b45aa1fdff57af8c37f116113f-CoinMP-1.7.6.tgz"; } { name = "cppunit-1.14.0.tar.gz"; url = "http://dev-www.libreoffice.org/src/cppunit-1.14.0.tar.gz"; sha256 = "3d569869d27b48860210c758c4f313082103a5e58219a7669b52bfd29d674780"; md5 = ""; - md5name = "-cppunit-1.14.0.tar.gz"; + md5name = "3d569869d27b48860210c758c4f313082103a5e58219a7669b52bfd29d674780-cppunit-1.14.0.tar.gz"; } { name = "converttexttonumber-1-5-0.oxt"; @@ -112,25 +105,25 @@ md5name = "1f467e5bb703f12cbbb09d5cf67ecf4a-converttexttonumber-1-5-0.oxt"; } { - name = "curl-7.52.1.tar.gz"; - url = "http://dev-www.libreoffice.org/src/curl-7.52.1.tar.gz"; - sha256 = "a8984e8b20880b621f61a62d95ff3c0763a3152093a9f9ce4287cfd614add6ae"; + name = "curl-7.58.0.tar.gz"; + url = "http://dev-www.libreoffice.org/src/curl-7.58.0.tar.gz"; + sha256 = "cc245bf9a1a42a45df491501d97d5593392a03f7b4f07b952793518d97666115"; md5 = ""; - md5name = "-curl-7.52.1.tar.gz"; + md5name = "cc245bf9a1a42a45df491501d97d5593392a03f7b4f07b952793518d97666115-curl-7.58.0.tar.gz"; } { - name = "libe-book-0.1.2.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/libe-book-0.1.2.tar.bz2"; - sha256 = "b710a57c633205b933015474d0ac0862253d1c52114d535dd09b20939a0d1850"; + name = "libe-book-0.1.3.tar.xz"; + url = "http://dev-www.libreoffice.org/src/libe-book-0.1.3.tar.xz"; + sha256 = "7e8d8ff34f27831aca3bc6f9cc532c2f90d2057c778963b884ff3d1e34dfe1f9"; md5 = ""; - md5name = "-libe-book-0.1.2.tar.bz2"; + md5name = "7e8d8ff34f27831aca3bc6f9cc532c2f90d2057c778963b884ff3d1e34dfe1f9-libe-book-0.1.3.tar.xz"; } { name = "libepoxy-1.3.1.tar.bz2"; url = "http://dev-www.libreoffice.org/src/libepoxy-1.3.1.tar.bz2"; sha256 = "1d8668b0a259c709899e1c4bab62d756d9002d546ce4f59c9665e2fc5f001a64"; md5 = ""; - md5name = "-libepoxy-1.3.1.tar.bz2"; + md5name = "1d8668b0a259c709899e1c4bab62d756d9002d546ce4f59c9665e2fc5f001a64-libepoxy-1.3.1.tar.bz2"; } { name = "epm-3.7.tar.gz"; @@ -140,32 +133,39 @@ md5name = "3ade8cfe7e59ca8e65052644fed9fca4-epm-3.7.tar.gz"; } { - name = "libetonyek-0.1.6.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/libetonyek-0.1.6.tar.bz2"; - sha256 = "032f53e8d7691e48a73ddbe74fa84c906ff6ff32a33e6ee2a935b6fdb6aecb78"; + name = "libepubgen-0.1.0.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/libepubgen-0.1.0.tar.bz2"; + sha256 = "730bd1cbeee166334faadbc06c953a67b145c3c4754a3b503482066dae4cd633"; md5 = ""; - md5name = "-libetonyek-0.1.6.tar.bz2"; + md5name = "730bd1cbeee166334faadbc06c953a67b145c3c4754a3b503482066dae4cd633-libepubgen-0.1.0.tar.bz2"; } { - name = "expat-2.2.3.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/expat-2.2.3.tar.bz2"; - sha256 = "b31890fb02f85c002a67491923f89bda5028a880fd6c374f707193ad81aace5f"; + name = "libetonyek-0.1.7.tar.xz"; + url = "http://dev-www.libreoffice.org/src/libetonyek-0.1.7.tar.xz"; + sha256 = "69dbe10d4426d52f09060d489f8eb90dfa1df592e82eb0698d9dbaf38cc734ac"; md5 = ""; - md5name = "-expat-2.2.3.tar.bz2"; + md5name = "69dbe10d4426d52f09060d489f8eb90dfa1df592e82eb0698d9dbaf38cc734ac-libetonyek-0.1.7.tar.xz"; + } + { + name = "expat-2.2.5.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/expat-2.2.5.tar.bz2"; + sha256 = "d9dc32efba7e74f788fcc4f212a43216fc37cf5f23f4c2339664d473353aedf6"; + md5 = ""; + md5name = "d9dc32efba7e74f788fcc4f212a43216fc37cf5f23f4c2339664d473353aedf6-expat-2.2.5.tar.bz2"; } { name = "Firebird-3.0.0.32483-0.tar.bz2"; url = "http://dev-www.libreoffice.org/src/Firebird-3.0.0.32483-0.tar.bz2"; sha256 = "6994be3555e23226630c587444be19d309b25b0fcf1f87df3b4e3f88943e5860"; md5 = ""; - md5name = "-Firebird-3.0.0.32483-0.tar.bz2"; + md5name = "6994be3555e23226630c587444be19d309b25b0fcf1f87df3b4e3f88943e5860-Firebird-3.0.0.32483-0.tar.bz2"; } { - name = "fontconfig-2.12.1.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/fontconfig-2.12.1.tar.bz2"; - sha256 = "b449a3e10c47e1d1c7a6ec6e2016cca73d3bd68fbbd4f0ae5cc6b573f7d6c7f3"; + name = "fontconfig-2.12.6.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/fontconfig-2.12.6.tar.bz2"; + sha256 = "cf0c30807d08f6a28ab46c61b8dbd55c97d2f292cf88f3a07d3384687f31f017"; md5 = ""; - md5name = "-fontconfig-2.12.1.tar.bz2"; + md5name = "cf0c30807d08f6a28ab46c61b8dbd55c97d2f292cf88f3a07d3384687f31f017-fontconfig-2.12.6.tar.bz2"; } { name = "crosextrafonts-20130214.tar.gz"; @@ -216,20 +216,6 @@ md5 = "e7a384790b13c29113e22e596ade9687"; md5name = "e7a384790b13c29113e22e596ade9687-LinLibertineG-20120116.zip"; } - { - name = "open-sans-font-ttf-1.10.tar.gz"; - url = "http://dev-www.libreoffice.org/src/7a15edea7d415ac5150ea403e27401fd-open-sans-font-ttf-1.10.tar.gz"; - sha256 = "cc80fd415e57ecec067339beadd0eef9eaa45e65d3c51a922ba5f9172779bfb8"; - md5 = "7a15edea7d415ac5150ea403e27401fd"; - md5name = "7a15edea7d415ac5150ea403e27401fd-open-sans-font-ttf-1.10.tar.gz"; - } - { - name = "pt-serif-font-1.0000W.tar.gz"; - url = "http://dev-www.libreoffice.org/src/c3c1a8ba7452950636e871d25020ce0d-pt-serif-font-1.0000W.tar.gz"; - sha256 = "6757feb23f889a82df59679d02b8ee1f907df0a0ac1c49cdb48ed737b60e5dfa"; - md5 = "c3c1a8ba7452950636e871d25020ce0d"; - md5name = "c3c1a8ba7452950636e871d25020ce0d-pt-serif-font-1.0000W.tar.gz"; - } { name = "source-code-pro-2.030R-ro-1.050R-it.tar.gz"; url = "http://dev-www.libreoffice.org/src/907d6e99f241876695c19ff3db0b8923-source-code-pro-2.030R-ro-1.050R-it.tar.gz"; @@ -249,21 +235,77 @@ url = "http://dev-www.libreoffice.org/src/EmojiOneColor-SVGinOT-1.3.tar.gz"; sha256 = "d1a08f7c10589f22740231017694af0a7a270760c8dec33d8d1c038e2be0a0c7"; md5 = ""; - md5name = "-EmojiOneColor-SVGinOT-1.3.tar.gz"; + md5name = "d1a08f7c10589f22740231017694af0a7a270760c8dec33d8d1c038e2be0a0c7-EmojiOneColor-SVGinOT-1.3.tar.gz"; } { - name = "libfreehand-0.1.1.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/libfreehand-0.1.1.tar.bz2"; - sha256 = "45dab0e5d632eb51eeb00847972ca03835d6791149e9e714f093a9df2b445877"; + name = "noto-fonts-20171024.tar.gz"; + url = "http://dev-www.libreoffice.org/src/noto-fonts-20171024.tar.gz"; + sha256 = "29acc15a4c4d6b51201ba5d60f303dfbc2e5acbfdb70413c9ae1ed34fa259994"; md5 = ""; - md5name = "-libfreehand-0.1.1.tar.bz2"; + md5name = "29acc15a4c4d6b51201ba5d60f303dfbc2e5acbfdb70413c9ae1ed34fa259994-noto-fonts-20171024.tar.gz"; } { - name = "freetype-2.7.1.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/freetype-2.7.1.tar.bz2"; - sha256 = "3a3bb2c4e15ffb433f2032f50a5b5a92558206822e22bfe8cbe339af4aa82f88"; + name = "culmus-0.131.tar.gz"; + url = "http://dev-www.libreoffice.org/src/culmus-0.131.tar.gz"; + sha256 = "dcf112cfcccb76328dcfc095f4d7c7f4d2f7e48d0eed5e78b100d1d77ce2ed1b"; md5 = ""; - md5name = "-freetype-2.7.1.tar.bz2"; + md5name = "dcf112cfcccb76328dcfc095f4d7c7f4d2f7e48d0eed5e78b100d1d77ce2ed1b-culmus-0.131.tar.gz"; + } + { + name = "libre-hebrew-1.0.tar.gz"; + url = "http://dev-www.libreoffice.org/src/libre-hebrew-1.0.tar.gz"; + sha256 = "f596257c1db706ce35795b18d7f66a4db99d427725f20e9384914b534142579a"; + md5 = ""; + md5name = "f596257c1db706ce35795b18d7f66a4db99d427725f20e9384914b534142579a-libre-hebrew-1.0.tar.gz"; + } + { + name = "alef-1.001.tar.gz"; + url = "http://dev-www.libreoffice.org/src/alef-1.001.tar.gz"; + sha256 = "b98b67602a2c8880a1770f0b9e37c190f29a7e2ade5616784f0b89fbdb75bf52"; + md5 = ""; + md5name = "b98b67602a2c8880a1770f0b9e37c190f29a7e2ade5616784f0b89fbdb75bf52-alef-1.001.tar.gz"; + } + { + name = "amiri-0.109.zip"; + url = "http://dev-www.libreoffice.org/src/amiri-0.109.zip"; + sha256 = "97ee6e40d87f4b31de15d9a93bb30bf27bf308f0814f4ee9c47365b027402ad6"; + md5 = ""; + md5name = "97ee6e40d87f4b31de15d9a93bb30bf27bf308f0814f4ee9c47365b027402ad6-amiri-0.109.zip"; + } + { + name = "ttf-kacst_2.01+mry.tar.gz"; + url = "http://dev-www.libreoffice.org/src/ttf-kacst_2.01+mry.tar.gz"; + sha256 = "dca00f5e655f2f217a766faa73a81f542c5c204aa3a47017c3c2be0b31d00a56"; + md5 = ""; + md5name = "dca00f5e655f2f217a766faa73a81f542c5c204aa3a47017c3c2be0b31d00a56-ttf-kacst_2.01+mry.tar.gz"; + } + { + name = "ReemKufi-0.6.tar.gz"; + url = "http://dev-www.libreoffice.org/src/ReemKufi-0.6.tar.gz"; + sha256 = "4dfbd8b227ea062ca1742fb15d707f0b74398f9ddb231892554f0959048e809b"; + md5 = ""; + md5name = "4dfbd8b227ea062ca1742fb15d707f0b74398f9ddb231892554f0959048e809b-ReemKufi-0.6.tar.gz"; + } + { + name = "Scheherazade-2.100.zip"; + url = "http://dev-www.libreoffice.org/src/Scheherazade-2.100.zip"; + sha256 = "251c8817ceb87d9b661ce1d5b49e732a0116add10abc046be4b8ba5196e149b5"; + md5 = ""; + md5name = "251c8817ceb87d9b661ce1d5b49e732a0116add10abc046be4b8ba5196e149b5-Scheherazade-2.100.zip"; + } + { + name = "libfreehand-0.1.2.tar.xz"; + url = "http://dev-www.libreoffice.org/src/libfreehand-0.1.2.tar.xz"; + sha256 = "0e422d1564a6dbf22a9af598535425271e583514c0f7ba7d9091676420de34ac"; + md5 = ""; + md5name = "0e422d1564a6dbf22a9af598535425271e583514c0f7ba7d9091676420de34ac-libfreehand-0.1.2.tar.xz"; + } + { + name = "freetype-2.8.1.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/freetype-2.8.1.tar.bz2"; + sha256 = "e5435f02e02d2b87bb8e4efdcaa14b1f78c9cf3ab1ed80f94b6382fb6acc7d78"; + md5 = ""; + md5name = "e5435f02e02d2b87bb8e4efdcaa14b1f78c9cf3ab1ed80f94b6382fb6acc7d78-freetype-2.8.1.tar.bz2"; } { name = "glm-0.9.4.6-libreoffice.zip"; @@ -273,25 +315,25 @@ md5name = "bae83fa5dc7f081768daace6e199adc3-glm-0.9.4.6-libreoffice.zip"; } { - name = "gpgme-1.8.0.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/gpgme-1.8.0.tar.bz2"; - sha256 = "596097257c2ce22e747741f8ff3d7e24f6e26231fa198a41b2a072e62d1e5d33"; + name = "gpgme-1.9.0.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/gpgme-1.9.0.tar.bz2"; + sha256 = "1b29fedb8bfad775e70eafac5b0590621683b2d9869db994568e6401f4034ceb"; md5 = ""; - md5name = "-gpgme-1.8.0.tar.bz2"; + md5name = "1b29fedb8bfad775e70eafac5b0590621683b2d9869db994568e6401f4034ceb-gpgme-1.9.0.tar.bz2"; } { name = "graphite2-minimal-1.3.10.tgz"; url = "http://dev-www.libreoffice.org/src/graphite2-minimal-1.3.10.tgz"; sha256 = "aa5e58356cd084000609ebbd93fef456a1bc0ab9e46fea20e81552fb286232a9"; md5 = ""; - md5name = "-graphite2-minimal-1.3.10.tgz"; + md5name = "aa5e58356cd084000609ebbd93fef456a1bc0ab9e46fea20e81552fb286232a9-graphite2-minimal-1.3.10.tgz"; } { - name = "harfbuzz-1.3.2.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/harfbuzz-1.3.2.tar.bz2"; - sha256 = "8543a6372f08c5987c632dfaa86210c7edb3f43fbacd96095c609bc3539ce027"; + name = "harfbuzz-1.7.0.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/harfbuzz-1.7.0.tar.bz2"; + sha256 = "042742d6ec67bc6719b69cf38a3fba24fbd120e207e3fdc18530dc730fb6a029"; md5 = ""; - md5name = "-harfbuzz-1.3.2.tar.bz2"; + md5name = "042742d6ec67bc6719b69cf38a3fba24fbd120e207e3fdc18530dc730fb6a029-harfbuzz-1.7.0.tar.bz2"; } { name = "hsqldb_1_8_0.zip"; @@ -301,11 +343,11 @@ md5name = "17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip"; } { - name = "hunspell-1.6.0.tar.gz"; - url = "http://dev-www.libreoffice.org/src/047c3feb121261b76dc16cdb62f54483-hunspell-1.6.0.tar.gz"; - sha256 = "512e7d2ee69dad0b35ca011076405e56e0f10963a02d4859dbcc4faf53ca68e2"; - md5 = "047c3feb121261b76dc16cdb62f54483"; - md5name = "047c3feb121261b76dc16cdb62f54483-hunspell-1.6.0.tar.gz"; + name = "hunspell-1.6.2.tar.gz"; + url = "http://dev-www.libreoffice.org/src/hunspell-1.6.2.tar.gz"; + sha256 = "3cd9ceb062fe5814f668e4f22b2fa6e3ba0b339b921739541ce180cac4d6f4c4"; + md5 = ""; + md5name = "3cd9ceb062fe5814f668e4f22b2fa6e3ba0b339b921739541ce180cac4d6f4c4-hunspell-1.6.2.tar.gz"; } { name = "hyphen-2.8.8.tar.gz"; @@ -315,11 +357,18 @@ md5name = "5ade6ae2a99bc1e9e57031ca88d36dad-hyphen-2.8.8.tar.gz"; } { - name = "icu4c-58_1-src.tgz"; - url = "http://dev-www.libreoffice.org/src/1901302aaff1c1633ef81862663d2917-icu4c-58_1-src.tgz"; - sha256 = "0eb46ba3746a9c2092c8ad347a29b1a1b4941144772d13a88667a7b11ea30309"; - md5 = "1901302aaff1c1633ef81862663d2917"; - md5name = "1901302aaff1c1633ef81862663d2917-icu4c-58_1-src.tgz"; + name = "icu4c-60_2-src.tgz"; + url = "http://dev-www.libreoffice.org/src/icu4c-60_2-src.tgz"; + sha256 = "f073ea8f35b926d70bb33e6577508aa642a8b316a803f11be20af384811db418"; + md5 = ""; + md5name = "f073ea8f35b926d70bb33e6577508aa642a8b316a803f11be20af384811db418-icu4c-60_2-src.tgz"; + } + { + name = "icu4c-60_2-data.zip"; + url = "http://dev-www.libreoffice.org/src/icu4c-60_2-data.zip"; + sha256 = "68f42ad0c9e0a5a5af8eba0577ba100833912288bad6e4d1f42ff480bbcfd4a9"; + md5 = ""; + md5name = "68f42ad0c9e0a5a5af8eba0577ba100833912288bad6e4d1f42ff480bbcfd4a9-icu4c-60_2-data.zip"; } { name = "flow-engine-0.9.4.zip"; @@ -399,18 +448,18 @@ md5name = "39bb3fcea1514f1369fcfc87542390fd-sacjava-1.3.zip"; } { - name = "libjpeg-turbo-1.5.1.tar.gz"; - url = "http://dev-www.libreoffice.org/src/libjpeg-turbo-1.5.1.tar.gz"; - sha256 = "41429d3d253017433f66e3d472b8c7d998491d2f41caa7306b8d9a6f2a2c666c"; + name = "libjpeg-turbo-1.5.2.tar.gz"; + url = "http://dev-www.libreoffice.org/src/libjpeg-turbo-1.5.2.tar.gz"; + sha256 = "9098943b270388727ae61de82adec73cf9f0dbb240b3bc8b172595ebf405b528"; md5 = ""; - md5name = "-libjpeg-turbo-1.5.1.tar.gz"; + md5name = "9098943b270388727ae61de82adec73cf9f0dbb240b3bc8b172595ebf405b528-libjpeg-turbo-1.5.2.tar.gz"; } { - name = "language-subtag-registry-2017-04-19.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/language-subtag-registry-2017-04-19.tar.bz2"; - sha256 = "8333809eec6fce852a1d6de68859962106e13a84705417efb03452164da3ee7a"; + name = "language-subtag-registry-2017-12-14.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/language-subtag-registry-2017-12-14.tar.bz2"; + sha256 = "0f87b9428cbc2d96d8e4f54a07e3858b4a428e5fec9396bc3b52fb9f248be362"; md5 = ""; - md5name = "-language-subtag-registry-2017-04-19.tar.bz2"; + md5name = "0f87b9428cbc2d96d8e4f54a07e3858b4a428e5fec9396bc3b52fb9f248be362-language-subtag-registry-2017-12-14.tar.bz2"; } { name = "JLanguageTool-1.7.0.tar.bz2"; @@ -424,84 +473,77 @@ url = "http://dev-www.libreoffice.org/src/lcms2-2.8.tar.gz"; sha256 = "66d02b229d2ea9474e62c2b6cd6720fde946155cd1d0d2bffdab829790a0fb22"; md5 = ""; - md5name = "-lcms2-2.8.tar.gz"; + md5name = "66d02b229d2ea9474e62c2b6cd6720fde946155cd1d0d2bffdab829790a0fb22-lcms2-2.8.tar.gz"; } { name = "libassuan-2.4.3.tar.bz2"; url = "http://dev-www.libreoffice.org/src/libassuan-2.4.3.tar.bz2"; sha256 = "22843a3bdb256f59be49842abf24da76700354293a066d82ade8134bb5aa2b71"; md5 = ""; - md5name = "-libassuan-2.4.3.tar.bz2"; + md5name = "22843a3bdb256f59be49842abf24da76700354293a066d82ade8134bb5aa2b71-libassuan-2.4.3.tar.bz2"; } { name = "libatomic_ops-7_2d.zip"; url = "http://dev-www.libreoffice.org/src/libatomic_ops-7_2d.zip"; sha256 = "cf5c52f08a2067ae4fe7c8919e3c1ccf3ee917f1749e0bcc7efffff59c68d9ad"; md5 = ""; - md5name = "-libatomic_ops-7_2d.zip"; + md5name = "cf5c52f08a2067ae4fe7c8919e3c1ccf3ee917f1749e0bcc7efffff59c68d9ad-libatomic_ops-7_2d.zip"; } { name = "libeot-0.01.tar.bz2"; url = "http://dev-www.libreoffice.org/src/libeot-0.01.tar.bz2"; sha256 = "cf5091fa8e7dcdbe667335eb90a2cfdd0a3fe8f8c7c8d1ece44d9d055736a06a"; md5 = ""; - md5name = "-libeot-0.01.tar.bz2"; + md5name = "cf5091fa8e7dcdbe667335eb90a2cfdd0a3fe8f8c7c8d1ece44d9d055736a06a-libeot-0.01.tar.bz2"; } { - name = "libexttextcat-3.4.4.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/10d61fbaa6a06348823651b1bd7940fe-libexttextcat-3.4.4.tar.bz2"; - sha256 = "9595601c41051356d03d0a7d5dcad334fe1b420d221f6885d143c14bb8d62163"; - md5 = "10d61fbaa6a06348823651b1bd7940fe"; - md5name = "10d61fbaa6a06348823651b1bd7940fe-libexttextcat-3.4.4.tar.bz2"; - } - { - name = "libgltf-0.1.0.tar.gz"; - url = "http://dev-www.libreoffice.org/src/libgltf/libgltf-0.1.0.tar.gz"; - sha256 = "119e730fbf002dd0eaafa4930167267d7d910aa17f29979ca9ca8b66625fd2da"; + name = "libexttextcat-3.4.5.tar.xz"; + url = "http://dev-www.libreoffice.org/src/libexttextcat-3.4.5.tar.xz"; + sha256 = "13fdbc9d4c489a4d0519e51933a1aa21fe3fb9eb7da191b87f7a63e82797dac8"; md5 = ""; - md5name = "-libgltf-0.1.0.tar.gz"; + md5name = "13fdbc9d4c489a4d0519e51933a1aa21fe3fb9eb7da191b87f7a63e82797dac8-libexttextcat-3.4.5.tar.xz"; } { - name = "libgpg-error-1.26.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/libgpg-error-1.26.tar.bz2"; - sha256 = "4c4bcbc90116932e3acd37b37812d8653b1b189c1904985898e860af818aee69"; + name = "libgpg-error-1.27.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/libgpg-error-1.27.tar.bz2"; + sha256 = "4f93aac6fecb7da2b92871bb9ee33032be6a87b174f54abf8ddf0911a22d29d2"; md5 = ""; - md5name = "-libgpg-error-1.26.tar.bz2"; + md5name = "4f93aac6fecb7da2b92871bb9ee33032be6a87b174f54abf8ddf0911a22d29d2-libgpg-error-1.27.tar.bz2"; } { name = "liblangtag-0.6.2.tar.bz2"; url = "http://dev-www.libreoffice.org/src/liblangtag-0.6.2.tar.bz2"; sha256 = "d6242790324f1432fb0a6fae71b6851f520b2c5a87675497cf8ea14c2924d52e"; md5 = ""; - md5name = "-liblangtag-0.6.2.tar.bz2"; + md5name = "d6242790324f1432fb0a6fae71b6851f520b2c5a87675497cf8ea14c2924d52e-liblangtag-0.6.2.tar.bz2"; } { name = "ltm-1.0.zip"; url = "http://dev-www.libreoffice.org/src/ltm-1.0.zip"; sha256 = "083daa92d8ee6f4af96a6143b12d7fc8fe1a547e14f862304f7281f8f7347483"; md5 = ""; - md5name = "-ltm-1.0.zip"; + md5name = "083daa92d8ee6f4af96a6143b12d7fc8fe1a547e14f862304f7281f8f7347483-ltm-1.0.zip"; } { - name = "xmlsec1-1.2.24.tar.gz"; - url = "http://dev-www.libreoffice.org/src/xmlsec1-1.2.24.tar.gz"; - sha256 = "99a8643f118bb1261a72162f83e2deba0f4f690893b4b90e1be4f708e8d481cc"; + name = "xmlsec1-1.2.25.tar.gz"; + url = "http://dev-www.libreoffice.org/src/xmlsec1-1.2.25.tar.gz"; + sha256 = "967ca83edf25ccb5b48a3c4a09ad3405a63365576503bf34290a42de1b92fcd2"; md5 = ""; - md5name = "-xmlsec1-1.2.24.tar.gz"; + md5name = "967ca83edf25ccb5b48a3c4a09ad3405a63365576503bf34290a42de1b92fcd2-xmlsec1-1.2.25.tar.gz"; } { - name = "libxml2-2.9.4.tar.gz"; - url = "http://dev-www.libreoffice.org/src/ae249165c173b1ff386ee8ad676815f5-libxml2-2.9.4.tar.gz"; - sha256 = "ffb911191e509b966deb55de705387f14156e1a56b21824357cdf0053233633c"; - md5 = "ae249165c173b1ff386ee8ad676815f5"; - md5name = "ae249165c173b1ff386ee8ad676815f5-libxml2-2.9.4.tar.gz"; + name = "libxml2-2.9.7.tar.gz"; + url = "http://dev-www.libreoffice.org/src/libxml2-2.9.7.tar.gz"; + sha256 = "f63c5e7d30362ed28b38bfa1ac6313f9a80230720b7fb6c80575eeab3ff5900c"; + md5 = ""; + md5name = "f63c5e7d30362ed28b38bfa1ac6313f9a80230720b7fb6c80575eeab3ff5900c-libxml2-2.9.7.tar.gz"; } { - name = "libxslt-1.1.29.tar.gz"; - url = "http://dev-www.libreoffice.org/src/a129d3c44c022de3b9dcf6d6f288d72e-libxslt-1.1.29.tar.gz"; - sha256 = "b5976e3857837e7617b29f2249ebb5eeac34e249208d31f1fbf7a6ba7a4090ce"; - md5 = "a129d3c44c022de3b9dcf6d6f288d72e"; - md5name = "a129d3c44c022de3b9dcf6d6f288d72e-libxslt-1.1.29.tar.gz"; + name = "libxslt-1.1.32.tar.gz"; + url = "http://dev-www.libreoffice.org/src/libxslt-1.1.32.tar.gz"; + sha256 = "526ecd0abaf4a7789041622c3950c0e7f2c4c8835471515fd77eec684a355460"; + md5 = ""; + md5name = "526ecd0abaf4a7789041622c3950c0e7f2c4c8835471515fd77eec684a355460-libxslt-1.1.32.tar.gz"; } { name = "lp_solve_5.5.tar.gz"; @@ -518,32 +560,32 @@ md5name = "a233181e03d3c307668b4c722d881661-mariadb_client-2.0.0-src.tar.gz"; } { - name = "mdds-1.2.2.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/mdds-1.2.2.tar.bz2"; - sha256 = "141e730b39110434b02cd844c5ad3442103f7c35f7e9a4d6a9f8af813594cc9d"; + name = "mdds-1.3.1.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/mdds-1.3.1.tar.bz2"; + sha256 = "dcb8cd2425567a5a5ec164afea475bce57784bca3e352ad4cbdd3d1a7e08e5a1"; md5 = ""; - md5name = "-mdds-1.2.2.tar.bz2"; + md5name = "dcb8cd2425567a5a5ec164afea475bce57784bca3e352ad4cbdd3d1a7e08e5a1-mdds-1.3.1.tar.bz2"; } { name = "mDNSResponder-576.30.4.tar.gz"; url = "http://dev-www.libreoffice.org/src/mDNSResponder-576.30.4.tar.gz"; sha256 = "4737cb51378377e11d0edb7bcdd1bec79cbdaa7b27ea09c13e3006e58f8d92c0"; md5 = ""; - md5name = "-mDNSResponder-576.30.4.tar.gz"; + md5name = "4737cb51378377e11d0edb7bcdd1bec79cbdaa7b27ea09c13e3006e58f8d92c0-mDNSResponder-576.30.4.tar.gz"; } { - name = "libmspub-0.1.2.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/libmspub-0.1.2.tar.bz2"; - sha256 = "26d488527ffbb0b41686d4bab756e3e6aaeb99f88adeb169d0c16d2cde96859a"; + name = "libmspub-0.1.3.tar.xz"; + url = "http://dev-www.libreoffice.org/src/libmspub-0.1.3.tar.xz"; + sha256 = "f0225f0ff03f6bec4847d7c2d8719a36cafc4b97a09e504b610372cc5b981c97"; md5 = ""; - md5name = "-libmspub-0.1.2.tar.bz2"; + md5name = "f0225f0ff03f6bec4847d7c2d8719a36cafc4b97a09e504b610372cc5b981c97-libmspub-0.1.3.tar.xz"; } { - name = "libmwaw-0.3.11.tar.xz"; - url = "http://dev-www.libreoffice.org/src/libmwaw-0.3.11.tar.xz"; - sha256 = "4b483a196bbe82bc0f7cb4cdf70ef1cedb91139bd2e037eabaed4a4d6ed2299a"; + name = "libmwaw-0.3.13.tar.xz"; + url = "http://dev-www.libreoffice.org/src/libmwaw-0.3.13.tar.xz"; + sha256 = "db55c728448f9c795cd71a0bb6043f6d4744e3e001b955a018a2c634981d5aea"; md5 = ""; - md5name = "-libmwaw-0.3.11.tar.xz"; + md5name = "db55c728448f9c795cd71a0bb6043f6d4744e3e001b955a018a2c634981d5aea-libmwaw-0.3.13.tar.xz"; } { name = "mysql-connector-c++-1.1.4.tar.gz"; @@ -560,32 +602,32 @@ md5name = "a8c2c5b8f09e7ede322d5c602ff6a4b6-mythes-1.2.4.tar.gz"; } { - name = "neon-0.30.1.tar.gz"; - url = "http://dev-www.libreoffice.org/src/231adebe5c2f78fded3e3df6e958878e-neon-0.30.1.tar.gz"; - sha256 = "00c626c0dc18d094ab374dbd9a354915bfe4776433289386ed489c2ec0845cdd"; - md5 = "231adebe5c2f78fded3e3df6e958878e"; - md5name = "231adebe5c2f78fded3e3df6e958878e-neon-0.30.1.tar.gz"; + name = "neon-0.30.2.tar.gz"; + url = "http://dev-www.libreoffice.org/src/neon-0.30.2.tar.gz"; + sha256 = "db0bd8cdec329b48f53a6f00199c92d5ba40b0f015b153718d1b15d3d967fbca"; + md5 = ""; + md5name = "db0bd8cdec329b48f53a6f00199c92d5ba40b0f015b153718d1b15d3d967fbca-neon-0.30.2.tar.gz"; } { - name = "nss-3.29.5-with-nspr-4.13.1.tar.gz"; - url = "http://dev-www.libreoffice.org/src/nss-3.29.5-with-nspr-4.13.1.tar.gz"; - sha256 = "8cb8624147737d1b4587c50bf058afbb6effc0f3c205d69b5ef4077b3bfed0e4"; + name = "nss-3.33-with-nspr-4.17.tar.gz"; + url = "http://dev-www.libreoffice.org/src/nss-3.33-with-nspr-4.17.tar.gz"; + sha256 = "878d505ec0be577c45990c57eb5d2e5c8696bfa3412bd0fae193b275297bf5c4"; md5 = ""; - md5name = "-nss-3.29.5-with-nspr-4.13.1.tar.gz"; + md5name = "878d505ec0be577c45990c57eb5d2e5c8696bfa3412bd0fae193b275297bf5c4-nss-3.33-with-nspr-4.17.tar.gz"; } { name = "libodfgen-0.1.6.tar.bz2"; url = "http://dev-www.libreoffice.org/src/libodfgen-0.1.6.tar.bz2"; sha256 = "2c7b21892f84a4c67546f84611eccdad6259875c971e98ddb027da66ea0ac9c2"; md5 = ""; - md5name = "-libodfgen-0.1.6.tar.bz2"; + md5name = "2c7b21892f84a4c67546f84611eccdad6259875c971e98ddb027da66ea0ac9c2-libodfgen-0.1.6.tar.bz2"; } { - name = "odfvalidator-1.1.8-incubating-SNAPSHOT-jar-with-dependencies.jar"; - url = "http://dev-www.libreoffice.org/src/../extern/a084cd548b586552cb7d3ee51f1af969-odfvalidator-1.1.8-incubating-SNAPSHOT-jar-with-dependencies.jar"; - sha256 = "a0bd3e0186e043223bfb231a888e2bfb06c78ee2e07c2f0eca434236d173cf34"; - md5 = "a084cd548b586552cb7d3ee51f1af969"; - md5name = "a084cd548b586552cb7d3ee51f1af969-odfvalidator-1.1.8-incubating-SNAPSHOT-jar-with-dependencies.jar"; + name = "odfvalidator-1.2.0-incubating-SNAPSHOT-jar-with-dependencies+ODFTOOLKIT-460+ODFTOOLKIT-461.jar"; + url = "http://dev-www.libreoffice.org/src/../extern/odfvalidator-1.2.0-incubating-SNAPSHOT-jar-with-dependencies+ODFTOOLKIT-460+ODFTOOLKIT-461.jar"; + sha256 = "aa8896eef3adbd6b54d4ec1817c1bc3871cce99120faf26f93502077480233cf"; + md5 = ""; + md5name = "aa8896eef3adbd6b54d4ec1817c1bc3871cce99120faf26f93502077480233cf-odfvalidator-1.2.0-incubating-SNAPSHOT-jar-with-dependencies+ODFTOOLKIT-460+ODFTOOLKIT-461.jar"; } { name = "officeotron-0.7.4-master.jar"; @@ -595,53 +637,46 @@ md5name = "8249374c274932a21846fa7629c2aa9b-officeotron-0.7.4-master.jar"; } { - name = "OpenCOLLADA-master-6509aa13af.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/OpenCOLLADA-master-6509aa13af.tar.bz2"; - sha256 = "8f25d429237cde289a448c82a0a830791354ccce5ee40d77535642e46367d6c4"; + name = "openldap-2.4.45.tgz"; + url = "http://dev-www.libreoffice.org/src/openldap-2.4.45.tgz"; + sha256 = "cdd6cffdebcd95161a73305ec13fc7a78e9707b46ca9f84fb897cd5626df3824"; md5 = ""; - md5name = "-OpenCOLLADA-master-6509aa13af.tar.bz2"; + md5name = "cdd6cffdebcd95161a73305ec13fc7a78e9707b46ca9f84fb897cd5626df3824-openldap-2.4.45.tgz"; } { - name = "openldap-2.4.44.tgz"; - url = "http://dev-www.libreoffice.org/src/openldap-2.4.44.tgz"; - sha256 = "d7de6bf3c67009c95525dde3a0212cc110d0a70b92af2af8e3ee800e81b88400"; + name = "openssl-1.0.2m.tar.gz"; + url = "http://dev-www.libreoffice.org/src/openssl-1.0.2m.tar.gz"; + sha256 = "8c6ff15ec6b319b50788f42c7abc2890c08ba5a1cdcd3810eb9092deada37b0f"; md5 = ""; - md5name = "-openldap-2.4.44.tgz"; + md5name = "8c6ff15ec6b319b50788f42c7abc2890c08ba5a1cdcd3810eb9092deada37b0f-openssl-1.0.2m.tar.gz"; } { - name = "openssl-1.0.2k.tar.gz"; - url = "http://dev-www.libreoffice.org/src/openssl-1.0.2k.tar.gz"; - sha256 = "6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0"; + name = "liborcus-0.13.1.tar.gz"; + url = "http://dev-www.libreoffice.org/src/liborcus-0.13.1.tar.gz"; + sha256 = "d7041ef455bb78db66b4ba7876af1b3d0fa377b9444e3ef72ceaccd2e8400937"; md5 = ""; - md5name = "-openssl-1.0.2k.tar.gz"; - } - { - name = "liborcus-0.12.1.tar.gz"; - url = "http://dev-www.libreoffice.org/src/liborcus-0.12.1.tar.gz"; - sha256 = "676b1fedd721f64489650f5e76d7f98b750439914d87cae505b8163d08447908"; - md5 = ""; - md5name = "-liborcus-0.12.1.tar.gz"; + md5name = "d7041ef455bb78db66b4ba7876af1b3d0fa377b9444e3ef72ceaccd2e8400937-liborcus-0.13.1.tar.gz"; } { name = "owncloud-android-library-0.9.4-no-binary-deps.tar.gz"; url = "http://dev-www.libreoffice.org/src/owncloud-android-library-0.9.4-no-binary-deps.tar.gz"; sha256 = "b18b3e3ef7fae6a79b62f2bb43cc47a5346b6330f6a383dc4be34439aca5e9fb"; md5 = ""; - md5name = "-owncloud-android-library-0.9.4-no-binary-deps.tar.gz"; + md5name = "b18b3e3ef7fae6a79b62f2bb43cc47a5346b6330f6a383dc4be34439aca5e9fb-owncloud-android-library-0.9.4-no-binary-deps.tar.gz"; } { - name = "libpagemaker-0.0.3.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/libpagemaker-0.0.3.tar.bz2"; - sha256 = "3b5de037692f8e156777a75e162f6b110fa24c01749e4a66d7eb83f364e52a33"; + name = "libpagemaker-0.0.4.tar.xz"; + url = "http://dev-www.libreoffice.org/src/libpagemaker-0.0.4.tar.xz"; + sha256 = "66adacd705a7d19895e08eac46d1e851332adf2e736c566bef1164e7a442519d"; md5 = ""; - md5name = "-libpagemaker-0.0.3.tar.bz2"; + md5name = "66adacd705a7d19895e08eac46d1e851332adf2e736c566bef1164e7a442519d-libpagemaker-0.0.4.tar.xz"; } { - name = "pdfium-3064.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/pdfium-3064.tar.bz2"; - sha256 = "ded806dc9e2a4005d8c0a6b7fcb232ab36221d72d9ff5b815e8244987299d883"; + name = "pdfium-3235.tar.bz2"; + url = "http://dev-www.libreoffice.org/src/pdfium-3235.tar.bz2"; + sha256 = "7dc0d33fc24b1612865f5e173d48800ba3f2db891c57e3f92b9d2ce56ffeb72f"; md5 = ""; - md5name = "-pdfium-3064.tar.bz2"; + md5name = "7dc0d33fc24b1612865f5e173d48800ba3f2db891c57e3f92b9d2ce56ffeb72f-pdfium-3235.tar.bz2"; } { name = "pixman-0.34.0.tar.gz"; @@ -651,18 +686,18 @@ md5name = "e80ebae4da01e77f68744319f01d52a3-pixman-0.34.0.tar.gz"; } { - name = "libpng-1.6.28.tar.gz"; - url = "http://dev-www.libreoffice.org/src/libpng-1.6.28.tar.gz"; - sha256 = "b6cec903e74e9fdd7b5bbcde0ab2415dd12f2f9e84d9e4d9ddd2ba26a41623b2"; + name = "libpng-1.6.34.tar.xz"; + url = "http://dev-www.libreoffice.org/src/libpng-1.6.34.tar.xz"; + sha256 = "2f1e960d92ce3b3abd03d06dfec9637dfbd22febf107a536b44f7a47c60659f6"; md5 = ""; - md5name = "-libpng-1.6.28.tar.gz"; + md5name = "2f1e960d92ce3b3abd03d06dfec9637dfbd22febf107a536b44f7a47c60659f6-libpng-1.6.34.tar.xz"; } { - name = "poppler-0.56.0.tar.xz"; - url = "http://dev-www.libreoffice.org/src/poppler-0.56.0.tar.xz"; - sha256 = "869dbadf99ed882e776acbdbc06689d8a81872a2963440b1e8516cd7a2577173"; + name = "poppler-0.59.0.tar.xz"; + url = "http://dev-www.libreoffice.org/src/poppler-0.59.0.tar.xz"; + sha256 = "a3d626b24cd14efa9864e12584b22c9c32f51c46417d7c10ca17651f297c9641"; md5 = ""; - md5name = "-poppler-0.56.0.tar.xz"; + md5name = "a3d626b24cd14efa9864e12584b22c9c32f51c46417d7c10ca17651f297c9641-poppler-0.59.0.tar.xz"; } { name = "postgresql-9.2.1.tar.bz2"; @@ -676,7 +711,14 @@ url = "http://dev-www.libreoffice.org/src/Python-3.5.4.tgz"; sha256 = "6ed87a8b6c758cc3299a8b433e8a9a9122054ad5bc8aad43299cff3a53d8ca44"; md5 = ""; - md5name = "-Python-3.5.4.tgz"; + md5name = "6ed87a8b6c758cc3299a8b433e8a9a9122054ad5bc8aad43299cff3a53d8ca44-Python-3.5.4.tgz"; + } + { + name = "libqxp-0.0.1.tar.xz"; + url = "http://dev-www.libreoffice.org/src/libqxp-0.0.1.tar.xz"; + sha256 = "8c257f6184ff94aefa7c9fa1cfae82083d55a49247266905c71c53e013f95c73"; + md5 = ""; + md5name = "8c257f6184ff94aefa7c9fa1cfae82083d55a49247266905c71c53e013f95c73-libqxp-0.0.1.tar.xz"; } { name = "raptor2-2.0.15.tar.gz"; @@ -704,7 +746,7 @@ url = "http://dev-www.libreoffice.org/src/librevenge-0.0.4.tar.bz2"; sha256 = "c51601cd08320b75702812c64aae0653409164da7825fd0f451ac2c5dbe77cbf"; md5 = ""; - md5name = "-librevenge-0.0.4.tar.bz2"; + md5name = "c51601cd08320b75702812c64aae0653409164da7825fd0f451ac2c5dbe77cbf-librevenge-0.0.4.tar.bz2"; } { name = "rhino1_5R5.zip"; @@ -718,14 +760,14 @@ url = "http://dev-www.libreoffice.org/src/serf-1.2.1.tar.bz2"; sha256 = "6988d394b62c3494635b6f0760bc3079f9a0cd380baf0f6b075af1eb9fa5e700"; md5 = ""; - md5name = "-serf-1.2.1.tar.bz2"; + md5name = "6988d394b62c3494635b6f0760bc3079f9a0cd380baf0f6b075af1eb9fa5e700-serf-1.2.1.tar.bz2"; } { - name = "libstaroffice-0.0.3.tar.xz"; - url = "http://dev-www.libreoffice.org/src/libstaroffice-0.0.3.tar.xz"; - sha256 = "bedeec104b4cc3896b3dfd1976dda5ce7392d1942bf8f5d2f7d796cc47e422c6"; + name = "libstaroffice-0.0.5.tar.xz"; + url = "http://dev-www.libreoffice.org/src/libstaroffice-0.0.5.tar.xz"; + sha256 = "315507add58068aa6d5c437e7c2a6fd1abe684515915152c6cf338fc588da982"; md5 = ""; - md5name = "-libstaroffice-0.0.3.tar.xz"; + md5name = "315507add58068aa6d5c437e7c2a6fd1abe684515915152c6cf338fc588da982-libstaroffice-0.0.5.tar.xz"; } { name = "swingExSrc.zip"; @@ -742,32 +784,32 @@ md5name = "0168229624cfac409e766913506961a8-ucpp-1.3.2.tar.gz"; } { - name = "libvisio-0.1.5.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/libvisio-0.1.5.tar.bz2"; - sha256 = "b83b7991a40b4e7f07d0cac7bb46ddfac84dece705fd18e21bfd119a09be458e"; + name = "libvisio-0.1.6.tar.xz"; + url = "http://dev-www.libreoffice.org/src/libvisio-0.1.6.tar.xz"; + sha256 = "fe1002d3671d53c09bc65e47ec948ec7b67e6fb112ed1cd10966e211a8bb50f9"; md5 = ""; - md5name = "-libvisio-0.1.5.tar.bz2"; + md5name = "fe1002d3671d53c09bc65e47ec948ec7b67e6fb112ed1cd10966e211a8bb50f9-libvisio-0.1.6.tar.xz"; } { - name = "libwpd-0.10.1.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/libwpd-0.10.1.tar.bz2"; - sha256 = "efc20361d6e43f9ff74de5f4d86c2ce9c677693f5da08b0a88d603b7475a508d"; + name = "libwpd-0.10.2.tar.xz"; + url = "http://dev-www.libreoffice.org/src/libwpd-0.10.2.tar.xz"; + sha256 = "323f68beaf4f35e5a4d7daffb4703d0566698280109210fa4eaa90dea27d6610"; md5 = ""; - md5name = "-libwpd-0.10.1.tar.bz2"; + md5name = "323f68beaf4f35e5a4d7daffb4703d0566698280109210fa4eaa90dea27d6610-libwpd-0.10.2.tar.xz"; } { - name = "libwpg-0.3.1.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/libwpg-0.3.1.tar.bz2"; - sha256 = "29049b95895914e680390717a243b291448e76e0f82fb4d2479adee5330fbb59"; + name = "libwpg-0.3.2.tar.xz"; + url = "http://dev-www.libreoffice.org/src/libwpg-0.3.2.tar.xz"; + sha256 = "57faf1ab97d63d57383ac5d7875e992a3d190436732f4083310c0471e72f8c33"; md5 = ""; - md5name = "-libwpg-0.3.1.tar.bz2"; + md5name = "57faf1ab97d63d57383ac5d7875e992a3d190436732f4083310c0471e72f8c33-libwpg-0.3.2.tar.xz"; } { - name = "libwps-0.4.6.tar.xz"; - url = "http://dev-www.libreoffice.org/src/libwps-0.4.6.tar.xz"; - sha256 = "e48a7c2fd20048a0a8eaf69bad972575f8b9f06e7497c787463f127d332fccd0"; + name = "libwps-0.4.8.tar.xz"; + url = "http://dev-www.libreoffice.org/src/libwps-0.4.8.tar.xz"; + sha256 = "e478e825ef33f6a434a19ff902c5469c9da7acc866ea0d8ab610a8b2aa94177e"; md5 = ""; - md5name = "-libwps-0.4.6.tar.xz"; + md5name = "e478e825ef33f6a434a19ff902c5469c9da7acc866ea0d8ab610a8b2aa94177e-libwps-0.4.8.tar.xz"; } { name = "xsltml_2.1.2.zip"; @@ -781,13 +823,13 @@ url = "http://dev-www.libreoffice.org/src/zlib-1.2.11.tar.xz"; sha256 = "4ff941449631ace0d4d203e3483be9dbc9da454084111f97ea0a2114e19bf066"; md5 = ""; - md5name = "-zlib-1.2.11.tar.xz"; + md5name = "4ff941449631ace0d4d203e3483be9dbc9da454084111f97ea0a2114e19bf066-zlib-1.2.11.tar.xz"; } { - name = "libzmf-0.0.1.tar.bz2"; - url = "http://dev-www.libreoffice.org/src/libzmf-0.0.1.tar.bz2"; - sha256 = "b69f7f6e94cf695c4b672ca65def4825490a1e7dee34c2126309b96d21a19e6b"; + name = "libzmf-0.0.2.tar.xz"; + url = "http://dev-www.libreoffice.org/src/libzmf-0.0.2.tar.xz"; + sha256 = "27051a30cb057fdb5d5de65a1f165c7153dc76e27fe62251cbb86639eb2caf22"; md5 = ""; - md5name = "-libzmf-0.0.1.tar.bz2"; + md5name = "27051a30cb057fdb5d5de65a1f165c7153dc76e27fe62251cbb86639eb2caf22-libzmf-0.0.2.tar.xz"; } ] diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f817bc5a3ff0..4100e017ed98 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16237,7 +16237,10 @@ with pkgs; bluez5 = bluez5_28; fontsConf = makeFontsConf { fontDirectories = [ + carlito dejavu_fonts freefont_ttf xorg.fontmiscmisc + liberation_ttf_v1_binary + liberation_ttf_v2_binary ]; }; clucene_core = clucene_core_2; From 2c5efdbec46ea4773a659261496a97cca54cbffc Mon Sep 17 00:00:00 2001 From: Luke Adams Date: Fri, 19 Jan 2018 22:41:25 -0600 Subject: [PATCH 187/814] parallels: add `autoMountShares` option --- nixos/modules/virtualisation/parallels-guest.nix | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/nixos/modules/virtualisation/parallels-guest.nix b/nixos/modules/virtualisation/parallels-guest.nix index fc0409e9ec77..e3b28780ed6b 100644 --- a/nixos/modules/virtualisation/parallels-guest.nix +++ b/nixos/modules/virtualisation/parallels-guest.nix @@ -22,6 +22,16 @@ in ''; }; + autoMountShares = mkOption { + type = types.bool; + default = true; + description = '' + Control prlfsmountd service. When this service is running, shares can not be manually + mounted through `mount -t prl_fs ...` as this service will remount and trample any set options. + Recommended to enable for simple file sharing, but extended share use such as for code should + disable this to manually mount shares. + ''; + }; }; }; @@ -67,7 +77,7 @@ in }; }; - systemd.services.prlfsmountd = { + systemd.services.prlfsmountd = mkIf config.hardware.parallels.autoMountShares { description = "Parallels Shared Folders Daemon"; wantedBy = [ "multi-user.target" ]; serviceConfig = rec { From 7e54a70960f0248f8dd76072a8c757965d690a60 Mon Sep 17 00:00:00 2001 From: timor Date: Thu, 1 Mar 2018 10:15:08 +0100 Subject: [PATCH 188/814] maintainers: add myself --- lib/maintainers.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 106d5dfd3735..642ecf0b6080 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -708,6 +708,7 @@ tilpner = "Till Höppner "; timbertson = "Tim Cuthbertson "; timokau = "Timo Kaufmann "; + timor = "timor "; tiramiseb = "Sébastien Maccagnoni "; titanous = "Jonathan Rudenberg "; tnias = "Philipp Bartsch "; From 379317a7787acfb8e3dd072968ac8903ec953a24 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benno=20F=C3=BCnfst=C3=BCck?= Date: Sat, 19 Jul 2014 13:37:08 +0200 Subject: [PATCH 189/814] ispell: init at 3.3.02 --- pkgs/tools/text/ispell/default.nix | 47 ++++ .../patches/0005-Do-not-reorder-words.patch | 52 ++++ .../ispell/patches/0007-Use-termios.patch | 188 +++++++++++++++ .../ispell/patches/0008-Tex-backslash.patch | 48 ++++ .../patches/0009-Fix-FTBFS-on-glibc.patch | 23 ++ .../patches/0011-Missing-prototypes.patch | 84 +++++++ .../ispell/patches/0012-Fix-getline.patch | 62 +++++ .../ispell/patches/0013-Fix-man-pages.patch | 227 ++++++++++++++++++ .../patches/0021-Fix-gcc-warnings.patch | 57 +++++ .../patches/0023-Exclusive-options.patch | 38 +++ .../patches/0024-Check-tempdir-creation.patch | 69 ++++++ .../text/ispell/patches/0025-Languages.patch | 81 +++++++ ...30-Display-whole-multibyte-character.patch | 35 +++ pkgs/top-level/all-packages.nix | 2 + 14 files changed, 1013 insertions(+) create mode 100644 pkgs/tools/text/ispell/default.nix create mode 100644 pkgs/tools/text/ispell/patches/0005-Do-not-reorder-words.patch create mode 100644 pkgs/tools/text/ispell/patches/0007-Use-termios.patch create mode 100644 pkgs/tools/text/ispell/patches/0008-Tex-backslash.patch create mode 100644 pkgs/tools/text/ispell/patches/0009-Fix-FTBFS-on-glibc.patch create mode 100644 pkgs/tools/text/ispell/patches/0011-Missing-prototypes.patch create mode 100644 pkgs/tools/text/ispell/patches/0012-Fix-getline.patch create mode 100644 pkgs/tools/text/ispell/patches/0013-Fix-man-pages.patch create mode 100644 pkgs/tools/text/ispell/patches/0021-Fix-gcc-warnings.patch create mode 100644 pkgs/tools/text/ispell/patches/0023-Exclusive-options.patch create mode 100644 pkgs/tools/text/ispell/patches/0024-Check-tempdir-creation.patch create mode 100644 pkgs/tools/text/ispell/patches/0025-Languages.patch create mode 100644 pkgs/tools/text/ispell/patches/0030-Display-whole-multibyte-character.patch diff --git a/pkgs/tools/text/ispell/default.nix b/pkgs/tools/text/ispell/default.nix new file mode 100644 index 000000000000..b2219d1e66d6 --- /dev/null +++ b/pkgs/tools/text/ispell/default.nix @@ -0,0 +1,47 @@ +{ stdenv, fetchurl, bison, ncurses }: + +stdenv.mkDerivation rec { + name = "ispell-3.3.02"; + src = fetchurl { + url = "http://fmg-www.cs.ucla.edu/geoff/tars/${name}.tar.gz"; + sha256 = "1d7c2fqrdjckp91ajpkn5nnmpci2qrxqn8b6cyl0zn1afb9amxbz"; + }; + buildInputs = [ bison ncurses ]; + patches = [ + ./patches/0005-Do-not-reorder-words.patch + ./patches/0007-Use-termios.patch + ./patches/0008-Tex-backslash.patch + ./patches/0009-Fix-FTBFS-on-glibc.patch + ./patches/0011-Missing-prototypes.patch + ./patches/0012-Fix-getline.patch + ./patches/0013-Fix-man-pages.patch + ./patches/0021-Fix-gcc-warnings.patch + ./patches/0023-Exclusive-options.patch + ./patches/0024-Check-tempdir-creation.patch + ./patches/0025-Languages.patch + ./patches/0030-Display-whole-multibyte-character.patch + ]; + postPatch = '' + cat >> local.h < +Date: Thu, 3 Nov 2005 14:14:15 -0800 +Subject: 0005 Do not reorder words + +ispell reorders words in personal dictionary without good reason. + +The correct approach is to build the internal data structure with variant +spellings stored in the same order as they appear in the personal dictionary. +Fortunately, this is easy, though the patch is to a different file. This one +has been tested (That's what I get for trying to rush out a fix before a +meeting!). +--- + makedent.c | 18 +++++++++++------- + 1 files changed, 11 insertions(+), 7 deletions(-) + +diff --git a/makedent.c b/makedent.c +index 0453d11..d121345 100644 +--- a/makedent.c ++++ b/makedent.c +@@ -447,9 +447,10 @@ int combinecaps (hdrp, newp) + if (retval == 0) + { + /* +- ** Couldn't combine the two entries. Add a new variant. For +- ** ease, we'll stick it right behind the header, rather than +- ** at the end of the list. ++ ** Couldn't combine the two entries. Add a new variant. We ++ ** stick it at the end of the variant list because it's ++ ** important to maintain order; this causes the personal ++ ** dictionary to have a stable ordering. + */ + forcevheader (hdrp, oldp, newp); + tdent = (struct dent *) mymalloc (sizeof (struct dent)); +@@ -460,10 +461,13 @@ int combinecaps (hdrp, newp) + return -1; + } + *tdent = *newp; +- tdent->next = hdrp->next; +- hdrp->next = tdent; +- tdent->flagfield |= (hdrp->flagfield & MOREVARIANTS); +- hdrp->flagfield |= MOREVARIANTS; ++ for (oldp = hdrp; ++ oldp->next != NULL && oldp->flagfield & MOREVARIANTS; ++ oldp = oldp->next) ++ ; ++ tdent->next = oldp->next; ++ oldp->next = tdent; ++ oldp->flagfield |= MOREVARIANTS; + combineaffixes (hdrp, newp); + hdrp->flagfield |= (newp->flagfield & KEEP); + if (captype (newp->flagfield) == FOLLOWCASE) +-- diff --git a/pkgs/tools/text/ispell/patches/0007-Use-termios.patch b/pkgs/tools/text/ispell/patches/0007-Use-termios.patch new file mode 100644 index 000000000000..299e3c01ab13 --- /dev/null +++ b/pkgs/tools/text/ispell/patches/0007-Use-termios.patch @@ -0,0 +1,188 @@ +From: Torsten Landschoff +Date: Tue, 30 Mar 1999 21:05:09 +0100 +Subject: 0007 Use termios + +Use termios instead of termio (Closes: #35288). + +Patch updated on Mon, 07 Mar 2011 20:40:53 +0100 based on +ispell-3.3.02-terminal.patch from ispell-3.3.02-102.1.src.rpm +--- + term.c | 58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ + 1 files changed, 58 insertions(+), 0 deletions(-) + +diff --git a/term.c b/term.c +index 4923844..47c1aa0 100644 +--- a/term.c ++++ b/term.c +@@ -87,13 +87,22 @@ static char Rcs_Id[] = + #include "proto.h" + #include "msgs.h" + #ifdef USG ++#if defined(__GLIBC__) && __GLIBC__ >= 2 ++/* Use termios under at least glibc */ ++ #include ++ #define USE_TERMIOS ++#else + #include ++#endif + #else + #ifndef __DJGPP__ + #include + #endif + #endif + #include ++#include ++#include ++#include + + void ierase P ((void)); + void imove P ((int row, int col)); +@@ -166,8 +175,13 @@ static int iputch (c) + } + + #ifdef USG ++#ifdef USE_TERMIOS ++static struct termios sbuf; ++static struct termios osbuf; ++#else + static struct termio sbuf; + static struct termio osbuf; ++#endif + #else + static struct sgttyb sbuf; + static struct sgttyb osbuf; +@@ -190,9 +204,13 @@ void terminit () + int tpgrp; + #else + #ifdef TIOCGPGRP ++#ifdef USE_TERMIOS ++ pid_t tpgrp; ++#else + int tpgrp; + #endif + #endif ++#endif + #ifdef TIOCGWINSZ + struct winsize wsize; + #endif /* TIOCGWINSZ */ +@@ -276,7 +294,11 @@ retry: + (void) fprintf (stderr, TERM_C_NO_BATCH); + exit (1); + } ++#ifdef USE_TERMIOS ++ (void) tcgetattr (0, &osbuf); ++#else + (void) ioctl (0, TCGETA, (char *) &osbuf); ++#endif + termchanged = 1; + + sbuf = osbuf; +@@ -285,7 +307,11 @@ retry: + sbuf.c_iflag &= ~(INLCR | IGNCR | ICRNL); + sbuf.c_cc[VMIN] = 1; + sbuf.c_cc[VTIME] = 1; ++#ifdef USE_TERMIOS ++ (void) tcsetattr (0, TCSADRAIN, &sbuf); ++#else + (void) ioctl (0, TCSETAW, (char *) &sbuf); ++#endif + + uerasechar = osbuf.c_cc[VERASE]; + ukillchar = osbuf.c_cc[VKILL]; +@@ -298,7 +324,11 @@ retry: + #endif + #endif + #ifdef TIOCGPGRP ++#ifdef USE_TERMIOS ++ if ((tpgrp = tcgetpgrp (0)) == -1) ++#else + if (ioctl (0, TIOCGPGRP, (char *) &tpgrp) != 0) ++#endif + { + (void) fprintf (stderr, TERM_C_NO_BATCH); + exit (1); +@@ -373,7 +403,11 @@ SIGNAL_TYPE done (signo) + if (te) + tputs (te, 1, iputch); + #ifdef USG ++#ifdef USE_TERMIOS ++ (void) tcsetattr (0, TCSADRAIN, &osbuf); ++#else + (void) ioctl (0, TCSETAW, (char *) &osbuf); ++#endif + #else + (void) ioctl (0, TIOCSETP, (char *) &osbuf); + #ifdef TIOCSLTC +@@ -394,7 +428,11 @@ static SIGNAL_TYPE onstop (signo) + if (te) + tputs (te, 1, iputch); + #ifdef USG ++#ifdef USE_TERMIOS ++ (void) tcsetattr (0, TCSANOW, &osbuf); /* OpenSuse: TCSADRAIN */ ++#else + (void) ioctl (0, TCSETAW, (char *) &osbuf); ++#endif + #else + (void) ioctl (0, TIOCSETP, (char *) &osbuf); + #ifdef TIOCSLTC +@@ -413,7 +451,11 @@ static SIGNAL_TYPE onstop (signo) + if (termchanged) + { + #ifdef USG ++#ifdef USE_TERMIOS ++ (void) tcsetattr (0, TCSANOW, &sbuf); ++#else + (void) ioctl (0, TCSETAW, (char *) &sbuf); ++#endif + #else + (void) ioctl (0, TIOCSETP, (char *) &sbuf); + #ifdef TIOCSLTC +@@ -481,7 +523,11 @@ int shellescape (buf) + argv[i] = NULL; + + #ifdef USG ++#ifdef USE_TERMIOS ++ (void) tcsetattr (0, TCSADRAIN, &osbuf); ++#else + (void) ioctl (0, TCSETAW, (char *) &osbuf); ++#endif + #else + (void) ioctl (0, TIOCSETP, (char *) &osbuf); + #ifdef TIOCSLTC +@@ -527,7 +573,11 @@ int shellescape (buf) + #endif + + #ifdef USG ++#ifdef USE_TERMIOS ++ (void) tcsetattr (0, TCSADRAIN, &sbuf); ++#else + (void) ioctl (0, TCSETAW, (char *) &sbuf); ++#endif + #else + (void) ioctl (0, TIOCSETP, (char *) &sbuf); + #ifdef TIOCSLTC +@@ -563,7 +613,11 @@ void shescape (buf) + #endif + + #ifdef USG ++#ifdef USE_TERMIOS ++ (void) tcsetattr (0, TCSADRAIN, &osbuf); ++#else + (void) ioctl (0, TCSETAW, (char *) &osbuf); ++#endif + #else + (void) ioctl (0, TIOCSETP, (char *) &osbuf); + #ifdef TIOCSLTC +@@ -611,7 +665,11 @@ void shescape (buf) + #endif + + #ifdef USG ++#ifdef USE_TERMIOS ++ (void) tcsetattr (0, TCSADRAIN, &sbuf); ++#else + (void) ioctl (0, TCSETAW, (char *) &sbuf); ++#endif + #else + (void) ioctl (0, TIOCSETP, (char *) &sbuf); + #ifdef TIOCSLTC +-- diff --git a/pkgs/tools/text/ispell/patches/0008-Tex-backslash.patch b/pkgs/tools/text/ispell/patches/0008-Tex-backslash.patch new file mode 100644 index 000000000000..21b44d505db0 --- /dev/null +++ b/pkgs/tools/text/ispell/patches/0008-Tex-backslash.patch @@ -0,0 +1,48 @@ +From: Ken Stevens +Date: Sat, 15 Jul 2000 22:10:53 -0400 +Subject: 0008 Tex backslash + +Version 3.1.20 contains an irritating bug when using latex that causes all +sorts of problems when the backslash is used. (The backslash is a common +character in latex that is used, among other things, to create a forced space +similar to the tilde character.) In the current version, 3.1.20, the next TWO +characters are skipped after a backslash. This can results in misspellings and +the file being incorrectly parsed. (For example, if the text contains the +sequence `\ $' math mode will not be entered until the matching $ which should +end it, resulting in the body of the text not being spell checked and the math +region being checked.) + +Make sure to undefine NO8BIT and use a larger number for MASKBITS if you are +using iso character sets. + +http://www.kdstevens.com/~stevens/ispell-faq.html#bslash +--- + defmt.c | 7 +++---- + 1 files changed, 3 insertions(+), 4 deletions(-) + +diff --git a/defmt.c b/defmt.c +index 35f93e4..7499752 100644 +--- a/defmt.c ++++ b/defmt.c +@@ -884,6 +884,8 @@ static int TeX_math_end (bufp) + return 0; + } + ++/* Updates bufp to point to the next character to skip. */ ++/* Should only be called on non-word characters. */ + static int TeX_math_begin (bufp) + unsigned char ** bufp; + { +@@ -902,10 +904,7 @@ static int TeX_math_begin (bufp) + if (**bufp == TEXLEFTPAREN || **bufp == TEXLEFTSQUARE) + return 1; + else if (!isalpha(**bufp) && **bufp != '@') +- { +- (*bufp)++; +- continue; +- } ++ return 0; + else if (TeX_strncmp (*bufp, "begin", 5) == 0) + { + if (TeX_math_check ('b', bufp)) +-- diff --git a/pkgs/tools/text/ispell/patches/0009-Fix-FTBFS-on-glibc.patch b/pkgs/tools/text/ispell/patches/0009-Fix-FTBFS-on-glibc.patch new file mode 100644 index 000000000000..dbe0db9a0533 --- /dev/null +++ b/pkgs/tools/text/ispell/patches/0009-Fix-FTBFS-on-glibc.patch @@ -0,0 +1,23 @@ +From: Richard Braakman +Date: Fri, 2 Feb 2001 17:22:53 +0200 +Subject: 0009 Fix FTBFS on glibc + +Fix FTBFS on glibc (Closes: #75377) +--- + config.X | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/config.X b/config.X +index 18bf621..0a47cb2 100644 +--- a/config.X ++++ b/config.X +@@ -531,7 +531,7 @@ + #endif /* NO_MKSTEMP */ + + /* Aliases for some routines */ +-#ifdef USG ++#if defined (USG) && !defined(__GLIBC__) + #define BCOPY(s, d, n) memcpy (d, s, n) + #define BZERO(d, n) memset (d, 0, n) + #define index strchr +-- diff --git a/pkgs/tools/text/ispell/patches/0011-Missing-prototypes.patch b/pkgs/tools/text/ispell/patches/0011-Missing-prototypes.patch new file mode 100644 index 000000000000..5e77b6a4f371 --- /dev/null +++ b/pkgs/tools/text/ispell/patches/0011-Missing-prototypes.patch @@ -0,0 +1,84 @@ +From: Doug Porter +Date: Tue, 22 Jan 2002 10:28:44 -0500 +Subject: 0011 Missing prototypes + +Fixing implicit declarations (Closes: #130405). +--- + correct.c | 1 + + ijoin.c | 2 +- + ispell.c | 2 ++ + lookup.c | 2 ++ + tree.c | 1 + + 5 files changed, 7 insertions(+), 1 deletions(-) + +diff --git a/correct.c b/correct.c +index e2b63c8..661bf57 100644 +--- a/correct.c ++++ b/correct.c +@@ -201,6 +201,7 @@ static char Rcs_Id[] = + */ + + #include ++#include + #include "config.h" + #include "ispell.h" + #include "proto.h" +diff --git a/ijoin.c b/ijoin.c +index edb18d1..5da039a 100644 +--- a/ijoin.c ++++ b/ijoin.c +@@ -115,6 +115,7 @@ static char Rcs_Id[] = + */ + + #include ++#include + #include "config.h" + #include "ispell.h" + #include "proto.h" +@@ -169,7 +170,6 @@ static char * tabchar = " \t"; /* Field separator character(s) */ + static int unpairable1 = 0; /* NZ if -a1 */ + static int unpairable2 = 0; /* NZ if -a2 */ + +-extern int strcmp (); + + int main (argc, argv) /* Join files */ + int argc; /* Argument count */ +diff --git a/ispell.c b/ispell.c +index 9b509d0..59fe358 100644 +--- a/ispell.c ++++ b/ispell.c +@@ -235,6 +235,8 @@ static char Rcs_Id[] = + #include + #endif /* NO_FCNTL_H */ + #include ++#include ++#include + + static void usage P ((void)); + int main P ((int argc, char * argv[])); +diff --git a/lookup.c b/lookup.c +index 648f9c8..8bf1f6c 100644 +--- a/lookup.c ++++ b/lookup.c +@@ -87,6 +87,8 @@ static char Rcs_Id[] = + + #include + ++#include ++#include + #include "config.h" + #include "ispell.h" + #include "proto.h" +diff --git a/tree.c b/tree.c +index 073a6a6..c26f635 100644 +--- a/tree.c ++++ b/tree.c +@@ -94,6 +94,7 @@ static char Rcs_Id[] = + + #include + #include ++#include + #include "config.h" + #include "ispell.h" + #include "proto.h" +-- diff --git a/pkgs/tools/text/ispell/patches/0012-Fix-getline.patch b/pkgs/tools/text/ispell/patches/0012-Fix-getline.patch new file mode 100644 index 000000000000..ea966d67792e --- /dev/null +++ b/pkgs/tools/text/ispell/patches/0012-Fix-getline.patch @@ -0,0 +1,62 @@ +From: Stefan Potyra +Date: Sat, 3 Oct 2009 04:00:34 +0200 +Subject: 0012 Fix getline + +getline is not provided by eglibc, avoid conflict + +Bug-Debian: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=549401 +Forwarded: no +--- + correct.c | 10 +++++----- + 1 files changed, 5 insertions(+), 5 deletions(-) + +diff --git a/correct.c b/correct.c +index 661bf57..ff7cb99 100644 +--- a/correct.c ++++ b/correct.c +@@ -246,7 +246,7 @@ static void save_root_cap P ((ichar_t * word, ichar_t * pattern, + struct flagent * sufent, + ichar_t savearea[MAX_CAPS][INPUTWORDLEN + MAXAFFIXLEN], + int * nsaved)); +-static char * getline P ((char * buf, int bufsize)); ++static char * getline_ispell P ((char * buf, int bufsize)); + void askmode P ((void)); + void copyout P ((unsigned char ** cc, int cnt)); + static void lookharder P ((unsigned char * string)); +@@ -572,7 +572,7 @@ checkagain: + + imove (li - 1, 0); + (void) putchar ('!'); +- if (getline ((char *) buf, sizeof buf) == NULL) ++ if (getline_ispell ((char *) buf, sizeof buf) == NULL) + { + (void) putchar (7); + ierase (); +@@ -597,7 +597,7 @@ checkagain: + (void) printf ("%s ", CORR_C_READONLY); + } + (void) printf (CORR_C_REPLACE_WITH); +- if (getline ((char *) ctok, ctokl) == NULL) ++ if (getline_ispell ((char *) ctok, ctokl) == NULL) + { + (void) putchar (7); + /* Put it back */ +@@ -665,7 +665,7 @@ checkagain: + unsigned char buf[100]; + imove (li - 1, 0); + (void) printf (CORR_C_LOOKUP_PROMPT); +- if (getline ((char *) buf, sizeof buf) == NULL) ++ if (getline_ispell ((char *) buf, sizeof buf) == NULL) + { + (void) putchar (7); + ierase (); +@@ -1584,7 +1584,7 @@ static void save_root_cap (word, pattern, prestrip, preadd, sufstrip, sufadd, + return; + } + +-static char * getline (s, len) ++static char * getline_ispell(s, len) + register char * s; + register int len; + { +-- diff --git a/pkgs/tools/text/ispell/patches/0013-Fix-man-pages.patch b/pkgs/tools/text/ispell/patches/0013-Fix-man-pages.patch new file mode 100644 index 000000000000..9c0aedb67d76 --- /dev/null +++ b/pkgs/tools/text/ispell/patches/0013-Fix-man-pages.patch @@ -0,0 +1,227 @@ +From: David Paleino +Date: Mon, 9 Nov 2009 09:22:12 +0000 +Subject: 0013 Fix man pages + +Fix man pages, manpage-has-errors-from-man and hyphen-used-as-minus-sign + +Forwarded: no +--- + ispell.1X | 26 +++++++++++++------------- + ispell.5X | 26 +++++++++++++------------- + 2 files changed, 26 insertions(+), 26 deletions(-) + +diff --git a/ispell.1X b/ispell.1X +index b27b120..79894d4 100644 +--- a/ispell.1X ++++ b/ispell.1X +@@ -236,8 +236,8 @@ count affix-file + .RB [ \-p | \-s] + .RB [ \-c ] + .I expanded-file +-.IR affix [ +addition ] +-... ++.IR affix ++.RI [ +addition ] + .PP + .B icombine + .RB [ \-T +@@ -336,7 +336,7 @@ The amount of context is subject to a system-imposed limit. + If the + .B \-V + flag is given, characters that are not in the 7-bit ANSI printable +-character set will always be displayed in the style of "cat -v", even if ++character set will always be displayed in the style of "cat \-v", even if + .I ispell + thinks that these characters are legal ISO Latin-1 on your system. + This is useful when working with older terminals. +@@ -542,7 +542,7 @@ option is used to specify an alternate hashed dictionary file, + other than the default. + If the filename does not contain a "/", + the library directory for the default dictionary file is prefixed; +-thus, to use a dictionary in the local directory "-d ./xxx.hash" must ++thus, to use a dictionary in the local directory "\-d ./xxx.hash" must + be used. + This is useful to allow dictionaries for alternate languages. + Unlike previous versions of +@@ -615,7 +615,7 @@ alphabetics have no meaning - alphabetics are already accepted. + .I Ispell + will typically be used with input from a file, meaning that preserving + parity for possible 8 bit characters from the input text is OK. If you +-specify the -l option, and actually type text from the terminal, this may ++specify the \-l option, and actually type text from the terminal, this may + create problems if your stty settings preserve parity. + .PP + It is not possible to use +@@ -799,7 +799,7 @@ that the '&' is replaced by '?' (and the near-miss count is always zero). + The suggested derivations following the near misses are in the form: + .PP + .RS +-[prefix+] root [-prefix] [-suffix] [+suffix] ++[prefix+] root [\-prefix] [\-suffix] [+suffix] + .RE + .PP + (e.g., "re+fry-y+ies" to get "refries") +@@ -841,7 +841,7 @@ These output lines can be summarized as follows: + .PP + For example, a dummy dictionary containing the words "fray", "Frey", + "fry", and "refried" might produce the following response to the +-command "echo 'frqy refries | ispell -a -m -d ./test.hash": ++command "echo 'frqy refries | ispell \-a \-m \-d ./test.hash": + .RS + .nf + (#) International Ispell Version 3.0.05 (beta), 08/10/91 +@@ -1036,7 +1036,7 @@ script does this. + As an example, the command: + .PP + .RS +-echo BOTHER | ispell -c ++echo BOTHER | ispell \-c + .RE + .PP + produces: +@@ -1055,7 +1055,7 @@ it expands affix flags to produce a list of words. + For example, the command: + .PP + .RS +-echo BOTH/R | ispell -e ++echo BOTH/R | ispell \-e + .RE + .PP + produces: +@@ -1268,7 +1268,7 @@ hash file if it were added to the language table. + Only affixes that generate legal roots (found in the original input) + are listed. + .PP +-If the "-c" option is not given, the output lines are in the ++If the "\-c" option is not given, the output lines are in the + following format: + .IP + strip/add/count/bytes +@@ -1298,7 +1298,7 @@ If the + the output is made visually cleaner (but harder to post-process) + by changing it to: + .IP +--strip+addcountbytes ++\-strip+addcountbytes + .PP + where + .IR strip , +@@ -1313,7 +1313,7 @@ represents the ASCII tab character. + The method used to generate possible affixes will also generate + longer affixes which have common headers or trailers. For example, + the two words "moth" and "mother" will generate not only the obvious +-substitution "+er" but also "-h+her" and "-th+ther" (and possibly ++substitution "+er" but also "\-h+her" and "\-th+ther" (and possibly + even longer ones, depending on the value of + .IR min ). + To prevent +@@ -1621,7 +1621,7 @@ redirected. + However, a lot of the temporary space needed is for sorting, so TMPDIR + is only a partial help on systems with an uncooperative + .IR sort (1). +-("Cooperative" is defined as accepting the undocumented -T switch). ++("Cooperative" is defined as accepting the undocumented \-T switch). + At its peak usage, + .I munchlist + takes 10 to 40 times the original +diff --git a/ispell.5X b/ispell.5X +index ab526ed..7a1c2e5 100644 +--- a/ispell.5X ++++ b/ispell.5X +@@ -137,8 +137,8 @@ This feature can be used to convert an entire dictionary if necessary:) + echo qqqqq > dummy.dict + buildhash dummy.dict \fIaffix-file\fP dummy.hash + awk '{print "*"}END{print "#"}' \fIold-dict-file\fP \e +- | ispell -a -T \fIold-dict-string-type\fP \e +- -d ./dummy.hash -p ./\fInew-dict-file\fP \e ++ | ispell \-a \-T \fIold-dict-string-type\fP \e ++ \-d ./dummy.hash \-p ./\fInew-dict-file\fP \e + > /dev/null + rm dummy.* + .fi +@@ -622,7 +622,7 @@ or + .B stringchar + statements. + For example, if the hyphen is a boundary character (useful in French), +-the string "foo-bar" would be a single word, but "-foo" would be the ++the string "foo-bar" would be a single word, but "\-foo" would be the + same as "foo", and "foo--bar" would be two words separated by non-word + characters. + .PP +@@ -916,7 +916,7 @@ The following (suffix) replacements: + .RS + .nf + \&. > MENT +-Y > -Y,IES ++Y > \-Y,IES + .fi + .RE + .PP +@@ -956,8 +956,8 @@ Instead, you must use two separate rules: + .PP + .RS + .nf +-E > -E,IES +-Y > -Y,IES ++E > \-E,IES ++Y > \-Y,IES + .fi + .RE + .PP +@@ -1005,7 +1005,7 @@ For example, to specify words ending in "ED", write: + .PP + .RS + .nf +-E D > -ED,ING # As in covered > covering ++E D > \-ED,ING # As in covered > covering + .fi + .RE + .PP +@@ -1013,7 +1013,7 @@ If you write: + .PP + .RS + .nf +-ED > -ED,ING ++ED > \-ED,ING + .fi + .RE + .PP +@@ -1021,7 +1021,7 @@ the effect will be the same as: + .PP + .RS + .nf +-[ED] > -ED,ING ++[ED] > \-ED,ING + .fi + .RE + .PP +@@ -1047,7 +1047,7 @@ is useful, as in the following example: + .PP + .RS + .nf +-$ munchlist -c oldaffixes -l newaffixes olddict > newdict ++$ munchlist \-c oldaffixes \-l newaffixes olddict > newdict + .fi + .RE + .PP +@@ -1070,7 +1070,7 @@ flag from the English affix file: + .RS + .nf + flag *S: +- [^AEIOU]Y > -Y,IES # As in imply > implies ++ [^AEIOU]Y > \-Y,IES # As in imply > implies + [AEIOU]Y > S # As in convey > conveys + [SXZH] > ES # As in fix > fixes + [^SXZHY] > S # As in bat > bats +@@ -1099,8 +1099,8 @@ For example, we could extend the English "R" flag as follows: + flag *R: + E > R # As in skate > skater + E > RS # As in skate > skaters +- [^AEIOU]Y > -Y,IER # As in multiply > multiplier +- [^AEIOU]Y > -Y,IERS # As in multiply > multipliers ++ [^AEIOU]Y > \-Y,IER # As in multiply > multiplier ++ [^AEIOU]Y > \-Y,IERS # As in multiply > multipliers + [AEIOU]Y > ER # As in convey > conveyer + [AEIOU]Y > ERS # As in convey > conveyers + [^EY] > ER # As in build > builder +-- diff --git a/pkgs/tools/text/ispell/patches/0021-Fix-gcc-warnings.patch b/pkgs/tools/text/ispell/patches/0021-Fix-gcc-warnings.patch new file mode 100644 index 000000000000..8902018dab58 --- /dev/null +++ b/pkgs/tools/text/ispell/patches/0021-Fix-gcc-warnings.patch @@ -0,0 +1,57 @@ +From: Robert Luberda +Date: Mon, 7 Mar 2011 22:23:56 +0100 +Subject: 0021 Fix gcc warnings + +Fix some gcc warnings. +--- + correct.c | 2 +- + languages/english/msgs.h | 8 ++++---- + tree.c | 2 +- + 3 files changed, 6 insertions(+), 6 deletions(-) + +diff --git a/correct.c b/correct.c +index 79b259f..982b7c6 100644 +--- a/correct.c ++++ b/correct.c +@@ -825,7 +825,7 @@ static void inserttoken (buf, start, tok, curchar, oktochange) + for (p = start; p != *curchar; p++) + (void) putc (*p, logfile); + (void) putc (' ', logfile); +- (void) fputs (tok, logfile); ++ (void) fputs ((char*) tok, logfile); + (void) putc ('\n', logfile); + (void) fflush (logfile); + } +diff --git a/languages/english/msgs.h b/languages/english/msgs.h +index d33b42b..f9c87ca 100644 +--- a/languages/english/msgs.h ++++ b/languages/english/msgs.h +@@ -182,10 +182,10 @@ + #define CORR_C_HELP_4 "next to each one. You have the option of replacing the word%s\n" + #define CORR_C_HELP_5 "completely, or choosing one of the suggested words.%s\n" + /* You may add HELP_6 through HELP_9 if your language needs more lines */ +-#define CORR_C_HELP_6 "" +-#define CORR_C_HELP_7 "" +-#define CORR_C_HELP_8 "" +-#define CORR_C_HELP_9 "" ++#define CORR_C_HELP_6 "%s" ++#define CORR_C_HELP_7 "%s" ++#define CORR_C_HELP_8 "%s" ++#define CORR_C_HELP_9 "%s" + #define CORR_C_HELP_COMMANDS "%s\nCommands are:%s\n%s\n" + #define CORR_C_HELP_R_CMD "R Replace the misspelled word completely.%s\n" + #define CORR_C_HELP_BLANK "Space Accept the word this time only.%s\n" +diff --git a/tree.c b/tree.c +index 05a6918..229ae16 100644 +--- a/tree.c ++++ b/tree.c +@@ -351,7 +351,7 @@ void treeinsert (word, wordlen, keep) + struct dent * oldhtab; + unsigned int oldhsize; + ichar_t nword[INPUTWORDLEN + MAXAFFIXLEN]; +- int isvariant; ++ MASKTYPE isvariant; + + /* + * Expand hash table when it is MAXPCT % full. +-- diff --git a/pkgs/tools/text/ispell/patches/0023-Exclusive-options.patch b/pkgs/tools/text/ispell/patches/0023-Exclusive-options.patch new file mode 100644 index 000000000000..392d94d27d33 --- /dev/null +++ b/pkgs/tools/text/ispell/patches/0023-Exclusive-options.patch @@ -0,0 +1,38 @@ +From: Robert Luberda +Date: Tue, 8 Mar 2011 21:12:23 +0100 +Subject: 0023 Exclusive options + +Make options -x and -b mutually exclusive +--- + ispell.c | 6 ++++-- + 1 files changed, 4 insertions(+), 2 deletions(-) + +diff --git a/ispell.c b/ispell.c +index d130a0e..cd5802a 100644 +--- a/ispell.c ++++ b/ispell.c +@@ -279,6 +279,7 @@ int main (argc, argv) + static char outbuf[BUFSIZ]; + int argno; + int arglen; ++ int bflag = 0; + + Cmd = *argv; + +@@ -728,12 +729,13 @@ int main (argc, argv) + nodictflag++; + break; + case 'b': +- if (arglen > 2) ++ if (arglen > 2 || xflag == 1) + usage (); + xflag = 0; /* Keep a backup file */ ++ bflag = 1; + break; + case 'x': +- if (arglen > 2) ++ if (arglen > 2 || bflag == 1) + usage (); + xflag = 1; /* Don't keep a backup file */ + break; +-- diff --git a/pkgs/tools/text/ispell/patches/0024-Check-tempdir-creation.patch b/pkgs/tools/text/ispell/patches/0024-Check-tempdir-creation.patch new file mode 100644 index 000000000000..fd35ee34ec16 --- /dev/null +++ b/pkgs/tools/text/ispell/patches/0024-Check-tempdir-creation.patch @@ -0,0 +1,69 @@ +From: Robert Luberda +Date: Tue, 8 Mar 2011 21:00:31 +0100 +Subject: 0024 Check tempdir creation + +Fail if temporary directory cannot be created. +--- + findaffix.X | 3 ++- + munchlist.X | 3 ++- + subset.X | 3 ++- + zapdups.X | 3 ++- + 4 files changed, 8 insertions(+), 4 deletions(-) + +diff --git a/findaffix.X b/findaffix.X +index 2c253e2..58cabab 100755 +--- a/findaffix.X ++++ b/findaffix.X +@@ -179,7 +179,8 @@ TEMPDIR=`mktemp -d ${TDIR}/faffXXXXXXXXXX 2>/dev/null` || TEMPDIR="$TDIR" + TMP=${TEMPDIR}/faff$$ + if [ "$TEMPDIR" = "$TDIR" ] + then +- TOREMOVE="${TMP}*" ++ echo "Failed to create temporary directory; exiting" ++ exit 1 + else + TOREMOVE="$TEMPDIR" + fi +diff --git a/munchlist.X b/munchlist.X +index ada3f1d..47bb908 100755 +--- a/munchlist.X ++++ b/munchlist.X +@@ -180,7 +180,8 @@ MUNCHDIR=`mktemp -d ${TDIR}/munchXXXXXXXXXX 2>/dev/null` || MUNCHDIR="$TDIR" + TMP=${MUNCHDIR}/munch$$ + if [ "$MUNCHDIR" = "$TDIR" ] + then +- TOREMOVE="${TMP}*" ++ echo "$0: Failed to create temporary directory, exiting..." ++ exit 1 + else + TOREMOVE="$MUNCHDIR" + fi +diff --git a/subset.X b/subset.X +index cc748ec..9c904cc 100755 +--- a/subset.X ++++ b/subset.X +@@ -125,7 +125,8 @@ TEMPDIR=`mktemp -d ${TDIR}/ssetXXXXXXXXXX 2>/dev/null` || TEMPDIR="$TDIR" + TMP=${TEMPDIR}/sset$$ + if [ "$TEMPDIR" = "$TDIR" ] + then +- TOREMOVE="${TMP}*" ++ echo "$0: Failed to create temporary directory, exiting..." ++ exit 1 + else + TOREMOVE="$TEMPDIR" + fi +diff --git a/zapdups.X b/zapdups.X +index a68852a..1c610d4 100755 +--- a/zapdups.X ++++ b/zapdups.X +@@ -111,7 +111,8 @@ TEMPDIR=`mktemp -d ${TDIR}/zapdXXXXXXXXXX 2>/dev/null` || TEMPDIR="$TDIR" + TMP=${TEMPDIR}/zapd$$ + if [ "$TEMPDIR" = "$TDIR" ] + then +- TOREMOVE="${TMP}*" ++ echo "$0: Failed to create temporary directory, exiting..." ++ exit 1 + else + TOREMOVE="$TEMPDIR" + fi +-- diff --git a/pkgs/tools/text/ispell/patches/0025-Languages.patch b/pkgs/tools/text/ispell/patches/0025-Languages.patch new file mode 100644 index 000000000000..ffa114d28a12 --- /dev/null +++ b/pkgs/tools/text/ispell/patches/0025-Languages.patch @@ -0,0 +1,81 @@ +From: Robert Luberda +Date: Tue, 8 Mar 2011 21:02:47 +0100 +Subject: 0025 Languages + +Fix a few words. +--- + languages/english/british.0 | 1 + + languages/english/english.0 | 8 ++++++-- + languages/english/english.1 | 3 ++- + 3 files changed, 9 insertions(+), 3 deletions(-) + +diff --git a/languages/english/british.0 b/languages/english/british.0 +index dc4caa7..04d9177 100644 +--- a/languages/english/british.0 ++++ b/languages/english/british.0 +@@ -46,6 +46,7 @@ armour/DGMRSZ + armoured/U + armourer/MS + armoury/DMS ++artefact/MS + atomisation/MS + atomise/DGRSZ + authorisation/AMS +diff --git a/languages/english/english.0 b/languages/english/english.0 +index fc13212..f85e15a 100644 +--- a/languages/english/english.0 ++++ b/languages/english/english.0 +@@ -3502,6 +3502,7 @@ closure/DGMS + cloth/DGS + clothe/DGS + clothed/U ++cloths + cloud/DGS + clouded/U + cloudless/PY +@@ -10019,9 +10020,10 @@ mystery/MS + mystic/MS + mystical/Y + mysticism/S +-myth/MS ++myth/M + mythical/Y + mythology/MS ++myths + nag/MS + nail/DGRS + naive/PRY +@@ -14818,6 +14820,7 @@ tent/DGRS + tentacle/DS + tentative/PY + tented/U ++tenth + tenths + tenure/DS + tenured/U +@@ -16511,8 +16514,9 @@ youngster/MS + your/MS + yourself + yourselves +-youth/MS ++youth/M + youthful/PY ++youths + yuck + Yugoslavian/MS + yummy/R +diff --git a/languages/english/english.1 b/languages/english/english.1 +index 2bfac86..78a7edf 100644 +--- a/languages/english/english.1 ++++ b/languages/english/english.1 +@@ -7449,7 +7449,8 @@ metalloid + metallurgic + metallurgical/Y + metallurgists +-metalsmith/S ++metalsmith ++metalsmiths + metalwork/GJR + metamorphic + metamorphism +-- diff --git a/pkgs/tools/text/ispell/patches/0030-Display-whole-multibyte-character.patch b/pkgs/tools/text/ispell/patches/0030-Display-whole-multibyte-character.patch new file mode 100644 index 000000000000..bf687f04413c --- /dev/null +++ b/pkgs/tools/text/ispell/patches/0030-Display-whole-multibyte-character.patch @@ -0,0 +1,35 @@ +From: Robert Luberda +Date: Mon, 21 Mar 2011 10:36:15 +0100 +Subject: 0030 Display whole multibyte character + +Display all bytes from multibyte characters instead of converting them +into `cat -v' format. This fixes an ugly screen content shown while +checking UTF-8 files. +--- + correct.c | 11 +++++++---- + 1 files changed, 7 insertions(+), 4 deletions(-) + +diff --git a/correct.c b/correct.c +index 982b7c6..c91b41b 100644 +--- a/correct.c ++++ b/correct.c +@@ -733,11 +733,14 @@ static int show_char (cp, linew, output, maxw) + ichar = SET_SIZE + laststringch; + else + ichar = chartoichar (ch); +- if (!vflag && iswordch (ichar) && len == 1) ++ if (!vflag && iswordch (ichar) && len >= 1) + { +- if (output) +- (void) putchar (ch); +- (*cp)++; ++ for (i = 0; i < len; ++i) ++ { ++ if (output) ++ (void) putchar (**cp); ++ (*cp)++; ++ } + return 1; + } + if (ch == '\t') +-- diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4100e017ed98..eccc4136e710 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3301,6 +3301,8 @@ with pkgs; boost = boost165; }; + ispell = callPackage ../tools/text/ispell {}; + kindlegen = callPackage ../tools/typesetting/kindlegen { }; latex2html = callPackage ../tools/misc/latex2html { }; From 76a01ad9d15e798fcf8e55adaa659c389a4c3fdf Mon Sep 17 00:00:00 2001 From: timor Date: Wed, 28 Feb 2018 14:32:52 +0100 Subject: [PATCH 190/814] hunspell-dicts: add support for german dictionary Note that this relies on ispell as a dependency. Also, perl and hunspell itself are used during building the dictionary. --- .../libraries/hunspell/dictionaries.nix | 58 ++++++++++++++++++- 1 file changed, 57 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/hunspell/dictionaries.nix b/pkgs/development/libraries/hunspell/dictionaries.nix index 37c00f3e2aa8..f30ec1872bae 100644 --- a/pkgs/development/libraries/hunspell/dictionaries.nix +++ b/pkgs/development/libraries/hunspell/dictionaries.nix @@ -1,6 +1,6 @@ /* hunspell dictionaries */ -{ stdenv, fetchurl, fetchFromGitHub, unzip, coreutils, bash, which, zip }: +{ stdenv, fetchurl, fetchFromGitHub, unzip, coreutils, bash, which, zip, ispell, perl, hunspell }: let @@ -168,6 +168,42 @@ let }; }; + mkDictFromJ3e = + { shortName, shortDescription, dictFileName }: + stdenv.mkDerivation rec { + name = "hunspell-dict-${shortName}-j3e-${version}"; + version = "20161207"; + + src = fetchurl { + url = "https://j3e.de/ispell/igerman98/dict/igerman98-${version}.tar.bz2"; + sha256 = "1a3055hp2bc4q4nlg3gmg0147p3a1zlfnc65xiv2v9pyql1nya8p"; + }; + + buildInputs = [ ispell perl hunspell ]; + + phases = ["unpackPhase" "installPhase"]; + installPhase = '' + patchShebangs bin + make hunspell/${dictFileName}.aff hunspell/${dictFileName}.dic + # hunspell dicts + install -dm755 "$out/share/hunspell" + install -m644 hunspell/${dictFileName}.dic "$out/share/hunspell/" + install -m644 hunspell/${dictFileName}.aff "$out/share/hunspell/" + # myspell dicts symlinks + install -dm755 "$out/share/myspell/dicts" + ln -sv "$out/share/hunspell/${dictFileName}.dic" "$out/share/myspell/dicts/" + ln -sv "$out/share/hunspell/${dictFileName}.aff" "$out/share/myspell/dicts/" + ''; + + meta = with stdenv.lib; { + homepage = https://www.j3e.de/ispell/igerman98/index_en.html; + description = shortDescription; + license = with licenses; [ gpl2 gpl3 ]; + maintainers = with maintainers; [ timor ]; + platforms = platforms.all; + }; + }; + in { /* ENGLISH */ @@ -427,4 +463,24 @@ in { }) ]; }; + + /* GERMAN */ + + de-de = mkDictFromJ3e { + shortName = "de-de"; + shortDescription = "German (Germany)"; + dictFileName = "de_DE"; + }; + + de-at = mkDictFromJ3e { + shortName = "de-at"; + shortDescription = "German (Austria)"; + dictFileName = "de_AT"; + }; + + de-ch = mkDictFromJ3e { + shortName = "de-ch"; + shortDescription = "German (Switzerland)"; + dictFileName = "de_CH"; + }; } From ae7fae71ed4d2e4666a11b7ab60e50dffb71a282 Mon Sep 17 00:00:00 2001 From: Luke Adams Date: Thu, 1 Mar 2018 16:55:38 -0600 Subject: [PATCH 191/814] prl-tools: add libelf input fixes build on 18.03 --- pkgs/os-specific/linux/prl-tools/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/prl-tools/default.nix b/pkgs/os-specific/linux/prl-tools/default.nix index b120062295ad..593b810dae5d 100644 --- a/pkgs/os-specific/linux/prl-tools/default.nix +++ b/pkgs/os-specific/linux/prl-tools/default.nix @@ -2,6 +2,7 @@ , gawk, utillinux, xorg, glib, dbus-glib, zlib , kernel ? null, libsOnly ? false , undmg, fetchurl +, libelf }: assert (!libsOnly) -> kernel != null; @@ -27,7 +28,7 @@ stdenv.mkDerivation rec { hardeningDisable = [ "pic" "format" ]; # also maybe python2 to generate xorg.conf - nativeBuildInputs = [ p7zip undmg ] ++ lib.optionals (!libsOnly) [ makeWrapper ]; + nativeBuildInputs = [ p7zip undmg libelf ] ++ lib.optionals (!libsOnly) [ makeWrapper ]; inherit libsOnly; From 52747120c100c4a37c61725322e9216618b552cb Mon Sep 17 00:00:00 2001 From: Luke Adams Date: Thu, 1 Mar 2018 17:06:43 -0600 Subject: [PATCH 192/814] parallels: add package config option allows overriding of package with newer versions --- nixos/modules/virtualisation/parallels-guest.nix | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/nixos/modules/virtualisation/parallels-guest.nix b/nixos/modules/virtualisation/parallels-guest.nix index e3b28780ed6b..36ca7f356d44 100644 --- a/nixos/modules/virtualisation/parallels-guest.nix +++ b/nixos/modules/virtualisation/parallels-guest.nix @@ -3,9 +3,7 @@ with lib; let - - prl-tools = config.boot.kernelPackages.prl-tools; - + prl-tools = config.hardware.parallels.package; in { @@ -32,6 +30,16 @@ in disable this to manually mount shares. ''; }; + + package = mkOption { + type = types.package; + default = config.boot.kernelPackages.prl-tools; + defaultText = "config.boot.kernelPackages.prl-tools"; + example = literalExample "config.boot.kernelPackages.prl-tools"; + description = '' + Defines which package to use for prl-tools. Override to change the version. + ''; + }; }; }; From 455cef7d5eb59988a545203a804fd7a365acf32c Mon Sep 17 00:00:00 2001 From: Eric Litak Date: Sun, 26 Nov 2017 20:02:34 -0800 Subject: [PATCH 193/814] opentx: init at 2.2.1 This does not yet cross-compile the firmware images. --- pkgs/applications/misc/opentx/default.nix | 58 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 60 insertions(+) create mode 100644 pkgs/applications/misc/opentx/default.nix diff --git a/pkgs/applications/misc/opentx/default.nix b/pkgs/applications/misc/opentx/default.nix new file mode 100644 index 000000000000..8a941a719f29 --- /dev/null +++ b/pkgs/applications/misc/opentx/default.nix @@ -0,0 +1,58 @@ +{ stdenv, fetchFromGitHub +, cmake, gcc-arm-embedded, python +, qt5, SDL, gmock +, dfu-util, avrdude +}: + +let + + version = "2.2.1"; + +in stdenv.mkDerivation { + + name = "opentx-${version}"; + + src = fetchFromGitHub { + owner = "opentx"; + repo = "opentx"; + rev = version; + sha256 = "01lnnkrxach21aivnx1k1iqhih02nixh8c4nk6rpw408p13him9g"; + }; + + enableParallelBuilding = true; + + nativeBuildInputs = [ cmake ]; + + buildInputs = with qt5; [ + gcc-arm-embedded + python python.pkgs.pyqt4 + qtbase qtmultimedia qttranslations + SDL gmock + ]; + + postPatch = '' + sed -i companion/src/burnconfigdialog.cpp -e 's|/usr/.*bin/dfu-util|${dfu-util}/bin/dfu-util|' + sed -i companion/src/burnconfigdialog.cpp -e 's|/usr/.*bin/avrdude|${avrdude}/bin/avrdude|' + ''; + + cmakeFlags = [ + "-DQT_TRANSLATIONS_DIR=${qt5.qttranslations}/translations" + # XXX I would prefer to include these here, though we will need to file a bug upstream to get that changed. + #"-DDFU_UTIL_PATH=${dfu-util}/bin/dfu-util" + #"-DAVRDUDE_PATH=${avrdude}/bin/avrdude" + ]; + + meta = with stdenv.lib; { + description = "OpenTX Companion transmitter support software"; + longDescription = '' + OpenTX Companion is used for many different tasks like loading OpenTX + firmware to the radio, backing up model settings, editing settings and + running radio simulators. + ''; + homepage = https://open-tx.org/; + license = stdenv.lib.licenses.gpl2; + platforms = [ "i686-linux" "x86_64-linux" ]; + maintainers = with maintainers; [ elitak ]; + }; + +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index eccc4136e710..cca1d5077dd0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -16825,6 +16825,8 @@ with pkgs; openscad = callPackage ../applications/graphics/openscad {}; + opentx = callPackage ../applications/misc/opentx { }; + opera = callPackage ../applications/networking/browsers/opera {}; orca = python3Packages.callPackage ../applications/misc/orca { From e21aa3baef14fc4489ebf449211246b98015ac16 Mon Sep 17 00:00:00 2001 From: DarkScythe97 Date: Fri, 2 Mar 2018 10:41:16 +1030 Subject: [PATCH 194/814] libretro: specify license per core --- pkgs/misc/emulators/retroarch/cores.nix | 33 ++++++++++++++++++++++--- 1 file changed, 30 insertions(+), 3 deletions(-) diff --git a/pkgs/misc/emulators/retroarch/cores.nix b/pkgs/misc/emulators/retroarch/cores.nix index 605cb7261a2e..090942371d73 100644 --- a/pkgs/misc/emulators/retroarch/cores.nix +++ b/pkgs/misc/emulators/retroarch/cores.nix @@ -7,7 +7,7 @@ let d2u = stdenv.lib.replaceChars ["-"] ["_"]; - mkLibRetroCore = ({ core, src, description, ... }@a: + mkLibRetroCore = ({ core, src, description, license, ... }@a: stdenv.lib.makeOverridable stdenv.mkDerivation rec { name = "libretro-${core}-${version}"; @@ -37,7 +37,7 @@ let meta = with stdenv.lib; { inherit description; homepage = https://www.libretro.com/; - license = licenses.gpl3Plus; + inherit license; maintainers = with maintainers; [ edwtjo hrdinka MP2E ]; platforms = platforms.linux; }; @@ -50,7 +50,7 @@ let fetchSubmodules = true; }; -in +in with stdenv.lib.licenses; { @@ -62,6 +62,7 @@ in sha256 = "1n42f70vni2zavppayaq8xmsyx5cn40qi4zk4pgq1w3hh2q8mj72"; }; description = "Port of 4DO/libfreedo to libretro"; + license = "Non-commercial"; }).override { buildPhase = "make"; }; @@ -74,6 +75,7 @@ in sha256 = "0p0k7kqfd6xg1qh6vgzgwp122miprb2bpzljgxd9kvigxihsl6f7"; }; description = "Port of Mednafen's PC Engine core to libretro"; + license = gpl2; }).override { buildPhase = "make"; name = "beetle-pce-fast"; @@ -87,6 +89,7 @@ in sha256 = "1k4b7g50ajzchjrm6d3v68hvri4k3hzvacn2l99i5yq3hxp7vs7x"; }; description = "Port of Mednafen's PSX Engine core to libretro"; + license = gpl2; }).override { buildPhase = "make"; name = "beetle-psx"; @@ -100,6 +103,7 @@ in sha256 = "1d1brysynwr6inlwfgv7gwkl3i9mf4lsaxd9wm2szw86g4diyn4c"; }; description = "Port of Mednafen's Saturn core to libretro"; + license = gpl2; }).override { buildPhase = "make"; name = "beetle-saturn"; @@ -114,6 +118,7 @@ in sha256 = "0vkn1f38vwazpp3kbvvv8c467ghak6yfx00s48wkxwvhmak74a3s"; }; description = "Fork of bsnes with HLE DSP emulation restored"; + license = gpl3; }).override { buildPhase = "make && cd out"; }; @@ -126,6 +131,7 @@ in sha256 = "064gzfbr7yizmvi91ry5y6bzikj633kdqhvzycb9f1g6kspf8yyl"; }; description = "libretro wrapper for desmume NDS emulator"; + license = gpl2; }).override { configurePhase = "cd desmume"; }; @@ -138,6 +144,7 @@ in sha256 = "1cshlfmhph8dl3vgvn37imvp2b7xs2cx1r1ifp5js5psvhycrbz3"; }; description = "Port of Dolphin to libretro"; + license = gpl2Plus; extraBuildInputs = [ cmake curl mesa pcre pkgconfig sfml miniupnpc @@ -166,6 +173,7 @@ in sha256 = "159dww8mxi95xz4ypw38vsn1g4k6z8sv415qqf0qriydwhw6mh2m"; }; description = "Port of Final Burn Alpha to libretro"; + license = "Non-commercial"; }).override { buildPhase = '' cd svn-current/trunk \ @@ -182,6 +190,7 @@ in sha256 = "0jnwh1338q710x47bzrx319g5xbq9ipv35kyjlbkrzhqjq1blz0b"; }; description = "FCEUmm libretro port"; + license = gpl2; }; gambatte = mkLibRetroCore rec { @@ -192,6 +201,7 @@ in sha256 = "0h7hyj630nk1s32wx02y4q9x2lp6wbnh6nkc9ihf4pygcsignmwr"; }; description = "Gambatte libretro port"; + license = gpl2; }; genesis-plus-gx = mkLibRetroCore rec { @@ -202,6 +212,7 @@ in sha256 = "0s11ddpnb44q4xjkl7dylldhi9y5zqywqavpk0bbwyj84r1cbz3c"; }; description = "Enhanced Genesis Plus libretro port"; + license = "Non-commercial"; }; mame = (mkLibRetroCore { @@ -212,6 +223,7 @@ in sha256 = "0blfvq28hgv9kkpijd8c9d9sa5g2qr448clwi7wrj8kqfdnrr8m1"; }; description = "Port of MAME to libretro"; + license = gpl2Plus; extraBuildInputs = [ alsaLib mesa portaudio python27 xorg.libX11 ]; }).override { @@ -230,6 +242,7 @@ in sha256 = "1b30sa861r4bhbqkx6vkklh4iy625bpzki2ks4ivvjns1ijczvc7"; }; description = "Port of mGBA to libretro"; + license = mpl20; }; mupen64plus = (mkLibRetroCore rec { @@ -240,6 +253,7 @@ in sha256 = "0q5kvjz7rpk7mp75cdywqjgmy10c0h7ky26hh1x90d39y94idcd8"; }; description = "Libretro port of Mupen64 Plus, GL only"; + license = gpl2; extraBuildInputs = [ mesa libpng ]; }).override { @@ -254,6 +268,7 @@ in sha256 = "17ac7dhasch6f4lpill8c5scsvaix0jvbf1cp797qbll4hk84f2q"; }; description = "nestopia undead libretro port"; + license = gpl2; }).override { buildPhase = "cd libretro && make"; }; @@ -266,6 +281,7 @@ in sha256 = "19396v50azrb52ifjk298zgcbxn8dvfvp6zwrnzsk6mp8ff7qcqw"; }; description = "Parallel Mupen64plus rewrite for libretro."; + license = gpl2; extraBuildInputs = [ mesa libpng ]; }).override { @@ -280,6 +296,7 @@ in sha256 = "0fl9r6jj2x9231md5zc4scra79j5hfn1n2z67scff1375xg1k64h"; }; description = "Fast MegaDrive/MegaCD/32X emulator"; + license = "MAME"; extraBuildInputs = [ libpng SDL ]; }).override { @@ -295,6 +312,7 @@ in sha256 = "06k1gzmypz61dslynrw4b5i161rhj43y6wnr2nhbzvwcv5bw8w8r"; }; description = "ppsspp libretro port"; + license = gpl2; extraBuildInputs = [ mesa ffmpeg ]; }).override { buildPhase = "cd libretro && make"; @@ -308,6 +326,7 @@ in sha256 = "02vkl3y5dmyzifsviphspqv03a2rdyf36zpjpgfg7x0s226f56ja"; }; description = "Prboom libretro port"; + license = gpl2; }).override { buildPhase = "make"; }; @@ -320,6 +339,7 @@ in sha256 = "18lizdb9zjlfhh8ibvmcscldlf3mw4aj8nds3pah68cd2lw170w1"; }; description = "QuickNES libretro port"; + license = lgpl21Plus; }).override { buildPhase = "make"; }; @@ -332,6 +352,7 @@ in sha256 = "0d8wzpv7pcyh437gmvi439vim26wyrjmi5hj97wvyvggywjwrx8m"; }; description = "Reicast libretro port"; + license = gpl2; extraBuildInputs = [ mesa ]; }).override { buildPhase = "make"; @@ -345,6 +366,7 @@ in sha256 = "097i2dq3hw14hicsplrs36j1qa3r45vhzny5v4aw6qw4aj34hksy"; }; description = "Libretro port of ScummVM"; + license = gpl2; extraBuildInputs = [ fluidsynth libjpeg libvorbis mesa SDL ]; }).override { buildPhase = "cd backends/platform/libretro/build && make"; @@ -358,6 +380,7 @@ in sha256 = "02f04ss45km32lp68diyfkix1gryx89qy8cc80189ipwnx80pgip"; }; description = "Port of SNES9x git to libretro"; + license = "Non-commercial"; }).override { buildPhase = "cd libretro && make"; }; @@ -370,6 +393,7 @@ in sha256 = "1vhgsrg9l562nincfvpj2h2dqkkblg1qmh0v47jqlqgmgl2b1zij"; }; description = "Optimized port/rewrite of SNES9x 1.52+ to Libretro"; + license = "Non-commercial"; }).override { buildPhase = '' make -f Makefile.libretro @@ -385,6 +409,7 @@ in sha256 = "18r1yyfzvjq2hq04d94y37kzsq6aywh1aim69a3imk8kh46gwrh0"; }; description = "Port of Stella to libretro"; + license = gpl2; }).override { buildPhase = "make"; }; @@ -397,6 +422,7 @@ in sha256 = "03s4rh7dbbhbfc4pfdvr9jcbxrp4ijg8yp49s1xhr7sxsblj2vpv"; }; description = "VBA-M libretro port with modifications for speed"; + license = gpl2; }; vba-m = (mkLibRetroCore rec { @@ -407,6 +433,7 @@ in sha256 = "043djmqvh2grc25hwjw4b5kfx57b89ryp6fcl8v632sm35l3dd6z"; }; description = "vanilla VBA-M libretro port"; + license = gpl2; }).override { buildPhase = "cd src/libretro && make"; }; From f2937b74854625b664eb5cb5ca900d80cf0c390b Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Thu, 1 Mar 2018 21:21:27 -0500 Subject: [PATCH 195/814] initrd-ssh: Fix for new dropbear version. For some reason 2018.76 dropped the -m flag. --- nixos/modules/system/boot/initrd-ssh.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/system/boot/initrd-ssh.nix b/nixos/modules/system/boot/initrd-ssh.nix index cdeff4845948..8b3dc2d90eb3 100644 --- a/nixos/modules/system/boot/initrd-ssh.nix +++ b/nixos/modules/system/boot/initrd-ssh.nix @@ -118,7 +118,7 @@ in echo ${escapeShellArg key} >> /root/.ssh/authorized_keys '') cfg.authorizedKeys)} - dropbear -s -j -k -E -m -p ${toString cfg.port} ${optionalString (cfg.hostRSAKey == null && cfg.hostDSSKey == null && cfg.hostECDSAKey == null) "-R"} + dropbear -s -j -k -E -p ${toString cfg.port} ${optionalString (cfg.hostRSAKey == null && cfg.hostDSSKey == null && cfg.hostECDSAKey == null) "-R"} ''; boot.initrd.secrets = From 6dfe15185255ed70466313160f8d591c96e503b3 Mon Sep 17 00:00:00 2001 From: Ivan Jager Date: Tue, 26 Dec 2017 17:37:48 -0600 Subject: [PATCH 196/814] infiniband-diags: init at 2.0.0 --- .../networking/infiniband-diags/default.nix | 44 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 46 insertions(+) create mode 100644 pkgs/tools/networking/infiniband-diags/default.nix diff --git a/pkgs/tools/networking/infiniband-diags/default.nix b/pkgs/tools/networking/infiniband-diags/default.nix new file mode 100644 index 000000000000..f769a3fcffac --- /dev/null +++ b/pkgs/tools/networking/infiniband-diags/default.nix @@ -0,0 +1,44 @@ +{ stdenv, fetchFromGitHub, autoconf, automake, libtool, pkgconfig, rdma-core, + glib, opensm, perl, makeWrapper }: + +stdenv.mkDerivation rec { + name = "infiniband-diags-${version}"; + version = "2.0.0"; + + src = fetchFromGitHub { + owner = "linux-rdma"; + repo = "infiniband-diags"; + rev = version; + sha256 = "06x8yy3ly1vzraznc9r8pfsal9mjavxzhgrla3q2493j5jz0sx76"; + }; + + nativeBuildInputs = [ autoconf automake libtool pkgconfig makeWrapper ]; + + buildInputs = [ rdma-core glib opensm perl ]; + + preConfigure = '' + export CFLAGS="-I${opensm}/include/infiniband" + ./autogen.sh + ''; + + configureFlags = "--with-perl-installdir=\${out}/lib/perl5/site_perl --sbindir=\${out}/bin"; + + postInstall = '' + rmdir $out/var/run $out/var + ''; + + postFixup = '' + for pls in $out/bin/{ibfindnodesusing.pl,ibidsverify.pl}; do + echo "wrapping $pls" + wrapProgram $pls --prefix PERL5LIB : "$out/lib/perl5/site_perl" + done + ''; + + meta = with stdenv.lib; { + description = "Utilities designed to help configure, debug, and maintain infiniband fabrics"; + homepage = http://linux-rdma.org/; + license = licenses.bsd2; # Or GPL 2 + maintainers = [ maintainers.aij ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6e4629dc9a50..d17837694b2f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2918,6 +2918,8 @@ with pkgs; inetutils = callPackage ../tools/networking/inetutils { }; + infiniband-diags = callPackage ../tools/networking/infiniband-diags { }; + inform7 = callPackage ../development/compilers/inform7 { }; infamousPlugins = callPackage ../applications/audio/infamousPlugins { }; From c67d4aaf4de503e27bab63f702c5498a1302d467 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Fri, 2 Mar 2018 10:24:13 +0800 Subject: [PATCH 197/814] elixir: 1.6.0 -> 1.6.2 --- pkgs/development/interpreters/elixir/1.6.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/elixir/1.6.nix b/pkgs/development/interpreters/elixir/1.6.nix index 673a4b6e51bb..32e5bb6b3234 100644 --- a/pkgs/development/interpreters/elixir/1.6.nix +++ b/pkgs/development/interpreters/elixir/1.6.nix @@ -1,7 +1,7 @@ { mkDerivation }: mkDerivation rec { - version = "1.6.0"; - sha256 = "0wfmbrq70n85mx17kl9h2k0xzgnhncz3xygjx9cbvpmiwwdzgrdx"; + version = "1.6.2"; + sha256 = "18f5afmvra78y0x73bfnwbddlyqfndyaj1h8n1ybj32w4nvy96y7"; minimumOTPVersion = "18"; } From 4953a006f56f26cdd1b9889cf91d52356dd1320e Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Thu, 1 Mar 2018 21:27:25 -0500 Subject: [PATCH 198/814] Revert "dropbear: 2017.75 -> 2018.76" This reverts commit db913f844539b1769c305a9a5cffd4fe0c1f350a. --- pkgs/tools/networking/dropbear/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/dropbear/default.nix b/pkgs/tools/networking/dropbear/default.nix index b7ef3b8fa75b..709fb9540d16 100644 --- a/pkgs/tools/networking/dropbear/default.nix +++ b/pkgs/tools/networking/dropbear/default.nix @@ -4,11 +4,11 @@ }: stdenv.mkDerivation rec { - name = "dropbear-2018.76"; + name = "dropbear-2017.75"; src = fetchurl { url = "http://matt.ucc.asn.au/dropbear/releases/${name}.tar.bz2"; - sha256 = "0rgavbzw7jrs5wslxm0dnwx2m409yzxd9hazd92r7kx8xikr3yzj"; + sha256 = "1309cm2aw62n9m3h38prvgsqr8bj85hfasgnvwkd42cp3k5ivg3c"; }; dontDisableStatic = enableStatic; From 4237842f928c4ef6bf901f5f3dc1acc088738f36 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Thu, 1 Mar 2018 21:36:20 -0500 Subject: [PATCH 199/814] Revert "Revert "dropbear: 2017.75 -> 2018.76"" This was for local testing, never meant to commit it... This reverts commit 4953a006f56f26cdd1b9889cf91d52356dd1320e. --- pkgs/tools/networking/dropbear/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/dropbear/default.nix b/pkgs/tools/networking/dropbear/default.nix index 709fb9540d16..b7ef3b8fa75b 100644 --- a/pkgs/tools/networking/dropbear/default.nix +++ b/pkgs/tools/networking/dropbear/default.nix @@ -4,11 +4,11 @@ }: stdenv.mkDerivation rec { - name = "dropbear-2017.75"; + name = "dropbear-2018.76"; src = fetchurl { url = "http://matt.ucc.asn.au/dropbear/releases/${name}.tar.bz2"; - sha256 = "1309cm2aw62n9m3h38prvgsqr8bj85hfasgnvwkd42cp3k5ivg3c"; + sha256 = "0rgavbzw7jrs5wslxm0dnwx2m409yzxd9hazd92r7kx8xikr3yzj"; }; dontDisableStatic = enableStatic; From 2f018bb353e3593c3fae2a1d688f28d111c60de3 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Fri, 2 Mar 2018 07:35:18 +0100 Subject: [PATCH 200/814] xmoto: fix build with gcc7 --- pkgs/games/xmoto/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/games/xmoto/default.nix b/pkgs/games/xmoto/default.nix index 7d4f2e53a941..29c6cba853ce 100644 --- a/pkgs/games/xmoto/default.nix +++ b/pkgs/games/xmoto/default.nix @@ -13,10 +13,12 @@ stdenv.mkDerivation rec { buildInputs = [ chipmunk sqlite curl zlib bzip2 libjpeg libpng - freeglut mesa SDL SDL_mixer SDL_image SDL_net SDL_ttf + freeglut mesa SDL SDL_mixer SDL_image SDL_net SDL_ttf lua5 ode libxdg_basedir libxml2 ]; + CXXFLAGS = [ "-fpermissive" ]; + meta = with stdenv.lib; { description = "Obstacled race game"; homepage = http://xmoto.tuxfamily.org; From ab91a07d89b2e89cbb612ab0262e0d6ef3fb4be7 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Fri, 2 Mar 2018 08:25:18 +0100 Subject: [PATCH 201/814] libreoffice-fresh: 6.0.1.1 -> 6.0.2.1 --- pkgs/applications/office/libreoffice/default-primary-src.nix | 4 ++-- pkgs/applications/office/libreoffice/default.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/office/libreoffice/default-primary-src.nix b/pkgs/applications/office/libreoffice/default-primary-src.nix index 6f5da5bea8e4..f8742253c519 100644 --- a/pkgs/applications/office/libreoffice/default-primary-src.nix +++ b/pkgs/applications/office/libreoffice/default-primary-src.nix @@ -3,7 +3,7 @@ rec { major = "6"; minor = "0"; - patch = "1"; + patch = "2"; tweak = "1"; subdir = "${major}.${minor}.${patch}"; @@ -12,6 +12,6 @@ rec { src = fetchurl { url = "https://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${version}.tar.xz"; - sha256 = "1abhas5hc0whibz39msk4r7njyrm7w8k0idk0y522ifndsf2m04g"; + sha256 = "0qga01lhh09jf2gx3czk66i5c854gzzjxgkrmj5d7m4ci2zaxfsd"; }; } diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix index 1325d2de2fbc..dc3b14dabe1d 100644 --- a/pkgs/applications/office/libreoffice/default.nix +++ b/pkgs/applications/office/libreoffice/default.nix @@ -42,14 +42,14 @@ let translations = fetchSrc { name = "translations"; - sha256 = "0iqhsb6nw5fx2vjmyygqjq0qw76igyrrwpv8126j833zv29wx8jj"; + sha256 = "1fx9xkf1ppap77b8zdr8qawbikgp607z5w9b7jk3rilcqs7xbkwl"; }; # TODO: dictionaries help = fetchSrc { name = "help"; - sha256 = "0iynlnj9304qvg4636rpy005pjc7avi1hv37nb3kppgm2k0gyrj4"; + sha256 = "0zphmhl4a8pd5l7ma4bzhrwgbv037j8p5m1ilvb1blgbqv53v38a"; }; }; From 0e93b0e9ac0201427c3aba05f9a1cc1505672399 Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Thu, 1 Mar 2018 22:21:45 +0100 Subject: [PATCH 202/814] php: 7.2.2 -> 7.2.3 Changelog: http://www.php.net/ChangeLog-7.php#7.2.3 --- pkgs/development/interpreters/php/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix index 07b93f7bf695..13d77bbfb029 100644 --- a/pkgs/development/interpreters/php/default.nix +++ b/pkgs/development/interpreters/php/default.nix @@ -353,7 +353,7 @@ in { }; php72 = generic { - version = "7.2.2"; - sha256 = "1vjaixm4f7rz9vz1yrlzmn9rpp01vd7b74m83qjg4wblw5caqhgq"; + version = "7.2.3"; + sha256 = "14mzsp6ysjgc7f6vl0z0j996qf8n75yh0aga121dsr571fn5lwsa"; }; } From 5de8f99f03899f5791447bbcc0e1f3e87cf87868 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Tue, 27 Feb 2018 12:55:11 +0100 Subject: [PATCH 203/814] nixos/jenkins: ensure postStart follows redirects Pass the -L flag to curl to make it follow redirects. This fixes an issue I found when setting up reverse proxy for Jenkins. Without this fix, the returned HTTP code was stuck at 302, making postStart fail the service (it expects 200 or 403). --- .../modules/services/continuous-integration/jenkins/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/continuous-integration/jenkins/default.nix b/nixos/modules/services/continuous-integration/jenkins/default.nix index 0dd59e4fb444..54047a50caa6 100644 --- a/nixos/modules/services/continuous-integration/jenkins/default.nix +++ b/nixos/modules/services/continuous-integration/jenkins/default.nix @@ -208,7 +208,7 @@ in { ''; postStart = '' - until [[ $(${pkgs.curl.bin}/bin/curl -s --head -w '\n%{http_code}' http://${cfg.listenAddress}:${toString cfg.port}${cfg.prefix} | tail -n1) =~ ^(200|403)$ ]]; do + until [[ $(${pkgs.curl.bin}/bin/curl -L -s --head -w '\n%{http_code}' http://${cfg.listenAddress}:${toString cfg.port}${cfg.prefix} | tail -n1) =~ ^(200|403)$ ]]; do sleep 1 done ''; From 03eb06ae6ee1549c8cee758390007699f4eaddbb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Fri, 2 Mar 2018 09:20:11 +0100 Subject: [PATCH 204/814] mysql55: fixup build with gcc7 --- pkgs/servers/sql/mysql/5.5.x.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/servers/sql/mysql/5.5.x.nix b/pkgs/servers/sql/mysql/5.5.x.nix index 5a747fb85abd..29d25b77afc8 100644 --- a/pkgs/servers/sql/mysql/5.5.x.nix +++ b/pkgs/servers/sql/mysql/5.5.x.nix @@ -49,6 +49,7 @@ self = stdenv.mkDerivation rec { "-DINSTALL_SHAREDIR=share/mysql" ]; + NIX_CFLAGS_COMPILE = [ "-fpermissive" ]; # since gcc-7 NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isLinux "-lgcc_s"; prePatch = '' From 45fa79d43bdca35ac71c7dfba907cb031349bcaa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Fri, 2 Mar 2018 09:18:57 +0000 Subject: [PATCH 205/814] prl-tools: use kernel.moduleBuildDependencies instead of libelf --- pkgs/os-specific/linux/prl-tools/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/prl-tools/default.nix b/pkgs/os-specific/linux/prl-tools/default.nix index 593b810dae5d..b2ebab447e10 100644 --- a/pkgs/os-specific/linux/prl-tools/default.nix +++ b/pkgs/os-specific/linux/prl-tools/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { hardeningDisable = [ "pic" "format" ]; # also maybe python2 to generate xorg.conf - nativeBuildInputs = [ p7zip undmg libelf ] ++ lib.optionals (!libsOnly) [ makeWrapper ]; + nativeBuildInputs = [ p7zip undmg ] ++ lib.optionals (!libsOnly) [ makeWrapper ] ++ kernel.moduleBuildDependencies; inherit libsOnly; From 213c2169d671bfd1dd408cc658b7d35d9bf830be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Fri, 2 Mar 2018 10:32:59 +0100 Subject: [PATCH 206/814] msitools: remove myself from maintainers I haven't used it for a very long time, and there's too much other things going on. --- pkgs/development/tools/misc/msitools/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/tools/misc/msitools/default.nix b/pkgs/development/tools/misc/msitools/default.nix index 4ffad650f20c..ecee27c13858 100644 --- a/pkgs/development/tools/misc/msitools/default.nix +++ b/pkgs/development/tools/misc/msitools/default.nix @@ -16,7 +16,6 @@ stdenv.mkDerivation rec { description = "Set of programs to inspect and build Windows Installer (.MSI) files"; homepage = https://wiki.gnome.org/msitools; license = [licenses.gpl2 licenses.lgpl21]; - maintainers = [maintainers.vcunat]; platforms = platforms.unix; }; } From 0e050da0f5302c2beae0a898d2db16211378b84a Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Fri, 2 Mar 2018 10:45:11 +0100 Subject: [PATCH 207/814] torchat: not broken --- .../networking/instant-messengers/torchat/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/applications/networking/instant-messengers/torchat/default.nix b/pkgs/applications/networking/instant-messengers/torchat/default.nix index 700fab061164..06bcd7a0400e 100644 --- a/pkgs/applications/networking/instant-messengers/torchat/default.nix +++ b/pkgs/applications/networking/instant-messengers/torchat/default.nix @@ -33,6 +33,5 @@ stdenv.mkDerivation rec { license = licenses.gpl3; maintainers = [ maintainers.phreedom ]; platforms = platforms.unix; - broken = true; }; } From e616cd8840d8a5e301ca4f4a577f5ad5e72c790a Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Fri, 2 Mar 2018 10:52:12 +0100 Subject: [PATCH 208/814] tex4ht: obsoleted by tex4ht in texlive --- pkgs/tools/typesetting/tex/tex4ht/default.nix | 39 ------------------- pkgs/top-level/all-packages.nix | 2 - 2 files changed, 41 deletions(-) delete mode 100644 pkgs/tools/typesetting/tex/tex4ht/default.nix diff --git a/pkgs/tools/typesetting/tex/tex4ht/default.nix b/pkgs/tools/typesetting/tex/tex4ht/default.nix deleted file mode 100644 index dc2d3e052e8a..000000000000 --- a/pkgs/tools/typesetting/tex/tex4ht/default.nix +++ /dev/null @@ -1,39 +0,0 @@ -{stdenv, fetchurl, tetex, unzip}: - -stdenv.mkDerivation rec { - name = "tex4ht-1.0.2009_06_11_1038"; - - src = fetchurl { - url = "http://tug.org/applications/tex4ht/tex4ht.zip"; - sha256 = "15gj18ihds6530af42clpa4zskak5kah9wzs2hd19a9ymwjsccd6"; - }; - - buildInputs = [ tetex unzip ]; - - hardeningDisable = [ "format" ]; - - buildPhase = '' - cd src - for f in tex4ht t4ht htcmd ; do - # -DENVFILE="$out/share/texmf-nix/tex4ht/base/unix/tex4ht.env" - ''${CC:-gcc} -o $f $f.c -I${tetex}/include -L${tetex}/lib -DHAVE_DIRENT_H -DHAVE_DIRENT_H -DKPATHSEA -lkpathsea - done - cd - - ''; - - installPhase = '' - mkdir -p $out/bin - for f in src/tex4ht src/t4ht src/htcmd "bin/unix/"*; do - mv $f $out/bin/ - done - mv texmf $out/texmf-dist - ''; - - meta = { - homepage = http://tug.org/tex4ht/; - description = "A system to convert (La)TeX documents to HTML and various other formats"; - license = stdenv.lib.licenses.lppl12; - platforms = stdenv.lib.platforms.unix; - broken = true; # use the one from texlive.tex4ht - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c025469152b3..b85a217d3603 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20481,8 +20481,6 @@ with pkgs; tewi-font = callPackage ../data/fonts/tewi {}; - tex4ht = callPackage ../tools/typesetting/tex/tex4ht { tetex = ""; }; - texFunctions = callPackage ../tools/typesetting/tex/nix pkgs; # TeX Live; see http://nixos.org/nixpkgs/manual/#sec-language-texlive From e43dd6f164089e56fabb4d92638d5bcbaad203dc Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Fri, 2 Mar 2018 11:56:12 +0100 Subject: [PATCH 209/814] gnome2.gnome-session: remove --- pkgs/desktops/gnome-2/default.nix | 3 --- .../gnome-2/desktop/gnome-session/default.nix | 20 ------------------- 2 files changed, 23 deletions(-) delete mode 100644 pkgs/desktops/gnome-2/desktop/gnome-session/default.nix diff --git a/pkgs/desktops/gnome-2/default.nix b/pkgs/desktops/gnome-2/default.nix index a91202a22123..cc4536785251 100644 --- a/pkgs/desktops/gnome-2/default.nix +++ b/pkgs/desktops/gnome-2/default.nix @@ -12,7 +12,6 @@ let overridden = set // overrides; set = with overridden; { gnome_common = gnome-common; gnome_keyring = gnome-keyring; gnome_desktop = gnome-desktop; - gnome_session = gnome-session; gnome_settings_daemon = gnome-settings-daemon; gnome_control_center = gnome-control-center; @@ -107,8 +106,6 @@ let overridden = set // overrides; set = with overridden; { gnome_panel = callPackage ./desktop/gnome-panel { }; - gnome-session = callPackage ./desktop/gnome-session { }; - gnome-settings-daemon = callPackage ./desktop/gnome-settings-daemon { }; gnome-control-center = callPackage ./desktop/gnome-control-center { }; diff --git a/pkgs/desktops/gnome-2/desktop/gnome-session/default.nix b/pkgs/desktops/gnome-2/desktop/gnome-session/default.nix deleted file mode 100644 index a5ae555ded83..000000000000 --- a/pkgs/desktops/gnome-2/desktop/gnome-session/default.nix +++ /dev/null @@ -1,20 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, dbus-glib, cairo, dbus, gtk, pango, atk, libXau, libXtst, inputproto -, intltool, libglade, startup_notification, GConf, upower, libSM }: - -stdenv.mkDerivation { - name = "gnome-session-2.32.1"; - - src = fetchurl { - url = mirror://gnome/sources/gnome-session/2.32/gnome-session-2.32.1.tar.bz2; - sha256 = "0sk8qclarpar27va1ahzwjh2wsafys0xsdjzdg7cgygw6gj3rn92"; - }; - - buildInputs = - [ dbus-glib gtk libXau libXtst inputproto libglade startup_notification - GConf upower libSM - ]; - nativeBuildInputs = [ pkgconfig intltool ]; - - # gconf-sanity-check-2 not found - meta.broken = true; -} From a9dd3847f6a31573990eaf5d06549ae768afb532 Mon Sep 17 00:00:00 2001 From: Linus Heckemann Date: Wed, 28 Feb 2018 21:14:36 +0100 Subject: [PATCH 210/814] memtester: fix cross build --- pkgs/tools/system/memtester/default.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkgs/tools/system/memtester/default.nix b/pkgs/tools/system/memtester/default.nix index 2663f3b852a6..d34fb939822d 100644 --- a/pkgs/tools/system/memtester/default.nix +++ b/pkgs/tools/system/memtester/default.nix @@ -4,6 +4,11 @@ stdenv.mkDerivation rec { name = "memtester-${version}"; version = "4.3.0"; + preConfigure = '' + echo "$CC" > conf-cc + echo "$CC" > conf-ld + ''; + src = fetchurl { url = "http://pyropus.ca/software/memtester/old-versions/memtester-${version}.tar.gz"; sha256 = "127xymmyzb9r6dxqrwd69v7gf8csv8kv7fjvagbglf3wfgyy5pzr"; From 715ca57a57a565f0bb65074599dcb2b33770644d Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Fri, 2 Mar 2018 12:35:11 +0100 Subject: [PATCH 211/814] php: add myself as maintainer --- pkgs/development/interpreters/php/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix index 13d77bbfb029..b405694fb825 100644 --- a/pkgs/development/interpreters/php/default.nix +++ b/pkgs/development/interpreters/php/default.nix @@ -319,7 +319,7 @@ let description = "An HTML-embedded scripting language"; homepage = http://www.php.net/; license = licenses.php301; - maintainers = with maintainers; [ globin ]; + maintainers = with maintainers; [ globin etu ]; platforms = platforms.all; outputsToInstall = [ "out" "dev" ]; }; From c9fdf84a38d1be255e74816a9956399cb11b1b55 Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Fri, 2 Mar 2018 12:35:35 +0100 Subject: [PATCH 212/814] php71: 7.1.14 -> 7.1.15 Changelog: http://www.php.net/ChangeLog-7.php#7.1.15 --- pkgs/development/interpreters/php/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix index b405694fb825..4bb400913f70 100644 --- a/pkgs/development/interpreters/php/default.nix +++ b/pkgs/development/interpreters/php/default.nix @@ -348,8 +348,8 @@ in { }; php71 = generic { - version = "7.1.14"; - sha256 = "1x41qmq66r0ff0573ln34d3qbzwg5z20nagsn1b6frfpkq9zvck3"; + version = "7.1.15"; + sha256 = "1gfw3ab9pvv034l9xk7ry23xsdz9vcwksrvmzkjmsj79713sa5z1"; }; php72 = generic { From b503b2dda5d51f0bd8870968d3db4905c63f7151 Mon Sep 17 00:00:00 2001 From: Elis Hirwing Date: Fri, 2 Mar 2018 12:35:53 +0100 Subject: [PATCH 213/814] php56: 5.6.33 -> 5.6.34 Changelog: http://www.php.net/ChangeLog-5.php#5.6.34 --- pkgs/development/interpreters/php/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/php/default.nix b/pkgs/development/interpreters/php/default.nix index 4bb400913f70..e87d4e89a461 100644 --- a/pkgs/development/interpreters/php/default.nix +++ b/pkgs/development/interpreters/php/default.nix @@ -338,8 +338,8 @@ let in { php56 = generic { - version = "5.6.33"; - sha256 = "1k1ip1slk89hkp57qiqp8k2m5yrg9lx5rja542g87k8xfslrdxh7"; + version = "5.6.34"; + sha256 = "1kgjgkabhrm8ksmh6j3m59vm85n401mcn7inh03hnjzfijflk7z1"; }; php70 = generic { From a8d3aa58dcf6a62eecda96577c656e016f4bd7b7 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Fri, 2 Mar 2018 13:20:56 +0100 Subject: [PATCH 214/814] Revert "dhcpcd: 6.11.5 -> 7.0.1" This reverts commit 7cc74d6dc501295a9ad7a69eb2d1139b20f3f0f0. See discussion in https://github.com/NixOS/nixpkgs/pull/35622 cc @vcunat @Mic92 @fpletz --- pkgs/tools/networking/dhcpcd/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/dhcpcd/default.nix b/pkgs/tools/networking/dhcpcd/default.nix index 5b7befb3bf64..95e3193fd0f5 100644 --- a/pkgs/tools/networking/dhcpcd/default.nix +++ b/pkgs/tools/networking/dhcpcd/default.nix @@ -1,11 +1,13 @@ { stdenv, fetchurl, pkgconfig, udev }: stdenv.mkDerivation rec { - name = "dhcpcd-7.0.1"; + # when updating this to >=7, check, see previous reverts: + # nix-build -A nixos.tests.networking.scripted.macvlan.x86_64-linux nixos/release-combined.nix + name = "dhcpcd-6.11.5"; src = fetchurl { url = "mirror://roy/dhcpcd/${name}.tar.xz"; - sha256 = "1j7kyg9gm5d1k6qjdscjz2rjgpqia0dxgk69lswp21y0pizm6dlb"; + sha256 = "17nnhxmbdcc7k2mh6sgvxisqcqbic5540xbig363ds97gvf795kg"; }; nativeBuildInputs = [ pkgconfig ]; From 7d7d25fb3b3a79e49211e98320f7da8a2bacab21 Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Thu, 1 Mar 2018 15:34:33 +0100 Subject: [PATCH 215/814] spotify: 1.0.70.399.g5ffabd56-26 -> 1.0.69.336.g7edcc575-39 --- pkgs/applications/audio/spotify/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/spotify/default.nix b/pkgs/applications/audio/spotify/default.nix index 35c5dff27106..9ac0c49ebc31 100644 --- a/pkgs/applications/audio/spotify/default.nix +++ b/pkgs/applications/audio/spotify/default.nix @@ -9,7 +9,7 @@ let # Latest version number can be found at: # http://repository-origin.spotify.com/pool/non-free/s/spotify-client/ # Be careful not to pick the testing version. - version = "1.0.70.399.g5ffabd56-26"; + version = "1.0.69.336.g7edcc575-39"; deps = [ alsaLib @@ -54,7 +54,7 @@ stdenv.mkDerivation { src = fetchurl { url = "https://repository-origin.spotify.com/pool/non-free/s/spotify-client/spotify-client_${version}_amd64.deb"; - sha256 = "0kpakz11xkyqqjvln4jkhc3z5my8zgpw8m6jx954cjdbc6vkxd29"; + sha256 = "0bh2q7g478g7wj661fypxcbhrbq87zingfyigg7rz1shgsgwc3gd"; }; buildInputs = [ dpkg makeWrapper ]; From 7e39f46427a9f411903a7b29e05020fd64758928 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Fri, 2 Mar 2018 21:19:29 +0800 Subject: [PATCH 216/814] ethabi: 1.0.4 -> 4.1.0 --- pkgs/applications/altcoins/ethabi.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/altcoins/ethabi.nix b/pkgs/applications/altcoins/ethabi.nix index e8fb1c49828e..81b4cb52948f 100644 --- a/pkgs/applications/altcoins/ethabi.nix +++ b/pkgs/applications/altcoins/ethabi.nix @@ -4,16 +4,16 @@ with rustPlatform; buildRustPackage rec { name = "ethabi-${version}"; - version = "1.0.4"; + version = "4.1.0"; src = fetchFromGitHub { owner = "paritytech"; repo = "ethabi"; - rev = "18ddc983d77b2a97e6c322abcc23bec59940d65f"; - sha256 = "1rg7ydvnhlg8w6blilm3cv6v4q51x1hgrbkln2ikhpdq0vakp5fd"; + rev = "v${version}"; + sha256 = "0kxflixmgycdh7sv73zf2mrkbcfzzw7f5sjbsjks9crc9cvjqi6p"; }; - cargoSha256 = "0i9617qwc6d4jvlbydwk03rcsnyvxzpbn2ms10ds4r6x7jy2a4sy"; + cargoSha256 = "18rigpsmfiv6im2sspnxadgqrlfdp9dd75ji8s56ksc9g7hrc3wz"; cargoBuildFlags = ["--features cli"]; From 11d6ada7552cb3463d34501209eb5c26a2629322 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Fri, 2 Mar 2018 21:23:31 +0800 Subject: [PATCH 217/814] seth: 0.6.2 -> 0.6.3 --- pkgs/applications/altcoins/seth.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/altcoins/seth.nix b/pkgs/applications/altcoins/seth.nix index 40fbf2ceb6a7..334ec9277e1b 100644 --- a/pkgs/applications/altcoins/seth.nix +++ b/pkgs/applications/altcoins/seth.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { name = "seth-${version}"; - version = "0.6.2"; + version = "0.6.3"; src = fetchFromGitHub { owner = "dapphub"; repo = "seth"; rev = "v${version}"; - sha256 = "1lbr7i3rznfp3h03y7pc094r0m992lbzr926rnr0xxbyp755wvm4"; + sha256 = "0la2nfqsscpbq6zwa6hsd73nimdnrhilrmgyy77yr3jca2wjhsjk"; }; nativeBuildInputs = [makeWrapper]; From e044db39748a0eee110481dee4ed8c2c5fe7686c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Fri, 2 Mar 2018 12:20:00 +0000 Subject: [PATCH 218/814] mlt: 6.4.1 -> 6.6.0 fix opencv incompatibility reported in #36170 --- pkgs/development/libraries/mlt/default.nix | 17 ++------------- pkgs/development/libraries/mlt/qt-5.nix | 24 +++++++--------------- 2 files changed, 9 insertions(+), 32 deletions(-) diff --git a/pkgs/development/libraries/mlt/default.nix b/pkgs/development/libraries/mlt/default.nix index 6eee8df5a23e..59700669ba7c 100644 --- a/pkgs/development/libraries/mlt/default.nix +++ b/pkgs/development/libraries/mlt/default.nix @@ -6,28 +6,15 @@ stdenv.mkDerivation rec { name = "mlt-${version}"; - version = "6.4.1"; + version = "6.6.0"; src = fetchFromGitHub { owner = "mltframework"; repo = "mlt"; rev = "v${version}"; - sha256 = "0k9vj21n6qxdjd0vvj22cwi35igajjzh5fbjza766izdbijv2i2w"; + sha256 = "0b2fq0819r7n141l6hhr66hpayqqcmjr2yxw9azxkapg1h0div6q"; }; - patches = [ - # fix for glibc-2.26 - (fetchurl { - url = "https://github.com/mltframework/mlt/commit/2125e3955a0d0be61571cf43b674f74b4b93c6f8.patch"; - sha256 = "1bgs5a3dblsmdmb7hwval9nmq1as4r4f48b3amsc23v69nsl2g0a"; - }) - # fix for glibc-2.26 - (fetchurl { - url = "https://github.com/mltframework/mlt/commit/fbf6a5187776f2f392cf258935ff49e4c0e87024.patch"; - sha256 = "045vchpcznzsz47j67kxwdbg133kar66ssna3parnzrxdfqi72pv"; - }) - ]; - buildInputs = [ SDL ffmpeg frei0r libjack2 libdv libsamplerate libvorbis libxml2 makeWrapper movit pkgconfig sox diff --git a/pkgs/development/libraries/mlt/qt-5.nix b/pkgs/development/libraries/mlt/qt-5.nix index 7111a78381d1..27f7cf31cbf2 100644 --- a/pkgs/development/libraries/mlt/qt-5.nix +++ b/pkgs/development/libraries/mlt/qt-5.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, SDL, ffmpeg, frei0r, libjack2, libdv, libsamplerate +{ stdenv, fetchFromGitHub, SDL, ffmpeg, frei0r, libjack2, libdv, libsamplerate , libvorbis, libxml2, makeWrapper, movit, pkgconfig, sox, qtbase, qtsvg , fftw, vid-stab, opencv3, ladspa-sdk }: @@ -7,24 +7,14 @@ let inherit (stdenv.lib) getDev; in stdenv.mkDerivation rec { name = "mlt-${version}"; - version = "6.4.1"; + version = "6.6.0"; - src = fetchurl { - url = "https://github.com/mltframework/mlt/archive/v${version}.tar.gz"; - sha256 = "10m3ry0b2pvqx3bk34qh5dq337nn8pkc2gzfyhsj4nv9abskln47"; + src = fetchFromGitHub { + owner = "mltframework"; + repo = "mlt"; + rev = "v${version}"; + sha256 = "0b2fq0819r7n141l6hhr66hpayqqcmjr2yxw9azxkapg1h0div6q"; }; - patches = [ - # fix for glibc-2.26 - (fetchurl { - url = "https://github.com/mltframework/mlt/commit/2125e3955a0d0be61571cf43b674f74b4b93c6f8.patch"; - sha256 = "1bgs5a3dblsmdmb7hwval9nmq1as4r4f48b3amsc23v69nsl2g0a"; - }) - # fix for glibc-2.26 - (fetchurl { - url = "https://github.com/mltframework/mlt/commit/fbf6a5187776f2f392cf258935ff49e4c0e87024.patch"; - sha256 = "045vchpcznzsz47j67kxwdbg133kar66ssna3parnzrxdfqi72pv"; - }) - ]; buildInputs = [ SDL ffmpeg frei0r libjack2 libdv libsamplerate libvorbis libxml2 From 284c6a59908c234d3d82205e685af42effb050c3 Mon Sep 17 00:00:00 2001 From: Xavier Naveira Date: Fri, 2 Mar 2018 15:24:00 +0100 Subject: [PATCH 219/814] pythonPackages.scp: init at 0.10.2 --- lib/maintainers.nix | 1 + .../python-modules/scp/default.nix | 29 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 3 files changed, 32 insertions(+) create mode 100644 pkgs/development/python-modules/scp/default.nix diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 642ecf0b6080..bbd987fe14f1 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -774,6 +774,7 @@ wyvie = "Elijah Rum "; xaverdh = "Dominik Xaver Hörl "; xeji = "xeji "; + xnaveira = "Xavier Naveira "; xnwdd = "Guillermo NWDD "; xurei = "Olivier Bourdoux "; xvapx = "Marti Serra "; diff --git a/pkgs/development/python-modules/scp/default.nix b/pkgs/development/python-modules/scp/default.nix new file mode 100644 index 000000000000..0db9fd551564 --- /dev/null +++ b/pkgs/development/python-modules/scp/default.nix @@ -0,0 +1,29 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, pythonPackages +, setuptools +, paramiko +}: + +buildPythonPackage rec { + pname = "scp"; + version = "0.10.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "18f59e48df67fac0b069591609a0f4d50d781a101ddb8ec705f0c2e3501a8386"; + }; + + + buildInputs = [ + paramiko + ]; + + meta = with stdenv.lib; { + homepage = https://github.com/jbardin/scp.py; + description = "scp module for paramiko"; + license = licenses.lgpl3; + maintainers = with maintainers; [ xnaveira ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 3e6f4fcdafc8..807734dc94b7 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -452,6 +452,8 @@ in { python-sybase = callPackage ../development/python-modules/sybase {}; + scp = callPackage ../development/python-modules/scp {}; + alot = buildPythonPackage rec { rev = "0.5.1"; name = "alot-${rev}"; From 22c5082aed3d2ab1909f1df6e38cec349be1991c Mon Sep 17 00:00:00 2001 From: Xavier Naveira Date: Fri, 2 Mar 2018 15:33:07 +0100 Subject: [PATCH 220/814] pythonPackages.ncclient: init a 0.5.3 --- .../python-modules/ncclient/default.nix | 32 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 34 insertions(+) create mode 100644 pkgs/development/python-modules/ncclient/default.nix diff --git a/pkgs/development/python-modules/ncclient/default.nix b/pkgs/development/python-modules/ncclient/default.nix new file mode 100644 index 000000000000..2c6fcedc0694 --- /dev/null +++ b/pkgs/development/python-modules/ncclient/default.nix @@ -0,0 +1,32 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, pythonPackages +, setuptools +, paramiko +, lxml +, libxml2 +, libxslt +}: + +buildPythonPackage rec { + pname = "ncclient"; + version = "0.5.3"; + + src = fetchPypi { + inherit pname version; + sha256 = "fe6b9c16ed5f1b21f5591da74bfdd91a9bdf69eb4e918f1c06b3c8db307bd32b"; + }; + + + buildInputs = [ + setuptools paramiko lxml libxml2 libxslt + ]; + + meta = with stdenv.lib; { + homepage = http://ncclient.org/; + description = "Python library for NETCONF clients"; + license = licenses.asl20; + maintainers = with maintainers; [ xnaveira ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 807734dc94b7..83b90c42cbbe 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -454,6 +454,8 @@ in { scp = callPackage ../development/python-modules/scp {}; + ncclient = callPackage ../development/python-modules/ncclient {}; + alot = buildPythonPackage rec { rev = "0.5.1"; name = "alot-${rev}"; From 62a1abe20465a2fd1da08cfea3cdeedcf1913ebb Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Fri, 2 Mar 2018 09:37:02 -0500 Subject: [PATCH 221/814] haskellPackages.callCabal2nix: Depend on the expression. This ensures that as long as the package derivation is alive, its nix expressions do not need to be regenerated. Fixes #36190. --- .../haskell-modules/make-package-set.nix | 24 +++++++++++-------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/pkgs/development/haskell-modules/make-package-set.nix b/pkgs/development/haskell-modules/make-package-set.nix index 458c4eae136d..2a96c66dced5 100644 --- a/pkgs/development/haskell-modules/make-package-set.nix +++ b/pkgs/development/haskell-modules/make-package-set.nix @@ -145,17 +145,21 @@ in package-set { inherit pkgs stdenv callPackage; } self // { callHackage = name: version: self.callPackage (self.hackage2nix name version); # Creates a Haskell package from a source package by calling cabal2nix on the source. - callCabal2nix = name: src: args: - overrideCabal (self.callPackage (haskellSrc2nix { + callCabal2nix = name: src: args: let + filter = path: type: + pkgs.lib.hasSuffix "${name}.cabal" path || + baseNameOf path == "package.yaml"; + expr = haskellSrc2nix { inherit name; - src = - let filter = path: type: - pkgs.lib.hasSuffix "${name}.cabal" path || - baseNameOf path == "package.yaml"; - in if pkgs.lib.canCleanSource src - then pkgs.lib.cleanSourceWith { inherit src filter; } - else src; - }) args) (_: { inherit src; }); + src = if pkgs.lib.canCleanSource src + then pkgs.lib.cleanSourceWith { inherit src filter; } + else src; + }; + in overrideCabal (self.callPackage expr args) (orig: { + inherit src; + preConfigure = + "# Generated from ${expr}\n${orig.preConfigure or ""}"; + }); # : { root : Path # , source-overrides : Defaulted (Either Path VersionNumber) From 06153668cba3aa187ad9614c5d2a7247e5c7c21d Mon Sep 17 00:00:00 2001 From: Roman Volosatovs Date: Fri, 2 Mar 2018 16:03:41 +0100 Subject: [PATCH 222/814] Revert "spotify: 1.0.69.336.g7edcc575-39 -> 1.0.70.399.g5ffabd56-26" This reverts commit b21952e7669fd69479cd71987f4b1b9907842590. --- pkgs/applications/audio/spotify/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/spotify/default.nix b/pkgs/applications/audio/spotify/default.nix index 35c5dff27106..9ac0c49ebc31 100644 --- a/pkgs/applications/audio/spotify/default.nix +++ b/pkgs/applications/audio/spotify/default.nix @@ -9,7 +9,7 @@ let # Latest version number can be found at: # http://repository-origin.spotify.com/pool/non-free/s/spotify-client/ # Be careful not to pick the testing version. - version = "1.0.70.399.g5ffabd56-26"; + version = "1.0.69.336.g7edcc575-39"; deps = [ alsaLib @@ -54,7 +54,7 @@ stdenv.mkDerivation { src = fetchurl { url = "https://repository-origin.spotify.com/pool/non-free/s/spotify-client/spotify-client_${version}_amd64.deb"; - sha256 = "0kpakz11xkyqqjvln4jkhc3z5my8zgpw8m6jx954cjdbc6vkxd29"; + sha256 = "0bh2q7g478g7wj661fypxcbhrbq87zingfyigg7rz1shgsgwc3gd"; }; buildInputs = [ dpkg makeWrapper ]; From cc2aa6f3589ed6f1e9d134ba9b38622b71103c3f Mon Sep 17 00:00:00 2001 From: Andrey Golovizin Date: Fri, 2 Mar 2018 16:46:36 +0100 Subject: [PATCH 223/814] pythonPackages.pymetar: add myself as maintainer --- lib/maintainers.nix | 1 + pkgs/top-level/python-packages.nix | 1 + 2 files changed, 2 insertions(+) diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 642ecf0b6080..c4f8d6dcae40 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -226,6 +226,7 @@ erictapen = "Justin Humm "; erikryb = "Erik Rybakken "; ertes = "Ertugrul Söylemez "; + erosennin = "Andrey Golovizin "; ethercrow = "Dmitry Ivanov "; etu = "Elis Hirwing "; exfalso = "Andras Slemmer <0slemi0@gmail.com>"; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 3e6f4fcdafc8..04ac8cecc463 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -12433,6 +12433,7 @@ in { description = "A command-line tool to show the weather report by a given station ID"; homepage = http://www.schwarzvogel.de/software/pymetar.html; license = licenses.gpl2; + maintainers = with maintainers; [ erosennin ]; }; }; From a862a0e559593623b4f965bd9042490ec42dab22 Mon Sep 17 00:00:00 2001 From: Andrey Golovizin Date: Fri, 2 Mar 2018 16:47:28 +0100 Subject: [PATCH 224/814] pythonPackages.pymetar: 0.20 -> 0.21 --- pkgs/top-level/python-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 04ac8cecc463..e8a9f7b24736 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -12420,13 +12420,13 @@ in { pymetar = buildPythonPackage rec { name = "${pname}-${version}"; pname = "pymetar"; - version = "0.20"; + version = "0.21"; disabled = isPy3k; src = pkgs.fetchurl { url = "mirror://pypi/p/${pname}/${name}.tar.gz"; - sha256 = "1rxyg9465cp6nc47pqxqf092wmbvv2zhffzvaf2w74laal43pgxw"; + sha256 = "1sh3nm5ilnsgpnzbb2wv4xndnizjayw859qp72798jadqpcph69k"; }; meta = { From 004a59f18e9b82b5130e95c8dfc1156f99bb7f9e Mon Sep 17 00:00:00 2001 From: Jon Banafato Date: Fri, 2 Mar 2018 10:21:27 -0500 Subject: [PATCH 225/814] corebird: 1.7.3 -> 1.7.4 --- pkgs/applications/networking/corebird/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/corebird/default.nix b/pkgs/applications/networking/corebird/default.nix index d5b327723276..6a71afcaf60a 100644 --- a/pkgs/applications/networking/corebird/default.nix +++ b/pkgs/applications/networking/corebird/default.nix @@ -3,14 +3,14 @@ , glib-networking }: stdenv.mkDerivation rec { - version = "1.7.3"; + version = "1.7.4"; name = "corebird-${version}"; src = fetchFromGitHub { owner = "baedert"; repo = "corebird"; rev = version; - sha256 = "1xay22v5j239ppl6ydbj842zpm5v2mg5mcgpy5cjrhhmnbg79fgk"; + sha256 = "0qjffsmg1hm64dgsbkfwzbzy9q4xa1q4fh4h8ni8a2b1p3h80x7n"; }; preConfigure = '' From e2f7ef7bf54661fc869603941cf372f1c81e254a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Fri, 2 Mar 2018 16:12:08 +0000 Subject: [PATCH 226/814] python.pkgs.pymetar: modernize --- .../python-modules/pymetar/default.nix | 20 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 20 +------------------ 2 files changed, 21 insertions(+), 19 deletions(-) create mode 100644 pkgs/development/python-modules/pymetar/default.nix diff --git a/pkgs/development/python-modules/pymetar/default.nix b/pkgs/development/python-modules/pymetar/default.nix new file mode 100644 index 000000000000..a918528bdf87 --- /dev/null +++ b/pkgs/development/python-modules/pymetar/default.nix @@ -0,0 +1,20 @@ +{ stdenv, buildPythonPackage, isPy3k, fetchPypi }: + +buildPythonPackage rec { + pname = "pymetar"; + version = "0.21"; + + disabled = isPy3k; + + src = fetchPypi { + inherit pname version; + sha256 = "1sh3nm5ilnsgpnzbb2wv4xndnizjayw859qp72798jadqpcph69k"; + }; + + meta = with stdenv.lib; { + description = "A command-line tool to show the weather report by a given station ID"; + homepage = http://www.schwarzvogel.de/software/pymetar.html; + license = licenses.gpl2; + maintainers = with maintainers; [ erosennin ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e8a9f7b24736..9c46ce73c0d0 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -12417,25 +12417,7 @@ in { pylibmc = callPackage ../development/python-modules/pylibmc {}; - pymetar = buildPythonPackage rec { - name = "${pname}-${version}"; - pname = "pymetar"; - version = "0.21"; - - disabled = isPy3k; - - src = pkgs.fetchurl { - url = "mirror://pypi/p/${pname}/${name}.tar.gz"; - sha256 = "1sh3nm5ilnsgpnzbb2wv4xndnizjayw859qp72798jadqpcph69k"; - }; - - meta = { - description = "A command-line tool to show the weather report by a given station ID"; - homepage = http://www.schwarzvogel.de/software/pymetar.html; - license = licenses.gpl2; - maintainers = with maintainers; [ erosennin ]; - }; - }; + pymetar = callPackage ../development/python-modules/pymetar { }; pysftp = buildPythonPackage rec { name = "pysftp-${version}"; From 51857be0d53347a0ecaf68ca54f270fc2aeb9860 Mon Sep 17 00:00:00 2001 From: Sander van der Burg Date: Fri, 2 Mar 2018 18:16:07 +0100 Subject: [PATCH 227/814] s3fs: 1.82 -> 1.83 --- pkgs/tools/filesystems/s3fs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/filesystems/s3fs/default.nix b/pkgs/tools/filesystems/s3fs/default.nix index 9d7e9eaee95e..11d836e66bcc 100644 --- a/pkgs/tools/filesystems/s3fs/default.nix +++ b/pkgs/tools/filesystems/s3fs/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "s3fs-fuse-${version}"; - version = "1.82"; + version = "1.83"; src = fetchFromGitHub { owner = "s3fs-fuse"; repo = "s3fs-fuse"; rev = "v${version}"; - sha256 = "0bammbb8h10n51qk5141gabsd5p91qbaqq7cwa1q8yf5qglwlp10"; + sha256 = "0rh0lkvjjy19lixqq07hjp4k9mhahmwc0pbp5cr3m59qbwwcprvx"; }; buildInputs = [ curl openssl libxml2 fuse ]; From d78739ca96f6fa9bf01ac621f62d88b37a18b396 Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Fri, 2 Mar 2018 20:03:25 +0100 Subject: [PATCH 228/814] svtplay-dl: 1.9.7 -> 1.9.9 --- pkgs/tools/misc/svtplay-dl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/svtplay-dl/default.nix b/pkgs/tools/misc/svtplay-dl/default.nix index f0fa1c198885..3042dfb215f9 100644 --- a/pkgs/tools/misc/svtplay-dl/default.nix +++ b/pkgs/tools/misc/svtplay-dl/default.nix @@ -5,13 +5,13 @@ let inherit (pythonPackages) python nose pycrypto requests mock; in stdenv.mkDerivation rec { name = "svtplay-dl-${version}"; - version = "1.9.7"; + version = "1.9.9"; src = fetchFromGitHub { owner = "spaam"; repo = "svtplay-dl"; rev = version; - sha256 = "0zj102ir08s9knqqv8y6vy9rkrgk77xs7kqp00v9fzrlqyspf68r"; + sha256 = "1iam2pdcrlpcgk2hx3m7zawznp2p939xdv8cpll6sd6n0l4hpdc9"; }; pythonPaths = [ pycrypto requests ]; From d35c7590a2b06f6c6d2eac22b4fb833ca6023b66 Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Fri, 2 Mar 2018 19:45:38 +0100 Subject: [PATCH 229/814] khd: 2.1.1 -> 3.0.0 --- pkgs/os-specific/darwin/khd/default.nix | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/darwin/khd/default.nix b/pkgs/os-specific/darwin/khd/default.nix index 8a2f4f46e03f..fb7bb12a493f 100644 --- a/pkgs/os-specific/darwin/khd/default.nix +++ b/pkgs/os-specific/darwin/khd/default.nix @@ -1,16 +1,24 @@ -{ stdenv, fetchFromGitHub, Carbon, Cocoa }: +{ stdenv, fetchFromGitHub, fetchpatch, Carbon, Cocoa }: stdenv.mkDerivation rec { name = "khd-${version}"; - version = "2.1.1"; + version = "3.0.0"; src = fetchFromGitHub { owner = "koekeishiya"; repo = "khd"; rev = "v${version}"; - sha256 = "1ijfrlnwdf8hk259j3jfxj6zizvqzj57458rflza626z5dnhmbpr"; + sha256 = "0nzfhknv1s71870w2dk9dy56a3g5zsbjphmfrz0vsvi438g099r4"; }; + patches = [ + # Fixes build issues, remove with >3.0.0 + (fetchpatch { + url = https://github.com/koekeishiya/khd/commit/4765ae0b4c7d4ca56319dc92ff54393cd9e03fbc.patch; + sha256 = "0kvf5hxi5bf6pf125qib7wn7hys0ag66zzpp4srj1qa87lxyf7np"; + }) + ]; + buildInputs = [ Carbon Cocoa ]; buildPhase = '' From 9717e6268f881017617b494e67bfc00e337218b0 Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Fri, 2 Mar 2018 19:46:12 +0100 Subject: [PATCH 230/814] kwm: 4.0.4 -> 4.0.5 --- pkgs/os-specific/darwin/kwm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/darwin/kwm/default.nix b/pkgs/os-specific/darwin/kwm/default.nix index ac231f2dfe3d..3076392ecb26 100644 --- a/pkgs/os-specific/darwin/kwm/default.nix +++ b/pkgs/os-specific/darwin/kwm/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { name = "kwm-${version}"; - version = "4.0.4"; + version = "4.0.5"; src = fetchzip { stripRoot = false; url = "https://github.com/koekeishiya/kwm/releases/download/v${version}/Kwm-${version}.zip"; - sha256 = "07rf4ichq511w8qmvd6s602s7xcyjhjp73d5c615sj82cxvgirwc"; + sha256 = "1ld1vblg3hmc6lpb8p2ljvisbkijjkijf4y87z5y1ia4k8pk7mxb"; }; # TODO: Build this properly once we have swiftc. From 87acdcabd18cbf4157a0f8ea5e1cfd8707a998a8 Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Fri, 2 Mar 2018 22:59:54 +0100 Subject: [PATCH 231/814] josm: 13367 -> 13478 --- pkgs/applications/misc/josm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/josm/default.nix b/pkgs/applications/misc/josm/default.nix index aec6dc2f58c8..b536dffb708c 100644 --- a/pkgs/applications/misc/josm/default.nix +++ b/pkgs/applications/misc/josm/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "josm-${version}"; - version = "13367"; + version = "13478"; src = fetchurl { url = "https://josm.openstreetmap.de/download/josm-snapshot-${version}.jar"; - sha256 = "1yf7cx8159njxid9qa0id7zfkr7dn83rrkgxp9kzkjn25aqji4cf"; + sha256 = "1mc1zdcnlm14ky820cj61sid6aiq9k11kj6vzlqskvgqazc60xj4"; }; buildInputs = [ jre8 makeWrapper ]; From e232ebe24457dc5aa629061ce6dbe4c989c584a7 Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Fri, 2 Mar 2018 23:06:48 +0100 Subject: [PATCH 232/814] abcmidi: 2018.02.07 -> 2018.02.22 --- pkgs/tools/audio/abcmidi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/audio/abcmidi/default.nix b/pkgs/tools/audio/abcmidi/default.nix index 6915f8a90711..0aaf018cb22f 100644 --- a/pkgs/tools/audio/abcmidi/default.nix +++ b/pkgs/tools/audio/abcmidi/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "abcMIDI-${version}"; - version = "2018.02.07"; + version = "2018.02.22"; src = fetchzip { url = "http://ifdo.ca/~seymour/runabc/${name}.zip"; - sha256 = "16hdv114hs5agg288kpbijqw53wdiswjmprpbhy7kgdjnp9ijwxw"; + sha256 = "03ln05012yhlq8aalm00af6pidb44phmmidlc953453isfllg82a"; }; # There is also a file called "makefile" which seems to be preferred by the standard build phase From 61dc6030bf31ae8496b630c7dca4eec5f09f5173 Mon Sep 17 00:00:00 2001 From: Michiel Leenaars Date: Wed, 14 Feb 2018 21:53:18 +0100 Subject: [PATCH 233/814] stubby: init at 0.2.2 --- pkgs/tools/networking/stubby/default.nix | 35 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 37 insertions(+) create mode 100644 pkgs/tools/networking/stubby/default.nix diff --git a/pkgs/tools/networking/stubby/default.nix b/pkgs/tools/networking/stubby/default.nix new file mode 100644 index 000000000000..bd611af24263 --- /dev/null +++ b/pkgs/tools/networking/stubby/default.nix @@ -0,0 +1,35 @@ +{ stdenv, fetchFromGitHub, getdns, libtool, m4, file , doxygen +, autoreconfHook, automake, check, libbsd, libyaml, darwin }: + +stdenv.mkDerivation rec { + pname = "stubby"; + name = "${pname}-${version}"; + version = "0.2.2"; + + src = fetchFromGitHub { + owner = "getdnsapi"; + repo = pname; + rev = "v${version}"; + sha256 = "1zq7h3jx6v821phcbjp348ncdicx9s4gqkj7mcz8kd6ps902iag8"; + }; + + nativeBuildInputs = [ libtool m4 libbsd libyaml autoreconfHook ]; + + buildInputs = [ doxygen getdns automake file check ] + ++ stdenv.lib.optionals stdenv.isDarwin [ darwin.Security ]; + + meta = with stdenv.lib; { + description = "A local DNS Privacy stub resolver (using DNS-over-TLS)"; + longDescription = '' + Stubby is an application that acts as a local DNS Privacy stub + resolver (using RFC 7858, aka DNS-over-TLS). Stubby encrypts DNS + queries sent from a client machine (desktop or laptop) to a DNS + Privacy resolver increasing end user privacy. Stubby is developed by + the getdns team. +''; + homepage = https://dnsprivacy.org/wiki/x/JYAT; + downloadPage = "https://github.com/getdnsapi/stubby"; + maintainers = with maintainers; [ leenaars ]; + license = licenses.bsd3; platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e1deae16d526..caa86b444a50 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4781,6 +4781,8 @@ with pkgs; storebrowse = callPackage ../tools/system/storebrowse { }; + stubby = callPackage ../tools/networking/stubby { }; + syntex = callPackage ../tools/graphics/syntex {}; fusesmb = callPackage ../tools/filesystems/fusesmb { samba = samba3; }; From a1456403a940f899f16f9953e4173924a303a073 Mon Sep 17 00:00:00 2001 From: Tim Steinbach Date: Fri, 2 Mar 2018 18:12:08 -0500 Subject: [PATCH 234/814] ammonite: 1.0.3 -> 1.0.5 --- pkgs/development/tools/ammonite/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/ammonite/default.nix b/pkgs/development/tools/ammonite/default.nix index 1393229333d3..3aa64356896f 100644 --- a/pkgs/development/tools/ammonite/default.nix +++ b/pkgs/development/tools/ammonite/default.nix @@ -5,12 +5,12 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "ammonite-${version}"; - version = "1.0.3"; + version = "1.0.5"; scalaVersion = "2.12"; src = fetchurl { url = "https://github.com/lihaoyi/Ammonite/releases/download/${version}/${scalaVersion}-${version}"; - sha256 = "0pa60fy5skx781hwspaskisv8zx0sfddkvprgmwkhfdpz892srwm"; + sha256 = "10y73a4aaz3530qr9mms1j70c6dxgl9kwvnpbh062gnrbyw34z9l"; }; propagatedBuildInputs = [ jre ] ; From f6af32c6544746c22f182053e5f6c9b45a07e478 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Fri, 2 Mar 2018 23:57:48 +0100 Subject: [PATCH 235/814] =?UTF-8?q?cantarell=5Ffonts:=200.0.25=20=E2=86=92?= =?UTF-8?q?=200.100?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/data/fonts/cantarell-fonts/default.nix | 26 ++++++++++++++------- 1 file changed, 18 insertions(+), 8 deletions(-) diff --git a/pkgs/data/fonts/cantarell-fonts/default.nix b/pkgs/data/fonts/cantarell-fonts/default.nix index de2edad451b9..36a46a23a7e8 100644 --- a/pkgs/data/fonts/cantarell-fonts/default.nix +++ b/pkgs/data/fonts/cantarell-fonts/default.nix @@ -1,18 +1,28 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchurl, meson, ninja, gettext, appstream-glib, gnome3 }: -stdenv.mkDerivation rec { - major = "0.0"; - minor = "25"; - name = "cantarell-fonts-${major}.${minor}"; +let + pname = "cantarell-fonts"; + version = "0.100"; +in stdenv.mkDerivation rec { + name = "${pname}-${version}"; src = fetchurl { - url = "mirror://gnome/sources/cantarell-fonts/${major}/${name}.tar.xz"; - sha256 = "0zvkd8cm1cg2919v1js9qmzwa02sjl7qajj3gcvgqvai1fm2i8hl"; + url = "mirror://gnome/sources/${pname}/${gnome3.versionBranch version}/${name}.tar.xz"; + sha256 = "1286rx1z7mrmi6snx957fprpcmd5p00l6drdfpbgf6mqapl6kb81"; }; + nativeBuildInputs = [ meson ninja gettext appstream-glib ]; + outputHashAlgo = "sha256"; outputHashMode = "recursive"; - outputHash = "13w5qj1lx4vk875yna35v9lnc80cwmphcafnmp0d5grg4d98cry2"; + outputHash = "12ia41pr0rzjfay6y84asw3nxhyp1scq9zl0w4f6wkqj7vf1qfn1"; + + passthru = { + updateScript = gnome3.updateScript { + packageName = pname; + attrPath = "cantarell_fonts"; + }; + }; meta = { description = "Default typeface used in the user interface of GNOME since version 3.0"; From 618ac29687a650d854c8bea7efd4490387589ce2 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 3 Mar 2018 00:05:29 +0100 Subject: [PATCH 236/814] cantarell-fonts: rename from cantarell_fonts --- nixos/modules/services/x11/desktop-managers/gnome3.nix | 2 +- pkgs/data/fonts/cantarell-fonts/default.nix | 1 - pkgs/top-level/aliases.nix | 1 + pkgs/top-level/all-packages.nix | 2 +- 4 files changed, 3 insertions(+), 3 deletions(-) diff --git a/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix index 3d68f2b1c9b3..7256013d5d8b 100644 --- a/nixos/modules/services/x11/desktop-managers/gnome3.nix +++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix @@ -124,7 +124,7 @@ in { # If gnome3 is installed, build vim for gtk3 too. nixpkgs.config.vim.gui = "gtk3"; - fonts.fonts = [ pkgs.dejavu_fonts pkgs.cantarell_fonts ]; + fonts.fonts = [ pkgs.dejavu_fonts pkgs.cantarell-fonts ]; services.xserver.desktopManager.session = singleton { name = "gnome3"; diff --git a/pkgs/data/fonts/cantarell-fonts/default.nix b/pkgs/data/fonts/cantarell-fonts/default.nix index 36a46a23a7e8..9d002ef02ade 100644 --- a/pkgs/data/fonts/cantarell-fonts/default.nix +++ b/pkgs/data/fonts/cantarell-fonts/default.nix @@ -20,7 +20,6 @@ in stdenv.mkDerivation rec { passthru = { updateScript = gnome3.updateScript { packageName = pname; - attrPath = "cantarell_fonts"; }; }; diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index 06da21813ae3..f00544c907b1 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -42,6 +42,7 @@ mapAliases (rec { bridge_utils = bridge-utils; # added 2015-02-20 btrfsProgs = btrfs-progs; # added 2016-01-03 bundler_HEAD = bundler; # added 2015-11-15 + cantarell_fonts = cantarell-fonts; # added 2018-03-03 checkbashism = checkbashisms; # added 2016-08-16 cifs_utils = cifs-utils; # added 2016-08 clangAnalyzer = clang-analyzer; # added 2015-02-20 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 82c62c19563f..65b5b4e4d70d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13940,7 +13940,7 @@ with pkgs; caladea = callPackage ../data/fonts/caladea {}; - cantarell_fonts = callPackage ../data/fonts/cantarell-fonts { }; + cantarell-fonts = callPackage ../data/fonts/cantarell-fonts { }; carlito = callPackage ../data/fonts/carlito {}; From a820dba46917597d4fe3383b0b10ba60ff80acd6 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sat, 3 Mar 2018 01:47:57 +0100 Subject: [PATCH 237/814] uutils-coreutils: disable general unix build for now Currently the installation on Darwin fails due to a bug in the installation script: https://github.com/NixOS/nixpkgs/pull/34840#issuecomment-369227222 As I lack knowledge and resources to properly test this package against Darwin I'll disallow Darwin builds for now. --- pkgs/tools/misc/uutils-coreutils/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/misc/uutils-coreutils/default.nix b/pkgs/tools/misc/uutils-coreutils/default.nix index 7f6e4f760b3b..411e0324457a 100644 --- a/pkgs/tools/misc/uutils-coreutils/default.nix +++ b/pkgs/tools/misc/uutils-coreutils/default.nix @@ -34,6 +34,6 @@ rustPlatform.buildRustPackage { homepage = https://github.com/uutils/coreutils; maintainers = with maintainers; [ ma27 ]; license = licenses.mit; - platforms = platforms.unix; + platforms = platforms.linux; }; } From ae7efee4fa9b219ed1c7a10a0dd66739798450df Mon Sep 17 00:00:00 2001 From: aszlig Date: Sat, 3 Mar 2018 00:31:30 +0100 Subject: [PATCH 238/814] systemd: Reident the expression file The indenting is a bit weird to follow, especially at the end of the file (right brace without indent, but the opening brace is indented by two spaces). No functional change and I've verified this by building it with this change and without and both lead to the same store paths. Signed-off-by: aszlig Cc: @fpletz, @edolstra --- pkgs/os-specific/linux/systemd/default.nix | 350 ++++++++++----------- 1 file changed, 173 insertions(+), 177 deletions(-) diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index 383e3c340e64..858312c55d4d 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -16,211 +16,207 @@ assert stdenv.isLinux; let pythonLxmlEnv = python3Packages.python.withPackages ( ps: with ps; [ python3Packages.lxml ]); -in +in stdenv.mkDerivation rec { + version = "237"; + name = "systemd-${version}"; - stdenv.mkDerivation rec { - version = "237"; - name = "systemd-${version}"; + src = fetchFromGitHub { + owner = "NixOS"; + repo = "systemd"; + rev = "1e8830dfa77a7dc6976509f4a6edb7e012c50792"; + sha256 = "1cw1k0i68azmzpqzi3r8jm6mbi2wqlql78fhcg0vvnv1ly8bf7vq"; + }; - src = fetchFromGitHub { - owner = "NixOS"; - repo = "systemd"; - rev = "1e8830dfa77a7dc6976509f4a6edb7e012c50792"; - sha256 = "1cw1k0i68azmzpqzi3r8jm6mbi2wqlql78fhcg0vvnv1ly8bf7vq"; - }; + outputs = [ "out" "lib" "man" "dev" ]; - outputs = [ "out" "lib" "man" "dev" ]; + nativeBuildInputs = + [ pkgconfig intltool gperf libxslt gettext docbook_xsl docbook_xml_dtd_42 docbook_xml_dtd_45 + ninja meson + coreutils # meson calls date, stat etc. + pythonLxmlEnv glibcLocales + patchelf getent + ]; + buildInputs = + [ linuxHeaders libcap kmod xz pam acl + /* cryptsetup */ libuuid m4 glib libgcrypt libgpgerror libidn2 + libmicrohttpd kexectools libseccomp libffi audit lz4 bzip2 libapparmor + iptables gnu-efi + ]; - nativeBuildInputs = - [ pkgconfig intltool gperf libxslt gettext docbook_xsl docbook_xml_dtd_42 docbook_xml_dtd_45 - ninja meson - coreutils # meson calls date, stat etc. - pythonLxmlEnv glibcLocales - patchelf getent - ]; - buildInputs = - [ linuxHeaders libcap kmod xz pam acl - /* cryptsetup */ libuuid m4 glib libgcrypt libgpgerror libidn2 - libmicrohttpd kexectools libseccomp libffi audit lz4 bzip2 libapparmor - iptables gnu-efi - ]; + #dontAddPrefix = true; - #dontAddPrefix = true; + mesonFlags = [ + "-Dloadkeys-path=${kbd}/bin/loadkeys" + "-Dsetfont-path=${kbd}/bin/setfont" + "-Dtty-gid=3" # tty in NixOS has gid 3 + # "-Dtests=" # TODO + "-Dlz4=true" + "-Dhostnamed=true" + "-Dnetworkd=true" + "-Dsysusers=false" + "-Dtimedated=true" + "-Dtimesyncd=true" + "-Dfirstboot=false" + "-Dlocaled=true" + "-Dresolve=true" + "-Dsplit-usr=false" + "-Dlibcurl=false" + "-Dlibidn=false" + "-Dlibidn2=true" + "-Dquotacheck=false" + "-Dldconfig=false" + "-Dsmack=true" + "-Dsystem-uid-max=499" #TODO: debug why awking around in /etc/login.defs doesn't work + "-Dsystem-gid-max=499" + # "-Dtime-epoch=1" - mesonFlags = [ - "-Dloadkeys-path=${kbd}/bin/loadkeys" - "-Dsetfont-path=${kbd}/bin/setfont" - "-Dtty-gid=3" # tty in NixOS has gid 3 - # "-Dtests=" # TODO - "-Dlz4=true" - "-Dhostnamed=true" - "-Dnetworkd=true" - "-Dsysusers=false" - "-Dtimedated=true" - "-Dtimesyncd=true" - "-Dfirstboot=false" - "-Dlocaled=true" - "-Dresolve=true" - "-Dsplit-usr=false" - "-Dlibcurl=false" - "-Dlibidn=false" - "-Dlibidn2=true" - "-Dquotacheck=false" - "-Dldconfig=false" - "-Dsmack=true" - "-Dsystem-uid-max=499" #TODO: debug why awking around in /etc/login.defs doesn't work - "-Dsystem-gid-max=499" - # "-Dtime-epoch=1" + (if stdenv.isArm || !hostPlatform.isEfi then "-Dgnu-efi=false" else "-Dgnu-efi=true") + "-Defi-libdir=${toString gnu-efi}/lib" + "-Defi-includedir=${toString gnu-efi}/include/efi" + "-Defi-ldsdir=${toString gnu-efi}/lib" - (if stdenv.isArm || !hostPlatform.isEfi then "-Dgnu-efi=false" else "-Dgnu-efi=true") - "-Defi-libdir=${toString gnu-efi}/lib" - "-Defi-includedir=${toString gnu-efi}/include/efi" - "-Defi-ldsdir=${toString gnu-efi}/lib" + "-Dsysvinit-path=" + "-Dsysvrcnd-path=" + ]; - "-Dsysvinit-path=" - "-Dsysvrcnd-path=" - ]; + preConfigure = '' + mesonFlagsArray+=(-Dntp-servers="0.nixos.pool.ntp.org 1.nixos.pool.ntp.org 2.nixos.pool.ntp.org 3.nixos.pool.ntp.org") + mesonFlagsArray+=(-Ddbuspolicydir=$out/etc/dbus-1/system.d) + mesonFlagsArray+=(-Ddbussessionservicedir=$out/share/dbus-1/services) + mesonFlagsArray+=(-Ddbussystemservicedir=$out/share/dbus-1/system-services) + mesonFlagsArray+=(-Dpamconfdir=$out/etc/pam.d) + mesonFlagsArray+=(-Dsysconfdir=$out/etc) + mesonFlagsArray+=(-Drootprefix=$out) + mesonFlagsArray+=(-Dlibdir=$lib/lib) + mesonFlagsArray+=(-Drootlibdir=$lib/lib) + mesonFlagsArray+=(-Dmandir=$man/lib) + mesonFlagsArray+=(-Dincludedir=$dev/include) + mesonFlagsArray+=(-Dpkgconfiglibdir=$dev/lib/pkgconfig) + mesonFlagsArray+=(-Dpkgconfigdatadir=$dev/share/pkgconfig) - preConfigure = - '' - mesonFlagsArray+=(-Dntp-servers="0.nixos.pool.ntp.org 1.nixos.pool.ntp.org 2.nixos.pool.ntp.org 3.nixos.pool.ntp.org") - mesonFlagsArray+=(-Ddbuspolicydir=$out/etc/dbus-1/system.d) - mesonFlagsArray+=(-Ddbussessionservicedir=$out/share/dbus-1/services) - mesonFlagsArray+=(-Ddbussystemservicedir=$out/share/dbus-1/system-services) - mesonFlagsArray+=(-Dpamconfdir=$out/etc/pam.d) - mesonFlagsArray+=(-Dsysconfdir=$out/etc) - mesonFlagsArray+=(-Drootprefix=$out) - mesonFlagsArray+=(-Dlibdir=$lib/lib) - mesonFlagsArray+=(-Drootlibdir=$lib/lib) - mesonFlagsArray+=(-Dmandir=$man/lib) - mesonFlagsArray+=(-Dincludedir=$dev/include) - mesonFlagsArray+=(-Dpkgconfiglibdir=$dev/lib/pkgconfig) - mesonFlagsArray+=(-Dpkgconfigdatadir=$dev/share/pkgconfig) + # FIXME: Why aren't includedir and libdir picked up from mesonFlags while other options are? + substituteInPlace meson.build \ + --replace "includedir = join_paths(prefixdir, get_option('includedir'))" \ + "includedir = '$dev/include'" \ + --replace "libdir = join_paths(prefixdir, get_option('libdir'))" \ + "libdir = '$lib/lib'" - # FIXME: Why aren't includedir and libdir picked up from mesonFlags while other options are? - substituteInPlace meson.build \ - --replace "includedir = join_paths(prefixdir, get_option('includedir'))" \ - "includedir = '$dev/include'" \ - --replace "libdir = join_paths(prefixdir, get_option('libdir'))" \ - "libdir = '$lib/lib'" + export LC_ALL="en_US.UTF-8"; + # FIXME: patch this in systemd properly (and send upstream). + # already fixed in f00929ad622c978f8ad83590a15a765b4beecac9: (u)mount + for i in src/remount-fs/remount-fs.c src/core/mount.c src/core/swap.c src/fsck/fsck.c units/emergency.service.in units/rescue.service.in src/journal/cat.c src/core/shutdown.c src/nspawn/nspawn.c src/shared/generator.c; do + test -e $i + substituteInPlace $i \ + --replace /usr/bin/getent ${getent}/bin/getent \ + --replace /sbin/swapon ${utillinux.bin}/sbin/swapon \ + --replace /sbin/swapoff ${utillinux.bin}/sbin/swapoff \ + --replace /sbin/fsck ${utillinux.bin}/sbin/fsck \ + --replace /bin/echo ${coreutils}/bin/echo \ + --replace /bin/cat ${coreutils}/bin/cat \ + --replace /sbin/sulogin ${utillinux.bin}/sbin/sulogin \ + --replace /usr/lib/systemd/systemd-fsck $out/lib/systemd/systemd-fsck \ + --replace /bin/plymouth /run/current-system/sw/bin/plymouth # To avoid dependency + done - export LC_ALL="en_US.UTF-8"; - # FIXME: patch this in systemd properly (and send upstream). - # already fixed in f00929ad622c978f8ad83590a15a765b4beecac9: (u)mount - for i in src/remount-fs/remount-fs.c src/core/mount.c src/core/swap.c src/fsck/fsck.c units/emergency.service.in units/rescue.service.in src/journal/cat.c src/core/shutdown.c src/nspawn/nspawn.c src/shared/generator.c; do - test -e $i - substituteInPlace $i \ - --replace /usr/bin/getent ${getent}/bin/getent \ - --replace /sbin/swapon ${utillinux.bin}/sbin/swapon \ - --replace /sbin/swapoff ${utillinux.bin}/sbin/swapoff \ - --replace /sbin/fsck ${utillinux.bin}/sbin/fsck \ - --replace /bin/echo ${coreutils}/bin/echo \ - --replace /bin/cat ${coreutils}/bin/cat \ - --replace /sbin/sulogin ${utillinux.bin}/sbin/sulogin \ - --replace /usr/lib/systemd/systemd-fsck $out/lib/systemd/systemd-fsck \ - --replace /bin/plymouth /run/current-system/sw/bin/plymouth # To avoid dependency - done + for i in tools/xml_helper.py tools/make-directive-index.py tools/make-man-index.py test/sys-script.py; do + substituteInPlace $i \ + --replace "#!/usr/bin/env python" "#!${pythonLxmlEnv}/bin/python" + done - for i in tools/xml_helper.py tools/make-directive-index.py tools/make-man-index.py test/sys-script.py; do - substituteInPlace $i \ - --replace "#!/usr/bin/env python" "#!${pythonLxmlEnv}/bin/python" - done + for i in src/basic/generate-gperfs.py src/resolve/generate-dns_type-gperf.py src/test/generate-sym-test.py ; do + substituteInPlace $i \ + --replace "#!/usr/bin/env python" "#!${python3Packages.python}/bin/python" + done - for i in src/basic/generate-gperfs.py src/resolve/generate-dns_type-gperf.py src/test/generate-sym-test.py ; do - substituteInPlace $i \ - --replace "#!/usr/bin/env python" "#!${python3Packages.python}/bin/python" - done + substituteInPlace src/journal/catalog.c \ + --replace /usr/lib/systemd/catalog/ $out/lib/systemd/catalog/ + ''; - substituteInPlace src/journal/catalog.c \ - --replace /usr/lib/systemd/catalog/ $out/lib/systemd/catalog/ - ''; + # These defines are overridden by CFLAGS and would trigger annoying + # warning messages + postConfigure = '' + substituteInPlace config.h \ + --replace "POLKIT_AGENT_BINARY_PATH" "_POLKIT_AGENT_BINARY_PATH" \ + --replace "SYSTEMD_BINARY_PATH" "_SYSTEMD_BINARY_PATH" \ + --replace "SYSTEMD_CGROUP_AGENT_PATH" "_SYSTEMD_CGROUP_AGENT_PATH" + ''; - # These defines are overridden by CFLAGS and would trigger annoying - # warning messages - postConfigure = '' - substituteInPlace config.h \ - --replace "POLKIT_AGENT_BINARY_PATH" "_POLKIT_AGENT_BINARY_PATH" \ - --replace "SYSTEMD_BINARY_PATH" "_SYSTEMD_BINARY_PATH" \ - --replace "SYSTEMD_CGROUP_AGENT_PATH" "_SYSTEMD_CGROUP_AGENT_PATH" - ''; + hardeningDisable = [ "stackprotector" ]; - hardeningDisable = [ "stackprotector" ]; + NIX_CFLAGS_COMPILE = + [ # Can't say ${polkit.bin}/bin/pkttyagent here because that would + # lead to a cyclic dependency. + "-UPOLKIT_AGENT_BINARY_PATH" "-DPOLKIT_AGENT_BINARY_PATH=\"/run/current-system/sw/bin/pkttyagent\"" - NIX_CFLAGS_COMPILE = - [ # Can't say ${polkit.bin}/bin/pkttyagent here because that would - # lead to a cyclic dependency. - "-UPOLKIT_AGENT_BINARY_PATH" "-DPOLKIT_AGENT_BINARY_PATH=\"/run/current-system/sw/bin/pkttyagent\"" + # Set the release_agent on /sys/fs/cgroup/systemd to the + # currently running systemd (/run/current-system/systemd) so + # that we don't use an obsolete/garbage-collected release agent. + "-USYSTEMD_CGROUP_AGENT_PATH" "-DSYSTEMD_CGROUP_AGENT_PATH=\"/run/current-system/systemd/lib/systemd/systemd-cgroups-agent\"" - # Set the release_agent on /sys/fs/cgroup/systemd to the - # currently running systemd (/run/current-system/systemd) so - # that we don't use an obsolete/garbage-collected release agent. - "-USYSTEMD_CGROUP_AGENT_PATH" "-DSYSTEMD_CGROUP_AGENT_PATH=\"/run/current-system/systemd/lib/systemd/systemd-cgroups-agent\"" + "-USYSTEMD_BINARY_PATH" "-DSYSTEMD_BINARY_PATH=\"/run/current-system/systemd/lib/systemd/systemd\"" + ]; - "-USYSTEMD_BINARY_PATH" "-DSYSTEMD_BINARY_PATH=\"/run/current-system/systemd/lib/systemd/systemd\"" - ]; + postInstall = '' + # sysinit.target: Don't depend on + # systemd-tmpfiles-setup.service. This interferes with NixOps's + # send-keys feature (since sshd.service depends indirectly on + # sysinit.target). + mv $out/lib/systemd/system/sysinit.target.wants/systemd-tmpfiles-setup-dev.service $out/lib/systemd/system/multi-user.target.wants/ - postInstall = - '' - # sysinit.target: Don't depend on - # systemd-tmpfiles-setup.service. This interferes with NixOps's - # send-keys feature (since sshd.service depends indirectly on - # sysinit.target). - mv $out/lib/systemd/system/sysinit.target.wants/systemd-tmpfiles-setup-dev.service $out/lib/systemd/system/multi-user.target.wants/ + mkdir -p $out/example/systemd + mv $out/lib/{modules-load.d,binfmt.d,sysctl.d,tmpfiles.d} $out/example + mv $out/lib/systemd/{system,user} $out/example/systemd - mkdir -p $out/example/systemd - mv $out/lib/{modules-load.d,binfmt.d,sysctl.d,tmpfiles.d} $out/example - mv $out/lib/systemd/{system,user} $out/example/systemd + rm -rf $out/etc/systemd/system - rm -rf $out/etc/systemd/system + # Install SysV compatibility commands. + mkdir -p $out/sbin + ln -s $out/lib/systemd/systemd $out/sbin/telinit + for i in init halt poweroff runlevel reboot shutdown; do + ln -s $out/bin/systemctl $out/sbin/$i + done - # Install SysV compatibility commands. - mkdir -p $out/sbin - ln -s $out/lib/systemd/systemd $out/sbin/telinit - for i in init halt poweroff runlevel reboot shutdown; do - ln -s $out/bin/systemctl $out/sbin/$i - done + # Fix reference to /bin/false in the D-Bus services. + for i in $out/share/dbus-1/system-services/*.service; do + substituteInPlace $i --replace /bin/false ${coreutils}/bin/false + done - # Fix reference to /bin/false in the D-Bus services. - for i in $out/share/dbus-1/system-services/*.service; do - substituteInPlace $i --replace /bin/false ${coreutils}/bin/false - done + rm -rf $out/etc/rpm - rm -rf $out/etc/rpm + # "kernel-install" shouldn't be used on NixOS. + find $out -name "*kernel-install*" -exec rm {} \; - # "kernel-install" shouldn't be used on NixOS. - find $out -name "*kernel-install*" -exec rm {} \; + # Keep only libudev and libsystemd in the lib output. + mkdir -p $out/lib + mv $lib/lib/security $lib/lib/libnss* $out/lib/ + ''; # */ - # Keep only libudev and libsystemd in the lib output. - mkdir -p $out/lib - mv $lib/lib/security $lib/lib/libnss* $out/lib/ - ''; # */ + enableParallelBuilding = true; - enableParallelBuilding = true; + # The rpath to the shared systemd library is not added by meson. The + # functionality was removed by a nixpkgs patch because it would overwrite + # the existing rpath. + postFixup = '' + sharedLib=libsystemd-shared-${version}.so + for prog in `find $out -type f -executable`; do + (patchelf --print-needed $prog | grep $sharedLib > /dev/null) && ( + patchelf --set-rpath `patchelf --print-rpath $prog`:"$out/lib/systemd" $prog + ) || true + done + ''; - # The rpath to the shared systemd library is not added by meson. The - # functionality was removed by a nixpkgs patch because it would overwrite - # the existing rpath. - postFixup = '' - sharedLib=libsystemd-shared-${version}.so - for prog in `find $out -type f -executable`; do - (patchelf --print-needed $prog | grep $sharedLib > /dev/null) && ( - patchelf --set-rpath `patchelf --print-rpath $prog`:"$out/lib/systemd" $prog - ) || true - done - ''; + # The interface version prevents NixOS from switching to an + # incompatible systemd at runtime. (Switching across reboots is + # fine, of course.) It should be increased whenever systemd changes + # in a backwards-incompatible way. If the interface version of two + # systemd builds is the same, then we can switch between them at + # runtime; otherwise we can't and we need to reboot. + passthru.interfaceVersion = 2; - # The interface version prevents NixOS from switching to an - # incompatible systemd at runtime. (Switching across reboots is - # fine, of course.) It should be increased whenever systemd changes - # in a backwards-incompatible way. If the interface version of two - # systemd builds is the same, then we can switch between them at - # runtime; otherwise we can't and we need to reboot. - passthru.interfaceVersion = 2; - - meta = { - homepage = http://www.freedesktop.org/wiki/Software/systemd; - description = "A system and service manager for Linux"; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.eelco ]; - }; + meta = { + homepage = http://www.freedesktop.org/wiki/Software/systemd; + description = "A system and service manager for Linux"; + platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.eelco ]; + }; } From e604a3175dcb563d21b27ae546591c86fb01a878 Mon Sep 17 00:00:00 2001 From: DarkScythe97 Date: Sat, 3 Mar 2018 12:39:35 +1030 Subject: [PATCH 239/814] retroarch: 1.6.0 -> 1.7.1 --- pkgs/misc/emulators/retroarch/default.nix | 65 ++++++++++------------- 1 file changed, 27 insertions(+), 38 deletions(-) diff --git a/pkgs/misc/emulators/retroarch/default.nix b/pkgs/misc/emulators/retroarch/default.nix index 5e5ce9edca4b..3b160c46c912 100644 --- a/pkgs/misc/emulators/retroarch/default.nix +++ b/pkgs/misc/emulators/retroarch/default.nix @@ -1,61 +1,50 @@ -{ stdenv, fetchFromGitHub, makeDesktopItem, coreutils, which, pkgconfig +{ stdenv, fetchFromGitHub, which, pkgconfig, makeWrapper , ffmpeg, mesa, freetype, libxml2, python34 +, alsaLib ? null +, libpulseaudio ? null +, libv4l ? null +, libX11 ? null +, libXdmcp ? null +, libXext ? null +, libXxf86vm ? null +, SDL2 ? null +, udev ? null , enableNvidiaCgToolkit ? false, nvidia_cg_toolkit ? null -, alsaLib ? null, libv4l ? null -, udev ? null, libX11 ? null, libXext ? null, libXxf86vm ? null -, libXdmcp ? null, SDL ? null, libpulseaudio ? null +, withVulkan ? stdenv.isLinux, vulkan-loader ? null }: with stdenv.lib; -let - desktopItem = makeDesktopItem { - name = "retroarch"; - exec = "retroarch"; - icon = "retroarch"; - comment = "Multi-Engine Platform"; - desktopName = "RetroArch"; - genericName = "Libretro Frontend"; - categories = "Game;Emulator;"; - #keywords = "multi;engine;emulator;xmb;"; - }; -in - stdenv.mkDerivation rec { name = "retroarch-bare-${version}"; - version = "1.6.0"; + version = "1.7.1"; src = fetchFromGitHub { owner = "libretro"; repo = "RetroArch"; - sha256 = "1ym2kws58fbavkc3giz5xqaqiqqdbf7wrz7y7iw53p1bnkc3l8yi"; + sha256 = "0qv8ci76f5kwv5b49ijgpc6jdfp6sm21fw5hq06mq6ygyiy9vdzf"; rev = "v${version}"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ ffmpeg mesa freetype libxml2 coreutils python34 which SDL ] + nativeBuildInputs = [ pkgconfig ] + ++ optional withVulkan [ makeWrapper ]; + + buildInputs = [ ffmpeg freetype libxml2 mesa python34 SDL2 which ] ++ optional enableNvidiaCgToolkit nvidia_cg_toolkit - ++ optionals stdenv.isLinux [ udev alsaLib libX11 libXext libXxf86vm libXdmcp libv4l libpulseaudio ]; - - configureScript = "sh configure"; - - patchPhase = '' - export GLOBAL_CONFIG_DIR=$out/etc - sed -e 's#/bin/true#${coreutils}/bin/true#' -i qb/qb.libs.sh - ''; - - postInstall = '' - mkdir -p $out/share/icons/hicolor/scalable/apps - cp -p -T ./media/retroarch.svg $out/share/icons/hicolor/scalable/apps/retroarch.svg - - mkdir -p "$out/share/applications" - cp ${desktopItem}/share/applications/* $out/share/applications - ''; + ++ optional withVulkan [ vulkan-loader ] + ++ optionals stdenv.isLinux [ alsaLib libpulseaudio libv4l libX11 + libXdmcp libXext libXxf86vm udev ]; enableParallelBuilding = true; + postInstall = optional withVulkan '' + wrapProgram $out/bin/retroarch --prefix LD_LIBRARY_PATH ':' ${vulkan-loader}/lib + ''; + + preFixup = "rm $out/bin/retroarch-cg2glsl"; + meta = { - homepage = http://libretro.org/; + homepage = https://libretro.com; description = "Multi-platform emulator frontend for libretro cores"; license = licenses.gpl3; platforms = platforms.all; From 285fd08c0e20d10937e44fefb0698fd1ecfe68cf Mon Sep 17 00:00:00 2001 From: Bryan Gardiner Date: Fri, 2 Mar 2018 18:10:24 -0800 Subject: [PATCH 240/814] claws-mail, jitsi: remove myself (khumba) from maintainers --- .../networking/instant-messengers/jitsi/default.nix | 2 +- pkgs/applications/networking/mailreaders/claws-mail/default.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/jitsi/default.nix b/pkgs/applications/networking/instant-messengers/jitsi/default.nix index c4cb25dfe987..1d03c2f47c89 100644 --- a/pkgs/applications/networking/instant-messengers/jitsi/default.nix +++ b/pkgs/applications/networking/instant-messengers/jitsi/default.nix @@ -70,6 +70,6 @@ stdenv.mkDerivation rec { description = "Open Source Video Calls and Chat"; license = licenses.lgpl21Plus; platforms = platforms.linux; - maintainers = with maintainers; [ khumba ndowens ]; + maintainers = with maintainers; [ ndowens ]; }; } diff --git a/pkgs/applications/networking/mailreaders/claws-mail/default.nix b/pkgs/applications/networking/mailreaders/claws-mail/default.nix index b2a26bb6f0be..10daeeab8e13 100644 --- a/pkgs/applications/networking/mailreaders/claws-mail/default.nix +++ b/pkgs/applications/networking/mailreaders/claws-mail/default.nix @@ -101,6 +101,6 @@ stdenv.mkDerivation rec { homepage = http://www.claws-mail.org/; license = licenses.gpl3; platforms = platforms.linux; - maintainers = with maintainers; [ khumba fpletz globin ]; + maintainers = with maintainers; [ fpletz globin ]; }; } From 84adbd0d9849da89870e3f5f1b2c5a54146e6b94 Mon Sep 17 00:00:00 2001 From: Masayuki Takeda Date: Sat, 24 Feb 2018 11:42:35 +0900 Subject: [PATCH 241/814] janeStreet: 0.9.0 -> 0.10.0 --- .../ocaml-modules/janestreet/default.nix | 223 +++++++++--------- .../ocaml-modules/janestreet/janePackage.nix | 2 +- pkgs/top-level/ocaml-packages.nix | 5 +- 3 files changed, 111 insertions(+), 119 deletions(-) diff --git a/pkgs/development/ocaml-modules/janestreet/default.nix b/pkgs/development/ocaml-modules/janestreet/default.nix index 27a65c502753..9e3c6622e87a 100644 --- a/pkgs/development/ocaml-modules/janestreet/default.nix +++ b/pkgs/development/ocaml-modules/janestreet/default.nix @@ -1,6 +1,6 @@ -{ stdenv, lib, janePackage, ocaml, ocamlbuild, cryptokit, ctypes, magic-mime, - ocaml-migrate-parsetree, octavius, ounit, ppx_deriving, re, zarith, num, - openssl }: +{ stdenv, lib, janePackage, ocaml, ocamlbuild, angstrom, cryptokit, ctypes, + magic-mime, ocaml-migrate-parsetree, octavius, ounit, ppx_deriving, re, + zarith, num, openssl }: rec { @@ -9,56 +9,46 @@ rec { sexplib = janePackage { name = "sexplib"; meta.description = "Automated S-expression conversion"; - version = "0.10.0"; hash = "1agw649n0rnf6h4y2dr1zs1970nncxgjmf90848vbxv8y9im4yy2"; - buildInputs = [ num ]; + propagatedBuildInputs = [ num ]; }; base = janePackage { name = "base"; - version = "0.9.4"; - hash = "0x85xi66b4zwlbdwmyc99zcmawgpp75gxqbl55rr67awavw162rw"; + hash = "13brvkkj76syh8ws1k3lnvk88jvc6jxx16nsq5ysh558db91v5x7"; propagatedBuildInputs = [ sexplib ]; meta.description = "Full standard library replacement for OCaml"; }; ocaml-compiler-libs = janePackage { name = "ocaml-compiler-libs"; - hash = "1jz3nfrb6295sj4xj1j0zld8mhfj0xy2k4vlp9yf9sh3748n090l"; + hash = "0dg9jgwwir99y28bki17cqf3v30apd7cf0qdi8hfwb5pkgp9zdng"; meta.description = "OCaml compiler libraries repackaged"; }; - ppx_ast = janePackage ({ + ppx_ast = janePackage { name = "ppx_ast"; + hash = "02jsi9b200071i4x0w358by09xabw9v13q7xrx6cdshqxw0q97kf"; propagatedBuildInputs = [ ocaml-compiler-libs ocaml-migrate-parsetree ]; meta.description = "OCaml AST used by Jane Street ppx rewriters"; - } // (if lib.versionAtLeast ocaml.version "4.06" - then { - version = "0.9.2"; - hash = "1h4qf26rg23z21rrw83fakiavw9km7174p3830pg0gg4bwakvba0"; - } else { - version = "0.9.1"; - hash = "0a9rxwavy2748k0yd4db3hg1ypq7mpqnwq9si5a5qdiclgkhcggw"; - } - )); + }; ppx_traverse_builtins = janePackage { name = "ppx_traverse_builtins"; - hash = "10ajvz02ka6qimlfrq7py4ljhk8awqkga6240kn8j046b4xfyxzi"; + hash = "0hhw565cwjlr1cwpgkfj0v2kc0lqxyjcrmi9q3hx3344biql8q17"; meta.description = "Builtins for Ppx_traverse"; }; stdio = janePackage { name = "stdio"; - version = "0.9.1"; - hash = "13rj3ii0rvmklfim9ild0ib44ssdadig7a9ccjbz22m0pw84a1sx"; - propagatedBuildInputs = [ base ]; + hash = "0ydhy4f89f00n0pfgk8fanj6chzx433qnlcrxnddzg4d3dhb4254"; + propagatedBuildInputs = [ base sexplib ]; meta.description = "Standard IO library for OCaml"; }; ppx_core = janePackage { name = "ppx_core"; - hash = "15400zxxkqdimmjpdjcs36gcbxbrhylmaczlzwd6x65v1h9aydz3"; + hash = "0fm26bgf10gk8xl6j4xvwa5s7nmns8rlx7iblb7haj4dxc0qsjhd"; propagatedBuildInputs = [ ppx_ast ppx_traverse_builtins stdio ]; meta.description = "Jane Street's standard library for ppx rewriters"; }; @@ -67,15 +57,14 @@ rec { ppx_optcomp = janePackage { name = "ppx_optcomp"; - hash = "1wfj6fnh92s81yncq7yyhmax7j6zpjj1sg1f3qa1f9c5kf4kkzrd"; + hash = "134anhlh32s5yjjbiqsrmjw51i08pyghzccmrwg1bipl64q55m6n"; propagatedBuildInputs = [ ppx_core ]; meta.description = "Optional compilation for OCaml"; }; ppx_driver = janePackage { name = "ppx_driver"; - version = "0.9.1"; - hash = "1amz49x6v4sh1v2my6618cah0zv5i7jmsapbk9ydps6419g5asay"; + hash = "0kzijcsq32wf33f4spgja3w5jb9s8wnzmr6lpm8lahw05g80q8nj"; buildInputs = [ ocamlbuild ]; propagatedBuildInputs = [ ppx_optcomp ]; meta.description = "Feature-full driver for OCaml AST transformers"; @@ -83,56 +72,56 @@ rec { ppx_metaquot = janePackage { name = "ppx_metaquot"; - hash = "15qfd3s4x2pz006nx5316laxd3gqqi472x432qg4rfx4yh3vn31k"; + hash = "1wb8pl5v57yy1g0g61mvgnxgn2ix2r5skiz33g8hdjvx91pbgmv4"; propagatedBuildInputs = [ ppx_driver ]; meta.description = "Metaquotations for ppx_ast"; }; ppx_type_conv = janePackage { name = "ppx_type_conv"; - hash = "0a0gxjvjiql9vg37k0akn8xr5724nv3xb7v37xpidv7ld927ks7p"; + hash = "0xvn00fzj8lb41slkl91p9z62byg0rlnygdxf4xvrqglg04wa9cz"; propagatedBuildInputs = [ ppx_metaquot ppx_deriving ]; meta.description = "Support Library for type-driven code generators"; }; ppx_sexp_conv = janePackage { name = "ppx_sexp_conv"; - hash = "03cg2sym0wvpd5l7q4w9bclp589z5byygwsmnnq9h1ih56cmd55l"; + hash = "0kvbm34wbxrcpvrrbh5wq4kzx4yb67iidzcq5x1d4bygvp8x2lzd"; propagatedBuildInputs = [ ppx_type_conv sexplib ]; meta.description = "Generation of S-expression conversion functions from type definitions"; }; ppx_compare = janePackage { name = "ppx_compare"; - hash = "0wrszpvn1nms5sb5rb29p7z1wmqyd15gfzdj4ax8f843p5ywx3w9"; + hash = "1fjrb7bz7wrykf4pm7s4s32030jdw65hi7kzd22ibd1afnkz3xw1"; propagatedBuildInputs = [ ppx_type_conv ]; meta.description = "Generation of comparison functions from types"; }; ppx_enumerate = janePackage { name = "ppx_enumerate"; - hash = "1dfy86j2z12p5n9yrwaakx1ngphs5246vxy279kz6i6j34cwxm46"; + hash = "1b4q1h19bh2xdxgqwdmn5kv95lyvpyf6mfh2fswagf2ajyfshksx"; propagatedBuildInputs = [ ppx_type_conv ]; meta.description = "Generate a list containing all values of a finite type"; }; ppx_hash = janePackage { name = "ppx_hash"; - hash = "1w1riy2sqd9i611sc5f5z2rqqgjl2gvvkzi5xibpv309nacnl01d"; + hash = "12yln0gpf21ifr205qxk7dn83bsj07zhmak2xsjap7xkq4k8g9gc"; propagatedBuildInputs = [ ppx_compare ppx_sexp_conv ]; meta.description = "A ppx rewriter that generates hash functions from type expressions and definitions"; }; ppx_js_style = janePackage { name = "ppx_js_style"; - hash = "09k02b1l2r7svf9l3ls69h8xydsyiang2ziigxnny2i7gy7b0w59"; + hash = "11i2cwavbbplhsl5n4zmgpr8gjc4ixa5016vc72y8h78g71jj18n"; propagatedBuildInputs = [ ppx_metaquot octavius ]; meta.description = "Code style checker for Jane Street Packages"; }; ppx_base = janePackage { name = "ppx_base"; - hash = "0qikfzbkd2wyxfrvizz6rgi6vg4ykvxkivacj4gr178dbgfl5if3"; + hash = "1rk7dlnhl30prda9q34ic0xv375i52j47bkr664ry3ghklxx6d8y"; propagatedBuildInputs = [ ppx_enumerate ppx_hash ppx_js_style ]; meta.description = "Base set of ppx rewriters"; }; @@ -141,64 +130,63 @@ rec { fieldslib = janePackage { name = "fieldslib"; - hash = "1wxh59888l1bfz9ipnbcas58gwg744icaixzdbsg4v8f7wymc501"; + hash = "19l05d7hhc74zg48hj0m7sips8z3vpara1f0lvd8h7n46wpbs608"; propagatedBuildInputs = [ ppx_driver ]; meta.description = "OCaml record fields as first class values"; }; variantslib = janePackage { name = "variantslib"; - hash = "0kj53n62193j58q9vip8lfhhyf6w9d25wyvxzc163hx5m68yw0fz"; + hash = "0j1qlz7g8ny1qf3a7d38v2a7sxiis1nwcxkvz0myfsc3dkn716an"; propagatedBuildInputs = [ ppx_driver ]; meta.description = "OCaml variants as first class values"; }; ppx_traverse = janePackage { name = "ppx_traverse"; - hash = "1sdqgwyq0w71i03vhc5jq4jk6rsbgwhvain48fnrllpkb5kj2la2"; + hash = "1ps7s4vwvzik9wvmwd0i3a1sjgm0xx32yivc2r8ix9qqwylvjllq"; propagatedBuildInputs = [ ppx_type_conv ]; meta.description = "Automatic generation of open recursion classes"; }; ppx_custom_printf = janePackage { name = "ppx_custom_printf"; - hash = "0cjy2c2c5g3qxqvwx1yb6p7kbmmpnpb1hll55f7a44x215lg8x19"; + hash = "113dvmiy07lb6mf0f88avf4cfkix4q029xqi2w0h26xngp88s31p"; propagatedBuildInputs = [ ppx_sexp_conv ppx_traverse ]; meta.description = "Printf-style format-strings for user-defined string conversion"; }; ppx_fields_conv = janePackage { name = "ppx_fields_conv"; - hash = "0qp8zgmk58iskzrkf4g06i471kg6lrh3wqpy9klrb8pp9mg0xr9z"; + hash = "1df095qczkzclmdcs1nrm89wswnxivn9kvn6sw65jpvryfkf5v5k"; propagatedBuildInputs = [ fieldslib ppx_type_conv ]; meta.description = "Generation of accessor and iteration functions for OCaml records"; }; ppx_variants_conv = janePackage { name = "ppx_variants_conv"; - hash = "1xayhyglgbdjqvb9123kjbwjcv0a3n3302nb0j7g8gmja8w5y834"; + hash = "1l19rkclf65f8snw2v0yibkvk28by241dkp6jb0076dyghbln451"; propagatedBuildInputs = [ ppx_type_conv variantslib ]; meta.description = "Generation of accessor and iteration functions for OCaml variant types"; }; bin_prot = janePackage { name = "bin_prot"; - version = "0.9.1"; - hash = "1bgcmkgz6b5i522996x589zsaiy5b3h37887lwbqvpps8by2ayvk"; + hash = "1yyjpwr2s5l8sm9j77a4cmr92rdx73iy3fwqyxf7dr8hfrmd938v"; propagatedBuildInputs = [ ppx_compare ppx_custom_printf ppx_fields_conv ppx_variants_conv ]; meta.description = "Binary protocol generator"; }; ppx_here = janePackage { name = "ppx_here"; - hash = "0pjscw5ydxgy4fcxakgsazpp09ka057w5n2fp2dpkv2k5gil6rzh"; + hash = "0ysx25ai7mpzxfpbswd9k38hpxhjm12bj0iw5ghvhdjnnn07kwcv"; propagatedBuildInputs = [ ppx_driver ]; meta.description = "Expands [%here] into its location"; }; ppx_bin_prot = janePackage { name = "ppx_bin_prot"; - hash = "0qw9zqrc5yngzrzpk9awnlnd68xrb7wz5lq807c80ibxk0xvnqn3"; + hash = "06n7gs51847p75baay9ar8n15ynqzhdbnwd8xvp8vxs6krr6wpfd"; propagatedBuildInputs = [ ppx_here bin_prot ]; meta.description = "Generation of bin_prot readers and writers from types"; }; @@ -207,92 +195,91 @@ rec { ppx_assert = janePackage { name = "ppx_assert"; - hash = "1s5c75wkc46nlcwmgic5h7f439s26ssrzrcil501c5kpib2hlv6z"; + hash = "09xrcs2sk1a9vjn16bd1cpz3b52kbck7fhc7zrz24lv121wspiaj"; propagatedBuildInputs = [ ppx_sexp_conv ppx_here ppx_compare ]; meta.description = "Assert-like extension nodes that raise useful errors on failure"; }; ppx_inline_test = janePackage { name = "ppx_inline_test"; - version = "0.9.2"; - hash = "17j36ihiqprbpa2bk02449k93vaidid2sly5djrk848ccjq8n5aa"; + hash = "0ar4lpl3zwb7k1f4clqsw1hyzwa104gf118a2i89c4hvj2721jwf"; propagatedBuildInputs = [ ppx_metaquot ]; meta.description = "Syntax extension for writing in-line tests in OCaml code"; }; typerep = janePackage { name = "typerep"; - hash = "0hlc0xiznli1k6azv2mhm1s4xghhxqqd957np7828bfp7r8n2jy3"; + hash = "11na0kag6aggckx7326zq8hh9pzymkwqfxsd25fswskk5lpnvwqv"; propagatedBuildInputs = [ base ]; meta.description = "Runtime types for OCaml"; }; ppx_bench = janePackage { name = "ppx_bench"; - hash = "1qk4y6c2mpw7bqjppi2nam74vs2sc89wzq162j92wsqxyqsv4p93"; + hash = "17l5shhi613l02yfipyr4hna3lj94kn6zy746rvsgcibyc7nybq6"; propagatedBuildInputs = [ ppx_inline_test ]; meta.description = "Syntax extension for writing in-line benchmarks in OCaml code"; }; ppx_expect = janePackage { name = "ppx_expect"; - hash = "1bik53k51wcqv088f0h10n3ms9h51yvg6ha3g1s903i2bxr3xs6b"; + hash = "0qq07iqfsbksklwn7rr1wdz79kji0iyq5qkyfwxrxm0ci9fz0h1w"; propagatedBuildInputs = [ ppx_inline_test ppx_fields_conv ppx_custom_printf ppx_assert ppx_variants_conv re ]; meta.description = "Cram like framework for OCaml"; }; ppx_fail = janePackage { name = "ppx_fail"; - hash = "0qz0vlazasjyg7cv3iwpzxlvsah3zmn9dzd029xxqr1bji067s32"; + hash = "0cwz16xy5s0ijm9y98lh9089ic7wd161njpdncgsxy6lgsjawap2"; propagatedBuildInputs = [ ppx_here ppx_metaquot ]; meta.description = "Add location to calls to failwiths"; }; ppx_let = janePackage { name = "ppx_let"; - hash = "1b914a5nynwxjvfx42v61yigvjhnd548m4yqjfchf38dmqi1f4nr"; + hash = "0smdxkjh4nxrf3mwzfvkjbymvwbz04v70k2gwxsaz5f6wvnhyvmm"; propagatedBuildInputs = [ ppx_driver ]; meta.description = "Monadic let-bindings"; }; ppx_optional = janePackage { name = "ppx_optional"; - hash = "1vknsarxba0zcp5k2jb31wfpvqrv3bpanxbahfl5s2fwspsfdc82"; + hash = "1qmc0yzp9jab8yndxs0ca3qx35wyhfwiknqk0gfjmar2ji87zlzn"; propagatedBuildInputs = [ ppx_metaquot ]; meta.description = "Pattern matching on flat options"; }; ppx_pipebang = janePackage { name = "ppx_pipebang"; - hash = "1wyfyyjvyi94ds1p90l60wdr85q2v3fq1qdf3gnv9zjfy6sb0g9h"; + hash = "0lzw6qc9f9g7zkbhhp4603b3mj3jvca4phx40f95d49y370325qx"; propagatedBuildInputs = [ ppx_metaquot ]; meta.description = "A ppx rewriter that inlines reverse application operators |> and |!"; }; ppx_sexp_message = janePackage { name = "ppx_sexp_message"; - hash = "0r0skyr1zf2jh48xrxbs45gzywynhlivkq24xwc0qq435fmc2jqv"; + hash = "1gddia4ry2pmnh4qj5855a044lqs23g5h038bkny73xg7w06jhrk"; propagatedBuildInputs = [ ppx_sexp_conv ppx_here ]; meta.description = "A ppx rewriter for easy construction of s-expressions"; }; ppx_sexp_value = janePackage { name = "ppx_sexp_value"; - hash = "0hha5mmx700m8fy9g4znb8278l09chgwlpshny83vsmmzgq2jhah"; + hash = "1xd5ln997wka8x4dba58yh525a5f36sklngg2z7iyiss7xi4yg7i"; propagatedBuildInputs = [ ppx_sexp_conv ppx_here ]; meta.description = "A ppx rewriter that simplifies building s-expressions from OCaml values"; }; ppx_typerep_conv = janePackage { name = "ppx_typerep_conv"; - hash = "0bzgfpbqijwxm8x9jq1zb4xi5sbzymk17lw5rylri3hf84p60aq1"; + hash = "1bk8zgagf6q5lb7icsrbzs05c8dz1gij0clzk39am40l83zs3ain"; propagatedBuildInputs = [ ppx_type_conv typerep ]; meta.description = "Generation of runtime types from type declarations"; }; ppx_jane = janePackage { name = "ppx_jane"; - hash = "16m5iw0qyp452nqj83kd0g0x3rw40lrz7392hwpd4di1wi6v2qzc"; + hash = "1lhzcfh129dc54bkg16rnldi97682nlzdr8a47ham3hg2kkab8kr"; propagatedBuildInputs = [ ppx_base ppx_bench ppx_bin_prot ppx_expect ppx_fail ppx_let ppx_optional ppx_pipebang ppx_sexp_message ppx_sexp_value ppx_typerep_conv ]; meta.description = "Standard Jane Street ppx rewriters"; }; @@ -301,35 +288,33 @@ rec { configurator = janePackage { name = "configurator"; - version = "0.9.1"; - hash = "1q0s0ghcrcrxdj6zr9zr27g7sr4qr9l14kizjphwqwwvgbzawdix"; - propagatedBuildInputs = [ ppx_base ]; + hash = "0lydjj4r21ipmc91hyf91mjjvcibk4r7ipan8bqfzb5l490r95rp"; + propagatedBuildInputs = [ base stdio ]; meta.description = "Helper library for gathering system configuration"; }; jane-street-headers = janePackage { name = "jane-street-headers"; - hash = "0cdab6sblsidjbwvyvmspykyhqh44rpsjzi2djbfd5m4vh2h14gy"; + hash = "1sqyqzhgi52vq33i8ha2pmjg026qiqmpaqmibs3pfj4jsscwl842"; meta.description = "Jane Street header files"; }; core_kernel = janePackage { name = "core_kernel"; - hash = "05iwvggx9m81x7ijgv9gcv5znf5rmsmb76dg909bm9gkr3hbh7wh"; + hash = "00iqd9wcana2blgdih1lq9zqd31agr6az912bhsklyarvvcn9hcb"; propagatedBuildInputs = [ configurator jane-street-headers ppx_jane ]; meta.description = "Jane Street's standard library overlay (kernel)"; }; spawn = janePackage { name = "spawn"; - hash = "1w53b8ni06ajj62yaqjy0pkbm952l0m5fzr088yk15078qaxsnb5"; + hash = "1av1pjkiqq3nz0rjmykiylhf0iv6d1ssvqqj6wcc3c0bzvgyih0p"; meta.description = "Spawning sub-processes"; }; core = janePackage { name = "core"; - version = "0.9.1"; - hash = "1643r0namsgj8xwfr9niimcdwyyq4ddiwd02d73ipb4a8710aqi8"; + hash = "06cra34rlqpmxh4f3v1vps9fs7hy90jjnipdvcf9z8cn925mdj46"; propagatedBuildInputs = [ core_kernel spawn ]; meta.description = "Jane Street's standard library overlay"; }; @@ -338,7 +323,8 @@ rec { re2 = janePackage { name = "re2"; - hash = "1qmhl3yd6y0lq401rz72b1bsbpglb0wighpxn3x8y1ixq415p4xi"; + version = "0.10.1"; + hash = "1d39brryfaj5fqp1kzw67n1bvfxv28xi058mk5il14wj40y5ldh1"; propagatedBuildInputs = [ core_kernel ]; meta = { description = "OCaml bindings for RE2"; @@ -348,14 +334,21 @@ rec { textutils = janePackage { name = "textutils"; - hash = "1y6j2qw7rc8d80343lfv1dygnfrhn2qllz57mx28pl5kan743f6d"; - propagatedBuildInputs = [ core ]; + hash = "0mnmrp8kd443qx9gahrwr04a8q4hskcad2i1k9amiypbwy566s37"; + propagatedBuildInputs = [ core textutils_kernel ]; meta.description = "Text output utilities"; }; + textutils_kernel = janePackage { + name = "textutils_kernel"; + hash = "0w7nf7sycffff318fxr42ss1fxa3bsy9kj7y27dl1whrajip9mb7"; + propagatedBuildInputs = [ core_kernel ocaml-migrate-parsetree ]; + meta.description = "The subset of textutils using only core_kernel and working in javascript"; + }; + core_extended = janePackage { name = "core_extended"; - hash = "05cnzzj0kigz9c9gsmd6mfar82wmkbqm9qzrydb80sy2fz5b30rk"; + hash = "0g9adnr68l4ggayilmvz9nnf2slvnp0jzknjrxk10cab72l97rv4"; propagatedBuildInputs = [ core re2 textutils ]; postPatch = '' patchShebangs src/discover.sh @@ -369,63 +362,63 @@ rec { async_kernel = janePackage { name = "async_kernel"; - hash = "1zwxhzy7f9900rcjls2fql9cpfmwrcah3fazzdz4h2i51f41w62x"; + hash = "09dzfyfmjf9894yimf1fpnc2l1v342f51a2wjr3d23pw6xnbcrl0"; propagatedBuildInputs = [ core_kernel ]; meta.description = "Jane Street Capital's asynchronous execution library (core)"; }; async_rpc_kernel = janePackage { name = "async_rpc_kernel"; - hash = "1xk3s6s3xkj182p10kig2cqy8md6znif3v661h9cd02n8s57c40b"; - propagatedBuildInputs = [ core_kernel async_kernel ]; + hash = "1ardfr4vwbzc41qa2ccmzp15m9w3nbdl9cy4crvm87fi0ngkhixy"; + propagatedBuildInputs = [ core_kernel async_kernel protocol_version_header ]; meta.description = "Platform-independent core of Async RPC library"; }; async_unix = janePackage { name = "async_unix"; - hash = "0yd4z28j5vdj2zxqi0fkgh2ic1s9h740is2dk0raga0zr5a1z03d"; + hash = "151pn0543fwvi5gkdkbd05v8y9gjbxi1n69r4jxzc0bh842xx4xz"; propagatedBuildInputs = [ core async_kernel ]; meta.description = "Jane Street Capital's asynchronous execution library (unix)"; }; async_extra = janePackage { name = "async_extra"; - hash = "0rpy5lc5dh5mir7flq1jrppd8imby8wyw191yg4nmklg28xp5sx0"; + hash = "0vf3nfj8h7vnigs8l8m1bsg6w3szgaylaps6mbl4dsaihxdc732n"; propagatedBuildInputs = [ async_rpc_kernel async_unix ]; meta.description = "Jane Street's asynchronous execution library (extra)"; }; async = janePackage { name = "async"; - hash = "10ykzym19srgdiikj0s74dndx5nk15hjq1r2hc61iz48f6caxkb1"; + hash = "05ldvyw75648qrjx7q794m9llmlnqklh97lc09fv8biw515dby3d"; propagatedBuildInputs = [ async_extra ]; meta.description = "Jane Street Capital's asynchronous execution library"; }; async_find = janePackage { name = "async_find"; - hash = "11dmhdzgf5kn4m0cm6zr28wpwhi2kr4lak9nmgxbrxsq28bcncxq"; + hash = "05cpnz1m09h276cq6v3bh7da4iai14gmlh4cnh64v41f8hssw63s"; propagatedBuildInputs = [ async ]; meta.description = "Directory traversal with Async"; }; async_interactive = janePackage { name = "async_interactive"; - hash = "1mmqqp6bi2wg7bmgf0sw34jn3iyl5kbm200dax8yqq6rfprcs49j"; + hash = "1h2419l6nlqph3ipp5zdwyq55d3s602i4bv4jhsridmzy6cxxdxs"; propagatedBuildInputs = [ async ]; meta.description = "Utilities for building simple command-line based user interfaces"; }; async_parallel = janePackage { name = "async_parallel"; - hash = "0mdprhr1pv4g65g10gr3gaifrzknsdgarwfdbjlvhzfs86075kyn"; + hash = "0r8q73v26w3grj9n9wyrf65cq9w6pfzrmg9iswsy4jjb5r02bpr5"; propagatedBuildInputs = [ async ]; meta.description = "Distributed computing library"; }; async_shell = janePackage { name = "async_shell"; - hash = "02clpz3xv3i5avzifwalylb9gfxzpgnr8bnlfsjixxfk2m7kvsj2"; + hash = "1snkr944l3a627k23yh8f0lr900dpg2aym2l59fpp75s29pyk5md"; propagatedBuildInputs = [ core_extended async ]; meta = { description = "Shell helpers for Async"; @@ -434,7 +427,7 @@ rec { async_ssl = janePackage { name = "async_ssl"; - hash = "01w3bg38q61lc3hfh8jsr0sy1ylyv0m6g6h9yvsk8ngj6qk70nss"; + hash = "1cb9wpmgifa5vj9gadbav6bq6vxcm3g0jc6wxnkj3hgvnj35j2vy"; propagatedBuildInputs = [ async ctypes openssl ]; meta.description = "Async wrappers for SSL"; }; @@ -443,21 +436,21 @@ rec { sexp_pretty = janePackage { name = "sexp_pretty"; - hash = "1bx8va468j5b813m0vsh1jzgb6h2qnnjfmjlf2hb82sarv8lllfx"; + hash = "106r91ahzdr8yvphs1s3ck8r89c4qhpcl9q6j5rbxrbihgb71i8d"; propagatedBuildInputs = [ ppx_base re ]; meta.description = "S-expression pretty-printer"; }; expect_test_helpers_kernel = janePackage { name = "expect_test_helpers_kernel"; - hash = "1ycqir8sqgq5nialnrfg29nqn0cqg6jjpgv24drdycdhqf5r2zg6"; + hash = "027pwfkdnz8rzgg9dqa4x2ir0zn8lav7gh64cih35r455xbfnvpr"; propagatedBuildInputs = [ core_kernel sexp_pretty ]; meta.description = "Helpers for writing expectation tests"; }; expect_test_helpers = janePackage { name = "expect_test_helpers"; - hash = "0rsh6rwbqfcrqisk8jp7srlnicsadbzrs02ri6zyx0p3lmznw5r2"; + hash = "0rzsgj8h73gx18sz1a1d3pbrjkb0vd6shl1h71n4xl05njcfb73r"; propagatedBuildInputs = [ async expect_test_helpers_kernel ]; meta.description = "Async helpers for writing expectation tests"; }; @@ -466,28 +459,28 @@ rec { bignum = janePackage { name = "bignum"; - hash = "0g80mzsi7vc1kq4mzha8y9nl95h6cd041vix3wjrqgkdvb1qd4f3"; - propagatedBuildInputs = [ core_kernel zarith ]; + hash = "0vs52aqq7pwazgv35zdd66c5v5ha1wrgrcmzc17c2qbswy8wcc37"; + propagatedBuildInputs = [ core_kernel zarith num ]; meta.description = "Core-flavoured wrapper around zarith's arbitrary-precision rationals"; }; cinaps = janePackage { name = "cinaps"; - hash = "02fpjiwrygkpx2q4jfldhbqh0mqxmf955wizr8k4vmsq4wsis0p5"; + hash = "1mwllcakvsirxpbwcqlglwqkiz8cks7vbjf1jvngs9703mx1xdcy"; propagatedBuildInputs = [ re ]; meta.description = "Trivial Metaprogramming tool using the OCaml toplevel"; }; command_rpc = janePackage { name = "command_rpc"; - hash = "0w58z9jkz5qzbvf33wrzhfshzdvnrphj6dq8dmi52ykhfvxm7824"; + hash = "0lq1vcz8qyyqabrz9isw2pw50663lwmq4w3187jp99ygar9lk5n2"; propagatedBuildInputs = [ async ]; meta.description = "Utilities for Versioned RPC communication with a child process over stdin and stdout"; }; core_bench = janePackage { name = "core_bench"; - hash = "1m2q7217nmcsck29i59djkm0h6z3aj0i01niijzr5f6ilbnmyd3h"; + hash = "1py68z848gj5wdmknqmzdb6zg65k5zchv6i6vzygi5nszn3zzwgc"; propagatedBuildInputs = [ core_extended ]; meta = { description = "Micro-benchmarking library for OCaml"; @@ -496,7 +489,7 @@ rec { core_profiler = janePackage { name = "core_profiler"; - hash = "1ir2v3wdfbf5xzqcma16asc73mkx2q6dzq5y1bx6q1rpa7iznx44"; + hash = "1vqkb8fzhs0k94k78whjnsznj85qa18kp0bq73mdkffz9562hdyr"; propagatedBuildInputs = [ core_extended ]; meta = { description = "Profiling library"; @@ -505,22 +498,22 @@ rec { csvfields = janePackage { name = "csvfields"; - hash = "0lbvs1kwl22ryxhw6s089f6683hj2920bn518mvr22rnv7qijy0v"; - propagatedBuildInputs = [ core ]; + hash = "1qvcm2xkpw5ca5za2dfvz154h6kzm565wvynh7fffvrj2q719flm"; + propagatedBuildInputs = [ core expect_test_helpers ]; meta.description = "Runtime support for ppx_xml_conv and ppx_csv_conv"; }; ecaml = janePackage { name = "ecaml"; - hash = "1a2534bzbwgpm71aj3sm71sm0lkcjdfjj1mk91p1pg9kxn8c5x4i"; - propagatedBuildInputs = [ async ]; + hash = "1h8m8nznsyc8md8f5rx3845lpl37ijqpxkpd52w92xy5hlc9bk1k"; + propagatedBuildInputs = [ async expect_test_helpers_kernel ]; meta.description = "Writing Emacs plugin in OCaml"; }; email_message = janePackage { name = "email_message"; - hash = "0cpaf6wn5g883bxdz029bksvrfzih99m7hzbb30fhqglmpmmkniz"; - propagatedBuildInputs = [ async core_extended cryptokit magic-mime ounit ]; + hash = "0p56lak1ynqmimapsz529ankgdyd5yk90c0193q8fzv7fvvrzkzd"; + propagatedBuildInputs = [ async angstrom core_extended cryptokit magic-mime ounit ]; meta = { description = "E-mail message parser"; }; @@ -528,28 +521,28 @@ rec { incremental_kernel = janePackage { name = "incremental_kernel"; - hash = "0zq48wbgqcflh84n10iygi8aa3f0zzmgc7r0jwvsyg7i8zccgvf5"; + hash = "15xw3l07fdqk5sla37fdvfnwykvq6fyrj9b2lwhc29rq0444m1yz"; propagatedBuildInputs = [ core_kernel ]; meta.description = "Library for incremental computations depending only on core_kernel"; }; incremental = janePackage { name = "incremental"; - hash = "05sx8ia46v4dlvzcn7xgjcwxvbd0wmvv9r2bpvniapjnwr1nvcfh"; + hash = "14hh7kxj70bpgylnx1fj3s5c40d12sgcb11cnh1xh7nwm190a9c2"; propagatedBuildInputs = [ core incremental_kernel ]; meta.description = "Library for incremental computations"; }; incr_map = janePackage { name = "incr_map"; - hash = "0358qg9irxbbhn18laqww3mn43mdwvlbr0h2mvg3vdbb2c5jp4fv"; + hash = "0s6c7f8a80s7bnjxcs7mdgm45i24d1j0vw4i2j884z1ssjrk33hw"; propagatedBuildInputs = [ incremental_kernel ]; meta.description = "Helpers for incremental operations on map like data structures"; }; ocaml_plugin = janePackage { name = "ocaml_plugin"; - hash = "0q33swnlx9p1gcn1aj95501kapb7cnbzbsavid69csczwmzcxr14"; + hash = "0b63ciajc9hcjs3pl0chlj475y60i3l5mjzaiqmyz1pryfqpri7r"; buildInputs = [ ocamlbuild ]; propagatedBuildInputs = [ async ]; meta.description = "Automatically build and dynlink ocaml source files"; @@ -557,59 +550,57 @@ rec { parsexp = janePackage { name = "parsexp"; - hash = "0brrifvnfqbfk873v6y5b2jixs2d73hpispj9r440kca5cfsv23b"; + hash = "1k1z6kyp7c53l0wspz6qpvbb46bbr6aimnr06y6y1prxrpazm62w"; propagatedBuildInputs = [ ppx_compare ppx_fields_conv ppx_js_style ppx_sexp_value ]; meta.description = "S-expression parsing library"; }; parsexp_io = janePackage { name = "parsexp_io"; - hash = "0gcmh4dg48xgszladq92yhk1hf492zf0smz462xrwknzlfdkz6a5"; + hash = "0l9jrfm1zz0y6bfxla2s0fwjlvs9361ky83z3xwdlc48fgzks3a5"; propagatedBuildInputs = [ parsexp ]; meta.description = "S-expression parsing library (IO functions)"; }; patience_diff = janePackage { name = "patience_diff"; - hash = "0vpx9xj1ich5qmj3m26vlmix3nsdj7pd1xzhqwbc7ad2kqwy3grg"; + hash = "11ws6hsalmq7zc7wp37mj7zs3qaqkq4zlnwr06ybryv6vz62xj1l"; propagatedBuildInputs = [ core_kernel ]; meta.description = "Tool and library implementing patience diff"; }; posixat = janePackage { name = "posixat"; - hash = "0ak93dyzi6sc6gb0j07fj85b24d8bv6g2hm7jj5xwb39kjwh51jl"; + hash = "0dmjzbpbmzl94h4c1gk6k75wglnvk1kqcm4zs4nb9hy2ja8ldl9x"; propagatedBuildInputs = [ ppx_sexp_conv ]; meta.description = "Binding to the posix *at functions"; - meta.broken = lib.versionAtLeast ocaml.version "4.05"; + }; + + protocol_version_header = janePackage { + name = "protocol_version_header"; + hash = "1vl1kfn8n1zdm3vh7228c58vprac4v7mpqks60k8rnzjj4w2mj1n"; + propagatedBuildInputs = [ core_kernel ocaml-migrate-parsetree ]; + meta.description = "Protocol aware version negotiation"; }; rpc_parallel = janePackage { name = "rpc_parallel"; - hash = "0s72msl2p27bz0knjlpgy5qwp0w4z76cq801ps0sab35f8jjfs38"; + hash = "01nyjqgdj351ykdaqqpaljwzac48x824lzfpma64lbp6plqmjlbf"; propagatedBuildInputs = [ async ]; meta.description = "Type-safe library for building parallel applications"; }; shexp = janePackage { name = "shexp"; - hash = "1fkz4l9z4i0fz2kccd5blm2j9x2x4z6y1cn29wjmc3spqfxbq37y"; + hash = "1ck5gcsdp93194bw6d1i116zplyaqrz1r36h6mvrw5x7i2549n9p"; propagatedBuildInputs = [ posixat spawn ]; meta.description = "Process library and s-expression based shell"; }; topological_sort = janePackage { name = "topological_sort"; - hash = "1d64fyq0clsgham9p1f5rk01z8pxalglp92xmqw2iznyw0vxhvsy"; + hash = "08w1dx30frj2bxxk8djl23cd43sassjkrmissyhagn9fmq2l904m"; propagatedBuildInputs = [ core_kernel ]; meta.description = "Topological sort algorithm"; }; - - typerep_extended = janePackage { - name = "typerep_extended"; - hash = "15gq8mrvlipd616rffr3f0wqw5d0ijnnizix610g2d5viirh0j9p"; - propagatedBuildInputs = [ core_kernel ]; - meta.description = "Runtime types for OCaml (Extended)"; - }; - } diff --git a/pkgs/development/ocaml-modules/janestreet/janePackage.nix b/pkgs/development/ocaml-modules/janestreet/janePackage.nix index 6d6a4d714422..d9c8b9e66fe7 100644 --- a/pkgs/development/ocaml-modules/janestreet/janePackage.nix +++ b/pkgs/development/ocaml-modules/janestreet/janePackage.nix @@ -1,6 +1,6 @@ { stdenv, fetchFromGitHub, ocaml, jbuilder, findlib }: -{ name, version ? "0.9.0", buildInputs ? [], hash, meta, ...}@args: +{ name, version ? "0.10.0", buildInputs ? [], hash, meta, ...}@args: if !stdenv.lib.versionAtLeast ocaml.version "4.03" then throw "${name}-${version} is not available for OCaml ${ocaml.version}" else diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 4a6e4e815bb6..efce8c412d94 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -714,8 +714,9 @@ let janePackage = callPackage ../development/ocaml-modules/janestreet/janePackage.nix {}; janeStreet = import ../development/ocaml-modules/janestreet { - inherit lib janePackage ocaml ocamlbuild ctypes cryptokit magic-mime num; - inherit ocaml-migrate-parsetree octavius ounit ppx_deriving re zarith; + inherit lib janePackage ocaml ocamlbuild angstrom ctypes cryptokit; + inherit magic-mime num ocaml-migrate-parsetree octavius ounit; + inherit ppx_deriving re zarith; inherit (pkgs) stdenv openssl; }; From d5f6994b8527165e59237aa7ce7a0a019e9527db Mon Sep 17 00:00:00 2001 From: Kranium Gikos Mendoza Date: Sat, 3 Mar 2018 14:18:07 +1100 Subject: [PATCH 242/814] conkeror: use firefox-esr --- pkgs/applications/networking/browsers/conkeror/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/conkeror/default.nix b/pkgs/applications/networking/browsers/conkeror/default.nix index 4da4c74d1c37..a6fbda3ce16f 100644 --- a/pkgs/applications/networking/browsers/conkeror/default.nix +++ b/pkgs/applications/networking/browsers/conkeror/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, unzip, firefox, makeWrapper }: +{ stdenv, fetchgit, unzip, firefox-esr, makeWrapper }: stdenv.mkDerivation rec { pkgname = "conkeror"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { mkdir -p $out/libexec/conkeror cp -r * $out/libexec/conkeror - makeWrapper ${firefox}/bin/firefox $out/bin/conkeror \ + makeWrapper ${firefox-esr}/bin/firefox $out/bin/conkeror \ --add-flags "-app $out/libexec/conkeror/application.ini" ''; From 793cfa7e540568cd956e3d5dcb1797c10196ae66 Mon Sep 17 00:00:00 2001 From: Kranium Gikos Mendoza Date: Sat, 3 Mar 2018 14:19:39 +1100 Subject: [PATCH 243/814] conkeror: 1.0.3 -> 1.0.4 --- pkgs/applications/networking/browsers/conkeror/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/conkeror/default.nix b/pkgs/applications/networking/browsers/conkeror/default.nix index a6fbda3ce16f..ded2b688815c 100644 --- a/pkgs/applications/networking/browsers/conkeror/default.nix +++ b/pkgs/applications/networking/browsers/conkeror/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pkgname = "conkeror"; - version = "1.0.3"; + version = "1.0.4"; name = "${pkgname}-${version}"; src = fetchgit { url = git://repo.or.cz/conkeror.git; rev = "refs/tags/${version}"; - sha256 = "06fhfk8km3gd1lc19543zn0c71zfbn8wsalinvm1dbgi724f52pd"; + sha256 = "10c57wqybp9kcjpkb01wxq0h3vafcdb1g5kb4k8sb2zajg59afv8"; }; buildInputs = [ unzip makeWrapper ]; From 0339dc5fae62253c3554619daf9ed01fe2fa4779 Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Wed, 21 Feb 2018 01:24:36 -0600 Subject: [PATCH 244/814] libftdi: enable async mode Apparently, async mode for libftdi 0.20 is allegedly disabled when using libusb-compat wrappers, as libftdi does not really support libftdi 1.x. Because we only ship libusb-compat, this would normally make async mode completely unavailable. Except distributions like Ubuntu just disable this check completely! See this patch from Launchpad: https://bazaar.launchpad.net/~ubuntu-branches/ubuntu/trusty/libftdi/trusty/view/head:/debian/patches/04_async_mode.diff In the spirit of good competition (and feature parity for software that *doesn't* support the synchronous mode, thanks to Ubuntu silently ensuring their async-only paths work) we enable this just the same. Signed-off-by: Austin Seipp --- pkgs/development/libraries/libftdi/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/development/libraries/libftdi/default.nix b/pkgs/development/libraries/libftdi/default.nix index 2f499d3af87f..fff760c55191 100644 --- a/pkgs/development/libraries/libftdi/default.nix +++ b/pkgs/development/libraries/libftdi/default.nix @@ -14,6 +14,14 @@ stdenv.mkDerivation rec { # Hack to avoid TMPDIR in RPATHs. preFixup = ''rm -rf "$(pwd)" ''; + configureFlags = [ "--with-async-mode" ]; + + # allow async mode. from ubuntu. see: + # https://bazaar.launchpad.net/~ubuntu-branches/ubuntu/trusty/libftdi/trusty/view/head:/debian/patches/04_async_mode.diff + patchPhase = '' + substituteInPlace ./src/ftdi.c \ + --replace "ifdef USB_CLASS_PTP" "if 0" + ''; meta = { description = "A library to talk to FTDI chips using libusb"; From 7270f2139ae75815fab81e7db7b61385cf07396e Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Fri, 2 Mar 2018 14:40:47 -0600 Subject: [PATCH 245/814] tlaplus: init at 1.5.6 Signed-off-by: Austin Seipp --- .../science/logic/tlaplus/default.nix | 40 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 42 insertions(+) create mode 100644 pkgs/applications/science/logic/tlaplus/default.nix diff --git a/pkgs/applications/science/logic/tlaplus/default.nix b/pkgs/applications/science/logic/tlaplus/default.nix new file mode 100644 index 000000000000..b1eb171b20b1 --- /dev/null +++ b/pkgs/applications/science/logic/tlaplus/default.nix @@ -0,0 +1,40 @@ +{ stdenv, fetchFromGitHub, makeWrapper +, jdk, jre, ant +}: + +stdenv.mkDerivation rec { + name = "tlaplus-${version}"; + version = "1.5.6"; + + src = fetchFromGitHub { + owner = "tlaplus"; + repo = "tlaplus"; + rev = "refs/tags/v${version}"; + sha256 = "0966mvgxamknj4hsp980qbxwda886w1dv309kn7isxn0420lfv4f"; + }; + + buildInputs = [ makeWrapper jdk ant ]; + + buildPhase = "ant -f tlatools/customBuild.xml compile dist"; + installPhase = '' + mkdir -p $out/share/java $out/bin + cp tlatools/dist/*.jar $out/share/java + + makeWrapper ${jre}/bin/java $out/bin/tlc2 \ + --add-flags "-cp $out/share/java/tla2tools.jar tlc2.TLC" + makeWrapper ${jre}/bin/java $out/bin/tla2sany \ + --add-flags "-cp $out/share/java/tla2tools.jar tla2sany.SANY" + makeWrapper ${jre}/bin/java $out/bin/pcal \ + --add-flags "-cp $out/share/java/tla2tools.jar pcal.trans" + makeWrapper ${jre}/bin/java $out/bin/tla2tex \ + --add-flags "-cp $out/share/java/tla2tools.jar tla2tex.TLA" + ''; + + meta = { + description = "An algorithm specification language with model checking tools"; + homepage = http://lamport.azurewebsites.net/tla/tla.html; + license = stdenv.lib.licenses.mit; + platforms = stdenv.lib.platforms.unix; + maintainers = [ stdenv.lib.maintainers.thoughtpolice ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 65b5b4e4d70d..a2b4239314a3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19725,6 +19725,8 @@ with pkgs; z3_4_5_0 = callPackage ../applications/science/logic/z3/4.5.0.nix {}; z3 = callPackage ../applications/science/logic/z3 { python = python2; }; + tlaplus = callPackage ../applications/science/logic/tlaplus {}; + aiger = callPackage ../applications/science/logic/aiger {}; avy = callPackage ../applications/science/logic/avy {}; From 9478569beda4e362a4e99a125ee43c7d64eece1b Mon Sep 17 00:00:00 2001 From: Kranium Gikos Mendoza Date: Sat, 3 Mar 2018 15:58:52 +1100 Subject: [PATCH 246/814] libwhereami: fix gcc7 build --- pkgs/development/libraries/libwhereami/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/libraries/libwhereami/default.nix b/pkgs/development/libraries/libwhereami/default.nix index a119ae8795be..fe59eb736589 100644 --- a/pkgs/development/libraries/libwhereami/default.nix +++ b/pkgs/development/libraries/libwhereami/default.nix @@ -11,6 +11,9 @@ stdenv.mkDerivation rec { owner = "puppetlabs"; }; + # post gcc7, upstream bug: https://tickets.puppetlabs.com/browse/FACT-1828 + NIX_CFLAGS_COMPILE = "-Wno-error=deprecated"; + nativeBuildInputs = [ cmake ]; buildInputs = [ boost curl leatherman ]; From 6fb1978b3bcf0c0e8835e3e96a417e70979ee233 Mon Sep 17 00:00:00 2001 From: Kranium Gikos Mendoza Date: Sat, 3 Mar 2018 16:00:41 +1100 Subject: [PATCH 247/814] libwhereami: 0.1.3 -> 0.2.0 --- pkgs/development/libraries/libwhereami/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libwhereami/default.nix b/pkgs/development/libraries/libwhereami/default.nix index fe59eb736589..880ebcc1e468 100644 --- a/pkgs/development/libraries/libwhereami/default.nix +++ b/pkgs/development/libraries/libwhereami/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { name = "libwhereami-${version}"; - version = "0.1.3"; + version = "0.2.0"; src = fetchFromGitHub { - sha256 = "0mpy2rkxcm2nz1qvldih01czxlsksqfkzgh58pnrw8yva31wv9q6"; + sha256 = "10phq4a11m8ly6b4dc2yg3dnjzg8ad5wnjv0ilvwylnw32800pxr"; rev = version; repo = "libwhereami"; owner = "puppetlabs"; From abc93b0a2b9dd96d9a6048ff7b1729826a5d6990 Mon Sep 17 00:00:00 2001 From: Kranium Gikos Mendoza Date: Sat, 3 Mar 2018 17:40:46 +1100 Subject: [PATCH 248/814] facter: 3.9.3 -> 3.10.0 --- pkgs/tools/system/facter/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/system/facter/default.nix b/pkgs/tools/system/facter/default.nix index 57cbb44cebff..9ff5f58f558a 100644 --- a/pkgs/tools/system/facter/default.nix +++ b/pkgs/tools/system/facter/default.nix @@ -2,17 +2,16 @@ stdenv.mkDerivation rec { name = "facter-${version}"; - version = "3.9.3"; + version = "3.10.0"; src = fetchFromGitHub { - sha256 = "1qd0xsw49nbj22czddxk90di31gx43hacvnmh08gp3001a8g0qcj"; + sha256 = "0qj23n5h98iirwhnjpcqzmirqf92sjd8mws5dky0pap359j6w792"; rev = version; repo = "facter"; owner = "puppetlabs"; }; CXXFLAGS = "-fpermissive"; - NIX_CFLAGS_COMPILE = "-Wno-error"; NIX_LDFLAGS = "-lblkid"; cmakeFlags = [ "-DFACTER_RUBY=${ruby}/lib/libruby.so" ]; From 88530e02b6fa9b5429dc09972b599e7b0a3af569 Mon Sep 17 00:00:00 2001 From: aszlig Date: Sat, 3 Mar 2018 07:10:22 +0100 Subject: [PATCH 249/814] systemd: Update to latest NixOS branch Updated to the latest version of the nixos-v237 branch, which fixes two things: * Make sure that systemd looks in /etc for configuration files. https://github.com/NixOS/systemd/pull/15 * Fix handling of the x-initrd.mount option. https://github.com/NixOS/systemd/pull/16 I've added NixOS VM tests for both to ensure we won't run into regressions. The newly added systemd test only tests for that and is by no means exhaustive, but it's a start. Personally I only wanted to fix the former issue, because that's the one I've been debugging. After sending in a pull request for our systemd fork (https://github.com/NixOS/systemd/pull/17) I got a notice from @Mic92, that he already fixed this and his fix was even better as it's even suitable for upstream (so we hopefully can drop that patch someday). The reason why the second one came in was simply because it has been merged before the former, but I thought it would be a good idea to have tests for that as well. In addition I've removed the sysconfdir=$out/etc entry to make sure the default (/etc) is used. Installing is still done to $out, because those directories that were previously into sysconfdir now get into factoryconfdir. Quote from commit NixOS/systemd@98067cc806ae0d2759cdd2334f230cd8548e531: By default systemd should read all its configuration from /etc. Therefore we rely on -Dsysconfdir=/etc in meson as default value. Unfortunately this would also lead to installation of systemd's own configuration files to `/etc` whereas we are limited to /nix/store. To counter that this commit introduces two new configuration variables `factoryconfdir` and `factorypkgconfdir` to install systemd's own configuration into nix store again, while having executables looking up files in /etc. Tested this change against all of the NixOS VM tests we have in nixos/release.nix. Between this change and its parent no new tests were failing (although a lot of them were flaky). Signed-off-by: aszlig Cc: @Mic92, @tk-ecotelecom, @edolstra, @fpletz Fixes: #35415 Fixes: #35268 --- nixos/release.nix | 1 + nixos/tests/systemd.nix | 66 ++++++++++++++++++++++ pkgs/os-specific/linux/systemd/default.nix | 5 +- 3 files changed, 69 insertions(+), 3 deletions(-) create mode 100644 nixos/tests/systemd.nix diff --git a/nixos/release.nix b/nixos/release.nix index 473b11313bef..2d8b6c6b8263 100644 --- a/nixos/release.nix +++ b/nixos/release.nix @@ -355,6 +355,7 @@ in rec { tests.snapper = callTest tests/snapper.nix {}; tests.statsd = callTest tests/statsd.nix {}; tests.sudo = callTest tests/sudo.nix {}; + tests.systemd = callTest tests/systemd.nix {}; tests.switchTest = callTest tests/switch-test.nix {}; tests.taskserver = callTest tests/taskserver.nix {}; tests.tomcat = callTest tests/tomcat.nix {}; diff --git a/nixos/tests/systemd.nix b/nixos/tests/systemd.nix new file mode 100644 index 000000000000..2df6f341c4ef --- /dev/null +++ b/nixos/tests/systemd.nix @@ -0,0 +1,66 @@ +import ./make-test.nix { + name = "systemd"; + + machine = { lib, ... }: { + imports = [ common/user-account.nix common/x11.nix ]; + + virtualisation.emptyDiskImages = [ 512 ]; + + fileSystems = lib.mkVMOverride { + "/test-x-initrd-mount" = { + device = "/dev/vdb"; + fsType = "ext2"; + autoFormat = true; + noCheck = true; + options = [ "x-initrd.mount" ]; + }; + }; + + systemd.extraConfig = "DefaultEnvironment=\"XXX_SYSTEM=foo\""; + systemd.user.extraConfig = "DefaultEnvironment=\"XXX_USER=bar\""; + services.journald.extraConfig = "Storage=volatile"; + services.xserver.displayManager.auto.user = "alice"; + + systemd.services.testservice1 = { + description = "Test Service 1"; + wantedBy = [ "multi-user.target" ]; + serviceConfig.Type = "oneshot"; + script = '' + if [ "$XXX_SYSTEM" = foo ]; then + touch /system_conf_read + fi + ''; + }; + + systemd.user.services.testservice2 = { + description = "Test Service 2"; + wantedBy = [ "default.target" ]; + serviceConfig.Type = "oneshot"; + script = '' + if [ "$XXX_USER" = bar ]; then + touch "$HOME/user_conf_read" + fi + ''; + }; + }; + + testScript = '' + $machine->waitForX; + + # Regression test for https://github.com/NixOS/nixpkgs/issues/35415 + subtest "configuration files are recognized by systemd", sub { + $machine->succeed('test -e /system_conf_read'); + $machine->succeed('test -e /home/alice/user_conf_read'); + $machine->succeed('test -z $(ls -1 /var/log/journal)'); + }; + + # Regression test for https://github.com/NixOS/nixpkgs/issues/35268 + subtest "file system with x-initrd.mount is not unmounted", sub { + $machine->shutdown; + $machine->waitForUnit('multi-user.target'); + # If the file system was unmounted during the shutdown the file system + # has a last mount time, because the file system wasn't checked. + $machine->fail('dumpe2fs /dev/vdb | grep -q "^Last mount time: *n/a"'); + }; + ''; +} diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index 858312c55d4d..fc72728cbabe 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -23,8 +23,8 @@ in stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "NixOS"; repo = "systemd"; - rev = "1e8830dfa77a7dc6976509f4a6edb7e012c50792"; - sha256 = "1cw1k0i68azmzpqzi3r8jm6mbi2wqlql78fhcg0vvnv1ly8bf7vq"; + rev = "98067cc806ae0d2759cdd2334f230cd8548e5317"; + sha256 = "077svfs2xy3g30s62q69wcv5pb9vfhzh8i7lhfri73vvhwbpzd5q"; }; outputs = [ "out" "lib" "man" "dev" ]; @@ -85,7 +85,6 @@ in stdenv.mkDerivation rec { mesonFlagsArray+=(-Ddbussessionservicedir=$out/share/dbus-1/services) mesonFlagsArray+=(-Ddbussystemservicedir=$out/share/dbus-1/system-services) mesonFlagsArray+=(-Dpamconfdir=$out/etc/pam.d) - mesonFlagsArray+=(-Dsysconfdir=$out/etc) mesonFlagsArray+=(-Drootprefix=$out) mesonFlagsArray+=(-Dlibdir=$lib/lib) mesonFlagsArray+=(-Drootlibdir=$lib/lib) From 6eecefbfbea9066c6a1820177ea0d053787f03e8 Mon Sep 17 00:00:00 2001 From: Ryan Mulligan Date: Tue, 27 Feb 2018 09:39:50 -0800 Subject: [PATCH 250/814] petsc: 3.7.6 -> 3.8.3 Semi-automatic update. These checks were performed: - built on NixOS - ran `/nix/store/fgr3yvhrnvfhr0czc4ygx1mnjsrv4f4i-petsc-3.8.3/bin/saws/getSAWs.bash -h` got 0 exit code - ran `/nix/store/fgr3yvhrnvfhr0czc4ygx1mnjsrv4f4i-petsc-3.8.3/bin/saws/getSAWs.bash --help` got 0 exit code - ran `/nix/store/fgr3yvhrnvfhr0czc4ygx1mnjsrv4f4i-petsc-3.8.3/bin/saws/getSAWs.bash help` got 0 exit code - ran `/nix/store/fgr3yvhrnvfhr0czc4ygx1mnjsrv4f4i-petsc-3.8.3/bin/update.py -h` got 0 exit code - ran `/nix/store/fgr3yvhrnvfhr0czc4ygx1mnjsrv4f4i-petsc-3.8.3/bin/update.py --help` got 0 exit code - ran `/nix/store/fgr3yvhrnvfhr0czc4ygx1mnjsrv4f4i-petsc-3.8.3/bin/update.py help` got 0 exit code - ran `/nix/store/fgr3yvhrnvfhr0czc4ygx1mnjsrv4f4i-petsc-3.8.3/bin/update.py -V` and found version 3.8.3 - ran `/nix/store/fgr3yvhrnvfhr0czc4ygx1mnjsrv4f4i-petsc-3.8.3/bin/update.py -v` and found version 3.8.3 - ran `/nix/store/fgr3yvhrnvfhr0czc4ygx1mnjsrv4f4i-petsc-3.8.3/bin/update.py --version` and found version 3.8.3 - ran `/nix/store/fgr3yvhrnvfhr0czc4ygx1mnjsrv4f4i-petsc-3.8.3/bin/update.py version` and found version 3.8.3 - ran `/nix/store/fgr3yvhrnvfhr0czc4ygx1mnjsrv4f4i-petsc-3.8.3/bin/update.py -h` and found version 3.8.3 - ran `/nix/store/fgr3yvhrnvfhr0czc4ygx1mnjsrv4f4i-petsc-3.8.3/bin/update.py --help` and found version 3.8.3 - ran `/nix/store/fgr3yvhrnvfhr0czc4ygx1mnjsrv4f4i-petsc-3.8.3/bin/update.py help` and found version 3.8.3 - ran `/nix/store/fgr3yvhrnvfhr0czc4ygx1mnjsrv4f4i-petsc-3.8.3/bin/petscnagupgrade.py -h` got 0 exit code - ran `/nix/store/fgr3yvhrnvfhr0czc4ygx1mnjsrv4f4i-petsc-3.8.3/bin/petscnagupgrade.py --help` got 0 exit code - ran `/nix/store/fgr3yvhrnvfhr0czc4ygx1mnjsrv4f4i-petsc-3.8.3/bin/petscnagupgrade.py help` got 0 exit code - ran `/nix/store/fgr3yvhrnvfhr0czc4ygx1mnjsrv4f4i-petsc-3.8.3/bin/sendToJenkins -h` got 0 exit code - ran `/nix/store/fgr3yvhrnvfhr0czc4ygx1mnjsrv4f4i-petsc-3.8.3/bin/sendToJenkins --help` got 0 exit code - ran `/nix/store/fgr3yvhrnvfhr0czc4ygx1mnjsrv4f4i-petsc-3.8.3/bin/sendToJenkins -h` and found version 3.8.3 - ran `/nix/store/fgr3yvhrnvfhr0czc4ygx1mnjsrv4f4i-petsc-3.8.3/bin/sendToJenkins --help` and found version 3.8.3 - ran `/nix/store/fgr3yvhrnvfhr0czc4ygx1mnjsrv4f4i-petsc-3.8.3/bin/petscdiff -h` got 0 exit code - ran `/nix/store/fgr3yvhrnvfhr0czc4ygx1mnjsrv4f4i-petsc-3.8.3/bin/petscdiff --help` got 0 exit code - ran `/nix/store/fgr3yvhrnvfhr0czc4ygx1mnjsrv4f4i-petsc-3.8.3/bin/petscdiff -h` and found version 3.8.3 - ran `/nix/store/fgr3yvhrnvfhr0czc4ygx1mnjsrv4f4i-petsc-3.8.3/bin/petscdiff --help` and found version 3.8.3 - found 3.8.3 with grep in /nix/store/fgr3yvhrnvfhr0czc4ygx1mnjsrv4f4i-petsc-3.8.3 --- pkgs/development/libraries/science/math/petsc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/science/math/petsc/default.nix b/pkgs/development/libraries/science/math/petsc/default.nix index bc5527a8e970..efedbe725af1 100644 --- a/pkgs/development/libraries/science/math/petsc/default.nix +++ b/pkgs/development/libraries/science/math/petsc/default.nix @@ -7,11 +7,11 @@ stdenv.mkDerivation rec { name = "petsc-${version}"; - version = "3.7.6"; + version = "3.8.3"; src = fetchurl { url = "http://ftp.mcs.anl.gov/pub/petsc/release-snapshots/petsc-${version}.tar.gz"; - sha256 = "0jfl35lrhzvv982z6h1v5rcp39g0x16ca43rm9dx91wm6i8y13iw"; + sha256 = "1b1yr93g6df8kx10ri2y26bp3l3w3jv10r80krnarbvyjgnw7y81"; }; nativeBuildInputs = [ blas gfortran.cc.lib liblapack python ]; From 9ccb0f39554d4b7fdb75dcf757e9862029821694 Mon Sep 17 00:00:00 2001 From: Ryan Mulligan Date: Tue, 27 Feb 2018 09:28:46 -0800 Subject: [PATCH 251/814] par2cmdline: 0.7.3 -> 0.8.0 Semi-automatic update. These checks were performed: - built on NixOS - ran `/nix/store/j0cc1ys2lb4hxa5zqcq2a43pkaii585d-par2cmdline-0.8.0/bin/par2 -h` got 0 exit code - ran `/nix/store/j0cc1ys2lb4hxa5zqcq2a43pkaii585d-par2cmdline-0.8.0/bin/par2 --help` got 0 exit code - ran `/nix/store/j0cc1ys2lb4hxa5zqcq2a43pkaii585d-par2cmdline-0.8.0/bin/par2 -V` and found version 0.8.0 - found 0.8.0 with grep in /nix/store/j0cc1ys2lb4hxa5zqcq2a43pkaii585d-par2cmdline-0.8.0 - found 0.8.0 in filename of file in /nix/store/j0cc1ys2lb4hxa5zqcq2a43pkaii585d-par2cmdline-0.8.0 cc "@muflax" --- pkgs/tools/networking/par2cmdline/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/par2cmdline/default.nix b/pkgs/tools/networking/par2cmdline/default.nix index aa9e5483408f..f2c92d689f35 100644 --- a/pkgs/tools/networking/par2cmdline/default.nix +++ b/pkgs/tools/networking/par2cmdline/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "par2cmdline-${version}"; - version = "0.7.3"; + version = "0.8.0"; src = fetchFromGitHub { owner = "Parchive"; repo = "par2cmdline"; rev = "v${version}"; - sha256 = "1hkb1brz70p79rv7dlzhnl1invjmkll81rcpnhwvafv1yriklfai"; + sha256 = "0f1jsd5sw2wynjzi7yjqjaf13yhyjfdid91p8yh0jn32y03kjyrz"; }; nativeBuildInputs = [ autoreconfHook ]; From 515a6ad8437e264ec488ffc7d886c586d9b628df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sat, 3 Mar 2018 12:08:25 +0100 Subject: [PATCH 252/814] dovecot: 2.3.0 -> 2.3.0.1 Release notes: https://dovecot.org/list/dovecot-news/2018-February/000371.html CVE-2017-15132 is patched in this release, so the patches were removed. They were erroneously referencing CVE-2017-14132, but were indeed patches for CVE-2017-15132. --- pkgs/servers/mail/dovecot/default.nix | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/pkgs/servers/mail/dovecot/default.nix b/pkgs/servers/mail/dovecot/default.nix index 6b2adf572175..0060a59d8071 100644 --- a/pkgs/servers/mail/dovecot/default.nix +++ b/pkgs/servers/mail/dovecot/default.nix @@ -8,7 +8,7 @@ }: stdenv.mkDerivation rec { - name = "dovecot-2.3.0"; + name = "dovecot-2.3.0.1"; nativeBuildInputs = [ perl pkgconfig ]; buildInputs = @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://dovecot.org/releases/2.3/${name}.tar.gz"; - sha256 = "10c5myzgys866c3x6jdr1s9x9pqnjd5vpyz8z384sph21m3wnq6y"; + sha256 = "0lzisrdgrj5qqwjb7bv99mf2aljm568r6g108yisp0s644z2nxxb"; }; preConfigure = '' @@ -47,16 +47,6 @@ stdenv.mkDerivation rec { # so we can symlink plugins from several packages there. # The symlinking needs to be done in NixOS. ./2.2.x-module_dir.patch - (fetchpatch { - name = "CVE-2017-14132_part1.patch"; - url = https://github.com/dovecot/core/commit/1a29ed2f96da1be22fa5a4d96c7583aa81b8b060.patch; - sha256 = "1pcfzxr8xlwbpa7z19grp7mlvdnan6ln8zw74dj4pdmynmlk4aw9"; - }) - (fetchpatch { - name = "CVE-2017-14132_part2.patch"; - url = https://github.com/dovecot/core/commit/a9b135760aea6d1790d447d351c56b78889dac22.patch; - sha256 = "0082iid5rvjmh003xi9s09jld2rb31hbvni0yai1h1ggbmd5zf8l"; - }) ]; configureFlags = [ From 4f031c061b2ce0932b82ed7c648c4a4bc09af52b Mon Sep 17 00:00:00 2001 From: Guillaume Bouchard Date: Thu, 1 Mar 2018 10:45:12 +0100 Subject: [PATCH 253/814] partio: 1.1.0 -> 2018-03-01 - The version 1.1.0 is 6 years old and was not compiling anymore with GCC 7.0 - Fixed buildInputs / nativeBuildInputs - Set platform to linux, it does not work on OSX --- pkgs/development/libraries/partio/default.nix | 23 ++++++++----------- 1 file changed, 9 insertions(+), 14 deletions(-) diff --git a/pkgs/development/libraries/partio/default.nix b/pkgs/development/libraries/partio/default.nix index 4f93ed562115..16a987f15e20 100644 --- a/pkgs/development/libraries/partio/default.nix +++ b/pkgs/development/libraries/partio/default.nix @@ -3,28 +3,26 @@ stdenv.mkDerivation rec { name = "partio-${version}"; - version = "1.1.0"; + version = "2018-03-01"; src = fetchFromGitHub { owner = "wdas"; repo = "partio"; - rev = "v${version}"; - sha256 = "0z7n5ay21ca7g7xb80v6jmr96x9k7vm7zawawvmx71yj32rg1n34"; + rev = "8b6ea0d20f1ab77cd7f18390999251e60932de4a"; + sha256 = "16sdj103v02l2dgq9y9cna9jakafabz9jxzdxsd737ir6wn10ksb"; }; outputs = [ "dev" "out" "lib" ]; - buildInputs = [ unzip cmake freeglut mesa zlib swig python doxygen xorg.libXi xorg.libXmu ]; + nativeBuildInputs = [ unzip cmake doxygen ]; + buildInputs = [ freeglut mesa zlib swig python xorg.libXi xorg.libXmu ]; enableParallelBuilding = true; buildPhase = '' - sed 's/ADD_LIBRARY (partio /ADD_LIBRARY (partio SHARED /' -i ../src/lib/CMakeLists.txt - CXXFLAGS="-std=c++11" cmake . make partio mkdir $dev - mkdir -p $lib/lib mkdir $out ''; @@ -32,19 +30,16 @@ stdenv.mkDerivation rec # Sexpr support installPhase = '' - mkdir $dev/lib - mkdir -p $dev/include/partio - - mv lib/libpartio.so $lib/lib - - mv ../src/lib/* $dev/include/partio + make install prefix=$out + mkdir $dev/include/partio + mv $dev/include/*.h $dev/include/partio ''; meta = with stdenv.lib; { description = "C++ (with python bindings) library for easily reading/writing/manipulating common animation particle formats such as PDB, BGEO, PTC"; homepage = "https://www.disneyanimation.com/technology/partio.html"; license = licenses.bsd3; - platforms = platforms.all; + platforms = platforms.linux; maintainers = [ maintainers.guibou ]; }; } From bef07b86edadc8611bbc5805b723979cf86ff8ff Mon Sep 17 00:00:00 2001 From: Masayuki Takeda Date: Sat, 3 Mar 2018 20:39:17 +0900 Subject: [PATCH 254/814] bump janePackage's version lower bound --- pkgs/development/ocaml-modules/janestreet/janePackage.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/ocaml-modules/janestreet/janePackage.nix b/pkgs/development/ocaml-modules/janestreet/janePackage.nix index d9c8b9e66fe7..ddbb11220a04 100644 --- a/pkgs/development/ocaml-modules/janestreet/janePackage.nix +++ b/pkgs/development/ocaml-modules/janestreet/janePackage.nix @@ -2,7 +2,7 @@ { name, version ? "0.10.0", buildInputs ? [], hash, meta, ...}@args: -if !stdenv.lib.versionAtLeast ocaml.version "4.03" +if !stdenv.lib.versionAtLeast ocaml.version "4.04" then throw "${name}-${version} is not available for OCaml ${ocaml.version}" else stdenv.mkDerivation (args // { From 82595748687c34e7ffe627faa70fc86e2d53a1af Mon Sep 17 00:00:00 2001 From: Francesco Gazzetta Date: Sat, 24 Feb 2018 23:23:27 +0100 Subject: [PATCH 255/814] gnujump: init at 1.0.8 --- pkgs/games/gnujump/default.nix | 25 +++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/games/gnujump/default.nix diff --git a/pkgs/games/gnujump/default.nix b/pkgs/games/gnujump/default.nix new file mode 100644 index 000000000000..ae2cbd818417 --- /dev/null +++ b/pkgs/games/gnujump/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchurl, SDL, SDL_image, SDL_mixer }: + +stdenv.mkDerivation rec { + name = "gnujump-${version}"; + version = "1.0.8"; + src = fetchurl { + url = "mirror://gnu/gnujump/${name}.tar.gz"; + sha256 = "05syy9mzbyqcfnm0hrswlmhwlwx54f0l6zhcaq8c1c0f8dgzxhqk"; + }; + buildInputs = [ SDL SDL_image SDL_mixer ]; + + meta = with stdenv.lib; { + homepage = "https://jump.gnu.sinusoid.es/"; + description = "A clone of the simple yet addictive game Xjump"; + longDescription = '' + The goal in this game is to jump to the next floor trying not to fall + down. As you go upper in the Falling Tower the floors will fall faster. + Try to survive longer get upper than anyone. It might seem too simple but + once you've tried you'll realize how addictive this is. + ''; + license = licenses.gpl3; + maintainers = with maintainers; [ fgaz ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6bda20ba31b8..ae7908efbece 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -18677,6 +18677,8 @@ with pkgs; gnugo = callPackage ../games/gnugo { }; + gnujump = callPackage ../games/gnujump { }; + gogui = callPackage ../games/gogui {}; gtetrinet = callPackage ../games/gtetrinet { From 6a4cd9d744543fdd844184cf5eb306bd84e4811e Mon Sep 17 00:00:00 2001 From: Daiderd Jordan Date: Sat, 3 Mar 2018 13:54:06 +0100 Subject: [PATCH 256/814] qes: init at 0.0.2 --- pkgs/os-specific/darwin/qes/default.nix | 26 +++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 ++++ 2 files changed, 30 insertions(+) create mode 100644 pkgs/os-specific/darwin/qes/default.nix diff --git a/pkgs/os-specific/darwin/qes/default.nix b/pkgs/os-specific/darwin/qes/default.nix new file mode 100644 index 000000000000..aa7bfb5c3be7 --- /dev/null +++ b/pkgs/os-specific/darwin/qes/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchFromGitHub, Carbon }: + +stdenv.mkDerivation rec { + name = "qes-${version}"; + version = "0.0.2"; + + src = fetchFromGitHub { + owner = "koekeishiya"; + repo = "qes"; + rev = "ddedf008f0c38b134501ad9f328447b671423d34"; # no tag + sha256 = "1w9ppid7jg6f4q7pq40lhm0whg7xmnxcmf3pb9xqfkq2zj2f7dxv"; + }; + + buildInputs = [ Carbon ]; + + makeFlags = [ "BUILD_PATH=$(out)/bin" ]; + + meta = with stdenv.lib; { + description = "Quartz Event Synthesizer"; + homepage = https://github.com/koekeishiya/qes; + platforms = platforms.darwin; + maintainers = with maintainers; [ lnl7 ]; + license = licenses.mit; + }; +} + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a2b4239314a3..d4a60b98e284 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -670,6 +670,10 @@ with pkgs; reattach-to-user-namespace = callPackage ../os-specific/darwin/reattach-to-user-namespace {}; + qes = callPackage ../os-specific/darwin/qes { + inherit (darwin.apple_sdk.frameworks) Carbon; + }; + xcodeenv = callPackage ../development/mobile/xcodeenv { }; titaniumenv = callPackage ../development/mobile/titaniumenv { From a38466a340c88688231b3fadcfa0a0bbc812fa62 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Sat, 3 Mar 2018 14:34:44 +0100 Subject: [PATCH 257/814] idea: add `libsecret` to the library path This solves the `Cannot access native keychain` warning from IntelliJ-based IDEs. Previously IDEA was unable to find `libsecret` as it was not part of its library path. Please keep in mind that the keyring daemon that can be enabled on NixOS with `services.gnome3.gnome-keyring.enable = true` must be running. --- pkgs/applications/editors/jetbrains/common.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/jetbrains/common.nix b/pkgs/applications/editors/jetbrains/common.nix index a7ac367f048a..7715de153981 100644 --- a/pkgs/applications/editors/jetbrains/common.nix +++ b/pkgs/applications/editors/jetbrains/common.nix @@ -1,5 +1,6 @@ { stdenv, fetchurl, makeDesktopItem, makeWrapper, patchelf, p7zip -, coreutils, gnugrep, which, git, python, unzip }: +, coreutils, gnugrep, which, git, python, unzip, libsecret +}: { name, product, version, src, wmClass, jdk, meta } @ attrs: @@ -65,7 +66,7 @@ with stdenv; lib.makeOverridable mkDerivation rec { --prefix PATH : "$out/libexec/${name}:${stdenv.lib.makeBinPath [ jdk coreutils gnugrep which git ]}" \ --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ # Some internals want libstdc++.so.6 - stdenv.cc.cc.lib + stdenv.cc.cc.lib libsecret ]}" \ --set JDK_HOME "$jdk" \ --set ${hiName}_JDK "$jdk" \ From cca9ec2a6649c48dc308b0879728c6e108bd40f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20Gaspard?= Date: Sat, 3 Mar 2018 15:33:01 +0100 Subject: [PATCH 258/814] openldap module: cleanup --- nixos/modules/services/databases/openldap.nix | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/nixos/modules/services/databases/openldap.nix b/nixos/modules/services/databases/openldap.nix index e884098cb08d..9c6b33a16bf1 100644 --- a/nixos/modules/services/databases/openldap.nix +++ b/nixos/modules/services/databases/openldap.nix @@ -8,7 +8,8 @@ let openldap = pkgs.openldap; configFile = pkgs.writeText "slapd.conf" cfg.extraConfig; - + configOpts = if cfg.configDir == null then "-f ${configFile}" + else "-F ${cfg.configDir}"; in { @@ -88,7 +89,7 @@ in ###### implementation - config = mkIf config.services.openldap.enable { + config = mkIf cfg.enable { environment.systemPackages = [ openldap ]; @@ -98,11 +99,15 @@ in after = [ "network.target" ]; preStart = '' mkdir -p /var/run/slapd - chown -R ${cfg.user}:${cfg.group} /var/run/slapd - mkdir -p ${cfg.dataDir} - chown -R ${cfg.user}:${cfg.group} ${cfg.dataDir} + chown -R "${cfg.user}:${cfg.group}" /var/run/slapd + mkdir -p "${cfg.dataDir}" + chown -R "${cfg.user}:${cfg.group}" "${cfg.dataDir}" ''; - serviceConfig.ExecStart = "${openldap.out}/libexec/slapd -u ${cfg.user} -g ${cfg.group} -d 0 -h \"${concatStringsSep " " cfg.urlList}\" ${if cfg.configDir == null then "-f "+configFile else "-F "+cfg.configDir}"; + serviceConfig.ExecStart = + "${openldap.out}/libexec/slapd -d 0 " + + "-u '${cfg.user}' -g '${cfg.group}' " + + "-h '${concatStringsSep " " cfg.urlList}' " + + "${configOpts}"; }; users.extraUsers.openldap = From aeef7c91f14bfbf0db7527acd36fc550cd37ea65 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?L=C3=A9o=20Gaspard?= Date: Sat, 3 Mar 2018 15:33:23 +0100 Subject: [PATCH 259/814] openldap module: allow defining contents declaratively --- nixos/modules/services/databases/openldap.nix | 35 +++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/nixos/modules/services/databases/openldap.nix b/nixos/modules/services/databases/openldap.nix index 9c6b33a16bf1..a67c61eb9949 100644 --- a/nixos/modules/services/databases/openldap.nix +++ b/nixos/modules/services/databases/openldap.nix @@ -7,6 +7,7 @@ let cfg = config.services.openldap; openldap = pkgs.openldap; + dataFile = pkgs.writeText "ldap-contents.ldif" cfg.declarativeContents; configFile = pkgs.writeText "slapd.conf" cfg.extraConfig; configOpts = if cfg.configDir == null then "-f ${configFile}" else "-F ${cfg.configDir}"; @@ -82,6 +83,34 @@ in ''' ''; }; + + declarativeContents = mkOption { + type = with types; nullOr lines; + default = null; + description = '' + Declarative contents for the LDAP database, in LDIF format. + + Note a few facts when using it. First, the database + must be stored in the directory defined by + dataDir. Second, all dataDir will be erased + when starting the LDAP server. Third, modifications to the database + are not prevented, they are just dropped on the next reboot of the + server. Finally, performance-wise the database and indexes are rebuilt + on each server startup, so this will slow down server startup, + especially with large databases. + ''; + example = '' + dn: dc=example,dc=org + objectClass: domain + dc: example + + dn: ou=users,dc=example,dc=org + objectClass = organizationalUnit + ou: users + + # ... + ''; + }; }; }; @@ -100,7 +129,13 @@ in preStart = '' mkdir -p /var/run/slapd chown -R "${cfg.user}:${cfg.group}" /var/run/slapd + ${optionalString (cfg.declarativeContents != null) '' + rm -Rf "${cfg.dataDir}" + ''} mkdir -p "${cfg.dataDir}" + ${optionalString (cfg.declarativeContents != null) '' + ${openldap.out}/bin/slapadd ${configOpts} -l ${dataFile} + ''} chown -R "${cfg.user}:${cfg.group}" "${cfg.dataDir}" ''; serviceConfig.ExecStart = From 664deabf8fc0740cf28a44eb2a2de10d2198cc4e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Sat, 3 Mar 2018 15:23:27 +0000 Subject: [PATCH 260/814] radare2-cutter: 1.1 -> 1.2 --- .../tools/analysis/radare2-cutter/default.nix | 25 ++----------------- 1 file changed, 2 insertions(+), 23 deletions(-) diff --git a/pkgs/development/tools/analysis/radare2-cutter/default.nix b/pkgs/development/tools/analysis/radare2-cutter/default.nix index 3cd1d309e15d..2f82dc0fb8b5 100644 --- a/pkgs/development/tools/analysis/radare2-cutter/default.nix +++ b/pkgs/development/tools/analysis/radare2-cutter/default.nix @@ -1,39 +1,18 @@ { stdenv, fetchFromGitHub, fetchpatch, qmake, pkgconfig, qtbase, qtsvg, radare2 }: - stdenv.mkDerivation rec { name = "radare2-cutter-${version}"; - version = "1.1"; + version = "1.2"; src = fetchFromGitHub { owner = "radareorg"; repo = "cutter"; rev = "v${version}"; - sha256 = "02m5sf45n455hn34y7hrqanj830rc5xhz2ppp1z3mzbz0s515pfl"; + sha256 = "1ph8kvpai7kr7kcqfp0aagvrm098bbh9ygzg5fp8z8y51mwq898g"; }; postUnpack = "export sourceRoot=$sourceRoot/src"; - patches = [ - # Fixup version number :D - (fetchpatch { - url = "https://github.com/radareorg/cutter/commit/69506b64600df632afdca8b680baa7d946c78644.patch"; - sha256 = "0ks3ixz8bycjcfi26bd0p6z7qaplhq00alw44hsfzpdm4bmr01x0"; - }) - (fetchpatch { - url = "https://github.com/radareorg/cutter/commit/8b52c66f4f0091cd9d97389b32aa519c2c602e2b.patch"; - sha256 = "0wcdn35lx2943pfzm7mkg4sr82pm0qz3yxf74m8fxbd70s3w0gkm"; - }) - - # case-insensitive filtering - (fetchpatch { - url = "https://github.com/radareorg/cutter/commit/0ebd34370bcaed00000168147572bb78106eeab1.patch"; - sha256 = "0sc50jwhncfnd2i5mlyld4dbdzi2ws7nh4yglkhlap9l9h1jxn20"; - }) - ]; - - patchFlags = [ "-p2" ]; - nativeBuildInputs = [ qmake pkgconfig ]; buildInputs = [ qtbase qtsvg radare2 ]; From 1fa28ae95dab9c83d989814305342472620dcb22 Mon Sep 17 00:00:00 2001 From: Mitsuhiro Nakamura Date: Sun, 4 Mar 2018 00:39:16 +0900 Subject: [PATCH 261/814] [RDY] skim: init at 0.3.2 (#33561) --- pkgs/misc/vim-plugins/default.nix | 10 ++++++- pkgs/tools/misc/skim/default.nix | 43 +++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 54 insertions(+), 1 deletion(-) create mode 100644 pkgs/tools/misc/skim/default.nix diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix index 2eae839c4508..78aed2aa833c 100644 --- a/pkgs/misc/vim-plugins/default.nix +++ b/pkgs/misc/vim-plugins/default.nix @@ -1,7 +1,7 @@ # TODO check that no license information gets lost { fetchurl, stdenv, python, go, cmake, vim, vimUtils, perl, ruby, unzip , which, fetchgit, llvmPackages -, xkb_switch, rustracerd, fzf +, xkb_switch, rustracerd, fzf, skim , python3, boost, icu , ycmd, makeWrapper, rake , pythonPackages, python3Packages @@ -12,6 +12,8 @@ let + _skim = skim; + inherit (vimUtils.override {inherit vim;}) rtpPath addRtp buildVimPlugin buildVimPluginFrom2Nix vimHelpTags; in @@ -140,6 +142,12 @@ rec { dependencies = []; }; + skim = buildVimPluginFrom2Nix { + name = _skim.name; + src = _skim.vim; + dependencies = []; + }; + # --- generated packages bellow this line --- CSApprox = buildVimPluginFrom2Nix { # created by nix#NixDerivation diff --git a/pkgs/tools/misc/skim/default.nix b/pkgs/tools/misc/skim/default.nix new file mode 100644 index 000000000000..709cbbe07912 --- /dev/null +++ b/pkgs/tools/misc/skim/default.nix @@ -0,0 +1,43 @@ +{ stdenv, fetchFromGitHub, rustPlatform }: + +rustPlatform.buildRustPackage rec { + name = "skim-${version}"; + version = "0.3.2"; + + src = fetchFromGitHub { + owner = "lotabout"; + repo = "skim"; + rev = "v${version}"; + sha256 = "0spkkgjjrch1grb0115rn0wxzsh8pzmm96a7j69zy5pc1il2m5lp"; + }; + + outputs = [ "out" "vim" ]; + + cargoSha256 = "0zbjnii8r41ih2m2vqhm3wdiwgi13kipvxx75sg4vm4maf4wpmhv"; + + patchPhase = '' + sed -i -e "s|expand(':h:h')|'$out'|" plugin/skim.vim + ''; + + postInstall = '' + install -D -m 555 bin/sk-tmux -t $out/bin + install -D -m 444 shell/* -t $out/share/skim + install -D -m 444 plugin/skim.vim -t $vim/plugin + + cat <