diff --git a/.version b/.version index eab81229314..7bc03e791d4 100644 --- a/.version +++ b/.version @@ -1 +1 @@ -14.11 \ No newline at end of file +15.05 \ No newline at end of file diff --git a/README.md b/README.md index e59b15425e9..f49dcce2268 100644 --- a/README.md +++ b/README.md @@ -1,10 +1,10 @@ -Nixpkgs is a collection of packages for [Nix](http://nixos.org/nix/) package -manager. Nixpkgs also includes [NixOS](http://nixos.org/nixos/) linux distribution source code. +Nixpkgs is a collection of packages for [Nix](https://nixos.org/nix/) package +manager. Nixpkgs also includes [NixOS](https://nixos.org/nixos/) linux distribution source code. -* [NixOS installation instructions](http://nixos.org/nixos/manual/#ch-installation) -* [Manual (How to write packages for Nix)](http://nixos.org/nixpkgs/manual/) -* [Manual (NixOS)](http://nixos.org/nixos/manual/) -* [Continuous build](http://hydra.nixos.org/jobset/nixos/trunk-combined) -* [Tests](http://hydra.nixos.org/job/nixos/trunk-combined/tested#tabs-constituents) -* [Mailing list](http://lists.science.uu.nl/mailman/listinfo/nix-dev) +* [NixOS installation instructions](https://nixos.org/nixos/manual/#ch-installation) +* [Manual (How to write packages for Nix)](https://nixos.org/nixpkgs/manual/) +* [Manual (NixOS)](https://nixos.org/nixos/manual/) +* [Continuous build](https://hydra.nixos.org/jobset/nixos/trunk-combined) +* [Tests](https://hydra.nixos.org/job/nixos/trunk-combined/tested#tabs-constituents) +* [Mailing list](https://lists.science.uu.nl/mailman/listinfo/nix-dev) * [IRC - #nixos on freenode.net](irc://irc.freenode.net/#nixos) diff --git a/doc/language-support.xml b/doc/language-support.xml index e1049534c6b..4446e9ee382 100644 --- a/doc/language-support.xml +++ b/doc/language-support.xml @@ -502,7 +502,7 @@ exist in community to help save time. No tool is preferred at the moment.
Development - To develop Python packages bulidPythonPackage has + To develop Python packages buildPythonPackage has additional logic inside shellPhase to run ${python.interpreter} setup.py develop for the package. diff --git a/doc/old/cross.txt b/doc/old/cross.txt index 9c117774fc4..82a69f6f379 100644 --- a/doc/old/cross.txt +++ b/doc/old/cross.txt @@ -184,10 +184,10 @@ if test "$noSysDirs" = "1"; then if test "$noSysDirs" = "1"; then # Figure out what extra flags to pass to the gcc compilers # being generated to make sure that they use our glibc. - if test -e $NIX_GCC/nix-support/orig-glibc; then - glibc=$(cat $NIX_GCC/nix-support/orig-glibc) + if test -e $NIX_CC/nix-support/orig-glibc; then + glibc=$(cat $NIX_CC/nix-support/orig-glibc) # Ugh. Copied from gcc-wrapper/builder.sh. We can't just - # source in $NIX_GCC/nix-support/add-flags, since that + # source in $NIX_CC/nix-support/add-flags, since that # would cause *this* GCC to be linked against the # *previous* GCC. Need some more modularity there. extraCFlags="-B$glibc/lib -isystem $glibc/include" diff --git a/lib/licenses.nix b/lib/licenses.nix index 93fe1118c94..e3b551953fd 100644 --- a/lib/licenses.nix +++ b/lib/licenses.nix @@ -135,7 +135,7 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec { }; gpl1 = spdx { - shortName = "GPL-1.0"; + spdxId = "GPL-1.0"; fullName = "GNU General Public License v1.0 only"; }; @@ -255,6 +255,11 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec { fullName = "LaTeX Project Public License v1.2"; }; + lppl13c = spdx { + spdxId = "LPPL-1.3c"; + fullName = "LaTeX Project Public License v1.3c"; + }; + lpl-102 = spdx { spdxId = "LPL-1.02"; fullName = "Lucent Public License v1.02"; diff --git a/lib/maintainers.nix b/lib/maintainers.nix index bb9f2c89ad2..922ec43cdce 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -26,6 +26,7 @@ aycanirican = "Aycan iRiCAN "; balajisivaraman = "Balaji Sivaraman"; bbenoist = "Baptist BENOIST "; + bdimcheff = "Brandon Dimcheff "; bennofs = "Benno Fünfstück "; berdario = "Dario Bertini "; bergey = "Daniel Bergey "; @@ -50,6 +51,7 @@ davidrusu = "David Rusu "; dbohdan = "Danyil Bohdan "; DerGuteMoritz = "Moritz Heidkamp "; + devhell = "devhell <\"^\"@regexmail.net>"; dmalikov = "Dmitry Malikov "; doublec = "Chris Double "; ederoyd46 = "Matthew Brown "; @@ -90,6 +92,7 @@ jzellner = "Jeff Zellner "; kkallio = "Karn Kallio "; koral = "Koral "; + kovirobi = "Kovacsics Robert "; kragniz = "Louis Taylor "; ktosiek = "Tomasz Kontusz "; lethalman = "Luca Bruno "; @@ -102,12 +105,14 @@ manveru = "Michael Fellinger "; marcweber = "Marc Weber "; matejc = "Matej Cotman "; + meditans = "Carlo Nucera "; meisternu = "Matt Miemiec "; michelk = "Michel Kuhlmann "; modulistic = "Pablo Costa "; mornfall = "Petr Ročkai "; MP2E = "Cray Elliott "; msackman = "Matthew Sackman "; + mtreskin = "Max Treskin "; muflax = "Stefan Dorn "; nathan-gs = "Nathan Bijnens "; nckx = "Tobias Geerinckx-Rice "; @@ -124,6 +129,7 @@ piotr = "Piotr Pietraszkiewicz "; pkmx = "Chih-Mao Chen "; plcplc = "Philip Lykke Carlsen "; + prikhi = "Pavan Rikhi "; pSub = "Pascal Wittmann "; puffnfresh = "Brian McKenna "; qknight = "Joachim Schiele "; @@ -175,6 +181,7 @@ wjlroe = "William Roe "; wkennington = "William A. Kennington III "; wmertens = "Wout Mertens "; + wscott = "Wayne Scott "; wyvie = "Elijah Rum "; yarr = "Dmitry V. "; z77z = "Marco Maggesi "; diff --git a/lib/options.nix b/lib/options.nix index ecbd81cd997..939f9948cee 100644 --- a/lib/options.nix +++ b/lib/options.nix @@ -31,6 +31,23 @@ rec { type = lib.types.bool; }; + # This option accept anything, but it does not produce any result. This + # is useful for sharing a module across different module sets without + # having to implement similar features as long as the value of the options + # are not expected. + mkSinkUndeclaredOptions = attrs: mkOption ({ + internal = true; + visible = false; + default = false; + description = "Sink for option definitions."; + type = mkOptionType { + name = "sink"; + check = x: true; + merge = loc: defs: false; + }; + apply = x: throw "Option value is not readable because the option is not declared."; + } // attrs); + mergeDefaultOption = loc: defs: let list = getValues defs; in if length list == 1 then head list diff --git a/maintainers/docker/Dockerfile b/maintainers/docker/Dockerfile index 5a98c47de2c..f02a9d653fd 100644 --- a/maintainers/docker/Dockerfile +++ b/maintainers/docker/Dockerfile @@ -1,7 +1,7 @@ FROM busybox RUN dir=`mktemp -d` && trap 'rm -rf "$dir"' EXIT && \ - wget -O- http://nixos.org/releases/nix/nix-1.7/nix-1.7-x86_64-linux.tar.bz2 | bzcat | tar x -C $dir && \ + wget -O- https://nixos.org/releases/nix/nix-1.7/nix-1.7-x86_64-linux.tar.bz2 | bzcat | tar x -C $dir && \ mkdir -m 0755 /nix && USER=root sh $dir/*/install && \ echo ". /root/.nix-profile/etc/profile.d/nix.sh" >> /etc/profile diff --git a/maintainers/scripts/nix-generate-from-cpan.nix b/maintainers/scripts/nix-generate-from-cpan.nix index fffe11f1a5f..056cd994ba2 100644 --- a/maintainers/scripts/nix-generate-from-cpan.nix +++ b/maintainers/scripts/nix-generate-from-cpan.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation { name = "nix-generate-from-cpan-1"; - buildInputs = [ makeWrapper perl perlPackages.YAMLLibYAML perlPackages.JSON ]; + buildInputs = [ makeWrapper perl perlPackages.YAMLLibYAML perlPackages.JSON perlPackages.CPANPLUS ]; unpackPhase = "true"; buildPhase = "true"; @@ -19,4 +19,4 @@ stdenv.mkDerivation { maintainers = [ stdenv.lib.maintainers.eelco ]; description = "Utility to generate a Nix expression for a Perl package from CPAN"; }; -} \ No newline at end of file +} diff --git a/maintainers/scripts/nix-generate-from-cpan.pl b/maintainers/scripts/nix-generate-from-cpan.pl index 1d9f926ec55..56709ca8000 100755 --- a/maintainers/scripts/nix-generate-from-cpan.pl +++ b/maintainers/scripts/nix-generate-from-cpan.pl @@ -100,7 +100,7 @@ sub get_deps { foreach my $n (keys %{$deps}) { next if $n eq "perl"; # Hacky way to figure out if this module is part of Perl. - if ($n !~ /^JSON/ && $n !~ /^YAML/) { + if ($n !~ /^JSON/ && $n !~ /^YAML/ && $n !~ /^Module::Pluggable/) { eval "use $n;"; if (!$@) { print STDERR "skipping Perl-builtin module $n\n"; diff --git a/maintainers/scripts/patchelf-hints.sh b/maintainers/scripts/patchelf-hints.sh index 8de1d37c7f9..e6b3eeafafc 100755 --- a/maintainers/scripts/patchelf-hints.sh +++ b/maintainers/scripts/patchelf-hints.sh @@ -62,7 +62,7 @@ for bin in $(find $binaryDist -executable -type f) :; do ) if test "$names" = "glibc"; then names="stdenv.glibc"; fi - if echo $names | grep -c "gcc" &> /dev/null; then names="stdenv.gcc.gcc"; fi + if echo $names | grep -c "gcc" &> /dev/null; then names="stdenv.cc.gcc"; fi if test $lib != $libPath; then interpreter="--interpreter \${$names}/lib/$lib" diff --git a/maintainers/scripts/update-channel-branches.sh b/maintainers/scripts/update-channel-branches.sh new file mode 100755 index 00000000000..5dbbec9393c --- /dev/null +++ b/maintainers/scripts/update-channel-branches.sh @@ -0,0 +1,111 @@ +#!/bin/sh + +: ${NIXOS_CHANNELS:=https://nixos.org/channels/} +: ${CHANNELS_NAMESPACE:=refs/heads/channels/} + +# List all channels which are currently in the repository which we would +# have to remove if they are not found again. +deadChannels=$(git for-each-ref --format="%(refname)" $CHANNELS_NAMESPACE) + +function updateRef() { + local channelName=$1 + local newRev=$2 + + # if the inputs are not valid, then we do not update any branch. + test -z "$newRev" -o -z "$channelName" && return; + + # Update the local refs/heads/channels/* branches to be in-sync with the + # channel references. + local branch=$CHANNELS_NAMESPACE$channelName + oldRev=$(git rev-parse --short $branch 2>/dev/null || true) + if test "$oldRev" != "$newRev"; then + if git update-ref $branch $newRev 2>/dev/null; then + if test -z "$oldRev"; then + echo " * [new branch] $newRev -> ${branch#refs/heads/}" + else + echo " $oldRev..$newRev -> ${branch#refs/heads/}" + fi + else + if test -z "$oldRev"; then + echo " * [missing rev] $newRev -> ${branch#refs/heads/}" + else + echo " [missing rev] $oldRev..$newRev -> ${branch#refs/heads/}" + fi + fi + fi + + # Filter out the current channel from the list of dead channels. + deadChannels=$(grep -v $CHANNELS_NAMESPACE$channelName </dev/null); then + # If the system is entirely build from a custom nixpkgs version, + # then the version is not annotated in git version. This sed + # expression is basically matching that the expressions end with + # ". (Name)" to extract the sha1. + sha1=$(echo $currentSystem | sed -n 's,^.*\.\([a-f0-9]*\) *(.*)$,\1,; T skip; p; :skip;') + + updateRef current-system "$sha1" +fi + +echo "Fetching channels from ~/.nix-defexpr:" +for revFile in : $(find -L ~/.nix-defexpr/ -maxdepth 4 -name svn-revision); do + test "$revFile" = : && continue; + + # Deconstruct a path such as, into: + # + # /home/luke/.nix-defexpr/channels_root/nixos/nixpkgs/svn-revision + # channelName = root/nixos + # + # /home/luke/.nix-defexpr/channels/nixpkgs/svn-revision + # channelName = nixpkgs + # + user=${revFile#*.nix-defexpr/channels} + repo=${user#*/} + repo=${repo%%/*} + user=${user%%/*} + user=${user#_} + test -z "$user" && user=$USER + channelName="$user${user:+/}$repo" + + sha1=$(cat $revFile | sed -n 's,^.*\.\([a-f0-9]*\)$,\1,; T skip; p; :skip;') + + updateRef "$channelName" "$sha1" +done + +# Suggest to remove channel branches which are no longer found by this +# script. This is to handle the cases where a local/remote channel +# disappear. We should not attempt to remove manually any branches, as they +# might be user branches. +if test -n "$deadChannels"; then + + echo " +Some old channel branches are still in your repository, if you +want to remove them, run the following command(s): +" + + while read branch; do + echo " git update-ref -d $branch" + done <nixos-rebuild needs a path in the Nix store, Nix will try to download that path from the Internet rather than build it from source. The default binary cache is -http://cache.nixos.org/. If this cache is unreachable, Nix -operations may take a long time due to HTTP connection timeouts. You -can disable the use of the binary cache by adding , e.g. @@ -30,4 +30,4 @@ $ nixos-rebuild switch --option binary-caches http://my-cache.example.org/ -
\ No newline at end of file + diff --git a/nixos/doc/manual/development/sources.xml b/nixos/doc/manual/development/sources.xml index 992a07af981..3ac07da19f1 100644 --- a/nixos/doc/manual/development/sources.xml +++ b/nixos/doc/manual/development/sources.xml @@ -40,20 +40,22 @@ rebuild everything from source. So you may want to create a local branch based on your current NixOS version: -$ nixos-version -14.04.273.ea1952b (Baboon) - -$ git checkout -b local ea1952b +$ /my/sources/nixpkgs/maintainers/scripts/update-channel-branches.sh +Fetching channels from https://nixos.org/channels: + * [new branch] cbe467e -> channels/remotes/nixos-unstable +Fetching channels from nixos-version: + * [new branch] 9ff4738 -> channels/current-system +Fetching channels from ~/.nix-defexpr: + * [new branch] 0d4acad -> channels/root/nixos +$ git checkout -b local channels/current-system Or, to base your local branch on the latest version available in the NixOS channel: -$ curl -sI http://nixos.org/channels/nixos-unstable/ | grep Location -Location: http://releases.nixos.org/nixos/unstable/nixos-14.10pre43986.acaf4a6/ - -$ git checkout -b local acaf4a6 +$ /my/sources/nixpkgs/maintainers/scripts/update-channel-branches.sh +$ git checkout -b local channels/remotes/nixos-unstable You can then use git rebase to sync your local @@ -92,4 +94,4 @@ to nix-env, as it will break after interpreting expressions in nixos/ as packages. --> - \ No newline at end of file + diff --git a/nixos/doc/manual/installation/obtaining.xml b/nixos/doc/manual/installation/obtaining.xml index ceeeb5c0ac0..540f19c3201 100644 --- a/nixos/doc/manual/installation/obtaining.xml +++ b/nixos/doc/manual/installation/obtaining.xml @@ -8,9 +8,14 @@ NixOS ISO images can be downloaded from the NixOS -homepage. These can be burned onto a CD. It is also possible -to copy them onto a USB stick and install NixOS from there. For -details, see the . There are a number of installation options. If +you happen to have an optical drive and a spare CD, burning the +image to CD and booting from that is probably the easiest option. +Most people will need to prepare a USB stick to boot from. +Unetbootin is recommended and the process is described in brief below. +Note that systems which use UEFI require some additional manual steps. +If you run into difficulty a number of alternative methods are presented +in the NixOS Wiki. diff --git a/nixos/doc/manual/installation/upgrading.xml b/nixos/doc/manual/installation/upgrading.xml index e4e21603329..46d3af56b57 100644 --- a/nixos/doc/manual/installation/upgrading.xml +++ b/nixos/doc/manual/installation/upgrading.xml @@ -15,7 +15,7 @@ been built. These channels are: Stable channels, such as nixos-14.04. + xlink:href="https://nixos.org/channels/nixos-14.04">nixos-14.04. These only get conservative bug fixes and package upgrades. For instance, a channel update may cause the Linux kernel on your system to be upgraded from 3.4.66 to 3.4.67 (a minor bug fix), but @@ -26,7 +26,7 @@ been built. These channels are: The unstable channel, nixos-unstable. + xlink:href="https://nixos.org/channels/nixos-unstable">nixos-unstable. This corresponds to NixOS’s main development branch, and may thus see radical changes between channel updates. It’s not recommended for production systems. @@ -34,7 +34,7 @@ been built. These channels are: To see what channels are available, go to . (Note that the URIs of the +xlink:href="https://nixos.org/channels"/>. (Note that the URIs of the various channels redirect to a directory that contains the channel’s latest version and includes ISO images and VirtualBox appliances.) @@ -53,20 +53,20 @@ nixos https://nixos.org/channels/nixos-unstable To switch to a different NixOS channel, do -$ nix-channel --add http://nixos.org/channels/channel-name nixos +$ nix-channel --add https://nixos.org/channels/channel-name nixos (Be sure to include the nixos parameter at the end.) For instance, to use the NixOS 14.04 stable channel: -$ nix-channel --add http://nixos.org/channels/nixos-14.04 nixos +$ nix-channel --add https://nixos.org/channels/nixos-14.04 nixos But if you want to live on the bleeding edge: -$ nix-channel --add http://nixos.org/channels/nixos-unstable nixos +$ nix-channel --add https://nixos.org/channels/nixos-unstable nixos diff --git a/nixos/doc/manual/release-notes/release-notes.xml b/nixos/doc/manual/release-notes/release-notes.xml index 9034dba1fb5..231a3b4c2e2 100644 --- a/nixos/doc/manual/release-notes/release-notes.xml +++ b/nixos/doc/manual/release-notes/release-notes.xml @@ -10,7 +10,7 @@ This section lists the release notes for each stable version of NixOS. - + diff --git a/nixos/doc/manual/release-notes/rl-1411.xml b/nixos/doc/manual/release-notes/rl-1411.xml deleted file mode 100644 index f26cfee7a2c..00000000000 --- a/nixos/doc/manual/release-notes/rl-1411.xml +++ /dev/null @@ -1,37 +0,0 @@ - - -Release 14.11 (“Caterpillar”, 2014/11/??) - -When upgrading from a previous release, please be aware of the -following incompatible changes: - - - - The default version of Apache httpd is now 2.4. If - you use the option to pass literal - Apache configuration text, you may need to update it — see Apache’s - documentation for details. If you wish to continue to use - httpd 2.2, add the following line to your NixOS configuration: - - -services.httpd.package = pkgs.apacheHttpd_2_2; - - - - - The host side of a container virtual Ethernet pair - is now called ve-container-name - rather than c-container-name. - - GNOME 3.10 support has been dropped. The default GNOME version is now 3.12. - - - - - - diff --git a/nixos/doc/manual/release-notes/rl-1412.xml b/nixos/doc/manual/release-notes/rl-1412.xml new file mode 100644 index 00000000000..324a3e6bdc2 --- /dev/null +++ b/nixos/doc/manual/release-notes/rl-1412.xml @@ -0,0 +1,167 @@ + + +Release 14.12 (“Caterpillar”, 2014/12/??) + +In addition to numerous new and upgraded packages, this release has the following highlights: + + + +Systemd has been updated to version 217, which has numerous +improvements +. + + +Nix has been updated to 1.8. + +NixOS is now based on Glibc 2.20. + +KDE has been updated to 4.14. + +The default Linux kernel has been updated to 3.14. + + set to true now respect any changes +made after initial creation of a user or a group. + + + + +Following new services were added since the last release: + + +parallels-guest +docker +lxc +openvswitch +fluxbox +bspwm +gdm +fcgiwrap +peerflix +fail2ban +chronos +znc +unifi +teamspeak3 +strongswan +seeks +radicale +prosody +polipo +openntpd +nsd +mailpile +i2pd +dnscrypt-proxy +consul +atftpd +scollector +collectd +bosun +riemann +zookeeper +uhub +siproxd +redmine +phd +mesos +gitlab +gitolite +etcd +docker-registry +cpuminer-cryptonight +thermald +mlmmj +tcsd +gnome3.seahorse +gnome3.gvfs +gnome3.gnome-online-miners +gnome3.gnome-documents +geoclue2 +opentsdb +neo4j +monetdb +influxdb +hbase +torque/mrom +torque/server +kubernetes +fleet +crashplan +mopidy +liquidsoap + + + +When upgrading from a previous release, please be aware of the +following incompatible changes: + + + +The default version of Apache httpd is now 2.4. If +you use the option to pass literal +Apache configuration text, you may need to update it — see Apache’s +documentation for details. If you wish to continue to use +httpd 2.2, add the following line to your NixOS configuration: + +rogramlisting> +rvices.httpd.package = pkgs.apacheHttpd_2_2; +programlisting> + + + +PHP 5.3 has been removed because it is no longer +supported by the PHP project. A migration guide is +available. + +The host side of a container virtual Ethernet pair +is now called ve-container-name +rather than c-container-name. + +GNOME 3.10 support has been dropped. The default GNOME version is now 3.12. + +VirtualBox has been upgraded to 4.3.20 release. Users may be required to run +rm -rf /tmp.vbox*. imports = [ <nixpkgs/nixos/modules/programs/virtualbox.nix> ] +is no longer necessary, use services.virtualboxHost.enable = true instead. + +Also, hardening mode is now enabled by default, which means that unless you want to use +USB support, you no longer need to be a member of the vboxusers group. + + +Chromium has been updated to 39.0.2171.65. is now enabled by default. +chromium*Wrapper packages no longer exist, because upstream removed NSAPI support. +chromium-stable has been renamed to chromium. + + +Python packaging documentation is now part of nixpkgs manual. To override +the python packages available to a custom python you now use pkgs.pythonFull.buildEnv.override +instead of pkgs.pythonFull.override. + + +boot.resumeDevice = "8:6" is no longer supported. Most users will +want to leave it undefined, which takes the swap partitions automatically. There is an evaluation +assertion to ensure that the string starts with a slash. + + +The system-wide default timezone for NixOS installations +changed from CET to UTC. To choose +a different timezone for your system, configure +time.timeZone in +configuration.nix. A fairly complete list of possible +values for that setting is available at . + +GNU screen has been updated to 4.2.1, which breaks +the ability to connect to sessions created by older versions of +screen. + + + + + + diff --git a/nixos/lib/eval-config.nix b/nixos/lib/eval-config.nix index 0fa00637a93..08adcf3a007 100644 --- a/nixos/lib/eval-config.nix +++ b/nixos/lib/eval-config.nix @@ -11,15 +11,16 @@ , prefix ? [] }: -let extraArgs_ = extraArgs; pkgs_ = pkgs; system_ = system; in - -rec { +let extraArgs_ = extraArgs; pkgs_ = pkgs; system_ = system; + extraModules = let e = builtins.getEnv "NIXOS_EXTRA_MODULE_PATH"; + in if e == "" then [] else [(import (builtins.toPath e))]; +in rec { # Merge the option definitions in all modules, forming the full # system configuration. inherit (pkgs.lib.evalModules { inherit prefix; - modules = modules ++ baseModules; + modules = modules ++ extraModules ++ baseModules; args = extraArgs; check = check && options.environment.checkConfigurationOptions.value; }) config options; diff --git a/nixos/lib/make-system-tarball.nix b/nixos/lib/make-system-tarball.nix index 3bd891fdbc2..a2a0340a6bd 100644 --- a/nixos/lib/make-system-tarball.nix +++ b/nixos/lib/make-system-tarball.nix @@ -16,6 +16,9 @@ # symlink to `object' that will be added to the tarball. storeContents ? [] + # Extra commands to be executed before archiving files +, extraCommands ? "" + # Extra tar arguments , extraArgs ? "" }: @@ -25,7 +28,7 @@ stdenv.mkDerivation { builder = ./make-system-tarball.sh; buildInputs = [perl xz]; - inherit fileName pathsFromGraph extraArgs; + inherit fileName pathsFromGraph extraArgs extraCommands; # !!! should use XML. sources = map (x: x.source) contents; diff --git a/nixos/lib/make-system-tarball.sh b/nixos/lib/make-system-tarball.sh index 2eb668115a6..e04455e889b 100644 --- a/nixos/lib/make-system-tarball.sh +++ b/nixos/lib/make-system-tarball.sh @@ -33,7 +33,7 @@ for i in $storePaths; do done -# TODO tar ruxo +# TODO tar ruxo # Also include a manifest of the closures in a format suitable for # nix-store --load-db. printRegistration=1 perl $pathsFromGraph closure-* > nix-path-registration @@ -48,6 +48,8 @@ for ((n = 0; n < ${#objects[*]}; n++)); do fi done +$extraCommands + mkdir -p $out/tarball tar cvJf $out/tarball/$fileName.tar.xz * $extraArgs diff --git a/nixos/maintainers/scripts/ec2/create-ebs-amis.py b/nixos/maintainers/scripts/ec2/create-ebs-amis.py index 62525651ae0..6c91aa68694 100755 --- a/nixos/maintainers/scripts/ec2/create-ebs-amis.py +++ b/nixos/maintainers/scripts/ec2/create-ebs-amis.py @@ -75,7 +75,7 @@ m.run_command("mount {0} /mnt".format(device)) m.run_command("touch /mnt/.ebs") m.run_command("mkdir -p /mnt/etc/nixos") -m.run_command("nix-channel --add http://nixos.org/channels/nixos-{} nixos".format(args.channel)) +m.run_command("nix-channel --add https://nixos.org/channels/nixos-{} nixos".format(args.channel)) m.run_command("nix-channel --update") version = m.run_command("nix-instantiate --eval-only -A lib.nixpkgsVersion ''", capture_stdout=True).split(' ')[0].replace('"','').strip() diff --git a/nixos/modules/config/fonts/fontconfig-ultimate.nix b/nixos/modules/config/fonts/fontconfig-ultimate.nix new file mode 100644 index 00000000000..853f253ff9b --- /dev/null +++ b/nixos/modules/config/fonts/fontconfig-ultimate.nix @@ -0,0 +1,193 @@ +{ config, pkgs, ... }: + +with pkgs.lib; + +let fcBool = x: if x then "true" else "false"; +in +{ + + options = { + + fonts = { + + fontconfig = { + + ultimate = { + enable = mkOption { + type = types.bool; + default = true; + description = '' + Enable fontconfig-ultimate settings (formerly known as + Infinality). Besides the customizable settings in this NixOS + module, fontconfig-ultimate also provides many font-specific + rendering tweaks. + ''; + }; + + allowBitmaps = mkOption { + type = types.bool; + default = true; + description = '' + Allow bitmap fonts. Set to false to ban all + bitmap fonts. + ''; + }; + + allowType1 = mkOption { + type = types.bool; + default = false; + description = '' + Allow Type-1 fonts. Default is false because of + poor rendering. + ''; + }; + + useEmbeddedBitmaps = mkOption { + type = types.bool; + default = false; + description = ''Use embedded bitmaps in fonts like Calibri.''; + }; + + forceAutohint = mkOption { + type = types.bool; + default = false; + description = '' + Force use of the TrueType Autohinter. Useful for debugging or + free-software purists. + ''; + }; + + renderMonoTTFAsBitmap = mkOption { + type = types.bool; + default = false; + description = ''Render some monospace TTF fonts as bitmaps.''; + }; + + substitutions = mkOption { + type = types.str // { + check = flip elem ["none" "free" "combi" "ms"]; + }; + default = "free"; + description = '' + Font substitutions to replace common Type 1 fonts with nicer + TrueType fonts. free uses free fonts, + ms uses Microsoft fonts, + combi uses a combination, and + none disables the substitutions. + ''; + }; + + rendering = mkOption { + type = types.attrs; + default = pkgs.fontconfig-ultimate.rendering.ultimate; + description = '' + FreeType rendering settings presets. The default is + pkgs.fontconfig-ultimate.rendering.ultimate. + The other available styles are: + ultimate-lighter, + ultimate-darker, + ultimate-lightest, + ultimate-darkest, + default (the original Infinality default), + osx, + ipad, + ubuntu, + linux, + winxplight, + win7light, + winxp, + win7, + vanilla, + classic, + nudge, + push, + shove, + sharpened, + infinality. Any of the presets may be + customized by editing the attributes. To disable, set this option + to the empty attribute set {}. + ''; + }; + }; + }; + }; + + }; + + + config = + let ultimate = config.fonts.fontconfig.ultimate; + fontconfigUltimateConf = '' + + + + + ${optionalString (!ultimate.allowBitmaps) '' + + + + + false + + + + ''} + + ${optionalString ultimate.allowType1 '' + + + + + + Type 1 + + + + + ''} + + + + + ${fcBool ultimate.useEmbeddedBitmaps} + + + + + + + ${fcBool ultimate.forceAutohint} + + + + + + + ${fcBool ultimate.renderMonoTTFAsBitmap} + + + + ${optionalString (ultimate.substitutions != "none") '' + + ${pkgs.fontconfig-ultimate.confd}/etc/fonts/presets/${ultimate.substitutions} + ''} + + ${pkgs.fontconfig-ultimate.confd}/etc/fonts/conf.d + + + ''; + in mkIf (config.fonts.fontconfig.enable && ultimate.enable) { + + environment.etc."fonts/conf.d/52-fontconfig-ultimate.conf" = { + text = fontconfigUltimateConf; + }; + + environment.etc."fonts/${pkgs.fontconfig.configVersion}/conf.d/52-fontconfig-ultimate.conf" = { + text = fontconfigUltimateConf; + }; + + environment.variables = ultimate.rendering; + + }; + +} diff --git a/nixos/modules/config/fonts/fontconfig.nix b/nixos/modules/config/fonts/fontconfig.nix index 4b6f9325fda..793b0a250ac 100644 --- a/nixos/modules/config/fonts/fontconfig.nix +++ b/nixos/modules/config/fonts/fontconfig.nix @@ -8,72 +8,250 @@ with lib; fonts = { - enableFontConfig = mkOption { # !!! should be enableFontconfig - type = types.bool; - default = true; - description = '' - If enabled, a Fontconfig configuration file will be built - pointing to a set of default fonts. If you don't care about - running X11 applications or any other program that uses - Fontconfig, you can turn this option off and prevent a - dependency on all those fonts. - ''; + fontconfig = { + enable = mkOption { + type = types.bool; + default = true; + description = '' + If enabled, a Fontconfig configuration file will be built + pointing to a set of default fonts. If you don't care about + running X11 applications or any other program that uses + Fontconfig, you can turn this option off and prevent a + dependency on all those fonts. + ''; + }; + + antialias = mkOption { + type = types.bool; + default = true; + description = "Enable font antialiasing."; + }; + + dpi = mkOption { + type = types.int; + default = 0; + description = '' + Force DPI setting. Setting to 0 disables DPI + forcing; the DPI detected for the display will be used. + ''; + }; + + defaultFonts = { + monospace = mkOption { + type = types.listOf types.str; + default = ["DejaVu Sans Mono"]; + description = '' + System-wide default monospace font(s). Multiple fonts may be + listed in case multiple languages must be supported. + ''; + }; + + sansSerif = mkOption { + type = types.listOf types.str; + default = ["DejaVu Sans"]; + description = '' + System-wide default sans serif font(s). Multiple fonts may be + listed in case multiple languages must be supported. + ''; + }; + + serif = mkOption { + type = types.listOf types.str; + default = ["DejaVu Serif"]; + description = '' + System-wide default serif font(s). Multiple fonts may be listed + in case multiple languages must be supported. + ''; + }; + }; + + hinting = { + enable = mkOption { + type = types.bool; + default = true; + description = "Enable TrueType hinting."; + }; + + autohint = mkOption { + type = types.bool; + default = true; + description = '' + Enable the autohinter, which provides hinting for otherwise + un-hinted fonts. The results are usually lower quality than + correctly-hinted fonts. + ''; + }; + + style = mkOption { + type = types.str // { + check = flip elem ["none" "slight" "medium" "full"]; + }; + default = "full"; + description = '' + TrueType hinting style, one of none, + slight, medium, or + full. + ''; + }; + }; + + includeUserConf = mkOption { + type = types.bool; + default = true; + description = '' + Include the user configuration from + ~/.config/fontconfig/fonts.conf or + ~/.config/fontconfig/conf.d. + ''; + }; + + subpixel = { + + rgba = mkOption { + type = types.string // { + check = flip elem ["rgb" "bgr" "vrgb" "vbgr" "none"]; + }; + default = "rgb"; + description = '' + Subpixel order, one of none, + rgb, bgr, + vrgb, or vbgr. + ''; + }; + + lcdfilter = mkOption { + type = types.str // { + check = flip elem ["none" "default" "light" "legacy"]; + }; + default = "default"; + description = '' + FreeType LCD filter, one of none, + default, light, or + legacy. + ''; + }; + + }; + }; }; }; + config = + let fontconfig = config.fonts.fontconfig; + fcBool = x: "" + (if x then "true" else "false") + ""; + nixosConf = '' + + + - config = mkIf config.fonts.enableFontConfig { + + + + ${fcBool fontconfig.hinting.enable} + + + ${fcBool fontconfig.hinting.autohint} + + + hint${fontconfig.hinting.style} + + + ${fcBool fontconfig.antialias} + + + ${fontconfig.subpixel.rgba} + + + lcd${fontconfig.subpixel.lcdfilter} + + - # Fontconfig 2.10 backward compatibility + + ${optionalString (fontconfig.defaultFonts.sansSerif != []) '' + + sans-serif + + ${concatStringsSep "\n" + (map (font: "${font}") + fontconfig.defaultFonts.sansSerif)} + + + ''} + ${optionalString (fontconfig.defaultFonts.serif != []) '' + + serif + + ${concatStringsSep "\n" + (map (font: "${font}") + fontconfig.defaultFonts.serif)} + + + ''} + ${optionalString (fontconfig.defaultFonts.monospace != []) '' + + monospace + + ${concatStringsSep "\n" + (map (font: "${font}") + fontconfig.defaultFonts.monospace)} + + + ''} - # Bring in the default (upstream) fontconfig configuration, only for fontconfig 2.10 - environment.etc."fonts/fonts.conf".source = - pkgs.makeFontsConf { fontconfig = pkgs.fontconfig_210; fontDirectories = config.fonts.fonts; }; + ${optionalString (fontconfig.dpi != 0) '' + + + ${fontconfig.dpi} + + + ''} - environment.etc."fonts/conf.d/00-nixos.conf".text = - '' - - - + + ''; + in mkIf fontconfig.enable { - - - - hintslight - - + # Fontconfig 2.10 backward compatibility - - ''; + # Bring in the default (upstream) fontconfig configuration, only for fontconfig 2.10 + environment.etc."fonts/fonts.conf".source = + pkgs.makeFontsConf { fontconfig = pkgs.fontconfig_210; fontDirectories = config.fonts.fonts; }; - # Versioned fontconfig > 2.10. Take shared fonts.conf from fontconfig. - # Otherwise specify only font directories. - environment.etc."fonts/${pkgs.fontconfig.configVersion}/fonts.conf".source = - "${pkgs.fontconfig}/etc/fonts/fonts.conf"; - environment.etc."fonts/${pkgs.fontconfig.configVersion}/conf.d/00-nixos.conf".text = - '' - - - + environment.etc."fonts/conf.d/98-nixos.conf".text = nixosConf; - - - - hintslight - - + # Versioned fontconfig > 2.10. Take shared fonts.conf from fontconfig. + # Otherwise specify only font directories. + environment.etc."fonts/${pkgs.fontconfig.configVersion}/fonts.conf".source = + "${pkgs.fontconfig}/etc/fonts/fonts.conf"; - - ${concatStringsSep "\n" (map (font: "${font}") config.fonts.fonts)} + environment.etc."fonts/${pkgs.fontconfig.configVersion}/conf.d/00-nixos.conf".text = + '' + + + + + ${concatStringsSep "\n" (map (font: "${font}") config.fonts.fonts)} + + ''; - - ''; + environment.etc."fonts/${pkgs.fontconfig.configVersion}/conf.d/98-nixos.conf".text = nixosConf; - environment.systemPackages = [ pkgs.fontconfig ]; + environment.etc."fonts/${pkgs.fontconfig.configVersion}/conf.d/99-user.conf" = { + enable = fontconfig.includeUserConf; + text = '' + + + + fontconfig/conf.d + fontconfig/fonts.conf + + ''; + }; - }; + environment.systemPackages = [ pkgs.fontconfig ]; + + }; } diff --git a/nixos/modules/config/fonts/fonts.nix b/nixos/modules/config/fonts/fonts.nix index baf5b7713f5..a3fa4bd9778 100644 --- a/nixos/modules/config/fonts/fonts.nix +++ b/nixos/modules/config/fonts/fonts.nix @@ -25,7 +25,7 @@ with lib; [ pkgs.xorg.fontbhttf pkgs.xorg.fontbhlucidatypewriter100dpi pkgs.xorg.fontbhlucidatypewriter75dpi - pkgs.ttf_bitstream_vera + pkgs.dejavu_fonts pkgs.freefont_ttf pkgs.liberation_ttf pkgs.xorg.fontbh100dpi diff --git a/nixos/modules/config/networking.nix b/nixos/modules/config/networking.nix index 77e55fddf69..f99cea7d17b 100644 --- a/nixos/modules/config/networking.nix +++ b/nixos/modules/config/networking.nix @@ -140,7 +140,7 @@ in '' + optionalString config.services.nscd.enable '' # Invalidate the nscd cache whenever resolv.conf is # regenerated. - libc_restart='${pkgs.systemd}/bin/systemctl try-restart --no-block nscd.service' + libc_restart='${pkgs.systemd}/bin/systemctl try-restart --no-block nscd.service 2> /dev/null' '' + optionalString cfg.dnsSingleRequest '' # only send one DNS request at a time resolv_conf_options='single-request' diff --git a/nixos/modules/config/no-x-libs.nix b/nixos/modules/config/no-x-libs.nix index f91dbb4cc28..47393c9d3f5 100644 --- a/nixos/modules/config/no-x-libs.nix +++ b/nixos/modules/config/no-x-libs.nix @@ -24,7 +24,7 @@ with lib; programs.ssh.setXAuthLocation = false; security.pam.services.su.forwardXAuth = lib.mkForce false; - fonts.enableFontConfig = false; + fonts.fontconfig.enable = false; nixpkgs.config.packageOverrides = pkgs: { dbus = pkgs.dbus.override { useX11 = false; }; }; diff --git a/nixos/modules/config/timezone.nix b/nixos/modules/config/timezone.nix index c8592284077..06857139311 100644 --- a/nixos/modules/config/timezone.nix +++ b/nixos/modules/config/timezone.nix @@ -14,10 +14,14 @@ in time = { timeZone = mkOption { - default = "CET"; + default = "UTC"; type = types.str; example = "America/New_York"; - description = "The time zone used when displaying times and dates."; + description = '' + The time zone used when displaying times and dates. See + for a comprehensive list of possible values for this setting. + ''; }; hardwareClockInLocalTime = mkOption { diff --git a/nixos/modules/hardware/opengl.nix b/nixos/modules/hardware/opengl.nix index 1777c200dd1..7693bd5bb45 100644 --- a/nixos/modules/hardware/opengl.nix +++ b/nixos/modules/hardware/opengl.nix @@ -16,7 +16,6 @@ let [ p.mesa_drivers p.mesa_noglu # mainly for libGL (if cfg.s3tcSupport then p.libtxc_dxtn else p.libtxc_dxtn_s2tc) - p.udev ]; }; diff --git a/nixos/modules/installer/cd-dvd/system-tarball-pc-readme.txt b/nixos/modules/installer/cd-dvd/system-tarball-pc-readme.txt index 8f0a8d355c6..84252f292c5 100644 --- a/nixos/modules/installer/cd-dvd/system-tarball-pc-readme.txt +++ b/nixos/modules/installer/cd-dvd/system-tarball-pc-readme.txt @@ -80,7 +80,7 @@ had booted this nixos. Run: * `grep local-cmds run/current-system/init` Then you can proceed normally subscribing to a nixos channel: - nix-channel --add http://nixos.org/channels/nixos-unstable + nix-channel --add https://nixos.org/channels/nixos-unstable nix-channel --update Testing: diff --git a/nixos/modules/installer/tools/nixos-generate-config.pl b/nixos/modules/installer/tools/nixos-generate-config.pl index a3b763a8a94..43a83e0206d 100644 --- a/nixos/modules/installer/tools/nixos-generate-config.pl +++ b/nixos/modules/installer/tools/nixos-generate-config.pl @@ -476,14 +476,6 @@ EOF EOF } - # Generate a random 32-bit value to use as the host id - open my $rnd, "<", "/dev/urandom" or die $!; - read $rnd, $hostIdBin, 4; - close $rnd; - - # Convert the 32-bit value to a hex string - my $hostIdHex = unpack("H*", $hostIdBin); - write_file($fn, <' -A config.users.mutableUsers)" = true ] && [ -t 0 ] ; then echo "setting root password..." chroot $mountPoint /var/setuid-wrappers/passwd fi diff --git a/nixos/modules/installer/tools/nixos-option.sh b/nixos/modules/installer/tools/nixos-option.sh index 96d09c3a605..17c17d05e28 100644 --- a/nixos/modules/installer/tools/nixos-option.sh +++ b/nixos/modules/installer/tools/nixos-option.sh @@ -13,6 +13,7 @@ usage () { xml=false verbose=false +nixPath="" option="" @@ -26,6 +27,7 @@ for arg; do while test "$sarg" != "-"; do case $sarg in --*) longarg=$arg; sarg="--";; + -I) argfun="include_nixpath";; -*) usage;; esac # remove the first letter option @@ -53,6 +55,9 @@ for arg; do var=$(echo $argfun | sed 's,^set_,,') eval $var=$arg ;; + include_nixpath) + nixPath="-I $arg $nixPath" + ;; esac argfun="" fi @@ -69,18 +74,114 @@ fi ############################# evalNix(){ - nix-instantiate - --eval-only "$@" + result=$(nix-instantiate ${nixPath:+$nixPath} - --eval-only "$@" 2>&1) + if test $? -eq 0; then + cat < {}).$prefix${option:+.$option}${suffix:+.$suffix}" | evalNix ${strict:+--strict} + + # If strict is set, then set it to "true". + test -n "$strict" && strict=true + + evalNix ${strict:+--strict} <" + else if strict then + if isAttrs x then mapAttrs (n: cleanOutput) x + else if isList x then map cleanOutput x + else x + else x; +in + cleanOutput value +EOF } evalOpt(){ - evalAttr "options" "" "$@" + evalAttr "option" "" "$@" } evalCfg(){ @@ -90,8 +191,11 @@ evalCfg(){ findSources(){ local suffix=$1 - echo "(import {}).options${option:+.$option}.$suffix" | - evalNix --strict + evalNix --strict < {}; - nixpkgs = import {}; sources = builtins.map (f: f.source); - opt = reach nixos.options; - cfg = reach nixos.config; + opt = option; + cfg = config; in with nixpkgs.lib; diff --git a/nixos/modules/installer/tools/nixos-rebuild.sh b/nixos/modules/installer/tools/nixos-rebuild.sh index 5daa9ff9457..93f258f54e3 100644 --- a/nixos/modules/installer/tools/nixos-rebuild.sh +++ b/nixos/modules/installer/tools/nixos-rebuild.sh @@ -156,7 +156,7 @@ if [ -n "$buildNix" ]; then exit 1 fi if ! nix-store -r $nixStorePath --add-root $tmpDir/nix --indirect \ - --option extra-binary-caches http://cache.nixos.org/; then + --option extra-binary-caches https://cache.nixos.org/; then echo "warning: don't know how to get latest Nix" >&2 fi # Older version of nix-store -r don't support --add-root. diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix index 2f166f9ccd7..bf8365e3464 100644 --- a/nixos/modules/misc/ids.nix +++ b/nixos/modules/misc/ids.nix @@ -172,6 +172,8 @@ kubernetes = 162; peerflix = 163; chronos = 164; + gitlab = 165; + tox-bootstrapd = 166; # When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399! @@ -212,6 +214,7 @@ privoxy = 32; disnix = 33; osgi = 34; + tor = 35; ghostOne = 40; git = 41; fourstore = 42; @@ -306,6 +309,8 @@ scollector = 156; bosun = 157; kubernetes = 158; + fleet = 159; + gitlab = 160; # When adding a gid, make sure it doesn't match an existing uid. And don't use gids above 399! diff --git a/nixos/modules/misc/version.nix b/nixos/modules/misc/version.nix index f4271cea853..5afdcf214f2 100644 --- a/nixos/modules/misc/version.nix +++ b/nixos/modules/misc/version.nix @@ -53,7 +53,7 @@ with lib; mkDefault (if pathExists fn then readFile fn else "master"); # Note: code names must only increase in alphabetical order. - system.nixosCodeName = "Caterpillar"; + system.nixosCodeName = "Dingo"; # Generate /etc/os-release. See # http://0pointer.de/public/systemd-man/os-release.html for the diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 5bd056e5bc9..2c52ebb37bc 100755 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -1,6 +1,7 @@ [ ./config/fonts/corefonts.nix ./config/fonts/fontconfig.nix + ./config/fonts/fontconfig-ultimate.nix ./config/fonts/fontdir.nix ./config/fonts/fonts.nix ./config/fonts/ghostscript.nix @@ -101,6 +102,8 @@ ./services/backup/rsnapshot.nix ./services/backup/sitecopy-backup.nix ./services/backup/tarsnap.nix + ./services/cluster/fleet.nix + ./services/cluster/kubernetes.nix ./services/computing/torque/server.nix ./services/computing/torque/mom.nix ./services/continuous-integration/jenkins/default.nix @@ -134,6 +137,7 @@ ./services/desktops/gnome3/seahorse.nix ./services/desktops/gnome3/sushi.nix ./services/desktops/gnome3/tracker.nix + ./services/desktops/profile-sync-daemon.nix ./services/desktops/telepathy.nix ./services/games/ghost-one.nix ./services/games/minecraft-server.nix @@ -173,6 +177,7 @@ ./services/misc/etcd.nix ./services/misc/felix.nix ./services/misc/folding-at-home.nix + ./services/misc/gitlab.nix ./services/misc/gitolite.nix ./services/misc/gpsd.nix ./services/misc/mesos-master.nix @@ -281,6 +286,7 @@ ./services/networking/tcpcrypt.nix ./services/networking/teamspeak3.nix ./services/networking/tftpd.nix + ./services/networking/tox-bootstrapd.nix ./services/networking/unbound.nix ./services/networking/unifi.nix ./services/networking/vsftpd.nix @@ -305,6 +311,7 @@ ./services/security/torify.nix ./services/security/tor.nix ./services/security/torsocks.nix + ./services/system/cloud-init.nix ./services/system/dbus.nix ./services/system/kerberos.nix ./services/system/nscd.nix @@ -400,7 +407,6 @@ ./virtualisation/container-config.nix ./virtualisation/containers.nix ./virtualisation/docker.nix - ./virtualisation/kubernetes.nix ./virtualisation/libvirtd.nix ./virtualisation/lxc.nix #./virtualisation/nova.nix diff --git a/nixos/modules/profiles/container.nix b/nixos/modules/profiles/container.nix new file mode 100644 index 00000000000..dd2e6579a93 --- /dev/null +++ b/nixos/modules/profiles/container.nix @@ -0,0 +1,56 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + pkgs2storeContents = l : map (x: { object = x; symlink = "none"; }) l; + +in { + # Docker image config. + imports = [ + ../installer/cd-dvd/channel.nix + ./minimal.nix + ./clone-config.nix + ]; + + # Create the tarball + system.build.tarball = import ../../lib/make-system-tarball.nix { + inherit (pkgs) stdenv perl xz pathsFromGraph; + + contents = []; + extraArgs = "--owner=0"; + + # Add init script to image + storeContents = [ + { object = config.system.build.toplevel + "/init"; + symlink = "/init"; + } + ] ++ (pkgs2storeContents [ pkgs.stdenv ]); + + # Some container managers like lxc need these + extraCommands = "mkdir -p proc sys dev"; + }; + + boot.isContainer = true; + boot.postBootCommands = + '' + # After booting, register the contents of the Nix store in the Nix + # database. + if [ -f /nix-path-registration ]; then + ${config.nix.package}/bin/nix-store --load-db < /nix-path-registration && + rm /nix-path-registration + fi + + # nixos-rebuild also requires a "system" profile + ${config.nix.package}/bin/nix-env -p /nix/var/nix/profiles/system --set /run/current-system + ''; + + # Disable some features that are not useful in a container. + sound.enable = mkDefault false; + services.udisks2.enable = mkDefault false; + + # Install new init script + system.activationScripts.installInitScript = '' + ln -fs $systemConfig/init /init + ''; +} diff --git a/nixos/modules/programs/ssh.nix b/nixos/modules/programs/ssh.nix index c9bfe2fe0f7..796740ea636 100644 --- a/nixos/modules/programs/ssh.nix +++ b/nixos/modules/programs/ssh.nix @@ -61,7 +61,8 @@ in agentTimeout = mkOption { type = types.nullOr types.string; - default = "1h"; + default = null; + example = "1h"; description = '' How long to keep the private keys in memory. Use null to keep them forever. ''; diff --git a/nixos/modules/programs/virtualbox-host.nix b/nixos/modules/programs/virtualbox-host.nix index ea962d5d6ce..fc113a08a35 100644 --- a/nixos/modules/programs/virtualbox-host.nix +++ b/nixos/modules/programs/virtualbox-host.nix @@ -3,34 +3,74 @@ with lib; let - virtualbox = config.boot.kernelPackages.virtualbox; + cfg = config.services.virtualboxHost; + virtualbox = config.boot.kernelPackages.virtualbox.override { + inherit (cfg) enableHardening; + }; + in { - options = { - services.virtualboxHost.enable = mkEnableOption "VirtualBox Host support"; + options.services.virtualboxHost = { + enable = mkOption { + type = types.bool; + default = false; + description = '' + Whether to enable host-side support for VirtualBox. + + + In order to pass USB devices from the host to the guests, the user + needs to be in the vboxusers group. + + ''; + }; + + addNetworkInterface = mkOption { + type = types.bool; + default = true; + description = '' + Automatically set up a vboxnet0 host-only network interface. + ''; + }; + + enableHardening = mkOption { + type = types.bool; + default = true; + description = '' + Enable hardened VirtualBox, which ensures that only the binaries in the + system path get access to the devices exposed by the kernel modules + instead of all users in the vboxusers group. + + + Disabling this can put your system's security at risk, as local users + in the vboxusers group can tamper with the VirtualBox device files. + + ''; + }; }; - config = mkIf config.services.virtualboxHost.enable { + config = mkIf cfg.enable (mkMerge [{ boot.kernelModules = [ "vboxdrv" "vboxnetadp" "vboxnetflt" ]; boot.extraModulePackages = [ virtualbox ]; environment.systemPackages = [ virtualbox ]; security.setuidOwners = let - mkVboxStub = program: { + mkSuid = program: { inherit program; + source = "${virtualbox}/libexec/virtualbox/${program}"; owner = "root"; group = "vboxusers"; setuid = true; }; - in map mkVboxStub [ - "VBoxBFE" - "VBoxBalloonCtrl" + in mkIf cfg.enableHardening (map mkSuid [ "VBoxHeadless" - "VBoxManage" + "VBoxNetAdpCtl" + "VBoxNetDHCP" + "VBoxNetNAT" "VBoxSDL" + "VBoxVolInfo" "VirtualBox" - ]; + ]); users.extraGroups.vboxusers.gid = config.ids.gids.vboxusers; @@ -46,7 +86,7 @@ in ''; # Since we lack the right setuid binaries, set up a host-only network by default. - + } (mkIf cfg.addNetworkInterface { systemd.services."vboxnet0" = { description = "VirtualBox vboxnet0 Interface"; requires = [ "dev-vboxnetctl.device" ]; @@ -55,10 +95,13 @@ in path = [ virtualbox ]; serviceConfig.RemainAfterExit = true; serviceConfig.Type = "oneshot"; + serviceConfig.PrivateTmp = true; + environment.VBOX_USER_HOME = "/tmp"; script = '' if ! [ -e /sys/class/net/vboxnet0 ]; then VBoxManage hostonlyif create + cat /tmp/VBoxSVC.log >&2 fi ''; postStop = @@ -68,5 +111,5 @@ in }; networking.interfaces.vboxnet0.ip4 = [ { address = "192.168.56.1"; prefixLength = 24; } ]; - }; + })]); } diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix index b29a3d0354c..cb1b92e78d6 100644 --- a/nixos/modules/rename.nix +++ b/nixos/modules/rename.nix @@ -74,6 +74,7 @@ in zipModules ([] ++ obsolete [ "environment" "x11Packages" ] [ "environment" "systemPackages" ] ++ obsolete [ "environment" "enableBashCompletion" ] [ "programs" "bash" "enableCompletion" ] ++ obsolete [ "environment" "nix" ] [ "nix" "package" ] +++ obsolete [ "fonts" "enableFontConfig" ] [ "fonts" "fontconfig" "enable" ] ++ obsolete [ "fonts" "extraFonts" ] [ "fonts" "fonts" ] ++ obsolete [ "security" "extraSetuidPrograms" ] [ "security" "setuidPrograms" ] diff --git a/nixos/modules/security/sudo.nix b/nixos/modules/security/sudo.nix index 4c6a1c26426..d42a8c7f7d2 100644 --- a/nixos/modules/security/sudo.nix +++ b/nixos/modules/security/sudo.nix @@ -64,7 +64,7 @@ in security.sudo.configFile = '' # Don't edit this file. Set the NixOS options ‘security.sudo.configFile’ - # and security.sudo.extraConfig instead. + # or ‘security.sudo.extraConfig’ instead. # Environment variables to keep for root and %wheel. Defaults:root,%wheel env_keep+=TERMINFO_DIRS @@ -90,11 +90,10 @@ in environment.etc = singleton { source = pkgs.runCommand "sudoers" - {src = pkgs.writeText "sudoers-in" cfg.configFile; } + { src = pkgs.writeText "sudoers-in" cfg.configFile; } # Make sure that the sudoers file is syntactically valid. # (currently disabled - NIXOS-66) - "${pkgs.sudo}/sbin/visudo -f $src -c && - cp $src $out"; + "${pkgs.sudo}/sbin/visudo -f $src -c && cp $src $out"; target = "sudoers"; mode = "0440"; }; diff --git a/nixos/modules/services/audio/mpd.nix b/nixos/modules/services/audio/mpd.nix index e6b525c4b1b..eab7993387d 100644 --- a/nixos/modules/services/audio/mpd.nix +++ b/nixos/modules/services/audio/mpd.nix @@ -15,7 +15,6 @@ let state_file "${cfg.dataDir}/state" sticker_file "${cfg.dataDir}/sticker.sql" log_file "syslog" - user "mpd" ${if cfg.network.host != "any" then "bind_to_address ${cfg.network.host}" else ""} ${if cfg.network.port != 6600 then @@ -99,6 +98,9 @@ in { path = [ pkgs.mpd ]; preStart = "mkdir -p ${cfg.dataDir} && chown -R mpd:mpd ${cfg.dataDir}"; script = "exec mpd --no-daemon ${mpdConf}"; + serviceConfig = { + User = "mpd"; + }; }; users.extraUsers.mpd = { diff --git a/nixos/modules/services/cluster/fleet.nix b/nixos/modules/services/cluster/fleet.nix new file mode 100644 index 00000000000..04d95fbf186 --- /dev/null +++ b/nixos/modules/services/cluster/fleet.nix @@ -0,0 +1,150 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.fleet; + +in { + + ##### Interface + options.services.fleet = { + enable = mkOption { + type = types.bool; + default = false; + description = '' + Whether to enable fleet service. + ''; + }; + + listen = mkOption { + type = types.listOf types.str; + default = [ "/var/run/fleet.sock" ]; + example = [ "/var/run/fleet.sock" "127.0.0.1:49153" ]; + description = '' + Fleet listening addresses. + ''; + }; + + etcdServers = mkOption { + type = types.listOf types.str; + default = [ "http://127.0.0.1:4001" ]; + description = '' + Fleet list of etcd endpoints to use. + ''; + }; + + publicIp = mkOption { + type = types.nullOr types.str; + default = ""; + description = '' + Fleet IP address that should be published with the local Machine's + state and any socket information. If not set, fleetd will attempt + to detect the IP it should publish based on the machine's IP + routing information. + ''; + }; + + etcdCafile = mkOption { + type = types.nullOr types.path; + default = null; + description = '' + Fleet TLS ca file when SSL certificate authentication is enabled + in etcd endpoints. + ''; + }; + + etcdKeyfile = mkOption { + type = types.nullOr types.path; + default = null; + description = '' + Fleet TLS key file when SSL certificate authentication is enabled + in etcd endpoints. + ''; + }; + + etcdCertfile = mkOption { + type = types.nullOr types.path; + default = null; + description = '' + Fleet TLS cert file when SSL certificate authentication is enabled + in etcd endpoints. + ''; + }; + + metadata = mkOption { + type = types.attrsOf types.str; + default = {}; + apply = attrs: concatMapStringsSep "," (n: "${n}=${attrs."${n}"}") (attrNames attrs); + example = literalExample '' + { + region = "us-west"; + az = "us-west-1"; + } + ''; + description = '' + Key/value pairs that are published with the local to the fleet registry. + This data can be used directly by a client of fleet to make scheduling decisions. + ''; + }; + + extraConfig = mkOption { + type = types.attrsOf types.str; + apply = mapAttrs' (n: v: nameValuePair ("ETCD_" + n) v); + default = {}; + example = literalExample '' + { + VERBOSITY = 1; + ETCD_REQUEST_TIMEOUT = "2.0"; + AGENT_TTL = "40s"; + } + ''; + description = '' + Fleet extra config. See + + for configuration options. + ''; + }; + + }; + + ##### Implementation + config = mkIf cfg.enable { + systemd.services.fleet = { + description = "Fleet Init System Daemon"; + wantedBy = [ "multi-user.target" ]; + after = [ "network.target" "fleet.socket" "etcd.service" "docker.service" ]; + requires = [ "fleet.socket" ]; + environment = { + FLEET_ETCD_SERVERS = concatStringsSep "," cfg.etcdServers; + FLEET_PUBLIC_IP = cfg.publicIp; + FLEET_ETCD_CAFILE = cfg.etcdCafile; + FLEET_ETCD_KEYFILE = cfg.etcdKeyfile; + FEELT_ETCD_CERTFILE = cfg.etcdCertfile; + FLEET_METADATA = cfg.metadata; + } // cfg.extraConfig; + serviceConfig = { + ExecStart = "${pkgs.fleet}/bin/fleetd"; + Group = "fleet"; + }; + }; + + systemd.sockets.fleet = { + description = "Fleet Socket for the API"; + wantedBy = [ "sockets.target" ]; + listenStreams = cfg.listen; + socketConfig = { + ListenStream = "/var/run/fleet.sock"; + SocketMode = "0660"; + SocketUser = "root"; + SocketGroup = "fleet"; + }; + }; + + services.etcd.enable = mkDefault true; + virtualisation.docker.enable = mkDefault true; + + environment.systemPackages = [ pkgs.fleet ]; + users.extraGroups.fleet.gid = config.ids.gids.fleet; + }; +} diff --git a/nixos/modules/virtualisation/kubernetes.nix b/nixos/modules/services/cluster/kubernetes.nix similarity index 96% rename from nixos/modules/virtualisation/kubernetes.nix rename to nixos/modules/services/cluster/kubernetes.nix index e01499822ad..7fd2d77aa82 100644 --- a/nixos/modules/virtualisation/kubernetes.nix +++ b/nixos/modules/services/cluster/kubernetes.nix @@ -3,13 +3,13 @@ with lib; let - cfg = config.virtualisation.kubernetes; + cfg = config.services.kubernetes; in { ###### interface - options.virtualisation.kubernetes = { + options.services.kubernetes = { package = mkOption { description = "Kubernetes package to use."; type = types.package; @@ -420,15 +420,15 @@ in { }) (mkIf (any (el: el == "master") cfg.roles) { - virtualisation.kubernetes.apiserver.enable = mkDefault true; - virtualisation.kubernetes.scheduler.enable = mkDefault true; - virtualisation.kubernetes.controllerManager.enable = mkDefault true; + services.kubernetes.apiserver.enable = mkDefault true; + services.kubernetes.scheduler.enable = mkDefault true; + services.kubernetes.controllerManager.enable = mkDefault true; }) (mkIf (any (el: el == "node") cfg.roles) { virtualisation.docker.enable = mkDefault true; - virtualisation.kubernetes.kubelet.enable = mkDefault true; - virtualisation.kubernetes.proxy.enable = mkDefault true; + services.kubernetes.kubelet.enable = mkDefault true; + services.kubernetes.proxy.enable = mkDefault true; }) (mkIf (any (el: el == "node" || el == "master") cfg.roles) { @@ -442,7 +442,7 @@ in { cfg.kubelet.enable || cfg.proxy.enable ) { - virtualisation.kubernetes.package = mkDefault pkgs.kubernetes; + services.kubernetes.package = mkDefault pkgs.kubernetes; environment.systemPackages = [ cfg.package ]; diff --git a/nixos/modules/services/desktops/gnome3/gvfs.nix b/nixos/modules/services/desktops/gnome3/gvfs.nix index 7e1382b161e..c4f41a6125c 100644 --- a/nixos/modules/services/desktops/gnome3/gvfs.nix +++ b/nixos/modules/services/desktops/gnome3/gvfs.nix @@ -1,6 +1,6 @@ # gvfs backends -{ config, lib, ... }: +{ config, lib, pkgs, ... }: with lib; @@ -37,6 +37,8 @@ in services.dbus.packages = [ gnome3.gvfs ]; + services.udev.packages = [ pkgs.libmtp ]; + }; } diff --git a/nixos/modules/services/desktops/profile-sync-daemon.nix b/nixos/modules/services/desktops/profile-sync-daemon.nix new file mode 100644 index 00000000000..d66ecef2385 --- /dev/null +++ b/nixos/modules/services/desktops/profile-sync-daemon.nix @@ -0,0 +1,139 @@ +{ config, pkgs, lib, ... }: + +with lib; + +let + cfg = config.services.psd; + + configFile = '' + ${optionalString (cfg.users != [ ]) '' + USERS="${concatStringsSep " " cfg.users}" + ''} + + ${optionalString (cfg.browsers != [ ]) '' + BROWSERS="${concatStringsSep " " cfg.browsers}" + ''} + + ${optionalString (cfg.volatile != "") "VOLATILE=${cfg.volatile}"} + ${optionalString (cfg.daemonFile != "") "DAEMON_FILE=${cfg.daemonFile}"} + ''; + +in { + + options.services.psd = with types; { + enable = mkOption { + type = bool; + default = false; + description = '' + Whether to enable the Profile Sync daemon. + ''; + }; + + users = mkOption { + type = listOf str; + default = [ ]; + example = [ "demo" ]; + description = '' + A list of users whose browser profiles should be sync'd to tmpfs. + ''; + }; + + browsers = mkOption { + type = listOf str; + default = [ ]; + example = [ "chromium" "firefox" ]; + description = '' + A list of browsers to sync. Available choices are: + + chromium chromium-dev conkeror.mozdev.org epiphany firefox + firefox-trunk google-chrome google-chrome-beta google-chrome-unstable + heftig-aurora icecat luakit midori opera opera-developer opera-beta + qupzilla palemoon rekonq seamonkey + + An empty list will enable all browsers. + ''; + }; + + resyncTimer = mkOption { + type = str; + default = "1h"; + example = "1h 30min"; + description = '' + The amount of time to wait before syncing browser profiles back to the + disk. + + Takes a systemd.unit time span. The time unit defaults to seconds if + omitted. + ''; + }; + + volatile = mkOption { + type = str; + default = "/run/psd-profiles"; + description = '' + The directory where browser profiles should reside(this should be + mounted as a tmpfs). Do not include a trailing backslash. + ''; + }; + + daemonFile = mkOption { + type = str; + default = "/run/psd"; + description = '' + Where the pid and backup configuration files will be stored. + ''; + }; + }; + + config = mkIf cfg.enable { + systemd = { + services = { + psd = { + description = "Profile Sync daemon"; + wants = [ "psd-resync.service" "local-fs.target" ]; + wantedBy = [ "multi-user.target" ]; + preStart = "mkdir -p ${cfg.volatile}"; + + path = with pkgs; [ glibc rsync gawk ]; + + unitConfig = { + RequiresMountsFor = [ "/home/" ]; + }; + + serviceConfig = { + Type = "oneshot"; + RemainAfterExit = "yes"; + ExecStart = "${pkgs.profile-sync-daemon}/bin/profile-sync-daemon sync"; + ExecStop = "${pkgs.profile-sync-daemon}/bin/profile-sync-daemon unsync"; + }; + }; + + psd-resync = { + description = "Timed profile resync"; + after = [ "psd.service" ]; + wants = [ "psd-resync.timer" ]; + partOf = [ "psd.service" ]; + + path = with pkgs; [ glibc rsync gawk ]; + + serviceConfig = { + Type = "oneshot"; + ExecStart = "${pkgs.profile-sync-daemon}/bin/profile-sync-daemon resync"; + }; + }; + }; + + timers.psd-resync = { + description = "Timer for profile sync daemon - ${cfg.resyncTimer}"; + partOf = [ "psd-resync.service" "psd.service" ]; + + timerConfig = { + OnUnitActiveSec = "${cfg.resyncTimer}"; + }; + }; + }; + + environment.etc."psd.conf".text = configFile; + + }; +} diff --git a/nixos/modules/services/hardware/80-net-name-slot.rules b/nixos/modules/services/hardware/80-net-setup-link.rules similarity index 100% rename from nixos/modules/services/hardware/80-net-name-slot.rules rename to nixos/modules/services/hardware/80-net-setup-link.rules diff --git a/nixos/modules/services/hardware/udev.nix b/nixos/modules/services/hardware/udev.nix index 2a6f4cfb4e3..39180f4d37e 100644 --- a/nixos/modules/services/hardware/udev.nix +++ b/nixos/modules/services/hardware/udev.nix @@ -88,7 +88,7 @@ let done ${optionalString config.networking.usePredictableInterfaceNames '' - cp ${./80-net-name-slot.rules} $out/80-net-name-slot.rules + cp ${./80-net-setup-link.rules} $out/80-net-setup-link.rules ''} # If auto-configuration is disabled, then remove diff --git a/nixos/modules/services/misc/autofs.nix b/nixos/modules/services/misc/autofs.nix index e645bd25a66..f4a1059d09f 100644 --- a/nixos/modules/services/misc/autofs.nix +++ b/nixos/modules/services/misc/autofs.nix @@ -84,7 +84,7 @@ in startOn = "started network-interfaces"; stopOn = "stopping network-interfaces"; - path = [ pkgs.nfsUtils pkgs.sshfsFuse ]; + path = [ pkgs.nfs-utils pkgs.sshfsFuse ]; preStop = '' diff --git a/nixos/modules/services/misc/defaultUnicornConfig.rb b/nixos/modules/services/misc/defaultUnicornConfig.rb new file mode 100644 index 00000000000..81abaf336dc --- /dev/null +++ b/nixos/modules/services/misc/defaultUnicornConfig.rb @@ -0,0 +1,206 @@ +# The following was taken from github.com/crohr/syslogger and is BSD +# licensed. +require 'syslog' +require 'logger' +require 'thread' + +class Syslogger + + VERSION = "1.6.0" + + attr_reader :level, :ident, :options, :facility, :max_octets + attr_accessor :formatter + + MAPPING = { + Logger::DEBUG => Syslog::LOG_DEBUG, + Logger::INFO => Syslog::LOG_INFO, + Logger::WARN => Syslog::LOG_WARNING, + Logger::ERROR => Syslog::LOG_ERR, + Logger::FATAL => Syslog::LOG_CRIT, + Logger::UNKNOWN => Syslog::LOG_ALERT + } + + # + # Initializes default options for the logger + # ident:: the name of your program [default=$0]. + # options:: syslog options [default=Syslog::LOG_PID | Syslog::LOG_CONS]. + # Correct values are: + # LOG_CONS : writes the message on the console if an error occurs when sending the message; + # LOG_NDELAY : no delay before sending the message; + # LOG_PERROR : messages will also be written on STDERR; + # LOG_PID : adds the process number to the message (just after the program name) + # facility:: the syslog facility [default=nil] Correct values include: + # Syslog::LOG_DAEMON + # Syslog::LOG_USER + # Syslog::LOG_SYSLOG + # Syslog::LOG_LOCAL2 + # Syslog::LOG_NEWS + # etc. + # + # Usage: + # logger = Syslogger.new("my_app", Syslog::LOG_PID | Syslog::LOG_CONS, Syslog::LOG_LOCAL0) + # logger.level = Logger::INFO # use Logger levels + # logger.warn "warning message" + # logger.debug "debug message" + # + def initialize(ident = $0, options = Syslog::LOG_PID | Syslog::LOG_CONS, facility = nil) + @ident = ident + @options = options || (Syslog::LOG_PID | Syslog::LOG_CONS) + @facility = facility + @level = Logger::INFO + @mutex = Mutex.new + @formatter = Logger::Formatter.new + end + + %w{debug info warn error fatal unknown}.each do |logger_method| + # Accepting *args as message could be nil. + # Default params not supported in ruby 1.8.7 + define_method logger_method.to_sym do |*args, &block| + return true if @level > Logger.const_get(logger_method.upcase) + message = args.first || block && block.call + add(Logger.const_get(logger_method.upcase), message) + end + + unless logger_method == 'unknown' + define_method "#{logger_method}?".to_sym do + @level <= Logger.const_get(logger_method.upcase) + end + end + end + + # Log a message at the Logger::INFO level. Useful for use with Rack::CommonLogger + def write(msg) + add(Logger::INFO, msg) + end + + # Logs a message at the Logger::INFO level. + def <<(msg) + add(Logger::INFO, msg) + end + + # Low level method to add a message. + # +severity+:: the level of the message. One of Logger::DEBUG, Logger::INFO, Logger::WARN, Logger::ERROR, Logger::FATAL, Logger::UNKNOWN + # +message+:: the message string. + # If nil, the method will call the block and use the result as the message string. + # If both are nil or no block is given, it will use the progname as per the behaviour of both the standard Ruby logger, and the Rails BufferedLogger. + # +progname+:: optionally, overwrite the program name that appears in the log message. + def add(severity, message = nil, progname = nil, &block) + if message.nil? && block.nil? && !progname.nil? + message, progname = progname, nil + end + progname ||= @ident + + @mutex.synchronize do + Syslog.open(progname, @options, @facility) do |s| + s.mask = Syslog::LOG_UPTO(MAPPING[@level]) + communication = clean(message || block && block.call) + if self.max_octets + buffer = "#{tags_text}" + communication.bytes do |byte| + buffer.concat(byte) + # if the last byte we added is potentially part of an escape, we'll go ahead and add another byte + if buffer.bytesize >= self.max_octets && !['%'.ord,'\\'.ord].include?(byte) + s.log(MAPPING[severity],buffer) + buffer = "" + end + end + s.log(MAPPING[severity],buffer) unless buffer.empty? + else + s.log(MAPPING[severity],"#{tags_text}#{communication}") + end + end + end + end + + # Set the max octets of the messages written to the log + def max_octets=(max_octets) + @max_octets = max_octets + end + + # Sets the minimum level for messages to be written in the log. + # +level+:: one of Logger::DEBUG, Logger::INFO, Logger::WARN, Logger::ERROR, Logger::FATAL, Logger::UNKNOWN + def level=(level) + level = Logger.const_get(level.to_s.upcase) if level.is_a?(Symbol) + + unless level.is_a?(Fixnum) + raise ArgumentError.new("Invalid logger level `#{level.inspect}`") + end + + @level = level + end + + # Sets the ident string passed along to Syslog + def ident=(ident) + @ident = ident + end + + # Tagging code borrowed from ActiveSupport gem + def tagged(*tags) + new_tags = push_tags(*tags) + yield self + ensure + pop_tags(new_tags.size) + end + + def push_tags(*tags) + tags.flatten.reject{ |i| i.respond_to?(:empty?) ? i.empty? : !i }.tap do |new_tags| + current_tags.concat new_tags + end + end + + def pop_tags(size = 1) + current_tags.pop size + end + + def clear_tags! + current_tags.clear + end + + protected + + # Borrowed from SyslogLogger. + def clean(message) + message = message.to_s.dup + message.strip! # remove whitespace + message.gsub!(/\n/, '\\n') # escape newlines + message.gsub!(/%/, '%%') # syslog(3) freaks on % (printf) + message.gsub!(/\e\[[^m]*m/, '') # remove useless ansi color codes + message + end + + private + + def tags_text + tags = current_tags + if tags.any? + tags.collect { |tag| "[#{tag}] " }.join + end + end + + def current_tags + Thread.current[:syslogger_tagged_logging_tags] ||= [] + end +end + +worker_processes 2 +working_directory ENV["GITLAB_PATH"] +pid ENV["UNICORN_PATH"] + "/tmp/pids/unicorn.pid" + +listen ENV["UNICORN_PATH"] + "/tmp/sockets/gitlab.socket", :backlog => 1024 +listen "127.0.0.1:8080", :tcp_nopush => true + +timeout 60 + +logger Syslogger.new + +preload_app true + +GC.respond_to?(:copy_on_write_friendly=) and + GC.copy_on_write_friendly = true + +check_client_connection false + +after_fork do |server, worker| + defined?(ActiveRecord::Base) and + ActiveRecord::Base.establish_connection +end diff --git a/nixos/modules/services/misc/gitlab.nix b/nixos/modules/services/misc/gitlab.nix new file mode 100644 index 00000000000..efa139c8dfd --- /dev/null +++ b/nixos/modules/services/misc/gitlab.nix @@ -0,0 +1,295 @@ +{ config, lib, pkgs, ... }: + +# TODO: support non-postgresql + +with lib; + +let + cfg = config.services.gitlab; + + ruby = pkgs.ruby; + rubyLibs = pkgs.rubyLibs; + + databaseYml = '' + production: + adapter: postgresql + database: ${cfg.databaseName} + host: ${cfg.databaseHost} + password: ${cfg.databasePassword} + username: ${cfg.databaseUsername} + encoding: utf8 + ''; + gitlabShellYml = '' + user: gitlab + gitlab_url: "http://${cfg.host}:${toString cfg.port}/" + http_settings: + self_signed_cert: false + repos_path: "${cfg.stateDir}/repositories" + log_file: "${cfg.stateDir}/log/gitlab-shell.log" + redis: + bin: ${pkgs.redis}/bin/redis-cli + host: 127.0.0.1 + port: 6379 + database: 0 + namespace: resque:gitlab + ''; + + unicornConfig = builtins.readFile ./defaultUnicornConfig.rb; + + gitlab-runner = pkgs.stdenv.mkDerivation rec { + name = "gitlab-runner"; + buildInputs = [ pkgs.gitlab pkgs.rubyLibs.bundler pkgs.makeWrapper ]; + phases = "installPhase fixupPhase"; + buildPhase = ""; + installPhase = '' + mkdir -p $out/bin + makeWrapper ${rubyLibs.bundler}/bin/bundle $out/bin/gitlab-runner\ + --set RAKEOPT '"-f ${pkgs.gitlab}/share/gitlab/Rakefile"'\ + --set UNICORN_PATH "${cfg.stateDir}/"\ + --set GITLAB_PATH "${pkgs.gitlab}/share/gitlab/"\ + --set GITLAB_APPLICATION_LOG_PATH "${cfg.stateDir}/log/application.log"\ + --set GITLAB_SATELLITES_PATH "${cfg.stateDir}/satellites"\ + --set GITLAB_SHELL_PATH "${pkgs.gitlab-shell}"\ + --set GITLAB_REPOSITORIES_PATH "${cfg.stateDir}/repositories"\ + --set GITLAB_SHELL_HOOKS_PATH "${cfg.stateDir}/shell/hooks"\ + --set BUNDLE_GEMFILE "${pkgs.gitlab}/share/gitlab/Gemfile"\ + --set GITLAB_EMAIL_FROM "${cfg.emailFrom}"\ + --set GITLAB_SHELL_CONFIG_PATH "${cfg.stateDir}/shell/config.yml"\ + --set GITLAB_SHELL_SECRET_PATH "${cfg.stateDir}/config/gitlab_shell_secret"\ + --set GITLAB_HOST "${cfg.host}"\ + --set GITLAB_PORT "${toString cfg.port}"\ + --set GITLAB_BACKUP_PATH"${cfg.backupPath}"\ + --set RAILS_ENV "production" + ''; + }; + +in { + + options = { + services.gitlab = { + enable = mkOption { + type = types.bool; + default = false; + description = '' + Enable the gitlab service. + ''; + }; + + satelliteDir = mkOption { + type = types.str; + default = "/var/gitlab/git-satellites"; + description = "Gitlab directory to store checked out git trees requires for operation."; + }; + + stateDir = mkOption { + type = types.str; + default = "/var/gitlab/state"; + description = "Gitlab state directory, logs are stored here."; + }; + + backupPath = mkOption { + type = types.str; + default = cfg.stateDir + "/backup"; + description = "Gitlab path for backups."; + }; + + databaseHost = mkOption { + type = types.str; + default = "127.0.0.1"; + description = "Gitlab database hostname."; + }; + + databasePassword = mkOption { + type = types.str; + default = ""; + description = "Gitlab database user password."; + }; + + databaseName = mkOption { + type = types.str; + default = "gitlab"; + description = "Gitlab database name."; + }; + + databaseUsername = mkOption { + type = types.str; + default = "gitlab"; + description = "Gitlab database user."; + }; + + emailFrom = mkOption { + type = types.str; + default = "example@example.org"; + description = "The source address for emails sent by gitlab."; + }; + + host = mkOption { + type = types.str; + default = config.networking.hostName; + description = "Gitlab host name. Used e.g. for copy-paste URLs."; + }; + + port = mkOption { + type = types.int; + default = 8080; + description = "Gitlab server listening port."; + }; + }; + }; + + config = mkIf cfg.enable { + + environment.systemPackages = [ gitlab-runner pkgs.gitlab-shell ]; + + assertions = [ + { assertion = cfg.databasePassword != ""; + message = "databasePassword must be set"; + } + ]; + + # Redis is required for the sidekiq queue runner. + services.redis.enable = mkDefault true; + # We use postgres as the main data store. + services.postgresql.enable = mkDefault true; + services.postgresql.package = mkDefault pkgs.postgresql; + # Use postfix to send out mails. + services.postfix.enable = mkDefault true; + + users.extraUsers = [ + { name = "gitlab"; + group = "gitlab"; + home = "${cfg.stateDir}/home"; + shell = "${pkgs.bash}/bin/bash"; + uid = config.ids.uids.gitlab; + } ]; + + users.extraGroups = [ + { name = "gitlab"; + gid = config.ids.gids.gitlab; + } ]; + + systemd.services.gitlab-sidekiq = { + after = [ "network.target" "redis.service" ]; + wantedBy = [ "multi-user.target" ]; + environment.HOME = "${cfg.stateDir}/home"; + environment.UNICORN_PATH = "${cfg.stateDir}/"; + environment.GITLAB_PATH = "${pkgs.gitlab}/share/gitlab/"; + environment.GITLAB_APPLICATION_LOG_PATH = "${cfg.stateDir}/log/application.log"; + environment.GITLAB_SATELLITES_PATH = "${cfg.stateDir}/satellites"; + environment.GITLAB_SHELL_PATH = "${pkgs.gitlab-shell}"; + environment.GITLAB_REPOSITORIES_PATH = "${cfg.stateDir}/repositories"; + environment.GITLAB_SHELL_HOOKS_PATH = "${cfg.stateDir}/shell/hooks"; + environment.BUNDLE_GEMFILE = "${pkgs.gitlab}/share/gitlab/Gemfile"; + environment.GITLAB_EMAIL_FROM = "${cfg.emailFrom}"; + environment.GITLAB_SHELL_CONFIG_PATH = "${cfg.stateDir}/shell/config.yml"; + environment.GITLAB_SHELL_SECRET_PATH = "${cfg.stateDir}/config/gitlab_shell_secret"; + environment.GITLAB_HOST = "${cfg.host}"; + environment.GITLAB_PORT = "${toString cfg.port}"; + environment.GITLAB_DATABASE_HOST = "${cfg.databaseHost}"; + environment.GITLAB_DATABASE_PASSWORD = "${cfg.databasePassword}"; + environment.RAILS_ENV = "production"; + path = with pkgs; [ + config.services.postgresql.package + gitAndTools.git + ruby + openssh + nodejs + ]; + serviceConfig = { + Type = "simple"; + User = "gitlab"; + Group = "gitlab"; + TimeoutSec = "300"; + WorkingDirectory = "${pkgs.gitlab}/share/gitlab"; + ExecStart="${rubyLibs.bundler}/bin/bundle exec \"sidekiq -q post_receive -q mailer -q system_hook -q project_web_hook -q gitlab_shell -q common -q default -e production -P ${cfg.stateDir}/tmp/sidekiq.pid\""; + }; + }; + + systemd.services.gitlab = { + after = [ "network.target" "postgresql.service" "redis.service" ]; + wantedBy = [ "multi-user.target" ]; + environment.HOME = "${cfg.stateDir}/home"; + environment.UNICORN_PATH = "${cfg.stateDir}/"; + environment.GITLAB_PATH = "${pkgs.gitlab}/share/gitlab/"; + environment.GITLAB_APPLICATION_LOG_PATH = "${cfg.stateDir}/log/application.log"; + environment.GITLAB_SATELLITES_PATH = "${cfg.stateDir}/satellites"; + environment.GITLAB_SHELL_PATH = "${pkgs.gitlab-shell}"; + environment.GITLAB_REPOSITORIES_PATH = "${cfg.stateDir}/repositories"; + environment.GITLAB_SHELL_HOOKS_PATH = "${cfg.stateDir}/shell/hooks"; + environment.BUNDLE_GEMFILE = "${pkgs.gitlab}/share/gitlab/Gemfile"; + environment.GITLAB_EMAIL_FROM = "${cfg.emailFrom}"; + environment.GITLAB_HOST = "${cfg.host}"; + environment.GITLAB_PORT = "${toString cfg.port}"; + environment.GITLAB_DATABASE_HOST = "${cfg.databaseHost}"; + environment.GITLAB_DATABASE_PASSWORD = "${cfg.databasePassword}"; + environment.RAILS_ENV = "production"; + path = with pkgs; [ + config.services.postgresql.package + gitAndTools.git + ruby + openssh + nodejs + ]; + preStart = '' + # TODO: use env vars + mkdir -p ${cfg.stateDir} + mkdir -p ${cfg.stateDir}/log + mkdir -p ${cfg.stateDir}/satellites + mkdir -p ${cfg.stateDir}/repositories + mkdir -p ${cfg.stateDir}/shell/hooks + mkdir -p ${cfg.stateDir}/tmp/pids + mkdir -p ${cfg.stateDir}/tmp/sockets + rm -rf ${cfg.stateDir}/config + mkdir -p ${cfg.stateDir}/config + # TODO: What exactly is gitlab-shell doing with the secret? + head -c 20 /dev/urandom > ${cfg.stateDir}/config/gitlab_shell_secret + mkdir -p ${cfg.stateDir}/home/.ssh + touch ${cfg.stateDir}/home/.ssh/authorized_keys + + cp -rf ${pkgs.gitlab}/share/gitlab/config ${cfg.stateDir}/ + cp ${pkgs.gitlab}/share/gitlab/VERSION ${cfg.stateDir}/VERSION + + ln -fs ${pkgs.writeText "database.yml" databaseYml} ${cfg.stateDir}/config/database.yml + ln -fs ${pkgs.writeText "unicorn.rb" unicornConfig} ${cfg.stateDir}/config/unicorn.rb + + chown -R gitlab:gitlab ${cfg.stateDir}/ + chmod -R 755 ${cfg.stateDir}/ + + if [ "${cfg.databaseHost}" = "127.0.0.1" ]; then + if ! test -e "${cfg.stateDir}/db-created"; then + psql postgres -c "CREATE ROLE gitlab WITH LOGIN NOCREATEDB NOCREATEROLE NOCREATEUSER ENCRYPTED PASSWORD '${cfg.databasePassword}'" + ${config.services.postgresql.package}/bin/createdb --owner gitlab gitlab || true + touch "${cfg.stateDir}/db-created" + + # force=yes disables the manual-interaction yes/no prompt + # which breaks without an stdin. + force=yes ${rubyLibs.bundler}/bin/bundle exec rake -f ${pkgs.gitlab}/share/gitlab/Rakefile gitlab:setup RAILS_ENV=production + fi + fi + + # Install the shell required to push repositories + ln -fs ${pkgs.writeText "config.yml" gitlabShellYml} ${cfg.stateDir}/shell/config.yml + export GITLAB_SHELL_CONFIG_PATH=""${cfg.stateDir}/shell/config.yml + ${pkgs.gitlab-shell}/bin/install + + # Change permissions in the last step because some of the + # intermediary scripts like to create directories as root. + chown -R gitlab:gitlab ${cfg.stateDir}/ + chmod -R 755 ${cfg.stateDir}/ + ''; + + serviceConfig = { + PermissionsStartOnly = true; # preStart must be run as root + Type = "simple"; + User = "gitlab"; + Group = "gitlab"; + TimeoutSec = "300"; + WorkingDirectory = "${pkgs.gitlab}/share/gitlab"; + ExecStart="${rubyLibs.bundler}/bin/bundle exec \"unicorn -c ${cfg.stateDir}/config/unicorn.rb -E production\""; + }; + + }; + + }; + +} diff --git a/nixos/modules/services/misc/mesos-slave.nix b/nixos/modules/services/misc/mesos-slave.nix index d89531f7e90..26fb3fdb00c 100644 --- a/nixos/modules/services/misc/mesos-slave.nix +++ b/nixos/modules/services/misc/mesos-slave.nix @@ -5,6 +5,13 @@ with lib; let cfg = config.services.mesos.slave; + mkAttributes = + attrs: concatStringsSep ";" (mapAttrsToList + (k: v: "${k}:${v}") + (filterAttrs (k: v: v != null) attrs)); + attribsArg = optionalString (cfg.attributes != {}) + "--attributes=${mkAttributes cfg.attributes}"; + in { options.services.mesos = { @@ -31,9 +38,9 @@ in { }; withHadoop = mkOption { - description = "Add the HADOOP_HOME to the slave."; - default = false; - type = types.bool; + description = "Add the HADOOP_HOME to the slave."; + default = false; + type = types.bool; }; workDir = mkOption { @@ -44,10 +51,10 @@ in { extraCmdLineOptions = mkOption { description = '' - Extra command line options for Mesos Slave. + Extra command line options for Mesos Slave. - See https://mesos.apache.org/documentation/latest/configuration/ - ''; + See https://mesos.apache.org/documentation/latest/configuration/ + ''; default = [ "" ]; type = types.listOf types.string; example = [ "--gc_delay=3days" ]; @@ -62,6 +69,19 @@ in { type = types.str; }; + attributes = mkOption { + description = '' + Machine attributes for the slave instance. + + Use caution when changing this; you may need to manually reset slave + metadata before the slave can re-register. + ''; + default = {}; + type = types.attrsOf types.str; + example = { rack = "aa"; + host = "aabc123"; + os = "nixos"; }; + }; }; }; @@ -74,20 +94,21 @@ in { after = [ "network-interfaces.target" ]; environment.MESOS_CONTAINERIZERS = "docker,mesos"; serviceConfig = { - ExecStart = '' - ${pkgs.mesos}/bin/mesos-slave \ - --port=${toString cfg.port} \ - --master=${cfg.master} \ - ${optionalString cfg.withHadoop "--hadoop-home=${pkgs.hadoop}"} \ - --work_dir=${cfg.workDir} \ - --logging_level=${cfg.logLevel} \ - --docker=${pkgs.docker}/libexec/docker/docker \ - ${toString cfg.extraCmdLineOptions} - ''; - PermissionsStartOnly = true; + ExecStart = '' + ${pkgs.mesos}/bin/mesos-slave \ + --port=${toString cfg.port} \ + --master=${cfg.master} \ + ${optionalString cfg.withHadoop "--hadoop-home=${pkgs.hadoop}"} \ + ${attribsArg} \ + --work_dir=${cfg.workDir} \ + --logging_level=${cfg.logLevel} \ + --docker=${pkgs.docker}/libexec/docker/docker \ + ${toString cfg.extraCmdLineOptions} + ''; + PermissionsStartOnly = true; }; preStart = '' - mkdir -m 0700 -p ${cfg.workDir} + mkdir -m 0700 -p ${cfg.workDir} ''; }; }; diff --git a/nixos/modules/services/misc/nix-daemon.nix b/nixos/modules/services/misc/nix-daemon.nix index d041c5664ef..e9aa1018178 100644 --- a/nixos/modules/services/misc/nix-daemon.nix +++ b/nixos/modules/services/misc/nix-daemon.nix @@ -225,7 +225,7 @@ in binaryCaches = mkOption { type = types.listOf types.str; - default = [ http://cache.nixos.org/ ]; + default = [ https://cache.nixos.org/ ]; description = '' List of binary cache URLs used to obtain pre-built binaries of Nix packages. diff --git a/nixos/modules/services/misc/synergy.nix b/nixos/modules/services/misc/synergy.nix index 5338b25715c..054df965347 100644 --- a/nixos/modules/services/misc/synergy.nix +++ b/nixos/modules/services/misc/synergy.nix @@ -81,27 +81,26 @@ in ###### implementation - config = { - - systemd.services."synergy-client" = { - enable = cfgC.enable; - after = [ "network.target" ]; - description = "Synergy client"; - wantedBy = optional cfgC.autoStart "multi-user.target"; - path = [ pkgs.synergy ]; - serviceConfig.ExecStart = ''${pkgs.synergy}/bin/synergyc -f ${optionalString (cfgC.screenName != "") "-n ${cfgC.screenName}"} ${cfgC.serverAddress}''; - }; - - systemd.services."synergy-server" = { - enable = cfgS.enable; - after = [ "network.target" ]; - description = "Synergy server"; - wantedBy = optional cfgS.autoStart "multi-user.target"; - path = [ pkgs.synergy ]; - serviceConfig.ExecStart = ''${pkgs.synergy}/bin/synergys -c ${cfgS.configFile} -f ${optionalString (cfgS.address != "") "-a ${cfgS.address}"} ${optionalString (cfgS.screenName != "") "-n ${cfgS.screenName}" }''; - }; - - }; + config = mkMerge [ + (mkIf cfgC.enable { + systemd.services."synergy-client" = { + after = [ "network.target" ]; + description = "Synergy client"; + wantedBy = optional cfgC.autoStart "multi-user.target"; + path = [ pkgs.synergy ]; + serviceConfig.ExecStart = ''${pkgs.synergy}/bin/synergyc -f ${optionalString (cfgC.screenName != "") "-n ${cfgC.screenName}"} ${cfgC.serverAddress}''; + }; + }) + (mkIf cfgS.enable { + systemd.services."synergy-server" = { + after = [ "network.target" ]; + description = "Synergy server"; + wantedBy = optional cfgS.autoStart "multi-user.target"; + path = [ pkgs.synergy ]; + serviceConfig.ExecStart = ''${pkgs.synergy}/bin/synergys -c ${cfgS.configFile} -f ${optionalString (cfgS.address != "") "-a ${cfgS.address}"} ${optionalString (cfgS.screenName != "") "-n ${cfgS.screenName}" }''; + }; + }) + ]; } diff --git a/nixos/modules/services/monitoring/munin.nix b/nixos/modules/services/monitoring/munin.nix index aab1c4b75ef..8558c4ff8e4 100644 --- a/nixos/modules/services/monitoring/munin.nix +++ b/nixos/modules/services/monitoring/munin.nix @@ -34,7 +34,7 @@ let cap=$(sed -nr 's/.*#%#\s+capabilities\s*=\s*(.+)/\1/p' $file) wrapProgram $file \ - --set PATH "/run/current-system/sw/bin:/run/current-system/sw/sbin" \ + --set PATH "/var/setuid-wrappers:/run/current-system/sw/bin:/run/current-system/sw/sbin" \ --set MUNIN_LIBDIR "${pkgs.munin}/lib" \ --set MUNIN_PLUGSTATE "/var/run/munin" @@ -194,7 +194,7 @@ in mkdir -p /etc/munin/plugins rm -rf /etc/munin/plugins/* - PATH="/run/current-system/sw/bin:/run/current-system/sw/sbin" ${pkgs.munin}/sbin/munin-node-configure --shell --families contrib,auto,manual --config ${nodeConf} --libdir=${muninPlugins} --servicedir=/etc/munin/plugins 2>/dev/null | ${pkgs.bash}/bin/bash + PATH="/var/setuid-wrappers:/run/current-system/sw/bin:/run/current-system/sw/sbin" ${pkgs.munin}/sbin/munin-node-configure --shell --families contrib,auto,manual --config ${nodeConf} --libdir=${muninPlugins} --servicedir=/etc/munin/plugins 2>/dev/null | ${pkgs.bash}/bin/bash ''; serviceConfig = { ExecStart = "${pkgs.munin}/sbin/munin-node --config ${nodeConf} --servicedir /etc/munin/plugins/"; diff --git a/nixos/modules/services/network-filesystems/nfsd.nix b/nixos/modules/services/network-filesystems/nfsd.nix index 893df51fc1f..9b317e96884 100644 --- a/nixos/modules/services/network-filesystems/nfsd.nix +++ b/nixos/modules/services/network-filesystems/nfsd.nix @@ -86,7 +86,7 @@ in boot.supportedFilesystems = [ "nfs" ]; # needed for statd and idmapd - environment.systemPackages = [ pkgs.nfsUtils ]; + environment.systemPackages = [ pkgs.nfs-utils ]; environment.etc = singleton { source = exports; @@ -104,7 +104,7 @@ in after = [ "rpcbind.service" "mountd.service" "idmapd.service" ]; before = [ "statd.service" ]; - path = [ pkgs.nfsUtils ]; + path = [ pkgs.nfs-utils ]; script = '' @@ -131,7 +131,7 @@ in requires = [ "rpcbind.service" ]; after = [ "rpcbind.service" ]; - path = [ pkgs.nfsUtils pkgs.sysvtools pkgs.utillinux ]; + path = [ pkgs.nfs-utils pkgs.sysvtools pkgs.utillinux ]; preStart = '' @@ -157,7 +157,7 @@ in serviceConfig.Type = "forking"; serviceConfig.ExecStart = '' - @${pkgs.nfsUtils}/sbin/rpc.mountd rpc.mountd \ + @${pkgs.nfs-utils}/sbin/rpc.mountd rpc.mountd \ ${if cfg.mountdPort != null then "-p ${toString cfg.mountdPort}" else ""} ''; serviceConfig.Restart = "always"; diff --git a/nixos/modules/services/network-filesystems/rsyncd.nix b/nixos/modules/services/network-filesystems/rsyncd.nix index 19aa7efd2ff..2018bfa14a5 100644 --- a/nixos/modules/services/network-filesystems/rsyncd.nix +++ b/nixos/modules/services/network-filesystems/rsyncd.nix @@ -6,113 +6,84 @@ let cfg = config.services.rsyncd; - motdFile = pkgs.writeText "rsyncd-motd" cfg.motd; + motdFile = builtins.toFile "rsyncd-motd" cfg.motd; - rsyncdCfg = "" - + optionalString (cfg.motd != "") "motd file = ${motdFile}\n" - + optionalString (cfg.address != "") "address = ${cfg.address}\n" - + optionalString (cfg.port != 873) "port = ${toString cfg.port}\n" - + cfg.extraConfig - + "\n" - + flip concatMapStrings cfg.modules (m: "[${m.name}]\n\tpath = ${m.path}\n" - + optionalString (m.comment != "") "\tcomment = ${m.comment}\n" - + m.extraConfig - + "\n" - ); - - rsyncdCfgFile = pkgs.writeText "rsyncd.conf" rsyncdCfg; + moduleConfig = name: + let module = getAttr name cfg.modules; in + "[${name}]\n " + (toString ( + map + (key: "${key} = ${toString (getAttr key module)}\n") + (attrNames module) + )); + cfgFile = builtins.toFile "rsyncd.conf" + '' + ${optionalString (cfg.motd != "") "motd file = ${motdFile}"} + ${optionalString (cfg.address != "") "address = ${cfg.address}"} + ${optionalString (cfg.port != 873) "port = ${toString cfg.port}"} + ${cfg.extraConfig} + ${toString (map moduleConfig (attrNames cfg.modules))} + ''; in { options = { - services.rsyncd = { enable = mkOption { default = false; - description = "Whether to enable the rsync daemon."; + description = "Whether to enable the rsync daemon."; }; motd = mkOption { type = types.string; default = ""; - description = '' - Message of the day to display to clients on each connect. - This usually contains site information and any legal notices. - ''; + description = '' + Message of the day to display to clients on each connect. + This usually contains site information and any legal notices. + ''; }; port = mkOption { default = 873; - type = types.int; - description = "TCP port the daemon will listen on."; + type = types.int; + description = "TCP port the daemon will listen on."; }; address = mkOption { default = ""; - example = "192.168.1.2"; - description = '' - IP address the daemon will listen on; rsyncd will listen on - all addresses if this is not specified. - ''; + example = "192.168.1.2"; + description = '' + IP address the daemon will listen on; rsyncd will listen on + all addresses if this is not specified. + ''; }; extraConfig = mkOption { type = types.lines; - default = ""; - description = '' - Lines of configuration to add to rsyncd globally. - See man rsyncd.conf for more options. - ''; + default = ""; + description = '' + Lines of configuration to add to rsyncd globally. + See man rsyncd.conf for options. + ''; }; modules = mkOption { - default = [ ]; - example = [ - { name = "ftp"; - path = "/home/ftp"; - comment = "ftp export area"; - extraConfig = '' - secrets file = /etc/rsyncd.secrets - ''; - } - ]; - description = "The list of file paths to export."; - type = types.listOf types.optionSet; - - options = { - - name = mkOption { - example = "ftp"; - type = types.string; - description = "Name of export module."; - }; - - comment = mkOption { - default = ""; - description = '' - Description string that is displayed next to the module name - when clients obtain a list of available modules. - ''; - }; - - path = mkOption { - example = "/home/ftp"; - type = types.string; - description = "Directory to make available in this module."; - }; - - extraConfig = mkOption { - type = types.lines; - default = ""; - description = '' - Lines of configuration to add to this module. - See man rsyncd.conf for more options. - ''; + default = {}; + description = '' + A set describing exported directories. + See man rsyncd.conf for options. + ''; + type = types.attrsOf (types.attrsOf types.str); + example = + { srv = + { path = "/srv"; + "read only" = "yes"; + comment = "Public rsync share."; + }; }; - }; }; + }; }; @@ -120,20 +91,16 @@ in config = mkIf cfg.enable { - environment.etc = singleton - { source = rsyncdCfgFile; + environment.etc = singleton { + source = cfgFile; target = "rsyncd.conf"; }; systemd.services.rsyncd = { description = "Rsync daemon"; wantedBy = [ "multi-user.target" ]; - - path = [ pkgs.rsync ]; - serviceConfig.ExecStart = "${pkgs.rsync}/bin/rsync --daemon --no-detach"; }; - networking.firewall.allowedTCPPorts = [ cfg.port ]; }; } diff --git a/nixos/modules/services/network-filesystems/samba.nix b/nixos/modules/services/network-filesystems/samba.nix index fd1e83d9f3e..1199fa316f9 100644 --- a/nixos/modules/services/network-filesystems/samba.nix +++ b/nixos/modules/services/network-filesystems/samba.nix @@ -27,6 +27,14 @@ let mkdir -p ${privateDir} ''; + shareConfig = name: + let share = getAttr name cfg.shares; in + "[${name}]\n " + (toString ( + map + (key: "${key} = ${toString (getAttr key share)}\n") + (attrNames share) + )); + configFile = pkgs.writeText "smb.conf" (if cfg.configText != null then cfg.configText else '' @@ -36,6 +44,8 @@ let ${optionalString cfg.syncPasswordsByPam "pam password change = true"} ${cfg.extraConfig} + + ${toString (map shareConfig (attrNames cfg.shares))} ''); # This may include nss_ldap, needed for samba if it has to use ldap. @@ -159,6 +169,23 @@ in ''; }; + shares = mkOption { + default = {}; + description = + '' + A set describing shared resources. + See man smb.conf for options. + ''; + type = types.attrsOf (types.attrsOf types.str); + example = + { srv = + { path = "/srv"; + "read only" = "yes"; + comment = "Public samba share."; + }; + }; + }; + }; }; diff --git a/nixos/modules/services/networking/consul.nix b/nixos/modules/services/networking/consul.nix index ebc83681408..b2d5854fbc0 100644 --- a/nixos/modules/services/networking/consul.nix +++ b/nixos/modules/services/networking/consul.nix @@ -8,7 +8,6 @@ let configOptions = { data_dir = dataDir; - rejoin_after_leave = true; } // (if cfg.webUi then { ui_dir = "${pkgs.consul.ui}"; } else { }) // cfg.extraConfig; @@ -41,6 +40,35 @@ in ''; }; + leaveOnStop = mkOption { + type = types.bool; + default = false; + description = '' + If enabled, causes a leave action to be sent when closing consul. + This allows a clean termination of the node, but permanently removes + it from the cluster. You probably don't want this option unless you + are running a node which going offline in a permanent / semi-permanent + fashion. + ''; + }; + + joinNodes = mkOption { + type = types.listOf types.str; + default = [ ]; + description = '' + A list of addresses of nodes which should be joined at startup if the + current node is in a left state. + ''; + }; + + joinRetries = mkOption { + type = types.int; + default = 10; + description = '' + The number of times to retry connecting to the join nodes. + ''; + }; + interface = { advertise = mkOption { @@ -119,13 +147,15 @@ in serviceConfig = { ExecStart = "@${pkgs.consul}/bin/consul consul agent" + concatMapStrings (n: " -config-file ${n}") configFiles; - ExecStop = "${pkgs.consul}/bin/consul leave"; ExecReload = "${pkgs.consul}/bin/consul reload"; PermissionsStartOnly = true; User = if cfg.dropPrivileges then "consul" else null; - }; + TimeoutStartSec = "${toString (20 + (3 * cfg.joinRetries))}s"; + } // (optionalAttrs (cfg.leaveOnStop) { + ExecStop = "${pkgs.consul}/bin/consul leave"; + }); - path = with pkgs; [ iproute gnugrep gawk ]; + path = with pkgs; [ iproute gnugrep gawk consul ]; preStart = '' mkdir -m 0700 -p ${dataDir} chown -R consul ${dataDir} @@ -160,6 +190,18 @@ in echo " \"\": \"\"" >> /etc/consul-addrs.json echo "}" >> /etc/consul-addrs.json ''; + postStart = '' + # Issues joins to nodes which we statically connect to + ${flip concatMapStrings cfg.joinNodes (addr: '' + for i in {0..${toString cfg.joinRetries}}; do + # Try to join the other nodes ${toString cfg.joinRetries} times before failing + consul join "${addr}" && break + sleep 1 + done & + '')} + wait + exit 0 + ''; }; }; diff --git a/nixos/modules/services/networking/networkmanager.nix b/nixos/modules/services/networking/networkmanager.nix index 37bc1df2361..f72c7fb39d6 100644 --- a/nixos/modules/services/networking/networkmanager.nix +++ b/nixos/modules/services/networking/networkmanager.nix @@ -194,7 +194,7 @@ in { }; powerManagement.resumeCommands = '' - Systemctl restart network-manager + ${config.systemd.package}/bin/systemctl restart network-manager ''; security.polkit.extraConfig = polkitConf; diff --git a/nixos/modules/services/networking/strongswan.nix b/nixos/modules/services/networking/strongswan.nix index 19ad635d07e..8778b0364f9 100644 --- a/nixos/modules/services/networking/strongswan.nix +++ b/nixos/modules/services/networking/strongswan.nix @@ -118,7 +118,7 @@ in systemd.services.strongswan = { description = "strongSwan IPSec Service"; wantedBy = [ "multi-user.target" ]; - path = with pkgs; [ kmod ]; # XXX Linux + path = with pkgs; [ kmod iproute iptables utillinux ]; # XXX Linux wants = [ "keys.target" ]; after = [ "network.target" "keys.target" ]; environment = { diff --git a/nixos/modules/services/networking/tcpcrypt.nix b/nixos/modules/services/networking/tcpcrypt.nix index 1359006aef4..fbd581cc4b4 100644 --- a/nixos/modules/services/networking/tcpcrypt.nix +++ b/nixos/modules/services/networking/tcpcrypt.nix @@ -44,6 +44,8 @@ in path = [ pkgs.iptables pkgs.tcpcrypt pkgs.procps ]; preStart = '' + mkdir -p /var/run/tcpcryptd + chown tcpcryptd /var/run/tcpcryptd sysctl -n net.ipv4.tcp_ecn >/run/pre-tcpcrypt-ecn-state sysctl -w net.ipv4.tcp_ecn=0 diff --git a/nixos/modules/services/networking/tox-bootstrapd.nix b/nixos/modules/services/networking/tox-bootstrapd.nix new file mode 100644 index 00000000000..65aa87be44c --- /dev/null +++ b/nixos/modules/services/networking/tox-bootstrapd.nix @@ -0,0 +1,80 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + home = "/var/lib/tox-bootstrapd"; + PIDFile = "${home}/pid"; + + pkg = pkgs.libtoxcore; + cfg = config.services.toxBootstrapd; + cfgFile = builtins.toFile "tox-bootstrapd.conf" + '' + port = ${toString cfg.port} + keys_file_path = "${home}/keys" + pid_file_path = "${PIDFile}" + ${cfg.extraConfig} + ''; +in +{ + options = + { services.toxBootstrapd = + { enable = mkOption { + type = types.bool; + default = false; + description = + '' + Whether to enable the Tox DHT boostrap daemon. + ''; + }; + + port = mkOption { + type = types.int; + default = 33445; + description = "Listening port (UDP)."; + }; + + keysFile = mkOption { + type = types.str; + default = "${home}/keys"; + description = "Node key file."; + }; + + extraConfig = mkOption { + type = types.lines; + default = ""; + description = + '' + Configuration for boostrap daemon. + See + and . + ''; + }; + }; + + }; + + config = mkIf config.services.toxBootstrapd.enable { + + users.extraUsers = singleton + { name = "tox-bootstrapd"; + uid = config.ids.uids.tox-bootstrapd; + description = "Tox bootstrap daemon user"; + inherit home; + createHome = true; + }; + + systemd.services.tox-bootstrapd = { + description = "Tox DHT bootstrap daemon"; + after = [ "network.target" ]; + wantedBy = [ "multi-user.target" ]; + serviceConfig = + { ExecStart = "${pkg}/bin/tox-bootstrapd ${cfgFile}"; + Type = "forking"; + inherit PIDFile; + User = "tox-bootstrapd"; + }; + }; + + }; +} diff --git a/nixos/modules/services/networking/unifi.nix b/nixos/modules/services/networking/unifi.nix index 71dd38a3f47..8905ff1598b 100644 --- a/nixos/modules/services/networking/unifi.nix +++ b/nixos/modules/services/networking/unifi.nix @@ -48,6 +48,7 @@ in systemd.mounts = map ({ what, where }: { bindsTo = [ "unifi.service" ]; partOf = [ "unifi.service" ]; + unitConfig.RequiresMountsFor = stateDir; options = "bind"; what = what; where = where; @@ -59,6 +60,7 @@ in after = [ "network.target" ] ++ systemdMountPoints; partOf = systemdMountPoints; bindsTo = systemdMountPoints; + unitConfig.RequiresMountsFor = stateDir; preStart = '' # Ensure privacy of state diff --git a/nixos/modules/services/printing/cupsd.nix b/nixos/modules/services/printing/cupsd.nix index 22667739494..bb3bf2519d4 100644 --- a/nixos/modules/services/printing/cupsd.nix +++ b/nixos/modules/services/printing/cupsd.nix @@ -11,20 +11,16 @@ let additionalBackends = pkgs.runCommand "additional-cups-backends" { } '' mkdir -p $out - if [ ! -e ${pkgs.cups}/lib/cups/backend/smb ]; then + if [ ! -e ${cups}/lib/cups/backend/smb ]; then mkdir -p $out/lib/cups/backend ln -sv ${pkgs.samba}/bin/smbspool $out/lib/cups/backend/smb fi # Provide support for printing via HTTPS. - if [ ! -e ${pkgs.cups}/lib/cups/backend/https ]; then + if [ ! -e ${cups}/lib/cups/backend/https ]; then mkdir -p $out/lib/cups/backend - ln -sv ${pkgs.cups}/lib/cups/backend/ipp $out/lib/cups/backend/https + ln -sv ${cups}/lib/cups/backend/ipp $out/lib/cups/backend/https fi - - # Import filter configuration from Ghostscript. - mkdir -p $out/share/cups/mime/ - ln -v -s "${pkgs.ghostscript}/etc/cups/"* $out/share/cups/mime/ ''; # Here we can enable additional backends, filters, etc. that are not @@ -90,6 +86,15 @@ in ''; }; + cupsFilesConf = mkOption { + type = types.lines; + default = ""; + description = '' + The contents of the configuration file of the CUPS daemon + (cups-files.conf). + ''; + }; + extraConf = mkOption { type = types.lines; default = ""; @@ -153,13 +158,9 @@ in environment.systemPackages = [ cups ]; - environment.variables.CUPS_SERVERROOT = "/etc/cups"; - - environment.etc = [ - { source = pkgs.writeText "client.conf" cfg.clientConf; - target = "cups/client.conf"; - } - ]; + environment.etc."cups/client.conf".text = cfg.clientConf; + environment.etc."cups/cups-files.conf".text = cfg.cupsFilesConf; + environment.etc."cups/cupsd.conf".text = cfg.cupsdConf; services.dbus.packages = [ cups ]; @@ -186,35 +187,26 @@ in ''; serviceConfig.Type = "forking"; - serviceConfig.ExecStart = "@${cups}/sbin/cupsd cupsd -c ${pkgs.writeText "cupsd.conf" cfg.cupsdConf}"; + serviceConfig.ExecStart = "@${cups}/sbin/cupsd cupsd"; + + restartTriggers = + [ config.environment.etc."cups/cups-files.conf".source + config.environment.etc."cups/cupsd.conf".source + ]; }; services.printing.drivers = - [ pkgs.cups pkgs.ghostscript pkgs.cups_filters additionalBackends + [ cups pkgs.ghostscript pkgs.cups_filters additionalBackends pkgs.perl pkgs.coreutils pkgs.gnused pkgs.bc pkgs.gawk pkgs.gnugrep ]; - services.printing.cupsdConf = + services.printing.cupsFilesConf = '' - LogLevel info - SystemGroup root wheel - ${concatMapStrings (addr: '' - Listen ${addr} - '') cfg.listenAddresses} - Listen /var/run/cups/cups.sock - - # Note: we can't use ${cups}/etc/cups as the ServerRoot, since - # CUPS will write in the ServerRoot when e.g. adding new printers - # through the web interface. - ServerRoot /etc/cups - ServerBin ${bindir}/lib/cups DataDir ${bindir}/share/cups - SetEnv PATH ${bindir}/lib/cups/filter:${bindir}/bin:${bindir}/sbin - AccessLog syslog ErrorLog syslog PageLog syslog @@ -227,6 +219,18 @@ in # these programs to run as `lp' as well. User cups Group lp + ''; + + services.printing.cupsdConf = + '' + LogLevel info + + ${concatMapStrings (addr: '' + Listen ${addr} + '') cfg.listenAddresses} + Listen /var/run/cups/cups.sock + + SetEnv PATH ${bindir}/lib/cups/filter:${bindir}/bin:${bindir}/sbin Browsing On BrowseOrder allow,deny @@ -272,6 +276,7 @@ in Order deny,allow + ${cfg.extraConf} ''; diff --git a/nixos/modules/services/scheduling/cron.nix b/nixos/modules/services/scheduling/cron.nix index ded3010ec5a..1f42086dc1e 100644 --- a/nixos/modules/services/scheduling/cron.nix +++ b/nixos/modules/services/scheduling/cron.nix @@ -97,12 +97,10 @@ in environment.systemPackages = [ cronNixosPkg ]; - jobs.cron = + systemd.services.cron = { description = "Cron Daemon"; - startOn = "startup"; - - path = [ cronNixosPkg ]; + wantedBy = [ "multi-user.target" ]; preStart = '' @@ -119,7 +117,8 @@ in fi ''; - exec = "cron -n"; + restartTriggers = [ config.environment.etc.localtime.source ]; + serviceConfig.ExecStart = "${cronNixosPkg}/bin/cron -n"; }; }; diff --git a/nixos/modules/services/security/tor.nix b/nixos/modules/services/security/tor.nix index 582dd124c29..47f863b96df 100644 --- a/nixos/modules/services/security/tor.nix +++ b/nixos/modules/services/security/tor.nix @@ -3,120 +3,146 @@ with lib; let - - inherit (pkgs) tor privoxy; - - stateDir = "/var/lib/tor"; - privoxyDir = stateDir+"/privoxy"; - cfg = config.services.tor; + torDirectory = "/var/lib/tor"; - torUser = "tor"; + opt = name: value: optionalString (value != null) "${name} ${value}"; + optint = name: value: optionalString (value != 0) "${name} ${toString value}"; - opt = name: value: if value != "" then "${name} ${value}" else ""; - optint = name: value: if value != 0 then "${name} ${toString value}" else ""; + torRc = '' + User tor + DataDirectory ${torDirectory} + ${optint "ControlPort" cfg.controlPort} + '' + # Client connection config + + optionalString cfg.client.enable '' + SOCKSPort ${cfg.client.socksListenAddress} IsolateDestAddr + SOCKSPort ${cfg.client.socksListenAddressFaster} + ${opt "SocksPolicy" cfg.client.socksPolicy} + '' + # Relay config + + optionalString cfg.relay.enable '' + ORPort ${cfg.relay.portSpec} + ${opt "Nickname" cfg.relay.nickname} + ${opt "ContactInfo" cfg.relay.contactInfo} + + ${optint "RelayBandwidthRate" cfg.relay.bandwidthRate} + ${optint "RelayBandwidthBurst" cfg.relay.bandwidthBurst} + ${opt "AccountingMax" cfg.relay.accountingMax} + ${opt "AccountingStart" cfg.relay.accountingStart} + + ${if cfg.relay.isExit then + opt "ExitPolicy" cfg.relay.exitPolicy + else + "ExitPolicy reject *:*"} + + ${optionalString cfg.relay.isBridge '' + BridgeRelay 1 + ServerTransportPlugin obfs2,obfs3 exec ${pkgs.pythonPackages.obfsproxy}/bin/obfsproxy managed + ''} + '' + + cfg.extraConfig; + + torRcFile = pkgs.writeText "torrc" torRc; in - { - - ###### interface - options = { - services.tor = { + enable = mkOption { + type = types.bool; + default = false; + description = '' + Enable the Tor daemon. By default, the daemon is run without + relay, exit, bridge or client connectivity. + ''; + }; - config = mkOption { + extraConfig = mkOption { + type = types.lines; default = ""; description = '' Extra configuration. Contents will be added verbatim to the - configuration file. + configuration file at the end. + ''; + }; + + controlPort = mkOption { + type = types.int; + default = 0; + example = 9051; + description = '' + If set, Tor will accept connections on the specified port + and allow them to control the tor process. ''; }; client = { - enable = mkOption { + type = types.bool; default = false; description = '' - Whether to enable Tor daemon to route application connections. - You might want to disable this if you plan running a dedicated Tor relay. + Whether to enable Tor daemon to route application + connections. You might want to disable this if you plan + running a dedicated Tor relay. ''; }; socksListenAddress = mkOption { + type = types.str; default = "127.0.0.1:9050"; example = "192.168.0.1:9100"; description = '' - Bind to this address to listen for connections from Socks-speaking - applications. + Bind to this address to listen for connections from + Socks-speaking applications. Provides strong circuit + isolation, separate circuit per IP address. ''; }; socksListenAddressFaster = mkOption { + type = types.str; default = "127.0.0.1:9063"; + example = "192.168.0.1:9101"; description = '' - Same as socksListenAddress but uses weaker circuit isolation to provide - performance suitable for a web browser. - ''; - }; + Bind to this address to listen for connections from + Socks-speaking applications. Same as socksListenAddress + but uses weaker circuit isolation to provide performance + suitable for a web browser. + ''; + }; socksPolicy = mkOption { - default = ""; + type = types.nullOr types.str; + default = null; example = "accept 192.168.0.0/16, reject *"; description = '' - Entry policies to allow/deny SOCKS requests based on IP address. - First entry that matches wins. If no SocksPolicy is set, we accept - all (and only) requests from SocksListenAddress. + Entry policies to allow/deny SOCKS requests based on IP + address. First entry that matches wins. If no SocksPolicy + is set, we accept all (and only) requests from + SocksListenAddress. ''; }; - privoxy = { + privoxy.enable = mkOption { + default = true; + description = '' + Whether to enable and configure the system Privoxy to use Tor's + faster port, suitable for HTTP. - enable = mkOption { - default = true; - description = '' - Whether to enable a special instance of privoxy dedicated to Tor. - To have anonymity, protocols need to be scrubbed of identifying - information. - Most people using Tor want to anonymize their web traffic, so by - default we enable an special instance of privoxy specifically for - Tor. - However, if you are only going to use Tor only for other kinds of - traffic then you can disable this option. - ''; - }; - - listenAddress = mkOption { - default = "127.0.0.1:8118"; - description = '' - Address that Tor's instance of privoxy is listening to. - *This does not configure the standard NixOS instance of privoxy.* - This is for Tor connections only! - See services.privoxy.listenAddress to configure the standard NixOS - instace of privoxy. - ''; - }; - - config = mkOption { - default = ""; - description = '' - Extra configuration for Tor's instance of privoxy. Contents will be - added verbatim to the configuration file. - *This does not configure the standard NixOS instance of privoxy.* - This is for Tor connections only! - See services.privoxy.extraConfig to configure the standard NixOS - instace of privoxy. - ''; - }; + To have anonymity, protocols need to be scrubbed of identifying + information, and this can be accomplished for HTTP by Privoxy. + Privoxy can also be useful for KDE torification. A good setup would be: + setting SOCKS proxy to the default Tor port, providing maximum + circuit isolation where possible; and setting HTTP proxy to Privoxy + to route HTTP traffic over faster, but less isolated port. + ''; }; - }; relay = { - enable = mkOption { + type = types.bool; default = false; description = '' Whether to enable relaying TOR traffic for others. @@ -126,16 +152,19 @@ in }; isBridge = mkOption { + type = types.bool; default = false; description = '' - Bridge relays (or "bridges" ) are Tor relays that aren't listed in the - main directory. Since there is no complete public list of them, even if an - ISP is filtering connections to all the known Tor relays, they probably + Bridge relays (or "bridges") are Tor relays that aren't + listed in the main directory. Since there is no complete + public list of them, even if an ISP is filtering + connections to all the known Tor relays, they probably won't be able to block all the bridges. A bridge relay can't be an exit relay. - You need to set relay.enable to true for this option to take effect. + You need to set relay.enable to true for this option to + take effect. The bridge is set up with an obfuscated transport proxy. @@ -144,25 +173,72 @@ in }; isExit = mkOption { + type = types.bool; default = false; description = '' - An exit relay allows Tor users to access regular Internet services. + An exit relay allows Tor users to access regular Internet + services. - Unlike running a non-exit relay, running an exit relay may expose - you to abuse complaints. See https://www.torproject.org/faq.html.en#ExitPolicies for more info. + Unlike running a non-exit relay, running an exit relay may + expose you to abuse complaints. See + https://www.torproject.org/faq.html.en#ExitPolicies for + more info. - You can specify which services Tor users may access via your exit relay using exitPolicy option. + You can specify which services Tor users may access via + your exit relay using exitPolicy option. ''; }; nickname = mkOption { + type = types.str; default = "anonymous"; description = '' A unique handle for your TOR relay. ''; }; + contactInfo = mkOption { + type = types.nullOr types.str; + default = null; + example = "admin@relay.com"; + description = '' + Contact information for the relay owner (e.g. a mail + address and GPG key ID). + ''; + }; + + accountingMax = mkOption { + type = types.nullOr types.str; + default = null; + example = "450 GBytes"; + description = '' + Specify maximum bandwidth allowed during an accounting + period. This allows you to limit overall tor bandwidth + over some time period. See the + AccountingMax option by looking at the + tor manual (man tor) for more. + + Note this limit applies individually to upload and + download; if you specify "500 GBytes" + here, then you may transfer up to 1 TBytes of overall + bandwidth (500 GB upload, 500 GB download). + ''; + }; + + accountingStart = mkOption { + type = types.nullOr types.str; + default = null; + example = "month 1 1:00"; + description = '' + Specify length of an accounting period. This allows you to + limit overall tor bandwidth over some time period. See the + AccountingStart option by looking at + the tor manual (man tor) for more. + ''; + }; + bandwidthRate = mkOption { + type = types.int; default = 0; example = 100; description = '' @@ -172,6 +248,7 @@ in }; bandwidthBurst = mkOption { + type = types.int; default = cfg.relay.bandwidthRate; example = 200; description = '' @@ -181,143 +258,110 @@ in ''; }; - port = mkOption { - default = 9001; + portSpec = mkOption { + type = types.str; + example = "143"; description = '' - What port to advertise for Tor connections. - ''; - }; + What port to advertise for Tor connections. This corresponds + to the ORPort section in the Tor manual; see + man tor for more details. - listenAddress = mkOption { - default = ""; - example = "0.0.0.0:9090"; - description = '' - Set this if you need to listen on a port other than the one advertised - in relayPort (e.g. to advertise 443 but bind to 9090). You'll need to do - ipchains or other port forwsarding yourself to make this work. + At a minimum, you should just specify the port for the + relay to listen on; a common one like 143, 22, 80, or 443 + to help Tor users who may have very restrictive port-based + firewalls. ''; }; exitPolicy = mkOption { - default = ""; + type = types.nullOr types.str; + default = null; example = "accept *:6660-6667,reject *:*"; description = '' - A comma-separated list of exit policies. They're considered first - to last, and the first match wins. If you want to _replace_ - the default exit policy, end this with either a reject *:* or an - accept *:*. Otherwise, you're _augmenting_ (prepending to) the - default exit policy. Leave commented to just use the default, which is - available in the man page or at https://www.torproject.org/documentation.html + A comma-separated list of exit policies. They're + considered first to last, and the first match wins. If you + want to _replace_ the default exit policy, end this with + either a reject *:* or an accept *:*. Otherwise, you're + _augmenting_ (prepending to) the default exit + policy. Leave commented to just use the default, which is + available in the man page or at + https://www.torproject.org/documentation.html Look at https://www.torproject.org/faq-abuse.html#TypicalAbuses for issues you might encounter if you use the default exit policy. - If certain IPs and ports are blocked externally, e.g. by your firewall, - you should update your exit policy to reflect this -- otherwise Tor - users will be told that those destinations are down. + If certain IPs and ports are blocked externally, e.g. by + your firewall, you should update your exit policy to + reflect this -- otherwise Tor users will be told that + those destinations are down. ''; }; - }; - }; - }; - - ###### implementation - - config = mkIf (cfg.client.enable || cfg.relay.enable) { - + config = mkIf cfg.enable { assertions = singleton - { assertion = cfg.relay.enable -> !(cfg.relay.isBridge && cfg.relay.isExit); - message = "Can't be both an exit and a bridge relay at the same time"; + { message = "Can't be both an exit and a bridge relay at the same time"; + assertion = + cfg.relay.enable -> !(cfg.relay.isBridge && cfg.relay.isExit); }; - users.extraUsers = singleton - { name = torUser; - uid = config.ids.uids.tor; - description = "Tor daemon user"; - home = stateDir; + users.extraGroups.tor.gid = config.ids.gids.tor; + users.extraUsers.tor = + { description = "Tor Daemon User"; + createHome = true; + home = torDirectory; + group = "tor"; + uid = config.ids.uids.tor; }; - jobs = { - tor = { name = "tor"; + systemd.services.tor = + { description = "Tor Daemon"; + path = [ pkgs.tor ]; - startOn = "started network-interfaces"; - stopOn = "stopping network-interfaces"; + wantedBy = [ "multi-user.target" ]; + after = [ "network.target" ]; + restartTriggers = [ torRcFile ]; - preStart = '' - mkdir -m 0755 -p ${stateDir} - chown ${torUser} ${stateDir} - ''; - exec = "${tor}/bin/tor -f ${pkgs.writeText "torrc" cfg.config}"; - }; } - // optionalAttrs (cfg.client.privoxy.enable && cfg.client.enable) { - torPrivoxy = { name = "tor-privoxy"; + # Translated from the upstream contrib/dist/tor.service.in + serviceConfig = + { Type = "simple"; + ExecStartPre = "${pkgs.tor}/bin/tor -f ${torRcFile} --verify-config"; + ExecStart = "${pkgs.tor}/bin/tor -f ${torRcFile} --RunAsDaemon 0"; + ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; + KillSignal = "SIGINT"; + TimeoutSec = 30; + Restart = "on-failure"; + LimitNOFILE = 32768; - startOn = "started network-interfaces"; - stopOn = "stopping network-interfaces"; + # Hardening + # Note: DevicePolicy is set to 'closed', although the + # minimal permissions are really: + # DeviceAllow /dev/null rw + # DeviceAllow /dev/urandom r + # .. but we can't specify DeviceAllow multiple times. 'closed' + # is close enough. + PrivateTmp = "yes"; + DevicePolicy = "closed"; + InaccessibleDirectories = "/home"; + ReadOnlyDirectories = "/"; + ReadWriteDirectories = torDirectory; + NoNewPrivileges = "yes"; + }; + }; - preStart = '' - mkdir -m 0755 -p ${privoxyDir} - chown ${torUser} ${privoxyDir} - ''; - exec = "${privoxy}/sbin/privoxy --no-daemon --user ${torUser} ${pkgs.writeText "torPrivoxy.conf" cfg.client.privoxy.config}"; - }; }; + environment.systemPackages = [ pkgs.tor ]; - services.tor.config = '' - DataDirectory ${stateDir} - User ${torUser} - '' - + optionalString cfg.client.enable '' - SOCKSPort ${cfg.client.socksListenAddress} IsolateDestAddr - SOCKSPort ${cfg.client.socksListenAddressFaster} - ${opt "SocksPolicy" cfg.client.socksPolicy} - '' - + optionalString cfg.relay.enable '' - ORPort ${toString cfg.relay.port} - ${opt "ORListenAddress" cfg.relay.listenAddress } - ${opt "Nickname" cfg.relay.nickname} - ${optint "RelayBandwidthRate" cfg.relay.bandwidthRate} - ${optint "RelayBandwidthBurst" cfg.relay.bandwidthBurst} - ${if cfg.relay.isExit then opt "ExitPolicy" cfg.relay.exitPolicy else "ExitPolicy reject *:*"} - ${if cfg.relay.isBridge then '' - BridgeRelay 1 - ServerTransportPlugin obfs2,obfs3 exec ${pkgs.pythonPackages.obfsproxy}/bin/obfsproxy managed - '' else ""} - ''; - - services.tor.client.privoxy.config = '' - # Generally, this file goes in /etc/privoxy/config - # - # Tor listens as a SOCKS4a proxy here: + services.privoxy = mkIf (cfg.client.enable && cfg.client.privoxy.enable) { + enable = true; + extraConfig = '' forward-socks4a / ${cfg.client.socksListenAddressFaster} . - confdir ${privoxy}/etc - logdir ${privoxyDir} - # actionsfile standard # Internal purpose, recommended - actionsfile default.action # Main actions file - actionsfile user.action # User customizations - filterfile default.filter - - # Don't log interesting things, only startup messages, warnings and errors - logfile logfile - #jarfile jarfile - #debug 0 # show each GET/POST/CONNECT request - debug 4096 # Startup banner and warnings - debug 8192 # Errors - *we highly recommended enabling this* - - user-manual ${privoxy}/doc/privoxy/user-manual - listen-address ${cfg.client.privoxy.listenAddress} toggle 1 enable-remote-toggle 0 enable-edit-actions 0 enable-remote-http-toggle 0 - buffer-limit 4096 - - # Extra config goes here ''; - + }; }; - } diff --git a/nixos/modules/services/security/torify.nix b/nixos/modules/services/security/torify.nix index 53f48a714b4..a81cdbbc172 100644 --- a/nixos/modules/services/security/torify.nix +++ b/nixos/modules/services/security/torify.nix @@ -5,13 +5,13 @@ let cfg = config.services.tor; torify = pkgs.writeTextFile { - name = "torify"; + name = "tsocks"; text = '' #!${pkgs.stdenv.shell} - TSOCKS_CONF_FILE=${pkgs.writeText "tsocks.conf" cfg.torify.config} LD_PRELOAD="${pkgs.tsocks}/lib/libtsocks.so $LD_PRELOAD" "$@" + TSOCKS_CONF_FILE=${pkgs.writeText "tsocks.conf" cfg.tsocks.config} LD_PRELOAD="${pkgs.tsocks}/lib/libtsocks.so $LD_PRELOAD" "$@" ''; executable = true; - destination = "/bin/torify"; + destination = "/bin/tsocks"; }; in @@ -22,12 +22,12 @@ in options = { - services.tor.torify = { + services.tor.tsocks = { enable = mkOption { - default = cfg.client.enable; + default = cfg.enable && cfg.client.enable; description = '' - Whether to build torify scipt to relay application traffic via TOR. + Whether to build tsocks wrapper script to relay application traffic via TOR. ''; }; @@ -53,13 +53,13 @@ in ###### implementation - config = mkIf cfg.torify.enable { + config = mkIf cfg.tsocks.enable { environment.systemPackages = [ torify ]; # expose it to the users - services.tor.torify.config = '' - server = ${toString(head (splitString ":" cfg.torify.server))} - server_port = ${toString(tail (splitString ":" cfg.torify.server))} + services.tor.tsocks.config = '' + server = ${toString(head (splitString ":" cfg.tsocks.server))} + server_port = ${toString(tail (splitString ":" cfg.tsocks.server))} local = 127.0.0.0/255.128.0.0 local = 127.128.0.0/255.192.0.0 diff --git a/nixos/modules/services/security/torsocks.nix b/nixos/modules/services/security/torsocks.nix index ede6c983677..1b5a05b21e7 100644 --- a/nixos/modules/services/security/torsocks.nix +++ b/nixos/modules/services/security/torsocks.nix @@ -1,85 +1,121 @@ { config, lib, pkgs, ... }: + with lib; + let + cfg = config.services.tor.torsocks; + optionalNullStr = b: v: optionalString (b != null) v; - cfg = config.services.tor; + configFile = server: '' + TorAddress ${toString (head (splitString ":" server))} + TorPort ${toString (tail (splitString ":" server))} - makeConfig = server: '' - server = ${toString(head (splitString ":" server))} - server_port = ${toString(tail (splitString ":" server))} + OnionAddrRange ${cfg.onionAddrRange} - local = 127.0.0.0/255.128.0.0 - local = 127.128.0.0/255.192.0.0 - local = 169.254.0.0/255.255.0.0 - local = 172.16.0.0/255.240.0.0 - local = 192.168.0.0/255.255.0.0 + ${optionalNullStr cfg.socks5Username + "SOCKS5Username ${cfg.socks5Username}"} + ${optionalNullStr cfg.socks5Password + "SOCKS5Password ${cfg.socks5Password}"} - ${cfg.torsocks.config} - ''; - makeTorsocks = name: server: pkgs.writeTextFile { + AllowInbound ${if cfg.allowInbound then "1" else "0"} + ''; + + wrapTorsocks = name: server: pkgs.writeTextFile { name = name; text = '' #!${pkgs.stdenv.shell} - TORSOCKS_CONF_FILE=${pkgs.writeText "torsocks.conf" (makeConfig server)} LD_PRELOAD="${pkgs.torsocks}/lib/torsocks/libtorsocks.so $LD_PRELOAD" "$@" + TORSOCKS_CONF_FILE=${pkgs.writeText "torsocks.conf" (configFile server)} ${pkgs.torsocks}/bin/torsocks "$@" ''; executable = true; destination = "/bin/${name}"; }; - torsocks = makeTorsocks "torsocks" cfg.torsocks.server; - torsocksFaster = makeTorsocks "torsocks-faster" cfg.torsocks.serverFaster; in - { - - ###### interface - options = { - services.tor.torsocks = { - enable = mkOption { - default = cfg.client.enable; + type = types.bool; + default = config.services.tor.enable && config.services.tor.client.enable; description = '' - Whether to build torsocks scipt to relay application traffic via TOR. + Whether to build /etc/tor/torsocks.conf + containing the specified global torsocks configuration. ''; }; server = mkOption { - default = cfg.client.socksListenAddress; - example = "192.168.0.20:9050"; + type = types.str; + default = "127.0.0.1:9050"; + example = "192.168.0.20:1234"; description = '' - IP address of TOR client to use. + IP/Port of the Tor SOCKS server. Currently, hostnames are + NOT supported by torsocks. ''; }; - serverFaster = mkOption { - default = cfg.client.socksListenAddressFaster; - example = "192.168.0.20:9063"; + fasterServer = mkOption { + type = types.str; + default = "127.0.0.1:9063"; + example = "192.168.0.20:1234"; description = '' - IP address of TOR client to use for applications like web browsers which - need less circuit isolation to achive satisfactory performance. + IP/Port of the Tor SOCKS server for torsocks-faster wrapper suitable for HTTP. + Currently, hostnames are NOT supported by torsocks. ''; }; - config = mkOption { - default = ""; + onionAddrRange = mkOption { + type = types.str; + default = "127.42.42.0/24"; description = '' - Extra configuration. Contents will be added verbatim to torsocks - configuration file. + Tor hidden sites do not have real IP addresses. This + specifies what range of IP addresses will be handed to the + application as "cookies" for .onion names. Of course, you + should pick a block of addresses which you aren't going to + ever need to actually connect to. This is similar to the + MapAddress feature of the main tor daemon. + ''; + }; + + socks5Username = mkOption { + type = types.nullOr types.str; + default = null; + example = "bob"; + description = '' + SOCKS5 username. The TORSOCKS_USERNAME + environment variable overrides this option if it is set. + ''; + }; + + socks5Password = mkOption { + type = types.nullOr types.str; + default = null; + example = "sekret"; + description = '' + SOCKS5 password. The TORSOCKS_PASSWORD + environment variable overrides this option if it is set. + ''; + }; + + allowInbound = mkOption { + type = types.bool; + default = false; + description = '' + Set Torsocks to accept inbound connections. If set to + true, listen() and accept() will be + allowed to be used with non localhost address. ''; }; }; - }; - ###### implementation - - config = mkIf cfg.torsocks.enable { - - environment.systemPackages = [ torsocks torsocksFaster ]; # expose it to the users + config = mkIf cfg.enable { + environment.systemPackages = [ pkgs.torsocks (wrapTorsocks "torsocks-faster" cfg.fasterServer) ]; + environment.etc = + [ { source = pkgs.writeText "torsocks.conf" (configFile cfg.server); + target = "tor/torsocks.conf"; + } + ]; }; - } diff --git a/nixos/modules/services/system/cloud-init.nix b/nixos/modules/services/system/cloud-init.nix new file mode 100644 index 00000000000..0ef31ef8a8b --- /dev/null +++ b/nixos/modules/services/system/cloud-init.nix @@ -0,0 +1,152 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let cfg = config.services.cloud-init; + path = with pkgs; [ cloud-init nettools utillinux e2fsprogs shadow dmidecode openssh ]; + configFile = pkgs.writeText "cloud-init.cfg" '' +users: + - root + +disable_root: false +preserve_hostname: false + +cloud_init_modules: + - migrator + - seed_random + - bootcmd + - write-files + - growpart + - resizefs + - set_hostname + - update_hostname + - update_etc_hosts + - ca-certs + - rsyslog + - users-groups + +cloud_config_modules: + - emit_upstart + - disk_setup + - mounts + - ssh-import-id + - set-passwords + - timezone + - disable-ec2-metadata + - runcmd + - ssh + +cloud_final_modules: + - rightscale_userdata + - scripts-vendor + - scripts-per-once + - scripts-per-boot + - scripts-per-instance + - scripts-user + - ssh-authkey-fingerprints + - keys-to-console + - phone-home + - final-message + - power-state-change +''; +in +{ + options = { + + services.cloud-init = { + + enable = mkOption { + type = types.bool; + default = false; + description = '' + Enable the cloud-init service. This services reads + configuration metadata in a cloud environment and configures + the machine according to this metadata. + + This configuration is not completely compatible with the + NixOS way of doing configuration, as configuration done by + cloud-init might be overriden by a subsequent nixos-rebuild + call. However, some parts of cloud-init fall outside of + NixOS's responsibility, like filesystem resizing and ssh + public key provisioning, and cloud-init is useful for that + parts. Thus, be wary that using cloud-init in NixOS might + come as some cost. + ''; + }; + + }; + + }; + + config = mkIf cfg.enable { + + systemd.services.cloud-init-local = + { description = "Initial cloud-init job (pre-networking)"; + wantedBy = [ "multi-user.target" ]; + wants = [ "local-fs.target" ]; + after = [ "local-fs.target" ]; + path = path; + serviceConfig = + { Type = "oneshot"; + ExecStart = "${pkgs.cloud-init}/bin/cloud-init -f ${configFile} init --local"; + RemainAfterExit = "yes"; + TimeoutSec = "0"; + StandardOutput = "journal+console"; + }; + }; + + systemd.services.cloud-init = + { description = "Initial cloud-init job (metadata service crawler)"; + wantedBy = [ "multi-user.target" ]; + wants = [ "local-fs.target" "cloud-init-local.service" "sshd.service" "sshd-keygen.service" ]; + after = [ "local-fs.target" "network.target" "cloud-init-local.service" ]; + before = [ "sshd.service" "sshd-keygen.service" ]; + requires = [ "network.target "]; + path = path; + serviceConfig = + { Type = "oneshot"; + ExecStart = "${pkgs.cloud-init}/bin/cloud-init -f ${configFile} init"; + RemainAfterExit = "yes"; + TimeoutSec = "0"; + StandardOutput = "journal+console"; + }; + }; + + systemd.services.cloud-config = + { description = "Apply the settings specified in cloud-config"; + wantedBy = [ "multi-user.target" ]; + wants = [ "network.target" ]; + after = [ "network.target" "syslog.target" "cloud-config.target" ]; + + path = path; + serviceConfig = + { Type = "oneshot"; + ExecStart = "${pkgs.cloud-init}/bin/cloud-init -f ${configFile} modules --mode=config"; + RemainAfterExit = "yes"; + TimeoutSec = "0"; + StandardOutput = "journal+console"; + }; + }; + + systemd.services.cloud-final = + { description = "Execute cloud user/final scripts"; + wantedBy = [ "multi-user.target" ]; + wants = [ "network.target" ]; + after = [ "network.target" "syslog.target" "cloud-config.service" "rc-local.service" ]; + requires = [ "cloud-config.target" ]; + path = path; + serviceConfig = + { Type = "oneshot"; + ExecStart = "${pkgs.cloud-init}/bin/cloud-init -f ${configFile} modules --mode=final"; + RemainAfterExit = "yes"; + TimeoutSec = "0"; + StandardOutput = "journal+console"; + }; + }; + + systemd.targets.cloud-config = + { description = "Cloud-config availability"; + requires = [ "cloud-init-local.service" "cloud-init.service" ]; + }; + }; +} diff --git a/nixos/modules/services/web-servers/apache-httpd/default.nix b/nixos/modules/services/web-servers/apache-httpd/default.nix index 5adfb8f0f96..d5a57eddd5e 100644 --- a/nixos/modules/services/web-servers/apache-httpd/default.nix +++ b/nixos/modules/services/web-servers/apache-httpd/default.nix @@ -98,9 +98,6 @@ let # Authorization: is the user allowed access? "authz_user" "authz_groupfile" "authz_host" - # For compatibility with old configurations, the new module mod_access_compat is provided. - (if version24 then "access_compat" else "") - # Other modules. "ext_filter" "include" "log_config" "env" "mime_magic" "cern_meta" "expires" "headers" "usertrack" /* "unique_id" */ "setenvif" @@ -115,6 +112,8 @@ let "cache" "cache_disk" "slotmem_shm" "socache_shmcb" + # For compatibility with old configurations, the new module mod_access_compat is provided. + "access_compat" ] ++ (if mainCfg.multiProcessingModule == "prefork" then [ "cgi" ] else [ "cgid" ]) ++ optional enableSSL "ssl" diff --git a/nixos/modules/services/web-servers/nginx/default.nix b/nixos/modules/services/web-servers/nginx/default.nix index 7c2d3a42973..0af1b58b7ca 100644 --- a/nixos/modules/services/web-servers/nginx/default.nix +++ b/nixos/modules/services/web-servers/nginx/default.nix @@ -23,6 +23,7 @@ in services.nginx = { enable = mkOption { default = false; + type = types.bool; description = " Enable the nginx Web Server. "; @@ -70,11 +71,13 @@ in }; user = mkOption { + type = types.str; default = "nginx"; description = "User account under which nginx runs."; }; group = mkOption { + type = types.str; default = "nginx"; description = "Group account under which nginx runs."; }; diff --git a/nixos/modules/services/x11/desktop-managers/kde4.nix b/nixos/modules/services/x11/desktop-managers/kde4.nix index f7579fce7b5..16c99862e9e 100644 --- a/nixos/modules/services/x11/desktop-managers/kde4.nix +++ b/nixos/modules/services/x11/desktop-managers/kde4.nix @@ -152,7 +152,9 @@ in xorg.xauth # used by kdesu pkgs.shared_desktop_ontologies # used by nepomuk pkgs.strigi # used by nepomuk + pkgs.kde4.akonadi pkgs.mysql # used by akonadi + pkgs.kde4.kdepim_runtime ] ++ lib.optional config.hardware.pulseaudio.enable pkgs.kde4.kmix # Perhaps this should always be enabled ++ lib.optional config.hardware.bluetooth.enable pkgs.kde4.bluedevil diff --git a/nixos/modules/services/x11/display-managers/default.nix b/nixos/modules/services/x11/display-managers/default.nix index 6b01cde9e2b..a1b5daa3336 100644 --- a/nixos/modules/services/x11/display-managers/default.nix +++ b/nixos/modules/services/x11/display-managers/default.nix @@ -23,6 +23,17 @@ let pathsToLink = [ "/" ]; }; + fontconfig = config.fonts.fontconfig; + xresourcesXft = pkgs.writeText "Xresources-Xft" '' + ${optionalString (fontconfig.dpi != 0) ''Xft.dpi: ${fontconfig.dpi}''} + Xft.antialias: ${if fontconfig.antialias then "1" else "0"} + Xft.rgba: ${fontconfig.subpixel.rgba} + Xft.lcdfilter: lcd${fontconfig.subpixel.lcdfilter} + Xft.hinting: ${if fontconfig.hinting.enable then "1" else "0"} + Xft.autohint: ${if fontconfig.hinting.autohint then "1" else "0"} + Xft.hintstyle: hint${fontconfig.hinting.style} + ''; + # file provided by services.xserver.displayManager.session.script xsession = wm: dm: pkgs.writeScript "xsession" '' @@ -79,6 +90,7 @@ let ''} # Load X defaults. + ${xorg.xrdb}/bin/xrdb -merge ${xresourcesXft} if test -e ~/.Xresources; then ${xorg.xrdb}/bin/xrdb -merge ~/.Xresources elif test -e ~/.Xdefaults; then @@ -177,7 +189,7 @@ in xserverArgs = mkOption { type = types.listOf types.str; default = []; - example = [ "-ac" "-logverbose" "-nolisten tcp" ]; + example = [ "-ac" "-logverbose" "-verbose" "-nolisten tcp" ]; description = "List of arguments for the X server."; apply = toString; }; diff --git a/nixos/modules/services/x11/window-managers/awesome.nix b/nixos/modules/services/x11/window-managers/awesome.nix index 9b2f042a87a..455b3568499 100644 --- a/nixos/modules/services/x11/window-managers/awesome.nix +++ b/nixos/modules/services/x11/window-managers/awesome.nix @@ -5,6 +5,7 @@ with lib; let cfg = config.services.xserver.windowManager.awesome; + awesome = cfg.package; in @@ -14,9 +15,24 @@ in options = { - services.xserver.windowManager.awesome.enable = mkOption { - default = false; - description = "Enable the Awesome window manager."; + services.xserver.windowManager.awesome = { + + enable = mkEnableOption "Awesome window manager"; + + luaModules = mkOption { + default = []; + type = types.listOf types.package; + description = "List of lua packages available for being used in the Awesome configuration."; + example = literalExample "[ luaPackages.oocairo ]"; + }; + + package = mkOption { + default = null; + type = types.nullOr types.package; + description = "Package to use for running the Awesome WM."; + apply = pkg: if pkg == null then pkgs.awesome else pkg; + }; + }; }; @@ -30,12 +46,17 @@ in { name = "awesome"; start = '' - ${pkgs.awesome}/bin/awesome & + ${concatMapStrings (pkg: '' + export LUA_CPATH=$LUA_CPATH''${LUA_CPATH:+;}${pkg}/lib/lua/${awesome.lua.luaversion}/?.so + export LUA_PATH=$LUA_PATH''${LUA_PATH:+;}${pkg}/lib/lua/${awesome.lua.luaversion}/?.lua + '') cfg.luaModules} + + ${awesome}/bin/awesome & waitPID=$! ''; }; - environment.systemPackages = [ pkgs.awesome ]; + environment.systemPackages = [ awesome ]; }; diff --git a/nixos/modules/services/x11/xserver.nix b/nixos/modules/services/x11/xserver.nix index f911d3c81f9..64e0d4d8050 100644 --- a/nixos/modules/services/x11/xserver.nix +++ b/nixos/modules/services/x11/xserver.nix @@ -483,8 +483,6 @@ in services.xserver.displayManager.xserverArgs = [ "-ac" - "-logverbose" - "-verbose" "-terminate" "-logfile" "/var/log/X.${toString cfg.display}.log" "-config ${configFile}" diff --git a/nixos/modules/system/activation/switch-to-configuration.pl b/nixos/modules/system/activation/switch-to-configuration.pl index c0e0ae23d38..c814469ae41 100644 --- a/nixos/modules/system/activation/switch-to-configuration.pl +++ b/nixos/modules/system/activation/switch-to-configuration.pl @@ -181,7 +181,7 @@ while (my ($unit, $state) = each %{$activePrev}) { } elsif ($unit =~ /\.mount$/) { # Reload the changed mount unit to force a remount. write_file($reloadListFile, { append => 1 }, "$unit\n"); - } elsif ($unit =~ /\.socket$/ || $unit =~ /\.path$/) { + } elsif ($unit =~ /\.socket$/ || $unit =~ /\.path$/ || $unit =~ /\.slice$/) { # FIXME: do something? } else { my $unitInfo = parseUnit($newUnitFile); diff --git a/nixos/modules/system/activation/top-level.nix b/nixos/modules/system/activation/top-level.nix index b8ea7fd7b9a..d7a1e205b4d 100644 --- a/nixos/modules/system/activation/top-level.nix +++ b/nixos/modules/system/activation/top-level.nix @@ -88,7 +88,7 @@ let failed = map (x: x.message) (filter (x: !x.assertion) config.assertions); - showWarnings = res: fold (w: x: builtins.trace "^[[1;31mwarning: ${w}^[[0m" x) res config.warnings; + showWarnings = res: fold (w: x: builtins.trace "warning: ${w}" x) res config.warnings; # Putting it all together. This builds a store path containing # symlinks to the various parts of the built configuration (the diff --git a/nixos/modules/system/boot/luksroot.nix b/nixos/modules/system/boot/luksroot.nix index 70ff1d588a3..e1e472186e3 100644 --- a/nixos/modules/system/boot/luksroot.nix +++ b/nixos/modules/system/boot/luksroot.nix @@ -203,7 +203,7 @@ in description = '' Unless enabled, encryption keys can be easily recovered by an attacker with physical access to any machine with PCMCIA, ExpressCard, ThunderBolt or FireWire port. - More information: http://en.wikipedia.org/wiki/DMA_attack + More information is available at . This option blacklists FireWire drivers, but doesn't remove them. You can manually load the drivers if you need to use a FireWire device, but don't forget to unload them! diff --git a/nixos/modules/system/boot/stage-1-init.sh b/nixos/modules/system/boot/stage-1-init.sh index b62aed4ead9..0b7d4de6d20 100644 --- a/nixos/modules/system/boot/stage-1-init.sh +++ b/nixos/modules/system/boot/stage-1-init.sh @@ -56,9 +56,10 @@ echo # Mount special file systems. -mkdir -p /etc +mkdir -p /etc/udev touch /etc/fstab # to shut up mount touch /etc/mtab # to shut up mke2fs +touch /etc/udev/hwdb.bin # to shut up udev touch /etc/initrd-release mkdir -p /proc mount -t proc proc /proc diff --git a/nixos/modules/system/boot/stage-1.nix b/nixos/modules/system/boot/stage-1.nix index cf211404649..cd30ce1b7ce 100644 --- a/nixos/modules/system/boot/stage-1.nix +++ b/nixos/modules/system/boot/stage-1.nix @@ -240,8 +240,9 @@ in example = "/dev/sda3"; description = '' Device for manual resume attempt during boot. This should be used primarily - if you want to resume from file. Specify here the device where the file - resides. You should also use boot.kernelParams to specify + if you want to resume from file. If left empty, the swap partitions are used. + Specify here the device where the file resides. + You should also use boot.kernelParams to specify resume_offset. ''; }; @@ -355,10 +356,17 @@ in config = mkIf (!config.boot.isContainer) { - assertions = singleton + assertions = [ { assertion = any (fs: fs.mountPoint == "/") (attrValues config.fileSystems); message = "The ‘fileSystems’ option does not specify your root file system."; - }; + } + { assertion = let inherit (config.boot) resumeDevice; in + resumeDevice == "" || builtins.substring 0 1 resumeDevice == "/"; + message = "boot.resumeDevice has to be an absolute path." + + " Old \"x:y\" style is no longer supported."; + } + ]; + system.build.bootStage1 = bootStage1; system.build.initialRamdisk = initialRamdisk; diff --git a/nixos/modules/system/boot/systemd.nix b/nixos/modules/system/boot/systemd.nix index 78fe8c49fb0..05f8c8009bf 100644 --- a/nixos/modules/system/boot/systemd.nix +++ b/nixos/modules/system/boot/systemd.nix @@ -348,7 +348,8 @@ let [Service] ${let env = cfg.globalEnvironment // def.environment; in concatMapStrings (n: - let s = "Environment=\"${n}=${env.${n}}\"\n"; + let s = optionalString (env."${n}" != null) + "Environment=\"${n}=${env.${n}}\"\n"; in if stringLength s >= 2048 then throw "The value of the environment variable ‘${n}’ in systemd service ‘${name}.service’ is too long." else s) (attrNames env)} ${if def.reloadIfChanged then '' X-ReloadIfChanged=true diff --git a/nixos/modules/tasks/filesystems/nfs.nix b/nixos/modules/tasks/filesystems/nfs.nix index 546145e54ac..75c4f93c691 100644 --- a/nixos/modules/tasks/filesystems/nfs.nix +++ b/nixos/modules/tasks/filesystems/nfs.nix @@ -58,7 +58,7 @@ in services.rpcbind.enable = true; - system.fsPackages = [ pkgs.nfsUtils ]; + system.fsPackages = [ pkgs.nfs-utils ]; boot.extraModprobeConfig = mkIf (cfg.lockdPort != null) '' options lockd nlm_udpport=${toString cfg.lockdPort} nlm_tcpport=${toString cfg.lockdPort} @@ -71,7 +71,7 @@ in systemd.services.statd = { description = "NFSv3 Network Status Monitor"; - path = [ pkgs.nfsUtils pkgs.sysvtools pkgs.utillinux ]; + path = [ pkgs.nfs-utils pkgs.sysvtools pkgs.utillinux ]; wantedBy = [ "remote-fs-pre.target" ]; before = [ "remote-fs-pre.target" ]; @@ -89,7 +89,7 @@ in serviceConfig.Type = "forking"; serviceConfig.ExecStart = '' - @${pkgs.nfsUtils}/sbin/rpc.statd rpc.statd --no-notify \ + @${pkgs.nfs-utils}/sbin/rpc.statd rpc.statd --no-notify \ ${if cfg.statdPort != null then "-p ${toString statdPort}" else ""} ''; serviceConfig.Restart = "always"; @@ -117,7 +117,7 @@ in ''; serviceConfig.Type = "forking"; - serviceConfig.ExecStart = "@${pkgs.nfsUtils}/sbin/rpc.idmapd rpc.idmapd -c ${idmapdConfFile}"; + serviceConfig.ExecStart = "@${pkgs.nfs-utils}/sbin/rpc.idmapd rpc.idmapd -c ${idmapdConfFile}"; serviceConfig.Restart = "always"; }; diff --git a/nixos/modules/tasks/network-interfaces-scripted.nix b/nixos/modules/tasks/network-interfaces-scripted.nix index 316e2e33eec..9d61a4b0530 100644 --- a/nixos/modules/tasks/network-interfaces-scripted.nix +++ b/nixos/modules/tasks/network-interfaces-scripted.nix @@ -1,7 +1,7 @@ { config, lib, pkgs, utils, ... }: -with lib; with utils; +with lib; let @@ -85,6 +85,12 @@ in optionalString (cfg.defaultGatewayWindowSize != null) "window ${cfg.defaultGatewayWindowSize}"} || true ''} + ${optionalString (cfg.defaultGateway6 != null && cfg.defaultGateway6 != "") '' + # FIXME: get rid of "|| true" (necessary to make it idempotent). + ip -6 route add ::/0 via "${cfg.defaultGateway6}" ${ + optionalString (cfg.defaultGatewayWindowSize != null) + "window ${cfg.defaultGatewayWindowSize}"} || true + ''} ''; }; diff --git a/nixos/modules/tasks/network-interfaces-systemd.nix b/nixos/modules/tasks/network-interfaces-systemd.nix index ee3efbbc9ff..70158fc7252 100644 --- a/nixos/modules/tasks/network-interfaces-systemd.nix +++ b/nixos/modules/tasks/network-interfaces-systemd.nix @@ -1,7 +1,7 @@ { config, lib, pkgs, utils, ... }: -with lib; with utils; +with lib; let @@ -51,6 +51,8 @@ in DHCP = override (dhcpStr cfg.useDHCP); } // optionalAttrs (cfg.defaultGateway != null) { gateway = override [ cfg.defaultGateway ]; + } // optionalAttrs (cfg.defaultGateway6 != null) { + gateway = override [ cfg.defaultGateway6 ]; } // optionalAttrs (domains != [ ]) { domains = override domains; }; diff --git a/nixos/modules/tasks/network-interfaces.nix b/nixos/modules/tasks/network-interfaces.nix index 9c6c71a1dbb..4a272483e54 100644 --- a/nixos/modules/tasks/network-interfaces.nix +++ b/nixos/modules/tasks/network-interfaces.nix @@ -233,8 +233,12 @@ in The 32-bit host ID of the machine, formatted as 8 hexadecimal characters. You should try to make this ID unique among your machines. You can - generate a random 32-bit ID using the following command: + generate a random 32-bit ID using the following commands: + cksum /etc/machine-id | while read c rest; do printf "%x" $c; done + + (this derives it from the machine-id that systemd generates) or + head -c4 /dev/urandom | od -A none -t x4 ''; }; @@ -256,6 +260,15 @@ in ''; }; + networking.defaultGateway6 = mkOption { + default = null; + example = "2001:4d0:1e04:895::1"; + type = types.nullOr types.str; + description = '' + The default ipv6 gateway. It can be left empty if it is auto-detected through DHCP. + ''; + }; + networking.defaultGatewayWindowSize = mkOption { default = null; example = 524288; diff --git a/nixos/modules/virtualisation/docker-image.nix b/nixos/modules/virtualisation/docker-image.nix index cabb1712b6c..0195ca5c6dc 100644 --- a/nixos/modules/virtualisation/docker-image.nix +++ b/nixos/modules/virtualisation/docker-image.nix @@ -1,67 +1,19 @@ -{ config, lib, pkgs, ... }: +{ config, pkgs, ... }: -with lib; - -let - pkgs2storeContents = l : map (x: { object = x; symlink = "none"; }) l; - -in { - # Create the tarball - system.build.dockerImage = import ../../lib/make-system-tarball.nix { - inherit (pkgs) stdenv perl xz pathsFromGraph; - - contents = []; - extraArgs = "--owner=0"; - storeContents = [ - { object = config.system.build.toplevel + "/init"; - symlink = "/bin/init"; - } - ] ++ (pkgs2storeContents [ pkgs.stdenv ]); - }; +{ + imports = [ + ../profiles/container.nix + ]; boot.postBootCommands = '' - # After booting, register the contents of the Nix store in the Nix - # database. - if [ -f /nix-path-registration ]; then - ${config.nix.package}/bin/nix-store --load-db < /nix-path-registration && - rm /nix-path-registration - fi - - # nixos-rebuild also requires a "system" profile and an - # /etc/NIXOS tag. - touch /etc/NIXOS - ${config.nix.package}/bin/nix-env -p /nix/var/nix/profiles/system --set /run/current-system - # Set virtualisation to docker - echo "docker" > /run/systemd/container + echo "docker" > /run/systemd/container ''; - - # Docker image config. - imports = [ - ../installer/cd-dvd/channel.nix - ../profiles/minimal.nix - ../profiles/clone-config.nix - ]; - - boot.isContainer = true; - # Iptables do not work in Docker. networking.firewall.enable = false; - services.openssh.enable = true; - # Socket activated ssh presents problem in Docker. services.openssh.startWhenNeeded = false; - - # Allow the user to login as root without password. - users.extraUsers.root.initialHashedPassword = mkOverride 150 ""; - - # Some more help text. - services.mingetty.helpLine = - '' - - Log in as "root" with an empty password. - ''; } diff --git a/nixos/modules/virtualisation/lxc-container.nix b/nixos/modules/virtualisation/lxc-container.nix new file mode 100644 index 00000000000..2fa749d542e --- /dev/null +++ b/nixos/modules/virtualisation/lxc-container.nix @@ -0,0 +1,26 @@ +{ config, pkgs, lib, ... }: + +with lib; + +{ + imports = [ + ../profiles/container.nix + ]; + + # Allow the user to login as root without password. + users.extraUsers.root.initialHashedPassword = mkOverride 150 ""; + + # Some more help text. + services.mingetty.helpLine = + '' + + Log in as "root" with an empty password. + ''; + + # Containers should be light-weight, so start sshd on demand. + services.openssh.enable = mkDefault true; + services.openssh.startWhenNeeded = mkDefault true; + + # Allow ssh connections + networking.firewall.allowedTCPPorts = [ 22 ]; +} diff --git a/nixos/modules/virtualisation/qemu-vm.nix b/nixos/modules/virtualisation/qemu-vm.nix index a7610b3e11a..42986aa3e03 100644 --- a/nixos/modules/virtualisation/qemu-vm.nix +++ b/nixos/modules/virtualisation/qemu-vm.nix @@ -57,8 +57,7 @@ let -name ${vmName} \ -m ${toString config.virtualisation.memorySize} \ ${optionalString (pkgs.stdenv.system == "x86_64-linux") "-cpu kvm64"} \ - -net nic,vlan=0,model=virtio \ - -net user,vlan=0''${QEMU_NET_OPTS:+,$QEMU_NET_OPTS} \ + ${concatStringsSep " " config.virtualisation.qemu.networkingOptions} \ -virtfs local,path=/nix/store,security_model=none,mount_tag=store \ -virtfs local,path=$TMPDIR/xchg,security_model=none,mount_tag=xchg \ -virtfs local,path=''${SHARED_DIR:-$TMPDIR/xchg},security_model=none,mount_tag=shared \ @@ -248,12 +247,31 @@ in description = "Primary IP address used in /etc/hosts."; }; - virtualisation.qemu.options = - mkOption { - default = []; - example = [ "-vga std" ]; - description = "Options passed to QEMU."; - }; + virtualisation.qemu = { + options = + mkOption { + default = []; + example = [ "-vga std" ]; + description = "Options passed to QEMU."; + }; + + networkingOptions = + mkOption { + default = [ + "-net nic,vlan=0,model=virtio" + "-net user,vlan=0\${QEMU_NET_OPTS:+,$QEMU_NET_OPTS}" + ]; + type = types.listOf types.str; + description = '' + Networking-related command-line options that should be passed to qemu. + The default is to use userspace networking (slirp). + + If you override this option, be adviced to keep + ''${QEMU_NET_OPTS:+,$QEMU_NET_OPTS} (as seen in the default) + to keep the default runtime behaviour. + ''; + }; + }; virtualisation.useBootLoader = mkOption { diff --git a/nixos/release-combined.nix b/nixos/release-combined.nix index e850c1f6cdd..f2f68a11a28 100644 --- a/nixos/release-combined.nix +++ b/nixos/release-combined.nix @@ -48,6 +48,7 @@ in rec { (all nixos.ova) #(all nixos.tests.containers) + (all nixos.tests.chromium) (all nixos.tests.firefox) (all nixos.tests.firewall) (all nixos.tests.gnome3) diff --git a/nixos/release.nix b/nixos/release.nix index e0530276b64..04b8fd9bf67 100644 --- a/nixos/release.nix +++ b/nixos/release.nix @@ -213,6 +213,12 @@ in rec { inherit system; }); + # Provide container tarball for lxc, libvirt-lxc, docker-lxc, ... + containerTarball = forAllSystems (system: makeSystemTarball { + module = ./modules/virtualisation/lxc-container.nix; + inherit system; + }); + /* system_tarball_fuloong2f = assert builtins.currentSystem == "mips64-linux"; @@ -244,6 +250,8 @@ in rec { tests.etcd = scrubDrv (import tests/etcd.nix { system = "x86_64-linux"; }); tests.firefox = callTest tests/firefox.nix {}; tests.firewall = callTest tests/firewall.nix {}; + tests.fleet = scrubDrv (import tests/fleet.nix { system = "x86_64-linux"; }); + tests.gitlab = callTest tests/gitlab.nix {}; tests.gnome3 = callTest tests/gnome3.nix {}; tests.installer.grub1 = forAllSystems (system: scrubDrv (import tests/installer.nix { inherit system; }).grub1.test); tests.installer.lvm = forAllSystems (system: scrubDrv (import tests/installer.nix { inherit system; }).lvm.test); @@ -299,6 +307,7 @@ in rec { tests.simple = callTest tests/simple.nix {}; tests.tomcat = callTest tests/tomcat.nix {}; tests.udisks2 = callTest tests/udisks2.nix {}; + tests.virtualbox = callTest tests/virtualbox.nix {}; tests.xfce = callTest tests/xfce.nix {}; diff --git a/nixos/tests/bittorrent.nix b/nixos/tests/bittorrent.nix index 3500ad8ccc3..0d0f00212a0 100644 --- a/nixos/tests/bittorrent.nix +++ b/nixos/tests/bittorrent.nix @@ -81,7 +81,7 @@ in # Create the torrent. $tracker->succeed("mkdir /tmp/data"); $tracker->succeed("cp ${file} /tmp/data/test.tar.bz2"); - $tracker->succeed("transmission-create /tmp/data/test.tar.bz2 -t http://${(pkgs.lib.head nodes.tracker.config.networking.interfaces.eth1.ip4).address}:6969/announce -o /tmp/test.torrent"); + $tracker->succeed("transmission-create /tmp/data/test.tar.bz2 -p -t http://${(pkgs.lib.head nodes.tracker.config.networking.interfaces.eth1.ip4).address}:6969/announce -o /tmp/test.torrent"); $tracker->succeed("chmod 644 /tmp/test.torrent"); # Start the tracker. !!! use a less crappy tracker diff --git a/nixos/tests/blivet.nix b/nixos/tests/blivet.nix index acaf4fec614..72c2a33f87e 100644 --- a/nixos/tests/blivet.nix +++ b/nixos/tests/blivet.nix @@ -43,11 +43,6 @@ import ./make-test.nix ({ pkgs, ... }: with pkgs.pythonPackages; rec { TMPDIR=/tmp/xchg/bigtmp export TMPDIR - mkPythonPath() { - nix-store -qR "$@" \ - | sed -e 's|$|/lib/${pkgs.python.libPrefix}/site-packages|' - } - cp -Rd "${blivet.src}/tests" . # Skip SELinux tests @@ -73,8 +68,11 @@ import ./make-test.nix ({ pkgs, ... }: with pkgs.pythonPackages; rec { -e 's|_STORE_FILE_PATH = .*|_STORE_FILE_PATH = tempfile.gettempdir()|' \ tests/loopbackedtestcase.py - PYTHONPATH=".:$(mkPythonPath "${blivet}" "${mock}" | paste -sd :)" \ - python "${pythonTestRunner}" + PYTHONPATH=".:$(< "${pkgs.stdenv.mkDerivation { + name = "blivet-pythonpath"; + buildInputs = [ blivet mock ]; + buildCommand = "echo \"$PYTHONPATH\" > \"$out\""; + }}")" python "${pythonTestRunner}" ''; testScript = '' diff --git a/nixos/tests/containers.nix b/nixos/tests/containers.nix index e0add8a936f..e40a8100a06 100644 --- a/nixos/tests/containers.nix +++ b/nixos/tests/containers.nix @@ -43,7 +43,7 @@ import ./make-test.nix { $machine->fail("curl --fail --connect-timeout 2 http://$ip/ > /dev/null"); # Make sure we have a NixOS tree (required by ‘nixos-container create’). - $machine->succeed("nix-env -qa -A nixos.pkgs.hello >&2"); + $machine->succeed("PAGER=cat nix-env -qa -A nixos.pkgs.hello >&2"); # Create some containers imperatively. my $id1 = $machine->succeed("nixos-container create foo --ensure-unique-name"); diff --git a/nixos/tests/fleet.nix b/nixos/tests/fleet.nix new file mode 100644 index 00000000000..c60f596b6f5 --- /dev/null +++ b/nixos/tests/fleet.nix @@ -0,0 +1,73 @@ +import ./make-test.nix rec { + name = "simple"; + + nodes = { + node1 = + { config, pkgs, ... }: + { + services = { + etcd = { + enable = true; + listenPeerUrls = ["http://0.0.0.0:7001"]; + initialAdvertisePeerUrls = ["http://node1:7001"]; + initialCluster = ["node1=http://node1:7001" "node2=http://node2:7001"]; + }; + }; + + services.fleet = { + enable = true; + metadata.name = "node1"; + }; + + networking.firewall.allowedTCPPorts = [ 7001 ]; + }; + + node2 = + { config, pkgs, ... }: + { + services = { + etcd = { + enable = true; + listenPeerUrls = ["http://0.0.0.0:7001"]; + initialAdvertisePeerUrls = ["http://node2:7001"]; + initialCluster = ["node1=http://node1:7001" "node2=http://node2:7001"]; + }; + }; + + services.fleet = { + enable = true; + metadata.name = "node2"; + }; + + networking.firewall.allowedTCPPorts = [ 7001 ]; + }; + }; + + service = builtins.toFile "hello.service" '' + [Unit] + Description=Hello World + + [Service] + ExecStart=/bin/sh -c "while true; do echo \"Hello, world\"; /var/run/current-system/sw/bin/sleep 1; done" + + [X-Fleet] + MachineMetadata=name=node2 + ''; + + testScript = + '' + startAll; + $node1->waitForUnit("fleet.service"); + $node2->waitForUnit("fleet.service"); + + $node2->waitUntilSucceeds("fleetctl list-machines | grep node1"); + $node1->waitUntilSucceeds("fleetctl list-machines | grep node2"); + + $node1->succeed("cp ${service} hello.service && fleetctl submit hello.service"); + $node1->succeed("fleetctl list-unit-files | grep hello"); + $node1->succeed("fleetctl start hello.service"); + $node1->waitUntilSucceeds("fleetctl list-units | grep running"); + $node1->succeed("fleetctl stop hello.service"); + $node1->succeed("fleetctl destroy hello.service"); + ''; +} diff --git a/nixos/tests/gitlab.nix b/nixos/tests/gitlab.nix new file mode 100644 index 00000000000..27c65fe47e8 --- /dev/null +++ b/nixos/tests/gitlab.nix @@ -0,0 +1,21 @@ +# This test runs gitlab and checks if it works + +import ./make-test.nix { + name = "gitlab"; + + nodes = { + gitlab = { config, pkgs, ... }: { + virtualisation.memorySize = 768; + services.gitlab.enable = true; + services.gitlab.databasePassword = "gitlab"; + systemd.services.gitlab.serviceConfig.TimeoutStartSec = "10min"; + }; + }; + + testScript = '' + $gitlab->start(); + $gitlab->waitForUnit("gitlab.service"); + $gitlab->waitForUnit("gitlab-sidekiq.service"); + $gitlab->waitUntilSucceeds("curl http://localhost:8080/users/sign_in"); + ''; +} diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix index f27854f7645..641ff924e14 100644 --- a/nixos/tests/installer.nix +++ b/nixos/tests/installer.nix @@ -29,6 +29,10 @@ let pkgs.unionfs-fuse pkgs.gummiboot ]; + + # Don't use https://cache.nixos.org since the fake + # cache.nixos.org doesn't do https. + nix.binaryCaches = [ http://cache.nixos.org/ ]; } ]; }).config.system.build.isoImage; @@ -38,7 +42,7 @@ let makeConfig = { testChannel, grubVersion, grubDevice, grubIdentifier , readOnly ? true, forceGrubReinstallCount ? 0 }: pkgs.writeText "configuration.nix" '' - { config, pkgs, modulesPath, ... }: + { config, lib, pkgs, modulesPath, ... }: { imports = [ ./hardware-configuration.nix @@ -58,9 +62,9 @@ let ${optionalString (!readOnly) "nix.readOnlyStore = false;"} - swapDevices = mkOverride 0 [ ]; - environment.systemPackages = [ ${optionalString testChannel "pkgs.rlwrap"} ]; + + nix.binaryCaches = [ http://cache.nixos.org/ ]; } ''; @@ -68,7 +72,7 @@ let # Configuration of a web server that simulates the Nixpkgs channel # distribution server. webserver = - { config, pkgs, ... }: + { config, lib, pkgs, ... }: { services.httpd.enable = true; services.httpd.adminAddr = "foo@example.org"; @@ -187,8 +191,9 @@ let $machine->succeed("test -e /boot/grub"); # Did the swap device get activated? - $machine->waitForUnit("swap.target"); - $machine->succeed("cat /proc/swaps | grep -q /dev"); + # uncomment once https://bugs.freedesktop.org/show_bug.cgi?id=86930 is resolved + #$machine->waitForUnit("swap.target"); + $machine->waitUntilSucceeds("cat /proc/swaps | grep -q /dev"); # Check whether the channel works. $machine->succeed("nix-env -i coreutils >&2"); diff --git a/nixos/tests/kubernetes.nix b/nixos/tests/kubernetes.nix index e5fe8d2b879..8bc7c8d618a 100644 --- a/nixos/tests/kubernetes.nix +++ b/nixos/tests/kubernetes.nix @@ -45,10 +45,10 @@ import ./make-test.nix rec { nodes = { master = - { config, pkgs, nodes, ... }: + { config, pkgs, lib, nodes, ... }: { - virtualisation.memorySize = 512; - virtualisation.kubernetes = { + virtualisation.memorySize = 768; + services.kubernetes = { roles = ["master" "node"]; controllerManager.machines = ["master" "node"]; kubelet.extraOpts = "-network_container_image=master:5000/pause"; @@ -75,6 +75,7 @@ import ./make-test.nix rec { ipAddress = "10.10.0.1"; prefixLength = 24; }; + eth2.ip4 = lib.mkOverride 0 [ ]; }; networking.localCommands = '' ip route add 10.10.0.0/16 dev cbr0 @@ -89,9 +90,9 @@ import ./make-test.nix rec { }; node = - { config, pkgs, nodes, ... }: + { config, pkgs, lib, nodes, ... }: { - virtualisation.kubernetes = { + services.kubernetes = { roles = ["node"]; kubelet.extraOpts = "-network_container_image=master:5000/pause"; verbose = true; @@ -112,6 +113,7 @@ import ./make-test.nix rec { ipAddress = "10.10.1.1"; prefixLength = 24; }; + eth2.ip4 = lib.mkOverride 0 [ ]; }; networking.localCommands = '' ip route add 10.10.0.0/16 dev cbr0 diff --git a/nixos/tests/mesos.nix b/nixos/tests/mesos.nix new file mode 100644 index 00000000000..040f613c596 --- /dev/null +++ b/nixos/tests/mesos.nix @@ -0,0 +1,29 @@ +import ./make-test.nix { + name = "simple"; + + machine = { config, pkgs, ... }: { + services.zookeeper.enable = true; + virtualisation.docker.enable = true; + services.mesos = { + slave = { + enable = true; + master = "zk://localhost:2181/mesos"; + attributes = { + tag1 = "foo"; + tag2 = "bar"; + }; + }; + master = { + enable = true; + zk = "zk://localhost:2181/mesos"; + }; + }; + }; + + testScript = + '' + startAll; + $machine->waitForUnit("mesos-master.service"); + $machine->waitForUnit("mesos-slave.service"); + ''; +} diff --git a/nixos/tests/quake3.nix b/nixos/tests/quake3.nix index b16cb179982..e0e6d6eaadb 100644 --- a/nixos/tests/quake3.nix +++ b/nixos/tests/quake3.nix @@ -15,14 +15,14 @@ in rec { name = "quake3"; - makeCoverageReport = true; + # TODO: lcov doesn't work atm + #makeCoverageReport = true; client = { config, pkgs, ... }: { imports = [ ./common/x11.nix ]; hardware.opengl.driSupport = true; - services.xserver.defaultDepth = pkgs.lib.mkOverride 0 16; environment.systemPackages = [ pkgs.quake3demo ]; nixpkgs.config.packageOverrides = overrides; }; diff --git a/nixos/tests/virtualbox.nix b/nixos/tests/virtualbox.nix new file mode 100644 index 00000000000..b2b1ec87779 --- /dev/null +++ b/nixos/tests/virtualbox.nix @@ -0,0 +1,401 @@ +import ./make-test.nix ({ pkgs, ... }: with pkgs.lib; let + + debug = false; + + testVMConfig = vmName: attrs: { config, pkgs, ... }: { + boot.kernelParams = let + miniInit = '' + #!${pkgs.stdenv.shell} -xe + export PATH="${pkgs.coreutils}/bin:${pkgs.utillinux}/bin" + + ${pkgs.linuxPackages.virtualboxGuestAdditions}/sbin/VBoxService + ${(attrs.vmScript or (const "")) pkgs} + + i=0 + while [ ! -e /mnt-root/shutdown ]; do + sleep 10 + i=$(($i + 10)) + [ $i -le 120 ] || fail + done + + rm -f /mnt-root/boot-done /mnt-root/shutdown + ''; + in [ + "console=tty0" "console=ttyS0" "ignore_loglevel" + "boot.trace" "panic=1" "boot.panic_on_fail" + "init=${pkgs.writeScript "mini-init.sh" miniInit}" + ]; + + fileSystems."/" = { + device = "vboxshare"; + fsType = "vboxsf"; + }; + + services.virtualboxGuest.enable = true; + + boot.initrd.kernelModules = [ + "af_packet" "vboxsf" + "virtio" "virtio_pci" "virtio_ring" "virtio_net" "vboxguest" + ]; + + boot.initrd.extraUtilsCommands = '' + cp -av -t "$out/bin/" \ + "${pkgs.linuxPackages.virtualboxGuestAdditions}/sbin/mount.vboxsf" \ + "${pkgs.utillinux}/bin/unshare" + ${(attrs.extraUtilsCommands or (const "")) pkgs} + ''; + + boot.initrd.postMountCommands = '' + touch /mnt-root/boot-done + hostname "${vmName}" + mkdir -p /nix/store + unshare -m "@shell@" -c ' + mount -t vboxsf nixstore /nix/store + exec "$stage2Init" + ' + poweroff -f + ''; + + system.requiredKernelConfig = with config.lib.kernelConfig; [ + (isYes "SERIAL_8250_CONSOLE") + (isYes "SERIAL_8250") + ]; + }; + + mkLog = logfile: tag: let + rotated = map (i: "${logfile}.${toString i}") (range 1 9); + all = concatMapStringsSep " " (f: "\"${f}\"") ([logfile] ++ rotated); + logcmd = "tail -F ${all} 2> /dev/null | logger -t \"${tag}\""; + in optionalString debug "$machine->execute(ru '${logcmd} & disown');"; + + testVM = vmName: vmScript: let + cfg = (import ../lib/eval-config.nix { + system = "i686-linux"; + modules = [ + ../modules/profiles/minimal.nix + (testVMConfig vmName vmScript) + ]; + }).config; + in pkgs.vmTools.runInLinuxVM (pkgs.runCommand "virtualbox-image" { + preVM = '' + mkdir -p "$out" + diskImage="$(pwd)/qimage" + ${pkgs.vmTools.qemu}/bin/qemu-img create -f raw "$diskImage" 100M + ''; + + postVM = '' + echo "creating VirtualBox disk image..." + ${pkgs.vmTools.qemu}/bin/qemu-img convert -f raw -O vdi \ + "$diskImage" "$out/disk.vdi" + ''; + + buildInputs = [ pkgs.utillinux pkgs.perl ]; + } '' + ${pkgs.parted}/sbin/parted /dev/vda mklabel msdos + ${pkgs.parted}/sbin/parted /dev/vda -- mkpart primary ext2 1M -1s + . /sys/class/block/vda1/uevent + mknod /dev/vda1 b $MAJOR $MINOR + + ${pkgs.e2fsprogs}/sbin/mkfs.ext4 /dev/vda1 + ${pkgs.e2fsprogs}/sbin/tune2fs -c 0 -i 0 /dev/vda1 + mkdir /mnt + mount /dev/vda1 /mnt + cp "${cfg.system.build.kernel}/bzImage" /mnt/linux + cp "${cfg.system.build.initialRamdisk}/initrd" /mnt/initrd + + ${pkgs.grub2}/bin/grub-install --boot-directory=/mnt /dev/vda + + cat > /mnt/grub/grub.cfg <execute(ru $cmd); + return $status == 0; + } + + sub cleanup_${name} { + $machine->execute(ru "VBoxManage controlvm ${name} poweroff") + if checkRunning_${name}; + $machine->succeed("rm -rf ${sharePath}"); + $machine->succeed("mkdir -p ${sharePath}"); + $machine->succeed("chown alice.users ${sharePath}"); + } + + sub createVM_${name} { + vbm("createvm --name ${name} ${createFlags}"); + vbm("modifyvm ${name} ${vmFlags}"); + vbm("setextradata ${name} VBoxInternal/PDM/HaltOnReset 1"); + vbm("storagectl ${name} ${controllerFlags}"); + vbm("storageattach ${name} ${diskFlags}"); + vbm("sharedfolder add ${name} ${sharedFlags}"); + vbm("sharedfolder add ${name} ${nixstoreFlags}"); + cleanup_${name}; + + ${mkLog "$HOME/VirtualBox VMs/${name}/Logs/VBox.log" "HOST-${name}"} + } + + sub destroyVM_${name} { + cleanup_${name}; + vbm("unregistervm ${name} --delete"); + } + + sub waitForVMBoot_${name} { + $machine->execute(ru( + 'set -e; i=0; '. + 'while ! test -e ${sharePath}/boot-done; do '. + 'sleep 10; i=$(($i + 10)); [ $i -le 3600 ]; '. + 'VBoxManage list runningvms | grep -q "^\"${name}\""; '. + 'done' + )); + } + + sub waitForIP_${name} ($) { + my $property = "/VirtualBox/GuestInfo/Net/$_[0]/V4/IP"; + my $getip = "VBoxManage guestproperty get ${name} $property | ". + "sed -n -e 's/^Value: //p'"; + my $ip = $machine->succeed(ru( + 'for i in $(seq 1000); do '. + 'if ipaddr="$('.$getip.')" && [ -n "$ipaddr" ]; then '. + 'echo "$ipaddr"; exit 0; '. + 'fi; '. + 'sleep 1; '. + 'done; '. + 'echo "Could not get IPv4 address for ${name}!" >&2; '. + 'exit 1' + )); + chomp $ip; + return $ip; + } + + sub waitForStartup_${name} { + for (my $i = 0; $i <= 120; $i += 10) { + $machine->sleep(10); + return if checkRunning_${name}; + } + die "VirtualBox VM didn't start up within 2 minutes"; + } + + sub waitForShutdown_${name} { + for (my $i = 0; $i <= 120; $i += 10) { + $machine->sleep(10); + return unless checkRunning_${name}; + } + die "VirtualBox VM didn't shut down within 2 minutes"; + } + + sub shutdownVM_${name} { + $machine->succeed(ru "touch ${sharePath}/shutdown"); + $machine->waitUntilSucceeds( + "test ! -e ${sharePath}/shutdown ". + " -a ! -e ${sharePath}/boot-done" + ); + waitForShutdown_${name}; + } + ''; + }; + + hostonlyVMFlags = [ + "--nictype1 virtio" + "--nictype2 virtio" + "--nic2 hostonly" + "--hostonlyadapter2 vboxnet0" + ]; + + dhcpScript = pkgs: '' + ${pkgs.dhcp}/bin/dhclient \ + -lf /run/dhcp.leases \ + -pf /run/dhclient.pid \ + -v eth0 eth1 + + otherIP="$(${pkgs.netcat}/bin/netcat -clp 1234 || :)" + ${pkgs.iputils}/bin/ping -I eth1 -c1 "$otherIP" + echo "$otherIP reachable" | ${pkgs.netcat}/bin/netcat -clp 5678 || : + ''; + + vboxVMs = mapAttrs createVM { + simple = {}; + + test1.vmFlags = hostonlyVMFlags; + test1.vmScript = dhcpScript; + + test2.vmFlags = hostonlyVMFlags; + test2.vmScript = dhcpScript; + }; + +in { + name = "virtualbox"; + + machine = { pkgs, lib, config, ... }: { + imports = let + mkVMConf = name: val: val.machine // { key = "${name}-config"; }; + vmConfigs = mapAttrsToList mkVMConf vboxVMs; + in [ ./common/user-account.nix ./common/x11.nix ] ++ vmConfigs; + virtualisation.memorySize = 768; + services.virtualboxHost.enable = true; + users.extraUsers.alice.extraGroups = let + inherit (config.services.virtualboxHost) enableHardening; + in lib.mkIf enableHardening (lib.singleton "vboxusers"); + }; + + testScript = '' + sub ru ($) { + my $esc = $_[0] =~ s/'/'\\${"'"}'/gr; + return "su - alice -c '$esc'"; + } + + sub vbm { + $machine->succeed(ru("VBoxManage ".$_[0])); + }; + + ${concatStrings (mapAttrsToList (_: getAttr "testSubs") vboxVMs)} + + $machine->waitForX; + + ${mkLog "$HOME/.config/VirtualBox/VBoxSVC.log" "HOST-SVC"} + + createVM_simple; + + subtest "simple-gui", sub { + $machine->succeed(ru "VirtualBox &"); + $machine->waitForWindow(qr/Oracle VM VirtualBox Manager/); + $machine->sleep(5); + $machine->screenshot("gui_manager_started"); + $machine->sendKeys("ret"); + $machine->screenshot("gui_manager_sent_startup"); + waitForStartup_simple; + $machine->screenshot("gui_started"); + waitForVMBoot_simple; + $machine->screenshot("gui_booted"); + shutdownVM_simple; + $machine->sleep(5); + $machine->screenshot("gui_stopped"); + $machine->sendKeys("ctrl-q"); + $machine->sleep(5); + $machine->screenshot("gui_manager_stopped"); + }; + + cleanup_simple; + + subtest "simple-cli", sub { + vbm("startvm simple"); + waitForStartup_simple; + $machine->screenshot("cli_started"); + waitForVMBoot_simple; + $machine->screenshot("cli_booted"); + shutdownVM_simple; + }; + + subtest "privilege-escalation", sub { + $machine->fail("test -e '/root/VirtualBox VMs'"); + $machine->fail("test -e '/root/.config/VirtualBox'"); + $machine->succeed("test -e '/home/alice/VirtualBox VMs'"); + }; + + destroyVM_simple; + + subtest "net-hostonlyif", sub { + createVM_test1; + createVM_test2; + + vbm("startvm test1"); + waitForStartup_test1; + + vbm("startvm test2"); + waitForStartup_test2; + + waitForVMBoot_test1; + waitForVMBoot_test2; + + $machine->screenshot("net_booted"); + + my $test1IP = waitForIP_test1 1; + my $test2IP = waitForIP_test2 1; + + $machine->succeed("echo '$test2IP' | netcat -c '$test1IP' 1234"); + $machine->succeed("echo '$test1IP' | netcat -c '$test2IP' 1234"); + + $machine->waitUntilSucceeds("netcat -c '$test1IP' 5678 >&2"); + $machine->waitUntilSucceeds("netcat -c '$test2IP' 5678 >&2"); + + shutdownVM_test1; + shutdownVM_test2; + + destroyVM_test1; + destroyVM_test2; + }; + ''; +}) diff --git a/pkgs/applications/audio/amarok/default.nix b/pkgs/applications/audio/amarok/default.nix index b1bcfe869f7..d695150bf31 100644 --- a/pkgs/applications/audio/amarok/default.nix +++ b/pkgs/applications/audio/amarok/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { QT_PLUGIN_PATH="${qtscriptgenerator}/lib/qt4/plugins"; - buildInputs = [ qtscriptgenerator stdenv.gcc.libc gettext curl + buildInputs = [ qtscriptgenerator stdenv.cc.libc gettext curl libxml2 mysql taglib taglib_extras loudmouth kdelibs automoc4 phonon strigi soprano qca2 libmtp liblastfm libgpod pkgconfig qjson ffmpeg libofa nepomuk_core ]; diff --git a/pkgs/applications/audio/audacious/default.nix b/pkgs/applications/audio/audacious/default.nix index 49b02f46e9b..3ab113c92e8 100644 --- a/pkgs/applications/audio/audacious/default.nix +++ b/pkgs/applications/audio/audacious/default.nix @@ -4,20 +4,19 @@ , mpg123, neon, faad2 }: -let - version = "3.5.1"; -in +let version = "3.5.2"; in + stdenv.mkDerivation { name = "audacious-${version}"; src = fetchurl { url = "http://distfiles.audacious-media-player.org/audacious-${version}.tar.bz2"; - sha256 = "01wmlvpp540gdjw759wif3byh98h3b3q6f5wawzp0b0ivqd0wf6z"; + sha256 = "0mhrdj76h0g6q197wgp8rxk6gqsrirrw49hfidcb5b7q5rlvj59r"; }; pluginsSrc = fetchurl { url = "http://distfiles.audacious-media-player.org/audacious-plugins-${version}.tar.bz2"; - sha256 = "09lyvi15hbn3pvb2izyz2bm4021917mhcdrwxrn3q3sjvx337np6"; + sha256 = "1nacd8n46q3pqnwavq3i2ayls609gvxfcp3qqpcsfcdfz3bh15hp"; }; buildInputs = diff --git a/pkgs/applications/audio/cantata/default.nix b/pkgs/applications/audio/cantata/default.nix index 10baf254dc7..773f3dd82bb 100644 --- a/pkgs/applications/audio/cantata/default.nix +++ b/pkgs/applications/audio/cantata/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, cmake -, withQt4 ? true, qt4 -, withQt5 ? false, qt5 +, withQt4 ? false, qt4 +, withQt5 ? true, qt5 # I'm unable to make KDE work here, crashes at runtime so I simply # make Qt4 the default until someone who wants KDE can figure it out. @@ -39,7 +39,7 @@ assert withOnlineServices -> withTaglib; assert withReplaygain -> withTaglib; let - version = "1.5.0"; + version = "1.5.1"; pname = "cantata"; fstat = x: fn: "-DENABLE_" + fn + "=" + (if x then "ON" else "OFF"); fstats = x: map (fstat x); @@ -50,8 +50,8 @@ stdenv.mkDerivation rec { src = fetchurl { inherit name; - url = "https://drive.google.com/uc?export=download&id=0Bzghs6gQWi60c0pFbEtldEk1UnM"; - sha256 = "0gnqfp3ps79d500hrivxj2xkkia042knhg86md6w8ycl3945611p"; + url = "https://drive.google.com/uc?export=download&id=0Bzghs6gQWi60UktwaTRMTjRIUW8"; + sha256 = "0y7y3nbiqgh1ghb47n4lfyp163wvazvhavlshb1c18ik03fkn5sp"; }; buildInputs = diff --git a/pkgs/applications/audio/cava/default.nix b/pkgs/applications/audio/cava/default.nix new file mode 100644 index 00000000000..c1b5aef333b --- /dev/null +++ b/pkgs/applications/audio/cava/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchgit, alsaLib, fftw }: + +stdenv.mkDerivation rec { + name = "cava-${version}"; + version = "27dbdf47daae44c780db9998c760007b3bf63738"; + + buildInputs = [ alsaLib fftw ]; + + src = fetchgit { + url = "https://github.com/karlstav/cava"; + rev = version; + sha256 = "1a61e2c869376276cf78e6446cd1cc7f96b3e378fa8bc0bc4c5ca81945429909"; + }; + + installPhase = '' + mkdir -p $out/bin + cp cava $out/bin + ''; + + meta = with stdenv.lib; { + description = "Console-based Audio Visualizer for Alsa"; + homepage = https://github.com/karlstav/cava; + maintainers = with maintainers; [offline]; + platforms = with platforms; linux; + }; +} diff --git a/pkgs/applications/audio/cdparanoia/default.nix b/pkgs/applications/audio/cdparanoia/default.nix index 6bd9e0b376e..5c5416b79e1 100644 --- a/pkgs/applications/audio/cdparanoia/default.nix +++ b/pkgs/applications/audio/cdparanoia/default.nix @@ -7,6 +7,8 @@ stdenv.mkDerivation rec { url = "http://downloads.xiph.org/releases/cdparanoia/${name}.src.tgz"; sha256 = "1pv4zrajm46za0f6lv162iqffih57a8ly4pc69f7y0gfyigb8p80"; }; + + preConfigure = "unset CC"; meta = { homepage = http://xiph.org/paranoia; diff --git a/pkgs/applications/audio/easytag/default.nix b/pkgs/applications/audio/easytag/default.nix index d4927cc1a71..2d738f55c28 100644 --- a/pkgs/applications/audio/easytag/default.nix +++ b/pkgs/applications/audio/easytag/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, pkgconfig, intltool, gtk3, glib, libid3tag, id3lib, taglib , libvorbis, libogg, flac, itstool, libxml2, gsettings_desktop_schemas -, makeWrapper, gnome_icon_theme +, makeWrapper, gnome_icon_theme, dconf }: stdenv.mkDerivation rec { @@ -14,7 +14,8 @@ stdenv.mkDerivation rec { preFixup = '' wrapProgram $out/bin/easytag \ - --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH:$out/share" + --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH:$out/share" \ + --prefix GIO_EXTRA_MODULES : "${dconf}/lib/gio/modules" ''; NIX_LDFLAGS = "-lid3tag -lz"; @@ -22,7 +23,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper ]; buildInputs = [ pkgconfig intltool gtk3 glib libid3tag id3lib taglib libvorbis libogg flac - itstool libxml2 gsettings_desktop_schemas gnome_icon_theme + itstool libxml2 gsettings_desktop_schemas gnome_icon_theme dconf ]; meta = { diff --git a/pkgs/applications/audio/flac/default.nix b/pkgs/applications/audio/flac/default.nix index cb3ec1da97c..5dd70673521 100644 --- a/pkgs/applications/audio/flac/default.nix +++ b/pkgs/applications/audio/flac/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, libogg }: stdenv.mkDerivation rec { - name = "flac-1.3.0"; + name = "flac-1.3.1"; src = fetchurl { url = "http://downloads.xiph.org/releases/flac/${name}.tar.xz"; - sha256 = "1p0hh190kqvpkbk1bbajd81jfbmkyl4fn2i7pggk2zppq6m68bgs"; + sha256 = "4773c0099dba767d963fd92143263be338c48702172e8754b9bc5103efe1c56c"; }; buildInputs = [ libogg ]; diff --git a/pkgs/applications/audio/fldigi/default.nix b/pkgs/applications/audio/fldigi/default.nix index e0250055ccd..5a4793a09c1 100644 --- a/pkgs/applications/audio/fldigi/default.nix +++ b/pkgs/applications/audio/fldigi/default.nix @@ -2,13 +2,13 @@ libsamplerate, pulseaudio, libXinerama, gettext, pkgconfig, alsaLib }: stdenv.mkDerivation rec { - version = "3.21.83"; + version = "3.22.02"; pname = "fldigi"; name = "${pname}-${version}"; src = fetchurl { url = "http://www.w1hkj.com/downloads/${pname}/${name}.tar.gz"; - sha256 = "1fyg6dc6xnxb620rrhws60wj10lsgbwsmnhz8vc6ncspx8mx7019"; + sha256 = "1gry3r133j2x99h0ji56v6yjxzvbi0hb18p1lbkr9djzjvf591j3"; }; buildInputs = [ libXinerama gettext hamlib fltk13 libjpeg libpng portaudio diff --git a/pkgs/applications/audio/gmpc/default.nix b/pkgs/applications/audio/gmpc/default.nix index c151deddd70..7cc8aeda367 100644 --- a/pkgs/applications/audio/gmpc/default.nix +++ b/pkgs/applications/audio/gmpc/default.nix @@ -13,6 +13,7 @@ stdenv.mkDerivation rec { url = http://download.sarine.nl/Programs/gmpc/11.8/libmpd-11.8.17.tar.gz; sha256 = "10vspwsgr8pwf3qp2bviw6b2l8prgdiswgv7qiqiyr0h1mmk487y"; }; + patches = [ ./libmpd-11.8.17-remove-strndup.patch ]; buildInputs = [ pkgconfig glib ]; }; diff --git a/pkgs/applications/audio/gmpc/libmpd-11.8.17-remove-strndup.patch b/pkgs/applications/audio/gmpc/libmpd-11.8.17-remove-strndup.patch new file mode 100644 index 00000000000..ad4fdc02ef3 --- /dev/null +++ b/pkgs/applications/audio/gmpc/libmpd-11.8.17-remove-strndup.patch @@ -0,0 +1,15 @@ +diff --git a/src/libmpd-internal.h b/src/libmpd-internal.h +index c84c3a4..51be441 100644 +--- a/src/libmpd-internal.h ++++ b/src/libmpd-internal.h +@@ -206,10 +206,6 @@ int mpd_unlock_conn(MpdObj *mi); + MpdData * mpd_misc_sort_tag_list(MpdData *data); + + +-#ifndef HAVE_STRNDUP +-char * strndup (const char *s, size_t n); +-#endif +- + int mpd_server_get_allowed_commands(MpdObj *mi); + typedef enum _MpdSearchType { + MPD_SEARCH_TYPE_NONE, diff --git a/pkgs/applications/audio/google-musicmanager/default.nix b/pkgs/applications/audio/google-musicmanager/default.nix index 63a87b31554..f50d294f676 100644 --- a/pkgs/applications/audio/google-musicmanager/default.nix +++ b/pkgs/applications/audio/google-musicmanager/default.nix @@ -33,8 +33,8 @@ stdenv.mkDerivation rec { buildPhase = '' patchelf \ - --set-interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \ - --set-rpath "$out/opt/google/musicmanager:${readline}/lib:${ncurses}/lib:${stdenv.gcc.libc}/lib:${qt48}/lib:${stdenv.gcc.gcc}/lib:${libidn}/lib:${expat}/lib:${flac}/lib:${libvorbis}/lib" opt/google/musicmanager/MusicManager + --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + --set-rpath "$out/opt/google/musicmanager:${readline}/lib:${ncurses}/lib:${stdenv.cc.libc}/lib:${qt48}/lib:${stdenv.cc.gcc}/lib:${libidn}/lib:${expat}/lib:${flac}/lib:${libvorbis}/lib" opt/google/musicmanager/MusicManager ''; dontPatchELF = true; diff --git a/pkgs/applications/audio/guitarix/default.nix b/pkgs/applications/audio/guitarix/default.nix index c4ba88c87ed..8ffc760a88f 100644 --- a/pkgs/applications/audio/guitarix/default.nix +++ b/pkgs/applications/audio/guitarix/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "guitarix-${version}"; - version = "0.32.0"; + version = "0.32.1"; src = fetchurl { url = "mirror://sourceforge/guitarix/guitarix2-${version}.tar.bz2"; - sha256 = "06qxydcba1ga1l19kyqy0mk141mv6pa4wbkyh75xbwhyr65bwkc4"; + sha256 = "1sl7ca1lj0wchh3xq7qw3zqrbyyh4r8cwljb9i3yplpsn90d1i3k"; }; buildInputs = [ diff --git a/pkgs/applications/audio/ingen/default.nix b/pkgs/applications/audio/ingen/default.nix index 450b57a6819..d4abbbe0083 100644 --- a/pkgs/applications/audio/ingen/default.nix +++ b/pkgs/applications/audio/ingen/default.nix @@ -1,27 +1,37 @@ { stdenv, fetchsvn, boost, ganv, glibmm, gtk, gtkmm, jack2, lilv -, lv2, pkgconfig, python, raul, serd, sord, sratom, suil +, lv2, makeWrapper, pkgconfig, python, raul, rdflib, serd, sord, sratom +, suil }: stdenv.mkDerivation rec { name = "ingen-svn-${rev}"; - rev = "5464"; + rev = "5490"; src = fetchsvn { url = "http://svn.drobilla.net/lad/trunk/ingen"; rev = rev; - sha256 = "1p5rsxwanpj3kj5yai7zqbharj2ldvn78x3p739vkgpr3dinp506"; + sha256 = "09h2mrkzpwzhhyqy21xr7jhfbl82gmqfyj0lzhnjsrab8z56yzk6"; }; buildInputs = [ - boost ganv glibmm gtk gtkmm jack2 lilv lv2 pkgconfig python - raul serd sord sratom suil + boost ganv glibmm gtk gtkmm jack2 lilv lv2 makeWrapper pkgconfig + python raul serd sord sratom suil ]; configurePhase = "python waf configure --prefix=$out"; + propagatedBuildInputs = [ rdflib ]; + buildPhase = "python waf"; - installPhase = "python waf install"; + installPhase = '' + python waf install + for program in ingenams ingenish + do + wrapProgram $out/bin/$program \ + --prefix PYTHONPATH : $out/lib/python${python.majorVersion}/site-packages:$PYTHONPATH + done + ''; meta = with stdenv.lib; { description = "A modular audio processing system using JACK and LV2 or LADSPA plugins"; diff --git a/pkgs/applications/audio/meters_lv2/default.nix b/pkgs/applications/audio/meters_lv2/default.nix new file mode 100644 index 00000000000..3b7a5bc685c --- /dev/null +++ b/pkgs/applications/audio/meters_lv2/default.nix @@ -0,0 +1,47 @@ +{ stdenv, fetchurl, pkgconfig +, lv2, mesa, gtk2, cairo, pango, fftw }: + +let + version = "0.8.1"; + name = "meters.lv2-${version}"; + + # robtk submodule is pegged to this version + robtkVersion = "0.3.0"; + robtkName = "robtk-${robtkVersion}"; + + src = fetchurl { + name = "${name}.tar.gz"; + url = "https://github.com/x42/meters.lv2/archive/v${version}.tar.gz"; + sha256 = "142dg0j34mv5b0agajj2x1n9kgsmkfh08n1cjzk0j8n4xk2wb6ri"; + }; + + robtkSrc = fetchurl { + name = "${robtkName}.tar.gz"; + url = "https://github.com/x42/robtk/archive/v${robtkVersion}.tar.gz"; + sha256 = "1ny89i2sgga56k7fxskp9y8sb7pfhp6wgw5mni842p19z6q7h8rq"; + }; + +in +stdenv.mkDerivation { + inherit name; + + buildInputs = [ pkgconfig lv2 mesa gtk2 cairo pango fftw ]; + + srcs = [ src robtkSrc ]; + sourceRoot = name; + + postUnpack = "mv ${robtkName}/* ${name}/robtk"; # */ + + postPatch = "sed -i 's/fftw3f/fftw3/' Makefile"; + + preConfigure = "makeFlagsArray=( PREFIX=$out )"; + meter_VERSION = version; + + meta = with stdenv.lib; + { description = "Collection of audio level meters with GUI in LV2 plugin format"; + homepage = http://x42.github.io/meters.lv2/; + maintainers = with maintainers; [ emery ]; + license = licenses.gpl2; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/audio/mimms/default.nix b/pkgs/applications/audio/mimms/default.nix new file mode 100644 index 00000000000..b337dbf6d82 --- /dev/null +++ b/pkgs/applications/audio/mimms/default.nix @@ -0,0 +1,31 @@ +{ fetchurl, stdenv, pythonPackages, libmms }: + +let version = "3.2"; +in + pythonPackages.buildPythonPackage { + name = "mimms-${version}"; + src = fetchurl { + url = "http://download.savannah.gnu.org/releases/mimms/mimms-${version}.tar.bz2"; + sha256 = "0zmcd670mpq85cs3nvdq3i805ba0d1alqahfy1m9cpf7kxrivfml"; + }; + + postInstall = '' + wrapProgram $out/bin/mimms \ + --prefix LD_LIBRARY_PATH : ${libmms}/lib + ''; + + meta = { + homepage = https://savannah.nongnu.org/projects/mimms/; + license = stdenv.lib.licenses.gpl3; + description = "An mms (e.g. mms://) stream downloader"; + + longDescription = '' + mimms is a program designed to allow you to download streams + using the MMS protocol and save them to your computer, as + opposed to watching them live. Similar functionality is + available in full media player suites such as Xine, MPlayer, + and VLC, but mimms is quick and easy to use and, for the time + being, remains a useful program. + ''; + }; + } diff --git a/pkgs/applications/audio/morituri/default.nix b/pkgs/applications/audio/morituri/default.nix index 6af08cf0221..6498f48351d 100644 --- a/pkgs/applications/audio/morituri/default.nix +++ b/pkgs/applications/audio/morituri/default.nix @@ -1,10 +1,11 @@ { stdenv, fetchurl, python, pythonPackages, cdparanoia, cdrdao , pygobject, gst_python, gst_plugins_base, gst_plugins_good -, setuptools, utillinux, makeWrapper }: +, setuptools, utillinux, makeWrapper, substituteAll }: stdenv.mkDerivation rec { name = "morituri-${version}"; version = "0.2.3"; + namePrefix = ""; src = fetchurl { url = "http://thomas.apestaart.org/download/morituri/${name}.tar.bz2"; @@ -21,23 +22,12 @@ stdenv.mkDerivation rec { gst_plugins_base gst_plugins_good ] ++ pythonPath; - patches = [ ./paths.patch ]; - - postPatch = '' - substituteInPlace morituri/extern/python-command/scripts/help2man \ - --replace /usr/bin/python ${python}/bin/python - - substituteInPlace morituri/common/program.py \ - --replace umount ${utillinux}/bin/umount \ - --replace \'eject \'${utillinux}/bin/eject - - substituteInPlace morituri/program/cdparanoia.py \ - --replace '"cdparanoia"' '"${cdparanoia}/bin/cdparanoia"' - - substituteInPlace morituri/program/cdrdao.py \ - --replace "['cdrdao', ]" "['${cdrdao}/bin/cdrdao', ]" \ - --replace '"cdrdao"' '"${cdrdao}/bin/cdrdao"' - ''; + patches = [ + (substituteAll { + src = ./paths.patch; + inherit cdrdao cdparanoia python utillinux; + }) + ]; # This package contains no binaries to patch or strip. dontPatchELF = true; diff --git a/pkgs/applications/audio/morituri/paths.patch b/pkgs/applications/audio/morituri/paths.patch index 12f1d5b761c..efabc1d200c 100644 --- a/pkgs/applications/audio/morituri/paths.patch +++ b/pkgs/applications/audio/morituri/paths.patch @@ -1,6 +1,6 @@ diff -Nurp morituri-0.2.3-orig/doc/Makefile.in morituri-0.2.3/doc/Makefile.in ---- morituri-0.2.3-orig/doc/Makefile.in 2014-11-01 00:13:01.231364181 +0100 -+++ morituri-0.2.3/doc/Makefile.in 2014-11-01 00:13:56.691812229 +0100 +--- morituri-0.2.3-orig/doc/Makefile.in 2014-12-23 12:44:46.222410092 +0100 ++++ morituri-0.2.3/doc/Makefile.in 2014-12-23 12:46:49.619756940 +0100 @@ -486,7 +486,7 @@ morituri.ics: $(top_srcdir)/morituri.doa -moap doap -f $(top_srcdir)/morituri.doap ical > morituri.ics @@ -10,3 +10,82 @@ diff -Nurp morituri-0.2.3-orig/doc/Makefile.in morituri-0.2.3/doc/Makefile.in clean-local: @rm -rf reference +diff -Nurp morituri-0.2.3-orig/morituri/common/program.py morituri-0.2.3/morituri/common/program.py +--- morituri-0.2.3-orig/morituri/common/program.py 2014-12-23 12:44:46.218410048 +0100 ++++ morituri-0.2.3/morituri/common/program.py 2014-12-23 12:46:49.647757245 +0100 +@@ -92,13 +92,13 @@ class Program(log.Loggable): + """ + Load the given device. + """ +- os.system('eject -t %s' % device) ++ os.system('@utillinux@/bin/eject -t %s' % device) + + def ejectDevice(self, device): + """ + Eject the given device. + """ +- os.system('eject %s' % device) ++ os.system('@utillinux@/bin/eject %s' % device) + + def unmountDevice(self, device): + """ +@@ -112,7 +112,7 @@ class Program(log.Loggable): + proc = open('/proc/mounts').read() + if device in proc: + print 'Device %s is mounted, unmounting' % device +- os.system('umount %s' % device) ++ os.system('@utillinux@/bin/umount %s' % device) + + def getFastToc(self, runner, toc_pickle, device): + """ +diff -Nurp morituri-0.2.3-orig/morituri/extern/python-command/scripts/help2man morituri-0.2.3/morituri/extern/python-command/scripts/help2man +--- morituri-0.2.3-orig/morituri/extern/python-command/scripts/help2man 2014-12-23 12:44:46.206409916 +0100 ++++ morituri-0.2.3/morituri/extern/python-command/scripts/help2man 2014-12-23 12:46:49.631757074 +0100 +@@ -1,4 +1,4 @@ +-#!/usr/bin/python ++#!@python@/bin/python + + # -*- Mode: Python -*- + # vi:si:et:sw=4:sts=4:ts=4 +diff -Nurp morituri-0.2.3-orig/morituri/program/cdparanoia.py morituri-0.2.3/morituri/program/cdparanoia.py +--- morituri-0.2.3-orig/morituri/program/cdparanoia.py 2014-12-23 12:44:46.202409873 +0100 ++++ morituri-0.2.3/morituri/program/cdparanoia.py 2014-12-23 12:46:49.659757376 +0100 +@@ -278,7 +278,7 @@ class ReadTrackTask(log.Loggable, task.T + stopTrack, stopOffset) + + bufsize = 1024 +- argv = ["cdparanoia", "--stderr-progress", ++ argv = ["@cdparanoia@/bin/cdparanoia", "--stderr-progress", + "--sample-offset=%d" % self._offset, ] + if self._device: + argv.extend(["--force-cdrom-device", self._device, ]) +@@ -551,7 +551,7 @@ _VERSION_RE = re.compile( + + def getCdParanoiaVersion(): + getter = common.VersionGetter('cdparanoia', +- ["cdparanoia", "-V"], ++ ["@cdparanoia@/bin/cdparanoia", "-V"], + _VERSION_RE, + "%(version)s %(release)s") + +diff -Nurp morituri-0.2.3-orig/morituri/program/cdrdao.py morituri-0.2.3/morituri/program/cdrdao.py +--- morituri-0.2.3-orig/morituri/program/cdrdao.py 2014-12-23 12:44:46.202409873 +0100 ++++ morituri-0.2.3/morituri/program/cdrdao.py 2014-12-23 12:46:49.667757463 +0100 +@@ -257,7 +257,7 @@ class CDRDAOTask(ctask.PopenTask): + + def start(self, runner): + self.debug('Starting cdrdao with options %r', self.options) +- self.command = ['cdrdao', ] + self.options ++ self.command = ['@cdrdao@/bin/cdrdao', ] + self.options + + ctask.PopenTask.start(self, runner) + +@@ -515,7 +515,7 @@ _VERSION_RE = re.compile( + + def getCDRDAOVersion(): + getter = common.VersionGetter('cdrdao', +- ["cdrdao"], ++ ["@cdrdao@/bin/cdrdao"], + _VERSION_RE, + "%(version)s") + diff --git a/pkgs/applications/audio/mp3gain/default.nix b/pkgs/applications/audio/mp3gain/default.nix new file mode 100644 index 00000000000..340658f813d --- /dev/null +++ b/pkgs/applications/audio/mp3gain/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchurl, unzip }: + +stdenv.mkDerivation { + name = "mp3gain-1.5.2"; + src = fetchurl { + url = "http://downloads.sourceforge.net/mp3gain/mp3gain-1_5_2-src.zip"; + sha256 = "1jkgry59m8cnnfq05b9y1h4x4wpy3iq8j68slb9qffwa3ajcgbfv"; + }; + + buildInputs = [ unzip ]; + + sourceRoot = "."; + + buildFlags = [ "OSTYPE=linux" ]; + + installPhase = '' + mkdir -p $out/usr/bin + cp mp3gain $out/usr/bin + ''; + + meta = { + description = "Lossless mp3 normalizer with statistical analysis"; + homepage = http://mp3gain.sourceforge.net/; + license = stdenv.lib.licenses.lgpl21; + platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.devhell ]; + }; +} diff --git a/pkgs/applications/audio/ncmpcpp/default.nix b/pkgs/applications/audio/ncmpcpp/default.nix index 6e4ddcb1e9c..e83e5a8ca74 100644 --- a/pkgs/applications/audio/ncmpcpp/default.nix +++ b/pkgs/applications/audio/ncmpcpp/default.nix @@ -2,12 +2,12 @@ , libiconvOrEmpty, boost, readline }: stdenv.mkDerivation rec { - version = "0.6.1"; + version = "0.6.2"; name = "ncmpcpp-${version}"; src = fetchurl { url = "http://ncmpcpp.rybczak.net/stable/ncmpcpp-${version}.tar.bz2"; - sha256 = "033a18hj0q0smm5n0ykld9az7w95myr7jm2b1bjm0h2q5927x8qm"; + sha256 = "1mrd6m6ph0fscxp9x96ipxh6ai7w0n1miapcfqrqfy058qx5zbck"; }; configureFlags = "BOOST_LIB_SUFFIX="; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { description = "Curses-based interface for MPD (music player daemon)"; homepage = http://unkart.ovh.org/ncmpcpp/; license = licenses.gpl2Plus; - maintainers = with maintainers; [ lovek323 mornfall ]; + maintainers = with maintainers; [ lovek323 mornfall koral ]; platforms = platforms.all; }; } diff --git a/pkgs/applications/audio/pavucontrol/default.nix b/pkgs/applications/audio/pavucontrol/default.nix index 538e1cdf9d0..8696b1c055d 100644 --- a/pkgs/applications/audio/pavucontrol/default.nix +++ b/pkgs/applications/audio/pavucontrol/default.nix @@ -1,5 +1,5 @@ { fetchurl, stdenv, pkgconfig, intltool, pulseaudio, gtkmm3 -, libcanberra_gtk3 }: +, libcanberra_gtk3, makeWrapper, gnome3 }: stdenv.mkDerivation rec { name = "pavucontrol-2.0"; @@ -9,7 +9,13 @@ stdenv.mkDerivation rec { sha256 = "02s775m1531sshwlbvfddk3pz8zjmwkv1sgzggn386ja3gc9vwi2"; }; - buildInputs = [ pulseaudio gtkmm3 libcanberra_gtk3 ]; + preFixup = '' + wrapProgram "$out/bin/pavucontrol" \ + --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS" + ''; + + buildInputs = [ pulseaudio gtkmm3 libcanberra_gtk3 makeWrapper + gnome3.gnome_icon_theme ]; nativeBuildInputs = [ pkgconfig intltool ]; diff --git a/pkgs/applications/audio/picard/default.nix b/pkgs/applications/audio/picard/default.nix index d0c3f010e6e..210b2e0813b 100644 --- a/pkgs/applications/audio/picard/default.nix +++ b/pkgs/applications/audio/picard/default.nix @@ -6,6 +6,7 @@ let version = "1.3"; in buildPythonPackage { name = "picard-${version}"; + namePrefix = ""; src = fetchurl { url = "ftp://ftp.musicbrainz.org/pub/musicbrainz/picard/picard-${version}.tar.gz"; diff --git a/pkgs/applications/audio/schismtracker/default.nix b/pkgs/applications/audio/schismtracker/default.nix new file mode 100644 index 00000000000..1a448c74b47 --- /dev/null +++ b/pkgs/applications/audio/schismtracker/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchurl, alsaLib, python, SDL }: + +stdenv.mkDerivation rec { + version = "20120105"; + name = "schismtracker-${version}"; + + src = fetchurl { + url = "http://schismtracker.org/dl/${name}.tar.bz2"; + sha256 = "1ny7wv2wxm1av299wvpskall6438wjjpadphmqc7c0h6d0zg5kii"; + }; + + configureFlags = "--enable-dependency-tracking"; + + buildInputs = [ alsaLib python SDL ]; + + meta = { + description = "Music tracker application, free reimplementation of Impulse Tracker"; + homepage = "http://schismtracker.org/"; + license = stdenv.lib.licenses.gpl2; + platforms = [ "x86_64-linux" "i686-linux" ]; + maintainers = [ stdenv.lib.maintainers.ftrvxmtrx ]; + }; +} diff --git a/pkgs/applications/audio/spotify/default.nix b/pkgs/applications/audio/spotify/default.nix index 47919a7d7f8..08ce9093dd5 100644 --- a/pkgs/applications/audio/spotify/default.nix +++ b/pkgs/applications/audio/spotify/default.nix @@ -45,7 +45,7 @@ let pango qt4 sqlite - stdenv.gcc.gcc + stdenv.cc.gcc xlibs.libX11 xlibs.libXcomposite xlibs.libXdamage @@ -113,16 +113,16 @@ stdenv.mkDerivation { mkdir -p $out/bin - rpath="$out/spotify-client/Data:$out/lib:$out/spotify-client:${stdenv.gcc.gcc}/lib64" + rpath="$out/spotify-client/Data:$out/lib:$out/spotify-client:${stdenv.cc.gcc}/lib64" ln -s $out/spotify-client/spotify $out/bin/spotify patchelf \ - --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \ + --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ --set-rpath $rpath $out/spotify-client/spotify patchelf \ - --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \ + --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ --set-rpath $rpath $out/spotify-client/Data/SpotifyHelper dpkg-deb -x ${qt4webkit} ./ diff --git a/pkgs/applications/audio/tomahawk/default.nix b/pkgs/applications/audio/tomahawk/default.nix index fec93f0183d..eb26e2b66c4 100644 --- a/pkgs/applications/audio/tomahawk/default.nix +++ b/pkgs/applications/audio/tomahawk/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, cmake, pkgconfig, attica, boost, gnutls, libechonest -, liblastfm, lucenepp, phonon, phonon_backend_vlc, qca2, qjson, qt4, qtkeychain -, quazip, sparsehash, taglib, websocketpp +, liblastfm, lucenepp, phonon, phonon_backend_vlc, qca2, qca2_ossl, qjson, qt4 +, qtkeychain, quazip, sparsehash, taglib, websocketpp, makeWrapper , enableXMPP ? true, libjreen ? null , enableKDE ? false, kdelibs ? null @@ -15,11 +15,11 @@ let quazipQt4 = quazip.override { qt = qt4; }; in stdenv.mkDerivation rec { name = "tomahawk-${version}"; - version = "0.8.1"; + version = "0.8.2"; src = fetchurl { - url = "http://download.tomahawk-player.org/tomahawk-0.8.1.tar.bz2"; - sha256 = "0ca6fah30a2s8nnlryav95wyzhwys1ikjfwakrqf2hb0y5aczdpw"; + url = "http://download.tomahawk-player.org/${name}.tar.bz2"; + sha256 = "1bmkkpqhflpm42sn6zf7hxv3936h3p0kdiqzmj88jm7qfgw2wbaj"; }; cmakeFlags = [ @@ -30,11 +30,21 @@ in stdenv.mkDerivation rec { buildInputs = [ cmake pkgconfig attica boost gnutls libechonest liblastfm lucenepp phonon qca2 qjson qt4 qtkeychain quazipQt4 sparsehash taglib websocketpp + makeWrapper ] ++ stdenv.lib.optional enableXMPP libjreen ++ stdenv.lib.optional enableKDE kdelibs ++ stdenv.lib.optional enableTelepathy telepathy_qt; - propagatedBuildInputs = [ phonon_backend_vlc ]; + postInstall = let + pluginPath = stdenv.lib.concatStringsSep ":" [ + "${phonon_backend_vlc}/lib/kde4/plugins" + "${qca2_ossl}/lib/qt4/plugins" + ]; + in '' + for i in "$out"/bin/*; do + wrapProgram "$i" --prefix QT_PLUGIN_PATH : "${pluginPath}" + done + ''; enableParallelBuilding = true; diff --git a/pkgs/applications/audio/vimus/default.nix b/pkgs/applications/audio/vimus/default.nix index 6bd51760e88..7118f1876dc 100644 --- a/pkgs/applications/audio/vimus/default.nix +++ b/pkgs/applications/audio/vimus/default.nix @@ -25,5 +25,6 @@ cabal.mkDerivation (self: { license = self.stdenv.lib.licenses.mit; platforms = self.ghc.meta.platforms; maintainers = with self.stdenv.lib.maintainers; [ jzellner ]; + broken = self.stdenv.isLinux && self.stdenv.isi686; }; }) diff --git a/pkgs/applications/backup/crashplan/CrashPlanDesktop.patch b/pkgs/applications/backup/crashplan/CrashPlanDesktop.patch new file mode 100644 index 00000000000..00516484890 --- /dev/null +++ b/pkgs/applications/backup/crashplan/CrashPlanDesktop.patch @@ -0,0 +1,8 @@ +--- ./scripts/CrashPlanDesktop 2014-12-18 09:51:14.050804325 +0100 ++++ ./scripts/CrashPlanDesktop-1 2014-12-18 09:51:32.271009382 +0100 +@@ -9,4 +9,4 @@ + + cd ${TARGETDIR} + +-${JAVACOMMON} ${GUI_JAVA_OPTS} -classpath "./lib/com.backup42.desktop.jar:./lang:./skin" com.backup42.desktop.CPDesktop > ${TARGETDIR}/log/ui_output.log 2> ${TARGETDIR}/log/ui_error.log & ++${JAVACOMMON} ${GUI_JAVA_OPTS} -classpath "./lib/com.backup42.desktop.jar:./lang:./skin" com.backup42.desktop.CPDesktop & diff --git a/pkgs/applications/backup/crashplan/default.nix b/pkgs/applications/backup/crashplan/default.nix index 1a78dea2157..5a0e8c7cfbd 100644 --- a/pkgs/applications/backup/crashplan/default.nix +++ b/pkgs/applications/backup/crashplan/default.nix @@ -16,7 +16,7 @@ in stdenv.mkDerivation rec { description = "An online/offline backup solution"; homepage = "http://www.crashplan.org"; license = licenses.unfree; - maintainers = with maintainers; [ sztupi ]; + maintainers = with maintainers; [ sztupi iElectric ]; }; buildInputs = [ makeWrapper cpio ]; @@ -25,7 +25,7 @@ in stdenv.mkDerivation rec { manifestdir = "${vardir}/manifest"; - patches = [ ./CrashPlanEngine.patch ]; + patches = [ ./CrashPlanEngine.patch ./CrashPlanDesktop.patch ]; installPhase = '' mkdir $out @@ -45,6 +45,7 @@ in stdenv.mkDerivation rec { install -D -m 644 run.conf $out/bin/run.conf install -D -m 755 scripts/CrashPlanDesktop $out/bin/CrashPlanDesktop install -D -m 755 scripts/CrashPlanEngine $out/bin/CrashPlanEngine + install -D -m 644 scripts/CrashPlan.desktop $out/share/applications/CrashPlan.desktop rm -r $out/log ln -s $vardir/log $out/log @@ -72,6 +73,10 @@ in stdenv.mkDerivation rec { substituteInPlace $f --replace sed ${gnused}/bin/sed substituteInPlace $f --replace grep ${gnugrep}/bin/grep done + + substituteInPlace $out/share/applications/CrashPlan.desktop \ + --replace /usr/local $out \ + --replace crashplan/skin skin wrapProgram $out/bin/CrashPlanDesktop --prefix LD_LIBRARY_PATH ":" "${gtk2}/lib:${glib}/lib:${libXtst}/lib" ''; diff --git a/pkgs/applications/editors/atom/default.nix b/pkgs/applications/editors/atom/default.nix index d16233332e5..8bace6210d7 100644 --- a/pkgs/applications/editors/atom/default.nix +++ b/pkgs/applications/editors/atom/default.nix @@ -7,7 +7,7 @@ let atomEnv = buildEnv { name = "env-atom"; paths = [ - stdenv.gcc.gcc zlib glib dbus gtk atk pango freetype libgnome_keyring3 + stdenv.cc.gcc zlib glib dbus gtk atk pango freetype libgnome_keyring3 fontconfig gdk_pixbuf cairo cups expat libgpgerror alsaLib nspr gconf nss xlibs.libXrender xlibs.libX11 xlibs.libXext xlibs.libXdamage xlibs.libXtst xlibs.libXcomposite xlibs.libXi xlibs.libXfixes xlibs.libXrandr @@ -33,9 +33,9 @@ in stdenv.mkDerivation rec { ar p $src data.tar.gz | tar -C $out -xz ./usr mv $out/usr/* $out/ rm -r $out/usr/ - patchelf --set-interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \ + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ $out/share/atom/atom - patchelf --set-interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \ + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ $out/share/atom/resources/app/apm/node_modules/atom-package-manager/bin/node wrapProgram $out/bin/atom \ --prefix "LD_LIBRARY_PATH" : "${atomEnv}/lib:${atomEnv}/lib64" diff --git a/pkgs/applications/editors/bluefish/default.nix b/pkgs/applications/editors/bluefish/default.nix index 4e569fc68a5..71b2ccb6fb8 100644 --- a/pkgs/applications/editors/bluefish/default.nix +++ b/pkgs/applications/editors/bluefish/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { description = "A powerful editor targeted towards programmers and webdevelopers"; homepage = http://bluefish.openoffice.nl/; license = licenses.gpl3Plus; - maintainer = [maintainers.vbgl]; + maintainers = [maintainers.vbgl]; platforms = platforms.all; }; } diff --git a/pkgs/applications/editors/codeblocks/default.nix b/pkgs/applications/editors/codeblocks/default.nix index 1bf4bb1f8e6..750234b6399 100644 --- a/pkgs/applications/editors/codeblocks/default.nix +++ b/pkgs/applications/editors/codeblocks/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; patches = [ ./writable-projects.patch ]; preConfigure = "substituteInPlace ./configure --replace /usr/bin/file ${file}/bin/file"; - postConfigure = optionalString stdenv.isLinux "substituteInPlace libtool --replace ldconfig ${stdenv.gcc.libc}/sbin/ldconfig"; + postConfigure = optionalString stdenv.isLinux "substituteInPlace libtool --replace ldconfig ${stdenv.cc.libc}/sbin/ldconfig"; configureFlags = [ "--enable-pch=no" ] ++ optional contribPlugins "--with-contrib-plugins"; diff --git a/pkgs/applications/editors/emacs-24/builder.sh b/pkgs/applications/editors/emacs-24/builder.sh index c472d2b1a64..5b86f98d61c 100644 --- a/pkgs/applications/editors/emacs-24/builder.sh +++ b/pkgs/applications/editors/emacs-24/builder.sh @@ -11,7 +11,7 @@ preConfigure() { *) return; esac - libc=$(cat ${NIX_GCC}/nix-support/orig-libc) + libc=$(cat ${NIX_CC}/nix-support/orig-libc) echo "libc: $libc" for i in src/s/*.h src/m/*.h; do diff --git a/pkgs/applications/editors/emacs-modes/haskell/default.nix b/pkgs/applications/editors/emacs-modes/haskell/default.nix index 3f4b93dc638..7f4373c41ba 100644 --- a/pkgs/applications/editors/emacs-modes/haskell/default.nix +++ b/pkgs/applications/editors/emacs-modes/haskell/default.nix @@ -1,18 +1,25 @@ { stdenv, fetchurl, emacs, texinfo }: -stdenv.mkDerivation rec { - name = "haskell-mode-13.10"; +let + version = "13.10"; +in +stdenv.mkDerivation { + name = "haskell-mode-${version}"; src = fetchurl { - url = "https://github.com/haskell/haskell-mode/archive/v13.10.tar.gz"; + url = "https://github.com/haskell/haskell-mode/archive/v${version}.tar.gz"; sha256 = "0hcg7wpalcdw8j36m8vd854zrrgym074r7m903rpwfrhx9mlg02b"; }; buildInputs = [ emacs texinfo ]; + makeFlags = "VERSION=${version} GIT_VERSION=${version}"; + installPhase = '' - mkdir -p "$out/share/emacs/site-lisp" - cp *.el *.elc *.hs "$out/share/emacs/site-lisp/" + mkdir -p $out/share/emacs/site-lisp + cp *.el *.elc *.hs $out/share/emacs/site-lisp/ + mkdir -p $out/share/info + cp -v *.info* $out/share/info/ ''; meta = { diff --git a/pkgs/applications/editors/emacs-modes/haskell/git.nix b/pkgs/applications/editors/emacs-modes/haskell/git.nix new file mode 100644 index 00000000000..72f49592b51 --- /dev/null +++ b/pkgs/applications/editors/emacs-modes/haskell/git.nix @@ -0,0 +1,39 @@ +{ stdenv, fetchFromGitHub, emacs, texinfo }: + +let + version = "13.10-299-g74b5a3c"; # git describe --tags +in +stdenv.mkDerivation { + name = "haskell-mode-${version}"; + + src = fetchFromGitHub { + owner = "haskell"; + repo = "haskell-mode"; + rev = "v${version}"; + sha256 = "1qjrc1c4jsgbbhnhssvadg00qffn80a8slrxc9g1hnzp632kv8wl"; + }; + + buildInputs = [ emacs texinfo ]; + + makeFlags = "VERSION=v${version} GIT_VERSION=v${version}"; + + installPhase = '' + mkdir -p $out/share/emacs/site-lisp + cp *.el *.elc *.hs $out/share/emacs/site-lisp/ + mkdir -p $out/share/info + cp -v *.info* $out/share/info/ + ''; + + # The test suite must run *after* copying the generated files to $out + # because "make check" implies "make clean". + doInstallCheck = true; + installCheckTarget = "check"; + + meta = { + homepage = "http://github.com/haskell/haskell-mode"; + description = "Haskell mode for Emacs"; + + platforms = stdenv.lib.platforms.unix; + maintainers = [ stdenv.lib.maintainers.simons ]; + }; +} diff --git a/pkgs/applications/editors/idea/default.nix b/pkgs/applications/editors/idea/default.nix index f1e3a078b70..032f70786e4 100644 --- a/pkgs/applications/editors/idea/default.nix +++ b/pkgs/applications/editors/idea/default.nix @@ -56,9 +56,9 @@ let snappyPath="lib/snappy-java-1.0.5" 7z x -o"$snappyPath" "$snappyPath.jar" if [ "${stdenv.system}" == "x86_64-linux" ]; then - patchelf --set-rpath ${stdenv.gcc.gcc}/lib64 "$snappyPath/org/xerial/snappy/native/Linux/amd64/libsnappyjava.so" + patchelf --set-rpath ${stdenv.cc.gcc}/lib64 "$snappyPath/org/xerial/snappy/native/Linux/amd64/libsnappyjava.so" else - patchelf --set-rpath ${stdenv.gcc.gcc}/lib "$snappyPath/org/xerial/snappy/native/Linux/i386/libsnappyjava.so" + patchelf --set-rpath ${stdenv.cc.gcc}/lib "$snappyPath/org/xerial/snappy/native/Linux/i386/libsnappyjava.so" fi 7z a -tzip "$snappyPath.jar" ./"$snappyPath"/* rm -vr "$snappyPath" @@ -74,15 +74,9 @@ let && jdk=${jdk}/lib/openjdk \ || jdk=${jdk} - if [ "${stdenv.system}" == "x86_64-linux" ]; then - makeWrapper "$out/$name/bin/fsnotifier64" "$out/bin/fsnotifier64" - else - makeWrapper "$out/$name/bin/fsnotifier" "$out/bin/fsnotifier" - fi - makeWrapper "$out/$name/bin/${loName}.sh" "$out/bin/${loName}" \ --prefix PATH : "${jdk}/bin:${coreutils}/bin:${gnugrep}/bin:${which}/bin:${git}/bin" \ - --prefix LD_RUN_PATH : "${stdenv.gcc.gcc}/lib/" \ + --prefix LD_RUN_PATH : "${stdenv.cc.gcc}/lib/" \ --prefix JDK_HOME : "$jdk" \ --prefix ${hiName}_JDK : "$jdk" @@ -295,13 +289,13 @@ in phpstorm = buildPhpStorm rec { name = "phpstorm-${version}"; - version = "8.0.1"; - build = "PS-138.2001"; + version = "8.0.2"; + build = "PS-139.732"; description = "Professional IDE for Web and PHP developers"; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "http://download.jetbrains.com/webide/PhpStorm-${version}.tar.gz"; - sha256 = "0d46442aa32174fe16846c3c31428178ab69b827d2e0ce31f633f13b64c01afc"; + sha256 = "01b8vx6swi71sd0rc7i1jnicilqp11ch3zrm8gwb6xh1pmmpdirf"; }; }; diff --git a/pkgs/applications/editors/lighttable/default.nix b/pkgs/applications/editors/lighttable/default.nix index b5ab1950e2b..f66540abaa6 100644 --- a/pkgs/applications/editors/lighttable/default.nix +++ b/pkgs/applications/editors/lighttable/default.nix @@ -5,7 +5,7 @@ let libPath = stdenv.lib.makeLibraryPath [ - stdenv.gcc.gcc zlib glib dbus gtk atk pango freetype libgnome_keyring3 nss + stdenv.cc.gcc zlib glib dbus gtk atk pango freetype libgnome_keyring3 nss fontconfig gdk_pixbuf cairo cups expat libgpgerror alsaLib nspr gnome3.gconf xlibs.libXrender xlibs.libX11 xlibs.libXext xlibs.libXdamage xlibs.libXtst xlibs.libXcomposite xlibs.libXi xlibs.libXfixes @@ -40,8 +40,8 @@ stdenv.mkDerivation rec { mv LightTable $out/ patchelf \ - --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \ - --set-rpath ${libPath}:${stdenv.gcc.gcc}/lib${stdenv.lib.optionalString stdenv.is64bit "64"} \ + --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + --set-rpath ${libPath}:${stdenv.cc.gcc}/lib${stdenv.lib.optionalString stdenv.is64bit "64"} \ $out/LightTable/ltbin ln -s ${udev}/lib/libudev.so.1 $out/LightTable/libudev.so.0 diff --git a/pkgs/applications/editors/sublime/default.nix b/pkgs/applications/editors/sublime/default.nix index 0c967e05ba1..d51562b0213 100644 --- a/pkgs/applications/editors/sublime/default.nix +++ b/pkgs/applications/editors/sublime/default.nix @@ -28,8 +28,8 @@ stdenv.mkDerivation rec { echo ${libPath} patchelf \ - --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \ - --set-rpath ${libPath}:${stdenv.gcc.gcc}/lib${stdenv.lib.optionalString stdenv.is64bit "64"} \ + --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + --set-rpath ${libPath}:${stdenv.cc.gcc}/lib${stdenv.lib.optionalString stdenv.is64bit "64"} \ $out/sublime/sublime_text ''; diff --git a/pkgs/applications/editors/sublime3/default.nix b/pkgs/applications/editors/sublime3/default.nix index c27f5171de5..3864f48738a 100644 --- a/pkgs/applications/editors/sublime3/default.nix +++ b/pkgs/applications/editors/sublime3/default.nix @@ -31,8 +31,8 @@ in let buildPhase = '' for i in sublime_text plugin_host crash_reporter; do patchelf \ - --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \ - --set-rpath ${libPath}:${stdenv.gcc.gcc}/lib${stdenv.lib.optionalString stdenv.is64bit "64"} \ + --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + --set-rpath ${libPath}:${stdenv.cc.gcc}/lib${stdenv.lib.optionalString stdenv.is64bit "64"} \ $i done ''; @@ -41,7 +41,7 @@ in let mkdir -p $out cp -prvd * $out/ # Without this, plugin_host crashes, even though it has the rpath - wrapProgram $out/plugin_host --prefix LD_PRELOAD : ${stdenv.gcc.gcc}/lib${stdenv.lib.optionalString stdenv.is64bit "64"}/libgcc_s.so.1:${openssl}/lib/libssl.so:${bzip2}/lib/libbz2.so + wrapProgram $out/plugin_host --prefix LD_PRELOAD : ${stdenv.cc.gcc}/lib${stdenv.lib.optionalString stdenv.is64bit "64"}/libgcc_s.so.1:${openssl}/lib/libssl.so:${bzip2}/lib/libbz2.so ''; }; in stdenv.mkDerivation { diff --git a/pkgs/applications/editors/zed/default.nix b/pkgs/applications/editors/zed/default.nix index 4673029ed00..e46cb66de56 100644 --- a/pkgs/applications/editors/zed/default.nix +++ b/pkgs/applications/editors/zed/default.nix @@ -3,7 +3,7 @@ let name = "zed-${version}"; - version = "0.13"; + version = "1.0.0"; # When upgrading node.nix / node packages: # fetch package.json from Zed's repository @@ -31,7 +31,7 @@ let src = fetchgit { url = "git://github.com/zedapp/zed"; rev = "refs/tags/v${version}"; - sha256 = "023nq4y6dgh57xpsgawdn2zqvfyhjz1p00ldnsfsjajyy4nn6yb1"; + sha256 = "1kdvj9mvdwm4cswqw6nn9j6kgqvs4d7vycpsmmfha9a2rkryw9zh"; }; buildInputs = [ makeWrapper zip ]; diff --git a/pkgs/applications/editors/zed/node.nix b/pkgs/applications/editors/zed/node.nix index f2c08fde0cd..cd75f2d58fa 100644 --- a/pkgs/applications/editors/zed/node.nix +++ b/pkgs/applications/editors/zed/node.nix @@ -2,21 +2,21 @@ { by-spec."accepts"."~1.1.0" = - self.by-version."accepts"."1.1.0"; - by-version."accepts"."1.1.0" = lib.makeOverridable self.buildNodePackage { - name = "node-accepts-1.1.0"; + self.by-version."accepts"."1.1.1"; + by-version."accepts"."1.1.1" = lib.makeOverridable self.buildNodePackage { + name = "node-accepts-1.1.1"; src = [ (fetchurl { - url = "http://registry.npmjs.org/accepts/-/accepts-1.1.0.tgz"; - name = "accepts-1.1.0.tgz"; - sha1 = "43ba6d946374c80f91823eaec6bb43dc4955500b"; + url = "http://registry.npmjs.org/accepts/-/accepts-1.1.1.tgz"; + name = "accepts-1.1.1.tgz"; + sha1 = "3b40bf6abc3fe3bc004534f4672ae1efd0063a96"; }) ]; buildInputs = (self.nativeDeps."accepts" or []); deps = [ - self.by-version."mime-types"."2.0.1" - self.by-version."negotiator"."0.4.7" + self.by-version."mime-types"."2.0.2" + self.by-version."negotiator"."0.4.8" ]; peerDependencies = [ ]; @@ -119,33 +119,33 @@ passthru.names = [ "block-stream" ]; }; by-spec."body-parser"."^1.6.3" = - self.by-version."body-parser"."1.8.1"; - by-version."body-parser"."1.8.1" = lib.makeOverridable self.buildNodePackage { - name = "node-body-parser-1.8.1"; + self.by-version."body-parser"."1.9.0"; + by-version."body-parser"."1.9.0" = lib.makeOverridable self.buildNodePackage { + name = "node-body-parser-1.9.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/body-parser/-/body-parser-1.8.1.tgz"; - name = "body-parser-1.8.1.tgz"; - sha1 = "f9f96d221c435c95d18aeaad2bcdea1371902aad"; + url = "http://registry.npmjs.org/body-parser/-/body-parser-1.9.0.tgz"; + name = "body-parser-1.9.0.tgz"; + sha1 = "95d72943b1a4f67f56bbac9e0dcc837b68703605"; }) ]; buildInputs = (self.nativeDeps."body-parser" or []); deps = [ self.by-version."bytes"."1.0.0" - self.by-version."depd"."0.4.4" + self.by-version."depd"."1.0.0" self.by-version."iconv-lite"."0.4.4" self.by-version."media-typer"."0.3.0" self.by-version."on-finished"."2.1.0" - self.by-version."qs"."2.2.3" + self.by-version."qs"."2.2.4" self.by-version."raw-body"."1.3.0" - self.by-version."type-is"."1.5.1" + self.by-version."type-is"."1.5.2" ]; peerDependencies = [ ]; passthru.names = [ "body-parser" ]; }; - "body-parser" = self.by-version."body-parser"."1.8.1"; + "body-parser" = self.by-version."body-parser"."1.9.0"; by-spec."boom"."0.4.x" = self.by-version."boom"."0.4.2"; by-version."boom"."0.4.2" = lib.makeOverridable self.buildNodePackage { @@ -166,25 +166,6 @@ ]; passthru.names = [ "boom" ]; }; - by-spec."buffer-crc32"."0.2.3" = - self.by-version."buffer-crc32"."0.2.3"; - by-version."buffer-crc32"."0.2.3" = lib.makeOverridable self.buildNodePackage { - name = "node-buffer-crc32-0.2.3"; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.3.tgz"; - name = "buffer-crc32-0.2.3.tgz"; - sha1 = "bb54519e95d107cbd2400e76d0cab1467336d921"; - }) - ]; - buildInputs = - (self.nativeDeps."buffer-crc32" or []); - deps = [ - ]; - peerDependencies = [ - ]; - passthru.names = [ "buffer-crc32" ]; - }; by-spec."bytes"."1" = self.by-version."bytes"."1.0.0"; by-version."bytes"."1.0.0" = lib.makeOverridable self.buildNodePackage { @@ -283,6 +264,25 @@ ]; passthru.names = [ "cookie-signature" ]; }; + by-spec."crc"."3.0.0" = + self.by-version."crc"."3.0.0"; + by-version."crc"."3.0.0" = lib.makeOverridable self.buildNodePackage { + name = "node-crc-3.0.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/crc/-/crc-3.0.0.tgz"; + name = "crc-3.0.0.tgz"; + sha1 = "d11e97ec44a844e5eb15a74fa2c7875d0aac4b22"; + }) + ]; + buildInputs = + (self.nativeDeps."crc" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "crc" ]; + }; by-spec."cryptiles"."0.2.x" = self.by-version."cryptiles"."0.2.2"; by-version."cryptiles"."0.2.2" = lib.makeOverridable self.buildNodePackage { @@ -361,15 +361,34 @@ ]; passthru.names = [ "delayed-stream" ]; }; - by-spec."depd"."0.4.4" = - self.by-version."depd"."0.4.4"; - by-version."depd"."0.4.4" = lib.makeOverridable self.buildNodePackage { - name = "node-depd-0.4.4"; + by-spec."depd"."0.4.5" = + self.by-version."depd"."0.4.5"; + by-version."depd"."0.4.5" = lib.makeOverridable self.buildNodePackage { + name = "node-depd-0.4.5"; src = [ (fetchurl { - url = "http://registry.npmjs.org/depd/-/depd-0.4.4.tgz"; - name = "depd-0.4.4.tgz"; - sha1 = "07091fae75f97828d89b4a02a2d4778f0e7c0662"; + url = "http://registry.npmjs.org/depd/-/depd-0.4.5.tgz"; + name = "depd-0.4.5.tgz"; + sha1 = "1a664b53388b4a6573e8ae67b5f767c693ca97f1"; + }) + ]; + buildInputs = + (self.nativeDeps."depd" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "depd" ]; + }; + by-spec."depd"."~1.0.0" = + self.by-version."depd"."1.0.0"; + by-version."depd"."1.0.0" = lib.makeOverridable self.buildNodePackage { + name = "node-depd-1.0.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/depd/-/depd-1.0.0.tgz"; + name = "depd-1.0.0.tgz"; + sha1 = "2fda0d00e98aae2845d4991ab1bf1f2a199073d5"; }) ]; buildInputs = @@ -437,47 +456,46 @@ ]; passthru.names = [ "escape-html" ]; }; - by-spec."etag"."~1.3.0" = - self.by-version."etag"."1.3.0"; - by-version."etag"."1.3.0" = lib.makeOverridable self.buildNodePackage { - name = "node-etag-1.3.0"; + by-spec."etag"."~1.4.0" = + self.by-version."etag"."1.4.0"; + by-version."etag"."1.4.0" = lib.makeOverridable self.buildNodePackage { + name = "node-etag-1.4.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/etag/-/etag-1.3.0.tgz"; - name = "etag-1.3.0.tgz"; - sha1 = "c837debfbfe0baf7eb8e2f0bbb3d1d9cc3229697"; + url = "http://registry.npmjs.org/etag/-/etag-1.4.0.tgz"; + name = "etag-1.4.0.tgz"; + sha1 = "3050991615857707c04119d075ba2088e0701225"; }) ]; buildInputs = (self.nativeDeps."etag" or []); deps = [ - self.by-version."buffer-crc32"."0.2.3" + self.by-version."crc"."3.0.0" ]; peerDependencies = [ ]; passthru.names = [ "etag" ]; }; by-spec."express"."^4.8.3" = - self.by-version."express"."4.9.0"; - by-version."express"."4.9.0" = lib.makeOverridable self.buildNodePackage { - name = "node-express-4.9.0"; + self.by-version."express"."4.9.5"; + by-version."express"."4.9.5" = lib.makeOverridable self.buildNodePackage { + name = "node-express-4.9.5"; src = [ (fetchurl { - url = "http://registry.npmjs.org/express/-/express-4.9.0.tgz"; - name = "express-4.9.0.tgz"; - sha1 = "9b2ea4ebce57c7ac710604c74f6c303ab344a7f3"; + url = "http://registry.npmjs.org/express/-/express-4.9.5.tgz"; + name = "express-4.9.5.tgz"; + sha1 = "7f62aa84ac8f5e96acfb98e2944dde0bf1cf8688"; }) ]; buildInputs = (self.nativeDeps."express" or []); deps = [ - self.by-version."accepts"."1.1.0" - self.by-version."buffer-crc32"."0.2.3" + self.by-version."accepts"."1.1.1" self.by-version."cookie-signature"."1.0.5" self.by-version."debug"."2.0.0" - self.by-version."depd"."0.4.4" + self.by-version."depd"."0.4.5" self.by-version."escape-html"."1.0.1" - self.by-version."etag"."1.3.0" + self.by-version."etag"."1.4.0" self.by-version."finalhandler"."0.2.0" self.by-version."fresh"."0.2.4" self.by-version."media-typer"."0.3.0" @@ -485,12 +503,12 @@ self.by-version."on-finished"."2.1.0" self.by-version."parseurl"."1.3.0" self.by-version."path-to-regexp"."0.1.3" - self.by-version."proxy-addr"."1.0.1" - self.by-version."qs"."2.2.3" + self.by-version."proxy-addr"."1.0.3" + self.by-version."qs"."2.2.4" self.by-version."range-parser"."1.0.2" - self.by-version."send"."0.9.1" - self.by-version."serve-static"."1.6.1" - self.by-version."type-is"."1.5.1" + self.by-version."send"."0.9.3" + self.by-version."serve-static"."1.6.3" + self.by-version."type-is"."1.5.2" self.by-version."vary"."1.0.0" self.by-version."cookie"."0.1.2" self.by-version."merge-descriptors"."0.0.2" @@ -500,7 +518,7 @@ ]; passthru.names = [ "express" ]; }; - "express" = self.by-version."express"."4.9.0"; + "express" = self.by-version."express"."4.9.5"; by-spec."finalhandler"."0.2.0" = self.by-version."finalhandler"."0.2.0"; by-version."finalhandler"."0.2.0" = lib.makeOverridable self.buildNodePackage { @@ -563,6 +581,25 @@ ]; passthru.names = [ "form-data" ]; }; + by-spec."forwarded"."~0.1.0" = + self.by-version."forwarded"."0.1.0"; + by-version."forwarded"."0.1.0" = lib.makeOverridable self.buildNodePackage { + name = "node-forwarded-0.1.0"; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/forwarded/-/forwarded-0.1.0.tgz"; + name = "forwarded-0.1.0.tgz"; + sha1 = "19ef9874c4ae1c297bcf078fde63a09b66a84363"; + }) + ]; + buildInputs = + (self.nativeDeps."forwarded" or []); + deps = [ + ]; + peerDependencies = [ + ]; + passthru.names = [ "forwarded" ]; + }; by-spec."fresh"."0.2.4" = self.by-version."fresh"."0.2.4"; by-version."fresh"."0.2.4" = lib.makeOverridable self.buildNodePackage { @@ -728,15 +765,15 @@ }; by-spec."inherits"."~2.0.0" = self.by-version."inherits"."2.0.1"; - by-spec."ipaddr.js"."0.1.2" = - self.by-version."ipaddr.js"."0.1.2"; - by-version."ipaddr.js"."0.1.2" = lib.makeOverridable self.buildNodePackage { - name = "node-ipaddr.js-0.1.2"; + by-spec."ipaddr.js"."0.1.3" = + self.by-version."ipaddr.js"."0.1.3"; + by-version."ipaddr.js"."0.1.3" = lib.makeOverridable self.buildNodePackage { + name = "node-ipaddr.js-0.1.3"; src = [ (fetchurl { - url = "http://registry.npmjs.org/ipaddr.js/-/ipaddr.js-0.1.2.tgz"; - name = "ipaddr.js-0.1.2.tgz"; - sha1 = "6a1fd3d854f5002965c34d7bbcd9b4a8d4b0467e"; + url = "http://registry.npmjs.org/ipaddr.js/-/ipaddr.js-0.1.3.tgz"; + name = "ipaddr.js-0.1.3.tgz"; + sha1 = "27a9ca37f148d2102b0ef191ccbf2c51a8f025c6"; }) ]; buildInputs = @@ -846,15 +883,15 @@ self.by-version."mime"."1.2.11"; by-spec."mime"."~1.2.9" = self.by-version."mime"."1.2.11"; - by-spec."mime-db"."~1.0.1" = - self.by-version."mime-db"."1.0.1"; - by-version."mime-db"."1.0.1" = lib.makeOverridable self.buildNodePackage { - name = "node-mime-db-1.0.1"; + by-spec."mime-db"."~1.1.0" = + self.by-version."mime-db"."1.1.0"; + by-version."mime-db"."1.1.0" = lib.makeOverridable self.buildNodePackage { + name = "node-mime-db-1.1.0"; src = [ (fetchurl { - url = "http://registry.npmjs.org/mime-db/-/mime-db-1.0.1.tgz"; - name = "mime-db-1.0.1.tgz"; - sha1 = "35d99b0965967253bb30633a7d07a8de9975a952"; + url = "http://registry.npmjs.org/mime-db/-/mime-db-1.1.0.tgz"; + name = "mime-db-1.1.0.tgz"; + sha1 = "4613f418ab995450bf4bda240cd0ab38016a07a9"; }) ]; buildInputs = @@ -865,28 +902,26 @@ ]; passthru.names = [ "mime-db" ]; }; - by-spec."mime-types"."~2.0.0" = - self.by-version."mime-types"."2.0.1"; - by-version."mime-types"."2.0.1" = lib.makeOverridable self.buildNodePackage { - name = "node-mime-types-2.0.1"; + by-spec."mime-types"."~2.0.2" = + self.by-version."mime-types"."2.0.2"; + by-version."mime-types"."2.0.2" = lib.makeOverridable self.buildNodePackage { + name = "node-mime-types-2.0.2"; src = [ (fetchurl { - url = "http://registry.npmjs.org/mime-types/-/mime-types-2.0.1.tgz"; - name = "mime-types-2.0.1.tgz"; - sha1 = "7f5b4712592e7dd46ca733fd1c5f5d71356de615"; + url = "http://registry.npmjs.org/mime-types/-/mime-types-2.0.2.tgz"; + name = "mime-types-2.0.2.tgz"; + sha1 = "c74b779f2896c367888622bd537aaaad4c0a2c08"; }) ]; buildInputs = (self.nativeDeps."mime-types" or []); deps = [ - self.by-version."mime-db"."1.0.1" + self.by-version."mime-db"."1.1.0" ]; peerDependencies = [ ]; passthru.names = [ "mime-types" ]; }; - by-spec."mime-types"."~2.0.1" = - self.by-version."mime-types"."2.0.1"; by-spec."minimist"."0.0.8" = self.by-version."minimist"."0.0.8"; by-version."minimist"."0.0.8" = lib.makeOverridable self.buildNodePackage { @@ -964,15 +999,15 @@ ]; passthru.names = [ "nan" ]; }; - by-spec."negotiator"."0.4.7" = - self.by-version."negotiator"."0.4.7"; - by-version."negotiator"."0.4.7" = lib.makeOverridable self.buildNodePackage { - name = "node-negotiator-0.4.7"; + by-spec."negotiator"."0.4.8" = + self.by-version."negotiator"."0.4.8"; + by-version."negotiator"."0.4.8" = lib.makeOverridable self.buildNodePackage { + name = "node-negotiator-0.4.8"; src = [ (fetchurl { - url = "http://registry.npmjs.org/negotiator/-/negotiator-0.4.7.tgz"; - name = "negotiator-0.4.7.tgz"; - sha1 = "a4160f7177ec806738631d0d3052325da42abdc8"; + url = "http://registry.npmjs.org/negotiator/-/negotiator-0.4.8.tgz"; + name = "negotiator-0.4.8.tgz"; + sha1 = "96010b23b63c387f47a4bed96762a831cda39eab"; }) ]; buildInputs = @@ -1044,14 +1079,14 @@ by-spec."on-finished"."~2.1.0" = self.by-version."on-finished"."2.1.0"; by-spec."options".">=0.0.5" = - self.by-version."options"."0.0.5"; - by-version."options"."0.0.5" = lib.makeOverridable self.buildNodePackage { - name = "node-options-0.0.5"; + self.by-version."options"."0.0.6"; + by-version."options"."0.0.6" = lib.makeOverridable self.buildNodePackage { + name = "node-options-0.0.6"; src = [ (fetchurl { - url = "http://registry.npmjs.org/options/-/options-0.0.5.tgz"; - name = "options-0.0.5.tgz"; - sha1 = "9a3806378f316536d79038038ba90ccb724816c3"; + url = "http://registry.npmjs.org/options/-/options-0.0.6.tgz"; + name = "options-0.0.6.tgz"; + sha1 = "ec22d312806bb53e731773e7cdaefcf1c643128f"; }) ]; buildInputs = @@ -1100,21 +1135,22 @@ ]; passthru.names = [ "path-to-regexp" ]; }; - by-spec."proxy-addr"."1.0.1" = - self.by-version."proxy-addr"."1.0.1"; - by-version."proxy-addr"."1.0.1" = lib.makeOverridable self.buildNodePackage { - name = "node-proxy-addr-1.0.1"; + by-spec."proxy-addr"."~1.0.3" = + self.by-version."proxy-addr"."1.0.3"; + by-version."proxy-addr"."1.0.3" = lib.makeOverridable self.buildNodePackage { + name = "node-proxy-addr-1.0.3"; src = [ (fetchurl { - url = "http://registry.npmjs.org/proxy-addr/-/proxy-addr-1.0.1.tgz"; - name = "proxy-addr-1.0.1.tgz"; - sha1 = "c7c566d5eb4e3fad67eeb9c77c5558ccc39b88a8"; + url = "http://registry.npmjs.org/proxy-addr/-/proxy-addr-1.0.3.tgz"; + name = "proxy-addr-1.0.3.tgz"; + sha1 = "17d824aac844707441249da6d1ea5e889007cdd6"; }) ]; buildInputs = (self.nativeDeps."proxy-addr" or []); deps = [ - self.by-version."ipaddr.js"."0.1.2" + self.by-version."forwarded"."0.1.0" + self.by-version."ipaddr.js"."0.1.3" ]; peerDependencies = [ ]; @@ -1139,15 +1175,15 @@ ]; passthru.names = [ "punycode" ]; }; - by-spec."qs"."2.2.3" = - self.by-version."qs"."2.2.3"; - by-version."qs"."2.2.3" = lib.makeOverridable self.buildNodePackage { - name = "node-qs-2.2.3"; + by-spec."qs"."2.2.4" = + self.by-version."qs"."2.2.4"; + by-version."qs"."2.2.4" = lib.makeOverridable self.buildNodePackage { + name = "node-qs-2.2.4"; src = [ (fetchurl { - url = "http://registry.npmjs.org/qs/-/qs-2.2.3.tgz"; - name = "qs-2.2.3.tgz"; - sha1 = "6139c1f47960eff5655e56aab0ef9f6dd16d4eeb"; + url = "http://registry.npmjs.org/qs/-/qs-2.2.4.tgz"; + name = "qs-2.2.4.tgz"; + sha1 = "2e9fbcd34b540e3421c924ecd01e90aa975319c8"; }) ]; buildInputs = @@ -1177,7 +1213,7 @@ ]; passthru.names = [ "qs" ]; }; - by-spec."range-parser"."~1.0.0" = + by-spec."range-parser"."~1.0.2" = self.by-version."range-parser"."1.0.2"; by-version."range-parser"."1.0.2" = lib.makeOverridable self.buildNodePackage { name = "node-range-parser-1.0.2"; @@ -1196,8 +1232,6 @@ ]; passthru.names = [ "range-parser" ]; }; - by-spec."range-parser"."~1.0.2" = - self.by-version."range-parser"."1.0.2"; by-spec."raw-body"."1.3.0" = self.by-version."raw-body"."1.3.0"; by-version."raw-body"."1.3.0" = lib.makeOverridable self.buildNodePackage { @@ -1270,25 +1304,25 @@ ]; passthru.names = [ "rimraf" ]; }; - by-spec."send"."0.9.1" = - self.by-version."send"."0.9.1"; - by-version."send"."0.9.1" = lib.makeOverridable self.buildNodePackage { - name = "node-send-0.9.1"; + by-spec."send"."0.9.3" = + self.by-version."send"."0.9.3"; + by-version."send"."0.9.3" = lib.makeOverridable self.buildNodePackage { + name = "node-send-0.9.3"; src = [ (fetchurl { - url = "http://registry.npmjs.org/send/-/send-0.9.1.tgz"; - name = "send-0.9.1.tgz"; - sha1 = "d93689f7c9ce36bd32f8ee572bb60bda032edc23"; + url = "http://registry.npmjs.org/send/-/send-0.9.3.tgz"; + name = "send-0.9.3.tgz"; + sha1 = "b43a7414cd089b7fbec9b755246f7c37b7b85cc0"; }) ]; buildInputs = (self.nativeDeps."send" or []); deps = [ self.by-version."debug"."2.0.0" - self.by-version."depd"."0.4.4" + self.by-version."depd"."0.4.5" self.by-version."destroy"."1.0.3" self.by-version."escape-html"."1.0.1" - self.by-version."etag"."1.3.0" + self.by-version."etag"."1.4.0" self.by-version."fresh"."0.2.4" self.by-version."mime"."1.2.11" self.by-version."ms"."0.6.2" @@ -1299,15 +1333,15 @@ ]; passthru.names = [ "send" ]; }; - by-spec."serve-static"."~1.6.1" = - self.by-version."serve-static"."1.6.1"; - by-version."serve-static"."1.6.1" = lib.makeOverridable self.buildNodePackage { - name = "node-serve-static-1.6.1"; + by-spec."serve-static"."~1.6.3" = + self.by-version."serve-static"."1.6.3"; + by-version."serve-static"."1.6.3" = lib.makeOverridable self.buildNodePackage { + name = "node-serve-static-1.6.3"; src = [ (fetchurl { - url = "http://registry.npmjs.org/serve-static/-/serve-static-1.6.1.tgz"; - name = "serve-static-1.6.1.tgz"; - sha1 = "2f257563afbe931d28cee4aa3dfeddc975a87193"; + url = "http://registry.npmjs.org/serve-static/-/serve-static-1.6.3.tgz"; + name = "serve-static-1.6.3.tgz"; + sha1 = "b214235d4d4516db050ea9f7b429b46212e79132"; }) ]; buildInputs = @@ -1315,7 +1349,7 @@ deps = [ self.by-version."escape-html"."1.0.1" self.by-version."parseurl"."1.3.0" - self.by-version."send"."0.9.1" + self.by-version."send"."0.9.3" self.by-version."utils-merge"."1.0.0" ]; peerDependencies = [ @@ -1424,21 +1458,21 @@ passthru.names = [ "tunnel-agent" ]; }; by-spec."type-is"."~1.5.1" = - self.by-version."type-is"."1.5.1"; - by-version."type-is"."1.5.1" = lib.makeOverridable self.buildNodePackage { - name = "node-type-is-1.5.1"; + self.by-version."type-is"."1.5.2"; + by-version."type-is"."1.5.2" = lib.makeOverridable self.buildNodePackage { + name = "node-type-is-1.5.2"; src = [ (fetchurl { - url = "http://registry.npmjs.org/type-is/-/type-is-1.5.1.tgz"; - name = "type-is-1.5.1.tgz"; - sha1 = "5c1e62d874f79199fb16b34d16972dba376ccbed"; + url = "http://registry.npmjs.org/type-is/-/type-is-1.5.2.tgz"; + name = "type-is-1.5.2.tgz"; + sha1 = "8291bbe845a904acfaffd05a41fdeb234bfa9e5f"; }) ]; buildInputs = (self.nativeDeps."type-is" or []); deps = [ self.by-version."media-typer"."0.3.0" - self.by-version."mime-types"."2.0.1" + self.by-version."mime-types"."2.0.2" ]; peerDependencies = [ ]; @@ -1499,7 +1533,7 @@ self.by-version."commander"."2.1.0" self.by-version."nan"."1.0.0" self.by-version."tinycolor"."0.0.1" - self.by-version."options"."0.0.5" + self.by-version."options"."0.0.6" ]; peerDependencies = [ ]; diff --git a/pkgs/applications/gis/qgis/default.nix b/pkgs/applications/gis/qgis/default.nix index 82f1bc382d7..231533e580e 100644 --- a/pkgs/applications/gis/qgis/default.nix +++ b/pkgs/applications/gis/qgis/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl, gdal, cmake, qt4, flex, bison, proj, geos, x11, sqlite, gsl, - pyqt4, qwt, fcgi, python, libspatialindex, libspatialite, sip }: + pyqt4, qwt, fcgi, python, libspatialindex, libspatialite }: stdenv.mkDerivation rec { name = "qgis-2.4.0"; - buildInputs = [ gdal qt4 flex bison proj geos x11 sqlite gsl pyqt4 sip qwt + buildInputs = [ gdal qt4 flex bison proj geos x11 sqlite gsl pyqt4 qwt fcgi libspatialindex libspatialite ]; nativeBuildInputs = [ cmake python ]; diff --git a/pkgs/applications/graphics/ImageMagick/default.nix b/pkgs/applications/graphics/ImageMagick/default.nix index 69bc2006666..8ae4bc2dd1b 100644 --- a/pkgs/applications/graphics/ImageMagick/default.nix +++ b/pkgs/applications/graphics/ImageMagick/default.nix @@ -20,7 +20,7 @@ let - version = "6.8.9-8"; + version = "6.9.0-0"; arch = if stdenv.system == "i686-linux" then "i686" @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://imagemagick/releases/${name}.tar.xz"; - sha256 = "1c792hbwi308lm9xkml319xaa4w3bz6hwy6i92jwrm7kqr4h8di7"; + sha256 = "1dmrl5x63msdnxsf4cmhz5v4ard2z3jrgp2zhqlb27399j81qcqj"; }; enableParallelBuilding = true; diff --git a/pkgs/applications/graphics/apitrace/default.nix b/pkgs/applications/graphics/apitrace/default.nix new file mode 100644 index 00000000000..c2f963f001b --- /dev/null +++ b/pkgs/applications/graphics/apitrace/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchgit, cmake, python, libX11, qt4 }: + +stdenv.mkDerivation { + name = "apitrace-09519af205"; + + src = fetchgit { + url = git://github.com/apitrace/apitrace.git; + rev = "09519af2056879ce0ea59f7085ac4b282c7d01d0"; + sha256 = "1ka34fhl85k90r7kvp89awlqb6prkbqx0kg1whb3535rnvficxdv"; + }; + + buildInputs = [ cmake python libX11 qt4 ]; + + buildPhase = '' + cmake + make + ''; + + meta = with stdenv.lib; { + homepage = https://apitrace.github.io; + description = "A set of tools to trace OpenGL, OpenGL ES, Direct3D, and DirectDraw APIs"; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/graphics/darktable/default.nix b/pkgs/applications/graphics/darktable/default.nix index c4e2a7534af..f15c5addf98 100644 --- a/pkgs/applications/graphics/darktable/default.nix +++ b/pkgs/applications/graphics/darktable/default.nix @@ -9,12 +9,12 @@ assert stdenv ? glibc; stdenv.mkDerivation rec { - version = "1.4.2"; + version = "1.6.0"; name = "darktable-${version}"; src = fetchurl { - url = "mirror://sourceforge/darktable/darktable/1.2/darktable-${version}.tar.xz"; - sha256 = "02875rnabw5m9aqfls59901889iyxkmm4xk445fvh1v06dp1lcf1"; + url = "https://github.com/darktable-org/darktable/releases/download/release-${version}/darktable-${version}.tar.xz"; + sha256 = "0zjrcd9a73ikn9g8yx9lixz1ifwbmy2vg2ipc24lnkpqhrbb1y1b"; }; buildInputs = @@ -46,9 +46,9 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Virtual lighttable and darkroom for photographers"; - homepage = http://darktable.sourceforge.net; + homepage = http://www.darktable.org; license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = [ maintainers.goibhniu maintainers.rickynils ]; + maintainers = [ maintainers.goibhniu maintainers.rickynils maintainers.flosse ]; }; } diff --git a/pkgs/applications/graphics/feh/default.nix b/pkgs/applications/graphics/feh/default.nix index d23f42fdbf9..e40a5fd0630 100644 --- a/pkgs/applications/graphics/feh/default.nix +++ b/pkgs/applications/graphics/feh/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = { description = "A light-weight image viewer"; homepage = https://derf.homelinux.org/projects/feh/; - license = "BSD"; + license = stdenv.lib.licenses.mit; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/applications/graphics/luminance-hdr/default.nix b/pkgs/applications/graphics/luminance-hdr/default.nix index 7558b0aef4b..cbde1879d31 100644 --- a/pkgs/applications/graphics/luminance-hdr/default.nix +++ b/pkgs/applications/graphics/luminance-hdr/default.nix @@ -1,4 +1,4 @@ -{ stdenv, cmake, fetchurl, pkgconfig, qt5, boost, exiv2, fftwFloat, gsl +{ stdenv, cmake, fetchurl, fetchpatch, pkgconfig, qt5, boost, exiv2, fftwFloat, gsl , ilmbase, lcms2, libraw, libtiff, openexr }: @@ -10,6 +10,13 @@ stdenv.mkDerivation rec { sha256 = "00fldbcizrx8jcnjgq74n3zmbm27dxzl96fxa7q49689mfnlw08l"; }; + patches = [(fetchpatch { + name = "fix-qt53-build.diff"; + url = "http://anonscm.debian.org/cgit/pkg-phototools/luminance-hdr.git/" + + "plain/debian/patches/51_qt5_printsupport.diff?id=00c869a860062dac181303f2c03a3513c0e210bc"; + sha256 = "0nzvfxd3ybxx61rj6vxcaaxfrsxrl9af3h8jj7pr3rncisnl9gkl"; + })]; + NIX_CFLAGS_COMPILE = "-I${ilmbase}/include/OpenEXR"; buildInputs = [ qt5 boost exiv2 fftwFloat gsl ilmbase lcms2 libraw libtiff openexr ]; diff --git a/pkgs/applications/graphics/shotwell/default.nix b/pkgs/applications/graphics/shotwell/default.nix index 48044fba166..223f632f937 100644 --- a/pkgs/applications/graphics/shotwell/default.nix +++ b/pkgs/applications/graphics/shotwell/default.nix @@ -1,6 +1,6 @@ { fetchurl, stdenv, m4, glibc, gtk3, libexif, libgphoto2, libsoup, libxml2, vala, sqlite, webkitgtk24x , pkgconfig, gnome3, gst_all_1, which, udev, libraw, glib, json_glib, gettext, desktop_file_utils -, lcms2, gdk_pixbuf, librsvg, makeWrapper, gnome_doc_utils }: +, lcms2, gdk_pixbuf, librsvg, makeWrapper, gnome_doc_utils, hicolor_icon_theme }: # for dependencies see http://www.yorba.org/projects/shotwell/install/ @@ -42,7 +42,8 @@ in stdenv.mkDerivation rec { preFixup = '' wrapProgram "$out/bin/shotwell" \ --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ - --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gtk3}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" + --prefix XDG_DATA_DIRS : "$XDG_ICON_DIRS:${gtk3}/share:$out/share:$GSETTINGS_SCHEMAS_PATH" \ + --prefix GIO_EXTRA_MODULES : "${gnome3.dconf}/lib/gio/modules" rm $out/share/icons/hicolor/icon-theme.cache ''; @@ -50,7 +51,9 @@ in stdenv.mkDerivation rec { buildInputs = [ m4 glibc gtk3 libexif libgphoto2 libsoup libxml2 vala sqlite webkitgtk24x pkgconfig gst_all_1.gstreamer gst_all_1.gst-plugins-base gnome3.libgee which udev gnome3.gexiv2 libraw rest json_glib gettext desktop_file_utils glib lcms2 gdk_pixbuf librsvg - makeWrapper gnome_doc_utils ]; + makeWrapper gnome_doc_utils + gnome3.gnome_icon_theme gnome3.gnome_icon_theme_symbolic + hicolor_icon_theme ]; meta = with stdenv.lib; { description = "Popular photo organizer for the GNOME desktop"; diff --git a/pkgs/applications/graphics/yed/default.nix b/pkgs/applications/graphics/yed/default.nix index 2929513952e..4299d49ae65 100644 --- a/pkgs/applications/graphics/yed/default.nix +++ b/pkgs/applications/graphics/yed/default.nix @@ -24,6 +24,6 @@ stdenv.mkDerivation rec { homepage = http://www.yworks.com/en/products/yfiles/yed/; description = "A powerful desktop application that can be used to quickly and effectively generate high-quality diagrams"; platforms = jre.meta.platforms; - maintainer = with maintainers; [ abbradar ]; + maintainers = with maintainers; [ abbradar ]; }; } diff --git a/pkgs/applications/misc/adobe-reader/builder.sh b/pkgs/applications/misc/adobe-reader/builder.sh index 6024734dc44..41281385c99 100644 --- a/pkgs/applications/misc/adobe-reader/builder.sh +++ b/pkgs/applications/misc/adobe-reader/builder.sh @@ -17,7 +17,7 @@ rm $p/Reader/intellinux/plug_ins/PPKLite.api # More pointless files. rm $p/bin/UNINSTALL -patchelf --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \ +patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ --set-rpath $libPath \ $p/Reader/intellinux/bin/acroread diff --git a/pkgs/applications/misc/adobe-reader/default.nix b/pkgs/applications/misc/adobe-reader/default.nix index 85bc89f7755..07f8ba1d627 100644 --- a/pkgs/applications/misc/adobe-reader/default.nix +++ b/pkgs/applications/misc/adobe-reader/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation { # versions. libPath = stdenv.lib.makeLibraryPath - [ stdenv.gcc.gcc libX11 zlib libxml2 cups pango atk gtk glib gdk_pixbuf ]; + [ stdenv.cc.gcc libX11 zlib libxml2 cups pango atk gtk glib gdk_pixbuf ]; meta = { description = "Adobe Reader, a viewer for PDF documents"; diff --git a/pkgs/applications/misc/blender/default.nix b/pkgs/applications/misc/blender/default.nix index 01f9b861bf2..52583c53589 100644 --- a/pkgs/applications/misc/blender/default.nix +++ b/pkgs/applications/misc/blender/default.nix @@ -4,6 +4,7 @@ , zlib, fftw , jackaudioSupport ? false, jack2 , cudaSupport ? false, cudatoolkit6 +, colladaSupport ? true, opencollada }: with lib; @@ -16,13 +17,20 @@ stdenv.mkDerivation rec { sha256 = "0ixz8h3c08p4f84x8r85nzddwvc0h5lw1ci8gdg2x3m2mw2cfdj4"; }; + patches = [(fetchpatch { + url = "https://raw.githubusercontent.com/Exherbo/media-unofficial/b5b09fa35ed/" + + "packages/media-gfx/blender/files/blender-2.71-Fix-build-with-freetype-2.5.4.patch"; + sha256 = "19kx9h030zy2f0ah5v69ank2ak8gfp1zv26pm4ixngfdbsiy5lvk"; + })]; + buildInputs = [ SDL boost cmake ffmpeg gettext glew ilmbase libXi libjpeg libpng libsamplerate libsndfile libtiff mesa openal opencolorio openexr openimageio /* openjpeg */ python zlib fftw ] ++ optional jackaudioSupport jack2 - ++ optional cudaSupport cudatoolkit6; + ++ optional cudaSupport cudatoolkit6 + ++ optional colladaSupport opencollada; postUnpack = '' @@ -30,8 +38,7 @@ stdenv.mkDerivation rec { ''; cmakeFlags = - [ "-DWITH_OPENCOLLADA=OFF" - "-DWITH_MOD_OCEANSIM=ON" + [ "-DWITH_MOD_OCEANSIM=ON" "-DWITH_CODEC_FFMPEG=ON" "-DWITH_CODEC_SNDFILE=ON" "-DWITH_INSTALL_PORTABLE=OFF" @@ -41,7 +48,8 @@ stdenv.mkDerivation rec { "-DPYTHON_VERSION=${python.majorVersion}" ] ++ optional jackaudioSupport "-DWITH_JACK=ON" - ++ optional cudaSupport "-DWITH_CYCLES_CUDA_BINARIES=ON"; + ++ optional cudaSupport "-DWITH_CYCLES_CUDA_BINARIES=ON" + ++ optional colladaSupport "-DWITH_OPENCOLLADA=ON"; NIX_CFLAGS_COMPILE = "-I${ilmbase}/include/OpenEXR -I${python}/include/${python.libPrefix}m"; diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index 4656e5add13..ba4946ecc4b 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -5,11 +5,11 @@ }: stdenv.mkDerivation rec { - name = "calibre-2.12.0"; + name = "calibre-2.13.0"; src = fetchurl { url = "mirror://sourceforge/calibre/${name}.tar.xz"; - sha256 = "1qp3aq6f6ngfy8m0bj6rzdf6p2vmk4bxycxfby2n8byfhr8gaclf"; + sha256 = "0sd9yanl4n1bmbxpvdvl68bisp0bgvfk6naddkvcahy9h7qc6h33"; }; inherit python; diff --git a/pkgs/applications/misc/cool-old-term/default.nix b/pkgs/applications/misc/cool-old-term/default.nix index 76d78f00402..c56393a1be8 100644 --- a/pkgs/applications/misc/cool-old-term/default.nix +++ b/pkgs/applications/misc/cool-old-term/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, qt53 }: +{ stdenv, fetchFromGitHub, qt5 }: stdenv.mkDerivation rec { version = "0.9"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "8462f3eded7b2219acc143258544b0dfac32d81e10cac61ff14276d426704c93"; }; - buildInputs = [ qt53 ]; + buildInputs = [ qt5 ]; buildPhase = '' pushd ./konsole-qml-plugin @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { cat > $out/bin/cool-old-term < python != null && swig != null; stdenv.mkDerivation rec { name = "gnuradio-osmosdr-${version}"; - version = "0.1.0"; + version = "0.1.4"; src = fetchgit { url = "git://git.osmocom.org/gr-osmosdr"; rev = "refs/tags/v${version}"; - sha256 = "112zfvnr6fjvhdc06ihi2sb0dp441qy7jq8rvr81nbyv3r8jspj4"; + sha256 = "0vyzr4fhkblf2v3d7m0ch5hws4c493jw3ydl4y6b2dfbfzchhsz8"; }; buildInputs = [ diff --git a/pkgs/applications/misc/googleearth/default.nix b/pkgs/applications/misc/googleearth/default.nix index ea577beb592..48db5eb07b2 100644 --- a/pkgs/applications/misc/googleearth/default.nix +++ b/pkgs/applications/misc/googleearth/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { nativeBuildInputs = [ glibc glib - stdenv.gcc.gcc + stdenv.cc.gcc libSM libICE libXi @@ -59,7 +59,7 @@ stdenv.mkDerivation { fullPath=$fullPath:$i/lib done - patchelf --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \ + patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ --set-rpath $fullPath \ $out/opt/googleearth/googleearth-bin diff --git a/pkgs/applications/misc/gosmore/default.nix b/pkgs/applications/misc/gosmore/default.nix index ea72dc03269..43631ecdb24 100644 --- a/pkgs/applications/misc/gosmore/default.nix +++ b/pkgs/applications/misc/gosmore/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation { name = "gosmore-r${version}"; src = fetchsvn { url = http://svn.openstreetmap.org/applications/rendering/gosmore; - sha256 = "0qyvrb4xgy4msc7f65widzkvjzc8mlddc4dyr1i76b7wd3gpk0xj"; + sha256 = "0d8ddfa0nhz51ambwj9y5jjbizl9y9w44sviisk3ysqvn8q0phds"; rev = "${version}"; }; diff --git a/pkgs/applications/misc/gqrx/default.nix b/pkgs/applications/misc/gqrx/default.nix index a5208107750..169331ceb73 100644 --- a/pkgs/applications/misc/gqrx/default.nix +++ b/pkgs/applications/misc/gqrx/default.nix @@ -8,11 +8,11 @@ assert pulseaudioSupport -> pulseaudio != null; stdenv.mkDerivation rec { name = "gqrx-${version}"; - version = "2.2.0"; + version = "2.3.2"; src = fetchurl { - url = "mirror://sourceforge/project/gqrx/${version}/${name}-src.tar.gz"; - sha256 = "15ncx2shh43skph7sj3jvmkls9cbbbysld49c8xd23fhdsxanj9x"; + url = "mirror://sourceforge/project/gqrx/${version}/${name}.tar.xz"; + sha256 = "1vfqqa976xlbapqkpc9nka364zydvsy18xiwfqjy015kpasshdz1"; }; buildInputs = [ @@ -21,6 +21,14 @@ stdenv.mkDerivation rec { configurePhase = ''qmake PREFIX="$out"''; + postInstall = '' + mkdir -p "$out/share/applications" + mkdir -p "$out/share/icons" + + cp gqrx.desktop "$out/share/applications/" + cp icons/gqrx.svg "$out/share/icons/" + ''; + meta = with stdenv.lib; { description = "Software defined radio (SDR) receiver"; longDescription = '' diff --git a/pkgs/applications/misc/gtk2fontsel/default.nix b/pkgs/applications/misc/gtk2fontsel/default.nix new file mode 100644 index 00000000000..ea3f4b8f2b9 --- /dev/null +++ b/pkgs/applications/misc/gtk2fontsel/default.nix @@ -0,0 +1,28 @@ +{stdenv, fetchurl, pkgconfig, gtk }: + +stdenv.mkDerivation rec { + version = "0.1"; + name = "gtk2fontsel-${version}"; + + src = fetchurl { + url = "mirror://sourceforge/gtk2fontsel/${name}.tar.gz"; + sha256 = "0s2sj19n8ys92q9832hkn36ld91bb4qavicc6nygkry6qdpkkmjw"; + }; + + buildInputs = [ stdenv pkgconfig gtk ]; + + preferLocalBuild = true; + + meta = with stdenv.lib; { + description = "A font selection program for X11 using the GTK2 toolkit"; + longDescription = '' + Font selection tool similar to xfontsel implemented using GTK+ 2. + Trivial, but useful nonetheless. + ''; + homepage = http://gtk2fontsel.sourceforge.net/; + downloadPage = http://sourceforge.net/projects/gtk2fontsel/; + license = licenses.gpl2; + maintainers = [ maintainers.prikhi ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/misc/ikiwiki/default.nix b/pkgs/applications/misc/ikiwiki/default.nix index b58f0a5703c..691fecc77fd 100644 --- a/pkgs/applications/misc/ikiwiki/default.nix +++ b/pkgs/applications/misc/ikiwiki/default.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation { sed -i /ENV{PATH}/d ikiwiki.in # State the gcc dependency, and make the cgi use our wrapper sed -i -e 's@$0@"'$out/bin/ikiwiki'"@' \ - -e "s@'cc'@'${stdenv.gcc}/bin/gcc'@" IkiWiki/Wrapper.pm + -e "s@'cc'@'${stdenv.cc}/bin/gcc'@" IkiWiki/Wrapper.pm ''; configurePhase = "perl Makefile.PL PREFIX=$out"; diff --git a/pkgs/applications/misc/k2pdfopt/default.nix b/pkgs/applications/misc/k2pdfopt/default.nix index 2ae5a7ac8ef..9c592fcbb2d 100644 --- a/pkgs/applications/misc/k2pdfopt/default.nix +++ b/pkgs/applications/misc/k2pdfopt/default.nix @@ -20,10 +20,11 @@ let }; in stdenv.mkDerivation rec { - name = "k2pdfopt"; + name = "k2pdfopt-${version}"; + version = "2.30"; src = fetchzip { - url = http://www.willus.com/k2pdfopt/src/k2pdfopt_v2.21_src.zip; - sha256 = "1vy0yw41z6p95gmivjk4r534zbg0kqap4lr9ps56kvjw51q8r54j"; + url = "http://www.willus.com/k2pdfopt/src/k2pdfopt_v${version}_src.zip"; + sha256 = "1fjjznkplrbyrg48wbij4kqgkz9i5icq7savl6brsf9haahdz6q5"; }; buildInputs = [ libX11 libXext autoconf automake libtool leptonica libpng libtiff zlib @@ -95,7 +96,7 @@ in stdenv.mkDerivation rec { -ljbig2dec -ljpeg -lopenjp2 -lpng -lfreetype -lpthread -lmujs \ -lPgm2asc -llept -ltesseract -lcrypto - mkdir -p $out/bin + mkdir -p $out/bin cp k2pdfopt $out/bin ''; diff --git a/pkgs/applications/misc/k3b/default.nix b/pkgs/applications/misc/k3b/default.nix index b220c9127de..0a49ad44560 100644 --- a/pkgs/applications/misc/k3b/default.nix +++ b/pkgs/applications/misc/k3b/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, cmake, qt4, perl, shared_mime_info, libvorbis, taglib +{ stdenv, fetchurl, makeWrapper, cmake, qt4, perl, shared_mime_info, libvorbis, taglib , flac, libsamplerate, libdvdread, lame, libsndfile, libmad, gettext -, transcode, cdrdao, dvdplusrwtools, vcdimager +, transcode, cdrdao, dvdplusrwtools, vcdimager, cdparanoia , kdelibs, kdemultimedia, automoc4, phonon, libkcddb ? null }: @@ -15,9 +15,9 @@ stdenv.mkDerivation rec { buildInputs = [ cmake qt4 perl shared_mime_info libvorbis taglib flac libsamplerate libdvdread lame libsndfile - libmad gettext stdenv.gcc.libc + libmad gettext stdenv.cc.libc kdelibs kdemultimedia automoc4 phonon - libkcddb + libkcddb makeWrapper cdparanoia ]; enableParallelBuilding = true; @@ -26,6 +26,11 @@ stdenv.mkDerivation rec { # eMovix, growisofs, mkisofs, normalize, readcd, transcode, vcdxbuild, # vcdxminfo, and vcdxrip propagatedUserEnvPkgs = [ transcode dvdplusrwtools cdrdao vcdimager ]; + + postInstall = '' + wrapProgram $out/bin/k3b \ + --prefix LD_LIBRARY_PATH ":" "${cdparanoia}/lib" + ''; meta = with stdenv.lib; { description = "CD/DVD Burning Application for KDE"; diff --git a/pkgs/applications/misc/llpp/default.nix b/pkgs/applications/misc/llpp/default.nix index 5284d441b44..258b8cac940 100644 --- a/pkgs/applications/misc/llpp/default.nix +++ b/pkgs/applications/misc/llpp/default.nix @@ -1,5 +1,5 @@ { stdenv, makeWrapper, fetchgit, pkgconfig, ninja, ocaml, findlib, mupdf, lablgl -, gtk3, openjpeg, jbig2dec, mujs }: +, gtk3, openjpeg, jbig2dec, mujs, xsel }: let ocamlVersion = (builtins.parseDrvName (ocaml.name)).version; in stdenv.mkDerivation rec { @@ -28,7 +28,8 @@ in stdenv.mkDerivation rec { install link.so $out/lib wrapProgram $out/bin/llpp \ --prefix CAML_LD_LIBRARY_PATH ":" "${lablgl}/lib/ocaml/${ocamlVersion}/site-lib/lablgl" \ - --prefix CAML_LD_LIBRARY_PATH ":" "$out/lib" + --prefix CAML_LD_LIBRARY_PATH ":" "$out/lib" \ + --prefix PATH ":" "${xsel}/bin" ''; meta = with stdenv.lib; { diff --git a/pkgs/applications/misc/mediainfo-gui/default.nix b/pkgs/applications/misc/mediainfo-gui/default.nix new file mode 100644 index 00000000000..8013cbe3669 --- /dev/null +++ b/pkgs/applications/misc/mediainfo-gui/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchurl, automake, autoconf, libtool, pkgconfig, libzen, libmediainfo, wxGTK, desktop_file_utils, libSM, imagemagick }: + +let version = "0.7.71"; in + +stdenv.mkDerivation { + name = "mediainfo-gui-${version}"; + src = fetchurl { + url = "http://mediaarea.net/download/source/mediainfo/${version}/mediainfo_${version}.tar.bz2"; + sha256 = "0sf0ym0v5ds5w4bxk66712adybr1prxxqwvrf9clm57ibs602jfq"; + }; + + buildInputs = [ automake autoconf libtool pkgconfig libzen libmediainfo wxGTK desktop_file_utils libSM imagemagick ]; + + sourceRoot = "./MediaInfo/Project/GNU/GUI/"; + + preConfigure = "sh autogen"; + + meta = { + description = "Supplies technical and tag information about a video or audio file (GUI version)"; + longDescription = '' + MediaInfo is a convenient unified display of the most relevant technical + and tag data for video and audio files. + ''; + homepage = http://mediaarea.net/; + license = stdenv.lib.licenses.bsd2; + platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.devhell ]; + }; +} diff --git a/pkgs/applications/misc/mediainfo/default.nix b/pkgs/applications/misc/mediainfo/default.nix new file mode 100644 index 00000000000..a3393a0a99f --- /dev/null +++ b/pkgs/applications/misc/mediainfo/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchurl, automake, autoconf, libtool, pkgconfig, libzen, libmediainfo, zlib }: + +let version = "0.7.71"; in + +stdenv.mkDerivation { + name = "mediainfo-${version}"; + src = fetchurl { + url = "http://mediaarea.net/download/source/mediainfo/${version}/mediainfo_${version}.tar.bz2"; + sha256 = "0sf0ym0v5ds5w4bxk66712adybr1prxxqwvrf9clm57ibs602jfq"; + }; + + buildInputs = [ automake autoconf libtool pkgconfig libzen libmediainfo zlib ]; + + sourceRoot = "./MediaInfo/Project/GNU/CLI/"; + + configureFlags = [ "--with-libmediainfo=${libmediainfo}" ]; + preConfigure = "sh autogen"; + + meta = { + description = "Supplies technical and tag information about a video or audio file"; + longDescription = '' + MediaInfo is a convenient unified display of the most relevant technical + and tag data for video and audio files. + ''; + homepage = http://mediaarea.net/; + license = stdenv.lib.licenses.bsd2; + platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.devhell ]; + }; +} diff --git a/pkgs/applications/misc/monero/default.nix b/pkgs/applications/misc/monero/default.nix index 1fe5406384f..6af9b7dc267 100644 --- a/pkgs/applications/misc/monero/default.nix +++ b/pkgs/applications/misc/monero/default.nix @@ -16,6 +16,9 @@ stdenv.mkDerivation { # these tests take a long time and don't # always complete in the build environment postPatch = "sed -i '/add_subdirectory(tests)/d' CMakeLists.txt"; + + NIX_CFLAGS_COMPILE = "-Wno-error=cpp"; + doCheck = false; checkTarget = "test-release"; # this would be the target diff --git a/pkgs/applications/misc/mysql-workbench/default.nix b/pkgs/applications/misc/mysql-workbench/default.nix index 91fd1da1014..93450d17916 100644 --- a/pkgs/applications/misc/mysql-workbench/default.nix +++ b/pkgs/applications/misc/mysql-workbench/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { postInstall = '' wrapProgram "$out/bin/mysql-workbench" \ --prefix LD_LIBRARY_PATH : "${python}/lib" \ - --prefix LD_LIBRARY_PATH : "$(cat ${stdenv.gcc}/nix-support/orig-gcc)/lib64" \ + --prefix LD_LIBRARY_PATH : "$(cat ${stdenv.cc}/nix-support/orig-gcc)/lib64" \ --prefix PATH : "${gnome_keyring}/bin" \ --prefix PATH : "${python}/bin" \ --set PYTHONPATH $PYTHONPATH \ diff --git a/pkgs/applications/misc/printrun/default.nix b/pkgs/applications/misc/printrun/default.nix index dc258d65328..d6a0bfcd120 100644 --- a/pkgs/applications/misc/printrun/default.nix +++ b/pkgs/applications/misc/printrun/default.nix @@ -7,11 +7,12 @@ py.buildPythonPackage rec { src = fetchgit { url = "https://github.com/kliment/Printrun"; - rev = "0a7f2335d0c02c3cc283200867b41f8b337b1387"; - sha256 = "1zvh5ih89isv51sraljm29z9k00srrdnklwkyp27ymxzlbcwq6gv"; + rev = "2299962bb338d3f4335b97211ee609ebaea008f7"; # printrun-20140801 + sha256 = "19nay7xclm36x56hpm87gw4ca6rnygpqaw5ypbmrz0hyxx140abj"; }; - propagatedBuildInputs = [ py.wxPython py.pyserial py.dbus py.psutil ]; + propagatedBuildInputs = with py; [ wxPython30 pyserial dbus psutil + numpy pyopengl pyglet cython ]; doCheck = false; diff --git a/pkgs/applications/misc/procmail/default.nix b/pkgs/applications/misc/procmail/default.nix index 7b25f9fc5c7..38c982dc3e5 100644 --- a/pkgs/applications/misc/procmail/default.nix +++ b/pkgs/applications/misc/procmail/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation { name = "procmail-3.22"; - buildInputs = [ stdenv.gcc.libc ]; + buildInputs = [ stdenv.cc.libc ]; # getline is defined differently in glibc now. So rename it. installPhase = " diff --git a/pkgs/applications/misc/qpdfview/default.nix b/pkgs/applications/misc/qpdfview/default.nix index 17da22cbaaf..7d17e6c4a95 100644 --- a/pkgs/applications/misc/qpdfview/default.nix +++ b/pkgs/applications/misc/qpdfview/default.nix @@ -5,10 +5,10 @@ let s = # Generated upstream information rec { baseName="qpdfview"; - version="0.4.12"; + version = "0.4.13"; name="${baseName}-${version}"; url="https://launchpad.net/qpdfview/trunk/${version}/+download/qpdfview-${version}.tar.gz"; - sha256="1h6lrrh1vblqkxrd89nmid7d21anyn30iahj24z62yny35lidf0g"; + sha256 = "0hcfy9wrgs6vygmq790rqipw2132br3av3nhzrm4gpxlbw2n7xcg"; }; buildInputs = [ qt4 popplerQt4 pkgconfig djvulibre libspectre cups file ghostscript diff --git a/pkgs/applications/misc/rescuetime/default.nix b/pkgs/applications/misc/rescuetime/default.nix index 2fd43382c40..bb0cf451957 100644 --- a/pkgs/applications/misc/rescuetime/default.nix +++ b/pkgs/applications/misc/rescuetime/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation { cp usr/bin/rescuetime $out/bin ${patchelf}/bin/patchelf \ - --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \ + --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ $out/bin/rescuetime wrapProgram $out/bin/rescuetime \ diff --git a/pkgs/applications/misc/slic3r/default.nix b/pkgs/applications/misc/slic3r/default.nix index a057197a92d..727bb048605 100644 --- a/pkgs/applications/misc/slic3r/default.nix +++ b/pkgs/applications/misc/slic3r/default.nix @@ -69,5 +69,6 @@ stdenv.mkDerivation rec { license = licenses.agpl3; platforms = platforms.linux; maintainers = with maintainers; [ bjornfor the-kenny ]; + broken = true; # requires Perl 5.14 }; } diff --git a/pkgs/applications/misc/synergy/default.nix b/pkgs/applications/misc/synergy/default.nix index 2a518b9d7cc..746b5e5ef46 100644 --- a/pkgs/applications/misc/synergy/default.nix +++ b/pkgs/applications/misc/synergy/default.nix @@ -7,13 +7,13 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "synergy-${version}"; - version = "1.6.1"; + version = "1.6.2"; src = fetchFromGitHub { owner = "synergy"; repo = "synergy"; - rev = "1.6.1"; - sha256 = "1043101c4phv1nbxiqp2jn1jhgzspv9q6v75z0kfzwgii5n5xq1c"; + rev = version; + sha256 = "0himg6c50x5wz5nc6rgd54rph1w6nin6j9f08pa4spsxn9b5h8ks"; }; patches = optional stdenv.isLinux ./cryptopp.patch; diff --git a/pkgs/applications/misc/taffybar/default.nix b/pkgs/applications/misc/taffybar/default.nix index 1f5481fc5a9..8f2f95193fb 100644 --- a/pkgs/applications/misc/taffybar/default.nix +++ b/pkgs/applications/misc/taffybar/default.nix @@ -8,8 +8,8 @@ cabal.mkDerivation (self: { pname = "taffybar"; - version = "0.4.3"; - sha256 = "1h7acdzq3bndy44lyvgnm3gvxpbhzcs0ymvkrhmn3y41bfcwaac2"; + version = "0.4.4"; + sha256 = "046nfp878mqj9acsid94mqp8q1yqnm1hsdkv88m5qpmn182xljwh"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/applications/misc/xca/default.nix b/pkgs/applications/misc/xca/default.nix index 09edb086c9f..0bc2170340c 100644 --- a/pkgs/applications/misc/xca/default.nix +++ b/pkgs/applications/misc/xca/default.nix @@ -28,6 +28,5 @@ stdenv.mkDerivation rec { homepage = http://xca.sourceforge.net/; platforms = platforms.all; license = licenses.bsd3; - broken = true; }; } diff --git a/pkgs/applications/misc/xpdf/default.nix b/pkgs/applications/misc/xpdf/default.nix index fdcdd4770d0..2e690dcce09 100644 --- a/pkgs/applications/misc/xpdf/default.nix +++ b/pkgs/applications/misc/xpdf/default.nix @@ -1,5 +1,5 @@ { enableGUI ? true, enablePDFtoPPM ? true, useT1Lib ? false -, stdenv, fetchurl, x11 ? null, motif ? null, freetype ? null, t1lib ? null +, stdenv, fetchurl, zlib, libpng, x11 ? null, motif ? null, freetype ? null, t1lib ? null , base14Fonts ? null }: @@ -10,14 +10,14 @@ assert useT1Lib -> t1lib != null; assert !useT1Lib; # t1lib has multiple unpatched security vulnerabilities stdenv.mkDerivation { - name = "xpdf-3.03"; + name = "xpdf-3.04"; src = fetchurl { - url = ftp://ftp.foolabs.com/pub/xpdf/xpdf-3.03.tar.gz; - sha256 = "1jnfzdqc54wa73lw28kjv0m7120mksb0zkcn81jdlvijyvc67kq2"; + url = ftp://ftp.foolabs.com/pub/xpdf/xpdf-3.04.tar.gz; + sha256 = "1rbp54mr3z2x3a3a1qmz8byzygzi223vckfam9ib5g1sfds0qf8i"; }; - buildInputs = + buildInputs = [ zlib libpng ] ++ stdenv.lib.optionals enableGUI [x11 motif] ++ stdenv.lib.optional useT1Lib t1lib ++ stdenv.lib.optional enablePDFtoPPM freetype; diff --git a/pkgs/applications/networking/bittorrentsync/default.nix b/pkgs/applications/networking/bittorrentsync/default.nix index 00f36729d1f..974a5a83de4 100644 --- a/pkgs/applications/networking/bittorrentsync/default.nix +++ b/pkgs/applications/networking/bittorrentsync/default.nix @@ -5,15 +5,15 @@ let else if stdenv.system == "i686-linux" then "i386" else throw "Bittorrent Sync for: ${stdenv.system} not supported!"; - sha256 = if stdenv.system == "x86_64-linux" then "c4b100bbf8cda0334e20793e02bf400d15266cb9d089917bd2b6b9d49dd37d19" - else if stdenv.system == "i686-linux" then "5760471fcea396efd158758aa350b1c48a9d0633765a5e3b059baf8aeab615fa" + sha256 = if stdenv.system == "x86_64-linux" then "0hiapq24y02pm7zi0jvqj4jxwdn5k74yxq9n1jpv8jmgir3iwznn" + else if stdenv.system == "i686-linux" then "0jv3zg0jhdzsc56kkpylwihvhsz73gsl2i2pjmqk3r3x4gwjk8xx" else throw "Bittorrent Sync for: ${stdenv.system} not supported!"; - libPath = stdenv.lib.makeLibraryPath [ stdenv.gcc.libc ]; + libPath = stdenv.lib.makeLibraryPath [ stdenv.cc.libc ]; in stdenv.mkDerivation rec { name = "btsync-${version}"; - version = "1.4.93"; + version = "1.4.103"; src = fetchurl { url = "http://syncapp.bittorrent.com/${version}/btsync_${arch}-${version}.tar.gz"; @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { mkdir -p "$out/bin/" cp -r "btsync" "$out/bin/" - patchelf --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \ + patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ --set-rpath ${libPath} "$out/bin/btsync" ''; diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index dea816e5be9..ee46bb97072 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -13,7 +13,7 @@ , bison, gperf , glib, gtk, dbus_glib , libXScrnSaver, libXcursor, libXtst, mesa -, protobuf, speechd, libXdamage +, protobuf, speechd, libXdamage, cups # optional dependencies , libgcrypt ? null # gnomeSupport || cupsSupport @@ -25,7 +25,7 @@ , gnomeSupport ? false, gnome ? null , gnomeKeyringSupport ? false, libgnome_keyring3 ? null , proprietaryCodecs ? true -, cupsSupport ? false +, cupsSupport ? true , pulseSupport ? false, pulseaudio ? null , hiDPISupport ? false @@ -117,7 +117,7 @@ let ] ++ optional gnomeKeyringSupport libgnome_keyring3 ++ optionals gnomeSupport [ gnome.GConf libgcrypt ] ++ optional enableSELinux libselinux - ++ optional cupsSupport libgcrypt + ++ optionals cupsSupport [ libgcrypt cups ] ++ optional pulseSupport pulseaudio; # XXX: Wait for https://crbug.com/239107 and https://crbug.com/239181 to @@ -186,11 +186,13 @@ let } // (extraAttrs.gypFlags or {})); configurePhase = '' + # Precompile .pyc files to prevent race conditions during build + python -m compileall -q -f . || : # ignore errors + # This is to ensure expansion of $out. libExecPath="${libExecPath}" python build/linux/unbundle/replace_gyp_files.py ${gypFlags} python build/gyp_chromium -f ninja --depth "$(pwd)" ${gypFlags} - find . -iname '*.py[co]' -delete ''; buildPhase = let diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index 75d5f1c248e..8e397d81919 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -10,7 +10,7 @@ , proprietaryCodecs ? true , enablePepperFlash ? false , enableWideVine ? false -, cupsSupport ? false +, cupsSupport ? true , pulseSupport ? false , hiDPISupport ? false }: diff --git a/pkgs/applications/networking/browsers/chromium/plugins.nix b/pkgs/applications/networking/browsers/chromium/plugins.nix index 55e0cc4caa2..8e2dd2a4886 100644 --- a/pkgs/applications/networking/browsers/chromium/plugins.nix +++ b/pkgs/applications/networking/browsers/chromium/plugins.nix @@ -35,7 +35,7 @@ let ''; patchPhase = let - rpaths = [ stdenv.gcc.gcc ]; + rpaths = [ stdenv.cc.gcc ]; mkrpath = p: "${makeSearchPath "lib64" p}:${makeSearchPath "lib" p}"; in '' for sofile in PepperFlash/libpepflashplayer.so \ diff --git a/pkgs/applications/networking/browsers/dwb/default.nix b/pkgs/applications/networking/browsers/dwb/default.nix index 73f8be7d93d..f4b36d5e756 100644 --- a/pkgs/applications/networking/browsers/dwb/default.nix +++ b/pkgs/applications/networking/browsers/dwb/default.nix @@ -2,12 +2,12 @@ m4, glib_networking, gsettings_desktop_schemas, dconf }: stdenv.mkDerivation { - name = "dwb-2014-09-20"; + name = "dwb-2014-12-15"; src = fetchgit { - url = "https://bitbucket.org/portix/dwb.git"; - rev = "6a0e483533021157fa83ce7533c1b25c71254f00"; - sha256 = "0l8ryz4aqcw6ax6w7y22yl9bh8fs3gxnlppbas1jq7q7hjk1qs31"; + url = "https://bitbucket.org/0mark/dwb_collect"; + rev = "b94785470b11a0b6b52eecfc3bae276796b83a0d"; + sha256 = "09xbifj223mflj62rfhi6q7cvnkpkzkwyyqhkm8w067pdscdhyvs"; }; buildInputs = [ pkgconfig makeWrapper gsettings_desktop_schemas libsoup webkitgtk2 gtk2 gnutls json_c m4 ]; diff --git a/pkgs/applications/networking/browsers/firefox-bin/default.nix b/pkgs/applications/networking/browsers/firefox-bin/default.nix index 3f85467fe31..c9956497b10 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/default.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/default.nix @@ -70,7 +70,7 @@ stdenv.mkDerivation { phases = "unpackPhase installPhase"; libPath = stdenv.lib.makeLibraryPath - [ stdenv.gcc.gcc + [ stdenv.cc.gcc alsaLib atk cairo @@ -106,7 +106,7 @@ stdenv.mkDerivation { pulseaudio systemd ] + ":" + stdenv.lib.makeSearchPath "lib64" [ - stdenv.gcc.gcc + stdenv.cc.gcc ]; # "strip" after "patchelf" may break binaries. @@ -125,7 +125,7 @@ stdenv.mkDerivation { firefox mozilla-xremote-client firefox-bin plugin-container \ updater crashreporter webapprt-stub do - patchelf --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \ + patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ "$out/usr/lib/firefox-bin-${version}/$executable" done diff --git a/pkgs/applications/networking/browsers/firefox/default.nix b/pkgs/applications/networking/browsers/firefox/default.nix index 2892aa328b0..b5b1faa8146 100644 --- a/pkgs/applications/networking/browsers/firefox/default.nix +++ b/pkgs/applications/networking/browsers/firefox/default.nix @@ -13,7 +13,7 @@ enableOfficialBranding ? false }: -assert stdenv.gcc ? libc && stdenv.gcc.libc != null; +assert stdenv.cc ? libc && stdenv.cc.libc != null; let version = "34.0.5"; in diff --git a/pkgs/applications/networking/browsers/firefox/wrapper.nix b/pkgs/applications/networking/browsers/firefox/wrapper.nix index 6a00dfcd8c1..330bf6def59 100644 --- a/pkgs/applications/networking/browsers/firefox/wrapper.nix +++ b/pkgs/applications/networking/browsers/firefox/wrapper.nix @@ -1,5 +1,5 @@ -{ stdenv, lib, browser, makeDesktopItem, makeWrapper, plugins, libs, gtk_modules -, browserName, desktopName, nameSuffix, icon +{ stdenv, lib, browser, makeDesktopItem, makeWrapper, plugins, gst_plugins, libs, gtk_modules +, browserName, desktopName, nameSuffix, icon, libtrick ? true }: let p = builtins.parseDrvName browser.name; in @@ -17,7 +17,7 @@ stdenv.mkDerivation { categories = "Application;Network;WebBrowser;"; }; - buildInputs = [makeWrapper]; + buildInputs = [makeWrapper] ++ gst_plugins; buildCommand = '' if [ ! -x "${browser}/bin/${browserName}" ] @@ -32,7 +32,22 @@ stdenv.mkDerivation { --suffix-each LD_LIBRARY_PATH ':' "$libs" \ --suffix-each GTK_PATH ':' "$gtk_modules" \ --suffix-each LD_PRELOAD ':' "$(cat $(filterExisting $(addSuffix /extra-ld-preload $plugins)))" \ - --prefix-contents PATH ':' "$(filterExisting $(addSuffix /extra-bin-path $plugins))" + --prefix GST_PLUGIN_SYSTEM_PATH : "$GST_PLUGIN_SYSTEM_PATH" \ + --prefix-contents PATH ':' "$(filterExisting $(addSuffix /extra-bin-path $plugins))" \ + --set MOZ_OBJDIR "$(ls -d "${browser}/lib/${browserName}*")" + + ${ lib.optionalString libtrick + '' + sed -e "s@exec @exec -a '$out/bin/${browserName}${nameSuffix}' @" -i "$out/bin/${browserName}${nameSuffix}" + libdirname="$(echo "${browser}/lib/${browserName}"*)" + libdirbasename="$(basename "$libdirname")" + mkdir -p "$out/lib/$libdirbasename" + ln -s "$libdirname"/* "$out/lib/$libdirbasename" + script_location="$(mktemp "$out/lib/$libdirbasename/${browserName}${nameSuffix}.XXXXXX")" + mv "$out/bin/${browserName}${nameSuffix}" "$script_location" + ln -s "$script_location" "$out/bin/${browserName}${nameSuffix}" + '' + } mkdir -p $out/share/applications cp $desktopItem/share/applications/* $out/share/applications diff --git a/pkgs/applications/networking/browsers/kwebkitpart/CVE-2014-8600.diff b/pkgs/applications/networking/browsers/kwebkitpart/CVE-2014-8600.diff new file mode 100644 index 00000000000..0c65e68f216 --- /dev/null +++ b/pkgs/applications/networking/browsers/kwebkitpart/CVE-2014-8600.diff @@ -0,0 +1,33 @@ +--- a/src/webpage.cpp ++++ b/src/webpage.cpp +@@ -226,23 +226,26 @@ + doc += QL1S( "

" ); + doc += i18n( "Details of the Request:" ); + doc += QL1S( "

  • " ); +- doc += i18n( "URL: %1", reqUrl.url() ); ++ // escape URL twice: once for i18n, and once for HTML. ++ doc += i18n( "URL: %1", Qt::escape( Qt::escape( reqUrl.prettyUrl() ) ) ); + doc += QL1S( "
  • " ); + + const QString protocol (reqUrl.protocol()); + if ( !protocol.isNull() ) { +- doc += i18n( "Protocol: %1", protocol ); ++ // escape protocol twice: once for i18n, and once for HTML. ++ doc += i18n( "Protocol: %1", Qt::escape( Qt::escape( protocol ) ) ); + doc += QL1S( "
  • " ); + } + + doc += i18n( "Date and Time: %1", + KGlobal::locale()->formatDateTime(QDateTime::currentDateTime(), KLocale::LongDate) ); + doc += QL1S( "
  • " ); +- doc += i18n( "Additional Information: %1" , text ); ++ // escape text twice: once for i18n, and once for HTML. ++ doc += i18n( "Additional Information: %1", Qt::escape( Qt::escape( text ) ) ); + doc += QL1S( "

" ); + doc += i18n( "Description:" ); + doc += QL1S( "

" ); +- doc += description; ++ doc += Qt::escape( description ); + doc += QL1S( "

" ); + + if ( causes.count() ) { diff --git a/pkgs/applications/networking/browsers/kwebkitpart/default.nix b/pkgs/applications/networking/browsers/kwebkitpart/default.nix index 5ced048fe64..cb3a0e9eac4 100644 --- a/pkgs/applications/networking/browsers/kwebkitpart/default.nix +++ b/pkgs/applications/networking/browsers/kwebkitpart/default.nix @@ -10,6 +10,8 @@ stdenv.mkDerivation rec { sha256 = "0kszffgg3zpf319lmzlmdba5gq8kdr5xwb69xwy4s2abc9nvwvbi"; }; + patches = [ ./CVE-2014-8600.diff ]; + buildInputs = [ kdelibs ]; meta = with stdenv.lib; { diff --git a/pkgs/applications/networking/browsers/midori/default.nix b/pkgs/applications/networking/browsers/midori/default.nix index 11a17709ade..73fd39b75e9 100644 --- a/pkgs/applications/networking/browsers/midori/default.nix +++ b/pkgs/applications/networking/browsers/midori/default.nix @@ -11,14 +11,18 @@ stdenv.mkDerivation rec { meta = { description = "Lightweight WebKitGTK+ web browser"; - homepage = "http://www.midori-browser.org"; + homepage = "http://midori-browser.org"; license = stdenv.lib.licenses.lgpl21Plus; platforms = stdenv.lib.platforms.linux; maintainers = with stdenv.lib.maintainers; [ raskin iyzsong ]; }; src = fetchurl { - url = "${meta.homepage}/downloads/midori_${version}_all_.tar.bz2"; + urls = [ + "${meta.homepage}/downloads/midori_${version}_all_.tar.bz2" + "http://mirrors-ru.go-parts.com/blfs/conglomeration/midori/midori_${version}_all_.tar.bz2" + ]; + name = "midori_${version}_all_.tar.bz2"; sha256 = "10ckm98rfqfbwr84b8mc1ssgj84wjgkr4dadvx2l7c64sigi66dg"; }; diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix index f04a5f12ea2..e8b0b2bb5d5 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/flashplayer-11/default.nix @@ -36,7 +36,7 @@ let # -> http://get.adobe.com/flashplayer/ - version = "11.2.202.424"; + version = "11.2.202.425"; src = if stdenv.system == "x86_64-linux" then @@ -47,7 +47,7 @@ let else rec { inherit version; url = "http://fpdownload.macromedia.com/get/flashplayer/pdc/${version}/install_flash_player_11_linux.x86_64.tar.gz"; - sha256 = "1nkk77lbvvq9x17rlygwlkprq2pgnci5riwxvvriknkqr277dhz8"; + sha256 = "1bk0xh213jbinq0y587m01vklsbxskhqfgi2a2x8w8a7qyw42alf"; } else if stdenv.system == "i686-linux" then if debug then @@ -60,7 +60,7 @@ let else rec { inherit version; url = "http://fpdownload.macromedia.com/get/flashplayer/pdc/${version}/install_flash_player_11_linux.i386.tar.gz"; - sha256 = "1zwlzc7z6q8vr5hjzx6jywjcx9r0g9jxz141hlf6lqzicf4x6qan"; + sha256 = "0jcip60g0dwca304y4vmzyfw06zdagpyzvm66jxqy1sy6j78br0b"; } else throw "Flash Player is not supported on this platform"; diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/fribid/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/fribid/default.nix index 229aa4f23ba..3b473019600 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/fribid/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/fribid/default.nix @@ -17,6 +17,8 @@ stdenv.mkDerivation rec { ./ipc-lazytrace.patch ]; + postPatch = "substituteInPlace plugin/pluginutil.c --replace strndup strndup_"; + passthru.mozillaPlugin = "/lib/mozilla/plugins"; meta = { 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 029df7e46de..826f35fa839 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 @@ -32,7 +32,7 @@ let xorg.libXfixes xorg.libXrender xorg.libXrandr - stdenv.gcc.gcc + stdenv.cc.gcc alsaLib pulseaudio dbus_glib @@ -76,19 +76,19 @@ stdenv.mkDerivation rec { cp opt/google/talkplugin/*.so $plugins for i in libnpgoogletalk.so libppgoogletalk.so libppo1d.so; do - patchelf --set-rpath "${makeLibraryPath [ stdenv.gcc.gcc xorg.libX11 ]}:${stdenv.gcc.gcc}/lib64" $plugins/$i + patchelf --set-rpath "${makeLibraryPath [ stdenv.cc.gcc xorg.libX11 ]}:${stdenv.cc.gcc}/lib64" $plugins/$i done for i in libgoogletalkremoting.so libnpo1d.so; do - patchelf --set-rpath "$out/libexec/google/talkplugin/lib:${rpathPlugin}:${stdenv.gcc.gcc}/lib64" $plugins/$i + patchelf --set-rpath "$out/libexec/google/talkplugin/lib:${rpathPlugin}:${stdenv.cc.gcc}/lib64" $plugins/$i done mkdir -p $out/libexec/google/talkplugin cp -prd opt/google/talkplugin/{data,GoogleTalkPlugin,locale,remoting24x24.png,windowpicker.glade} $out/libexec/google/talkplugin/ patchelf \ - --set-interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \ - --set-rpath "${rpathProgram}:${stdenv.gcc.gcc}/lib64" \ + --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + --set-rpath "${rpathProgram}:${stdenv.cc.gcc}/lib64" \ $out/libexec/google/talkplugin/GoogleTalkPlugin # Generate an LD_PRELOAD wrapper to redirect execvp() calls to diff --git a/pkgs/applications/networking/browsers/netsurf/libsvgtiny.nix b/pkgs/applications/networking/browsers/netsurf/libsvgtiny.nix index 300e9965092..1e9f74a1ffd 100644 --- a/pkgs/applications/networking/browsers/netsurf/libsvgtiny.nix +++ b/pkgs/applications/networking/browsers/netsurf/libsvgtiny.nix @@ -7,6 +7,8 @@ stdenv.mkDerivation { (fetchurl { url = "http://mawercer.de/~nix/repos/libsvgtiny-9721.tar.gz"; sha256 = "0c4c8e357c220218a32ef789eb2ba8226a403d4c2b550d7c65f351a0af5d1a71"; }); # END + NIX_CFLAGS_COMPILE = "-Wno-error=cpp"; + installPhase = "make PREFIX=$out install"; buildInputs = [pkgconfig gperf libxml2]; diff --git a/pkgs/applications/networking/browsers/netsurf/libwapcaplet.nix b/pkgs/applications/networking/browsers/netsurf/libwapcaplet.nix index 8d19d1c1ef2..5aa15d7b80d 100644 --- a/pkgs/applications/networking/browsers/netsurf/libwapcaplet.nix +++ b/pkgs/applications/networking/browsers/netsurf/libwapcaplet.nix @@ -7,6 +7,8 @@ stdenv.mkDerivation { (fetchurl { url = "http://mawercer.de/~nix/repos/libwapcaplet-9721.tar.gz"; sha256 = "7f9f32ca772c939d67f3bc8bf0705544c2b2950760da3fe6a4e069ad0f77d91a"; }); # END + NIX_CFLAGS_COMPILE = "-Wno-error=cpp"; + installPhase = "make PREFIX=$out install"; buildInputs = []; diff --git a/pkgs/applications/networking/browsers/opera/default.nix b/pkgs/applications/networking/browsers/opera/default.nix index d0fe7e91989..eefae9d5dae 100644 --- a/pkgs/applications/networking/browsers/opera/default.nix +++ b/pkgs/applications/networking/browsers/opera/default.nix @@ -6,7 +6,7 @@ , kdeSupport ? false, qt4, kdelibs }: -assert stdenv.isLinux && stdenv.gcc.gcc != null && stdenv.gcc.libc != null; +assert stdenv.isLinux && stdenv.cc.gcc != null && stdenv.cc.libc != null; let mirror = http://get.geo.opera.com/pub/opera; @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { ''; buildInputs = - [ stdenv.gcc.gcc stdenv.gcc.libc zlib libX11 libXt libXext libSM libICE + [ stdenv.cc.gcc stdenv.cc.libc zlib libX11 libXt libXext libSM libICE libXft freetype fontconfig libXrender libuuid expat gstreamer libxml2 gst_plugins_base ] @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { elif [ $type == "EXEC" ]; then echo "patching $f executable <<" patchelf \ - --set-interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \ + --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ --set-rpath "${libPath}" \ "$f" elif [ $type == "DYN" ]; then diff --git a/pkgs/applications/networking/cluster/hadoop/default.nix b/pkgs/applications/networking/cluster/hadoop/default.nix index f6e86c6289c..baa13254f23 100644 --- a/pkgs/applications/networking/cluster/hadoop/default.nix +++ b/pkgs/applications/networking/cluster/hadoop/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { for n in "bin/"* "sbin/"*; do sed -i $n -e "s|#!/usr/bin/env bash|#! ${bash}/bin/bash|" done - patchelf --set-interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" bin/container-executor + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" bin/container-executor ''; installPhase = '' diff --git a/pkgs/applications/networking/cluster/spark/default.nix b/pkgs/applications/networking/cluster/spark/default.nix index 1e9fe918a2e..1852f21d27a 100644 --- a/pkgs/applications/networking/cluster/spark/default.nix +++ b/pkgs/applications/networking/cluster/spark/default.nix @@ -1,128 +1,46 @@ -{ stdenv, fetchurl, jre, bash, simpleBuildTool, python27Packages }: +{ stdenv, fetchurl, makeWrapper, jre, pythonPackages +, mesosSupport ? true, mesos +}: + +with stdenv.lib; stdenv.mkDerivation rec { name = "spark-${version}"; - version = "0.9.1"; + version = "1.1.1"; src = fetchurl { url = "http://d3kbcqa49mib13.cloudfront.net/${name}-bin-cdh4.tgz"; - sha256 = "1k3954srx3km3ckmfi6wn8rldrljxc039g0pf5m3azgkmaz0gld5"; + sha256 = "1k0lw8aq5is3gnsrm8q24s0knga6kb3c9xsca20g11fy8b0y4nvk"; }; - unpackPhase = ''tar zxf $src''; + buildInputs = [ makeWrapper jre pythonPackages.python pythonPackages.numpy ] + ++ optional mesosSupport [ mesos ]; untarDir = "${name}-bin-cdh4"; installPhase = '' - set -x - mkdir -p $out/lib $out/bin - mv ${untarDir} $out/lib + mkdir -p $out/{lib/${untarDir}/conf,bin} + mv * $out/lib/${untarDir} - cat > $out/bin/spark-class < []" >&2 - exit 1 - fi - - export SPARK_MEM=\''${SPARK_MEM:-1024m} - - JAVA_OPTS="" - JAVA_OPTS="\$JAVA_OPTS -Djava.library.path=\"\$SPARK_LIBRARY_PATH\"" - JAVA_OPTS="\$JAVA_OPTS -Xms\$SPARK_MEM -Xmx\$SPARK_MEM" - export JAVA_OPTS - - CLASSPATH=\`$out/lib/${untarDir}/bin/compute-classpath.sh\` - export CLASSPATH - - exec ${jre}/bin/java -cp "\$CLASSPATH" \$JAVA_OPTS "\$@" + cat > $out/lib/${untarDir}/conf/spark-env.sh <<- EOF + export JAVA_HOME="${jre}" + export SPARK_HOME="$out/lib/${untarDir}" + export PYSPARK_PYTHON="${pythonPackages.python}/bin/${pythonPackages.python.executable}" + export PYTHONPATH="\$PYTHONPATH:$PYTHONPATH" + ${optionalString mesosSupport + ''export MESOS_NATIVE_LIBRARY="$MESOS_NATIVE_LIBRARY"''} EOF - chmod +x $out/bin/spark-class - cat > $out/bin/spark-shell </dev/null) - if [[ ! \$? ]]; then - saved_stty="" - fi - - $out/bin/spark-class \$OPTIONS org.apache.spark.repl.Main "\$@" - - exit_status=\$? - onExit - EOF - chmod +x $out/bin/spark-shell - - cat > $out/bin/pyspark < $out/bin/spark-upload-scala < $out/bin/spark-upload-python < $out/bin/skype << EOF diff --git a/pkgs/applications/networking/instant-messengers/teamspeak/client.nix b/pkgs/applications/networking/instant-messengers/teamspeak/client.nix index 8a3e7203f26..256b4a7ed3a 100644 --- a/pkgs/applications/networking/instant-messengers/teamspeak/client.nix +++ b/pkgs/applications/networking/instant-messengers/teamspeak/client.nix @@ -46,8 +46,8 @@ stdenv.mkDerivation rec { mv ts3client_linux_${arch} ts3client echo "patching ts3client..." patchelf \ - --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \ - --set-rpath ${stdenv.lib.makeLibraryPath deps}:$(cat $NIX_GCC/nix-support/orig-gcc)/${libDir} \ + --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + --set-rpath ${stdenv.lib.makeLibraryPath deps}:$(cat $NIX_CC/nix-support/orig-gcc)/${libDir} \ --force-rpath \ ts3client ''; diff --git a/pkgs/applications/networking/instant-messengers/teamspeak/server.nix b/pkgs/applications/networking/instant-messengers/teamspeak/server.nix index 7a57cb8ad62..be5f6d0037c 100644 --- a/pkgs/applications/networking/instant-messengers/teamspeak/server.nix +++ b/pkgs/applications/networking/instant-messengers/teamspeak/server.nix @@ -29,8 +29,8 @@ stdenv.mkDerivation { mv ts3server_linux_${arch} ts3server echo "patching ts3server" patchelf \ - --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \ - --set-rpath $(cat $NIX_GCC/nix-support/orig-gcc)/${libDir} \ + --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + --set-rpath $(cat $NIX_CC/nix-support/orig-gcc)/${libDir} \ --force-rpath \ ts3server ''; diff --git a/pkgs/applications/networking/instant-messengers/telepathy/idle/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/idle/default.nix new file mode 100644 index 00000000000..16a31f6f3ba --- /dev/null +++ b/pkgs/applications/networking/instant-messengers/telepathy/idle/default.nix @@ -0,0 +1,20 @@ +{ stdenv, fetchurl, glib, pkgconfig, dbus_glib, telepathy_glib, libxslt }: + +stdenv.mkDerivation rec { + pname = "telepathy-idle"; + version = "0.2.0"; + name = "${pname}-${version}"; + + src = fetchurl { + url = "http://telepathy.freedesktop.org/releases/${pname}/${name}.tar.gz"; + sha256 = "1argdzbif1vdmwp5vqbgkadq9ancjmgdm2ncp0qfckni715ss4rh"; + }; + + buildInputs = [ pkgconfig glib telepathy_glib dbus_glib libxslt ]; + + meta = { + description = "IRC connection manager for the Telepathy framework"; + license = stdenv.lib.licenses.lgpl21; + platforms = stdenv.lib.platforms.gnu; + }; +} diff --git a/pkgs/applications/networking/irc/weechat/devel.nix b/pkgs/applications/networking/irc/weechat/devel.nix deleted file mode 100644 index 34ca4b4d7c6..00000000000 --- a/pkgs/applications/networking/irc/weechat/devel.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ stdenv, fetchgit, ncurses, openssl, perl, python, aspell, gnutls -, zlib, curl , pkgconfig, libgcrypt, ruby, lua5, tcl, guile -, pythonPackages, cacert, cmake, makeWrapper }: - -stdenv.mkDerivation rec { - rev = "124b2668fe4e97e3926caea85ed2c9f7082c4df9"; - version = "1.0-rev${rev}"; - name = "weechat-${version}"; - - src = fetchgit { - inherit rev; - url = "git://github.com/weechat/weechat.git"; - sha256 = "1xl5scyrxmyqaycpalhl3j50s65w2gjdm43vahd618yyykdffr8b"; - }; - - buildInputs = - [ ncurses perl python openssl aspell gnutls zlib curl pkgconfig - libgcrypt ruby lua5 tcl guile pythonPackages.pycrypto makeWrapper - cacert cmake ] - ++ stdenv.lib.optional stdenv.isDarwin pythonPackages.pync; - - NIX_CFLAGS_COMPILE = "-I${python}/include/${python.libPrefix}"; - - postInstall = '' - NIX_PYTHON_PATH="$out/lib/${python.libPrefix}/site-packages" - '' + stdenv.lib.optionalString stdenv.isDarwin '' - NIX_PYTHON_PATH+="${pythonPackages.pync}/lib/${python.libPrefix}/site-packages" - '' + '' - wrapProgram "$out/bin/weechat" \ - --prefix PYTHONPATH : "$PYTHONPATH" \ - --prefix PYTHONPATH : "$NIX_PYTHONPATH" - ''; - - meta = { - homepage = http://www.weechat.org/; - description = "A fast, light and extensible chat client"; - license = stdenv.lib.licenses.gpl3; - maintainers = with stdenv.lib.maintainers; [ lovek323 garbas the-kenny ]; - platforms = stdenv.lib.platforms.unix; - }; -} diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix index 55e5820a5d2..e2dbb6dbc2f 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix @@ -67,7 +67,7 @@ stdenv.mkDerivation { phases = "unpackPhase installPhase"; libPath = stdenv.lib.makeLibraryPath - [ stdenv.gcc.gcc + [ stdenv.cc.gcc gconf alsaLib at_spi2_atk @@ -100,7 +100,7 @@ stdenv.mkDerivation { nss pango ] + ":" + stdenv.lib.makeSearchPath "lib64" [ - stdenv.gcc.gcc + stdenv.cc.gcc ]; installPhase = @@ -115,7 +115,7 @@ stdenv.mkDerivation { thunderbird mozilla-xremote-client thunderbird-bin plugin-container \ updater do - patchelf --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \ + patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ "$out/usr/lib/thunderbird-bin-${version}/$executable" done diff --git a/pkgs/applications/networking/owncloud-client/default.nix b/pkgs/applications/networking/owncloud-client/default.nix index 6e7755c7bf4..7c04abebb54 100644 --- a/pkgs/applications/networking/owncloud-client/default.nix +++ b/pkgs/applications/networking/owncloud-client/default.nix @@ -28,5 +28,6 @@ stdenv.mkDerivation rec { description = "Synchronise your ownCloud with your computer using this desktop client"; homepage = https://owncloud.org; maintainers = with stdenv.lib.maintainers; [ qknight ]; + meta.platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/applications/networking/p2p/transmission-remote-gtk/default.nix b/pkgs/applications/networking/p2p/transmission-remote-gtk/default.nix index 8fa5cb6c2ee..01ba9ff47ea 100644 --- a/pkgs/applications/networking/p2p/transmission-remote-gtk/default.nix +++ b/pkgs/applications/networking/p2p/transmission-remote-gtk/default.nix @@ -17,7 +17,11 @@ stdenv.mkDerivation rec { rm $out/share/icons/hicolor/icon-theme.cache ''; - meta = { - description = "GTK remote control for the Transmission BitTorrent client"; - }; + meta = with stdenv.lib; + { description = "GTK remote control for the Transmission BitTorrent client"; + homepage = http://code.google.com/p/transmission-remote-gtk/; + license = licenses.gpl2; + maintainers = [ maintainers.emery ]; + platforms = platforms.linux; + }; } diff --git a/pkgs/applications/networking/remote/teamviewer/8.nix b/pkgs/applications/networking/remote/teamviewer/8.nix index a47d7bad4c9..ba5cc85e5a4 100644 --- a/pkgs/applications/networking/remote/teamviewer/8.nix +++ b/pkgs/applications/networking/remote/teamviewer/8.nix @@ -5,7 +5,7 @@ let topath = "${wineUnstable}/bin"; toldpath = stdenv.lib.concatStringsSep ":" (map (x: "${x}/lib") - [ stdenv.gcc.gcc libX11 libXtst libXext libXdamage libXfixes wineUnstable ]); + [ stdenv.cc.gcc libX11 libXtst libXext libXdamage libXfixes wineUnstable ]); in stdenv.mkDerivation { name = "teamviewer-8.0.17147"; @@ -34,8 +34,8 @@ stdenv.mkDerivation { EOF chmod +x $out/bin/teamviewer - patchelf --set-rpath "${stdenv.gcc.gcc}/lib64:${stdenv.gcc.gcc}/lib:${libX11}/lib:${libXext}/lib:${libXau}/lib:${libXdamage}/lib:${libXfixes}/lib" $out/share/teamviewer8/tv_bin/teamviewerd - patchelf --set-interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" $out/share/teamviewer8/tv_bin/teamviewerd + patchelf --set-rpath "${stdenv.cc.gcc}/lib64:${stdenv.cc.gcc}/lib:${libX11}/lib:${libXext}/lib:${libXau}/lib:${libXdamage}/lib:${libXfixes}/lib" $out/share/teamviewer8/tv_bin/teamviewerd + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $out/share/teamviewer8/tv_bin/teamviewerd ln -s $out/share/teamviewer8/tv_bin/teamviewerd $out/bin/ ''; diff --git a/pkgs/applications/networking/remote/teamviewer/9.nix b/pkgs/applications/networking/remote/teamviewer/9.nix index 6ae68aea9ea..4b449497dcc 100644 --- a/pkgs/applications/networking/remote/teamviewer/9.nix +++ b/pkgs/applications/networking/remote/teamviewer/9.nix @@ -5,7 +5,7 @@ let topath = "${wineUnstable}/bin"; toldpath = stdenv.lib.concatStringsSep ":" (map (x: "${x}/lib") - [ stdenv.gcc.gcc libX11 libXtst libXext libXdamage libXfixes wineUnstable ]); + [ stdenv.cc.gcc libX11 libXtst libXext libXdamage libXfixes wineUnstable ]); in stdenv.mkDerivation { name = "teamviewer-9.0.32150"; @@ -34,8 +34,8 @@ stdenv.mkDerivation { EOF chmod +x $out/bin/teamviewer - patchelf --set-rpath "${stdenv.gcc.gcc}/lib64:${stdenv.gcc.gcc}/lib:${libX11}/lib:${libXext}/lib:${libXau}/lib:${libXdamage}/lib:${libXfixes}/lib" $out/share/teamviewer9/tv_bin/teamviewerd - patchelf --set-interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" $out/share/teamviewer9/tv_bin/teamviewerd + patchelf --set-rpath "${stdenv.cc.gcc}/lib64:${stdenv.cc.gcc}/lib:${libX11}/lib:${libXext}/lib:${libXau}/lib:${libXdamage}/lib:${libXfixes}/lib" $out/share/teamviewer9/tv_bin/teamviewerd + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $out/share/teamviewer9/tv_bin/teamviewerd ln -s $out/share/teamviewer9/tv_bin/teamviewerd $out/bin/ ''; diff --git a/pkgs/applications/networking/remote/teamviewer/default.nix b/pkgs/applications/networking/remote/teamviewer/default.nix index 65ddd7305c8..8e42e8004c5 100644 --- a/pkgs/applications/networking/remote/teamviewer/default.nix +++ b/pkgs/applications/networking/remote/teamviewer/default.nix @@ -6,7 +6,7 @@ let topath = "${wine}/bin"; toldpath = stdenv.lib.concatStringsSep ":" (map (x: "${x}/lib") - [ stdenv.gcc.gcc libX11 libXtst libXext libXdamage libXfixes wine ]); + [ stdenv.cc.gcc libX11 libXtst libXext libXdamage libXfixes wine ]); in stdenv.mkDerivation { name = "teamviewer-7.0.9377"; diff --git a/pkgs/applications/networking/umurmur/default.nix b/pkgs/applications/networking/umurmur/default.nix index 1f08b9873d4..2e196cdf8cf 100644 --- a/pkgs/applications/networking/umurmur/default.nix +++ b/pkgs/applications/networking/umurmur/default.nix @@ -12,9 +12,9 @@ stdenv.mkDerivation rec { configureFlags = "--with-ssl=openssl"; - meta = { + meta = with stdenv.lib; { description = "Minimalistic Murmur (Mumble server)"; - license = "BSD"; + license = licenses.bsd3; homepage = http://code.google.com/p/umurmur/; }; } diff --git a/pkgs/applications/office/calligra/default.nix b/pkgs/applications/office/calligra/default.nix index 3c58d367ab1..9f18095beb8 100644 --- a/pkgs/applications/office/calligra/default.nix +++ b/pkgs/applications/office/calligra/default.nix @@ -6,11 +6,11 @@ }: stdenv.mkDerivation rec { - name = "calligra-2.8.6"; + name = "calligra-2.8.7"; src = fetchurl { url = "mirror://kde/stable/${name}/${name}.tar.xz"; - sha256 = "587dda4a340f46e28fe69de8f292fa33a3cf237445013f6ce5ceafa191cb3694"; + sha256 = "1d8fx0xn8n8y6jglw8hhpk7kr6kbhsbaxqwqlfzmnzh7x9s8nsxg"; }; nativeBuildInputs = [ cmake perl pkgconfig ]; diff --git a/pkgs/applications/office/ledger/default.nix b/pkgs/applications/office/ledger/default.nix index 34aa7c769d0..350bb4d713c 100644 --- a/pkgs/applications/office/ledger/default.nix +++ b/pkgs/applications/office/ledger/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation { meta = { homepage = "http://ledger-cli.org/"; description = "A double-entry accounting system with a command-line reporting interface"; - license = "BSD"; + license = stdenv.lib.licenses.bsd3; longDescription = '' Ledger is a powerful, double-entry accounting system that is accessed diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix index ceb1a9eab86..78eaa78ee10 100644 --- a/pkgs/applications/office/libreoffice/default.nix +++ b/pkgs/applications/office/libreoffice/default.nix @@ -176,7 +176,8 @@ stdenv.mkDerivation rec { ln -s $out/lib/libreoffice/share/xdg $out/share/applications for f in $out/share/applications/*.desktop; do - substituteInPlace "$f" --replace "Exec=libreoffice4.0" "Exec=$out/bin/soffice" + substituteInPlace "$f" --replace "Exec=libreofficedev${major}.${minor}" "Exec=$out/bin/soffice" + substituteInPlace "$f" --replace "Exec=libreoffice${major}.${minor}" "Exec=$out/bin/soffice" substituteInPlace "$f" --replace "Exec=libreoffice" "Exec=$out/bin/soffice" done ''; diff --git a/pkgs/applications/office/skrooge/default.nix b/pkgs/applications/office/skrooge/default.nix index a12849cf209..52dd08e1e0d 100644 --- a/pkgs/applications/office/skrooge/default.nix +++ b/pkgs/applications/office/skrooge/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libxslt, kdelibs, kdepimlibs, grantlee, qjson, qca2, libofx, sqlite, gettext }: +{ stdenv, fetchurl, libxslt, kdelibs, kdepimlibs, grantlee, qjson, qca2, libofx, sqlite, gettext, boost }: stdenv.mkDerivation rec { name = "skrooge-1.10.0"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "0rsw2xdgws5bvnf3h4hg16liahigcxgaxls7f8hzr9wipxx5xqda"; }; - buildInputs = [ libxslt kdelibs kdepimlibs grantlee qjson qca2 libofx sqlite ]; + buildInputs = [ libxslt kdelibs kdepimlibs grantlee qjson qca2 libofx sqlite boost ]; nativeBuildInputs = [ gettext ]; diff --git a/pkgs/applications/office/zotero/default.nix b/pkgs/applications/office/zotero/default.nix index 6cd8697cd7d..5acc8caf6b8 100644 --- a/pkgs/applications/office/zotero/default.nix +++ b/pkgs/applications/office/zotero/default.nix @@ -1,19 +1,24 @@ -{ stdenv, fetchurl, bash, callPackage, libIDL, pysqlite }: +{ stdenv, fetchurl, useGoldLinker, bash, callPackage, gnome, xlibs }: assert (stdenv.system == "x86_64-linux" || stdenv.system == "i686-linux"); let /* Zotero always has a hard upper bound on its firefox/xulrunner dependency. - * Use private versions of firefox and xulrunner to prevent breakage when the - * system packages are updated. Please update these dependencies whenever - * zotero is updated; it should be as simple as copying the system firefox - * and xulrunner Nix expressions into place. + * Use private version of firefox to prevent breakage when the system + * packages are updated. Please update this dependency whenever zotero is + * updated; it should be as simple as copying the system firefox expression + * into place. */ - firefox = callPackage ./firefox.nix { inherit libIDL pysqlite; }; - xulrunner = callPackage ./xulrunner.nix { inherit libIDL pysqlite firefox; }; - # Please update the firefox and xulrunner dependencies when zotero is updated! + firefox = callPackage ./firefox-bin { + gconf = gnome.GConf; + inherit (gnome) libgnome libgnomeui; + inherit (xlibs) libX11 libXScrnSaver libXcomposite libXdamage libXext + libXfixes libXinerama libXrender libXt; + }; + + # Please update the firefox dependency when zotero is updated! version = "4.0.23"; arch = if stdenv.system == "x86_64-linux" then "linux-x86_64" @@ -32,7 +37,7 @@ stdenv.mkDerivation { # Strip the bundled xulrunner prePatch = ''rm -fr run-zotero.sh zotero xulrunner/''; - inherit bash xulrunner; + inherit bash firefox; installPhase = '' mkdir -p "$out/libexec/zotero" cp -vR * "$out/libexec/zotero/" diff --git a/pkgs/applications/office/zotero/firefox-bin/default.nix b/pkgs/applications/office/zotero/firefox-bin/default.nix new file mode 100644 index 00000000000..c9956497b10 --- /dev/null +++ b/pkgs/applications/office/zotero/firefox-bin/default.nix @@ -0,0 +1,162 @@ +{ stdenv, fetchurl, config +, alsaLib +, atk +, cairo +, cups +, dbus_glib +, dbus_libs +, fontconfig +, freetype +, gconf +, gdk_pixbuf +, glib +, glibc +, gst_plugins_base +, gstreamer +, gtk +, libX11 +, libXScrnSaver +, libXcomposite +, libXdamage +, libXext +, libXfixes +, libXinerama +, libXrender +, libXt +, libcanberra +, libgnome +, libgnomeui +, mesa +, nspr +, nss +, pango +, heimdal +, pulseaudio +, systemd +}: + +assert stdenv.isLinux; + +# imports `version` and `sources` +with (import ./sources.nix); + +let + arch = if stdenv.system == "i686-linux" + then "linux-i686" + else "linux-x86_64"; + + isPrefixOf = prefix: string: + builtins.substring 0 (builtins.stringLength prefix) string == prefix; + + sourceMatches = locale: source: + (isPrefixOf source.locale locale) && source.arch == arch; + + systemLocale = config.i18n.defaultLocale or "en-US"; + + defaultSource = stdenv.lib.findFirst (sourceMatches "en-US") {} sources; + + source = stdenv.lib.findFirst (sourceMatches systemLocale) defaultSource sources; + +in + +stdenv.mkDerivation { + name = "firefox-bin-${version}"; + + src = fetchurl { + url = "http://download-installer.cdn.mozilla.net/pub/firefox/releases/${version}/${source.arch}/${source.locale}/firefox-${version}.tar.bz2"; + inherit (source) sha1; + }; + + phases = "unpackPhase installPhase"; + + libPath = stdenv.lib.makeLibraryPath + [ stdenv.cc.gcc + alsaLib + atk + cairo + cups + dbus_glib + dbus_libs + fontconfig + freetype + gconf + gdk_pixbuf + glib + glibc + gst_plugins_base + gstreamer + gtk + libX11 + libXScrnSaver + libXcomposite + libXdamage + libXext + libXfixes + libXinerama + libXrender + libXt + libcanberra + libgnome + libgnomeui + mesa + nspr + nss + pango + heimdal + pulseaudio + systemd + ] + ":" + stdenv.lib.makeSearchPath "lib64" [ + stdenv.cc.gcc + ]; + + # "strip" after "patchelf" may break binaries. + # See: https://github.com/NixOS/patchelf/issues/10 + dontStrip = 1; + + installPhase = + '' + mkdir -p "$prefix/usr/lib/firefox-bin-${version}" + cp -r * "$prefix/usr/lib/firefox-bin-${version}" + + mkdir -p "$out/bin" + ln -s "$prefix/usr/lib/firefox-bin-${version}/firefox" "$out/bin/" + + for executable in \ + firefox mozilla-xremote-client firefox-bin plugin-container \ + updater crashreporter webapprt-stub + do + patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + "$out/usr/lib/firefox-bin-${version}/$executable" + done + + for executable in \ + firefox mozilla-xremote-client firefox-bin plugin-container \ + updater crashreporter webapprt-stub libxul.so + do + patchelf --set-rpath "$libPath" \ + "$out/usr/lib/firefox-bin-${version}/$executable" + done + + # Create a desktop item. + mkdir -p $out/share/applications + cat > $out/share/applications/firefox.desktop < source.nix + +{ + version = "#{real_version}"; + sources = [ +EOH + +sources.each do |source| + puts(%Q| { locale = "#{source.locale}"; arch = "#{source.arch}"; sha1 = "#{source.hash}"; }|) +end + +puts(<<'EOF') + ]; +} +EOF diff --git a/pkgs/applications/office/zotero/firefox-bin/sources.nix b/pkgs/applications/office/zotero/firefox-bin/sources.nix new file mode 100644 index 00000000000..c052a007beb --- /dev/null +++ b/pkgs/applications/office/zotero/firefox-bin/sources.nix @@ -0,0 +1,192 @@ +# This file is generated from generate_nix.rb. DO NOT EDIT. +# Execute the following command in a temporary directory to update the file. +# +# ruby generate_source.rb > source.nix + +{ + version = "33.1"; + sources = [ + { locale = "ach"; arch = "linux-i686"; sha1 = "f6ecc5e1d1470a4d79d0f680f3a194857674c5a1"; } + { locale = "ach"; arch = "linux-x86_64"; sha1 = "d28450930e53f168c11e7e0c4e7df46c20d50882"; } + { locale = "af"; arch = "linux-i686"; sha1 = "2865493140bd8838e7981749f9fe7a734fa59745"; } + { locale = "af"; arch = "linux-x86_64"; sha1 = "8f94c2be8ba8e496ff917f78206ab9a9294e4de1"; } + { locale = "an"; arch = "linux-i686"; sha1 = "3f6ecaab216f91759a39e255571edaf9b48d4733"; } + { locale = "an"; arch = "linux-x86_64"; sha1 = "ae0fce83ae2aa416dc3acda327dec98f2c7c0b98"; } + { locale = "ar"; arch = "linux-i686"; sha1 = "aeaed8574b13046d1afb129ad9d3cc0ee22b2bff"; } + { locale = "ar"; arch = "linux-x86_64"; sha1 = "997495abb13611591ce9ab5ea81cc65dd7ee579a"; } + { locale = "as"; arch = "linux-i686"; sha1 = "84193f01192c8341905a0f8d2e7b3d198c39e113"; } + { locale = "as"; arch = "linux-x86_64"; sha1 = "f7e9278e9d4b0d3b45f453a16b5840bb84598ccc"; } + { locale = "ast"; arch = "linux-i686"; sha1 = "e52fb5a1e813e1d91ec7562bd7e94632f661c5a4"; } + { locale = "ast"; arch = "linux-x86_64"; sha1 = "89f13d927c9d8596899ed09f8c9f7d97c26d78f5"; } + { locale = "az"; arch = "linux-i686"; sha1 = "bc0972e18db99f9d6fdbe100dd09d62bb2c3afbd"; } + { locale = "az"; arch = "linux-x86_64"; sha1 = "4552aa92a799086b7f79178eb8d846a84e77e094"; } + { locale = "be"; arch = "linux-i686"; sha1 = "4c2577170f9df45a313c6728076cc35504f7ad80"; } + { locale = "be"; arch = "linux-x86_64"; sha1 = "dea774633ab5c1ab5c74380984253b0597d53d2c"; } + { locale = "bg"; arch = "linux-i686"; sha1 = "5f770c719895ddec1a8c27bda298361341b2e924"; } + { locale = "bg"; arch = "linux-x86_64"; sha1 = "5581f70176eb35cf01d5ebb368741130420b505e"; } + { locale = "bn-BD"; arch = "linux-i686"; sha1 = "f0853164e4d1497be6dcffd6dd365eaf56b6582b"; } + { locale = "bn-BD"; arch = "linux-x86_64"; sha1 = "0ccb11141eb9c339cfe652aee6e902ed0cd700e4"; } + { locale = "bn-IN"; arch = "linux-i686"; sha1 = "36448e2198e3650f0e5a107af3ae10dbdc8273ce"; } + { locale = "bn-IN"; arch = "linux-x86_64"; sha1 = "804668a7692b378f6686ea56dae3b9e047bce4a1"; } + { locale = "br"; arch = "linux-i686"; sha1 = "396a845931ee25c79baaa2147c94b7eea6c8505f"; } + { locale = "br"; arch = "linux-x86_64"; sha1 = "87d9567073d22f09abe6c45a044fd3b4ee4d925b"; } + { locale = "bs"; arch = "linux-i686"; sha1 = "e3263e2215862dad2268686242a2374e460d1868"; } + { locale = "bs"; arch = "linux-x86_64"; sha1 = "714597790f46b03289a4a91e20f797c82672f849"; } + { locale = "ca"; arch = "linux-i686"; sha1 = "0dfc5d9abcac90e5ab254bb72ae20d987ff206f3"; } + { locale = "ca"; arch = "linux-x86_64"; sha1 = "2eac6e7cb6eae8ca0714dd219eb08b3f7d846191"; } + { locale = "cs"; arch = "linux-i686"; sha1 = "505764e55d673a282d38c3bca7db4ac29325ead1"; } + { locale = "cs"; arch = "linux-x86_64"; sha1 = "bd32e999d5c61b20bb3a5983032227ff2a7d6d84"; } + { locale = "csb"; arch = "linux-i686"; sha1 = "ae5065363647da475901fb7cc156a4ecdecc528b"; } + { locale = "csb"; arch = "linux-x86_64"; sha1 = "df0de3d7e5b2aa84e37097b5f65168d732bfd3de"; } + { locale = "cy"; arch = "linux-i686"; sha1 = "3e1e7991983277f4c07486d1f2896e2a192d5f85"; } + { locale = "cy"; arch = "linux-x86_64"; sha1 = "20232e85c69830eb08b4387f69e3d26637b3d06c"; } + { locale = "da"; arch = "linux-i686"; sha1 = "1a3a3913876fe8eea20b4b6d33b939b9e531fd34"; } + { locale = "da"; arch = "linux-x86_64"; sha1 = "f89864c28eb750655fb212d77569fcfdfbd38ee9"; } + { locale = "de"; arch = "linux-i686"; sha1 = "da97ff54467b5d0cad8142158e01514a1e75f457"; } + { locale = "de"; arch = "linux-x86_64"; sha1 = "988c4cd52388368d21cfb1e6002c28f3e8fb57b1"; } + { locale = "dsb"; arch = "linux-i686"; sha1 = "0997a81282c73a8faf8a784a296bbe9102c823bd"; } + { locale = "dsb"; arch = "linux-x86_64"; sha1 = "d6573147c354d29f0ba928888916882aafb92268"; } + { locale = "el"; arch = "linux-i686"; sha1 = "df53cedb977f9f1cff6b43351fa19801c51e53d9"; } + { locale = "el"; arch = "linux-x86_64"; sha1 = "e124b8586af6fb23371c006be0fbe3525dafc8a9"; } + { locale = "en-GB"; arch = "linux-i686"; sha1 = "738a7335b42e4d324bb3c8411666c3d64e481f85"; } + { locale = "en-GB"; arch = "linux-x86_64"; sha1 = "788abe682ac80e08739edf0fabfd4f160eee44da"; } + { locale = "en-US"; arch = "linux-i686"; sha1 = "9aeaab7265640c4dfdde57b0ef7eebac26c1d1ec"; } + { locale = "en-US"; arch = "linux-x86_64"; sha1 = "e4bdb638b0a4c90ecb664a9b64351a31ad237ee5"; } + { locale = "en-ZA"; arch = "linux-i686"; sha1 = "381749003d0755cec8dbf29cd1d4ebfa806576f8"; } + { locale = "en-ZA"; arch = "linux-x86_64"; sha1 = "518c307bb0b23592ff711943594ea76ffdf0d0c3"; } + { locale = "eo"; arch = "linux-i686"; sha1 = "f570024c9c665b36bd8646f44b2b27ff7021f590"; } + { locale = "eo"; arch = "linux-x86_64"; sha1 = "fb777076f2a2a7d911a381a0561c02701dd54878"; } + { locale = "es-AR"; arch = "linux-i686"; sha1 = "20cac134a4312d5cee8ad1f144b2c44108e96b8e"; } + { locale = "es-AR"; arch = "linux-x86_64"; sha1 = "d4757bfb61d84d6d3e4b484377f1037b1ff2728c"; } + { locale = "es-CL"; arch = "linux-i686"; sha1 = "0416114a667fbc9144186d9a74ce2cf3e09944cc"; } + { locale = "es-CL"; arch = "linux-x86_64"; sha1 = "73eeff57047143e8d4217bb22a3831555f87341f"; } + { locale = "es-ES"; arch = "linux-i686"; sha1 = "66d8288cb4af4d4e8584dcebefc14d9aaf46f4bc"; } + { locale = "es-ES"; arch = "linux-x86_64"; sha1 = "d0830ffc8634ab47033b932dcac51e7d042c4f19"; } + { locale = "es-MX"; arch = "linux-i686"; sha1 = "592df3f8ee6e6a6fc56991a7b1e9f55a1ea1b8e8"; } + { locale = "es-MX"; arch = "linux-x86_64"; sha1 = "cf0d2afac587dbb4f640ea672ea01190f2425905"; } + { locale = "et"; arch = "linux-i686"; sha1 = "441a5dbb69fe61e28e06ec3ed29f34d067ec2ade"; } + { locale = "et"; arch = "linux-x86_64"; sha1 = "633b25f83507b61829a934385766628c8764544e"; } + { locale = "eu"; arch = "linux-i686"; sha1 = "f8f6ddf346afb5bb0420ab092463d61e5e6abfe7"; } + { locale = "eu"; arch = "linux-x86_64"; sha1 = "cc7cfc43d8e6db5ac08f846e81a416e5a75b37b6"; } + { locale = "fa"; arch = "linux-i686"; sha1 = "796ee1d052e97372a870f113390ef25f26047203"; } + { locale = "fa"; arch = "linux-x86_64"; sha1 = "3810bd3727a7de7474070e329ddeabfb98f4aeee"; } + { locale = "ff"; arch = "linux-i686"; sha1 = "436b6732f58bb6a128c6e3027358089bca0d753e"; } + { locale = "ff"; arch = "linux-x86_64"; sha1 = "ed7e3e1a90d31e40cd47645474246adba30eaa1d"; } + { locale = "fi"; arch = "linux-i686"; sha1 = "1d7909cbfe55f6234b6789addae5c9a2dbcf1e49"; } + { locale = "fi"; arch = "linux-x86_64"; sha1 = "d7734ee040a5ff56aa6d7149d6d5a78541f533fb"; } + { locale = "fr"; arch = "linux-i686"; sha1 = "a8614ef406ed6d4ce7f64f14335b5c4a13fd1ee2"; } + { locale = "fr"; arch = "linux-x86_64"; sha1 = "98d5e3476784ee4d759b7995e2ff936910a1b213"; } + { locale = "fy-NL"; arch = "linux-i686"; sha1 = "3c7a1c5e1fb9e0f2320a33771bde1cbd774eb6bf"; } + { locale = "fy-NL"; arch = "linux-x86_64"; sha1 = "10178c5fc56dd8f510f80748767e7e5961bac6ff"; } + { locale = "ga-IE"; arch = "linux-i686"; sha1 = "235c5016eb77c9369ee10e51514961a6986f3c78"; } + { locale = "ga-IE"; arch = "linux-x86_64"; sha1 = "023c3aafa794faa30cc25576e411f2482cc83131"; } + { locale = "gd"; arch = "linux-i686"; sha1 = "e86c734f2afb872f407f78e867735ecda7ceb622"; } + { locale = "gd"; arch = "linux-x86_64"; sha1 = "29b695a5c8291f23b22871dcec4d6e66f918e21c"; } + { locale = "gl"; arch = "linux-i686"; sha1 = "c13ac4e21e70e5d3bcf0b2149bfc3e6090c383ce"; } + { locale = "gl"; arch = "linux-x86_64"; sha1 = "70116ba4463b6937382dc9c7c8da465f5aa78c07"; } + { locale = "gu-IN"; arch = "linux-i686"; sha1 = "7b687b19b72543d411c9eeb4055015c4e4ebaa4b"; } + { locale = "gu-IN"; arch = "linux-x86_64"; sha1 = "d2cc38aafa2311808d92f1c927b6b6fd86c35d59"; } + { locale = "he"; arch = "linux-i686"; sha1 = "24027663a19be1d27379167585936591ffe01650"; } + { locale = "he"; arch = "linux-x86_64"; sha1 = "0ab9ec52df1e0debad953b2c658c16396a7c336d"; } + { locale = "hi-IN"; arch = "linux-i686"; sha1 = "d72b91be0e392a853d3b894f2809bb16d4ed77f5"; } + { locale = "hi-IN"; arch = "linux-x86_64"; sha1 = "560a3562b66a46f7b5c235e5f0c9a37518dc60f4"; } + { locale = "hr"; arch = "linux-i686"; sha1 = "319c19a36f1d9f087f59470cb14ad0b9429cb751"; } + { locale = "hr"; arch = "linux-x86_64"; sha1 = "2c98ac830fb0eff611cb82690d068dc61fa6fb21"; } + { locale = "hsb"; arch = "linux-i686"; sha1 = "f8b2f8a85b7e5d8d4c551f0e64340cfe491695c4"; } + { locale = "hsb"; arch = "linux-x86_64"; sha1 = "5b6533ac4222a3e18c3d4ba74e0aa459bfa413d1"; } + { locale = "hu"; arch = "linux-i686"; sha1 = "93308746df2c99182d2919fece807b47db688b3d"; } + { locale = "hu"; arch = "linux-x86_64"; sha1 = "9fd5cd46a04bed5b8fb079aeb59050664c5d93e0"; } + { locale = "hy-AM"; arch = "linux-i686"; sha1 = "d889d18ccef0c7c25dc2e1fc71b9eaa6aaeb4229"; } + { locale = "hy-AM"; arch = "linux-x86_64"; sha1 = "2ef01a1c2f01825d80d6a0846d59ff6ad77e90e1"; } + { locale = "id"; arch = "linux-i686"; sha1 = "1c5cb9d1d4b20b2060a8fd07d2851067a4b71d6a"; } + { locale = "id"; arch = "linux-x86_64"; sha1 = "82c871d7554fe8411d8f6fccf5e3c7f0d7798885"; } + { locale = "is"; arch = "linux-i686"; sha1 = "1e697fa5802915b826e29ea73805b7101a32312c"; } + { locale = "is"; arch = "linux-x86_64"; sha1 = "44b0d19bc285462f305abf8137aefd9477715e8f"; } + { locale = "it"; arch = "linux-i686"; sha1 = "16e00713bd355373c676e05a032933d9c210ba87"; } + { locale = "it"; arch = "linux-x86_64"; sha1 = "c32e8d9e9dde6c61092e4b72a3192f50e70bcfa9"; } + { locale = "ja"; arch = "linux-i686"; sha1 = "d2d4d0a2c32769ae9fb6d27dfb71e52f146824c3"; } + { locale = "ja"; arch = "linux-x86_64"; sha1 = "271d50bcf97440e61bf7b952a48fe3992c40faf0"; } + { locale = "kk"; arch = "linux-i686"; sha1 = "bc1e2c28b01b7bffde01d88e6aa6aec1a8868f3d"; } + { locale = "kk"; arch = "linux-x86_64"; sha1 = "94a66d608cec6de58fb8d72b116395c77198494d"; } + { locale = "km"; arch = "linux-i686"; sha1 = "99fdf2ae88c34db6fe9234d236caffeb50cbb843"; } + { locale = "km"; arch = "linux-x86_64"; sha1 = "78645872859dc627c5d12e6aa86aef6e3528b3d9"; } + { locale = "kn"; arch = "linux-i686"; sha1 = "ef5dcee189c685ee5b71a76cb19138e65f22a0be"; } + { locale = "kn"; arch = "linux-x86_64"; sha1 = "87b064a5ce23ffd1397b8a480e6a158b1de4cd67"; } + { locale = "ko"; arch = "linux-i686"; sha1 = "95e6290a38025af724c34272f8e2a4d531e4f06a"; } + { locale = "ko"; arch = "linux-x86_64"; sha1 = "e989184dfda401f19a895275519f729597a27e97"; } + { locale = "ku"; arch = "linux-i686"; sha1 = "c1004b96937b848d9e1e53f9fe4a8507d218572d"; } + { locale = "ku"; arch = "linux-x86_64"; sha1 = "a4e61d630ab6ce54a06ff1a90c7df3b76b235181"; } + { locale = "lij"; arch = "linux-i686"; sha1 = "be5da1e0d17c7b51da616c082932d8190a33a74e"; } + { locale = "lij"; arch = "linux-x86_64"; sha1 = "35e29b7825124dd5c68d02e7c1a15e9cdefaec22"; } + { locale = "lt"; arch = "linux-i686"; sha1 = "c09c5cf5f25eac88f90f4aeb48495f688d78d80d"; } + { locale = "lt"; arch = "linux-x86_64"; sha1 = "7f4f6511d9cf4b70e34b37c823c12bd13409a7e8"; } + { locale = "lv"; arch = "linux-i686"; sha1 = "7fc81c00badbbd877a67d5e1998f16560dd41f3e"; } + { locale = "lv"; arch = "linux-x86_64"; sha1 = "5edb8fac36c755db3e3270a0cf4320970696ff4c"; } + { locale = "mai"; arch = "linux-i686"; sha1 = "4d49ecb2e195c9c65382155128ff02d857937703"; } + { locale = "mai"; arch = "linux-x86_64"; sha1 = "96d0dac8116f20972469e527757d17cf7c22792b"; } + { locale = "mk"; arch = "linux-i686"; sha1 = "b72b07ab4d69430d62fb9c497c047f2987636ea1"; } + { locale = "mk"; arch = "linux-x86_64"; sha1 = "441918ac58ff166851921bf1566e7dda24ce2377"; } + { locale = "ml"; arch = "linux-i686"; sha1 = "b7947f50a0618ba9b8fb5fa9f1adff13dbfc0147"; } + { locale = "ml"; arch = "linux-x86_64"; sha1 = "3c98db55a6b9c707957786cc40a03d69e9b4e619"; } + { locale = "mr"; arch = "linux-i686"; sha1 = "f1e5109a2fe72d1c7d8a32f83918064d607efa1a"; } + { locale = "mr"; arch = "linux-x86_64"; sha1 = "820f056eb3413fc0e1979f192e9542db0c9e0e79"; } + { locale = "ms"; arch = "linux-i686"; sha1 = "6a9f01f286fbe0b63f6c171f0171f2883fa5b474"; } + { locale = "ms"; arch = "linux-x86_64"; sha1 = "f8cccf1c87845947693c631fd60300d1a5ec7436"; } + { locale = "nb-NO"; arch = "linux-i686"; sha1 = "2dbe61442b310777b427d27159ee767d82a4b254"; } + { locale = "nb-NO"; arch = "linux-x86_64"; sha1 = "b7a437552fc540966478832bf89a85dc81b16766"; } + { locale = "nl"; arch = "linux-i686"; sha1 = "36f65d56954e59bd758b4a1c09abec85872eb140"; } + { locale = "nl"; arch = "linux-x86_64"; sha1 = "0c1ed8b52afdd3d15f163fc8899e14caeb0a4497"; } + { locale = "nn-NO"; arch = "linux-i686"; sha1 = "729144a52c95cbcb2665da00e953cbdb269c0665"; } + { locale = "nn-NO"; arch = "linux-x86_64"; sha1 = "5298026198b8d6c7eb0b816ca29bbd26f0f65907"; } + { locale = "or"; arch = "linux-i686"; sha1 = "33aaf77833a3c3a504559c399a270061a582ffbb"; } + { locale = "or"; arch = "linux-x86_64"; sha1 = "a2dca791375b174d0f888ce56555fe21e5b2eaf4"; } + { locale = "pa-IN"; arch = "linux-i686"; sha1 = "3670a8492dde8b19e1f5fba10d54eabd003183e1"; } + { locale = "pa-IN"; arch = "linux-x86_64"; sha1 = "376576536d6a7d373ec5c453e107f63261819cf1"; } + { locale = "pl"; arch = "linux-i686"; sha1 = "53af2036a170d77f828e80d455edf6cddf826cfb"; } + { locale = "pl"; arch = "linux-x86_64"; sha1 = "01e04cf2530c1b51bd9e8ee5114ac9ba5317e0e4"; } + { locale = "pt-BR"; arch = "linux-i686"; sha1 = "0fec2a4ea90ecb6d7e09041d45a4b0647c37ebe0"; } + { locale = "pt-BR"; arch = "linux-x86_64"; sha1 = "f7f1dd1f7d78b3647cb77f282b87a3d7224ec567"; } + { locale = "pt-PT"; arch = "linux-i686"; sha1 = "cf46849b5fbd06b51c468f2dc6dab3eb9e8ffde1"; } + { locale = "pt-PT"; arch = "linux-x86_64"; sha1 = "e6bae39233b0c3735fb122b9e56ac4e82d435749"; } + { locale = "rm"; arch = "linux-i686"; sha1 = "41ed6d9c3816647069b0416d1b7edda97fe1abff"; } + { locale = "rm"; arch = "linux-x86_64"; sha1 = "36a83ca4594ba79a3b01ee21a5cfde45b13b323e"; } + { locale = "ro"; arch = "linux-i686"; sha1 = "d70284aea6297688eb25835a482d9ca349eac313"; } + { locale = "ro"; arch = "linux-x86_64"; sha1 = "78079d94b0ad83e6cd687433c335b7e0012c8cb8"; } + { locale = "ru"; arch = "linux-i686"; sha1 = "354fb775dbddfe9f87e78982e7456f20d01476bb"; } + { locale = "ru"; arch = "linux-x86_64"; sha1 = "30a29bb1cbf967fb24e5bbc6abefcdf074b316cc"; } + { locale = "si"; arch = "linux-i686"; sha1 = "b20089f3f2ef670426a29e409426a9cd3569090a"; } + { locale = "si"; arch = "linux-x86_64"; sha1 = "bee5b374f0ca41a858e9b61fe0b43a56bf303180"; } + { locale = "sk"; arch = "linux-i686"; sha1 = "6c9d83b2cef140bdf513c7226854fc991d087785"; } + { locale = "sk"; arch = "linux-x86_64"; sha1 = "57595905385b6b7e77eee34f54a40562d041169d"; } + { locale = "sl"; arch = "linux-i686"; sha1 = "63b3edf9aec8a6beabdf1a4b4a9fb0fb835345fc"; } + { locale = "sl"; arch = "linux-x86_64"; sha1 = "3afafa985ee73cfe378e39881665d2242a6943c9"; } + { locale = "son"; arch = "linux-i686"; sha1 = "e6b6b56ebee586bb10511d197b11d93aefae6316"; } + { locale = "son"; arch = "linux-x86_64"; sha1 = "f95cb4b571fa389df4e182632b12216699cc9f0a"; } + { locale = "sq"; arch = "linux-i686"; sha1 = "18dfa5b40bd31a0d23884f6e9af357b0be01c4b2"; } + { locale = "sq"; arch = "linux-x86_64"; sha1 = "f9d026e9d5a85eaad008d65b736ae8c63cb5064d"; } + { locale = "sr"; arch = "linux-i686"; sha1 = "a5ed16491244d9ab6237546e241335005572c1c0"; } + { locale = "sr"; arch = "linux-x86_64"; sha1 = "2ed29dec3a28949b93f82d0652a38a5539fb2304"; } + { locale = "sv-SE"; arch = "linux-i686"; sha1 = "594eae45b36645a47b12d9579826789e3255b275"; } + { locale = "sv-SE"; arch = "linux-x86_64"; sha1 = "0cec1133910c8ae87878ca56fd63b610651f99ca"; } + { locale = "ta"; arch = "linux-i686"; sha1 = "86da5bfa06e670359b831226822db6a40a7ec7c3"; } + { locale = "ta"; arch = "linux-x86_64"; sha1 = "86b3749d396a7be3628face4bf7ed7278b98c5ab"; } + { locale = "te"; arch = "linux-i686"; sha1 = "7020a27e9173b52a54c8e442e8e2ffc60a888e2c"; } + { locale = "te"; arch = "linux-x86_64"; sha1 = "417ea3e749a9f7309b11d50f99bd5c1b916a0c77"; } + { locale = "th"; arch = "linux-i686"; sha1 = "539293f4f6183ec2941fa83705f7c91bf5e65776"; } + { locale = "th"; arch = "linux-x86_64"; sha1 = "362d3c39936725437d63576f2c8ee6deaf9429ea"; } + { locale = "tr"; arch = "linux-i686"; sha1 = "eb0d205cf6eac45a8405d072b89856293d4cb63e"; } + { locale = "tr"; arch = "linux-x86_64"; sha1 = "84c19d6ec3446ecbe03f0751822501d3628699a8"; } + { locale = "uk"; arch = "linux-i686"; sha1 = "5ef72696a4180c91483f406627ea040bede2f30c"; } + { locale = "uk"; arch = "linux-x86_64"; sha1 = "9de7bcc3ff254234e1844860c3bc907317c02ae6"; } + { locale = "vi"; arch = "linux-i686"; sha1 = "3338130b87e4dd9ee7b8e7120dd158065a772290"; } + { locale = "vi"; arch = "linux-x86_64"; sha1 = "53ebf9890f9b4ccdc786fa65dcae739fae7b8f7c"; } + { locale = "xh"; arch = "linux-i686"; sha1 = "83ae4b1f84c64733d196b9bec58ab1468b126577"; } + { locale = "xh"; arch = "linux-x86_64"; sha1 = "da5b9dca0277dd2be1027251c96f7524e0204f2f"; } + { locale = "zh-CN"; arch = "linux-i686"; sha1 = "bc3e12000156a886e00a64bf536c5b2c35bb727d"; } + { locale = "zh-CN"; arch = "linux-x86_64"; sha1 = "1ac45fd506eb1d5bb92a86ee3a9686e8c93b5c9e"; } + { locale = "zh-TW"; arch = "linux-i686"; sha1 = "5377236c138066df6f67083ae8ed348c6d611a81"; } + { locale = "zh-TW"; arch = "linux-x86_64"; sha1 = "8733a47e10d1bd025507c09a443acf80dd614643"; } + { locale = "zu"; arch = "linux-i686"; sha1 = "a653e724fe28431b2b5ca5f2553654da4ffa526f"; } + { locale = "zu"; arch = "linux-x86_64"; sha1 = "81c967fc251d77a38de24519dba0f4465326fcd8"; } + ]; +} diff --git a/pkgs/applications/office/zotero/firefox.nix b/pkgs/applications/office/zotero/firefox.nix deleted file mode 100644 index 60befdbaad5..00000000000 --- a/pkgs/applications/office/zotero/firefox.nix +++ /dev/null @@ -1,108 +0,0 @@ -{ lib, stdenv, fetchurl, pkgconfig, gtk, pango, perl, python, zip, libIDL -, libjpeg, zlib, dbus, dbus_glib, bzip2, xlibs -, freetype, fontconfig, file, alsaLib, nspr, nss, libnotify -, yasm, mesa, sqlite, unzip, makeWrapper, pysqlite -, hunspell, libevent, libstartup_notification, libvpx -, cairo, gstreamer, gst_plugins_base, icu -, debugBuild ? false -, # If you want the resulting program to call itself "Firefox" instead - # of "Shiretoko" or whatever, enable this option. However, those - # binaries may not be distributed without permission from the - # Mozilla Foundation, see - # http://www.mozilla.org/foundation/trademarks/. - enableOfficialBranding ? false -}: - -assert stdenv.gcc ? libc && stdenv.gcc.libc != null; - -let version = "33.1.1"; in - -stdenv.mkDerivation rec { - name = "firefox-${version}"; - - src = fetchurl { - url = "http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${version}/source/firefox-${version}.source.tar.bz2"; - sha1 = "1e9e3176e7d221c4f2ce479f37ee7c432236a0ec"; - }; - - buildInputs = - [ pkgconfig gtk perl zip libIDL libjpeg zlib bzip2 - python dbus dbus_glib pango freetype fontconfig xlibs.libXi - xlibs.libX11 xlibs.libXrender xlibs.libXft xlibs.libXt file - alsaLib nspr nss libnotify xlibs.pixman yasm mesa - xlibs.libXScrnSaver xlibs.scrnsaverproto pysqlite - xlibs.libXext xlibs.xextproto sqlite unzip makeWrapper - hunspell libevent libstartup_notification libvpx cairo - gstreamer gst_plugins_base icu - ]; - - configureFlags = - [ "--enable-application=browser" - "--disable-javaxpcom" - "--with-system-jpeg" - "--with-system-zlib" - "--with-system-bz2" - "--with-system-nspr" - "--with-system-nss" - "--with-system-libevent" - "--with-system-libvpx" - # "--with-system-png" # needs APNG support - # "--with-system-icu" # causes ‘ar: invalid option -- 'L'’ in Firefox 28.0 - "--enable-system-ffi" - "--enable-system-hunspell" - "--enable-system-pixman" - "--enable-system-sqlite" - "--enable-system-cairo" - "--enable-gstreamer" - "--enable-startup-notification" - # "--enable-content-sandbox" # available since 26.0, but not much info available - # "--enable-content-sandbox-reporter" # keeping disabled for now - "--disable-crashreporter" - "--disable-tests" - "--disable-necko-wifi" # maybe we want to enable this at some point - "--disable-installer" - "--disable-updater" - "--disable-pulseaudio" - ] - ++ (if debugBuild then [ "--enable-debug" "--enable-profiling"] - else [ "--disable-debug" "--enable-release" - "--enable-optimize${lib.optionalString (stdenv.system == "i686-linux") "=-O1"}" - "--enable-strip" ]) - ++ lib.optional enableOfficialBranding "--enable-official-branding"; - - enableParallelBuilding = true; - - preConfigure = - '' - mkdir ../objdir - cd ../objdir - configureScript=../mozilla-release/configure - ''; - - preInstall = - '' - # The following is needed for startup cache creation on grsecurity kernels. - paxmark m ../objdir/dist/bin/xpcshell - ''; - - postInstall = - '' - # For grsecurity kernels - paxmark m $out/lib/${name}/{firefox,firefox-bin,plugin-container} - - # Remove SDK cruft. FIXME: move to a separate output? - rm -rf $out/share/idl $out/include $out/lib/firefox-devel-* - ''; - - meta = { - description = "Web browser"; - homepage = http://www.mozilla.com/en-US/firefox/; - maintainers = with lib.maintainers; [ eelco ]; - platforms = lib.platforms.linux; - }; - - passthru = { - inherit gtk nspr version; - isFirefox3Like = true; - }; -} diff --git a/pkgs/applications/office/zotero/xulrunner.nix b/pkgs/applications/office/zotero/xulrunner.nix deleted file mode 100644 index 4dd1095c0ce..00000000000 --- a/pkgs/applications/office/zotero/xulrunner.nix +++ /dev/null @@ -1,80 +0,0 @@ -{ lib, stdenv, fetchurl, pkgconfig, gtk, pango, perl, python, zip, libIDL -, libjpeg, zlib, dbus, dbus_glib, bzip2, xlibs -, freetype, fontconfig, file, alsaLib, nspr, nss, libnotify -, yasm, mesa, sqlite, unzip, makeWrapper, pysqlite -, hunspell, libevent, libstartup_notification, libvpx -, cairo, gstreamer, gst_plugins_base, icu, firefox -, debugBuild ? false -}: - -assert stdenv.gcc ? libc && stdenv.gcc.libc != null; - -let version = firefox.version; in - -stdenv.mkDerivation rec { - name = "xulrunner-${version}"; - - src = firefox.src; - - buildInputs = - [ pkgconfig gtk perl zip libIDL libjpeg zlib bzip2 - python dbus dbus_glib pango freetype fontconfig xlibs.libXi - xlibs.libX11 xlibs.libXrender xlibs.libXft xlibs.libXt file - alsaLib nspr nss libnotify xlibs.pixman yasm mesa - xlibs.libXScrnSaver xlibs.scrnsaverproto pysqlite - xlibs.libXext xlibs.xextproto sqlite unzip makeWrapper - hunspell libevent libstartup_notification libvpx cairo - gstreamer gst_plugins_base icu - ]; - - configureFlags = - [ "--enable-application=xulrunner" - "--disable-javaxpcom" - "--with-system-jpeg" - "--with-system-zlib" - "--with-system-bz2" - "--with-system-nspr" - "--with-system-nss" - "--with-system-libevent" - "--with-system-libvpx" - # "--with-system-png" # needs APNG support - # "--with-system-icu" # causes ‘ar: invalid option -- 'L'’ in Firefox 28.0 - "--enable-system-ffi" - "--enable-system-hunspell" - "--enable-system-pixman" - "--enable-system-sqlite" - "--enable-system-cairo" - "--enable-gstreamer" - "--enable-startup-notification" - # "--enable-content-sandbox" # available since 26.0, but not much info available - # "--enable-content-sandbox-reporter" # keeping disabled for now - "--disable-crashreporter" - "--disable-tests" - "--disable-necko-wifi" # maybe we want to enable this at some point - "--disable-installer" - "--disable-updater" - "--disable-pulseaudio" - ] - ++ (if debugBuild - then [ "--enable-debug" "--enable-profiling"] - else [ "--disable-debug" "--enable-release" "--enable-strip" - "--enable-optimize${lib.optionalString (stdenv.system == "i686-linux") "=-O1"}" ]); - - enableParallelBuilding = true; - - preConfigure = - '' - mkdir ../objdir - cd ../objdir - configureScript=../mozilla-release/configure - ''; - - meta = { - description = "Mozilla Firefox XUL runner"; - homepage = http://www.mozilla.com/en-US/firefox/; - maintainers = [ lib.maintainers.eelco ]; - platforms = lib.platforms.linux; - }; - - passthru = { inherit gtk version; }; -} diff --git a/pkgs/applications/office/zotero/zotero.sh b/pkgs/applications/office/zotero/zotero.sh index c80d5e8189e..8941097fc42 100644 --- a/pkgs/applications/office/zotero/zotero.sh +++ b/pkgs/applications/office/zotero/zotero.sh @@ -1,3 +1,3 @@ #!@bash@/bin/bash -exec "@xulrunner@/bin/xulrunner" "@out@/libexec/zotero/application.ini" "${@}" +exec "@firefox@/bin/firefox" -app "@out@/libexec/zotero/application.ini" "${@}" diff --git a/pkgs/applications/science/electronics/eagle/default.nix b/pkgs/applications/science/electronics/eagle/default.nix index 8693e45ce10..dd8863b1c4e 100644 --- a/pkgs/applications/science/electronics/eagle/default.nix +++ b/pkgs/applications/science/electronics/eagle/default.nix @@ -59,11 +59,11 @@ stdenv.mkDerivation rec { gcc -shared -fPIC -DEAGLE_PATH=\"$out/eagle-${version}\" ${./eagle_fixer.c} -o "$out"/lib/eagle_fixer.so -ldl # Make wrapper script - dynlinker="$(cat $NIX_GCC/nix-support/dynamic-linker)" + dynlinker="$(cat $NIX_CC/nix-support/dynamic-linker)" mkdir -p "$out"/bin cat > "$out"/bin/eagle << EOF #!${stdenv.shell} - export LD_LIBRARY_PATH="${stdenv.gcc.gcc}/lib:${libPath}" + export LD_LIBRARY_PATH="${stdenv.cc.gcc}/lib:${libPath}" export LD_PRELOAD="$out/lib/eagle_fixer.so" exec "$dynlinker" "$out/eagle-${version}/bin/eagle" "\$@" EOF diff --git a/pkgs/applications/science/logic/coq/HEAD.nix b/pkgs/applications/science/logic/coq/HEAD.nix index edf3091ef16..7b5d1ce62b4 100644 --- a/pkgs/applications/science/logic/coq/HEAD.nix +++ b/pkgs/applications/science/logic/coq/HEAD.nix @@ -3,7 +3,7 @@ {stdenv, fetchgit, writeText, pkgconfig, ocaml, findlib, camlp5, ncurses, lablgtk ? null}: let - version = "8.5pre-52f51fb3"; + version = "8.5pre-0c999f02"; coq-version = "8.5"; buildIde = lablgtk != null; ideFlags = if buildIde then "-lablgtkdir ${lablgtk}/lib/ocaml/*/site-lib/lablgtk2 -coqide opt" else ""; @@ -17,8 +17,8 @@ stdenv.mkDerivation { src = fetchgit { url = git://scm.gforge.inria.fr/coq/coq.git; - rev = "52f51fb385d6a1c90bd7d055185fee50ef2670be"; - sha256 = "0pgp59j2j8vk7nmcja5smly39dpkqfhpp29wpsn71piq6n52pql3"; + rev = "0c999f02ffcd61fcace0cc2d045056a82992a100"; + sha256 = "1wk9lxdmw152665hr5cvnnzgnbbq7kg2845qkb4ag99nnfpsi26s"; }; buildInputs = [ pkgconfig ocaml findlib camlp5 ncurses lablgtk ]; diff --git a/pkgs/applications/science/logic/hol/default.nix b/pkgs/applications/science/logic/hol/default.nix index dc8e975ce1d..a7cdf7f3097 100644 --- a/pkgs/applications/science/logic/hol/default.nix +++ b/pkgs/applications/science/logic/hol/default.nix @@ -69,6 +69,6 @@ stdenv.mkDerivation { checking. ''; homepage = "http://hol.sourceforge.net/"; - license = "BSD"; + license = stdenv.lib.licenses.bsd3; }; } diff --git a/pkgs/applications/science/logic/leo2/default.nix b/pkgs/applications/science/logic/leo2/default.nix index 8f673eb0f15..95012f90a94 100644 --- a/pkgs/applications/science/logic/leo2/default.nix +++ b/pkgs/applications/science/logic/leo2/default.nix @@ -55,7 +55,7 @@ rec { ]; platforms = with a.lib.platforms; linux; - license = "BSD"; + license = a.lib.licenses.bsd3; inherit (sourceInfo) version; homepage = "http://page.mi.fu-berlin.de/cbenzmueller/leo/"; downloadPage = "http://page.mi.fu-berlin.de/cbenzmueller/leo/download.html"; diff --git a/pkgs/applications/science/logic/spass/default.nix b/pkgs/applications/science/logic/spass/default.nix index 2c6144baf0e..5327ed6a42a 100644 --- a/pkgs/applications/science/logic/spass/default.nix +++ b/pkgs/applications/science/logic/spass/default.nix @@ -38,7 +38,7 @@ rec { ]; platforms = with a.lib.platforms; linux; - license = "BSD"; + license = a.lib.licenses.bsd2; }; passthru = { updateInfo = { diff --git a/pkgs/applications/science/logic/verifast/default.nix b/pkgs/applications/science/logic/verifast/default.nix index 2685f5e53d0..797333d5bd8 100644 --- a/pkgs/applications/science/logic/verifast/default.nix +++ b/pkgs/applications/science/logic/verifast/default.nix @@ -5,12 +5,12 @@ assert stdenv.isLinux; let libPath = stdenv.lib.makeLibraryPath - [ stdenv.gcc.libc stdenv.gcc.gcc gtk gdk_pixbuf atk pango glib cairo + [ stdenv.cc.libc stdenv.cc.gcc gtk gdk_pixbuf atk pango glib cairo freetype fontconfig libxml2 gnome2.gtksourceview - ] + ":${stdenv.gcc.gcc}/lib64"; + ] + ":${stdenv.cc.gcc}/lib64"; patchExe = x: '' - patchelf --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \ + patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ --set-rpath ${libPath} ${x} ''; in diff --git a/pkgs/applications/science/logic/yices/default.nix b/pkgs/applications/science/logic/yices/default.nix index b6b34d96d15..e181ecfd0e1 100644 --- a/pkgs/applications/science/logic/yices/default.nix +++ b/pkgs/applications/science/logic/yices/default.nix @@ -3,7 +3,7 @@ assert stdenv.isLinux; let - libPath = stdenv.lib.makeLibraryPath [ stdenv.gcc.libc ]; + libPath = stdenv.lib.makeLibraryPath [ stdenv.cc.libc ]; in stdenv.mkDerivation rec { name = "yices-${version}"; diff --git a/pkgs/applications/science/math/mathematica/9.nix b/pkgs/applications/science/math/mathematica/9.nix index d4d352c95bb..64ebfb34636 100644 --- a/pkgs/applications/science/math/mathematica/9.nix +++ b/pkgs/applications/science/math/mathematica/9.nix @@ -93,7 +93,7 @@ stdenv.mkDerivation rec { elif [ "$type" == "EXEC" ]; then echo "patching $f executable <<" patchelf \ - --set-interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \ + --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ --set-rpath "${ldpath}" \ "$f" patchelf --shrink-rpath "$f" diff --git a/pkgs/applications/science/math/mathematica/default.nix b/pkgs/applications/science/math/mathematica/default.nix index 2f11144bad4..587321f09ec 100644 --- a/pkgs/applications/science/math/mathematica/default.nix +++ b/pkgs/applications/science/math/mathematica/default.nix @@ -104,7 +104,7 @@ stdenv.mkDerivation rec { echo "patching $f executable <<" patchelf --shrink-rpath "$f" patchelf \ - --set-interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \ + --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ --set-rpath "$(patchelf --print-rpath "$f"):${ldpath}" \ "$f" \ && patchelf --shrink-rpath "$f" \ diff --git a/pkgs/applications/science/math/maxima/default.nix b/pkgs/applications/science/math/maxima/default.nix index ddd5dc5d6bb..ffc16a33054 100644 --- a/pkgs/applications/science/math/maxima/default.nix +++ b/pkgs/applications/science/math/maxima/default.nix @@ -2,7 +2,7 @@ let name = "maxima"; - version = "5.34.1"; + version = "5.35.1"; searchPath = stdenv.lib.makeSearchPath "bin" @@ -13,7 +13,7 @@ stdenv.mkDerivation { src = fetchurl { url = "mirror://sourceforge/${name}/${name}-${version}.tar.gz"; - sha256 = "1dw9vfzldpj7lv303xbw0wpyn6ra6i2yzwlrjbcx7j0jm5n43ji0"; + sha256 = "1wwqvay9z6gal7bsyyyhhcwh0fy5ak4h2a446ali0x6zmybaklcy"; }; buildInputs = [sbcl texinfo perl makeWrapper]; @@ -29,10 +29,9 @@ stdenv.mkDerivation { ln -s ../maxima/${version}/doc $out/share/doc/maxima ''; - # Failures in the regression test suite are not going to abort the - # build process. We run the suite mostly so that potential errors show - # up in the build log. See also: - # . + # Failures in the regression test suite won't abort the build process. We run + # the suite only so that potential errors show up in the build log. See also: + # http://sourceforge.net/tracker/?func=detail&aid=3365831&group_id=4933&atid=104933. doCheck = true; enableParallelBuilding = true; diff --git a/pkgs/applications/science/math/wxmaxima/default.nix b/pkgs/applications/science/math/wxmaxima/default.nix index 06eceea65c9..a73e3dbcec0 100644 --- a/pkgs/applications/science/math/wxmaxima/default.nix +++ b/pkgs/applications/science/math/wxmaxima/default.nix @@ -2,14 +2,14 @@ let name = "wxmaxima"; - version = "14.09.0"; + version = "14.12.1"; in stdenv.mkDerivation { name = "${name}-${version}"; src = fetchurl { url = "mirror://sourceforge/${name}/wxMaxima/${version}/wxmaxima-${version}.tar.gz"; - sha256 = "1wqiw9dgjc9vg94dqk4kif8xs7nlmn34xj3v4zm13fh1jihraksq"; + sha256 = "0sjxvh0y5w5p2xdq3qzz3yhlsigrg3ynib9dkymhynpfnb51x82z"; }; buildInputs = [wxGTK maxima makeWrapper]; diff --git a/pkgs/applications/science/misc/root/cmake.patch b/pkgs/applications/science/misc/root/cmake.patch index b6efd7444fe..6d2d4cdc70d 100644 --- a/pkgs/applications/science/misc/root/cmake.patch +++ b/pkgs/applications/science/misc/root/cmake.patch @@ -1,5 +1,5 @@ ---- cmake/modules/RootBuildOptions.cmake 1969-12-31 20:30:01.000000000 -0330 -+++ cmake/modules/RootBuildOptions.cmake 2014-01-10 14:09:29.424937408 -0330 +--- a/cmake/modules/RootBuildOptions.cmake 1969-12-31 20:30:01.000000000 -0330 ++++ b/cmake/modules/RootBuildOptions.cmake 2014-01-10 14:09:29.424937408 -0330 @@ -149,7 +149,7 @@ #---General Build options---------------------------------------------------------------------- diff --git a/pkgs/applications/science/misc/root/default.nix b/pkgs/applications/science/misc/root/default.nix index 1227e76ac0c..57d9fc40ab5 100644 --- a/pkgs/applications/science/misc/root/default.nix +++ b/pkgs/applications/science/misc/root/default.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchurl, cmake, mesa, libX11, gfortran, libXpm, libXft, libXext, zlib }: +{ stdenv, fetchurl, fetchpatch, cmake, mesa, gfortran +, libX11,libXpm, libXft, libXext, zlib }: stdenv.mkDerivation rec { name = "root-${version}"; @@ -14,8 +15,15 @@ stdenv.mkDerivation rec { # CMAKE_INSTALL_RPATH_USE_LINK_PATH is set to FALSE in # /cmake/modules/RootBuildOptions.cmake. # This patch sets it to TRUE. - patches = [ ./cmake.patch ]; - patchFlags = "-p0"; + patches = [ + ./cmake.patch + (fetchpatch { + name = "fix-tm_t-member.diff"; + url = "https://github.com/root-mirror/root/commit/" + + "08b08412bafc24fa635b0fdb832097a3aa2fa1d2.diff"; + sha256 = "0apbp51pk8471gl06agx3i88dn76p6gpkgf1ssfhcyam0bjl8907"; + }) + ]; enableParallelBuilding = true; diff --git a/pkgs/applications/taxes/aangifte-2006/builder.sh b/pkgs/applications/taxes/aangifte-2006/builder.sh index 8d284176d44..1b709b613bd 100644 --- a/pkgs/applications/taxes/aangifte-2006/builder.sh +++ b/pkgs/applications/taxes/aangifte-2006/builder.sh @@ -3,7 +3,7 @@ source $stdenv/setup buildPhase() { for i in bin/*; do patchelf \ - --set-interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \ + --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ --set-rpath $libX11/lib:$libXext/lib \ $i done diff --git a/pkgs/applications/taxes/aangifte-2007/builder.sh b/pkgs/applications/taxes/aangifte-2007/builder.sh index f400f1b8855..5cf03348839 100644 --- a/pkgs/applications/taxes/aangifte-2007/builder.sh +++ b/pkgs/applications/taxes/aangifte-2007/builder.sh @@ -1,12 +1,12 @@ source $stdenv/setup -echo $NIX_GCC +echo $NIX_CC buildPhase() { for i in bin/*; do patchelf \ - --set-interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \ - --set-rpath $libX11/lib:$libXext/lib:$libSM/lib:$(cat $NIX_GCC/nix-support/orig-gcc)/lib \ + --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + --set-rpath $libX11/lib:$libXext/lib:$libSM/lib:$(cat $NIX_CC/nix-support/orig-gcc)/lib \ $i done } diff --git a/pkgs/applications/taxes/aangifte-2008/builder.sh b/pkgs/applications/taxes/aangifte-2008/builder.sh index f400f1b8855..5cf03348839 100644 --- a/pkgs/applications/taxes/aangifte-2008/builder.sh +++ b/pkgs/applications/taxes/aangifte-2008/builder.sh @@ -1,12 +1,12 @@ source $stdenv/setup -echo $NIX_GCC +echo $NIX_CC buildPhase() { for i in bin/*; do patchelf \ - --set-interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \ - --set-rpath $libX11/lib:$libXext/lib:$libSM/lib:$(cat $NIX_GCC/nix-support/orig-gcc)/lib \ + --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + --set-rpath $libX11/lib:$libXext/lib:$libSM/lib:$(cat $NIX_CC/nix-support/orig-gcc)/lib \ $i done } diff --git a/pkgs/applications/taxes/aangifte-2009/default.nix b/pkgs/applications/taxes/aangifte-2009/default.nix index 9aa7a817271..59d83f0ea94 100644 --- a/pkgs/applications/taxes/aangifte-2009/default.nix +++ b/pkgs/applications/taxes/aangifte-2009/default.nix @@ -17,8 +17,8 @@ stdenv.mkDerivation { '' for i in bin/*; do patchelf \ - --set-interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \ - --set-rpath ${stdenv.lib.makeLibraryPath [ libX11 libXext libSM ]}:$(cat $NIX_GCC/nix-support/orig-gcc)/lib \ + --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + --set-rpath ${stdenv.lib.makeLibraryPath [ libX11 libXext libSM ]}:$(cat $NIX_CC/nix-support/orig-gcc)/lib \ $i done ''; diff --git a/pkgs/applications/taxes/aangifte-2010/default.nix b/pkgs/applications/taxes/aangifte-2010/default.nix index 23338c01ec3..17a2c502e47 100644 --- a/pkgs/applications/taxes/aangifte-2010/default.nix +++ b/pkgs/applications/taxes/aangifte-2010/default.nix @@ -17,8 +17,8 @@ stdenv.mkDerivation { '' for i in bin/*; do patchelf \ - --set-interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \ - --set-rpath ${stdenv.lib.makeLibraryPath [ libX11 libXext libSM ]}:$(cat $NIX_GCC/nix-support/orig-gcc)/lib \ + --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + --set-rpath ${stdenv.lib.makeLibraryPath [ libX11 libXext libSM ]}:$(cat $NIX_CC/nix-support/orig-gcc)/lib \ $i done ''; diff --git a/pkgs/applications/taxes/aangifte-2011/default.nix b/pkgs/applications/taxes/aangifte-2011/default.nix index e5bc233affa..161a30d5a98 100644 --- a/pkgs/applications/taxes/aangifte-2011/default.nix +++ b/pkgs/applications/taxes/aangifte-2011/default.nix @@ -17,8 +17,8 @@ stdenv.mkDerivation { '' for i in bin/*; do patchelf \ - --set-interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \ - --set-rpath ${stdenv.lib.makeLibraryPath [ libX11 libXext libSM ]}:$(cat $NIX_GCC/nix-support/orig-gcc)/lib \ + --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + --set-rpath ${stdenv.lib.makeLibraryPath [ libX11 libXext libSM ]}:$(cat $NIX_CC/nix-support/orig-gcc)/lib \ $i done ''; diff --git a/pkgs/applications/taxes/aangifte-2012/default.nix b/pkgs/applications/taxes/aangifte-2012/default.nix index 544fe4ec55f..9691f2fe9c6 100644 --- a/pkgs/applications/taxes/aangifte-2012/default.nix +++ b/pkgs/applications/taxes/aangifte-2012/default.nix @@ -17,8 +17,8 @@ stdenv.mkDerivation { '' for i in bin/*; do patchelf \ - --set-interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \ - --set-rpath ${stdenv.lib.makeLibraryPath [ libX11 libXext libSM ]}:$(cat $NIX_GCC/nix-support/orig-gcc)/lib \ + --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + --set-rpath ${stdenv.lib.makeLibraryPath [ libX11 libXext libSM ]}:$(cat $NIX_CC/nix-support/orig-gcc)/lib \ $i done ''; @@ -28,7 +28,7 @@ stdenv.mkDerivation { mkdir -p $out cp -prvd * $out/ wrapProgram $out/bin/ib2012ux --prefix PATH : ${xdg_utils}/bin \ - --prefix LD_PRELOAD : $(cat $NIX_GCC/nix-support/orig-gcc)/lib/libgcc_s.so.1 + --prefix LD_PRELOAD : $(cat $NIX_CC/nix-support/orig-gcc)/lib/libgcc_s.so.1 ''; meta = { diff --git a/pkgs/applications/taxes/aangifte-2013/default.nix b/pkgs/applications/taxes/aangifte-2013/default.nix index 5cf90320adc..ce4d7f116a8 100644 --- a/pkgs/applications/taxes/aangifte-2013/default.nix +++ b/pkgs/applications/taxes/aangifte-2013/default.nix @@ -17,8 +17,8 @@ stdenv.mkDerivation { '' for i in bin/*; do patchelf \ - --set-interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \ - --set-rpath ${stdenv.lib.makeLibraryPath [ libX11 libXext libSM ]}:$(cat $NIX_GCC/nix-support/orig-gcc)/lib \ + --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + --set-rpath ${stdenv.lib.makeLibraryPath [ libX11 libXext libSM ]}:$(cat $NIX_CC/nix-support/orig-gcc)/lib \ $i done ''; @@ -28,7 +28,7 @@ stdenv.mkDerivation { mkdir -p $out cp -prvd * $out/ wrapProgram $out/bin/ib2013ux --prefix PATH : ${xdg_utils}/bin \ - --prefix LD_PRELOAD : $(cat $NIX_GCC/nix-support/orig-gcc)/lib/libgcc_s.so.1 + --prefix LD_PRELOAD : $(cat $NIX_CC/nix-support/orig-gcc)/lib/libgcc_s.so.1 ''; meta = { diff --git a/pkgs/applications/version-management/fossil/default.nix b/pkgs/applications/version-management/fossil/default.nix index c2793190e89..8cc8920d4a1 100644 --- a/pkgs/applications/version-management/fossil/default.nix +++ b/pkgs/applications/version-management/fossil/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation { from the others by being extremely simple to setup and operate. ''; homepage = http://www.fossil-scm.org/; - license = "BSD"; + license = stdenv.lib.licenses.bsd2; platforms = with stdenv.lib.platforms; all; maintainers = [ #Add your name here! stdenv.lib.maintainers.z77z diff --git a/pkgs/applications/version-management/git-and-tools/git-annex/default.nix b/pkgs/applications/version-management/git-and-tools/git-annex/default.nix index 9259cabc28e..3982eff71b5 100644 --- a/pkgs/applications/version-management/git-and-tools/git-annex/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-annex/default.nix @@ -10,15 +10,16 @@ , networkProtocolXmpp, networkUri, openssh, optparseApplicative , pathPieces, perl, QuickCheck, random, regexTdfa, resourcet, rsync , SafeSemaphore, securemem, SHA, shakespeare, stm, tasty -, tastyHunit, tastyQuickcheck, tastyRerun, text, time, transformers -, unixCompat, utf8String, uuid, wai, waiExtra, warp, warpTls, which -, xmlTypes, yesod, yesodCore, yesodDefault, yesodForm, yesodStatic +, tastyHunit, tastyQuickcheck, tastyRerun, text, time, torrent +, transformers, unixCompat, utf8String, uuid, wai, waiExtra, warp +, warpTls, wget, which, xmlTypes, yesod, yesodCore, yesodDefault +, yesodForm, yesodStatic }: cabal.mkDerivation (self: { pname = "git-annex"; - version = "5.20141203"; - sha256 = "01gifds86925vg7mh363i7qsii2wrgf3vpk3wgjff9rbb7z0fvfk"; + version = "5.20141219"; + sha256 = "1qxvsvys5hrpc5sm6s2ygr7hyrgfjc4qaycp1b0kkwjj4bl4cbvz"; isLibrary = false; isExecutable = true; buildDepends = [ @@ -30,11 +31,13 @@ cabal.mkDerivation (self: { networkMulticast networkProtocolXmpp networkUri optparseApplicative pathPieces QuickCheck random regexTdfa resourcet SafeSemaphore securemem SHA shakespeare stm tasty tastyHunit tastyQuickcheck - tastyRerun text time transformers unixCompat utf8String uuid wai - waiExtra warp warpTls xmlTypes yesod yesodCore yesodDefault - yesodForm yesodStatic + tastyRerun text time torrent transformers unixCompat utf8String + uuid wai waiExtra warp warpTls xmlTypes yesod yesodCore + yesodDefault yesodForm yesodStatic + ]; + buildTools = [ + bup curl git gnupg1 lsof openssh perl rsync wget which ]; - buildTools = [ bup curl git gnupg1 lsof openssh perl rsync which ]; configureFlags = "-fAssistant -fProduction"; preConfigure = "export HOME=$TEMPDIR"; installPhase = "./Setup install"; diff --git a/pkgs/applications/version-management/git-and-tools/git/default.nix b/pkgs/applications/version-management/git-and-tools/git/default.nix index 69e88f32c41..73e2565e457 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -10,7 +10,7 @@ let - version = "2.1.3"; + version = "2.1.4"; svn = subversionClient.override { perlBindings = true; }; @@ -21,7 +21,7 @@ stdenv.mkDerivation { src = fetchurl { url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"; - sha256 = "0mvgvr2hz25p49dhhizcw9591f2h17y2699mpmndis3kzap0c6zy"; + sha256 = "0gh57mfxz1qrxzfp1lpcaqswhixc246kmajlf0db7g0cn6wnhjd0"; }; patches = [ diff --git a/pkgs/applications/version-management/git-and-tools/github-backup/default.nix b/pkgs/applications/version-management/git-and-tools/github-backup/default.nix index 5b1e2041e4a..39af61f5bb5 100644 --- a/pkgs/applications/version-management/git-and-tools/github-backup/default.nix +++ b/pkgs/applications/version-management/git-and-tools/github-backup/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "github-backup"; - version = "1.20141110"; - sha256 = "0675zcijfap757076r3j7js4iadnj1jbihmchf6ikzaanczmq1kg"; + version = "1.20141204"; + sha256 = "0asj0ix81k6vi95rwlhs7ikk936lzfsav4gw0gvyzf31ggmf4j4c"; isLibrary = false; isExecutable = true; buildDepends = [ diff --git a/pkgs/applications/version-management/gitlab-shell/default.nix b/pkgs/applications/version-management/gitlab-shell/default.nix new file mode 100644 index 00000000000..3d4ae689f6b --- /dev/null +++ b/pkgs/applications/version-management/gitlab-shell/default.nix @@ -0,0 +1,59 @@ +{ stdenv, ruby, rubyLibs, fetchgit }: + +stdenv.mkDerivation rec { + version = "2.1.0"; + name = "gitlab-shell-${version}"; + + srcs = fetchgit { + url = "https://gitlab.com/gitlab-org/gitlab-shell.git"; + rev = "823aba63e444afa2f45477819770fec3cb5f0159"; + sha256 = "0ppf547xs9pvmk49v4h043d0j93k5n4q0yx3b9ssrc4qf2smflgq"; + }; + + buildInputs = [ + ruby rubyLibs.bundler + ]; + + installPhase = '' + mkdir -p $out/ + cp -R . $out/ + + # Nothing to install ATM for non-development but keeping the + # install command anyway in case that changes in the future: + export HOME=$(pwd) + bundle install -j4 --verbose --local --deployment --without development test + ''; + + # gitlab-shell will try to read its config relative to the source + # code by default which doesn't work in nixos because it's a + # read-only filesystem + postPatch = '' + substituteInPlace lib/gitlab_config.rb --replace\ + "File.join(ROOT_PATH, 'config.yml')"\ + "ENV['GITLAB_SHELL_CONFIG_PATH']" + substituteInPlace lib/gitlab_net.rb --replace\ + "File.read File.join(ROOT_PATH, '.gitlab_shell_secret')"\ + "File.read ENV['GITLAB_SHELL_SECRET_PATH']" + + # Note that we're running gitlab-shell from current-system/sw + # because otherwise updating gitlab-shell won't be reflected in + # the hardcoded path of the authorized-keys file: + substituteInPlace lib/gitlab_keys.rb --replace\ + "auth_line = \"command=\\\"#{ROOT_PATH}/bin/gitlab-shell"\ + "auth_line = \"command=\\\"GITLAB_SHELL_CONFIG_PATH=#{ENV['GITLAB_SHELL_CONFIG_PATH']} GITLAB_SHELL_SECRET_PATH=#{ENV['GITLAB_SHELL_SECRET_PATH']} /run/current-system/sw/bin/gitlab-shell" + + # We're setting GITLAB_SHELL_CONFIG_PATH in the ssh authorized key + # environment because we need it in gitlab_configrb + # . unsetenv_others will remove that so we're not doing it for + # now. + # + # TODO: Are there any security implications? The commit adding + # unsetenv_others didn't mention anything... + # + # Kernel::exec({'PATH' => ENV['PATH'], 'LD_LIBRARY_PATH' => ENV['LD_LIBRARY_PATH'], 'GL_ID' => ENV['GL_ID']}, *args, unsetenv_others: true) + substituteInPlace lib/gitlab_shell.rb --replace\ + " *args, unsetenv_others: true)"\ + " *args)" + ''; + +} diff --git a/pkgs/applications/version-management/gitlab/Gemfile.lock b/pkgs/applications/version-management/gitlab/Gemfile.lock new file mode 100644 index 00000000000..8a1141d0861 --- /dev/null +++ b/pkgs/applications/version-management/gitlab/Gemfile.lock @@ -0,0 +1,705 @@ +GEM + remote: https://rubygems.org/ + specs: + RedCloth (4.2.9) + ace-rails-ap (2.0.1) + actionmailer (4.1.1) + actionpack (= 4.1.1) + actionview (= 4.1.1) + mail (~> 2.5.4) + actionpack (4.1.1) + actionview (= 4.1.1) + activesupport (= 4.1.1) + rack (~> 1.5.2) + rack-test (~> 0.6.2) + actionview (4.1.1) + activesupport (= 4.1.1) + builder (~> 3.1) + erubis (~> 2.7.0) + activemodel (4.1.1) + activesupport (= 4.1.1) + builder (~> 3.1) + activerecord (4.1.1) + activemodel (= 4.1.1) + activesupport (= 4.1.1) + arel (~> 5.0.0) + activesupport (4.1.1) + i18n (~> 0.6, >= 0.6.9) + json (~> 1.7, >= 1.7.7) + minitest (~> 5.1) + thread_safe (~> 0.1) + tzinfo (~> 1.1) + acts-as-taggable-on (2.4.1) + rails (>= 3, < 5) + addressable (2.3.5) + annotate (2.6.0) + activerecord (>= 2.3.0) + rake (>= 0.8.7) + arel (5.0.1.20140414130214) + asciidoctor (0.1.4) + awesome_print (1.2.0) + axiom-types (0.0.5) + descendants_tracker (~> 0.0.1) + ice_nine (~> 0.9) + bcrypt (3.1.7) + better_errors (1.0.1) + coderay (>= 1.0.0) + erubis (>= 2.6.6) + binding_of_caller (0.7.2) + debug_inspector (>= 0.0.1) + bootstrap-sass (3.0.3.0) + sass (~> 3.2) + builder (3.2.2) + capybara (2.2.1) + mime-types (>= 1.16) + nokogiri (>= 1.3.3) + rack (>= 1.0.0) + rack-test (>= 0.5.4) + xpath (~> 2.0) + carrierwave (0.9.0) + activemodel (>= 3.2.0) + activesupport (>= 3.2.0) + json (>= 1.7) + celluloid (0.15.2) + timers (~> 1.1.0) + charlock_holmes (0.6.9.4) + cliver (0.3.2) + code_analyzer (0.4.3) + sexp_processor + coderay (1.1.0) + coercible (1.0.0) + descendants_tracker (~> 0.0.1) + coffee-rails (4.0.1) + coffee-script (>= 2.2.0) + railties (>= 4.0.0, < 5.0) + coffee-script (2.2.0) + coffee-script-source + execjs + coffee-script-source (1.6.3) + colored (1.2) + colorize (0.5.8) + connection_pool (1.2.0) + coveralls (0.7.0) + multi_json (~> 1.3) + rest-client + simplecov (>= 0.7) + term-ansicolor + thor + crack (0.4.1) + safe_yaml (~> 0.9.0) + creole (0.3.8) + d3_rails (3.1.10) + railties (>= 3.1.0) + daemons (1.1.9) + database_cleaner (1.3.0) + debug_inspector (0.0.2) + default_value_for (3.0.0) + activerecord (>= 3.2.0, < 5.0) + descendants_tracker (0.0.3) + devise (3.2.4) + bcrypt (~> 3.0) + orm_adapter (~> 0.1) + railties (>= 3.2.6, < 5) + thread_safe (~> 0.1) + warden (~> 1.2.3) + devise-async (0.9.0) + devise (~> 3.2) + diff-lcs (1.2.5) + diffy (3.0.3) + docile (1.1.5) + dotenv (0.9.0) + dropzonejs-rails (0.4.14) + rails (> 3.1) + email_spec (1.5.0) + launchy (~> 2.1) + mail (~> 2.2) + emoji (1.0.1) + json + enumerize (0.7.0) + activesupport (>= 3.2) + equalizer (0.0.8) + erubis (2.7.0) + escape_utils (0.2.4) + eventmachine (1.0.3) + excon (0.32.1) + execjs (2.0.2) + expression_parser (0.9.0) + factory_girl (4.3.0) + activesupport (>= 3.0.0) + factory_girl_rails (4.3.0) + factory_girl (~> 4.3.0) + railties (>= 3.0.0) + faraday (0.8.9) + multipart-post (~> 1.2.0) + faraday_middleware (0.9.0) + faraday (>= 0.7.4, < 0.9) + ffaker (1.22.1) + ffi (1.9.3) + fog (1.21.0) + fog-brightbox + fog-core (~> 1.21, >= 1.21.1) + fog-json + nokogiri (~> 1.5, >= 1.5.11) + fog-brightbox (0.0.1) + fog-core + fog-json + fog-core (1.21.1) + builder + excon (~> 0.32) + formatador (~> 0.2.0) + mime-types + net-scp (~> 1.1) + net-ssh (>= 2.1.3) + fog-json (1.0.0) + multi_json (~> 1.0) + font-awesome-rails (4.2.0.0) + railties (>= 3.2, < 5.0) + foreman (0.63.0) + dotenv (>= 0.7) + thor (>= 0.13.6) + formatador (0.2.4) + gemnasium-gitlab-service (0.2.2) + rugged (~> 0.19) + gherkin-ruby (0.3.1) + racc + github-markup (1.1.0) + gitlab-flowdock-git-hook (0.4.2.2) + gitlab-grit (>= 2.4.1) + multi_json + gitlab-grack (2.0.0.pre) + rack (~> 1.5.1) + gitlab-grit (2.6.12) + charlock_holmes (~> 0.6) + diff-lcs (~> 1.1) + mime-types (~> 1.15) + posix-spawn (~> 0.3) + gitlab-linguist (3.0.0) + charlock_holmes (~> 0.6.6) + escape_utils (~> 0.2.4) + mime-types (~> 1.19) + gitlab_emoji (0.0.1.1) + emoji (~> 1.0.1) + gitlab_git (7.0.0.rc10) + activesupport (~> 4.0) + charlock_holmes (~> 0.6) + gitlab-linguist (~> 3.0) + rugged (~> 0.21.0) + gitlab_meta (7.0) + gitlab_omniauth-ldap (1.1.0) + net-ldap (~> 0.7.0) + omniauth (~> 1.0) + pyu-ruby-sasl (~> 0.0.3.1) + rubyntlm (~> 0.1.1) + gollum-lib (3.0.0) + github-markup (~> 1.1.0) + gitlab-grit (~> 2.6.5) + nokogiri (~> 1.6.1) + rouge (~> 1.3.3) + sanitize (~> 2.1.0) + stringex (~> 2.5.1) + gon (5.0.1) + actionpack (>= 2.3.0) + json + grape (0.6.1) + activesupport + builder + hashie (>= 1.2.0) + multi_json (>= 1.3.2) + multi_xml (>= 0.5.2) + rack (>= 1.3.0) + rack-accept + rack-mount + virtus (>= 1.0.0) + grape-entity (0.4.2) + activesupport + multi_json (>= 1.3.2) + growl (1.0.3) + guard (2.2.4) + formatador (>= 0.2.4) + listen (~> 2.1) + lumberjack (~> 1.0) + pry (>= 0.9.12) + thor (>= 0.18.1) + guard-rspec (4.2.0) + guard (>= 2.1.1) + rspec (>= 2.14, < 4.0) + guard-spinach (0.0.2) + guard (>= 1.1) + spinach + haml (4.0.5) + tilt + haml-rails (0.5.3) + actionpack (>= 4.0.1) + activesupport (>= 4.0.1) + haml (>= 3.1, < 5.0) + railties (>= 4.0.1) + hashie (2.1.2) + hike (1.2.3) + hipchat (0.14.0) + httparty + httparty + html-pipeline (1.11.0) + activesupport (>= 2) + nokogiri (~> 1.4) + html-pipeline-gitlab (0.1.5) + actionpack (~> 4) + gitlab_emoji (~> 0.0.1) + html-pipeline (~> 1.11.0) + sanitize (~> 2.1) + http_parser.rb (0.5.3) + httparty (0.13.0) + json (~> 1.8) + multi_xml (>= 0.5.2) + httpauth (0.2.1) + i18n (0.6.11) + ice_nine (0.10.0) + jasmine (2.0.2) + jasmine-core (~> 2.0.0) + phantomjs + rack (>= 1.2.1) + rake + jasmine-core (2.0.0) + jquery-atwho-rails (0.3.3) + jquery-rails (3.1.0) + railties (>= 3.0, < 5.0) + thor (>= 0.14, < 2.0) + jquery-scrollto-rails (1.4.3) + railties (> 3.1, < 5.0) + jquery-turbolinks (2.0.1) + railties (>= 3.1.0) + turbolinks + jquery-ui-rails (4.2.1) + railties (>= 3.2.16) + json (1.8.1) + jwt (0.1.13) + multi_json (>= 1.5) + kaminari (0.15.1) + actionpack (>= 3.0.0) + activesupport (>= 3.0.0) + kgio (2.8.1) + launchy (2.4.2) + addressable (~> 2.3) + letter_opener (1.1.2) + launchy (~> 2.2) + listen (2.3.1) + celluloid (>= 0.15.2) + rb-fsevent (>= 0.9.3) + rb-inotify (>= 0.9) + lumberjack (1.0.4) + mail (2.5.4) + mime-types (~> 1.16) + treetop (~> 1.4.8) + method_source (0.8.2) + mime-types (1.25.1) + mini_portile (0.6.0) + minitest (5.3.5) + mousetrap-rails (1.4.6) + multi_json (1.10.1) + multi_xml (0.5.5) + multipart-post (1.2.0) + net-ldap (0.7.0) + net-scp (1.1.2) + net-ssh (>= 2.6.5) + net-ssh (2.8.0) + newrelic_rpm (3.9.4.245) + nokogiri (1.6.2.1) + mini_portile (= 0.6.0) + nprogress-rails (0.1.2.3) + oauth (0.4.7) + oauth2 (0.8.1) + faraday (~> 0.8) + httpauth (~> 0.1) + jwt (~> 0.1.4) + multi_json (~> 1.0) + rack (~> 1.2) + omniauth (1.1.4) + hashie (>= 1.2, < 3) + rack + omniauth-github (1.1.1) + omniauth (~> 1.0) + omniauth-oauth2 (~> 1.1) + omniauth-google-oauth2 (0.2.5) + omniauth (> 1.0) + omniauth-oauth2 (~> 1.1) + omniauth-oauth (1.0.1) + oauth + omniauth (~> 1.0) + omniauth-oauth2 (1.1.1) + oauth2 (~> 0.8.0) + omniauth (~> 1.0) + omniauth-shibboleth (1.1.1) + omniauth (>= 1.0.0) + omniauth-twitter (1.0.1) + multi_json (~> 1.3) + omniauth-oauth (~> 1.0) + org-ruby (0.9.9) + rubypants (~> 0.2) + orm_adapter (0.5.0) + pg (0.15.1) + phantomjs (1.9.2.0) + poltergeist (1.5.1) + capybara (~> 2.1) + cliver (~> 0.3.1) + multi_json (~> 1.0) + websocket-driver (>= 0.2.0) + polyglot (0.3.4) + posix-spawn (0.3.9) + pry (0.9.12.4) + coderay (~> 1.0) + method_source (~> 0.8) + slop (~> 3.4) + pyu-ruby-sasl (0.0.3.3) + quiet_assets (1.0.2) + railties (>= 3.1, < 5.0) + racc (1.4.10) + rack (1.5.2) + rack-accept (0.4.5) + rack (>= 0.4) + rack-attack (2.3.0) + rack + rack-cors (0.2.9) + rack-mini-profiler (0.9.0) + rack (>= 1.1.3) + rack-mount (0.8.3) + rack (>= 1.0.0) + rack-protection (1.5.1) + rack + rack-test (0.6.2) + rack (>= 1.0) + rails (4.1.1) + actionmailer (= 4.1.1) + actionpack (= 4.1.1) + actionview (= 4.1.1) + activemodel (= 4.1.1) + activerecord (= 4.1.1) + activesupport (= 4.1.1) + bundler (>= 1.3.0, < 2.0) + railties (= 4.1.1) + sprockets-rails (~> 2.0) + rails_autolink (1.1.6) + rails (> 3.1) + rails_best_practices (1.14.4) + activesupport + awesome_print + code_analyzer (>= 0.4.3) + colored + erubis + i18n + require_all + ruby-progressbar + railties (4.1.1) + actionpack (= 4.1.1) + activesupport (= 4.1.1) + rake (>= 0.8.7) + thor (>= 0.18.1, < 2.0) + raindrops (0.12.0) + rake (10.3.2) + raphael-rails (2.1.2) + rb-fsevent (0.9.3) + rb-inotify (0.9.2) + ffi (>= 0.5.0) + rdoc (3.12.2) + json (~> 1.4) + redcarpet (3.1.2) + redis (3.0.6) + redis-actionpack (4.0.0) + actionpack (~> 4) + redis-rack (~> 1.5.0) + redis-store (~> 1.1.0) + redis-activesupport (4.0.0) + activesupport (~> 4) + redis-store (~> 1.1.0) + redis-namespace (1.4.1) + redis (~> 3.0.4) + redis-rack (1.5.0) + rack (~> 1.5) + redis-store (~> 1.1.0) + redis-rails (4.0.0) + redis-actionpack (~> 4) + redis-activesupport (~> 4) + redis-store (~> 1.1.0) + redis-store (1.1.4) + redis (>= 2.2) + request_store (1.0.5) + require_all (1.3.2) + rest-client (1.6.7) + mime-types (>= 1.16) + rinku (1.7.3) + rouge (1.3.3) + rspec (2.14.1) + rspec-core (~> 2.14.0) + rspec-expectations (~> 2.14.0) + rspec-mocks (~> 2.14.0) + rspec-core (2.14.7) + rspec-expectations (2.14.4) + diff-lcs (>= 1.1.3, < 2.0) + rspec-mocks (2.14.4) + rspec-rails (2.14.0) + actionpack (>= 3.0) + activesupport (>= 3.0) + railties (>= 3.0) + rspec-core (~> 2.14.0) + rspec-expectations (~> 2.14.0) + rspec-mocks (~> 2.14.0) + ruby-progressbar (1.2.0) + rubyntlm (0.1.1) + rubypants (0.2.0) + rugged (0.21.0) + safe_yaml (0.9.7) + sanitize (2.1.0) + nokogiri (>= 1.4.4) + sass (3.2.19) + sass-rails (4.0.3) + railties (>= 4.0.0, < 5.0) + sass (~> 3.2.0) + sprockets (~> 2.8, <= 2.11.0) + sprockets-rails (~> 2.0) + sdoc (0.3.20) + json (>= 1.1.3) + rdoc (~> 3.10) + seed-fu (2.3.1) + activerecord (>= 3.1, < 4.2) + activesupport (>= 3.1, < 4.2) + select2-rails (3.5.2) + thor (~> 0.14) + semantic-ui-sass (0.16.1.0) + sass (~> 3.2) + settingslogic (2.0.9) + sexp_processor (4.4.0) + shoulda-matchers (2.1.0) + activesupport (>= 3.0.0) + sidekiq (2.17.0) + celluloid (>= 0.15.2) + connection_pool (>= 1.0.0) + json + redis (>= 3.0.4) + redis-namespace (>= 1.3.1) + simple_oauth (0.1.9) + simplecov (0.9.0) + docile (~> 1.1.0) + multi_json + simplecov-html (~> 0.8.0) + simplecov-html (0.8.0) + sinatra (1.4.4) + rack (~> 1.4) + rack-protection (~> 1.4) + tilt (~> 1.3, >= 1.3.4) + six (0.2.0) + slack-notifier (0.3.2) + slim (2.0.2) + temple (~> 0.6.6) + tilt (>= 1.3.3, < 2.1) + slop (3.4.7) + spinach (0.8.7) + colorize (= 0.5.8) + gherkin-ruby (>= 0.3.1) + spinach-rails (0.2.1) + capybara (>= 2.0.0) + railties (>= 3) + spinach (>= 0.4) + spring (1.1.3) + spring-commands-rspec (1.0.1) + spring (>= 0.9.1) + spring-commands-spinach (1.0.0) + spring (>= 0.9.1) + sprockets (2.11.0) + hike (~> 1.2) + multi_json (~> 1.0) + rack (~> 1.0) + tilt (~> 1.1, != 1.3.0) + sprockets-rails (2.1.3) + actionpack (>= 3.0) + activesupport (>= 3.0) + sprockets (~> 2.8) + stamp (0.5.0) + state_machine (1.2.0) + stringex (2.5.1) + temple (0.6.7) + term-ansicolor (1.2.2) + tins (~> 0.8) + test_after_commit (0.2.2) + thin (1.6.1) + daemons (>= 1.0.9) + eventmachine (>= 1.0.0) + rack (>= 1.0.0) + thor (0.19.1) + thread_safe (0.3.4) + tilt (1.4.1) + timers (1.1.0) + tinder (1.9.3) + eventmachine (~> 1.0) + faraday (~> 0.8) + faraday_middleware (~> 0.9) + hashie (>= 1.0, < 3) + json (~> 1.8.0) + mime-types (~> 1.19) + multi_json (~> 1.7) + twitter-stream (~> 0.1) + tins (0.13.1) + treetop (1.4.15) + polyglot + polyglot (>= 0.3.1) + turbolinks (2.0.0) + coffee-rails + twitter-stream (0.1.16) + eventmachine (>= 0.12.8) + http_parser.rb (~> 0.5.1) + simple_oauth (~> 0.1.4) + tzinfo (1.2.2) + thread_safe (~> 0.1) + uglifier (2.3.2) + execjs (>= 0.3.0) + json (>= 1.8.0) + underscore-rails (1.4.4) + unf (0.1.4) + unf_ext + unf_ext (0.0.6) + unicorn (4.6.3) + kgio (~> 2.6) + rack + raindrops (~> 0.7) + unicorn-worker-killer (0.4.2) + unicorn (~> 4) + version_sorter (1.1.0) + virtus (1.0.1) + axiom-types (~> 0.0.5) + coercible (~> 1.0) + descendants_tracker (~> 0.0.1) + equalizer (~> 0.0.7) + warden (1.2.3) + rack (>= 1.0) + webmock (1.16.0) + addressable (>= 2.2.7) + crack (>= 0.3.2) + websocket-driver (0.3.3) + wikicloth (0.8.1) + builder + expression_parser + rinku + xpath (2.0.0) + nokogiri (~> 1.3) + +PLATFORMS + ruby + +DEPENDENCIES + RedCloth + ace-rails-ap + acts-as-taggable-on + annotate (~> 2.6.0.beta2) + asciidoctor (= 0.1.4) + awesome_print + better_errors + binding_of_caller + bootstrap-sass (~> 3.0) + capybara (~> 2.2.1) + carrierwave + coffee-rails + colored + coveralls + creole (~> 0.3.6) + d3_rails (~> 3.1.4) + database_cleaner + default_value_for (~> 3.0.0) + devise (= 3.2.4) + devise-async (= 0.9.0) + diffy (~> 3.0.3) + dropzonejs-rails + email_spec + enumerize + factory_girl_rails + ffaker + fog (~> 1.14) + font-awesome-rails (~> 4.2) + foreman + gemnasium-gitlab-service (~> 0.2) + github-markup + gitlab-flowdock-git-hook (~> 0.4.2) + gitlab-grack (~> 2.0.0.pre) + gitlab-linguist (~> 3.0.0) + gitlab_emoji (~> 0.0.1.1) + gitlab_git (= 7.0.0.rc10) + gitlab_meta (= 7.0) + gitlab_omniauth-ldap (= 1.1.0) + gollum-lib (~> 3.0.0) + gon (~> 5.0.0) + grape (~> 0.6.1) + grape-entity (~> 0.4.2) + growl + guard-rspec + guard-spinach + haml-rails + hipchat (~> 0.14.0) + html-pipeline-gitlab (~> 0.1.0) + httparty + jasmine (= 2.0.2) + jquery-atwho-rails (~> 0.3.3) + jquery-rails + jquery-scrollto-rails + jquery-turbolinks + jquery-ui-rails + kaminari (~> 0.15.1) + launchy + letter_opener + minitest (~> 5.3.0) + mousetrap-rails + mysql2 + newrelic_rpm + nprogress-rails + omniauth (~> 1.1.3) + omniauth-github + omniauth-google-oauth2 + omniauth-shibboleth + omniauth-twitter + org-ruby (= 0.9.9) + pg + poltergeist (~> 1.5.1) + pry + quiet_assets (~> 1.0.1) + rack-attack + rack-cors + rack-mini-profiler + rails (~> 4.1.0) + rails_autolink (~> 1.1) + rails_best_practices + raphael-rails (~> 2.1.2) + rb-fsevent + rb-inotify + rdoc (~> 3.6) + redcarpet (~> 3.1.2) + redis-rails + request_store + rspec-rails + sanitize (~> 2.0) + sass-rails (~> 4.0.2) + sdoc + seed-fu + select2-rails + semantic-ui-sass (~> 0.16.1.0) + settingslogic + shoulda-matchers (~> 2.1.0) + sidekiq (= 2.17.0) + simplecov + sinatra + six + slack-notifier (~> 0.3.2) + slim + spinach-rails + spring (= 1.1.3) + spring-commands-rspec (= 1.0.1) + spring-commands-spinach (= 1.0.0) + stamp + state_machine + test_after_commit + thin + tinder (~> 1.9.2) + turbolinks + uglifier + underscore-rails (~> 1.4.4) + unf + unicorn (~> 4.6.3) + unicorn-worker-killer + version_sorter + virtus + webmock + wikicloth (= 0.8.1) diff --git a/pkgs/applications/version-management/gitlab/Gemfile.nix b/pkgs/applications/version-management/gitlab/Gemfile.nix new file mode 100644 index 00000000000..2e05d883abf --- /dev/null +++ b/pkgs/applications/version-management/gitlab/Gemfile.nix @@ -0,0 +1,1508 @@ +[ +{ +name = "RedCloth"; +hash = "b4cf450a8868ca00a48d6ea43346d75dac183a8590774dd5590f4e967d87ea1a"; +url = "http://rubygems.org/downloads/RedCloth-4.2.9.gem"; +version = "4.2.9"; +} +{ +name = "ace-rails-ap"; +hash = "7bfbec4e8f7c7b6d2733fada398253f885ee48acd08201126a47a636b3085620"; +url = "http://rubygems.org/downloads/ace-rails-ap-2.0.1.gem"; +version = "2.0.1"; +} +{ +name = "actionmailer"; +hash = "ddf61f96ecf52b918522f063effb28985d0f76deb5c3ad85ab8cf5ec39adab92"; +url = "http://rubygems.org/downloads/actionmailer-4.1.1.gem"; +version = "4.1.1"; +} +{ +name = "actionpack"; +hash = "c11be56442eb570ba44d3b3ac74f6949f882c8dc76c56fceeb071daf64c5111d"; +url = "http://rubygems.org/downloads/actionpack-4.1.1.gem"; +version = "4.1.1"; +} +{ +name = "actionview"; +hash = "5892b097fc3556c4ac25307f3c406ba697b6520ca7c34b7d1ff17e0c93d79072"; +url = "http://rubygems.org/downloads/actionview-4.1.1.gem"; +version = "4.1.1"; +} +{ +name = "activemodel"; +hash = "c1d808d85b5e7f90593cb66ac7694f9288c819cdd1cb029790617f60cfed3232"; +url = "http://rubygems.org/downloads/activemodel-4.1.1.gem"; +version = "4.1.1"; +} +{ +name = "activerecord"; +hash = "df9f2227e00779826ea8abe13ed1c6aa9ba5422b35e37c1b82f62480d2ea13a0"; +url = "http://rubygems.org/downloads/activerecord-4.1.1.gem"; +version = "4.1.1"; +} +{ +name = "activesupport"; +hash = "7342801d69c8ca68c9005cafbc4a8f67069d3b51c0a4f5e2bbd061dcb26bba85"; +url = "http://rubygems.org/downloads/activesupport-4.1.1.gem"; +version = "4.1.1"; +} +{ +name = "acts-as-taggable-on"; +hash = "4b75dd427cb721f38fe354e8a37d8c3d217779c9db204398890984694def753d"; +url = "http://rubygems.org/downloads/acts-as-taggable-on-2.4.1.gem"; +version = "2.4.1"; +} +{ +name = "addressable"; +hash = "e74d0e825fe79b12943c7e3cbd3a5c92f7e3ebb94485b2493d320d6876321b86"; +url = "http://rubygems.org/downloads/addressable-2.3.5.gem"; +version = "2.3.5"; +} +{ +name = "annotate"; +hash = "d92ab99c6d10d98fec361bb5501ee91f8f30d1a7b2a6267334d74a1c6b363656"; +url = "http://rubygems.org/downloads/annotate-2.6.0.gem"; +version = "2.6.0"; +} +{ +name = "arel"; +hash = "c941f07bad89af26e8837c73d8a399b7777c721609f759eda015ed0081601636"; +url = "http://rubygems.org/downloads/arel-5.0.1.20140414130214.gem"; +version = "5.0.1.20140414130214"; +} +{ +name = "asciidoctor"; +hash = "2a2d6f9aed31200c9c74e5b81dba1673eda2f7936599df016cbe608dd8e1cf92"; +url = "http://rubygems.org/downloads/asciidoctor-0.1.4.gem"; +version = "0.1.4"; +} +{ +name = "awesome_print"; +hash = "f9fb1d1bafddc4739266c68f3a043e409716a620aea937d54d1ae07c278305cd"; +url = "http://rubygems.org/downloads/awesome_print-1.2.0.gem"; +version = "1.2.0"; +} +{ +name = "axiom-types"; +hash = "f67b87e9d7276f78cbee8f09f9bd474d63d7b357d271c63bfac5092b4670d54c"; +url = "http://rubygems.org/downloads/axiom-types-0.0.5.gem"; +version = "0.0.5"; +} +{ +name = "bcrypt"; +hash = "1c30953152c7151eac21aa59eed7ea933a7bc5d5838edea1d30d79b005955702"; +url = "http://rubygems.org/downloads/bcrypt-3.1.7.gem"; +version = "3.1.7"; +} +{ +name = "better_errors"; +hash = "eec93a02c996a8105cd9409cff2a2156a16ff1609b93b9b0d38c623cdb42186c"; +url = "http://rubygems.org/downloads/better_errors-1.0.1.gem"; +version = "1.0.1"; +} +{ +name = "binding_of_caller"; +hash = "d327682ce1d8e8cc46e282a46052946af0de16bef734014c63df0aac66334f96"; +url = "http://rubygems.org/downloads/binding_of_caller-0.7.2.gem"; +version = "0.7.2"; +} +{ +name = "bootstrap-sass"; +hash = "3f9269bae459b9f48bcb46524497fe7c422919708d12d9d9b1096b45339654c7"; +url = "http://rubygems.org/downloads/bootstrap-sass-3.0.3.0.gem"; +version = "3.0.3.0"; +} +{ +name = "builder"; +hash = "62fb9ad70ea42219a0c8d209a30281803712c717df7cb8f5ce5f63b4d489d191"; +url = "http://rubygems.org/downloads/builder-3.2.2.gem"; +version = "3.2.2"; +} +{ +name = "capybara"; +hash = "0081ff6eaa33f4b5b0427db7ef0ca0af015a9bf6606126f41016db6feb58cdeb"; +url = "http://rubygems.org/downloads/capybara-2.2.1.gem"; +version = "2.2.1"; +} +{ +name = "carrierwave"; +hash = "859069a445ffe03551cce9e239da424dabcc3b9a855e5f615ec62f6655d82aac"; +url = "http://rubygems.org/downloads/carrierwave-0.9.0.gem"; +version = "0.9.0"; +} +{ +name = "celluloid"; +hash = "2bb549276898d262355818b54eee45161d565af08728a5fe83e51277ea49ea52"; +url = "http://rubygems.org/downloads/celluloid-0.15.2.gem"; +version = "0.15.2"; +} +{ +name = "charlock_holmes"; +hash = "e52db7af0f7a652f55244455f84b4f1c09144f0d5e416f677a912f9147d6dfef"; +url = "http://rubygems.org/downloads/charlock_holmes-0.6.9.4.gem"; +version = "0.6.9.4"; +} +{ +name = "cliver"; +hash = "8775445218c612bb57f50c392c4906a1ab5cca067eab093bde3cc77d6426ce24"; +url = "http://rubygems.org/downloads/cliver-0.3.2.gem"; +version = "0.3.2"; +} +{ +name = "code_analyzer"; +hash = "27b610b987b3421d17a615cbab0c712f90bca45e82391ab9082670af97360bed"; +url = "http://rubygems.org/downloads/code_analyzer-0.4.3.gem"; +version = "0.4.3"; +} +{ +name = "coderay"; +hash = "5a943c59e36f7ef9dd2677855735656413af02e3f302431e9c548aabe89f3c15"; +url = "http://rubygems.org/downloads/coderay-1.1.0.gem"; +version = "1.1.0"; +} +{ +name = "coercible"; +hash = "5081ad24352cc8435ce5472bc2faa30260c7ea7f2102cc6a9f167c4d9bffaadc"; +url = "http://rubygems.org/downloads/coercible-1.0.0.gem"; +version = "1.0.0"; +} +{ +name = "coffee-rails"; +hash = "2f6e36f2c7a2b5ea4ba2aae5d8f70b443e47f010e1f645aec28368d783e1d88a"; +url = "http://rubygems.org/downloads/coffee-rails-4.0.1.gem"; +version = "4.0.1"; +} +{ +name = "coffee-script"; +hash = "acdd9f907950cfcf2342bc621ac9d11c9b0f34e2be8ab02de7845c673fb96c8c"; +url = "http://rubygems.org/downloads/coffee-script-2.2.0.gem"; +version = "2.2.0"; +} +{ +name = "coffee-script-source"; +hash = "64a5e37557b367c3a087643ed033b1dce485d6c21f96262aecc806d93280635c"; +url = "http://rubygems.org/downloads/coffee-script-source-1.6.3.gem"; +version = "1.6.3"; +} +{ +name = "colored"; +hash = "9d82b47ac589ce7f6cab64b1f194a2009e9fd00c326a5357321f44afab2c1d2c"; +url = "http://rubygems.org/downloads/colored-1.2.gem"; +version = "1.2"; +} +{ +name = "colorize"; +hash = "0f3d2c56f6a9da8dd6e8bb7c4448dab91a682615ef49feff415a8a6999dedfe5"; +url = "http://rubygems.org/downloads/colorize-0.5.8.gem"; +version = "0.5.8"; +} +{ +name = "connection_pool"; +hash = "41c0f1ff0c5a697869344ff50ae0d952fe99b52b26c21744b06fac34323adcb9"; +url = "http://rubygems.org/downloads/connection_pool-1.2.0.gem"; +version = "1.2.0"; +} +{ +name = "coveralls"; +hash = "449284ddd071e2297d06d0a9d18fe4c2b4027848263b1087d4180fb44e03e36b"; +url = "http://rubygems.org/downloads/coveralls-0.7.0.gem"; +version = "0.7.0"; +} +{ +name = "crack"; +hash = "4f9690bc66278494e0c525989b8ebfa89ce44087cd1733857d6ca9162dd16271"; +url = "http://rubygems.org/downloads/crack-0.4.1.gem"; +version = "0.4.1"; +} +{ +name = "creole"; +hash = "88ceda907e86402e629557002dfdc3a64c96ece2f85af8d787b96422639998f3"; +url = "http://rubygems.org/downloads/creole-0.3.8.gem"; +version = "0.3.8"; +} +{ +name = "d3_rails"; +hash = "28c6b97d4167481b78525cb2e2aa6b066fff6a086bb68a25762dec502cdf24d9"; +url = "http://rubygems.org/downloads/d3_rails-3.1.10.gem"; +version = "3.1.10"; +} +{ +name = "daemons"; +hash = "fee738586059ac5051ed89b40b63d02bdc9a19254f9b6e58848dea1c2f3135c8"; +url = "http://rubygems.org/downloads/daemons-1.1.9.gem"; +version = "1.1.9"; +} +{ +name = "database_cleaner"; +hash = "f675eb78d4fed65ae1e8503ccef4dfd25f4a3c3702bfb792789720a39a2f82a7"; +url = "http://rubygems.org/downloads/database_cleaner-1.3.0.gem"; +version = "1.3.0"; +} +{ +name = "debug_inspector"; +hash = "1594188ffd35b9973fa1e048497e4aa63abad0c3cbba0670e17935005e302781"; +url = "http://rubygems.org/downloads/debug_inspector-0.0.2.gem"; +version = "0.0.2"; +} +{ +name = "default_value_for"; +hash = "1fbd89cb5e7dab1820f7da6bbf5972c36e41acaa25101f129a7adffe9b987021"; +url = "http://rubygems.org/downloads/default_value_for-3.0.0.gem"; +version = "3.0.0"; +} +{ +name = "descendants_tracker"; +hash = "01d7079bc81d4743e138bf77a7cc1ece123834fa6883f4241646163401922920"; +url = "http://rubygems.org/downloads/descendants_tracker-0.0.3.gem"; +version = "0.0.3"; +} +{ +name = "devise"; +hash = "a37345a41049b5c4e02da561bcf922920b406cdd41970d1eb0023315050244fd"; +url = "http://rubygems.org/downloads/devise-3.2.4.gem"; +version = "3.2.4"; +} +{ +name = "devise-async"; +hash = "b51aec324bfa56f5e51b00e5429546e9eeab4be99ac0971625afdeffde799486"; +url = "http://rubygems.org/downloads/devise-async-0.9.0.gem"; +version = "0.9.0"; +} +{ +name = "diff-lcs"; +hash = "a1d3dde665292317a883d319066792e3f0e6a24cade4bc4cc47605d27664c9ed"; +url = "http://rubygems.org/downloads/diff-lcs-1.2.5.gem"; +version = "1.2.5"; +} +{ +name = "diffy"; +hash = "15a1d91b0ea81cada6ef5977543e7c255b4f8c5c3d361e557c8aee52cdf58d62"; +url = "http://rubygems.org/downloads/diffy-3.0.3.gem"; +version = "3.0.3"; +} +{ +name = "docile"; +hash = "5d3ee40b3a6567fe460601f3f4a3e199a98de37434ebfa242d751d0c79181255"; +url = "http://rubygems.org/downloads/docile-1.1.5.gem"; +version = "1.1.5"; +} +{ +name = "dotenv"; +hash = "838e235fa00d343c3138dbc05aa2cf1ec626ff9f065d521917a79a86b4a980be"; +url = "http://rubygems.org/downloads/dotenv-0.9.0.gem"; +version = "0.9.0"; +} +{ +name = "dropzonejs-rails"; +hash = "de86f5f58ca2e6f7212709db879f72d3eec16477a92296f03effabdd928c122b"; +url = "http://rubygems.org/downloads/dropzonejs-rails-0.4.14.gem"; +version = "0.4.14"; +} +{ +name = "email_spec"; +hash = "2607e556f41ab7fb90dabd3eda3d21acec5c2afd3ee607ab713664473dda503f"; +url = "http://rubygems.org/downloads/email_spec-1.5.0.gem"; +version = "1.5.0"; +} +{ +name = "emoji"; +hash = "2a74a4c6ff196cdc81e63198d30d8660b39b1147a59bd5f3639b39edf8fccf05"; +url = "http://rubygems.org/downloads/emoji-1.0.1.gem"; +version = "1.0.1"; +} +{ +name = "enumerize"; +hash = "4608034132557260e16a936c0eef54bf26c21eda261da25f89e49edd475de665"; +url = "http://rubygems.org/downloads/enumerize-0.7.0.gem"; +version = "0.7.0"; +} +{ +name = "equalizer"; +hash = "d66d02ece6935c217e3a81b2e33487825633fd203144e495b6e29f07278909da"; +url = "http://rubygems.org/downloads/equalizer-0.0.8.gem"; +version = "0.0.8"; +} +{ +name = "erubis"; +hash = "63653f5174a7997f6f1d6f465fbe1494dcc4bdab1fb8e635f6216989fb1148ba"; +url = "http://rubygems.org/downloads/erubis-2.7.0.gem"; +version = "2.7.0"; +} +{ +name = "escape_utils"; +hash = "8f14b54e78845b9673d4ade8ec7f748652e18e19cd9800605f810ba0d4bbe555"; +url = "http://rubygems.org/downloads/escape_utils-0.2.4.gem"; +version = "0.2.4"; +} +{ +name = "eventmachine"; +hash = "34424c87fc517f70ba137fe2281d16b53ce9c13f5cbfc2dda3ada56e96a65827"; +url = "http://rubygems.org/downloads/eventmachine-1.0.3.gem"; +version = "1.0.3"; +} +{ +name = "excon"; +hash = "aa1018571cb72248f82a9b88ab631b53179d0de0f8169957eebe512404805f79"; +url = "http://rubygems.org/downloads/excon-0.32.1.gem"; +version = "0.32.1"; +} +{ +name = "execjs"; +hash = "5a2e097ea0ae440cbbe6aebf54d83cf8596324fa85b7a725dfdb1e8afd5cf398"; +url = "http://rubygems.org/downloads/execjs-2.0.2.gem"; +version = "2.0.2"; +} +{ +name = "expression_parser"; +hash = "2b56db3cffc48c3337f4f29f5bc2374c86e7ba29acb40269c74bb55af9f868a4"; +url = "http://rubygems.org/downloads/expression_parser-0.9.0.gem"; +version = "0.9.0"; +} +{ +name = "factory_girl"; +hash = "bfa55ba5d3218c8e86adf251be79a3f936adadcae563f0d7462cfcb38802e28f"; +url = "http://rubygems.org/downloads/factory_girl-4.3.0.gem"; +version = "4.3.0"; +} +{ +name = "factory_girl_rails"; +hash = "1fe68aa430afa25807a135ac348b5157ec5b70608fb7741e598d46570df540ca"; +url = "http://rubygems.org/downloads/factory_girl_rails-4.3.0.gem"; +version = "4.3.0"; +} +{ +name = "faraday"; +hash = "289c3b5b57821b52988bdb5178d3e1149741f2bae5fbee2a80bc83feb44ba79d"; +url = "http://rubygems.org/downloads/faraday-0.8.9.gem"; +version = "0.8.9"; +} +{ +name = "faraday_middleware"; +hash = "02b37848159983ed1e4374f46f02325bf0364e8eb1e0a38839d2b4deb4889bcf"; +url = "http://rubygems.org/downloads/faraday_middleware-0.9.0.gem"; +version = "0.9.0"; +} +{ +name = "ffaker"; +hash = "18e03e1390c5bf0fc7ebf9a457fcce365b5e51e937b79c9e0c03e1191cc4f79f"; +url = "http://rubygems.org/downloads/ffaker-1.22.1.gem"; +version = "1.22.1"; +} +{ +name = "ffi"; +hash = "57977d095c1c324ac1cb134863180b34d5743fed2b6d7528adc5ec71a581e320"; +url = "http://rubygems.org/downloads/ffi-1.9.3.gem"; +version = "1.9.3"; +} +{ +name = "fog"; +hash = "ee28b0bae7004a98e139f65d8fe606d666534f4b5f96cef247bdd0374ec10b92"; +url = "http://rubygems.org/downloads/fog-1.21.0.gem"; +version = "1.21.0"; +} +{ +name = "fog-brightbox"; +hash = "7362f7497c45e7aa9621a23d4486211c90126afd86d0a5603270d88894bb2b48"; +url = "http://rubygems.org/downloads/fog-brightbox-0.0.1.gem"; +version = "0.0.1"; +} +{ +name = "fog-core"; +hash = "64e023ca8de23a0317ff3608c65068bbf722691c07a26c00752b9e51168d9df1"; +url = "http://rubygems.org/downloads/fog-core-1.21.1.gem"; +version = "1.21.1"; +} +{ +name = "fog-json"; +hash = "dcd321b42f551a9ed3a2a5d43bdfe703b7588dcac5a9e504577501ba50d52794"; +url = "http://rubygems.org/downloads/fog-json-1.0.0.gem"; +version = "1.0.0"; +} +{ +name = "font-awesome-rails"; +hash = "00ca8028187d17176a397588003c6db779ed14197dbbe28d369561ae2919dde4"; +url = "http://rubygems.org/downloads/font-awesome-rails-4.2.0.0.gem"; +version = "4.2.0.0"; +} +{ +name = "foreman"; +hash = "937e1b895042139d578936b1c099bc1989dcb7188c0f4798e79154997a941e7b"; +url = "http://rubygems.org/downloads/foreman-0.63.0.gem"; +version = "0.63.0"; +} +{ +name = "formatador"; +hash = "2238f3794fc3b5d69578fdd9bad7ea82116540a3587a67a966a39a686098f55d"; +url = "http://rubygems.org/downloads/formatador-0.2.4.gem"; +version = "0.2.4"; +} +{ +name = "gemnasium-gitlab-service"; +hash = "82b9b6ef02f625a30198cefe5fd46b8c4551ec749a320d3b56fdcd1ebef07228"; +url = "http://rubygems.org/downloads/gemnasium-gitlab-service-0.2.2.gem"; +version = "0.2.2"; +} +{ +name = "gherkin-ruby"; +hash = "9856207d67c184a07e7e35e91fd4322f89ad15704ba1f3764307f8798864f482"; +url = "http://rubygems.org/downloads/gherkin-ruby-0.3.1.gem"; +version = "0.3.1"; +} +{ +name = "github-markup"; +hash = "ef345d335058b050ecbe0f2e59450e1f6648574fa67f31b8537cdead9ea4fa1b"; +url = "http://rubygems.org/downloads/github-markup-1.1.0.gem"; +version = "1.1.0"; +} +{ +name = "gitlab-flowdock-git-hook"; +hash = "9bdb3455e46de3a6642d72a23f8f62b57669d1d0f2ea98561c653736ffe4d064"; +url = "http://rubygems.org/downloads/gitlab-flowdock-git-hook-0.4.2.2.gem"; +version = "0.4.2.2"; +} +{ +name = "gitlab-grack"; +hash = "197qdlymn6cf0qk3698kn0miizv7x9hr1429g9l900rnc85a5rdb"; +url = "https://rubygems.org/downloads/gitlab-grack-2.0.0.pre.gem"; +version = "2.0.0.pre"; +} +{ +name = "gitlab-grit"; +hash = "88996ec1e14017bfd4c70baae6e72110317704ae689f3fdb26e3bd371887cf03"; +url = "http://rubygems.org/downloads/gitlab-grit-2.6.12.gem"; +version = "2.6.12"; +} +{ +name = "gitlab-linguist"; +hash = "6652604cdf0168832ba5fe6662251f792730fbcb9253869625658cb1e8d9563c"; +url = "http://rubygems.org/downloads/gitlab-linguist-3.0.0.gem"; +version = "3.0.0"; +} +{ +name = "gitlab_emoji"; +hash = "760fc5df13080ef39bb8f06878b5b49b7206d4259471d6569fbb0e56f0821d33"; +url = "http://rubygems.org/downloads/gitlab_emoji-0.0.1.1.gem"; +version = "0.0.1.1"; +} +{ +name = "gitlab_git"; +hash = "0kjljz76wh4344z05mv3wiad7qdf6nwaa0yl1jls1j0hk9i4bb4k"; +url = "https://rubygems.org/downloads/gitlab_git-7.0.0.rc10.gem"; +version = "7.0.0.rc10"; +} +{ +name = "gitlab_meta"; +hash = "e96e1ced109b39bfcbefb30623e31c8eab4dc7d385a01bf7ba9ed1f5ce866a93"; +url = "http://rubygems.org/downloads/gitlab_meta-7.0.gem"; +version = "7.0"; +} +{ +name = "gitlab_omniauth-ldap"; +hash = "07df91c1993de0e5fa2fda845e2109e7b0bce228960bf41f770350873e82fa2e"; +url = "http://rubygems.org/downloads/gitlab_omniauth-ldap-1.1.0.gem"; +version = "1.1.0"; +} +{ +name = "gollum-lib"; +hash = "7a0896cae6d443e42b19e1353f1f900684b63109844cfdb52c48d40f2824e7a1"; +url = "http://rubygems.org/downloads/gollum-lib-3.0.0.gem"; +version = "3.0.0"; +} +{ +name = "gon"; +hash = "f593d15ba8616a0c9482b53113e03bc8a69cd0392e21f0189b2a96338837eaa5"; +url = "http://rubygems.org/downloads/gon-5.0.1.gem"; +version = "5.0.1"; +} +{ +name = "grape"; +hash = "e83ff1ae19bb2a402a75bdf81372ae31d25399ec6079f4e31d6be1572f9854ea"; +url = "http://rubygems.org/downloads/grape-0.6.1.gem"; +version = "0.6.1"; +} +{ +name = "grape-entity"; +hash = "93bc04e43bac2ab8959d66beffcac3d60e88681cb7c09de923c80a0e8fbc7b97"; +url = "http://rubygems.org/downloads/grape-entity-0.4.2.gem"; +version = "0.4.2"; +} +{ +name = "growl"; +hash = "c926f6fa77800a1cfab1c0a9e4c3608c93b5619145062cf6ba545949553d1e68"; +url = "http://rubygems.org/downloads/growl-1.0.3.gem"; +version = "1.0.3"; +} +{ +name = "guard"; +hash = "182ecf687c58d19de444a711892a44b6ef607589073f16c413c8ffcb663e827c"; +url = "http://rubygems.org/downloads/guard-2.2.4.gem"; +version = "2.2.4"; +} +{ +name = "guard-rspec"; +hash = "1631dd0b0172e528d23d92de3ad8c2903fcae195707bb18bdac023c4592a8158"; +url = "http://rubygems.org/downloads/guard-rspec-4.2.0.gem"; +version = "4.2.0"; +} +{ +name = "guard-spinach"; +hash = "2d76e05c747fc3ef163449c3f5d0b850af92bbd66f7133f3b79bfbe8a23750bb"; +url = "http://rubygems.org/downloads/guard-spinach-0.0.2.gem"; +version = "0.0.2"; +} +{ +name = "haml"; +hash = "05b1cde6e0d770e800cb74f6bf1212446bc4573bbbfecc4002e1085c2658bff6"; +url = "http://rubygems.org/downloads/haml-4.0.5.gem"; +version = "4.0.5"; +} +{ +name = "haml-rails"; +hash = "4598b9c3204a04ce27dfe5ce88f278af0a1069c7a5f2708a80c49df5026ce439"; +url = "http://rubygems.org/downloads/haml-rails-0.5.3.gem"; +version = "0.5.3"; +} +{ +name = "hashie"; +hash = "a9e1e4928bf4f5a5683ea9c7ef29e50fb93f72542f9a9550e205fe33a6568923"; +url = "http://rubygems.org/downloads/hashie-2.1.2.gem"; +version = "2.1.2"; +} +{ +name = "hike"; +hash = "154e2f2593845e5bcd8ed2ba3092600c55c6ad8c630722857de3fdaf334ccc44"; +url = "http://rubygems.org/downloads/hike-1.2.3.gem"; +version = "1.2.3"; +} +{ +name = "hipchat"; +hash = "1678c4ee7de2beacc2986792c29dbe5008b09247f1088046f02a062155896bf8"; +url = "http://rubygems.org/downloads/hipchat-0.14.0.gem"; +version = "0.14.0"; +} +{ +name = "html-pipeline"; +hash = "3461d1f709ef4812f11cc9789bdebb801813ba726e5544df3aad6c62336d93f9"; +url = "http://rubygems.org/downloads/html-pipeline-1.11.0.gem"; +version = "1.11.0"; +} +{ +name = "html-pipeline-gitlab"; +hash = "cf36fa0aded375a210d38586e023642a88585360b9fc203621a210ac8f4430be"; +url = "http://rubygems.org/downloads/html-pipeline-gitlab-0.1.5.gem"; +version = "0.1.5"; +} +{ +name = "http_parser.rb"; +hash = "d64f525eb1c580598d5bdef4fad98e948b6e016fa7803f45e13ac8714a2b8e3b"; +url = "http://rubygems.org/downloads/http_parser.rb-0.5.3.gem"; +version = "0.5.3"; +} +{ +name = "httparty"; +hash = "5c8ad1664ebd51c7bded6a96138d804549c030b413ad685b8b3940dea137aae1"; +url = "http://rubygems.org/downloads/httparty-0.13.0.gem"; +version = "0.13.0"; +} +{ +name = "httpauth"; +hash = "0d4991e48dfe46aae27ec709b896e54b7a1c402d84a4dbc93a6fe86d8353b4f9"; +url = "http://rubygems.org/downloads/httpauth-0.2.1.gem"; +version = "0.2.1"; +} +{ +name = "i18n"; +hash = "b37dda25b30484f2674a851e24ae098a38564a61c976fa91a34bf8fceaa3923b"; +url = "http://rubygems.org/downloads/i18n-0.6.11.gem"; +version = "0.6.11"; +} +{ +name = "ice_nine"; +hash = "108f7538b32819623db949583895a962f5934dcfd183e7fff8b7e6d70db04c42"; +url = "http://rubygems.org/downloads/ice_nine-0.10.0.gem"; +version = "0.10.0"; +} +{ +name = "jasmine"; +hash = "39426ce310c74f2efbe8dfae6efb3770f58687a11bb84a4115e15a528b2a1fec"; +url = "http://rubygems.org/downloads/jasmine-2.0.2.gem"; +version = "2.0.2"; +} +{ +name = "jasmine-core"; +hash = "f23bfecc48cca26fe2f81bb7b1782f1a853168f7a0c14c187a8aabec9b4d39bb"; +url = "http://rubygems.org/downloads/jasmine-core-2.0.0.gem"; +version = "2.0.0"; +} +{ +name = "jquery-atwho-rails"; +hash = "7abb6386fb377165e7ed8cb1665536f4b340c3c208400addc7441be2f10c1cb9"; +url = "http://rubygems.org/downloads/jquery-atwho-rails-0.3.3.gem"; +version = "0.3.3"; +} +{ +name = "jquery-rails"; +hash = "9d192f83aaa54196b380753cb20b42ca1ad210715063ef0fb15fac63ec430a8c"; +url = "http://rubygems.org/downloads/jquery-rails-3.1.0.gem"; +version = "3.1.0"; +} +{ +name = "jquery-scrollto-rails"; +hash = "77dbb8add00d4f1baec5f34859b992649a86a9ca054b1c2a7d3e03c3fb072c8a"; +url = "http://rubygems.org/downloads/jquery-scrollto-rails-1.4.3.gem"; +version = "1.4.3"; +} +{ +name = "jquery-turbolinks"; +hash = "6d9a82a44ddf652f74b6181e5892860cdbda3f000eb1497fa91e3dc098d9ca34"; +url = "http://rubygems.org/downloads/jquery-turbolinks-2.0.1.gem"; +version = "2.0.1"; +} +{ +name = "jquery-ui-rails"; +hash = "5b349e7066150b16d7a784183f040c083d51af3357937b8564aa0cc8b1cd59bd"; +url = "http://rubygems.org/downloads/jquery-ui-rails-4.2.1.gem"; +version = "4.2.1"; +} +{ +name = "json"; +hash = "961bfbbfa9fda1e857e9c791e964e6664e0d43bf687b19669dfbc7cdbc5e0200"; +url = "http://rubygems.org/downloads/json-1.8.1.gem"; +version = "1.8.1"; +} +{ +name = "jwt"; +hash = "5653fb76aa0b4b280624b314cd6c00a64de7cb2d61c2ab27587b434b8ad7880d"; +url = "http://rubygems.org/downloads/jwt-0.1.13.gem"; +version = "0.1.13"; +} +{ +name = "kaminari"; +hash = "6d8c87cdcd1bff99cc97436160ec31dae3228403a04169c33421c3522e7cc7d4"; +url = "http://rubygems.org/downloads/kaminari-0.15.1.gem"; +version = "0.15.1"; +} +{ +name = "kgio"; +hash = "92e59a3b97d044177b354f1434f6ebddfe50309d18d84754ab08d632a61dfc6e"; +url = "http://rubygems.org/downloads/kgio-2.8.1.gem"; +version = "2.8.1"; +} +{ +name = "launchy"; +hash = "3b22fd75759a8af480e1a7545c17e10eada3146605e1789cc162da8b33ad3644"; +url = "http://rubygems.org/downloads/launchy-2.4.2.gem"; +version = "2.4.2"; +} +{ +name = "letter_opener"; +hash = "b43060c7b223b00caa94dafe7016b424d809c83378326fbf24d041830cabebcf"; +url = "http://rubygems.org/downloads/letter_opener-1.1.2.gem"; +version = "1.1.2"; +} +{ +name = "listen"; +hash = "5549b607337a95bb3248a97660ccaa0c3eeec70e01e61b8a08d4a6c36dd93720"; +url = "http://rubygems.org/downloads/listen-2.3.1.gem"; +version = "2.3.1"; +} +{ +name = "lumberjack"; +hash = "2d85f466e25623f5c1d8476523f5e4b7903fa622007ac109fd7b560b45a846d6"; +url = "http://rubygems.org/downloads/lumberjack-1.0.4.gem"; +version = "1.0.4"; +} +{ +name = "mail"; +hash = "446585c38b062121252688dcc9cc70af1f470822e30db021bb97d185969e257c"; +url = "http://rubygems.org/downloads/mail-2.5.4.gem"; +version = "2.5.4"; +} +{ +name = "method_source"; +hash = "c2e9d0f4ebefd6b37efe38fe2964337b1d315fe198cad850681fd2da0027b1bc"; +url = "http://rubygems.org/downloads/method_source-0.8.2.gem"; +version = "0.8.2"; +} +{ +name = "mime-types"; +hash = "88ef3c596481678710ffd4018fa40f1999b02d97babea39682ba7d5badd21f56"; +url = "http://rubygems.org/downloads/mime-types-1.25.1.gem"; +version = "1.25.1"; +} +{ +name = "mini_portile"; +hash = "762b3e241362de24b2eb2bb1b98638399b931e9e51bece5f8e2df7611eb16c26"; +url = "http://rubygems.org/downloads/mini_portile-0.6.0.gem"; +version = "0.6.0"; +} +{ +name = "minitest"; +hash = "b99fb077a6ace47d496f981041395ec565b9a1a59c45a73a2edd880bb27493a2"; +url = "http://rubygems.org/downloads/minitest-5.3.5.gem"; +version = "5.3.5"; +} +{ +name = "mousetrap-rails"; +hash = "555caf5075543bb0f5bf642ea11ce02d08001ddb48041400de64667e4b1ec102"; +url = "http://rubygems.org/downloads/mousetrap-rails-1.4.6.gem"; +version = "1.4.6"; +} +{ +name = "multi_json"; +hash = "2c98979877e87df0b338ebf5c86091b390f53d62c11a8232bd51ca007e0b82d2"; +url = "http://rubygems.org/downloads/multi_json-1.10.1.gem"; +version = "1.10.1"; +} +{ +name = "multi_xml"; +hash = "08936dc294586ee1d178217cce577febe26315d7880e01e4f8e97cf2753b1945"; +url = "http://rubygems.org/downloads/multi_xml-0.5.5.gem"; +version = "0.5.5"; +} +{ +name = "multipart-post"; +hash = "ccf26a61706f128a2a3f3745aba0f79fde7b6fee068e03490eb189c2aaa5e78a"; +url = "http://rubygems.org/downloads/multipart-post-1.2.0.gem"; +version = "1.2.0"; +} +{ +name = "net-ldap"; +hash = "d39d341c992abb7273d8b83cbe32a38e69fdeb4eab684dbd2db1232e4065a4b4"; +url = "http://rubygems.org/downloads/net-ldap-0.7.0.gem"; +version = "0.7.0"; +} +{ +name = "net-scp"; +hash = "f3d8848f63f9b7670e57af2e2c308e9bd6fddb7c5440a36e892478a1e62b5977"; +url = "http://rubygems.org/downloads/net-scp-1.1.2.gem"; +version = "1.1.2"; +} +{ +name = "net-ssh"; +hash = "42f5c53fc4b8fb8c75de7c6b996613d7915e6f7387d4b5f7394fa51402500951"; +url = "http://rubygems.org/downloads/net-ssh-2.8.0.gem"; +version = "2.8.0"; +} +{ +name = "newrelic_rpm"; +hash = "36faff761a443f00d6e36502b23de96007ec007b3428215f701ac7cab9093d64"; +url = "http://rubygems.org/downloads/newrelic_rpm-3.9.4.245.gem"; +version = "3.9.4.245"; +} +{ +name = "nokogiri"; +hash = "dfb23254b87672a93582981c4ac5880d178ff32db6878fc351d75198aa544836"; +url = "http://rubygems.org/downloads/nokogiri-1.6.2.1.gem"; +version = "1.6.2.1"; +} +{ +name = "nprogress-rails"; +hash = "048ca784af666dde59940a804801f2471ad791952b2dc43cfbdb7d6cbd54f899"; +url = "http://rubygems.org/downloads/nprogress-rails-0.1.2.3.gem"; +version = "0.1.2.3"; +} +{ +name = "oauth"; +hash = "bca47d77c946af466872269e37e470837858b1305d5143e5a56c50356e02b2cc"; +url = "http://rubygems.org/downloads/oauth-0.4.7.gem"; +version = "0.4.7"; +} +{ +name = "oauth2"; +hash = "e18808a91165f22b8ce7939a216a51bb50d16a90b592347084b5112a4815f3a1"; +url = "http://rubygems.org/downloads/oauth2-0.8.1.gem"; +version = "0.8.1"; +} +{ +name = "omniauth"; +hash = "d47132daf1c59b8c97b4c51f3f2e379b5b6ae2cd9e169d0a3e46de45b335efbd"; +url = "http://rubygems.org/downloads/omniauth-1.1.4.gem"; +version = "1.1.4"; +} +{ +name = "omniauth-github"; +hash = "94b41beb49cc16b1e7c5f7a91999d867b76d84a33c9a44e5839178289b8ddac2"; +url = "http://rubygems.org/downloads/omniauth-github-1.1.1.gem"; +version = "1.1.1"; +} +{ +name = "omniauth-google-oauth2"; +hash = "1c11a1c330f91a9a77e5c51b7f1b378aa8b06b548a3bc1545056cee28360ebdd"; +url = "http://rubygems.org/downloads/omniauth-google-oauth2-0.2.5.gem"; +version = "0.2.5"; +} +{ +name = "omniauth-oauth"; +hash = "9f1bfb30fe6ba823935330d2036e08a5406e980f1e20c9b1271b82ee34fbe759"; +url = "http://rubygems.org/downloads/omniauth-oauth-1.0.1.gem"; +version = "1.0.1"; +} +{ +name = "omniauth-oauth2"; +hash = "72b8ba77b9ead4320e7f4e430aee0f3ef759aed79ae52c3b0e8fb2f41785eb68"; +url = "http://rubygems.org/downloads/omniauth-oauth2-1.1.1.gem"; +version = "1.1.1"; +} +{ +name = "omniauth-shibboleth"; +hash = "b0a92a0bc1e47d96c70f1bec982425c73029725da331dcda2022af762b929276"; +url = "http://rubygems.org/downloads/omniauth-shibboleth-1.1.1.gem"; +version = "1.1.1"; +} +{ +name = "omniauth-twitter"; +hash = "cd110801549953505a6152ae1426956785aca0cb749ff82835e8d49898b30f18"; +url = "http://rubygems.org/downloads/omniauth-twitter-1.0.1.gem"; +version = "1.0.1"; +} +{ +name = "org-ruby"; +hash = "ea272d4c7d0ac0310c8bb58ac503ca04c5180ca5c64642be0c96569d514327e5"; +url = "http://rubygems.org/downloads/org-ruby-0.9.9.gem"; +version = "0.9.9"; +} +{ +name = "orm_adapter"; +hash = "aa5d0be5d540cbb46d3a93e88061f4ece6a25f6e97d6a47122beb84fe595e9b9"; +url = "http://rubygems.org/downloads/orm_adapter-0.5.0.gem"; +version = "0.5.0"; +} +{ +name = "pg"; +hash = "ba6827400e0614f8fd464543f6e10b307aadef58c59280c6560e6f2548599ed3"; +url = "http://rubygems.org/downloads/pg-0.15.1.gem"; +version = "0.15.1"; +} +{ +name = "phantomjs"; +hash = "42f3d5b561832a383076c1d49720ed4d2711f29acb85c701a07015b412436f33"; +url = "http://rubygems.org/downloads/phantomjs-1.9.2.0.gem"; +version = "1.9.2.0"; +} +{ +name = "poltergeist"; +hash = "db4580c0197729b1e7d2cc872ab3d1c5d98b759ac67720c0ba77fbc8752a6a23"; +url = "http://rubygems.org/downloads/poltergeist-1.5.1.gem"; +version = "1.5.1"; +} +{ +name = "polyglot"; +hash = "05409d9f736e1fd39635f8700b24e1156ae8e308e785d5d0f939c603fd529649"; +url = "http://rubygems.org/downloads/polyglot-0.3.4.gem"; +version = "0.3.4"; +} +{ +name = "posix-spawn"; +hash = "634746d6f090c1b15d2f92fa90c5ed4868e59c8752ca56a5d83af8f79c0a5110"; +url = "http://rubygems.org/downloads/posix-spawn-0.3.9.gem"; +version = "0.3.9"; +} +{ +name = "pry"; +hash = "3a521a98344c62096561773ab5b831f862432bc40ce3798bbbdead1c7f86b159"; +url = "http://rubygems.org/downloads/pry-0.9.12.4.gem"; +version = "0.9.12.4"; +} +{ +name = "pyu-ruby-sasl"; +hash = "5683a6bc5738db5a1bf5ceddeaf545405fb241b4184dd4f2587e679a7e9497e5"; +url = "http://rubygems.org/downloads/pyu-ruby-sasl-0.0.3.3.gem"; +version = "0.0.3.3"; +} +{ +name = "quiet_assets"; +hash = "3fbc8728462a42d58cd9101b0ad8a240d3cb90a248d5d4072af432fa946a2fa8"; +url = "http://rubygems.org/downloads/quiet_assets-1.0.2.gem"; +version = "1.0.2"; +} +{ +name = "racc"; +hash = "6282f61f123f4e1d39bac5ad19027e34c336a5e1d80f9e4769c80b16db11b583"; +url = "http://rubygems.org/downloads/racc-1.4.10.gem"; +version = "1.4.10"; +} +{ +name = "rack"; +hash = "e64af00234e8faaa69ea81ef4e3800f40743c69560f0dda8fc9969660e775fa7"; +url = "http://rubygems.org/downloads/rack-1.5.2.gem"; +version = "1.5.2"; +} +{ +name = "rack-accept"; +hash = "66247b5449db64ebb93ae2ec4af4764b87d1ae8a7463c7c68893ac13fa8d4da2"; +url = "http://rubygems.org/downloads/rack-accept-0.4.5.gem"; +version = "0.4.5"; +} +{ +name = "rack-attack"; +hash = "f910e5d0a54b7cc7e086bf111481a0e455260caf8184a33bbb9e96f8064ef49c"; +url = "http://rubygems.org/downloads/rack-attack-2.3.0.gem"; +version = "2.3.0"; +} +{ +name = "rack-cors"; +hash = "5a256bda2673c7bbba014587b1f93fd2e6fd80b7ac9804a0f90665add6ba087d"; +url = "http://rubygems.org/downloads/rack-cors-0.2.9.gem"; +version = "0.2.9"; +} +{ +name = "rack-mini-profiler"; +hash = "1c77870679e17b54c5657ce3e15a3b7f54813844c4ab3ff292181f2904d1404b"; +url = "http://rubygems.org/downloads/rack-mini-profiler-0.9.0.gem"; +version = "0.9.0"; +} +{ +name = "rack-mount"; +hash = "a25100725157aea263dcea4f75aaab4e23922dc0e09fffd60c94eade95c34125"; +url = "http://rubygems.org/downloads/rack-mount-0.8.3.gem"; +version = "0.8.3"; +} +{ +name = "rack-protection"; +hash = "ad8d7e99b47418e1361ae8aaa0a8591671c8065b958bcedaef92da121a2db863"; +url = "http://rubygems.org/downloads/rack-protection-1.5.1.gem"; +version = "1.5.1"; +} +{ +name = "rack-test"; +hash = "7e920b6aac888e4a3846e5997fb1cbf456bdb5846322b58dc31697a54a38b306"; +url = "http://rubygems.org/downloads/rack-test-0.6.2.gem"; +version = "0.6.2"; +} +{ +name = "rails"; +hash = "602275642419e731637c91421cf498f2994c2d9f1b94f6c713f3b7b8757b2aa5"; +url = "http://rubygems.org/downloads/rails-4.1.1.gem"; +version = "4.1.1"; +} +{ +name = "rails_autolink"; +hash = "384c17bee71ca5dc44f49401762f91abb6bc356dd564f380713fc974d2c25671"; +url = "http://rubygems.org/downloads/rails_autolink-1.1.6.gem"; +version = "1.1.6"; +} +{ +name = "rails_best_practices"; +hash = "859371ff63fcfe6a33e7012ce3e18df0c0f00579520c684a544dccfd33c7c691"; +url = "http://rubygems.org/downloads/rails_best_practices-1.14.4.gem"; +version = "1.14.4"; +} +{ +name = "railties"; +hash = "0cef786bd54741f6b6c2ff0bfb769a200222f7e8928b93caf61f87c7325f8ee6"; +url = "http://rubygems.org/downloads/railties-4.1.1.gem"; +version = "4.1.1"; +} +{ +name = "raindrops"; +hash = "2077f24017dad9637bc4e20e77f3cc533054190516e9e330476678e3cc7a689a"; +url = "http://rubygems.org/downloads/raindrops-0.12.0.gem"; +version = "0.12.0"; +} +{ +name = "rake"; +hash = "b504ad9d610b85ef0856a4771d024e4a66656c63a17121a3ed1d4d7db39c775b"; +url = "http://rubygems.org/downloads/rake-10.3.2.gem"; +version = "10.3.2"; +} +{ +name = "raphael-rails"; +hash = "6c89daf65f82621f7ff59948db1db0ca2f41422ceadf905ba18a58b7ab57516a"; +url = "http://rubygems.org/downloads/raphael-rails-2.1.2.gem"; +version = "2.1.2"; +} +{ +name = "rb-fsevent"; +hash = "e1aed0fa5b42f74ecc1321dd807296d688b0f4fada96e87a9b2113d91befb62d"; +url = "http://rubygems.org/downloads/rb-fsevent-0.9.3.gem"; +version = "0.9.3"; +} +{ +name = "rb-inotify"; +hash = "3b1e16da8b00849dfa3c6348cc6df6888a2d35d2bf432bc50267f4ec1e74a21c"; +url = "http://rubygems.org/downloads/rb-inotify-0.9.2.gem"; +version = "0.9.2"; +} +{ +name = "rdoc"; +hash = "a8e2b78f7e5ec4cc4716cd863975645f2f2377dc6db267a15e427e5fae2633ed"; +url = "http://rubygems.org/downloads/rdoc-3.12.2.gem"; +version = "3.12.2"; +} +{ +name = "redcarpet"; +hash = "ff5397c2b0d1344f065d07e58ed157f5bc25b49d44e723348620693ba928d71c"; +url = "http://rubygems.org/downloads/redcarpet-3.1.2.gem"; +version = "3.1.2"; +} +{ +name = "redis"; +hash = "e3c8203afbfb9e0cfe915a0610f6795e02ba2298e72e9326076eed2c048142c1"; +url = "http://rubygems.org/downloads/redis-3.0.6.gem"; +version = "3.0.6"; +} +{ +name = "redis-actionpack"; +hash = "e49029df46b15434591962cc004a1f0b07ab11276e00fd53ec835b85c7064d55"; +url = "http://rubygems.org/downloads/redis-actionpack-4.0.0.gem"; +version = "4.0.0"; +} +{ +name = "redis-activesupport"; +hash = "cd802d06716638fb000e209a769f1a3932285c8ba2b328aa0c501f0999fcb4a2"; +url = "http://rubygems.org/downloads/redis-activesupport-4.0.0.gem"; +version = "4.0.0"; +} +{ +name = "redis-namespace"; +hash = "c7c119c0a8c3876b7d7f0dc0ae2e3343352f1dfc6d978c9711b63b58518a6639"; +url = "http://rubygems.org/downloads/redis-namespace-1.4.1.gem"; +version = "1.4.1"; +} +{ +name = "redis-rack"; +hash = "68be24901183f1973059e837b1acc421cebd34766753ca6f6e7902fb50ef35f8"; +url = "http://rubygems.org/downloads/redis-rack-1.5.0.gem"; +version = "1.5.0"; +} +{ +name = "redis-rails"; +hash = "a7224c9a7c9bfc9d6080a0418b3c290b9d27ff88b481022b3958a1b2e0e1fc45"; +url = "http://rubygems.org/downloads/redis-rails-4.0.0.gem"; +version = "4.0.0"; +} +{ +name = "redis-store"; +hash = "9fb47e5dbc6bce6ab4206899f49c6ee8d4a0c6d4830bb0f042ea49df72804249"; +url = "http://rubygems.org/downloads/redis-store-1.1.4.gem"; +version = "1.1.4"; +} +{ +name = "request_store"; +hash = "70adb9485eb22113bd165e259b929a449dfe2d2410a880566f06df6a164fc1cf"; +url = "http://rubygems.org/downloads/request_store-1.0.5.gem"; +version = "1.0.5"; +} +{ +name = "require_all"; +hash = "1d4e5729811a1d976916465b64c508481c7fe229bc1ca88c8b1665ad4c46809a"; +url = "http://rubygems.org/downloads/require_all-1.3.2.gem"; +version = "1.3.2"; +} +{ +name = "rest-client"; +hash = "a3203433b8b0c914648caea54395a8791a61e0df7d401c81f4e2b7f8a8fac75a"; +url = "http://rubygems.org/downloads/rest-client-1.6.7.gem"; +version = "1.6.7"; +} +{ +name = "rinku"; +hash = "eb5cec33af86da3002e66470d9a741a0726d6864a69b580abc798931b4b706ca"; +url = "http://rubygems.org/downloads/rinku-1.7.3.gem"; +version = "1.7.3"; +} +{ +name = "rouge"; +hash = "b41278cf37dcef392e1d195519b482f03d1b80878837926a8322c7db9cef0251"; +url = "http://rubygems.org/downloads/rouge-1.3.3.gem"; +version = "1.3.3"; +} +{ +name = "rspec"; +hash = "4f9fc6c58696faa22571ca80d710fd0e4f30eaeb700155968d36df303f279e8c"; +url = "http://rubygems.org/downloads/rspec-2.14.1.gem"; +version = "2.14.1"; +} +{ +name = "rspec-core"; +hash = "e714621feb592e515c3ca19a685505af1c2bbb2d713b85c0610ab80985624348"; +url = "http://rubygems.org/downloads/rspec-core-2.14.7.gem"; +version = "2.14.7"; +} +{ +name = "rspec-expectations"; +hash = "3cb74fd8427a56321ca09e598f2db509231bae0996800b12f30084d7c3882f3a"; +url = "http://rubygems.org/downloads/rspec-expectations-2.14.4.gem"; +version = "2.14.4"; +} +{ +name = "rspec-mocks"; +hash = "e745b215de211099681d3b128fc8af15616eb19101bdd76da47dca1c1dd86b8b"; +url = "http://rubygems.org/downloads/rspec-mocks-2.14.4.gem"; +version = "2.14.4"; +} +{ +name = "rspec-rails"; +hash = "6ee4375e977d03ca4945fd5d79debfa72239f7f35f3de9a162ab4adcd4d735e9"; +url = "http://rubygems.org/downloads/rspec-rails-2.14.0.gem"; +version = "2.14.0"; +} +{ +name = "ruby-progressbar"; +hash = "94265728146504d311c3d6a3c040fc4d45ada6fc9bf42b58dbef208c6cc97d9b"; +url = "http://rubygems.org/downloads/ruby-progressbar-1.2.0.gem"; +version = "1.2.0"; +} +{ +name = "rubyntlm"; +hash = "a07b9bacc0cf531c76d4f71ed0813b4055fe881447aede2bc7cd7e89ec808870"; +url = "http://rubygems.org/downloads/rubyntlm-0.1.1.gem"; +version = "0.1.1"; +} +{ +name = "rubypants"; +hash = "f07e38eac793655a0323fe91946081052341b9e69807026fcf102346589eedee"; +url = "http://rubygems.org/downloads/rubypants-0.2.0.gem"; +version = "0.2.0"; +} +{ +name = "rugged"; +hash = "e536ec53d7f08109960e159e5401e682dd03f6ab386f84f93ef71e1968817529"; +url = "http://rubygems.org/downloads/rugged-0.21.0.gem"; +version = "0.21.0"; +} +{ +name = "safe_yaml"; +hash = "139285ff8e70413d2a3721da4e742c736b4948682f0b80330a353e34d5dd6478"; +url = "http://rubygems.org/downloads/safe_yaml-0.9.7.gem"; +version = "0.9.7"; +} +{ +name = "sanitize"; +hash = "c3be075f5b38a1b02404be5778b181e50fba9ab253bac851cb217d9a71375b77"; +url = "http://rubygems.org/downloads/sanitize-2.1.0.gem"; +version = "2.1.0"; +} +{ +name = "sass"; +hash = "ddcd7d76d98daa8f3ebbaec196972500a6cf6e854f9c328fcfc9aa556f29bfac"; +url = "http://rubygems.org/downloads/sass-3.2.19.gem"; +version = "3.2.19"; +} +{ +name = "sass-rails"; +hash = "b57665f95f63f063137e365d3e8a1c6d1340ec892d875aeeab93fb60e13f2ec8"; +url = "http://rubygems.org/downloads/sass-rails-4.0.3.gem"; +version = "4.0.3"; +} +{ +name = "sdoc"; +hash = "c2f54086862252f487e0c4b05fc46d8659a4dba6deb2ad0a24ff9046c1c4889e"; +url = "http://rubygems.org/downloads/sdoc-0.3.20.gem"; +version = "0.3.20"; +} +{ +name = "seed-fu"; +hash = "eb09cfeb574f46a22b313e38fe7d4ae6bf2c6a57554d3f157778756b58bc81db"; +url = "http://rubygems.org/downloads/seed-fu-2.3.1.gem"; +version = "2.3.1"; +} +{ +name = "select2-rails"; +hash = "dcae2d6f92f94975080c14bee21a2b9745675135824f7ec298a9c94e329e9f7e"; +url = "http://rubygems.org/downloads/select2-rails-3.5.2.gem"; +version = "3.5.2"; +} +{ +name = "semantic-ui-sass"; +hash = "54a9f7c3ac28203f91e99f4f929c2851356796e3d7d2de3468ff060528db71a1"; +url = "http://rubygems.org/downloads/semantic-ui-sass-0.16.1.0.gem"; +version = "0.16.1.0"; +} +{ +name = "settingslogic"; +hash = "5925a91d0d48dfb59a6e48ae2bb9c9b801fe6fab25a8e8d302ce8699d92f2ae6"; +url = "http://rubygems.org/downloads/settingslogic-2.0.9.gem"; +version = "2.0.9"; +} +{ +name = "sexp_processor"; +hash = "71591ddbda99b5e12e4a46d377c87513850ca7aa4b1aa800ae02792cadee6be7"; +url = "http://rubygems.org/downloads/sexp_processor-4.4.0.gem"; +version = "4.4.0"; +} +{ +name = "shoulda-matchers"; +hash = "da4ce8e10970a5dfa88d30b7be06dbef87caf2aca4508343b31a59c434449fc6"; +url = "http://rubygems.org/downloads/shoulda-matchers-2.1.0.gem"; +version = "2.1.0"; +} +{ +name = "sidekiq"; +hash = "81c57e05311c7176e8e71373cf78874c9365f00ed40b9fd1a969863e56a10c53"; +url = "http://rubygems.org/downloads/sidekiq-2.17.0.gem"; +version = "2.17.0"; +} +{ +name = "simple_oauth"; +hash = "723f19781f5562182e075a0f31bca11a955962d933064abb23bce98ed035602d"; +url = "http://rubygems.org/downloads/simple_oauth-0.1.9.gem"; +version = "0.1.9"; +} +{ +name = "simplecov"; +hash = "4f205752a4f3730fd4c58678bbab4c83f4e2a6ca3bbea4cdf18cd86a70589eb7"; +url = "http://rubygems.org/downloads/simplecov-0.9.0.gem"; +version = "0.9.0"; +} +{ +name = "simplecov-html"; +hash = "69393ce932c2898dd5074913e360078f651f094a9b7300b286a78f43b11c164a"; +url = "http://rubygems.org/downloads/simplecov-html-0.8.0.gem"; +version = "0.8.0"; +} +{ +name = "sinatra"; +hash = "1a16a552d559be0fff6cefd2c84c1fecafcc54668fba540e99fe8f2692033e8a"; +url = "http://rubygems.org/downloads/sinatra-1.4.4.gem"; +version = "1.4.4"; +} +{ +name = "six"; +hash = "83c73d4aa60ff76172ec257f45b098c66f7a8b89883bcaaec42517287dbc0aae"; +url = "http://rubygems.org/downloads/six-0.2.0.gem"; +version = "0.2.0"; +} +{ +name = "slack-notifier"; +hash = "64166343518084e3b1cdf03bb49ff42469dae8aab868fafa001c9f6a4f8d4604"; +url = "http://rubygems.org/downloads/slack-notifier-0.3.2.gem"; +version = "0.3.2"; +} +{ +name = "slim"; +hash = "07cdf67f971b99a360c9ded6ea70ae5351e1236182997dff8118ef5ea242a7ea"; +url = "http://rubygems.org/downloads/slim-2.0.2.gem"; +version = "2.0.2"; +} +{ +name = "slop"; +hash = "568b7d1d48d675ce2778e5fd1b9de56ff754e3eb4b589e4918f2cf8d25e56df4"; +url = "http://rubygems.org/downloads/slop-3.4.7.gem"; +version = "3.4.7"; +} +{ +name = "spinach"; +hash = "a43718a977de8c2bb0fd952af23d56a69c046d28dac687057405c7301ccfdf0c"; +url = "http://rubygems.org/downloads/spinach-0.8.7.gem"; +version = "0.8.7"; +} +{ +name = "spinach-rails"; +hash = "e0d045ae1266f46549570c148d1696ac7d4baa518f8b974a7c8ed949bd63cad9"; +url = "http://rubygems.org/downloads/spinach-rails-0.2.1.gem"; +version = "0.2.1"; +} +{ +name = "spring"; +hash = "92aa8cf28fec20b0f760e2cf8efd1990be2c30c2e79167cdd19e8344420b72c5"; +url = "http://rubygems.org/downloads/spring-1.1.3.gem"; +version = "1.1.3"; +} +{ +name = "spring-commands-rspec"; +hash = "61d75e234afd79f247942dca387c3a7fffc0de9527f16aea4d5fdd66fd82cffc"; +url = "http://rubygems.org/downloads/spring-commands-rspec-1.0.1.gem"; +version = "1.0.1"; +} +{ +name = "spring-commands-spinach"; +hash = "694fbf041b5f357bd29fab2ff44013f42e894bf1af498bcce726498f5b56128d"; +url = "http://rubygems.org/downloads/spring-commands-spinach-1.0.0.gem"; +version = "1.0.0"; +} +{ +name = "sprockets"; +hash = "b06a4a66a74cce8a3dbd53a9078c9b71b94f5652a6fe92809f28786d8fcd5920"; +url = "http://rubygems.org/downloads/sprockets-2.11.0.gem"; +version = "2.11.0"; +} +{ +name = "sprockets-rails"; +hash = "9e134d28c4d05f86f3c8ebcdecd50ec060bd33e8bdcb6461cfcf0f2b77f26d8a"; +url = "http://rubygems.org/downloads/sprockets-rails-2.1.3.gem"; +version = "2.1.3"; +} +{ +name = "stamp"; +hash = "1ad6622d000cd390b9b523eb9270fc902abd24a685ce0c73529f344d6a9fa4f0"; +url = "http://rubygems.org/downloads/stamp-0.5.0.gem"; +version = "0.5.0"; +} +{ +name = "state_machine"; +hash = "80fcddc91976baec8713c37c28b5bc0655f5f2e0a1412a1a4a3aac41082cc2ed"; +url = "http://rubygems.org/downloads/state_machine-1.2.0.gem"; +version = "1.2.0"; +} +{ +name = "stringex"; +hash = "dbd556b4b59d994de64c8fa91ef959667338d840b814fc72531f8253dbba179d"; +url = "http://rubygems.org/downloads/stringex-2.5.1.gem"; +version = "2.5.1"; +} +{ +name = "temple"; +hash = "3374f339c3b54611538b9811c0c46db8e06b48ed212db741cd7f52baf59caa26"; +url = "http://rubygems.org/downloads/temple-0.6.7.gem"; +version = "0.6.7"; +} +{ +name = "term-ansicolor"; +hash = "b9534713ba4c2a48f2291fadf9ce2edae9f2dc96157ee812fe8fe16a70c081ac"; +url = "http://rubygems.org/downloads/term-ansicolor-1.2.2.gem"; +version = "1.2.2"; +} +{ +name = "test_after_commit"; +hash = "8be009b5b7dd8f6e712ea92a079625b9a84f9a010ef2d5d5e44bcd45c353fa8f"; +url = "http://rubygems.org/downloads/test_after_commit-0.2.2.gem"; +version = "0.2.2"; +} +{ +name = "thin"; +hash = "a0b80e1632d3529a5c4b87e07d9ab146e0dde5e506c20f3a740fe8b364d5bd18"; +url = "http://rubygems.org/downloads/thin-1.6.1.gem"; +version = "1.6.1"; +} +{ +name = "thor"; +hash = "9ff834f031b5550c743bb8a3139317fefdae9cdebd02d60de376658f427fe522"; +url = "http://rubygems.org/downloads/thor-0.19.1.gem"; +version = "0.19.1"; +} +{ +name = "thread_safe"; +hash = "16315baa971c48d00104bcd35e8934e3f9ccfd3b8f429e3fca7ee2dfd81734b2"; +url = "http://rubygems.org/downloads/thread_safe-0.3.4.gem"; +version = "0.3.4"; +} +{ +name = "tilt"; +hash = "39820562c4f5db45fe18de87ccc30a0e77a998bf5334b1d8c10a2f7dbc1f5903"; +url = "http://rubygems.org/downloads/tilt-1.4.1.gem"; +version = "1.4.1"; +} +{ +name = "timers"; +hash = "3bbb9651a73e43e47950a5e13a7fa62f852cd5c46e421bb671e9ade1fbb47b74"; +url = "http://rubygems.org/downloads/timers-1.1.0.gem"; +version = "1.1.0"; +} +{ +name = "tinder"; +hash = "0b06fd2a72ed424e82b1896852dd9ebb10791ef6ab8412e74ad2fa9069f6bd47"; +url = "http://rubygems.org/downloads/tinder-1.9.3.gem"; +version = "1.9.3"; +} +{ +name = "tins"; +hash = "c53bf237462be8d61cfa2a5f4b48f372d010825b0dc594c952d9857fe4c3ef30"; +url = "http://rubygems.org/downloads/tins-0.13.1.gem"; +version = "0.13.1"; +} +{ +name = "treetop"; +hash = "ffa68f201c0f62c26b0a1d13233d73194400596964696843f87ebb5d812f12ff"; +url = "http://rubygems.org/downloads/treetop-1.4.15.gem"; +version = "1.4.15"; +} +{ +name = "turbolinks"; +hash = "d92fd8f1627a6eadfaa39b76da83c257181e786557f54859d81ab2b08d73e8ff"; +url = "http://rubygems.org/downloads/turbolinks-2.0.0.gem"; +version = "2.0.0"; +} +{ +name = "twitter-stream"; +hash = "3866afdfbdf083e773b46afb3037ff3e3b1ebf8014ab88353153daddc70b4847"; +url = "http://rubygems.org/downloads/twitter-stream-0.1.16.gem"; +version = "0.1.16"; +} +{ +name = "tzinfo"; +hash = "fdb1d3fdf2776d490c82a0e589a08e7cbde70ac1ae7d2b1f0b7e77f3e6b801b0"; +url = "http://rubygems.org/downloads/tzinfo-1.2.2.gem"; +version = "1.2.2"; +} +{ +name = "uglifier"; +hash = "5e942f02d11d9e4f6e18aa84cfd909e569fe887b12c3ecf66d92e8cf4162acf0"; +url = "http://rubygems.org/downloads/uglifier-2.3.2.gem"; +version = "2.3.2"; +} +{ +name = "underscore-rails"; +hash = "e229a9668f799ea169616fa59da3f6cf48f259d9c1dd2ef52ff2a151bd6be3f5"; +url = "http://rubygems.org/downloads/underscore-rails-1.4.4.gem"; +version = "1.4.4"; +} +{ +name = "unf"; +hash = "4999517a531f2a955750f8831941891f6158498ec9b6cb1c81ce89388e63022e"; +url = "http://rubygems.org/downloads/unf-0.1.4.gem"; +version = "0.1.4"; +} +{ +name = "unf_ext"; +hash = "afcdba30a57665a4540c5d43b2833c6a3677a3296428fa70fbd7b4c8feaceb1f"; +url = "http://rubygems.org/downloads/unf_ext-0.0.6.gem"; +version = "0.0.6"; +} +{ +name = "unicorn"; +hash = "fd0b12148a24acfd8bf28a0322e4116061e64e271253e077999e4ec531a74966"; +url = "http://rubygems.org/downloads/unicorn-4.6.3.gem"; +version = "4.6.3"; +} +{ +name = "unicorn-worker-killer"; +hash = "6d2819347c514ff65bcdbda745a416a2c93e18e90e1e347c6f4931e7b1a6c78b"; +url = "http://rubygems.org/downloads/unicorn-worker-killer-0.4.2.gem"; +version = "0.4.2"; +} +{ +name = "version_sorter"; +hash = "aeeae527de4fb3146bbdaa9283f3fb087fedbe0cee80645c12d1970fe4947873"; +url = "http://rubygems.org/downloads/version_sorter-1.1.0.gem"; +version = "1.1.0"; +} +{ +name = "virtus"; +hash = "03d81d65377a603894b058c0ee78130dda1c3e6d56918d40444f11dba5d644a6"; +url = "http://rubygems.org/downloads/virtus-1.0.1.gem"; +version = "1.0.1"; +} +{ +name = "warden"; +hash = "97769e5b5d230fec4f77e91b1116b28fdd27428f4acab68dc5ed025af9d37f7a"; +url = "http://rubygems.org/downloads/warden-1.2.3.gem"; +version = "1.2.3"; +} +{ +name = "webmock"; +hash = "89e8ced0a58bcf68bec818f901ce966b4f8938dd20b101044bd6408589a957f8"; +url = "http://rubygems.org/downloads/webmock-1.16.0.gem"; +version = "1.16.0"; +} +{ +name = "websocket-driver"; +hash = "4e9a04c1e370dada829738ee1433a98e6721e7fa83b98fceef089fe6bce97638"; +url = "http://rubygems.org/downloads/websocket-driver-0.3.3.gem"; +version = "0.3.3"; +} +{ +name = "wikicloth"; +hash = "7ac8a9ca0a948cf472851e521afc6c2a6b04a8f91ef1d824ba6a61ffbd60e6ca"; +url = "http://rubygems.org/downloads/wikicloth-0.8.1.gem"; +version = "0.8.1"; +} +{ +name = "xpath"; +hash = "9ca4a1cc88d9ab16c591468cce7b5d00ee06a8a76b841f8438970c7a44c86c12"; +url = "http://rubygems.org/downloads/xpath-2.0.0.gem"; +version = "2.0.0"; +} +] diff --git a/pkgs/applications/version-management/gitlab/README b/pkgs/applications/version-management/gitlab/README new file mode 100644 index 00000000000..cd8d4748e70 --- /dev/null +++ b/pkgs/applications/version-management/gitlab/README @@ -0,0 +1,5 @@ +to regenerate Gemfile.nix and Gemfile.lock you need to + + % nix-build bootstrap.nix + % cp result/Gemfile.nix ./ + % cp result/Gemfile.lock ./ diff --git a/pkgs/applications/version-management/gitlab/bootstrap.nix b/pkgs/applications/version-management/gitlab/bootstrap.nix new file mode 100644 index 00000000000..a983ede333a --- /dev/null +++ b/pkgs/applications/version-management/gitlab/bootstrap.nix @@ -0,0 +1,45 @@ +{ pkgs ? import {} +}: + +with pkgs; + +let + +in stdenv.mkDerivation rec { + version = "7.4.2"; + name = "gitlab-${version}"; + __noChroot = true; + src = fetchurl { + url = "https://github.com/gitlabhq/gitlabhq/archive/v${version}.zip"; + sha256 = "01iplkpa4scr0wcap6vjrc960dj15z4ciclaqswj0sz5hrp9glw6"; + }; + buildInputs = [ + ruby rubyLibs.bundler libiconv libxslt libxml2 pkgconfig + libffi postgresql which stdenv unzip + ]; + installPhase = '' + unset http_proxy + unset ftp_proxy + + cp -R . $out + cp ${./generate_nix_requirements.rb} $out/generate_nix_requirements.rb + cd $out + + cat > config/database.yml < config/database.yml < + password: <%= ENV["GITLAB_DATABASE_PASSWORD"] || "blerg" %> + username: gitlab + encoding: utf8 + EOF + + mkdir -p vendor/cache + ${stdenv.lib.concatStrings (map (gem: "ln -s ${gem} vendor/cache/${gem.name};") gemspec)} + + cp ${./Gemfile.lock} Gemfile.lock + substituteInPlace Gemfile --replace 'gem "therubyracer"' "" + + bundle config build.nokogiri \ + --use-system-libraries \ + --with-xslt-dir=${libxslt} \ + --with-xml2-dir=${libxml2} \ + --with-pkg-config=${pkgconfig}/bin/pkg-config \ + --with-pg-config=${postgresql}/bin/pg_config + + # See https://github.com/gitlabhq/gitlab-public-wiki/wiki/Trouble-Shooting-Guide: + bundle install -j4 --verbose --local --deployment --without development test mysql + + # Fix timezone data directory + substituteInPlace $out/share/gitlab/vendor/bundle/ruby/*/gems/tzinfo-*/lib/tzinfo/zoneinfo_data_source.rb \ + --replace "/etc/zoneinfo" "${tzdata}/share/zoneinfo" + + # For reasons I don't understand "bundle exec" ignores the + # RAILS_ENV causing tests to be executed that fail because we're + # not installing development and test gems above. Deleting the + # tests works though.: + rm $out/share/gitlab/lib/tasks/test.rake + + # Assets + bundle exec rake assets:precompile RAILS_ENV=production + ''; + + meta = with stdenv.lib; { + homepage = http://www.gitlab.com/; + platforms = platforms.linux; + maintainers = [ ]; + license = licenses.mit; + }; +} diff --git a/pkgs/applications/version-management/gitlab/generate_nix_requirements.rb b/pkgs/applications/version-management/gitlab/generate_nix_requirements.rb new file mode 100755 index 00000000000..ed47d52c9c1 --- /dev/null +++ b/pkgs/applications/version-management/gitlab/generate_nix_requirements.rb @@ -0,0 +1,56 @@ +#!/usr/bin/env ruby + +require 'rubygems' +require 'bundler' +require 'fileutils' +require 'net/http' +require 'net/https' +require 'uri' + +TMP_DIR = "/tmp/gems" + +FileUtils.rm_rf(TMP_DIR) if File.exists?(TMP_DIR) +FileUtils.mkdir TMP_DIR + +GEMSERVER = "http://rubygems.org" + +# inspect Gemfile.lock +lockfile = Bundler::LockfileParser.new(Bundler.read_file("Gemfile.lock")) + +to_mirror = {} + +uri = URI(GEMSERVER) +http = Net::HTTP.new(uri.host, uri.port) +http.use_ssl = uri.scheme == 'https' + +requirements = {} + +lockfile.specs.each do |s| + possible_gem_name = "#{s.name}-#{s.version.to_s}.gem" + + Dir.chdir TMP_DIR do + filename = `gem fetch #{s.name} -v #{s.version.to_s}`.split()[1] + hash = `sha256sum #{filename}.gem` + url = "#{GEMSERVER}/downloads/#{filename}.gem" + puts url + requirements[s.name] = { :version => s.version.to_s, + :hash => hash.split().first, + :url => url,} + + end +end + +filename = 'Gemfile.nix' + +File.open(filename, 'w') do |file| + file.puts "[" + requirements.each do |name, info| + file.puts "{" + file.puts ['name = ', '"', name, '";'].join('') + file.puts ['hash = ', '"', info[:hash], '";'].join('') + file.puts ['url = ', '"', info[:url], '";'].join('') + file.puts ['version = ', '"', info[:version], '";'].join('') + file.puts "}" + end + file.puts "]" +end diff --git a/pkgs/applications/version-management/gitlab/remove-hardcoded-locations.patch b/pkgs/applications/version-management/gitlab/remove-hardcoded-locations.patch new file mode 100644 index 00000000000..f5532bbd67c --- /dev/null +++ b/pkgs/applications/version-management/gitlab/remove-hardcoded-locations.patch @@ -0,0 +1,109 @@ +diff --git a/config/environments/production.rb b/config/environments/production.rb +index 78bf543..9b37122 100644 +--- a/config/environments/production.rb ++++ b/config/environments/production.rb +@@ -66,10 +66,10 @@ Gitlab::Application.configure do + + config.action_mailer.delivery_method = :sendmail + # Defaults to: +- # # config.action_mailer.sendmail_settings = { +- # # location: '/usr/sbin/sendmail', +- # # arguments: '-i -t' +- # # } ++ config.action_mailer.sendmail_settings = { ++ location: '/var/setuid-wrappers/sendmail', ++ arguments: '-i -t' ++ } + config.action_mailer.perform_deliveries = true + config.action_mailer.raise_delivery_errors = true + +diff --git a/config/gitlab.yml.example b/config/gitlab.yml.example +index e7a8d08..834ecaf 100644 +--- a/config/gitlab.yml.example ++++ b/config/gitlab.yml.example +@@ -17,8 +17,8 @@ production: &base + ## GitLab settings + gitlab: + ## Web server settings (note: host is the FQDN, do not include http://) +- host: localhost +- port: 80 # Set to 443 if using HTTPS, see installation.md#using-https for additional HTTPS configuration details ++ host: <%= ENV['GITLAB_HOST'] || 'localhost' %> ++ port: <%= ENV['GITLAB_PORT'] || 80 %> + https: false # Set to true if using HTTPS, see installation.md#using-https for additional HTTPS configuration details + + # Uncommment this line below if your ssh host is different from HTTP/HTTPS one +@@ -31,11 +31,11 @@ production: &base + # relative_url_root: /gitlab + + # Uncomment and customize if you can't use the default user to run GitLab (default: 'git') +- # user: git ++ user: gitlab + + ## Email settings + # Email address used in the "From" field in mails sent by GitLab +- email_from: example@example.com ++ email_from: <%= ENV['GITLAB_EMAIL_FROM'] %> + + # Email server smtp settings are in [a separate file](initializers/smtp_settings.rb.sample). + +@@ -230,12 +230,12 @@ production: &base + # GitLab Satellites + satellites: + # Relative paths are relative to Rails.root (default: tmp/repo_satellites/) +- path: /home/git/gitlab-satellites/ ++ path: <%= ENV['GITLAB_SATELLITES_PATH'] %> + timeout: 30 + + ## Backup settings + backup: +- path: "tmp/backups" # Relative paths are relative to Rails.root (default: tmp/backups/) ++ path: <%= ENV['GITLAB_BACKUP_PATH'] %> + # keep_time: 604800 # default: 0 (forever) (in seconds) + # upload: + # # Fog storage connection settings, see http://fog.io/storage/ . +@@ -249,11 +249,11 @@ production: &base + + ## GitLab Shell settings + gitlab_shell: +- path: /home/git/gitlab-shell/ ++ path: <%= ENV['GITLAB_SHELL_PATH'] %> + + # REPOS_PATH MUST NOT BE A SYMLINK!!! +- repos_path: /home/git/repositories/ +- hooks_path: /home/git/gitlab-shell/hooks/ ++ repos_path: <%= ENV['GITLAB_REPOSITORIES_PATH'] %> ++ hooks_path: <%= ENV['GITLAB_SHELL_HOOKS_PATH'] %> + + # Git over HTTP + upload_pack: true +@@ -266,7 +266,7 @@ production: &base + # CAUTION! + # Use the default values unless you really know what you are doing + git: +- bin_path: /usr/bin/git ++ bin_path: git + # The next value is the maximum memory size grit can use + # Given in number of bytes per git object (e.g. a commit) + # This value can be increased if you have very large commits +@@ -299,7 +299,7 @@ test: + gravatar: + enabled: true + gitlab: +- host: localhost ++ host: <%= ENV['GITLAB_HOST'] %> + port: 80 + + # When you run tests we clone and setup gitlab-shell +diff --git a/lib/gitlab/app_logger.rb b/lib/gitlab/app_logger.rb +index 8e4717b..abfe2e4 100644 +--- a/lib/gitlab/app_logger.rb ++++ b/lib/gitlab/app_logger.rb +@@ -1,7 +1,7 @@ + module Gitlab + class AppLogger < Gitlab::Logger + def self.file_name +- 'application.log' ++ ENV["GITLAB_APPLICATION_LOG_PATH"] + end + + def format_message(severity, timestamp, progname, msg) diff --git a/pkgs/applications/version-management/mercurial/default.nix b/pkgs/applications/version-management/mercurial/default.nix index 82d92fd79e8..8cb34a7f9fa 100644 --- a/pkgs/applications/version-management/mercurial/default.nix +++ b/pkgs/applications/version-management/mercurial/default.nix @@ -2,7 +2,7 @@ , guiSupport ? false, tk ? null, curses }: let - version = "3.1.2"; + version = "3.2.2"; name = "mercurial-${version}"; in @@ -11,7 +11,7 @@ stdenv.mkDerivation { src = fetchurl { url = "http://mercurial.selenic.com/release/${name}.tar.gz"; - sha256 = "0fldlypjpzn12az2gk4b3am615wih3r6ld69im97iqq76zmmrgjx"; + sha256 = "1311ba2cgdc17ap8sl7pswzngc702pnkr4cd2rx6znb0w9jzgpmg"; }; inherit python; # pass it so that the same version can be used in hg2git diff --git a/pkgs/applications/version-management/redmine/default.nix b/pkgs/applications/version-management/redmine/default.nix index 4655a16671e..a4254384e5b 100644 --- a/pkgs/applications/version-management/redmine/default.nix +++ b/pkgs/applications/version-management/redmine/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ruby, rubyLibs, libiconv, libxslt, libxml2, pkgconfig, libffi, imagemagickBig, postgresql }: +{ stdenv, fetchurl, ruby, rubyLibs, libiconv, libiconvOrNull, libiconvOrLibc, libxslt, libxml2, pkgconfig, libffi, glibc, imagemagickBig, postgresql }: let gemspec = map (gem: fetchurl { url=gem.url; sha256=gem.hash; }) (import ./Gemfile.nix); @@ -25,7 +25,9 @@ in stdenv.mkDerivation rec { ''; buildInputs = [ - ruby rubyLibs.bundler libiconv libxslt libxml2 pkgconfig libffi + ruby rubyLibs.bundler + ] ++ (if (libiconvOrNull != null) then [libiconv] else []) ++ [ + libxslt libxml2 pkgconfig libffi imagemagickBig postgresql ]; @@ -46,7 +48,7 @@ in stdenv.mkDerivation rec { bundle config build.nokogiri \ --use-system-libraries \ - --with-iconv-dir=${libiconv} \ + --with-iconv-dir=${libiconvOrLibc} \ --with-xslt-dir=${libxslt} \ --with-xml2-dir=${libxml2} \ --with-pkg-config \ diff --git a/pkgs/applications/version-management/subversion/default.nix b/pkgs/applications/version-management/subversion/default.nix index 1ec4866f1aa..6e329ebdf71 100644 --- a/pkgs/applications/version-management/subversion/default.nix +++ b/pkgs/applications/version-management/subversion/default.nix @@ -17,13 +17,13 @@ assert javahlBindings -> jdk != null && perl != null; stdenv.mkDerivation rec { - version = "1.8.10"; + version = "1.8.11"; name = "subversion-${version}"; src = fetchurl { url = "mirror://apache/subversion/${name}.tar.bz2"; - sha256 = "1k3xskg2kjfp3zipl46lqx4fq4lhqnswd79qxp1kfhwplz401j8w"; + sha1 = "161edaee328f4fdcfd2a7c10ecd3fbcd51c61275"; }; buildInputs = [ zlib apr aprutil sqlite ] diff --git a/pkgs/applications/video/cc1394/default.nix b/pkgs/applications/video/cc1394/default.nix index d555e1b7885..1040f8e009a 100644 --- a/pkgs/applications/video/cc1394/default.nix +++ b/pkgs/applications/video/cc1394/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.alliedvisiontec.com/us/products/software/linux/avt-fire4linux.html; description = "AVT Viewer application for AVT cameras"; - license = "BSD"; + license = stdenv.lib.licenses.bsd3; maintainers = [ stdenv.lib.maintainers.viric ]; platforms = stdenv.lib.platforms.linux; hydraPlatforms = []; # because libdc1394avt is broken diff --git a/pkgs/applications/video/devede/default.nix b/pkgs/applications/video/devede/default.nix new file mode 100644 index 00000000000..b48f0f42936 --- /dev/null +++ b/pkgs/applications/video/devede/default.nix @@ -0,0 +1,30 @@ +{ pkgs, stdenv, fetchurl, pythonPackages, buildPythonPackage, pygtk, ffmpeg, mplayer, vcdimager, cdrkit, dvdauthor }: + +let + inherit (pythonPackages) dbus; + +in buildPythonPackage rec { + name = "devede-3.23.0"; + namePrefix = ""; + + src = fetchurl { + url = "http://www.rastersoft.com/descargas/${name}.tar.bz2"; + sha256 = "9e217ca46f5f275cb0c3cadbe8c830fa1fde774c004bd95a343d1255be6f25e1"; + }; + + buildInputs = [ ffmpeg ]; + + pythonPath = [ pygtk dbus ffmpeg mplayer dvdauthor vcdimager cdrkit ]; + + postPatch = '' + substituteInPlace devede --replace "/usr/share/devede" "$out/share/devede" + + ''; + + meta = with stdenv.lib; { + description = "DVD Creator for Linux"; + homepage = http://www.rastersoft.com/programas/devede.html; + license = licenses.gpl3; + maintainers = [ maintainers.bdimcheff ]; + }; +} diff --git a/pkgs/applications/video/dvdauthor/default.nix b/pkgs/applications/video/dvdauthor/default.nix index 6889e4d9ef8..cab7b4112d0 100644 --- a/pkgs/applications/video/dvdauthor/default.nix +++ b/pkgs/applications/video/dvdauthor/default.nix @@ -1,4 +1,5 @@ -{ stdenv, fetchurl, imagemagick, libdvdread, libxml2, freetype, fribidi, libpng, zlib, pkgconfig }: +{ stdenv, fetchurl, imagemagick, libdvdread, libxml2, freetype, fribidi, libpng, zlib, pkgconfig +, flex, bison }: stdenv.mkDerivation rec{ name = "dvdauthor-0.7.1"; @@ -8,9 +9,15 @@ stdenv.mkDerivation rec{ sha256 = "1s8zqlim0s3hk5sbdsilip3qqh0yv05l1jwx49d9rsy614dv27sh"; }; - buildInputs = [ libpng freetype libdvdread libxml2 zlib fribidi imagemagick ]; + buildInputs = [ libpng freetype libdvdread libxml2 zlib fribidi imagemagick flex bison]; nativeBuildInputs = [ pkgconfig ]; + patches = [ + ./dvdauthor-0.7.1-automake-1.13.patch + ./dvdauthor-0.7.1-mga-strndup.patch + ./dvdauthor-imagemagick-0.7.0.patch + ]; + meta = { description = "Tools for generating DVD files to be played on standalone DVD players"; homepage = http://dvdauthor.sourceforge.net/; diff --git a/pkgs/applications/video/dvdauthor/dvdauthor-0.7.1-automake-1.13.patch b/pkgs/applications/video/dvdauthor/dvdauthor-0.7.1-automake-1.13.patch new file mode 100644 index 00000000000..786f0c96855 --- /dev/null +++ b/pkgs/applications/video/dvdauthor/dvdauthor-0.7.1-automake-1.13.patch @@ -0,0 +1,10 @@ +--- dvdauthor/configure.ac~ 2013-01-04 08:27:40.713197029 +0800 ++++ dvdauthor/configure.ac 2013-01-04 08:27:53.273525273 +0800 +@@ -1,6 +1,6 @@ + AC_INIT(DVDAuthor,0.7.1,dvdauthor-users@lists.sourceforge.net) + +-AM_CONFIG_HEADER(src/config.h) ++AC_CONFIG_HEADERS(src/config.h) + AC_CONFIG_AUX_DIR(autotools) + + AM_INIT_AUTOMAKE diff --git a/pkgs/applications/video/dvdauthor/dvdauthor-0.7.1-mga-strndup.patch b/pkgs/applications/video/dvdauthor/dvdauthor-0.7.1-mga-strndup.patch new file mode 100644 index 00000000000..5f77a68081a --- /dev/null +++ b/pkgs/applications/video/dvdauthor/dvdauthor-0.7.1-mga-strndup.patch @@ -0,0 +1,24 @@ +Index: dvdauthor/src/dvdvml.l +=================================================================== +--- dvdauthor/src/dvdvml.l ++++ dvdauthor/src/dvdvml.l 2014-09-14 19:36:05.098847465 +0000 +@@ -19,6 +19,7 @@ + * USA + */ + ++#include "config.h" + #include "compat.h" /* needed for bool */ + #include "dvdvm.h" + #include "dvdvmy.h" +Index: dvdauthor/src/dvdvmy.y +=================================================================== +--- dvdauthor/src/dvdvmy.y ++++ dvdauthor/src/dvdvmy.y 2014-09-14 19:36:28.251618378 +0000 +@@ -19,6 +19,7 @@ + * USA + */ + ++#include "config.h" + #include "compat.h" /* needed for bool */ + #include "dvdvm.h" + diff --git a/pkgs/applications/video/dvdauthor/dvdauthor-imagemagick-0.7.0.patch b/pkgs/applications/video/dvdauthor/dvdauthor-imagemagick-0.7.0.patch new file mode 100644 index 00000000000..52b6cc44cd5 --- /dev/null +++ b/pkgs/applications/video/dvdauthor/dvdauthor-imagemagick-0.7.0.patch @@ -0,0 +1,11 @@ +--- dvdauthor/configure.ac.orig 2010-10-23 04:26:49.000000000 +0200 ++++ dvdauthor/configure.ac 2010-10-24 14:37:45.489064778 +0200 +@@ -31,7 +31,7 @@ + + usemagick=0 + +-AC_CHECK_PROGS(MAGICKCONFIG, [Magick-config]) ++AC_CHECK_PROGS(MAGICKCONFIG, [MagickCore-config]) + if test -n "$MAGICKCONFIG"; then + ac_save_CPPFLAGS="$CPPFLAGS" + ac_save_LIBS="$LIBS" diff --git a/pkgs/applications/video/kmplayer/default.nix b/pkgs/applications/video/kmplayer/default.nix index 553b86a3801..8d4a328cc09 100644 --- a/pkgs/applications/video/kmplayer/default.nix +++ b/pkgs/applications/video/kmplayer/default.nix @@ -6,7 +6,8 @@ stdenv.mkDerivation { name = "kmplayer-0.11.3d"; src = fetchurl { - url = http://kmplayer.kde.org/pkgs/kmplayer-0.11.3d.tar.bz2; + #url = http://kmplayer.kde.org/pkgs/kmplayer-0.11.3d.tar.bz2; + url = "mirror://gentoo/distfiles/kmplayer-0.11.3d.tar.bz2"; sha256 = "1yvbkb1hh5y7fqfvixjf2rryzm0fm0fpkx4lmvhi7k7d0v4wpgky"; }; diff --git a/pkgs/applications/video/kodi/default.nix b/pkgs/applications/video/kodi/default.nix new file mode 100644 index 00000000000..8735b8a78a1 --- /dev/null +++ b/pkgs/applications/video/kodi/default.nix @@ -0,0 +1,120 @@ +{ stdenv, lib, fetchurl, makeWrapper +, pkgconfig, cmake, gnumake, yasm, pythonFull +, boost, avahi, libdvdcss, lame, autoreconfHook +, gettext, pcre, yajl, fribidi, which +, openssl, gperf, tinyxml2, taglib, libssh, swig, jre +, libX11, xproto, inputproto, libxml2 +, libXt, libXmu, libXext, xextproto +, libXinerama, libXrandr, randrproto +, libXtst, libXfixes, fixesproto, systemd +, SDL, SDL_image, SDL_mixer, alsaLib +, mesa, glew, fontconfig, freetype, ftgl +, libjpeg, jasper, libpng, libtiff +, libmpeg2, libsamplerate, libmad +, libogg, libvorbis, flac, libxslt +, lzo, libcdio, libmodplug, libass, libbluray +, sqlite, mysql, nasm, gnutls, libva, wayland +, curl, bzip2, zip, unzip, glxinfo, xdpyinfo +, dbus_libs ? null, dbusSupport ? true +, udev, udevSupport ? true +, libusb ? null, usbSupport ? false +, samba ? null, sambaSupport ? true +, libmicrohttpd, bash +# TODO: would be nice to have nfsSupport (needs libnfs library) +# TODO: librtmp +, libvdpau ? null, vdpauSupport ? true +, pulseaudio ? null, pulseSupport ? true +, libcec ? null, cecSupport ? true +}: + +assert dbusSupport -> dbus_libs != null; +assert udevSupport -> udev != null; +assert usbSupport -> libusb != null && ! udevSupport; # libusb won't be used if udev is avaliable +assert sambaSupport -> samba != null; +assert vdpauSupport -> libvdpau != null; +assert pulseSupport -> pulseaudio != null; +assert cecSupport -> libcec != null; + +let + ffmpeg_2_4_4 = fetchurl { + url = "https://github.com/xbmc/FFmpeg/archive/2.4.4-Helix.tar.gz"; + sha256 = "1pkkmnq0kbwb13ps1wk01709lp3l2dzbfay6l29zj1204lbc3anb"; + }; +in stdenv.mkDerivation rec { + name = "kodi-14.0"; + + src = fetchurl { + url = "https://github.com/xbmc/xbmc/archive/14.0-Helix.tar.gz"; + sha256 = "14hip50gg3qgfb0mw7wrdqvw77mxdg9x1abfrqv1ydjrrjansx0i"; + }; + + buildInputs = [ + makeWrapper libxml2 gnutls + pkgconfig cmake gnumake yasm pythonFull + boost libmicrohttpd autoreconfHook + gettext pcre yajl fribidi libva + openssl gperf tinyxml2 taglib libssh swig jre + libX11 xproto inputproto which + libXt libXmu libXext xextproto + libXinerama libXrandr randrproto + libXtst libXfixes fixesproto + SDL SDL_image SDL_mixer alsaLib + mesa glew fontconfig freetype ftgl + libjpeg jasper libpng libtiff wayland + libmpeg2 libsamplerate libmad + libogg libvorbis flac libxslt systemd + lzo libcdio libmodplug libass libbluray + sqlite mysql nasm avahi libdvdcss lame + curl bzip2 zip unzip glxinfo xdpyinfo + ] + ++ lib.optional dbusSupport dbus_libs + ++ lib.optional udevSupport udev + ++ lib.optional usbSupport libusb + ++ lib.optional sambaSupport samba + ++ lib.optional vdpauSupport libvdpau + ++ lib.optional pulseSupport pulseaudio + ++ lib.optional cecSupport libcec; + + dontUseCmakeConfigure = true; + + postPatch = '' + substituteInPlace xbmc/linux/LinuxTimezone.cpp \ + --replace 'usr/share/zoneinfo' 'etc/zoneinfo' + substituteInPlace tools/depends/target/ffmpeg/autobuild.sh \ + --replace "/bin/bash" "${bash}/bin/bash -ex" + cp ${ffmpeg_2_4_4} tools/depends/target/ffmpeg/ffmpeg-2.4.4-Helix.tar.gz + ''; + + preConfigure = '' + ./bootstrap + ''; + + configureFlags = [ + "--enable-external-libraries" + ] + ++ lib.optional (!sambaSupport) "--disable-samba" + ++ lib.optional vdpauSupport "--enable-vdpau" + ++ lib.optional pulseSupport "--enable-pulse"; + + postInstall = '' + for p in $(ls $out/bin/) ; do + wrapProgram $out/bin/$p \ + --prefix PATH ":" "${pythonFull}/bin" \ + --prefix PATH ":" "${glxinfo}/bin" \ + --prefix PATH ":" "${xdpyinfo}/bin" \ + --prefix LD_LIBRARY_PATH ":" "${curl}/lib" \ + --prefix LD_LIBRARY_PATH ":" "${systemd}/lib" \ + --prefix LD_LIBRARY_PATH ":" "${libmad}/lib" \ + --prefix LD_LIBRARY_PATH ":" "${libvdpau}/lib" \ + --prefix LD_LIBRARY_PATH ":" "${libcec}/lib" + done + ''; + + meta = with stdenv.lib; { + homepage = http://kodi.tv/; + description = "Media center"; + license = stdenv.lib.licenses.gpl2; + platforms = platforms.linux; + maintainers = [ maintainers.iElectric maintainers.titanous ]; + }; +} diff --git a/pkgs/applications/video/makemkv/builder.sh b/pkgs/applications/video/makemkv/builder.sh index 0f5f853c28d..416d5c0f0b0 100644 --- a/pkgs/applications/video/makemkv/builder.sh +++ b/pkgs/applications/video/makemkv/builder.sh @@ -27,7 +27,7 @@ libPath="${libPath}:${out}/lib" # XXX: der. This should be in the nix file? for i in ${bin} ; do patchelf \ - --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \ + --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ --set-rpath $libPath \ ${i} done diff --git a/pkgs/applications/video/makemkv/default.nix b/pkgs/applications/video/makemkv/default.nix index 9f360e964af..83fe8c70474 100644 --- a/pkgs/applications/video/makemkv/default.nix +++ b/pkgs/applications/video/makemkv/default.nix @@ -19,8 +19,8 @@ stdenv.mkDerivation rec { buildInputs = [openssl qt4 mesa zlib pkgconfig libav]; - libPath = stdenv.lib.makeLibraryPath [stdenv.gcc.gcc openssl mesa qt4 zlib ] - + ":" + stdenv.gcc.gcc + "/lib64"; + libPath = stdenv.lib.makeLibraryPath [stdenv.cc.gcc openssl mesa qt4 zlib ] + + ":" + stdenv.cc.gcc + "/lib64"; meta = with stdenv.lib; { description = "convert blu-ray and dvd to mkv"; diff --git a/pkgs/applications/video/mkvtoolnix/default.nix b/pkgs/applications/video/mkvtoolnix/default.nix index a6c2ff0b822..b958b5d02a4 100644 --- a/pkgs/applications/video/mkvtoolnix/default.nix +++ b/pkgs/applications/video/mkvtoolnix/default.nix @@ -28,6 +28,7 @@ stdenv.mkDerivation rec { expat wxGTK zlib ruby gettext pkgconfig curl ]; + configureFlags = "--with-boost-libdir=${boost.lib}/lib"; buildPhase = '' ruby ./drake ''; diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix index 5acdcac9737..052add92a1f 100644 --- a/pkgs/applications/video/mpv/default.nix +++ b/pkgs/applications/video/mpv/default.nix @@ -58,11 +58,11 @@ in stdenv.mkDerivation rec { name = "mpv-${version}"; - version = "0.7.0"; + version = "0.7.1"; src = fetchurl { url = "https://github.com/mpv-player/mpv/archive/v${version}.tar.gz"; - sha256 = "0rz8dp44yag442gamaa2vdmf69h25gqh2bgybx89prkfh8n4hy8x"; + sha256 = "1grnmhj7hymi77ivvyzpgykj4wwrjd7a9apm5vyz2xqrankn3hyc"; }; buildInputs = with stdenv.lib; @@ -120,7 +120,7 @@ stdenv.mkDerivation rec { ''; homepage = http://mpv.io; license = licenses.gpl2Plus; - maintainers = [ maintainers.AndersonTorres ]; + maintainers = with stdenv.lib.maintainers; [ AndersonTorres fuuzetsu ]; platforms = platforms.linux; }; } diff --git a/pkgs/applications/video/shotcut/default.nix b/pkgs/applications/video/shotcut/default.nix index 79fd26204a9..484e28972cb 100644 --- a/pkgs/applications/video/shotcut/default.nix +++ b/pkgs/applications/video/shotcut/default.nix @@ -34,5 +34,9 @@ stdenv.mkDerivation rec { license = licenses.gpl3; maintainers = [ maintainers.goibhniu ]; platforms = platforms.linux; + + # after qt5 bump it probably needs to be updated, + # but newer versions seem to need newer than the latest stable mlt + broken = true; }; } diff --git a/pkgs/applications/video/vlc/default.nix b/pkgs/applications/video/vlc/default.nix index 71db3d40a46..97cc2f7e0a8 100644 --- a/pkgs/applications/video/vlc/default.nix +++ b/pkgs/applications/video/vlc/default.nix @@ -1,32 +1,38 @@ { stdenv, fetchurl, xz, bzip2, perl, xlibs, libdvdnav, libbluray , zlib, a52dec, libmad, faad2, ffmpeg, alsaLib -, pkgconfig, dbus, fribidi, qt4, freefont_ttf, libebml, libmatroska +, pkgconfig, dbus, fribidi, freefont_ttf, libebml, libmatroska , libvorbis, libtheora, speex, lua5, libgcrypt, libupnp , libcaca, pulseaudio, flac, schroedinger, libxml2, librsvg , mpeg2dec, udev, gnutls, avahi, libcddb, jack2, SDL, SDL_image , libmtp, unzip, taglib, libkate, libtiger, libv4l, samba, liboggz , libass, libva, libdvbpsi, libdc1394, libraw1394, libopus , libvdpau +, onlyLibVLC ? false +, qt4 ? null, qt5 ? null, withQt5 ? false }: +with stdenv.lib; + +assert (withQt5 -> qt5 != null); assert (!withQt5 -> qt4 != null); + stdenv.mkDerivation rec { name = "vlc-${version}"; version = "2.1.5"; src = fetchurl { - url = "http://download.videolan.org/pub/videolan/vlc/${version}/${name}.tar.xz"; + url = "http://download.videolan.org/vlc/${version}/${name}.tar.xz"; sha256 = "0whzbn7ahn5maarcwl1yhk9lq10b0q0y9w5pjl9kh3frdjmncrbg"; }; buildInputs = [ xz bzip2 perl zlib a52dec libmad faad2 ffmpeg alsaLib libdvdnav libdvdnav.libdvdread - libbluray dbus fribidi qt4 libvorbis libtheora speex lua5 libgcrypt + libbluray dbus fribidi libvorbis libtheora speex lua5 libgcrypt libupnp libcaca pulseaudio flac schroedinger libxml2 librsvg mpeg2dec udev gnutls avahi libcddb jack2 SDL SDL_image libmtp unzip taglib libkate libtiger libv4l samba liboggz libass libdvbpsi libva xlibs.xlibs xlibs.libXv xlibs.libXvMC xlibs.libXpm xlibs.xcbutilkeysyms libdc1394 libraw1394 libopus libebml libmatroska libvdpau - ]; + ] ++ [(if withQt5 then qt5 else qt4)]; nativeBuildInputs = [ pkgconfig ]; @@ -36,7 +42,8 @@ stdenv.mkDerivation rec { "--enable-dc1394" "--enable-ncurses" "--enable-vdpau" - ]; + ] + ++ optional onlyLibVLC "--disable-vlc"; preConfigure = ''sed -e "s@/bin/echo@echo@g" -i configure''; diff --git a/pkgs/applications/video/xbmc/0005-CEC-renamed-the-iDoubleTapTimeoutMs-in-the-new-libCE.patch b/pkgs/applications/video/xbmc/0005-CEC-renamed-the-iDoubleTapTimeoutMs-in-the-new-libCE.patch new file mode 100644 index 00000000000..91811194c9b --- /dev/null +++ b/pkgs/applications/video/xbmc/0005-CEC-renamed-the-iDoubleTapTimeoutMs-in-the-new-libCE.patch @@ -0,0 +1,32 @@ +From 9f1e45a10860dd23239de35673643e9e0e4a74f8 Mon Sep 17 00:00:00 2001 +From: Lars Op den Kamp +Date: Tue, 28 Oct 2014 14:52:16 +0100 +Subject: [PATCH 5/8] [CEC] renamed the iDoubleTapTimeoutMs in the new libCEC + for clarity. does not change binary compatibility + +--- + xbmc/peripherals/devices/PeripheralCecAdapter.cpp | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +diff --git a/xbmc/peripherals/devices/PeripheralCecAdapter.cpp b/xbmc/peripherals/devices/PeripheralCecAdapter.cpp +index 1d068dc..ad123d9 100644 +--- a/xbmc/peripherals/devices/PeripheralCecAdapter.cpp ++++ b/xbmc/peripherals/devices/PeripheralCecAdapter.cpp +@@ -1347,8 +1347,13 @@ void CPeripheralCecAdapter::SetConfigurationFromSettings(void) + m_configuration.bPowerOffOnStandby = iStandbyAction == 13011 ? 1 : 0; + m_configuration.bShutdownOnStandby = iStandbyAction == 13005 ? 1 : 0; + ++#if defined(CEC_DOUBLE_TAP_TIMEOUT_MS_OLD) + // double tap prevention timeout in ms +- m_configuration.iDoubleTapTimeoutMs = GetSettingInt("double_tap_timeout_ms"); ++ m_configuration.iDoubleTapTimeout50Ms = GetSettingInt("double_tap_timeout_ms") / 50; ++#else ++ // backwards compatibility. will be removed once the next major release of libCEC is out ++ m_configuration.iDoubleTapTimeoutMs = GetSettingInt("double_tap_timeout_ms"); ++#endif + } + + void CPeripheralCecAdapter::ReadLogicalAddresses(const CStdString &strString, cec_logical_addresses &addresses) +-- +2.1.2 + diff --git a/pkgs/applications/video/xbmc/default.nix b/pkgs/applications/video/xbmc/default.nix index f7bddc50ef8..cb6f4346e16 100644 --- a/pkgs/applications/video/xbmc/default.nix +++ b/pkgs/applications/video/xbmc/default.nix @@ -72,6 +72,8 @@ stdenv.mkDerivation rec { dontUseCmakeConfigure = true; + patches = [ ./0005-CEC-renamed-the-iDoubleTapTimeoutMs-in-the-new-libCE.patch ]; + preConfigure = '' substituteInPlace xbmc/linux/LinuxTimezone.cpp \ --replace 'usr/share/zoneinfo' 'etc/zoneinfo' diff --git a/pkgs/applications/virtualization/OVMF/default.nix b/pkgs/applications/virtualization/OVMF/default.nix index 54d697d4275..388248c5aa8 100644 --- a/pkgs/applications/virtualization/OVMF/default.nix +++ b/pkgs/applications/virtualization/OVMF/default.nix @@ -1,4 +1,4 @@ -{ stdenv, edk2 }: +{ stdenv, edk2, nasm, iasl }: let @@ -12,8 +12,9 @@ let in stdenv.mkDerivation (edk2.setup "OvmfPkg/OvmfPkg${targetArch}.dsc" { - name = "OVMF-2014-02-01"; + name = "OVMF-2014-12-10"; + buildInputs = [nasm iasl]; unpackPhase = '' for file in \ "${edk2.src}"/{OvmfPkg,UefiCpuPkg,MdeModulePkg,IntelFrameworkModulePkg,PcAtChipsetPkg,FatBinPkg,EdkShellBinPkg,MdePkg,ShellPkg,OptionRomPkg,IntelFrameworkPkg}; @@ -25,7 +26,7 @@ stdenv.mkDerivation (edk2.setup "OvmfPkg/OvmfPkg${targetArch}.dsc" { meta = { description = "Sample UEFI firmware for QEMU and KVM"; homepage = http://sourceforge.net/apps/mediawiki/tianocore/index.php?title=OVMF; - license = "BSD"; + license = stdenv.lib.licenses.bsd2; maintainers = [ stdenv.lib.maintainers.shlevy ]; platforms = ["x86_64-linux" "i686-linux"]; }; diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index 354666f3374..3483b0ac6d2 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -3,11 +3,11 @@ btrfsProgs, iptables, bash, e2fsprogs, xz}: stdenv.mkDerivation rec { name = "docker-${version}"; - version = "1.3.1"; + version = "1.3.3"; src = fetchurl { url = "https://github.com/dotcloud/docker/archive/v${version}.tar.gz"; - sha256 = "0w1gz1apkcrmhgng2rkkzy7wmxm68zgs6a16bi4cx3a38n4mgday"; + sha256 = "1jxvbm81zinh0achh8r2aac3x650aqiwn3w6iq1fg57fir1lw1cw"; }; buildInputs = [ makeWrapper go sqlite lxc iproute bridge_utils devicemapper btrfsProgs iptables e2fsprogs]; diff --git a/pkgs/applications/virtualization/qemu/cve-2014-0150.patch b/pkgs/applications/virtualization/qemu/cve-2014-0150.patch deleted file mode 100644 index a086b369321..00000000000 --- a/pkgs/applications/virtualization/qemu/cve-2014-0150.patch +++ /dev/null @@ -1,14 +0,0 @@ - -diff --git a/hw/net/virtio-net.c b/hw/net/virtio-net.c -index 439477b..33bd233 100644 ---- a/hw/net/virtio-net.c -+++ b/hw/net/virtio-net.c - -677,7 +677,7 static int virtio_net_handle_mac(VirtIONet *n, uint8_t cmd, - goto error; - } - -- if (in_use + mac_data.entries <= MAC_TABLE_ENTRIES) { -+ if (mac_data.entries <= MAC_TABLE_ENTRIES - in_use) { - s = iov_to_buf(iov, iov_cnt, 0, &macs[in_use * ETH_ALEN], - mac_data.entries * ETH_ALEN); - if (s != mac_data.entries * ETH_ALEN) { diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index 1d668c4a28c..7b329750ea5 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -1,40 +1,55 @@ { stdenv, fetchurl, python, zlib, pkgconfig, glib, ncurses, perl, pixman -, attr, libcap, vde2, alsaLib, texinfo, libuuid, flex, bison +, attr, libcap, vde2, alsaLib, texinfo, libuuid, flex, bison, lzo, snappy +, libseccomp, libaio, libcap_ng, gnutls , makeWrapper +, pulseSupport ? true, pulseaudio , sdlSupport ? true, SDL , vncSupport ? true, libjpeg, libpng , spiceSupport ? true, spice, spice_protocol, usbredir , x86Only ? false }: -let n = "qemu-2.0.0"; in +with stdenv.lib; +let + n = "qemu-2.2.0"; + audio = optionalString (hasSuffix "linux" stdenv.system) "alsa," + + optionalString pulseSupport "pa," + + optionalString sdlSupport "sdl,"; +in stdenv.mkDerivation rec { name = n + (if x86Only then "-x86-only" else ""); src = fetchurl { url = "http://wiki.qemu.org/download/${n}.tar.bz2"; - sha256 = "0frsahiw56jr4cqr9m6s383lyj4ar9hfs2wp3y4yr76krah1mk30"; + sha256 = "1703c3scl5n07gmpilg7g2xzyxnr7jczxgx6nn4m8kv9gin9p35n"; }; - patches = [ ./cve-2014-0150.patch ]; - buildInputs = [ python zlib pkgconfig glib ncurses perl pixman attr libcap - vde2 alsaLib texinfo libuuid flex bison makeWrapper + vde2 texinfo libuuid flex bison makeWrapper lzo snappy libseccomp + libcap_ng gnutls ] - ++ stdenv.lib.optionals sdlSupport [ SDL ] - ++ stdenv.lib.optionals vncSupport [ libjpeg libpng ] - ++ stdenv.lib.optionals spiceSupport [ spice_protocol spice usbredir ]; + ++ optionals pulseSupport [ pulseaudio ] + ++ optionals sdlSupport [ SDL ] + ++ optionals vncSupport [ libjpeg libpng ] + ++ optionals spiceSupport [ spice_protocol spice usbredir ] + ++ optionals (hasSuffix "linux" stdenv.system) [ alsaLib libaio ]; enableParallelBuilding = true; + patches = [ ./no-etc-install.patch ]; + configureFlags = - [ "--audio-drv-list=alsa" + [ "--enable-seccomp" "--smbd=smbd" # use `smbd' from $PATH + "--audio-drv-list=${audio}" + "--sysconfdir=/etc" + "--localstatedir=/var" ] - ++ stdenv.lib.optional spiceSupport "--enable-spice" - ++ stdenv.lib.optional x86Only "--target-list=i386-softmmu,x86_64-softmmu"; + ++ optional spiceSupport "--enable-spice" + ++ optional x86Only "--target-list=i386-softmmu,x86_64-softmmu" + ++ optional (hasSuffix "linux" stdenv.system) "--enable-linux-aio"; postInstall = '' diff --git a/pkgs/applications/virtualization/qemu/no-etc-install.patch b/pkgs/applications/virtualization/qemu/no-etc-install.patch new file mode 100644 index 00000000000..81d29feea3d --- /dev/null +++ b/pkgs/applications/virtualization/qemu/no-etc-install.patch @@ -0,0 +1,14 @@ +diff --git a/Makefile b/Makefile +index d6b9dc1..ce7c493 100644 +--- a/Makefile ++++ b/Makefile +@@ -384,8 +384,7 @@ install-confdir: + install-sysconfig: install-datadir install-confdir + $(INSTALL_DATA) $(SRC_PATH)/sysconfigs/target/target-x86_64.conf "$(DESTDIR)$(qemu_confdir)" + +-install: all $(if $(BUILD_DOCS),install-doc) install-sysconfig \ +-install-datadir install-localstatedir ++install: all $(if $(BUILD_DOCS),install-doc) install-datadir + ifneq ($(TOOLS),) + $(call install-prog,$(TOOLS),$(DESTDIR)$(bindir)) + endif diff --git a/pkgs/applications/virtualization/remotebox/default.nix b/pkgs/applications/virtualization/remotebox/default.nix new file mode 100644 index 00000000000..a257ef27e9f --- /dev/null +++ b/pkgs/applications/virtualization/remotebox/default.nix @@ -0,0 +1,40 @@ +{ stdenv, fetchurl, perl, perlPackages }: + +stdenv.mkDerivation rec { + version = "1.9"; + name = "remotebox-${version}"; + + src = fetchurl { + url = "${meta.homepage}/downloads/RemoteBox-${version}.tar.bz2"; + sha256 = "0vsfz2qmha9nz60fyksgqqyrw4lz9z2d5isnwqc6afn8z3i1qmkp"; + }; + + buildInputs = [ perl perlPackages.Gtk2 perlPackages.SOAPLite ]; + + installPhase = '' + mkdir -p $out/bin + cp -a docs/ share/ $out + + substituteInPlace remotebox --replace "\$Bin/" "\$Bin/../" + install -t $out/bin remotebox + + mkdir -p $out/share/applications + cp -p packagers-readme/*.desktop $out/share/applications + ''; + + meta = with stdenv.lib; { + description = "VirtualBox client with remote management"; + homepage = http://remotebox.knobgoblin.org.uk/; + license = with licenses; gpl2Plus; + longDescription = '' + VirtualBox is traditionally considered to be a virtualization solution + aimed at the desktop. While it is certainly possible to install + VirtualBox on a server, it offers few remote management features beyond + using the vboxmanage command line. + RemoteBox aims to fill this gap by providing a graphical VirtualBox + client which is able to manage a VirtualBox server installation. + ''; + maintainers = with maintainers; [ nckx ]; + platforms = with platforms; all; + }; +} diff --git a/pkgs/applications/virtualization/virt-viewer/default.nix b/pkgs/applications/virtualization/virt-viewer/default.nix index b49bd40136f..842687cfdaf 100644 --- a/pkgs/applications/virtualization/virt-viewer/default.nix +++ b/pkgs/applications/virtualization/virt-viewer/default.nix @@ -1,8 +1,12 @@ { stdenv, fetchurl, pkgconfig, intltool, glib, libxml2, gtk3, gtkvnc, gmp -, libgcrypt, gnupg, cyrus_sasl, spiceSupport ? true, spice_gtk, shared_mime_info -, libvirt, libcap_ng, yajl +, libgcrypt, gnupg, cyrus_sasl, shared_mime_info, libvirt, libcap_ng, yajl +, gsettings_desktop_schemas, makeWrapper +, spiceSupport ? true, spice_gtk ? null, spice_protocol ? null, libcap ? null, gdbm ? null }: +assert spiceSupport -> + spice_gtk != null && spice_protocol != null && libcap != null && gdbm != null; + with stdenv.lib; let sourceInfo = rec { @@ -23,8 +27,14 @@ stdenv.mkDerivation { buildInputs = [ pkgconfig intltool glib libxml2 gtk3 gtkvnc gmp libgcrypt gnupg cyrus_sasl - shared_mime_info libvirt libcap_ng yajl - ] ++ optional spiceSupport spice_gtk; + shared_mime_info libvirt libcap_ng yajl gsettings_desktop_schemas makeWrapper + ] ++ optionals spiceSupport [ spice_gtk spice_protocol libcap gdbm ]; + + postInstall = '' + for f in "$out"/bin/*; do + wrapProgram "$f" --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" + done + ''; meta = { description = "A viewer for remote virtual machines"; diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix index cbdf13b2158..7f12d2fa8f8 100644 --- a/pkgs/applications/virtualization/virtualbox/default.nix +++ b/pkgs/applications/virtualization/virtualbox/default.nix @@ -1,34 +1,36 @@ { stdenv, fetchurl, lib, iasl, dev86, pam, libxslt, libxml2, libX11, xproto, libXext , libXcursor, libXmu, qt4, libIDL, SDL, libcap, zlib, libpng, glib, kernel, lvm2 -, which, alsaLib, curl, libvpx, gawk -, xorriso, makeself, perl, pkgconfig +, which, alsaLib, curl, libvpx, gawk, nettools +, xorriso, makeself, perl, pkgconfig, nukeReferences , javaBindings ? false, jdk ? null , pythonBindings ? false, python ? null , enableExtensionPack ? false, requireFile ? null, patchelf ? null, fakeroot ? null , pulseSupport ? false, pulseaudio ? null -, enableHardening ? true +, enableHardening ? false }: with stdenv.lib; let + buildType = "release"; version = "4.3.20"; # changes ./guest-additions as well forEachModule = action: '' for mod in \ - $sourcedir/out/linux.*/release/bin/src/vboxdrv \ - $sourcedir/out/linux.*/release/bin/src/vboxpci \ - $sourcedir/out/linux.*/release/bin/src/vboxnetadp \ - $sourcedir/out/linux.*/release/bin/src/vboxnetflt + out/linux.*/${buildType}/bin/src/vboxdrv \ + out/linux.*/${buildType}/bin/src/vboxpci \ + out/linux.*/${buildType}/bin/src/vboxnetadp \ + out/linux.*/${buildType}/bin/src/vboxnetflt do if [ "x$(basename "$mod")" != xvboxdrv -a ! -e "$mod/Module.symvers" ] then - cp -v $sourcedir/out/linux.*/release/bin/src/vboxdrv/Module.symvers \ - "$mod/Module.symvers" + cp -v out/linux.*/${buildType}/bin/src/vboxdrv/Module.symvers \ + "$mod/Module.symvers" fi INSTALL_MOD_PATH="$out" INSTALL_MOD_DIR=misc \ - make -C "$MODULES_BUILD_DIR" "M=$mod" DEPMOD=/do_not_use_depmod ${action} + make -C "$MODULES_BUILD_DIR" DEPMOD=/do_not_use_depmod \ + "M=\$(PWD)/$mod" BUILD_TYPE="${buildType}" ${action} done ''; @@ -64,7 +66,7 @@ in stdenv.mkDerivation { buildInputs = [ iasl dev86 libxslt libxml2 xproto libX11 libXext libXcursor qt4 libIDL SDL libcap glib lvm2 python alsaLib curl libvpx pam xorriso makeself perl - pkgconfig which libXmu ] + pkgconfig which libXmu nukeReferences ] ++ optional javaBindings jdk ++ optional pythonBindings python ++ optional pulseSupport pulseaudio; @@ -86,8 +88,12 @@ in stdenv.mkDerivation { patches = optional enableHardening ./hardened.patch; + postPatch = '' + sed -i -e 's|/sbin/ifconfig|${nettools}/bin/ifconfig|' \ + src/apps/adpctl/VBoxNetAdpCtl.cpp + ''; + configurePhase = '' - sourcedir="$(pwd)" cat >> LocalConfig.kmk <i_notifyComplete(E_FAIL, +diff --git a/src/VBox/Runtime/r3/path.cpp b/src/VBox/Runtime/r3/path.cpp +index be2ad8f..7ddf105 100644 +--- a/src/VBox/Runtime/r3/path.cpp ++++ b/src/VBox/Runtime/r3/path.cpp +@@ -81,6 +81,12 @@ RTDECL(int) RTPathExecDir(char *pszPath, size_t cchPath) + } + + ++RTDECL(int) RTPathSuidDir(char *pszPath, size_t cchPath) ++{ ++ return RTStrCopy(pszPath, cchPath, "/var/setuid-wrappers"); ++} ++ ++ + RTDECL(int) RTPathAppPrivateNoArch(char *pszPath, size_t cchPath) + { + #if !defined(RT_OS_WINDOWS) && defined(RTPATH_APP_PRIVATE) +diff --git a/src/VBox/Runtime/r3/process.cpp b/src/VBox/Runtime/r3/process.cpp +index 7bde6af..2656cae 100644 +--- a/src/VBox/Runtime/r3/process.cpp ++++ b/src/VBox/Runtime/r3/process.cpp +@@ -111,6 +111,26 @@ RTR3DECL(char *) RTProcGetExecutablePath(char *pszExecPath, size_t cbExecPath) + return NULL; + } + ++/* ++ * Note the / at the end! This is important, because the functions using this ++ * will cut off everything after the rightmost / as this function is analogous ++ * to RTProcGetExecutablePath(). ++ */ ++#define SUIDDIR "/var/setuid-wrappers/" ++ ++RTR3DECL(char *) RTProcGetSuidPath(char *pszExecPath, size_t cbExecPath) ++{ ++ if (cbExecPath >= sizeof(SUIDDIR)) ++ { ++ memcpy(pszExecPath, SUIDDIR, sizeof(SUIDDIR)); ++ pszExecPath[sizeof(SUIDDIR)] = '\0'; ++ return pszExecPath; ++ } ++ ++ AssertMsgFailed(("Buffer too small (%zu <= %zu)\n", cbExecPath, sizeof(SUIDDIR))); ++ return NULL; ++} ++ + + RTR3DECL(const char *) RTProcShortName(void) + { diff --git a/pkgs/applications/window-managers/awesome/3.4.nix b/pkgs/applications/window-managers/awesome/3.4.nix index 3db2bde6540..961296c6eec 100644 --- a/pkgs/applications/window-managers/awesome/3.4.nix +++ b/pkgs/applications/window-managers/awesome/3.4.nix @@ -47,4 +47,9 @@ stdenv.mkDerivation rec { maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; }; + + passthru = { + inherit lua; + }; + } diff --git a/pkgs/applications/window-managers/awesome/default.nix b/pkgs/applications/window-managers/awesome/default.nix index 713ca591578..20cd15abf1c 100644 --- a/pkgs/applications/window-managers/awesome/default.nix +++ b/pkgs/applications/window-managers/awesome/default.nix @@ -1,13 +1,13 @@ -{ stdenv, fetchurl, lua, cairo, cmake, imagemagick, pkgconfig, gdk_pixbuf +{ stdenv, fetchurl, luaPackages, cairo, cmake, imagemagick, pkgconfig, gdk_pixbuf , xlibs, libstartup_notification, libxdg_basedir, libpthreadstubs -, xcb-util-cursor, lgi, makeWrapper, pango, gobjectIntrospection, unclutter +, xcb-util-cursor, makeWrapper, pango, gobjectIntrospection, unclutter , compton, procps, iproute, coreutils, curl, alsaUtils, findutils, rxvt_unicode , which, dbus, nettools, git, asciidoc, doxygen, xmlto, docbook_xml_dtd_45 , docbook_xsl }: let version = "3.5.5"; -in +in with luaPackages; stdenv.mkDerivation rec { name = "awesome-${version}"; @@ -32,6 +32,7 @@ stdenv.mkDerivation rec { dbus doxygen gdk_pixbuf + gobjectIntrospection git imagemagick lgi @@ -60,18 +61,22 @@ stdenv.mkDerivation rec { LD_LIBRARY_PATH = "${cairo}/lib:${pango}/lib:${gobjectIntrospection}/lib"; GI_TYPELIB_PATH = "${pango}/lib/girepository-1.0"; - LUA_CPATH = "${lgi}/lib/lua/5.1/?.so"; - LUA_PATH = "${lgi}/share/lua/5.1/?.lua;${lgi}/share/lua/5.1/lgi/?.lua"; + LUA_CPATH = "${lgi}/lib/lua/${lua.luaversion}/?.so"; + LUA_PATH = "${lgi}/share/lua/${lua.luaversion}/?.lua;${lgi}/share/lua/${lua.luaversion}/lgi/?.lua"; postInstall = '' wrapProgram $out/bin/awesome \ - --set LUA_CPATH '"${lgi}/lib/lua/5.1/?.so"' \ - --set LUA_PATH '"${lgi}/share/lua/5.1/?.lua;${lgi}/share/lua/5.1/lgi/?.lua"' \ - --set GI_TYPELIB_PATH "${pango}/lib/girepository-1.0" \ + --prefix LUA_CPATH ";" '"${lgi}/lib/lua/${lua.luaversion}/?.so"' \ + --prefix LUA_PATH ";" '"${lgi}/share/lua/${lua.luaversion}/?.lua;${lgi}/share/lua/${lua.luaversion}/lgi/?.lua"' \ + --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ --prefix LD_LIBRARY_PATH : "${cairo}/lib:${pango}/lib:${gobjectIntrospection}/lib" \ --prefix PATH : "${compton}/bin:${unclutter}/bin:${procps}/bin:${iproute}/sbin:${coreutils}/bin:${curl}/bin:${alsaUtils}/bin:${findutils}/bin:${rxvt_unicode}/bin" wrapProgram $out/bin/awesome-client \ --prefix PATH : "${which}/bin" ''; + + passthru = { + inherit lua; + }; } diff --git a/pkgs/applications/window-managers/bspwm/default.nix b/pkgs/applications/window-managers/bspwm/default.nix index 0b36d922df4..c17107ae97b 100644 --- a/pkgs/applications/window-managers/bspwm/default.nix +++ b/pkgs/applications/window-managers/bspwm/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { description = "A tiling window manager based on binary space partitioning"; homepage = http://github.com/baskerville/bspwm; maintainers = [ stdenv.lib.maintainers.meisternu ]; - license = "BSD"; + license = stdenv.lib.licenses.bsd2; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/applications/window-managers/compiz/default.nix b/pkgs/applications/window-managers/compiz/default.nix index b73d636aaa5..b8e342fb5d1 100644 --- a/pkgs/applications/window-managers/compiz/default.nix +++ b/pkgs/applications/window-managers/compiz/default.nix @@ -15,11 +15,11 @@ let s = # Generated upstream information rec { baseName="compiz"; - version="0.9.11.2"; + version="0.9.12.0"; name="${baseName}-${version}"; - hash="1czk4snv9j9l7b587nwf2y305lkn112zspm7f9l7yfk7jmkx1hqy"; - url="https://launchpad.net/compiz/0.9.11/0.9.11.2/+download/compiz-0.9.11.2.tar.bz2"; - sha256="1czk4snv9j9l7b587nwf2y305lkn112zspm7f9l7yfk7jmkx1hqy"; + hash="1n7y413bkykcby9imgmj5f1nbjfjc0hnbwmdkq2n77d4kv1rilxr"; + url="https://launchpad.net/compiz/0.9.12/0.9.12.0/+download/compiz-0.9.12.0.tar.bz2"; + sha256="1n7y413bkykcby9imgmj5f1nbjfjc0hnbwmdkq2n77d4kv1rilxr"; }; buildInputs = [cmake pkgconfig libXrender renderproto gtk libwnck pango cairo diff --git a/pkgs/applications/window-managers/herbstluftwm/default.nix b/pkgs/applications/window-managers/herbstluftwm/default.nix index 7c4cb4934c9..c4b265f4b41 100644 --- a/pkgs/applications/window-managers/herbstluftwm/default.nix +++ b/pkgs/applications/window-managers/herbstluftwm/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = { description = "A manual tiling window manager for X"; homepage = "http://herbstluftwm.org/"; - license = "BSD"; # Simplified BSD License + license = stdenv.lib.licenses.bsd2; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/applications/window-managers/sxhkd/default.nix b/pkgs/applications/window-managers/sxhkd/default.nix index 03563a4f812..af368d0a042 100644 --- a/pkgs/applications/window-managers/sxhkd/default.nix +++ b/pkgs/applications/window-managers/sxhkd/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = { description = "Simple X hotkey daemon"; homepage = "http://github.com/baskerville/sxhkd"; - license = "BSD"; + license = stdenv.lib.licenses.bsd2; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/applications/window-managers/weston/default.nix b/pkgs/applications/window-managers/weston/default.nix index 9a6708f1b14..c78f7d2d241 100644 --- a/pkgs/applications/window-managers/weston/default.nix +++ b/pkgs/applications/window-managers/weston/default.nix @@ -1,7 +1,8 @@ { stdenv, fetchurl, pkgconfig, wayland, mesa, libxkbcommon, cairo, libxcb , libXcursor, x11, udev, libdrm, mtdev, libjpeg, pam, dbus, libinput , pango ? null, libunwind ? null, freerdp ? null, vaapi ? null, libva ? null -, libwebp ? null +, libwebp ? null, xwayland ? null +# beware of null defaults, as the parameters *are* supplied by callPackage by default }: let version = "1.6.0"; in @@ -21,7 +22,6 @@ stdenv.mkDerivation rec { ]; configureFlags = [ - "--enable-xwayland" "--enable-x11-compositor" "--enable-drm-compositor" "--enable-wayland-compositor" @@ -32,7 +32,11 @@ stdenv.mkDerivation rec { "--enable-weston-launch" "--disable-setuid-install" # prevent install target to chown root weston-launch, which fails ] ++ stdenv.lib.optional (freerdp != null) "--enable-rdp-compositor" - ++ stdenv.lib.optional (vaapi != null) "--enabe-vaapi-recorder"; + ++ stdenv.lib.optional (vaapi != null) "--enabe-vaapi-recorder" + ++ stdenv.lib.optionals (xwayland != null) [ + "--enable-xwayland" + "--with-xserver-path=${xwayland}/bin/Xwayland" + ]; meta = with stdenv.lib; { description = "Reference implementation of a Wayland compositor"; diff --git a/pkgs/build-support/builder-defs/builder-defs.nix b/pkgs/build-support/builder-defs/builder-defs.nix index 5c9ec402d4b..da5d2249852 100644 --- a/pkgs/build-support/builder-defs/builder-defs.nix +++ b/pkgs/build-support/builder-defs/builder-defs.nix @@ -100,13 +100,13 @@ let inherit (builtins) head tail trace; in ${stdenv.preHook} set -e - NIX_GCC=${stdenv.gcc} + NIX_CC=${stdenv.cc} export SHELL=${stdenv.shell} PATH_DELIMITER=':' # Set up the initial path. PATH= - for i in \$NIX_GCC ${toString stdenv.initialPath}; do + for i in \$NIX_CC ${toString stdenv.initialPath}; do PATH=\$PATH\${PATH:+\"\${PATH_DELIMITER}\"}\$i/bin done @@ -138,7 +138,7 @@ let inherit (builtins) head tail trace; in } pkgs=\"\" - for i in \$NIX_GCC ${toString realBuildInputs}; do + for i in \$NIX_CC ${toString realBuildInputs}; do findInputs \$i done diff --git a/pkgs/build-support/cabal/default.nix b/pkgs/build-support/cabal/default.nix index 2ffdad2c09b..c3d26db74d3 100644 --- a/pkgs/build-support/cabal/default.nix +++ b/pkgs/build-support/cabal/default.nix @@ -220,6 +220,8 @@ assert !enableStaticLibraries -> versionOlder "7.7" ghc.version; done done + configureFlags+=" --with-gcc=$CC" + ${optionalString (self.enableSharedExecutables && self.stdenv.isLinux) '' configureFlags+=" --ghc-option=-optl=-Wl,-rpath=$out/lib/${ghc.ghc.name}/${self.pname}-${self.version}" ''} diff --git a/pkgs/build-support/fetchgit/nix-prefetch-git b/pkgs/build-support/fetchgit/nix-prefetch-git index 8a427d56ba3..01605b35ef3 100755 --- a/pkgs/build-support/fetchgit/nix-prefetch-git +++ b/pkgs/build-support/fetchgit/nix-prefetch-git @@ -151,12 +151,7 @@ init_submodules(){ local name=$( git config -f .gitmodules --get-regexp submodule\..*\.path | sed -n "s,^\(.*\)\.path $dir\$,\\1,p") - local url=$(git config -f .gitmodules --get ${name}.url) - - # Get Absolute URL if we have a relative URL - if ! echo "$url" | grep '^[a-zA-Z]\+://' >/dev/null 2>&1; then - url="$(git config --get remote.origin.url)/$url" - fi + local url=$(git config --get ${name}.url) clone "$dir" "$url" "$hash" "" done diff --git a/pkgs/build-support/fetchurl/mirrors.nix b/pkgs/build-support/fetchurl/mirrors.nix index 6284655e5e9..9641378f018 100644 --- a/pkgs/build-support/fetchurl/mirrors.nix +++ b/pkgs/build-support/fetchurl/mirrors.nix @@ -426,4 +426,9 @@ rec { http://sagemath.org/src-old/ ]; + # MySQL mirrors + mysql = [ + http://mysql.mirrors.pair.com/Downloads/ + http://cdn.mysql.com/Downloads/ + ]; } diff --git a/pkgs/build-support/fetchzip/default.nix b/pkgs/build-support/fetchzip/default.nix index 12fb69ba8ef..dd927ed8363 100644 --- a/pkgs/build-support/fetchzip/default.nix +++ b/pkgs/build-support/fetchzip/default.nix @@ -12,7 +12,7 @@ , url , ... } @ args: -fetchurl ({ +lib.overrideDerivation (fetchurl ({ name = args.name or (baseNameOf url); recursiveHash = true; @@ -39,4 +39,6 @@ fetchurl ({ mv $out/$fn/* "$out/" rmdir "$out/$fn" ''; -} // args) +} // args)) +# Hackety-hack: we actually need unzip hooks, too +(x: {nativeBuildInputs = x.nativeBuildInputs++ [unzip];}) diff --git a/pkgs/build-support/gcc-cross-wrapper/gcc-wrapper.sh b/pkgs/build-support/gcc-cross-wrapper/gcc-wrapper.sh index ec1f6004edd..c15777144e1 100644 --- a/pkgs/build-support/gcc-cross-wrapper/gcc-wrapper.sh +++ b/pkgs/build-support/gcc-cross-wrapper/gcc-wrapper.sh @@ -1,7 +1,7 @@ #! @shell@ -e -if test -n "$NIX_GCC_WRAPPER_START_HOOK"; then - source "$NIX_GCC_WRAPPER_START_HOOK" +if test -n "$NIX_CC_WRAPPER_START_HOOK"; then + source "$NIX_CC_WRAPPER_START_HOOK" fi if test -z "$NIX_CROSS_GLIBC_FLAGS_SET"; then @@ -107,8 +107,8 @@ if test "$NIX_DEBUG" = "1"; then done fi -if test -n "$NIX_GCC_WRAPPER_EXEC_HOOK"; then - source "$NIX_GCC_WRAPPER_EXEC_HOOK" +if test -n "$NIX_CC_WRAPPER_EXEC_HOOK"; then + source "$NIX_CC_WRAPPER_EXEC_HOOK" fi # We want gcc to call the wrapper linker, not that of binutils. diff --git a/pkgs/build-support/gcc-wrapper-old/add-flags b/pkgs/build-support/gcc-wrapper-old/add-flags new file mode 100644 index 00000000000..7714a630573 --- /dev/null +++ b/pkgs/build-support/gcc-wrapper-old/add-flags @@ -0,0 +1,28 @@ +# `-B@out@/bin' forces gcc to use ld-wrapper.sh when calling ld. +export NIX_CFLAGS_COMPILE="-B@out@/bin/ $NIX_CFLAGS_COMPILE" + +if test -e @out@/nix-support/libc-cflags; then + export NIX_CFLAGS_COMPILE="$(cat @out@/nix-support/libc-cflags) $NIX_CFLAGS_COMPILE" +fi + +if test -e @out@/nix-support/gcc-cflags; then + export NIX_CFLAGS_COMPILE="$(cat @out@/nix-support/gcc-cflags) $NIX_CFLAGS_COMPILE" +fi + +if test -e @out@/nix-support/gnat-cflags; then + export NIX_GNATFLAGS_COMPILE="$(cat @out@/nix-support/gnat-cflags) $NIX_GNATFLAGS_COMPILE" +fi + +if test -e @out@/nix-support/libc-ldflags; then + export NIX_LDFLAGS="$NIX_LDFLAGS $(cat @out@/nix-support/libc-ldflags)" +fi + +if test -e @out@/nix-support/gcc-ldflags; then + export NIX_LDFLAGS="$NIX_LDFLAGS $(cat @out@/nix-support/gcc-ldflags)" +fi + +if test -e @out@/nix-support/libc-ldflags-before; then + export NIX_LDFLAGS_BEFORE="$(cat @out@/nix-support/libc-ldflags-before) $NIX_LDFLAGS_BEFORE" +fi + +export NIX_CC_WRAPPER_FLAGS_SET=1 diff --git a/pkgs/build-support/gcc-wrapper-old/builder.sh b/pkgs/build-support/gcc-wrapper-old/builder.sh new file mode 100644 index 00000000000..c79680712ee --- /dev/null +++ b/pkgs/build-support/gcc-wrapper-old/builder.sh @@ -0,0 +1,214 @@ +source $stdenv/setup + + +mkdir -p $out/bin +mkdir -p $out/nix-support + + +if test -z "$nativeLibc"; then + dynamicLinker="$libc/lib/$dynamicLinker" + echo $dynamicLinker > $out/nix-support/dynamic-linker + + if test -e $libc/lib/32/ld-linux.so.2; then + echo $libc/lib/32/ld-linux.so.2 > $out/nix-support/dynamic-linker-m32 + fi + + # The "-B$libc/lib/" flag is a quick hack to force gcc to link + # against the crt1.o from our own glibc, rather than the one in + # /usr/lib. (This is only an issue when using an `impure' + # compiler/linker, i.e., one that searches /usr/lib and so on.) + # + # Unfortunately, setting -B appears to override the default search + # path. Thus, the gcc-specific "../includes-fixed" directory is + # now longer searched and glibc's header fails to + # compile, because it uses "#include_next " to find the + # limits.h file in ../includes-fixed. To remedy the problem, + # another -idirafter is necessary to add that directory again. + echo "-B$libc/lib/ -idirafter $libc/include -idirafter $gcc/lib/gcc/*/*/include-fixed" > $out/nix-support/libc-cflags + + echo "-L$libc/lib" > $out/nix-support/libc-ldflags + + # The dynamic linker is passed in `ldflagsBefore' to allow + # explicit overrides of the dynamic linker by callers to gcc/ld + # (the *last* value counts, so ours should come first). + echo "-dynamic-linker" $dynamicLinker > $out/nix-support/libc-ldflags-before +fi + +if test -n "$nativeTools"; then + gccPath="$nativePrefix/bin" + ldPath="$nativePrefix/bin" +else + if test -e "$gcc/lib64"; then + gccLDFlags="$gccLDFlags -L$gcc/lib64" + fi + gccLDFlags="$gccLDFlags -L$gcc/lib" + if [ -n "$langVhdl" ]; then + gccLDFlags="$gccLDFlags -L$zlib/lib" + fi + echo "$gccLDFlags" > $out/nix-support/gcc-ldflags + + # GCC shows $gcc/lib in `gcc -print-search-dirs', but not + # $gcc/lib64 (even though it does actually search there...).. + # This confuses libtool. So add it to the compiler tool search + # path explicitly. + if test -e "$gcc/lib64"; then + gccCFlags="$gccCFlags -B$gcc/lib64" + fi + + # Find the gcc libraries path (may work only without multilib) + if [ -n "$langAda" ]; then + basePath=`echo $gcc/lib/*/*/*` + gccCFlags="$gccCFlags -B$basePath -I$basePath/adainclude" + + gnatCFlags="-aI$basePath/adainclude -aO$basePath/adalib" + echo "$gnatCFlags" > $out/nix-support/gnat-cflags + fi + echo "$gccCFlags" > $out/nix-support/gcc-cflags + + gccPath="$gcc/bin" + # On Illumos/Solaris we might prefer native ld + if test -n "$nativePrefix"; then + ldPath="$nativePrefix/bin" + else + ldPath="$binutils/bin" + fi; +fi + + +doSubstitute() { + local src=$1 + local dst=$2 + local ld="$ldPath/ld" + if $ld -V 2>&1 |grep Solaris; then + # Use Solaris specific linker wrapper + ld="$out/bin/ld-solaris" + fi + # Can't use substitute() here, because replace may not have been + # built yet (in the bootstrap). + sed \ + -e "s^@out@^$out^g" \ + -e "s^@shell@^$shell^g" \ + -e "s^@gcc@^$gcc^g" \ + -e "s^@gccProg@^$gccProg^g" \ + -e "s^@gnatProg@^$gnatProg^g" \ + -e "s^@gnatlinkProg@^$gnatlinkProg^g" \ + -e "s^@binutils@^$binutils^g" \ + -e "s^@coreutils@^$coreutils^g" \ + -e "s^@libc@^$libc^g" \ + -e "s^@ld@^$ld^g" \ + < "$src" > "$dst" +} + + +# Make wrapper scripts around gcc, g++, and gfortran. Also make symlinks +# cc, c++, and f77. +mkGccWrapper() { + local dst=$1 + local src=$2 + + if ! test -f "$src"; then + echo "$src does not exist (skipping)" + return 1 + fi + + gccProg="$src" + doSubstitute "$gccWrapper" "$dst" + chmod +x "$dst" +} + +mkGnatWrapper() { + local dst=$1 + local src=$2 + + if ! test -f "$src"; then + echo "$src does not exist (skipping)" + return 1 + fi + + gnatProg="$src" + doSubstitute "$gnatWrapper" "$dst" + chmod +x "$dst" +} + +mkGnatLinkWrapper() { + local dst=$1 + local src=$2 + + if ! test -f "$src"; then + echo "$src does not exist (skipping)" + return 1 + fi + + gnatlinkProg="$src" + doSubstitute "$gnatlinkWrapper" "$dst" + chmod +x "$dst" +} + +if mkGccWrapper $out/bin/gcc $gccPath/gcc +then + ln -sv gcc $out/bin/cc +fi + +if mkGccWrapper $out/bin/g++ $gccPath/g++ +then + ln -sv g++ $out/bin/c++ +fi + +mkGccWrapper $out/bin/cpp $gccPath/cpp || true + +if mkGccWrapper $out/bin/gfortran $gccPath/gfortran +then + ln -sv gfortran $out/bin/g77 + ln -sv gfortran $out/bin/f77 +fi + +mkGccWrapper $out/bin/gcj $gccPath/gcj || true + +mkGccWrapper $out/bin/gccgo $gccPath/gccgo || true + +mkGccWrapper $out/bin/gnatgcc $gccPath/gnatgcc || true +mkGnatWrapper $out/bin/gnatmake $gccPath/gnatmake || true +mkGnatWrapper $out/bin/gnatbind $gccPath/gnatbind || true +mkGnatLinkWrapper $out/bin/gnatlink $gccPath/gnatlink || true + +if [ -f $gccPath/ghdl ]; then + ln -sf $gccPath/ghdl $out/bin/ghdl +fi + + +# Create a symlink to as (the assembler). This is useful when a +# gcc-wrapper is installed in a user environment, as it ensures that +# the right assembler is called. +ln -s $ldPath/as $out/bin/as + + +# Make a wrapper around the linker. +doSubstitute "$ldWrapper" "$out/bin/ld" +chmod +x "$out/bin/ld" + +# Copy solaris ld wrapper if needed +if $ldPath/ld -V 2>&1 |grep Solaris; then + # Use Solaris specific linker wrapper + sed -e "s^@ld@^$ldPath/ld^g" < "$ldSolarisWrapper" > "$out/bin/ld-solaris" + chmod +x "$out/bin/ld-solaris" +fi + + +# Emit a setup hook. Also store the path to the original GCC and +# Glibc. +test -n "$gcc" && echo $gcc > $out/nix-support/orig-gcc +test -n "$libc" && echo $libc > $out/nix-support/orig-libc + +doSubstitute "$addFlags" "$out/nix-support/add-flags.sh" + +doSubstitute "$setupHook" "$out/nix-support/setup-hook" + +cp -p $utils $out/nix-support/utils.sh + + +# Propagate the wrapped gcc so that if you install the wrapper, you get +# tools like gcov, the manpages, etc. as well (including for binutils +# and Glibc). +if test -z "$nativeTools"; then + echo $gcc $binutils $libc > $out/nix-support/propagated-user-env-packages +fi diff --git a/pkgs/build-support/gcc-wrapper-old/default.nix b/pkgs/build-support/gcc-wrapper-old/default.nix new file mode 100644 index 00000000000..20f1bc97ad1 --- /dev/null +++ b/pkgs/build-support/gcc-wrapper-old/default.nix @@ -0,0 +1,97 @@ +# The Nix `gcc' stdenv.mkDerivation is not directly usable, since it doesn't +# know where the C library and standard header files are. Therefore +# the compiler produced by that package cannot be installed directly +# in a user environment and used from the command line. This +# stdenv.mkDerivation provides a wrapper that sets up the right environment +# variables so that the compiler and the linker just "work". + +{ name ? "", stdenv, nativeTools, nativeLibc, nativePrefix ? "" +, gcc ? null, libc ? null, binutils ? null, coreutils ? null, shell ? "" +, zlib ? null +}: + +assert nativeTools -> nativePrefix != ""; +assert !nativeTools -> gcc != null && binutils != null && coreutils != null; +assert !nativeLibc -> libc != null; + +# For ghdl (the vhdl language provider to gcc) we need zlib in the wrapper +assert (gcc != null && gcc ? langVhdl && gcc.langVhdl) -> zlib != null; + +let + + gccVersion = (builtins.parseDrvName gcc.name).version; + gccName = (builtins.parseDrvName gcc.name).name; + + langGo = if nativeTools then false else gcc ? langGo && gcc.langGo; +in + +stdenv.mkDerivation { + name = + (if name != "" then name else gccName + "-wrapper") + + (if gcc != null && gccVersion != "" then "-" + gccVersion else ""); + + builder = ./builder.sh; + setupHook = ./setup-hook.sh; + gccWrapper = ./gcc-wrapper.sh; + gnatWrapper = ./gnat-wrapper.sh; + gnatlinkWrapper = ./gnatlink-wrapper.sh; + ldWrapper = ./ld-wrapper.sh; + ldSolarisWrapper = ./ld-solaris-wrapper.sh; + utils = ./utils.sh; + addFlags = ./add-flags; + + inherit nativeTools nativeLibc nativePrefix gcc; + libc = if nativeLibc then null else libc; + binutils = if nativeTools then null else binutils; + # The wrapper scripts use 'cat', so we may need coreutils + coreutils = if nativeTools then null else coreutils; + + langC = if nativeTools then true else gcc.langC; + langCC = if nativeTools then true else gcc.langCC; + langFortran = if nativeTools then false else gcc ? langFortran; + langAda = if nativeTools then false else gcc ? langAda && gcc.langAda; + langVhdl = if nativeTools then false else gcc ? langVhdl && gcc.langVhdl; + zlib = if gcc != null && gcc ? langVhdl then zlib else null; + shell = if shell == "" then stdenv.shell else + if builtins.isAttrs shell then (shell + shell.shellPath) + else shell; + + crossAttrs = { + shell = shell.crossDrv + shell.crossDrv.shellPath; + libc = stdenv.ccCross.libc; + coreutils = coreutils.crossDrv; + binutils = binutils.crossDrv; + gcc = gcc.crossDrv; + # + # This is not the best way to do this. I think the reference should be + # the style in the gcc-cross-wrapper, but to keep a stable stdenv now I + # do this sufficient if/else. + dynamicLinker = + (if stdenv.cross.arch == "arm" then "ld-linux.so.3" else + if stdenv.cross.arch == "mips" then "ld.so.1" else + if stdenv.lib.hasSuffix "pc-gnu" stdenv.cross.config then "ld.so.1" else + abort "don't know the name of the dynamic linker for this platform"); + }; + + preferLocalBuild = true; + + meta = + let gcc_ = if gcc != null then gcc else {}; in + (if gcc_ ? meta then removeAttrs gcc.meta ["priority"] else {}) // + { description = + stdenv.lib.attrByPath ["meta" "description"] "System C compiler" gcc_ + + " (wrapper script)"; + }; + + # The dynamic linker has different names on different Linux platforms. + dynamicLinker = + if !nativeLibc then + (if stdenv.system == "i686-linux" then "ld-linux.so.2" else + if stdenv.system == "x86_64-linux" then "ld-linux-x86-64.so.2" else + # ARM with a wildcard, which can be "" or "-armhf". + if stdenv.isArm then "ld-linux*.so.3" else + if stdenv.system == "powerpc-linux" then "ld.so.1" else + if stdenv.system == "mips64el-linux" then "ld.so.1" else + abort "don't know the name of the dynamic linker for this platform") + else ""; +} diff --git a/pkgs/build-support/gcc-wrapper-old/gcc-wrapper-old.sh b/pkgs/build-support/gcc-wrapper-old/gcc-wrapper-old.sh new file mode 100644 index 00000000000..a9d18036952 --- /dev/null +++ b/pkgs/build-support/gcc-wrapper-old/gcc-wrapper-old.sh @@ -0,0 +1,146 @@ +#! @shell@ -e + +if [ -n "$NIX_CC_WRAPPER_START_HOOK" ]; then + source "$NIX_CC_WRAPPER_START_HOOK" +fi + +if [ -z "$NIX_CC_WRAPPER_FLAGS_SET" ]; then + source @out@/nix-support/add-flags.sh +fi + +source @out@/nix-support/utils.sh + + +# Figure out if linker flags should be passed. GCC prints annoying +# warnings when they are not needed. +dontLink=0 +getVersion=0 +nonFlagArgs=0 + +for i in "$@"; do + if [ "$i" = -c ]; then + dontLink=1 + elif [ "$i" = -S ]; then + dontLink=1 + elif [ "$i" = -E ]; then + dontLink=1 + elif [ "$i" = -E ]; then + dontLink=1 + elif [ "$i" = -M ]; then + dontLink=1 + elif [ "$i" = -MM ]; then + dontLink=1 + elif [ "$i" = -x ]; then + # At least for the cases c-header or c++-header we should set dontLink. + # I expect no one use -x other than making precompiled headers. + dontLink=1 + elif [ "${i:0:1}" != - ]; then + nonFlagArgs=1 + elif [ "$i" = -m32 ]; then + if [ -e @out@/nix-support/dynamic-linker-m32 ]; then + NIX_LDFLAGS="$NIX_LDFLAGS -dynamic-linker $(cat @out@/nix-support/dynamic-linker-m32)" + fi + fi +done + +# If we pass a flag like -Wl, then gcc will call the linker unless it +# can figure out that it has to do something else (e.g., because of a +# "-c" flag). So if no non-flag arguments are given, don't pass any +# linker flags. This catches cases like "gcc" (should just print +# "gcc: no input files") and "gcc -v" (should print the version). +if [ "$nonFlagArgs" = 0 ]; then + dontLink=1 +fi + + +# Optionally filter out paths not refering to the store. +params=("$@") +if [ "$NIX_ENFORCE_PURITY" = 1 -a -n "$NIX_STORE" ]; then + rest=() + n=0 + while [ $n -lt ${#params[*]} ]; do + p=${params[n]} + p2=${params[$((n+1))]} + if [ "${p:0:3}" = -L/ ] && badPath "${p:2}"; then + skip $p + elif [ "$p" = -L ] && badPath "$p2"; then + n=$((n + 1)); skip $p2 + elif [ "${p:0:3}" = -I/ ] && badPath "${p:2}"; then + skip $p + elif [ "$p" = -I ] && badPath "$p2"; then + n=$((n + 1)); skip $p2 + elif [ "$p" = -isystem ] && badPath "$p2"; then + n=$((n + 1)); skip $p2 + else + rest=("${rest[@]}" "$p") + fi + n=$((n + 1)) + done + params=("${rest[@]}") +fi + + +# Add the flags for the C compiler proper. +extraAfter=($NIX_CFLAGS_COMPILE) +extraBefore=() + +# When enforcing purity, pretend gcc can't find the current date and +# time +if [ "$NIX_ENFORCE_PURITY" = 1 ]; then + extraAfter+=('-D__DATE__="Jan 01 1970"' + '-D__TIME__="00:00:01"' + ) +fi + + +if [ "$dontLink" != 1 ]; then + + # Add the flags that should only be passed to the compiler when + # linking. + extraAfter+=($NIX_CFLAGS_LINK) + + # Add the flags that should be passed to the linker (and prevent + # `ld-wrapper' from adding NIX_LDFLAGS again). + for i in $NIX_LDFLAGS_BEFORE; do + extraBefore=(${extraBefore[@]} "-Wl,$i") + done + for i in $NIX_LDFLAGS; do + if [ "${i:0:3}" = -L/ ]; then + extraAfter+=("$i") + else + extraAfter+=("-Wl,$i") + fi + done + export NIX_LDFLAGS_SET=1 +fi + +# As a very special hack, if the arguments are just `-v', then don't +# add anything. This is to prevent `gcc -v' (which normally prints +# out the version number and returns exit code 0) from printing out +# `No input files specified' and returning exit code 1. +if [ "$*" = -v ]; then + extraAfter=() + extraBefore=() +fi + +# Optionally print debug info. +if [ -n "$NIX_DEBUG" ]; then + echo "original flags to @prog@:" >&2 + for i in "${params[@]}"; do + echo " $i" >&2 + done + echo "extraBefore flags to @prog@:" >&2 + for i in ${extraBefore[@]}; do + echo " $i" >&2 + done + echo "extraAfter flags to @prog@:" >&2 + for i in ${extraAfter[@]}; do + echo " $i" >&2 + done +fi + +if [ -n "$NIX_CC_WRAPPER_EXEC_HOOK" ]; then + source "$NIX_CC_WRAPPER_EXEC_HOOK" +fi + +exec @prog@ ${extraBefore[@]} "${params[@]}" "${extraAfter[@]}" diff --git a/pkgs/build-support/gcc-wrapper-old/gcc-wrapper.sh b/pkgs/build-support/gcc-wrapper-old/gcc-wrapper.sh new file mode 100644 index 00000000000..8f12f08ddc7 --- /dev/null +++ b/pkgs/build-support/gcc-wrapper-old/gcc-wrapper.sh @@ -0,0 +1,147 @@ +#! @shell@ -e + +if test -n "$NIX_CC_WRAPPER_START_HOOK"; then + source "$NIX_CC_WRAPPER_START_HOOK" +fi + +if test -z "$NIX_CC_WRAPPER_FLAGS_SET"; then + source @out@/nix-support/add-flags.sh +fi + +source @out@/nix-support/utils.sh + + +# Figure out if linker flags should be passed. GCC prints annoying +# warnings when they are not needed. +dontLink=0 +getVersion=0 +nonFlagArgs=0 + +for i in "$@"; do + if test "$i" = "-c"; then + dontLink=1 + elif test "$i" = "-S"; then + dontLink=1 + elif test "$i" = "-E"; then + dontLink=1 + elif test "$i" = "-E"; then + dontLink=1 + elif test "$i" = "-M"; then + dontLink=1 + elif test "$i" = "-MM"; then + dontLink=1 + elif test "$i" = "-x"; then + # At least for the cases c-header or c++-header we should set dontLink. + # I expect no one use -x other than making precompiled headers. + dontLink=1 + elif test "${i:0:1}" != "-"; then + nonFlagArgs=1 + elif test "$i" = "-m32"; then + if test -e @out@/nix-support/dynamic-linker-m32; then + NIX_LDFLAGS="$NIX_LDFLAGS -dynamic-linker $(cat @out@/nix-support/dynamic-linker-m32)" + fi + fi +done + +# If we pass a flag like -Wl, then gcc will call the linker unless it +# can figure out that it has to do something else (e.g., because of a +# "-c" flag). So if no non-flag arguments are given, don't pass any +# linker flags. This catches cases like "gcc" (should just print +# "gcc: no input files") and "gcc -v" (should print the version). +if test "$nonFlagArgs" = "0"; then + dontLink=1 +fi + + +# Optionally filter out paths not refering to the store. +params=("$@") +if test "$NIX_ENFORCE_PURITY" = "1" -a -n "$NIX_STORE"; then + rest=() + n=0 + while test $n -lt ${#params[*]}; do + p=${params[n]} + p2=${params[$((n+1))]} + if test "${p:0:3}" = "-L/" && badPath "${p:2}"; then + skip $p + elif test "$p" = "-L" && badPath "$p2"; then + n=$((n + 1)); skip $p2 + elif test "${p:0:3}" = "-I/" && badPath "${p:2}"; then + skip $p + elif test "$p" = "-I" && badPath "$p2"; then + n=$((n + 1)); skip $p2 + elif test "$p" = "-isystem" && badPath "$p2"; then + n=$((n + 1)); skip $p2 + else + rest=("${rest[@]}" "$p") + fi + n=$((n + 1)) + done + params=("${rest[@]}") +fi + + +# Add the flags for the C compiler proper. +extraAfter=($NIX_CFLAGS_COMPILE) +extraBefore=() + +if test "$dontLink" != "1"; then + + # Add the flags that should only be passed to the compiler when + # linking. + extraAfter=(${extraAfter[@]} $NIX_CFLAGS_LINK) + + # Add the flags that should be passed to the linker (and prevent + # `ld-wrapper' from adding NIX_LDFLAGS again). + for i in $NIX_LDFLAGS_BEFORE; do + extraBefore=(${extraBefore[@]} "-Wl,$i") + done + for i in $NIX_LDFLAGS; do + if test "${i:0:3}" = "-L/"; then + extraAfter=(${extraAfter[@]} "$i") + else + extraAfter=(${extraAfter[@]} "-Wl,$i") + fi + done + export NIX_LDFLAGS_SET=1 +fi + +# As a very special hack, if the arguments are just `-v', then don't +# add anything. This is to prevent `gcc -v' (which normally prints +# out the version number and returns exit code 0) from printing out +# `No input files specified' and returning exit code 1. +if test "$*" = "-v"; then + extraAfter=() + extraBefore=() +fi + +# Optionally print debug info. +if test "$NIX_DEBUG" = "1"; then + echo "original flags to @gccProg@:" >&2 + for i in "${params[@]}"; do + echo " $i" >&2 + done + echo "extraBefore flags to @gccProg@:" >&2 + for i in ${extraBefore[@]}; do + echo " $i" >&2 + done + echo "extraAfter flags to @gccProg@:" >&2 + for i in ${extraAfter[@]}; do + echo " $i" >&2 + done +fi + +if test -n "$NIX_CC_WRAPPER_EXEC_HOOK"; then + source "$NIX_CC_WRAPPER_EXEC_HOOK" +fi + + +# Call the real `gcc'. Filter out warnings from stderr about unused +# `-B' flags, since they confuse some programs. Deep bash magic to +# apply grep to stderr (by swapping stdin/stderr twice). +if test -z "$NIX_CC_NEEDS_GREP"; then + @gccProg@ ${extraBefore[@]} "${params[@]}" ${extraAfter[@]} +else + (@gccProg@ ${extraBefore[@]} "${params[@]}" ${extraAfter[@]} 3>&2 2>&1 1>&3- \ + | (grep -v 'file path prefix' || true); exit ${PIPESTATUS[0]}) 3>&2 2>&1 1>&3- + exit $? +fi diff --git a/pkgs/build-support/gcc-wrapper-old/gnat-wrapper.sh b/pkgs/build-support/gcc-wrapper-old/gnat-wrapper.sh new file mode 100644 index 00000000000..f6fa4b18400 --- /dev/null +++ b/pkgs/build-support/gcc-wrapper-old/gnat-wrapper.sh @@ -0,0 +1,113 @@ +#! @shell@ -e + +if test -n "$NIX_GNAT_WRAPPER_START_HOOK"; then + source "$NIX_GNAT_WRAPPER_START_HOOK" +fi + +if test -z "$NIX_GNAT_WRAPPER_FLAGS_SET"; then + source @out@/nix-support/add-flags.sh +fi + +source @out@/nix-support/utils.sh + + +# Figure out if linker flags should be passed. GCC prints annoying +# warnings when they are not needed. +dontLink=0 +getVersion=0 +nonFlagArgs=0 + +for i in "$@"; do + if test "$i" = "-c"; then + dontLink=1 + elif test "$i" = "-M"; then + dontLink=1 + elif test "${i:0:1}" != "-"; then + nonFlagArgs=1 + elif test "$i" = "-m32"; then + if test -e @out@/nix-support/dynamic-linker-m32; then + NIX_LDFLAGS="$NIX_LDFLAGS -dynamic-linker $(cat @out@/nix-support/dynamic-linker-m32)" + fi + fi +done + +# If we pass a flag like -Wl, then gcc will call the linker unless it +# can figure out that it has to do something else (e.g., because of a +# "-c" flag). So if no non-flag arguments are given, don't pass any +# linker flags. This catches cases like "gcc" (should just print +# "gcc: no input files") and "gcc -v" (should print the version). +if test "$nonFlagArgs" = "0"; then + dontLink=1 +fi + + +# Optionally filter out paths not refering to the store. +params=("$@") +if test "$NIX_ENFORCE_PURITY" = "1" -a -n "$NIX_STORE"; then + rest=() + n=0 + while test $n -lt ${#params[*]}; do + p=${params[n]} + p2=${params[$((n+1))]} + if test "${p:0:3}" = "-L/" && badPath "${p:2}"; then + skip $p + elif test "${p:0:3}" = "-I/" && badPath "${p:2}"; then + skip $p + elif test "${p:0:4}" = "-aI/" && badPath "${p:3}"; then + skip $p + elif test "${p:0:4}" = "-aO/" && badPath "${p:3}"; then + skip $p + else + rest=("${rest[@]}" "$p") + fi + n=$((n + 1)) + done + params=("${rest[@]}") +fi + + +# Add the flags for the GNAT compiler proper. +extraAfter=($NIX_GNATFLAGS_COMPILE) +extraBefore=() + +if [ "`basename $0`x" = "gnatmakex" ]; then + extraBefore=("--GNATBIND=@out@/bin/gnatbind --GNATLINK=@out@/bin/gnatlink ") +fi + +# Add the flags that should be passed to the linker (and prevent +# `ld-wrapper' from adding NIX_LDFLAGS again). +#for i in $NIX_LDFLAGS_BEFORE; do +# extraBefore=(${extraBefore[@]} "-largs $i") +#done + +# Optionally print debug info. +if test "$NIX_DEBUG" = "1"; then + echo "original flags to @gnatProg@:" >&2 + for i in "${params[@]}"; do + echo " $i" >&2 + done + echo "extraBefore flags to @gnatProg@:" >&2 + for i in ${extraBefore[@]}; do + echo " $i" >&2 + done + echo "extraAfter flags to @gnatProg@:" >&2 + for i in ${extraAfter[@]}; do + echo " $i" >&2 + done +fi + +if test -n "$NIX_GNAT_WRAPPER_EXEC_HOOK"; then + source "$NIX_GNAT_WRAPPER_EXEC_HOOK" +fi + + +# Call the real `gcc'. Filter out warnings from stderr about unused +# `-B' flags, since they confuse some programs. Deep bash magic to +# apply grep to stderr (by swapping stdin/stderr twice). +if test -z "$NIX_GNAT_NEEDS_GREP"; then + @gnatProg@ ${extraBefore[@]} "${params[@]}" ${extraAfter[@]} +else + (@gnatProg@ ${extraBefore[@]} "${params[@]}" ${extraAfter[@]} 3>&2 2>&1 1>&3- \ + | (grep -v 'file path prefix' || true); exit ${PIPESTATUS[0]}) 3>&2 2>&1 1>&3- + exit $? +fi diff --git a/pkgs/build-support/gcc-wrapper-old/gnatlink-wrapper.sh b/pkgs/build-support/gcc-wrapper-old/gnatlink-wrapper.sh new file mode 100644 index 00000000000..25907108b4d --- /dev/null +++ b/pkgs/build-support/gcc-wrapper-old/gnatlink-wrapper.sh @@ -0,0 +1,43 @@ +#! @shell@ -e + +# Add the flags for the GNAT compiler proper. +extraAfter="--GCC=@out@/bin/gcc" +extraBefore=() + +# Add the flags that should be passed to the linker (and prevent +# `ld-wrapper' from adding NIX_LDFLAGS again). +#for i in $NIX_LDFLAGS_BEFORE; do +# extraBefore=(${extraBefore[@]} "-largs $i") +#done + +# Optionally print debug info. +if test "$NIX_DEBUG" = "1"; then + echo "original flags to @gnatlinkProg@:" >&2 + for i in "$@"; do + echo " $i" >&2 + done + echo "extraBefore flags to @gnatlinkProg@:" >&2 + for i in ${extraBefore[@]}; do + echo " $i" >&2 + done + echo "extraAfter flags to @gnatlinkProg@:" >&2 + for i in ${extraAfter[@]}; do + echo " $i" >&2 + done +fi + +if test -n "$NIX_GNAT_WRAPPER_EXEC_HOOK"; then + source "$NIX_GNAT_WRAPPER_EXEC_HOOK" +fi + + +# Call the real `gcc'. Filter out warnings from stderr about unused +# `-B' flags, since they confuse some programs. Deep bash magic to +# apply grep to stderr (by swapping stdin/stderr twice). +if test -z "$NIX_GNAT_NEEDS_GREP"; then + @gnatlinkProg@ ${extraBefore[@]} "$@" ${extraAfter[@]} +else + (@gnatlinkProg@ ${extraBefore[@]} "$@" ${extraAfter[@]} 3>&2 2>&1 1>&3- \ + | (grep -v 'file path prefix' || true); exit ${PIPESTATUS[0]}) 3>&2 2>&1 1>&3- + exit $? +fi diff --git a/pkgs/build-support/gcc-wrapper-old/ld-solaris-wrapper.sh b/pkgs/build-support/gcc-wrapper-old/ld-solaris-wrapper.sh new file mode 100644 index 00000000000..5a7b92b5ad7 --- /dev/null +++ b/pkgs/build-support/gcc-wrapper-old/ld-solaris-wrapper.sh @@ -0,0 +1,40 @@ +#!/bin/bash + +set -e +set -u + +# I've also tried adding -z direct and -z lazyload, but it gave too many problems with C++ exceptions :'( +# Also made sure libgcc would not be lazy-loaded, as suggested here: https://www.illumos.org/issues/2534#note-3 +# but still no success. +cmd="@ld@ -z ignore" + +args=("$@"); + +# This loop makes sure all -L arguments are before -l arguments, or ld may complain it cannot find a library. +# GNU binutils does not have this problem: +# http://stackoverflow.com/questions/5817269/does-the-order-of-l-and-l-options-in-the-gnu-linker-matter +i=0; +while [[ $i -lt $# ]]; do + case "${args[$i]}" in + -L) cmd="$cmd ${args[$i]} ${args[($i+1)]}"; i=($i+1); ;; + -L*) cmd="$cmd ${args[$i]}" ;; + *) ;; + esac + i=($i+1); +done + +i=0; +while [[ $i -lt $# ]]; do + case "${args[$i]}" in + -L) i=($i+1); ;; + -L*) ;; + *) cmd="$cmd ${args[$i]}" ;; + esac + i=($i+1); +done + +# Trace: +set -x +exec $cmd + +exit 0 diff --git a/pkgs/build-support/gcc-wrapper-old/ld-wrapper.sh b/pkgs/build-support/gcc-wrapper-old/ld-wrapper.sh new file mode 100644 index 00000000000..db50d25cb3b --- /dev/null +++ b/pkgs/build-support/gcc-wrapper-old/ld-wrapper.sh @@ -0,0 +1,166 @@ +#! @shell@ -e + +if test -n "$NIX_LD_WRAPPER_START_HOOK"; then + source "$NIX_LD_WRAPPER_START_HOOK" +fi + +if test -z "$NIX_CC_WRAPPER_FLAGS_SET"; then + source @out@/nix-support/add-flags.sh +fi + +source @out@/nix-support/utils.sh + + +# Optionally filter out paths not refering to the store. +params=("$@") +if test "$NIX_ENFORCE_PURITY" = "1" -a -n "$NIX_STORE" \ + -a \( -z "$NIX_IGNORE_LD_THROUGH_GCC" -o -z "$NIX_LDFLAGS_SET" \); then + rest=() + n=0 + while test $n -lt ${#params[*]}; do + p=${params[n]} + p2=${params[$((n+1))]} + if test "${p:0:3}" = "-L/" && badPath "${p:2}"; then + skip $p + elif test "$p" = "-L" && badPath "$p2"; then + n=$((n + 1)); skip $p2 + elif test "$p" = "-rpath" && badPath "$p2"; then + n=$((n + 1)); skip $p2 + elif test "$p" = "-dynamic-linker" && badPath "$p2"; then + n=$((n + 1)); skip $p2 + elif test "${p:0:1}" = "/" && badPath "$p"; then + # We cannot skip this; barf. + echo "impure path \`$p' used in link" >&2 + exit 1 + elif test "${p:0:9}" = "--sysroot"; then + # Our ld is not built with sysroot support (Can we fix that?) + : + else + rest=("${rest[@]}" "$p") + fi + n=$((n + 1)) + done + params=("${rest[@]}") +fi + + +extra=() +extraBefore=() + +if test -z "$NIX_LDFLAGS_SET"; then + extra+=($NIX_LDFLAGS) + extraBefore+=($NIX_LDFLAGS_BEFORE) +fi + +extra+=($NIX_LDFLAGS_AFTER) + + +# Add all used dynamic libraries to the rpath. +if test "$NIX_DONT_SET_RPATH" != "1"; then + + libPath="" + addToLibPath() { + local path="$1" + if test "${path:0:1}" != "/"; then return 0; fi + case "$path" in + *..*|*./*|*/.*|*//*) + local path2 + if path2=$(readlink -f "$path"); then + path="$path2" + fi + ;; + esac + case $libPath in + *\ $path\ *) return 0 ;; + esac + libPath="$libPath $path " + } + + addToRPath() { + # If the path is not in the store, don't add it to the rpath. + # This typically happens for libraries in /tmp that are later + # copied to $out/lib. If not, we're screwed. + if test "${1:0:${#NIX_STORE}}" != "$NIX_STORE"; then return 0; fi + case $rpath in + *\ $1\ *) return 0 ;; + esac + rpath="$rpath $1 " + } + + libs="" + addToLibs() { + libs="$libs $1" + } + + rpath="" + + # First, find all -L... switches. + allParams=("${params[@]}" ${extra[@]}) + n=0 + while test $n -lt ${#allParams[*]}; do + p=${allParams[n]} + p2=${allParams[$((n+1))]} + if test "${p:0:3}" = "-L/"; then + addToLibPath ${p:2} + elif test "$p" = "-L"; then + addToLibPath ${p2} + n=$((n + 1)) + elif test "$p" = "-l"; then + addToLibs ${p2} + n=$((n + 1)) + elif test "${p:0:2}" = "-l"; then + addToLibs ${p:2} + elif test "$p" = "-dynamic-linker"; then + # Ignore the dynamic linker argument, or it + # will get into the next 'elif'. We don't want + # the dynamic linker path rpath to go always first. + n=$((n + 1)) + elif [[ "$p" =~ ^[^-].*\.so($|\.) ]]; then + # This is a direct reference to a shared library, so add + # its directory to the rpath. + path="$(dirname "$p")"; + addToRPath "${path}" + fi + n=$((n + 1)) + done + + # Second, for each directory in the library search path (-L...), + # see if it contains a dynamic library used by a -l... flag. If + # so, add the directory to the rpath. + # It's important to add the rpath in the order of -L..., so + # the link time chosen objects will be those of runtime linking. + + for i in $libPath; do + for j in $libs; do + if test -f "$i/lib$j.so"; then + addToRPath $i + break + fi + done + done + + + # Finally, add `-rpath' switches. + for i in $rpath; do + extra=(${extra[@]} -rpath $i) + done +fi + + +# Optionally print debug info. +if test "$NIX_DEBUG" = "1"; then + echo "original flags to @ld@:" >&2 + for i in "${params[@]}"; do + echo " $i" >&2 + done + echo "extra flags to @ld@:" >&2 + for i in ${extra[@]}; do + echo " $i" >&2 + done +fi + +if test -n "$NIX_LD_WRAPPER_EXEC_HOOK"; then + source "$NIX_LD_WRAPPER_EXEC_HOOK" +fi + +exec @ld@ ${extraBefore[@]} "${params[@]}" ${extra[@]} diff --git a/pkgs/build-support/gcc-wrapper-old/setup-hook.sh b/pkgs/build-support/gcc-wrapper-old/setup-hook.sh new file mode 100644 index 00000000000..298ade21d1f --- /dev/null +++ b/pkgs/build-support/gcc-wrapper-old/setup-hook.sh @@ -0,0 +1,33 @@ +addCVars () { + if test -d $1/include; then + export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -isystem $1/include" + fi + + if test -d $1/lib64; then + export NIX_LDFLAGS="$NIX_LDFLAGS -L$1/lib64" + fi + + if test -d $1/lib; then + export NIX_LDFLAGS="$NIX_LDFLAGS -L$1/lib" + fi +} + +envHooks=(${envHooks[@]} addCVars) + +# Note: these come *after* $out in the PATH (see setup.sh). + +if test -n "@gcc@"; then + addToSearchPath PATH @gcc@/bin +fi + +if test -n "@binutils@"; then + addToSearchPath PATH @binutils@/bin +fi + +if test -n "@libc@"; then + addToSearchPath PATH @libc@/bin +fi + +if test -n "@coreutils@"; then + addToSearchPath PATH @coreutils@/bin +fi diff --git a/pkgs/build-support/gcc-wrapper-old/utils.sh b/pkgs/build-support/gcc-wrapper-old/utils.sh new file mode 100644 index 00000000000..753b3772e95 --- /dev/null +++ b/pkgs/build-support/gcc-wrapper-old/utils.sh @@ -0,0 +1,24 @@ +skip () { + if test "$NIX_DEBUG" = "1"; then + echo "skipping impure path $1" >&2 + fi +} + + +# Checks whether a path is impure. E.g., `/lib/foo.so' is impure, but +# `/nix/store/.../lib/foo.so' isn't. +badPath() { + local p=$1 + + # Relative paths are okay (since they're presumably relative to + # the temporary build directory). + if test "${p:0:1}" != "/"; then return 1; fi + + # Otherwise, the path should refer to the store or some temporary + # directory (including the build directory). + test \ + "$p" != "/dev/null" -a \ + "${p:0:${#NIX_STORE}}" != "$NIX_STORE" -a \ + "${p:0:4}" != "/tmp" -a \ + "${p:0:${#NIX_BUILD_TOP}}" != "$NIX_BUILD_TOP" +} diff --git a/pkgs/build-support/gcc-wrapper/add-flags b/pkgs/build-support/gcc-wrapper/add-flags index d75f378e2c9..be79fc370ec 100644 --- a/pkgs/build-support/gcc-wrapper/add-flags +++ b/pkgs/build-support/gcc-wrapper/add-flags @@ -25,4 +25,4 @@ if [ -e @out@/nix-support/libc-ldflags-before ]; then export NIX_LDFLAGS_BEFORE="$(cat @out@/nix-support/libc-ldflags-before) $NIX_LDFLAGS_BEFORE" fi -export NIX_GCC_WRAPPER_FLAGS_SET=1 +export NIX_CC_WRAPPER_FLAGS_SET=1 diff --git a/pkgs/build-support/gcc-wrapper/default.nix b/pkgs/build-support/gcc-wrapper/default.nix index b2f7d07560d..aed1ab817aa 100644 --- a/pkgs/build-support/gcc-wrapper/default.nix +++ b/pkgs/build-support/gcc-wrapper/default.nix @@ -226,7 +226,7 @@ stdenv.mkDerivation { crossAttrs = { shell = shell.crossDrv + shell.crossDrv.shellPath; - libc = stdenv.gccCross.libc; + libc = stdenv.ccCross.libc; coreutils = coreutils.crossDrv; binutils = binutils.crossDrv; gcc = gcc.crossDrv; diff --git a/pkgs/build-support/gcc-wrapper/gcc-wrapper.sh b/pkgs/build-support/gcc-wrapper/gcc-wrapper.sh index d0c82c82dc1..c918cc30d9a 100644 --- a/pkgs/build-support/gcc-wrapper/gcc-wrapper.sh +++ b/pkgs/build-support/gcc-wrapper/gcc-wrapper.sh @@ -1,10 +1,10 @@ #! @shell@ -e -if [ -n "$NIX_GCC_WRAPPER_START_HOOK" ]; then - source "$NIX_GCC_WRAPPER_START_HOOK" +if [ -n "$NIX_CC_WRAPPER_START_HOOK" ]; then + source "$NIX_CC_WRAPPER_START_HOOK" fi -if [ -z "$NIX_GCC_WRAPPER_FLAGS_SET" ]; then +if [ -z "$NIX_CC_WRAPPER_FLAGS_SET" ]; then source @out@/nix-support/add-flags.sh fi @@ -139,8 +139,8 @@ if [ -n "$NIX_DEBUG" ]; then done fi -if [ -n "$NIX_GCC_WRAPPER_EXEC_HOOK" ]; then - source "$NIX_GCC_WRAPPER_EXEC_HOOK" +if [ -n "$NIX_CC_WRAPPER_EXEC_HOOK" ]; then + source "$NIX_CC_WRAPPER_EXEC_HOOK" fi exec @prog@ ${extraBefore[@]} "${params[@]}" "${extraAfter[@]}" diff --git a/pkgs/build-support/gcc-wrapper/ld-wrapper.sh b/pkgs/build-support/gcc-wrapper/ld-wrapper.sh index 894dbf9a352..30c531b7647 100644 --- a/pkgs/build-support/gcc-wrapper/ld-wrapper.sh +++ b/pkgs/build-support/gcc-wrapper/ld-wrapper.sh @@ -4,7 +4,7 @@ if [ -n "$NIX_LD_WRAPPER_START_HOOK" ]; then source "$NIX_LD_WRAPPER_START_HOOK" fi -if [ -z "$NIX_GCC_WRAPPER_FLAGS_SET" ]; then +if [ -z "$NIX_CC_WRAPPER_FLAGS_SET" ]; then source @out@/nix-support/add-flags.sh fi diff --git a/pkgs/build-support/gcc-wrapper/setup-hook.sh b/pkgs/build-support/gcc-wrapper/setup-hook.sh index a6b7edbcb69..fc10e8fb2c3 100644 --- a/pkgs/build-support/gcc-wrapper/setup-hook.sh +++ b/pkgs/build-support/gcc-wrapper/setup-hook.sh @@ -1,4 +1,4 @@ -export NIX_GCC=@out@ +export NIX_CC=@out@ addCVars () { if [ -d $1/include ]; then @@ -33,3 +33,6 @@ fi if [ -n "@coreutils@" ]; then addToSearchPath PATH @coreutils@/bin fi + +export CC=gcc +export CXX=g++ diff --git a/pkgs/build-support/setup-hooks/autoreconf.sh b/pkgs/build-support/setup-hooks/autoreconf.sh index f70a1087084..441d6b43baa 100644 --- a/pkgs/build-support/setup-hooks/autoreconf.sh +++ b/pkgs/build-support/setup-hooks/autoreconf.sh @@ -1,11 +1,11 @@ preConfigurePhases+=" autoreconfPhase" -for i in @autoconf@ @automake@ @libtool@; do +for i in @autoconf@ @automake@ @libtool@ @gettext@; do findInputs $i nativePkgs propagated-native-build-inputs done autoreconfPhase() { runHook preAutoreconf - autoreconf ${autoreconfFlags:---install --force} + autoreconf ${autoreconfFlags:---install --force --verbose} runHook postAutoreconf } diff --git a/pkgs/build-support/setup-hooks/find-xml-catalogs.sh b/pkgs/build-support/setup-hooks/find-xml-catalogs.sh new file mode 100644 index 00000000000..b742d5a8ffd --- /dev/null +++ b/pkgs/build-support/setup-hooks/find-xml-catalogs.sh @@ -0,0 +1,22 @@ +addXMLCatalogs () { + local d i + # ‘xml/dtd’ and ‘xml/xsl’ are deprecated. Catalogs should be + # installed underneath ‘share/xml’. + for d in $1/share/xml $1/xml/dtd $1/xml/xsl; do + if [ -d $d ]; then + for i in $(find $d -name catalog.xml); do + XML_CATALOG_FILES+=" $i" + done + fi + done +} + +if [ -z "$libxmlHookDone" ]; then + libxmlHookDone=1 + + # Set up XML_CATALOG_FILES. An empty initial value prevents + # xmllint and xsltproc from looking in /etc/xml/catalog. + export XML_CATALOG_FILES + if [ -z "$XML_CATALOG_FILES" ]; then XML_CATALOG_FILES=" "; fi + envHooks+=(addXMLCatalogs) +fi diff --git a/pkgs/build-support/setup-hooks/move-lib64.sh b/pkgs/build-support/setup-hooks/move-lib64.sh index 46c90fcea6b..7724be369c9 100644 --- a/pkgs/build-support/setup-hooks/move-lib64.sh +++ b/pkgs/build-support/setup-hooks/move-lib64.sh @@ -3,6 +3,7 @@ # $output/lib. The rationale is that lib64 directories are unnecessary # in Nix (since 32-bit and 64-bit builds of a package are in different # store paths anyway). +# If the move would overwrite anything, it should fail on rmdir. fixupOutputHooks+=(_moveLib64) @@ -13,7 +14,7 @@ _moveLib64() { mkdir -p $prefix/lib shopt -s dotglob for i in $prefix/lib64/*; do - mv "$i" $prefix/lib + mv --no-clobber "$i" $prefix/lib done shopt -u dotglob rmdir $prefix/lib64 diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix index 962f9f6a10f..8ee489a30d1 100644 --- a/pkgs/build-support/vm/default.nix +++ b/pkgs/build-support/vm/default.nix @@ -1517,11 +1517,11 @@ rec { packagesLists = [ (fetchurl { url = mirror://ubuntu/dists/utopic/main/binary-i386/Packages.bz2; - sha256 = "d703032d9291783772c790c17d428ea6cf6d04c3baac5159e623ae60b681e64e"; + sha256 = "dc33a906ccb5625740251da759393d7daace65013d421c79fdd6c99a6490d989"; }) (fetchurl { url = mirror://ubuntu/dists/utopic/universe/binary-i386/Packages.bz2; - sha256 = "cc9232b7fd937bd8894ad6daf28bd4b2a7428e09a0c1661c708e846b3af24ec8"; + sha256 = "e50553c033d9e478507405e63ce7d43c8060368ea851eca0c93b75b72fd85167"; }) ]; urlPrefix = mirror://ubuntu; @@ -1534,11 +1534,11 @@ rec { packagesList = [ (fetchurl { url = mirror://ubuntu/dists/utopic/main/binary-amd64/Packages.bz2; - sha256 = "56b5cce1a2c8ae1ea46b1d4c50345f0fc8f1108a8db27f6dd8409d566eb517c9"; + sha256 = "9650775abec90a24c26dbb03f91a488180309144338f64f7044f7119d60d7182"; }) (fetchurl { url = mirror://ubuntu/dists/utopic/universe/binary-amd64/Packages.bz2; - sha256 = "66ca2bf3363b4b45b97e5f5047bd736947d672c31693ed78bacd36e63b19bb63"; + sha256 = "2acf0e39e64b4fd6d2b68b55c598fc167d7c3cabae233fc31a1e6b69eb6ecc63"; }) ]; urlPrefix = mirror://ubuntu; diff --git a/pkgs/data/fonts/dina/default.nix b/pkgs/data/fonts/dina/default.nix new file mode 100644 index 00000000000..da7a1bc5fb9 --- /dev/null +++ b/pkgs/data/fonts/dina/default.nix @@ -0,0 +1,61 @@ +{stdenv, fetchurl, unzip, bdftopcf, mkfontdir, mkfontscale}: + +stdenv.mkDerivation rec { + version = "2.92"; + name = "dina-font-${version}"; + + src = fetchurl { + url = "http://www.donationcoder.com/Software/Jibz/Dina/downloads/Dina.zip"; + sha256 = "1kq86lbxxgik82aywwhawmj80vsbz3hfhdyhicnlv9km7yjvnl8z"; + }; + + buildInputs = [ unzip bdftopcf mkfontdir mkfontscale ]; + + dontBuild = true; + patchPhase = "sed -i 's/microsoft-cp1252/ISO8859-1/' *.bdf"; + installPhase = '' + _get_font_size() { + _pt=$\{1%.bdf} + _pt=$\{_pt#*-} + echo $_pt + } + + for i in Dina_i400-*.bdf; do + bdftopcf -t -o DinaItalic$(_get_font_size $i).pcf $i + done + for i in Dina_i700-*.bdf; do + bdftopcf -t -o DinaBoldItalic$(_get_font_size $i).pcf $i + done + for i in Dina_r400-*.bdf; do + bdftopcf -t -o DinaMedium$(_get_font_size $i).pcf $i + done + for i in Dina_r700-*.bdf; do + bdftopcf -t -o DinaBold$(_get_font_size $i).pcf $i + done + gzip *.pcf + + fontDir="$out/share/fonts/misc" + mkdir -p "$fontDir" + mv *.pcf.gz "$fontDir" + + cd "$fontDir" + mkfontdir + mkfontscale + ''; + + preferLocalBuild = true; + + meta = with stdenv.lib; { + description = "A monospace bitmap font aimed at programmers."; + longDescription = '' + Dina is a monospace bitmap font, primarily aimed at programmers. It is + relatively compact to allow a lot of code on screen, while (hopefully) + clear enough to remain readable even at high resolutions. + ''; + homepage = https://www.donationcoder.com/Software/Jibz/Dina/; + downloadPage = https://www.donationcoder.com/Software/Jibz/Dina/; + license = licenses.free; + maintainers = [ maintainers.prikhi ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/data/fonts/gyre/default.nix b/pkgs/data/fonts/gyre/default.nix new file mode 100644 index 00000000000..46b947ce77a --- /dev/null +++ b/pkgs/data/fonts/gyre/default.nix @@ -0,0 +1,38 @@ +{stdenv, fetchurl, unzip}: + +stdenv.mkDerivation rec { + baseName = "gyre-fonts"; + version = "2.005"; + name="${baseName}-${version}"; + + src = fetchurl { + url = "http://www.gust.org.pl/projects/e-foundry/tex-gyre/whole/tg-2.005otf.zip"; + sha256 = "0kph9l3g7jb2bpmxdbdg5zl56wacmnvdvsdn7is1gc750sqvsn31"; + }; + + buildInputs = [unzip]; + + sourceRoot = "."; + + installPhase = '' + mkdir -p $out/share/fonts/truetype + cp *.otf $out/share/fonts/truetype + ''; + + meta = { + description = "OpenType fonts from the Gyre project, suitable for use with (La)TeX"; + + longDescription = ''The Gyre project started in 2006, and will + eventually include enhanced releases of all 35 freely available + PostScript fonts distributed with Ghostscript v4.00. These are + being converted to OpenType and extended with diacritical marks + covering all modern European languages and then some''; + + homepage = "http://www.gust.org.pl/projects/e-foundry/tex-gyre/index_html#Readings"; + + license = stdenv.lib.licenses.lppl13c; + + platforms = stdenv.lib.platforms.all; + maintainers = with stdenv.lib.maintainers; [ bergey ]; + }; +} diff --git a/pkgs/data/fonts/league-of-moveable-type/default.nix b/pkgs/data/fonts/league-of-moveable-type/default.nix new file mode 100644 index 00000000000..c592ac2d38b --- /dev/null +++ b/pkgs/data/fonts/league-of-moveable-type/default.nix @@ -0,0 +1,79 @@ +{stdenv, fetchurl, unzip}: + +stdenv.mkDerivation rec { + baseName = "league-of-moveable-type"; + version = "2014-12"; + name="${baseName}-${version}"; + + srcs = [(fetchurl { + url = "https://www.theleagueofmoveabletype.com/league-gothic/download"; + sha256 = "0nbwsbwhs375kbis3lpk98dw05mnh455vghjg1cq0j2fsj1zb99b"; + name = "league-gothic.zip"; + }) + + (fetchurl { + url = "https://www.theleagueofmoveabletype.com/fanwood/download"; + sha256 = "1023da7hik8ci8s7rcy6lh4h9p6igx1kz9y1a2cv6sizbp819w8g"; + name = "fanwood.zip"; + }) + + (fetchurl { + url = "https://www.theleagueofmoveabletype.com/linden-hill/download"; + sha256 = "0rm92rz9kki91l5wcn149mdpwq1mfql4dv6d159hv534qmg3z3ks"; + name = "linden-hill.zip"; + }) + + (fetchurl { + url = "https://www.theleagueofmoveabletype.com/raleway/download"; + sha256 = "0f6anym0adq0ankqbdqx4lyzbysx824zqdj1x60gafyisjx48y87"; + name = "raleway.zip"; + }) + + (fetchurl { + url = "https://www.theleagueofmoveabletype.com/prociono/download"; + sha256 = "11hamjry5lx3cykzpjq7kwlp6h9cjqy470fmn9f2pi954b46xkdy"; + name = "prociono.zip"; + }) + + (fetchurl { + url = "https://www.theleagueofmoveabletype.com/goudy-bookletter-1911/download"; + sha256 = "01qganq5n7rgqw546lf45kj8j7ymfjr00i2bwp3qw7ibifg9pn4n"; + name = "goudy-bookletter-1911.zip"; + }) + + (fetchurl { + url = "https://www.theleagueofmoveabletype.com/sorts-mill-goudy/download"; + sha256 = "11aywj5lzapk04k2yzi1g96acbbm48x902ka0v9cfwwqpn6js9ra"; + name = "sorts-mill-goudy.zip"; + }) + + +]; + + buildInputs = [unzip]; + + sourceRoot = "."; + + installPhase = '' + mkdir -p $out/share/fonts/truetype + cp */*.otf $out/share/fonts/truetype + ''; + + + meta = { + description = "Font Collection by The League of Moveable Type"; + + longDescription = '' We're done with the tired old fontstacks of + yesteryear. The web is no longer limited, and now it's time to raise + our standards. Since 2009, The League has given only the most + well-made, free & open-source, @font-face ready fonts. + ''; + + homepage = "https://www.theleagueofmoveabletype.com/"; + + license = stdenv.lib.licenses.ofl; + + platforms = stdenv.lib.platforms.all; + maintainers = with stdenv.lib.maintainers; [ bergey ]; + }; +} diff --git a/pkgs/data/fonts/nafees/default.nix b/pkgs/data/fonts/nafees/default.nix index aa0c1dbd77b..bcbf5749810 100644 --- a/pkgs/data/fonts/nafees/default.nix +++ b/pkgs/data/fonts/nafees/default.nix @@ -54,6 +54,6 @@ stdenv.mkDerivation rec { license = "unknown"; platforms = stdenv.lib.platforms.all; - maintainers = [ "Daniel Bergey " ]; + maintainers = with stdenv.lib.maintainers; [ bergey ]; }; } diff --git a/pkgs/data/sgml+xml/schemas/docbook-5.0/builder.sh b/pkgs/data/sgml+xml/schemas/docbook-5.0/builder.sh deleted file mode 100644 index 96ad77eaa57..00000000000 --- a/pkgs/data/sgml+xml/schemas/docbook-5.0/builder.sh +++ /dev/null @@ -1,17 +0,0 @@ -source $stdenv/setup - -unpackFile $src - -cd docbook-* - -mkdir -p $out/xml/rng -cp -prv rng $out/xml/rng/docbook - -mkdir -p $out/xml/dtd -cp -prv dtd $out/xml/dtd/docbook - -mkdir -p $out/share/doc -cp -prv docs $out/share/doc/docbook - -mkdir -p $out/share/docbook -cp -prv tools $out/share/docbook/ diff --git a/pkgs/data/sgml+xml/schemas/docbook-5.0/default.nix b/pkgs/data/sgml+xml/schemas/docbook-5.0/default.nix index 1e0103a9305..a9d09945d7f 100644 --- a/pkgs/data/sgml+xml/schemas/docbook-5.0/default.nix +++ b/pkgs/data/sgml+xml/schemas/docbook-5.0/default.nix @@ -1,13 +1,35 @@ -{stdenv, fetchurl, unzip}: +{ lib, stdenv, fetchurl, unzip }: stdenv.mkDerivation { name = "docbook5-5.0"; - builder = ./builder.sh; src = fetchurl { url = http://www.docbook.org/xml/5.0/docbook-5.0.zip; sha256 = "13i04dkd709f0p5f2413sf2y9321pfi4y85ynf8wih6ryphnbk9x"; }; - buildInputs = [unzip]; + buildInputs = [ unzip ]; + + installPhase = + '' + dst=$out/share/xml/docbook-5.0 + mkdir -p $dst + cp -prv * $dst/ + + substituteInPlace $dst/catalog.xml --replace 'uri="' "uri=\"$dst/" + + rm -rf $dst/docs $dst/ChangeLog + + # Backwards compatibility. Will remove eventually. + mkdir -p $out/xml/rng $out/xml/dtd + ln -s $dst/rng $out/xml/rng/docbook + ln -s $dst/dtd $out/xml/dtd/docbook + ''; + + meta = { + description = "Schemas for DocBook 5.0, a semantic markup language for technical documentation"; + homepage = http://docbook.org/xml/5.0/; + maintainers = [ lib.maintainers.eelco ]; + platforms = lib.platforms.all; + }; } diff --git a/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl-ns/default.nix b/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl-ns/default.nix index bfe454a49fe..36d2cc48c9f 100644 --- a/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl-ns/default.nix +++ b/pkgs/data/sgml+xml/stylesheets/xslt/docbook-xsl-ns/default.nix @@ -1,8 +1,8 @@ -{stdenv, fetchurl}: +{ lib, stdenv, fetchurl }: stdenv.mkDerivation rec { name = "docbook-xsl-ns-1.78.1"; - + src = fetchurl { url = "mirror://sourceforge/docbook/${name}.tar.bz2"; sha256 = "1x3sc0axk9z3i6n0jhlsmzlmb723a4sjgslm9g12by6phirdx3ng"; @@ -12,13 +12,20 @@ stdenv.mkDerivation rec { installPhase = '' + dst=$out/share/xml/docbook-xsl-ns + mkdir -p $dst + rm -rf RELEASE* README* INSTALL TODO NEWS* BUGS install.sh svn* tools log Makefile tests extensions webhelp + mv * $dst/ + + # Backwards compatibility. Will remove eventually. mkdir -p $out/xml/xsl - cd .. - mv docbook-xsl-ns-* $out/xml/xsl/docbook + ln -s $dst $out/xml/xsl/docbook ''; meta = { homepage = http://wiki.docbook.org/topic/DocBookXslStylesheets; description = "XSL stylesheets for transforming DocBook documents into HTML and various other formats"; + maintainers = [ lib.maintainers.eelco ]; + platforms = lib.platforms.all; }; } diff --git a/pkgs/desktops/e19/default.nix b/pkgs/desktops/e19/default.nix index 5740337a11a..9c862734dcc 100644 --- a/pkgs/desktops/e19/default.nix +++ b/pkgs/desktops/e19/default.nix @@ -22,5 +22,6 @@ rec { #### APPLICATIONS econnman = callPackage ./econnman.nix { }; terminology = callPackage ./terminology.nix { }; + rage = callPackage ./rage.nix { }; } diff --git a/pkgs/desktops/e19/econnman.nix b/pkgs/desktops/e19/econnman.nix index 0c09317d24f..c29a57af54a 100644 --- a/pkgs/desktops/e19/econnman.nix +++ b/pkgs/desktops/e19/econnman.nix @@ -8,9 +8,9 @@ stdenv.mkDerivation rec { }; buildInputs = [ makeWrapper pkgconfig e19.efl python27 dbus ]; - propagatedBuildInputs = [ python27Packages.pythonefl_1_11 python27Packages.dbus e19.elementary ]; + propagatedBuildInputs = [ python27Packages.pythonefl_1_12 python27Packages.dbus e19.elementary ]; postInstall = '' - wrapProgram $out/bin/econnman-bin --prefix PYTHONPATH : ${python27Packages.dbus}/lib/python2.7/site-packages:${python27Packages.pythonefl_1_11}/lib/python2.7/site-packages + wrapProgram $out/bin/econnman-bin --prefix PYTHONPATH : ${python27Packages.dbus}/lib/python2.7/site-packages:${python27Packages.pythonefl_1_12}/lib/python2.7/site-packages ''; meta = { diff --git a/pkgs/desktops/e19/efl.nix b/pkgs/desktops/e19/efl.nix index 2367f47bac4..6dae5f03877 100644 --- a/pkgs/desktops/e19/efl.nix +++ b/pkgs/desktops/e19/efl.nix @@ -1,19 +1,29 @@ -{ stdenv, fetchurl, pkgconfig, openssl, libjpeg, zlib, freetype, fontconfig, fribidi, SDL2, SDL, mesa, giflib, libpng, libtiff, glib, gst_all_1, pulseaudio, libsndfile, xlibs, wayland, libdrm, libxkbcommon, udev, utillinuxCurses, dbus, bullet, luajit, python27Packages, openjpeg, doxygen, expat, lua5_2, harfbuzz, jbig2dec, librsvg, dbus_libs, alsaLib, poppler, libraw, libspectre, xineLib, vlc, libwebp, curl }: +{ stdenv, fetchurl, pkgconfig, openssl, libjpeg, zlib, freetype, fontconfig, fribidi, SDL2, SDL, mesa, giflib, libpng, libtiff, glib, gst_all_1, pulseaudio, libsndfile, xlibs, libdrm, libxkbcommon, udev, utillinuxCurses, dbus, bullet, luajit, python27Packages, openjpeg, doxygen, expat, lua5_2, harfbuzz, jbig2dec, librsvg, dbus_libs, alsaLib, poppler, libraw, libspectre, xineLib, vlc, libwebp, curl }: stdenv.mkDerivation rec { name = "efl-${version}"; - version = "1.11.3"; + version = "1.12.2"; src = fetchurl { url = "http://download.enlightenment.org/rel/libs/efl/${name}.tar.gz"; - sha256 = "0s9pm3lfp7f2yf877xywjw8ihgr2yrns3gibak0gcwx7d8bfljfr"; + sha256 = "1knxm4xiqxpvpszhyqik43lw36hdwdfh8z7y62803a7093j3yjnw"; }; - buildInputs = [ pkgconfig openssl zlib freetype fontconfig fribidi SDL2 SDL mesa giflib libpng libtiff glib gst_all_1.gstreamer gst_all_1.gst-plugins-base gst_all_1.gst-libav pulseaudio libsndfile xlibs.libXcursor xlibs.printproto xlibs.libX11 libdrm udev utillinuxCurses luajit ]; + buildInputs = [ pkgconfig openssl zlib freetype fontconfig fribidi SDL2 SDL mesa + giflib libpng libtiff glib gst_all_1.gstreamer gst_all_1.gst-plugins-base + gst_all_1.gst-libav pulseaudio libsndfile xlibs.libXcursor xlibs.printproto + xlibs.libX11 libdrm udev utillinuxCurses luajit ]; - propagatedBuildInputs = [ wayland libxkbcommon python27Packages.dbus dbus libjpeg xlibs.libXcomposite xlibs.libXdamage xlibs.libXinerama xlibs.libXp xlibs.libXtst xlibs.libXi xlibs.libXext bullet xlibs.libXScrnSaver ] ++ [ xlibs.libXrender xlibs.libXfixes xlibs.libXrandr xlibs.libxkbfile xlibs.libxcb xlibs.xcbutilkeysyms openjpeg doxygen expat lua5_2 harfbuzz jbig2dec librsvg dbus_libs alsaLib poppler libraw libspectre xineLib vlc libwebp curl ]; + propagatedBuildInputs = [ libxkbcommon python27Packages.dbus dbus libjpeg xlibs.libXcomposite + xlibs.libXdamage xlibs.libXinerama xlibs.libXp xlibs.libXtst xlibs.libXi xlibs.libXext + bullet xlibs.libXScrnSaver xlibs.libXrender xlibs.libXfixes xlibs.libXrandr + xlibs.libxkbfile xlibs.libxcb xlibs.xcbutilkeysyms openjpeg doxygen expat lua5_2 + harfbuzz jbig2dec librsvg dbus_libs alsaLib poppler libraw libspectre xineLib vlc libwebp curl ]; - configureFlags = [ "--with-tests=none" "--enable-sdl" "--enable-drm" "--with-opengl=full" "--enable-image-loader-jp2k" "--enable-xinput22" "--enable-multisense" "--enable-systemd" "--enable-image-loader-webp" "--enable-harfbuzz" "--enable-wayland" "--enable-xine" "--enable-fb" "--disable-tslib" "--with-systemdunitdir=$out/systemd/user" ]; + configureFlags = [ "--with-tests=none" "--enable-sdl" "--enable-drm" "--with-opengl=full" + "--enable-image-loader-jp2k" "--enable-xinput22" "--enable-multisense" "--enable-systemd" + "--enable-image-loader-webp" "--enable-harfbuzz" "--enable-xine" "--enable-fb" + "--disable-tslib" "--with-systemdunitdir=$out/systemd/user" "--enable-lua-old" ]; NIX_CFLAGS_COMPILE = [ "-I${xlibs.libXtst}" "-I${dbus_libs}/include/dbus-1.0" "-I${dbus_libs}/lib/dbus-1.0/include" ]; diff --git a/pkgs/desktops/e19/elementary.nix b/pkgs/desktops/e19/elementary.nix index 4ee8c0b1a95..27400513f1b 100644 --- a/pkgs/desktops/e19/elementary.nix +++ b/pkgs/desktops/e19/elementary.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl, pkgconfig, e19, libcap, gdbm }: stdenv.mkDerivation rec { name = "elementary-${version}"; - version = "1.11.3"; + version = "1.12.2"; src = fetchurl { url = "http://download.enlightenment.org/rel/libs/elementary/${name}.tar.gz"; - sha256 = "1yr96imam9sckgagnp7wdvwmvr1xwakw29dih3gxp7nz7xsa0j8k"; + sha256 = "0qjbhdhnw6h5zc05r2w2j38yapcv9km92k5spcw3zsdnc784vf5i"; }; buildInputs = [ pkgconfig e19.efl gdbm ] ++ stdenv.lib.optionals stdenv.isLinux [ libcap ]; preConfigure = '' diff --git a/pkgs/desktops/e19/emotion.nix b/pkgs/desktops/e19/emotion.nix index 269bfe32dbc..96c791d1b93 100644 --- a/pkgs/desktops/e19/emotion.nix +++ b/pkgs/desktops/e19/emotion.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl, pkgconfig, e19, vlc }: stdenv.mkDerivation rec { name = "emotion_generic_players-${version}"; - version = "1.11.0"; + version = "1.12.0"; src = fetchurl { url = "http://download.enlightenment.org/rel/libs/emotion_generic_players/${name}.tar.gz"; - sha256 = "0x6aigsqnfn9vcaj1rj6055s0vh811svzhwz5zghksg4lqipjbjx"; + sha256 = "1nm0qbdkhrpgvmj5qn7l4jj5l1g4zz77bda0ddy67fqkn5h3qarg"; }; buildInputs = [ pkgconfig e19.efl vlc ]; preConfigure = '' diff --git a/pkgs/desktops/e19/enlightenment.nix b/pkgs/desktops/e19/enlightenment.nix index 9faa03a6338..e00d4a66a45 100644 --- a/pkgs/desktops/e19/enlightenment.nix +++ b/pkgs/desktops/e19/enlightenment.nix @@ -1,18 +1,22 @@ -{ stdenv, fetchurl, pkgconfig, e19, xlibs, libffi, pam, alsaLib, luajit, bzip2, libpthreadstubs, gdbm, libcap, set_freqset_setuid ? false }: - - +{ stdenv, fetchurl, pkgconfig, e19, xlibs, libffi, pam, alsaLib, luajit, bzip2 +, libpthreadstubs, gdbm, libcap, mesa_glu, xkeyboard_config, set_freqset_setuid ? false }: stdenv.mkDerivation rec { name = "enlightenment-${version}"; - version = "0.19.1"; + version = "0.19.2"; src = fetchurl { url = "http://download.enlightenment.org/rel/apps/enlightenment/${name}.tar.xz"; - sha256 = "016z1vilhjarpxzn5bwcw696d8b66rklnhkrwzfa5mcxn8gpmvap"; + sha256 = "06il67mlbn24ra6rb7gws5ly67i80lfiprhi5cr71qfmnsr4xbqk"; }; - buildInputs = [ pkgconfig e19.efl e19.elementary xlibs.libXdmcp xlibs.libxcb xlibs.xcbutilkeysyms xlibs.libXrandr libffi pam alsaLib luajit bzip2 libpthreadstubs gdbm ] ++ stdenv.lib.optionals stdenv.isLinux [ libcap ]; + buildInputs = [ pkgconfig e19.efl e19.elementary xlibs.libXdmcp xlibs.libxcb + xlibs.xcbutilkeysyms xlibs.libXrandr libffi pam alsaLib luajit bzip2 + libpthreadstubs gdbm ] ++ stdenv.lib.optionals stdenv.isLinux [ libcap ]; preConfigure = '' export NIX_CFLAGS_COMPILE="-I${e19.efl}/include/eo-1 -I${e19.efl}/include/ecore-imf-1 -I${e19.efl}/include/ethumb-client-1 -I${e19.efl}/include/ethumb-1 $NIX_CFLAGS_COMPILE" export USER_SESSION_DIR=$prefix/lib/systemd/user + + substituteInPlace src/modules/xkbswitch/e_mod_parse.c \ + --replace "/usr/share/X11/xkb/rules/xorg.lst" "${xkeyboard_config}/share/X11/xkb/rules/base.lst" ''; # this is a hack and without this cpufreq module is not working: diff --git a/pkgs/desktops/e19/evas.nix b/pkgs/desktops/e19/evas.nix index 756c7badb07..bc678c6aab8 100644 --- a/pkgs/desktops/e19/evas.nix +++ b/pkgs/desktops/e19/evas.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl, pkgconfig, e19, zlib, libspectre, gstreamer, gst_plugins_base, gst_ffmpeg, gst_plugins_good, poppler, librsvg, libraw }: stdenv.mkDerivation rec { name = "evas_generic_loaders-${version}"; - version = "1.11.2"; + version = "1.12.0"; src = fetchurl { url = "http://download.enlightenment.org/rel/libs/evas_generic_loaders/${name}.tar.gz"; - sha256 = "03p6v7l2fxvldiymqk16pqnbm9llygp6i19qhn3rmrqy1hkjkry6"; + sha256 = "0viph73wv83xw9g6rgjhhiav9n896m0ixnz2m27cnmmn8llchcf5"; }; buildInputs = [ pkgconfig e19.efl zlib libspectre gstreamer gst_plugins_base gst_ffmpeg gst_plugins_good poppler librsvg libraw ]; meta = { diff --git a/pkgs/desktops/e19/rage.nix b/pkgs/desktops/e19/rage.nix new file mode 100644 index 00000000000..6cb6d3d24e8 --- /dev/null +++ b/pkgs/desktops/e19/rage.nix @@ -0,0 +1,45 @@ +{ stdenv, fetchurl, e19, automake, autoconf, libtool, pkgconfig, gst_all_1 +, makeWrapper, lib }: +stdenv.mkDerivation rec { + name = "rage-${version}"; + version = "0.1.0"; + src = fetchurl { + url = "http://download.enlightenment.org/rel/apps/rage/${name}.tar.gz"; + sha256 = "0d87n0rl24s7b8y3bdcg6i3yrzhil5f5vmgrmh451i4y38k84swk"; + }; + buildInputs = [ e19.elementary e19.efl automake autoconf libtool pkgconfig + makeWrapper ]; + NIX_CFLAGS_COMPILE = [ "-I${e19.efl}/include/evas-1" + "-I${e19.efl}/include/ecore-1" + "-I${e19.efl}/include/eina-1" + "-I${e19.efl}/include/eina-1/eina" + "-I${e19.efl}/include/eet-1" + "-I${e19.efl}/include/eo-1" + "-I${e19.efl}/include/ecore-evas-1" + "-I${e19.efl}/include/ecore-imf-1" + "-I${e19.efl}/include/ecore-con-1" + "-I${e19.efl}/include/ecore-file-1" + "-I${e19.efl}/include/ecore-input-1" + "-I${e19.efl}/include/eldbus-1" + "-I${e19.efl}/include/efreet-1" + "-I${e19.efl}/include/ethumb-client-1" + "-I${e19.efl}/include/ethumb-1" ]; + GST_PLUGIN_PATH = lib.makeSearchPath "lib/gstreamer-1.0" [ + gst_all_1.gst-plugins-base + gst_all_1.gst-plugins-good + gst_all_1.gst-plugins-bad ]; + configurePhase = '' + ./autogen.sh --prefix=$out + ''; + postInstall = '' + wrapProgram $out/bin/rage \ + --prefix GST_PLUGIN_PATH : "$GST_PLUGIN_PATH" + ''; + meta = { + description = "Video + Audio player along the lines of mplayer"; + homepage = http://enlightenment.org/; + maintainers = with stdenv.lib.maintainers; [ matejc ]; + platforms = stdenv.lib.platforms.linux; + license = stdenv.lib.licenses.bsd2; + }; +} diff --git a/pkgs/desktops/gnome-3/3.12/apps/gnome-music/default.nix b/pkgs/desktops/gnome-3/3.12/apps/gnome-music/default.nix index c5f9bdb2774..028ab4832ef 100644 --- a/pkgs/desktops/gnome-3/3.12/apps/gnome-music/default.nix +++ b/pkgs/desktops/gnome-3/3.12/apps/gnome-music/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; buildInputs = [ pkgconfig gtk3 glib intltool itstool gnome3.libmediaart - gdk_pixbuf gnome3.gnome_icon_theme librsvg python3 + gdk_pixbuf gnome3.gnome_icon_theme librsvg python3 cairo gnome3.grilo libxml2 python3Packages.pygobject3 libnotify python3Packages.pycairo python3Packages.dbus gnome3.totem-pl-parser gst_all_1.gstreamer gst_all_1.gst-plugins-base @@ -24,19 +24,11 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - preFixup = - let - libPath = stdenv.lib.makeLibraryPath - [ glib gtk3 libnotify tracker gnome3.grilo cairo - gst_all_1.gstreamer gst_all_1.gst-plugins-base gnome3.totem-pl-parser - gst_all_1.gst-plugins-good gst_all_1.gst-plugins-bad ]; - in - '' + preFixup = '' wrapProgram "$out/bin/gnome-music" \ --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" \ --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ - --prefix LD_LIBRARY_PATH : "${libPath}" \ --prefix GST_PLUGIN_SYSTEM_PATH_1_0 : "$GST_PLUGIN_SYSTEM_PATH_1_0" \ --prefix GRL_PLUGIN_PATH : "${gnome3.grilo-plugins}/lib/grilo-0.2" \ --prefix PYTHONPATH : "$PYTHONPATH" diff --git a/pkgs/desktops/gnome-3/3.12/apps/polari/default.nix b/pkgs/desktops/gnome-3/3.12/apps/polari/default.nix new file mode 100644 index 00000000000..6289fd4a6db --- /dev/null +++ b/pkgs/desktops/gnome-3/3.12/apps/polari/default.nix @@ -0,0 +1,35 @@ +{stdenv, fetchurl, makeWrapper, intltool, pkgconfig, gobjectIntrospection, glib +, gtk3, telepathy_glib, gnome3, telepathy_idle, telepathy_logger, libsoup +, gdk_pixbuf, librsvg }: + +stdenv.mkDerivation rec { + name = "polari-3.12.2"; + + src = fetchurl { + url = "https://download.gnome.org/sources/polari/3.12/${name}.tar.xz"; + sha256 = "8b10f369fac9e5e48a7bed51320754262d00c1bb14899a321b02843e20c0a995"; + }; + + buildInputs = [ makeWrapper intltool pkgconfig gobjectIntrospection glib gtk3 + telepathy_glib gnome3.gjs telepathy_logger libsoup + gdk_pixbuf librsvg + gnome3.gnome_icon_theme gnome3.gnome_icon_theme_symbolic ]; + + propagatedUserEnvPkgs = [ telepathy_idle ]; + + preFixup = '' + wrapProgram "$out/bin/polari" \ + --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ + --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" \ + --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" + ''; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + description = "Internet Relay Chat (IRC) client designed for GNOME 3"; + homepage = https://wiki.gnome.org/Apps/Polari; + platforms = platforms.linux; + maintainers = [ maintainers.lethalman ]; + }; +} diff --git a/pkgs/desktops/gnome-3/3.12/core/tracker/default.nix b/pkgs/desktops/gnome-3/3.12/core/tracker/default.nix index cf84f511416..0d5cc4d1427 100644 --- a/pkgs/desktops/gnome-3/3.12/core/tracker/default.nix +++ b/pkgs/desktops/gnome-3/3.12/core/tracker/default.nix @@ -1,8 +1,8 @@ { stdenv, intltool, fetchurl, libxml2, upower -, pkgconfig, gtk3, glib, hicolor_icon_theme -, bash, makeWrapper, itstool, vala, sqlite +, pkgconfig, gtk3, glib, hicolor_icon_theme, gobjectIntrospection +, bash, makeWrapper, itstool, vala, sqlite, automake114x, autoconf , gnome3, librsvg, gdk_pixbuf, file, libnotify -, evolution_data_server, gst_all_1, poppler +, evolution_data_server, gst_all_1, poppler, libtool , icu, taglib, libjpeg, libtiff, giflib, libcue , libvorbis, flac, exempi, networkmanager , libpng, libexif, libgsf, libuuid, bzip2 }: @@ -21,8 +21,13 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + preConfigure = '' + substituteInPlace src/libtracker-sparql/Makefile.am --replace "shared-library=" "shared-library=$out/lib/" + ''; + buildInputs = [ vala pkgconfig gtk3 glib intltool itstool libxml2 - bzip2 gnome3.totem-pl-parser + bzip2 gnome3.totem-pl-parser gobjectIntrospection + automake114x autoconf libtool gnome3.gsettings_desktop_schemas makeWrapper file gdk_pixbuf gnome3.gnome_icon_theme librsvg sqlite upower libnotify evolution_data_server gnome3.libgee diff --git a/pkgs/desktops/gnome-3/3.12/default.nix b/pkgs/desktops/gnome-3/3.12/default.nix index a60e1a85bca..7a972925f66 100644 --- a/pkgs/desktops/gnome-3/3.12/default.nix +++ b/pkgs/desktops/gnome-3/3.12/default.nix @@ -234,6 +234,8 @@ rec { seahorse = callPackage ./apps/seahorse { }; + polari = callPackage ./apps/polari { }; + pomodoro = callPackage ./apps/pomodoro { }; #### Dev http://ftp.gnome.org/pub/GNOME/devtools/ diff --git a/pkgs/desktops/kde-4.14/CVE-2014-8600.diff b/pkgs/desktops/kde-4.14/CVE-2014-8600.diff new file mode 100644 index 00000000000..1fe26484605 --- /dev/null +++ b/pkgs/desktops/kde-4.14/CVE-2014-8600.diff @@ -0,0 +1,19 @@ +--- a/kioslave/bookmarks/kio_bookmarks.cpp ++++ b/kioslave/bookmarks/kio_bookmarks.cpp +@@ -22,6 +22,7 @@ + #include + + #include ++#include + + #include + #include +@@ -197,7 +198,7 @@ + echoImage(regexp.cap(1), regexp.cap(2), url.queryItem("size")); + } else { + echoHead(); +- echo("

" + i18n("Wrong request: %1",path) + "

"); ++ echo("

" + i18n("Bad request: %1", Qt::escape(Qt::escape(url.prettyUrl()))) + "

"); + } + finished(); + } diff --git a/pkgs/desktops/kde-4.14/applications/kate.nix b/pkgs/desktops/kde-4.14/applications/kate.nix index e7a6476dd6d..2440d73e7e8 100644 --- a/pkgs/desktops/kde-4.14/applications/kate.nix +++ b/pkgs/desktops/kde-4.14/applications/kate.nix @@ -1,8 +1,8 @@ -{ stdenv, kde, kdelibs, kactivities, qjson, pyqt4, sip, python, pykde4}: +{ stdenv, kde, kdelibs, kactivities, qjson, pyqt4, python, pykde4}: kde { - buildInputs = [ kdelibs kactivities qjson pyqt4 sip python pykde4 ]; + buildInputs = [ kdelibs kactivities qjson pyqt4 python pykde4 ]; meta = { description = "Kate, the KDE Advanced Text Editor, as well as KWrite"; diff --git a/pkgs/desktops/kde-4.14/default.nix b/pkgs/desktops/kde-4.14/default.nix index 2a20bde568b..2b8e5d313cc 100644 --- a/pkgs/desktops/kde-4.14/default.nix +++ b/pkgs/desktops/kde-4.14/default.nix @@ -1,4 +1,4 @@ -{ callPackage, callPackageOrig, stdenv, qt48, release ? "4.14.1" }: +{ callPackage, callPackageOrig, stdenv, qt48, release ? "4.14.3" }: let branch = "4.14"; diff --git a/pkgs/desktops/kde-4.14/kde-baseapps/kde-baseapps.nix b/pkgs/desktops/kde-4.14/kde-baseapps/kde-baseapps.nix index a65f33e13de..31245413f15 100644 --- a/pkgs/desktops/kde-4.14/kde-baseapps/kde-baseapps.nix +++ b/pkgs/desktops/kde-4.14/kde-baseapps/kde-baseapps.nix @@ -1,8 +1,8 @@ -{ stdenv, kde, kdelibs, htmlTidy, kactivities +{ stdenv, kde, kdelibs, html-tidy, kactivities , nepomuk_core, nepomuk_widgets, libXt }: kde { - buildInputs = [ kdelibs nepomuk_core nepomuk_widgets htmlTidy kactivities libXt ]; + buildInputs = [ kdelibs nepomuk_core nepomuk_widgets html-tidy kactivities libXt ]; meta = { description = "Base KDE applications, including the Dolphin file manager and Konqueror web browser"; diff --git a/pkgs/desktops/kde-4.14/kde-package/4.14.1.nix b/pkgs/desktops/kde-4.14/kde-package/4.14.1.nix deleted file mode 100644 index 477e116e5e0..00000000000 --- a/pkgs/desktops/kde-4.14/kde-package/4.14.1.nix +++ /dev/null @@ -1,627 +0,0 @@ -{stable=true; -hashes=builtins.listToAttrs[ - {name="amor";value="143fhmgbmy7nlhhlbgh4s9ripqiidlx9bfrcrhamhgl11jjdr0mc";} - {name="analitza";value="18w35j4pag0s075d6yykkqg9cwfgx88zv0qgzas58qhzd3kjcijf";} - {name="ark";value="17imd7pfzjd1vfr69499fg51hmymzspax8l64gskmygdwbx7shh8";} - {name="artikulate";value="1gqvwz5amwssgjkldzg9gnixi88i5vdmk3s1bq94i0z3p0y3h88a";} - {name="audiocd-kio";value="02aq2qs01kz79jdi0sqr6hs7y1z8f4lf9mpv687pfv4g82fg2jh7";} - {name="baloo";value="0nvq2j81y75zf0f2p08av8iw7dc84826fsa93l14334ci245lar7";} - {name="baloo-widgets";value="11ma80nsb6x1wfh83k4g5aafwqsz6j9c4xmnbcc8bm57wssd8jxc";} - {name="blinken";value="11mmm12465bfikpzl486pznprj2rgcnxvpr4mniqfdjcijsfwdwd";} - {name="bomber";value="1lkn2nasyynf4kyrard39mckgfq558255ry07r3z7cvn9m8hc08y";} - {name="bovo";value="0sfb24ksh8gg6b7269skmxs72kkgd9cbgz0xs1hvd5y8w9cmz3yl";} - {name="cantor";value="07i5p439b15wl106h7fq2c016cd6jpdi18rz5m9sylaaj87a5d26";} - {name="cervisia";value="0sspkafcbma2vig9r5dl1z70p95nm2y3rfzssng7i6kam6fr4yqd";} - {name="dolphin-plugins";value="0a4pvxz1s44lszy8mqvw8rzilmq3vrjb30y08j0gp7id1xc3lpn0";} - {name="dragon";value="0dnfhmpifcabc9y5w393pg7rw2425kqslh88ljkz4bh6yw767ihd";} - {name="ffmpegthumbs";value="1dmwwx96pp5vnrxk3f4vr08qwjny7ydmkdvzj1hmgsid1s283i6v";} - {name="filelight";value="03gr0ldpkbf2q3nx1w07mhgmilrn8mx0wy81140gd1wjwilk5d7x";} - {name="granatier";value="0dph80h7jj9d0wh67bp9m98i0imrq6dxv11rqylnfzsf70lp2xzs";} - {name="gwenview";value="0mybmdvblf05kif5aa1wc2g1sv30bnkd30kwn0f7s0xiq3kckf38";} - {name="jovie";value="1sgm1v93868sgjdjpfjn3kv7kjpg92lajm91qy1m49w2isg60f4v";} - {name="juk";value="1gqdidzq1bqbjkhf40abpfj2b0fkk4bpi8kb6crk3zfjhsfa7rbq";} - {name="kaccessible";value="002dwar3c965783si4y1q7qpv56s8mqddqz6mbx1qhmzy88br5q1";} - {name="kactivities";value="12l9brpq8mr9hqqmnlz9xfsfr8ry6283b32nfqfx0p3f7w19vjy7";} - {name="kajongg";value="07cpw5k03rg8f54g3a1vx6z5ihfid561yza8qihsmzyjay4v2hya";} - {name="kalgebra";value="132awnbgcr66xfb99mgqcnh7viyrvr7vdqxm9wwgmpa14n7lk56q";} - {name="kalzium";value="03rz0gl5pihs7xnw7i415bla8ck2afqzrb717xsf1lb7ihrsky8d";} - {name="kamera";value="0593gai9ysd6pb5qir5wikj9szj7dj35iy435rikfpc8gwfpnsaj";} - {name="kanagram";value="1s1pq7ldjgarwbf2m49r5pi6w88c1yn38b5d023qhrgjbw2kfbpy";} - {name="kapman";value="1lcm7miqrjjg469h5765gaqrcxzhm5279nps4v2x4vkng3s2pj1a";} - {name="kapptemplate";value="0h0gcc00l0mq5lmac2656xnadz8sp14vbzjq2zsxr5y0m3nmcfg4";} - {name="kate";value="0izgfkd15755g4g0hll0q9nbn21w0a0p0qa5mlxrhxdsik3f580q";} - {name="katomic";value="0f53q39vsk23r8ldikk24f083n52747jrkgd1hvama9amga74hlm";} - {name="kblackbox";value="0wndkaqmfj5c2s64sw8jhjrr6y7mrkmjgmnnadpw8gmkhkml6qzi";} - {name="kblocks";value="0rl2sf1jz3zh790vijazmg88wy1hj7r2pgmql6x2ccbd6pp8j9qw";} - {name="kbounce";value="1mq2xmx3886pgjyb91fk501kwyw6k49zm5qijyi7bw735dfcvqry";} - {name="kbreakout";value="1ba7n2392gxdsz4ijws01pv1w4djirqjbdqidqaknr2rrknfchk3";} - {name="kbruch";value="044p4q5668ng0gbbykmcb7xivx8djijp133ch8vy2gbg38xi81lj";} - {name="kcachegrind";value="12h7s1a5hz9l015qcjzm7w5xzk7v6h66qm7sfww49m6h0w1g41v8";} - {name="kcalc";value="02gkap5phz59h4sflz44f4az3xww97g6bsl8nin3x0skll0nxnlr";} - {name="kcharselect";value="0df30c854blqfzkarlpfxhls04gpi8d3sy9p9b1landaaqbbln9w";} - {name="kcolorchooser";value="1hxlizxk8ljxn9jgn7wn42i1h5zksdgvhiak7sgz1ci5x68622zw";} - {name="kcron";value="0g9yi9xg215n89rmqmkwnd55mv85m9nq6irmxvcmwy0x1cci23rp";} - {name="kdeartwork";value="18f36p9zfz6jgswnc7k45g6ahqd6glqxzp35q6pndk0bp448dg08";} - {name="kde-baseapps";value="0jclvwiwbkcd6l0k39v3hxn0pcj8lfn6g4rynq55ca4h3wwkwmdq";} - {name="kde-base-artwork";value="09gfxr4md2yl9c8alghpxn0hxlz931b7d000zv8hg4nvw00qrnaj";} - {name="kde-dev-scripts";value="12an5jhin26kdvk6kyc477dv00vfvwbg250402vmzx8ngs4crlg8";} - {name="kde-dev-utils";value="17ag4vl3lyvsg7m0chs83wvm67i4k49xhlkw4kvj4xryzbnf11m1";} - {name="kdegraphics-mobipocket";value="15nrzgh49zs73ja21ihd7pi6nzxm4c3zh4s7jjidz369qbafyj4x";} - {name="kdegraphics-strigi-analyzer";value="0wr8rq0mmp7jbj8y5zn2wccna7mv3myspvwlrpkplga0f3mxbnm7";} - {name="kdegraphics-thumbnailers";value="0iw0pslmqdrj94j26lj8sgvx6a8yy3pf6daxc5q4l580l5djq1k2";} - {name="kdelibs";value="0904qa0a8i1nhqcya9r3k6i5b1zyvm18g6a8w0abxm9fd089ps9p";} - {name="kdenetwork-filesharing";value="015rqw7gxapxnh0wxivyii36fg0n0spzsqv1x4qssj8ld8imvagv";} - {name="kdenetwork-strigi-analyzers";value="09m3zr8acwxy912lpdlk9p1daris2yh6fzfj3m76j822223knh83";} - {name="kdepim";value="0f9m59q30w9bdhjlhv3z72b9zrqnrjggafnsq26py8d58hg2lxms";} - {name="kdepimlibs";value="05ki1iacaraiwbabyiwzlr83f6askn4qf440cbsah8dyfm27srgb";} - {name="kdepim-runtime";value="0kc86l2qbb24w3389yrwwh4ww4yvnnj9wygmzm7cm51hbfjvd12p";} - {name="kdeplasma-addons";value="1nlnvj7k205cpkqkrbm0qpcfgc7rpb47xzv3r1z5iil9hz7d5jx6";} - {name="kde-runtime";value="1b6ag633jh519f1ncmmdy8j3ri6k7niblqsjmgk56xv4a9iy4cmg";} - {name="kdesdk-kioslaves";value="0brykgby8mh5laym4iwq7nz8q9slb79kc89jjlh4ci5n496h06v5";} - {name="kdesdk-strigi-analyzers";value="1gpp4pi59cd81kw6d1z26q02vifl0pz7rbk7ipvxmy8n873q42pn";} - {name="kdesdk-thumbnailers";value="0l662gzmm8gx6dcpw23lqnyfv0pdn7dfqqnxnwsnfycw9vd493g9";} - {name="kde-wallpapers";value="1ai36ii25m0yl8g42nidbimf3chsc8gh4rixyl8iqhf50wsghw94";} - {name="kdewebdev";value="1z87fffcnj1b2dimr05p702pcra80f1p1hcz45rf903cxgy6y1bf";} - {name="kde-workspace";value="0bwlz92q8fgdp5n0kc15l7f3642nqr3yrpyykf8zq15pq4daxn09";} - {name="kdf";value="04j3w1h6h2nb6566pb1yifjy2m25mi6dk4mvjxl680mwlqaaj3rz";} - {name="kdiamond";value="1lzx3alcczxx9xb7bvzarypfw6dcgcb6wngxmli2ppb1ghl4pnds";} - {name="kfilemetadata";value="1r4zdx32qsjzszym0riw65nn5rrcjm57a0yawik96fzxrrvrvzkc";} - {name="kfloppy";value="01lar9p26g4b2a6cz83jy9l6bd943jsysv18hr9lyxwm98747axa";} - {name="kfourinline";value="0193nc2g3mcm6m3s732dg6ha5kh6mgdkih0pf0zay9ahfhkrpziw";} - {name="kgamma";value="1fj9xnj3i8i18m5y2jhmclw337akyb8nmajksgwnd573s040zh84";} - {name="kgeography";value="1j1d62lfziz403qhwc41frx737sl25kz060crz60ix3sam7arvkl";} - {name="kget";value="1ndgd960iyvgshmikplr2fqq13zijc6g8rbavqpcs4az8bp2h6zy";} - {name="kgoldrunner";value="05346q4366qrm3idh3dbgi1ddajplbncrwn28vlhxbqkqb8qp51y";} - {name="kgpg";value="1nwrpdczf4wmmwasa5wiggs7cjc8ivr005q77vzj5094ajq457dy";} - {name="khangman";value="1jf10ixqwrn9f9wbhpppw6j3jpcp9ss4g4gairrklmr7v5cp59lr";} - {name="kig";value="07f85rab71kb6fn0zdqx068im3a63l2irqci9dha8cfh805jyl8y";} - {name="kigo";value="0vk2wq9z6xi86plx84agrl2j07jx98y1i9dsvimyvrxah32ykdka";} - {name="killbots";value="15azd5391247h2qn4shv0c4cz5hmr77xcbld2va5357xrbhzirx9";} - {name="kimono";value="0z4g580nn62zsf6rmxcg4z13n9vd9n24s1fzhc4d5kk6niszbjap";} - {name="kiriki";value="0mh7v16haiqkkfiapq8qivmbhyyczsq5sm8kzpddh40814p3sy9w";} - {name="kiten";value="12s7h19ybpm48gha23jkh86a2p71yqb3h93bs4mnkfgidjssvd43";} - {name="kjumpingcube";value="01wffw1s5crv11s3hg54ipwp09i8kgp7wjw038c83jgrvcw52ql5";} - {name="klettres";value="13bayjpny80d4avm77vmhm5f8ma4ckwiz63sximz8hyr6rg5i7fc";} - {name="klickety";value="0cmzzy2nf3zpmpyfsmrmfcklppib7qmg0pbxsm03y7az0qrz03bm";} - {name="klines";value="0k4xi6p4ikp0sb54jbb4rzdbhlwyhf4r117pgmmvb3n2aq6w4n9f";} - {name="kmag";value="1c3z1r0qk69pprivak6lgb4mk491pd17hqb9474fv645nk9jh48h";} - {name="kmahjongg";value="0lfnjzshcm7d91cq6x6s5l2n4p5q6ya4d7c3r94ad2fqpy3425c1";} - {name="kmines";value="1fxb8cwy9wfsijgf36ji4v1c2yaqbnxbppa4c4pld9fi9vnds0w7";} - {name="kmix";value="084prv50nsh7j1db2dd3i4gkfj6wh430azlq60a4j4667ih483l9";} - {name="kmousetool";value="1gr1nvxnapmmw5p9hk35g76rlxs3f5l7wbsfmczlzlxwszfg05lc";} - {name="kmouth";value="0f8s6ikrx069cp8pd3405g2s4czvk0vpv6d48jgvkbxnxfasli1c";} - {name="kmplot";value="1si0dl1m4zabmnrnmih0g5dxfwsws3p626j0kgvrqnd5hlwl6ar6";} - {name="knavalbattle";value="1llrj7d79s2k66qp9cx6zbjs5f69xnvc8gr0yi2jdbycaiq9q9lj";} - {name="knetwalk";value="13gy2pqqfysh69pmx4mcq9nx6qcxmzp08sqvf2b6c6v7f90ic2kx";} - {name="kolf";value="0808js28c4y1wllzs62sw4j02hzspijvl6n7i6vbhim47blvn3yq";} - {name="kollision";value="1mn9agdzw15gkyb27pqg80anbk4a6iv6r1mvn8m2hksfqwv8c1mf";} - {name="kolourpaint";value="0nj4a8sjyip0nmq3xkba00qigmg9z6bfck5gfb53sm5z6mdrdvd6";} - {name="kompare";value="13123ylhm1r5kkc5q9dzc3n03nxa89vfy1nrffa501awhyhb6qvl";} - {name="konquest";value="1m06chqvanlqklymdrl78hyqi9wzlkmnzbq3sg920jzqjvac8yq1";} - {name="konsole";value="1j5z5ma7mljis1s6rfpcli02vbnmrdhs8zr1gm2rgpyii9k3xykn";} - {name="kopete";value="1s87ln4qjdx4k1313r87glzmazah85siv0nddzndvz50330gnqrv";} - {name="korundum";value="1a7nwi8lk1n3r5m7qsfkzb4dgj37ff7i5il3i6fabmkmbwmikm82";} - {name="kpat";value="1lb5arhhx4zz6zrcag2kmsa7hrmjl3zd7jaklkcbd86bm57xmzry";} - {name="kppp";value="16p6gfr2lyhcmyldzclj8md4sr31rmmxp0m3afnhi4bwvd76d4sc";} - {name="kqtquickcharts";value="0sx7jahhaz2v0sp9qix4xxinxry2k50hnxfrf9hd5877s4ngdi3h";} - {name="krdc";value="1jyyrj4g854ki39p0k056mmca21d5yiqa25sa2wxb3v7g128lvl8";} - {name="kremotecontrol";value="0f5hfdlwfqqygc6vd6lgchh0bdh0z9crikkv7pjah43x5h0sys14";} - {name="kreversi";value="1cl8dbrgsv60zhxfqry0wd4gn4lyas9xb8yy5m3f71dkcb4xmhrz";} - {name="krfb";value="1yzp00kyww6wrdbhy8idxbpn8nr597h116rzxa57xalq7cj4px5m";} - {name="kross-interpreters";value="01a6w2iqx3k32fdwnlz2z8h7p1isf9sf2i261gaixf510drz3mqs";} - {name="kruler";value="0sbxvaxvixyka4qy2h17i8bgblxppp76j6b9jgsgqq8w20ppj0yd";} - {name="ksaneplugin";value="134cccd2v7xygg18xlggsk942hlcmpilmpaljksh2w6dzjig8ag9";} - {name="kscd";value="1r7ffan61ps9h3awbwyr4kn2ismk8l8dnb0rdyjmp2rsmrci3xmy";} - {name="kshisen";value="0b4zny2nxhx45k540mjpqzfpa9xnfnyk1hgs3xziihg5iij1vdnf";} - {name="ksirk";value="0xladrvxvj8mfagl9531842bffixbk2z7ymwp178xlrz3c4b07xs";} - {name="ksnakeduel";value="1q901qphmb09642whn3ad0viv9lgvls2rggc5xnxxjccchz98ggh";} - {name="ksnapshot";value="168ya0d15966j9kkgxqpp67kfhmsw7xj875dr8cfqbcmgf6ghjdm";} - {name="kspaceduel";value="0fidkh52vwbjbabrjvbcvr144vcgig0nz12g5f5fzfbl04336x12";} - {name="ksquares";value="1w91mp1a22gzq546w87767aq02gl2jl9mrsv83hv327q0i4r55ng";} - {name="kstars";value="0z7045cpb8fwkrmlcgjz2606zhcl4irs0lafgwv3hdg3g6k5xj0n";} - {name="ksudoku";value="1vdqd7nxm9q0xmj90ix1k6j1cn7zc2imfkz13xjlkjgrbb7nn4dr";} - {name="ksystemlog";value="1rh3c54jpd1s6ggcshx0p2q2gsv6flh04qqjnk9bnkw374ad6an7";} - {name="kteatime";value="0akd8kr2pj8j4abvwf7cs9vk5mswj4mfki3vxk1kmyaanrxb6wrq";} - {name="ktimer";value="1hnmw4rw7mzc7arlqn1wiap9l00x97bp1z03ls7v133wga6hy56f";} - {name="ktouch";value="0z83pdh027h7nl15g6qqc7y4v8nlm07g0c4a2cl0j86r53vv4jrp";} - {name="ktuberling";value="05hngh9pgsl4q3qnv2vqw1lggn2glc4c2b3jxgkccagp5igqj2nb";} - {name="kturtle";value="1f3j3w6lgdkcn8p6zy29b42bm0k93a864njf827j1ri2vrjifdag";} - {name="ktux";value="0j15i5f7x6jq7xrrx675f6h92qjzb89xcwmv43snd87sj0yaymgs";} - {name="kubrick";value="1np1d913fhanfva26cfy4wabf0h69qs824kdmawr89f24689xpjl";} - {name="kuser";value="12xw1qhilh88xfaky5iv44hybwmzf0f4fkp5ahgskysx2whvk7dh";} - {name="kwalletmanager";value="0h71nm5mpp2rvv5xs0a7153583zdwzc1i9vv9xkwwmq84qwar06w";} - {name="kwordquiz";value="0w2a1df2ipynarfxjr27jk896jhq8hsbkxhf3rzpflzs902afrfn";} - {name="libkcddb";value="153cgh9mxfqfdxdg5glphs3fvyhd89cmdzpvwpn29gdfshbpc9np";} - {name="libkcompactdisc";value="1y4f3b4yx8giyz83nan0nl75l3k1fyfw1fnbma6ch1901yxbliqq";} - {name="libkdcraw";value="03lgy6h9fy8j72ryfrsxpsbnb7l5i1n8wihfw117y2m5h23x6va2";} - {name="libkdeedu";value="06w2pfj0whcl8pz89cck2y0bkn7r54n93l95vnqvj7v0zq704imd";} - {name="libkdegames";value="0yx77i8yanv2fjmc0gcz3fzywkmpzq7jrc1g1frcwc9qcbd652sb";} - {name="libkexiv2";value="0fibx70n5c11absj97c20p1d7crhfx5wc1p7h77dyjv76zxb0rjk";} - {name="libkipi";value="09vihz0sm32acbh2xqmg4r0c48m40xsf6fcvfcjy4w08dvxb26jd";} - {name="libkmahjongg";value="09q0vvznag2dk03vwzlaip3qvjgwi8kk0ypvpwbga48vi9wy5qih";} - {name="libkomparediff2";value="1ihdpcsmkvnhs0i4xwx4ardy54gk5fcbh4byam3h9x8156d1gi60";} - {name="libksane";value="0dvprckc0d8vc8rcj7ib22ycsib1g8bi9m6i24961ccgbn3mhbha";} - {name="lokalize";value="1ad6vqvaa1ijcc9vjq46986z8q8bm5kjcaxdjzrq956m5kgx96wm";} - {name="lskat";value="00iva59g8rgrzp9w273cja1z2kbnxpb8gdm2a29qnld862l586x8";} - {name="marble";value="1gk75xl6kdqxh9kyfiialp937jhb203ycnza6x5sdnky8n7dchzs";} - {name="mplayerthumbs";value="1lg51si9iy4kn91s1cpa7irpk7iind1lfc4nb0a3s3dw685jf3z4";} - {name="nepomuk-core";value="1krwfrkrk0dj08wqfbx8lfdxriff9w5pqhjaccvmdj3bmlik542f";} - {name="nepomuk-widgets";value="1k1zxbpplal5fw2lziv8rr850nl5a6y1vwng96f8zqqgda6nnbqz";} - {name="okteta";value="0h7jb7zhpdw1sbdl2mqajnnvn11hisxp0p33km4qxh1jxdn44apc";} - {name="okular";value="13lva2rasrh1za65wr5zjn1mwx6nzd9n1ci3i940px8qfgqjbysx";} - {name="oxygen-icons";value="15daai2vx5ccll1mdxf77pc0i52365m9a6j2jy956sybwpzmfkmx";} - {name="pairs";value="002hsh5vp1grc8gdhgj93bmrmnzf4mnaax6zs5j7f0jsv60czh9m";} - {name="palapeli";value="0qrcfg1p3ipa84l0kp8mxg9h4098jmaz3n0fakc8fkvfdgg70x5c";} - {name="parley";value="1z0yz7x53w23rq22pn0z3hiwzgajqmq6v9bishqgm5r7layqj0v5";} - {name="perlkde";value="07p1g8mv5xw3qys4h2jrh72kvf6yyl7yz5rnk4bg04rl4dg7n3j2";} - {name="perlqt";value="1fk2g1xam8gf6n1mpix7kkw2jm6p3d57jbph2vfc5gszdddlb0z1";} - {name="picmi";value="1n6h9rzfqr2pvmz172bk04bmc1mm9b1rvakqdyqdf4j6b7inlnqh";} - {name="poxml";value="0y9x29fd0fzxcb9lpsy6sd4kcwwjp0d6yi4qgklqxb2xw5d519rc";} - {name="print-manager";value="0k2lmdcw72ifbq2mbalnq78sq5brl3wkny8lxl5ia9q2wq6c5nbl";} - {name="pykde4";value="1lknacs02gk0lh96jgj1hjyphnw04yljpxamhhvz9l0nn82dh5ip";} - {name="qtruby";value="0nlldf06z0rhmdgmrd6wambywn6xfd2ini6zliakspk7s8c851nd";} - {name="qyoto";value="0wh5zf057bkxr7rs7k2psjh74j10ri943qfk8hv07jw25652xpzb";} - {name="rocs";value="1i3s0kjrc6qqn9v219s8m10w2fyp1cdvra736pv0ld9gg5a71fc8";} - {name="smokegen";value="0lzkfp09rfkcxn5k18x789wwbiq94hypsiwyxg3fd5ybkx725j55";} - {name="smokekde";value="1admv2k41i6xh4s0n8yydmpqjkwank6f8mpaapa9a8dnj918ydll";} - {name="smokeqt";value="1fnnma8sls8rf958cwlfars26gaxk68plx3fzv979rwwb1n7h3jg";} - {name="step";value="11prsrpf0nvrrb0n9gz7w2shyq60v3hv3av6ggaxy5i7qq2jkcmw";} - {name="superkaramba";value="1p7ks4cyx66dmfxwrdzd890h3sa9bqm5rh2x6i1b81v5g3dg09s7";} - {name="svgpart";value="0gwc68hzw29lfj1kmikqpmsyignlcghvv86amlmylnvrypkjypk7";} - {name="sweeper";value="1dxqspva4rql2r92y0y16m3f0jf3anvb26x36bxk71ad5fpph9yl";} - {name="umbrello";value="1l9zq8sk46nd8nyk48vy4rdlbx7s8l5pif0n1y38ymbppc157lqi";} - {name="zeroconf-ioslave";value="0ds85m35p34cv2bv2mkvdvmygvykssssbr736g02jbiasivmclk5";} -]; -versions=builtins.listToAttrs[ - {name="amor";value="4.14.1";} - {name="analitza";value="4.14.1";} - {name="ark";value="4.14.1";} - {name="artikulate";value="4.14.1";} - {name="audiocd-kio";value="4.14.1";} - {name="baloo";value="4.14.1";} - {name="baloo-widgets";value="4.14.1";} - {name="blinken";value="4.14.1";} - {name="bomber";value="4.14.1";} - {name="bovo";value="4.14.1";} - {name="cantor";value="4.14.1";} - {name="cervisia";value="4.14.1";} - {name="dolphin-plugins";value="4.14.1";} - {name="dragon";value="4.14.1";} - {name="ffmpegthumbs";value="4.14.1";} - {name="filelight";value="4.14.1";} - {name="granatier";value="4.14.1";} - {name="gwenview";value="4.14.1";} - {name="jovie";value="4.14.1";} - {name="juk";value="4.14.1";} - {name="kaccessible";value="4.14.1";} - {name="kactivities";value="4.13.3";} - {name="kajongg";value="4.14.1";} - {name="kalgebra";value="4.14.1";} - {name="kalzium";value="4.14.1";} - {name="kamera";value="4.14.1";} - {name="kanagram";value="4.14.1";} - {name="kapman";value="4.14.1";} - {name="kapptemplate";value="4.14.1";} - {name="kate";value="4.14.1";} - {name="katomic";value="4.14.1";} - {name="kblackbox";value="4.14.1";} - {name="kblocks";value="4.14.1";} - {name="kbounce";value="4.14.1";} - {name="kbreakout";value="4.14.1";} - {name="kbruch";value="4.14.1";} - {name="kcachegrind";value="4.14.1";} - {name="kcalc";value="4.14.1";} - {name="kcharselect";value="4.14.1";} - {name="kcolorchooser";value="4.14.1";} - {name="kcron";value="4.14.1";} - {name="kdeartwork";value="4.14.1";} - {name="kde-baseapps";value="4.14.1";} - {name="kde-base-artwork";value="4.14.1";} - {name="kde-dev-scripts";value="4.14.1";} - {name="kde-dev-utils";value="4.14.1";} - {name="kdegraphics-mobipocket";value="4.14.1";} - {name="kdegraphics-strigi-analyzer";value="4.14.1";} - {name="kdegraphics-thumbnailers";value="4.14.1";} - {name="kdelibs";value="4.14.1";} - {name="kdenetwork-filesharing";value="4.14.1";} - {name="kdenetwork-strigi-analyzers";value="4.14.1";} - {name="kdepim";value="4.14.1";} - {name="kdepimlibs";value="4.14.1";} - {name="kdepim-runtime";value="4.14.1";} - {name="kdeplasma-addons";value="4.14.1";} - {name="kde-runtime";value="4.14.1";} - {name="kdesdk-kioslaves";value="4.14.1";} - {name="kdesdk-strigi-analyzers";value="4.14.1";} - {name="kdesdk-thumbnailers";value="4.14.1";} - {name="kde-wallpapers";value="4.14.1";} - {name="kdewebdev";value="4.14.1";} - {name="kde-workspace";value="4.11.12";} - {name="kdf";value="4.14.1";} - {name="kdiamond";value="4.14.1";} - {name="kfilemetadata";value="4.14.1";} - {name="kfloppy";value="4.14.1";} - {name="kfourinline";value="4.14.1";} - {name="kgamma";value="4.14.1";} - {name="kgeography";value="4.14.1";} - {name="kget";value="4.14.1";} - {name="kgoldrunner";value="4.14.1";} - {name="kgpg";value="4.14.1";} - {name="khangman";value="4.14.1";} - {name="kig";value="4.14.1";} - {name="kigo";value="4.14.1";} - {name="killbots";value="4.14.1";} - {name="kimono";value="4.14.1";} - {name="kiriki";value="4.14.1";} - {name="kiten";value="4.14.1";} - {name="kjumpingcube";value="4.14.1";} - {name="klettres";value="4.14.1";} - {name="klickety";value="4.14.1";} - {name="klines";value="4.14.1";} - {name="kmag";value="4.14.1";} - {name="kmahjongg";value="4.14.1";} - {name="kmines";value="4.14.1";} - {name="kmix";value="4.14.1";} - {name="kmousetool";value="4.14.1";} - {name="kmouth";value="4.14.1";} - {name="kmplot";value="4.14.1";} - {name="knavalbattle";value="4.14.1";} - {name="knetwalk";value="4.14.1";} - {name="kolf";value="4.14.1";} - {name="kollision";value="4.14.1";} - {name="kolourpaint";value="4.14.1";} - {name="kompare";value="4.14.1";} - {name="konquest";value="4.14.1";} - {name="konsole";value="4.14.1";} - {name="kopete";value="4.14.1";} - {name="korundum";value="4.14.1";} - {name="kpat";value="4.14.1";} - {name="kppp";value="4.14.1";} - {name="kqtquickcharts";value="4.14.1";} - {name="krdc";value="4.14.1";} - {name="kremotecontrol";value="4.14.1";} - {name="kreversi";value="4.14.1";} - {name="krfb";value="4.14.1";} - {name="kross-interpreters";value="4.14.1";} - {name="kruler";value="4.14.1";} - {name="ksaneplugin";value="4.14.1";} - {name="kscd";value="4.14.1";} - {name="kshisen";value="4.14.1";} - {name="ksirk";value="4.14.1";} - {name="ksnakeduel";value="4.14.1";} - {name="ksnapshot";value="4.14.1";} - {name="kspaceduel";value="4.14.1";} - {name="ksquares";value="4.14.1";} - {name="kstars";value="4.14.1";} - {name="ksudoku";value="4.14.1";} - {name="ksystemlog";value="4.14.1";} - {name="kteatime";value="4.14.1";} - {name="ktimer";value="4.14.1";} - {name="ktouch";value="4.14.1";} - {name="ktuberling";value="4.14.1";} - {name="kturtle";value="4.14.1";} - {name="ktux";value="4.14.1";} - {name="kubrick";value="4.14.1";} - {name="kuser";value="4.14.1";} - {name="kwalletmanager";value="4.14.1";} - {name="kwordquiz";value="4.14.1";} - {name="libkcddb";value="4.14.1";} - {name="libkcompactdisc";value="4.14.1";} - {name="libkdcraw";value="4.14.1";} - {name="libkdeedu";value="4.14.1";} - {name="libkdegames";value="4.14.1";} - {name="libkexiv2";value="4.14.1";} - {name="libkipi";value="4.14.1";} - {name="libkmahjongg";value="4.14.1";} - {name="libkomparediff2";value="4.14.1";} - {name="libksane";value="4.14.1";} - {name="lokalize";value="4.14.1";} - {name="lskat";value="4.14.1";} - {name="marble";value="4.14.1";} - {name="mplayerthumbs";value="4.14.1";} - {name="nepomuk-core";value="4.14.1";} - {name="nepomuk-widgets";value="4.14.1";} - {name="okteta";value="4.14.1";} - {name="okular";value="4.14.1";} - {name="oxygen-icons";value="4.14.1";} - {name="pairs";value="4.14.1";} - {name="palapeli";value="4.14.1";} - {name="parley";value="4.14.1";} - {name="perlkde";value="4.14.1";} - {name="perlqt";value="4.14.1";} - {name="picmi";value="4.14.1";} - {name="poxml";value="4.14.1";} - {name="print-manager";value="4.14.1";} - {name="pykde4";value="4.14.1";} - {name="qtruby";value="4.14.1";} - {name="qyoto";value="4.14.1";} - {name="rocs";value="4.14.1";} - {name="smokegen";value="4.14.1";} - {name="smokekde";value="4.14.1";} - {name="smokeqt";value="4.14.1";} - {name="step";value="4.14.1";} - {name="superkaramba";value="4.14.1";} - {name="svgpart";value="4.14.1";} - {name="sweeper";value="4.14.1";} - {name="umbrello";value="4.14.1";} - {name="zeroconf-ioslave";value="4.14.1";} -]; -modules=[ -{ - module="kdemultimedia"; - split=true; - pkgs=[ - { name="audiocd-kio"; sane="audiocd_kio"; } - { name="dragon"; } - { name="ffmpegthumbs"; } - { name="juk"; } - { name="kmix"; } - { name="kscd"; } - { name="libkcddb"; } - { name="libkcompactdisc"; } - { name="mplayerthumbs"; } - ]; -} -{ - module="kdegraphics"; - split=true; - pkgs=[ - { name="gwenview"; } - { name="kamera"; } - { name="kcolorchooser"; } - { name="kdegraphics-mobipocket"; sane="kdegraphics_mobipocket"; } - { name="kdegraphics-strigi-analyzer"; sane="kdegraphics_strigi_analyzer"; } - { name="kdegraphics-thumbnailers"; sane="kdegraphics_thumbnailers"; } - { name="kgamma"; } - { name="kolourpaint"; } - { name="kruler"; } - { name="ksaneplugin"; } - { name="ksnapshot"; } - { name="libkdcraw"; } - { name="libkexiv2"; } - { name="libkipi"; } - { name="libksane"; } - { name="okular"; } - { name="svgpart"; } - ]; -} -{ - module="kdelibs"; - split=true; - pkgs=[ - { name="kdelibs"; } - { name="baloo"; } - { name="baloo-widgets"; sane="baloo_widgets"; } - { name="kfilemetadata"; } - { name="nepomuk-core"; sane="nepomuk_core"; } - { name="nepomuk-widgets"; sane="nepomuk_widgets"; } - ]; -} -{ - module="kdenetwork"; - split=true; - pkgs=[ - { name="kdenetwork-filesharing"; sane="kdenetwork_filesharing"; } - { name="kdenetwork-strigi-analyzers"; sane="kdenetwork_strigi_analyzers"; } - { name="kget"; } - { name="kopete"; } - { name="kppp"; } - { name="krdc"; } - { name="krfb"; } - { name="zeroconf-ioslave"; sane="zeroconf_ioslave"; } - ]; -} -{ - module="kdeutils"; - split=true; - pkgs=[ - { name="ark"; } - { name="filelight"; } - { name="kcalc"; } - { name="kcharselect"; } - { name="kdf"; } - { name="kfloppy"; } - { name="kgpg"; } - { name="kremotecontrol"; } - { name="ktimer"; } - { name="kwalletmanager"; } - { name="print-manager"; sane="print_manager"; } - { name="superkaramba"; } - { name="sweeper"; } - ]; -} -{ - module="applications"; - split=true; - pkgs=[ - { name="kate"; } - { name="konsole"; } - ]; -} -{ - module="kdetoys"; - split=true; - pkgs=[ - { name="amor"; } - { name="kteatime"; } - { name="ktux"; } - ]; -} -{ - module="kdesdk"; - split=true; - pkgs=[ - { name="cervisia"; } - { name="dolphin-plugins"; sane="dolphin_plugins"; } - { name="kapptemplate"; } - { name="kcachegrind"; } - { name="kde-dev-scripts"; sane="kde_dev_scripts"; } - { name="kde-dev-utils"; sane="kde_dev_utils"; } - { name="kdesdk-kioslaves"; sane="kdesdk_kioslaves"; } - { name="kdesdk-strigi-analyzers"; sane="kdesdk_strigi_analyzers"; } - { name="kdesdk-thumbnailers"; sane="kdesdk_thumbnailers"; } - { name="kompare"; } - { name="libkomparediff2"; } - { name="lokalize"; } - { name="okteta"; } - { name="poxml"; } - { name="umbrello"; } - ]; -} -{ - module="kdegames"; - split=true; - pkgs=[ - { name="bomber"; } - { name="bovo"; } - { name="granatier"; } - { name="kajongg"; } - { name="kapman"; } - { name="katomic"; } - { name="kblackbox"; } - { name="kblocks"; } - { name="kbounce"; } - { name="kbreakout"; } - { name="kdiamond"; } - { name="kfourinline"; } - { name="kgoldrunner"; } - { name="kigo"; } - { name="killbots"; } - { name="kiriki"; } - { name="kjumpingcube"; } - { name="klickety"; } - { name="klines"; } - { name="kmahjongg"; } - { name="kmines"; } - { name="knavalbattle"; } - { name="knetwalk"; } - { name="kolf"; } - { name="kollision"; } - { name="konquest"; } - { name="kpat"; } - { name="kreversi"; } - { name="kshisen"; } - { name="ksirk"; } - { name="ksnakeduel"; } - { name="kspaceduel"; } - { name="ksquares"; } - { name="ksudoku"; } - { name="ktuberling"; } - { name="kubrick"; } - { name="libkdegames"; } - { name="libkmahjongg"; } - { name="lskat"; } - { name="palapeli"; } - { name="picmi"; } - ]; -} -{ - module="kdeedu"; - split=true; - pkgs=[ - { name="analitza"; } - { name="artikulate"; } - { name="blinken"; } - { name="cantor"; } - { name="kalgebra"; } - { name="kalzium"; } - { name="kanagram"; } - { name="kbruch"; } - { name="kgeography"; } - { name="khangman"; } - { name="kig"; } - { name="kiten"; } - { name="klettres"; } - { name="kmplot"; } - { name="kqtquickcharts"; } - { name="kstars"; } - { name="ktouch"; } - { name="kturtle"; } - { name="kwordquiz"; } - { name="libkdeedu"; } - { name="marble"; } - { name="pairs"; } - { name="parley"; } - { name="rocs"; } - { name="step"; } - ]; -} -{ - module="kdeadmin"; - split=true; - pkgs=[ - { name="kcron"; } - { name="ksystemlog"; } - { name="kuser"; } - ]; -} -{ - module="kdebindings"; - split=true; - pkgs=[ - { name="kimono"; } - { name="korundum"; } - { name="kross-interpreters"; sane="kross_interpreters"; } - { name="perlkde"; } - { name="perlqt"; } - { name="pykde4"; } - { name="qtruby"; } - { name="qyoto"; } - { name="smokegen"; } - { name="smokekde"; } - { name="smokeqt"; } - ]; -} -{ - module="kdeaccessibility"; - split=true; - pkgs=[ - { name="jovie"; } - { name="kaccessible"; } - { name="kmag"; } - { name="kmousetool"; } - { name="kmouth"; } - ]; -} -{ - module="kde-baseapps"; -sane="kde_baseapps"; split=true; - pkgs=[ - { name="kde-baseapps"; sane="kde_baseapps"; } - ]; -} -{ module="kactivities"; split=false;} -{ module="kdeartwork"; split=false; - pkgs=[ - { name="ColorSchemes"; } - { name="IconThemes"; } - { name="emoticons"; } - { name="kscreensaver"; } - { name="kwin-styles"; sane="kwin_styles";} - { name="styles"; } - { name="wallpapers"; } - { name="HighResolutionWallpapers"; } - { name="WeatherWallpapers"; } - { name="desktopthemes"; } - ]; - -} -{ module="kde-base-artwork"; sane="kde_base_artwork"; split=false;} -{ module="kdepim"; split=false;} -{ module="kdepimlibs"; split=false;} -{ module="kdepim-runtime"; sane="kdepim_runtime"; split=false;} -{ module="kdeplasma-addons"; sane="kdeplasma_addons"; split=false;} -{ module="kde-runtime"; sane="kde_runtime"; split=false;} -{ module="kde-wallpapers"; sane="kde_wallpapers"; split=false;} -{ module="kdewebdev"; split=false; - pkgs=[ - { name="klinkstatus"; } - { name="kfilereplace"; } - { name="kimagemapeditor"; } - { name="kommander"; } - ]; - -} -{ module="kde-workspace"; sane="kde_workspace"; split=false;} -{ module="oxygen-icons"; sane="oxygen_icons"; split=false;} -]; -} diff --git a/pkgs/desktops/kde-4.14/kde-package/4.14.3.nix b/pkgs/desktops/kde-4.14/kde-package/4.14.3.nix new file mode 100644 index 00000000000..d29840735ab --- /dev/null +++ b/pkgs/desktops/kde-4.14/kde-package/4.14.3.nix @@ -0,0 +1,626 @@ +{stable=true; +hashes=builtins.listToAttrs[ + {name="amor";value="1n9qhy7pcprhh7a5v5i9xi5pr3a3lbg08j315kbahn89py2wqk6x";} + {name="analitza";value="08p4rky4q4c1r5mkw087s31k38xvc8k50fyahf6y0bkc03v7q8h0";} + {name="ark";value="1p5q96i7hxp80c3hzxaqfixc3rn16cdnhhhjdaqz7k5zkgmgfbnb";} + {name="artikulate";value="1spb3qwf62agc76vnji7hgm1xsahb7i2fg818gmqwd9ndd4rf0fk";} + {name="audiocd-kio";value="0572hwlzn4l53d3xi2w20pgdf6wsyankr49q4522ckfjw9zh2p33";} + {name="baloo";value="0p3awsrc20q79kq04x0vjz84acxz6gjm9jc7j2al4kybkyzx5p4y";} + {name="baloo-widgets";value="1lxwm8cb1f1dy91zr1d54alw0f67d30kixhr7hnbpqlanfw44sbv";} + {name="blinken";value="0zmfvj64xzgi9mmdx92csknm6nrgq57z458dmqr82glvdq6sy53w";} + {name="bomber";value="09bwp2fnyhi2jq6j36ssvcd02gxihd162b14hj4h76p50q9142ly";} + {name="bovo";value="0pflfpnxni01nfmljrb356bvb9sq7xg1yx7ylli8ws591s1wjv2f";} + {name="cantor";value="1qb58pnrpn23qr94j1nrdyj87yxc6gr9drra76mq583acra19j4g";} + {name="cervisia";value="1dgg0m8l2vb1ypkzq2lvp8d5faxn005z9fylf4pg6yczgj51y2m0";} + {name="dolphin-plugins";value="1vb5q9xwxplwxwfs57fqy1bi2hsq96cy1z705lbyiy1pq1g0xw5p";} + {name="dragon";value="195hv0l3w6n32qghdbqj3jzl4833lkbw90q53rnay56ia3azd7nk";} + {name="ffmpegthumbs";value="1waj02snh48qk8h021p1agy9pifpb7k7848ni9cyr1q76xmqbw3r";} + {name="filelight";value="16pp16zdvm8l6aaywj0cvvmpc1fgwr1ik1nf9s3vnj6pnqw91mc1";} + {name="granatier";value="08fs7nvhgg33cr54v2ib5p64lc9kmzshl12swsa88sp1fzakpdlj";} + {name="gwenview";value="1817nhd3qwghimbh4v57nxpbk9y2z9gh33i9s7rr190fqa5x2ci0";} + {name="jovie";value="06cvnycbab5w1vgws6fyfbpdnps63mvss2gnsv6ig1gm18pq8kh4";} + {name="juk";value="02dv0v34dbac9wpfj0p1kh438b380025qg0mpnhdisw9ng4igx83";} + {name="kaccessible";value="0blkyalm45c1q670wp9jn6mmqq4igw16hlsa39bv1dj82m5f0bkb";} + {name="kajongg";value="1f4fv1s1x2bg9ghf317br0kl6lgj9nacmck6fv1g3r14j60z5sfn";} + {name="kalgebra";value="0zgnppmnm2g0anq4yldlyd4bncjabr72b66h4s9ns6wd7kk9z6rs";} + {name="kalzium";value="1r8phdshq9whcglb7nyjcg8qjqnqya8rj1rm91mwax18jin0i3ab";} + {name="kamera";value="09n11d1hvl6xxfsp9j72q6ja103vda54gmrl7lqscnp5nvlfl2vg";} + {name="kanagram";value="0ns95365rdzx4v7akrsnbz1vgyl10d5h4jnavg1x08yrq7sm3rcm";} + {name="kapman";value="1c27dlpdnnmvxqwsr5359ixl386z54ijs5ysb5vd7f0nw980kjk0";} + {name="kapptemplate";value="089znigfd0c4gb318qjbxhyk3gc6j9z4vb4lw76g3nwjkk52s35s";} + {name="kate";value="0zbhgrhpa3f9zaf8a9b0s69p05m17rg6harvmyfbb9kgqgi4lgai";} + {name="katomic";value="1j3y0zfwcms2wfv2v3jpn6lisl2qw5zhvwswhyc2k44wq934vwq6";} + {name="kblackbox";value="1vlc37il59xh6k4zcap7cs25b1r70cbzi0b6jybpwhxrq2zh1zmz";} + {name="kblocks";value="16k8j3h8dvjz2yqdb22dkb9z6mi3k28c4wkhpa1l5q151kb8q6ba";} + {name="kbounce";value="16g2f6vvax74gqz3jn1b9rfwcdaia7dphnwg37d03ayflp2s7mji";} + {name="kbreakout";value="1011gcbajlk4h5z16nyr8xxkqz5k86vwgn1h5k4fqqpbl2g9aryr";} + {name="kbruch";value="0jrd0hqqiaghyhj1rw66j0skqs1f7p21czx3adiy2v50ni70i84z";} + {name="kcachegrind";value="0954zvzzhfc76msbs7pc10c9nqd4ganqwqdyn051n4204np1fyd6";} + {name="kcalc";value="03px8j0ga6bbla6bxbj3ahcw4jxwb4kkqhls0rxldbfkjwz2q1wz";} + {name="kcharselect";value="0js5wxdjmzg2yq83m0kpil9mdjwb1bschh8d9hsk044327i9wmz7";} + {name="kcolorchooser";value="1z5snm4vxn6whdhxh64kd18bvl58i65qb4p4xdznrc0gyrgnl92a";} + {name="kcron";value="1d685808rya0fjysn2smh0d1p6xqcg7a1r3ah54hnj58y4r3rxyc";} + {name="kdeartwork";value="1x0fz21xi54gxz4dkk7qhpv9a5j3nc0crgvygpq32jrkvv5ygp4k";} + {name="kde-baseapps";value="1nz6mm257rd916dklnbrix4r25scylvjil99b1djb35blx1aynqj";} + {name="kde-base-artwork";value="14l83fd6drwpl9j4v876afp3k7na3dirpjwh03c1a7lcn27grzkn";} + {name="kde-dev-scripts";value="17zw6ckbvq5iqykc3ijdnp7j0nh4k06jgqwfsrnqnvp5fqqcf1vn";} + {name="kde-dev-utils";value="16kdr5i48jlflzdv1y5n2xca2kws5whwlymliqdqy7wlcgy0lh7q";} + {name="kdegraphics-mobipocket";value="0m41s8scy5hym6mk0kfmjj54dc3yxahsdrliaadixhp0fx02cx0v";} + {name="kdegraphics-strigi-analyzer";value="08d2vrghwqkw4mg4vmgsynfnhygxpavxnscvs3z70hdff7i001f0";} + {name="kdegraphics-thumbnailers";value="1lhb7m298mbz7dk50savqdz3p6lkbscn0gi6bqapji24464vlb8k";} + {name="kdelibs";value="17pxihhcbinr3jpwvi1iwfnqs2wiqh0jgf1is05yz13122hns87q";} + {name="kdenetwork-filesharing";value="0a8vw6jj0kz0lq96mj3mfzpdvb6xpw8xvccwxhjqp164bzqdz66d";} + {name="kdenetwork-strigi-analyzers";value="14px6ddp8flqd40bww0sl71jmn5bfqm9j3v6rqm63ii7z87qk6xl";} + {name="kdepim";value="0i7r68r5nzflmpdkkzpj5xc3fwxg5903g1fj5g1yn79v5zx1gzd3";} + {name="kdepimlibs";value="1mv8k0wr0wr0hnlb1al50nmz8d77vbm73p2hhipipgliq6zb3vb5";} + {name="kdepim-runtime";value="03xmm9c5whr96bwrdrdmaq8w53qg251g0kd479g02x3br20yi3rd";} + {name="kdeplasma-addons";value="094gj8z1xx4d5vlkq8izifpgvh6sfq36bh08n8ylfa976qq8xm8j";} + {name="kde-runtime";value="01c6pjsq4xp75yma8wbfpg92lrvvppp9ighlxvy7z2afkd8lx9vq";} + {name="kdesdk-kioslaves";value="0k0ff1nq10z0gajr3rnrbhm1rml42d2fi9ahwxdjnxyaav31ml24";} + {name="kdesdk-strigi-analyzers";value="12r17q7mg74prir52h80prc61bn5rq1031cbp3xswh658srf1lg0";} + {name="kdesdk-thumbnailers";value="1kmdpb52kg04smgp9v5a51bjjrw6fsh347ajnxhr8ygg7d8zw763";} + {name="kde-wallpapers";value="05jb5ry6ziz64lqxrmi7c53n8j5hpgrz3lii4y1wnr204342ln6k";} + {name="kdewebdev";value="0sclb72i6nbrsz4a5jlxf7mgngdn7wbd669fqa7xw6axrsjj1cgn";} + {name="kde-workspace";value="00bf708i0vzl47dgcr8mp61n7k0xjzqnlb8j1smliy5bydiaa86g";} + {name="kdf";value="0y5d6d6wl5ycmcswrkgwc301jbj77jnb46sgl38i9q4nf7b3ham0";} + {name="kdiamond";value="0z8c07vx3k466ysri1syka0wm0bkz581kb72d5sns86np0rg0wmp";} + {name="kfilemetadata";value="0wak1nphnphcam8r6pba7m2gld4w04dkk8qn23myjammv3myc59i";} + {name="kfloppy";value="02sv0k6cqvd9zf7hwsjxgb6l3jawx5fkg1siffbb62cgp49y8fw0";} + {name="kfourinline";value="0zhvpbgmk89cn7pjzgdzc4kah8rkjj3w97yym205phc8fc36nwa4";} + {name="kgamma";value="1cpm1d0sr3zphkqpfg11farqal2h2hl6gcdnf8p1b10np1b8rxwk";} + {name="kgeography";value="125772x1kbh136ymja903w2k7vgahs2d1nw471nr8fx511pnxcj4";} + {name="kget";value="1v1j5sfsym1sz8w6ll23il0n4qq74sjx9c9ij29zhdwxy21xasv9";} + {name="kgoldrunner";value="1mc93hwl1diygjlpalf2wdzhdnhcjq1mj9srlxhr5f1w0687pzar";} + {name="kgpg";value="0ihc5pp1mxsa67ynrvf2mpxwhyni6lkcdarj1xmvpcf56nlkfzdw";} + {name="khangman";value="0wddflgsfslbhdpkl39qipnc2xx6b23ci1gr19ipyiyif8d74zix";} + {name="kig";value="1kp3rhsfprp9c9f0wp264x9d6n454ff26ysfnli9gl5l2imxhw9f";} + {name="kigo";value="1gdsr31ybc07bkcyfrrm4fz081l3l5h5rv46ld0f6rfmxm3xv01j";} + {name="killbots";value="1d31pxvjls5a9m521a9n7rynl317585ald1nn4bpk2f138475d12";} + {name="kimono";value="17n1nx66kqcc2wfp6ql7xpn8lq9y3b6djf6y1n3ajvyjh8m357jf";} + {name="kiriki";value="00iis3vx95nlcarysy9mrbz4jnw4rbxgmjpy48z85imdd7yydd8x";} + {name="kiten";value="17n6q1kan8dlxqhnhk73nzn4jg39yw1hh88vsndswmx1s4k68x7r";} + {name="kjumpingcube";value="0p9kswv2wnxqgmlvwbcwxrb27b0h6by1zx91k5vmv16qm789gfk9";} + {name="klettres";value="01vf6cdiafncv0n35cp5v44azxkjjzn1rp1r8rw05vlmh2296p0l";} + {name="klickety";value="0c156fkchcpfybmvc3qkvdqizc62b758drkdqc8pawal8766ff27";} + {name="klines";value="1w8k18azfqsb0q90aijn7xfkkfrbnrnfwn6w66wc8xn2b6hibahl";} + {name="kmag";value="091h7vb3wcp5zg06mp240a2vdhj18xqw40i25djkl7a861xxhpb8";} + {name="kmahjongg";value="0qb933kjv205narrkgr83ha516pldpfxi65l8yhm7801nhljhpsg";} + {name="kmines";value="103lzgr7p2ic29afn8imk6mh7ab0pfpcrdwlsg21zkvrrbrcaq6k";} + {name="kmix";value="153fif25m7w94g8g20ahg5fjppkf3bi8rn4njq1zl1g0bsnrgpfp";} + {name="kmousetool";value="1z62h71mcxdrp4y2dl497x89295m6mlilaqnvp9ijpw6fm4b9czd";} + {name="kmouth";value="06n6srd6011bk29w5xnqihvs6pbhmg0sf5h7mwfwp4szvm167hc4";} + {name="kmplot";value="1xajighandffidp85rjjch4si0gb3mfjks3yh5i8sig8j4797b86";} + {name="knavalbattle";value="1fmh6qds3ql5w3nsw6zk18ia0z4immpwj8sl35qq2kkx1g0hbv0c";} + {name="knetwalk";value="0h17ck55fdwipvsdqfdhmn612jb1nrq6vkj0g9i3qchvw9qz0hcs";} + {name="kolf";value="006h7iqwn55bjrgsc9p6316lgvxvda0kvcdxxfd4sqg2ain64h7q";} + {name="kollision";value="1hc07r3z4w8gqby0pyb5m1ylp8izmvx0ib3dlpmh2jd5khp0qyhj";} + {name="kolourpaint";value="0kf6wjxcd80mc4hxb4nhpksxj0bm9339i835iwpsbjfn8xs1s55h";} + {name="kompare";value="0zhpw7kz1c9hcmqfhnvsg39xw4zhi36q39bgifcbyfvjs0ymbvi4";} + {name="konquest";value="125ciy00h77y7byrlnqv0zhw3pxp9a5i5clz12dlc1z251z3l588";} + {name="konsole";value="0mgi0fw5sc216cy8j45g4zd733d02l2d6z4wjcxqm7rh61lhwx9g";} + {name="kopete";value="0i9qq7k19vyss1k22ppr6xq3y3bb6mndg8b5323f0cvjlpgcc8xs";} + {name="korundum";value="0zapd60frhq652p1xnpaj680vpaqr595dqbhha552c4dfabvgv4j";} + {name="kpat";value="0kfvhkwamrfllgmd8yl6p3xlc0jmivxy0rsdrxpabvpb0vcqh9ml";} + {name="kppp";value="01pj8q1m3gwww6wvgwnd24lgbyvzfm6gskv2c802lzjcj7p9218m";} + {name="kqtquickcharts";value="1vml9scxva9gr8bb6rkxl8gaaghx3lyvwcwcifq5hz0154q875d5";} + {name="krdc";value="07p67z8gh9xnnr71kjy8g6ki07w22c767qbrk2fzar2zvc8dgnw6";} + {name="kremotecontrol";value="06nkg9chkimmzs1ww0sbxglssibby3157jkw6bncg661yfbsd48r";} + {name="kreversi";value="1pjjw3vim3pjazcxggs9axglkl7l1g0fpzqgjdxxn0p8vfh84jgg";} + {name="krfb";value="08qpw93slflx7whp9jbq1bsq1ikm0pgdvys11idvhmzl2lg86j1d";} + {name="kross-interpreters";value="1v6xjdpflzx3gi12vaf6ywzhb4ycrnawb839pjbpw3cy83p1m6pa";} + {name="kruler";value="08b54gimg0z4hl9lgndsbl797r5h88mjlamzzv10k0rf7rsd0924";} + {name="ksaneplugin";value="1rcmjkzr3yxanpvkfvbvf06dg57m1mmfmmy4n6ixy51ir0mh1v5j";} + {name="kscd";value="01nchy6pb4spvbhgmkfqglmrm8jgkslg6k1q1vzvahyns4lv8b6d";} + {name="kshisen";value="0i9imqb4zz2yvc80dgvbz08s3pxncm8dnvvwxjaw674nks0jxlh8";} + {name="ksirk";value="1lnsz5fg86vqdks3d5dfsxzkdxs8kzakjrwx4ixpab5xhq05vzls";} + {name="ksnakeduel";value="0721xwg3rjwib3aazgzhdmph0bpl2p5zkha8jbmq7aqr5i8ddkx0";} + {name="ksnapshot";value="10grzlp7sq367g91858d16sadzipzmgwczhnb5xvy0437lqhhz7c";} + {name="kspaceduel";value="0cwgmpv2xcjwz914hqx6rivi5sk4x66imcdqy7pjnj5vk4f197m7";} + {name="ksquares";value="1zzg6y6zfqd1a0939hd1wy7ix4wld7ixp5pz2qs315g51m9lpn7i";} + {name="kstars";value="1pjvy476yjir4z6x1j7192xjr9m0zcxq3x3lpvsxf92pk3l4c73p";} + {name="ksudoku";value="0qgjx7fbawhn63vv37wv4z56jf0gi4chs64aw9bllbq52syirmgb";} + {name="ksystemlog";value="11xh1psqhq7vimymb394kxjk83yax3gzi9fdckjspk6p10cycln2";} + {name="kteatime";value="16rrlxc67afkin3afdf1s9dlr7z2281dfsja64pdrrdilwwpyqwi";} + {name="ktimer";value="02yw6zgp5wbgfvq38adbnn8mqpjc69chz4rndphmyskvflszz6n4";} + {name="ktouch";value="110haqrk8ixq7hmsb8hymkbqw7jygybxh467p4ag0pczr09gr3d3";} + {name="ktuberling";value="1jpnzb6dbmcv2f0hb7y3alqn9jqq589jzz2chbvlsm7p7xnpv2h2";} + {name="kturtle";value="1z6mx1ls5ymh5biyzf5f99q6qapr4a2jgxdi2za0qclqjsla4hrf";} + {name="ktux";value="1n854lccqs540c0lsg6794g0ir25zli1h6z92vyccsvranjb6k9r";} + {name="kubrick";value="1sa53z2bdk4rnvr5fs73nazl1aisbcg9yyianazggqshhy0l6w8k";} + {name="kuser";value="1rkjah60cwpkp355ldcbvb7cwap9ib1mvj1aska9zn2kad0dg8n1";} + {name="kwalletmanager";value="1w3csapcddpzn7l7v4a2802wwh6d1zm8vqx9lz3wmajczpx6xjab";} + {name="kwordquiz";value="0zvxzva65cvqin64v105zh9hwbv0yi8mx9lll4ybbp915dw8701q";} + {name="libkcddb";value="0xrmg53p5lh4ral2l5zh96angaf9czhih3zzvwr9qr9h9ks5vrn1";} + {name="libkcompactdisc";value="14hjlql1vzzszfpxhz0rzvjpi0q7f20ry5857lpdbqhnrc0p3bmg";} + {name="libkdcraw";value="0ksarwq8aaxc77cp0ryfnw1n311wkykzdlhj03rln8jjlbdm3j3q";} + {name="libkdeedu";value="1i2sfby6ya8cfkdk28a9ia5zixwbixy56ql488v41w29mf1jnvzx";} + {name="libkdegames";value="0rd24v67fg09h5ilr4r7g9q21z165q1pm37y17l2qgjzr04czwn4";} + {name="libkexiv2";value="1z8fmxfphx7szf4a17fs7zfjyxj6wncbvsphfvf6i5rlqy60g1y4";} + {name="libkipi";value="0fjm96pwird4km4wlhag1b67czwi03vsc2anng9iw3l4avavmvfw";} + {name="libkmahjongg";value="1ab66zgxya23yi7l3ga78yrm1kkr0l6hl709khyyk667kgzfqf16";} + {name="libkomparediff2";value="0bx672rysz78y2322lmm8a0i1k9v755wx8vmh538amk5smq936mz";} + {name="libksane";value="18nd90hrfmrgwmm6p5hgdr9dwc7z9978v2ibmjiim8dv44myk2is";} + {name="lokalize";value="1ig5mvzcspyz6ihr43fmwnhw560pby2kij0bz598xjkvb5hwfn8g";} + {name="lskat";value="01vgf40apf9x322k4f3i78n9ha01maga3xh3zvw4kmbs8kd662bi";} + {name="marble";value="1w603miykq0s84jk6j17b7pg44rd4az0dhzgq7j7d6dfcz7nfrjd";} + {name="mplayerthumbs";value="0zin10mah7wm7f5v3hqffbwq2pqs7v39i2qhdizrijp85wsp925v";} + {name="nepomuk-core";value="0gdb7vk3qjvv04a5xqwlv0f4bjn391a3k3hkgibkql9ggxbjbrvl";} + {name="nepomuk-widgets";value="1qbrs56af9zdzhfb8964p44706gdf4j0bmj378xy5jva7km9cypx";} + {name="okteta";value="1vgs9kwp1bb5fvp1ja5hzvgll1s7n3ds5gg4500khy47k2z2cvmx";} + {name="okular";value="0ijw71vkk1lj873hqczc23vllhkc9s0miipsbllxblx57rgi5qp6";} + {name="oxygen-icons";value="1nwjjcm0isjnn3i8xf75nk6mhbg1zm20farlmyrzx261r2cj68lv";} + {name="pairs";value="124rpv22cx6bi65ixz5889zk46q17913w4l80d94pp9l6aypn4fm";} + {name="palapeli";value="08rklllik0zsrw19ff6b6l0ijxkyxy8wn5mxm3i07h9pbzv1ga5k";} + {name="parley";value="1mx0s7dmcmprrr44iim3pzr782cacndqiqiy7zz1zdw41mif3q16";} + {name="perlkde";value="0aiv8wmv08yp19rk228m7wirh43dagz4yapp3f7bgg50f4c6rpkb";} + {name="perlqt";value="0villxkgqwscx0sipfqnacxdyi3kzkmma4p9fkjq0hvqzq1b4pd0";} + {name="picmi";value="0x6nv6ahgsb90brckgv97grsmdb4za5m9izrkcyz6rg5gnn848c4";} + {name="poxml";value="020lf3wc7vn9d01pqqn1ygvvx7699vxkk5n9hq8zw7rf6n25gifx";} + {name="print-manager";value="0df1zca0cdk3qdyjfsymhghdadixz3fwm5w4h833iwf7fgr3c5q8";} + {name="pykde4";value="1z40gnkyjlv6ds3cmpzvv99394rhmydr6rxx7qj33m83xnsxgfbz";} + {name="qtruby";value="179wjl7w8vdm1606m1dzphhmcqxynfbdrcnrjzpyyvhibsdyfl10";} + {name="qyoto";value="0inwdnwhmi3cf82z0ni1abf621l6322r84kq447cqia6rkmf59j4";} + {name="rocs";value="1z6lk3xzbrw6581gy8hd3lm3ry4vkphg9wcdl8l03az1nyk2xp61";} + {name="smokegen";value="1if43r4icp7fz8ngmfw8i5wdylak48j79pp3bdvizfwn4pazl2s3";} + {name="smokekde";value="099c4qkpwwhbj9yibsm5zkgczv22qs4vd6s84v1p347kxr5in1hd";} + {name="smokeqt";value="02drfr1bnhac27a4c8pvbvvag250pmg71iz7ig968bp2gqvxcf99";} + {name="step";value="14f4a2k2al21ynkmwqrh5c33fgn6bhw3g461yhvmnq2sf8fwg8wb";} + {name="superkaramba";value="1jf3dck707svpbnbpwv46mlcgf5x52djnix5wjsg3wmkipgs4w88";} + {name="svgpart";value="1bj9gaaj6nqdgchmqnn381288aqw09ky0kbm1naddqa82pk196f6";} + {name="sweeper";value="0fhq9n1ffhcka37j6m9gs0rdxs0dzfn7lnl66v9wpgw075lfiaxx";} + {name="umbrello";value="0cvks49ij449grh3ldbpmmagz3yx61zq1g0fsg2ii9pqzbd6hn3x";} + {name="zeroconf-ioslave";value="0hhm5jj0kbi1y18m4x50hnpnfi1cjgh6mglggbscp8xr32jgmgjm";} +]; +versions=builtins.listToAttrs[ + {name="amor";value="4.14.3";} + {name="analitza";value="4.14.3";} + {name="ark";value="4.14.3";} + {name="artikulate";value="4.14.3";} + {name="audiocd-kio";value="4.14.3";} + {name="baloo";value="4.14.3";} + {name="baloo-widgets";value="4.14.3";} + {name="blinken";value="4.14.3";} + {name="bomber";value="4.14.3";} + {name="bovo";value="4.14.3";} + {name="cantor";value="4.14.3";} + {name="cervisia";value="4.14.3";} + {name="dolphin-plugins";value="4.14.3";} + {name="dragon";value="4.14.3";} + {name="ffmpegthumbs";value="4.14.3";} + {name="filelight";value="4.14.3";} + {name="granatier";value="4.14.3";} + {name="gwenview";value="4.14.3";} + {name="jovie";value="4.14.3";} + {name="juk";value="4.14.3";} + {name="kaccessible";value="4.14.3";} + {name="kactivities";value="4.13.3";} + {name="kajongg";value="4.14.3";} + {name="kalgebra";value="4.14.3";} + {name="kalzium";value="4.14.3";} + {name="kamera";value="4.14.3";} + {name="kanagram";value="4.14.3";} + {name="kapman";value="4.14.3";} + {name="kapptemplate";value="4.14.3";} + {name="kate";value="4.14.3";} + {name="katomic";value="4.14.3";} + {name="kblackbox";value="4.14.3";} + {name="kblocks";value="4.14.3";} + {name="kbounce";value="4.14.3";} + {name="kbreakout";value="4.14.3";} + {name="kbruch";value="4.14.3";} + {name="kcachegrind";value="4.14.3";} + {name="kcalc";value="4.14.3";} + {name="kcharselect";value="4.14.3";} + {name="kcolorchooser";value="4.14.3";} + {name="kcron";value="4.14.3";} + {name="kdeartwork";value="4.14.3";} + {name="kde-baseapps";value="4.14.3";} + {name="kde-base-artwork";value="4.14.3";} + {name="kde-dev-scripts";value="4.14.3";} + {name="kde-dev-utils";value="4.14.3";} + {name="kdegraphics-mobipocket";value="4.14.3";} + {name="kdegraphics-strigi-analyzer";value="4.14.3";} + {name="kdegraphics-thumbnailers";value="4.14.3";} + {name="kdelibs";value="4.14.3";} + {name="kdenetwork-filesharing";value="4.14.3";} + {name="kdenetwork-strigi-analyzers";value="4.14.3";} + {name="kdepim";value="4.14.3";} + {name="kdepimlibs";value="4.14.3";} + {name="kdepim-runtime";value="4.14.3";} + {name="kdeplasma-addons";value="4.14.3";} + {name="kde-runtime";value="4.14.3";} + {name="kdesdk-kioslaves";value="4.14.3";} + {name="kdesdk-strigi-analyzers";value="4.14.3";} + {name="kdesdk-thumbnailers";value="4.14.3";} + {name="kde-wallpapers";value="4.14.3";} + {name="kdewebdev";value="4.14.3";} + {name="kde-workspace";value="4.11.14";} + {name="kdf";value="4.14.3";} + {name="kdiamond";value="4.14.3";} + {name="kfilemetadata";value="4.14.3";} + {name="kfloppy";value="4.14.3";} + {name="kfourinline";value="4.14.3";} + {name="kgamma";value="4.14.3";} + {name="kgeography";value="4.14.3";} + {name="kget";value="4.14.3";} + {name="kgoldrunner";value="4.14.3";} + {name="kgpg";value="4.14.3";} + {name="khangman";value="4.14.3";} + {name="kig";value="4.14.3";} + {name="kigo";value="4.14.3";} + {name="killbots";value="4.14.3";} + {name="kimono";value="4.14.3";} + {name="kiriki";value="4.14.3";} + {name="kiten";value="4.14.3";} + {name="kjumpingcube";value="4.14.3";} + {name="klettres";value="4.14.3";} + {name="klickety";value="4.14.3";} + {name="klines";value="4.14.3";} + {name="kmag";value="4.14.3";} + {name="kmahjongg";value="4.14.3";} + {name="kmines";value="4.14.3";} + {name="kmix";value="4.14.3";} + {name="kmousetool";value="4.14.3";} + {name="kmouth";value="4.14.3";} + {name="kmplot";value="4.14.3";} + {name="knavalbattle";value="4.14.3";} + {name="knetwalk";value="4.14.3";} + {name="kolf";value="4.14.3";} + {name="kollision";value="4.14.3";} + {name="kolourpaint";value="4.14.3";} + {name="kompare";value="4.14.3";} + {name="konquest";value="4.14.3";} + {name="konsole";value="4.14.3";} + {name="kopete";value="4.14.3";} + {name="korundum";value="4.14.3";} + {name="kpat";value="4.14.3";} + {name="kppp";value="4.14.3";} + {name="kqtquickcharts";value="4.14.3";} + {name="krdc";value="4.14.3";} + {name="kremotecontrol";value="4.14.3";} + {name="kreversi";value="4.14.3";} + {name="krfb";value="4.14.3";} + {name="kross-interpreters";value="4.14.3";} + {name="kruler";value="4.14.3";} + {name="ksaneplugin";value="4.14.3";} + {name="kscd";value="4.14.3";} + {name="kshisen";value="4.14.3";} + {name="ksirk";value="4.14.3";} + {name="ksnakeduel";value="4.14.3";} + {name="ksnapshot";value="4.14.3";} + {name="kspaceduel";value="4.14.3";} + {name="ksquares";value="4.14.3";} + {name="kstars";value="4.14.3";} + {name="ksudoku";value="4.14.3";} + {name="ksystemlog";value="4.14.3";} + {name="kteatime";value="4.14.3";} + {name="ktimer";value="4.14.3";} + {name="ktouch";value="4.14.3";} + {name="ktuberling";value="4.14.3";} + {name="kturtle";value="4.14.3";} + {name="ktux";value="4.14.3";} + {name="kubrick";value="4.14.3";} + {name="kuser";value="4.14.3";} + {name="kwalletmanager";value="4.14.3";} + {name="kwordquiz";value="4.14.3";} + {name="libkcddb";value="4.14.3";} + {name="libkcompactdisc";value="4.14.3";} + {name="libkdcraw";value="4.14.3";} + {name="libkdeedu";value="4.14.3";} + {name="libkdegames";value="4.14.3";} + {name="libkexiv2";value="4.14.3";} + {name="libkipi";value="4.14.3";} + {name="libkmahjongg";value="4.14.3";} + {name="libkomparediff2";value="4.14.3";} + {name="libksane";value="4.14.3";} + {name="lokalize";value="4.14.3";} + {name="lskat";value="4.14.3";} + {name="marble";value="4.14.3";} + {name="mplayerthumbs";value="4.14.3";} + {name="nepomuk-core";value="4.14.3";} + {name="nepomuk-widgets";value="4.14.3";} + {name="okteta";value="4.14.3";} + {name="okular";value="4.14.3";} + {name="oxygen-icons";value="4.14.3";} + {name="pairs";value="4.14.3";} + {name="palapeli";value="4.14.3";} + {name="parley";value="4.14.3";} + {name="perlkde";value="4.14.3";} + {name="perlqt";value="4.14.3";} + {name="picmi";value="4.14.3";} + {name="poxml";value="4.14.3";} + {name="print-manager";value="4.14.3";} + {name="pykde4";value="4.14.3";} + {name="qtruby";value="4.14.3";} + {name="qyoto";value="4.14.3";} + {name="rocs";value="4.14.3";} + {name="smokegen";value="4.14.3";} + {name="smokekde";value="4.14.3";} + {name="smokeqt";value="4.14.3";} + {name="step";value="4.14.3";} + {name="superkaramba";value="4.14.3";} + {name="svgpart";value="4.14.3";} + {name="sweeper";value="4.14.3";} + {name="umbrello";value="4.14.3";} + {name="zeroconf-ioslave";value="4.14.3";} +]; +modules=[ +{ + module="kdemultimedia"; + split=true; + pkgs=[ + { name="audiocd-kio"; sane="audiocd_kio"; } + { name="dragon"; } + { name="ffmpegthumbs"; } + { name="juk"; } + { name="kmix"; } + { name="kscd"; } + { name="libkcddb"; } + { name="libkcompactdisc"; } + { name="mplayerthumbs"; } + ]; +} +{ + module="kdegraphics"; + split=true; + pkgs=[ + { name="gwenview"; } + { name="kamera"; } + { name="kcolorchooser"; } + { name="kdegraphics-mobipocket"; sane="kdegraphics_mobipocket"; } + { name="kdegraphics-strigi-analyzer"; sane="kdegraphics_strigi_analyzer"; } + { name="kdegraphics-thumbnailers"; sane="kdegraphics_thumbnailers"; } + { name="kgamma"; } + { name="kolourpaint"; } + { name="kruler"; } + { name="ksaneplugin"; } + { name="ksnapshot"; } + { name="libkdcraw"; } + { name="libkexiv2"; } + { name="libkipi"; } + { name="libksane"; } + { name="okular"; } + { name="svgpart"; } + ]; +} +{ + module="kdelibs"; + split=true; + pkgs=[ + { name="kdelibs"; } + { name="baloo"; } + { name="baloo-widgets"; sane="baloo_widgets"; } + { name="kfilemetadata"; } + { name="nepomuk-core"; sane="nepomuk_core"; } + { name="nepomuk-widgets"; sane="nepomuk_widgets"; } + ]; +} +{ + module="kdenetwork"; + split=true; + pkgs=[ + { name="kdenetwork-filesharing"; sane="kdenetwork_filesharing"; } + { name="kdenetwork-strigi-analyzers"; sane="kdenetwork_strigi_analyzers"; } + { name="kget"; } + { name="kopete"; } + { name="kppp"; } + { name="krdc"; } + { name="krfb"; } + { name="zeroconf-ioslave"; sane="zeroconf_ioslave"; } + ]; +} +{ + module="kdeutils"; + split=true; + pkgs=[ + { name="ark"; } + { name="filelight"; } + { name="kcalc"; } + { name="kcharselect"; } + { name="kdf"; } + { name="kfloppy"; } + { name="kgpg"; } + { name="kremotecontrol"; } + { name="ktimer"; } + { name="kwalletmanager"; } + { name="print-manager"; sane="print_manager"; } + { name="superkaramba"; } + { name="sweeper"; } + ]; +} +{ + module="applications"; + split=true; + pkgs=[ + { name="kate"; } + { name="konsole"; } + ]; +} +{ + module="kdetoys"; + split=true; + pkgs=[ + { name="amor"; } + { name="kteatime"; } + { name="ktux"; } + ]; +} +{ + module="kdesdk"; + split=true; + pkgs=[ + { name="cervisia"; } + { name="dolphin-plugins"; sane="dolphin_plugins"; } + { name="kapptemplate"; } + { name="kcachegrind"; } + { name="kde-dev-scripts"; sane="kde_dev_scripts"; } + { name="kde-dev-utils"; sane="kde_dev_utils"; } + { name="kdesdk-kioslaves"; sane="kdesdk_kioslaves"; } + { name="kdesdk-strigi-analyzers"; sane="kdesdk_strigi_analyzers"; } + { name="kdesdk-thumbnailers"; sane="kdesdk_thumbnailers"; } + { name="kompare"; } + { name="libkomparediff2"; } + { name="lokalize"; } + { name="okteta"; } + { name="poxml"; } + { name="umbrello"; } + ]; +} +{ + module="kdegames"; + split=true; + pkgs=[ + { name="bomber"; } + { name="bovo"; } + { name="granatier"; } + { name="kajongg"; } + { name="kapman"; } + { name="katomic"; } + { name="kblackbox"; } + { name="kblocks"; } + { name="kbounce"; } + { name="kbreakout"; } + { name="kdiamond"; } + { name="kfourinline"; } + { name="kgoldrunner"; } + { name="kigo"; } + { name="killbots"; } + { name="kiriki"; } + { name="kjumpingcube"; } + { name="klickety"; } + { name="klines"; } + { name="kmahjongg"; } + { name="kmines"; } + { name="knavalbattle"; } + { name="knetwalk"; } + { name="kolf"; } + { name="kollision"; } + { name="konquest"; } + { name="kpat"; } + { name="kreversi"; } + { name="kshisen"; } + { name="ksirk"; } + { name="ksnakeduel"; } + { name="kspaceduel"; } + { name="ksquares"; } + { name="ksudoku"; } + { name="ktuberling"; } + { name="kubrick"; } + { name="libkdegames"; } + { name="libkmahjongg"; } + { name="lskat"; } + { name="palapeli"; } + { name="picmi"; } + ]; +} +{ + module="kdeedu"; + split=true; + pkgs=[ + { name="analitza"; } + { name="artikulate"; } + { name="blinken"; } + { name="cantor"; } + { name="kalgebra"; } + { name="kalzium"; } + { name="kanagram"; } + { name="kbruch"; } + { name="kgeography"; } + { name="khangman"; } + { name="kig"; } + { name="kiten"; } + { name="klettres"; } + { name="kmplot"; } + { name="kqtquickcharts"; } + { name="kstars"; } + { name="ktouch"; } + { name="kturtle"; } + { name="kwordquiz"; } + { name="libkdeedu"; } + { name="marble"; } + { name="pairs"; } + { name="parley"; } + { name="rocs"; } + { name="step"; } + ]; +} +{ + module="kdeadmin"; + split=true; + pkgs=[ + { name="kcron"; } + { name="ksystemlog"; } + { name="kuser"; } + ]; +} +{ + module="kdebindings"; + split=true; + pkgs=[ + { name="kimono"; } + { name="korundum"; } + { name="kross-interpreters"; sane="kross_interpreters"; } + { name="perlkde"; } + { name="perlqt"; } + { name="pykde4"; } + { name="qtruby"; } + { name="qyoto"; } + { name="smokegen"; } + { name="smokekde"; } + { name="smokeqt"; } + ]; +} +{ + module="kdeaccessibility"; + split=true; + pkgs=[ + { name="jovie"; } + { name="kaccessible"; } + { name="kmag"; } + { name="kmousetool"; } + { name="kmouth"; } + ]; +} +{ + module="kde-baseapps"; +sane="kde_baseapps"; split=true; + pkgs=[ + { name="kde-baseapps"; sane="kde_baseapps"; } + ]; +} +{ module="kactivities"; split=false;} +{ module="kdeartwork"; split=false; + pkgs=[ + { name="ColorSchemes"; } + { name="IconThemes"; } + { name="emoticons"; } + { name="kscreensaver"; } + { name="kwin-styles"; sane="kwin_styles";} + { name="styles"; } + { name="wallpapers"; } + { name="HighResolutionWallpapers"; } + { name="WeatherWallpapers"; } + { name="desktopthemes"; } + ]; + +} +{ module="kde-base-artwork"; sane="kde_base_artwork"; split=false;} +{ module="kdepim"; split=false;} +{ module="kdepimlibs"; split=false;} +{ module="kdepim-runtime"; sane="kdepim_runtime"; split=false;} +{ module="kdeplasma-addons"; sane="kdeplasma_addons"; split=false;} +{ module="kde-runtime"; sane="kde_runtime"; split=false;} +{ module="kde-wallpapers"; sane="kde_wallpapers"; split=false;} +{ module="kdewebdev"; split=false; + pkgs=[ + { name="klinkstatus"; } + { name="kfilereplace"; } + { name="kimagemapeditor"; } + { name="kommander"; } + ]; + +} +{ module="kde-workspace"; sane="kde_workspace"; split=false;} +{ module="oxygen-icons"; sane="oxygen_icons"; split=false;} +]; +} diff --git a/pkgs/desktops/kde-4.14/kde-runtime.nix b/pkgs/desktops/kde-4.14/kde-runtime.nix index 1c9706f4f4b..2b8df4757de 100644 --- a/pkgs/desktops/kde-4.14/kde-runtime.nix +++ b/pkgs/desktops/kde-4.14/kde-runtime.nix @@ -4,6 +4,8 @@ }: kde { + patches = [ ./CVE-2014-8600.diff ]; + buildInputs = [ kdelibs attica xz bzip2 libssh libjpeg exiv2 ntrack qca2 samba libcanberra pulseaudio gpgme diff --git a/pkgs/desktops/kde-4.14/kdebindings/pykde4.nix b/pkgs/desktops/kde-4.14/kdebindings/pykde4.nix index 64e196452e3..191b96380e6 100644 --- a/pkgs/desktops/kde-4.14/kdebindings/pykde4.nix +++ b/pkgs/desktops/kde-4.14/kdebindings/pykde4.nix @@ -1,5 +1,5 @@ -{ kde, kdelibs, python, sip, pyqt4, kdepimlibs, shared_desktop_ontologies, - polkit_qt_1, boost, lndir, pkgconfig }: +{ kde, kdelibs, python, pyqt4, kdepimlibs, shared_desktop_ontologies, + polkit_qt4, boost, lndir, pkgconfig }: let pydir = "lib/python${python.majorVersion}"; in @@ -9,12 +9,12 @@ kde { buildInputs = [ python kdepimlibs shared_desktop_ontologies - boost polkit_qt_1 + boost polkit_qt4 ]; nativeBuildInputs = [ pkgconfig ]; - propagatedBuildInputs = [ pyqt4 sip ]; + propagatedBuildInputs = [ pyqt4 ]; preConfigure = '' diff --git a/pkgs/desktops/kde-4.14/kdelibs/baloo.nix b/pkgs/desktops/kde-4.14/kdelibs/baloo.nix index 0976639e803..8883c03274d 100644 --- a/pkgs/desktops/kde-4.14/kdelibs/baloo.nix +++ b/pkgs/desktops/kde-4.14/kdelibs/baloo.nix @@ -1,4 +1,4 @@ -{ stdenv, kde, kdelibs, pkgconfig, doxygen, kdepimlibs, xapian, qjson, akonadi, kfilemetadata +{ stdenv, kde, kdelibs, pkgconfig, doxygen, kdepimlibs, xapian, qjson, akonadi, kfilemetadata, boost }: kde { @@ -6,7 +6,7 @@ kde { # TODO: qmobipocket buildInputs = [ - kdelibs kdepimlibs xapian qjson akonadi kfilemetadata + kdelibs kdepimlibs xapian qjson akonadi kfilemetadata boost ]; nativeBuildInputs = [ pkgconfig doxygen ]; diff --git a/pkgs/desktops/kde-4.14/kdelibs/kdelibs.nix b/pkgs/desktops/kde-4.14/kdelibs/kdelibs.nix index 4207dfd5654..52e0ebf2062 100644 --- a/pkgs/desktops/kde-4.14/kdelibs/kdelibs.nix +++ b/pkgs/desktops/kde-4.14/kdelibs/kdelibs.nix @@ -2,7 +2,7 @@ , qt4, bzip2, fam, shared_mime_info, giflib, jasper, strigi , openexr, avahi, kerberos, shared_desktop_ontologies, libXScrnSaver , automoc4, soprano, qca2, attica, enchant, libdbusmenu_qt, grantlee -, docbook_xml_dtd_42, docbook_xsl, polkit_qt_1, acl, attr, libXtst +, docbook_xml_dtd_42, docbook_xsl, polkit_qt4, acl, attr, libXtst , udev, herqq, phonon, libjpeg, xz, ilmbase, libxslt , pkgconfig }: @@ -13,7 +13,7 @@ kde { buildInputs = [ pkgconfig attica avahi bzip2 enchant fam giflib grantlee herqq - libdbusmenu_qt libXScrnSaver polkit_qt_1 qca2 acl jasper libxslt + libdbusmenu_qt libXScrnSaver polkit_qt4 qca2 acl jasper libxslt shared_desktop_ontologies xz udev libjpeg kerberos openexr libXtst attr ]; diff --git a/pkgs/desktops/kde-4.14/kdepimlibs.nix b/pkgs/desktops/kde-4.14/kdepimlibs.nix index 8301e9f4b18..e0f355acdd9 100644 --- a/pkgs/desktops/kde-4.14/kdepimlibs.nix +++ b/pkgs/desktops/kde-4.14/kdepimlibs.nix @@ -6,11 +6,14 @@ kde { nativeBuildInputs = [ pkgconfig ]; buildInputs = - [ gpgme libical libxslt qjson prison + [ boost gpgme libical libxslt qjson prison openldap cyrus_sasl akonadi shared_desktop_ontologies ]; - propagatedBuildInputs = [ kdelibs nepomuk_core boost ]; + propagatedBuildInputs = [ kdelibs nepomuk_core ]; + + # Prevent a dependency on boost.dev. FIXME: move this cmake file to .dev. + postInstall = "rm $out/lib/gpgmepp/GpgmeppConfig.cmake"; meta = { description = "KDE PIM libraries"; diff --git a/pkgs/desktops/kde-4.14/kdewebdev/klinkstatus.nix b/pkgs/desktops/kde-4.14/kdewebdev/klinkstatus.nix index 918512e2b2d..b0138ecb48b 100644 --- a/pkgs/desktops/kde-4.14/kdewebdev/klinkstatus.nix +++ b/pkgs/desktops/kde-4.14/kdewebdev/klinkstatus.nix @@ -1,10 +1,10 @@ -{ kde, kdelibs, libxml2, libxslt, kdepimlibs, htmlTidy, boost }: +{ kde, kdelibs, libxml2, libxslt, kdepimlibs, html-tidy, boost }: kde { # todo: ruby19 is not found by the build system. not linking against ruby18 due to it being too old - buildInputs = [ kdelibs kdepimlibs htmlTidy boost ]; + buildInputs = [ kdelibs kdepimlibs html-tidy boost ]; meta = { description = "A KDE link checker"; diff --git a/pkgs/desktops/kde-4.14/l10n/manifest-4.14.1.nix b/pkgs/desktops/kde-4.14/l10n/manifest-4.14.1.nix deleted file mode 100644 index 922bf46adcf..00000000000 --- a/pkgs/desktops/kde-4.14/l10n/manifest-4.14.1.nix +++ /dev/null @@ -1,267 +0,0 @@ -[ -{ - lang = "ar"; - saneName = "ar"; - sha256 = "1hprszswsrmlbbbi6yian9v55yg78ca0y18ass0wvqpa0wk1yjhl"; -} -{ - lang = "bg"; - saneName = "bg"; - sha256 = "0vbxv671h88sq3mjsz8cs8y4cqf38xsqar517mwvzkav17jdgsin"; -} -{ - lang = "bs"; - saneName = "bs"; - sha256 = "1s6jqrldp28a2c7y74f6kwp6wy01d9n667p3wnfjbs2x4r7q5yag"; -} -{ - lang = "ca"; - saneName = "ca"; - sha256 = "1aqs3jr5w7kwzkdw7a00b6yslzphrwvaib8w37fz21ppijsyhb55"; -} -{ - lang = "ca@valencia"; - saneName = "ca_valencia"; - sha256 = "0ns7jqv9yil38m5ymy0q6ghmv0807wqjjp68z2z2c3n50ky4a9nn"; -} -{ - lang = "cs"; - saneName = "cs"; - sha256 = "0bs92lxdffyqd4yrzar0xwa43j1zb6hj4z0kw99aj2gwdn6kripr"; -} -{ - lang = "da"; - saneName = "da"; - sha256 = "129g2zb7di4w51dcykpbm4ilr23f0a00f62yw96583lnm7cmnxyh"; -} -{ - lang = "de"; - saneName = "de"; - sha256 = "0vahrfrrnqxj3mhm13wavykrrs4r7r3yff9v19n8b6j2v1frcj21"; -} -{ - lang = "el"; - saneName = "el"; - sha256 = "1rbclbbcgylxnfkf7j9k1vm1b40lhgl5lghbqz488i2pkkm0sxdi"; -} -{ - lang = "en_GB"; - saneName = "en_GB"; - sha256 = "060zw53mdh872agsp3qszqb2a04kfrzr6mfnbh3fa3kqdkdk9czq"; -} -{ - lang = "es"; - saneName = "es"; - sha256 = "117gvv3280fy9ir8964xvpjc89nd1igp6g43s7gbg7w7dq3ssm9n"; -} -{ - lang = "et"; - saneName = "et"; - sha256 = "15z7zqdh8i7rq5wdzbri73ifdd8nxac4izs1lgyj73nhbj5wfqkf"; -} -{ - lang = "eu"; - saneName = "eu"; - sha256 = "1386aj4gfh6014kb746vwq7dh8bbps9q55x1narhp85v430mqbb5"; -} -{ - lang = "fa"; - saneName = "fa"; - sha256 = "0izpc6k2ly2s70wzd2zawl6051fxds27arkq6z9cbrn535697790"; -} -{ - lang = "fi"; - saneName = "fi"; - sha256 = "0k6grdvik887gmhr1f2la6xpj0c7hfqk4x2p9akb7v62byl1f85h"; -} -{ - lang = "fr"; - saneName = "fr"; - sha256 = "1cqbxk82lc6k7f3y2aj5nflm9l4nqgzg7rs45xw5sbjrcbkkifhy"; -} -{ - lang = "ga"; - saneName = "ga"; - sha256 = "1cyhsr7yvbpkllkzc4lc57r03x53xyxsk973dy3gw3nhj90b3wj3"; -} -{ - lang = "gl"; - saneName = "gl"; - sha256 = "0ywnk0rn983i2pbyj7iqxvkl1z3szh3l1ikj0mwrbk63y5xdrxkw"; -} -{ - lang = "he"; - saneName = "he"; - sha256 = "1125cajwik5n6mdqx3m0wiaj3aw828sk9gi4yff8ki8710p7yff5"; -} -{ - lang = "hi"; - saneName = "hi"; - sha256 = "12v5m86pi35q9dyd9iph16iqlr8hz12q49h0fpqq8rn6m6l7q2cb"; -} -{ - lang = "hr"; - saneName = "hr"; - sha256 = "0dyjp6j1xhmfkmvvqql6d6viqg7c6qqjbi709fq2d41jmrk9b6mp"; -} -{ - lang = "hu"; - saneName = "hu"; - sha256 = "004pq9sw834ksj988w8sf4plfqzbbzkwyvgjv3fsb96a3dq86w76"; -} -{ - lang = "ia"; - saneName = "ia"; - sha256 = "00y28i5f0q6vzdwbdjb2mvc3yb4sdswqhn5ajr2pig5wrd95l4mf"; -} -{ - lang = "id"; - saneName = "id"; - sha256 = "1z5hpyd3s3j78403ffyp6bw82n2qncqx3nw3bgc8ivsmls99zm1i"; -} -{ - lang = "is"; - saneName = "is"; - sha256 = "19kswci8x4q5cz0qcy0bba5ix3a9jjzmdpn3idsd42p2hn95dzjg"; -} -{ - lang = "it"; - saneName = "it"; - sha256 = "1shx1nmq0if35qlw97bq0kmbdjqzkzy61m0pdmlwg85i6z3fv9x0"; -} -{ - lang = "ja"; - saneName = "ja"; - sha256 = "1y5g9bgg7c5f9nmcci0h2zi8bmk8xphwd0vkzjh6mqdhx4mckawh"; -} -{ - lang = "kk"; - saneName = "kk"; - sha256 = "0318wnd31q2gsizhcsp2rgdzsd64vvrmm42rihin01325nx58nzi"; -} -{ - lang = "km"; - saneName = "km"; - sha256 = "1jjprhshr6ll4v1fin7bv00wgv243hg3an9b6f6jk75q146bdv8v"; -} -{ - lang = "ko"; - saneName = "ko"; - sha256 = "06r0yh1yqvay6swbyr3qpyx67z1sdf0f71bj02y3zalp53q33n2x"; -} -{ - lang = "lt"; - saneName = "lt"; - sha256 = "09slsn1frwpf9agwyp8chwlb9mzfaqpd9h21dnbpahz3yxzcr4zk"; -} -{ - lang = "lv"; - saneName = "lv"; - sha256 = "10zrn03iir9z4fhpf6kqczn04808axgpxaa60qijdpr7h0wa3nkx"; -} -{ - lang = "mr"; - saneName = "mr"; - sha256 = "1g8r6zx9mpyzahi5nmciwjcpc4llylj35yarwypghp53pbmqy1qz"; -} -{ - lang = "nb"; - saneName = "nb"; - sha256 = "0lkbm0yfn32yfmbrfp9ip98gydcpg553fv9f2lwn0xh369qsqi8w"; -} -{ - lang = "nds"; - saneName = "nds"; - sha256 = "0lgs7qw2k2w2sxdhs5mkp3ifswc09q17l37q6y8qc7sk6bpsxgam"; -} -{ - lang = "nl"; - saneName = "nl"; - sha256 = "143piqk6sdqs440qzws251i4h08gqm908g244frjkaswmd44a67s"; -} -{ - lang = "nn"; - saneName = "nn"; - sha256 = "1j391h00alzl2bsfa5nxrkh9z3j4jjf1wlg54mjnaxm2n9r13f7a"; -} -{ - lang = "pa"; - saneName = "pa"; - sha256 = "0c9805q6b3pswc33wr4lwfnm1knqm7i984dsdx50w66b2fh3jldh"; -} -{ - lang = "pl"; - saneName = "pl"; - sha256 = "1w7jihagpw8n6ljm965mqx8shjywh4zanybb2kc94cwyx5dpg6ia"; -} -{ - lang = "pt"; - saneName = "pt"; - sha256 = "0yh203s8v5r3yf1c98lwyk220ppwbndn879c4z71r88jww9g2xaw"; -} -{ - lang = "pt_BR"; - saneName = "pt_BR"; - sha256 = "1r3krrpwvwdpailmdn7ilaamcjhahg6kpq8lmgqx85aybaqwllqa"; -} -{ - lang = "ro"; - saneName = "ro"; - sha256 = "1nnzmzj90jh97nbrjbdyyfc9vlgsra622y63mg3dps4vzmv7sfji"; -} -{ - lang = "ru"; - saneName = "ru"; - sha256 = "0l3pzvpjzsw8fs1wwx0vzl3r46sz3lcgjzjjwxnxjwjjvrlnsr8g"; -} -{ - lang = "sk"; - saneName = "sk"; - sha256 = "13r77k8q6idn2wxwhp46vry3jynyg4i3dcamamw55w3qgb3bd2ri"; -} -{ - lang = "sl"; - saneName = "sl"; - sha256 = "1mx54f4m75zg0rdbq6gz65xl0bf6w63ij0d3ziq5fj7fpz4jnlqb"; -} -{ - lang = "sr"; - saneName = "sr"; - sha256 = "1grl665j40vq39y0kchfxx2wz13wbr88h7paz6fgc3kskwwj9i4z"; -} -{ - lang = "sv"; - saneName = "sv"; - sha256 = "0gf84fyg3hzipf3ja6wnn8h82v2vaaqpgs6k7k72p484b7a34881"; -} -{ - lang = "tr"; - saneName = "tr"; - sha256 = "0r3afsnkv478byc3wnpg7jv1ik0malks5l204kdxanczlcy64x97"; -} -{ - lang = "ug"; - saneName = "ug"; - sha256 = "0kpm91m0rnk3xij2ba1dbr6063034fcg7kvpyl1qbzr2hvr453sa"; -} -{ - lang = "uk"; - saneName = "uk"; - sha256 = "0hrvz8wm2p05ch41w26pbk19jcgsxw27n94axmyp3lb8vlhmf7xm"; -} -{ - lang = "wa"; - saneName = "wa"; - sha256 = "0rhxpbas2dcf2sn88adi4ymm206gmd1arv32k3mnvh3gm60ik2s6"; -} -{ - lang = "zh_CN"; - saneName = "zh_CN"; - sha256 = "1sjzbh0577gcmq29qd9p077szybylhhz4krji7x2cbbkimx6insv"; -} -{ - lang = "zh_TW"; - saneName = "zh_TW"; - sha256 = "0zlz7y1xpngvs3d2mhkvl5p7bfyb5nzshf73ljghghljniv412ky"; -} -] diff --git a/pkgs/desktops/kde-4.14/l10n/manifest-4.14.3.nix b/pkgs/desktops/kde-4.14/l10n/manifest-4.14.3.nix new file mode 100644 index 00000000000..a6d48ae51bf --- /dev/null +++ b/pkgs/desktops/kde-4.14/l10n/manifest-4.14.3.nix @@ -0,0 +1,267 @@ +[ +{ + lang = "ar"; + saneName = "ar"; + sha256 = "1amzzwa4zhwm0r1b1fdi0fjp883wpbjh12wn9q42g04xzza6nq04"; +} +{ + lang = "bg"; + saneName = "bg"; + sha256 = "1x1yx6lw86bwv2d7lcfb061k1pqgqw6abqwrga7pnzfmk2fcaawb"; +} +{ + lang = "bs"; + saneName = "bs"; + sha256 = "148195dk6wmymk6jib467a10w9jajh3bmx1igxl29l7vp33xpgng"; +} +{ + lang = "ca"; + saneName = "ca"; + sha256 = "04bgjfwr5pwn79lh3wixajswmccfcqll5dnjhf84zw7p09138m0v"; +} +{ + lang = "ca@valencia"; + saneName = "ca_valencia"; + sha256 = "0p257jjilkmjrq9ddvwfdh41911b2yrcrid1j31g7gg9gp7iriq4"; +} +{ + lang = "cs"; + saneName = "cs"; + sha256 = "0kjn9pq9p8bfja6ca4pcpqgli9k1mfyh77j6i8p28i37wfmgv0cn"; +} +{ + lang = "da"; + saneName = "da"; + sha256 = "1w0ylqnxkbqz6camk8045nrxpz1n4dbz8cgl559l31m7zacq1rmb"; +} +{ + lang = "de"; + saneName = "de"; + sha256 = "0i97h1jcm8lpv3pap7wiz8nvjwf00jav5z5ymsbklagvmbmwyfyk"; +} +{ + lang = "el"; + saneName = "el"; + sha256 = "1br19741hmn08g3vzmx8dilx2kdfbg5zv1rjxnigdfwi0zphqyw9"; +} +{ + lang = "en_GB"; + saneName = "en_GB"; + sha256 = "1flp57prc12ri2rhh6vwf6hb5mqj8w1sj94pnji02ylmkghcc466"; +} +{ + lang = "es"; + saneName = "es"; + sha256 = "0waccr5mih5nv4q31k6xn07iws2by8n67riij6k9nsfsrlrxv21g"; +} +{ + lang = "et"; + saneName = "et"; + sha256 = "1bqd4jaws8890r2zjzpf6pw1k9v7h2lr7xk1dzfs8ak7gny32fm9"; +} +{ + lang = "eu"; + saneName = "eu"; + sha256 = "0q4cac4vp1s7fda328xxyzhqll0iqinn5v9syb93xfj29kij4ja2"; +} +{ + lang = "fa"; + saneName = "fa"; + sha256 = "0avabmdm9bxyb5b5d0mrv8mmwp6j1r4ch7y0ab7b4zl380blw7d3"; +} +{ + lang = "fi"; + saneName = "fi"; + sha256 = "0lk0r03r2wmqpf8n9zvwpsbl7s11dipa8kc3lmkh1yrjk8c4z2sw"; +} +{ + lang = "fr"; + saneName = "fr"; + sha256 = "1gzwc6yj7x7x3jx0270ap5nf70ckl25lqccrxiyzwx3mqfxgfbx2"; +} +{ + lang = "ga"; + saneName = "ga"; + sha256 = "0bkf62cqj4rfgz81yj9jspv5jfa932hsyhk4kq0r2hqsm8gndddd"; +} +{ + lang = "gl"; + saneName = "gl"; + sha256 = "00m4m480fqls5i1cvdidkq3nb8xzqhgyqqp0zk3j3qybxfq98yg5"; +} +{ + lang = "he"; + saneName = "he"; + sha256 = "1488lk7jniv0hj77wcfxplxw10srp3df6lv6llss8b5m3yqb061a"; +} +{ + lang = "hi"; + saneName = "hi"; + sha256 = "16ni7257b1ch0wabncvq17569c57ncz7pzqgqm830bj8ldpk9zzv"; +} +{ + lang = "hr"; + saneName = "hr"; + sha256 = "1si90cnwjsvw553pmppb0aakfk7fan2jk44ag0j191kdiir2b3xk"; +} +{ + lang = "hu"; + saneName = "hu"; + sha256 = "1x2s2cd521ffp5azzrzq2w2cr4sjz6gpg1a1h9jg4749xwqfhc1a"; +} +{ + lang = "ia"; + saneName = "ia"; + sha256 = "1ybaihygv0lviw6bq3a6ki40glgs49gsk29abq4y95bi9ymlrryc"; +} +{ + lang = "id"; + saneName = "id"; + sha256 = "1s8zliwc737avc04n2l27rhhh9isz9ag81nsajai27yxif0ncn7x"; +} +{ + lang = "is"; + saneName = "is"; + sha256 = "1x2mag8jwlmbh8v8y3rmvp9n69sv2xfwwsxw7c9vb8qg4cybax1c"; +} +{ + lang = "it"; + saneName = "it"; + sha256 = "1ng2hzrbvcak3nhbmlb3h64a15h34zfrgabzwrjvi2b0fv8liycw"; +} +{ + lang = "ja"; + saneName = "ja"; + sha256 = "01klhf9bmha9x6s39r4wnd0hxn35jg5bh7h9rwqij3nf06rddfrj"; +} +{ + lang = "kk"; + saneName = "kk"; + sha256 = "149fi65z1x64svs00rn82njmw6l0pncgs4b5d66fb18ah3bjlfg2"; +} +{ + lang = "km"; + saneName = "km"; + sha256 = "17hjv0gi2fqa5gkjgmqkxb4k7z3zizrxax6inq8s03g4f2vfibaz"; +} +{ + lang = "ko"; + saneName = "ko"; + sha256 = "19yhacc0v5grxc35bmks9r4qy091qij26yfi2qvs3rca7cc374jp"; +} +{ + lang = "lt"; + saneName = "lt"; + sha256 = "0y0nkvqidc12paf8ghk4p6z213gxcyv27nvglk120l2602980idj"; +} +{ + lang = "lv"; + saneName = "lv"; + sha256 = "0msw54v8d9p08c7prw6m20w29qf8f0yb32s378knhsql6abv5gln"; +} +{ + lang = "mr"; + saneName = "mr"; + sha256 = "05kcm7x7jj4lppn6fd1jlzl37r3gs9wrz0cckwpscc2m6y2g7p55"; +} +{ + lang = "nb"; + saneName = "nb"; + sha256 = "0wsdr8yyjjik2h30xy7y38i5hagy4jya98cqjbcrrab35i677l9a"; +} +{ + lang = "nds"; + saneName = "nds"; + sha256 = "0lr5z1r8v3fkqpkcjvnml2s9jh50wmqsqiyls9ivr46ygwm8wcbq"; +} +{ + lang = "nl"; + saneName = "nl"; + sha256 = "09w8cniq3z11900axjcdlm24jbzjjsqcpdwpvhvc9z78hfsjqp36"; +} +{ + lang = "nn"; + saneName = "nn"; + sha256 = "1b304wg1143pk7ib8k451g2riq87c1h0611khslghy428q4rviwd"; +} +{ + lang = "pa"; + saneName = "pa"; + sha256 = "02y56ld5hiywph88khh55hqg0gpcvmqcqrbpsidzx3qdgh5j40nl"; +} +{ + lang = "pl"; + saneName = "pl"; + sha256 = "137mfrr7wza2pg4yzqqi93bsmsrjvj0ar27gi3lk1qh6zniwyjai"; +} +{ + lang = "pt"; + saneName = "pt"; + sha256 = "1zb454rg4pigkldg9jp97r2r7k8azwxbal77zscky2q6rbw0sjcn"; +} +{ + lang = "pt_BR"; + saneName = "pt_BR"; + sha256 = "1zrn09k99pfscnc5zyxh1jzyrbirhy8ilwacbgg913maaanjprny"; +} +{ + lang = "ro"; + saneName = "ro"; + sha256 = "1lkr14if7jmfcxmb10pf11a6xjxxqxrq45lwdx19kj3djgr5l4pc"; +} +{ + lang = "ru"; + saneName = "ru"; + sha256 = "1ldf4y9wck339n0jq8x43x9h57jvfg3qk0spfv9d5fw9qyxygwwi"; +} +{ + lang = "sk"; + saneName = "sk"; + sha256 = "1n4qjwvpkddwizl8k3gr1xwv8icwd6lqsg09cypax049g3q2sy4p"; +} +{ + lang = "sl"; + saneName = "sl"; + sha256 = "1k111r9ssprgali6sg3wpbvp635hb56ckmcgpdhyvk6bbkcbnbmr"; +} +{ + lang = "sr"; + saneName = "sr"; + sha256 = "0pini77jlnrv2fhl0j99wjxylwlj77bihcbfvnkf5bganffgwc11"; +} +{ + lang = "sv"; + saneName = "sv"; + sha256 = "0ykxy95a4q0pp5ibmw20ckg33b3h89g2m86p6fcfnqf6350nxs2v"; +} +{ + lang = "tr"; + saneName = "tr"; + sha256 = "15vcfpyc30ia6bsjgwv3zhydv2nlnmggr8i2yjpnb5dlynn3sywh"; +} +{ + lang = "ug"; + saneName = "ug"; + sha256 = "0qhzfbd3j0d7grg4ghzn7y5vrl031iz9krifv7dv6jgp68fzz1h0"; +} +{ + lang = "uk"; + saneName = "uk"; + sha256 = "03n2myhwx9lvm1vzqvrg2sgl3y1m0rrrskqa22m06fjmh4vxawhx"; +} +{ + lang = "wa"; + saneName = "wa"; + sha256 = "11b7gyy31n2zfhkaj304pd4lkr14sp1sgi4pzv86c824sr6lp01v"; +} +{ + lang = "zh_CN"; + saneName = "zh_CN"; + sha256 = "1r5gxadd94ckdpkwcchwa8k735g2y9x7bi6px6hm7qlxdbi9sjmq"; +} +{ + lang = "zh_TW"; + saneName = "zh_TW"; + sha256 = "04bvvb3na4arns483fz27npjs045hf3s53p2rkd2nvq9gwvn0kmi"; +} +] diff --git a/pkgs/desktops/xfce/applications/xfce4-taskmanager.nix b/pkgs/desktops/xfce/applications/xfce4-taskmanager.nix index df743e4cc9c..1063cfca090 100644 --- a/pkgs/desktops/xfce/applications/xfce4-taskmanager.nix +++ b/pkgs/desktops/xfce/applications/xfce4-taskmanager.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { p_name = "xfce4-taskmanager"; - ver_maj = "1.0"; - ver_min = "1"; + ver_maj = "1.1"; + ver_min = "0"; src = fetchurl { url = "mirror://xfce/src/apps/${p_name}/${ver_maj}/${name}.tar.bz2"; - sha256 = "11pfiglfg3mzsmpiwva6l7dj44zsv76vyf0282pghwcrvnb2gapm"; + sha256 = "1jwywmkkkmz7406m1jq40w6apiav25cznafhigbgpjv6z5hv27if"; }; name = "${p_name}-${ver_maj}.${ver_min}"; diff --git a/pkgs/desktops/xfce/core/xfce4-power-manager.nix b/pkgs/desktops/xfce/core/xfce4-power-manager.nix index 81a0aebb75c..2a1e772e4a5 100644 --- a/pkgs/desktops/xfce/core/xfce4-power-manager.nix +++ b/pkgs/desktops/xfce/core/xfce4-power-manager.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { p_name = "xfce4-power-manager"; ver_maj = "1.3"; - ver_min = "0"; + ver_min = "2"; src = fetchurl { url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2"; - sha256 = "1q0mnj9hjqw4zpk7wqnfayy6zzbjbhzd1mcplfjik2h753gaxgh5"; + sha256 = "0lv29ycws185qr89xn01vcddkvpddk7q6hni0s6d0nqvjavycg0j"; }; name = "${p_name}-${ver_maj}.${ver_min}"; diff --git a/pkgs/desktops/xfce/core/xfdesktop.nix b/pkgs/desktops/xfce/core/xfdesktop.nix index 697ff2bfb8a..6353f6d6c33 100644 --- a/pkgs/desktops/xfce/core/xfdesktop.nix +++ b/pkgs/desktops/xfce/core/xfdesktop.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { p_name = "xfdesktop"; ver_maj = "4.10"; - ver_min = "2"; + ver_min = "3"; src = fetchurl { url = "mirror://xfce/src/xfce/${p_name}/${ver_maj}/${name}.tar.bz2"; - sha256 = "0zbrvfj4fxnjz593brxjsjy9pv5bbf12jnbydy4pwc1ya6zf19j9"; + sha256 = "1kkj6axcbj82v3n2hkzsdranpqrxaarnyjxkpfs29dyqajjjpjh9"; }; name = "${p_name}-${ver_maj}.${ver_min}"; diff --git a/pkgs/development/arduino/arduino-core/default.nix b/pkgs/development/arduino/arduino-core/default.nix index 3f722d1b7d4..a5b8980e32c 100644 --- a/pkgs/development/arduino/arduino-core/default.nix +++ b/pkgs/development/arduino/arduino-core/default.nix @@ -36,8 +36,8 @@ stdenv.mkDerivation rec { if echo "$filepath" | grep -q "\.elf$"; then continue fi - echo "setting interpreter $(cat "$NIX_GCC"/nix-support/dynamic-linker) in $filepath" - patchelf --set-interpreter "$(cat "$NIX_GCC"/nix-support/dynamic-linker)" "$filepath" + echo "setting interpreter $(cat "$NIX_CC"/nix-support/dynamic-linker) in $filepath" + patchelf --set-interpreter "$(cat "$NIX_CC"/nix-support/dynamic-linker)" "$filepath" test $? -eq 0 || { echo "patchelf failed to process $filepath"; exit 1; } fi done diff --git a/pkgs/development/compilers/agda/default.nix b/pkgs/development/compilers/agda/default.nix index b37f6ce1ab3..573f7c6b890 100644 --- a/pkgs/development/compilers/agda/default.nix +++ b/pkgs/development/compilers/agda/default.nix @@ -9,8 +9,8 @@ cabal.mkDerivation (self: { pname = "Agda"; - version = "2.4.2.1"; - sha256 = "094x1rdhqxm630f0kgllhivgr1vdy4xrd9pgh737b1gbb2vf3awm"; + version = "2.4.2.2"; + sha256 = "1hxvapnvlkx6imifswc70ng869zll0zfsygivhc2mjyhaiv10i13"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/compilers/aldor/default.nix b/pkgs/development/compilers/aldor/default.nix index ddf16bc2219..b1809c9a6d9 100644 --- a/pkgs/development/compilers/aldor/default.nix +++ b/pkgs/development/compilers/aldor/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation { do wrapProgram $out/bin/$prog --set ALDORROOT $out \ --prefix PATH : ${openjdk}/bin \ - --prefix PATH : ${stdenv.gcc}/bin ; + --prefix PATH : ${stdenv.cc}/bin ; done ''; diff --git a/pkgs/development/compilers/aliceml/builder.sh b/pkgs/development/compilers/aliceml/builder.sh deleted file mode 100644 index e1f5d1b2bed..00000000000 --- a/pkgs/development/compilers/aliceml/builder.sh +++ /dev/null @@ -1,71 +0,0 @@ -source $stdenv/setup - -export CXXFLAGS="-m32" - -tar zxvf "$gecodeSrc" -cd gecode-1.3.1 -./configure --prefix="$out" --disable-minimodel --disable-examples -make -make install -cd .. - -PKG_CONFIG_PATH=$PKG_CONFIG_PATH:"$out"/lib/pkgconfig - -tar zxvf "$seamSrc" -cd seam-1.4 -./configure --prefix="$out" --with-zlib=$zlib -make -make install -cd .. - -PATH=$PATH:"$out"/bin - -tar zxvf "$aliceSrc" -cd alice-1.4 -sed -i -e 's/bin\/bash/usr\/bin\/env bash/g' bin/alicerun.in -sed -i -e 's/bin\/bash/usr\/bin\/env bash/g' bin/aliceremote -./configure --prefix="$out" --with-gmp=$gmp -make -make install -cd .. - -tar zxvf "$aliceGecodeSrc" -cd alice-gecode-1.4 -make compiledll MUST_GENERATE=no -make installdll MUST_GENERATE=no -cd .. - -tar zxvf "$aliceRegexSrc" -cd alice-regex-1.4 -make compiledll MUST_GENERATE=no -make installdll MUST_GENERATE=no -cd .. - -tar zxvf "$aliceSqliteSrc" -cd alice-sqlite-1.4 -make compiledll MUST_GENERATE=no -make installdll MUST_GENERATE=no -cd .. - -tar zxvf "$aliceXmlSrc" -cd alice-xml-1.4 -make compiledll MUST_GENERATE=no -make installdll MUST_GENERATE=no -cd .. - -tar zxvf "$aliceGtkSrc" -cd alice-gtk-1.4 -sed -i -e 's/PRIVATE_GTK_LEAVE_PENDING/PRIVATE_GTK_HAS_POINTER/g' NativeGtk.cc -sed -i -e 's/bin\/bash/usr\/bin\/env bash/g' myinstall -make compiledll MUST_GENERATE=no -make installdll MUST_GENERATE=no -cd .. - -tar zxvf "$aliceRuntimeSrc" -cd alice-runtime-1.4 -./configure --prefix="$out" -make -make install -cd .. - - diff --git a/pkgs/development/compilers/aliceml/default.nix b/pkgs/development/compilers/aliceml/default.nix index 29e95863921..5059cdf2158 100644 --- a/pkgs/development/compilers/aliceml/default.nix +++ b/pkgs/development/compilers/aliceml/default.nix @@ -1,46 +1,13 @@ -{stdenv, fetchurl, pkgsi686Linux, libtool, gnumake381, autoconf, automake111x, file, which, zsh, m4, pkgconfig, perl}: +{stdenv, gcc, glibc, fetchurl, fetchgit, libtool, autoconf, automake, file, gnumake, which, zsh, m4, pkgconfig, perl, gnome, pango, sqlite, libxml2, zlib, gmp, smlnj }: stdenv.mkDerivation { - name = "aliceml-1.4"; + name = "aliceml-1.4-493cd356"; - aliceSrc = fetchurl { - url = http://www.ps.uni-saarland.de/alice/download/sources/alice-1.4.tar.gz; - sha256 = "1ay8r26g7xm9zlrlpigp6y1zmrl93hzkndb5phx7651wx8j2183r"; - }; - - aliceGecodeSrc = fetchurl { - url = http://www.ps.uni-saarland.de/alice/download/sources/alice-gecode-1.4.tar.gz; - sha256 = "0yklpsqnm3wwzfz4vvv69dmm7q7pzpl3z7iw7wg33klng85cidl6"; - }; - - aliceGtkSrc = fetchurl { - url = http://www.ps.uni-saarland.de/alice/download/sources/alice-gtk-1.4.tar.gz; - sha256 = "0zx4ks0pk5wgbcsflcmn0kbpa9j7pjbsc19d1s3jgp4rwb24m1an"; - }; - - aliceRegexSrc = fetchurl { - url = http://www.ps.uni-saarland.de/alice/download/sources/alice-regex-1.4.tar.gz; - sha256 = "0myjzh3295awamghs4c88ypaa41m8sxh5jys876yq6flslw41s02"; - }; - - aliceRuntimeSrc = fetchurl { - url = http://www.ps.uni-saarland.de/alice/download/sources/alice-runtime-1.4.tar.gz; - sha256 = "1cbca71vh16l2h0zjvhgzzs0rzq99nc8nx9a97yzw595355nq57f"; - }; - - aliceSqliteSrc = fetchurl { - url = http://www.ps.uni-saarland.de/alice/download/sources/alice-sqlite-1.4.tar.gz; - sha256 = "0554xbx8zgqmpb7x06d7xvhlbk7bxmc237khgjs6yjcy53yf366b"; - }; - - aliceXmlSrc = fetchurl { - url = http://www.ps.uni-saarland.de/alice/download/sources/alice-xml-1.4.tar.gz; - sha256 = "058a815a0vajjvjlsmd4ryx2bc71q6zwvyjg2c0v1gba2v3pddm0"; - }; - - seamSrc = fetchurl { - url = http://www.ps.uni-saarland.de/alice/download/sources/seam-1.4.tar.gz; - sha256 = "1iz98jdv914whaw426d5406shlqgxqwpy3fbyb472x7d3lfra2dz"; + src = fetchgit { + url = "https://github.com/aliceml/aliceml"; + rev = "493cd3565f0bc3b35790185ec358fb91b7b43037"; + sha256 = "12fbaf0a474e53f40a71f16bf61c52b7ffe044f4d0993e208e69552df3054d45"; + fetchSubmodules = true; }; gecodeSrc = fetchurl { @@ -48,19 +15,32 @@ stdenv.mkDerivation { sha256 = "0mgc6llbq166jmlq3alvagqsg3730670zvbwwkdgsqklw70v9355"; }; - zlib = pkgsi686Linux.zlib; - gmp = pkgsi686Linux.gmp; - - buildInputs = [ - stdenv pkgsi686Linux.gcc34 pkgsi686Linux.glibc - libtool gnumake381 autoconf automake111x pkgsi686Linux.zlib - file which zsh pkgsi686Linux.gmp m4 pkgsi686Linux.gnome.gtk - pkgsi686Linux.gnome.libgnomecanvas pkgsi686Linux.pango pkgsi686Linux.sqlite - pkgsi686Linux.libxml2 pkgsi686Linux.lightning pkgconfig perl + stdenv gcc glibc + libtool gnumake autoconf automake + file which zsh m4 gnome.gtk zlib gmp + gnome.libgnomecanvas pango sqlite + libxml2 pkgconfig perl smlnj ]; - - builder = ./builder.sh; + + makePatch = ./make.patch; + seamPatch = ./seam.patch; + + phases = [ "unpackPhase" "patchPhase" "configurePhase" "buildPhase" ]; + + patchPhase = '' + sed -i -e "s@wget ..GECODE_URL. -O - | tar xz@tar xf $gecodeSrc@" make/Makefile + patch -p1 <$makePatch + patch -p1 <$seamPatch + ''; + + configurePhase = '' + make -C make setup PREFIX="$out" + ''; + + buildPhase = '' + gmp="${gmp}" zlib="${zlib}" PATH=$PATH:`pwd`/seam-support/install/bin make -C make all PREFIX="$out" + ''; meta = { description = "Functional programming language based on Standard ML"; @@ -70,6 +50,7 @@ stdenv.mkDerivation { programming. ''; homepage = http://www.ps.uni-saarland.de/alice/; - license = "BSD"; + license = stdenv.lib.licenses.mit; + maintainers = [ stdenv.lib.maintainers.doublec ]; }; } diff --git a/pkgs/development/compilers/aliceml/make.patch b/pkgs/development/compilers/aliceml/make.patch new file mode 100644 index 00000000000..78e2b28974e --- /dev/null +++ b/pkgs/development/compilers/aliceml/make.patch @@ -0,0 +1,20 @@ +diff --git a/Makefile b/Makefile +index 6a55b06..84a6000 100644 +--- a/make/Makefile ++++ b/make/Makefile +@@ -387,6 +387,7 @@ configure-seam-linux64: + ../sources/configure \ + --prefix='$(PREFIX)' \ + --with-warnings=yes \ ++ --with-zlib='$(zlib)' \ + --disable-lightning) + + .PHONY: configure-seam-darwin64 +@@ -434,6 +435,7 @@ configure-alice-ll-linux: + (cd $(PWD)/alice/build && \ + ../sources/vm-seam/configure \ + --prefix='$(PREFIX)' \ ++ --with-gmp='$(gmp)' \ + --with-warnings=yes) + + .PHONY: rebuild-alice-ll diff --git a/pkgs/development/compilers/aliceml/seam.patch b/pkgs/development/compilers/aliceml/seam.patch new file mode 100644 index 00000000000..d489037fef4 --- /dev/null +++ b/pkgs/development/compilers/aliceml/seam.patch @@ -0,0 +1,13 @@ +diff --git a/Makefile.cvs b/Makefile.cvs +index b59434a..cd1316f 100644 +--- a/seam/sources/Makefile.cvs ++++ b/seam/sources/Makefile.cvs +@@ -32,7 +32,7 @@ autotools: + aclocal -I . + autoconf + automake --add-missing +- cd libltdl; aclocal; autoconf; automake --add-missing ++ cd libltdl; chmod +w *; aclocal; autoconf; automake --add-missing + + lightning: + rm -rf lightning diff --git a/pkgs/development/compilers/bigloo/default.nix b/pkgs/development/compilers/bigloo/default.nix index 3ac5f1696ce..5c227d72e34 100644 --- a/pkgs/development/compilers/bigloo/default.nix +++ b/pkgs/development/compilers/bigloo/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { preConfigure = # Help libgc's configure. - '' export CXXCPP="g++ -E" + '' export CXXCPP="$CXX -E" ''; patchPhase = '' diff --git a/pkgs/development/compilers/chicken/default.nix b/pkgs/development/compilers/chicken/default.nix index 0e210343a72..a1eec63af56 100644 --- a/pkgs/development/compilers/chicken/default.nix +++ b/pkgs/development/compilers/chicken/default.nix @@ -53,7 +53,7 @@ stdenv.mkDerivation { for f in $out/bin/* do wrapProgram $f \ - --prefix PATH : ${stdenv.gcc}/bin + --prefix PATH : ${stdenv.cc}/bin done ''; @@ -61,7 +61,7 @@ stdenv.mkDerivation { meta = { homepage = http://www.call-cc.org/; - license = "BSD"; + license = stdenv.lib.licenses.bsd3; maintainers = with stdenv.lib.maintainers; [ the-kenny ]; platforms = with stdenv.lib.platforms; allBut darwin; description = "A portable compiler for the Scheme programming language"; diff --git a/pkgs/development/compilers/cmucl/binary.nix b/pkgs/development/compilers/cmucl/binary.nix index c3a960388bb..027857ccda0 100644 --- a/pkgs/development/compilers/cmucl/binary.nix +++ b/pkgs/development/compilers/cmucl/binary.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation { buildCommand = '' mkdir -p $out tar -C $out -xjf ${dist} - patchelf --set-interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \ + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ $out/bin/lisp ''; diff --git a/pkgs/development/compilers/compcert/default.nix b/pkgs/development/compilers/compcert/default.nix index bdf850df8cb..00a0e7b9c2b 100644 --- a/pkgs/development/compilers/compcert/default.nix +++ b/pkgs/development/compilers/compcert/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, coq, ocaml, ocamlPackages, gcc }: +{ stdenv, fetchurl, coq, ocaml, ocamlPackages }: stdenv.mkDerivation rec { name = "compcert-${version}"; @@ -12,7 +12,10 @@ stdenv.mkDerivation rec { buildInputs = [ coq ocaml ocamlPackages.menhir ]; enableParallelBuilding = true; - configurePhase = "./configure -prefix $out -toolprefix ${gcc}/bin/ " + + + configurePhase = '' + substituteInPlace ./configure --replace '{toolprefix}gcc' '{toolprefix}cc' + ./configure -prefix $out -toolprefix ${stdenv.cc}/bin/ '' + (if stdenv.isDarwin then "ia32-macosx" else "ia32-linux"); meta = with stdenv.lib; { diff --git a/pkgs/development/compilers/cryptol/1.8.x.nix b/pkgs/development/compilers/cryptol/1.8.x.nix index 17382ed9d56..e6f04249f53 100644 --- a/pkgs/development/compilers/cryptol/1.8.x.nix +++ b/pkgs/development/compilers/cryptol/1.8.x.nix @@ -10,12 +10,12 @@ let jss-ver = "jss-0.4"; libPath = stdenv.lib.makeLibraryPath - [ stdenv.gcc.libc - stdenv.gcc.gcc + [ stdenv.cc.libc + stdenv.cc.gcc gmp4 ncurses zlib - ] + ":${stdenv.gcc.gcc}/lib64"; + ] + ":${stdenv.cc.gcc}/lib64"; cryptol-bin = if stdenv.system == "i686-linux" @@ -94,12 +94,12 @@ stdenv.mkDerivation rec { # Hack around lack of libtinfo in NixOS ln -s ${ncurses}/lib/libncursesw.so.5.9 $out/lib/libtinfo.so.5 - ln -s ${stdenv.gcc.libc}/lib/libpthread-2.19.so $out/lib/libpthread.so.0 + ln -s ${stdenv.cc.libc}/lib/libpthread-2.19.so $out/lib/libpthread.so.0 ''; fixupPhase = '' for x in bin/cryptol bin/edif2verilog bin/copy-iverilog bin/symbolic_netlist bin/jaig bin/vvp-galois bin/lss libexec/jss; do - patchelf --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \ + patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ --set-rpath "$out/lib:${libPath}" $out/$x patchelf --shrink-rpath $out/$x done diff --git a/pkgs/development/compilers/cudatoolkit/5.5.nix b/pkgs/development/compilers/cudatoolkit/5.5.nix index bf4009f08be..a16a252b4a5 100644 --- a/pkgs/development/compilers/cudatoolkit/5.5.nix +++ b/pkgs/development/compilers/cudatoolkit/5.5.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { gtk2 glib fontconfig freetype unixODBC alsaLib ]; - rpath = "${stdenv.lib.makeLibraryPath runtimeDependencies}:${stdenv.gcc.gcc}/lib64"; + rpath = "${stdenv.lib.makeLibraryPath runtimeDependencies}:${stdenv.cc.gcc}/lib64"; unpackPhase = '' sh $src --keep --noexec @@ -38,10 +38,10 @@ stdenv.mkDerivation rec { buildPhase = '' find . -type f -executable -exec patchelf \ - --set-interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \ + --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ '{}' \; || true find . -type f -exec patchelf \ - --set-rpath $rpath:$out/jre/lib/amd64/jli:$out/lib:$out/lib64:$out/nvvm/lib:$out/nvvm/lib64:$(cat $NIX_GCC/nix-support/orig-gcc)/lib \ + --set-rpath $rpath:$out/jre/lib/amd64/jli:$out/lib:$out/lib64:$out/nvvm/lib:$out/nvvm/lib64:$(cat $NIX_CC/nix-support/orig-gcc)/lib \ --force-rpath \ '{}' \; || true ''; diff --git a/pkgs/development/compilers/cudatoolkit/6.0.nix b/pkgs/development/compilers/cudatoolkit/6.0.nix index 5da4b3d0a4a..d6fdb6c6bdb 100644 --- a/pkgs/development/compilers/cudatoolkit/6.0.nix +++ b/pkgs/development/compilers/cudatoolkit/6.0.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { gtk2 glib fontconfig freetype unixODBC alsaLib ]; - rpath = "${stdenv.lib.makeLibraryPath runtimeDependencies}:${stdenv.gcc.gcc}/lib64"; + rpath = "${stdenv.lib.makeLibraryPath runtimeDependencies}:${stdenv.cc.gcc}/lib64"; unpackPhase = '' sh $src --keep --noexec @@ -38,10 +38,10 @@ stdenv.mkDerivation rec { buildPhase = '' find . -type f -executable -exec patchelf \ - --set-interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \ + --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ '{}' \; || true find . -type f -exec patchelf \ - --set-rpath $rpath:$out/jre/lib/amd64/jli:$out/lib:$out/lib64:$out/nvvm/lib:$out/nvvm/lib64:$(cat $NIX_GCC/nix-support/orig-gcc)/lib \ + --set-rpath $rpath:$out/jre/lib/amd64/jli:$out/lib:$out/lib64:$out/nvvm/lib:$out/nvvm/lib64:$(cat $NIX_CC/nix-support/orig-gcc)/lib \ --force-rpath \ '{}' \; || true ''; diff --git a/pkgs/development/compilers/edk2/default.nix b/pkgs/development/compilers/edk2/default.nix index 9787d0da929..02e22e82029 100644 --- a/pkgs/development/compilers/edk2/default.nix +++ b/pkgs/development/compilers/edk2/default.nix @@ -10,12 +10,12 @@ else throw "Unsupported architecture"; edk2 = stdenv.mkDerivation { - name = "edk2-2014-02-01"; + name = "edk2-2014-12-10"; src = fetchgit { url = git://github.com/tianocore/edk2; - rev = "2818c158de6a164d012e6afb0fc145656aed4e4b"; - sha256 = "a756b5de3a3e71d82ce1de8c7832bc69d2affb98d704894b26540571f9f5e214"; + rev = "684a565a04"; + sha256 = "1l46396f48v91z5b8lh3b0f0lcd7z5f86i1nrpc7l5gf7gx3117j"; }; buildInputs = [ libuuid pythonFull ]; @@ -33,8 +33,8 @@ edk2 = stdenv.mkDerivation { meta = { description = "Intel EFI development kit"; - homepage = http://sourceforge.net/apps/mediawiki/tianocore/index.php?title=EDK2; - license = "BSD"; + homepage = http://sourceforge.net/projects/edk2/; + license = stdenv.lib.licenses.bsd2; maintainers = [ stdenv.lib.maintainers.shlevy ]; platforms = ["x86_64-linux" "i686-linux"]; }; diff --git a/pkgs/development/compilers/fpc/lazarus.nix b/pkgs/development/compilers/fpc/lazarus.nix index bf2e10b2c62..ef3d962d7d1 100644 --- a/pkgs/development/compilers/fpc/lazarus.nix +++ b/pkgs/development/compilers/fpc/lazarus.nix @@ -17,7 +17,7 @@ let buildInputs = [ fpc gtk glib libXi inputproto libX11 xproto libXext xextproto pango atk - stdenv.gcc makeWrapper gdk_pixbuf + stdenv.cc makeWrapper gdk_pixbuf ]; in stdenv.mkDerivation { diff --git a/pkgs/development/compilers/gcc/3.4/builder.sh b/pkgs/development/compilers/gcc/3.4/builder.sh index 5a43d600a50..3909b605c20 100644 --- a/pkgs/development/compilers/gcc/3.4/builder.sh +++ b/pkgs/development/compilers/gcc/3.4/builder.sh @@ -7,17 +7,17 @@ mkdir $NIX_FIXINC_DUMMY if test "$noSysDirs" = "1"; then - if test -e $NIX_GCC/nix-support/orig-libc; then + if test -e $NIX_CC/nix-support/orig-libc; then # Figure out what extra flags to pass to the gcc compilers # being generated to make sure that they use our glibc. - extraCFlags="$(cat $NIX_GCC/nix-support/libc-cflags)" - extraLDFlags="$(cat $NIX_GCC/nix-support/libc-ldflags) $(cat $NIX_GCC/nix-support/libc-ldflags-before)" + extraCFlags="$(cat $NIX_CC/nix-support/libc-cflags)" + extraLDFlags="$(cat $NIX_CC/nix-support/libc-ldflags) $(cat $NIX_CC/nix-support/libc-ldflags-before)" # Use *real* header files, otherwise a limits.h is generated # that does not include Glibc's limits.h (notably missing # SSIZE_MAX, which breaks the build). - export NIX_FIXINC_DUMMY=$(cat $NIX_GCC/nix-support/orig-libc)/include + export NIX_FIXINC_DUMMY=$(cat $NIX_CC/nix-support/orig-libc)/include else # Hack: support impure environments. diff --git a/pkgs/development/compilers/gcc/4.2-apple64/builder.sh b/pkgs/development/compilers/gcc/4.2-apple64/builder.sh index 036678460d6..4a4fb476a35 100644 --- a/pkgs/development/compilers/gcc/4.2-apple64/builder.sh +++ b/pkgs/development/compilers/gcc/4.2-apple64/builder.sh @@ -14,11 +14,11 @@ if test "$noSysDirs" = "1"; then # Figure out what extra flags to pass to the gcc compilers being # generated to make sure that they use our glibc. - if test -e $NIX_GCC/nix-support/orig-glibc; then - glibc=$(cat $NIX_GCC/nix-support/orig-glibc) + if test -e $NIX_CC/nix-support/orig-glibc; then + glibc=$(cat $NIX_CC/nix-support/orig-glibc) # Ugh. Copied from gcc-wrapper/builder.sh. We can't just - # source in $NIX_GCC/nix-support/add-flags, since that would + # source in $NIX_CC/nix-support/add-flags, since that would # cause *this* GCC to be linked against the *previous* GCC. # Need some more modularity there. extraCFlags="-B$glibc/lib -isystem $glibc/include" diff --git a/pkgs/development/compilers/gcc/4.3/builder.sh b/pkgs/development/compilers/gcc/4.3/builder.sh index aaf0c54d99b..16e53d9f231 100644 --- a/pkgs/development/compilers/gcc/4.3/builder.sh +++ b/pkgs/development/compilers/gcc/4.3/builder.sh @@ -12,17 +12,17 @@ export CPP="gcc -E" if test "$noSysDirs" = "1"; then - if test -e $NIX_GCC/nix-support/orig-libc; then + if test -e $NIX_CC/nix-support/orig-libc; then # Figure out what extra flags to pass to the gcc compilers # being generated to make sure that they use our glibc. - extraCFlags="$(cat $NIX_GCC/nix-support/libc-cflags)" - extraLDFlags="$(cat $NIX_GCC/nix-support/libc-ldflags) $(cat $NIX_GCC/nix-support/libc-ldflags-before)" + extraCFlags="$(cat $NIX_CC/nix-support/libc-cflags)" + extraLDFlags="$(cat $NIX_CC/nix-support/libc-ldflags) $(cat $NIX_CC/nix-support/libc-ldflags-before)" # Use *real* header files, otherwise a limits.h is generated # that does not include Glibc's limits.h (notably missing # SSIZE_MAX, which breaks the build). - export NIX_FIXINC_DUMMY=$(cat $NIX_GCC/nix-support/orig-libc)/include + export NIX_FIXINC_DUMMY=$(cat $NIX_CC/nix-support/orig-libc)/include else # Hack: support impure environments. diff --git a/pkgs/development/compilers/gcc/4.4/builder.sh b/pkgs/development/compilers/gcc/4.4/builder.sh index abe14b457ab..15476131e03 100644 --- a/pkgs/development/compilers/gcc/4.4/builder.sh +++ b/pkgs/development/compilers/gcc/4.4/builder.sh @@ -17,20 +17,20 @@ fi if test "$noSysDirs" = "1"; then - if test -e $NIX_GCC/nix-support/orig-libc; then + if test -e $NIX_CC/nix-support/orig-libc; then # Figure out what extra flags to pass to the gcc compilers # being generated to make sure that they use our glibc. - extraFlags="$(cat $NIX_GCC/nix-support/libc-cflags)" - extraLDFlags="$(cat $NIX_GCC/nix-support/libc-ldflags) $(cat $NIX_GCC/nix-support/libc-ldflags-before)" + extraFlags="$(cat $NIX_CC/nix-support/libc-cflags)" + extraLDFlags="$(cat $NIX_CC/nix-support/libc-ldflags) $(cat $NIX_CC/nix-support/libc-ldflags-before)" # Use *real* header files, otherwise a limits.h is generated # that does not include Glibc's limits.h (notably missing # SSIZE_MAX, which breaks the build). - export NIX_FIXINC_DUMMY=$(cat $NIX_GCC/nix-support/orig-libc)/include + export NIX_FIXINC_DUMMY=$(cat $NIX_CC/nix-support/orig-libc)/include # The path to the Glibc binaries such as `crti.o'. - glibc_libdir="$(cat $NIX_GCC/nix-support/orig-libc)/lib" + glibc_libdir="$(cat $NIX_CC/nix-support/orig-libc)/lib" else # Hack: support impure environments. @@ -61,27 +61,27 @@ if test "$noSysDirs" = "1"; then EXTRA_LDFLAGS_TARGET="-Wl,-L${libcCross}/lib" fi else - if test -z "$NIX_GCC_CROSS"; then + if test -z "$NIX_CC_CROSS"; then EXTRA_FLAGS_TARGET="$EXTRA_FLAGS" EXTRA_LDFLAGS_TARGET="$EXTRA_LDFLAGS" else # This the case of cross-building the gcc. # We need special flags for the target, different than those of the build # Assertion: - test -e $NIX_GCC_CROSS/nix-support/orig-libc + test -e $NIX_CC_CROSS/nix-support/orig-libc # Figure out what extra flags to pass to the gcc compilers # being generated to make sure that they use our glibc. - extraFlags="$(cat $NIX_GCC_CROSS/nix-support/libc-cflags)" - extraLDFlags="$(cat $NIX_GCC_CROSS/nix-support/libc-ldflags) $(cat $NIX_GCC_CROSS/nix-support/libc-ldflags-before)" + extraFlags="$(cat $NIX_CC_CROSS/nix-support/libc-cflags)" + extraLDFlags="$(cat $NIX_CC_CROSS/nix-support/libc-ldflags) $(cat $NIX_CC_CROSS/nix-support/libc-ldflags-before)" # Use *real* header files, otherwise a limits.h is generated # that does not include Glibc's limits.h (notably missing # SSIZE_MAX, which breaks the build). - NIX_FIXINC_DUMMY_CROSS=$(cat $NIX_GCC_CROSS/nix-support/orig-libc)/include + NIX_FIXINC_DUMMY_CROSS=$(cat $NIX_CC_CROSS/nix-support/orig-libc)/include # The path to the Glibc binaries such as `crti.o'. - glibc_libdir="$(cat $NIX_GCC_CROSS/nix-support/orig-libc)/lib" + glibc_libdir="$(cat $NIX_CC_CROSS/nix-support/orig-libc)/lib" extraFlags="-g0 -O2 -I$NIX_FIXINC_DUMMY_CROSS $extraFlags" extraLDFlags="--strip-debug -L$glibc_libdir -rpath $glibc_libdir $extraLDFlags" diff --git a/pkgs/development/compilers/gcc/4.4/default.nix b/pkgs/development/compilers/gcc/4.4/default.nix index be2f323fde1..3cbd7706ea0 100644 --- a/pkgs/development/compilers/gcc/4.4/default.nix +++ b/pkgs/development/compilers/gcc/4.4/default.nix @@ -188,7 +188,7 @@ stdenv.mkDerivation ({ NM_FOR_TARGET = "${stdenv.cross.config}-nm"; CXX_FOR_TARGET = "${stdenv.cross.config}-g++"; # If we are making a cross compiler, cross != null - NIX_GCC_CROSS = if cross == null then "${stdenv.gccCross}" else ""; + NIX_CC_CROSS = if cross == null then "${stdenv.ccCross}" else ""; configureFlags = " ${if enableMultilib then "" else "--disable-multilib"} ${if enableShared then "" else "--disable-shared"} diff --git a/pkgs/development/compilers/gcc/4.5/builder.sh b/pkgs/development/compilers/gcc/4.5/builder.sh index e1e56c8574a..83ca368c4ff 100644 --- a/pkgs/development/compilers/gcc/4.5/builder.sh +++ b/pkgs/development/compilers/gcc/4.5/builder.sh @@ -23,20 +23,20 @@ echo "\$LIBRARY_PATH is \`$LIBRARY_PATH'" if test "$noSysDirs" = "1"; then - if test -e $NIX_GCC/nix-support/orig-libc; then + if test -e $NIX_CC/nix-support/orig-libc; then # Figure out what extra flags to pass to the gcc compilers # being generated to make sure that they use our glibc. - extraFlags="$(cat $NIX_GCC/nix-support/libc-cflags)" - extraLDFlags="$(cat $NIX_GCC/nix-support/libc-ldflags) $(cat $NIX_GCC/nix-support/libc-ldflags-before)" + extraFlags="$(cat $NIX_CC/nix-support/libc-cflags)" + extraLDFlags="$(cat $NIX_CC/nix-support/libc-ldflags) $(cat $NIX_CC/nix-support/libc-ldflags-before)" # Use *real* header files, otherwise a limits.h is generated # that does not include Glibc's limits.h (notably missing # SSIZE_MAX, which breaks the build). - export NIX_FIXINC_DUMMY=$(cat $NIX_GCC/nix-support/orig-libc)/include + export NIX_FIXINC_DUMMY=$(cat $NIX_CC/nix-support/orig-libc)/include # The path to the Glibc binaries such as `crti.o'. - glibc_libdir="$(cat $NIX_GCC/nix-support/orig-libc)/lib" + glibc_libdir="$(cat $NIX_CC/nix-support/orig-libc)/lib" else # Hack: support impure environments. @@ -67,27 +67,27 @@ if test "$noSysDirs" = "1"; then EXTRA_TARGET_LDFLAGS="-Wl,-L${libcCross}/lib" fi else - if test -z "$NIX_GCC_CROSS"; then + if test -z "$NIX_CC_CROSS"; then EXTRA_TARGET_CFLAGS="$EXTRA_FLAGS" EXTRA_TARGET_LDFLAGS="$EXTRA_LDFLAGS" else # This the case of cross-building the gcc. # We need special flags for the target, different than those of the build # Assertion: - test -e $NIX_GCC_CROSS/nix-support/orig-libc + test -e $NIX_CC_CROSS/nix-support/orig-libc # Figure out what extra flags to pass to the gcc compilers # being generated to make sure that they use our glibc. - extraFlags="$(cat $NIX_GCC_CROSS/nix-support/libc-cflags)" - extraLDFlags="$(cat $NIX_GCC_CROSS/nix-support/libc-ldflags) $(cat $NIX_GCC_CROSS/nix-support/libc-ldflags-before)" + extraFlags="$(cat $NIX_CC_CROSS/nix-support/libc-cflags)" + extraLDFlags="$(cat $NIX_CC_CROSS/nix-support/libc-ldflags) $(cat $NIX_CC_CROSS/nix-support/libc-ldflags-before)" # Use *real* header files, otherwise a limits.h is generated # that does not include Glibc's limits.h (notably missing # SSIZE_MAX, which breaks the build). - NIX_FIXINC_DUMMY_CROSS=$(cat $NIX_GCC_CROSS/nix-support/orig-libc)/include + NIX_FIXINC_DUMMY_CROSS=$(cat $NIX_CC_CROSS/nix-support/orig-libc)/include # The path to the Glibc binaries such as `crti.o'. - glibc_libdir="$(cat $NIX_GCC_CROSS/nix-support/orig-libc)/lib" + glibc_libdir="$(cat $NIX_CC_CROSS/nix-support/orig-libc)/lib" extraFlags="-I$NIX_FIXINC_DUMMY_CROSS $extraFlags" extraLDFlags="-L$glibc_libdir -rpath $glibc_libdir $extraLDFlags" @@ -162,7 +162,7 @@ preConfigure() { # Patch the configure script so it finds glibc headers # It's important for example in order not to get libssp built, because it's # functionality is in glibc already. - glibc_headers="$(cat $NIX_GCC/nix-support/orig-libc)/include" + glibc_headers="$(cat $NIX_CC/nix-support/orig-libc)/include" sed -i \ -e s,glibc_header_dir=/usr/include,glibc_header_dir=$glibc_headers, \ gcc/configure diff --git a/pkgs/development/compilers/gcc/4.5/default.nix b/pkgs/development/compilers/gcc/4.5/default.nix index fbeea0768ad..95986c03f74 100644 --- a/pkgs/development/compilers/gcc/4.5/default.nix +++ b/pkgs/development/compilers/gcc/4.5/default.nix @@ -185,11 +185,11 @@ stdenv.mkDerivation ({ sed -i gcc/config/t-gnu \ -es'|NATIVE_SYSTEM_HEADER_DIR.*$|NATIVE_SYSTEM_HEADER_DIR = ${libc}/include|g' '' - else if cross != null || stdenv.gcc.libc != null then + else if cross != null || stdenv.cc.libc != null then # On NixOS, use the right path to the dynamic linker instead of # `/lib/ld*.so'. let - libc = if libcCross != null then libcCross else stdenv.gcc.libc; + libc = if libcCross != null then libcCross else stdenv.cc.libc; in '' echo "fixing the \`GLIBC_DYNAMIC_LINKER' and \`UCLIBC_DYNAMIC_LINKER' macros..." for header in "gcc/config/"*-gnu.h "gcc/config/"*"/"*.h @@ -272,7 +272,7 @@ stdenv.mkDerivation ({ NM_FOR_TARGET = "${stdenv.cross.config}-nm"; CXX_FOR_TARGET = "${stdenv.cross.config}-g++"; # If we are making a cross compiler, cross != null - NIX_GCC_CROSS = if cross == null then "${stdenv.gccCross}" else ""; + NIX_CC_CROSS = if cross == null then "${stdenv.ccCross}" else ""; dontStrip = true; configureFlags = '' ${if enableMultilib then "" else "--disable-multilib"} diff --git a/pkgs/development/compilers/gcc/4.6/builder.sh b/pkgs/development/compilers/gcc/4.6/builder.sh index de4566c12dd..af2e97b1e4e 100644 --- a/pkgs/development/compilers/gcc/4.6/builder.sh +++ b/pkgs/development/compilers/gcc/4.6/builder.sh @@ -19,20 +19,20 @@ echo "\$LIBRARY_PATH is \`$LIBRARY_PATH'" if test "$noSysDirs" = "1"; then - if test -e $NIX_GCC/nix-support/orig-libc; then + if test -e $NIX_CC/nix-support/orig-libc; then # Figure out what extra flags to pass to the gcc compilers # being generated to make sure that they use our glibc. - extraFlags="$(cat $NIX_GCC/nix-support/libc-cflags)" - extraLDFlags="$(cat $NIX_GCC/nix-support/libc-ldflags) $(cat $NIX_GCC/nix-support/libc-ldflags-before)" + extraFlags="$(cat $NIX_CC/nix-support/libc-cflags)" + extraLDFlags="$(cat $NIX_CC/nix-support/libc-ldflags) $(cat $NIX_CC/nix-support/libc-ldflags-before)" # Use *real* header files, otherwise a limits.h is generated # that does not include Glibc's limits.h (notably missing # SSIZE_MAX, which breaks the build). - export NIX_FIXINC_DUMMY=$(cat $NIX_GCC/nix-support/orig-libc)/include + export NIX_FIXINC_DUMMY=$(cat $NIX_CC/nix-support/orig-libc)/include # The path to the Glibc binaries such as `crti.o'. - glibc_libdir="$(cat $NIX_GCC/nix-support/orig-libc)/lib" + glibc_libdir="$(cat $NIX_CC/nix-support/orig-libc)/lib" else # Hack: support impure environments. @@ -74,27 +74,27 @@ if test "$noSysDirs" = "1"; then EXTRA_TARGET_LDFLAGS="-Wl,-L${libcCross}/lib" fi else - if test -z "$NIX_GCC_CROSS"; then + if test -z "$NIX_CC_CROSS"; then EXTRA_TARGET_CFLAGS="$EXTRA_FLAGS" EXTRA_TARGET_LDFLAGS="$EXTRA_LDFLAGS" else # This the case of cross-building the gcc. # We need special flags for the target, different than those of the build # Assertion: - test -e $NIX_GCC_CROSS/nix-support/orig-libc + test -e $NIX_CC_CROSS/nix-support/orig-libc # Figure out what extra flags to pass to the gcc compilers # being generated to make sure that they use our glibc. - extraFlags="$(cat $NIX_GCC_CROSS/nix-support/libc-cflags)" - extraLDFlags="$(cat $NIX_GCC_CROSS/nix-support/libc-ldflags) $(cat $NIX_GCC_CROSS/nix-support/libc-ldflags-before)" + extraFlags="$(cat $NIX_CC_CROSS/nix-support/libc-cflags)" + extraLDFlags="$(cat $NIX_CC_CROSS/nix-support/libc-ldflags) $(cat $NIX_CC_CROSS/nix-support/libc-ldflags-before)" # Use *real* header files, otherwise a limits.h is generated # that does not include Glibc's limits.h (notably missing # SSIZE_MAX, which breaks the build). - NIX_FIXINC_DUMMY_CROSS=$(cat $NIX_GCC_CROSS/nix-support/orig-libc)/include + NIX_FIXINC_DUMMY_CROSS=$(cat $NIX_CC_CROSS/nix-support/orig-libc)/include # The path to the Glibc binaries such as `crti.o'. - glibc_libdir="$(cat $NIX_GCC_CROSS/nix-support/orig-libc)/lib" + glibc_libdir="$(cat $NIX_CC_CROSS/nix-support/orig-libc)/lib" extraFlags="-I$NIX_FIXINC_DUMMY_CROSS $extraFlags" extraLDFlags="-L$glibc_libdir -rpath $glibc_libdir $extraLDFlags" @@ -166,11 +166,11 @@ preConfigure() { rm -Rf zlib fi - if test -f "$NIX_GCC/nix-support/orig-libc"; then + if test -f "$NIX_CC/nix-support/orig-libc"; then # Patch the configure script so it finds glibc headers. It's # important for example in order not to get libssp built, # because its functionality is in glibc already. - glibc_headers="$(cat $NIX_GCC/nix-support/orig-libc)/include" + glibc_headers="$(cat $NIX_CC/nix-support/orig-libc)/include" sed -i \ -e "s,glibc_header_dir=/usr/include,glibc_header_dir=$glibc_headers", \ gcc/configure diff --git a/pkgs/development/compilers/gcc/4.6/default.nix b/pkgs/development/compilers/gcc/4.6/default.nix index 0f08a908bfd..5ad087db134 100644 --- a/pkgs/development/compilers/gcc/4.6/default.nix +++ b/pkgs/development/compilers/gcc/4.6/default.nix @@ -46,15 +46,12 @@ assert stdenv.isDarwin -> gnused != null; with stdenv.lib; with builtins; -let version = "4.6.3"; +let version = "4.6.4"; # Whether building a cross-compiler for GNU/Hurd. crossGNU = cross != null && cross.config == "i586-pc-gnu"; - patches = - [ # Fix building on Glibc 2.16. - ./siginfo_t_fix.patch - ] + patches = [ ] ++ optional (cross != null) ./libstdc++-target.patch ++ optional noSysDirs ./no-sys-dirs.patch # The GNAT Makefiles did not pay attention to CFLAGS_FOR_TARGET for its @@ -232,11 +229,11 @@ stdenv.mkDerivation ({ sed -i gcc/config/t-gnu \ -es'|NATIVE_SYSTEM_HEADER_DIR.*$|NATIVE_SYSTEM_HEADER_DIR = ${libc}/include|g' '' - else if cross != null || stdenv.gcc.libc != null then + else if cross != null || stdenv.cc.libc != null then # On NixOS, use the right path to the dynamic linker instead of # `/lib/ld*.so'. let - libc = if libcCross != null then libcCross else stdenv.gcc.libc; + libc = if libcCross != null then libcCross else stdenv.cc.libc; in '' echo "fixing the \`GLIBC_DYNAMIC_LINKER' and \`UCLIBC_DYNAMIC_LINKER' macros..." for header in "gcc/config/"*-gnu.h "gcc/config/"*"/"*.h @@ -342,7 +339,7 @@ stdenv.mkDerivation ({ NM_FOR_TARGET = "${stdenv.cross.config}-nm"; CXX_FOR_TARGET = "${stdenv.cross.config}-g++"; # If we are making a cross compiler, cross != null - NIX_GCC_CROSS = if cross == null then "${stdenv.gccCross}" else ""; + NIX_CC_CROSS = if cross == null then "${stdenv.ccCross}" else ""; dontStrip = true; configureFlags = '' ${if enableMultilib then "" else "--disable-multilib"} diff --git a/pkgs/development/compilers/gcc/4.6/siginfo_t_fix.patch b/pkgs/development/compilers/gcc/4.6/siginfo_t_fix.patch deleted file mode 100644 index 1409c552c7d..00000000000 --- a/pkgs/development/compilers/gcc/4.6/siginfo_t_fix.patch +++ /dev/null @@ -1,211 +0,0 @@ -Partly taken from: -http://gcc.gnu.org/git/?p=gcc.git;a=patch;h=5617a3db5d04630d0bfb71a3578894b4442f266d - -Adapted to gcc 4.6.3. Original commit text follows. - -From 5617a3db5d04630d0bfb71a3578894b4442f266d Mon Sep 17 00:00:00 2001 -From: tschwinge -Date: Fri, 20 Apr 2012 07:44:50 +0000 -Subject: [PATCH] struct siginfo vs. siginfo_t - -gcc/ - * config/alpha/linux-unwind.h (alpha_fallback_frame_state): Use - siginfo_t instead of struct siginfo. - * config/bfin/linux-unwind.h (bfin_fallback_frame_state): Likewise. - * config/i386/linux-unwind.h (x86_fallback_frame_state): Likewise. - * config/ia64/linux-unwind.h (ia64_fallback_frame_state) - (ia64_handle_unwabi): Likewise. - * config/mips/linux-unwind.h (mips_fallback_frame_state): Likewise. - * config/pa/linux-unwind.h (pa32_fallback_frame_state): Likewise. - * config/sh/linux-unwind.h (shmedia_fallback_frame_state) - (sh_fallback_frame_state): Likewise. - * config/xtensa/linux-unwind.h (xtensa_fallback_frame_state): Likewise. - -git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@186610 138bc75d-0d04-0410-961f-82ee72b054a4 - -diff --git a/gcc/config/alpha/linux-unwind.h b/gcc/config/alpha/linux-unwind.h -index 4c811dc..8c04b3b 100644 ---- a/gcc/config/alpha/linux-unwind.h -+++ b/gcc/config/alpha/linux-unwind.h -@@ -1,5 +1,5 @@ - /* DWARF2 EH unwinding support for Alpha Linux. -- Copyright (C) 2004, 2005, 2009, 2011 Free Software Foundation, Inc. -+ Copyright (C) 2004, 2005, 2009, 2011, 2012 Free Software Foundation, Inc. - - This file is part of GCC. - -@@ -49,7 +49,7 @@ alpha_fallback_frame_state (struct _Unwind_Context *context, - else if (pc[1] == 0x201f015f) /* lda $0,NR_rt_sigreturn */ - { - struct rt_sigframe { -- struct siginfo info; -+ siginfo_t info; - struct ucontext uc; - } *rt_ = context->cfa; - sc = &rt_->uc.uc_mcontext; -diff --git a/gcc/config/bfin/linux-unwind.h b/gcc/config/bfin/linux-unwind.h -index 88c8285..15bb2f1 100644 ---- a/gcc/config/bfin/linux-unwind.h -+++ b/gcc/config/bfin/linux-unwind.h -@@ -1,5 +1,5 @@ - /* DWARF2 EH unwinding support for Blackfin. -- Copyright (C) 2007, 2009 Free Software Foundation, Inc. -+ Copyright (C) 2007, 2009, 2012 Free Software Foundation, Inc. - - This file is part of GCC. - -@@ -48,10 +48,10 @@ bfin_fallback_frame_state (struct _Unwind_Context *context, - { - struct rt_sigframe { - int sig; -- struct siginfo *pinfo; -+ siginfo_t *pinfo; - void *puc; - char retcode[8]; -- struct siginfo info; -+ siginfo_t info; - struct ucontext uc; - } *rt_ = context->cfa; - -diff --git a/gcc/config/i386/linux-unwind.h b/gcc/config/i386/linux-unwind.h -index ad0ccfa..02b1897 100644 ---- a/gcc/config/i386/linux-unwind.h -+++ b/gcc/config/i386/linux-unwind.h -@@ -136,9 +136,9 @@ x86_fallback_frame_state (struct _Unwind_Context *context, - { - struct rt_sigframe { - int sig; -- struct siginfo *pinfo; -+ siginfo_t *pinfo; - void *puc; -- struct siginfo info; -+ siginfo_t info; - struct ucontext uc; - } *rt_ = context->cfa; - /* The void * cast is necessary to avoid an aliasing warning. -diff --git a/gcc/config/ia64/linux-unwind.h b/gcc/config/ia64/linux-unwind.h -index 93f762d..da31259 100644 ---- a/gcc/config/ia64/linux-unwind.h -+++ b/gcc/config/ia64/linux-unwind.h -@@ -1,5 +1,5 @@ - /* DWARF2 EH unwinding support for IA64 Linux. -- Copyright (C) 2004, 2005, 2009 Free Software Foundation, Inc. -+ Copyright (C) 2004, 2005, 2009, 2012 Free Software Foundation, Inc. - - This file is part of GCC. - -@@ -47,7 +47,7 @@ ia64_fallback_frame_state (struct _Unwind_Context *context, - struct sigframe { - char scratch[16]; - unsigned long sig_number; -- struct siginfo *info; -+ siginfo_t *info; - struct sigcontext *sc; - } *frame_ = (struct sigframe *)context->psp; - struct sigcontext *sc = frame_->sc; -@@ -137,7 +137,7 @@ ia64_handle_unwabi (struct _Unwind_Context *context, _Unwind_FrameState *fs) - struct sigframe { - char scratch[16]; - unsigned long sig_number; -- struct siginfo *info; -+ siginfo_t *info; - struct sigcontext *sc; - } *frame = (struct sigframe *)context->psp; - struct sigcontext *sc = frame->sc; -diff --git a/gcc/config/mips/linux-unwind.h b/gcc/config/mips/linux-unwind.h -index 02f7cd5..094ff58 100644 ---- a/gcc/config/mips/linux-unwind.h -+++ b/gcc/config/mips/linux-unwind.h -@@ -1,5 +1,6 @@ - /* DWARF2 EH unwinding support for MIPS Linux. -- Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009 Free Software Foundation, Inc. -+ Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2012 Free Software -+ Foundation, Inc. - - This file is part of GCC. - -@@ -75,7 +76,7 @@ mips_fallback_frame_state (struct _Unwind_Context *context, - struct rt_sigframe { - u_int32_t ass[4]; /* Argument save space for o32. */ - u_int32_t trampoline[2]; -- struct siginfo info; -+ siginfo_t info; - _sig_ucontext_t uc; - } *rt_ = context->cfa; - sc = &rt_->uc.uc_mcontext; -diff --git a/gcc/config/pa/linux-unwind.h b/gcc/config/pa/linux-unwind.h -index a0560e9..38b4eda 100644 ---- a/gcc/config/pa/linux-unwind.h -+++ b/gcc/config/pa/linux-unwind.h -@@ -1,5 +1,5 @@ - /* DWARF2 EH unwinding support for PA Linux. -- Copyright (C) 2004, 2005, 2009 Free Software Foundation, Inc. -+ Copyright (C) 2004, 2005, 2009, 2012 Free Software Foundation, Inc. - - This file is part of GCC. - -@@ -63,7 +63,7 @@ pa32_fallback_frame_state (struct _Unwind_Context *context, - int i; - struct sigcontext *sc; - struct rt_sigframe { -- struct siginfo info; -+ siginfo_t info; - struct ucontext uc; - } *frame; - -diff --git a/gcc/config/sh/linux-unwind.h b/gcc/config/sh/linux-unwind.h -index 94ed95d..5a78e31 100644 ---- a/gcc/config/sh/linux-unwind.h -+++ b/gcc/config/sh/linux-unwind.h -@@ -1,5 +1,6 @@ - /* DWARF2 EH unwinding support for SH Linux. -- Copyright (C) 2004, 2005, 2006, 2007, 2009 Free Software Foundation, Inc. -+ Copyright (C) 2004, 2005, 2006, 2007, 2009, 2012 Free Software Foundation, -+ Inc. - - This file is part of GCC. - -@@ -80,9 +81,9 @@ shmedia_fallback_frame_state (struct _Unwind_Context *context, - && (*(unsigned long *) (pc+11) == 0x6ff0fff0)) - { - struct rt_sigframe { -- struct siginfo *pinfo; -+ siginfo_t *pinfo; - void *puc; -- struct siginfo info; -+ siginfo_t info; - struct ucontext uc; - } *rt_ = context->cfa; - /* The void * cast is necessary to avoid an aliasing warning. -@@ -179,7 +180,7 @@ sh_fallback_frame_state (struct _Unwind_Context *context, - && (*(unsigned short *) (pc+14) == 0x00ad)))) - { - struct rt_sigframe { -- struct siginfo info; -+ siginfo_t info; - struct ucontext uc; - } *rt_ = context->cfa; - /* The void * cast is necessary to avoid an aliasing warning. -diff --git a/gcc/config/xtensa/linux-unwind.h b/gcc/config/xtensa/linux-unwind.h -index 32e9349..2456497 100644 ---- a/gcc/config/xtensa/linux-unwind.h -+++ b/gcc/config/xtensa/linux-unwind.h -@@ -1,5 +1,5 @@ - /* DWARF2 EH unwinding support for Xtensa. -- Copyright (C) 2008, 2009 Free Software Foundation, Inc. -+ Copyright (C) 2008, 2009, 2012 Free Software Foundation, Inc. - - This file is part of GCC. - -@@ -62,7 +62,7 @@ xtensa_fallback_frame_state (struct _Unwind_Context *context, - struct sigcontext *sc; - - struct rt_sigframe { -- struct siginfo info; -+ siginfo_t info; - struct ucontext uc; - } *rt_; - --- -1.7.3.4 - diff --git a/pkgs/development/compilers/gcc/4.6/sources.nix b/pkgs/development/compilers/gcc/4.6/sources.nix index fd347aa8bda..ca50160def4 100644 --- a/pkgs/development/compilers/gcc/4.6/sources.nix +++ b/pkgs/development/compilers/gcc/4.6/sources.nix @@ -1,31 +1,27 @@ /* Automatically generated by `update-gcc.sh', do not edit. - For GCC 4.6.3. */ + For GCC 4.6.4. */ { fetchurl, optional, version, langC, langCC, langFortran, langJava, langAda, langGo }: -assert version == "4.6.3"; +assert version == "4.6.4"; optional /* langC */ true (fetchurl { url = "mirror://gcc/releases/gcc-${version}/gcc-core-${version}.tar.bz2"; - sha256 = "283e00881c0de258fafc5170843e4d9b14ee2a7dc4426f0d426e6be0400251c1"; + sha256 = "48b566f1288f099dff8fba868499a320f83586245ec69b8c82a9042566a5bf62"; }) ++ optional langCC (fetchurl { url = "mirror://gcc/releases/gcc-${version}/gcc-g++-${version}.tar.bz2"; - sha256 = "b3e0c733e900e99096b0c5480f57e22e3e583ec3d83596cc2cb9986bd64b29e8"; + sha256 = "4eaa347f9cd3ab7d5e14efbb9c5c03009229cd714b558fc55fa56e8996b74d42"; }) ++ optional langFortran (fetchurl { url = "mirror://gcc/releases/gcc-${version}/gcc-fortran-${version}.tar.bz2"; - sha256 = "fe1bdf3485f33e6d0a998ff7bcb42526fbf3083dbfc107c3d95a88c00739eadb"; + sha256 = "4f402e0d27995a02354570f0a63047f27463c72c62f1ba3c08ef5a7c6c9c3d1c"; }) ++ optional langJava (fetchurl { url = "mirror://gcc/releases/gcc-${version}/gcc-java-${version}.tar.bz2"; - sha256 = "d0f9aafbd8fe95fdee5797cd02a9a734de0078aa62a9a249b0752adabf76d6e6"; + sha256 = "4441d0c3cc04f2162f981c6b4bf29cdd9f6c16d294ce24c6bc4a05d8277abf28"; }) ++ optional langAda (fetchurl { url = "mirror://gcc/releases/gcc-${version}/gcc-ada-${version}.tar.bz2"; - sha256 = "7bb213ec3948646df72720580fcba3489c84aa452bd0e4238712607ef83cbdf6"; -}) ++ -optional langGo (fetchurl { - url = "mirror://gcc/releases/gcc-${version}/gcc-go-${version}.tar.bz2"; - sha256 = "7589c16f33ad383769510bb5b9c1aeb7f865f3ae0b89b07b2370d988a4c1fe6d"; + sha256 = "2a09bbf942b2557839722d4807e67559123037356f5cb1a3b12f44539968d0ad"; }) ++ [] diff --git a/pkgs/development/compilers/gcc/4.8/builder.sh b/pkgs/development/compilers/gcc/4.8/builder.sh index 3d24d34a2f2..dd77c67a023 100644 --- a/pkgs/development/compilers/gcc/4.8/builder.sh +++ b/pkgs/development/compilers/gcc/4.8/builder.sh @@ -19,20 +19,20 @@ echo "\$LIBRARY_PATH is \`$LIBRARY_PATH'" if test "$noSysDirs" = "1"; then - if test -e $NIX_GCC/nix-support/orig-libc; then + if test -e $NIX_CC/nix-support/orig-libc; then # Figure out what extra flags to pass to the gcc compilers # being generated to make sure that they use our glibc. - extraFlags="$(cat $NIX_GCC/nix-support/libc-cflags)" - extraLDFlags="$(cat $NIX_GCC/nix-support/libc-ldflags) $(cat $NIX_GCC/nix-support/libc-ldflags-before)" + extraFlags="$(cat $NIX_CC/nix-support/libc-cflags)" + extraLDFlags="$(cat $NIX_CC/nix-support/libc-ldflags) $(cat $NIX_CC/nix-support/libc-ldflags-before)" # Use *real* header files, otherwise a limits.h is generated # that does not include Glibc's limits.h (notably missing # SSIZE_MAX, which breaks the build). - export NIX_FIXINC_DUMMY=$(cat $NIX_GCC/nix-support/orig-libc)/include + export NIX_FIXINC_DUMMY=$(cat $NIX_CC/nix-support/orig-libc)/include # The path to the Glibc binaries such as `crti.o'. - glibc_libdir="$(cat $NIX_GCC/nix-support/orig-libc)/lib" + glibc_libdir="$(cat $NIX_CC/nix-support/orig-libc)/lib" else # Hack: support impure environments. @@ -74,7 +74,7 @@ if test "$noSysDirs" = "1"; then EXTRA_TARGET_LDFLAGS="-Wl,-L${libcCross}/lib -Wl,-rpath,${libcCross}/lib -Wl,-rpath-link,${libcCross}/lib" fi else - if test -z "$NIX_GCC_CROSS"; then + if test -z "$NIX_CC_CROSS"; then EXTRA_TARGET_CFLAGS="$EXTRA_FLAGS" EXTRA_TARGET_CXXFLAGS="$EXTRA_FLAGS" EXTRA_TARGET_LDFLAGS="$EXTRA_LDFLAGS" @@ -82,20 +82,20 @@ if test "$noSysDirs" = "1"; then # This the case of cross-building the gcc. # We need special flags for the target, different than those of the build # Assertion: - test -e $NIX_GCC_CROSS/nix-support/orig-libc + test -e $NIX_CC_CROSS/nix-support/orig-libc # Figure out what extra flags to pass to the gcc compilers # being generated to make sure that they use our glibc. - extraFlags="$(cat $NIX_GCC_CROSS/nix-support/libc-cflags)" - extraLDFlags="$(cat $NIX_GCC_CROSS/nix-support/libc-ldflags) $(cat $NIX_GCC_CROSS/nix-support/libc-ldflags-before)" + extraFlags="$(cat $NIX_CC_CROSS/nix-support/libc-cflags)" + extraLDFlags="$(cat $NIX_CC_CROSS/nix-support/libc-ldflags) $(cat $NIX_CC_CROSS/nix-support/libc-ldflags-before)" # Use *real* header files, otherwise a limits.h is generated # that does not include Glibc's limits.h (notably missing # SSIZE_MAX, which breaks the build). - NIX_FIXINC_DUMMY_CROSS=$(cat $NIX_GCC_CROSS/nix-support/orig-libc)/include + NIX_FIXINC_DUMMY_CROSS=$(cat $NIX_CC_CROSS/nix-support/orig-libc)/include # The path to the Glibc binaries such as `crti.o'. - glibc_dir="$(cat $NIX_GCC_CROSS/nix-support/orig-libc)" + glibc_dir="$(cat $NIX_CC_CROSS/nix-support/orig-libc)" glibc_libdir="$glibc_dir/lib" configureFlags="$configureFlags --with-native-system-header-dir=$glibc_dir/include" @@ -167,11 +167,11 @@ preConfigure() { rm -Rf zlib fi - if test -f "$NIX_GCC/nix-support/orig-libc"; then + if test -f "$NIX_CC/nix-support/orig-libc"; then # Patch the configure script so it finds glibc headers. It's # important for example in order not to get libssp built, # because its functionality is in glibc already. - glibc_headers="$(cat $NIX_GCC/nix-support/orig-libc)/include" + glibc_headers="$(cat $NIX_CC/nix-support/orig-libc)/include" sed -i \ -e "s,glibc_header_dir=/usr/include,glibc_header_dir=$glibc_headers", \ gcc/configure diff --git a/pkgs/development/compilers/gcc/4.8/default.nix b/pkgs/development/compilers/gcc/4.8/default.nix index c240acb5e89..aca4d90b652 100644 --- a/pkgs/development/compilers/gcc/4.8/default.nix +++ b/pkgs/development/compilers/gcc/4.8/default.nix @@ -54,14 +54,14 @@ assert langGo -> langCC; with stdenv.lib; with builtins; -let version = "4.8.3"; +let version = "4.8.4"; # Whether building a cross-compiler for GNU/Hurd. crossGNU = cross != null && cross.config == "i586-pc-gnu"; enableParallelBuilding = true; - patches = [] + patches = [ ] ++ optional enableParallelBuilding ./parallel-bconfig.patch ++ optional (cross != null) ./libstdc++-target.patch ++ optional noSysDirs ./no-sys-dirs.patch @@ -209,7 +209,7 @@ stdenv.mkDerivation ({ src = fetchurl { url = "mirror://gnu/gcc/gcc-${version}/gcc-${version}.tar.bz2"; - sha256 = "07hg10zs7gnqz58my10ch0zygizqh0z0bz6pv4pgxx45n48lz3ka"; + sha256 = "15c6gwm6dzsaagamxkak5smdkf1rdfbqqjs9jdbrp3lbg4ism02a"; }; inherit patches; @@ -251,11 +251,11 @@ stdenv.mkDerivation ({ sed -i "${gnu_h}" \ -es'|#define STANDARD_INCLUDE_DIR.*$|#define STANDARD_INCLUDE_DIR "${libc}/include"|g' '' - else if cross != null || stdenv.gcc.libc != null then + else if cross != null || stdenv.cc.libc != null then # On NixOS, use the right path to the dynamic linker instead of # `/lib/ld*.so'. let - libc = if libcCross != null then libcCross else stdenv.gcc.libc; + libc = if libcCross != null then libcCross else stdenv.cc.libc; in '' echo "fixing the \`GLIBC_DYNAMIC_LINKER' and \`UCLIBC_DYNAMIC_LINKER' macros..." for header in "gcc/config/"*-gnu.h "gcc/config/"*"/"*.h @@ -397,7 +397,7 @@ stdenv.mkDerivation ({ NM_FOR_TARGET = "${stdenv.cross.config}-nm"; CXX_FOR_TARGET = "${stdenv.cross.config}-g++"; # If we are making a cross compiler, cross != null - NIX_GCC_CROSS = if cross == null then "${stdenv.gccCross}" else ""; + NIX_CC_CROSS = if cross == null then "${stdenv.ccCross}" else ""; dontStrip = true; configureFlags = '' ${if enableMultilib then "" else "--disable-multilib"} diff --git a/pkgs/development/compilers/gcc/4.9/builder.sh b/pkgs/development/compilers/gcc/4.9/builder.sh index b781fa6c7ef..96bbd025ba6 100644 --- a/pkgs/development/compilers/gcc/4.9/builder.sh +++ b/pkgs/development/compilers/gcc/4.9/builder.sh @@ -19,20 +19,20 @@ echo "\$LIBRARY_PATH is \`$LIBRARY_PATH'" if test "$noSysDirs" = "1"; then - if test -e $NIX_GCC/nix-support/orig-libc; then + if test -e $NIX_CC/nix-support/orig-libc; then # Figure out what extra flags to pass to the gcc compilers # being generated to make sure that they use our glibc. - extraFlags="$(cat $NIX_GCC/nix-support/libc-cflags)" - extraLDFlags="$(cat $NIX_GCC/nix-support/libc-ldflags) $(cat $NIX_GCC/nix-support/libc-ldflags-before)" + extraFlags="$(cat $NIX_CC/nix-support/libc-cflags)" + extraLDFlags="$(cat $NIX_CC/nix-support/libc-ldflags) $(cat $NIX_CC/nix-support/libc-ldflags-before)" # Use *real* header files, otherwise a limits.h is generated # that does not include Glibc's limits.h (notably missing # SSIZE_MAX, which breaks the build). - export NIX_FIXINC_DUMMY=$(cat $NIX_GCC/nix-support/orig-libc)/include + export NIX_FIXINC_DUMMY=$(cat $NIX_CC/nix-support/orig-libc)/include # The path to the Glibc binaries such as `crti.o'. - glibc_libdir="$(cat $NIX_GCC/nix-support/orig-libc)/lib" + glibc_libdir="$(cat $NIX_CC/nix-support/orig-libc)/lib" else # Hack: support impure environments. @@ -74,7 +74,7 @@ if test "$noSysDirs" = "1"; then EXTRA_TARGET_LDFLAGS="-Wl,-L${libcCross}/lib -Wl,-rpath,${libcCross}/lib -Wl,-rpath-link,${libcCross}/lib" fi else - if test -z "$NIX_GCC_CROSS"; then + if test -z "$NIX_CC_CROSS"; then EXTRA_TARGET_CFLAGS="$EXTRA_FLAGS" EXTRA_TARGET_CXXFLAGS="$EXTRA_FLAGS" EXTRA_TARGET_LDFLAGS="$EXTRA_LDFLAGS" @@ -82,20 +82,20 @@ if test "$noSysDirs" = "1"; then # This the case of cross-building the gcc. # We need special flags for the target, different than those of the build # Assertion: - test -e $NIX_GCC_CROSS/nix-support/orig-libc + test -e $NIX_CC_CROSS/nix-support/orig-libc # Figure out what extra flags to pass to the gcc compilers # being generated to make sure that they use our glibc. - extraFlags="$(cat $NIX_GCC_CROSS/nix-support/libc-cflags)" - extraLDFlags="$(cat $NIX_GCC_CROSS/nix-support/libc-ldflags) $(cat $NIX_GCC_CROSS/nix-support/libc-ldflags-before)" + extraFlags="$(cat $NIX_CC_CROSS/nix-support/libc-cflags)" + extraLDFlags="$(cat $NIX_CC_CROSS/nix-support/libc-ldflags) $(cat $NIX_CC_CROSS/nix-support/libc-ldflags-before)" # Use *real* header files, otherwise a limits.h is generated # that does not include Glibc's limits.h (notably missing # SSIZE_MAX, which breaks the build). - NIX_FIXINC_DUMMY_CROSS=$(cat $NIX_GCC_CROSS/nix-support/orig-libc)/include + NIX_FIXINC_DUMMY_CROSS=$(cat $NIX_CC_CROSS/nix-support/orig-libc)/include # The path to the Glibc binaries such as `crti.o'. - glibc_dir="$(cat $NIX_GCC_CROSS/nix-support/orig-libc)" + glibc_dir="$(cat $NIX_CC_CROSS/nix-support/orig-libc)" glibc_libdir="$glibc_dir/lib" configureFlags="$configureFlags --with-native-system-header-dir=$glibc_dir/include" @@ -171,11 +171,11 @@ preConfigure() { rm -Rf zlib fi - if test -f "$NIX_GCC/nix-support/orig-libc"; then + if test -f "$NIX_CC/nix-support/orig-libc"; then # Patch the configure script so it finds glibc headers. It's # important for example in order not to get libssp built, # because its functionality is in glibc already. - glibc_headers="$(cat $NIX_GCC/nix-support/orig-libc)/include" + glibc_headers="$(cat $NIX_CC/nix-support/orig-libc)/include" sed -i \ -e "s,glibc_header_dir=/usr/include,glibc_header_dir=$glibc_headers", \ gcc/configure diff --git a/pkgs/development/compilers/gcc/4.9/default.nix b/pkgs/development/compilers/gcc/4.9/default.nix index ef7846fadd0..cffb50ef211 100644 --- a/pkgs/development/compilers/gcc/4.9/default.nix +++ b/pkgs/development/compilers/gcc/4.9/default.nix @@ -247,11 +247,11 @@ stdenv.mkDerivation ({ sed -i "${gnu_h}" \ -es'|#define STANDARD_INCLUDE_DIR.*$|#define STANDARD_INCLUDE_DIR "${libc}/include"|g' '' - else if cross != null || stdenv.gcc.libc != null then + else if cross != null || stdenv.cc.libc != null then # On NixOS, use the right path to the dynamic linker instead of # `/lib/ld*.so'. let - libc = if libcCross != null then libcCross else stdenv.gcc.libc; + libc = if libcCross != null then libcCross else stdenv.cc.libc; in '' echo "fixing the \`GLIBC_DYNAMIC_LINKER' and \`UCLIBC_DYNAMIC_LINKER' macros..." for header in "gcc/config/"*-gnu.h "gcc/config/"*"/"*.h @@ -385,7 +385,7 @@ stdenv.mkDerivation ({ NM_FOR_TARGET = "${stdenv.cross.config}-nm"; CXX_FOR_TARGET = "${stdenv.cross.config}-g++"; # If we are making a cross compiler, cross != null - NIX_GCC_CROSS = if cross == null then "${stdenv.gccCross}" else ""; + NIX_CC_CROSS = if cross == null then "${stdenv.ccCross}" else ""; dontStrip = true; configureFlags = '' ${if enableMultilib then "" else "--disable-multilib"} diff --git a/pkgs/development/compilers/gcl/default.nix b/pkgs/development/compilers/gcl/default.nix index f2252fe8381..452f5c09bf5 100644 --- a/pkgs/development/compilers/gcl/default.nix +++ b/pkgs/development/compilers/gcl/default.nix @@ -9,11 +9,11 @@ let in ( -assert a.stdenv ? gcc ; -assert a.stdenv.gcc ? gcc ; -assert a.stdenv.gcc ? libc ; -assert a.stdenv.gcc.gcc != null ; -assert a.stdenv.gcc.libc != null ; +assert a.stdenv ? cc ; +assert a.stdenv.cc ? gcc ; +assert a.stdenv.cc ? libc ; +assert a.stdenv.cc.gcc != null ; +assert a.stdenv.cc.libc != null ; rec { src = a.fetchurl { @@ -37,7 +37,7 @@ rec { preBuild = a.fullDepEntry ('' sed -re "s@/bin/cat@$(which cat)@g" -i configure */configure sed -re "s@if test -d /proc/self @if false @" -i configure - sed -re 's^([ \t])cpp ^\1cpp -I${a.stdenv.gcc.gcc}/include -I${a.stdenv.gcc.libc}/include ^g' -i makefile + sed -re 's^([ \t])cpp ^\1cpp -I${a.stdenv.cc.gcc}/include -I${a.stdenv.cc.libc}/include ^g' -i makefile '') ["minInit" "doUnpack" "addInputs"]; /* doConfigure should be removed if not needed */ diff --git a/pkgs/development/compilers/ghc/6.10.1-binary.nix b/pkgs/development/compilers/ghc/6.10.1-binary.nix index e7d4d3c1946..02e37cc42cf 100644 --- a/pkgs/development/compilers/ghc/6.10.1-binary.nix +++ b/pkgs/development/compilers/ghc/6.10.1-binary.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { # find editline/gmp. (if stdenv.isLinux then '' find . -type f -perm +100 \ - -exec patchelf --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \ + -exec patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ --set-rpath "${libedit}/lib:${ncurses}/lib:${gmp}/lib" {} \; for prog in ld ar gcc strip ranlib; do find . -name "setup-config" -exec sed -i "s@/usr/bin/$prog@$(type -p $prog)@g" {} \; diff --git a/pkgs/development/compilers/ghc/6.10.1.nix b/pkgs/development/compilers/ghc/6.10.1.nix index ccb9f434230..7c18d76626e 100644 --- a/pkgs/development/compilers/ghc/6.10.1.nix +++ b/pkgs/development/compilers/ghc/6.10.1.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { configureFlags=[ "--with-gmp-libraries=${gmp}/lib" "--with-gmp-includes=${gmp}/include" - "--with-gcc=${stdenv.gcc}/bin/gcc" + "--with-gcc=${stdenv.cc}/bin/gcc" ]; meta = { diff --git a/pkgs/development/compilers/ghc/6.10.2-binary.nix b/pkgs/development/compilers/ghc/6.10.2-binary.nix index 5af89e38c21..1e755ab6c0c 100644 --- a/pkgs/development/compilers/ghc/6.10.2-binary.nix +++ b/pkgs/development/compilers/ghc/6.10.2-binary.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation rec { # find editline/gmp. (if stdenv.isLinux then '' find . -type f -perm +100 \ - -exec patchelf --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \ + -exec patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ --set-rpath "${libedit}/lib:${ncurses}/lib:${gmp}/lib" {} \; for prog in ld ar gcc strip ranlib; do find . -name "setup-config" -exec sed -i "s@/usr/bin/$prog@$(type -p $prog)@g" {} \; diff --git a/pkgs/development/compilers/ghc/6.10.2.nix b/pkgs/development/compilers/ghc/6.10.2.nix index 4988734f580..9261ead80d7 100644 --- a/pkgs/development/compilers/ghc/6.10.2.nix +++ b/pkgs/development/compilers/ghc/6.10.2.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { configureFlags=[ "--with-gmp-libraries=${gmp}/lib" "--with-gmp-includes=${gmp}/include" - "--with-gcc=${stdenv.gcc}/bin/gcc" + "--with-gcc=${stdenv.cc}/bin/gcc" ]; meta = { diff --git a/pkgs/development/compilers/ghc/6.10.3.nix b/pkgs/development/compilers/ghc/6.10.3.nix index f6683278e45..9ab6e2076b5 100644 --- a/pkgs/development/compilers/ghc/6.10.3.nix +++ b/pkgs/development/compilers/ghc/6.10.3.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { configureFlags=[ "--with-gmp-libraries=${gmp}/lib" "--with-gmp-includes=${gmp}/include" - "--with-gcc=${stdenv.gcc}/bin/gcc" + "--with-gcc=${stdenv.cc}/bin/gcc" ]; meta = { diff --git a/pkgs/development/compilers/ghc/6.10.4.nix b/pkgs/development/compilers/ghc/6.10.4.nix index 5d02088c44c..3c5a52c0c40 100644 --- a/pkgs/development/compilers/ghc/6.10.4.nix +++ b/pkgs/development/compilers/ghc/6.10.4.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { configureFlags=[ "--with-gmp-libraries=${gmp}/lib" "--with-gmp-includes=${gmp}/include" - "--with-gcc=${stdenv.gcc}/bin/gcc" + "--with-gcc=${stdenv.cc}/bin/gcc" ]; NIX_CFLAGS_COMPILE = "-fomit-frame-pointer"; diff --git a/pkgs/development/compilers/ghc/6.11.nix b/pkgs/development/compilers/ghc/6.11.nix index 914403cdd66..8d57ecd59ac 100644 --- a/pkgs/development/compilers/ghc/6.11.nix +++ b/pkgs/development/compilers/ghc/6.11.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { configureFlags=[ "--with-gmp-libraries=${gmp}/lib" "--with-gmp-includes=${gmp}/include" - "--with-gcc=${stdenv.gcc}/bin/gcc" + "--with-gcc=${stdenv.cc}/bin/gcc" ]; preConfigure=[ diff --git a/pkgs/development/compilers/ghc/6.12.1-binary.nix b/pkgs/development/compilers/ghc/6.12.1-binary.nix index da4658c3829..8d03ca40452 100644 --- a/pkgs/development/compilers/ghc/6.12.1-binary.nix +++ b/pkgs/development/compilers/ghc/6.12.1-binary.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { # find editline/gmp. (if stdenv.isLinux then '' find . -type f -perm +100 \ - -exec patchelf --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \ + -exec patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ --set-rpath "${ncurses}/lib:${gmp}/lib" {} \; sed -i "s|/usr/bin/perl|perl\x00 |" ghc-${version}/ghc/stage2/build/tmp/ghc-stage2 sed -i "s|/usr/bin/gcc|gcc\x00 |" ghc-${version}/ghc/stage2/build/tmp/ghc-stage2 diff --git a/pkgs/development/compilers/ghc/6.12.1.nix b/pkgs/development/compilers/ghc/6.12.1.nix index 31c763c4505..66b277dc376 100644 --- a/pkgs/development/compilers/ghc/6.12.1.nix +++ b/pkgs/development/compilers/ghc/6.12.1.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { ''; configureFlags=[ - "--with-gcc=${stdenv.gcc}/bin/gcc" + "--with-gcc=${stdenv.cc}/bin/gcc" ]; # required, because otherwise all symbols from HSffi.o are stripped, and diff --git a/pkgs/development/compilers/ghc/6.12.2.nix b/pkgs/development/compilers/ghc/6.12.2.nix index 5db5fc49fc6..a7252a7931d 100644 --- a/pkgs/development/compilers/ghc/6.12.2.nix +++ b/pkgs/development/compilers/ghc/6.12.2.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { ''; configureFlags=[ - "--with-gcc=${stdenv.gcc}/bin/gcc" + "--with-gcc=${stdenv.cc}/bin/gcc" ]; # required, because otherwise all symbols from HSffi.o are stripped, and diff --git a/pkgs/development/compilers/ghc/6.12.3.nix b/pkgs/development/compilers/ghc/6.12.3.nix index 08c9c1739ed..a1cc16e1f9e 100644 --- a/pkgs/development/compilers/ghc/6.12.3.nix +++ b/pkgs/development/compilers/ghc/6.12.3.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { ''; configureFlags=[ - "--with-gcc=${stdenv.gcc}/bin/gcc" + "--with-gcc=${stdenv.cc}/bin/gcc" ]; NIX_CFLAGS_COMPILE = "-fomit-frame-pointer"; diff --git a/pkgs/development/compilers/ghc/6.4.2-binary.nix b/pkgs/development/compilers/ghc/6.4.2-binary.nix index b42602829ac..5485326e2e7 100644 --- a/pkgs/development/compilers/ghc/6.4.2-binary.nix +++ b/pkgs/development/compilers/ghc/6.4.2-binary.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation { # find readline/gmp. postBuild = if stdenv.isLinux then " find . -type f -perm +100 \\ - -exec patchelf --interpreter \"$(cat $NIX_GCC/nix-support/dynamic-linker)\" \\ + -exec patchelf --interpreter \"$(cat $NIX_CC/nix-support/dynamic-linker)\" \\ --set-rpath \"${readline}/lib:${ncurses}/lib:${gmp}/lib\" {} \\; " else ""; diff --git a/pkgs/development/compilers/ghc/6.4.2.nix b/pkgs/development/compilers/ghc/6.4.2.nix index e336d4e83b1..dfd38cc6a1a 100644 --- a/pkgs/development/compilers/ghc/6.4.2.nix +++ b/pkgs/development/compilers/ghc/6.4.2.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation { propagatedBuildInputs = [readline ncurses gmp]; - configureFlags = "--with-gcc=${stdenv.gcc}/bin/gcc"; + configureFlags = "--with-gcc=${stdenv.cc}/bin/gcc"; preConfigure = '' diff --git a/pkgs/development/compilers/ghc/6.8.2.nix b/pkgs/development/compilers/ghc/6.8.2.nix index 8af15862590..0f649745a1e 100644 --- a/pkgs/development/compilers/ghc/6.8.2.nix +++ b/pkgs/development/compilers/ghc/6.8.2.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation (rec { "--with-gmp-libraries=${gmp}/lib" "--with-gmp-includes=${gmp}/include" "--with-readline-libraries=${readline}/lib" - "--with-gcc=${stdenv.gcc}/bin/gcc" + "--with-gcc=${stdenv.cc}/bin/gcc" ]; preConfigure = " diff --git a/pkgs/development/compilers/ghc/6.8.3.nix b/pkgs/development/compilers/ghc/6.8.3.nix index 281ff61b700..ea116781afb 100644 --- a/pkgs/development/compilers/ghc/6.8.3.nix +++ b/pkgs/development/compilers/ghc/6.8.3.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { "--with-gmp-libraries=${gmp}/lib" "--with-gmp-includes=${gmp}/include" "--with-readline-libraries=${readline}/lib" - "--with-gcc=${stdenv.gcc}/bin/gcc" + "--with-gcc=${stdenv.cc}/bin/gcc" ]; preConfigure = '' diff --git a/pkgs/development/compilers/ghc/7.0.1.nix b/pkgs/development/compilers/ghc/7.0.1.nix index b0b03d4b8cc..3f992bb16ff 100644 --- a/pkgs/development/compilers/ghc/7.0.1.nix +++ b/pkgs/development/compilers/ghc/7.0.1.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { ''; configureFlags=[ - "--with-gcc=${stdenv.gcc}/bin/gcc" + "--with-gcc=${stdenv.cc}/bin/gcc" ]; # required, because otherwise all symbols from HSffi.o are stripped, and diff --git a/pkgs/development/compilers/ghc/7.0.2.nix b/pkgs/development/compilers/ghc/7.0.2.nix index 5dd2e14b0c6..3fb982e2a71 100644 --- a/pkgs/development/compilers/ghc/7.0.2.nix +++ b/pkgs/development/compilers/ghc/7.0.2.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { ''; configureFlags=[ - "--with-gcc=${stdenv.gcc}/bin/gcc" + "--with-gcc=${stdenv.cc}/bin/gcc" ]; # required, because otherwise all symbols from HSffi.o are stripped, and diff --git a/pkgs/development/compilers/ghc/7.0.3.nix b/pkgs/development/compilers/ghc/7.0.3.nix index c8d4b264804..b2040751370 100644 --- a/pkgs/development/compilers/ghc/7.0.3.nix +++ b/pkgs/development/compilers/ghc/7.0.3.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { ''; configureFlags=[ - "--with-gcc=${stdenv.gcc}/bin/gcc" + "--with-gcc=${stdenv.cc}/bin/gcc" ]; # required, because otherwise all symbols from HSffi.o are stripped, and diff --git a/pkgs/development/compilers/ghc/7.0.4-binary.nix b/pkgs/development/compilers/ghc/7.0.4-binary.nix index 2c9b11f2b65..1fedfaedf51 100644 --- a/pkgs/development/compilers/ghc/7.0.4-binary.nix +++ b/pkgs/development/compilers/ghc/7.0.4-binary.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { # find editline/gmp. (if stdenv.isLinux then '' find . -type f -perm +100 \ - -exec patchelf --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \ + -exec patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ --set-rpath "${ncurses}/lib:${gmp}/lib" {} \; sed -i "s|/usr/bin/perl|perl\x00 |" ghc-${version}/ghc/stage2/build/tmp/ghc-stage2 sed -i "s|/usr/bin/gcc|gcc\x00 |" ghc-${version}/ghc/stage2/build/tmp/ghc-stage2 diff --git a/pkgs/development/compilers/ghc/7.0.4.nix b/pkgs/development/compilers/ghc/7.0.4.nix index ab69df12aa8..bcce5ec03ae 100644 --- a/pkgs/development/compilers/ghc/7.0.4.nix +++ b/pkgs/development/compilers/ghc/7.0.4.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { ''; configureFlags=[ - "--with-gcc=${stdenv.gcc}/bin/gcc" + "--with-gcc=${stdenv.cc}/bin/gcc" ]; NIX_CFLAGS_COMPILE = "-fomit-frame-pointer"; diff --git a/pkgs/development/compilers/ghc/7.2.1.nix b/pkgs/development/compilers/ghc/7.2.1.nix index 867df5aae6b..5a3af0f6492 100644 --- a/pkgs/development/compilers/ghc/7.2.1.nix +++ b/pkgs/development/compilers/ghc/7.2.1.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { ''; configureFlags=[ - "--with-gcc=${stdenv.gcc}/bin/gcc" + "--with-gcc=${stdenv.cc}/bin/gcc" ]; # required, because otherwise all symbols from HSffi.o are stripped, and diff --git a/pkgs/development/compilers/ghc/7.2.2.nix b/pkgs/development/compilers/ghc/7.2.2.nix index 7e714ae3b78..51d94af4051 100644 --- a/pkgs/development/compilers/ghc/7.2.2.nix +++ b/pkgs/development/compilers/ghc/7.2.2.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { ''; configureFlags=[ - "--with-gcc=${stdenv.gcc}/bin/gcc" + "--with-gcc=${stdenv.cc}/bin/gcc" ]; NIX_CFLAGS_COMPILE = "-fomit-frame-pointer"; diff --git a/pkgs/development/compilers/ghc/7.4.1.nix b/pkgs/development/compilers/ghc/7.4.1.nix index 95590518a28..f666299c5b0 100644 --- a/pkgs/development/compilers/ghc/7.4.1.nix +++ b/pkgs/development/compilers/ghc/7.4.1.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { ''; configureFlags=[ - "--with-gcc=${stdenv.gcc}/bin/gcc" + "--with-gcc=${stdenv.cc}/bin/gcc" ]; # required, because otherwise all symbols from HSffi.o are stripped, and diff --git a/pkgs/development/compilers/ghc/7.4.2-binary.nix b/pkgs/development/compilers/ghc/7.4.2-binary.nix index f6dc974227c..bc083fe7a82 100644 --- a/pkgs/development/compilers/ghc/7.4.2-binary.nix +++ b/pkgs/development/compilers/ghc/7.4.2-binary.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { # find editline/gmp. (if stdenv.isLinux then '' find . -type f -perm +100 \ - -exec patchelf --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \ + -exec patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ --set-rpath "${ncurses}/lib:${gmp}/lib" {} \; sed -i "s|/usr/bin/perl|perl\x00 |" ghc-${version}/ghc/stage2/build/tmp/ghc-stage2 sed -i "s|/usr/bin/gcc|gcc\x00 |" ghc-${version}/ghc/stage2/build/tmp/ghc-stage2 diff --git a/pkgs/development/compilers/ghc/7.4.2.nix b/pkgs/development/compilers/ghc/7.4.2.nix index 497a59e17fa..2f577f12bc4 100644 --- a/pkgs/development/compilers/ghc/7.4.2.nix +++ b/pkgs/development/compilers/ghc/7.4.2.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { ''; configureFlags=[ - "--with-gcc=${stdenv.gcc}/bin/gcc" + "--with-gcc=${stdenv.cc}/bin/gcc" ]; # required, because otherwise all symbols from HSffi.o are stripped, and diff --git a/pkgs/development/compilers/ghc/7.6.1.nix b/pkgs/development/compilers/ghc/7.6.1.nix index 5a63d30390d..8f1a6951966 100644 --- a/pkgs/development/compilers/ghc/7.6.1.nix +++ b/pkgs/development/compilers/ghc/7.6.1.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ''; configureFlags=[ - "--with-gcc=${stdenv.gcc}/bin/gcc" + "--with-gcc=${stdenv.cc}/bin/gcc" ]; # required, because otherwise all symbols from HSffi.o are stripped, and diff --git a/pkgs/development/compilers/ghc/7.6.2.nix b/pkgs/development/compilers/ghc/7.6.2.nix index 45f877ffc7c..d2ea2ebce05 100644 --- a/pkgs/development/compilers/ghc/7.6.2.nix +++ b/pkgs/development/compilers/ghc/7.6.2.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { ''; configureFlags = [ - "--with-gcc=${stdenv.gcc}/bin/gcc" + "--with-gcc=${stdenv.cc}/bin/gcc" ]; # required, because otherwise all symbols from HSffi.o are stripped, and diff --git a/pkgs/development/compilers/ghc/7.6.3.nix b/pkgs/development/compilers/ghc/7.6.3.nix index dc84446a276..9866ea38e86 100644 --- a/pkgs/development/compilers/ghc/7.6.3.nix +++ b/pkgs/development/compilers/ghc/7.6.3.nix @@ -41,7 +41,7 @@ in stdenv.mkDerivation rec { export NIX_LDFLAGS="$NIX_LDFLAGS -rpath $out/lib/ghc-${version}" ''; - configureFlags = "--with-gcc=${stdenv.gcc}/bin/gcc"; + configureFlags = "--with-gcc=${stdenv.cc}/bin/gcc"; postInstall = '' # ghci uses mmap with rwx protection at it implements dynamic diff --git a/pkgs/development/compilers/ghc/7.8.3-binary.nix b/pkgs/development/compilers/ghc/7.8.3-binary.nix index f2c65c6ad05..a84b03fa0dd 100644 --- a/pkgs/development/compilers/ghc/7.8.3-binary.nix +++ b/pkgs/development/compilers/ghc/7.8.3-binary.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { # find editline/gmp. (if stdenv.isLinux then '' find . -type f -perm +100 \ - -exec patchelf --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \ + -exec patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ --set-rpath "${ncurses}/lib:${gmp}/lib" {} \; sed -i "s|/usr/bin/perl|perl\x00 |" ghc-${version}/ghc/stage2/build/tmp/ghc-stage2 sed -i "s|/usr/bin/gcc|gcc\x00 |" ghc-${version}/ghc/stage2/build/tmp/ghc-stage2 diff --git a/pkgs/development/compilers/ghc/7.8.3.nix b/pkgs/development/compilers/ghc/7.8.4.nix similarity index 90% rename from pkgs/development/compilers/ghc/7.8.3.nix rename to pkgs/development/compilers/ghc/7.8.4.nix index 9f5fc4b4e50..ccc3f4c875b 100644 --- a/pkgs/development/compilers/ghc/7.8.3.nix +++ b/pkgs/development/compilers/ghc/7.8.4.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, ghc, perl, gmp, ncurses }: stdenv.mkDerivation rec { - version = "7.8.3"; + version = "7.8.4"; name = "ghc-${version}"; src = fetchurl { - url = "http://www.haskell.org/ghc/dist/7.8.3/${name}-src.tar.xz"; - sha256 = "0n5rhwl83yv8qm0zrbaxnyrf8x1i3b6si927518mwfxs96jrdkdh"; + url = "http://www.haskell.org/ghc/dist/7.8.4/${name}-src.tar.xz"; + sha256 = "1i4254akbb4ym437rf469gc0m40bxm31blp6s1z1g15jmnacs6f3"; }; buildInputs = [ ghc perl gmp ncurses ]; diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix index c50a79b8474..22f42bd90b5 100644 --- a/pkgs/development/compilers/ghc/head.nix +++ b/pkgs/development/compilers/ghc/head.nix @@ -1,32 +1,29 @@ { stdenv, fetchurl, ghc, perl, gmp, ncurses, happy, alex }: stdenv.mkDerivation rec { - version = "7.9.20141106"; + version = "7.9.20141217"; name = "ghc-${version}"; src = fetchurl { - url = "http://deb.haskell.org/dailies/2014-11-06/ghc_${version}.orig.tar.bz2"; - sha256 = "1si8wx8a2lrg5ba13vwpisssxa3rcxi5a7fqxhgapa8d2i2w7gaz"; + url = "http://deb.haskell.org/dailies/2014-12-17/ghc_${version}.orig.tar.bz2"; + sha256 = "1yfdi9r07aqbnv6xfdhs6cpj0y0yjdr03l5sa4dv0j1xs3lh1wkv"; }; - buildInputs = [ ghc perl gmp ncurses happy alex ]; - - enableParallelBuilding = true; - - buildMK = '' - libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-libraries="${gmp}/lib" - libraries/integer-gmp_CONFIGURE_OPTS += --configure-option=--with-gmp-includes="${gmp}/include" - DYNAMIC_BY_DEFAULT = NO - ''; + buildInputs = [ ghc perl ncurses happy alex ]; preConfigure = '' - echo "${buildMK}" > mk/build.mk + echo >mk/build.mk "DYNAMIC_BY_DEFAULT = NO" sed -i -e 's|-isysroot /Developer/SDKs/MacOSX10.5.sdk||' configure '' + stdenv.lib.optionalString (!stdenv.isDarwin) '' export NIX_LDFLAGS="$NIX_LDFLAGS -rpath $out/lib/ghc-${version}" ''; - configureFlags = "--with-gcc=${stdenv.gcc}/bin/gcc"; + configureFlags = [ + "--with-gcc=${stdenv.cc}/bin/cc" + "--with-gmp-includes=${gmp}/include" "--with-gmp-libraries=${gmp}/lib" + ]; + + enableParallelBuilding = true; # required, because otherwise all symbols from HSffi.o are stripped, and # that in turn causes GHCi to abort @@ -35,11 +32,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://haskell.org/ghc"; description = "The Glasgow Haskell Compiler"; - maintainers = [ - stdenv.lib.maintainers.marcweber - stdenv.lib.maintainers.andres - stdenv.lib.maintainers.simons - ]; + maintainers = with stdenv.lib.maintainers; [ marcweber andres simons ]; inherit (ghc.meta) license platforms; }; diff --git a/pkgs/development/compilers/gnatboot/default.nix b/pkgs/development/compilers/gnatboot/default.nix index 3cab8379720..b8e3c172739 100644 --- a/pkgs/development/compilers/gnatboot/default.nix +++ b/pkgs/development/compilers/gnatboot/default.nix @@ -21,8 +21,8 @@ stdenv.mkDerivation { cp -R * $out set +e for a in $out/bin/* ; do - patchelf --interpreter $(cat $NIX_GCC/nix-support/dynamic-linker) \ - --set-rpath $(cat $NIX_GCC/nix-support/orig-libc)/lib:$(cat $NIX_GCC/nix-support/orig-gcc)/lib64:$(cat $NIX_GCC/nix-support/orig-gcc)/lib $a + patchelf --interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ + --set-rpath $(cat $NIX_CC/nix-support/orig-libc)/lib:$(cat $NIX_CC/nix-support/orig-gcc)/lib64:$(cat $NIX_CC/nix-support/orig-gcc)/lib $a done set -e mv $out/bin/gnatgcc_2wrap $out/bin/gnatgcc diff --git a/pkgs/development/compilers/go/1.1.nix b/pkgs/development/compilers/go/1.1.nix index 14ea73c2384..11640f2393d 100644 --- a/pkgs/development/compilers/go/1.1.nix +++ b/pkgs/development/compilers/go/1.1.nix @@ -17,6 +17,8 @@ stdenv.mkDerivation { buildInputs = [ bison glibc bash makeWrapper ]; + NIX_CFLAGS_COMPILE = "-Wno-error=cpp"; + # I'm not sure what go wants from its 'src', but the go installation manual # describes an installation keeping the src. preUnpack = '' diff --git a/pkgs/development/compilers/go/1.2.nix b/pkgs/development/compilers/go/1.2.nix index 9f95ad59b77..a00fe734670 100644 --- a/pkgs/development/compilers/go/1.2.nix +++ b/pkgs/development/compilers/go/1.2.nix @@ -16,6 +16,8 @@ stdenv.mkDerivation { buildInputs = [ bison glibc bash makeWrapper ]; + NIX_CFLAGS_COMPILE = "-Wno-error=cpp"; + # I'm not sure what go wants from its 'src', but the go installation manual # describes an installation keeping the src. preUnpack = '' diff --git a/pkgs/development/compilers/go/1.3.nix b/pkgs/development/compilers/go/1.3.nix index 3c465c3471f..8f4bd50326d 100644 --- a/pkgs/development/compilers/go/1.3.nix +++ b/pkgs/development/compilers/go/1.3.nix @@ -1,7 +1,5 @@ { stdenv, lib, fetchurl, fetchhg, bison, glibc, bash, coreutils, makeWrapper, tzdata, iana_etc, perl }: -assert stdenv.gcc.gcc != null; - let loader386 = "${glibc}/lib/ld-linux.so.2"; loaderAmd64 = "${glibc}/lib/ld-linux-x86-64.so.2"; @@ -78,16 +76,16 @@ stdenv.mkDerivation { else throw "Unsupported system"; GOARM = stdenv.lib.optionalString (stdenv.system == "armv5tel-linux") "5"; GO386 = 387; # from Arch: don't assume sse2 on i686 - CGO_ENABLED = 1; + CGO_ENABLED = if stdenv.isDarwin then 0 else 1; installPhase = '' export CC=cc - + '' + stdenv.lib.optionalString (stdenv ? cc) '' # http://lists.science.uu.nl/pipermail/nix-dev/2013-October/011891.html # Fix for "libgcc_s.so.1 must be installed for pthread_cancel to work" # during tests: - export LD_LIBRARY_PATH="$(dirname $(echo ${stdenv.gcc.gcc}/lib/libgcc_s.so))" - + export LD_LIBRARY_PATH="$(dirname $(echo ${stdenv.cc.gcc}/lib/libgcc_s.so))" + '' + '' mkdir -p "$out/bin" export GOROOT="$(pwd)/" export GOBIN="$out/bin" diff --git a/pkgs/development/compilers/go/default.nix b/pkgs/development/compilers/go/default.nix index e289ce14ee1..b35159c10e7 100644 --- a/pkgs/development/compilers/go/default.nix +++ b/pkgs/development/compilers/go/default.nix @@ -60,6 +60,8 @@ stdenv.mkDerivation { else throw "Unsupported system"; GOARM = stdenv.lib.optionalString (stdenv.system == "armv5tel-linux") "5"; + NIX_CFLAGS_COMPILE = "-Wno-error=cpp"; + installPhase = '' mkdir -p "$out/bin" export GOROOT="$(pwd)/" diff --git a/pkgs/development/compilers/hhvm/3918a2ccceb98230ff517601ad60aa6bee36e2c4.patch b/pkgs/development/compilers/hhvm/3918a2ccceb98230ff517601ad60aa6bee36e2c4.patch new file mode 100644 index 00000000000..8ee5b31925f --- /dev/null +++ b/pkgs/development/compilers/hhvm/3918a2ccceb98230ff517601ad60aa6bee36e2c4.patch @@ -0,0 +1,40 @@ +From 3918a2ccceb98230ff517601ad60aa6bee36e2c4 Mon Sep 17 00:00:00 2001 +From: Alex Malyshev +Date: Tue, 28 Oct 2014 15:55:34 -0700 +Subject: [PATCH] Replace use of MAX macro with std::max in ZendPack + +Summary: This has randomly bitten me in open source builds. I intermittently get +an error saying that MAX isn't defined. + +Instead of trying to figure out what's going on, I'm just gonna switch +it to std::max. + +Reviewed By: @paulbiss + +Differential Revision: D1636740 +--- + hphp/runtime/base/zend-pack.cpp | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/hphp/runtime/base/zend-pack.cpp b/hphp/runtime/base/zend-pack.cpp +index d878ea4..c3ee14d 100644 +--- a/hphp/runtime/base/zend-pack.cpp ++++ b/hphp/runtime/base/zend-pack.cpp +@@ -21,6 +21,8 @@ + #include "hphp/runtime/base/builtin-functions.h" + #include "hphp/util/tiny-vector.h" + ++#include ++ + namespace HPHP { + + #define INC_OUTPUTPOS(a,b) \ +@@ -294,7 +296,7 @@ Variant ZendPack::pack(const String& fmt, const Array& argv) { + case 'a': + case 'A': + case 'Z': { +- int arg_cp = (code != 'Z') ? arg : MAX(0, arg - 1); ++ int arg_cp = (code != 'Z') ? arg : std::max(0, arg - 1); + memset(&output[outputpos], (code != 'A') ? '\0' : ' ', arg); + val = argv[currentarg++].toString(); + s = val.c_str(); diff --git a/pkgs/development/compilers/hhvm/8207a31c26cc42fee79363a14c4a8f4fcbfffe63.patch b/pkgs/development/compilers/hhvm/8207a31c26cc42fee79363a14c4a8f4fcbfffe63.patch new file mode 100644 index 00000000000..f7cf29b739f --- /dev/null +++ b/pkgs/development/compilers/hhvm/8207a31c26cc42fee79363a14c4a8f4fcbfffe63.patch @@ -0,0 +1,40 @@ +From 8207a31c26cc42fee79363a14c4a8f4fcbfffe63 Mon Sep 17 00:00:00 2001 +From: Jordan DeLong +Date: Mon, 6 Oct 2014 18:30:28 -0700 +Subject: [PATCH] Remove some MIN/MAX macro uses in the emitter + +Summary: has preferable type-safe versions that don't double-eval +their args. + +Reviewed By: @paulbiss + +Differential Revision: D1599803 +--- + hphp/compiler/analysis/emitter.cpp | 6 +++--- + hphp/util/compatibility.h | 4 ---- + 2 files changed, 3 insertions(+), 7 deletions(-) + +diff --git a/hphp/compiler/analysis/emitter.cpp b/hphp/compiler/analysis/emitter.cpp +index 321e637..b1d3f2d 100644 +--- a/hphp/compiler/analysis/emitter.cpp ++++ b/hphp/compiler/analysis/emitter.cpp +@@ -799,8 +799,8 @@ void SymbolicStack::push(char sym) { + if (sym != StackSym::W && sym != StackSym::K && sym != StackSym::L && + sym != StackSym::T && sym != StackSym::I && sym != StackSym::H) { + m_actualStack.push_back(m_symStack.size()); +- *m_actualStackHighWaterPtr = MAX(*m_actualStackHighWaterPtr, +- (int)m_actualStack.size()); ++ *m_actualStackHighWaterPtr = std::max(*m_actualStackHighWaterPtr, ++ (int)m_actualStack.size()); + } + m_symStack.push_back(SymEntry(sym)); + } +@@ -1010,7 +1010,7 @@ int SymbolicStack::sizeActual() const { + + void SymbolicStack::pushFDesc() { + m_fdescCount += kNumActRecCells; +- *m_fdescHighWaterPtr = MAX(*m_fdescHighWaterPtr, m_fdescCount); ++ *m_fdescHighWaterPtr = std::max(*m_fdescHighWaterPtr, m_fdescCount); + } + + void SymbolicStack::popFDesc() { diff --git a/pkgs/development/compilers/hhvm/default.nix b/pkgs/development/compilers/hhvm/default.nix index c48e6d5a81e..bc2629513a5 100644 --- a/pkgs/development/compilers/hhvm/default.nix +++ b/pkgs/development/compilers/hhvm/default.nix @@ -2,22 +2,28 @@ , libevent, gd, curl, libxml2, icu, flex, bison, openssl, zlib, php, re2c , expat, libcap, oniguruma, libdwarf, libmcrypt, tbb, gperftools, glog , bzip2, openldap, readline, libelf, uwimap, binutils, cyrus_sasl, pam, libpng -, libxslt, ocaml, freetype +, libxslt, ocaml, freetype, gdb }: stdenv.mkDerivation rec { name = "hhvm-${version}"; - version = "3.2.0"; + version = "3.3.0"; + # use git version since we need submodules src = fetchgit { url = "https://github.com/facebook/hhvm.git"; - rev = "01228273b8cf709aacbd3df1c51b1e690ecebac8"; - sha256 = "418d5a55ac4ba5335a42329ebfb7dd96fdb8d5edbc2700251c86e9fa2ae4a967"; + rev = "e0c98e21167b425dddf1fc9efe78c9f7a36db268"; + sha256 = "0s32v713xgf4iim1zb9sg08sg1r1fs49czar3jxajsi0dwc0lkj9"; fetchSubmodules = true; }; + patches = [ + ./3918a2ccceb98230ff517601ad60aa6bee36e2c4.patch + ./8207a31c26cc42fee79363a14c4a8f4fcbfffe63.patch + ]; + buildInputs = - [ cmake pkgconfig boost libunwind mariadb libmemcached pcre + [ cmake pkgconfig boost libunwind mariadb libmemcached pcre gdb libevent gd curl libxml2 icu flex bison openssl zlib php expat libcap oniguruma libdwarf libmcrypt tbb gperftools bzip2 openldap readline libelf uwimap binutils cyrus_sasl pam glog libpng libxslt ocaml @@ -34,7 +40,7 @@ stdenv.mkDerivation rec { # work around broken build system NIX_CFLAGS_COMPILE = "-I${freetype}/include/freetype2"; - patchPhase = '' + prePatch = '' substituteInPlace hphp/util/generate-buildinfo.sh \ --replace /bin/bash ${stdenv.shell} substituteInPlace ./configure \ diff --git a/pkgs/development/compilers/idris/wrapper.nix b/pkgs/development/compilers/idris/wrapper.nix index 2985b33c170..857a31f6d4a 100644 --- a/pkgs/development/compilers/idris/wrapper.nix +++ b/pkgs/development/compilers/idris/wrapper.nix @@ -1,4 +1,4 @@ -{ gmp, makeWrapper, gcc, runCommand, idris_plain, boehmgc}: +{ stdenv, gmp, makeWrapper, runCommand, idris_plain, boehmgc}: runCommand "idris-wrapper" {} '' source ${makeWrapper}/nix-support/setup-hook @@ -6,6 +6,6 @@ runCommand "idris-wrapper" {} '' ln -s ${idris_plain}/bin/idris $out/bin wrapProgram $out/bin/idris \ --suffix NIX_CFLAGS_COMPILE : '"-I${gmp}/include -L${gmp}/lib -L${boehmgc}/lib"' \ - --suffix PATH : ${gcc}/bin \ + --suffix PATH : ${stdenv.cc}/bin \ --suffix PATH : ${idris_plain}/bin '' diff --git a/pkgs/development/compilers/julia/0.2.1.nix b/pkgs/development/compilers/julia/0.2.1.nix index b701558efe0..78407f6b6c6 100644 --- a/pkgs/development/compilers/julia/0.2.1.nix +++ b/pkgs/development/compilers/julia/0.2.1.nix @@ -4,7 +4,7 @@ , tcl, tk, xproto, libX11, git, mpfr } : let - realGcc = stdenv.gcc.gcc; + realGcc = stdenv.cc.gcc; in stdenv.mkDerivation rec { pname = "julia"; diff --git a/pkgs/development/compilers/julia/0.3.3.nix b/pkgs/development/compilers/julia/0.3.3.nix index 10441fd785a..a8ad9d00aec 100644 --- a/pkgs/development/compilers/julia/0.3.3.nix +++ b/pkgs/development/compilers/julia/0.3.3.nix @@ -7,7 +7,7 @@ assert stdenv.isLinux; let - realGcc = stdenv.gcc.gcc; + realGcc = stdenv.cc.gcc; in stdenv.mkDerivation rec { pname = "julia"; @@ -108,7 +108,7 @@ stdenv.mkDerivation rec { patchShebangs . contrib - export PATH="$PATH:${stdenv.gcc.libc}/sbin" + export PATH="$PATH:${stdenv.cc.libc}/sbin" # ldconfig doesn't seem to ever work on NixOS; system-wide ldconfig cache # is probably not what we want anyway on non-NixOS diff --git a/pkgs/development/compilers/llvm/3.3/clang.nix b/pkgs/development/compilers/llvm/3.3/clang.nix index 262e0bff248..3282542ba3c 100644 --- a/pkgs/development/compilers/llvm/3.3/clang.nix +++ b/pkgs/development/compilers/llvm/3.3/clang.nix @@ -2,7 +2,7 @@ let version = "3.3"; - gccReal = if (stdenv.gcc.gcc or null) == null then stdenv.gcc else stdenv.gcc.gcc; + gccReal = if (stdenv.cc.gcc or null) == null then stdenv.cc else stdenv.cc.gcc; in stdenv.mkDerivation { @@ -11,15 +11,15 @@ stdenv.mkDerivation { buildInputs = [ perl llvm groff cmake libxml2 python ]; patches = [ ./clang-tablegen-dir.patch ] ++ - stdenv.lib.optional (stdenv.gcc.libc != null) ./clang-purity.patch; + stdenv.lib.optional (stdenv.cc.libc != null) ./clang-purity.patch; cmakeFlags = [ "-DCLANG_PATH_TO_LLVM_BUILD=${llvm}" "-DCMAKE_BUILD_TYPE=Release" "-DLLVM_TARGETS_TO_BUILD=all" "-DGCC_INSTALL_PREFIX=${gccReal}" - ] ++ stdenv.lib.optionals (stdenv.gcc.libc != null) [ - "-DC_INCLUDE_DIRS=${stdenv.gcc.libc}/include/" + ] ++ stdenv.lib.optionals (stdenv.cc.libc != null) [ + "-DC_INCLUDE_DIRS=${stdenv.cc.libc}/include/" ]; enableParallelBuilding = true; @@ -29,7 +29,7 @@ stdenv.mkDerivation { sha256 = "15mrvw43s4frk1j49qr4v5viq68h8qlf10qs6ghd6mrsmgj5vddi"; }; - passthru = { gcc = stdenv.gcc.gcc; }; + passthru = { gcc = stdenv.cc.gcc; }; meta = { homepage = http://clang.llvm.org/; diff --git a/pkgs/development/compilers/llvm/3.4/clang.nix b/pkgs/development/compilers/llvm/3.4/clang.nix index fc33a7809a6..a2358a6f0b7 100644 --- a/pkgs/development/compilers/llvm/3.4/clang.nix +++ b/pkgs/development/compilers/llvm/3.4/clang.nix @@ -1,9 +1,5 @@ { stdenv, fetch, cmake, libxml2, libedit, llvm, version, clang-tools-extra_src }: -# be sure not to rebuild clang on darwin; some packages request it specifically -# we need to fix those -assert stdenv.isDarwin -> stdenv.gcc.nativeTools; - stdenv.mkDerivation { name = "clang-${version}"; @@ -28,8 +24,8 @@ stdenv.mkDerivation { "-DCMAKE_CXX_FLAGS=-std=c++11" "-DCLANG_PATH_TO_LLVM_BUILD=${llvm}" ] ++ - (stdenv.lib.optional (stdenv.gcc.libc != null) "-DC_INCLUDE_DIRS=${stdenv.gcc.libc}/include") ++ - (stdenv.lib.optional (stdenv.gcc.gcc != null) "-DGCC_INSTALL_PREFIX=${stdenv.gcc.gcc}"); + (stdenv.lib.optional (stdenv.cc.libc != null) "-DC_INCLUDE_DIRS=${stdenv.cc.libc}/include") ++ + (stdenv.lib.optional (stdenv.cc.gcc != null) "-DGCC_INSTALL_PREFIX=${stdenv.cc.gcc}"); # Clang expects to find LLVMgold in its own prefix # Clang expects to find sanitizer libraries in its own prefix @@ -38,7 +34,7 @@ stdenv.mkDerivation { ln -sv ${llvm}/lib/clang/${version}/lib $out/lib/clang/${version}/ ''; - passthru.gcc = stdenv.gcc.gcc; + passthru.gcc = stdenv.cc.gcc; enableParallelBuilding = true; diff --git a/pkgs/development/compilers/mentor/default.nix b/pkgs/development/compilers/mentor/default.nix index b12a197451a..7ff013b2344 100644 --- a/pkgs/development/compilers/mentor/default.nix +++ b/pkgs/development/compilers/mentor/default.nix @@ -18,7 +18,7 @@ let tar --strip-components=1 -xjf "$src" -C "$out" # Patch binaries - interpreter="$(cat "$NIX_GCC"/nix-support/dynamic-linker)" + interpreter="$(cat "$NIX_CC"/nix-support/dynamic-linker)" for file in "$out"/bin/* "$out"/libexec/gcc/*/*/* "$out"/*/bin/*; do # Skip non-executable files case "$file" in diff --git a/pkgs/development/compilers/mozart/binary.nix b/pkgs/development/compilers/mozart/binary.nix index bcaf917b3c3..9868e8d92c3 100644 --- a/pkgs/development/compilers/mozart/binary.nix +++ b/pkgs/development/compilers/mozart/binary.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation { }; libPath = stdenv.lib.makeLibraryPath - [stdenv.gcc.gcc emacs tk tcl boost gmp]; + [stdenv.cc.gcc emacs tk tcl boost gmp]; builder = ./builder.sh; diff --git a/pkgs/development/compilers/mozart/builder.sh b/pkgs/development/compilers/mozart/builder.sh index 58fe9a8effe..75914121611 100644 --- a/pkgs/development/compilers/mozart/builder.sh +++ b/pkgs/development/compilers/mozart/builder.sh @@ -14,7 +14,7 @@ patchShebangs $out for f in $out/bin/*; do b=$(basename $f) if [ $b == "ozemulator" ] || [ $b == "ozwish" ]; then - patchelf --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \ + patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ --set-rpath $libPath \ $f continue; diff --git a/pkgs/development/compilers/opendylan/bin.nix b/pkgs/development/compilers/opendylan/bin.nix index 4f0a1bd0512..4d18b8d328d 100644 --- a/pkgs/development/compilers/opendylan/bin.nix +++ b/pkgs/development/compilers/opendylan/bin.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation { mkdir -p "$out" tar --strip-components=1 -xjf "$src" -C "$out" - interpreter="$(cat "$NIX_GCC"/nix-support/dynamic-linker)" + interpreter="$(cat "$NIX_CC"/nix-support/dynamic-linker)" for a in "$out"/bin/*; do patchelf --set-interpreter "$interpreter" "$a" patchelf --set-rpath "$out/lib:${boehmgc}/lib" "$a" diff --git a/pkgs/development/compilers/openjdk/default.nix b/pkgs/development/compilers/openjdk/default.nix index 6a07c7af69e..3c0ace0ac93 100644 --- a/pkgs/development/compilers/openjdk/default.nix +++ b/pkgs/development/compilers/openjdk/default.nix @@ -61,7 +61,12 @@ stdenv.mkDerivation rec { makeFlagsArray+=(CUPS_HEADERS_PATH=$cupsDir) ''; - patches = [ ./cppflags-include-fix.patch ./fix-java-home.patch ./paxctl.patch ]; + patches = [ + ./cppflags-include-fix.patch + ./fix-java-home.patch + ./paxctl.patch + ./read-truststore-from-env.patch + ]; NIX_NO_SELF_RPATH = true; diff --git a/pkgs/development/compilers/openjdk/read-truststore-from-env.patch b/pkgs/development/compilers/openjdk/read-truststore-from-env.patch new file mode 100644 index 00000000000..8fb0f409d0a --- /dev/null +++ b/pkgs/development/compilers/openjdk/read-truststore-from-env.patch @@ -0,0 +1,21 @@ +diff -ur openjdk-7u65-b32/jdk/src/share/classes/sun/security/ssl/TrustManagerFactoryImpl.java openjdk-7u65-b32.new/jdk/src/share/classes/sun/security/ssl/TrustManagerFactoryImpl.java +--- openjdk-7u65-b32/jdk/src/share/classes/sun/security/ssl/TrustManagerFactoryImpl.java 2014-07-17 12:12:14.000000000 +0200 ++++ openjdk-7u65-b32.new/jdk/src/share/classes/sun/security/ssl/TrustManagerFactoryImpl.java 2014-12-09 13:31:27.821960372 +0100 +@@ -158,6 +158,7 @@ + /* + * Try: + * javax.net.ssl.trustStore (if this variable exists, stop) ++ * system environment variable JAVAX_NET_SSL_TRUSTSTORE + * jssecacerts + * cacerts + * +@@ -165,6 +166,9 @@ + */ + + storeFileName = props.get("trustStore"); ++ if (storeFileName == null) { ++ storeFileName = System.getenv("JAVAX_NET_SSL_TRUSTSTORE"); ++ } + if (!"NONE".equals(storeFileName)) { + if (storeFileName != null) { + storeFile = new File(storeFileName); diff --git a/pkgs/development/compilers/oraclejdk/dlj-bundle-builder.sh b/pkgs/development/compilers/oraclejdk/dlj-bundle-builder.sh index 028164ac395..56669ae0f2f 100644 --- a/pkgs/development/compilers/oraclejdk/dlj-bundle-builder.sh +++ b/pkgs/development/compilers/oraclejdk/dlj-bundle-builder.sh @@ -5,7 +5,7 @@ unzip ${src} || true # set the dynamic linker of unpack200, necessary for construct script echo "patching unpack200" -patchelf --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" --set-rpath "" */bin/unpack200 +patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" --set-rpath "" */bin/unpack200 echo "constructing JDK and JRE installations" if test -z "$installjdk"; then @@ -46,7 +46,7 @@ rpath=$rpath${rpath:+:}$jrePath/lib/$architecture/jli # set all the dynamic linkers find $out -type f -perm +100 \ - -exec patchelf --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \ + -exec patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ --set-rpath "$rpath" {} \; find $out -name "*.so" -exec patchelf --set-rpath "$rpath" {} \; diff --git a/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix b/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix index 657d18070e9..cabfaff7a1e 100644 --- a/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix +++ b/pkgs/development/compilers/oraclejdk/jdk-linux-base.nix @@ -143,7 +143,7 @@ let result = stdenv.mkDerivation rec { # set all the dynamic linkers find $out -type f -perm +100 \ - -exec patchelf --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \ + -exec patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ --set-rpath "$rpath" {} \; find $out -name "*.so" -exec patchelf --set-rpath "$rpath" {} \; @@ -173,8 +173,8 @@ let result = stdenv.mkDerivation rec { * libXt is only needed on amd64 */ libraries = - [stdenv.gcc.libc glib libxml2 libav_0_8 ffmpeg libxslt mesa_noglu xlibs.libXxf86vm alsaLib fontconfig freetype gnome.pango gnome.gtk cairo gdk_pixbuf atk] ++ - (if swingSupport then [xlibs.libX11 xlibs.libXext xlibs.libXtst xlibs.libXi xlibs.libXp xlibs.libXt xlibs.libXrender stdenv.gcc.gcc] else []); + [stdenv.cc.libc glib libxml2 libav_0_8 ffmpeg libxslt mesa_noglu xlibs.libXxf86vm alsaLib fontconfig freetype gnome.pango gnome.gtk cairo gdk_pixbuf atk] ++ + (if swingSupport then [xlibs.libX11 xlibs.libXext xlibs.libXtst xlibs.libXi xlibs.libXp xlibs.libXt xlibs.libXrender stdenv.cc.gcc] else []); passthru.mozillaPlugin = if installjdk then "/jre/lib/${architecture}/plugins" else "/lib/${architecture}/plugins"; diff --git a/pkgs/development/compilers/oraclejdk/jdk6-linux.nix b/pkgs/development/compilers/oraclejdk/jdk6-linux.nix index 9b384c5ae46..84fdf63f359 100644 --- a/pkgs/development/compilers/oraclejdk/jdk6-linux.nix +++ b/pkgs/development/compilers/oraclejdk/jdk6-linux.nix @@ -72,7 +72,7 @@ stdenv.mkDerivation { * libXt is only needed on amd64 */ libraries = - [stdenv.gcc.libc] ++ + [stdenv.cc.libc] ++ (if swingSupport then [xlibs.libX11 xlibs.libXext xlibs.libXtst xlibs.libXi xlibs.libXp xlibs.libXt] else []); inherit swingSupport pluginSupport architecture jce; diff --git a/pkgs/development/compilers/orc/default.nix b/pkgs/development/compilers/orc/default.nix index d654ebe6b0a..83255824ac2 100644 --- a/pkgs/development/compilers/orc/default.nix +++ b/pkgs/development/compilers/orc/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "orc-0.4.22"; + name = "orc-0.4.23"; src = fetchurl { url = "http://gstreamer.freedesktop.org/src/orc/${name}.tar.xz"; - sha256 = "0dgrbjm94y9l63s3srlddjcdxgrv6iazmvwh630jrw159dzhgjh4"; + sha256 = "1ryz1gfgrxcj806cakcblxf0bcwq8p2mw8k86fs3f5wlwayawzkn"; }; # building memcpy_speed.log diff --git a/pkgs/development/compilers/path64/default.nix b/pkgs/development/compilers/path64/default.nix index 9cc31537558..d6112dcdfc4 100644 --- a/pkgs/development/compilers/path64/default.nix +++ b/pkgs/development/compilers/path64/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { patchPhase = '' sed -i s,/usr/bin/ld,$(type -P ld), src/driver/phases.c - sed -i s,/lib64/ld-linux-x86-64.so.2,${stdenv.gcc.libc}/lib/ld-linux-x86-64.so.2, src/include/main_defs.h.in + sed -i s,/lib64/ld-linux-x86-64.so.2,${stdenv.cc.libc}/lib/ld-linux-x86-64.so.2, src/include/main_defs.h.in ''; cmakeFlags = '' @@ -22,7 +22,7 @@ stdenv.mkDerivation { -DPATH64_ENABLE_PSCRUNTIME=OFF -DPATH64_ENABLE_PROFILING=OFF -DPATH64_ENABLE_TARGETS=x8664 -DCMAKE_BUILD_TYPE=Debug -DPATH64_ENABLE_FORTRAN=OFF - -DPSC_CRT_PATH=${stdenv.gcc.libc}/lib + -DPSC_CRT_PATH=${stdenv.cc.libc}/lib ''; makeFlags = "-j4"; diff --git a/pkgs/development/compilers/rustc/0.12.nix b/pkgs/development/compilers/rustc/0.12.nix index d26e8ba4dda..43df15505c0 100644 --- a/pkgs/development/compilers/rustc/0.12.nix +++ b/pkgs/development/compilers/rustc/0.12.nix @@ -1,7 +1,5 @@ {stdenv, fetchurl, which, file, perl, curl, python27, makeWrapper}: -assert stdenv.gcc.gcc != null; - /* Rust's build process has a few quirks : - It requires some patched in llvm that haven't landed upstream, so it @@ -53,21 +51,22 @@ in stdenv.mkDerivation { mkdir -p "$out" cp -r bin "$out/bin" '' + (if stdenv.isLinux then '' - patchelf --interpreter "${stdenv.glibc}/lib/${stdenv.gcc.dynamicLinker}" \ - --set-rpath "${stdenv.gcc.gcc}/lib/:${stdenv.gcc.gcc}/lib64/" \ + patchelf --interpreter "${stdenv.glibc}/lib/${stdenv.cc.dynamicLinker}" \ + --set-rpath "${stdenv.cc.gcc}/lib/:${stdenv.cc.gcc}/lib64/" \ "$out/bin/rustc" '' else ""); }; - configureFlags = [ "--enable-local-rust" "--local-rust-root=$snapshot" ]; + configureFlags = [ "--enable-local-rust" "--local-rust-root=$snapshot" ] + ++ stdenv.lib.optional (stdenv.cc ? clang) "--enable-clang"; # The compiler requires cc, so we patch the source to tell it where to find it patches = [ ./hardcode_paths.patch ./local_stage0.patch ]; postPatch = '' substituteInPlace src/librustc/back/link.rs \ - --subst-var-by "ccPath" "${stdenv.gcc}/bin/cc" + --subst-var-by "ccPath" "${stdenv.cc}/bin/cc" substituteInPlace src/librustc_back/archive.rs \ - --subst-var-by "arPath" "${stdenv.gcc.binutils}/bin/ar" + --subst-var-by "arPath" "${stdenv.cc.binutils}/bin/ar" ''; buildInputs = [ which file perl curl python27 makeWrapper ]; diff --git a/pkgs/development/compilers/rustc/head.nix b/pkgs/development/compilers/rustc/head.nix index cc3fabb244e..20c21bec06f 100644 --- a/pkgs/development/compilers/rustc/head.nix +++ b/pkgs/development/compilers/rustc/head.nix @@ -1,9 +1,7 @@ { stdenv, fetchurl, fetchgit, which, file, perl, curl, python27, makeWrapper -, tzdata, git, valgrind +, tzdata, git, valgrind, procps, coreutils }: -assert stdenv.gcc.gcc != null; - /* Rust's build process has a few quirks : - It requires some patched in llvm that haven't landed upstream, so it @@ -18,19 +16,19 @@ assert stdenv.gcc.gcc != null; */ -with ((import ./common.nix) {inherit stdenv; version = "0.13.0-pre-1673-g3a325c6";}); +with ((import ./common.nix) {inherit stdenv; version = "0.13.0-pre-2604-g2f3cff6";}); let snapshot = if stdenv.system == "i686-linux" - then "c8342e762a1720be939ed7c6a39bdaa27892f66f" + then "3daf531aed03f5769402f2fef852377e2838db98" else if stdenv.system == "x86_64-linux" - then "7a7fe6f5ed47b9cc66261f880e166c7c8738b73e" + then "4f3c8b092dd4fe159d6f25a217cf62e0e899b365" else if stdenv.system == "i686-darwin" - then "63e8644512bd5665c14389a83d5af564c7c0b103" + then "2a3e647b9c400505bd49cfe56091e866c83574ca" else if stdenv.system == "x86_64-darwin" - then "7933ae0e974d1b897806138b7052cb2b4514585f" + then "5e730efc34d79a33f464a87686c10eace0760a2e" else abort "no-snapshot for platform ${stdenv.system}"; - snapshotDate = "2014-11-21"; - snapshotRev = "c9f6d69"; + snapshotDate = "2014-12-20"; + snapshotRev = "8443b09"; snapshotName = "rust-stage0-${snapshotDate}-${snapshotRev}-${platform}-${snapshot}.tar.bz2"; in stdenv.mkDerivation { @@ -40,8 +38,8 @@ in stdenv.mkDerivation { src = fetchgit { url = https://github.com/rust-lang/rust; - rev = "3a325c666d2cb7e297bf3057ff2442f96a79428b"; - sha256 = "0a0byglfaf0wfsnlm53vng1gqkkz4i29zphdwqg93v26mciqqc61"; + rev = "2f3cff6956d56048ef7afb6d33e17cbdb2dcf038"; + sha256 = "113y74sd1gr7f0xs1lsgjw3jkvhz8s4dxx34r9cxlw5vjr7fp066"; }; # We need rust to build rust. If we don't provide it, configure will try to download it. @@ -56,13 +54,14 @@ in stdenv.mkDerivation { mkdir -p "$out" cp -r bin "$out/bin" '' + (if stdenv.isLinux then '' - patchelf --interpreter "${stdenv.glibc}/lib/${stdenv.gcc.dynamicLinker}" \ - --set-rpath "${stdenv.gcc.gcc}/lib/:${stdenv.gcc.gcc}/lib64/" \ + patchelf --interpreter "${stdenv.glibc}/lib/${stdenv.cc.dynamicLinker}" \ + --set-rpath "${stdenv.cc.gcc}/lib/:${stdenv.cc.gcc}/lib64/" \ "$out/bin/rustc" '' else ""); }; - configureFlags = [ "--enable-local-rust" "--local-rust-root=$snapshot" ]; + configureFlags = [ "--enable-local-rust" "--local-rust-root=$snapshot" ] + ++ stdenv.lib.optional (stdenv.cc ? clang) "--enable-clang"; # The compiler requires cc, so we patch the source to tell it where to find it patches = [ ./hardcode_paths.HEAD.patch ./local_stage0.HEAD.patch ] @@ -70,12 +69,15 @@ in stdenv.mkDerivation { postPatch = '' substituteInPlace src/librustc_trans/back/link.rs \ - --subst-var-by "ccPath" "${stdenv.gcc}/bin/cc" + --subst-var-by "ccPath" "${stdenv.cc}/bin/cc" substituteInPlace src/librustc_back/archive.rs \ - --subst-var-by "arPath" "${stdenv.gcc.binutils}/bin/ar" + --subst-var-by "arPath" "${stdenv.cc.binutils}/bin/ar" + + substituteInPlace src/rust-installer/gen-install-script.sh \ + --replace /bin/echo "${coreutils}/bin/echo" ''; - buildInputs = [ which file perl curl python27 makeWrapper git valgrind ]; + buildInputs = [ which file perl curl python27 makeWrapper git valgrind procps ]; enableParallelBuilding = false; # disabled due to rust-lang/rust#16305 diff --git a/pkgs/development/compilers/sbcl/1.2.0.nix b/pkgs/development/compilers/sbcl/1.2.0.nix index c9d360f0ec5..a12e8c5ae9d 100644 --- a/pkgs/development/compilers/sbcl/1.2.0.nix +++ b/pkgs/development/compilers/sbcl/1.2.0.nix @@ -47,6 +47,9 @@ stdenv.mkDerivation rec { sed -e '5,$d' -i contrib/sb-bsd-sockets/tests.lisp sed -e '5,$d' -i contrib/sb-simple-streams/*test*.lisp + + # Use whatever `cc` the stdenv provides + substituteInPlace src/runtime/Config.x86-64-darwin --replace gcc cc ''; preBuild = '' diff --git a/pkgs/development/compilers/sbcl/default.nix b/pkgs/development/compilers/sbcl/default.nix index 17c0bed7caa..4ca477442a9 100644 --- a/pkgs/development/compilers/sbcl/default.nix +++ b/pkgs/development/compilers/sbcl/default.nix @@ -50,6 +50,9 @@ stdenv.mkDerivation rec { sed -e '5,$d' -i contrib/sb-bsd-sockets/tests.lisp sed -e '5,$d' -i contrib/sb-simple-streams/*test*.lisp + + # Use whatever `cc` the stdenv provides + substituteInPlace src/runtime/Config.x86-64-darwin --replace gcc cc ''; preBuild = '' diff --git a/pkgs/development/compilers/sdcc/default.nix b/pkgs/development/compilers/sdcc/default.nix index fe293fbc4b8..0650fae917a 100644 --- a/pkgs/development/compilers/sdcc/default.nix +++ b/pkgs/development/compilers/sdcc/default.nix @@ -16,6 +16,8 @@ stdenv.mkDerivation rec { ${if gputils == null then "--disable-pic14-port --disable-pic16-port" else ""} ''; + NIX_CFLAGS_COMPILE = "--std=c99"; # http://sourceforge.net/p/sdcc/code/9106/ + meta = with stdenv.lib; { description = "Small Device C Compiler"; longDescription = '' diff --git a/pkgs/development/compilers/tinycc/default.nix b/pkgs/development/compilers/tinycc/default.nix index bd71ab7b27f..c9378451d1f 100644 --- a/pkgs/development/compilers/tinycc/default.nix +++ b/pkgs/development/compilers/tinycc/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { ''; preConfigure = '' - configureFlagsArray+=("--elfinterp=$(cat $NIX_GCC/nix-support/dynamic-linker)") + configureFlagsArray+=("--elfinterp=$(cat $NIX_CC/nix-support/dynamic-linker)") configureFlagsArray+=("--crtprefix=${stdenv.glibc}/lib") configureFlagsArray+=("--sysincludepaths=${stdenv.glibc}/include:{B}/include") configureFlagsArray+=("--libpaths=${stdenv.glibc}/lib") diff --git a/pkgs/development/compilers/urweb/default.nix b/pkgs/development/compilers/urweb/default.nix index 01dbaee8cde..e6460b5d509 100644 --- a/pkgs/development/compilers/urweb/default.nix +++ b/pkgs/development/compilers/urweb/default.nix @@ -2,15 +2,15 @@ stdenv.mkDerivation rec { pname = "urweb"; - version = "20140830"; + version = "20141206"; name = "${pname}-${version}"; src = fetchurl { url = "http://www.impredicative.com/ur/${name}.tgz"; - sha256 = "0l4zhvdy2fdvhihyl4gl09v8q4w05b1k0c6h4k8281px96d5ljgr"; + sha256 = "077yakksxvdjlmwgc9wlz9jnkr345sikqjchvmxyv0axga5bw4rj"; }; - buildInputs = [ stdenv.gcc file openssl mlton mysql postgresql sqlite ]; + buildInputs = [ stdenv.cc file openssl mlton mysql postgresql sqlite ]; prePatch = '' sed -e 's@/usr/bin/file@${file}/bin/file@g' -i configure @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { preConfigure = '' - export CC="${stdenv.gcc}/bin/gcc"; + export CC="${stdenv.cc}/bin/gcc"; export CCARGS="-I$out/include \ -L${mysql}/lib/mysql -L${postgresql}/lib -L${sqlite}/lib"; diff --git a/pkgs/development/compilers/yasm/default.nix b/pkgs/development/compilers/yasm/default.nix index f752ad35a6d..738b63fe1ad 100644 --- a/pkgs/development/compilers/yasm/default.nix +++ b/pkgs/development/compilers/yasm/default.nix @@ -8,10 +8,10 @@ stdenv.mkDerivation rec { sha256 = "0gv0slmm0qpq91za3v2v9glff3il594x5xsrbgab7xcmnh0ndkix"; }; - meta = { + meta = with stdenv.lib; { homepage = http://www.tortall.net/projects/yasm/; description = "Complete rewrite of the NASM assembler"; - license = "BSD"; - platforms = stdenv.lib.platforms.unix; + license = licenses.bsd2; + platforms = platforms.unix; }; } diff --git a/pkgs/development/coq-modules/flocq/default.nix b/pkgs/development/coq-modules/flocq/default.nix index c26c22b0a6d..89555c2e13d 100644 --- a/pkgs/development/coq-modules/flocq/default.nix +++ b/pkgs/development/coq-modules/flocq/default.nix @@ -26,6 +26,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = http://flocq.gforge.inria.fr/; description = "Flocq (Floats for Coq) is a floating-point formalization for the Coq system"; + license = licenses.lgpl3; maintainers = with maintainers; [ jwiegley ]; platforms = coq.meta.platforms; }; diff --git a/pkgs/development/coq-modules/interval/default.nix b/pkgs/development/coq-modules/interval/default.nix new file mode 100644 index 00000000000..36533ab35d5 --- /dev/null +++ b/pkgs/development/coq-modules/interval/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchurl, which, coq, flocq, mathcomp }: + +stdenv.mkDerivation { + name = "coq-interval-${coq.coq-version}-2.0.0"; + + src = fetchurl { + url = https://gforge.inria.fr/frs/download.php/file/34294/interval-2.0.0.tar.gz; + sha256 = "0wx0z07nhx88hwl20icgb5w4mx6s5pn7mhzyx5jn8f7yl1m46ad2"; + }; + + nativeBuildInputs = [ which ]; + buildInputs = [ coq ]; + propagatedBuildInputs = [ flocq mathcomp ]; + + configurePhase = "./configure --libdir=$out/lib/coq/${coq.coq-version}/user-contrib/Interval"; + buildPhase = "./remake"; + installPhase = "./remake install"; + + meta = with stdenv.lib; { + homepage = http://coq-interval.gforge.inria.fr/; + description = "Tactics for simplifying the proofs of inequalities on expressions of real numbers for the Coq proof assistant"; + license = licenses.cecill-c; + maintainers = with maintainers; [ vbgl ]; + platforms = coq.meta.platforms; + }; +} diff --git a/pkgs/development/guile-modules/guile-lib/default.nix b/pkgs/development/guile-modules/guile-lib/default.nix index 2f77c273af7..25bdc64a8fe 100644 --- a/pkgs/development/guile-modules/guile-lib/default.nix +++ b/pkgs/development/guile-modules/guile-lib/default.nix @@ -1,6 +1,6 @@ {stdenv, fetchurl, guile, texinfo}: -assert stdenv ? gcc && stdenv.gcc ? gcc && stdenv.gcc.gcc != null; +assert stdenv ? cc && stdenv.cc ? gcc && stdenv.cc.gcc != null; stdenv.mkDerivation rec { name = "guile-lib-0.2.2"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { preCheck = # Make `libgcc_s.so' visible for `pthread_cancel'. - '' export LD_LIBRARY_PATH="$(dirname $(echo ${stdenv.gcc.gcc}/lib*/libgcc_s.so)):$LD_LIBRARY_PATH" + '' export LD_LIBRARY_PATH="$(dirname $(echo ${stdenv.cc.gcc}/lib*/libgcc_s.so)):$LD_LIBRARY_PATH" ''; meta = { diff --git a/pkgs/development/interpreters/dart/default.nix b/pkgs/development/interpreters/dart/default.nix index d775b74c903..f51ac1cdddf 100644 --- a/pkgs/development/interpreters/dart/default.nix +++ b/pkgs/development/interpreters/dart/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation { mkdir -p $out cp -R * $out/ echo $libPath - patchelf --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \ + patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ --set-rpath $libPath \ $out/bin/dart @@ -33,7 +33,7 @@ stdenv.mkDerivation { sha256 = "00935c4vxfj2h3x354g75qdazswwissbwc7kj5k05l1m3lizikf6"; }; - libPath = stdenv.lib.makeLibraryPath [ stdenv.gcc.gcc ]; + libPath = stdenv.lib.makeLibraryPath [ stdenv.cc.gcc ]; dontStrip = true; } \ No newline at end of file diff --git a/pkgs/development/interpreters/erlang/R17.nix b/pkgs/development/interpreters/erlang/R17.nix index a7378e69c3a..667e513769b 100644 --- a/pkgs/development/interpreters/erlang/R17.nix +++ b/pkgs/development/interpreters/erlang/R17.nix @@ -10,11 +10,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "erlang-" + version + "${optionalString odbcSupport "-odbc"}"; - version = "17.3"; + version = "17.4"; src = fetchurl { url = "http://www.erlang.org/download/otp_src_${version}.tar.gz"; - sha256 = "1r3n7drzgmwcv46n4lzic9ki19psgx1vjgnmjp5g85k06kmh7gnl"; + sha256 = "0mhzfs64wa00g0bv9hwf0sbl8lgs83jj8cq9c3wg1iksmskfv0hd"; }; buildInputs = @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { postInstall = let manpages = fetchurl { url = "http://www.erlang.org/download/otp_doc_man_${version}.tar.gz"; - sha256 = "1dys0903snk0ppip8hfckfd656pl9z3s4vqqv3yk4i2rn30dmarz"; + sha256 = "0n4sczblx8mjcck56rpxvyvz186hkzg0c1xjqrnpnz1nkn7dn73c"; }; in '' ln -s $out/lib/erlang/lib/erl_interface*/bin/erl_call $out/bin/erl_call diff --git a/pkgs/development/interpreters/groovy/default.nix b/pkgs/development/interpreters/groovy/default.nix index 9a2bd0ff328..d271edfe207 100644 --- a/pkgs/development/interpreters/groovy/default.nix +++ b/pkgs/development/interpreters/groovy/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "groovy-${version}"; - version = "2.3.8"; + version = "2.3.9"; src = fetchurl { url = "http://dl.bintray.com/groovy/maven/groovy-binary-${version}.zip"; - sha256 = "0fgsn1s7vhxcrwb2wa6zvrdzff7zbb2s6f7xj6c9x7gl9mdfcwpn"; + sha256 = "1lk942v7gd3ism4cw8gqk9ndr6yjwkgxc55z7p366khiv8d4f608"; }; installPhase = '' diff --git a/pkgs/development/interpreters/j/default.nix b/pkgs/development/interpreters/j/default.nix index 9c09038051e..3668fedf051 100644 --- a/pkgs/development/interpreters/j/default.nix +++ b/pkgs/development/interpreters/j/default.nix @@ -37,14 +37,19 @@ rec { builtins.trace "assuming ${a.stdenv.system} is 32 bits" "32"; doBuildJ = a.fullDepEntry '' - sed -i bin/jconfig -e 's@bits=32@bits=${bits}@g; s@readline=0@readline=1@; s@LIBREADLINE=""@LIBREADLINE=" -lreadline "@' + sed -i bin/jconfig -e ' + s@bits=32@bits=${bits}@g; + s@readline=0@readline=1@; + s@LIBREADLINE=""@LIBREADLINE=" -lreadline "@; + s@-W1,soname,libj.so@-Wl,-soname,libj.so@ + ' sed -i bin/build_libj -e 's@>& make.txt@ 2>\&1 | tee make.txt@' touch *.c *.h - sh bin/build_jconsole - sh bin/build_libj - sh bin/build_defs - sh bin/build_tsdll + sh -o errexit bin/build_jconsole + sh -o errexit bin/build_libj + sh -o errexit bin/build_defs + sh -o errexit bin/build_tsdll sed -i j/bin/profile.ijs -e "s@userx=[.] *'.j'@userx=. '/.j'@; s@bin,'/profilex.ijs'@user,'/profilex.ijs'@ ; diff --git a/pkgs/development/interpreters/luajit/default.nix b/pkgs/development/interpreters/luajit/default.nix index 00c4ddc447f..f0d9d03991b 100644 --- a/pkgs/development/interpreters/luajit/default.nix +++ b/pkgs/development/interpreters/luajit/default.nix @@ -14,10 +14,12 @@ stdenv.mkDerivation rec { patchPhase = '' substituteInPlace Makefile \ --replace /usr/local $out - '' + stdenv.lib.optionalString (stdenv.gcc.libc != null) + + substituteInPlace src/Makefile --replace gcc cc + '' + stdenv.lib.optionalString (stdenv.cc.libc != null) '' substituteInPlace Makefile \ - --replace ldconfig ${stdenv.gcc.libc}/sbin/ldconfig + --replace ldconfig ${stdenv.cc.libc}/sbin/ldconfig ''; configurePhase = false; diff --git a/pkgs/development/interpreters/mujs/default.nix b/pkgs/development/interpreters/mujs/default.nix index 7ef475ddab8..e21216ffe5e 100644 --- a/pkgs/development/interpreters/mujs/default.nix +++ b/pkgs/development/interpreters/mujs/default.nix @@ -5,8 +5,8 @@ stdenv.mkDerivation rec { src = fetchgit { url = git://git.ghostscript.com/mujs.git; - rev = "6afabf445cad0dd9afbc1f5870dba730801f09c0"; - sha256 = "1afzmncw3jvfq6smhhhsi1ywfmdpxkjpzswb86pdmdh3p04g1r0n"; + rev = "9bc5fec0804381d59ef8dc62304ed6892fb7c4ca"; + sha256 = "0ba6p92ygcssfzd4ij89vilfr2kwql2d1jpyqxflh5wyh1i92wjl"; }; buildInputs = [ clang ]; diff --git a/pkgs/development/interpreters/perl/5.14/default.nix b/pkgs/development/interpreters/perl/5.14/default.nix deleted file mode 100644 index dd4e7acf71f..00000000000 --- a/pkgs/development/interpreters/perl/5.14/default.nix +++ /dev/null @@ -1,64 +0,0 @@ -{ stdenv, fetchurl }: - -let - - libc = if stdenv ? gcc && stdenv.gcc.libc != null then stdenv.gcc.libc else "/usr"; - -in - -stdenv.mkDerivation rec { - name = "perl-5.14.4"; - - src = fetchurl { - url = "mirror://cpan/src/${name}.tar.gz"; - sha256 = "1js47zzna3v38fjnirf2vq6y0rjp8m86ysj5vagzgkig956d8gw0"; - }; - - patches = - [ # Do not look in /usr etc. for dependencies. - ./no-sys-dirs.patch - ] - ++ stdenv.lib.optional stdenv.isSunOS ./ld-shared.patch - ++ stdenv.lib.optional stdenv.isDarwin ./no-libutil.patch; - - # Build a thread-safe Perl with a dynamic libperls.o. We need the - # "installstyle" option to ensure that modules are put under - # $out/lib/perl5 - this is the general default, but because $out - # contains the string "perl", Configure would select $out/lib. - # Miniperl needs -lm. perl needs -lrt. - configureFlags = - [ "-de" - "-Dcc=gcc" - "-Uinstallusrbinperl" - "-Dinstallstyle=lib/perl5" - "-Duseshrplib" - "-Dlocincpth=${libc}/include" - "-Dloclibpth=${libc}/lib" - ] - ++ stdenv.lib.optional (stdenv ? glibc) "-Dusethreads"; - - configureScript = "${stdenv.shell} ./Configure"; - - dontAddPrefix = true; - - enableParallelBuilding = true; - - preConfigure = - '' - configureFlags="$configureFlags -Dprefix=$out -Dman1dir=$out/share/man/man1 -Dman3dir=$out/share/man/man3" - - ${stdenv.lib.optionalString stdenv.isArm '' - configureFlagsArray=(-Dldflags="-lm -lrt") - ''} - ''; - - preBuild = stdenv.lib.optionalString (!(stdenv ? gcc && stdenv.gcc.nativeTools)) - '' - # Make Cwd work on NixOS (where we don't have a /bin/pwd). - substituteInPlace dist/Cwd/Cwd.pm --replace "'/bin/pwd'" "'$(type -tP pwd)'" - ''; - - setupHook = ./setup-hook.sh; - - passthru.libPrefix = "lib/perl5/site_perl"; -} diff --git a/pkgs/development/interpreters/perl/5.14/ld-shared.patch b/pkgs/development/interpreters/perl/5.14/ld-shared.patch deleted file mode 100644 index b1834ff7a1f..00000000000 --- a/pkgs/development/interpreters/perl/5.14/ld-shared.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- perl-5.14.2/hints/solaris_2.sh.orig 2013-02-14 19:29:49.453988140 +0000 -+++ perl-5.14.2/hints/solaris_2.sh 2013-02-14 19:30:31.681631019 +0000 -@@ -568,7 +568,7 @@ - # ccflags="$ccflags -Wa,`getconf XBS5_LP64_OFF64_CFLAGS 2>/dev/null`" - # fi - ldflags="$ldflags -m64" -- lddlflags="$lddlflags -G -m64" -+ lddlflags="$lddlflags -shared -m64" - ;; - *) - getconfccflags="`getconf XBS5_LP64_OFF64_CFLAGS 2>/dev/null`" diff --git a/pkgs/development/interpreters/perl/5.14/no-libutil.patch b/pkgs/development/interpreters/perl/5.14/no-libutil.patch deleted file mode 100644 index 9b749bccf32..00000000000 --- a/pkgs/development/interpreters/perl/5.14/no-libutil.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ru -x '*~' perl-5.14.2-orig/Configure perl-5.14.2/Configure ---- perl-5.14.2-orig/Configure 2011-09-26 11:44:34.000000000 +0200 -+++ perl-5.14.2/Configure 2012-02-16 17:24:50.779839039 +0100 -@@ -1368,7 +1368,7 @@ - : List of libraries we want. - : If anyone needs extra -lxxx, put those in a hint file. - libswanted="sfio socket bind inet nsl nm ndbm gdbm dbm db malloc dl dld ld sun" --libswanted="$libswanted m crypt sec util c cposix posix ucb bsd BSD" -+libswanted="$libswanted m crypt sec c cposix posix ucb bsd BSD" - : We probably want to search /usr/shlib before most other libraries. - : This is only used by the lib/ExtUtils/MakeMaker.pm routine extliblist. - glibpth=`echo " $glibpth " | sed -e 's! /usr/shlib ! !'` diff --git a/pkgs/development/interpreters/perl/5.14/no-sys-dirs.patch b/pkgs/development/interpreters/perl/5.14/no-sys-dirs.patch deleted file mode 100644 index 54ffb28e206..00000000000 --- a/pkgs/development/interpreters/perl/5.14/no-sys-dirs.patch +++ /dev/null @@ -1,152 +0,0 @@ -diff -ru -x '*~' perl-5.14.2-orig/Configure perl-5.14.2/Configure ---- perl-5.14.2-orig/Configure 2011-09-26 11:44:34.000000000 +0200 -+++ perl-5.14.2/Configure 2012-01-20 17:05:23.089223129 +0100 -@@ -106,15 +106,7 @@ - fi - - : Proper PATH setting --paths='/bin /usr/bin /usr/local/bin /usr/ucb /usr/local /usr/lbin' --paths="$paths /opt/bin /opt/local/bin /opt/local /opt/lbin" --paths="$paths /usr/5bin /etc /usr/gnu/bin /usr/new /usr/new/bin /usr/nbin" --paths="$paths /opt/gnu/bin /opt/new /opt/new/bin /opt/nbin" --paths="$paths /sys5.3/bin /sys5.3/usr/bin /bsd4.3/bin /bsd4.3/usr/ucb" --paths="$paths /bsd4.3/usr/bin /usr/bsd /bsd43/bin /opt/ansic/bin /usr/ccs/bin" --paths="$paths /etc /usr/lib /usr/ucblib /lib /usr/ccs/lib" --paths="$paths /sbin /usr/sbin /usr/libexec" --paths="$paths /system/gnu_library/bin" -+paths='' - - for p in $paths - do -@@ -1311,8 +1303,7 @@ - archname='' - : Possible local include directories to search. - : Set locincpth to "" in a hint file to defeat local include searches. --locincpth="/usr/local/include /opt/local/include /usr/gnu/include" --locincpth="$locincpth /opt/gnu/include /usr/GNU/include /opt/GNU/include" -+locincpth="" - : - : no include file wanted by default - inclwanted='' -@@ -1328,17 +1319,12 @@ - archobjs='' - libnames='' - : change the next line if compiling for Xenix/286 on Xenix/386 --xlibpth='/usr/lib/386 /lib/386' -+xlibpth='' - : Possible local library directories to search. --loclibpth="/usr/local/lib /opt/local/lib /usr/gnu/lib" --loclibpth="$loclibpth /opt/gnu/lib /usr/GNU/lib /opt/GNU/lib" -+loclibpth="" - - : general looking path for locating libraries --glibpth="/lib /usr/lib $xlibpth" --glibpth="$glibpth /usr/ccs/lib /usr/ucblib /usr/local/lib" --test -f /usr/shlib/libc.so && glibpth="/usr/shlib $glibpth" --test -f /shlib/libc.so && glibpth="/shlib $glibpth" --test -d /usr/lib64 && glibpth="$glibpth /lib64 /usr/lib64 /usr/local/lib64" -+glibpth="" - - : Private path used by Configure to find libraries. Its value - : is prepended to libpth. This variable takes care of special -@@ -1371,8 +1357,6 @@ - libswanted="$libswanted m crypt sec util c cposix posix ucb bsd BSD" - : We probably want to search /usr/shlib before most other libraries. - : This is only used by the lib/ExtUtils/MakeMaker.pm routine extliblist. --glibpth=`echo " $glibpth " | sed -e 's! /usr/shlib ! !'` --glibpth="/usr/shlib $glibpth" - : Do not use vfork unless overridden by a hint file. - usevfork=false - -@@ -2380,7 +2364,6 @@ - zip - " - pth=`echo $PATH | sed -e "s/$p_/ /g"` --pth="$pth /lib /usr/lib" - for file in $loclist; do - eval xxx=\$$file - case "$xxx" in -@@ -4785,7 +4768,7 @@ - : Set private lib path - case "$plibpth" in - '') if ./mips; then -- plibpth="$incpath/usr/lib /usr/local/lib /usr/ccs/lib" -+ plibpth="$incpath/usr/lib" - fi;; - esac - case "$libpth" in -@@ -8390,13 +8373,8 @@ - echo " " - case "$sysman" in - '') -- syspath='/usr/share/man/man1 /usr/man/man1' -- syspath="$syspath /usr/man/mann /usr/man/manl /usr/man/local/man1" -- syspath="$syspath /usr/man/u_man/man1" -- syspath="$syspath /usr/catman/u_man/man1 /usr/man/l_man/man1" -- syspath="$syspath /usr/local/man/u_man/man1 /usr/local/man/l_man/man1" -- syspath="$syspath /usr/man/man.L /local/man/man1 /usr/local/man/man1" -- sysman=`./loc . /usr/man/man1 $syspath` -+ syspath='' -+ sysman='' - ;; - esac - if $test -d "$sysman"; then -@@ -19721,9 +19699,10 @@ - case "$full_ar" in - '') full_ar=$ar ;; - esac -+full_ar=ar - - : Store the full pathname to the sed program for use in the C program --full_sed=$sed -+full_sed=sed - - : see what type gids are declared as in the kernel - echo " " -diff -ru -x '*~' perl-5.14.2-orig/ext/Errno/Errno_pm.PL perl-5.14.2/ext/Errno/Errno_pm.PL ---- perl-5.14.2-orig/ext/Errno/Errno_pm.PL 2011-09-26 11:44:34.000000000 +0200 -+++ perl-5.14.2/ext/Errno/Errno_pm.PL 2012-01-20 17:02:07.938138311 +0100 -@@ -137,11 +137,7 @@ - if ($dep =~ /(\S+errno\.h)/) { - $file{$1} = 1; - } -- } elsif ($^O eq 'linux' && -- $Config{gccversion} ne '' && -- $Config{gccversion} !~ /intel/i -- # might be using, say, Intel's icc -- ) { -+ } elsif (0) { - # Some Linuxes have weird errno.hs which generate - # no #file or #line directives - my $linux_errno_h = -e '/usr/include/errno.h' ? -diff -ru -x '*~' perl-5.14.2-orig/hints/freebsd.sh perl-5.14.2/hints/freebsd.sh ---- perl-5.14.2-orig/hints/freebsd.sh 2011-09-19 15:18:22.000000000 +0200 -+++ perl-5.14.2/hints/freebsd.sh 2012-01-20 17:10:37.267924044 +0100 -@@ -118,21 +118,21 @@ - objformat=`/usr/bin/objformat` - if [ x$objformat = xaout ]; then - if [ -e /usr/lib/aout ]; then -- libpth="/usr/lib/aout /usr/local/lib /usr/lib" -- glibpth="/usr/lib/aout /usr/local/lib /usr/lib" -+ libpth="" -+ glibpth="" - fi - lddlflags='-Bshareable' - else -- libpth="/usr/lib /usr/local/lib" -- glibpth="/usr/lib /usr/local/lib" -+ libpth="" -+ glibpth="" - ldflags="-Wl,-E " - lddlflags="-shared " - fi - cccdlflags='-DPIC -fPIC' - ;; - *) -- libpth="/usr/lib /usr/local/lib" -- glibpth="/usr/lib /usr/local/lib" -+ libpth="" -+ glibpth="" - ldflags="-Wl,-E " - lddlflags="-shared " - cccdlflags='-DPIC -fPIC' diff --git a/pkgs/development/interpreters/perl/5.14/setup-hook.sh b/pkgs/development/interpreters/perl/5.14/setup-hook.sh deleted file mode 100644 index a8656b8531d..00000000000 --- a/pkgs/development/interpreters/perl/5.14/setup-hook.sh +++ /dev/null @@ -1,5 +0,0 @@ -addPerlLibPath () { - addToSearchPath PERL5LIB $1/lib/perl5/site_perl -} - -envHooks+=(addPerlLibPath) diff --git a/pkgs/development/interpreters/perl/5.16/default.nix b/pkgs/development/interpreters/perl/5.16/default.nix index db9b821b888..9ed3aa54f51 100644 --- a/pkgs/development/interpreters/perl/5.16/default.nix +++ b/pkgs/development/interpreters/perl/5.16/default.nix @@ -2,7 +2,7 @@ let - libc = if stdenv.gcc.libc or null != null then stdenv.gcc.libc else "/usr"; + libc = if stdenv.cc.libc or null != null then stdenv.cc.libc else "/usr"; in @@ -60,7 +60,7 @@ stdenv.mkDerivation rec { ''} ''; - preBuild = lib.optionalString (!(stdenv ? gcc && stdenv.gcc.nativeTools)) + preBuild = lib.optionalString (!(stdenv ? cc && stdenv.cc.nativeTools)) '' # Make Cwd work on NixOS (where we don't have a /bin/pwd). substituteInPlace dist/Cwd/Cwd.pm --replace "'/bin/pwd'" "'$(type -tP pwd)'" diff --git a/pkgs/development/interpreters/perl/5.20/default.nix b/pkgs/development/interpreters/perl/5.20/default.nix index 66a9ca597a4..4ec1f08f15d 100644 --- a/pkgs/development/interpreters/perl/5.20/default.nix +++ b/pkgs/development/interpreters/perl/5.20/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, enableThreading ? true }: +{ stdenv, fetchurl, enableThreading ? stdenv ? glibc }: # We can only compile perl with threading on platforms where we have a # real glibc in the stdenv. @@ -14,7 +14,7 @@ assert enableThreading -> (stdenv ? glibc); let - libc = if stdenv.gcc.libc or null != null then stdenv.gcc.libc else "/usr"; + libc = if stdenv.cc.libc or null != null then stdenv.cc.libc else "/usr"; in @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { # Miniperl needs -lm. perl needs -lrt. configureFlags = [ "-de" - "-Dcc=gcc" + "-Dcc=cc" "-Uinstallusrbinperl" "-Dinstallstyle=lib/perl5" "-Duseshrplib" @@ -68,7 +68,7 @@ stdenv.mkDerivation rec { ''} ''; - preBuild = optionalString (!(stdenv ? gcc && stdenv.gcc.nativeTools)) + preBuild = optionalString (!(stdenv ? cc && stdenv.cc.nativeTools)) '' # Make Cwd work on NixOS (where we don't have a /bin/pwd). substituteInPlace dist/PathTools/Cwd.pm --replace "'/bin/pwd'" "'$(type -tP pwd)'" diff --git a/pkgs/development/interpreters/php/5.3-freetype-dirs.patch b/pkgs/development/interpreters/php/5.3-freetype-dirs.patch deleted file mode 100644 index 3b78f9b309b..00000000000 --- a/pkgs/development/interpreters/php/5.3-freetype-dirs.patch +++ /dev/null @@ -1,64 +0,0 @@ -From a0955f351c7eb1022da7ae36970ffef3b00c8aff Mon Sep 17 00:00:00 2001 -From: Adam Harvey -Date: Sat, 7 Dec 2013 19:39:40 -0800 -Subject: [PATCH] Switch to using freetype-config for freetype detection. - -This fixes GD compilation against libfreetype 2.5.1 and later after they made -the rather interesting decision to change their include directory layout in a -point release. - -The original suggestion in the bug was to use pkg-config, but my inclination is -to use freetype-config instead: we should be able to get the same configuration -information without actually needing pkg-config installed, since pkg-config is -by no means guaranteed to exist on many Unices and distros, whereas -freetype-config should always be present if a libfreetype build environment is -installed. Let's try it out and see what happens. - -Fixes bug #64405 (Use freetype-config for determining freetype2 dir(s)). - -diff --git a/ext/gd/config.m4 b/ext/gd/config.m4 -index 0e35ece..732e14c 100644 ---- a/ext/gd/config.m4 -+++ b/ext/gd/config.m4 -@@ -193,30 +193,25 @@ AC_DEFUN([PHP_GD_FREETYPE2],[ - if test "$PHP_FREETYPE_DIR" != "no"; then - - for i in $PHP_FREETYPE_DIR /usr/local /usr; do -- if test -f "$i/include/freetype2/freetype/freetype.h"; then -+ if test -f "$i/bin/freetype-config"; then - FREETYPE2_DIR=$i -- FREETYPE2_INC_DIR=$i/include/freetype2 -+ FREETYPE2_CONFIG="$i/bin/freetype-config" - break - fi - done - - if test -z "$FREETYPE2_DIR"; then -- AC_MSG_ERROR([freetype.h not found.]) -+ AC_MSG_ERROR([freetype-config not found.]) - fi - -- PHP_CHECK_LIBRARY(freetype, FT_New_Face, -- [ -- PHP_ADD_LIBRARY_WITH_PATH(freetype, $FREETYPE2_DIR/$PHP_LIBDIR, GD_SHARED_LIBADD) -- PHP_ADD_INCLUDE($FREETYPE2_DIR/include) -- PHP_ADD_INCLUDE($FREETYPE2_INC_DIR) -- AC_DEFINE(USE_GD_IMGSTRTTF, 1, [ ]) -- AC_DEFINE(HAVE_LIBFREETYPE,1,[ ]) -- AC_DEFINE(ENABLE_GD_TTF,1,[ ]) -- ],[ -- AC_MSG_ERROR([Problem with freetype.(a|so). Please check config.log for more information.]) -- ],[ -- -L$FREETYPE2_DIR/$PHP_LIBDIR -- ]) -+ FREETYPE2_CFLAGS=`$FREETYPE2_CONFIG --cflags` -+ FREETYPE2_LIBS=`$FREETYPE2_CONFIG --libs` -+ -+ PHP_EVAL_INCLINE($FREETYPE2_CFLAGS) -+ PHP_EVAL_LIBLINE($FREETYPE2_LIBS, GD_SHARED_LIBADD) -+ AC_DEFINE(USE_GD_IMGSTRTTF, 1, [ ]) -+ AC_DEFINE(HAVE_LIBFREETYPE,1,[ ]) -+ AC_DEFINE(ENABLE_GD_TTF,1,[ ]) - else - AC_MSG_RESULT([If configure fails try --with-freetype-dir=]) - fi diff --git a/pkgs/development/interpreters/php/5.3.nix b/pkgs/development/interpreters/php/5.3.nix deleted file mode 100644 index 4de87f20d8e..00000000000 --- a/pkgs/development/interpreters/php/5.3.nix +++ /dev/null @@ -1,245 +0,0 @@ -{ stdenv, fetchurl, composableDerivation, autoconf, automake, flex, bison -, apacheHttpd, mysql, libxml2, readline, zlib, curl, gd, postgresql, gettext -, openssl, pkgconfig, sqlite, config, libjpeg, libpng, freetype, libxslt -, libmcrypt, bzip2, icu, libssh2, makeWrapper, libiconvOrEmpty, libiconv, uwimap -, pam }: - -let - libmcryptOverride = libmcrypt.override { disablePosixThreads = true; }; -in - -composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed) version; in { - - version = "5.3.29"; - - name = "php-${version}"; - - enableParallelBuilding = true; - - buildInputs - = [ flex bison pkgconfig ] - ++ stdenv.lib.optionals stdenv.isDarwin [ libssh2 makeWrapper ]; - - # need to include the C++ standard library when compiling on darwin - NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isDarwin "-lstdc++"; - - # need to specify where the dylib for icu is stored - DYLD_LIBRARY_PATH = stdenv.lib.optionalString stdenv.isDarwin "${icu}/lib"; - - flags = { - - # much left to do here... - - # SAPI modules: - - apxs2 = { - configureFlags = ["--with-apxs2=${apacheHttpd}/bin/apxs"]; - buildInputs = [apacheHttpd]; - }; - - # Extensions - - curl = { - configureFlags = ["--with-curl=${curl}" "--with-curlwrappers"]; - buildInputs = [curl openssl]; - }; - - pcntl = { - configureFlags = [ "--enable-pcntl" ]; - }; - - zlib = { - configureFlags = ["--with-zlib=${zlib}"]; - buildInputs = [zlib]; - }; - - libxml2 = { - configureFlags - = [ "--with-libxml-dir=${libxml2}" ] - ++ stdenv.lib.optional (libiconvOrEmpty != []) - [ "--with-iconv=${libiconv}" ]; - buildInputs = [ libxml2 ] ++ libiconvOrEmpty; - }; - - readline = { - configureFlags = ["--with-readline=${readline}"]; - buildInputs = [ readline ]; - }; - - sqlite = { - configureFlags = ["--with-pdo-sqlite=${sqlite}"]; - buildInputs = [ sqlite ]; - }; - - postgresql = { - configureFlags = ["--with-pgsql=${postgresql}"]; - buildInputs = [ postgresql ]; - }; - - mysql = { - configureFlags = ["--with-mysql=${mysql}"]; - buildInputs = [ mysql ]; - }; - - mysqli = { - configureFlags = ["--with-mysqli=${mysql}/bin/mysql_config"]; - buildInputs = [ mysql]; - }; - - mysqli_embedded = { - configureFlags = ["--enable-embedded-mysqli"]; - depends = "mysqli"; - assertion = fixed.mysqliSupport; - }; - - pdo_mysql = { - configureFlags = ["--with-pdo-mysql=${mysql}"]; - buildInputs = [ mysql ]; - }; - - bcmath = { - configureFlags = ["--enable-bcmath"]; - }; - - gd = { - configureFlags = [ - "--with-gd=${gd}" - "--with-png-dir=${libpng}" - "--with-jpeg-dir=${libjpeg}" - ]; - buildInputs = [gd libpng libjpeg freetype]; - }; - - soap = { - configureFlags = ["--enable-soap"]; - }; - - sockets = { - configureFlags = ["--enable-sockets"]; - }; - - openssl = { - configureFlags = ["--with-openssl=${openssl}"]; - buildInputs = ["openssl"]; - }; - - mbstring = { - configureFlags = ["--enable-mbstring"]; - }; - - gettext = { - configureFlags = ["--with-gettext=${gettext}"]; - buildInputs = [gettext]; - }; - - imap = { - configureFlags = [ "--with-imap=${uwimap}" "--with-imap-ssl" ] - # uwimap builds with kerberos on darwin - ++ stdenv.lib.optional (stdenv.isDarwin) "--with-kerberos"; - buildInputs = [ uwimap openssl ] - ++ stdenv.lib.optional (!stdenv.isDarwin) pam; - }; - - intl = { - configureFlags = ["--enable-intl"]; - buildInputs = [icu]; - }; - - exif = { - configureFlags = ["--enable-exif"]; - }; - - xsl = { - configureFlags = ["--with-xsl=${libxslt}"]; - buildInputs = [libxslt]; - }; - - mcrypt = { - configureFlags = ["--with-mcrypt=${libmcrypt}"]; - buildInputs = [libmcryptOverride]; - }; - - bz2 = { - configureFlags = ["--with-bz2=${bzip2}"]; - buildInputs = [bzip2]; - }; - - zip = { - configureFlags = ["--enable-zip"]; - }; - - ftp = { - configureFlags = ["--enable-ftp"]; - }; - - fpm = { - configureFlags = ["--enable-fpm"]; - }; - }; - - cfg = { - apxs2Support = config.php.apxs2 or true; - bcmathSupport = config.php.bcmath or true; - bz2Support = config.php.bz2 or false; - curlSupport = config.php.curl or true; - exifSupport = config.php.exif or true; - ftpSupport = config.php.ftp or true; - fpmSupport = config.php.fpm or false; - gdSupport = config.php.gd or true; - gettextSupport = config.php.gettext or true; - imapSupport = config.php.imap or false; - intlSupport = config.php.intl or true; - libxml2Support = config.php.libxml2 or true; - mbstringSupport = config.php.mbstring or true; - mcryptSupport = config.php.mcrypt or false; - mysqlSupport = config.php.mysql or true; - mysqliSupport = config.php.mysqli or true; - opensslSupport = config.php.openssl or true; - pcntlSupport = config.php.pcntl or true; - pdo_mysqlSupport = config.php.pdo_mysql or true; - postgresqlSupport = config.php.postgresql or true; - readlineSupport = config.php.readline or true; - soapSupport = config.php.soap or true; - socketsSupport = config.php.sockets or true; - sqliteSupport = config.php.sqlite or true; - xslSupport = config.php.xsl or false; - zipSupport = config.php.zip or true; - zlibSupport = config.php.zlib or true; - }; - - configurePhase = '' - iniFile=$out/etc/php-recommended.ini - [[ -z "$libxml2" ]] || export PATH=$PATH:$libxml2/bin - ./configure --with-config-file-scan-dir=/etc --with-config-file-path=$out/etc --prefix=$out $configureFlags - echo configurePhase end - '' + stdenv.lib.optionalString stdenv.isDarwin '' - # don't build php.dSYM as the php binary - sed -i 's/EXEEXT = \.dSYM/EXEEXT =/' Makefile - ''; - - installPhase = '' - unset installPhase; installPhase; - cp php.ini-production $iniFile - '' + ( stdenv.lib.optionalString stdenv.isDarwin '' - for prog in $out/bin/*; do - wrapProgram "$prog" --prefix DYLD_LIBRARY_PATH : "$DYLD_LIBRARY_PATH" - done - '' ); - - src = fetchurl { - url = "http://www.php.net/distributions/php-${version}.tar.bz2"; - sha256 = "1480pfp4391byqzmvdmbxkdkqwdzhdylj63sfzrcgadjf9lwzqf4"; - name = "php-${version}.tar.bz2"; - }; - - meta = { - description = "An HTML-embedded scripting language"; - homepage = http://www.php.net/; - license = "PHP-3"; - maintainers = with stdenv.lib.maintainers; [ lovek323 ]; - platforms = stdenv.lib.platforms.unix; - }; - - patches = [ ./fix.patch ./5.3-freetype-dirs.patch ]; - -}) diff --git a/pkgs/development/interpreters/php/5.4.nix b/pkgs/development/interpreters/php/5.4.nix index c9a3ae61862..a5fbac680f9 100644 --- a/pkgs/development/interpreters/php/5.4.nix +++ b/pkgs/development/interpreters/php/5.4.nix @@ -41,10 +41,14 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed) }; curl = { - configureFlags = ["--with-curl=${curl}" "--with-curlwrappers"]; + configureFlags = ["--with-curl=${curl}"]; buildInputs = [curl openssl]; }; + curlWrappers = { + configureFlags = ["--with-curlwrappers"]; + }; + zlib = { configureFlags = ["--with-zlib=${zlib}"]; buildInputs = [zlib]; @@ -199,6 +203,7 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed) bcmathSupport = config.php.bcmath or true; socketsSupport = config.php.sockets or true; curlSupport = config.php.curl or true; + curlWrappersSupport = config.php.curlWrappers or false; gettextSupport = config.php.gettext or true; pcntlSupport = config.php.pcntl or true; postgresqlSupport = config.php.postgresql or true; @@ -243,7 +248,7 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed) src = fetchurl { url = "http://www.php.net/distributions/php-${version}.tar.bz2"; - sha256 = "0d425zxka3m1l0ygsls4r56qy374rf6skl4ggim0k2y1y08fmm2p"; + sha256 = "0svlp5alqvm3fxzf2044ygziacy2ks9vbrnimkpqnxqgrmjl5nwc"; }; meta = { diff --git a/pkgs/development/interpreters/pypy/2.4/default.nix b/pkgs/development/interpreters/pypy/2.4/default.nix index 31024b17925..c5d86766d1f 100644 --- a/pkgs/development/interpreters/pypy/2.4/default.nix +++ b/pkgs/development/interpreters/pypy/2.4/default.nix @@ -22,13 +22,13 @@ let }; buildInputs = [ bzip2 openssl pkgconfig pythonFull libffi ncurses expat sqlite tk tcl x11 libX11 makeWrapper ] - ++ stdenv.lib.optional (stdenv ? gcc && stdenv.gcc.libc != null) stdenv.gcc.libc + ++ stdenv.lib.optional (stdenv ? cc && stdenv.cc.libc != null) stdenv.cc.libc ++ stdenv.lib.optional zlibSupport zlib; C_INCLUDE_PATH = stdenv.lib.concatStringsSep ":" (map (p: "${p}/include") buildInputs); LIBRARY_PATH = stdenv.lib.concatStringsSep ":" (map (p: "${p}/lib") buildInputs); LD_LIBRARY_PATH = stdenv.lib.concatStringsSep ":" (map (p: "${p}/lib") - (stdenv.lib.filter (x : x.outPath != stdenv.gcc.libc.outPath or "") buildInputs)); + (stdenv.lib.filter (x : x.outPath != stdenv.cc.libc.outPath or "") buildInputs)); preConfigure = '' substituteInPlace Makefile \ @@ -72,8 +72,9 @@ let # disable test_os because test_urandom_failure fails # disable test_urllib2net and test_urllibnet because it requires networking (example.com) # disable test_zipfile64 because it randomly timeouts - # disable test_default_ciphers because of error message mismatch - ./pypy-c ./pypy/test_all.py --pypy=./pypy-c -k 'not (test_sqlite or test_default_ciphers or test_urllib2net or test_urllibnet or test_socket or test_os or test_shutil or test_mhlib or test_multiprocessing or test_zipfile64)' lib-python + # disable test_cpickle because timeouts + # disable test_ssl because no shared cipher' not found in '[Errno 1] error:14077410:SSL routines:SSL23_GET_SERVER_HELLO:sslv3 alert handshake failure + ./pypy-c ./pypy/test_all.py --pypy=./pypy-c -k 'not (test_ssl or test_cpickle or test_sqlite or test_urllib2net or test_urllibnet or test_socket or test_os or test_shutil or test_mhlib or test_multiprocessing or test_zipfile64)' lib-python ''; installPhase = '' diff --git a/pkgs/development/interpreters/python/2.6/default.nix b/pkgs/development/interpreters/python/2.6/default.nix index 3894f401d4a..d13fe9178bd 100644 --- a/pkgs/development/interpreters/python/2.6/default.nix +++ b/pkgs/development/interpreters/python/2.6/default.nix @@ -31,9 +31,9 @@ let for i in /usr /sw /opt /pkg; do substituteInPlace ./setup.py --replace $i /no-such-path done - '' + optionalString (stdenv ? gcc && stdenv.gcc.libc != null) '' + '' + optionalString (stdenv ? cc && stdenv.cc.libc != null) '' for i in Lib/plat-*/regen; do - substituteInPlace $i --replace /usr/include/ ${stdenv.gcc.libc}/include/ + substituteInPlace $i --replace /usr/include/ ${stdenv.cc.libc}/include/ done '' + optionalString stdenv.isCygwin '' # On Cygwin, `make install' tries to read this Makefile. @@ -44,7 +44,7 @@ let ''; buildInputs = - optional (stdenv ? gcc && stdenv.gcc.libc != null) stdenv.gcc.libc ++ + optional (stdenv ? cc && stdenv.cc.libc != null) stdenv.cc.libc ++ [ bzip2 openssl ]++ optionals includeModules [ db openssl ncurses gdbm readline x11 tcl tk sqlite ] ++ optional zlibSupport zlib; diff --git a/pkgs/development/interpreters/python/2.7/default.nix b/pkgs/development/interpreters/python/2.7/default.nix index 3201d7520d1..117d11f3052 100644 --- a/pkgs/development/interpreters/python/2.7/default.nix +++ b/pkgs/development/interpreters/python/2.7/default.nix @@ -7,11 +7,11 @@ with stdenv.lib; let majorVersion = "2.7"; - version = "${majorVersion}.8"; + version = "${majorVersion}.9"; src = fetchurl { url = "http://www.python.org/ftp/python/${version}/Python-${version}.tar.xz"; - sha256 = "0nh7d3dp75f1aj0pamn4hla8s0l7nbaq4a38brry453xrfh11ppd"; + sha256 = "05j9in7yygfgl6nml0rixfvj1bbip982w3l54q05f0vyx8a7xllh"; }; patches = @@ -27,9 +27,6 @@ let # patch python to put zero timestamp into pyc # if DETERMINISTIC_BUILD env var is set ./deterministic-build.patch - - # http://bugs.python.org/issue21963 - ./remove-avoid-daemon-thread-shutdown.patch ]; preConfigure = '' @@ -37,9 +34,9 @@ let for i in /usr /sw /opt /pkg; do substituteInPlace ./setup.py --replace $i /no-such-path done - '' + optionalString (stdenv ? gcc && stdenv.gcc.libc != null) '' + '' + optionalString (stdenv ? cc && stdenv.cc.libc != null) '' for i in Lib/plat-*/regen; do - substituteInPlace $i --replace /usr/include/ ${stdenv.gcc.libc}/include/ + substituteInPlace $i --replace /usr/include/ ${stdenv.cc.libc}/include/ done '' + optionalString stdenv.isCygwin '' # On Cygwin, `make install' tries to read this Makefile. @@ -50,7 +47,7 @@ let ''; buildInputs = - optional (stdenv ? gcc && stdenv.gcc.libc != null) stdenv.gcc.libc ++ + optional (stdenv ? cc && stdenv.cc.libc != null) stdenv.cc.libc ++ [ bzip2 openssl ] ++ optionals includeModules [ db openssl ncurses gdbm libX11 readline x11 tcl tk sqlite ] ++ optional zlibSupport zlib; diff --git a/pkgs/development/interpreters/python/2.7/remove-avoid-daemon-thread-shutdown.patch b/pkgs/development/interpreters/python/2.7/remove-avoid-daemon-thread-shutdown.patch deleted file mode 100644 index 650f276f08a..00000000000 --- a/pkgs/development/interpreters/python/2.7/remove-avoid-daemon-thread-shutdown.patch +++ /dev/null @@ -1,170 +0,0 @@ -changeset: 93046:61ad2208a5ce -branch: 2.7 -tag: tip -user: William A. Kennington III -date: Mon Oct 13 13:57:12 2014 -0700 -summary: Revert: 91229:7741d0dd66ca to fix i21963 - -diff -r ed4098380799 -r 61ad2208a5ce Include/pythonrun.h ---- a/Include/pythonrun.h Mon Oct 13 12:58:03 2014 -0700 -+++ b/Include/pythonrun.h Mon Oct 13 13:57:12 2014 -0700 -@@ -147,8 +147,6 @@ - PyAPI_FUNC(void) PyByteArray_Fini(void); - PyAPI_FUNC(void) _PyRandom_Fini(void); - --PyAPI_DATA(PyThreadState *) _Py_Finalizing; -- - /* Stuff with no proper home (yet) */ - PyAPI_FUNC(char *) PyOS_Readline(FILE *, FILE *, char *); - PyAPI_DATA(int) (*PyOS_InputHook)(void); -diff -r ed4098380799 -r 61ad2208a5ce Lib/test/test_threading.py ---- a/Lib/test/test_threading.py Mon Oct 13 12:58:03 2014 -0700 -+++ b/Lib/test/test_threading.py Mon Oct 13 13:57:12 2014 -0700 -@@ -700,49 +700,6 @@ - output = "end of worker thread\nend of main thread\n" - self.assertScriptHasOutput(script, output) - -- @unittest.skipIf(sys.platform in platforms_to_skip, "due to known OS bug") -- def test_6_daemon_threads(self): -- # Check that a daemon thread cannot crash the interpreter on shutdown -- # by manipulating internal structures that are being disposed of in -- # the main thread. -- script = """if True: -- import os -- import random -- import sys -- import time -- import threading -- -- thread_has_run = set() -- -- def random_io(): -- '''Loop for a while sleeping random tiny amounts and doing some I/O.''' -- while True: -- in_f = open(os.__file__, 'rb') -- stuff = in_f.read(200) -- null_f = open(os.devnull, 'wb') -- null_f.write(stuff) -- time.sleep(random.random() / 1995) -- null_f.close() -- in_f.close() -- thread_has_run.add(threading.current_thread()) -- -- def main(): -- count = 0 -- for _ in range(40): -- new_thread = threading.Thread(target=random_io) -- new_thread.daemon = True -- new_thread.start() -- count += 1 -- while len(thread_has_run) < count: -- time.sleep(0.001) -- # Trigger process shutdown -- sys.exit(0) -- -- main() -- """ -- rc, out, err = assert_python_ok('-c', script) -- self.assertFalse(err) -- - @unittest.skipUnless(hasattr(os, 'fork'), "needs os.fork()") - @unittest.skipIf(sys.platform in platforms_to_skip, "due to known OS bug") - def test_reinit_tls_after_fork(self): -diff -r ed4098380799 -r 61ad2208a5ce Misc/NEWS ---- a/Misc/NEWS Mon Oct 13 12:58:03 2014 -0700 -+++ b/Misc/NEWS Mon Oct 13 13:57:12 2014 -0700 -@@ -96,10 +96,6 @@ - - Issue #21831: Avoid integer overflow when large sizes and offsets are given to - the buffer type. - --- Issue #1856: Avoid crashes and lockups when daemon threads run while the -- interpreter is shutting down; instead, these threads are now killed when they -- try to take the GIL. -- - - Issue #19656: Running Python with the -3 option now also warns about - non-ascii bytes literals. - -diff -r ed4098380799 -r 61ad2208a5ce Python/ceval.c ---- a/Python/ceval.c Mon Oct 13 12:58:03 2014 -0700 -+++ b/Python/ceval.c Mon Oct 13 13:57:12 2014 -0700 -@@ -355,12 +355,6 @@ - if (interpreter_lock) { - int err = errno; - PyThread_acquire_lock(interpreter_lock, 1); -- /* _Py_Finalizing is protected by the GIL */ -- if (_Py_Finalizing && tstate != _Py_Finalizing) { -- PyThread_release_lock(interpreter_lock); -- PyThread_exit_thread(); -- assert(0); /* unreachable */ -- } - errno = err; - } - #endif -@@ -1024,13 +1018,6 @@ - /* Other threads may run now */ - - PyThread_acquire_lock(interpreter_lock, 1); -- -- /* Check if we should make a quick exit. */ -- if (_Py_Finalizing && _Py_Finalizing != tstate) { -- PyThread_release_lock(interpreter_lock); -- PyThread_exit_thread(); -- } -- - if (PyThreadState_Swap(tstate) != NULL) - Py_FatalError("ceval: orphan tstate"); - -diff -r ed4098380799 -r 61ad2208a5ce Python/pythonrun.c ---- a/Python/pythonrun.c Mon Oct 13 12:58:03 2014 -0700 -+++ b/Python/pythonrun.c Mon Oct 13 13:57:12 2014 -0700 -@@ -91,8 +91,6 @@ - int Py_NoUserSiteDirectory = 0; /* for -s and site.py */ - int Py_HashRandomizationFlag = 0; /* for -R and PYTHONHASHSEED */ - --PyThreadState *_Py_Finalizing = NULL; -- - - /* Hack to force loading of object files */ - int (*_PyOS_mystrnicmp_hack)(const char *, const char *, Py_ssize_t) = \ -@@ -165,7 +163,6 @@ - if (initialized) - return; - initialized = 1; -- _Py_Finalizing = NULL; - - if ((p = Py_GETENV("PYTHONDEBUG")) && *p != '\0') - Py_DebugFlag = add_flag(Py_DebugFlag, p); -@@ -425,16 +422,12 @@ - * the threads created via Threading. - */ - call_sys_exitfunc(); -+ initialized = 0; - - /* Get current thread state and interpreter pointer */ - tstate = PyThreadState_GET(); - interp = tstate->interp; - -- /* Remaining threads (e.g. daemon threads) will automatically exit -- after taking the GIL (in PyEval_RestoreThread()). */ -- _Py_Finalizing = tstate; -- initialized = 0; -- - /* Disable signal handling */ - PyOS_FiniInterrupts(); - -diff -r ed4098380799 -r 61ad2208a5ce Python/thread_pthread.h ---- a/Python/thread_pthread.h Mon Oct 13 12:58:03 2014 -0700 -+++ b/Python/thread_pthread.h Mon Oct 13 13:57:12 2014 -0700 -@@ -242,9 +242,9 @@ - PyThread_exit_thread(void) - { - dprintf(("PyThread_exit_thread called\n")); -- if (!initialized) -+ if (!initialized) { - exit(0); -- pthread_exit(0); -+ } - } - - #ifdef USE_SEMAPHORES - diff --git a/pkgs/development/interpreters/racket/default.nix b/pkgs/development/interpreters/racket/default.nix index b626c8a1539..af6cf4b1956 100644 --- a/pkgs/development/interpreters/racket/default.nix +++ b/pkgs/development/interpreters/racket/default.nix @@ -48,6 +48,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--enable-shared" "--enable-lt=${libtool}/bin/libtool" ]; NIX_LDFLAGS = "-lgcc_s"; + enableParallelBuilding = true; postInstall = '' for p in $(ls $out/bin/) ; do diff --git a/pkgs/development/interpreters/ruby/gem.nix b/pkgs/development/interpreters/ruby/gem.nix index 22801aa5b04..b5be8cf2b65 100644 --- a/pkgs/development/interpreters/ruby/gem.nix +++ b/pkgs/development/interpreters/ruby/gem.nix @@ -3,7 +3,7 @@ let gemDefaults = { name, basename, requiredGems, sha256, meta }: { - buildInputs = [rubygems ruby makeWrapper]; + buildInputs = [rubygems makeWrapper]; unpackPhase = ":"; configurePhase=":"; bulidPhase=":"; @@ -15,7 +15,8 @@ let name = "ruby-${name}"; - propagatedBuildInputs = requiredGems; + propagatedBuildInputs = requiredGems ++ [ruby]; + inherit meta; installPhase = '' diff --git a/pkgs/development/interpreters/ruby/generated.nix b/pkgs/development/interpreters/ruby/generated.nix index f3b47025547..d07a5e779d3 100644 --- a/pkgs/development/interpreters/ruby/generated.nix +++ b/pkgs/development/interpreters/ruby/generated.nix @@ -14,14 +14,14 @@ g: # Get dependencies from patched gems arel = g.arel_5_0_1_20140414130214; atoulme_Antwrap = g.atoulme_Antwrap_0_7_5; autotest_rails = g.autotest_rails_4_2_1; - aws_sdk = g.aws_sdk_1_59_0; - aws_sdk_v1 = g.aws_sdk_v1_1_59_0; + aws_sdk = g.aws_sdk_1_59_1; + aws_sdk_v1 = g.aws_sdk_v1_1_59_1; backports = g.backports_3_6_4; bitbucket_backup = g.bitbucket_backup_0_3_1; blankslate = g.blankslate_2_1_2_4; builder = g.builder_3_2_2; - buildr = g.buildr_1_4_20; - bundler = g.bundler_1_7_7; + buildr = g.buildr_1_4_21; + bundler = g.bundler_1_7_9; celluloid = g.celluloid_0_16_0; childprocess = g.childprocess_0_5_5; chronic = g.chronic_0_10_2; @@ -45,7 +45,7 @@ g: # Get dependencies from patched gems ethon = g.ethon_0_7_1; eventmachine = g.eventmachine_1_0_3; eventmachine_tail = g.eventmachine_tail_0_6_4; - excon = g.excon_0_41_0; + excon = g.excon_0_42_1; execjs = g.execjs_2_2_2; fakes3 = g.fakes3_0_1_6_1; faraday = g.faraday_0_9_0; @@ -57,8 +57,8 @@ g: # Get dependencies from patched gems gettext = g.gettext_3_1_4; gh = g.gh_0_13_2; gherkin = g.gherkin_2_12_2; - heroku = g.heroku_3_16_2; - heroku_api = g.heroku_api_0_3_20; + heroku = g.heroku_3_20_0; + heroku_api = g.heroku_api_0_3_21; highline = g.highline_1_6_21; hike = g.hike_1_2_3; hitimes = g.hitimes_1_2_2; @@ -70,8 +70,8 @@ g: # Get dependencies from patched gems jekyll_coffeescript = g.jekyll_coffeescript_1_0_1; jekyll_gist = g.jekyll_gist_1_1_0; jekyll_paginate = g.jekyll_paginate_1_1_0; - jekyll_sass_converter = g.jekyll_sass_converter_1_2_1; - jekyll_watch = g.jekyll_watch_1_1_2; + jekyll_sass_converter = g.jekyll_sass_converter_1_3_0; + jekyll_watch = g.jekyll_watch_1_2_0; jsduck = g.jsduck_5_3_4; json = g.json_1_8_1; json_pure = g.json_pure_1_8_0; @@ -89,7 +89,7 @@ g: # Get dependencies from patched gems mime_types = g.mime_types_2_4_3; mini_portile = g.mini_portile_0_6_1; minitar = g.minitar_0_5_4; - minitest = g.minitest_5_4_3; + minitest = g.minitest_5_5_0; multi_json = g.multi_json_1_10_1; multi_test = g.multi_test_0_1_1; multipart_post = g.multipart_post_2_0_0; @@ -98,7 +98,8 @@ g: # Get dependencies from patched gems net_http_pipeline = g.net_http_pipeline_1_0_1; net_sftp = g.net_sftp_2_1_2; net_ssh = g.net_ssh_2_9_1; - netrc = g.netrc_0_7_9; + netrc = g.netrc_0_10_1; + newrelic_plugin = g.newrelic_plugin_1_3_1; nix = g.nix_0_1_1; nokogiri = g.nokogiri_1_6_5; ntlm_http = g.ntlm_http_0_1_1; @@ -111,23 +112,25 @@ g: # Get dependencies from patched gems pry = g.pry_0_9_12_6; pusher_client = g.pusher_client_0_6_0; pygments_rb = g.pygments_rb_0_6_0; + rabbitmq_manager = g.rabbitmq_manager_0_1_0; rack = g.rack_1_5_2; rack_protection = g.rack_protection_1_5_3; rack_test = g.rack_test_0_6_2; rails = g.rails_4_1_8; railties = g.railties_4_1_8; - rake = g.rake_10_4_0; + rake = g.rake_10_4_2; rb_fsevent = g.rb_fsevent_0_9_4; rb_inotify = g.rb_inotify_0_9_5; rdiscount = g.rdiscount_2_1_7_1; - rdoc = g.rdoc_4_1_2; - redcarpet = g.redcarpet_3_2_1; + rdoc = g.rdoc_4_2_0; + redcarpet = g.redcarpet_3_2_2; + redis = g.redis_3_2_0; remote_syslog = g.remote_syslog_1_6_14; rest_client = g.rest_client_1_6_7; riemann_dash = g.riemann_dash_0_2_9; right_aws = g.right_aws_3_1_0; right_http_connection = g.right_http_connection_1_5_0; - rjb = g.rjb_1_5_1; + rjb = g.rjb_1_5_2; rkelly_remix = g.rkelly_remix_0_0_6; rmail = g.rmail_1_0_0; rspec = g.rspec_2_14_1; @@ -161,7 +164,7 @@ g: # Get dependencies from patched gems trollop = g.trollop_2_0; typhoeus = g.typhoeus_0_6_9; tzinfo = g.tzinfo_1_2_2; - uglifier = g.uglifier_2_5_3; + uglifier = g.uglifier_2_6_0; unf = g.unf_0_1_4; unf_ext = g.unf_ext_0_0_6; uuid = g.uuid_2_3_7; @@ -173,7 +176,7 @@ g: # Get dependencies from patched gems xml_simple = g.xml_simple_1_1_2; yajl_ruby = g.yajl_ruby_1_2_1; }; - gem_nix_args = [ ''autotest-rails'' ''aws-sdk'' ''bitbucket-backup'' ''buildr'' ''compass'' ''cucumber'' ''erubis'' ''execjs'' ''fakes3'' ''foreman'' ''gettext'' ''heroku'' ''iconv'' ''jekyll'' ''jsduck'' ''lockfile'' ''mechanize'' ''nix'' ''papertrail-cli'' ''rails'' ''rake'' ''rb-fsevent'' ''rdoc'' ''remote_syslog'' ''riemann-dash'' ''right_aws'' ''rmail'' ''sass'' ''selenium-webdriver'' ''sinatra-1.3.2'' ''taskjuggler'' ''terminal-notifier'' ''thin'' ''tmuxinator'' ''travis'' ''trollop'' ''uglifier'' ''uuid'' ''xapian-full'' ''xapian-ruby'' ''yajl-ruby'' ]; + gem_nix_args = [ ''autotest-rails'' ''aws-sdk'' ''bitbucket-backup'' ''buildr'' ''compass'' ''cucumber'' ''erubis'' ''execjs'' ''fakes3'' ''foreman'' ''gettext'' ''heroku'' ''iconv'' ''jekyll'' ''jsduck'' ''lockfile'' ''mechanize'' ''newrelic_plugin'' ''nix'' ''papertrail-cli'' ''rabbitmq_manager-0.1.0'' ''rails'' ''rake'' ''rb-fsevent'' ''rdoc'' ''redis'' ''remote_syslog'' ''riemann-dash'' ''right_aws'' ''rmail'' ''sass'' ''selenium-webdriver'' ''sinatra-1.3.2'' ''taskjuggler'' ''terminal-notifier'' ''thin'' ''tmuxinator'' ''travis'' ''trollop'' ''uglifier'' ''uuid'' ''xapian-full'' ''xapian-ruby'' ''yajl-ruby'' ]; gems = { ZenTest_4_11_0 = { basename = ''ZenTest''; @@ -269,7 +272,7 @@ installed versions.''; longDescription = ''A toolkit of support libraries and Ruby core extensions extracted from the Rails framework. Rich support for multibyte strings, internationalization, time zones, and testing.''; }; name = ''activesupport-4.1.8''; - requiredGems = [ g.i18n_0_6_11 g.json_1_8_1 g.tzinfo_1_2_2 g.minitest_5_4_3 g.thread_safe_0_3_4 ]; + requiredGems = [ g.i18n_0_6_11 g.json_1_8_1 g.tzinfo_1_2_2 g.minitest_5_5_0 g.thread_safe_0_3_4 ]; sha256 = ''012w64jqmkkhcah4rzmcmmd53ihrxdn81nifi6dgrg8i40cxqb8r''; }; addressable_2_3_6 = { @@ -313,17 +316,17 @@ database compatibility and query generation.''; == FEATURES/PROBLEMS: - Antwrap runs on the native Ruby interpreter via the RJB (Ruby Java Bridge gem) and on the JRuby interpreter. Antwrap is compatible with Ant versions 1.5.4, - 1.6.5 and 1.7.0. For more information, see the Project Info (http://rubyforge.org/projects/antwrap/) page. - + Antwrap runs on the native Ruby interpreter via the RJB (Ruby Java Bridge gem) and on the JRuby interpreter. Antwrap is compatible with Ant versions 1.5.4, + 1.6.5 and 1.7.0. For more information, see the Project Info (http://rubyforge.org/projects/antwrap/) page. + == SYNOPSIS: - Antwrap is a Ruby library that can be used to invoke Ant tasks. It is being used in the Buildr (http://incubator.apache.org/buildr/) project to execute - Ant (http://ant.apache.org/) tasks in a Java project. If you are tired of fighting with Ant or Maven XML files in your Java project, take some time to + Antwrap is a Ruby library that can be used to invoke Ant tasks. It is being used in the Buildr (http://incubator.apache.org/buildr/) project to execute + Ant (http://ant.apache.org/) tasks in a Java project. If you are tired of fighting with Ant or Maven XML files in your Java project, take some time to check out Buildr!''; }; name = ''atoulme-Antwrap-0.7.5''; - requiredGems = [ g.rjb_1_5_1 ]; + requiredGems = [ g.rjb_1_5_2 ]; sha256 = ''05s3iw44lqa81f8nfy5f0xjj808600h82zb9bsh46b9kcq2w2kmz''; }; autotest_rails_4_2_1 = { @@ -338,7 +341,7 @@ rails support and extra plugins for migrations and fixtures.''; requiredGems = [ g.ZenTest_4_11_0 ]; sha256 = ''1v1dm9zlhdlrxvk90zs8d439ldar674ix41s7pncddgyswcfgg5l''; }; - aws_sdk_1_59_0 = { + aws_sdk_1_59_1 = { basename = ''aws_sdk''; meta = { description = ''AWS SDK for Ruby V1''; @@ -347,11 +350,11 @@ rails support and extra plugins for migrations and fixtures.''; Use `aws-sdk-v1` if you want to load v1 and v2 of the Ruby SDK in the same application.''; }; - name = ''aws-sdk-1.59.0''; - requiredGems = [ g.aws_sdk_v1_1_59_0 ]; - sha256 = ''0vv3w326mz601970a16vbhmllfja1lk64a6dfb1lqrcx83g9v49f''; + name = ''aws-sdk-1.59.1''; + requiredGems = [ g.aws_sdk_v1_1_59_1 ]; + sha256 = ''1g20jj507l98x8nijfy3dwzmagr201rv1wy949bnh1y3hzs83dh4''; }; - aws_sdk_v1_1_59_0 = { + aws_sdk_v1_1_59_1 = { basename = ''aws_sdk_v1''; meta = { description = ''AWS SDK for Ruby V1''; @@ -360,9 +363,9 @@ application.''; Use `aws-sdk-v1` if you want to load v1 and v2 of the Ruby SDK in the same application.''; }; - name = ''aws-sdk-v1-1.59.0''; + name = ''aws-sdk-v1-1.59.1''; requiredGems = [ g.nokogiri_1_6_5 g.json_1_8_1 ]; - sha256 = ''1y07wbbxhhgl2j30mq7bs2hljfpjf0b38iaajlrzi93y577xwxfa''; + sha256 = ''0wxmzxaly1jkp694wshkyh7rg9lf6ai1amn6mj9ib8azxw7mgcsg''; }; backports_3_6_4 = { basename = ''backports''; @@ -412,7 +415,7 @@ simple to do. Currently the following builder objects are supported: requiredGems = [ ]; sha256 = ''14fii7ab8qszrvsvhz6z2z3i4dw0h41a62fjr2h1j8m41vbrmyv2''; }; - buildr_1_4_20 = { + buildr_1_4_21 = { basename = ''buildr''; meta = { description = ''Build like you code''; @@ -424,20 +427,20 @@ to do, and it takes care of the rest. But also something we can easily extend for those one-off tasks, with a language that's a joy to use. ''; }; - name = ''buildr-1.4.20''; - requiredGems = [ g.rake_0_9_2_2 g.builder_3_2_2 g.net_ssh_2_7_0 g.net_sftp_2_1_2 g.rubyzip_0_9_9 g.json_pure_1_8_0 g.hoe_3_7_1 g.rjb_1_4_9 g.atoulme_Antwrap_0_7_5 g.diff_lcs_1_2_4 g.rspec_expectations_2_14_3 g.rspec_mocks_2_14_3 g.rspec_core_2_14_5 g.rspec_2_14_1 g.xml_simple_1_1_2 g.minitar_0_5_4 g.bundler_1_7_7 g.orderedhash_0_0_6 ]; - sha256 = ''0x4ffblw7jg0z49ywfm5abfxgg23di3d661czndwi904cvmghrkv''; + name = ''buildr-1.4.21''; + requiredGems = [ g.rake_0_9_2_2 g.builder_3_2_2 g.net_ssh_2_7_0 g.net_sftp_2_1_2 g.rubyzip_0_9_9 g.json_pure_1_8_0 g.hoe_3_7_1 g.rjb_1_5_1 g.atoulme_Antwrap_0_7_5 g.diff_lcs_1_2_4 g.rspec_expectations_2_14_3 g.rspec_mocks_2_14_3 g.rspec_core_2_14_5 g.rspec_2_14_1 g.xml_simple_1_1_2 g.minitar_0_5_4 g.bundler_1_7_9 g.orderedhash_0_0_6 ]; + sha256 = ''0a7x5vckpy9f8fdvb1w4swl095g8pw1zim2a19f3bfz9g2nd37i2''; }; - bundler_1_7_7 = { + bundler_1_7_9 = { basename = ''bundler''; meta = { description = ''The best way to manage your application's dependencies''; homepage = ''http://bundler.io''; longDescription = ''Bundler manages an application's dependencies through its entire life, across many machines, systematically and repeatably''; }; - name = ''bundler-1.7.7''; + name = ''bundler-1.7.9''; requiredGems = [ ]; - sha256 = ''1911jd33nlzr89dapbkllxfwi63c06zg93cmwsx17l2hh5zzggdh''; + sha256 = ''1gd201rh17xykab9pbqp0dkxfm7b9jri02llyvmrc0c5bz2vhycm''; }; celluloid_0_16_0 = { basename = ''celluloid''; @@ -770,16 +773,16 @@ using TCP/IP, especially if custom protocols are required.''; requiredGems = [ g.eventmachine_1_0_3 ]; sha256 = ''1pvlb34vdzd81kf9f3xyibb4f55xjqm7lqqy28dgyci5cyv50y61''; }; - excon_0_41_0 = { + excon_0_42_1 = { basename = ''excon''; meta = { description = ''speed, persistence, http(s)''; homepage = ''https://github.com/excon/excon''; longDescription = ''EXtended http(s) CONnections''; }; - name = ''excon-0.41.0''; + name = ''excon-0.42.1''; requiredGems = [ ]; - sha256 = ''136cffvp65ng50idp323v1sdpydl16csf287ylanrvfv0nbmmhi0''; + sha256 = ''1za1jmp83149qmykih2bfgxlwyyz3hrpaq4kxww7467fvgwh58xj''; }; execjs_2_2_2 = { basename = ''execjs''; @@ -904,27 +907,27 @@ So you can use GNU gettext tools for maintaining. requiredGems = [ g.multi_json_1_10_1 ]; sha256 = ''1mxfgw15pii1jmq00xxbyp77v71mh3bp99ndgwzfwkxvbcisha25''; }; - heroku_3_16_2 = { + heroku_3_20_0 = { basename = ''heroku''; meta = { description = ''Client library and CLI to deploy apps on Heroku.''; homepage = ''http://heroku.com/''; longDescription = ''Client library and command-line tool to deploy and manage apps on Heroku.''; }; - name = ''heroku-3.16.2''; - requiredGems = [ g.heroku_api_0_3_20 g.launchy_2_4_3 g.netrc_0_7_9 g.rest_client_1_6_7 g.rubyzip_0_9_9 g.multi_json_1_10_1 ]; - sha256 = ''0p21qfcpkgf35s3hwpc94lrdib85rirsdl31nqsrw9wifjqiabc4''; + name = ''heroku-3.20.0''; + requiredGems = [ g.heroku_api_0_3_21 g.launchy_2_4_3 g.netrc_0_10_1 g.rest_client_1_6_7 g.rubyzip_0_9_9 g.multi_json_1_10_1 ]; + sha256 = ''0iw3x413sbc5a5f2r3aicdprghw3vnmj5lrbd9gdh9pm4v7saf8b''; }; - heroku_api_0_3_20 = { + heroku_api_0_3_21 = { basename = ''heroku_api''; meta = { description = ''Ruby Client for the Heroku API''; homepage = ''http://github.com/heroku/heroku.rb''; longDescription = ''Ruby Client for the Heroku API''; }; - name = ''heroku-api-0.3.20''; - requiredGems = [ g.excon_0_41_0 g.multi_json_1_10_1 ]; - sha256 = ''0c8dfjxzx3prgw7c3xmwzik268wziplv9jhzg0b70mpambvj0h18''; + name = ''heroku-api-0.3.21''; + requiredGems = [ g.excon_0_42_1 g.multi_json_1_10_1 ]; + sha256 = ''0f41zzx4sshpba5p013hmjmk7lxkk5dfasb292zvx1cfi4l60lwd''; }; highline_1_6_21 = { basename = ''highline''; @@ -980,7 +983,7 @@ below. For extra goodness, see: http://seattlerb.rubyforge.org/hoe/Hoe.pdf''; }; name = ''hoe-3.7.1''; - requiredGems = [ g.rake_10_4_0 ]; + requiredGems = [ g.rake_10_4_2 ]; sha256 = ''0lyrdbzxj4isxzyfp93w0q1g9sqw6grkjp91xirzlw1z1714qsw3''; }; http_cookie_1_0_2 = { @@ -1024,7 +1027,7 @@ For extra goodness, see: http://seattlerb.rubyforge.org/hoe/Hoe.pdf''; longDescription = ''Jekyll is a simple, blog aware, static site generator.''; }; name = ''jekyll-2.5.2''; - requiredGems = [ g.liquid_2_6_1 g.kramdown_1_5_0 g.mercenary_0_3_5 g.safe_yaml_1_0_4 g.colorator_0_1 g.pygments_rb_0_6_0 g.redcarpet_3_2_1 g.toml_0_1_2 g.jekyll_paginate_1_1_0 g.jekyll_gist_1_1_0 g.jekyll_coffeescript_1_0_1 g.jekyll_sass_converter_1_2_1 g.jekyll_watch_1_1_2 g.classifier_reborn_2_0_2 ]; + requiredGems = [ g.liquid_2_6_1 g.kramdown_1_5_0 g.mercenary_0_3_5 g.safe_yaml_1_0_4 g.colorator_0_1 g.pygments_rb_0_6_0 g.redcarpet_3_2_2 g.toml_0_1_2 g.jekyll_paginate_1_1_0 g.jekyll_gist_1_1_0 g.jekyll_coffeescript_1_0_1 g.jekyll_sass_converter_1_3_0 g.jekyll_watch_1_2_0 g.classifier_reborn_2_0_2 ]; sha256 = ''03ka7jcfk5byvphy5ks35w75i78ahshrrgm3zbnsxj8xvbxg9bgi''; }; jekyll_coffeescript_1_0_1 = { @@ -1057,25 +1060,25 @@ For extra goodness, see: http://seattlerb.rubyforge.org/hoe/Hoe.pdf''; requiredGems = [ ]; sha256 = ''0r7bcs8fq98zldih4787zk5i9w24nz5wa26m84ssja95n3sas2l8''; }; - jekyll_sass_converter_1_2_1 = { + jekyll_sass_converter_1_3_0 = { basename = ''jekyll_sass_converter''; meta = { description = ''A basic Sass converter for Jekyll.''; homepage = ''https://github.com/jekyll/jekyll-sass-converter''; }; - name = ''jekyll-sass-converter-1.2.1''; + name = ''jekyll-sass-converter-1.3.0''; requiredGems = [ g.sass_3_4_9 ]; - sha256 = ''1w221nzcpaqh2llflciwhbzw1sqxjavwwzbri9n4qkj057a73ar1''; + sha256 = ''1xqmlr87xmzpalf846gybkbfqkj48y3fva81r7c7175my9p4ykl1''; }; - jekyll_watch_1_1_2 = { + jekyll_watch_1_2_0 = { basename = ''jekyll_watch''; meta = { description = ''Rebuild your Jekyll site when a file changes with the `--watch` switch.''; homepage = ''https://github.com/jekyll/jekyll-watch''; }; - name = ''jekyll-watch-1.1.2''; + name = ''jekyll-watch-1.2.0''; requiredGems = [ g.listen_2_8_3 ]; - sha256 = ''0pgyl015akxslrj7d89gc0z61d6s7iqz5kiba5c4sal6vh0w5ckm''; + sha256 = ''0ivw66jww4wlw067pspapgd8ibw781xfwdi6r5mzswjz4nvyf056''; }; jsduck_5_3_4 = { basename = ''jsduck''; @@ -1316,7 +1319,7 @@ with some types added by the users of mime-types.''; requiredGems = [ ]; sha256 = ''1vpdjfmdq1yc4i620frfp9af02ia435dnpj8ybsd7dc3rypkvbka''; }; - minitest_5_4_3 = { + minitest_5_5_0 = { basename = ''minitest''; meta = { description = ''minitest provides a complete suite of testing facilities supporting TDD, BDD, mocking, and benchmarking''; @@ -1375,9 +1378,9 @@ classes, modules, inheritance, methods. This means you only have to learn ruby to use minitest and all of your regular OO practices like extract-method refactorings still apply.''; }; - name = ''minitest-5.4.3''; + name = ''minitest-5.5.0''; requiredGems = [ ]; - sha256 = ''1ws2cphg9jh45nrvs43s2ww5r14nb026bwlbwwpi0jz6qsqm86x4''; + sha256 = ''1kzq25l8fh2ngshlwy7k535ncb15n2piqmha86272frh71vw0xq2''; }; multi_json_1_10_1 = { basename = ''multi_json''; @@ -1506,16 +1509,27 @@ The server will respond in-order.''; requiredGems = [ ]; sha256 = ''1vscp4r58jisiigqc6d6752w19m1m6hmi3jkzmp3ydxai7h3jb2j''; }; - netrc_0_7_9 = { + netrc_0_10_1 = { basename = ''netrc''; meta = { description = ''Library to read and write netrc files.''; homepage = ''https://github.com/geemus/netrc''; longDescription = ''This library can read and update netrc files, preserving formatting including comments and whitespace.''; }; - name = ''netrc-0.7.9''; + name = ''netrc-0.10.1''; requiredGems = [ ]; - sha256 = ''11622ccf1gp1m0bkw6y1h5mgsajwszng4rhrfiii264gz4rhhwp5''; + sha256 = ''1f7ba1zadvydjh0vs16b0spsxpqq2y9jim4h38wahd3sqygiwifc''; + }; + newrelic_plugin_1_3_1 = { + basename = ''newrelic_plugin''; + meta = { + description = ''New Relic Ruby Plugin SDK''; + homepage = ''http://newrelic.com''; + longDescription = ''The New Relic Plugin Gem is used to send plugin data to New Relic from non-application sources.''; + }; + name = ''newrelic_plugin-1.3.1''; + requiredGems = [ g.json_1_8_1 ]; + sha256 = ''0vmm82mjb9spbs6sb9b94yk8b58dzhflzvgzpyhv7jb3rfdng7ak''; }; nix_0_1_1 = { basename = ''nix''; @@ -1650,6 +1664,17 @@ enough of it.''; requiredGems = [ g.yajl_ruby_1_1_0 g.posix_spawn_0_3_9 ]; sha256 = ''0jszj99cirbkxaqllbgnp9718v32xhvg08rfldvr10gy8i7bhy2s''; }; + rabbitmq_manager_0_1_0 = { + basename = ''rabbitmq_manager''; + meta = { + description = ''Ruby wrapper for RabbitMQ management HTTP API''; + homepage = ''https://github.com/carlhoerberg/rabbitmq_manager''; + longDescription = ''Ruby wrapper for RabbitMQ management HTTP API''; + }; + name = ''rabbitmq_manager-0.1.0''; + requiredGems = [ g.faraday_0_9_0 g.faraday_middleware_0_9_1 ]; + sha256 = ''0364ljnk9y13b7lj0i2mks62g6c9ywv4py4v17p6fzrfx693mmbc''; + }; rack_1_5_2 = { basename = ''rack''; meta = { @@ -1701,7 +1726,7 @@ request helpers feature.''; longDescription = ''Ruby on Rails is a full-stack web framework optimized for programmer happiness and sustainable productivity. It encourages beautiful code by favoring convention over configuration.''; }; name = ''rails-4.1.8''; - requiredGems = [ g.activesupport_4_1_8 g.actionpack_4_1_8 g.actionview_4_1_8 g.activemodel_4_1_8 g.activerecord_4_1_8 g.actionmailer_4_1_8 g.railties_4_1_8 g.bundler_1_7_7 g.sprockets_rails_2_2_2 ]; + requiredGems = [ g.activesupport_4_1_8 g.actionpack_4_1_8 g.actionview_4_1_8 g.activemodel_4_1_8 g.activerecord_4_1_8 g.actionmailer_4_1_8 g.railties_4_1_8 g.bundler_1_7_9 g.sprockets_rails_2_2_2 ]; sha256 = ''17ar4gvnvkcw233cn77x4ps3q6ln3i5kpbqwfa2hbi6s61na9x10''; }; railties_4_1_8 = { @@ -1712,7 +1737,7 @@ request helpers feature.''; longDescription = ''Rails internals: application bootup, plugins, generators, and rake tasks.''; }; name = ''railties-4.1.8''; - requiredGems = [ g.activesupport_4_1_8 g.actionpack_4_1_8 g.rake_10_4_0 g.thor_0_19_1 ]; + requiredGems = [ g.activesupport_4_1_8 g.actionpack_4_1_8 g.rake_10_4_2 g.thor_0_19_1 ]; sha256 = ''171h23zr4135qynz74n61zly2pr0pzvspdi48dwxvc9xrzgzhznm''; }; rake_0_9_2_2 = { @@ -1726,7 +1751,7 @@ request helpers feature.''; requiredGems = [ ]; sha256 = ''19n4qp5gzbcqy9ajh56kgwqv9p9w2hnczhyvaqz0nlvk9diyng6q''; }; - rake_10_4_0 = { + rake_10_4_2 = { basename = ''rake''; meta = { description = ''Rake is a Make-like program implemented in Ruby''; @@ -1754,9 +1779,9 @@ Rake has the following features: * Supports parallel execution of tasks.''; }; - name = ''rake-10.4.0''; + name = ''rake-10.4.2''; requiredGems = [ ]; - sha256 = ''0a10xzqc1lh6gjkajkslr0n40wjrniyiyzxkp9m5fc8wf7b74zw8''; + sha256 = ''1rn03rqlf1iv6n87a78hkda2yqparhhaivfjpizblmxvlw2hk5r8''; }; rb_fsevent_0_9_4 = { basename = ''rb_fsevent''; @@ -1790,7 +1815,7 @@ Rake has the following features: requiredGems = [ ]; sha256 = ''1g70vsgv7mdwcyk9rxja7wm4qqap67prqwkj335c460vlzs6pqii''; }; - rdoc_4_1_2 = { + rdoc_4_2_0 = { basename = ''rdoc''; meta = { description = ''RDoc produces HTML and command-line documentation for Ruby projects''; @@ -1799,20 +1824,34 @@ Rake has the following features: includes the +rdoc+ and +ri+ tools for generating and displaying documentation from the command-line.''; }; - name = ''rdoc-4.1.2''; + name = ''rdoc-4.2.0''; requiredGems = [ g.json_1_8_1 ]; - sha256 = ''0cqhjidw657d8irkypxsrv6dr4y9r8csg9inaq40c3iz110cc8w6''; + sha256 = ''1k4hfa26r06ib1sxcig67arphy0a07cywcpsl37v57d6hhsgw6rr''; }; - redcarpet_3_2_1 = { + redcarpet_3_2_2 = { basename = ''redcarpet''; meta = { description = ''Markdown that smells nice''; homepage = ''http://github.com/vmg/redcarpet''; longDescription = ''A fast, safe and extensible Markdown to (X)HTML parser''; }; - name = ''redcarpet-3.2.1''; + name = ''redcarpet-3.2.2''; requiredGems = [ ]; - sha256 = ''194gm78cj5kzy60yx8lng26rqgn1qyl4kxhvj60a3f7s1ymssnk7''; + sha256 = ''1yf93kxnyk8dy3cdzq1lbdv8f47svns0k042w81kn8ilj1w88zhg''; + }; + redis_3_2_0 = { + basename = ''redis''; + meta = { + description = ''A Ruby client library for Redis''; + homepage = ''https://github.com/redis/redis-rb''; + longDescription = '' A Ruby client that tries to match Redis' API one-to-one, while still + providing an idiomatic interface. It features thread-safety, + client-side sharding, pipelining, and an obsession for performance. +''; + }; + name = ''redis-3.2.0''; + requiredGems = [ ]; + sha256 = ''10h6a0dsh7yk1x6q6g75z5dlpbn8qg8z3wk9ymwqm3zv0r3himh6''; }; remote_syslog_1_6_14 = { basename = ''remote_syslog''; @@ -1914,18 +1953,6 @@ algorithm for low-level network errors. requiredGems = [ ]; sha256 = ''0shd8v24aqxdvim1gdqzwxpanjhfgkhdaw0m0lzz7sybkb02j8qf''; }; - rjb_1_4_9 = { - basename = ''rjb''; - meta = { - description = ''Ruby Java bridge''; - homepage = ''http://rjb.rubyforge.org/''; - longDescription = ''RJB is a bridge program that connect between Ruby and Java with Java Native Interface. -''; - }; - name = ''rjb-1.4.9''; - requiredGems = [ ]; - sha256 = ''062f7bjwz6iz6da49nzzbbx4xn8ahqqha2smqvqhbf0i7kd5v0yz''; - }; rjb_1_5_1 = { basename = ''rjb''; meta = { @@ -1938,6 +1965,18 @@ algorithm for low-level network errors. requiredGems = [ ]; sha256 = ''1mfmx80r00ka5zn4qa3bnwsvapsnn4g0xr13g1kf95f2fgymy0yv''; }; + rjb_1_5_2 = { + basename = ''rjb''; + meta = { + description = ''Ruby Java bridge''; + homepage = ''http://rjb.rubyforge.org/''; + longDescription = ''RJB is a bridge program that connect between Ruby and Java with Java Native Interface. +''; + }; + name = ''rjb-1.5.2''; + requiredGems = [ ]; + sha256 = ''1adg5bxdb7f95cw3mazj596d9zn2laz7l0wygcabkzrxbkbfif3r''; + }; rkelly_remix_0_0_6 = { basename = ''rkelly_remix''; meta = { @@ -2373,16 +2412,16 @@ specify.''; requiredGems = [ g.thread_safe_0_3_4 ]; sha256 = ''1c01p3kg6xvy1cgjnzdfq45fggbwish8krd0h864jvbpybyx7cgx''; }; - uglifier_2_5_3 = { + uglifier_2_6_0 = { basename = ''uglifier''; meta = { description = ''Ruby wrapper for UglifyJS JavaScript compressor''; homepage = ''http://github.com/lautis/uglifier''; longDescription = ''Uglifier minifies JavaScript files by wrapping UglifyJS to be accessible in Ruby''; }; - name = ''uglifier-2.5.3''; + name = ''uglifier-2.6.0''; requiredGems = [ g.execjs_2_2_2 g.json_1_8_1 ]; - sha256 = ''0rlx9nrcavpfffyacsrh7xyvz3adv7jvylz0sv0jnix1mj5rkpd9''; + sha256 = ''1lih36zfw8bclsbgrh2ai0b923716lv12qzpfd27i3889gfsq2xb''; }; unf_0_1_4 = { basename = ''unf''; diff --git a/pkgs/development/interpreters/scsh/default.nix b/pkgs/development/interpreters/scsh/default.nix index 010d7c504d3..98b4f55f79b 100644 --- a/pkgs/development/interpreters/scsh/default.nix +++ b/pkgs/development/interpreters/scsh/default.nix @@ -15,12 +15,12 @@ stdenv.mkDerivation { }; meta = { - description = "a Scheme shell"; + description = "A Scheme shell"; longDescription = '' SCSH is an implementation of the Scheme shell. It is implemented as a heap image which is interpreted by the Scheme 48 virtual machine. ''; homepage = http://www.scsh.net/; - license = "BSD"; + license = stdenv.lib.licenses.bsd3; }; } diff --git a/pkgs/development/interpreters/xulrunner/default.nix b/pkgs/development/interpreters/xulrunner/default.nix index 4dd1095c0ce..1f24b4dde54 100644 --- a/pkgs/development/interpreters/xulrunner/default.nix +++ b/pkgs/development/interpreters/xulrunner/default.nix @@ -7,7 +7,7 @@ , debugBuild ? false }: -assert stdenv.gcc ? libc && stdenv.gcc.libc != null; +assert stdenv.cc ? libc && stdenv.cc.libc != null; let version = firefox.version; in diff --git a/pkgs/development/libraries/afflib/default.nix b/pkgs/development/libraries/afflib/default.nix index d29349abe0c..c29512b86a0 100644 --- a/pkgs/development/libraries/afflib/default.nix +++ b/pkgs/development/libraries/afflib/default.nix @@ -3,13 +3,13 @@ }: stdenv.mkDerivation rec { - version = "3.7.5"; + version = "3.7.6"; name = "afflib-${version}"; src = fetchgit { url = "https://github.com/sshock/AFFLIBv3/"; rev = "refs/tags/v${version}"; - sha256 = "06dr3y6bd7vfjf0p9v85yp1xzg43x515zsa9587jcx7yy5h5ams5"; + sha256 = "11wpjbyja6cn0828sw3951s7dbly11abijk41my3cpy9wnvmiggh"; name = "afflib-${version}-checkout"; }; @@ -32,7 +32,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.bsdOriginal; maintainers = [ stdenv.lib.maintainers.raskin ]; inherit version; - downloadPage = "http://digitalcorpora.org/downloads/afflib/"; - updateWalker = true; + downloadPage = "https://github.com/sshock/AFFLIBv3/tags"; }; } diff --git a/pkgs/development/libraries/aterm/2.5.nix b/pkgs/development/libraries/aterm/2.5.nix index 10a22e00f65..ef53a76d20b 100644 --- a/pkgs/development/libraries/aterm/2.5.nix +++ b/pkgs/development/libraries/aterm/2.5.nix @@ -21,6 +21,8 @@ stdenv.mkDerivation { dontDisableStatic = true; + NIX_CFLAGS_COMPILE = "-D__USE_BSD"; + meta = { homepage = http://www.cwi.nl/htbin/sen1/twiki/bin/view/SEN1/ATerm; license = "LGPL"; diff --git a/pkgs/development/libraries/boringssl/default.nix b/pkgs/development/libraries/boringssl/default.nix index a4ea804b776..b2500d1f49b 100644 --- a/pkgs/development/libraries/boringssl/default.nix +++ b/pkgs/development/libraries/boringssl/default.nix @@ -12,6 +12,7 @@ stdenv.mkDerivation rec { buildInputs = [ cmake perl ]; enableParallelBuilding = true; + NIX_CFLAGS_COMPILE = "-Wno-error=cpp"; installPhase = '' mkdir -p $out/bin $out/include $out/lib diff --git a/pkgs/development/libraries/botan/generic.nix b/pkgs/development/libraries/botan/generic.nix index 3fe8d1da729..b4bd4e05841 100644 --- a/pkgs/development/libraries/botan/generic.nix +++ b/pkgs/development/libraries/botan/generic.nix @@ -17,9 +17,11 @@ stdenv.mkDerivation rec { buildInputs = [ python bzip2 zlib gmp openssl boost ]; configurePhase = '' - python configure.py --prefix=$out --with-gnump --with-bzip2 --with-zlib --with-openssl + python configure.py --prefix=$out --with-gnump --with-bzip2 --with-zlib --with-openssl --cc=$CC ''; + enableParallelBuilding = true; + postInstall = '' cd "$out"/lib/pkgconfig ln -s botan-*.pc botan.pc || true diff --git a/pkgs/development/libraries/cairo/default.nix b/pkgs/development/libraries/cairo/default.nix index dd73858c3fc..97e455b1f30 100644 --- a/pkgs/development/libraries/cairo/default.nix +++ b/pkgs/development/libraries/cairo/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, libiconvOrEmpty, libintlOrEmpty +{ stdenv, fetchurl, fetchpatch, pkgconfig, libiconvOrEmpty, libintlOrEmpty , expat, zlib, libpng, pixman, fontconfig, freetype, xlibs , gobjectSupport ? true, glib , xcbSupport ? true # no longer experimental since 1.12 @@ -18,6 +18,12 @@ stdenv.mkDerivation rec { sha1 = "53cf589b983412ea7f78feee2e1ba9cea6e3ebae"; }; + patches = [(fetchpatch { + name = "fix-racket.diff"; + url = "http://cgit.freedesktop.org/cairo/patch/?id=2de69581c28bf115852037ca41eba13cb7335976"; + sha256 = "0mk2fd9fwxqzravlmnbbrzwak15wqspn7609y0yn6qh87va5i0x4"; + })]; + nativeBuildInputs = [ pkgconfig ] ++ libintlOrEmpty ++ libiconvOrEmpty; propagatedBuildInputs = diff --git a/pkgs/development/libraries/cairomm/default.nix b/pkgs/development/libraries/cairomm/default.nix index f21abedc1f5..990d44dfef8 100644 --- a/pkgs/development/libraries/cairomm/default.nix +++ b/pkgs/development/libraries/cairomm/default.nix @@ -1,15 +1,15 @@ { fetchurl, stdenv, pkgconfig, cairo, x11, fontconfig, freetype, libsigcxx }: stdenv.mkDerivation rec { - name = "cairomm-1.10.0"; + name = "cairomm-1.11.2"; src = fetchurl { url = "http://cairographics.org/releases/${name}.tar.gz"; - sha256 = "13rrp96px95m6xnvmsaqb0wcqsnizg3bz334k0yhlyxf7v29d386"; + sha1 = "35e190a03f760924bece5dc1204cc36b3583c806"; }; buildInputs = [ pkgconfig ]; - + propagatedBuildInputs = [ cairo x11 fontconfig freetype libsigcxx ]; meta = { diff --git a/pkgs/development/libraries/confuse/default.nix b/pkgs/development/libraries/confuse/default.nix index 67fe669a037..e11e0ae0a1c 100644 --- a/pkgs/development/libraries/confuse/default.nix +++ b/pkgs/development/libraries/confuse/default.nix @@ -10,6 +10,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.nongnu.org/confuse/; description = "Configuration file parser library"; - license = "BSD"; + license = stdenv.lib.licenses.isc; }; } diff --git a/pkgs/development/libraries/cppnetlib/default.nix b/pkgs/development/libraries/cppnetlib/default.nix deleted file mode 100644 index 818e28b0a76..00000000000 --- a/pkgs/development/libraries/cppnetlib/default.nix +++ /dev/null @@ -1,40 +0,0 @@ -{stdenv, fetchurl, cmake, openssl, boost}: - -stdenv.mkDerivation rec { - name = "cpp-netlib-0.9.2"; - - src = fetchurl { - url = "https://github.com/downloads/cpp-netlib/cpp-netlib/${name}.tar.bz2"; - sha256 = "0llmiyp9l7byavwdyb7vpks27yfv3g85170bm81paps748bcyb1p"; - }; - - buildInputs = [ cmake boost openssl ]; - - /* Tests fail to build ... - https://github.com/cpp-netlib/cpp-netlib/issues/85 - - Once working, we could do: - checkTarget = "test"; - doCheck = true; - */ - - preConfigure = '' - sed -i /test/d CMakeLists.txt - ''; - - /* The build phase just builds examples. That's at least some testing. - That's how to install the lib - copy the headers. */ - installPhase = '' - # We are at sourcepath/build - mkdir -p $out/include - cp -R ../boost $out/include/ - mkdir -p $out/lib - cp -R libs/network/src/*.a $out/lib/ - ''; - - meta = { - homepage = http://cpp-netlib.github.com/; - description = "Provides application layer network support at boost style"; - license = stdenv.lib.licenses.boost; - }; -} diff --git a/pkgs/development/libraries/czmq/default.nix b/pkgs/development/libraries/czmq/default.nix new file mode 100644 index 00000000000..8c513978cfd --- /dev/null +++ b/pkgs/development/libraries/czmq/default.nix @@ -0,0 +1,20 @@ +{stdenv, fetchurl, zeromq4}: + +stdenv.mkDerivation rec { + baseName="czmq"; + version="3.0.0-rc1"; + name="${baseName}-${version}"; + + src = fetchurl { + url = "http://download.zeromq.org/${name}.tar.gz"; + sha256 = "1g3rk3fz7xzsbqcdcwn0x18nmiyr70k47kg00gdrq8g10li8mmd9"; + }; + + buildInputs = [ zeromq4 ]; + + meta = { + license = stdenv.lib.licenses.mpl20; + homepage = "http://czmq.zeromq.org/"; + description = "High-level C Binding for ZeroMQ"; + }; +} diff --git a/pkgs/development/libraries/dbus/default.nix b/pkgs/development/libraries/dbus/default.nix index 31e27127784..d332321a22a 100644 --- a/pkgs/development/libraries/dbus/default.nix +++ b/pkgs/development/libraries/dbus/default.nix @@ -3,8 +3,8 @@ , libX11, libICE, libSM, useX11 ? (stdenv.isLinux || stdenv.isDarwin) }: let - version = "1.8.10"; - sha256 = "13mgvwigm931r8n9363imnn0vn6dvc0m322k3p8fs5c8nvyqggqh"; + version = "1.8.12"; + sha256 = "07jhcalg00i2rx5zrgk73rg0vm7lzi5q5z2gscrbl999ipr2h569"; inherit (stdenv) lib; diff --git a/pkgs/development/libraries/eigen/default.nix b/pkgs/development/libraries/eigen/default.nix index 14308dc0eb0..758f687fb73 100644 --- a/pkgs/development/libraries/eigen/default.nix +++ b/pkgs/development/libraries/eigen/default.nix @@ -1,7 +1,7 @@ {stdenv, fetchurl, cmake}: let - version = "3.2.2"; + version = "3.2.3"; in stdenv.mkDerivation { name = "eigen-${version}"; @@ -9,7 +9,7 @@ stdenv.mkDerivation { src = fetchurl { url = "http://bitbucket.org/eigen/eigen/get/${version}.tar.gz"; name = "eigen-${version}.tar.gz"; - sha256 = "0pwykjkz5n8wfyg9cjj7smgs54a9zc80m9gi106w43n2m72ni39i"; + sha256 = "14l5hlgxxymwyava5mx97ipyk3ma3alaj586aaz1xh1r700a7sxm"; }; nativeBuildInputs = [ cmake ]; diff --git a/pkgs/development/libraries/enginepkcs11/default.nix b/pkgs/development/libraries/enginepkcs11/default.nix index 8c570c5421d..ff40a110a33 100644 --- a/pkgs/development/libraries/enginepkcs11/default.nix +++ b/pkgs/development/libraries/enginepkcs11/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.opensc-project.org/engine_pkcs11/; - license = "BSD"; + license = stdenv.lib.licenses.bsdOriginal; description = "Engine for OpenSSL to use smart cards in PKCS#11 format"; }; } diff --git a/pkgs/development/libraries/eventlog/default.nix b/pkgs/development/libraries/eventlog/default.nix index 7a8ab8e464b..12da7e89603 100644 --- a/pkgs/development/libraries/eventlog/default.nix +++ b/pkgs/development/libraries/eventlog/default.nix @@ -19,6 +19,6 @@ stdenv.mkDerivation { combination of description and tag/value pairs. ''; homepage = "http://www.balabit.com/support/community/products/"; - license = "BSD"; + license = stdenv.lib.licenses.bsd3; }; } diff --git a/pkgs/development/libraries/ffmpeg/2.3.x.nix b/pkgs/development/libraries/ffmpeg/2.2.x.nix similarity index 98% rename from pkgs/development/libraries/ffmpeg/2.3.x.nix rename to pkgs/development/libraries/ffmpeg/2.2.x.nix index 2b4b0569b55..51a6bb8c880 100644 --- a/pkgs/development/libraries/ffmpeg/2.3.x.nix +++ b/pkgs/development/libraries/ffmpeg/2.2.x.nix @@ -5,12 +5,12 @@ }: stdenv.mkDerivation rec { - version = "2.3.3"; + version = "2.2.11"; name = "ffmpeg-${version}"; src = fetchurl { url = "http://www.ffmpeg.org/releases/${name}.tar.bz2"; - sha256 = "0ik4c06anh49r5b0d3rq9if4zl6ysjsa341655kzw22fl880sk5v"; + sha256 = "06sli7xvihh97ss6a2mkdq4dcj3rg1w8zffrmjfc1hvyjxhc8f2r"; }; subtitleSupport = config.ffmpeg.subtitle or true; diff --git a/pkgs/development/libraries/ffmpeg/2.x.nix b/pkgs/development/libraries/ffmpeg/2.x.nix index bdd4b0392b9..db69e2d6979 100644 --- a/pkgs/development/libraries/ffmpeg/2.x.nix +++ b/pkgs/development/libraries/ffmpeg/2.x.nix @@ -5,12 +5,12 @@ }: stdenv.mkDerivation rec { - version = "2.4.4"; + version = "2.5.1"; name = "ffmpeg-${version}"; src = fetchurl { url = "http://www.ffmpeg.org/releases/${name}.tar.bz2"; - sha256 = "1z2a940fjryabwqzg5pw5k1r7ivkqdch4p2wbihb5f0z43043l4s"; + sha256 = "0lpgqw3pcsxjnj167fgsp70zycbhndhcji7icvj4i58hz6r51kq3"; }; subtitleSupport = config.ffmpeg.subtitle or true; diff --git a/pkgs/development/libraries/flann/default.nix b/pkgs/development/libraries/flann/default.nix index 4e4391a50f7..bffb124dc68 100644 --- a/pkgs/development/libraries/flann/default.nix +++ b/pkgs/development/libraries/flann/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation { meta = { homepage = http://people.cs.ubc.ca/~mariusm/flann/; - license = "BSD"; + license = stdenv.lib.licenses.bsd3; description = "Fast approximate nearest neighbor searches in high dimensional spaces"; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; diff --git a/pkgs/development/libraries/fmod/default.nix b/pkgs/development/libraries/fmod/default.nix index 78b70eebd7e..5473f2eb9b6 100644 --- a/pkgs/development/libraries/fmod/default.nix +++ b/pkgs/development/libraries/fmod/default.nix @@ -5,7 +5,7 @@ let bits = stdenv.lib.optionalString (stdenv.system == "x86_64-linux") "64"; libPath = stdenv.lib.makeLibraryPath - [ stdenv.gcc.libc stdenv.gcc.gcc ] + ":${stdenv.gcc.gcc}/lib64"; + [ stdenv.cc.libc stdenv.cc.gcc ] + ":${stdenv.cc.gcc}/lib64"; patchLib = x: "patchelf --set-rpath ${libPath} ${x}"; in stdenv.mkDerivation rec { diff --git a/pkgs/development/libraries/folly/default.nix b/pkgs/development/libraries/folly/default.nix index 27c7b673805..66d4f73096b 100644 --- a/pkgs/development/libraries/folly/default.nix +++ b/pkgs/development/libraries/folly/default.nix @@ -29,7 +29,8 @@ stdenv.mkDerivation rec { description = "A YAML parser and emitter for C++"; homepage = https://code.google.com/p/yaml-cpp/; license = licenses.mit; - platforms = platforms.unix; + # 32bit is not supported: https://github.com/facebook/folly/issues/103 + platforms = [ "x86_64-linux" ]; maintainers = maintainers.abbradar; }; } diff --git a/pkgs/development/libraries/fontconfig-ultimate/confd.nix b/pkgs/development/libraries/fontconfig-ultimate/confd.nix new file mode 100644 index 00000000000..e522cead822 --- /dev/null +++ b/pkgs/development/libraries/fontconfig-ultimate/confd.nix @@ -0,0 +1,35 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation { + name = "fontconfig-ultimate-20141123"; + src = fetchurl { + url = "https://github.com/bohoomil/fontconfig-ultimate/archive/2014-11-23.tar.gz"; + sha256 = "0czfm3hxc41x5mscwrba7p1vhm2w62j1qg7z8kfdrf21z8fvgznw"; + }; + + phases = "$prePhases unpackPhase installPhase $postPhases"; + installPhase = '' + mkdir -p $out/etc/fonts/conf.d + cp conf.d.infinality/*.conf $out/etc/fonts/conf.d + + # Base rendering settings will be determined by NixOS module + rm $out/etc/fonts/conf.d/10-base-rendering.conf + + # Options controlled by NixOS module + rm $out/etc/fonts/conf.d/35-repl-custom.conf + rm $out/etc/fonts/conf.d/38-repl-*.conf + rm $out/etc/fonts/conf.d/82-*.conf + rm $out/etc/fonts/conf.d/83-*.conf + + # Inclusion of local and user configs handled by global configuration + rm $out/etc/fonts/conf.d/97-local.conf + rm $out/etc/fonts/conf.d/98-user.conf + + cp fontconfig_patches/fonts-settings/*.conf $out/etc/fonts/conf.d + + mkdir -p $out/etc/fonts/presets/{combi,free,ms} + cp fontconfig_patches/combi/*.conf $out/etc/fonts/presets/combi + cp fontconfig_patches/free/*.conf $out/etc/fonts/presets/free + cp fontconfig_patches/ms/*.conf $out/etc/fonts/presets/ms + ''; +} diff --git a/pkgs/development/libraries/fontconfig-ultimate/default.nix b/pkgs/development/libraries/fontconfig-ultimate/default.nix new file mode 100644 index 00000000000..aa799d850d7 --- /dev/null +++ b/pkgs/development/libraries/fontconfig-ultimate/default.nix @@ -0,0 +1,6 @@ +{ callPackage }: + +{ + confd = callPackage ./confd.nix {}; + rendering = callPackage ./rendering.nix {}; +} diff --git a/pkgs/development/libraries/fontconfig-ultimate/rendering.nix b/pkgs/development/libraries/fontconfig-ultimate/rendering.nix new file mode 100644 index 00000000000..b1de43b49b2 --- /dev/null +++ b/pkgs/development/libraries/fontconfig-ultimate/rendering.nix @@ -0,0 +1,212 @@ +{}: + +rec { + default = { + INFINALITY_FT_FILTER_PARAMS="11 22 38 22 11"; + INFINALITY_FT_GRAYSCALE_FILTER_STRENGTH="0"; + INFINALITY_FT_FRINGE_FILTER_STRENGTH="0"; + INFINALITY_FT_AUTOHINT_HORIZONTAL_STEM_DARKEN_STRENGTH="10"; + INFINALITY_FT_AUTOHINT_VERTICAL_STEM_DARKEN_STRENGTH="25"; + INFINALITY_FT_WINDOWS_STYLE_SHARPENING_STRENGTH="10"; + INFINALITY_FT_CHROMEOS_STYLE_SHARPENING_STRENGTH="0"; + INFINALITY_FT_STEM_ALIGNMENT_STRENGTH="25"; + INFINALITY_FT_STEM_FITTING_STRENGTH="25"; + INFINALITY_FT_GAMMA_CORRECTION="0 100"; + INFINALITY_FT_BRIGHTNESS="0"; + INFINALITY_FT_CONTRAST="0"; + INFINALITY_FT_USE_VARIOUS_TWEAKS="true"; + INFINALITY_FT_AUTOHINT_INCREASE_GLYPH_HEIGHTS="true"; + INFINALITY_FT_AUTOHINT_SNAP_STEM_HEIGHT="100"; + INFINALITY_FT_STEM_SNAPPING_SLIDING_SCALE="40"; + INFINALITY_FT_USE_KNOWN_SETTINGS_ON_SELECTED_FONTS="true"; + INFINALITY_FT_GLOBAL_EMBOLDEN_X_VALUE="0"; + INFINALITY_FT_GLOBAL_EMBOLDEN_Y_VALUE="0"; + INFINALITY_FT_BOLD_EMBOLDEN_X_VALUE="0"; + INFINALITY_FT_BOLD_EMBOLDEN_Y_VALUE="0"; + }; + + osx = default // { + INFINALITY_FT_FILTER_PARAMS="03 32 38 32 03"; + INFINALITY_FT_GRAYSCALE_FILTER_STRENGTH="25"; + INFINALITY_FT_WINDOWS_STYLE_SHARPENING_STRENGTH="0"; + INFINALITY_FT_STEM_ALIGNMENT_STRENGTH="0"; + INFINALITY_FT_STEM_FITTING_STRENGTH="0"; + INFINALITY_FT_GAMMA_CORRECTION="1000 80"; + INFINALITY_FT_BRIGHTNESS="10"; + INFINALITY_FT_CONTRAST="20"; + INFINALITY_FT_USE_VARIOUS_TWEAKS="false"; + INFINALITY_FT_AUTOHINT_INCREASE_GLYPH_HEIGHTS="false"; + INFINALITY_FT_AUTOHINT_SNAP_STEM_HEIGHT="0"; + INFINALITY_FT_STEM_SNAPPING_SLIDING_SCALE="0"; + INFINALITY_FT_USE_KNOWN_SETTINGS_ON_SELECTED_FONTS="false"; + INFINALITY_FT_GLOBAL_EMBOLDEN_Y_VALUE="8"; + INFINALITY_FT_BOLD_EMBOLDEN_X_VALUE="16"; + }; + + ipad = default // { + INFINALITY_FT_FILTER_PARAMS="00 00 100 00 00"; + INFINALITY_FT_GRAYSCALE_FILTER_STRENGTH="100"; + INFINALITY_FT_AUTOHINT_HORIZONTAL_STEM_DARKEN_STRENGTH="0"; + INFINALITY_FT_AUTOHINT_VERTICAL_STEM_DARKEN_STRENGTH="0"; + INFINALITY_FT_WINDOWS_STYLE_SHARPENING_STRENGTH="0"; + INFINALITY_FT_STEM_ALIGNMENT_STRENGTH="0"; + INFINALITY_FT_STEM_FITTING_STRENGTH="0"; + INFINALITY_FT_GAMMA_CORRECTION="1000 80"; + INFINALITY_FT_USE_VARIOUS_TWEAKS="false"; + INFINALITY_FT_AUTOHINT_INCREASE_GLYPH_HEIGHTS="false"; + INFINALITY_FT_AUTOHINT_SNAP_STEM_HEIGHT="0"; + INFINALITY_FT_STEM_SNAPPING_SLIDING_SCALE="0"; + INFINALITY_FT_USE_KNOWN_SETTINGS_ON_SELECTED_FONTS="false"; + }; + + ubuntu = default // { + INFINALITY_FT_WINDOWS_STYLE_SHARPENING_STRENGTH="0"; + INFINALITY_FT_STEM_ALIGNMENT_STRENGTH="0"; + INFINALITY_FT_STEM_FITTING_STRENGTH="0"; + INFINALITY_FT_GAMMA_CORRECTION="1000 80"; + INFINALITY_FT_BRIGHTNESS="-10"; + INFINALITY_FT_CONTRAST="15"; + INFINALITY_FT_USE_VARIOUS_TWEAKS="false"; + INFINALITY_FT_AUTOHINT_INCREASE_GLYPH_HEIGHTS="false"; + INFINALITY_FT_AUTOHINT_SNAP_STEM_HEIGHT="0"; + INFINALITY_FT_STEM_SNAPPING_SLIDING_SCALE="0"; + INFINALITY_FT_USE_KNOWN_SETTINGS_ON_SELECTED_FONTS="false"; + }; + + linux = default // { + INFINALITY_FT_FILTER_PARAMS="06 25 44 25 06"; + INFINALITY_FT_WINDOWS_STYLE_SHARPENING_STRENGTH="0"; + INFINALITY_FT_STEM_ALIGNMENT_STRENGTH="0"; + INFINALITY_FT_STEM_FITTING_STRENGTH="0"; + INFINALITY_FT_AUTOHINT_INCREASE_GLYPH_HEIGHTS="false"; + INFINALITY_FT_AUTOHINT_SNAP_STEM_HEIGHT="100"; + INFINALITY_FT_USE_KNOWN_SETTINGS_ON_SELECTED_FONTS="false"; + }; + + winxplight = default // { + INFINALITY_FT_FILTER_PARAMS="06 25 44 25 06"; + INFINALITY_FT_FRINGE_FILTER_STRENGTH="100"; + INFINALITY_FT_WINDOWS_STYLE_SHARPENING_STRENGTH="65"; + INFINALITY_FT_STEM_ALIGNMENT_STRENGTH="15"; + INFINALITY_FT_STEM_FITTING_STRENGTH="15"; + INFINALITY_FT_GAMMA_CORRECTION="1000 120"; + INFINALITY_FT_BRIGHTNESS="20"; + INFINALITY_FT_CONTRAST="30"; + INFINALITY_FT_AUTOHINT_INCREASE_GLYPH_HEIGHTS="false"; + INFINALITY_FT_STEM_SNAPPING_SLIDING_SCALE="30"; + }; + + win7light = default // { + INFINALITY_FT_FILTER_PARAMS="20 25 38 25 05"; + INFINALITY_FT_FRINGE_FILTER_STRENGTH="100"; + INFINALITY_FT_WINDOWS_STYLE_SHARPENING_STRENGTH="100"; + INFINALITY_FT_STEM_ALIGNMENT_STRENGTH="0"; + INFINALITY_FT_STEM_FITTING_STRENGTH="0"; + INFINALITY_FT_GAMMA_CORRECTION="1000 160"; + INFINALITY_FT_CONTRAST="20"; + INFINALITY_FT_AUTOHINT_INCREASE_GLYPH_HEIGHTS="false"; + INFINALITY_FT_STEM_SNAPPING_SLIDING_SCALE="30"; + }; + + winxp = default // { + INFINALITY_FT_FILTER_PARAMS="06 25 44 25 06"; + INFINALITY_FT_FRINGE_FILTER_STRENGTH="100"; + INFINALITY_FT_WINDOWS_STYLE_SHARPENING_STRENGTH="65"; + INFINALITY_FT_STEM_ALIGNMENT_STRENGTH="15"; + INFINALITY_FT_STEM_FITTING_STRENGTH="15"; + INFINALITY_FT_GAMMA_CORRECTION="1000 120"; + INFINALITY_FT_BRIGHTNESS="10"; + INFINALITY_FT_CONTRAST="20"; + INFINALITY_FT_AUTOHINT_INCREASE_GLYPH_HEIGHTS="false"; + INFINALITY_FT_STEM_SNAPPING_SLIDING_SCALE="30"; + }; + + win7 = default // { + INFINALITY_FT_FILTER_PARAMS="20 25 42 25 06"; + INFINALITY_FT_FRINGE_FILTER_STRENGTH="100"; + INFINALITY_FT_WINDOWS_STYLE_SHARPENING_STRENGTH="65"; + INFINALITY_FT_STEM_ALIGNMENT_STRENGTH="0"; + INFINALITY_FT_STEM_FITTING_STRENGTH="0"; + INFINALITY_FT_GAMMA_CORRECTION="1000 120"; + INFINALITY_FT_BRIGHTNESS="10"; + INFINALITY_FT_CONTRAST="20"; + INFINALITY_FT_AUTOHINT_INCREASE_GLYPH_HEIGHTS="false"; + INFINALITY_FT_STEM_SNAPPING_SLIDING_SCALE="0"; + }; + + vanilla = default // { + INFINALITY_FT_FILTER_PARAMS="06 25 38 25 06"; + INFINALITY_FT_AUTOHINT_HORIZONTAL_STEM_DARKEN_STRENGTH="0"; + INFINALITY_FT_AUTOHINT_VERTICAL_STEM_DARKEN_STRENGTH="0"; + INFINALITY_FT_WINDOWS_STYLE_SHARPENING_STRENGTH="0"; + INFINALITY_FT_STEM_ALIGNMENT_STRENGTH="0"; + INFINALITY_FT_STEM_FITTING_STRENGTH="0"; + INFINALITY_FT_USE_VARIOUS_TWEAKS="false"; + INFINALITY_FT_AUTOHINT_INCREASE_GLYPH_HEIGHTS="false"; + INFINALITY_FT_AUTOHINT_SNAP_STEM_HEIGHT="0"; + INFINALITY_FT_STEM_SNAPPING_SLIDING_SCALE="0"; + INFINALITY_FT_USE_KNOWN_SETTINGS_ON_SELECTED_FONTS="false"; + }; + + classic = default // { + INFINALITY_FT_FILTER_PARAMS="06 25 38 25 06"; + INFINALITY_FT_AUTOHINT_HORIZONTAL_STEM_DARKEN_STRENGTH="0"; + INFINALITY_FT_AUTOHINT_VERTICAL_STEM_DARKEN_STRENGTH="0"; + INFINALITY_FT_WINDOWS_STYLE_SHARPENING_STRENGTH="0"; + INFINALITY_FT_STEM_ALIGNMENT_STRENGTH="0"; + INFINALITY_FT_STEM_FITTING_STRENGTH="0"; + INFINALITY_FT_STEM_SNAPPING_SLIDING_SCALE="0"; + INFINALITY_FT_USE_KNOWN_SETTINGS_ON_SELECTED_FONTS="false"; + }; + + nudge = default // { + INFINALITY_FT_WINDOWS_STYLE_SHARPENING_STRENGTH="0"; + INFINALITY_FT_STEM_SNAPPING_SLIDING_SCALE="30"; + INFINALITY_FT_USE_KNOWN_SETTINGS_ON_SELECTED_FONTS="false"; + }; + + push = default // { + INFINALITY_FT_WINDOWS_STYLE_SHARPENING_STRENGTH="0"; + INFINALITY_FT_STEM_ALIGNMENT_STRENGTH="75"; + INFINALITY_FT_STEM_FITTING_STRENGTH="50"; + INFINALITY_FT_STEM_SNAPPING_SLIDING_SCALE="30"; + }; + + infinality = default // { + INFINALITY_FT_WINDOWS_STYLE_SHARPENING_STRENGTH="5"; + }; + + shove = default // { + INFINALITY_FT_WINDOWS_STYLE_SHARPENING_STRENGTH="0"; + INFINALITY_FT_STEM_ALIGNMENT_STRENGTH="100"; + INFINALITY_FT_STEM_FITTING_STRENGTH="100"; + INFINALITY_FT_STEM_SNAPPING_SLIDING_SCALE="0"; + }; + + sharpened = default // { + INFINALITY_FT_WINDOWS_STYLE_SHARPENING_STRENGTH="65"; + }; + + ultimate = { + INFINALITY_FT_FILTER_PARAMS="08 24 36 24 08"; + INFINALITY_FT_FRINGE_FILTER_STRENGTH="50"; + INFINALITY_FT_USE_VARIOUS_TWEAKS="true"; + INFINALITY_FT_CHROMEOS_STYLE_SHARPENING_STRENGTH="20"; + }; + + ultimate-lighter = ultimate // { + INFINALITY_FT_FILTER_PARAMS="06 22 36 22 06"; + }; + + ultimate-lightest = ultimate // { + INFINALITY_FT_FILTER_PARAMS="04 22 38 22 04"; + }; + + ultimate-darker = ultimate // { + INFINALITY_FT_FILTER_PARAMS="10 25 37 25 10"; + }; + + ultimate-darkest = ultimate // { + INFINALITY_FT_FILTER_PARAMS="12 28 42 28 12"; + }; +} diff --git a/pkgs/development/libraries/fontconfig/default.nix b/pkgs/development/libraries/fontconfig/default.nix index d659c30083d..b03528de2d5 100644 --- a/pkgs/development/libraries/fontconfig/default.nix +++ b/pkgs/development/libraries/fontconfig/default.nix @@ -23,14 +23,6 @@ stdenv.mkDerivation rec { sha256 = "16baa4g5lswkyjlyf1h5lwc0zjap7c4d8grw79349a5w6dsl8qnw"; }; - infinality_patch = - let subvers = "1"; - in fetchurl { - url = http://www.infinality.net/fedora/linux/zips/fontconfig-infinality-1-20130104_1.tar.bz2; - sha256 = "1fm5xx0mx2243jrq5rxk4v0ajw2nawpj23399h710bx6hd1rviq7"; - } - ; - patches = [ (fetchpatch ({ url = "http://cgit.freedesktop.org/fontconfig/patch/?id=f44157c809d280e2a0ce87fb078fc4b278d24a67"; @@ -71,7 +63,7 @@ stdenv.mkDerivation rec { installFlags = "fc_cachedir=$(TMPDIR)/dummy RUN_FC_CACHE_TEST=false"; postInstall = '' - cd "$out/etc/fonts" && tar xvf ${infinality_patch} + cd "$out/etc/fonts" rm conf.d/{50-user,51-local}.conf "${libxslt}/bin/xsltproc" --stringparam fontDirectories "${fontbhttf}" \ --stringparam fontconfig "$out" \ diff --git a/pkgs/development/libraries/fontconfig/make-fonts-conf.xsl b/pkgs/development/libraries/fontconfig/make-fonts-conf.xsl index 03f7815e38a..1b79834c894 100644 --- a/pkgs/development/libraries/fontconfig/make-fonts-conf.xsl +++ b/pkgs/development/libraries/fontconfig/make-fonts-conf.xsl @@ -27,8 +27,6 @@ /etc/fonts/conf.d /etc/fonts//conf.d - - fontconfig/conf.d fontconfig diff --git a/pkgs/development/libraries/freetype/default.nix b/pkgs/development/libraries/freetype/default.nix index a13e399ab0f..e9e393075b3 100644 --- a/pkgs/development/libraries/freetype/default.nix +++ b/pkgs/development/libraries/freetype/default.nix @@ -7,30 +7,29 @@ }: let - version = "2.5.3"; + version = "2.5.4"; fetch_bohoomil = name: sha256: fetchpatch { - url = https://raw.githubusercontent.com/bohoomil/fontconfig-ultimate/8a155db28f264520596cc3e76eb44824bdb30f8e/01_freetype2-iu/ + name; + url = https://raw.githubusercontent.com/bohoomil/fontconfig-ultimate/e4c99bcf5ac9595e2c64393c0661377685c0ad24/01_freetype2-iu/ + name; inherit sha256; }; in -with { inherit (stdenv.lib) optional optionalString; }; +with { inherit (stdenv.lib) optional optionals optionalString; }; stdenv.mkDerivation rec { name = "freetype-${version}"; src = fetchurl { url = "mirror://sourceforge/freetype/${name}.tar.bz2"; - sha256 = "0pppcn73b5pwd7zdi9yfx16f5i93y18q7q4jmlkwmwrfsllqp160"; + sha256 = "1fxsbk4lp6ymifldzrb86g3x6mz771jmrzphkz92mcrkddk2qkiv"; }; - patches = [ ./enable-validation.patch ] # from Gentoo - ++ [ - (fetch_bohoomil "freetype-2.5.3-pkgconfig.patch" "1dpfdh8kmka3gzv14glz7l79i545zizah6wma937574v5z2iy3nn") - (fetch_bohoomil "fix_segfault_with_harfbuzz.diff" "1nx36inqrw717b86cla2miprdb3hii4vndw95k0jbbhfmax9k6fy") - ] - ++ optional useEncumberedCode - (fetch_bohoomil "infinality-2.5.3.patch" "0mxiybcb4wwbicrjiinh1b95rv543bh05sdqk1v0ipr3fxfrb47q") - ; + patches = [ ./enable-validation.patch ] # from Gentoo, bohoomil has the same patch as well + ++ [ ./fix-pcf.patch ] + ++ optionals useEncumberedCode [ + (fetch_bohoomil "02-ftsmooth-2.5.4.patch" "11w4wb7gwgpijc788mpkxj92d7rfdwrdv7jzrpxwv5w5cgpx9iw9") + (fetch_bohoomil "03-upstream-2014.12.07.patch" "0gq7y63mg3gc5z69nfkv2kl7xad0bjzsvnl6j1j9q79jjbvaqdq0") + (fetch_bohoomil "04-infinality-2.5.4-2014.12.07.patch" "1gph7z9s2221gy5dxn01v3lga0m9yib8yqsaqj5km74bqx1vlalh") + ]; propagatedBuildInputs = [ zlib bzip2 libpng ]; # needed when linking against freetype # dependence on harfbuzz is looser than the reverse dependence diff --git a/pkgs/development/libraries/freetype/fix-pcf.patch b/pkgs/development/libraries/freetype/fix-pcf.patch new file mode 100644 index 00000000000..bb301bcd9ca --- /dev/null +++ b/pkgs/development/libraries/freetype/fix-pcf.patch @@ -0,0 +1,132 @@ +Upstream fixes for pcf fonts. + +http://git.savannah.gnu.org/cgit/freetype/freetype2.git/commit/?id=74af85c4b62b35e55b0ce9dec55ee10cbc4962a2 +http://git.savannah.gnu.org/cgit/freetype/freetype2.git/commit/?id=06842c7b49c21f13c0ab61201daab6ff5a358fcc + +diff --git a/src/pcf/pcfread.c b/src/pcf/pcfread.c +index 998cbed..e3caf82 100644 +--- a/src/pcf/pcfread.c ++++ b/src/pcf/pcfread.c +@@ -2,7 +2,7 @@ + + FreeType font driver for pcf fonts + +- Copyright 2000-2010, 2012, 2013 by ++ Copyright 2000-2010, 2012-2014 by + Francesco Zappa Nardelli + + Permission is hereby granted, free of charge, to any person obtaining a copy +@@ -78,7 +78,7 @@ THE SOFTWARE. + FT_FRAME_START( 16 ), + FT_FRAME_ULONG_LE( type ), + FT_FRAME_ULONG_LE( format ), +- FT_FRAME_ULONG_LE( size ), ++ FT_FRAME_ULONG_LE( size ), /* rounded up to a multiple of 4 */ + FT_FRAME_ULONG_LE( offset ), + FT_FRAME_END + }; +@@ -95,9 +95,11 @@ THE SOFTWARE. + FT_Memory memory = FT_FACE( face )->memory; + FT_UInt n; + ++ FT_ULong size; + +- if ( FT_STREAM_SEEK ( 0 ) || +- FT_STREAM_READ_FIELDS ( pcf_toc_header, toc ) ) ++ ++ if ( FT_STREAM_SEEK( 0 ) || ++ FT_STREAM_READ_FIELDS( pcf_toc_header, toc ) ) + return FT_THROW( Cannot_Open_Resource ); + + if ( toc->version != PCF_FILE_VERSION || +@@ -154,14 +156,35 @@ THE SOFTWARE. + break; + } + +- /* we now check whether the `size' and `offset' values are reasonable: */ +- /* `offset' + `size' must not exceed the stream size */ ++ /* ++ * We now check whether the `size' and `offset' values are reasonable: ++ * `offset' + `size' must not exceed the stream size. ++ * ++ * Note, however, that X11's `pcfWriteFont' routine (used by the ++ * `bdftopcf' program to create PDF font files) has two special ++ * features. ++ * ++ * - It always assigns the accelerator table a size of 100 bytes in the ++ * TOC, regardless of its real size, which can vary between 34 and 72 ++ * bytes. ++ * ++ * - Due to the way the routine is designed, it ships out the last font ++ * table with its real size, ignoring the TOC's size value. Since ++ * the TOC size values are always rounded up to a multiple of 4, the ++ * difference can be up to three bytes for all tables except the ++ * accelerator table, for which the difference can be as large as 66 ++ * bytes. ++ * ++ */ ++ + tables = face->toc.tables; +- for ( n = 0; n < toc->count; n++ ) ++ size = stream->size; ++ ++ for ( n = 0; n < toc->count - 1; n++ ) + { + /* we need two checks to avoid overflow */ +- if ( ( tables->size > stream->size ) || +- ( tables->offset > stream->size - tables->size ) ) ++ if ( ( tables->size > size ) || ++ ( tables->offset > size - tables->size ) ) + { + error = FT_THROW( Invalid_Table ); + goto Exit; +@@ -169,6 +192,15 @@ THE SOFTWARE. + tables++; + } + ++ /* no check of `tables->size' for last table element ... */ ++ if ( ( tables->offset > size ) ) ++ { ++ error = FT_THROW( Invalid_Table ); ++ goto Exit; ++ } ++ /* ... instead, we adjust `tables->size' to the real value */ ++ tables->size = size - tables->offset; ++ + #ifdef FT_DEBUG_LEVEL_TRACE + + { +@@ -733,8 +765,8 @@ THE SOFTWARE. + + FT_TRACE4(( " number of bitmaps: %d\n", nbitmaps )); + +- /* XXX: PCF_Face->nmetrics is singed FT_Long, see pcf.h */ +- if ( face->nmetrics < 0 || nbitmaps != ( FT_ULong )face->nmetrics ) ++ /* XXX: PCF_Face->nmetrics is signed FT_Long, see pcf.h */ ++ if ( face->nmetrics < 0 || nbitmaps != (FT_ULong)face->nmetrics ) + return FT_THROW( Invalid_File_Format ); + + if ( FT_NEW_ARRAY( offsets, nbitmaps ) ) +diff --git a/src/pcf/pcfread.c b/src/pcf/pcfread.c +index e3caf82..a29a9e3 100644 +--- a/src/pcf/pcfread.c ++++ b/src/pcf/pcfread.c +@@ -192,14 +192,15 @@ THE SOFTWARE. + tables++; + } + +- /* no check of `tables->size' for last table element ... */ ++ /* only check `tables->offset' for last table element ... */ + if ( ( tables->offset > size ) ) + { + error = FT_THROW( Invalid_Table ); + goto Exit; + } +- /* ... instead, we adjust `tables->size' to the real value */ +- tables->size = size - tables->offset; ++ /* ... and adjust `tables->size' to the real value if necessary */ ++ if ( tables->size > size - tables->offset ) ++ tables->size = size - tables->offset; + + #ifdef FT_DEBUG_LEVEL_TRACE + diff --git a/pkgs/development/libraries/gdal/default.nix b/pkgs/development/libraries/gdal/default.nix index c397013750b..76c896d64dd 100644 --- a/pkgs/development/libraries/gdal/default.nix +++ b/pkgs/development/libraries/gdal/default.nix @@ -1,28 +1,30 @@ { stdenv, fetchurl, composableDerivation, unzip, libjpeg, libtiff, zlib -, postgresql, mysql, libgeotiff, python, pythonPackages}: +, postgresql, mysql, libgeotiff, python, pythonPackages, proj}: composableDerivation.composableDerivation {} (fixed: rec { - name = "gdal-1.11.0"; + version = "1.11.1"; + name = "gdal-${version}"; src = fetchurl { - url = "http://download.osgeo.org/gdal/1.11.0/${name}.tar.gz"; - md5 = "9fdf0f2371a3e9863d83e69951c71ec4"; + url = "http://download.osgeo.org/gdal/${version}/${name}.tar.gz"; + sha256 = "0h1kib2pzv4nbppdnxv6vhngvk9ic531y8rzcwb8bg6am125jszl"; }; - buildInputs = [ unzip libjpeg libtiff python pythonPackages.numpy]; + buildInputs = [ unzip libjpeg libtiff python pythonPackages.numpy proj]; # don't use optimization for gcc >= 4.3. That's said to be causeing segfaults preConfigure = "export CFLAGS=-O0; export CXXFLAGS=-O0"; configureFlags = [ "--with-jpeg=${libjpeg}" - "--with-libtiff=${libtiff}" # optional (without largetiff support - "--with-libz=${zlib}" # optional + "--with-libtiff=${libtiff}" # optional (without largetiff support + "--with-libz=${zlib}" # optional "--with-pg=${postgresql}/bin/pg_config" "--with-mysql=${mysql}/bin/mysql_config" "--with-geotiff=${libgeotiff}" - "--with-python" # optional + "--with-python" # optional + "--with-static-proj4=${proj}" # optional ]; meta = { diff --git a/pkgs/development/libraries/gettext/default.nix b/pkgs/development/libraries/gettext/default.nix index 9d62472c27e..8d88ef45303 100644 --- a/pkgs/development/libraries/gettext/default.nix +++ b/pkgs/development/libraries/gettext/default.nix @@ -35,8 +35,8 @@ stdenv.mkDerivation (rec { enableParallelBuilding = true; crossAttrs = { - buildInputs = stdenv.lib.optional (stdenv.gccCross.libc ? libiconv) - stdenv.gccCross.libc.libiconv.crossDrv; + buildInputs = stdenv.lib.optional (stdenv.ccCross.libc ? libiconv) + stdenv.ccCross.libc.libiconv.crossDrv; # Gettext fails to guess the cross compiler configureFlags = "CXX=${stdenv.cross.config}-g++"; }; diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix index 4df07c8f6b8..ab6f4165e72 100644 --- a/pkgs/development/libraries/glib/default.nix +++ b/pkgs/development/libraries/glib/default.nix @@ -7,7 +7,7 @@ with stdenv.lib; -assert stdenv.gcc.gcc != null; +assert !stdenv.isDarwin -> stdenv.cc ? gcc; # TODO: # * Add gio-module-fam @@ -83,7 +83,7 @@ stdenv.mkDerivation rec { preCheck = optionalString doCheck # libgcc_s.so.1 must be installed for pthread_cancel to work # also point to the glib/.libs path - '' export LD_LIBRARY_PATH="${stdenv.gcc.gcc}/lib:$NIX_BUILD_TOP/${name}/glib/.libs:$LD_LIBRARY_PATH" + '' export LD_LIBRARY_PATH="${stdenv.cc.gcc}/lib:$NIX_BUILD_TOP/${name}/glib/.libs:$LD_LIBRARY_PATH" export TZDIR="${tzdata}/share/zoneinfo" export XDG_CACHE_HOME="$TMP" export XDG_RUNTIME_HOME="$TMP" diff --git a/pkgs/development/libraries/glibc/2.19/cve-2014-0475.patch b/pkgs/development/libraries/glibc/2.19/cve-2014-0475.patch deleted file mode 100644 index a4f983de8f6..00000000000 --- a/pkgs/development/libraries/glibc/2.19/cve-2014-0475.patch +++ /dev/null @@ -1,170 +0,0 @@ -Picked from upstream commits, but excluding changes to news and tests: -d183645616b0533 and 4e8f95a0df7c2 -Also see https://sourceware.org/bugzilla/show_bug.cgi?id=17137 - -diff --git a/locale/setlocale.c b/locale/setlocale.c -index 9458468..6455b8b 100644 ---- a/locale/setlocale.c -+++ b/locale/setlocale.c -@@ -272,6 +272,8 @@ setlocale (int category, const char *locale) - of entries of the form `CATEGORY=VALUE'. */ - const char *newnames[__LC_LAST]; - struct __locale_data *newdata[__LC_LAST]; -+ /* Copy of the locale argument, for in-place splitting. */ -+ char *locale_copy = NULL; - - /* Set all name pointers to the argument name. */ - for (category = 0; category < __LC_LAST; ++category) -@@ -281,7 +283,13 @@ setlocale (int category, const char *locale) - if (__glibc_unlikely (strchr (locale, ';') != NULL)) - { - /* This is a composite name. Make a copy and split it up. */ -- char *np = strdupa (locale); -+ locale_copy = strdup (locale); -+ if (__glibc_unlikely (locale_copy == NULL)) -+ { -+ __libc_rwlock_unlock (__libc_setlocale_lock); -+ return NULL; -+ } -+ char *np = locale_copy; - char *cp; - int cnt; - -@@ -299,6 +307,7 @@ setlocale (int category, const char *locale) - { - error_return: - __libc_rwlock_unlock (__libc_setlocale_lock); -+ free (locale_copy); - - /* Bogus category name. */ - ERROR_RETURN; -@@ -391,8 +400,9 @@ setlocale (int category, const char *locale) - /* Critical section left. */ - __libc_rwlock_unlock (__libc_setlocale_lock); - -- /* Free the resources (the locale path variable). */ -+ /* Free the resources. */ - free (locale_path); -+ free (locale_copy); - - return composite; - } -diff --git a/locale/findlocale.c b/locale/findlocale.c -index bbaf708..22e8b53 100644 ---- a/locale/findlocale.c -+++ b/locale/findlocale.c -@@ -17,6 +17,7 @@ - . */ - - #include -+#include - #include - #include - #include -@@ -57,6 +58,45 @@ struct loaded_l10nfile *_nl_locale_file_list[__LC_LAST]; - - const char _nl_default_locale_path[] attribute_hidden = LOCALEDIR; - -+/* Checks if the name is actually present, that is, not NULL and not -+ empty. */ -+static inline int -+name_present (const char *name) -+{ -+ return name != NULL && name[0] != '\0'; -+} -+ -+/* Checks that the locale name neither extremely long, nor contains a -+ ".." path component (to prevent directory traversal). */ -+static inline int -+valid_locale_name (const char *name) -+{ -+ /* Not set. */ -+ size_t namelen = strlen (name); -+ /* Name too long. The limit is arbitrary and prevents stack overflow -+ issues later. */ -+ if (__glibc_unlikely (namelen > 255)) -+ return 0; -+ /* Directory traversal attempt. */ -+ static const char slashdot[4] = {'/', '.', '.', '/'}; -+ if (__glibc_unlikely (memmem (name, namelen, -+ slashdot, sizeof (slashdot)) != NULL)) -+ return 0; -+ if (namelen == 2 && __glibc_unlikely (name[0] == '.' && name [1] == '.')) -+ return 0; -+ if (namelen >= 3 -+ && __glibc_unlikely (((name[0] == '.' -+ && name[1] == '.' -+ && name[2] == '/') -+ || (name[namelen - 3] == '/' -+ && name[namelen - 2] == '.' -+ && name[namelen - 1] == '.')))) -+ return 0; -+ /* If there is a slash in the name, it must start with one. */ -+ if (__glibc_unlikely (memchr (name, '/', namelen) != NULL) && name[0] != '/') -+ return 0; -+ return 1; -+} - - struct __locale_data * - internal_function -@@ -65,7 +105,7 @@ _nl_find_locale (const char *locale_path, size_t locale_path_len, - { - int mask; - /* Name of the locale for this category. */ -- char *loc_name; -+ char *loc_name = (char *) *name; - const char *language; - const char *modifier; - const char *territory; -@@ -73,31 +113,39 @@ _nl_find_locale (const char *locale_path, size_t locale_path_len, - const char *normalized_codeset; - struct loaded_l10nfile *locale_file; - -- if ((*name)[0] == '\0') -+ if (loc_name[0] == '\0') - { - /* The user decides which locale to use by setting environment - variables. */ -- *name = getenv ("LC_ALL"); -- if (*name == NULL || (*name)[0] == '\0') -- *name = getenv (_nl_category_names.str -+ loc_name = getenv ("LC_ALL"); -+ if (!name_present (loc_name)) -+ loc_name = getenv (_nl_category_names.str - + _nl_category_name_idxs[category]); -- if (*name == NULL || (*name)[0] == '\0') -- *name = getenv ("LANG"); -+ if (!name_present (loc_name)) -+ loc_name = getenv ("LANG"); -+ if (!name_present (loc_name)) -+ loc_name = (char *) _nl_C_name; - } - -- if (*name == NULL || (*name)[0] == '\0' -- || (__builtin_expect (__libc_enable_secure, 0) -- && strchr (*name, '/') != NULL)) -- *name = (char *) _nl_C_name; -+ /* We used to fall back to the C locale if the name contains a slash -+ character '/', but we now check for directory traversal in -+ valid_locale_name, so this is no longer necessary. */ - -- if (__builtin_expect (strcmp (*name, _nl_C_name), 1) == 0 -- || __builtin_expect (strcmp (*name, _nl_POSIX_name), 1) == 0) -+ if (__builtin_expect (strcmp (loc_name, _nl_C_name), 1) == 0 -+ || __builtin_expect (strcmp (loc_name, _nl_POSIX_name), 1) == 0) - { - /* We need not load anything. The needed data is contained in - the library itself. */ - *name = (char *) _nl_C_name; - return _nl_C[category]; - } -+ else if (!valid_locale_name (loc_name)) -+ { -+ __set_errno (EINVAL); -+ return NULL; -+ } -+ -+ *name = loc_name; - - /* We really have to load some data. First we try the archive, - but only if there was no LOCPATH environment variable specified. */ diff --git a/pkgs/development/libraries/glibc/2.19/cve-2014-5119.patch b/pkgs/development/libraries/glibc/2.19/cve-2014-5119.patch deleted file mode 100644 index cbae03425eb..00000000000 --- a/pkgs/development/libraries/glibc/2.19/cve-2014-5119.patch +++ /dev/null @@ -1,206 +0,0 @@ -http://anonscm.debian.org/viewvc/pkg-glibc/glibc-package/trunk/debian/patches/any/cvs-CVE-2014-5119.diff?revision=6248&view=co - -commit a1a6a401ab0a3c9f15fb7eaebbdcee24192254e8 -Author: Florian Weimer -Date: Tue Aug 26 19:38:59 2014 +0200 - - __gconv_translit_find: Disable function [BZ #17187] - - This functionality has never worked correctly, and the implementation - contained a security vulnerability (CVE-2014-5119). - -2014-08-26 Florian Weimer - - [BZ #17187] - * iconv/gconv_trans.c (struct known_trans, search_tree, lock, - trans_compare, open_translit, __gconv_translit_find): - Remove module loading code. - ---- a/iconv/gconv_trans.c -+++ b/iconv/gconv_trans.c -@@ -238,181 +238,12 @@ __gconv_transliterate (struct __gconv_step *step, - return __GCONV_ILLEGAL_INPUT; - } - -- --/* Structure to represent results of found (or not) transliteration -- modules. */ --struct known_trans --{ -- /* This structure must remain the first member. */ -- struct trans_struct info; -- -- char *fname; -- void *handle; -- int open_count; --}; -- -- --/* Tree with results of previous calls to __gconv_translit_find. */ --static void *search_tree; -- --/* We modify global data. */ --__libc_lock_define_initialized (static, lock); -- -- --/* Compare two transliteration entries. */ --static int --trans_compare (const void *p1, const void *p2) --{ -- const struct known_trans *s1 = (const struct known_trans *) p1; -- const struct known_trans *s2 = (const struct known_trans *) p2; -- -- return strcmp (s1->info.name, s2->info.name); --} -- -- --/* Open (maybe reopen) the module named in the struct. Get the function -- and data structure pointers we need. */ --static int --open_translit (struct known_trans *trans) --{ -- __gconv_trans_query_fct queryfct; -- -- trans->handle = __libc_dlopen (trans->fname); -- if (trans->handle == NULL) -- /* Not available. */ -- return 1; -- -- /* Find the required symbol. */ -- queryfct = __libc_dlsym (trans->handle, "gconv_trans_context"); -- if (queryfct == NULL) -- { -- /* We cannot live with that. */ -- close_and_out: -- __libc_dlclose (trans->handle); -- trans->handle = NULL; -- return 1; -- } -- -- /* Get the context. */ -- if (queryfct (trans->info.name, &trans->info.csnames, &trans->info.ncsnames) -- != 0) -- goto close_and_out; -- -- /* Of course we also have to have the actual function. */ -- trans->info.trans_fct = __libc_dlsym (trans->handle, "gconv_trans"); -- if (trans->info.trans_fct == NULL) -- goto close_and_out; -- -- /* Now the optional functions. */ -- trans->info.trans_init_fct = -- __libc_dlsym (trans->handle, "gconv_trans_init"); -- trans->info.trans_context_fct = -- __libc_dlsym (trans->handle, "gconv_trans_context"); -- trans->info.trans_end_fct = -- __libc_dlsym (trans->handle, "gconv_trans_end"); -- -- trans->open_count = 1; -- -- return 0; --} -- -- - int - internal_function - __gconv_translit_find (struct trans_struct *trans) - { -- struct known_trans **found; -- const struct path_elem *runp; -- int res = 1; -- -- /* We have to have a name. */ -- assert (trans->name != NULL); -- -- /* Acquire the lock. */ -- __libc_lock_lock (lock); -- -- /* See whether we know this module already. */ -- found = __tfind (trans, &search_tree, trans_compare); -- if (found != NULL) -- { -- /* Is this module available? */ -- if ((*found)->handle != NULL) -- { -- /* Maybe we have to reopen the file. */ -- if ((*found)->handle != (void *) -1) -- /* The object is not unloaded. */ -- res = 0; -- else if (open_translit (*found) == 0) -- { -- /* Copy the data. */ -- *trans = (*found)->info; -- (*found)->open_count++; -- res = 0; -- } -- } -- } -- else -- { -- size_t name_len = strlen (trans->name) + 1; -- int need_so = 0; -- struct known_trans *newp; -- -- /* We have to continue looking for the module. */ -- if (__gconv_path_elem == NULL) -- __gconv_get_path (); -- -- /* See whether we have to append .so. */ -- if (name_len <= 4 || memcmp (&trans->name[name_len - 4], ".so", 3) != 0) -- need_so = 1; -- -- /* Create a new entry. */ -- newp = (struct known_trans *) malloc (sizeof (struct known_trans) -- + (__gconv_max_path_elem_len -- + name_len + 3) -- + name_len); -- if (newp != NULL) -- { -- char *cp; -- -- /* Clear the struct. */ -- memset (newp, '\0', sizeof (struct known_trans)); -- -- /* Store a copy of the module name. */ -- newp->info.name = cp = (char *) (newp + 1); -- cp = __mempcpy (cp, trans->name, name_len); -- -- newp->fname = cp; -- -- /* Search in all the directories. */ -- for (runp = __gconv_path_elem; runp->name != NULL; ++runp) -- { -- cp = __mempcpy (__stpcpy ((char *) newp->fname, runp->name), -- trans->name, name_len); -- if (need_so) -- memcpy (cp, ".so", sizeof (".so")); -- -- if (open_translit (newp) == 0) -- { -- /* We found a module. */ -- res = 0; -- break; -- } -- } -- -- if (res) -- newp->fname = NULL; -- -- /* In any case we'll add the entry to our search tree. */ -- if (__tsearch (newp, &search_tree, trans_compare) == NULL) -- { -- /* Yickes, this should not happen. Unload the object. */ -- res = 1; -- /* XXX unload here. */ -- } -- } -- } -- -- __libc_lock_unlock (lock); -- -- return res; -+ /* Transliteration module loading has been removed because it never -+ worked as intended and suffered from a security vulnerability. -+ Consequently, this function always fails. */ -+ return 1; - } diff --git a/pkgs/development/libraries/glibc/2.19/fix-math.patch b/pkgs/development/libraries/glibc/2.19/fix-math.patch deleted file mode 100644 index 516f53954dd..00000000000 --- a/pkgs/development/libraries/glibc/2.19/fix-math.patch +++ /dev/null @@ -1,336 +0,0 @@ -From: Siddhesh Poyarekar -Date: Thu, 27 Feb 2014 15:42:09 +0000 (+0530) -Subject: Fix sign of input to bsloww1 (BZ #16623) -X-Git-Url: http://repo.or.cz/w/glibc.git/commitdiff_plain/1cadc85813d736f7682fa2eeadae639ab6b66c65 - -Fix sign of input to bsloww1 (BZ #16623) - -In 84ba214c, I removed some redundant sign computations and in the -process, I incorrectly got rid of a temporary variable, thus passing -the absolute value of the input to bsloww1. This caused #16623. - -This fix undoes the incorrect change. - -[nix]: drop docs update (wouldn't apply) ---- - -diff --git a/math/auto-libm-test-in b/math/auto-libm-test-in -index ac5348f..fafe96f 100644 ---- a/math/auto-libm-test-in -+++ b/math/auto-libm-test-in -@@ -594,6 +594,7 @@ cos 0x1.0000010b239a9p0 - cos 0x1.00000162a932bp0 - cos 0x1.000002d452a10p0 - cos 0x1.000005bc7d86dp0 -+cos 0x1.200145a975ce6p32 - cos 1 - cos 2 - cos 3 -@@ -1748,6 +1749,7 @@ sin 7 - sin 8 - sin 9 - sin 10 -+sin 0x1.2001469775ce6p32 - - sincos 0 - sincos -0 -diff --git a/math/auto-libm-test-out b/math/auto-libm-test-out -index 8f79359..59c08a7 100644 ---- a/math/auto-libm-test-out -+++ b/math/auto-libm-test-out -@@ -74446,6 +74446,75 @@ cos 0x1.000005bc7d86dp0 - = cos tonearest ldbl-128ibm 0x1.000005bc7d86dp+0L : 0x8.a513ba9f703d3ffffffcb92354p-4L : inexact-ok - = cos towardzero ldbl-128ibm 0x1.000005bc7d86dp+0L : 0x8.a513ba9f703d3ffffffcb92354p-4L : inexact-ok - = cos upward ldbl-128ibm 0x1.000005bc7d86dp+0L : 0x8.a513ba9f703d3ffffffcb92358p-4L : inexact-ok -+cos 0x1.200145a975ce6p32 -+= cos downward flt-32 0x1.200146p+32f : -0xf.74fbep-4f : inexact-ok -+= cos tonearest flt-32 0x1.200146p+32f : -0xf.74fbdp-4f : inexact-ok -+= cos towardzero flt-32 0x1.200146p+32f : -0xf.74fbdp-4f : inexact-ok -+= cos upward flt-32 0x1.200146p+32f : -0xf.74fbdp-4f : inexact-ok -+= cos downward dbl-64 0x1.200146p+32 : -0xf.74fbd5498fe5p-4 : inexact-ok -+= cos tonearest dbl-64 0x1.200146p+32 : -0xf.74fbd5498fe5p-4 : inexact-ok -+= cos towardzero dbl-64 0x1.200146p+32 : -0xf.74fbd5498fe48p-4 : inexact-ok -+= cos upward dbl-64 0x1.200146p+32 : -0xf.74fbd5498fe48p-4 : inexact-ok -+= cos downward ldbl-96-intel 0x1.200146p+32L : -0xf.74fbd5498fe4c0dp-4L : inexact-ok -+= cos tonearest ldbl-96-intel 0x1.200146p+32L : -0xf.74fbd5498fe4c0cp-4L : inexact-ok -+= cos towardzero ldbl-96-intel 0x1.200146p+32L : -0xf.74fbd5498fe4c0cp-4L : inexact-ok -+= cos upward ldbl-96-intel 0x1.200146p+32L : -0xf.74fbd5498fe4c0cp-4L : inexact-ok -+= cos downward ldbl-96-m68k 0x1.200146p+32L : -0xf.74fbd5498fe4c0dp-4L : inexact-ok -+= cos tonearest ldbl-96-m68k 0x1.200146p+32L : -0xf.74fbd5498fe4c0cp-4L : inexact-ok -+= cos towardzero ldbl-96-m68k 0x1.200146p+32L : -0xf.74fbd5498fe4c0cp-4L : inexact-ok -+= cos upward ldbl-96-m68k 0x1.200146p+32L : -0xf.74fbd5498fe4c0cp-4L : inexact-ok -+= cos downward ldbl-128 0x1.200146p+32L : -0xf.74fbd5498fe4c0c71bd9e4ef59e8p-4L : inexact-ok -+= cos tonearest ldbl-128 0x1.200146p+32L : -0xf.74fbd5498fe4c0c71bd9e4ef59e8p-4L : inexact-ok -+= cos towardzero ldbl-128 0x1.200146p+32L : -0xf.74fbd5498fe4c0c71bd9e4ef59ep-4L : inexact-ok -+= cos upward ldbl-128 0x1.200146p+32L : -0xf.74fbd5498fe4c0c71bd9e4ef59ep-4L : inexact-ok -+= cos downward ldbl-128ibm 0x1.200146p+32L : -0xf.74fbd5498fe4c0c71bd9e4ef5cp-4L : inexact-ok -+= cos tonearest ldbl-128ibm 0x1.200146p+32L : -0xf.74fbd5498fe4c0c71bd9e4ef58p-4L : inexact-ok -+= cos towardzero ldbl-128ibm 0x1.200146p+32L : -0xf.74fbd5498fe4c0c71bd9e4ef58p-4L : inexact-ok -+= cos upward ldbl-128ibm 0x1.200146p+32L : -0xf.74fbd5498fe4c0c71bd9e4ef58p-4L : inexact-ok -+= cos downward flt-32 0x1.200144p+32f : 0xf.bc96cp-4f : inexact-ok -+= cos tonearest flt-32 0x1.200144p+32f : 0xf.bc96dp-4f : inexact-ok -+= cos towardzero flt-32 0x1.200144p+32f : 0xf.bc96cp-4f : inexact-ok -+= cos upward flt-32 0x1.200144p+32f : 0xf.bc96dp-4f : inexact-ok -+= cos downward dbl-64 0x1.200144p+32 : 0xf.bc96ca2c658a8p-4 : inexact-ok -+= cos tonearest dbl-64 0x1.200144p+32 : 0xf.bc96ca2c658a8p-4 : inexact-ok -+= cos towardzero dbl-64 0x1.200144p+32 : 0xf.bc96ca2c658a8p-4 : inexact-ok -+= cos upward dbl-64 0x1.200144p+32 : 0xf.bc96ca2c658bp-4 : inexact-ok -+= cos downward ldbl-96-intel 0x1.200144p+32L : 0xf.bc96ca2c658abf5p-4L : inexact-ok -+= cos tonearest ldbl-96-intel 0x1.200144p+32L : 0xf.bc96ca2c658abf6p-4L : inexact-ok -+= cos towardzero ldbl-96-intel 0x1.200144p+32L : 0xf.bc96ca2c658abf5p-4L : inexact-ok -+= cos upward ldbl-96-intel 0x1.200144p+32L : 0xf.bc96ca2c658abf6p-4L : inexact-ok -+= cos downward ldbl-96-m68k 0x1.200144p+32L : 0xf.bc96ca2c658abf5p-4L : inexact-ok -+= cos tonearest ldbl-96-m68k 0x1.200144p+32L : 0xf.bc96ca2c658abf6p-4L : inexact-ok -+= cos towardzero ldbl-96-m68k 0x1.200144p+32L : 0xf.bc96ca2c658abf5p-4L : inexact-ok -+= cos upward ldbl-96-m68k 0x1.200144p+32L : 0xf.bc96ca2c658abf6p-4L : inexact-ok -+= cos downward ldbl-128 0x1.200144p+32L : 0xf.bc96ca2c658abf5ace7b886a8fbp-4L : inexact-ok -+= cos tonearest ldbl-128 0x1.200144p+32L : 0xf.bc96ca2c658abf5ace7b886a8fbp-4L : inexact-ok -+= cos towardzero ldbl-128 0x1.200144p+32L : 0xf.bc96ca2c658abf5ace7b886a8fbp-4L : inexact-ok -+= cos upward ldbl-128 0x1.200144p+32L : 0xf.bc96ca2c658abf5ace7b886a8fb8p-4L : inexact-ok -+= cos downward ldbl-128ibm 0x1.200144p+32L : 0xf.bc96ca2c658abf5ace7b886a8cp-4L : inexact-ok -+= cos tonearest ldbl-128ibm 0x1.200144p+32L : 0xf.bc96ca2c658abf5ace7b886a9p-4L : inexact-ok -+= cos towardzero ldbl-128ibm 0x1.200144p+32L : 0xf.bc96ca2c658abf5ace7b886a8cp-4L : inexact-ok -+= cos upward ldbl-128ibm 0x1.200144p+32L : 0xf.bc96ca2c658abf5ace7b886a9p-4L : inexact-ok -+= cos downward dbl-64 0x1.200145a975ce6p+32 : -0x6.568e7ed3dffdp-4 : inexact-ok -+= cos tonearest dbl-64 0x1.200145a975ce6p+32 : -0x6.568e7ed3dffccp-4 : inexact-ok -+= cos towardzero dbl-64 0x1.200145a975ce6p+32 : -0x6.568e7ed3dffccp-4 : inexact-ok -+= cos upward dbl-64 0x1.200145a975ce6p+32 : -0x6.568e7ed3dffccp-4 : inexact-ok -+= cos downward ldbl-96-intel 0x1.200145a975ce6p+32L : -0x6.568e7ed3dffcdfe8p-4L : inexact-ok -+= cos tonearest ldbl-96-intel 0x1.200145a975ce6p+32L : -0x6.568e7ed3dffcdfep-4L : inexact-ok -+= cos towardzero ldbl-96-intel 0x1.200145a975ce6p+32L : -0x6.568e7ed3dffcdfep-4L : inexact-ok -+= cos upward ldbl-96-intel 0x1.200145a975ce6p+32L : -0x6.568e7ed3dffcdfep-4L : inexact-ok -+= cos downward ldbl-96-m68k 0x1.200145a975ce6p+32L : -0x6.568e7ed3dffcdfe8p-4L : inexact-ok -+= cos tonearest ldbl-96-m68k 0x1.200145a975ce6p+32L : -0x6.568e7ed3dffcdfep-4L : inexact-ok -+= cos towardzero ldbl-96-m68k 0x1.200145a975ce6p+32L : -0x6.568e7ed3dffcdfep-4L : inexact-ok -+= cos upward ldbl-96-m68k 0x1.200145a975ce6p+32L : -0x6.568e7ed3dffcdfep-4L : inexact-ok -+= cos downward ldbl-128 0x1.200145a975ce6p+32L : -0x6.568e7ed3dffcdfe227fd726840e8p-4L : inexact-ok -+= cos tonearest ldbl-128 0x1.200145a975ce6p+32L : -0x6.568e7ed3dffcdfe227fd726840e4p-4L : inexact-ok -+= cos towardzero ldbl-128 0x1.200145a975ce6p+32L : -0x6.568e7ed3dffcdfe227fd726840e4p-4L : inexact-ok -+= cos upward ldbl-128 0x1.200145a975ce6p+32L : -0x6.568e7ed3dffcdfe227fd726840e4p-4L : inexact-ok -+= cos downward ldbl-128ibm 0x1.200145a975ce6p+32L : -0x6.568e7ed3dffcdfe227fd726842p-4L : inexact-ok -+= cos tonearest ldbl-128ibm 0x1.200145a975ce6p+32L : -0x6.568e7ed3dffcdfe227fd72684p-4L : inexact-ok -+= cos towardzero ldbl-128ibm 0x1.200145a975ce6p+32L : -0x6.568e7ed3dffcdfe227fd72684p-4L : inexact-ok -+= cos upward ldbl-128ibm 0x1.200145a975ce6p+32L : -0x6.568e7ed3dffcdfe227fd72684p-4L : inexact-ok - cos 1 - = cos downward flt-32 0x1p+0f : 0x8.a514p-4f : inexact-ok - = cos tonearest flt-32 0x1p+0f : 0x8.a514p-4f : inexact-ok -@@ -157744,6 +157813,75 @@ sin 10 - = sin tonearest ldbl-128ibm 0xap+0L : -0x8.b44f7af9a7a92ce7fb22be025p-4L : inexact-ok - = sin towardzero ldbl-128ibm 0xap+0L : -0x8.b44f7af9a7a92ce7fb22be024cp-4L : inexact-ok - = sin upward ldbl-128ibm 0xap+0L : -0x8.b44f7af9a7a92ce7fb22be024cp-4L : inexact-ok -+sin 0x1.2001469775ce6p32 -+= sin downward flt-32 0x1.200148p+32f : -0x5.595d8p-4f : inexact-ok -+= sin tonearest flt-32 0x1.200148p+32f : -0x5.595d8p-4f : inexact-ok -+= sin towardzero flt-32 0x1.200148p+32f : -0x5.595d78p-4f : inexact-ok -+= sin upward flt-32 0x1.200148p+32f : -0x5.595d78p-4f : inexact-ok -+= sin downward dbl-64 0x1.200148p+32 : -0x5.595d7e536fe38p-4 : inexact-ok -+= sin tonearest dbl-64 0x1.200148p+32 : -0x5.595d7e536fe34p-4 : inexact-ok -+= sin towardzero dbl-64 0x1.200148p+32 : -0x5.595d7e536fe34p-4 : inexact-ok -+= sin upward dbl-64 0x1.200148p+32 : -0x5.595d7e536fe34p-4 : inexact-ok -+= sin downward ldbl-96-intel 0x1.200148p+32L : -0x5.595d7e536fe35eep-4L : inexact-ok -+= sin tonearest ldbl-96-intel 0x1.200148p+32L : -0x5.595d7e536fe35ed8p-4L : inexact-ok -+= sin towardzero ldbl-96-intel 0x1.200148p+32L : -0x5.595d7e536fe35ed8p-4L : inexact-ok -+= sin upward ldbl-96-intel 0x1.200148p+32L : -0x5.595d7e536fe35ed8p-4L : inexact-ok -+= sin downward ldbl-96-m68k 0x1.200148p+32L : -0x5.595d7e536fe35eep-4L : inexact-ok -+= sin tonearest ldbl-96-m68k 0x1.200148p+32L : -0x5.595d7e536fe35ed8p-4L : inexact-ok -+= sin towardzero ldbl-96-m68k 0x1.200148p+32L : -0x5.595d7e536fe35ed8p-4L : inexact-ok -+= sin upward ldbl-96-m68k 0x1.200148p+32L : -0x5.595d7e536fe35ed8p-4L : inexact-ok -+= sin downward ldbl-128 0x1.200148p+32L : -0x5.595d7e536fe35edbe2ad0df9d944p-4L : inexact-ok -+= sin tonearest ldbl-128 0x1.200148p+32L : -0x5.595d7e536fe35edbe2ad0df9d94p-4L : inexact-ok -+= sin towardzero ldbl-128 0x1.200148p+32L : -0x5.595d7e536fe35edbe2ad0df9d94p-4L : inexact-ok -+= sin upward ldbl-128 0x1.200148p+32L : -0x5.595d7e536fe35edbe2ad0df9d94p-4L : inexact-ok -+= sin downward ldbl-128ibm 0x1.200148p+32L : -0x5.595d7e536fe35edbe2ad0df9dap-4L : inexact-ok -+= sin tonearest ldbl-128ibm 0x1.200148p+32L : -0x5.595d7e536fe35edbe2ad0df9dap-4L : inexact-ok -+= sin towardzero ldbl-128ibm 0x1.200148p+32L : -0x5.595d7e536fe35edbe2ad0df9d8p-4L : inexact-ok -+= sin upward ldbl-128ibm 0x1.200148p+32L : -0x5.595d7e536fe35edbe2ad0df9d8p-4L : inexact-ok -+= sin downward flt-32 0x1.200146p+32f : 0x4.220ffp-4f : inexact-ok -+= sin tonearest flt-32 0x1.200146p+32f : 0x4.220ffp-4f : inexact-ok -+= sin towardzero flt-32 0x1.200146p+32f : 0x4.220ffp-4f : inexact-ok -+= sin upward flt-32 0x1.200146p+32f : 0x4.220ff8p-4f : inexact-ok -+= sin downward dbl-64 0x1.200146p+32 : 0x4.220ff25f5cfp-4 : inexact-ok -+= sin tonearest dbl-64 0x1.200146p+32 : 0x4.220ff25f5cf04p-4 : inexact-ok -+= sin towardzero dbl-64 0x1.200146p+32 : 0x4.220ff25f5cfp-4 : inexact-ok -+= sin upward dbl-64 0x1.200146p+32 : 0x4.220ff25f5cf04p-4 : inexact-ok -+= sin downward ldbl-96-intel 0x1.200146p+32L : 0x4.220ff25f5cf02a4p-4L : inexact-ok -+= sin tonearest ldbl-96-intel 0x1.200146p+32L : 0x4.220ff25f5cf02a48p-4L : inexact-ok -+= sin towardzero ldbl-96-intel 0x1.200146p+32L : 0x4.220ff25f5cf02a4p-4L : inexact-ok -+= sin upward ldbl-96-intel 0x1.200146p+32L : 0x4.220ff25f5cf02a48p-4L : inexact-ok -+= sin downward ldbl-96-m68k 0x1.200146p+32L : 0x4.220ff25f5cf02a4p-4L : inexact-ok -+= sin tonearest ldbl-96-m68k 0x1.200146p+32L : 0x4.220ff25f5cf02a48p-4L : inexact-ok -+= sin towardzero ldbl-96-m68k 0x1.200146p+32L : 0x4.220ff25f5cf02a4p-4L : inexact-ok -+= sin upward ldbl-96-m68k 0x1.200146p+32L : 0x4.220ff25f5cf02a48p-4L : inexact-ok -+= sin downward ldbl-128 0x1.200146p+32L : 0x4.220ff25f5cf02a464dbb3a679ccp-4L : inexact-ok -+= sin tonearest ldbl-128 0x1.200146p+32L : 0x4.220ff25f5cf02a464dbb3a679ccp-4L : inexact-ok -+= sin towardzero ldbl-128 0x1.200146p+32L : 0x4.220ff25f5cf02a464dbb3a679ccp-4L : inexact-ok -+= sin upward ldbl-128 0x1.200146p+32L : 0x4.220ff25f5cf02a464dbb3a679cc4p-4L : inexact-ok -+= sin downward ldbl-128ibm 0x1.200146p+32L : 0x4.220ff25f5cf02a464dbb3a679cp-4L : inexact-ok -+= sin tonearest ldbl-128ibm 0x1.200146p+32L : 0x4.220ff25f5cf02a464dbb3a679cp-4L : inexact-ok -+= sin towardzero ldbl-128ibm 0x1.200146p+32L : 0x4.220ff25f5cf02a464dbb3a679cp-4L : inexact-ok -+= sin upward ldbl-128ibm 0x1.200146p+32L : 0x4.220ff25f5cf02a464dbb3a679ep-4L : inexact-ok -+= sin downward dbl-64 0x1.2001469775ce6p+32 : -0x6.444fda50019fcp-4 : inexact-ok -+= sin tonearest dbl-64 0x1.2001469775ce6p+32 : -0x6.444fda50019f8p-4 : inexact-ok -+= sin towardzero dbl-64 0x1.2001469775ce6p+32 : -0x6.444fda50019f8p-4 : inexact-ok -+= sin upward dbl-64 0x1.2001469775ce6p+32 : -0x6.444fda50019f8p-4 : inexact-ok -+= sin downward ldbl-96-intel 0x1.2001469775ce6p+32L : -0x6.444fda50019f9f6p-4L : inexact-ok -+= sin tonearest ldbl-96-intel 0x1.2001469775ce6p+32L : -0x6.444fda50019f9f58p-4L : inexact-ok -+= sin towardzero ldbl-96-intel 0x1.2001469775ce6p+32L : -0x6.444fda50019f9f58p-4L : inexact-ok -+= sin upward ldbl-96-intel 0x1.2001469775ce6p+32L : -0x6.444fda50019f9f58p-4L : inexact-ok -+= sin downward ldbl-96-m68k 0x1.2001469775ce6p+32L : -0x6.444fda50019f9f6p-4L : inexact-ok -+= sin tonearest ldbl-96-m68k 0x1.2001469775ce6p+32L : -0x6.444fda50019f9f58p-4L : inexact-ok -+= sin towardzero ldbl-96-m68k 0x1.2001469775ce6p+32L : -0x6.444fda50019f9f58p-4L : inexact-ok -+= sin upward ldbl-96-m68k 0x1.2001469775ce6p+32L : -0x6.444fda50019f9f58p-4L : inexact-ok -+= sin downward ldbl-128 0x1.2001469775ce6p+32L : -0x6.444fda50019f9f5ba3779ca70604p-4L : inexact-ok -+= sin tonearest ldbl-128 0x1.2001469775ce6p+32L : -0x6.444fda50019f9f5ba3779ca706p-4L : inexact-ok -+= sin towardzero ldbl-128 0x1.2001469775ce6p+32L : -0x6.444fda50019f9f5ba3779ca706p-4L : inexact-ok -+= sin upward ldbl-128 0x1.2001469775ce6p+32L : -0x6.444fda50019f9f5ba3779ca706p-4L : inexact-ok -+= sin downward ldbl-128ibm 0x1.2001469775ce6p+32L : -0x6.444fda50019f9f5ba3779ca708p-4L : inexact-ok -+= sin tonearest ldbl-128ibm 0x1.2001469775ce6p+32L : -0x6.444fda50019f9f5ba3779ca706p-4L : inexact-ok -+= sin towardzero ldbl-128ibm 0x1.2001469775ce6p+32L : -0x6.444fda50019f9f5ba3779ca706p-4L : inexact-ok -+= sin upward ldbl-128ibm 0x1.2001469775ce6p+32L : -0x6.444fda50019f9f5ba3779ca706p-4L : inexact-ok - sincos 0 - = sincos downward flt-32 0x0p+0f : 0x0p+0f 0x1p+0f : inexact-ok - = sincos tonearest flt-32 0x0p+0f : 0x0p+0f 0x1p+0f : inexact-ok -diff --git a/sysdeps/ieee754/dbl-64/s_sin.c b/sysdeps/ieee754/dbl-64/s_sin.c -index 6105e9f..50109b8 100644 ---- a/sysdeps/ieee754/dbl-64/s_sin.c -+++ b/sysdeps/ieee754/dbl-64/s_sin.c -@@ -447,19 +447,21 @@ __sin (double x) - } - else - { -+ double t; - if (a > 0) - { - m = 1; -+ t = a; - db = da; - } - else - { - m = 0; -- a = -a; -+ t = -a; - db = -da; - } -- u.x = big + a; -- y = a - (u.x - big); -+ u.x = big + t; -+ y = t - (u.x - big); - res = do_sin (u, y, db, &cor); - cor = (cor > 0) ? 1.035 * cor + eps : 1.035 * cor - eps; - retval = ((res == res + cor) ? ((m) ? res : -res) -@@ -671,19 +673,21 @@ __cos (double x) - } - else - { -+ double t; - if (a > 0) - { - m = 1; -+ t = a; - db = da; - } - else - { - m = 0; -- a = -a; -+ t = -a; - db = -da; - } -- u.x = big + a; -- y = a - (u.x - big); -+ u.x = big + t; -+ y = t - (u.x - big); - res = do_sin (u, y, db, &cor); - cor = (cor > 0) ? 1.035 * cor + eps : 1.035 * cor - eps; - retval = ((res == res + cor) ? ((m) ? res : -res) -diff --git a/sysdeps/x86_64/fpu/libm-test-ulps b/sysdeps/x86_64/fpu/libm-test-ulps -index f3980f8..544f1c7 100644 ---- a/sysdeps/x86_64/fpu/libm-test-ulps -+++ b/sysdeps/x86_64/fpu/libm-test-ulps -@@ -10900,6 +10900,14 @@ idouble: 1 - Test "cos_downward (0x1.0c152382d7365p+0)": - double: 1 - idouble: 1 -+Test "cos_downward (0x1.200145a975ce6p+32)": -+double: 1 -+idouble: 1 -+ildouble: 1 -+ldouble: 1 -+Test "cos_downward (0x1.200146p+32)": -+ildouble: 1 -+ldouble: 1 - Test "cos_downward (0x1.921fb4p+0)": - ildouble: 1 - ldouble: 1 -@@ -11126,6 +11134,9 @@ idouble: 1 - Test "cos_towardzero (0x1.0c152382d7365p+0)": - double: 1 - idouble: 1 -+Test "cos_towardzero (0x1.200146p+32)": -+double: 1 -+idouble: 1 - Test "cos_towardzero (0x1.921fb4p+0)": - ildouble: 1 - ldouble: 1 -@@ -11258,6 +11269,17 @@ idouble: 1 - Test "cos_upward (0x1.0c1524p+0)": - double: 1 - idouble: 1 -+Test "cos_upward (0x1.200144p+32)": -+double: 1 -+idouble: 1 -+Test "cos_upward (0x1.200145a975ce6p+32)": -+ildouble: 1 -+ldouble: 1 -+Test "cos_upward (0x1.200146p+32)": -+double: 1 -+idouble: 1 -+ildouble: 1 -+ldouble: 1 - Test "cos_upward (0x1.921fb4p+0)": - double: 1 - idouble: 1 -@@ -15155,6 +15177,19 @@ double: 1 - idouble: 1 - ildouble: 1 - ldouble: 1 -+Test "sin_downward (0x1.2001469775ce6p+32)": -+double: 1 -+idouble: 1 -+ildouble: 1 -+ldouble: 1 -+Test "sin_downward (0x1.200146p+32)": -+double: 1 -+idouble: 1 -+Test "sin_downward (0x1.200148p+32)": -+double: 1 -+idouble: 1 -+ildouble: 1 -+ldouble: 1 - Test "sin_downward (0x1.921fb54442d18468p+0)": - ildouble: 1 - ldouble: 1 -@@ -15383,6 +15418,9 @@ double: 1 - idouble: 1 - ildouble: 1 - ldouble: 1 -+Test "sin_towardzero (0x1.200146p+32)": -+double: 1 -+idouble: 1 - Test "sin_towardzero (0x1.921fb54442d18468p+0)": - ildouble: 1 - ldouble: 1 -@@ -15532,6 +15570,12 @@ ldouble: 1 - Test "sin_upward (-0x8.60a92p-4)": - ildouble: 1 - ldouble: 1 -+Test "sin_upward (0x1.2001469775ce6p+32)": -+ildouble: 1 -+ldouble: 1 -+Test "sin_upward (0x1.200148p+32)": -+ildouble: 1 -+ldouble: 1 - Test "sin_upward (0x1.921fb4p+0)": - double: 1 - idouble: 1 diff --git a/pkgs/development/libraries/glibc/2.19/glibc-remove-date-from-compilation-banner.patch b/pkgs/development/libraries/glibc/2.19/glibc-remove-date-from-compilation-banner.patch deleted file mode 100644 index 5d0b1a51762..00000000000 --- a/pkgs/development/libraries/glibc/2.19/glibc-remove-date-from-compilation-banner.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ur glibc-2.17.orig/csu/Makefile glibc-2.17/csu/Makefile ---- glibc-2.17.orig/csu/Makefile 2012-12-25 04:02:13.000000000 +0100 -+++ glibc-2.17/csu/Makefile 2013-08-19 16:01:57.132378550 +0200 -@@ -172,7 +172,7 @@ - os=Linux; \ - fi; \ - printf '"Compiled on a %s %s system on %s.\\n"\n' \ -- "$$os" "$$version" "`date +%Y-%m-%d`";; \ -+ "$$os" "$$version";; \ - *) ;; \ - esac; \ - files="$(all-Banner-files)"; \ diff --git a/pkgs/development/libraries/glibc/2.19/builder.sh b/pkgs/development/libraries/glibc/builder.sh similarity index 91% rename from pkgs/development/libraries/glibc/2.19/builder.sh rename to pkgs/development/libraries/glibc/builder.sh index 3b077cbb3fd..2836063e3bf 100644 --- a/pkgs/development/libraries/glibc/2.19/builder.sh +++ b/pkgs/development/libraries/glibc/builder.sh @@ -46,10 +46,6 @@ postInstall() { ln -s lib $out/lib64 fi - # This file, that should not remain in the glibc derivation, - # may have not been created during the preInstall - rm -f $out/lib/libgcc_s.so.1 - # Get rid of more unnecessary stuff. rm -rf $out/var $out/sbin/sln } diff --git a/pkgs/development/libraries/glibc/2.19/common.nix b/pkgs/development/libraries/glibc/common.nix similarity index 93% rename from pkgs/development/libraries/glibc/2.19/common.nix rename to pkgs/development/libraries/glibc/common.nix index 23efc01a397..55f8d8a1725 100644 --- a/pkgs/development/libraries/glibc/2.19/common.nix +++ b/pkgs/development/libraries/glibc/common.nix @@ -13,7 +13,7 @@ cross: let - version = "2.19"; + version = "2.20"; in @@ -56,14 +56,6 @@ stdenv.mkDerivation ({ "/bin:/usr/bin", which is inappropriate on NixOS machines. This patch extends the search path by "/run/current-system/sw/bin". */ ./fix_path_attribute_in_getconf.patch - - ./fix-math.patch - - ./cve-2014-0475.patch - ./cve-2014-5119.patch - - /* Remove references to the compilation date. */ - ./glibc-remove-date-from-compilation-banner.patch ]; postPatch = @@ -77,8 +69,11 @@ stdenv.mkDerivation ({ + '' echo "LDFLAGS-nscd += -static-libgcc" >> nscd/Makefile '' - # Replace the date and time in nscd by $out. - # It is used as a protocol compatibility check. + # Replace the date and time in nscd by a prefix of $out. + # It is used as a protocol compatibility check. + # Note: the size of the struct changes, but using only a part + # would break hash-rewriting. When receiving stats it does check + # that the struct sizes match and can't cause overflow or something. + '' cat ${./glibc-remove-datetime-from-nscd.patch} \ | sed "s,@out@,$out," | patch -p1 @@ -155,7 +150,7 @@ stdenv.mkDerivation ({ } else fetchurl { url = "mirror://gnu/glibc/glibc-${version}.tar.gz"; - sha256 = "15n7x9mmzhd7w6s5hd9srx0h23b32gwb306x98k9ss940yvnvb8q"; + sha256 = "1g6ysvk15arpi7c1f1fpx5slgfr2k3dqd5xr0yvijajp1m0xxq9p"; }; # Remove absolute paths from `configure' & co.; build out-of-tree. @@ -172,8 +167,8 @@ stdenv.mkDerivation ({ configureScript="`pwd`/../$sourceRoot/configure" - ${stdenv.lib.optionalString (stdenv.gcc.libc != null) - ''makeFlags="$makeFlags BUILD_LDFLAGS=-Wl,-rpath,${stdenv.gcc.libc}/lib"'' + ${stdenv.lib.optionalString (stdenv.cc.libc != null) + ''makeFlags="$makeFlags BUILD_LDFLAGS=-Wl,-rpath,${stdenv.cc.libc}/lib"'' } ${preConfigure} diff --git a/pkgs/development/libraries/glibc/2.19/default.nix b/pkgs/development/libraries/glibc/default.nix similarity index 94% rename from pkgs/development/libraries/glibc/2.19/default.nix rename to pkgs/development/libraries/glibc/default.nix index 52a94bd0a0d..3273b89c84e 100644 --- a/pkgs/development/libraries/glibc/2.19/default.nix +++ b/pkgs/development/libraries/glibc/default.nix @@ -8,7 +8,7 @@ , withGd ? false, gd ? null, libpng ? null }: -assert stdenv.gcc.gcc != null; +assert stdenv.cc ? gcc; let build = import ./common.nix; @@ -33,9 +33,9 @@ in # libgcc_s will not be at {gcc}/lib, and gcc's libgcc will be found without # any special hack. preInstall = '' - if [ -f ${stdenv.gcc.gcc}/lib/libgcc_s.so.1 ]; then + if [ -f ${stdenv.cc.gcc}/lib/libgcc_s.so.1 ]; then mkdir -p $out/lib - ln -s ${stdenv.gcc.gcc}/lib/libgcc_s.so.1 $out/lib/libgcc_s.so.1 + cp ${stdenv.cc.gcc}/lib/libgcc_s.so.1 $out/lib/libgcc_s.so.1 fi ''; diff --git a/pkgs/development/libraries/glibc/2.19/dont-use-system-ld-so-cache.patch b/pkgs/development/libraries/glibc/dont-use-system-ld-so-cache.patch similarity index 100% rename from pkgs/development/libraries/glibc/2.19/dont-use-system-ld-so-cache.patch rename to pkgs/development/libraries/glibc/dont-use-system-ld-so-cache.patch diff --git a/pkgs/development/libraries/glibc/2.19/dont-use-system-ld-so-preload.patch b/pkgs/development/libraries/glibc/dont-use-system-ld-so-preload.patch similarity index 55% rename from pkgs/development/libraries/glibc/2.19/dont-use-system-ld-so-preload.patch rename to pkgs/development/libraries/glibc/dont-use-system-ld-so-preload.patch index fabb6c3ec5e..894e2a11cf8 100644 --- a/pkgs/development/libraries/glibc/2.19/dont-use-system-ld-so-preload.patch +++ b/pkgs/development/libraries/glibc/dont-use-system-ld-so-preload.patch @@ -1,12 +1,12 @@ -diff -rupN a/elf/rtld.c b/elf/rtld.c ---- a/elf/rtld.c 2013-08-11 00:52:55.000000001 +0200 -+++ b/elf/rtld.c 2014-02-18 13:56:19.000000001 +0100 -@@ -1639,7 +1639,7 @@ ERROR: ld.so: object '%s' cannot be load +diff -ru glibc-2.20-orig/elf/rtld.c glibc-2.20/elf/rtld.c +--- glibc-2.20-orig/elf/rtld.c 2014-09-07 10:09:09.000000000 +0200 ++++ glibc-2.20/elf/rtld.c 2014-10-27 11:32:25.203043157 +0100 +@@ -1513,7 +1513,7 @@ open(). So we do this first. If it succeeds we do almost twice the work but this does not matter, since it is not for production use. */ - static const char preload_file[] = "/etc/ld.so.preload"; + static const char preload_file[] = "/etc/ld-nix.so.preload"; - if (__builtin_expect (__access (preload_file, R_OK) == 0, 0)) + if (__glibc_unlikely (__access (preload_file, R_OK) == 0)) { /* Read the contents of the file. */ diff --git a/pkgs/development/libraries/glibc/2.19/fix_path_attribute_in_getconf.patch b/pkgs/development/libraries/glibc/fix_path_attribute_in_getconf.patch similarity index 100% rename from pkgs/development/libraries/glibc/2.19/fix_path_attribute_in_getconf.patch rename to pkgs/development/libraries/glibc/fix_path_attribute_in_getconf.patch diff --git a/pkgs/development/libraries/glibc/2.19/glibc-crypt-blowfish.patch b/pkgs/development/libraries/glibc/glibc-crypt-blowfish.patch similarity index 100% rename from pkgs/development/libraries/glibc/2.19/glibc-crypt-blowfish.patch rename to pkgs/development/libraries/glibc/glibc-crypt-blowfish.patch diff --git a/pkgs/development/libraries/glibc/2.19/glibc-remove-datetime-from-nscd.patch b/pkgs/development/libraries/glibc/glibc-remove-datetime-from-nscd.patch similarity index 84% rename from pkgs/development/libraries/glibc/2.19/glibc-remove-datetime-from-nscd.patch rename to pkgs/development/libraries/glibc/glibc-remove-datetime-from-nscd.patch index 0a5456ea5c4..db010e62366 100644 --- a/pkgs/development/libraries/glibc/2.19/glibc-remove-datetime-from-nscd.patch +++ b/pkgs/development/libraries/glibc/glibc-remove-datetime-from-nscd.patch @@ -5,7 +5,7 @@ /* We use this to make sure the receiver is the same. */ -static const char compilation[21] = __DATE__ " " __TIME__; -+static const char compilation[21] = "@out@"; ++static const char compilation[] = "@out@"; /* Statistic data for one database. */ struct dbstat diff --git a/pkgs/development/libraries/glibc/2.19/info.nix b/pkgs/development/libraries/glibc/info.nix similarity index 100% rename from pkgs/development/libraries/glibc/2.19/info.nix rename to pkgs/development/libraries/glibc/info.nix diff --git a/pkgs/development/libraries/glibc/2.19/locales-builder.sh b/pkgs/development/libraries/glibc/locales-builder.sh similarity index 100% rename from pkgs/development/libraries/glibc/2.19/locales-builder.sh rename to pkgs/development/libraries/glibc/locales-builder.sh diff --git a/pkgs/development/libraries/glibc/2.19/locales.nix b/pkgs/development/libraries/glibc/locales.nix similarity index 92% rename from pkgs/development/libraries/glibc/2.19/locales.nix rename to pkgs/development/libraries/glibc/locales.nix index 9f9fb86a396..1dd15832f5b 100644 --- a/pkgs/development/libraries/glibc/2.19/locales.nix +++ b/pkgs/development/libraries/glibc/locales.nix @@ -28,8 +28,8 @@ build null { mkdir -p $TMPDIR/"$(dirname $(readlink -f $(type -p localedef)))/../lib/locale" # Hack to allow building of the locales (needed since glibc-2.12) - sed -i -e "s,^LOCALEDEF=.*,LOCALEDEF=localedef --prefix=$TMPDIR," -e \ - /library-path/d ../glibc-2*/localedata/Makefile + sed -i -e 's,^$(rtld-prefix) $(common-objpfx)locale/localedef,localedef --prefix='$TMPDIR',' ../glibc-2*/localedata/Makefile + ${if allLocales then "" else "echo SUPPORTED-LOCALES=\"${toString locales}\" > ../glibc-2*/localedata/SUPPORTED"} diff --git a/pkgs/development/libraries/glibc/2.19/multi.nix b/pkgs/development/libraries/glibc/multi.nix similarity index 84% rename from pkgs/development/libraries/glibc/2.19/multi.nix rename to pkgs/development/libraries/glibc/multi.nix index ad4a34152b6..e0a9fa46b96 100644 --- a/pkgs/development/libraries/glibc/2.19/multi.nix +++ b/pkgs/development/libraries/glibc/multi.nix @@ -1,7 +1,10 @@ { runCommand, glibc, glibc32 }: -runCommand "${glibc.name}-multi" +let + nameVersion = builtins.parseDrvName glibc.name; +in +runCommand "${nameVersion.name}-multi-${nameVersion.version}" { inherit glibc32; glibc64 = glibc; } diff --git a/pkgs/development/libraries/glibc/2.19/nix-locale-archive.patch b/pkgs/development/libraries/glibc/nix-locale-archive.patch similarity index 100% rename from pkgs/development/libraries/glibc/2.19/nix-locale-archive.patch rename to pkgs/development/libraries/glibc/nix-locale-archive.patch diff --git a/pkgs/development/libraries/glibc/2.19/rpcgen-path.patch b/pkgs/development/libraries/glibc/rpcgen-path.patch similarity index 100% rename from pkgs/development/libraries/glibc/2.19/rpcgen-path.patch rename to pkgs/development/libraries/glibc/rpcgen-path.patch diff --git a/pkgs/development/libraries/glibmm/default.nix b/pkgs/development/libraries/glibmm/default.nix index 66fb0179489..c0f0983d73d 100644 --- a/pkgs/development/libraries/glibmm/default.nix +++ b/pkgs/development/libraries/glibmm/default.nix @@ -1,15 +1,15 @@ { stdenv, fetchurl, pkgconfig, glib, libsigcxx }: let - ver_maj = "2.38"; - ver_min = "1"; + ver_maj = "2.42"; + ver_min = "0"; in stdenv.mkDerivation rec { name = "glibmm-${ver_maj}.${ver_min}"; src = fetchurl { url = "mirror://gnome/sources/glibmm/${ver_maj}/${name}.tar.xz"; - sha256 = "18n4czi6lh4ncj54apxms18xn9k8pmrp2ba9sxn0sk9w3pp2bja9"; + sha256 = "985083d97378d234da27a7243587cc0d186897a4b2d3c1286f794089be1a3397"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/pkgs/development/libraries/glm/0954.nix b/pkgs/development/libraries/glm/0954.nix new file mode 100644 index 00000000000..a5b62c6b04e --- /dev/null +++ b/pkgs/development/libraries/glm/0954.nix @@ -0,0 +1,35 @@ +{ stdenv, fetchurl, unzip }: + +stdenv.mkDerivation rec { + name = "glm-0.9.5.4"; + + src = fetchurl { + url = "mirror://sourceforge/project/ogl-math/${name}/${name}.zip"; + sha256 = "0v14xssysy3q1h2mga6rqlz722mwbis4rrx76zmvhjqh17qh4l62"; + }; + + buildInputs = [ unzip ]; + + outputs = [ "out" "doc" ]; + + installPhase = '' + mkdir -p "$out/include" + cp -r glm "$out/include" + + mkdir -p "$doc/share/doc/glm" + cp -r doc/* "$doc/share/doc/glm" + ''; + + meta = with stdenv.lib; { + description = "OpenGL Mathematics library for C++"; + longDescription = '' + OpenGL Mathematics (GLM) is a header only C++ mathematics library for + graphics software based on the OpenGL Shading Language (GLSL) + specification and released under the MIT license. + ''; + homepage = http://glm.g-truc.net/; + license = licenses.mit; + platforms = platforms.unix; + maintainers = with stdenv.lib.maintainers; [ fuuzetsu ]; + }; +} diff --git a/pkgs/development/libraries/glog/default.nix b/pkgs/development/libraries/glog/default.nix index d3f74f4043a..9e26d8ecf05 100644 --- a/pkgs/development/libraries/glog/default.nix +++ b/pkgs/development/libraries/glog/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://code.google.com/p/google-glog/; - license = "BSD"; + license = stdenv.lib.licenses.bsd3; description = "Library for application-level logging"; }; } diff --git a/pkgs/development/libraries/gnet/default.nix b/pkgs/development/libraries/gnet/default.nix index f294889dd32..6b05bda1b3a 100644 --- a/pkgs/development/libraries/gnet/default.nix +++ b/pkgs/development/libraries/gnet/default.nix @@ -1,12 +1,22 @@ -{stdenv, fetchurl, pkgconfig, glib}: - -assert pkgconfig != null && glib != null; +{stdenv, fetchFromGitHub, pkgconfig, autoconf, automake, glib, libtool }: stdenv.mkDerivation { - name = "gnet-2.0.7"; - src = fetchurl { - url = http://www.gnetlibrary.org/src/gnet-2.0.7.tar.gz; - md5 = "3a7a40411775688fe4c42141ab007048"; + name = "gnet-2.0.8"; + src = fetchFromGitHub { + owner = "GNOME"; + repo = "gnet"; + rev = "GNET_2_0_8"; + sha256 = "1cy78kglzi235md964ikvm0rg801bx0yk9ya8zavndjnaarzqq87"; + }; + + buildInputs = [ pkgconfig autoconf automake glib libtool ]; + + preConfigure = "./autogen.sh"; + + meta = with stdenv.lib; { + description = "A network library, written in C, object-oriented, and built upon GLib"; + homepage = https://developer.gnome.org/gnet/; + platforms = platforms.linux; + maintainers = with maintainers; [ pSub ]; }; - buildInputs = [pkgconfig glib]; } diff --git a/pkgs/development/libraries/gnutls/3.1.nix b/pkgs/development/libraries/gnutls/3.1.nix deleted file mode 100644 index 44ea0176e38..00000000000 --- a/pkgs/development/libraries/gnutls/3.1.nix +++ /dev/null @@ -1,67 +0,0 @@ -{ fetchurl, stdenv, zlib, lzo, libtasn1, nettle, pkgconfig, lzip -, guileBindings, guile, perl, gmp }: - -assert guileBindings -> guile != null; - -stdenv.mkDerivation rec { - name = "gnutls-3.1.26"; - - src = fetchurl { - url = "ftp://ftp.gnutls.org/gcrypt/gnutls/v3.1/${name}.tar.lz"; - sha256 = "7947e18fd0c292c0274d810c9bdf674b8faa3566e056ea404a39f335982607a3"; - }; - - # FreeBSD doesn't have , and Gnulib's `alloca' module isn't used. - patches = stdenv.lib.optional stdenv.isFreeBSD ./guile-gnulib-includes.patch; - - # Note: GMP is a dependency of Nettle, whose public headers include - # GMP headers, hence the hack. - configurePhase = '' - ./configure --prefix="$out" \ - --disable-dependency-tracking --enable-fast-install \ - --without-p11-kit \ - --with-lzo --with-libtasn1-prefix="${libtasn1}" \ - --with-libnettle-prefix="${nettle}" \ - CPPFLAGS="-I${gmp}/include" \ - ${stdenv.lib.optionalString guileBindings - "--enable-guile --with-guile-site-dir=\"$out/share/guile/site\""} - ''; - - # Build of the Guile bindings is not parallel-safe. See - # - # for the actual fix. - enableParallelBuilding = !guileBindings; - - buildInputs = [ zlib lzo lzip ] - ++ stdenv.lib.optional guileBindings guile; - - nativeBuildInputs = [ perl pkgconfig ]; - - propagatedBuildInputs = [ nettle libtasn1 ]; - - # XXX: Gnulib's `test-select' fails on FreeBSD: - # http://hydra.nixos.org/build/2962084/nixlog/1/raw . - doCheck = false;#(!stdenv.isFreeBSD && !stdenv.isDarwin); - - meta = { - description = "The GNU Transport Layer Security Library"; - - longDescription = '' - GnuTLS is a project that aims to develop a library which - provides a secure layer, over a reliable transport - layer. Currently the GnuTLS library implements the proposed - standards by the IETF's TLS working group. - - Quoting from the TLS protocol specification: - - "The TLS protocol provides communications privacy over the - Internet. The protocol allows client/server applications to - communicate in a way that is designed to prevent eavesdropping, - tampering, or message forgery." - ''; - - homepage = http://www.gnu.org/software/gnutls/; - license = stdenv.lib.licenses.lgpl21Plus; - maintainers = [ stdenv.lib.maintainers.eelco ]; - }; -} diff --git a/pkgs/development/libraries/gnutls/3.2.nix b/pkgs/development/libraries/gnutls/3.2.nix index 5bf933fbc96..e9254a445de 100644 --- a/pkgs/development/libraries/gnutls/3.2.nix +++ b/pkgs/development/libraries/gnutls/3.2.nix @@ -4,11 +4,11 @@ assert guileBindings -> guile != null; stdenv.mkDerivation rec { - name = "gnutls-3.2.17"; + name = "gnutls-3.2.20"; src = fetchurl { url = "ftp://ftp.gnutls.org/gcrypt/gnutls/v3.2/${name}.tar.lz"; - sha256 = "a332adda1d294fbee859ae46ee0c128d8959c4a5b9c28e7cdbe5c9b56898fc25"; + sha256 = "0mjwzj486g0aj5i3zr70mixmbd4ldrj1ckrwmcr90si6bqa0sc6q"; }; patches = diff --git a/pkgs/development/libraries/gobject-introspection/default.nix b/pkgs/development/libraries/gobject-introspection/default.nix index 4b7ec1f4116..8263ee7071c 100644 --- a/pkgs/development/libraries/gobject-introspection/default.nix +++ b/pkgs/development/libraries/gobject-introspection/default.nix @@ -16,10 +16,10 @@ stdenv.mkDerivation rec { sha256 = "162flbzwzz0b8axab2gimc4dglpaw88fh1d177zfg0whczlpbsln"; }; - buildInputs = [ flex bison glib pkgconfig python ] + buildInputs = [ flex bison pkgconfig python ] ++ libintlOrEmpty ++ stdenv.lib.optional stdenv.isDarwin otool; - propagatedBuildInputs = [ libffi ]; + propagatedBuildInputs = [ libffi glib ]; # Tests depend on cairo, which is undesirable (it pulls in lots of # other dependencies). diff --git a/pkgs/development/libraries/gpgme/default.nix b/pkgs/development/libraries/gpgme/default.nix index e30e2d7cf70..c77500906e6 100644 --- a/pkgs/development/libraries/gpgme/default.nix +++ b/pkgs/development/libraries/gpgme/default.nix @@ -11,11 +11,11 @@ let "${gnupg}/bin/gpg2"; in stdenv.mkDerivation rec { - name = "gpgme-1.5.2"; + name = "gpgme-1.5.3"; src = fetchurl { url = "ftp://ftp.gnupg.org/gcrypt/gpgme/${name}.tar.bz2"; - sha256 = "1m7i0krffw4717jx7211d0pk4wi2rldg2bp7xgl6a0kgl6hb160y"; + sha256 = "1jgwmra6cf0i5x2prj92w77vl7hmj276qmmll3lwysbyn32l1c0d"; }; propagatedBuildInputs = [ libgpgerror glib libassuan pth ]; diff --git a/pkgs/development/libraries/gstreamer/bad/default.nix b/pkgs/development/libraries/gstreamer/bad/default.nix index a573dc561fd..96a094ca9cc 100644 --- a/pkgs/development/libraries/gstreamer/bad/default.nix +++ b/pkgs/development/libraries/gstreamer/bad/default.nix @@ -11,7 +11,7 @@ assert faacSupport -> faac != null; stdenv.mkDerivation rec { - name = "gst-plugins-bad-1.4.3"; + name = "gst-plugins-bad-1.4.5"; meta = with stdenv.lib; { description = "Gstreamer Bad Plugins"; @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "${meta.homepage}/src/gst-plugins-bad/${name}.tar.xz"; - sha256 = "a6840080c469d0db51d6d4d0f7c42c97b3c8c01942f24401c61b1ad36726b97c"; + sha256 = "0g4q9yqq71z32pz7zj54wigkcf438a2mcv5kvvwp4gb8a1rasbqm"; }; nativeBuildInputs = [ pkgconfig python ]; diff --git a/pkgs/development/libraries/gstreamer/base/default.nix b/pkgs/development/libraries/gstreamer/base/default.nix index 854fa8f0c34..61e0762826a 100644 --- a/pkgs/development/libraries/gstreamer/base/default.nix +++ b/pkgs/development/libraries/gstreamer/base/default.nix @@ -4,7 +4,7 @@ }: stdenv.mkDerivation rec { - name = "gst-plugins-base-1.4.3"; + name = "gst-plugins-base-1.4.5"; meta = { description = "Base plugins and helper libraries"; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "${meta.homepage}/src/gst-plugins-base/${name}.tar.xz"; - sha256 = "f7b4d2b3ba2bcac485896e2c1c36459cb091ebe8b49e91635c27d40f66792d9d"; + sha256 = "07ampnfa6p41s0lhia62l9h8bdx3c7vxvdz93pbx64m3wycq3gbp"; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/gstreamer/core/default.nix b/pkgs/development/libraries/gstreamer/core/default.nix index 5ab1ec6a31f..78d3c3f1a23 100644 --- a/pkgs/development/libraries/gstreamer/core/default.nix +++ b/pkgs/development/libraries/gstreamer/core/default.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation rec { - name = "gstreamer-1.4.3"; + name = "gstreamer-1.4.5"; meta = { description = "Open source multimedia framework"; @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "${meta.homepage}/src/gstreamer/${name}.tar.xz"; - sha256 = "11f155784d28b85a12b50d2fc8f91c6b75d9ca325cc76aaffba1a58d4c9549c9"; + sha256 = "1bmhbhak6i5wmmb6w86jyyv8lax4gdq983la4lk4a0krz6kim020"; }; nativeBuildInputs = [ diff --git a/pkgs/development/libraries/gstreamer/good/default.nix b/pkgs/development/libraries/gstreamer/good/default.nix index 72a14b50606..a06747ddc90 100644 --- a/pkgs/development/libraries/gstreamer/good/default.nix +++ b/pkgs/development/libraries/gstreamer/good/default.nix @@ -7,7 +7,7 @@ }: stdenv.mkDerivation rec { - name = "gst-plugins-good-1.4.3"; + name = "gst-plugins-good-1.4.5"; meta = with stdenv.lib; { description = "Gstreamer Good Plugins"; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "${meta.homepage}/src/gst-plugins-good/${name}.tar.xz"; - sha256 = "5876a74402f2a24d1d3ae9163c32466bdc7a565696dddeef65e6a9a93efc5537"; + sha256 = "0hg6qzdpib9nwn3hdxv0d4rvivi1c4bmxsq2a9hqmamwyzrvbcbr"; }; nativeBuildInputs = [ pkgconfig python ]; diff --git a/pkgs/development/libraries/gstreamer/libav/default.nix b/pkgs/development/libraries/gstreamer/libav/default.nix index 0e8f0684f7b..bcc05e44103 100644 --- a/pkgs/development/libraries/gstreamer/libav/default.nix +++ b/pkgs/development/libraries/gstreamer/libav/default.nix @@ -6,7 +6,7 @@ assert withSystemLibav -> libav != null; stdenv.mkDerivation rec { - name = "gst-libav-1.4.3"; + name = "gst-libav-1.4.5"; meta = { homepage = "http://gstreamer.freedesktop.org"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "${meta.homepage}/src/gst-libav/${name}.tar.xz"; - sha256 = "833229d2b1aad6549ad0297435516508cc3ac47b166d6393ecdffc34c31a01d3"; + sha256 = "1g7vg9amh3cc3nmc415h6g2rqxqi4wgwqi08hxfbpwq48ri64p30"; }; configureFlags = stdenv.lib.optionalString withSystemLibav diff --git a/pkgs/development/libraries/gstreamer/ugly/default.nix b/pkgs/development/libraries/gstreamer/ugly/default.nix index b04c62021e4..4e3d7eee78b 100644 --- a/pkgs/development/libraries/gstreamer/ugly/default.nix +++ b/pkgs/development/libraries/gstreamer/ugly/default.nix @@ -5,7 +5,7 @@ }: stdenv.mkDerivation rec { - name = "gst-plugins-ugly-1.4.3"; + name = "gst-plugins-ugly-1.4.5"; meta = with stdenv.lib; { description = "Gstreamer Ugly Plugins"; @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "${meta.homepage}/src/gst-plugins-ugly/${name}.tar.xz"; - sha256 = "d581592a82cf3930361430d38436c30a58d8b6c249cad18f7f213b203e206d46"; + sha256 = "0rwhljn3f8mp2pfchzfcx4pvps1546dndw9mr56lz50qyqffimaw"; }; nativeBuildInputs = [ pkgconfig python ]; diff --git a/pkgs/development/libraries/gtkmm/3.x.nix b/pkgs/development/libraries/gtkmm/3.x.nix index 47057b819e0..2d5798186c4 100644 --- a/pkgs/development/libraries/gtkmm/3.x.nix +++ b/pkgs/development/libraries/gtkmm/3.x.nix @@ -1,21 +1,22 @@ { stdenv, fetchurl, pkgconfig, gtk3, glibmm, cairomm, pangomm, atkmm }: let - ver_maj = "3.11"; # unstable version, but ATM no stable builds with gtk-3.12 and this is the version used in GNOME-3.12 "stable" - ver_min = "9"; + ver_maj = "3.12"; + ver_min = "0"; in stdenv.mkDerivation rec { name = "gtkmm-${ver_maj}.${ver_min}"; src = fetchurl { url = "mirror://gnome/sources/gtkmm/${ver_maj}/${name}.tar.xz"; - sha256 = "04yji82prijlwpd3blx0am1ikjy7y7ih7jd628dywdjbbfq42920"; + sha256 = "86c526ceec15d889996822128d566748bb36f70cf5a2c270530dfc546a2574e1"; }; nativeBuildInputs = [ pkgconfig ]; propagatedBuildInputs = [ glibmm gtk3 atkmm cairomm pangomm ]; + enableParallelBuilding = true; doCheck = true; meta = { diff --git a/pkgs/development/libraries/harfbuzz/default.nix b/pkgs/development/libraries/harfbuzz/default.nix index 45cdc5be02b..9c7244fdc6e 100644 --- a/pkgs/development/libraries/harfbuzz/default.nix +++ b/pkgs/development/libraries/harfbuzz/default.nix @@ -8,11 +8,11 @@ # (icu is a ~30 MB dependency, the rest is very small in comparison) stdenv.mkDerivation rec { - name = "harfbuzz-0.9.35"; + name = "harfbuzz-0.9.36"; src = fetchurl { url = "http://www.freedesktop.org/software/harfbuzz/release/${name}.tar.bz2"; - sha256 = "1v86596994bnb9hx7laykhw4ipixqz9ckwzyyqf340pmlsmsi88a"; + sha256 = "3bfbf7b016167ee6b2a2f83948fef75cc1253081873d6a91022161815956b9be"; }; configureFlags = [ diff --git a/pkgs/development/libraries/haskell/DRBG/default.nix b/pkgs/development/libraries/haskell/DRBG/default.nix index c192ad4302e..741368799d1 100644 --- a/pkgs/development/libraries/haskell/DRBG/default.nix +++ b/pkgs/development/libraries/haskell/DRBG/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "DRBG"; - version = "0.5.2"; - sha256 = "0c8w8h2mxpk2avj6321q9a1smzp970cyn87aj98vn8dln7h9cqsi"; + version = "0.5.3"; + sha256 = "197kp2bchkj3zrl3f06glba9lbjf51mp710sx0qj8i4spvf3jfr8"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/libraries/haskell/FontyFruity/default.nix b/pkgs/development/libraries/haskell/FontyFruity/default.nix index 1a613492f43..325ed34c5d6 100644 --- a/pkgs/development/libraries/haskell/FontyFruity/default.nix +++ b/pkgs/development/libraries/haskell/FontyFruity/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "FontyFruity"; - version = "0.3"; - sha256 = "0ivz7hkz5mx8bqqv5av56a8rw4231wyzzg0dhz6465d59iqmjhd4"; + version = "0.4"; + sha256 = "0nrlsiwav1mwbmp555vwnc24250yn166yr5fjazjg9g7a0ikkivf"; buildDepends = [ binary deepseq filepath text vector ]; meta = { description = "A true type file format loader"; diff --git a/pkgs/development/libraries/haskell/JuicyPixels/default.nix b/pkgs/development/libraries/haskell/JuicyPixels/default.nix index 2305756f93b..e8c1c610e89 100644 --- a/pkgs/development/libraries/haskell/JuicyPixels/default.nix +++ b/pkgs/development/libraries/haskell/JuicyPixels/default.nix @@ -6,14 +6,14 @@ cabal.mkDerivation (self: { pname = "JuicyPixels"; - version = "3.1.7.1"; - sha256 = "0mhsknqdrhxnm622mgrswvj4kvksh87x18s5ddgk4ylf0s2fjlap"; + version = "3.2"; + sha256 = "1z4i0464zdijv54b7wzc55zrp8h67ahm6mrdk7a6gi2qm0nihmy5"; buildDepends = [ binary deepseq mtl primitive transformers vector zlib ]; meta = { homepage = "https://github.com/Twinside/Juicy.Pixels"; - description = "Picture loading/serialization (in png, jpeg, bitmap, gif, tiff and radiance)"; + description = "Picture loading/serialization (in png, jpeg, bitmap, gif, tga, tiff and radiance)"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; }; diff --git a/pkgs/development/libraries/haskell/MonadRandom/0.3.nix b/pkgs/development/libraries/haskell/MonadRandom/0.3.0.1.nix similarity index 80% rename from pkgs/development/libraries/haskell/MonadRandom/0.3.nix rename to pkgs/development/libraries/haskell/MonadRandom/0.3.0.1.nix index 8b522b5de43..0362804ed45 100644 --- a/pkgs/development/libraries/haskell/MonadRandom/0.3.nix +++ b/pkgs/development/libraries/haskell/MonadRandom/0.3.0.1.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "MonadRandom"; - version = "0.3"; - sha256 = "0bmsccjcz6glb0x0nkjlq3qywfibf0wxxv4dvdhjfw5sx6im9qx3"; + version = "0.3.0.1"; + sha256 = "0bbj6rkxskrvl14lngpggql4q41pw21cj4z8h592mizrxjfa3rj0"; buildDepends = [ mtl random transformers ]; meta = { description = "Random-number generation monad"; diff --git a/pkgs/development/libraries/haskell/Rasterific/default.nix b/pkgs/development/libraries/haskell/Rasterific/default.nix index c53e9f72858..5380cb59659 100644 --- a/pkgs/development/libraries/haskell/Rasterific/default.nix +++ b/pkgs/development/libraries/haskell/Rasterific/default.nix @@ -1,16 +1,17 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! { cabal, binary, criterion, deepseq, dlist, filepath, FontyFruity -, free, JuicyPixels, mtl, QuickCheck, statistics, vector +, free, JuicyPixels, mtl, primitive, QuickCheck, statistics, vector , vectorAlgorithms }: cabal.mkDerivation (self: { pname = "Rasterific"; - version = "0.3"; - sha256 = "1chbcfcb5il7fbzivszap60qfwcwrq85kpx9y6qdr2pim39199fa"; + version = "0.4"; + sha256 = "1cw8lalxp9cs3w3kfr4ayp5h0kd71fdnyih99xpljy8zxw28hv3z"; buildDepends = [ - dlist FontyFruity free JuicyPixels mtl vector vectorAlgorithms + dlist FontyFruity free JuicyPixels mtl primitive vector + vectorAlgorithms ]; testDepends = [ binary criterion deepseq filepath FontyFruity JuicyPixels diff --git a/pkgs/development/libraries/haskell/active/default.nix b/pkgs/development/libraries/haskell/active/default.nix index a13113cde4e..02764c108f8 100644 --- a/pkgs/development/libraries/haskell/active/default.nix +++ b/pkgs/development/libraries/haskell/active/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "active"; - version = "0.1.0.16"; - sha256 = "0x4z9n0avk9pr9v64vfmbbpxx2n6cl32d8sw8y2w61345s2z628k"; + version = "0.1.0.17"; + sha256 = "1asp0han2737vfk92gasij804z4jsw8v2bc0m4nrmn3v80vmh7qb"; buildDepends = [ newtype semigroupoids semigroups vectorSpace ]; testDepends = [ newtype QuickCheck semigroupoids semigroups vectorSpace diff --git a/pkgs/development/libraries/haskell/ad/default.nix b/pkgs/development/libraries/haskell/ad/default.nix index afe8992aeea..72c53b5178a 100644 --- a/pkgs/development/libraries/haskell/ad/default.nix +++ b/pkgs/development/libraries/haskell/ad/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "ad"; - version = "4.2.1"; - sha256 = "05ndr26lsc4xa18vfb3qdjcp03gsq2bhc8dc0yr5g1x9dybq6dx2"; + version = "4.2.1.1"; + sha256 = "1zdpfh4k93ygrm91m7lw1la6n4yvaq3k2sqswgia04naf2wcmjka"; buildDepends = [ comonad dataReify erf free nats reflection tagged transformers ]; diff --git a/pkgs/development/libraries/haskell/aeson-pretty/default.nix b/pkgs/development/libraries/haskell/aeson-pretty/default.nix index 7bc2beb3b30..8e1959c401c 100644 --- a/pkgs/development/libraries/haskell/aeson-pretty/default.nix +++ b/pkgs/development/libraries/haskell/aeson-pretty/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "aeson-pretty"; - version = "0.7.1"; - sha256 = "0gmm1kmdbanfyfdyij1gnazycp1x9703qfa5hgrz39j9046zg3y6"; + version = "0.7.2"; + sha256 = "03ap81853qi8yd9kdgczllrrni23a6glsfxrwj8zab6ipjrbh234"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/libraries/haskell/algebra/default.nix b/pkgs/development/libraries/haskell/algebra/default.nix index 1e054a1cdb4..2044c8ad872 100644 --- a/pkgs/development/libraries/haskell/algebra/default.nix +++ b/pkgs/development/libraries/haskell/algebra/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "algebra"; - version = "4.1"; - sha256 = "1wcwpngaqnr9w89p5dycmpsaihdwqqrs2vjap6jfwrscq16yyyc6"; + version = "4.2"; + sha256 = "1b74c55326qsnpyqzyhyq87j61wp3zrpsqhipgw8db8nm2lq9nhs"; buildDepends = [ adjunctions distributive mtl nats semigroupoids semigroups tagged transformers void diff --git a/pkgs/development/libraries/haskell/ariadne/default.nix b/pkgs/development/libraries/haskell/ariadne/default.nix index f087787f67f..2d282fae022 100644 --- a/pkgs/development/libraries/haskell/ariadne/default.nix +++ b/pkgs/development/libraries/haskell/ariadne/default.nix @@ -27,5 +27,6 @@ cabal.mkDerivation (self: { license = self.stdenv.lib.licenses.mit; platforms = self.ghc.meta.platforms; maintainers = with self.stdenv.lib.maintainers; [ ocharles ]; + broken = true; }; }) diff --git a/pkgs/development/libraries/haskell/atto-lisp/default.nix b/pkgs/development/libraries/haskell/atto-lisp/default.nix index 9ee9ecd7a28..6e69e361585 100644 --- a/pkgs/development/libraries/haskell/atto-lisp/default.nix +++ b/pkgs/development/libraries/haskell/atto-lisp/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "atto-lisp"; - version = "0.2.1.2"; - sha256 = "0xl5b0gblab3v2sfaxvx3z96660r9xp1m2n3ri6aph3kldbpkfcg"; + version = "0.2.2"; + sha256 = "13lhdalam4gn9faa58c3c7nssdwp2y0jsfl1lnnvr3dx6wzp0jhc"; buildDepends = [ attoparsec blazeBuilder blazeTextual deepseq text ]; diff --git a/pkgs/development/libraries/haskell/aws/default.nix b/pkgs/development/libraries/haskell/aws/default.nix index 8f0818f43d6..1069c9da1e9 100644 --- a/pkgs/development/libraries/haskell/aws/default.nix +++ b/pkgs/development/libraries/haskell/aws/default.nix @@ -12,8 +12,8 @@ cabal.mkDerivation (self: { pname = "aws"; - version = "0.10.5"; - sha256 = "1d82q2477wp08zavlkzsksalbkiczz3vzy17ijk2z5xsw5yslqnj"; + version = "0.11"; + sha256 = "19q7r74c5xw04vpwl2fwm675bvkp3vhlak63iqfl1927z2jsyva9"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/libraries/haskell/base-prelude/default.nix b/pkgs/development/libraries/haskell/base-prelude/default.nix index fdbd2b85510..5cf966f35bd 100644 --- a/pkgs/development/libraries/haskell/base-prelude/default.nix +++ b/pkgs/development/libraries/haskell/base-prelude/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "base-prelude"; - version = "0.1.6"; - sha256 = "1lc8j3wfaqh42pqshlizkpr67ghkr1m90m1g9xiw8h36p8n72fcm"; + version = "0.1.7"; + sha256 = "0xzgwj5sqx7y57biby77d6vrsghcmq85ha3frn8k4xq7wqqk4aqp"; meta = { homepage = "https://github.com/nikita-volkov/base-prelude"; description = "The most complete prelude formed from only the \"base\" package"; diff --git a/pkgs/development/libraries/haskell/bencode/default.nix b/pkgs/development/libraries/haskell/bencode/default.nix new file mode 100644 index 00000000000..2d4630dc867 --- /dev/null +++ b/pkgs/development/libraries/haskell/bencode/default.nix @@ -0,0 +1,15 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, binary, parsec }: + +cabal.mkDerivation (self: { + pname = "bencode"; + version = "0.5"; + sha256 = "018cj7h5llvnqyr1jd9nif2ig9hz8d8vmi9iax07all567yhy378"; + buildDepends = [ binary parsec ]; + meta = { + description = "Parser and printer for bencoded data"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/binary-strict/default.nix b/pkgs/development/libraries/haskell/binary-strict/default.nix new file mode 100644 index 00000000000..e62fd782ad9 --- /dev/null +++ b/pkgs/development/libraries/haskell/binary-strict/default.nix @@ -0,0 +1,16 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, mtl }: + +cabal.mkDerivation (self: { + pname = "binary-strict"; + version = "0.4.8.1"; + sha256 = "07mmh4x8qjpw7w35nxcq8wayy4bagjblbwkpvh3xd38rxpdnl6pi"; + buildDepends = [ mtl ]; + meta = { + homepage = "http://code.haskell.org/binary-low-level"; + description = "Binary deserialisation using strict ByteStrings"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/bindings-portaudio/default.nix b/pkgs/development/libraries/haskell/bindings-portaudio/default.nix new file mode 100644 index 00000000000..6ae304d6c75 --- /dev/null +++ b/pkgs/development/libraries/haskell/bindings-portaudio/default.nix @@ -0,0 +1,17 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, bindingsDSL, portaudio }: + +cabal.mkDerivation (self: { + pname = "bindings-portaudio"; + version = "0.1"; + sha256 = "0wcxq300ijfkf4zc7p4xwsd9wzhnlss0kxjf04fka01mf9bh3ai2"; + buildDepends = [ bindingsDSL ]; + pkgconfigDepends = [ portaudio ]; + meta = { + description = "Low-level bindings to portaudio library"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = with self.stdenv.lib.maintainers; [ fuuzetsu ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/bound/default.nix b/pkgs/development/libraries/haskell/bound/default.nix index 31e7b053add..dd1f288a1b9 100644 --- a/pkgs/development/libraries/haskell/bound/default.nix +++ b/pkgs/development/libraries/haskell/bound/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "bound"; - version = "1.0.3"; - sha256 = "0nfcxq87i9lzdkrg7g65cprn4rg9rhn9nyk2jpjh4c1rc7gdn0aq"; + version = "1.0.4"; + sha256 = "17qnrjmqhx07cpzwd1z4lp2d42jx1lfxl6b86d65g4fd79miipky"; buildDepends = [ bifunctors binary bytes cereal comonad hashable hashableExtras preludeExtras profunctors transformers diff --git a/pkgs/development/libraries/haskell/bytes/default.nix b/pkgs/development/libraries/haskell/bytes/default.nix index 4f6387781c2..1ad3446bd0c 100644 --- a/pkgs/development/libraries/haskell/bytes/default.nix +++ b/pkgs/development/libraries/haskell/bytes/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "bytes"; - version = "0.14.1.1"; - sha256 = "11bsl31352h5lj7ad68byqqc27d5iz53kwx7b433l44g9kaijrvc"; + version = "0.14.1.2"; + sha256 = "1v1nnp1m5i4bfr0fshbps163v6yn6var53p0vcvav6g4w5wffd7d"; buildDepends = [ binary cereal mtl text time transformers transformersCompat void ]; diff --git a/pkgs/development/libraries/haskell/call/default.nix b/pkgs/development/libraries/haskell/call/default.nix new file mode 100644 index 00000000000..c11a07ae94c --- /dev/null +++ b/pkgs/development/libraries/haskell/call/default.nix @@ -0,0 +1,30 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, bindingsPortaudio, boundingboxes, cleanUnions, colors +, controlBool, deepseq, distributive, elevator, filepath, freetype2 +, GLFWB, hashable, JuicyPixels, JuicyPixelsUtil, lens, linear +, minioperational, mtl, objective, OpenGL, OpenGLRaw, random +, reflection, text, transformers, vector, WAVE +}: + +cabal.mkDerivation (self: { + pname = "call"; + version = "0.1.1.2"; + sha256 = "1g96asydq0lc07xf2c709zdv99r6ljs5a7jm6fvlyjswqnbrwy9s"; + isLibrary = true; + isExecutable = true; + buildDepends = [ + bindingsPortaudio boundingboxes cleanUnions colors controlBool + deepseq distributive elevator filepath freetype2 GLFWB hashable + JuicyPixels JuicyPixelsUtil lens linear minioperational mtl + objective OpenGL OpenGLRaw random reflection text transformers + vector WAVE + ]; + meta = { + homepage = "https://github.com/fumieval/call"; + description = "The call game engine"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = with self.stdenv.lib.maintainers; [ fuuzetsu ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/cgrep/default.nix b/pkgs/development/libraries/haskell/cgrep/default.nix index a49697bccf9..91f7920fcea 100644 --- a/pkgs/development/libraries/haskell/cgrep/default.nix +++ b/pkgs/development/libraries/haskell/cgrep/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "cgrep"; - version = "6.4.8"; - sha256 = "0xz2kzrvxxaa67x21dckv7l01s7jhmak7ka0rp8qygx6zjf836wy"; + version = "6.4.9"; + sha256 = "1g5np8r5h8hxgyxr3m7595xh7fiq1b8h9w6vm0ly81949lbwclga"; isLibrary = false; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/libraries/haskell/cheapskate/default.nix b/pkgs/development/libraries/haskell/cheapskate/default.nix index e3b13cdd806..7d96433a588 100644 --- a/pkgs/development/libraries/haskell/cheapskate/default.nix +++ b/pkgs/development/libraries/haskell/cheapskate/default.nix @@ -1,17 +1,18 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, blazeHtml, dataDefault, mtl, syb, text, uniplate -, xssSanitize +{ cabal, aeson, blazeHtml, dataDefault, httpTypes, mtl, syb, text +, uniplate, wai, waiExtra, xssSanitize }: cabal.mkDerivation (self: { pname = "cheapskate"; - version = "0.1.0.1"; - sha256 = "0slrvbaamnwxx89kqjcr62058j00s2dw4c16q1swf817az2p66h8"; + version = "0.1.0.2"; + sha256 = "1bz3zi2w5vm128csg21swcz4cm7h8ybqylpknr4fnyxmg3gxdd7d"; isLibrary = true; isExecutable = true; buildDepends = [ - blazeHtml dataDefault mtl syb text uniplate xssSanitize + aeson blazeHtml dataDefault httpTypes mtl syb text uniplate wai + waiExtra xssSanitize ]; jailbreak = true; meta = { diff --git a/pkgs/development/libraries/haskell/clientsession/default.nix b/pkgs/development/libraries/haskell/clientsession/default.nix index bd06ff10a86..6fcecac9eb5 100644 --- a/pkgs/development/libraries/haskell/clientsession/default.nix +++ b/pkgs/development/libraries/haskell/clientsession/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "clientsession"; - version = "0.9.1"; - sha256 = "1hq4f5iq4xb9jilr6qprww9lql314vpfw5khwmizljry9cwd2gq7"; + version = "0.9.1.1"; + sha256 = "08h0461ydhfymw2pya472n81kx5rqp7awfgxlbz2r851rl5kqmn9"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/libraries/haskell/concurrent-extra/default.nix b/pkgs/development/libraries/haskell/concurrent-extra/default.nix index 43230662fe0..69c1d1edddc 100644 --- a/pkgs/development/libraries/haskell/concurrent-extra/default.nix +++ b/pkgs/development/libraries/haskell/concurrent-extra/default.nix @@ -1,24 +1,22 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, async, baseUnicodeSymbols, HUnit, random, stm -, testFramework, testFrameworkHunit, unboundedDelays +{ cabal, async, HUnit, random, stm, testFramework +, testFrameworkHunit, unboundedDelays }: cabal.mkDerivation (self: { pname = "concurrent-extra"; - version = "0.7.0.8"; - sha256 = "0q6n7wlakvnvfrjr3zmxbn9i0dxq96071j565vffp0r5abxkn83q"; - buildDepends = [ baseUnicodeSymbols stm unboundedDelays ]; + version = "0.7.0.9"; + sha256 = "19bqm0brnbhhmp5nypi995p27mna7kd33xzw0kf7yx2w2p2kb1aw"; + buildDepends = [ stm unboundedDelays ]; testDepends = [ - async baseUnicodeSymbols HUnit random stm testFramework - testFrameworkHunit unboundedDelays + async HUnit random stm testFramework testFrameworkHunit + unboundedDelays ]; meta = { homepage = "https://github.com/basvandijk/concurrent-extra"; description = "Extra concurrency primitives"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - broken = true; }; }) diff --git a/pkgs/development/libraries/haskell/conduit-extra/default.nix b/pkgs/development/libraries/haskell/conduit-extra/default.nix index b9ddeec104f..8a551de3516 100644 --- a/pkgs/development/libraries/haskell/conduit-extra/default.nix +++ b/pkgs/development/libraries/haskell/conduit-extra/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "conduit-extra"; - version = "1.1.4.2"; - sha256 = "0s2ggca6g2104dylbrkn090xwsfrp0946bhwf7fgpfpg9gi1sz1g"; + version = "1.1.5"; + sha256 = "1i38n3pdibjpi9kg37wvv4m6krfbsdd4baik804ss2ml1ry7gm4p"; buildDepends = [ attoparsec blazeBuilder conduit filepath monadControl network primitive resourcet stm streamingCommons text transformers diff --git a/pkgs/development/libraries/haskell/crypto-pubkey/default.nix b/pkgs/development/libraries/haskell/crypto-pubkey/default.nix index bd4b4f9639f..a8979fef315 100644 --- a/pkgs/development/libraries/haskell/crypto-pubkey/default.nix +++ b/pkgs/development/libraries/haskell/crypto-pubkey/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "crypto-pubkey"; - version = "0.2.4"; - sha256 = "0mdjr6zma2q7r2z9qibp2bwf73bis6zrv7ss62i4pz42kndb9hh4"; + version = "0.2.5"; + sha256 = "18rxm6mgxp8x4ns2725pw6ja2g6n6k64dj9cbwdlsb13pkdh3lxq"; buildDepends = [ byteable cryptohash cryptoNumbers cryptoPubkeyTypes cryptoRandom ]; diff --git a/pkgs/development/libraries/haskell/csv-conduit/default.nix b/pkgs/development/libraries/haskell/csv-conduit/default.nix new file mode 100644 index 00000000000..f0c01481dbd --- /dev/null +++ b/pkgs/development/libraries/haskell/csv-conduit/default.nix @@ -0,0 +1,31 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, attoparsec, attoparsecConduit, blazeBuilder, conduit +, conduitExtra, dataDefault, HUnit, mmorph, monadControl, mtl +, primitive, resourcet, testFramework, testFrameworkHunit, text +, transformers, unorderedContainers, vector +}: + +cabal.mkDerivation (self: { + pname = "csv-conduit"; + version = "0.6.3"; + sha256 = "1db1wlpl0ryyf8cmkrg1hgz4ggsvzy6z9ayzcc6n6rdywpfi29z4"; + isLibrary = true; + isExecutable = true; + buildDepends = [ + attoparsec attoparsecConduit blazeBuilder conduit conduitExtra + dataDefault mmorph monadControl mtl primitive resourcet text + transformers unorderedContainers vector + ]; + testDepends = [ + HUnit mtl primitive testFramework testFrameworkHunit text + transformers vector + ]; + meta = { + homepage = "http://github.com/ozataman/csv-conduit"; + description = "A flexible, fast, conduit-based CSV parser library for Haskell"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = with self.stdenv.lib.maintainers; [ bergey ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/cuda/default.nix b/pkgs/development/libraries/haskell/cuda/default.nix index 7e09fc12f70..25eced2e810 100644 --- a/pkgs/development/libraries/haskell/cuda/default.nix +++ b/pkgs/development/libraries/haskell/cuda/default.nix @@ -4,10 +4,12 @@ cabal.mkDerivation (self: { pname = "cuda"; - version = "0.6.5.0"; - sha256 = "0q4c2xgffkchn8kxhiwjganmb3ki4yjhx5665zwfd18bgvmlnp60"; + version = "0.6.5.1"; + sha256 = "04j57inw4wmd0l74ryxdgpjcbf3zkklgkqw9bv7yp4n96n40mp0y"; + isLibrary = true; + isExecutable = true; buildTools = [ c2hs ]; - extraLibraries = [ cudatoolkit nvidia_x11 self.stdenv.gcc ]; + extraLibraries = [ cudatoolkit nvidia_x11 self.stdenv.cc ]; doCheck = false; # Perhaps this should be the default in cabal.nix ... # diff --git a/pkgs/development/libraries/haskell/data-lens-light/default.nix b/pkgs/development/libraries/haskell/data-lens-light/default.nix index 2eca446c714..017e5e706db 100644 --- a/pkgs/development/libraries/haskell/data-lens-light/default.nix +++ b/pkgs/development/libraries/haskell/data-lens-light/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "data-lens-light"; - version = "0.1.2"; - sha256 = "1xxphcd36vw1ib48rfmrg207h0i1hlby01bm3xsxnq90ygizvxk7"; + version = "0.1.2.1"; + sha256 = "038vfzb4vxk1qb0246l2kgv9br37wg59wnlhzyjpn97lypwlf68w"; buildDepends = [ mtl ]; meta = { homepage = "https://github.com/feuerbach/data-lens-light"; diff --git a/pkgs/development/libraries/haskell/dbus/default.nix b/pkgs/development/libraries/haskell/dbus/default.nix index 81aee9c42b4..dc88a613350 100644 --- a/pkgs/development/libraries/haskell/dbus/default.nix +++ b/pkgs/development/libraries/haskell/dbus/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "dbus"; - version = "0.10.8"; - sha256 = "1pqcb6fk6l2xzwyy3n9sa2q2k3qykym1f98n2zf75545ix46b1r6"; + version = "0.10.9"; + sha256 = "0sjnmxy0ikvg21sip7yadg4qr3lniy1wwpavkg48dc87gv98ymdb"; buildDepends = [ cereal libxmlSax network parsec random text transformers vector xmlTypes diff --git a/pkgs/development/libraries/haskell/diagrams/contrib.nix b/pkgs/development/libraries/haskell/diagrams/contrib.nix index a958c0b6266..78ed983650f 100644 --- a/pkgs/development/libraries/haskell/diagrams/contrib.nix +++ b/pkgs/development/libraries/haskell/diagrams/contrib.nix @@ -9,8 +9,8 @@ cabal.mkDerivation (self: { pname = "diagrams-contrib"; - version = "1.1.2.3"; - sha256 = "00bn9p2a6h26q7hfqqzwimfgr2avf7ilf61z3anz25raz8jqvfxc"; + version = "1.1.2.4"; + sha256 = "0iq5psy5wjm664hqsaprynba0b7x3ijxngh7mbk6hkh004vsna1w"; buildDepends = [ arithmoi circlePacking colour dataDefault dataDefaultClass diagramsCore diagramsLib forceLayout lens MonadRandom mtl parsec diff --git a/pkgs/development/libraries/haskell/diagrams/core.nix b/pkgs/development/libraries/haskell/diagrams/core.nix index 0ce9a559059..518b5594cb6 100644 --- a/pkgs/development/libraries/haskell/diagrams/core.nix +++ b/pkgs/development/libraries/haskell/diagrams/core.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "diagrams-core"; - version = "1.2.0.3"; - sha256 = "1pmdz75v2xl8y0clqifs017gq40syxqpfa2h2mc50pip3484a7m5"; + version = "1.2.0.4"; + sha256 = "1axkgprqs4jvzh5vfr118nzr1h0m48axr5jfiqqrqvy5xyjcagkq"; buildDepends = [ dualTree lens MemoTrie monoidExtras newtype semigroups vectorSpace vectorSpacePoints diff --git a/pkgs/development/libraries/haskell/diagrams/lib.nix b/pkgs/development/libraries/haskell/diagrams/lib.nix index 3b42584bb28..d2e25254f67 100644 --- a/pkgs/development/libraries/haskell/diagrams/lib.nix +++ b/pkgs/development/libraries/haskell/diagrams/lib.nix @@ -8,8 +8,8 @@ cabal.mkDerivation (self: { pname = "diagrams-lib"; - version = "1.2.0.5"; - sha256 = "0km2j74riybmlhpb3jp4i3xilz4q2ngkifnsq6bsk8d0m3kqizd6"; + version = "1.2.0.7"; + sha256 = "12ddlipp47j2mifwhi0ilb2fjdh2whk24s4d5h6ais2znj3hh99a"; buildDepends = [ active colour dataDefaultClass diagramsCore dualTree filepath fingertree hashable intervals JuicyPixels lens MemoTrie diff --git a/pkgs/development/libraries/haskell/diagrams/postscript.nix b/pkgs/development/libraries/haskell/diagrams/postscript.nix index 73bc954de5d..841487305ef 100644 --- a/pkgs/development/libraries/haskell/diagrams/postscript.nix +++ b/pkgs/development/libraries/haskell/diagrams/postscript.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "diagrams-postscript"; - version = "1.1.0.2"; - sha256 = "1djvra4igw43746wqhwg1ms76w2qlrsdwhr0b795si4wdx8k28b3"; + version = "1.1.0.3"; + sha256 = "172r7q9jzhy2kv5bsbakakwv6gpvy308gvp8xpirbch9mrvnjxhz"; buildDepends = [ dataDefaultClass diagramsCore diagramsLib dlist filepath hashable lens monoidExtras mtl semigroups split vectorSpace diff --git a/pkgs/development/libraries/haskell/diagrams/rasterific.nix b/pkgs/development/libraries/haskell/diagrams/rasterific.nix index 0aa953537ce..8e494241f74 100644 --- a/pkgs/development/libraries/haskell/diagrams/rasterific.nix +++ b/pkgs/development/libraries/haskell/diagrams/rasterific.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "diagrams-rasterific"; - version = "0.1.0.4"; - sha256 = "0l6072blz56rc4nxr2s7gh5p3zdcyq8cfndbqgzndsfak6wyixgb"; + version = "0.1.0.5"; + sha256 = "1a95l8g55jsmqhbv9flk5kfkfa40z93axbjfz6xb74lyvl6xccwr"; buildDepends = [ dataDefaultClass diagramsCore diagramsLib filepath FontyFruity JuicyPixels lens mtl optparseApplicative Rasterific split diff --git a/pkgs/development/libraries/haskell/diagrams/svg.nix b/pkgs/development/libraries/haskell/diagrams/svg.nix index 00ce51e8d97..1994905c1d4 100644 --- a/pkgs/development/libraries/haskell/diagrams/svg.nix +++ b/pkgs/development/libraries/haskell/diagrams/svg.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "diagrams-svg"; - version = "1.1.0.2"; - sha256 = "0dzws9c3swgnrx70a64614m9pc8rszfajgh674n7x56fbbp3ra1n"; + version = "1.1.0.3"; + sha256 = "0byqxwz9h1hi2yrq2vz32gv0az9q3l94qa2q3nl3j8sa64qmpdwq"; buildDepends = [ base64Bytestring blazeMarkup blazeSvg colour diagramsCore diagramsLib filepath hashable JuicyPixels lens monoidExtras mtl diff --git a/pkgs/development/libraries/haskell/distributed-process/default.nix b/pkgs/development/libraries/haskell/distributed-process/default.nix index 24375cb277a..0232a02c8af 100644 --- a/pkgs/development/libraries/haskell/distributed-process/default.nix +++ b/pkgs/development/libraries/haskell/distributed-process/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "distributed-process"; - version = "0.5.1"; - sha256 = "1c654l7r3cn89nknh67vsg7crnfhgswh4523qyrmn8z4ykyd0zfk"; + version = "0.5.2"; + sha256 = "04llhz9z28365idgj13hhwkp98zwqv6mhhy9i7416wk5d3r70g7l"; buildDepends = [ binary dataAccessor deepseq distributedStatic hashable mtl networkTransport random rank1dynamic stm syb time transformers diff --git a/pkgs/development/libraries/haskell/distributed-static/default.nix b/pkgs/development/libraries/haskell/distributed-static/default.nix index 8f7f61da8f6..4dce7cc1ded 100644 --- a/pkgs/development/libraries/haskell/distributed-static/default.nix +++ b/pkgs/development/libraries/haskell/distributed-static/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "distributed-static"; - version = "0.3.0.0"; - sha256 = "1g8jr01jxlfshsz3mrpzl21q290whwz4va3zjp1h0d1pnfwz6jcj"; + version = "0.3.1.0"; + sha256 = "190b6vjcipgrvnfl72c0ssw8crza02gfw9kwyvwg043jcznihj08"; buildDepends = [ binary rank1dynamic ]; meta = { homepage = "http://haskell-distributed.github.com"; diff --git a/pkgs/development/libraries/haskell/dual-tree/default.nix b/pkgs/development/libraries/haskell/dual-tree/default.nix index f9cf3b13b41..7efdcce8526 100644 --- a/pkgs/development/libraries/haskell/dual-tree/default.nix +++ b/pkgs/development/libraries/haskell/dual-tree/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "dual-tree"; - version = "0.2.0.4"; - sha256 = "0visavx0zqgmcjcq07vfhk6dn867269w2gxa8nvc79gya56c6wdp"; + version = "0.2.0.5"; + sha256 = "077njr9m6x9n2id0419rn6v4xwb9nvxshrmas9pkknp52va4ljg5"; buildDepends = [ monoidExtras newtype semigroups ]; jailbreak = true; meta = { diff --git a/pkgs/development/libraries/haskell/ekg-bosun/default.nix b/pkgs/development/libraries/haskell/ekg-bosun/default.nix index 23876662f2a..e4074ddd1ff 100644 --- a/pkgs/development/libraries/haskell/ekg-bosun/default.nix +++ b/pkgs/development/libraries/haskell/ekg-bosun/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "ekg-bosun"; - version = "1.0.2"; - sha256 = "0q32yvl5j59s22v357j8vx0i3b5cd0gygh7gyibym5ka5d5xd82m"; + version = "1.0.3"; + sha256 = "0mlfsmw1aa24p6fhml8m2dj2v7hrp91a9d3cfl74rr8z8am61mqc"; buildDepends = [ aeson ekgCore httpClient lens network networkUri text time unorderedContainers vector wreq diff --git a/pkgs/development/libraries/haskell/ekg/default.nix b/pkgs/development/libraries/haskell/ekg/default.nix index c19ec4ec881..05dd7d99877 100644 --- a/pkgs/development/libraries/haskell/ekg/default.nix +++ b/pkgs/development/libraries/haskell/ekg/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "ekg"; - version = "0.4.0.4"; - sha256 = "1v1kskl1fwwpv72lay8c7nlvg2dswf6wij176fjfml1v8lmll2lr"; + version = "0.4.0.5"; + sha256 = "0ak06yz88p79bhayy8byy3j9yw9bix7zhw8yxfcdnxjwgnx621h0"; buildDepends = [ aeson ekgCore filepath network snapCore snapServer text time transformers unorderedContainers diff --git a/pkgs/development/libraries/haskell/elevator/default.nix b/pkgs/development/libraries/haskell/elevator/default.nix new file mode 100644 index 00000000000..a93e52a0ba0 --- /dev/null +++ b/pkgs/development/libraries/haskell/elevator/default.nix @@ -0,0 +1,17 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, cleanUnions, transformers }: + +cabal.mkDerivation (self: { + pname = "elevator"; + version = "0.1.3"; + sha256 = "0z7rj70ilv4y95prfdj3fjlw4icr64d66lqgyr6jp28zxrxw1535"; + buildDepends = [ cleanUnions transformers ]; + meta = { + homepage = "https://github.com/fumieval/elevator"; + description = "Immediately lifts to a desired level"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = with self.stdenv.lib.maintainers; [ fuuzetsu ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/engine-io/default.nix b/pkgs/development/libraries/haskell/engine-io/default.nix index 141d54ab23c..d275a2f2b0f 100644 --- a/pkgs/development/libraries/haskell/engine-io/default.nix +++ b/pkgs/development/libraries/haskell/engine-io/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "engine-io"; - version = "1.2.2"; - sha256 = "1d8323nxklbhva2y8ymgm5h57j2p86sdjfh0yi1fjjr8p26dh2py"; + version = "1.2.3"; + sha256 = "05sc939x24f3na6nxywgbq0yx4wdamh6zk4spdclqgq65j7v0hxc"; buildDepends = [ aeson async attoparsec base64Bytestring either free monadLoops mwcRandom stm stmDelay text transformers unorderedContainers vector diff --git a/pkgs/development/libraries/haskell/equational-reasoning/default.nix b/pkgs/development/libraries/haskell/equational-reasoning/default.nix index fa88fbfe2e8..b9562573f8f 100644 --- a/pkgs/development/libraries/haskell/equational-reasoning/default.nix +++ b/pkgs/development/libraries/haskell/equational-reasoning/default.nix @@ -7,6 +7,7 @@ cabal.mkDerivation (self: { version = "0.2.0.4"; sha256 = "1f94y6h7qg7rck7rxf6j8sygkh1xmfk0z1lr71inx6s74agjyc9j"; buildDepends = [ singletons tagged void ]; + jailbreak = true; meta = { description = "Proof assistant for Haskell using DataKinds & PolyKinds"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/esqueleto/default.nix b/pkgs/development/libraries/haskell/esqueleto/default.nix index 86bc90fae81..c85ff455180 100644 --- a/pkgs/development/libraries/haskell/esqueleto/default.nix +++ b/pkgs/development/libraries/haskell/esqueleto/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "esqueleto"; - version = "2.1.2"; - sha256 = "18wcr5jwf7iz0rfrx07b4mm3j15rqwc43a6hycrabijik6s0v95v"; + version = "2.1.2.1"; + sha256 = "0lynhkbrxxrngvdj5d4xlmi92s4m3dzdpd7gs1k408slil2i7r7i"; buildDepends = [ conduit monadLogger persistent resourcet tagged text transformers unorderedContainers diff --git a/pkgs/development/libraries/haskell/extensible-effects/default.nix b/pkgs/development/libraries/haskell/extensible-effects/default.nix index 2bae81325ae..e7f1f16059d 100644 --- a/pkgs/development/libraries/haskell/extensible-effects/default.nix +++ b/pkgs/development/libraries/haskell/extensible-effects/default.nix @@ -2,16 +2,17 @@ { cabal, HUnit, QuickCheck, testFramework, testFrameworkHunit , testFrameworkQuickcheck2, transformers, transformersBase +, typeAligned, void }: cabal.mkDerivation (self: { pname = "extensible-effects"; - version = "1.7.1.2"; - sha256 = "1mvyiqlga6al81j4b4rg9yl46ml5s0hnx1g2hyvqljzr12njmajv"; - buildDepends = [ transformers transformersBase ]; + version = "1.9.0.1"; + sha256 = "17hl4x4052jfn7xs6xhnc6d3x75a8haw2zsbnjd6rr5gsd1hq5kx"; + buildDepends = [ transformers transformersBase typeAligned void ]; testDepends = [ HUnit QuickCheck testFramework testFrameworkHunit - testFrameworkQuickcheck2 + testFrameworkQuickcheck2 void ]; jailbreak = true; meta = { diff --git a/pkgs/development/libraries/haskell/extra/default.nix b/pkgs/development/libraries/haskell/extra/default.nix index dfbdf73a2ae..9e90fe2bb05 100644 --- a/pkgs/development/libraries/haskell/extra/default.nix +++ b/pkgs/development/libraries/haskell/extra/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "extra"; - version = "0.8"; - sha256 = "06ydgniar294i9xzviz7qmr3xpnlkpvyvgigwxqfz50kv77w8ijw"; + version = "1.0"; + sha256 = "0ainwq8f2mp1wc30srl971xy4qnrcyrcyig1kmrxx951hgav1dkb"; buildDepends = [ filepath time ]; testDepends = [ filepath QuickCheck time ]; meta = { diff --git a/pkgs/development/libraries/haskell/fay-base/default.nix b/pkgs/development/libraries/haskell/fay-base/default.nix index e978d5ec939..466dd478261 100644 --- a/pkgs/development/libraries/haskell/fay-base/default.nix +++ b/pkgs/development/libraries/haskell/fay-base/default.nix @@ -4,14 +4,15 @@ cabal.mkDerivation (self: { pname = "fay-base"; - version = "0.19.2.1"; - sha256 = "19vzrdbd1c8wws4mccycpq70594qy2ka3mr5x5fsdya56ff4xgld"; + version = "0.19.4.1"; + sha256 = "1pk1jjwyh2n9fg583v4cd0ll5qglphwnfm08q95klcvc61p4wqg6"; buildDepends = [ fay ]; meta = { - homepage = "https://github.com/faylang/fay-base"; + homepage = "https://github.com/faylang/fay/"; description = "The base package for Fay"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; maintainers = with self.stdenv.lib.maintainers; [ ocharles ]; + inherit (fay.meta) broken; }; }) diff --git a/pkgs/development/libraries/haskell/fay-text/default.nix b/pkgs/development/libraries/haskell/fay-text/default.nix index 7f80072335a..05b2505d762 100644 --- a/pkgs/development/libraries/haskell/fay-text/default.nix +++ b/pkgs/development/libraries/haskell/fay-text/default.nix @@ -4,13 +4,14 @@ cabal.mkDerivation (self: { pname = "fay-text"; - version = "0.3.1"; - sha256 = "0blr39vah0zd3i6clzzgmsfhxncwj8q6j4widk27iz3l27nlyin8"; + version = "0.3.2"; + sha256 = "1yjsn188ixpfqdr75xyl57rbv53dybik4g28h6p3jv73q494552m"; buildDepends = [ fay fayBase text ]; meta = { homepage = "https://github.com/faylang/fay-text"; description = "Fay Text type represented as JavaScript strings"; license = self.stdenv.lib.licenses.mit; platforms = self.ghc.meta.platforms; + inherit (fay.meta) broken; }; }) diff --git a/pkgs/development/libraries/haskell/fay/default.nix b/pkgs/development/libraries/haskell/fay/default.nix index bcb58a44e08..9a268a9b34f 100644 --- a/pkgs/development/libraries/haskell/fay/default.nix +++ b/pkgs/development/libraries/haskell/fay/default.nix @@ -9,8 +9,8 @@ cabal.mkDerivation (self: { pname = "fay"; - version = "0.21.0.2"; - sha256 = "0hq9jfyl5ki3jcwffb9q7cxrgpchajgwk4j44kz37y1wji63lk96"; + version = "0.21.2.1"; + sha256 = "06ijfkm1x5a15hac9f4cs4f16rva2hkf07xfh0mm9q3wkamqxlfm"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -19,11 +19,13 @@ cabal.mkDerivation (self: { sourcemap split spoon syb text time transformers uniplate unorderedContainers utf8String vector ]; + jailbreak = true; meta = { homepage = "https://github.com/faylang/fay/wiki"; description = "A compiler for Fay, a Haskell subset that compiles to JavaScript"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; maintainers = with self.stdenv.lib.maintainers; [ ocharles ]; + broken = true; }; }) diff --git a/pkgs/development/libraries/haskell/free/default.nix b/pkgs/development/libraries/haskell/free/default.nix index e516eb3613a..5837cc448c2 100644 --- a/pkgs/development/libraries/haskell/free/default.nix +++ b/pkgs/development/libraries/haskell/free/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "free"; - version = "4.9"; - sha256 = "01pa9ax9i4pkh9a5achndx5s7sxvhnk6rm57g8rzav79hzsr4cnx"; + version = "4.10.0.1"; + sha256 = "0vs080bbcbncjqa7z0l6zd10kpmilj8khxiqdn4bq24mifyryhvq"; buildDepends = [ bifunctors comonad distributive mtl preludeExtras profunctors semigroupoids semigroups transformers diff --git a/pkgs/development/libraries/haskell/generics-sop/default.nix b/pkgs/development/libraries/haskell/generics-sop/default.nix index 2fce6c66be5..d7724a7b1ba 100644 --- a/pkgs/development/libraries/haskell/generics-sop/default.nix +++ b/pkgs/development/libraries/haskell/generics-sop/default.nix @@ -4,13 +4,15 @@ cabal.mkDerivation (self: { pname = "generics-sop"; - version = "0.1.0.2"; - sha256 = "01s3v3a29wdsps9vas8in2ks5p4d2arqp3qvmzqa7v2sz786xjra"; + version = "0.1.0.4"; + sha256 = "00rjlqsjb7hba5q0kbfwg4ajk75a4sd7m72wx18fa9rlz92qbx2j"; buildDepends = [ tagged ]; meta = { description = "Generic Programming using True Sums of Products"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = with self.stdenv.lib.maintainers; [ ocharles ]; + maintainers = with self.stdenv.lib.maintainers; [ + aycanirican ocharles + ]; }; }) diff --git a/pkgs/development/libraries/haskell/ghc-server/default.nix b/pkgs/development/libraries/haskell/ghc-server/default.nix deleted file mode 100644 index ac9cb852704..00000000000 --- a/pkgs/development/libraries/haskell/ghc-server/default.nix +++ /dev/null @@ -1,22 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, async, attoLisp, attoparsec, conduit, conduitExtra -, ghcPaths, mtl, network, syb, text -}: - -cabal.mkDerivation (self: { - pname = "ghc-server"; - version = "1.1"; - sha256 = "1rgrgx9xakq6vy6nanvwzwfvzbfg287pmm8pdm9lbd7kf7ls5ml4"; - isLibrary = true; - isExecutable = true; - buildDepends = [ - async attoLisp attoparsec conduit conduitExtra ghcPaths mtl network - syb text - ]; - meta = { - description = "A server interface to GHC"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - }; -}) diff --git a/pkgs/development/libraries/haskell/ghcjs-dom/default.nix b/pkgs/development/libraries/haskell/ghcjs-dom/default.nix index 50de163b8fb..63b65a1224f 100644 --- a/pkgs/development/libraries/haskell/ghcjs-dom/default.nix +++ b/pkgs/development/libraries/haskell/ghcjs-dom/default.nix @@ -6,12 +6,9 @@ cabal.mkDerivation (self: { pname = "ghcjs-dom"; - version = "0.1.0.0"; - src = fetchgit { - url = https://github.com/ghcjs/ghcjs-dom; - rev = "15414daf6d7478eb98b66a6bff76607f875684a4"; - sha256 = "a1661eb3ad58c8214f75886fbeaa43b87bb3072c3abe087ad66832906a83e95a"; - }; + version = "0.1.1.1"; + sha256 = "0fwwm658gf4fp32zmfskfayi480ddsf40y2cfla88a7l1rbacwif"; + buildDepends = [ ghcjsBase mtl text ]; buildDepends = [ mtl ] ++ (if buildType == "jsffi" then [ ghcjsBase ] else if buildType == "webkit" then [ glib transformers gtk webkit ] else throw "unrecognized buildType"); configureFlags = if buildType == "jsffi" then [ ] else if buildType == "webkit" then [ "-f-ghcjs" "-fwebkit" "-f-gtk3" ] else throw "unrecognized buildType"; meta = { diff --git a/pkgs/development/libraries/haskell/github/default.nix b/pkgs/development/libraries/haskell/github/default.nix index 86e344dc2ca..3e2b84a93db 100644 --- a/pkgs/development/libraries/haskell/github/default.nix +++ b/pkgs/development/libraries/haskell/github/default.nix @@ -8,8 +8,8 @@ cabal.mkDerivation (self: { pname = "github"; - version = "0.13"; - sha256 = "1vvfrlz6p43mrzskvhp9skh6xbgd5pqcn06wvxw31plpamf5pmzn"; + version = "0.13.1"; + sha256 = "0rz89lpswxxsdyfjb63v9md96bxr3abxzwqryh1a2jxhm7f1ia5l"; buildDepends = [ aeson attoparsec base16Bytestring byteable caseInsensitive conduit cryptohash dataDefault failure hashable HTTP httpConduit httpTypes diff --git a/pkgs/development/libraries/haskell/gitlib-libgit2/default.nix b/pkgs/development/libraries/haskell/gitlib-libgit2/default.nix index 287f98d661d..bb7206803eb 100644 --- a/pkgs/development/libraries/haskell/gitlib-libgit2/default.nix +++ b/pkgs/development/libraries/haskell/gitlib-libgit2/default.nix @@ -10,8 +10,8 @@ cabal.mkDerivation (self: { pname = "gitlib-libgit2"; - version = "3.1.0"; - sha256 = "1kjwc36fd14j2ipw53j8hdsy29gxir1qrm54wxgpp5n4q2kcs9pq"; + version = "3.1.0.1"; + sha256 = "0rqx1cqj7rciy7kr5dfzh4crvjk0s6amm3d5nzyawkkkdda54dcs"; buildDepends = [ conduit conduitCombinators exceptions fastLogger filepath gitlib hlibgit2 liftedAsync liftedBase missingForeign mmorph monadControl @@ -26,7 +26,6 @@ cabal.mkDerivation (self: { description = "Libgit2 backend for gitlib"; license = self.stdenv.lib.licenses.mit; platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; maintainers = with self.stdenv.lib.maintainers; [ ianwookim ]; }; }) diff --git a/pkgs/development/libraries/haskell/gitlib-test/default.nix b/pkgs/development/libraries/haskell/gitlib-test/default.nix index e8ab6aca6cf..130a0efdcd1 100644 --- a/pkgs/development/libraries/haskell/gitlib-test/default.nix +++ b/pkgs/development/libraries/haskell/gitlib-test/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "gitlib-test"; - version = "3.1.0"; - sha256 = "0hnwx5r9fdkxvx0zmqffpym921dvf1x2lky8w11y3rfhk9i1g7l4"; + version = "3.1.0.1"; + sha256 = "1c65v86brvw3sy48vg79j0ijc5n4cpafksqsmbjs50h3v80zkdm3"; buildDepends = [ conduit conduitCombinators exceptions gitlib hspec hspecExpectations HUnit monadControl tagged text time transformers @@ -18,6 +18,5 @@ cabal.mkDerivation (self: { license = self.stdenv.lib.licenses.mit; platforms = self.ghc.meta.platforms; maintainers = with self.stdenv.lib.maintainers; [ ianwookim ]; - broken = true; }; }) diff --git a/pkgs/development/libraries/haskell/gloss-banana/default.nix b/pkgs/development/libraries/haskell/gloss-banana/default.nix index 7edbb8649f9..58adb03fc78 100644 --- a/pkgs/development/libraries/haskell/gloss-banana/default.nix +++ b/pkgs/development/libraries/haskell/gloss-banana/default.nix @@ -13,5 +13,6 @@ cabal.mkDerivation (self: { license = self.stdenv.lib.licenses.gpl3; platforms = self.ghc.meta.platforms; maintainers = with self.stdenv.lib.maintainers; [ twey ]; + broken = true; }; }) diff --git a/pkgs/development/libraries/haskell/gloss-raster/default.nix b/pkgs/development/libraries/haskell/gloss-raster/default.nix index ff5e202ae73..16316b16590 100644 --- a/pkgs/development/libraries/haskell/gloss-raster/default.nix +++ b/pkgs/development/libraries/haskell/gloss-raster/default.nix @@ -1,12 +1,12 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, gloss, llvm, repa }: +{ cabal, gloss, glossRendering, llvm, repa }: cabal.mkDerivation (self: { pname = "gloss-raster"; - version = "1.8.2.1"; - sha256 = "0ls8rlwrbpisrmq2xigf9926pak028dmld6shrblcmdbykaz55ha"; - buildDepends = [ gloss repa ]; + version = "1.9.2.1"; + sha256 = "0vz03hw9rck9vcbh1lvy7dncij9ykgh7mslb3hwsz8z570dbnacw"; + buildDepends = [ gloss glossRendering repa ]; extraLibraries = [ llvm ]; jailbreak = true; meta = { diff --git a/pkgs/development/libraries/haskell/gloss-rendering/default.nix b/pkgs/development/libraries/haskell/gloss-rendering/default.nix new file mode 100644 index 00000000000..190993e44fc --- /dev/null +++ b/pkgs/development/libraries/haskell/gloss-rendering/default.nix @@ -0,0 +1,15 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, bmp, GLUT, OpenGL }: + +cabal.mkDerivation (self: { + pname = "gloss-rendering"; + version = "1.9.2.1"; + sha256 = "05wdiadwjykz8x0fimznp3q1drm4v3vnv6cv6wjkj1xsclmhb99k"; + buildDepends = [ bmp GLUT OpenGL ]; + meta = { + description = "Gloss picture data types and rendering functions"; + license = self.stdenv.lib.licenses.mit; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/gloss/default.nix b/pkgs/development/libraries/haskell/gloss/default.nix index 079914a84fc..da6eb98776f 100644 --- a/pkgs/development/libraries/haskell/gloss/default.nix +++ b/pkgs/development/libraries/haskell/gloss/default.nix @@ -1,12 +1,12 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, bmp, GLUT, OpenGL }: +{ cabal, bmp, glossRendering, GLUT, OpenGL }: cabal.mkDerivation (self: { pname = "gloss"; - version = "1.8.2.2"; - sha256 = "1v3rvx3jidbh98znmnl122rqgg5r9zcl22h5ibzag9h5d31c5vzr"; - buildDepends = [ bmp GLUT OpenGL ]; + version = "1.9.2.1"; + sha256 = "1fk7472lw4621gv64fv4mna8z1av15f7d0didpc9r22rdlkpa80l"; + buildDepends = [ bmp glossRendering GLUT OpenGL ]; meta = { homepage = "http://gloss.ouroborus.net"; description = "Painless 2D vector graphics, animations and simulations"; diff --git a/pkgs/development/libraries/haskell/gtk/default.nix b/pkgs/development/libraries/haskell/gtk/default.nix index e9a90659a95..effbd57f799 100644 --- a/pkgs/development/libraries/haskell/gtk/default.nix +++ b/pkgs/development/libraries/haskell/gtk/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "gtk"; - version = "0.13.0.3"; - sha256 = "1l42hn3mhycq2b7z517jjyz3s8kvf5nyy0m674da0h2rixw9r5fh"; + version = "0.13.3"; + sha256 = "016v6r53py659ncx0nvlcvvs3j3kj6rrbrm7lk8sggdhm7jvz6w7"; buildDepends = [ cairo gio glib mtl pango text ]; buildTools = [ gtk2hsBuildtools ]; extraLibraries = [ libc pkgconfig ]; diff --git a/pkgs/development/libraries/haskell/gtk3/default.nix b/pkgs/development/libraries/haskell/gtk3/default.nix index 2bcb6848e59..d39adf4e5e4 100644 --- a/pkgs/development/libraries/haskell/gtk3/default.nix +++ b/pkgs/development/libraries/haskell/gtk3/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "gtk3"; - version = "0.13.1"; - sha256 = "063my2y0fjsr2dgw066l6ck3mbcp1ahx5rqlzyb5xx1sbafrpl6a"; + version = "0.13.3"; + sha256 = "0246d4dxgmfvq7g8avswjry2rh5lfj1kzcf0vqwchgvlvcfhgzlh"; isLibrary = true; isExecutable = true; buildDepends = [ cairo gio glib mtl pango text time transformers ]; diff --git a/pkgs/development/libraries/haskell/hackage-db/default.nix b/pkgs/development/libraries/haskell/hackage-db/default.nix index 1668574d7c8..e4243def8b4 100644 --- a/pkgs/development/libraries/haskell/hackage-db/default.nix +++ b/pkgs/development/libraries/haskell/hackage-db/default.nix @@ -4,12 +4,12 @@ cabal.mkDerivation (self: { pname = "hackage-db"; - version = "1.8"; - sha256 = "0iav085xq4d6k9z0x7jlnw3r3wwnzbr7ygbaqnblj6mcpnps9r3q"; + version = "1.11"; + sha256 = "14jjy3i5pjdcw2cx3n5ipg72zahvy9vh87vlcgnz44slw8av6dcq"; buildDepends = [ Cabal filepath tar utf8String ]; meta = { homepage = "http://github.com/peti/hackage-db"; - description = "provide access to the Hackage database via Data.Map"; + description = "access Hackage's package database via Data.Map"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; maintainers = with self.stdenv.lib.maintainers; [ simons ]; diff --git a/pkgs/development/libraries/haskell/haddock-api/default.nix b/pkgs/development/libraries/haskell/haddock-api/default.nix index 2f3afa32196..d2dc35b1ffd 100644 --- a/pkgs/development/libraries/haskell/haddock-api/default.nix +++ b/pkgs/development/libraries/haskell/haddock-api/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "haddock-api"; - version = "2.15.0"; - sha256 = "17h5h40ddn0kiqnz6rmz9p0jqvng11lq3xm6lnizwix9kcwl843b"; + version = "2.15.0.1"; + sha256 = "1s25wykd5ka9chi67s07zy1jyd4pxs72d6lcpj7551izcs2l86sm"; buildDepends = [ Cabal deepseq filepath ghcPaths haddockLibrary xhtml ]; diff --git a/pkgs/development/libraries/haskell/hakyll/default.nix b/pkgs/development/libraries/haskell/hakyll/default.nix index 03730449a1a..7eeacd238ba 100644 --- a/pkgs/development/libraries/haskell/hakyll/default.nix +++ b/pkgs/development/libraries/haskell/hakyll/default.nix @@ -11,8 +11,8 @@ cabal.mkDerivation (self: { pname = "hakyll"; - version = "4.6.1.0"; - sha256 = "19yw5yp84vli228zmyz23vs6d5mb14rjbb81kvyra8fi8mmy2l6b"; + version = "4.6.1.1"; + sha256 = "1y1bc25ivj6sgq9909qgwsm54dn6sdisd1znkk9r5x9c7ajv6gaa"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/libraries/haskell/half/default.nix b/pkgs/development/libraries/haskell/half/default.nix index 009c141660f..e113f6730d9 100644 --- a/pkgs/development/libraries/haskell/half/default.nix +++ b/pkgs/development/libraries/haskell/half/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "half"; - version = "0.2"; - sha256 = "0p5fw17mvcr6yizgdjy681a1gqdidb5yp80gksxrdm1dv6qf6xcp"; + version = "0.2.0.1"; + sha256 = "0lwh5bv8pnp9fzq64z1fg1i4fv8h2lcchs1298agq881hcay19qw"; meta = { homepage = "http://github.com/ekmett/half"; description = "Half-precision floating-point"; diff --git a/pkgs/development/libraries/haskell/hashable/default.nix b/pkgs/development/libraries/haskell/hashable/default.nix index bfd9ec03c0e..ba2690e6ce8 100644 --- a/pkgs/development/libraries/haskell/hashable/default.nix +++ b/pkgs/development/libraries/haskell/hashable/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "hashable"; - version = "1.2.2.0"; - sha256 = "08cfm1rzhf3d8dzn0iqadfs35151ff6szhnh4bwrpxcs6sq90fh3"; + version = "1.2.3.0"; + sha256 = "02akgpwjzj2w5jnn31xp6yvgs4xmyircm8wcbq9v0icza6yb11qi"; buildDepends = [ text ]; testDepends = [ HUnit QuickCheck random testFramework testFrameworkHunit diff --git a/pkgs/development/libraries/haskell/hashtables/default.nix b/pkgs/development/libraries/haskell/hashtables/default.nix index c941e08da35..ddccebeb48d 100644 --- a/pkgs/development/libraries/haskell/hashtables/default.nix +++ b/pkgs/development/libraries/haskell/hashtables/default.nix @@ -1,11 +1,15 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, hashable, primitive, vector }: +{ cabal, fetchgit, hashable, primitive, vector }: cabal.mkDerivation (self: { pname = "hashtables"; - version = "1.1.2.1"; - sha256 = "1166baqalpp9v735821drjvyasr44p4znbcs7njyr09fx87r23f5"; + version = "1.2.0.1"; + src = fetchgit { + url = "git://github.com/gregorycollins/hashtables.git"; + sha256 = "1622ba3eb37e72cbedf01ae17162e045ca6506dea8a78750cc85805fe8e86129"; + rev = "a045fa90f4bc3923f38d1b468ce4d3982cef85e0"; + }; buildDepends = [ hashable primitive vector ]; meta = { homepage = "http://github.com/gregorycollins/hashtables"; diff --git a/pkgs/development/libraries/haskell/haskell-names/default.nix b/pkgs/development/libraries/haskell/haskell-names/default.nix index f8ec4d67a0b..5185c1037a8 100644 --- a/pkgs/development/libraries/haskell/haskell-names/default.nix +++ b/pkgs/development/libraries/haskell/haskell-names/default.nix @@ -8,8 +8,8 @@ cabal.mkDerivation (self: { pname = "haskell-names"; - version = "0.4.1"; - sha256 = "1zkfq54s7n17g77sqzfhhc4bmqwdwbynz0gzwyaf3m4nmz6lkfl8"; + version = "0.5.0"; + sha256 = "07fwdnhiqz6w323iw4xspar8m6sc6mv85i5f2vzbb5y8mrv352zr"; buildDepends = [ aeson Cabal dataLensLight filepath haskellPackages haskellSrcExts hseCpp mtl tagged transformers traverseWithClass typeEq uniplate diff --git a/pkgs/development/libraries/haskell/hindent/default.nix b/pkgs/development/libraries/haskell/hindent/default.nix index 36fe2f7113d..ea5e13a1b5f 100644 --- a/pkgs/development/libraries/haskell/hindent/default.nix +++ b/pkgs/development/libraries/haskell/hindent/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "hindent"; - version = "3.9.1"; - sha256 = "1q1a5smykjs36y29cn34kws443kw0w26xjjfdvv0kf69jpcm4b2f"; + version = "4.0"; + sha256 = "1l4dhp55ps92zvz2nmhs1j4hfsbs0r5f2b7idjcy8ibng8sgb361"; isLibrary = true; isExecutable = true; buildDepends = [ dataDefault haskellSrcExts monadLoops mtl text ]; diff --git a/pkgs/development/libraries/haskell/hmatrix/default.nix b/pkgs/development/libraries/haskell/hmatrix/default.nix index cbb4a44655d..afc5833d5e2 100644 --- a/pkgs/development/libraries/haskell/hmatrix/default.nix +++ b/pkgs/development/libraries/haskell/hmatrix/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "hmatrix"; - version = "0.16.0.6"; - sha256 = "13xbz0dx153m6nc7lv522gihvav5n6a4kiavwsqwh27ql4zyind7"; + version = "0.16.1.0"; + sha256 = "0jdkh9cq3dzc2fdkqv2zpv70knfkr0i01wv83zw3gjjv081gcn5h"; buildDepends = [ binary deepseq random split storableComplex vector ]; diff --git a/pkgs/development/libraries/haskell/hopenssl/default.nix b/pkgs/development/libraries/haskell/hopenssl/default.nix index c077e7cde20..5532b56e6a1 100644 --- a/pkgs/development/libraries/haskell/hopenssl/default.nix +++ b/pkgs/development/libraries/haskell/hopenssl/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "hopenssl"; - version = "1.6.2"; - sha256 = "0b9xdm7jgkadx53vwszjnisyblzsqk99s3zqppgp0iqqf9955s4w"; + version = "1.7"; + sha256 = "1zs69kxwz5fnm62mdscbpfz78vwnda75gyx1vxmmlisfhfslprly"; buildDepends = [ mtl ]; extraLibraries = [ openssl ]; meta = { diff --git a/pkgs/development/libraries/haskell/hspec-core/default.nix b/pkgs/development/libraries/haskell/hspec-core/default.nix index 5e8378dd871..313153c55c0 100644 --- a/pkgs/development/libraries/haskell/hspec-core/default.nix +++ b/pkgs/development/libraries/haskell/hspec-core/default.nix @@ -1,21 +1,21 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, ansiTerminal, async, deepseq, ghcPaths, hspecExpectations -, hspecMeta, HUnit, QuickCheck, quickcheckIo, random, setenv -, silently, tfRandom, time, transformers +{ cabal, ansiTerminal, async, deepseq, hspecExpectations, hspecMeta +, HUnit, QuickCheck, quickcheckIo, random, setenv, silently +, tfRandom, time, transformers }: cabal.mkDerivation (self: { pname = "hspec-core"; - version = "2.0.2"; - sha256 = "19nssrvwnpa9yib9qqrhf1hi8m624si97874hhdh2hqc7kjqr332"; + version = "2.1.2"; + sha256 = "1mvsfr175g5dbk1xz48d0p4lv4gvv4z3ss3n2s7d2h83i25bmjvh"; buildDepends = [ ansiTerminal async deepseq hspecExpectations HUnit QuickCheck quickcheckIo random setenv tfRandom time transformers ]; testDepends = [ - ansiTerminal async deepseq ghcPaths hspecExpectations hspecMeta - HUnit QuickCheck quickcheckIo random setenv silently tfRandom time + ansiTerminal async deepseq hspecExpectations hspecMeta HUnit + QuickCheck quickcheckIo random setenv silently tfRandom time transformers ]; meta = { diff --git a/pkgs/development/libraries/haskell/hspec-discover/default.nix b/pkgs/development/libraries/haskell/hspec-discover/default.nix index bf7d280fca0..8a4a79eae97 100644 --- a/pkgs/development/libraries/haskell/hspec-discover/default.nix +++ b/pkgs/development/libraries/haskell/hspec-discover/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "hspec-discover"; - version = "2.0.2"; - sha256 = "1439134sdgwimjihjy06g4vq3bkym97da4z1zkgxgj91ljfwlb2i"; + version = "2.1.2"; + sha256 = "0zv215br94agvg8dbz0f5az5cahgnw8gdx0z84zlrpjxkzf3rb19"; isLibrary = true; isExecutable = true; buildDepends = [ filepath ]; diff --git a/pkgs/development/libraries/haskell/hspec-laws/default.nix b/pkgs/development/libraries/haskell/hspec-laws/default.nix new file mode 100644 index 00000000000..b7b2a57d534 --- /dev/null +++ b/pkgs/development/libraries/haskell/hspec-laws/default.nix @@ -0,0 +1,17 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, hspec, markdownUnlit, QuickCheck }: + +cabal.mkDerivation (self: { + pname = "hspec-laws"; + version = "0.0.0"; + sha256 = "15mcspn20znjxjsjqivrfvpndjd2i3kic5nyij13lfwyd3p2al0j"; + buildDepends = [ hspec QuickCheck ]; + testDepends = [ hspec markdownUnlit QuickCheck ]; + meta = { + description = "Document and test laws for standard type classes"; + license = self.stdenv.lib.licenses.mit; + platforms = self.ghc.meta.platforms; + maintainers = with self.stdenv.lib.maintainers; [ fuuzetsu ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/hspec/default.nix b/pkgs/development/libraries/haskell/hspec/default.nix index fc60a54cd73..8f8b66b39d3 100644 --- a/pkgs/development/libraries/haskell/hspec/default.nix +++ b/pkgs/development/libraries/haskell/hspec/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "hspec"; - version = "2.0.2"; - sha256 = "19zxsadp1xwxdyp6zksaz4czdnmjd0x3gmbh7pqv6l4dxmd0545a"; + version = "2.1.2"; + sha256 = "04n34g7gbmbkyqzp9by4qdcf87m1gasmc2hnm8i0dqpcnssv05py"; buildDepends = [ hspecCore hspecDiscover hspecExpectations HUnit QuickCheck transformers diff --git a/pkgs/development/libraries/haskell/hspec2/default.nix b/pkgs/development/libraries/haskell/hspec2/default.nix index c833b80bb9f..c6f64c92182 100644 --- a/pkgs/development/libraries/haskell/hspec2/default.nix +++ b/pkgs/development/libraries/haskell/hspec2/default.nix @@ -12,5 +12,6 @@ cabal.mkDerivation (self: { description = "Alpha version of Hspec 2.0"; license = self.stdenv.lib.licenses.mit; platforms = self.ghc.meta.platforms; + broken = true; }; }) diff --git a/pkgs/development/libraries/haskell/http-client/default.nix b/pkgs/development/libraries/haskell/http-client/default.nix index 12e69b7c723..9ab96c6dfe8 100644 --- a/pkgs/development/libraries/haskell/http-client/default.nix +++ b/pkgs/development/libraries/haskell/http-client/default.nix @@ -9,8 +9,8 @@ cabal.mkDerivation (self: { pname = "http-client"; - version = "0.4.5"; - sha256 = "04ikxigxhppayzw4bfh52zznly6cd9vfd9gn3a12xz4js6q3pwva"; + version = "0.4.6"; + sha256 = "0zv1jncacwxxk8dj1jlicjdlfhxigpl23frq2vrp4w76d1lsa0d8"; buildDepends = [ base64Bytestring blazeBuilder caseInsensitive cookie dataDefaultClass deepseq exceptions filepath httpTypes mimeTypes diff --git a/pkgs/development/libraries/haskell/httpd-shed/default.nix b/pkgs/development/libraries/haskell/httpd-shed/default.nix index 4ae04b2c726..4a4334be732 100644 --- a/pkgs/development/libraries/haskell/httpd-shed/default.nix +++ b/pkgs/development/libraries/haskell/httpd-shed/default.nix @@ -1,19 +1,18 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, network }: +{ cabal, network, networkUri }: cabal.mkDerivation (self: { pname = "httpd-shed"; - version = "0.4.0.2"; - sha256 = "0w37ra59xhk6gqrxpk83m1wmm7mqygcg59y5nl00x279c77qzxj3"; + version = "0.4.0.3"; + sha256 = "064jy1mqhnf1hvq6s04wlhmp916rd522x58djb9qixv13vc8gzxh"; isLibrary = true; isExecutable = true; - buildDepends = [ network ]; + buildDepends = [ network networkUri ]; jailbreak = true; meta = { description = "A simple web-server with an interact style API"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - broken = true; }; }) diff --git a/pkgs/development/libraries/haskell/hxt/default.nix b/pkgs/development/libraries/haskell/hxt/default.nix index 28eaff157f1..db2badaaaf2 100644 --- a/pkgs/development/libraries/haskell/hxt/default.nix +++ b/pkgs/development/libraries/haskell/hxt/default.nix @@ -18,5 +18,6 @@ cabal.mkDerivation (self: { description = "A collection of tools for processing XML with Haskell"; license = self.stdenv.lib.licenses.mit; platforms = self.ghc.meta.platforms; + maintainers = with self.stdenv.lib.maintainers; [ fuuzetsu ]; }; }) diff --git a/pkgs/development/libraries/haskell/io-streams/default.nix b/pkgs/development/libraries/haskell/io-streams/default.nix index a046c234e63..3963add1825 100644 --- a/pkgs/development/libraries/haskell/io-streams/default.nix +++ b/pkgs/development/libraries/haskell/io-streams/default.nix @@ -8,8 +8,8 @@ cabal.mkDerivation (self: { pname = "io-streams"; - version = "1.2.0.1"; - sha256 = "12r7j8dzj80f4s9942a6pi60pd9jh44sqyl6hcn0npzmdyl7hg1k"; + version = "1.2.1.1"; + sha256 = "1pvrscyw7wcv910p8d9j4a9jdm0vm7m74g5kgzpc5hnxdfibhqj1"; buildDepends = [ attoparsec blazeBuilder network primitive text time transformers vector zlibBindings diff --git a/pkgs/development/libraries/haskell/ixdopp/default.nix b/pkgs/development/libraries/haskell/ixdopp/default.nix deleted file mode 100644 index 25b4ebed648..00000000000 --- a/pkgs/development/libraries/haskell/ixdopp/default.nix +++ /dev/null @@ -1,18 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, preprocessorTools, syb }: - -cabal.mkDerivation (self: { - pname = "ixdopp"; - version = "0.1.3"; - sha256 = "1vknwznk42b33q4pmh6z620g761yf3cmsmrmhilgq42i5qhll4d4"; - isLibrary = false; - isExecutable = true; - buildDepends = [ preprocessorTools syb ]; - meta = { - homepage = "http://www.eecs.harvard.edu/~tov/pubs/haskell-session-types/"; - description = "A preprocessor for expanding \"ixdo\" notation for indexed monads"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - }; -}) diff --git a/pkgs/development/libraries/haskell/jwt/default.nix b/pkgs/development/libraries/haskell/jwt/default.nix index 27eb104f4df..400bd6c9e9d 100644 --- a/pkgs/development/libraries/haskell/jwt/default.nix +++ b/pkgs/development/libraries/haskell/jwt/default.nix @@ -2,22 +2,24 @@ { cabal, aeson, base64Bytestring, cryptohash, dataDefault , httpTypes, HUnit, network, networkUri, QuickCheck, scientific -, tasty, tastyHunit, tastyQuickcheck, tastyTh, text, time -, unorderedContainers +, semigroups, tasty, tastyHunit, tastyQuickcheck, tastyTh, text +, time, unorderedContainers, vector }: cabal.mkDerivation (self: { pname = "jwt"; - version = "0.4.2"; - sha256 = "167qm37y5f3d05spr0z2jwkbm2sszz3khs6zd1p0az5q4nhq295w"; + version = "0.5.0"; + sha256 = "0445biw5rj4plbz4nbmzrn446dfsjnggzrrcn1m292g3dqp6gzgh"; buildDepends = [ aeson base64Bytestring cryptohash dataDefault httpTypes network - networkUri scientific text time unorderedContainers + networkUri scientific semigroups text time unorderedContainers + vector ]; testDepends = [ aeson base64Bytestring cryptohash dataDefault httpTypes HUnit - network networkUri QuickCheck scientific tasty tastyHunit - tastyQuickcheck tastyTh text time unorderedContainers + network networkUri QuickCheck scientific semigroups tasty + tastyHunit tastyQuickcheck tastyTh text time unorderedContainers + vector ]; meta = { homepage = "https://bitbucket.org/ssaasen/haskell-jwt"; diff --git a/pkgs/development/libraries/haskell/kan-extensions/default.nix b/pkgs/development/libraries/haskell/kan-extensions/default.nix index dce273d60a6..d359cebd6e1 100644 --- a/pkgs/development/libraries/haskell/kan-extensions/default.nix +++ b/pkgs/development/libraries/haskell/kan-extensions/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "kan-extensions"; - version = "4.1.0.1"; - sha256 = "1jrs5cp5bhv3sjfi3d2zl16x40fr086zadp69r8yigj43bgkwkkd"; + version = "4.1.1"; + sha256 = "0g7z37c2jvhvq08ynnd5z2spp7w56vqhpg5biscj62rw7fzssnar"; buildDepends = [ adjunctions comonad contravariant distributive free mtl pointed semigroupoids tagged transformers diff --git a/pkgs/development/libraries/haskell/lens-aeson/default.nix b/pkgs/development/libraries/haskell/lens-aeson/default.nix index 44097f2c9d4..f1fcd255b5f 100644 --- a/pkgs/development/libraries/haskell/lens-aeson/default.nix +++ b/pkgs/development/libraries/haskell/lens-aeson/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "lens-aeson"; - version = "1.0.0.2"; - sha256 = "1hq0zs1h4wapy1n9vyr4yiysnwbv26di8gl6msx3jkcahvlnkvlp"; + version = "1.0.0.3"; + sha256 = "0wfbnazarwcza5dn3icsdvsmkyf9ki5lr5d5yidmgijhs63ak7ac"; buildDepends = [ aeson attoparsec lens scientific text unorderedContainers vector ]; diff --git a/pkgs/development/libraries/haskell/lens/4.2.nix b/pkgs/development/libraries/haskell/lens/4.2.nix index 2729e42be61..f82368422e4 100644 --- a/pkgs/development/libraries/haskell/lens/4.2.nix +++ b/pkgs/development/libraries/haskell/lens/4.2.nix @@ -11,8 +11,8 @@ cabal.mkDerivation (self: { pname = "lens"; - version = "4.5"; - sha256 = "009wdzybzmk7cs27fzigsmxknim6f9s7lp7iivgcsfn49pd8imwv"; + version = "4.6.0.1"; + sha256 = "099hhkca39zxfj9xavd2rafzgm2r4nm8clngcsgcrn1qsy8knvz2"; buildDepends = [ bifunctors comonad contravariant distributive exceptions filepath free hashable mtl parallel primitive profunctors reflection diff --git a/pkgs/development/libraries/haskell/libnotify/default.nix b/pkgs/development/libraries/haskell/libnotify/default.nix new file mode 100644 index 00000000000..8ed4e80d49f --- /dev/null +++ b/pkgs/development/libraries/haskell/libnotify/default.nix @@ -0,0 +1,16 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, glib, gtk, libnotify }: + +cabal.mkDerivation (self: { + pname = "libnotify"; + version = "0.1.1.0"; + sha256 = "1wc19v14agadj7dzi81lm3qzk2x33apaj5ylmg7x232k56xzfvr0"; + buildDepends = [ glib gtk ]; + extraLibraries = [ libnotify ]; + meta = { + description = "Bindings to libnotify library"; + license = self.stdenv.lib.licenses.mit; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/lifted-base/default.nix b/pkgs/development/libraries/haskell/lifted-base/default.nix index 3e4f95521bb..80961ba86c8 100644 --- a/pkgs/development/libraries/haskell/lifted-base/default.nix +++ b/pkgs/development/libraries/haskell/lifted-base/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "lifted-base"; - version = "0.2.3.0"; - sha256 = "0wbh9l7hsbgvfplxyamvpb8nq6w147zsd2yskylfmpw7kyz6yp9n"; + version = "0.2.3.1"; + sha256 = "1ga2kvacb44syvv1l0gaqyzlp12h7rrqn8k5fvy7ca5ffxwy5472"; buildDepends = [ monadControl transformersBase ]; testDepends = [ HUnit monadControl testFramework testFrameworkHunit transformers diff --git a/pkgs/development/libraries/haskell/lin-alg/default.nix b/pkgs/development/libraries/haskell/lin-alg/default.nix new file mode 100644 index 00000000000..39391f989a8 --- /dev/null +++ b/pkgs/development/libraries/haskell/lin-alg/default.nix @@ -0,0 +1,15 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, NumInstances, vector }: + +cabal.mkDerivation (self: { + pname = "lin-alg"; + version = "0.1.0.2"; + sha256 = "19123k967mql69my6c19mnvp4qwa4b3bgimmlbhipqdljykj7pqc"; + buildDepends = [ NumInstances vector ]; + meta = { + description = "Low-dimensional matrices and vectors for graphics and physics"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/linear-opengl/default.nix b/pkgs/development/libraries/haskell/linear-opengl/default.nix new file mode 100644 index 00000000000..a10489a6006 --- /dev/null +++ b/pkgs/development/libraries/haskell/linear-opengl/default.nix @@ -0,0 +1,18 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, distributive, lens, linear, OpenGL, OpenGLRaw, tagged }: + +cabal.mkDerivation (self: { + pname = "linear-opengl"; + version = "0.2.0.4"; + sha256 = "11pdif2w730jqknajr2si77a0z4v4k5spm5zdks642i25ya135ba"; + buildDepends = [ + distributive lens linear OpenGL OpenGLRaw tagged + ]; + meta = { + homepage = "http://www.github.com/bgamari/linear-opengl"; + description = "Isomorphisms between linear and OpenGL types"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/linear/default.nix b/pkgs/development/libraries/haskell/linear/default.nix index bbe0763cd23..6301d8d42d6 100644 --- a/pkgs/development/libraries/haskell/linear/default.nix +++ b/pkgs/development/libraries/haskell/linear/default.nix @@ -8,8 +8,8 @@ cabal.mkDerivation (self: { pname = "linear"; - version = "1.15.4"; - sha256 = "0xpprafv7dndihnk2mapgvhy4cpz2d24k5j1p3q5crrsi2wj7k0b"; + version = "1.15.5"; + sha256 = "17fxz49zj6vklgfs583zpn7naqgp5mv2zsvmxrv80ym8r52mp5mi"; buildDepends = [ adjunctions binary distributive hashable lens reflection semigroupoids semigroups tagged transformers unorderedContainers diff --git a/pkgs/development/libraries/haskell/list-t/default.nix b/pkgs/development/libraries/haskell/list-t/default.nix new file mode 100644 index 00000000000..9df455650f5 --- /dev/null +++ b/pkgs/development/libraries/haskell/list-t/default.nix @@ -0,0 +1,21 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, basePrelude, HTF, mmorph, monadControl, mtlPrelude +, transformers, transformersBase +}: + +cabal.mkDerivation (self: { + pname = "list-t"; + version = "0.3.0"; + sha256 = "091gz47gisajd2p0iwx0mw99bivfl7wpyddg1ypsvjv2qax94cm9"; + buildDepends = [ + basePrelude mmorph monadControl transformers transformersBase + ]; + testDepends = [ basePrelude HTF mtlPrelude ]; + meta = { + homepage = "https://github.com/nikita-volkov/list-t"; + description = "ListT done right"; + license = self.stdenv.lib.licenses.mit; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/lzma-conduit/default.nix b/pkgs/development/libraries/haskell/lzma-conduit/default.nix index f93a53c8670..9b80409ddd4 100644 --- a/pkgs/development/libraries/haskell/lzma-conduit/default.nix +++ b/pkgs/development/libraries/haskell/lzma-conduit/default.nix @@ -20,5 +20,6 @@ cabal.mkDerivation (self: { description = "Conduit interface for lzma/xz compression"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; + broken = self.stdenv.isLinux && self.stdenv.isi686; }; }) diff --git a/pkgs/development/libraries/haskell/machines/default.nix b/pkgs/development/libraries/haskell/machines/default.nix index 02b2ec272b0..bb01e9f655e 100644 --- a/pkgs/development/libraries/haskell/machines/default.nix +++ b/pkgs/development/libraries/haskell/machines/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "machines"; - version = "0.4.0.1"; - sha256 = "11h1b6hls7v4ifz3p7v1gdsgxqgyx92v978pjfyp81ianwjyclqg"; + version = "0.4.1"; + sha256 = "1wripnvpzfdnf7i2aygjyh33cp7srkb5638snwyn700bjbi2j7gb"; buildDepends = [ comonad free mtl pointed profunctors semigroups transformers void ]; diff --git a/pkgs/development/libraries/haskell/markdown/default.nix b/pkgs/development/libraries/haskell/markdown/default.nix index d2d7ef84375..cd0bcd3cfee 100644 --- a/pkgs/development/libraries/haskell/markdown/default.nix +++ b/pkgs/development/libraries/haskell/markdown/default.nix @@ -1,17 +1,17 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, attoparsec, blazeHtml, conduit, conduitExtra, dataDefault -, hspec, systemFileio, systemFilepath, text, transformers -, xssSanitize +{ cabal, attoparsec, blazeHtml, blazeMarkup, conduit, conduitExtra +, dataDefault, hspec, systemFileio, systemFilepath, text +, transformers, xssSanitize }: cabal.mkDerivation (self: { pname = "markdown"; - version = "0.1.12"; - sha256 = "19qpr9k3yz5c77i4y4qldq4ak0m8iy6ca5wjx6mix9krlnwxkrid"; + version = "0.1.13"; + sha256 = "1r04h641d9y8p88h59isrz9g42gq7vdykx3n8bhk499ici800134"; buildDepends = [ - attoparsec blazeHtml conduit conduitExtra dataDefault text - transformers xssSanitize + attoparsec blazeHtml blazeMarkup conduit conduitExtra dataDefault + text transformers xssSanitize ]; testDepends = [ blazeHtml conduit conduitExtra hspec systemFileio systemFilepath diff --git a/pkgs/development/libraries/haskell/minioperational/default.nix b/pkgs/development/libraries/haskell/minioperational/default.nix index d037645682f..04da7e27e2c 100644 --- a/pkgs/development/libraries/haskell/minioperational/default.nix +++ b/pkgs/development/libraries/haskell/minioperational/default.nix @@ -1,16 +1,17 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, transformers }: +{ cabal, cleanUnions, elevator, transformers }: cabal.mkDerivation (self: { pname = "minioperational"; - version = "0.4.6"; - sha256 = "0ir15l9ks4wik5wmhc9v23d2wlh4v499a52pzzsl8w40406lm5ln"; - buildDepends = [ transformers ]; + version = "0.4.8.1"; + sha256 = "02nkgbpf1dky7h3n99j9m3101wyfahcdx5wk5vidvf9snl5vy1w9"; + buildDepends = [ cleanUnions elevator transformers ]; meta = { homepage = "https://github.com/fumieval/minioperational"; description = "fast and simple operational monad"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; + maintainers = with self.stdenv.lib.maintainers; [ fuuzetsu ]; }; }) diff --git a/pkgs/development/libraries/haskell/monad-logger/default.nix b/pkgs/development/libraries/haskell/monad-logger/default.nix index 4cb44acf652..68e3c0164c0 100644 --- a/pkgs/development/libraries/haskell/monad-logger/default.nix +++ b/pkgs/development/libraries/haskell/monad-logger/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "monad-logger"; - version = "0.3.8"; - sha256 = "08mvz78ak6rf22s2z0b50iky36cnd6f498262aj57l7j0l7zsy7r"; + version = "0.3.11"; + sha256 = "0ydxv4pdq660dh3cdmsd5lgjkfhh7c62kb5vcl8jl6qmjf8kvmdq"; buildDepends = [ blazeBuilder conduit conduitExtra exceptions fastLogger liftedBase monadControl monadLoops mtl resourcet stm stmChans text diff --git a/pkgs/development/libraries/haskell/monad-par/0.3.4.6.nix b/pkgs/development/libraries/haskell/monad-par/0.3.4.7.nix similarity index 90% rename from pkgs/development/libraries/haskell/monad-par/0.3.4.6.nix rename to pkgs/development/libraries/haskell/monad-par/0.3.4.7.nix index d43379da7f9..c9d6cf71ae5 100644 --- a/pkgs/development/libraries/haskell/monad-par/0.3.4.6.nix +++ b/pkgs/development/libraries/haskell/monad-par/0.3.4.7.nix @@ -8,8 +8,8 @@ cabal.mkDerivation (self: { pname = "monad-par"; - version = "0.3.4.6"; - sha256 = "1k345fpq31jg0mvfk8ap03wscnx8dvlp65gr567vai9ym1ahk6zy"; + version = "0.3.4.7"; + sha256 = "12n27hs274nrfkpa6hx0gdkrc76wxzliqf53x6689idl363sdf13"; buildDepends = [ abstractDeque abstractPar deepseq monadParExtras mtl mwcRandom parallel diff --git a/pkgs/development/libraries/haskell/monad-parallel/default.nix b/pkgs/development/libraries/haskell/monad-parallel/default.nix index db53712d4ef..bff520fab83 100644 --- a/pkgs/development/libraries/haskell/monad-parallel/default.nix +++ b/pkgs/development/libraries/haskell/monad-parallel/default.nix @@ -1,12 +1,12 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, parallel, transformers }: +{ cabal, parallel, transformers, transformersCompat }: cabal.mkDerivation (self: { pname = "monad-parallel"; - version = "0.7.1.2"; - sha256 = "0ybifm54dwaz5jqccw7hwlykjw4bcnl924808bi01j5i7ggyz5wj"; - buildDepends = [ parallel transformers ]; + version = "0.7.1.3"; + sha256 = "150ich9fzpmwdvvhsd7ri97nm8zsqn86gr3bh0aqb0wgrg4hbmkx"; + buildDepends = [ parallel transformers transformersCompat ]; meta = { homepage = "http://trac.haskell.org/SCC/wiki/monad-parallel"; description = "Parallel execution of monadic computations"; diff --git a/pkgs/development/libraries/haskell/monoid-extras/default.nix b/pkgs/development/libraries/haskell/monoid-extras/default.nix index 3c0a742a1f3..f7ae10ce08d 100644 --- a/pkgs/development/libraries/haskell/monoid-extras/default.nix +++ b/pkgs/development/libraries/haskell/monoid-extras/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "monoid-extras"; - version = "0.3.3.4"; - sha256 = "0jbly9zxnsm15a5d3xg7i6w1mpqi4irdc76996xm5slg8bh0cji6"; + version = "0.3.3.5"; + sha256 = "07xll4pz0ijjxj75z0s0bz1lia2f65hsm61snlx0jv3aybrnw280"; buildDepends = [ groups semigroupoids semigroups ]; jailbreak = true; meta = { diff --git a/pkgs/development/libraries/haskell/mtl-prelude/default.nix b/pkgs/development/libraries/haskell/mtl-prelude/default.nix new file mode 100644 index 00000000000..3bf2395cb3a --- /dev/null +++ b/pkgs/development/libraries/haskell/mtl-prelude/default.nix @@ -0,0 +1,16 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, mtl, transformers }: + +cabal.mkDerivation (self: { + pname = "mtl-prelude"; + version = "1.0.1"; + sha256 = "09zdsgh4y4b5chl847n1dz4vys2sdyxmf0v39ad449s5rv5l92hj"; + buildDepends = [ mtl transformers ]; + meta = { + homepage = "https://github.com/nikita-volkov/mtl-prelude"; + description = "Reexports of most definitions from \"mtl\" and \"transformers\""; + license = self.stdenv.lib.licenses.mit; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/mvc-updates/default.nix b/pkgs/development/libraries/haskell/mvc-updates/default.nix new file mode 100644 index 00000000000..ef6d465fd81 --- /dev/null +++ b/pkgs/development/libraries/haskell/mvc-updates/default.nix @@ -0,0 +1,15 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, async, foldl, mvc }: + +cabal.mkDerivation (self: { + pname = "mvc-updates"; + version = "1.2.0"; + sha256 = "125bwc79qcmwb8dn8yqkrxlbqf3vwdzhjx66c69j2jbrp70061n6"; + buildDepends = [ async foldl mvc ]; + meta = { + description = "Concurrent and combinable updates"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/mvc/default.nix b/pkgs/development/libraries/haskell/mvc/default.nix new file mode 100644 index 00000000000..5373062a6da --- /dev/null +++ b/pkgs/development/libraries/haskell/mvc/default.nix @@ -0,0 +1,20 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, async, contravariant, managed, mmorph, pipes +, pipesConcurrency, transformers +}: + +cabal.mkDerivation (self: { + pname = "mvc"; + version = "1.0.2"; + sha256 = "1hah38hzy0d12b3vk7m6wfzx6hbm79zl4a9mx8bk9825c0g9qy0z"; + buildDepends = [ + async contravariant managed mmorph pipes pipesConcurrency + transformers + ]; + meta = { + description = "Model-view-controller"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/nats/default.nix b/pkgs/development/libraries/haskell/nats/default.nix index e870d171383..3c4130eddc4 100644 --- a/pkgs/development/libraries/haskell/nats/default.nix +++ b/pkgs/development/libraries/haskell/nats/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "nats"; - version = "0.2"; - sha256 = "05skqs5ahbrnwlsxjihkvmsw0n49k9mqdhrv9nqh4dmd1j622r73"; + version = "1"; + sha256 = "0r6s8l4s0yq3x2crrkv0b8zac13magfasr9v8hnq6rn1icsfhic0"; buildDepends = [ hashable ]; meta = { homepage = "http://github.com/ekmett/nats/"; diff --git a/pkgs/development/libraries/haskell/network-fancy/default.nix b/pkgs/development/libraries/haskell/network-fancy/default.nix index 8e0cf757834..92e6e9e34c7 100644 --- a/pkgs/development/libraries/haskell/network-fancy/default.nix +++ b/pkgs/development/libraries/haskell/network-fancy/default.nix @@ -1,14 +1,15 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal }: cabal.mkDerivation (self: { pname = "network-fancy"; - version = "0.1.5.2"; - sha256 = "039yrrir17sphkzarwl7hncj7fb4x471mh2lvpqixl3a6nij141c"; + version = "0.2.2"; + sha256 = "12q2ifjwg4ss5l2pv42nfhsawncbwm6y4dwrspadkjv9b8idl91j"; meta = { homepage = "http://github.com/taruti/network-fancy"; description = "Networking support with a cleaner API"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; }; - preConfigure = ''substituteInPlace Setup.hs --replace '-> rt' '-> return ()' ''; }) diff --git a/pkgs/development/libraries/haskell/network-transport-tcp/default.nix b/pkgs/development/libraries/haskell/network-transport-tcp/default.nix index b4a70eb6843..cd467f5d2ab 100644 --- a/pkgs/development/libraries/haskell/network-transport-tcp/default.nix +++ b/pkgs/development/libraries/haskell/network-transport-tcp/default.nix @@ -6,19 +6,16 @@ cabal.mkDerivation (self: { pname = "network-transport-tcp"; - version = "0.4.0"; - sha256 = "1jjf1dj67a7l3jg3qgbg0hrjfnx1kr9n7hfvqssq7kr8sq1sc49v"; + version = "0.4.1"; + sha256 = "11fj0f2yrvdqn3sivfb4p0chs74bx26a0yc49fh160kkcmk42yaf"; buildDepends = [ dataAccessor network networkTransport ]; testDepends = [ network networkTransport networkTransportTests ]; doCheck = false; - patchPhase = '' - sed -i -e 's|network >=.*,|network,|' -e 's|network >=.*|network|' network-transport-tcp.cabal - ''; meta = { homepage = "http://haskell-distributed.github.com"; description = "TCP instantiation of Network.Transport"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; + maintainers = with self.stdenv.lib.maintainers; [ andres ]; }; }) diff --git a/pkgs/development/libraries/haskell/network-transport-tests/default.nix b/pkgs/development/libraries/haskell/network-transport-tests/default.nix index 2dc5036899b..5ee1edec2e9 100644 --- a/pkgs/development/libraries/haskell/network-transport-tests/default.nix +++ b/pkgs/development/libraries/haskell/network-transport-tests/default.nix @@ -4,15 +4,14 @@ cabal.mkDerivation (self: { pname = "network-transport-tests"; - version = "0.1.0.1"; - sha256 = "15vdkjq10mm378iyci1lpj6b77m7sil5mk3yhzf6vcbfj54pwca6"; + version = "0.2.1.0"; + sha256 = "17qf52a76an9ignhb85alz92j9vk3p0ydmaqys8b1ss5mkqipm64"; buildDepends = [ ansiTerminal mtl networkTransport random ]; + jailbreak = true; meta = { - homepage = "http://github.com/haskell-distributed/distributed-process"; + homepage = "http://haskell-distributed.github.com"; description = "Unit tests for Network.Transport implementations"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - broken = true; }; }) diff --git a/pkgs/development/libraries/haskell/network-transport/default.nix b/pkgs/development/libraries/haskell/network-transport/default.nix index c59a3fbb235..410e6076f29 100644 --- a/pkgs/development/libraries/haskell/network-transport/default.nix +++ b/pkgs/development/libraries/haskell/network-transport/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "network-transport"; - version = "0.4.0.0"; - sha256 = "1485w86wzszlg4dvl0fkr7wa47snvpw825llrvdgrrkcxamhsmrz"; + version = "0.4.1.0"; + sha256 = "0xn879ngrbnm71i1wsbxxiih22sdb6csy6aip6fgqyafqlpc1c93"; buildDepends = [ binary hashable transformers ]; meta = { homepage = "http://haskell-distributed.github.com"; diff --git a/pkgs/development/libraries/haskell/objective/default.nix b/pkgs/development/libraries/haskell/objective/default.nix index 9ed48a45e92..4051efb42f7 100644 --- a/pkgs/development/libraries/haskell/objective/default.nix +++ b/pkgs/development/libraries/haskell/objective/default.nix @@ -1,12 +1,16 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, cleanUnions, free, transformers }: +{ cabal, cleanUnions, elevator, minioperational, profunctors +, transformers +}: cabal.mkDerivation (self: { pname = "objective"; - version = "0.4"; - sha256 = "0zcls4b6i5b9yazy6d6fq2vpc6gbq16cqbycyc909bm7kkqzmb86"; - buildDepends = [ cleanUnions free transformers ]; + version = "0.6.1"; + sha256 = "1rnlh16r9kcrxffih6z8rprds9nxhlqksqba9wdgdkkwhrhq0ah6"; + buildDepends = [ + cleanUnions elevator minioperational profunctors transformers + ]; meta = { homepage = "https://github.com/fumieval/objective"; description = "Extensible objects"; diff --git a/pkgs/development/libraries/haskell/ofx/default.nix b/pkgs/development/libraries/haskell/ofx/default.nix new file mode 100644 index 00000000000..d7fd805f5e8 --- /dev/null +++ b/pkgs/development/libraries/haskell/ofx/default.nix @@ -0,0 +1,17 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, parsec, time }: + +cabal.mkDerivation (self: { + pname = "ofx"; + version = "0.4.0.2"; + sha256 = "0vhr2pydnfc0ma7w1qdn5p5yylzlj3n47fnm16mlbhlb5ydnjshg"; + buildDepends = [ parsec time ]; + jailbreak = true; + meta = { + homepage = "http://www.github.com/massysett/ofx"; + description = "Parser for OFX data"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/opaleye/default.nix b/pkgs/development/libraries/haskell/opaleye/default.nix index 850267648b0..918bef94fba 100644 --- a/pkgs/development/libraries/haskell/opaleye/default.nix +++ b/pkgs/development/libraries/haskell/opaleye/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "opaleye"; - version = "0.2"; - sha256 = "08qlgsr8jcwn7sx2j08nk5lggx37mh0wc8gggj6gxqpafm0jn247"; + version = "0.3"; + sha256 = "1jq2q0dswgj5jksdd5xn2ny66d1nfqmwf7cv835gg59g4rd2yyrx"; buildDepends = [ contravariant postgresqlSimple productProfunctors profunctors semigroups text time transformers uuid diff --git a/pkgs/development/libraries/haskell/parallel/3.2.0.4.nix b/pkgs/development/libraries/haskell/parallel/3.2.0.5.nix similarity index 79% rename from pkgs/development/libraries/haskell/parallel/3.2.0.4.nix rename to pkgs/development/libraries/haskell/parallel/3.2.0.5.nix index e1d1b24286d..987ee8c5bdc 100644 --- a/pkgs/development/libraries/haskell/parallel/3.2.0.4.nix +++ b/pkgs/development/libraries/haskell/parallel/3.2.0.5.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "parallel"; - version = "3.2.0.4"; - sha256 = "0v8l2rbczjadynbz4q4r00k8a1mqj70y63zbklpxckafq1zn7nwc"; + version = "3.2.0.5"; + sha256 = "16hhsi8pr29qqg9ssks0y9j0vmnvpyy1qk46s0c0vgj3pyzl38mm"; buildDepends = [ deepseq ]; meta = { description = "Parallel programming library"; diff --git a/pkgs/development/libraries/haskell/pipes-http/default.nix b/pkgs/development/libraries/haskell/pipes-http/default.nix index 5406a579799..5f432bc9dd9 100644 --- a/pkgs/development/libraries/haskell/pipes-http/default.nix +++ b/pkgs/development/libraries/haskell/pipes-http/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "pipes-http"; - version = "1.0.1"; - sha256 = "15jmhf6lgqxv9zn08dky8biiv8cp4s3vf0xmp78pbllaqkvm4z9w"; + version = "1.0.2"; + sha256 = "0hqab1pzcj11qwvc4dznis0qsyn1zc1d0riqxy6b5k04p9i2jbzk"; buildDepends = [ httpClient httpClientTls pipes ]; jailbreak = true; meta = { diff --git a/pkgs/development/libraries/haskell/pointed/default.nix b/pkgs/development/libraries/haskell/pointed/default.nix index f486737765e..82ee1a418c7 100644 --- a/pkgs/development/libraries/haskell/pointed/default.nix +++ b/pkgs/development/libraries/haskell/pointed/default.nix @@ -1,16 +1,16 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! { cabal, comonad, dataDefaultClass, semigroupoids, semigroups, stm -, tagged, transformers +, tagged, transformers, transformersCompat }: cabal.mkDerivation (self: { pname = "pointed"; - version = "4.1"; - sha256 = "1l40nl1sx16hbqz1kv70g6jp2igvvj93p5db8b6bsgjxx9ibck6g"; + version = "4.1.1"; + sha256 = "183ix3cax4qvph6grghpj5n4m7bd5xznqahjbgwz88gkf9rp2gbj"; buildDepends = [ comonad dataDefaultClass semigroupoids semigroups stm tagged - transformers + transformers transformersCompat ]; jailbreak = true; meta = { diff --git a/pkgs/development/libraries/haskell/postgresql-simple/default.nix b/pkgs/development/libraries/haskell/postgresql-simple/default.nix index 3285a9209aa..d48e80e3014 100644 --- a/pkgs/development/libraries/haskell/postgresql-simple/default.nix +++ b/pkgs/development/libraries/haskell/postgresql-simple/default.nix @@ -1,17 +1,18 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! { cabal, aeson, attoparsec, base16Bytestring, blazeBuilder -, blazeTextual, cryptohash, hashable, HUnit, postgresqlLibpq -, scientific, text, time, transformers, uuid, vector +, blazeTextual, caseInsensitive, cryptohash, hashable, HUnit +, postgresqlLibpq, scientific, text, time, transformers, uuid +, vector }: cabal.mkDerivation (self: { pname = "postgresql-simple"; - version = "0.4.7.0"; - sha256 = "17cs5f7pfh30y2n8b3w76v832sd5z9m5xswpfa5w6r2vf18xpkqs"; + version = "0.4.8.0"; + sha256 = "09mflczxjm7a8nixi4a989nq1ijhpikl4j9kqvzcpmfgb8sx38nm"; buildDepends = [ - aeson attoparsec blazeBuilder blazeTextual hashable postgresqlLibpq - scientific text time transformers uuid vector + aeson attoparsec blazeBuilder blazeTextual caseInsensitive hashable + postgresqlLibpq scientific text time transformers uuid vector ]; testDepends = [ aeson base16Bytestring cryptohash HUnit text time vector diff --git a/pkgs/development/libraries/haskell/preprocessor-tools/0.1.3.nix b/pkgs/development/libraries/haskell/preprocessor-tools/0.1.3.nix deleted file mode 100644 index 4bbd60e0ebe..00000000000 --- a/pkgs/development/libraries/haskell/preprocessor-tools/0.1.3.nix +++ /dev/null @@ -1,17 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, mtl, parsec, syb }: - -cabal.mkDerivation (self: { - pname = "preprocessor-tools"; - version = "0.1.3"; - sha256 = "0jz85v93zpv6cwvad18wr12nsikmv4n20gn37zli2h34zi543i9v"; - buildDepends = [ mtl parsec syb ]; - meta = { - homepage = "http://www.ccs.neu.edu/~tov/pubs/haskell-session-types"; - description = "A framework for extending Haskell's syntax via quick-and-dirty preprocessors"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/preprocessor-tools/1.0.1.nix b/pkgs/development/libraries/haskell/preprocessor-tools/default.nix similarity index 100% rename from pkgs/development/libraries/haskell/preprocessor-tools/1.0.1.nix rename to pkgs/development/libraries/haskell/preprocessor-tools/default.nix diff --git a/pkgs/development/libraries/haskell/presburger/default.nix b/pkgs/development/libraries/haskell/presburger/default.nix index fed380b9bd0..a8efaf7554e 100644 --- a/pkgs/development/libraries/haskell/presburger/default.nix +++ b/pkgs/development/libraries/haskell/presburger/default.nix @@ -1,11 +1,12 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal }: +{ cabal, QuickCheck }: cabal.mkDerivation (self: { pname = "presburger"; - version = "1.1"; - sha256 = "0pb0rabhhzrrrsr8260lgjpp168pm8ldqwfqbc2i1wy95n7wxk7c"; + version = "1.2"; + sha256 = "1kx51ydpjg5dv762p85qh9w76qm038rw9pgfnd0az1vms97r1kpm"; + testDepends = [ QuickCheck ]; meta = { homepage = "http://github.com/yav/presburger"; description = "A decision procedure for quantifier-free linear arithmetic"; diff --git a/pkgs/development/libraries/haskell/present/default.nix b/pkgs/development/libraries/haskell/present/default.nix index 7c5f3afbd98..ee63eccf005 100644 --- a/pkgs/development/libraries/haskell/present/default.nix +++ b/pkgs/development/libraries/haskell/present/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "present"; - version = "1.1"; - sha256 = "1hmzq3qi4hz74xr7cnc33kpwki9ziyinvrwazag8hh77d02fl11z"; + version = "2.2"; + sha256 = "1z9zvmszda7h1h4inq4b6ig9bd205mskqq85ns3rzsffxaj471p4"; buildDepends = [ aeson attoLisp dataDefault mtl semigroups text ]; meta = { description = "Make presentations for data types"; diff --git a/pkgs/development/libraries/haskell/product-profunctors/default.nix b/pkgs/development/libraries/haskell/product-profunctors/default.nix index 0e5e18de339..444baa76a1a 100644 --- a/pkgs/development/libraries/haskell/product-profunctors/default.nix +++ b/pkgs/development/libraries/haskell/product-profunctors/default.nix @@ -4,9 +4,10 @@ cabal.mkDerivation (self: { pname = "product-profunctors"; - version = "0.5"; - sha256 = "02hkcq4vzk4641hkm1rf2v2qdbaqalbfgnwfdk7yfz497qv9lmad"; + version = "0.6"; + sha256 = "1qhl2v0shzip5yh7x7b6k7xsnd4d5spf1f69h0qr0l57lm6jywl4"; buildDepends = [ contravariant profunctors ]; + testDepends = [ profunctors ]; jailbreak = true; meta = { homepage = "https://github.com/tomjaguarpaw/product-profunctors"; diff --git a/pkgs/development/libraries/haskell/purescript/default.nix b/pkgs/development/libraries/haskell/purescript/default.nix index 3a521ea121b..4fa383337c4 100644 --- a/pkgs/development/libraries/haskell/purescript/default.nix +++ b/pkgs/development/libraries/haskell/purescript/default.nix @@ -1,19 +1,20 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, cmdtheline, fileEmbed, filepath, haskeline, monadUnify -, mtl, nodejs, parsec, patternArrows, time, transformers +{ cabal, fileEmbed, filepath, haskeline, monadUnify, mtl, nodejs +, optparseApplicative, parsec, patternArrows, time, transformers , unorderedContainers, utf8String }: cabal.mkDerivation (self: { pname = "purescript"; - version = "0.6.1.2"; - sha256 = "0j1fmfcal2m75ji937xxl9cizzpw6v4pr31hxfjmal8fdcf677ma"; + version = "0.6.2"; + sha256 = "1zf2yyk3rdwk5992fhvqyd7b5w7mkzjcc0iyp75bscnjsggs31k0"; isLibrary = true; isExecutable = true; buildDepends = [ - cmdtheline fileEmbed filepath haskeline monadUnify mtl parsec - patternArrows time transformers unorderedContainers utf8String + fileEmbed filepath haskeline monadUnify mtl optparseApplicative + parsec patternArrows time transformers unorderedContainers + utf8String ]; testDepends = [ filepath mtl nodejs parsec transformers utf8String diff --git a/pkgs/development/libraries/haskell/quickcheck-unicode/default.nix b/pkgs/development/libraries/haskell/quickcheck-unicode/default.nix new file mode 100644 index 00000000000..edc2924f09b --- /dev/null +++ b/pkgs/development/libraries/haskell/quickcheck-unicode/default.nix @@ -0,0 +1,16 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, QuickCheck }: + +cabal.mkDerivation (self: { + pname = "quickcheck-unicode"; + version = "1.0.0.0"; + sha256 = "0yp7d2hwvipw2sdjf4sm45v3iiijc1yi4qk21kq12fi6x6xxwcxq"; + buildDepends = [ QuickCheck ]; + meta = { + homepage = "https://github.com/bos/quickcheck-unicode"; + description = "Generator and shrink functions for testing Unicode-related software"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/resourcet/default.nix b/pkgs/development/libraries/haskell/resourcet/default.nix index affeff4d1b0..3d312a6809f 100644 --- a/pkgs/development/libraries/haskell/resourcet/default.nix +++ b/pkgs/development/libraries/haskell/resourcet/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "resourcet"; - version = "1.1.3"; - sha256 = "0qai73ip4fwghd27c9ddpbl4kw338xhp17n9r5gh8v9awxc5ppap"; + version = "1.1.3.1"; + sha256 = "13g8vj9hc59q8n696j0w79k5bhp3mgs923y4d2cffnd0p7yd8r8x"; buildDepends = [ exceptions liftedBase mmorph monadControl mtl transformers transformersBase diff --git a/pkgs/development/libraries/haskell/rest-core/default.nix b/pkgs/development/libraries/haskell/rest-core/default.nix index bea8d8655e1..ce01091c066 100644 --- a/pkgs/development/libraries/haskell/rest-core/default.nix +++ b/pkgs/development/libraries/haskell/rest-core/default.nix @@ -8,8 +8,8 @@ cabal.mkDerivation (self: { pname = "rest-core"; - version = "0.33.1.1"; - sha256 = "0sdknsh2y2lag4n59vdvwq95h0x32s3nvr1alddnpfpw6fsd7m2s"; + version = "0.33.1.2"; + sha256 = "0axl6d28agyzklrnl264413a8hpfi7ih296i453r6fg4c63ma5h4"; buildDepends = [ aeson aesonUtils either errors fclabels hxt hxtPickleUtils jsonSchema mtl multipart random restStringmap restTypes safe split diff --git a/pkgs/development/libraries/haskell/rest-gen/default.nix b/pkgs/development/libraries/haskell/rest-gen/default.nix index f876f25c2d9..f97d701fba1 100644 --- a/pkgs/development/libraries/haskell/rest-gen/default.nix +++ b/pkgs/development/libraries/haskell/rest-gen/default.nix @@ -9,8 +9,8 @@ cabal.mkDerivation (self: { pname = "rest-gen"; - version = "0.16.1.2"; - sha256 = "1w2b4b52qa57z5kd9w7czimimzydwbh3qdz7cr22p69ihism38c9"; + version = "0.16.1.3"; + sha256 = "1nh3rjnn36v13ikvvxc7xahrj3gsswhiq2w54xclrxjl2fzsqz3a"; buildDepends = [ aeson blazeHtml Cabal codeBuilder fclabels filepath hashable haskellSrcExts hslogger HStringTemplate hxt jsonSchema restCore diff --git a/pkgs/development/libraries/haskell/rest-types/default.nix b/pkgs/development/libraries/haskell/rest-types/default.nix index 23a112730ba..9b9d9f62d26 100644 --- a/pkgs/development/libraries/haskell/rest-types/default.nix +++ b/pkgs/development/libraries/haskell/rest-types/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "rest-types"; - version = "1.11.1"; - sha256 = "1dqjch3h3hv4s1v0wkbd4spn26f068bqpsz6mr0vdacdbhjwnigg"; + version = "1.11.1.1"; + sha256 = "0xr9h1bivw3miyg4xill0jwn95lybsbqgrnw2323pwxlbbnaa25a"; buildDepends = [ aeson genericAeson hxt jsonSchema mtl regular regularXmlpickler restStringmap text uuid diff --git a/pkgs/development/libraries/haskell/sbv/default.nix b/pkgs/development/libraries/haskell/sbv/default.nix index 088fc38d0f8..492dcd816ed 100644 --- a/pkgs/development/libraries/haskell/sbv/default.nix +++ b/pkgs/development/libraries/haskell/sbv/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "sbv"; - version = "3.2"; - sha256 = "0hqibdl2bhxyc0akfy97j41mkp9s39ahdz25nyrzpjj89b9hzzi0"; + version = "3.3"; + sha256 = "193k7njrd7b0qp865ahbjh32h49b86kyc58laifgq6ka2zv64x2f"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/libraries/haskell/scientific/0.3.3.2.nix b/pkgs/development/libraries/haskell/scientific/0.3.3.3.nix similarity index 89% rename from pkgs/development/libraries/haskell/scientific/0.3.3.2.nix rename to pkgs/development/libraries/haskell/scientific/0.3.3.3.nix index e43b6734d77..10e294b4214 100644 --- a/pkgs/development/libraries/haskell/scientific/0.3.3.2.nix +++ b/pkgs/development/libraries/haskell/scientific/0.3.3.3.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "scientific"; - version = "0.3.3.2"; - sha256 = "17lxxjfbmmlr0ppkrhw42lqhcg42nk21n5l2x9i6b87g8qr37jii"; + version = "0.3.3.3"; + sha256 = "1hngkmd1kggc84sz4mddc0yj2vyzc87dz5dkkywjgxczys51mhqn"; buildDepends = [ deepseq hashable text ]; testDepends = [ QuickCheck smallcheck tasty tastyAntXml tastyHunit tastyQuickcheck diff --git a/pkgs/development/libraries/haskell/semigroups/default.nix b/pkgs/development/libraries/haskell/semigroups/default.nix index 23e48c02fd0..8cd94e9079f 100644 --- a/pkgs/development/libraries/haskell/semigroups/default.nix +++ b/pkgs/development/libraries/haskell/semigroups/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "semigroups"; - version = "0.15.4"; - sha256 = "17jr1wz44avcdws3pxh8jif9myylx7d1gwfv0paiq6yb6r089y68"; + version = "0.16"; + sha256 = "0mq5c6py0z3jaxr1j0aalz4vjd1v6ygffv91h7nh5621rcv4ga4s"; buildDepends = [ deepseq hashable nats text unorderedContainers ]; meta = { homepage = "http://github.com/ekmett/semigroups/"; diff --git a/pkgs/development/libraries/haskell/servant-client/default.nix b/pkgs/development/libraries/haskell/servant-client/default.nix new file mode 100644 index 00000000000..d11e25222ea --- /dev/null +++ b/pkgs/development/libraries/haskell/servant-client/default.nix @@ -0,0 +1,27 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, aeson, attoparsec, deepseq, either, exceptions, hspec +, httpClient, httpTypes, network, networkUri, QuickCheck, safe +, servant, servantServer, stringConversions, text, transformers +, wai, warp +}: + +cabal.mkDerivation (self: { + pname = "servant-client"; + version = "0.2.1"; + sha256 = "1mwmca96sld3s6n4hxq3zl9pjw24halwa061awjb23kc49cmp4pn"; + buildDepends = [ + aeson attoparsec either exceptions httpClient httpTypes networkUri + safe servant stringConversions text transformers + ]; + testDepends = [ + aeson deepseq either hspec httpTypes network QuickCheck servant + servantServer wai warp + ]; + meta = { + homepage = "http://haskell-servant.github.io/"; + description = "automatical derivation of querying functions for servant webservices"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/servant-docs/default.nix b/pkgs/development/libraries/haskell/servant-docs/default.nix new file mode 100644 index 00000000000..3da6936532c --- /dev/null +++ b/pkgs/development/libraries/haskell/servant-docs/default.nix @@ -0,0 +1,23 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, aeson, hashable, lens, servant, stringConversions +, systemFilepath, text, unorderedContainers +}: + +cabal.mkDerivation (self: { + pname = "servant-docs"; + version = "0.2.1"; + sha256 = "1wchqdpfrc3hxc629ij6rbpr29dzc0flpc7z8phykpmf59106pcv"; + isLibrary = true; + isExecutable = true; + buildDepends = [ + aeson hashable lens servant stringConversions systemFilepath text + unorderedContainers + ]; + meta = { + homepage = "http://haskell-servant.github.io/"; + description = "generate API docs for your servant webservice"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/servant-jquery/default.nix b/pkgs/development/libraries/haskell/servant-jquery/default.nix new file mode 100644 index 00000000000..2a85cb19106 --- /dev/null +++ b/pkgs/development/libraries/haskell/servant-jquery/default.nix @@ -0,0 +1,22 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, aeson, filepath, lens, servant, servantServer, stm +, transformers, warp +}: + +cabal.mkDerivation (self: { + pname = "servant-jquery"; + version = "0.2.1"; + sha256 = "1wyfnkzb44m08icfjvdbn1m0b0a1ydsznp1czfdnmq2818rrip8v"; + isLibrary = true; + isExecutable = true; + buildDepends = [ + aeson filepath lens servant servantServer stm transformers warp + ]; + meta = { + homepage = "http://haskell-servant.github.io/"; + description = "Automatically derive jquery-based javascript functions to query servant webservices"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/servant-pool/default.nix b/pkgs/development/libraries/haskell/servant-pool/default.nix deleted file mode 100644 index 692d694ed46..00000000000 --- a/pkgs/development/libraries/haskell/servant-pool/default.nix +++ /dev/null @@ -1,16 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, resourcePool, servant, time }: - -cabal.mkDerivation (self: { - pname = "servant-pool"; - version = "0.1"; - sha256 = "0if4lxb0fpdd4lnkz9j7z6vhjbrcc80pvz9jb6sdb9p6sbbgqf69"; - buildDepends = [ resourcePool servant time ]; - meta = { - homepage = "http://github.com/zalora/servant-pool"; - description = "Utility functions for creating servant 'Context's with \"context/connection pooling\" support"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - }; -}) diff --git a/pkgs/development/libraries/haskell/servant-postgresql/default.nix b/pkgs/development/libraries/haskell/servant-postgresql/default.nix deleted file mode 100644 index 154eefea320..00000000000 --- a/pkgs/development/libraries/haskell/servant-postgresql/default.nix +++ /dev/null @@ -1,18 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, postgresqlSimple, servant, servantPool, servantResponse }: - -cabal.mkDerivation (self: { - pname = "servant-postgresql"; - version = "0.1"; - sha256 = "1svy1v6sl5pq0zs8ms4qf7wn6zar63bqmfiyfqgz84ryli0wxrhj"; - buildDepends = [ - postgresqlSimple servant servantPool servantResponse - ]; - meta = { - homepage = "http://github.com/zalora/servant-postgresql"; - description = "Useful functions and instances for using servant with a PostgreSQL context"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - }; -}) diff --git a/pkgs/development/libraries/haskell/servant-response/default.nix b/pkgs/development/libraries/haskell/servant-response/default.nix deleted file mode 100644 index 3f7f9c1eee0..00000000000 --- a/pkgs/development/libraries/haskell/servant-response/default.nix +++ /dev/null @@ -1,16 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, aeson, httpTypes, text }: - -cabal.mkDerivation (self: { - pname = "servant-response"; - version = "0.1"; - sha256 = "0vgzi6nm3f1vjbnvhzcr6v2fh75fsl18wsps54ya0mbmfn2v6chy"; - buildDepends = [ aeson httpTypes text ]; - meta = { - homepage = "http://github.com/zalora/servant"; - description = "Machinery to express how servant should turn results of database operations into proper JSON-encodable response types"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - }; -}) diff --git a/pkgs/development/libraries/haskell/servant-scotty/default.nix b/pkgs/development/libraries/haskell/servant-scotty/default.nix deleted file mode 100644 index 732b2c95cc7..00000000000 --- a/pkgs/development/libraries/haskell/servant-scotty/default.nix +++ /dev/null @@ -1,20 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, aeson, httpTypes, scotty, servant, servantResponse, text -, transformers -}: - -cabal.mkDerivation (self: { - pname = "servant-scotty"; - version = "0.1.1"; - sha256 = "0d3yc7aa2p1izizqnj81iscj9hbgbkpyav1ncmxzkr48svr6h783"; - buildDepends = [ - aeson httpTypes scotty servant servantResponse text transformers - ]; - meta = { - homepage = "http://github.com/zalora/servant"; - description = "Generate a web service for servant 'Resource's using scotty and JSON"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - }; -}) diff --git a/pkgs/development/libraries/haskell/servant-server/default.nix b/pkgs/development/libraries/haskell/servant-server/default.nix new file mode 100644 index 00000000000..7776af8036d --- /dev/null +++ b/pkgs/development/libraries/haskell/servant-server/default.nix @@ -0,0 +1,31 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, aeson, attoparsec, either, exceptions, hspec, hspecWai +, httpTypes, network, networkUri, parsec, QuickCheck, safe, servant +, split, stringConversions, systemFilepath, temporary, text +, transformers, wai, waiAppStatic, waiExtra, warp +}: + +cabal.mkDerivation (self: { + pname = "servant-server"; + version = "0.2.1"; + sha256 = "1b2aqxnn9nf5qabbl8k9kq9b2mpn591j9jpjy33sis7ni469bayj"; + isLibrary = true; + isExecutable = true; + buildDepends = [ + aeson attoparsec either httpTypes networkUri safe servant split + stringConversions systemFilepath text transformers wai waiAppStatic + warp + ]; + testDepends = [ + aeson either exceptions hspec hspecWai httpTypes network parsec + QuickCheck servant stringConversions temporary text transformers + wai waiExtra warp + ]; + meta = { + homepage = "http://haskell-servant.github.io/"; + description = "A family of combinators for defining webservices APIs and serving them"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/servant/default.nix b/pkgs/development/libraries/haskell/servant/default.nix index 38f89764c4c..1c206c1ab22 100644 --- a/pkgs/development/libraries/haskell/servant/default.nix +++ b/pkgs/development/libraries/haskell/servant/default.nix @@ -1,14 +1,16 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal }: +{ cabal, hspec, parsec, QuickCheck, stringConversions, text }: cabal.mkDerivation (self: { pname = "servant"; - version = "0.1"; - sha256 = "1bm5223rjgcm8rb3s2mclmfj2df7j059jjh572a5py0rdqzg3yj0"; + version = "0.2.1"; + sha256 = "1i7yvxvil65lp1gizh99dn4gj1r7vcqslq1w7sqykj88y9h22p3x"; + buildDepends = [ parsec stringConversions text ]; + testDepends = [ hspec parsec QuickCheck stringConversions text ]; meta = { - homepage = "http://github.com/zalora/servant"; - description = "A library to generate REST-style webservices on top of scotty, handling all the boilerplate for you"; + homepage = "http://haskell-servant.github.io/"; + description = "A family of combinators for defining webservices APIs"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; }; diff --git a/pkgs/development/libraries/haskell/shake/default.nix b/pkgs/development/libraries/haskell/shake/default.nix index 1983f80b60d..fca81a974fb 100644 --- a/pkgs/development/libraries/haskell/shake/default.nix +++ b/pkgs/development/libraries/haskell/shake/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "shake"; - version = "0.14.1"; - sha256 = "101sdrp3whp1yvx4n8zri0rjkagq3hkmpd2xpkidzj9ssaz4x4fa"; + version = "0.14.2"; + sha256 = "0wb4rvnkw6gag1jffv9z2by7y8gifp58pnw3n7dyc01yglbys72m"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/libraries/haskell/shell-conduit/default.nix b/pkgs/development/libraries/haskell/shell-conduit/default.nix index 409c572603e..ce5507832e1 100644 --- a/pkgs/development/libraries/haskell/shell-conduit/default.nix +++ b/pkgs/development/libraries/haskell/shell-conduit/default.nix @@ -1,20 +1,21 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! { cabal, async, conduit, conduitExtra, controlMonadLoop, filepath -, monadControl, monadsTf, resourcet, semigroups, split, text, these +, monadControl, monadsTf, resourcet, semigroups, split, text , transformers, transformersBase }: cabal.mkDerivation (self: { pname = "shell-conduit"; - version = "4.4"; - sha256 = "023cqmj5c45d65rcv07m2w1w2b5lhlfhzwv18fxxl3v8s6gr3wb8"; + version = "4.5"; + sha256 = "1vgqfba6k0nv8nwa48fv2hkr9xlrrfrdh2awgpllrimnh0yww41g"; buildDepends = [ async conduit conduitExtra controlMonadLoop filepath monadControl - monadsTf resourcet semigroups split text these transformers + monadsTf resourcet semigroups split text transformers transformersBase ]; meta = { + homepage = "https://github.com/chrisdone/shell-conduit"; description = "Write shell scripts with Conduit"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; diff --git a/pkgs/development/libraries/haskell/skein/default.nix b/pkgs/development/libraries/haskell/skein/default.nix index 5fcd9df4642..c60bf97d54f 100644 --- a/pkgs/development/libraries/haskell/skein/default.nix +++ b/pkgs/development/libraries/haskell/skein/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "skein"; - version = "1.0.9"; - sha256 = "08hy40c0gzlalrpmgcvhc1v51a44idipamjjbh7zzwsvbxmp1cbb"; + version = "1.0.9.2"; + sha256 = "1j8bhqm25r9vd4qb4v12g32r0dv6xyhk48cq287wfbzjraayi1gw"; buildDepends = [ cereal cryptoApi tagged ]; testDepends = [ cereal cryptoApi filepath hspec tagged ]; jailbreak = true; diff --git a/pkgs/development/libraries/haskell/snap/snap.nix b/pkgs/development/libraries/haskell/snap/snap.nix index 14769499c21..bb4afe88512 100644 --- a/pkgs/development/libraries/haskell/snap/snap.nix +++ b/pkgs/development/libraries/haskell/snap/snap.nix @@ -10,8 +10,8 @@ cabal.mkDerivation (self: { pname = "snap"; - version = "0.13.3.1"; - sha256 = "016azx90gxjkhmncpnqvqrwsk9kbkz315z088wm7y67s97lpnr9c"; + version = "0.13.3.2"; + sha256 = "1k6sd2ww8zqkbfv4v5ryqwgicx6yprfil8cd5rgdvygyjs88fcrp"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -21,9 +21,6 @@ cabal.mkDerivation (self: { snapCore snapServer stm syb text time transformers unorderedContainers vector vectorAlgorithms xmlhtml ]; - patchPhase = '' - sed -i -e 's|lens *>=.*|lens|' snap.cabal - ''; meta = { homepage = "http://snapframework.com/"; description = "Top-level package for the Snap Web Framework"; diff --git a/pkgs/development/libraries/haskell/socket-io/default.nix b/pkgs/development/libraries/haskell/socket-io/default.nix index c64c7c48edc..57827d495f3 100644 --- a/pkgs/development/libraries/haskell/socket-io/default.nix +++ b/pkgs/development/libraries/haskell/socket-io/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "socket-io"; - version = "1.1.1"; - sha256 = "0zr5kj519hw90rlicang5f573dd325rxv24psf12fxl6vmyxx1zc"; + version = "1.2.0"; + sha256 = "1271qmd83q669dcs6ni0f84i5kgvh8vgr4xgx2lcprirbzkx0gdl"; buildDepends = [ aeson attoparsec engineIo mtl stm text transformers unorderedContainers vector diff --git a/pkgs/development/libraries/haskell/stm-containers/default.nix b/pkgs/development/libraries/haskell/stm-containers/default.nix index 052c913a98e..d093c5e07db 100644 --- a/pkgs/development/libraries/haskell/stm-containers/default.nix +++ b/pkgs/development/libraries/haskell/stm-containers/default.nix @@ -1,19 +1,21 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, basePrelude, focus, free, hashable, HTF, lochTh, mtl -, placeholders, primitive, QuickCheck, unorderedContainers +{ cabal, basePrelude, focus, free, hashable, HTF, listT, lochTh +, mtl, mtlPrelude, placeholders, primitive, QuickCheck +, transformers, unorderedContainers }: cabal.mkDerivation (self: { pname = "stm-containers"; - version = "0.1.4"; - sha256 = "15h7qxxbr1ifkvmxsj30k0v3hp83m04iq25bvi3jmagvvk5hv5bj"; + version = "0.2.7"; + sha256 = "1qgmrxccnvids2xq2n28cllfqh88f0b2512hm5grrab7qb07phar"; buildDepends = [ - basePrelude focus hashable lochTh placeholders primitive + basePrelude focus hashable listT lochTh placeholders primitive + transformers ]; testDepends = [ - basePrelude focus free hashable HTF lochTh mtl placeholders - primitive QuickCheck unorderedContainers + basePrelude focus free hashable HTF listT lochTh mtl mtlPrelude + placeholders primitive QuickCheck transformers unorderedContainers ]; doCheck = false; meta = { diff --git a/pkgs/development/libraries/haskell/streaming-commons/default.nix b/pkgs/development/libraries/haskell/streaming-commons/default.nix index ba9b8794eb5..c4d19f61188 100644 --- a/pkgs/development/libraries/haskell/streaming-commons/default.nix +++ b/pkgs/development/libraries/haskell/streaming-commons/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "streaming-commons"; - version = "0.1.6"; - sha256 = "0wapq6h7c0c3wciqfjz7j4z8kgf7wdr1s0al493jcrdyfy5k43dh"; + version = "0.1.7.3"; + sha256 = "12sm59dhjrygly215888i2xcsn5m5a393ir0mm6w62883x49wzxb"; buildDepends = [ blazeBuilder network random stm text transformers zlib ]; diff --git a/pkgs/development/libraries/haskell/system-fileio/default.nix b/pkgs/development/libraries/haskell/system-fileio/default.nix index 98048f503b7..cf3dcee3301 100644 --- a/pkgs/development/libraries/haskell/system-fileio/default.nix +++ b/pkgs/development/libraries/haskell/system-fileio/default.nix @@ -5,14 +5,14 @@ cabal.mkDerivation (self: { pname = "system-fileio"; - version = "0.3.15"; - sha256 = "06cnr3hzw8xd75529nfqajgb5xy5i4ddqybgjw1v1nwpq04mhihi"; + version = "0.3.16"; + sha256 = "1x18ffhas6bhjis0glf0xd6ap8vy7cap8lkmnkn4px83d82yzi8k"; buildDepends = [ systemFilepath text time ]; testDepends = [ chell systemFilepath temporary text time transformers ]; meta = { - homepage = "https://john-millikin.com/software/haskell-filesystem/"; + homepage = "https://github.com/fpco/haskell-filesystem"; description = "Consistent filesystem interaction across GHC versions"; license = self.stdenv.lib.licenses.mit; platforms = self.ghc.meta.platforms; diff --git a/pkgs/development/libraries/haskell/system-filepath/default.nix b/pkgs/development/libraries/haskell/system-filepath/default.nix index 4adf48d26e7..8ec752d7a39 100644 --- a/pkgs/development/libraries/haskell/system-filepath/default.nix +++ b/pkgs/development/libraries/haskell/system-filepath/default.nix @@ -4,13 +4,13 @@ cabal.mkDerivation (self: { pname = "system-filepath"; - version = "0.4.12"; - sha256 = "0sfralwgd5b9hfqmp20v31sq96s0v7j9g920qdj3n9i5mhslhwd2"; + version = "0.4.13"; + sha256 = "0g1lam859vs71vyc8qsg6aianw5s7w19rk02acf2gr8dg3ypznca"; buildDepends = [ deepseq text ]; testDepends = [ chell chellQuickcheck QuickCheck text ]; doCheck = false; meta = { - homepage = "https://john-millikin.com/software/haskell-filesystem/"; + homepage = "https://github.com/fpco/haskell-filesystem"; description = "High-level, byte-based file and directory path manipulations"; license = self.stdenv.lib.licenses.mit; platforms = self.ghc.meta.platforms; diff --git a/pkgs/development/libraries/haskell/tasty-hspec/default.nix b/pkgs/development/libraries/haskell/tasty-hspec/default.nix index 6f8ff2e9add..459a0f1123a 100644 --- a/pkgs/development/libraries/haskell/tasty-hspec/default.nix +++ b/pkgs/development/libraries/haskell/tasty-hspec/default.nix @@ -1,15 +1,16 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, hspec, QuickCheck, random, tasty, tastyQuickcheck -, tastySmallcheck +{ cabal, hspec, hspecCore, QuickCheck, random, tasty +, tastyQuickcheck, tastySmallcheck }: cabal.mkDerivation (self: { pname = "tasty-hspec"; - version = "0.2"; - sha256 = "04qnmsyrlxgxf36lww3z6xkgpf6x5gprwrrwza3kcjl13wcm2rml"; + version = "1.1"; + sha256 = "15ly6jf4kgdc15k6b584d99j18xb41alas62gyakw5sf8y0y02i6"; buildDepends = [ - hspec QuickCheck random tasty tastyQuickcheck tastySmallcheck + hspec hspecCore QuickCheck random tasty tastyQuickcheck + tastySmallcheck ]; meta = { homepage = "http://github.com/mitchellwrosen/tasty-hspec"; @@ -17,6 +18,5 @@ cabal.mkDerivation (self: { license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; maintainers = with self.stdenv.lib.maintainers; [ ocharles ]; - broken = true; }; }) diff --git a/pkgs/development/libraries/haskell/tasty-quickcheck/default.nix b/pkgs/development/libraries/haskell/tasty-quickcheck/default.nix index 8692daaa482..36b22a30f53 100644 --- a/pkgs/development/libraries/haskell/tasty-quickcheck/default.nix +++ b/pkgs/development/libraries/haskell/tasty-quickcheck/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "tasty-quickcheck"; - version = "0.8.3.1"; - sha256 = "0shmph95vys2l0ik3k615aigcvfas0f2079c1lbw73d0wrm841gn"; + version = "0.8.3.2"; + sha256 = "1q1fghmsjrdl6jkcnajmsvw4d893m6cyhzpai9vvrhxy9vdy0l1v"; buildDepends = [ QuickCheck tagged tasty ]; testDepends = [ pcreLight tasty tastyHunit ]; meta = { diff --git a/pkgs/development/libraries/haskell/test-framework/default.nix b/pkgs/development/libraries/haskell/test-framework/default.nix index e17ca346e7f..b4ba1fd1009 100644 --- a/pkgs/development/libraries/haskell/test-framework/default.nix +++ b/pkgs/development/libraries/haskell/test-framework/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "test-framework"; - version = "0.8.0.3"; - sha256 = "136nw5dapsz3jrnw1pdfkjgplxigpr2mrf6i85154vx342zvw5ar"; + version = "0.8.1.0"; + sha256 = "1js7jbdw0xijpjlca3yh7mw427s3rjkymm1qi565r928pbsbdkhm"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/libraries/haskell/texmath/default.nix b/pkgs/development/libraries/haskell/texmath/default.nix index fdcc5a6af3b..f8bff923c6d 100644 --- a/pkgs/development/libraries/haskell/texmath/default.nix +++ b/pkgs/development/libraries/haskell/texmath/default.nix @@ -1,16 +1,16 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, filepath, mtl, pandocTypes, parsec, split, syb, temporary -, text, utf8String, xml +{ cabal, filepath, mtl, networkUri, pandocTypes, parsec, split, syb +, temporary, text, utf8String, xml }: cabal.mkDerivation (self: { pname = "texmath"; - version = "0.8"; - sha256 = "1j0i9594fqhl2fzxyndyy6fvrpaqdarq817pxdar0hmccy55b7gb"; + version = "0.8.0.1"; + sha256 = "1k68spamhqwq4afcd0283w731gq0k6j6jxbp5099y6bndh8ff9cn"; isLibrary = true; isExecutable = true; - buildDepends = [ mtl pandocTypes parsec syb xml ]; + buildDepends = [ mtl networkUri pandocTypes parsec syb xml ]; testDepends = [ filepath split temporary text utf8String xml ]; meta = { homepage = "http://github.com/jgm/texmath"; diff --git a/pkgs/development/libraries/haskell/text/1.2.0.0.nix b/pkgs/development/libraries/haskell/text/1.2.0.3.nix similarity index 55% rename from pkgs/development/libraries/haskell/text/1.2.0.0.nix rename to pkgs/development/libraries/haskell/text/1.2.0.3.nix index c588c65ba94..d0d2112a5e2 100644 --- a/pkgs/development/libraries/haskell/text/1.2.0.0.nix +++ b/pkgs/development/libraries/haskell/text/1.2.0.3.nix @@ -1,17 +1,17 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, deepseq, HUnit, QuickCheck, random, testFramework -, testFrameworkHunit, testFrameworkQuickcheck2 +{ cabal, deepseq, HUnit, QuickCheck, quickcheckUnicode, random +, testFramework, testFrameworkHunit, testFrameworkQuickcheck2 }: cabal.mkDerivation (self: { pname = "text"; - version = "1.2.0.0"; - sha256 = "0c681yaqq68imj77qzy0j4iag8q90mhnnaalfwc08nzv8cr6c8z6"; + version = "1.2.0.3"; + sha256 = "11prz0vli6rclj04vpx5dnzfyznvsrq7i2jmh4sjy37nic5bqf0x"; buildDepends = [ deepseq ]; testDepends = [ - deepseq HUnit QuickCheck random testFramework testFrameworkHunit - testFrameworkQuickcheck2 + deepseq HUnit QuickCheck quickcheckUnicode random testFramework + testFrameworkHunit testFrameworkQuickcheck2 ]; doCheck = false; meta = { diff --git a/pkgs/development/libraries/haskell/th-lift/default.nix b/pkgs/development/libraries/haskell/th-lift/default.nix index a27360632b9..28fdedbde75 100644 --- a/pkgs/development/libraries/haskell/th-lift/default.nix +++ b/pkgs/development/libraries/haskell/th-lift/default.nix @@ -4,11 +4,12 @@ cabal.mkDerivation (self: { pname = "th-lift"; - version = "0.6.1"; - sha256 = "0m1ips0n06jnjr5lssq7x4jaa5878sw03l8iaprya37bnkxxak5d"; + version = "0.7"; + sha256 = "1mh5k6ifmc3mjavlrpkcq55ng737yb3nqv1q67fv8irkv5m6qpza"; meta = { + homepage = "http://github.com/mboes/th-lift"; description = "Derive Template Haskell's Lift class for datatypes"; - license = "unknown"; + license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; }; }) diff --git a/pkgs/development/libraries/haskell/thyme/default.nix b/pkgs/development/libraries/haskell/thyme/default.nix index 25118d1ff64..7c18f2c555b 100644 --- a/pkgs/development/libraries/haskell/thyme/default.nix +++ b/pkgs/development/libraries/haskell/thyme/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "thyme"; - version = "0.3.5.4"; - sha256 = "00qsd0ig1zjj7lni7xw5xaxk8w2zwq8jbii8admigrfqsj5qcnam"; + version = "0.3.5.5"; + sha256 = "0v3rbjl92bqggsdra72zdq6rxzb2qf1268424p94225lnwgp1il4"; buildDepends = [ aeson attoparsec deepseq mtl profunctors QuickCheck random text time vector vectorSpace vectorThUnbox diff --git a/pkgs/development/libraries/haskell/timezone-olson/default.nix b/pkgs/development/libraries/haskell/timezone-olson/default.nix index 236cedc9c1f..8b8704c0de7 100644 --- a/pkgs/development/libraries/haskell/timezone-olson/default.nix +++ b/pkgs/development/libraries/haskell/timezone-olson/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "timezone-olson"; - version = "0.1.4"; - sha256 = "1l5j6gqi9vlx7sifn7vv3by4z9ha3h6klfds4ywqv3dv0gh5725k"; + version = "0.1.6"; + sha256 = "0gg1fq85km5d48966a267q6z0wwl1dz88xq88v0l1jlkwd9jsb0z"; buildDepends = [ binary extensibleExceptions time timezoneSeries ]; meta = { homepage = "http://projects.haskell.org/time-ng/"; diff --git a/pkgs/development/libraries/haskell/timezone-series/default.nix b/pkgs/development/libraries/haskell/timezone-series/default.nix index d12ae9aec05..d46f2d81254 100644 --- a/pkgs/development/libraries/haskell/timezone-series/default.nix +++ b/pkgs/development/libraries/haskell/timezone-series/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "timezone-series"; - version = "0.1.3"; - sha256 = "0b13a929wrgfl1agkyp3d5wy89aw69zm4l0src7p16rh3kr38w73"; + version = "0.1.4"; + sha256 = "06p5v0dimhwmra100gwkhkz3ll492i2bvafw0qx2qzcxx4yxff40"; buildDepends = [ time ]; meta = { homepage = "http://projects.haskell.org/time-ng/"; diff --git a/pkgs/development/libraries/haskell/torrent/default.nix b/pkgs/development/libraries/haskell/torrent/default.nix new file mode 100644 index 00000000000..0133de6c221 --- /dev/null +++ b/pkgs/development/libraries/haskell/torrent/default.nix @@ -0,0 +1,15 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, bencode, binary, filepath, syb }: + +cabal.mkDerivation (self: { + pname = "torrent"; + version = "10000.0.0"; + sha256 = "030ll4m80ljkvq72n1aa8a2ygqa56ykkndzy5g40vh9j9j5vq52r"; + buildDepends = [ bencode binary filepath syb ]; + meta = { + description = "BitTorrent file parser and generater"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/transformers-compat/0.3.3.nix b/pkgs/development/libraries/haskell/transformers-compat/0.3.3.nix deleted file mode 100644 index 4ff5df9d1c5..00000000000 --- a/pkgs/development/libraries/haskell/transformers-compat/0.3.3.nix +++ /dev/null @@ -1,17 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, transformers }: - -cabal.mkDerivation (self: { - pname = "transformers-compat"; - version = "0.3.3"; - sha256 = "14lmwqr6q79k1f7byvb0jcm4r7lprhxkl85z72pr6ghn7bsvqwps"; - buildDepends = [ transformers ]; - meta = { - homepage = "http://github.com/ekmett/transformers-compat/"; - description = "A small compatibility shim exposing the new types from transformers 0.3 and 0.4 to older Haskell platforms."; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/transformers-compat/0.3.3.4.nix b/pkgs/development/libraries/haskell/transformers-compat/default.nix similarity index 100% rename from pkgs/development/libraries/haskell/transformers-compat/0.3.3.4.nix rename to pkgs/development/libraries/haskell/transformers-compat/default.nix diff --git a/pkgs/development/libraries/haskell/transformers/0.4.1.0.nix b/pkgs/development/libraries/haskell/transformers/0.4.2.0.nix similarity index 81% rename from pkgs/development/libraries/haskell/transformers/0.4.1.0.nix rename to pkgs/development/libraries/haskell/transformers/0.4.2.0.nix index d705040387b..3557941a9a8 100644 --- a/pkgs/development/libraries/haskell/transformers/0.4.1.0.nix +++ b/pkgs/development/libraries/haskell/transformers/0.4.2.0.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "transformers"; - version = "0.4.1.0"; - sha256 = "0jlnz86f87jndv4sifg1zpv5b2g2cxy1x2575x727az6vyaarwwg"; + version = "0.4.2.0"; + sha256 = "0a364zfcm17mhpy0c4ms2j88sys4yvgd6071qsgk93la2wjm8mkr"; noHaddock = self.stdenv.lib.versionOlder self.ghc.version "6.11"; meta = { description = "Concrete functor and monad transformers"; diff --git a/pkgs/development/libraries/haskell/type-aligned/default.nix b/pkgs/development/libraries/haskell/type-aligned/default.nix new file mode 100644 index 00000000000..a1e547ca0e2 --- /dev/null +++ b/pkgs/development/libraries/haskell/type-aligned/default.nix @@ -0,0 +1,15 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal }: + +cabal.mkDerivation (self: { + pname = "type-aligned"; + version = "0.9.3"; + sha256 = "1wkjbb6giq71j5j72w4018hifn58gpgwxppbhgi5a8xdcxp8afl0"; + meta = { + homepage = "https://github.com/atzeus/type-aligned"; + description = "Various type-aligned sequence data structures"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/unbound-generics/default.nix b/pkgs/development/libraries/haskell/unbound-generics/default.nix index 602b28d0aa6..351df38fc0d 100644 --- a/pkgs/development/libraries/haskell/unbound-generics/default.nix +++ b/pkgs/development/libraries/haskell/unbound-generics/default.nix @@ -1,13 +1,15 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, contravariant, mtl, tasty, tastyHunit, transformers }: +{ cabal, contravariant, mtl, QuickCheck, tasty, tastyHunit +, tastyQuickcheck, transformers +}: cabal.mkDerivation (self: { pname = "unbound-generics"; - version = "0.0.1"; - sha256 = "0iwg1292dpwl8icr8p4nyhns4n0r44q8wv4l22j6i9m61li68al1"; + version = "0.0.2"; + sha256 = "0zgajq411bp16xwv31i2igsz62lad923rylhfprklsism13rk5ai"; buildDepends = [ contravariant mtl transformers ]; - testDepends = [ mtl tasty tastyHunit ]; + testDepends = [ mtl QuickCheck tasty tastyHunit tastyQuickcheck ]; meta = { homepage = "http://github.com/lambdageek/unbound-generics"; description = "Reimplementation of Unbound using GHC Generics"; diff --git a/pkgs/development/libraries/haskell/uuid/default.nix b/pkgs/development/libraries/haskell/uuid/default.nix index 44fb5bde2bf..0c65e8dc1df 100644 --- a/pkgs/development/libraries/haskell/uuid/default.nix +++ b/pkgs/development/libraries/haskell/uuid/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "uuid"; - version = "1.3.4"; - sha256 = "03gab2dg52i4ysxw6vdzdd018qy0lycq7x3gcbx0r9c8vsqvafmc"; + version = "1.3.7"; + sha256 = "01idfi9vdmcz8fkgnfa0bpz6khx4x2r0rzynzha42irl7881da21"; buildDepends = [ binary cryptohash deepseq hashable networkInfo random time ]; @@ -19,7 +19,7 @@ cabal.mkDerivation (self: { jailbreak = true; doCheck = false; meta = { - homepage = "http://projects.haskell.org/uuid/"; + homepage = "https://github.com/aslatter/uuid"; description = "For creating, comparing, parsing and printing Universally Unique Identifiers"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; diff --git a/pkgs/development/libraries/haskell/validation/default.nix b/pkgs/development/libraries/haskell/validation/default.nix index 2ae7e9c66e5..903165b2f5f 100644 --- a/pkgs/development/libraries/haskell/validation/default.nix +++ b/pkgs/development/libraries/haskell/validation/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "validation"; - version = "0.4.1"; - sha256 = "05mws9gqlqjmzcw6d3kclrh9dybchhp61qsfwg77h31n44j7w0mh"; + version = "0.4.2"; + sha256 = "0rsa3n3zawywbpi1gvhfrfglxf9mkmkidkc216ld3s02pmsdmclm"; buildDepends = [ bifunctors lens semigroupoids semigroups transformers ]; diff --git a/pkgs/development/libraries/haskell/vcsgui/default.nix b/pkgs/development/libraries/haskell/vcsgui/default.nix index 08605391fc2..5e1d6ebf5b8 100644 --- a/pkgs/development/libraries/haskell/vcsgui/default.nix +++ b/pkgs/development/libraries/haskell/vcsgui/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "vcsgui"; - version = "0.1.0.0"; - sha256 = "0wxalzil8ypvwp0z754m7g3848963znwwrjysdxp5q33imzbp60z"; + version = "0.1.1.0"; + sha256 = "1sjkg1ncmpymv9m5ag1f4ia4pdak05bgb03d28jd84p24qvshqyk"; isLibrary = true; isExecutable = true; buildDepends = [ filepath gtk3 mtl text vcswrapper ]; diff --git a/pkgs/development/libraries/haskell/vcswrapper/default.nix b/pkgs/development/libraries/haskell/vcswrapper/default.nix index ca739b1d923..335c5b319bc 100644 --- a/pkgs/development/libraries/haskell/vcswrapper/default.nix +++ b/pkgs/development/libraries/haskell/vcswrapper/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "vcswrapper"; - version = "0.1.0"; - sha256 = "058xbfgxsp3g4x4rwbp57dqgr9mwnmj623js39dbmiqkixsda31a"; + version = "0.1.1"; + sha256 = "056gdgmyprvbz61gfffkpwfyh4m7f9fnglk69jp4xh4jfx1wr7ni"; isLibrary = true; isExecutable = true; buildDepends = [ filepath hxt mtl parsec split text ]; diff --git a/pkgs/development/libraries/haskell/vector/0.10.12.1.nix b/pkgs/development/libraries/haskell/vector/0.10.12.2.nix similarity index 88% rename from pkgs/development/libraries/haskell/vector/0.10.12.1.nix rename to pkgs/development/libraries/haskell/vector/0.10.12.2.nix index e83a53b57a1..011c9b367fa 100644 --- a/pkgs/development/libraries/haskell/vector/0.10.12.1.nix +++ b/pkgs/development/libraries/haskell/vector/0.10.12.2.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "vector"; - version = "0.10.12.1"; - sha256 = "0m4m650yxv92dz8xgcjfkbhsl46hgnf02viwgdja5xmvg3aa8fcp"; + version = "0.10.12.2"; + sha256 = "01hc71k1z9m0g0dv4zsvq5d2dvbgyc5p01hryw5c53792yi2fm25"; buildDepends = [ deepseq primitive ]; testDepends = [ QuickCheck random testFramework testFrameworkQuickcheck2 diff --git a/pkgs/development/libraries/haskell/vk-posix-pty/default.nix b/pkgs/development/libraries/haskell/vk-posix-pty/default.nix index 533b9ae7215..52a57bd0cae 100644 --- a/pkgs/development/libraries/haskell/vk-posix-pty/default.nix +++ b/pkgs/development/libraries/haskell/vk-posix-pty/default.nix @@ -4,13 +4,12 @@ cabal.mkDerivation (self: { pname = "vk-posix-pty"; - version = "0.2.0.2"; - sha256 = "0dp9kpn1qzfqykmyq20sg0snyk8zrqa2g8c5xp9rfp0zfgmh37dh"; + version = "0.2.1"; + sha256 = "1kj06niwcsb4lyhppv5bs67cf8frcs4g8fyyzv3cpipn0xdhsr97"; isLibrary = true; isExecutable = true; meta = { - homepage = "https://bitbucket.org/merijnv/posix-pty -https://github.com/proger/posix-pty/tree/fork"; + homepage = "https://github.com/proger/posix-pty/tree/fork"; description = "Pseudo terminal interaction with subprocesses"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; diff --git a/pkgs/development/libraries/haskell/void/default.nix b/pkgs/development/libraries/haskell/void/default.nix index f6cc8eaa4d9..16f4bfeb8ef 100644 --- a/pkgs/development/libraries/haskell/void/default.nix +++ b/pkgs/development/libraries/haskell/void/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "void"; - version = "0.6.1"; - sha256 = "09pa0n17b7cz7sa699gjdmp1hxcshl3170nl5sx2x99zvxz2mv42"; + version = "0.7"; + sha256 = "0ivgr4minxb5v56v4kbd045iwqk1c2w89c830731l75mkg8qa6wq"; buildDepends = [ hashable semigroups ]; meta = { homepage = "http://github.com/ekmett/void"; diff --git a/pkgs/development/libraries/haskell/vty/default.nix b/pkgs/development/libraries/haskell/vty/default.nix index 023c6de3071..d91f04f6f26 100644 --- a/pkgs/development/libraries/haskell/vty/default.nix +++ b/pkgs/development/libraries/haskell/vty/default.nix @@ -9,8 +9,8 @@ cabal.mkDerivation (self: { pname = "vty"; - version = "5.2.5"; - sha256 = "15c49nzmkld4vcdmjbh0azlzsqrqmfb0z87zfixqxcl0bafpzrjy"; + version = "5.2.6"; + sha256 = "05d5vczifyzg36w1d4wwa9h27fpwgxaxws5ilmg47gq4zr1a6yxi"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/libraries/haskell/wai-conduit/default.nix b/pkgs/development/libraries/haskell/wai-conduit/default.nix index 6174784a134..5c5c1134396 100644 --- a/pkgs/development/libraries/haskell/wai-conduit/default.nix +++ b/pkgs/development/libraries/haskell/wai-conduit/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "wai-conduit"; - version = "3.0.0"; - sha256 = "0v92jyxkigq7yj3hzy7kg360036nav986ny7b558l6j7zc90jsdg"; + version = "3.0.0.1"; + sha256 = "0m5mfr6plzb873by4pab9d4g4cwfcpxl6g5c5qyljb8sydfzhhym"; buildDepends = [ blazeBuilder conduit httpTypes transformers wai ]; meta = { homepage = "https://github.com/yesodweb/wai"; diff --git a/pkgs/development/libraries/haskell/wai-extra/default.nix b/pkgs/development/libraries/haskell/wai-extra/default.nix index 39514c8a3bd..480a6101487 100644 --- a/pkgs/development/libraries/haskell/wai-extra/default.nix +++ b/pkgs/development/libraries/haskell/wai-extra/default.nix @@ -1,16 +1,16 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! { cabal, ansiTerminal, base64Bytestring, blazeBuilder -, caseInsensitive, dataDefault, dataDefaultClass, deepseq -, fastLogger, hspec, httpTypes, HUnit, liftedBase, network -, resourcet, streamingCommons, stringsearch, text, time -, transformers, void, wai, waiLogger, word8, zlib +, caseInsensitive, dataDefaultClass, deepseq, fastLogger, hspec +, httpTypes, HUnit, liftedBase, network, resourcet +, streamingCommons, stringsearch, text, time, transformers, void +, wai, waiLogger, word8, zlib }: cabal.mkDerivation (self: { pname = "wai-extra"; - version = "3.0.2.1"; - sha256 = "02jamvina7m9wjz0hd7gj309d1vcmhgdwyh9y1bfpvq29ngqkkca"; + version = "3.0.2.2"; + sha256 = "0lbm5z4fzsss1y4749598ish967j64nfvlvdmgj27nvshi7qn4s9"; buildDepends = [ ansiTerminal base64Bytestring blazeBuilder caseInsensitive dataDefaultClass deepseq fastLogger httpTypes liftedBase network @@ -18,8 +18,8 @@ cabal.mkDerivation (self: { wai waiLogger word8 ]; testDepends = [ - blazeBuilder dataDefault fastLogger hspec httpTypes HUnit resourcet - text transformers wai zlib + fastLogger hspec httpTypes HUnit resourcet text transformers wai + zlib ]; jailbreak = true; meta = { diff --git a/pkgs/development/libraries/haskell/warp/default.nix b/pkgs/development/libraries/haskell/warp/default.nix index abca63eaf1b..ae363291803 100644 --- a/pkgs/development/libraries/haskell/warp/default.nix +++ b/pkgs/development/libraries/haskell/warp/default.nix @@ -8,8 +8,8 @@ cabal.mkDerivation (self: { pname = "warp"; - version = "3.0.2.3"; - sha256 = "16fwqd3nnw0bpa2a8ki0ynxif8a90qa20fvw5fmyngyvysl8g7qn"; + version = "3.0.4"; + sha256 = "0kykf3nki9a7mqr1z9jhk4z0cbzlmk9lyc7zw5y36285mx9id0dr"; buildDepends = [ autoUpdate blazeBuilder caseInsensitive hashable httpDate httpTypes network simpleSendfile streamingCommons text unixCompat void wai diff --git a/pkgs/development/libraries/haskell/websockets/default.nix b/pkgs/development/libraries/haskell/websockets/default.nix index 2b80e524d4a..79e03b748e6 100644 --- a/pkgs/development/libraries/haskell/websockets/default.nix +++ b/pkgs/development/libraries/haskell/websockets/default.nix @@ -8,8 +8,8 @@ cabal.mkDerivation (self: { pname = "websockets"; - version = "0.9.1.0"; - sha256 = "18q2dax5d4qh7didr2jhsns07lsybab4v231wjxn6iiyf9f7f16i"; + version = "0.9.2.1"; + sha256 = "11pdh5dc7r9svg789yx66lff5gcmzs6yg7m74ciz3ybb2i4p855s"; buildDepends = [ attoparsec base64Bytestring binary blazeBuilder caseInsensitive entropy mtl network random SHA text diff --git a/pkgs/development/libraries/haskell/wl-pprint-extras/default.nix b/pkgs/development/libraries/haskell/wl-pprint-extras/default.nix index 0165e0a82ea..0507b1ea1a6 100644 --- a/pkgs/development/libraries/haskell/wl-pprint-extras/default.nix +++ b/pkgs/development/libraries/haskell/wl-pprint-extras/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "wl-pprint-extras"; - version = "3.5.0.2"; - sha256 = "1wh8nm7h8bbr1xxf0q3cwb837jk5y1cq4l2h6lw63wavwqqvjfw6"; + version = "3.5.0.3"; + sha256 = "124wb4hqd97f3naha0589v18lvi9xbn39bmn8jwaylvyg6s5fyyp"; buildDepends = [ nats semigroupoids semigroups text utf8String ]; testDepends = [ HUnit testFramework testFrameworkHunit ]; meta = { diff --git a/pkgs/development/libraries/haskell/wl-pprint-terminfo/default.nix b/pkgs/development/libraries/haskell/wl-pprint-terminfo/default.nix index 30636f6b97c..6f2e62008f5 100644 --- a/pkgs/development/libraries/haskell/wl-pprint-terminfo/default.nix +++ b/pkgs/development/libraries/haskell/wl-pprint-terminfo/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "wl-pprint-terminfo"; - version = "3.7.1.2"; - sha256 = "17c5ys8730hhhpy0swk4yxrjs1042w4m7aypsfnzzk3b0cw94q56"; + version = "3.7.1.3"; + sha256 = "19z5cr1wqc3xcy39dswx78b6fpxhb41798zkiwkmb97nnvzwbdmv"; buildDepends = [ nats semigroups terminfo text transformers wlPprintExtras ]; diff --git a/pkgs/development/libraries/haskell/wl-pprint-text/default.nix b/pkgs/development/libraries/haskell/wl-pprint-text/default.nix index b76f50a6bf6..9ec7c2e1743 100644 --- a/pkgs/development/libraries/haskell/wl-pprint-text/default.nix +++ b/pkgs/development/libraries/haskell/wl-pprint-text/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "wl-pprint-text"; - version = "1.1.0.2"; - sha256 = "0wbfqp38as2qpn66sq4hvl3hzvj66v301cz9rmgnx2i62r0a3s81"; + version = "1.1.0.3"; + sha256 = "1ghrkqdfsdkn71mpipbxiaar2gd8mdyd3dxbsz68awwnlpapy4f3"; buildDepends = [ text ]; jailbreak = true; meta = { diff --git a/pkgs/development/libraries/haskell/wreq/default.nix b/pkgs/development/libraries/haskell/wreq/default.nix index c16df5863a0..8b6e7151273 100644 --- a/pkgs/development/libraries/haskell/wreq/default.nix +++ b/pkgs/development/libraries/haskell/wreq/default.nix @@ -1,30 +1,33 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, aeson, attoparsec, doctest, exceptions, filepath -, httpClient, httpClientTls, httpTypes, HUnit, lens, lensAeson -, mimeTypes, temporary, testFramework, testFrameworkHunit, text -, time, fetchpatch +{ cabal, aeson, aesonPretty, aesonQq, attoparsec, base16Bytestring +, base64Bytestring, byteable, caseInsensitive, cryptohash, doctest +, exceptions, filepath, hashable, httpClient, httpClientTls +, httpTypes, HUnit, lens, lensAeson, mimeTypes, networkInfo +, PSQueue, QuickCheck, snapCore, snapServer, temporary +, testFramework, testFrameworkHunit, testFrameworkQuickcheck2, text +, time, transformers, unixCompat, unorderedContainers, uuid }: cabal.mkDerivation (self: { pname = "wreq"; - version = "0.2.0.0"; - sha256 = "0ajrwn4yn6h65v97jfhbb4x3j307gdf34dyjnnhsrmsf7911l44d"; + version = "0.3.0.1"; + sha256 = "13apqr8sfx2vi794ldqprmgqch79sqli9scgyk3k41v7wcwqaal4"; isLibrary = true; isExecutable = true; buildDepends = [ - aeson attoparsec exceptions httpClient httpClientTls httpTypes lens - lensAeson mimeTypes text time + aeson attoparsec base16Bytestring byteable caseInsensitive + cryptohash exceptions hashable httpClient httpClientTls httpTypes + lens lensAeson mimeTypes PSQueue text time unorderedContainers ]; testDepends = [ - aeson doctest filepath httpClient httpTypes HUnit lens lensAeson - temporary testFramework testFrameworkHunit text + aeson aesonPretty aesonQq base64Bytestring caseInsensitive doctest + filepath hashable httpClient httpTypes HUnit lens lensAeson + networkInfo QuickCheck snapCore snapServer temporary testFramework + testFrameworkHunit testFrameworkQuickcheck2 text transformers + unixCompat uuid ]; doCheck = false; - patches = [ (fetchpatch { - url = "https://github.com/relrod/wreq/commit/9a91d57b50a09646ecbda88d126918e49aeb2de4.diff"; - sha256 = "09px4hbqkc9b0ykx7alzq2llzp0nxb2c5zsbaa05rcq9cb3nrq4m"; - })]; meta = { homepage = "http://www.serpentine.com/wreq"; description = "An easy-to-use HTTP client library"; diff --git a/pkgs/development/libraries/haskell/yaml/default.nix b/pkgs/development/libraries/haskell/yaml/default.nix index e00e7c4712d..bf63586eed4 100644 --- a/pkgs/development/libraries/haskell/yaml/default.nix +++ b/pkgs/development/libraries/haskell/yaml/default.nix @@ -1,23 +1,23 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, aeson, aesonQq, attoparsec, conduit, filepath, hspec -, HUnit, resourcet, scientific, text, transformers -, unorderedContainers, vector +{ cabal, aeson, aesonQq, attoparsec, conduit, enclosedExceptions +, filepath, hspec, hspecExpectations, HUnit, resourcet, scientific +, text, transformers, unorderedContainers, vector }: cabal.mkDerivation (self: { pname = "yaml"; - version = "0.8.10"; - sha256 = "1m51h253gcp77a0sjsckccrwz5ajd991ppczvyhnprphx1y210ig"; + version = "0.8.10.1"; + sha256 = "1a8v8digg6mcc4gx4kgfg8wzgj18wdf40wv1b7n72dg1c8kr2xz9"; isLibrary = true; isExecutable = true; buildDepends = [ - aeson attoparsec conduit filepath resourcet scientific text - transformers unorderedContainers vector + aeson attoparsec conduit enclosedExceptions filepath resourcet + scientific text transformers unorderedContainers vector ]; testDepends = [ - aeson aesonQq conduit hspec HUnit resourcet text transformers - unorderedContainers vector + aeson aesonQq conduit hspec hspecExpectations HUnit resourcet text + transformers unorderedContainers vector ]; meta = { homepage = "http://github.com/snoyberg/yaml/"; diff --git a/pkgs/development/libraries/haskell/yesod-bin/default.nix b/pkgs/development/libraries/haskell/yesod-bin/default.nix index 4809609036b..7033bff4d15 100644 --- a/pkgs/development/libraries/haskell/yesod-bin/default.nix +++ b/pkgs/development/libraries/haskell/yesod-bin/default.nix @@ -11,8 +11,8 @@ cabal.mkDerivation (self: { pname = "yesod-bin"; - version = "1.4.0.9"; - sha256 = "0pm45wi72v0kx9cqbwsbq9g6w93cb8aknps6aa153vbv7k8ikn7v"; + version = "1.4.1"; + sha256 = "0kzhnq0mv8s4qdkzqj05c7jdmp2xllv02kqgihwhyr2s4wvqmviw"; isLibrary = false; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/libraries/haskell/yesod-core/default.nix b/pkgs/development/libraries/haskell/yesod-core/default.nix index 88b33620edc..8c87981a693 100644 --- a/pkgs/development/libraries/haskell/yesod-core/default.nix +++ b/pkgs/development/libraries/haskell/yesod-core/default.nix @@ -13,8 +13,8 @@ cabal.mkDerivation (self: { pname = "yesod-core"; - version = "1.4.4.4"; - sha256 = "0l4a49a3y1m257zkzmvqwg5cm6shxzssgd143qqzhg1svikavv82"; + version = "1.4.6"; + sha256 = "1xlqqiyn2p0c1qxrkx0mlkp4cra0adhlpw27y03icvj0c93xi27g"; buildDepends = [ aeson autoUpdate blazeBuilder blazeHtml blazeMarkup caseInsensitive cereal clientsession conduit conduitExtra cookie dataDefault diff --git a/pkgs/development/libraries/haskell/yesod-form/default.nix b/pkgs/development/libraries/haskell/yesod-form/default.nix index f8645b3d108..f052a38357d 100644 --- a/pkgs/development/libraries/haskell/yesod-form/default.nix +++ b/pkgs/development/libraries/haskell/yesod-form/default.nix @@ -8,8 +8,8 @@ cabal.mkDerivation (self: { pname = "yesod-form"; - version = "1.4.1.1"; - sha256 = "0as2hgl78hqyci0f9ysa7sy3r7c8vq1a0a0y7wpbybz0c4690pqi"; + version = "1.4.3"; + sha256 = "08ivcqq4glyyvjm60fsmd4linqr6kkh6wn4bbcpzinvpv6asr6mr"; buildDepends = [ aeson attoparsec blazeBuilder blazeHtml blazeMarkup byteable dataDefault emailValidate networkUri persistent resourcet diff --git a/pkgs/development/libraries/haskell/yesod/default.nix b/pkgs/development/libraries/haskell/yesod/default.nix index 2860cab4d1a..04b4ebee52f 100644 --- a/pkgs/development/libraries/haskell/yesod/default.nix +++ b/pkgs/development/libraries/haskell/yesod/default.nix @@ -9,8 +9,8 @@ cabal.mkDerivation (self: { pname = "yesod"; - version = "1.4.1"; - sha256 = "1h4l78qjaiv3aqw02cj3qakkxv7ds946iagdccm8pav2wlkdl5pw"; + version = "1.4.1.1"; + sha256 = "0p95f6gjpcl28ysl82hbyxh7fjql6lr5csndmnrd264h2pd88pxx"; buildDepends = [ aeson blazeHtml blazeMarkup conduitExtra dataDefault fastLogger monadControl monadLogger safe semigroups shakespeare diff --git a/pkgs/development/libraries/haskell/zip-archive/0.2.3.4.nix b/pkgs/development/libraries/haskell/zip-archive/0.2.3.5.nix similarity index 87% rename from pkgs/development/libraries/haskell/zip-archive/0.2.3.4.nix rename to pkgs/development/libraries/haskell/zip-archive/0.2.3.5.nix index a7732367710..8369b2a3eb5 100644 --- a/pkgs/development/libraries/haskell/zip-archive/0.2.3.4.nix +++ b/pkgs/development/libraries/haskell/zip-archive/0.2.3.5.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "zip-archive"; - version = "0.2.3.4"; - sha256 = "1c589cpl1jax1r60b92az1800b67zrva3dndhv9hcxidlgyf46gp"; + version = "0.2.3.5"; + sha256 = "0qa3qvaj0xkh4qw7s96rkbdmkyhnql6g92yplm7m6n7z7nxrcs18"; isLibrary = true; isExecutable = true; buildDepends = [ binary digest filepath mtl text time zlib ]; diff --git a/pkgs/development/libraries/hidapi/default.nix b/pkgs/development/libraries/hidapi/default.nix index a6259ac23cc..07534ed63d7 100644 --- a/pkgs/development/libraries/hidapi/default.nix +++ b/pkgs/development/libraries/hidapi/default.nix @@ -14,7 +14,8 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = https://github.com/signal11/hidapi; - description = "for communicating with USB and Bluetooth HID devices"; + description = "Library for communicating with USB and Bluetooth HID devices"; + # Actually, you can chose between GPLv3, BSD or HIDAPI license (more liberal) license = licenses.bsd3; platforms = platforms.unix; maintainers = with maintainers; [ wkennington ]; diff --git a/pkgs/development/libraries/itk/default.nix b/pkgs/development/libraries/itk/default.nix index 29e15e08f69..7b4e3834af7 100644 --- a/pkgs/development/libraries/itk/default.nix +++ b/pkgs/development/libraries/itk/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = { description = "Insight Segmentation and Registration Toolkit"; homepage = http://www.itk.org/; - license = "BSD"; + license = stdenv.lib.licenses.asl20; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/development/libraries/jasper/default.nix b/pkgs/development/libraries/jasper/default.nix index ed51a0a2820..94e6cba4ee4 100644 --- a/pkgs/development/libraries/jasper/default.nix +++ b/pkgs/development/libraries/jasper/default.nix @@ -8,13 +8,19 @@ stdenv.mkDerivation rec { sha256 = "154l7zk7yh3v8l2l6zm5s2alvd2fzkp6c9i18iajfbna5af5m43b"; }; + patches = [ + ./jasper-CVE-2014-8137-variant2.diff ./jasper-CVE-2014-8137-noabort.diff + ./jasper-CVE-2014-8138.diff + ./jasper-CVE-2014-9029.diff + ]; + nativeBuildInputs = [unzip]; propagatedBuildInputs = [ libjpeg ]; configureFlags = "--enable-shared"; meta = { - homepage = http://www.ece.uvic.ca/~mdadams/jasper/; + homepage = https://www.ece.uvic.ca/~frodo/jasper/; description = "JPEG2000 Library"; }; } diff --git a/pkgs/development/libraries/jasper/jasper-CVE-2014-8137-noabort.diff b/pkgs/development/libraries/jasper/jasper-CVE-2014-8137-noabort.diff new file mode 100644 index 00000000000..47b57d5c809 --- /dev/null +++ b/pkgs/development/libraries/jasper/jasper-CVE-2014-8137-noabort.diff @@ -0,0 +1,16 @@ +From RedHat: https://bugzilla.redhat.com/attachment.cgi?id=967284&action=diff + +--- jasper-1.900.1.orig/src/libjasper/jp2/jp2_dec.c 2014-12-11 14:30:54.193209780 +0100 ++++ jasper-1.900.1/src/libjasper/jp2/jp2_dec.c 2014-12-11 14:36:46.313217814 +0100 +@@ -291,7 +291,10 @@ jas_image_t *jp2_decode(jas_stream_t *in + case JP2_COLR_ICC: + iccprof = jas_iccprof_createfrombuf(dec->colr->data.colr.iccp, + dec->colr->data.colr.iccplen); +- assert(iccprof); ++ if (!iccprof) { ++ jas_eprintf("error: failed to parse ICC profile\n"); ++ goto error; ++ } + jas_iccprof_gethdr(iccprof, &icchdr); + jas_eprintf("ICC Profile CS %08x\n", icchdr.colorspc); + jas_image_setclrspc(dec->image, fromiccpcs(icchdr.colorspc)); diff --git a/pkgs/development/libraries/jasper/jasper-CVE-2014-8137-variant2.diff b/pkgs/development/libraries/jasper/jasper-CVE-2014-8137-variant2.diff new file mode 100644 index 00000000000..243300dd70e --- /dev/null +++ b/pkgs/development/libraries/jasper/jasper-CVE-2014-8137-variant2.diff @@ -0,0 +1,45 @@ +From RedHat: https://bugzilla.redhat.com/attachment.cgi?id=967283&action=diff + +--- jasper-1.900.1.orig/src/libjasper/base/jas_icc.c 2014-12-11 14:06:44.000000000 +0100 ++++ jasper-1.900.1/src/libjasper/base/jas_icc.c 2014-12-11 15:16:37.971272386 +0100 +@@ -1009,7 +1009,6 @@ static int jas_icccurv_input(jas_iccattr + return 0; + + error: +- jas_icccurv_destroy(attrval); + return -1; + } + +@@ -1127,7 +1126,6 @@ static int jas_icctxtdesc_input(jas_icca + #endif + return 0; + error: +- jas_icctxtdesc_destroy(attrval); + return -1; + } + +@@ -1206,8 +1204,6 @@ static int jas_icctxt_input(jas_iccattrv + goto error; + return 0; + error: +- if (txt->string) +- jas_free(txt->string); + return -1; + } + +@@ -1328,7 +1324,6 @@ static int jas_icclut8_input(jas_iccattr + goto error; + return 0; + error: +- jas_icclut8_destroy(attrval); + return -1; + } + +@@ -1497,7 +1492,6 @@ static int jas_icclut16_input(jas_iccatt + goto error; + return 0; + error: +- jas_icclut16_destroy(attrval); + return -1; + } + diff --git a/pkgs/development/libraries/jasper/jasper-CVE-2014-8138.diff b/pkgs/development/libraries/jasper/jasper-CVE-2014-8138.diff new file mode 100644 index 00000000000..cbf0899d807 --- /dev/null +++ b/pkgs/development/libraries/jasper/jasper-CVE-2014-8138.diff @@ -0,0 +1,16 @@ +From RedHat: https://bugzilla.redhat.com/attachment.cgi?id=967280&action=diff + +--- jasper-1.900.1.orig/src/libjasper/jp2/jp2_dec.c 2014-12-11 14:06:44.000000000 +0100 ++++ jasper-1.900.1/src/libjasper/jp2/jp2_dec.c 2014-12-11 14:06:26.000000000 +0100 +@@ -386,6 +386,11 @@ jas_image_t *jp2_decode(jas_stream_t *in + /* Determine the type of each component. */ + if (dec->cdef) { + for (i = 0; i < dec->numchans; ++i) { ++ /* Is the channel number reasonable? */ ++ if (dec->cdef->data.cdef.ents[i].channo >= dec->numchans) { ++ jas_eprintf("error: invalid channel number in CDEF box\n"); ++ goto error; ++ } + jas_image_setcmpttype(dec->image, + dec->chantocmptlut[dec->cdef->data.cdef.ents[i].channo], + jp2_getct(jas_image_clrspc(dec->image), diff --git a/pkgs/development/libraries/jasper/jasper-CVE-2014-9029.diff b/pkgs/development/libraries/jasper/jasper-CVE-2014-9029.diff new file mode 100644 index 00000000000..01db7f03cdf --- /dev/null +++ b/pkgs/development/libraries/jasper/jasper-CVE-2014-9029.diff @@ -0,0 +1,31 @@ +From RedHat: https://bugzilla.redhat.com/attachment.cgi?id=961994&action=diff + +--- jasper-1.900.1.orig/src/libjasper/jpc/jpc_dec.c 2014-11-27 12:45:44.000000000 +0100 ++++ jasper-1.900.1/src/libjasper/jpc/jpc_dec.c 2014-11-27 12:44:58.000000000 +0100 +@@ -1281,7 +1281,7 @@ static int jpc_dec_process_coc(jpc_dec_t + jpc_coc_t *coc = &ms->parms.coc; + jpc_dec_tile_t *tile; + +- if (JAS_CAST(int, coc->compno) > dec->numcomps) { ++ if (JAS_CAST(int, coc->compno) >= dec->numcomps) { + jas_eprintf("invalid component number in COC marker segment\n"); + return -1; + } +@@ -1307,7 +1307,7 @@ static int jpc_dec_process_rgn(jpc_dec_t + jpc_rgn_t *rgn = &ms->parms.rgn; + jpc_dec_tile_t *tile; + +- if (JAS_CAST(int, rgn->compno) > dec->numcomps) { ++ if (JAS_CAST(int, rgn->compno) >= dec->numcomps) { + jas_eprintf("invalid component number in RGN marker segment\n"); + return -1; + } +@@ -1356,7 +1356,7 @@ static int jpc_dec_process_qcc(jpc_dec_t + jpc_qcc_t *qcc = &ms->parms.qcc; + jpc_dec_tile_t *tile; + +- if (JAS_CAST(int, qcc->compno) > dec->numcomps) { ++ if (JAS_CAST(int, qcc->compno) >= dec->numcomps) { + jas_eprintf("invalid component number in QCC marker segment\n"); + return -1; + } diff --git a/pkgs/development/libraries/java/classpath/default.nix b/pkgs/development/libraries/java/classpath/default.nix index 898813be7f8..215234f9176 100644 --- a/pkgs/development/libraries/java/classpath/default.nix +++ b/pkgs/development/libraries/java/classpath/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, javac, jvm, antlr, pkgconfig, gtk, gconf }: +{ fetchurl, stdenv, javac, jvm, antlr, pkgconfig, gtk, gconf, ecj }: stdenv.mkDerivation rec { name = "classpath-0.99"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { patches = [ ./missing-casts.patch ]; - buildInputs = [ javac jvm antlr pkgconfig gtk gconf ]; + buildInputs = [ javac jvm antlr pkgconfig gtk gconf ecj ]; configurePhase = '' # GCJ tries to compile all of Classpath during the `configure' run when diff --git a/pkgs/development/libraries/ldb/default.nix b/pkgs/development/libraries/ldb/default.nix index 26748d50479..41b44c4b731 100644 --- a/pkgs/development/libraries/ldb/default.nix +++ b/pkgs/development/libraries/ldb/default.nix @@ -5,11 +5,11 @@ }: stdenv.mkDerivation rec { - name = "ldb-1.1.17"; + name = "ldb-1.1.18"; src = fetchurl { url = "http://samba.org/ftp/ldb/${name}.tar.gz"; - sha256 = "1rmnppbk06aa1kfdrxi4xyjw2zzx54jqyz95dmqn754ys6m158xr"; + sha256 = "1j69sla6shzcm5lmsb79c4igsjnx2ggygqmf9yyim9mkl8z9ksig"; }; buildInputs = [ diff --git a/pkgs/development/libraries/ldns/default.nix b/pkgs/development/libraries/ldns/default.nix index 21c95066b33..01aeeecc6f6 100644 --- a/pkgs/development/libraries/ldns/default.nix +++ b/pkgs/development/libraries/ldns/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = { description = "Library with the aim of simplifying DNS programming in C"; - license = "BSD"; + license = stdenv.lib.licenses.bsd3; homepage = "http://www.nlnetlabs.nl/projects/ldns/"; }; } diff --git a/pkgs/development/libraries/lgi/default.nix b/pkgs/development/libraries/lgi/default.nix deleted file mode 100644 index 663185831f6..00000000000 --- a/pkgs/development/libraries/lgi/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, gobjectIntrospection, lua, glib }: - -stdenv.mkDerivation { - name = "lgi-0.7.2"; - - src = fetchurl { - url = https://github.com/pavouk/lgi/archive/0.7.2.tar.gz; - sha256 = "0ihl7gg77b042vsfh0k7l53b7sl3d7mmrq8ns5lrsf71dzrr19bn"; - }; - - meta = with stdenv.lib; { - description = "Gobject-introspection based dynamic Lua binding to GObject based libraries"; - homepage = https://github.com/pavouk/lgi; - license = "custom"; - maintainers = with maintainers; [ lovek323 ]; - platforms = platforms.unix; - }; - - buildInputs = [ glib gobjectIntrospection lua pkgconfig ]; - - preBuild = '' - sed -i "s|/usr/local|$out|" lgi/Makefile - ''; -} diff --git a/pkgs/development/libraries/libassuan/default.nix b/pkgs/development/libraries/libassuan/default.nix index 2bcf7e5d21c..e625334cefa 100644 --- a/pkgs/development/libraries/libassuan/default.nix +++ b/pkgs/development/libraries/libassuan/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, pth, libgpgerror }: stdenv.mkDerivation rec { - name = "libassuan-2.1.2"; + name = "libassuan-2.2.0"; src = fetchurl { url = "mirror://gnupg/libassuan/${name}.tar.bz2"; - sha256 = "0yxp3mdsxg75aj3h2r94vzad5i1y2mh0df9pv76ggals6k4sgy1r"; + sha256 = "1ikf9whfi7rg71qa610ynyv12qrw20zkn7zxgvvr9dp41gbqxxbx"; }; propagatedBuildInputs = [ libgpgerror pth ]; diff --git a/pkgs/development/libraries/libcec/default.nix b/pkgs/development/libraries/libcec/default.nix index 853786c3404..6eca14767c5 100644 --- a/pkgs/development/libraries/libcec/default.nix +++ b/pkgs/development/libraries/libcec/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, autoreconfHook, pkgconfig, udev }: -let version = "2.1.4"; in +let version = "2.2.0"; in stdenv.mkDerivation { name = "libcec-${version}"; src = fetchurl { - url = "https://github.com/Pulse-Eight/libcec/archive/libcec-${version}.tar.gz"; - sha256 = "0iz11zclbs3gk4ddq0pm4vyq015qmvy4nb9sra3vk6jw58izbgkr"; + url = "https://github.com/Pulse-Eight/libcec/archive/libcec-${version}-repack.tar.gz"; + sha256 = "1kdfak8y96v14d5vp2apkjjs0fvvim9phc0nkhlq5pjlagk8v32x"; }; buildInputs = [ autoreconfHook pkgconfig udev ]; @@ -18,7 +18,7 @@ stdenv.mkDerivation { ''; meta = with stdenv.lib; { - description = "USB CEC adapter communication library"; + description = "Allows you (with the right hardware) to control your device with your TV remote control using existing HDMI cabling"; homepage = "http://libcec.pulse-eight.com"; repositories.git = "https://github.com/Pulse-Eight/libcec.git"; license = stdenv.lib.licenses.gpl2Plus; diff --git a/pkgs/development/libraries/libcello/default.nix b/pkgs/development/libraries/libcello/default.nix index 4a7bc56568e..f45fb378374 100644 --- a/pkgs/development/libraries/libcello/default.nix +++ b/pkgs/development/libraries/libcello/default.nix @@ -9,8 +9,8 @@ stdenv.mkDerivation rec { }; meta = { - homepage = "http://libcello.org/"; + homepage = http://libcello.org/; description = "Higher level programming in C"; - license = "BSD"; + license = stdenv.lib.licenses.bsd3; }; } diff --git a/pkgs/development/libraries/libcouchbase/default.nix b/pkgs/development/libraries/libcouchbase/default.nix index a29107c3896..841edd3dff6 100644 --- a/pkgs/development/libraries/libcouchbase/default.nix +++ b/pkgs/development/libraries/libcouchbase/default.nix @@ -2,11 +2,11 @@ pkgconfig, perl, git, libevent, openssl}: stdenv.mkDerivation { - name = "libcouchbase-2.4.1"; + name = "libcouchbase-2.4.4"; src = fetchgit { url = "https://github.com/couchbase/libcouchbase.git"; - rev = "bd3a20f9e18a69dca199134956fd4ad3e1b80ca8"; - sha256 = "0gimvfxvbmhm6zy4vgs2630ygilhryxl8apfmv3iqs23pafwzm8r"; + rev = "4410eebcd813844b6cd6f9c7eeb4ab3dfa2ab8ac"; + sha256 = "02lzv5l6fvnqr2l9bqfha0pzkzlzjfddn3w5zcbjz36kw4p2p4h9"; leaveDotGit = true; }; @@ -24,6 +24,5 @@ stdenv.mkDerivation { homepage = "https://github.com/couchbase/libcouchbase"; license = stdenv.lib.licenses.asl20; platforms = stdenv.lib.platforms.unix; - }; } \ No newline at end of file diff --git a/pkgs/development/libraries/libctemplate/default.nix b/pkgs/development/libraries/libctemplate/default.nix index 36652f7abc7..142025c1e51 100644 --- a/pkgs/development/libraries/libctemplate/default.nix +++ b/pkgs/development/libraries/libctemplate/default.nix @@ -1,22 +1,29 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchsvn, python }: stdenv.mkDerivation rec { + name = "ctemplate-${version}"; + + version = "2.3"; + + src = fetchsvn { + url = "http://ctemplate.googlecode.com/svn/tags/${name}"; + sha256 = "1kvh82mhazf4qz7blnv0rcax7vi524dmz6v6rp89z2h3qjilbvc7"; + }; + + buildInputs = [ python ]; + + postPatch = '' + patchShebangs . + ''; + meta = { description = "A simple but powerful template language for C++"; longDescription = '' CTemplate is a simple but powerful template language for C++. It emphasizes separating logic from presentation: it is impossible to - embed application logic in this template language. ''; + embed application logic in this template language. + ''; homepage = http://code.google.com/p/google-ctemplate/; license = "bsd"; }; - - pname = "ctemplate"; - version = "2.2"; - name = "${pname}-${version}"; - - src = fetchurl { - url = "http://ctemplate.googlecode.com/files/${name}.tar.gz"; - sha256 = "0vv8gvyndppm9m5s1i5k0jvwcz41l1vfgg04r7nssdpzyz0cpwq4"; - }; } diff --git a/pkgs/development/libraries/libdnet/default.nix b/pkgs/development/libraries/libdnet/default.nix index acd930ddd01..2bdeffb204d 100644 --- a/pkgs/development/libraries/libdnet/default.nix +++ b/pkgs/development/libraries/libdnet/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation { meta = { description = "Provides a simplified, portable interface to several low-level networking routines"; homepage = http://code.google.com/p/libdnet/; - license = "BSD"; # New BSD license + license = stdenv.lib.licenses.bsd3; maintainers = [stdenv.lib.maintainers.marcweber]; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/development/libraries/libedit/default.nix b/pkgs/development/libraries/libedit/default.nix index f913ab8e493..9eee0d40654 100644 --- a/pkgs/development/libraries/libedit/default.nix +++ b/pkgs/development/libraries/libedit/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { NROFF = "${groff}/bin/nroff"; postInstall = '' - sed -i ${stdenv.lib.optionalString (stdenv.isDarwin && stdenv.gcc.nativeTools) "''"} s/-lncurses/-lncursesw/g $out/lib/pkgconfig/libedit.pc + sed -i ${stdenv.lib.optionalString (stdenv.isDarwin && stdenv.cc.nativeTools) "''"} s/-lncurses/-lncursesw/g $out/lib/pkgconfig/libedit.pc ''; configureFlags = [ "--enable-widec" ]; diff --git a/pkgs/development/libraries/libetpan/default.nix b/pkgs/development/libraries/libetpan/default.nix index e628490f159..aa201106e3c 100644 --- a/pkgs/development/libraries/libetpan/default.nix +++ b/pkgs/development/libraries/libetpan/default.nix @@ -1,24 +1,24 @@ { autoconf, automake, fetchgit, libtool, stdenv, openssl }: -let version = "1.5"; in +let version = "1.6"; in stdenv.mkDerivation { name = "libetpan-${version}"; + src = fetchgit { + url = "git://github.com/dinhviethoa/libetpan"; + rev = "refs/tags/" + version; + sha256 = "12n0vd0bwdyjcmwmpv1hdq5l04mqy6qfyy8mhsblddqaa1ah9qy8"; + }; + + buildInputs = [ autoconf automake libtool openssl ]; + + configureScript = "./autogen.sh"; + meta = with stdenv.lib; { description = "An efficient, portable library for different kinds of mail access: IMAP, SMTP, POP, and NNTP"; homepage = http://www.etpan.org/libetpan.html; license = licenses.bsd3; platforms = platforms.linux; }; - - src = fetchgit { - url = "git://github.com/dinhviethoa/libetpan"; - rev = "refs/tags/" + version; - sha256 = "bf9465121a0fb09418215ee3474a400ea5bc5ed05a6811a2978afe4905e140c9"; - }; - - buildInputs = [ autoconf automake libtool openssl ]; - - configureScript = "./autogen.sh"; } diff --git a/pkgs/development/libraries/libevdev/default.nix b/pkgs/development/libraries/libevdev/default.nix index 5dac8f88895..fd16866ccee 100644 --- a/pkgs/development/libraries/libevdev/default.nix +++ b/pkgs/development/libraries/libevdev/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, python }: stdenv.mkDerivation rec { - name = "libevdev-1.3"; + name = "libevdev-1.3.1"; src = fetchurl { url = "http://www.freedesktop.org/software/libevdev/${name}.tar.xz"; - sha256 = "0iil4pnla0kjdx52ay7igq65sx32sjbzn1wx9q3v74m5g7712m16"; + sha256 = "0hr6xjp7vcnr7lnr1il03235rcslqb95yv7j88qh51q0bwcpcz2b"; }; buildInputs = [ python ]; diff --git a/pkgs/development/libraries/libf2c/default.nix b/pkgs/development/libraries/libf2c/default.nix index 3f800c2086e..3123bb33d45 100644 --- a/pkgs/development/libraries/libf2c/default.nix +++ b/pkgs/development/libraries/libf2c/default.nix @@ -27,6 +27,6 @@ stdenv.mkDerivation rec { meta = { description = "F2c converts Fortran 77 source code to C"; homepage = http://www.netlib.org/f2c/; - license = "BSD"; + license = stdenv.lib.licenses.mit; }; } diff --git a/pkgs/development/libraries/libinput/default.nix b/pkgs/development/libraries/libinput/default.nix index 9c825f42166..d7fab5ecac7 100644 --- a/pkgs/development/libraries/libinput/default.nix +++ b/pkgs/development/libraries/libinput/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, mtdev, udev, libevdev }: stdenv.mkDerivation rec { - name = "libinput-0.6.0"; + name = "libinput-0.7.0"; src = fetchurl { url = "http://www.freedesktop.org/software/libinput/${name}.tar.xz"; - sha256 = "1g5za42f60vw87982vjh0n6r78qajj34l323p7623fbw3rvmbd9h"; + sha256 = "17jps5iz8kvhbgbd0h436grzb6fbjwf9k4qjcja96jjyzrd4i7qj"; }; buildInputs = [ pkgconfig mtdev udev libevdev ]; diff --git a/pkgs/development/libraries/libmediainfo/default.nix b/pkgs/development/libraries/libmediainfo/default.nix new file mode 100644 index 00000000000..6b0274d3f0c --- /dev/null +++ b/pkgs/development/libraries/libmediainfo/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchurl, automake, autoconf, libtool, pkgconfig, libzen, zlib }: + +let version = "0.7.71"; in + +stdenv.mkDerivation { + name = "libmediainfo-${version}"; + src = fetchurl { + url = "http://mediaarea.net/download/source/libmediainfo/${version}/libmediainfo_${version}.tar.bz2"; + sha256 = "088v7qsn7d5pijr88fx4azwb31g6d7bp5ykrzgwhskmj80y3rlp2"; + }; + + buildInputs = [ automake autoconf libtool pkgconfig libzen zlib ]; + + sourceRoot = "./MediaInfoLib/Project/GNU/Library/"; + + configureFlags = [ "--enable-shared" ]; + preConfigure = "sh autogen"; + + postInstall = '' + install -vD -m 644 libmediainfo.pc "$out/lib/pkgconfig/libmediainfo.pc" + ''; + + meta = { + description = "Shared library for mediainfo"; + homepage = http://mediaarea.net/; + license = stdenv.lib.licenses.bsd2; + platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.devhell ]; + }; +} diff --git a/pkgs/development/libraries/libmusclecard/default.nix b/pkgs/development/libraries/libmusclecard/default.nix index af235b83382..fa8b41a1772 100644 --- a/pkgs/development/libraries/libmusclecard/default.nix +++ b/pkgs/development/libraries/libmusclecard/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation { meta = { description = "Library for MUSCLE smartcard applications"; homepage = http://pcsclite.alioth.debian.org/; - license = "BSD"; + license = stdenv.lib.licenses.lgpl21; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; broken = true; diff --git a/pkgs/development/libraries/libnftnl/default.nix b/pkgs/development/libraries/libnftnl/default.nix index cb1e8346742..4a4159bfdc7 100644 --- a/pkgs/development/libraries/libnftnl/default.nix +++ b/pkgs/development/libraries/libnftnl/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, libmnl }: stdenv.mkDerivation rec { - name = "libnftnl-1.0.2"; + name = "libnftnl-1.0.3"; src = fetchurl { url = "netfilter.org/projects/libnftnl/files/${name}.tar.bz2"; - sha256 = "1p268cv85l4ipd1p9ipjdrfgba14cblp01apv7wc44zmwfr2gkkq"; + sha256 = "1xr7gis51z9r96s5m5z3dw3f5jx2m1qb7mpvl69631m6nvmff2ng"; }; buildInputs = [ pkgconfig libmnl ]; diff --git a/pkgs/development/libraries/libodfgen/default.nix b/pkgs/development/libraries/libodfgen/default.nix index 2e6c58c804e..4f4a028176f 100644 --- a/pkgs/development/libraries/libodfgen/default.nix +++ b/pkgs/development/libraries/libodfgen/default.nix @@ -3,11 +3,11 @@ let s = # Generated upstream information rec { baseName="libodfgen"; - version="0.1.1"; + version="0.1.2"; name="${baseName}-${version}"; - hash="1p335m2l19c7glsss30rrm5dxfcyajk9fvj7rsclgn0kmb4y48cm"; - url="mirror://sourceforge/project/libwpd/libodfgen/libodfgen-0.1.1/libodfgen-0.1.1.tar.xz"; - sha256="1p335m2l19c7glsss30rrm5dxfcyajk9fvj7rsclgn0kmb4y48cm"; + hash="05f0l90a715kw6n1hbq393alwyjipyp0dcqqqrwm2l0s4p151bpd"; + url="mirror://sourceforge/project/libwpd/libodfgen/libodfgen-0.1.2/libodfgen-0.1.2.tar.xz"; + sha256="05f0l90a715kw6n1hbq393alwyjipyp0dcqqqrwm2l0s4p151bpd"; }; buildInputs = [ boost pkgconfig cppunit zlib libwpg libwpd librevenge diff --git a/pkgs/development/libraries/libopensc-dnie/default.nix b/pkgs/development/libraries/libopensc-dnie/default.nix index 1452ec61606..f2855dd2a92 100644 --- a/pkgs/development/libraries/libopensc-dnie/default.nix +++ b/pkgs/development/libraries/libopensc-dnie/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { ar x opensc-dnie* tar xf data.tar.gz - RPATH=${glib}/lib:${opensc}/lib:${openssl}/lib:${openct}/lib:${libtool}/lib:${pcsclite}/lib:${stdenv.gcc.libc}/lib:${zlib}/lib + RPATH=${glib}/lib:${opensc}/lib:${openssl}/lib:${openct}/lib:${libtool}/lib:${pcsclite}/lib:${stdenv.cc.libc}/lib:${zlib}/lib for a in "usr/lib/"*.so*; do if ! test -L $a; then diff --git a/pkgs/development/libraries/libopus/default.nix b/pkgs/development/libraries/libopus/default.nix index 78b264506f0..557e448e2d4 100644 --- a/pkgs/development/libraries/libopus/default.nix +++ b/pkgs/development/libraries/libopus/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = { description = "Open, royalty-free, highly versatile audio codec"; - license = "BSD"; + license = stdenv.lib.licenses.bsd3; homepage = http://www.opus-codec.org/; }; } diff --git a/pkgs/development/libraries/libpng/default.nix b/pkgs/development/libraries/libpng/default.nix index 001d8094a27..17820fa8188 100644 --- a/pkgs/development/libraries/libpng/default.nix +++ b/pkgs/development/libraries/libpng/default.nix @@ -3,11 +3,11 @@ assert zlib != null; let - version = "1.6.14"; - sha256 = "0i5lwh9xnqj490c3mcx7rxaq4zr3wj27ba7vzfls45aqa2jl714n"; + version = "1.6.16"; + sha256 = "0q5ygy15jkpqbj5701ywrjzqp4nl5yz3r4g58h2p0kiycggm9xs2"; patch_src = fetchurl { url = "mirror://sourceforge/libpng-apng/libpng-${version}-apng.patch.gz"; - sha256 = "1gwpm9kb57dknicy9j4mf8g9q5zz4ikhbznlk32jhw2b3l0mn446"; + sha256 = "1sf27a5gvwvcm4wsf2pyq87d3g4l2fym8cirq9sli54bi753ikbh"; }; whenPatched = stdenv.lib.optionalString apngSupport; diff --git a/pkgs/development/libraries/libre/default.nix b/pkgs/development/libraries/libre/default.nix index 25b4f6617be..4e007c1b2ef 100644 --- a/pkgs/development/libraries/libre/default.nix +++ b/pkgs/development/libraries/libre/default.nix @@ -1,18 +1,18 @@ {stdenv, fetchurl, zlib, openssl}: stdenv.mkDerivation rec { - version = "0.4.10"; + version = "0.4.11"; name = "libre-${version}"; src=fetchurl { url = "http://www.creytiv.com/pub/re-${version}.tar.gz"; - sha256 = "1ckp5rwdqlhr6n8nwzfd3jwxa6f6n4gxh9ny3c1wcrbzvpkkhkv3"; + sha256 = "10jqra8b1nzy1q440ax72fxymxasgjyvpy0x4k67l77wy4p1jr42"; }; buildInputs = [zlib openssl]; makeFlags = [ "USE_ZLIB=1" "USE_OPENSSL=1" ''PREFIX=$(out)'' ] - ++ stdenv.lib.optional (stdenv.gcc.gcc != null) "SYSROOT_ALT=${stdenv.gcc.gcc}" - ++ stdenv.lib.optional (stdenv.gcc.libc != null) "SYSROOT=${stdenv.gcc.libc}" + ++ stdenv.lib.optional (stdenv.cc.gcc != null) "SYSROOT_ALT=${stdenv.cc.gcc}" + ++ stdenv.lib.optional (stdenv.cc.libc != null) "SYSROOT=${stdenv.cc.libc}" ; meta = { homepage = "http://www.creytiv.com/re.html"; diff --git a/pkgs/development/libraries/librem/default.nix b/pkgs/development/libraries/librem/default.nix index fe49609ce68..b28a8cfd9a9 100644 --- a/pkgs/development/libraries/librem/default.nix +++ b/pkgs/development/libraries/librem/default.nix @@ -12,8 +12,8 @@ stdenv.mkDerivation rec { "LIBRE_INC=${libre}/include/re" ''PREFIX=$(out)'' ] - ++ stdenv.lib.optional (stdenv.gcc.gcc != null) "SYSROOT_ALT=${stdenv.gcc.gcc}" - ++ stdenv.lib.optional (stdenv.gcc.libc != null) "SYSROOT=${stdenv.gcc.libc}" + ++ stdenv.lib.optional (stdenv.cc.gcc != null) "SYSROOT_ALT=${stdenv.cc.gcc}" + ++ stdenv.lib.optional (stdenv.cc.libc != null) "SYSROOT=${stdenv.cc.libc}" ; meta = { homepage = "http://www.creytiv.com/rem.html"; diff --git a/pkgs/development/libraries/libssh/default.nix b/pkgs/development/libraries/libssh/default.nix index c201eda69e6..88af054654b 100644 --- a/pkgs/development/libraries/libssh/default.nix +++ b/pkgs/development/libraries/libssh/default.nix @@ -1,23 +1,22 @@ -{ stdenv, fetchurl, pkgconfig, cmake, zlib, libgcrypt }: +{ stdenv, fetchurl, pkgconfig, cmake, zlib, libgcrypt, openssl }: stdenv.mkDerivation rec { - name = "libssh-0.6.3"; + name = "libssh-0.6.4"; src = fetchurl { - url = "https://red.libssh.org/attachments/download/87/${name}.tar.xz"; - sha256 = "1jyaj9h1iglvn02hrvcchbx8ycjpj8b91h8mi459k7q5jp2xgd9b"; + url = "https://red.libssh.org/attachments/download/107/${name}.tar.gz"; + sha256 = "0lkb45sc7w0wd67p46yh8rsprglssnkqar1sp0impwsvx7i0acky"; }; - buildInputs = [ zlib libgcrypt ]; + # option we don't provide (yet): use libgcrypt instead of openssl + buildInputs = [ zlib /*libgcrypt*/ openssl ]; nativeBuildInputs = [ cmake pkgconfig ]; - cmakeFlags = "-DWITH_GCRYPT=ON"; - - meta = { + meta = with stdenv.lib; { description = "SSH client library"; - license = "LGPL"; + license = licenses.lgpl2Plus; maintainers = with stdenv.lib.maintainers; [ sander urkud ]; - platforms = stdenv.lib.platforms.all; + platforms = platforms.all; }; } diff --git a/pkgs/development/libraries/libtidy/default.nix b/pkgs/development/libraries/libtidy/default.nix new file mode 100644 index 00000000000..412f34008f1 --- /dev/null +++ b/pkgs/development/libraries/libtidy/default.nix @@ -0,0 +1,28 @@ +{ stdenv, lib, fetchcvs, cmake, libtool, automake, autoconf }: + +stdenv.mkDerivation rec { + name = "libtidy-${version}"; + + version = "1.46"; + + src = fetchcvs { + cvsRoot = ":pserver:anonymous@tidy.cvs.sourceforge.net:/cvsroot/tidy"; + module = "tidy"; + date = "2009-03-25"; + sha256 = "0bnxn1qgjx1pfyn2q4y24yj1gwqq5bxwf5ksjljqzqzrmjv3q46x"; + }; + + preConfigure = '' + source build/gnuauto/setup.sh + ''; + + buildInputs = [ libtool automake autoconf ]; + + meta = with lib; { + description = "Validate, correct, and pretty-print HTML files"; + homepage = http://tidy.sourceforge.net; + license = licenses.mit; + platforms = platforms.linux; + maintainers = with maintainers; [ cstrahan ]; + }; +} diff --git a/pkgs/development/libraries/libtoxcore/default.nix b/pkgs/development/libraries/libtoxcore/default.nix index 1a93c53785b..de224f6b613 100644 --- a/pkgs/development/libraries/libtoxcore/default.nix +++ b/pkgs/development/libraries/libtoxcore/default.nix @@ -1,17 +1,18 @@ -{ stdenv, fetchurl, autoconf, libtool, automake, libsodium, ncurses, libopus +{ stdenv, fetchFromGitHub, autoconf, libtool, automake, libsodium, ncurses, libopus , libvpx, check, libconfig, pkgconfig }: let version = "f6b3e6e8fe98d2457827ac6da944e715f008a08a"; - date = "20141203"; + date = "20141219"; in stdenv.mkDerivation rec { - name = "tox-core-${date}-${version}"; + name = "tox-core-${date}-${builtins.substring 0 7 version}"; - src = fetchurl { - url = "https://github.com/irungentoo/toxcore/tarball/${version}"; - name = "${name}.tar.gz"; - sha256 = "1zsx7saqs25vva3pp0bw31yqzrn40fx84w42ig6fiv723k9gpdzy"; + src = fetchFromGitHub { + owner = "irungentoo"; + repo = "toxcore"; + rev = version; + sha256 = "1wd817kix3zjyzzb68jz02iir3z4y5k5p40dgl7a29757yb9m608"; }; NIX_LDFLAGS = "-lgcc_s"; @@ -33,6 +34,7 @@ stdenv.mkDerivation rec { "--with-libsodium-headers=${libsodium}/include" "--with-libsodium-libs=${libsodium}/lib" "--enable-ntox" + "--enable-daemon" ]; buildInputs = [ @@ -44,8 +46,13 @@ stdenv.mkDerivation rec { propagatedBuildInputs = stdenv.lib.optionals (!stdenv.isArm) [ libvpx ]; - # Some tests fail in the Sheevaplug due to timeout - doCheck = !stdenv.isArm; + # Some tests fail randomly due to timeout. This kind of problem is well known + # by upstream: https://github.com/irungentoo/toxcore/issues/{950,1054} + # They don't recommend running tests on 50core machines with other cpu-bound + # tests running in parallel. + # + # NOTE: run the tests locally on your machine before upgrading this package! + doCheck = false; meta = with stdenv.lib; { description = "P2P FOSS instant messaging application aimed to replace Skype with crypto"; diff --git a/pkgs/development/libraries/libuchardet/default.nix b/pkgs/development/libraries/libuchardet/default.nix new file mode 100644 index 00000000000..86428e08c47 --- /dev/null +++ b/pkgs/development/libraries/libuchardet/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchFromGitHub, cmake }: + +stdenv.mkDerivation rec { + name = "libuchardet-${version}"; + + version = "0.0.1"; + + src = fetchFromGitHub { + owner = "BYVoid"; + repo = "uchardet"; + rev = "69b7133995e4ee260b093323c57a7f8c6c6803b8"; + sha256 = "0yqrc9a7wxsh2fvigjppjp55v4r1q8p40yh048xsvl3kly2rkqy9"; + }; + + buildInputs = [ cmake ]; + + meta = with stdenv.lib; { + description = "Mozilla's Universal Charset Detector C/C++ API"; + homepage = https://www.byvoid.com/zht/project/uchardet; + license = licenses.mpl11; + maintainers = with maintainers; [ cstrahan ]; + }; +} diff --git a/pkgs/development/libraries/liburcu/default.nix b/pkgs/development/libraries/liburcu/default.nix index e7f627f62f7..29765f07066 100644 --- a/pkgs/development/libraries/liburcu/default.nix +++ b/pkgs/development/libraries/liburcu/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - version = "0.8.4"; + version = "0.8.6"; name = "liburcu-${version}"; src = fetchurl { url = "http://lttng.org/files/urcu/userspace-rcu-${version}.tar.bz2"; - sha256 = "04py48xphylb246mpkzvld0yprj5h7cyv6pydr8b25aax5bs3h4n"; + sha256 = "08dbfkdj4pm9s3q56nwa1vzldkf1jav61g2r4xq7mfhlw2yd79di"; }; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/libvdpau/default.nix b/pkgs/development/libraries/libvdpau/default.nix index 9d9528b75e4..dfb3575b89b 100644 --- a/pkgs/development/libraries/libvdpau/default.nix +++ b/pkgs/development/libraries/libvdpau/default.nix @@ -1,22 +1,24 @@ { stdenv, fetchurl, pkgconfig, xorg }: stdenv.mkDerivation rec { - name = "libvdpau-0.8"; + name = "libvdpau-0.9"; src = fetchurl { url = "http://people.freedesktop.org/~aplattner/vdpau/${name}.tar.gz"; - sha256 = "1v81875hppablq9gpsmvhnyl7z80zihx6arry758pvdbq4fd39vk"; + sha256 = "0vhfkjqghfva3zjif04w7pdp84g08c8xnwir3ah4b99m10a5fag3"; }; buildInputs = with xorg; [ pkgconfig dri2proto libXext ]; propagatedBuildInputs = [ xorg.libX11 ]; - configureFlags = stdenv.lib.optional stdenv.isDarwin [ "--build=x86_64" ]; + configureFlags = stdenv.lib.optional stdenv.isDarwin "--build=x86_64"; meta = with stdenv.lib; { homepage = http://people.freedesktop.org/~aplattner/vdpau/; description = "Library to use the Video Decode and Presentation API for Unix (VDPAU)"; - license = licenses.mit; + license = licenses.mit; # expat version + platforms = platforms.unix; + maintainers = [ maintainers.vcunat ]; }; } diff --git a/pkgs/development/libraries/libvncserver/default.nix b/pkgs/development/libraries/libvncserver/default.nix index da9e1dc3148..581673af64d 100644 --- a/pkgs/development/libraries/libvncserver/default.nix +++ b/pkgs/development/libraries/libvncserver/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation { inherit (s) url sha256; }; preConfigure = '' - sed -e 's@/usr/include/linux@${stdenv.gcc.libc}/include/linux@g' -i configure + sed -e 's@/usr/include/linux@${stdenv.cc.libc}/include/linux@g' -i configure ''; meta = { inherit (s) version; diff --git a/pkgs/development/libraries/libxml2/default.nix b/pkgs/development/libraries/libxml2/default.nix index 8dfe60f9026..434b76a09ea 100644 --- a/pkgs/development/libraries/libxml2/default.nix +++ b/pkgs/development/libraries/libxml2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, zlib, xz, python ? null, pythonSupport ? true }: +{ stdenv, fetchurl, zlib, xz, python ? null, pythonSupport ? true, findXMLCatalogs }: assert pythonSupport -> python != null; @@ -22,9 +22,7 @@ stdenv.mkDerivation (rec { # RUNPATH for that, leading to undefined references for its users. ++ (stdenv.lib.optional stdenv.isFreeBSD xz); - propagatedBuildInputs = [ zlib ]; - - setupHook = ./setup-hook.sh; + propagatedBuildInputs = [ zlib findXMLCatalogs ]; passthru = { inherit pythonSupport version; }; diff --git a/pkgs/development/libraries/libxml2/setup-hook.sh b/pkgs/development/libraries/libxml2/setup-hook.sh deleted file mode 100644 index 4acdd25a6b2..00000000000 --- a/pkgs/development/libraries/libxml2/setup-hook.sh +++ /dev/null @@ -1,19 +0,0 @@ -addXMLCatalogs () { - for kind in dtd xsl; do - if test -d $1/xml/$kind; then - for i in $(find $1/xml/$kind -name catalog.xml); do - export XML_CATALOG_FILES="$XML_CATALOG_FILES $i" - done - fi - done -} - -if test -z "$libxmlHookDone"; then - libxmlHookDone=1 - - # Set up XML_CATALOG_FILES. An empty initial value prevents - # xmllint and xsltproc from looking in /etc/xml/catalog. - export XML_CATALOG_FILES - if test -z "$XML_CATALOG_FILES"; then XML_CATALOG_FILES=" "; fi - envHooks+=(addXMLCatalogs) -fi diff --git a/pkgs/development/libraries/libxmlxx/default.nix b/pkgs/development/libraries/libxmlxx/default.nix index 61f519dfe51..785ed0db7d7 100644 --- a/pkgs/development/libraries/libxmlxx/default.nix +++ b/pkgs/development/libraries/libxmlxx/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl , pkgconfig, libxml2, glibmm, perl }: stdenv.mkDerivation rec { - name = "libxml++-2.37.1"; + name = "libxml++-2.37.2"; src = fetchurl { url = "mirror://gnome/sources/libxml++/2.37/${name}.tar.xz"; - sha256 = "17xkdndcambij33k25cb5c4mg2457wi114kiaprjma9j0mh87cgk"; + sha256 = "0fvpm95iapi5qrz6sil6vnqqdrsd7f9a16c415hzr44f2ji10gmv"; }; buildInputs = [ pkgconfig glibmm perl ]; diff --git a/pkgs/development/libraries/libxslt/default.nix b/pkgs/development/libraries/libxslt/default.nix index fd84c53c88f..c5b91f3c491 100644 --- a/pkgs/development/libraries/libxslt/default.nix +++ b/pkgs/development/libraries/libxslt/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libxml2 }: +{ stdenv, fetchurl, libxml2, findXMLCatalogs }: stdenv.mkDerivation rec { name = "libxslt-1.1.28"; @@ -10,6 +10,8 @@ stdenv.mkDerivation rec { buildInputs = [ libxml2 ]; + propagatedBuildInputs = [ findXMLCatalogs ]; + patches = stdenv.lib.optionals stdenv.isSunOS [ ./patch-ah.patch ]; configureFlags = [ @@ -21,11 +23,6 @@ stdenv.mkDerivation rec { "--without-debugger" ]; - postInstall = '' - mkdir -p $out/nix-support - ln -s ${libxml2}/nix-support/setup-hook $out/nix-support/ - ''; - meta = { homepage = http://xmlsoft.org/XSLT/; description = "A C library and tools to do XSL transformations"; diff --git a/pkgs/development/libraries/libyaml/default.nix b/pkgs/development/libraries/libyaml/default.nix index 33376cbdad3..667298922ca 100644 --- a/pkgs/development/libraries/libyaml/default.nix +++ b/pkgs/development/libraries/libyaml/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchurl, fetchpatch }: let version = "0.1.6"; in @@ -10,6 +10,12 @@ stdenv.mkDerivation { sha256 = "0j9731s5zjb8mjx7wzf6vh7bsqi38ay564x6s9nri2nh9cdrg9kx"; }; + patches = [(fetchpatch { + name = "CVE-2014-9130.diff"; + url = "http://bitbucket.org/xi/libyaml/commits/2b915675/raw/"; + sha256 = "1vrkga2wk060wccg61c2mj5prcyv181qikgdfi1z4hz8ygmpvl04"; + })]; + meta = with stdenv.lib; { homepage = http://pyyaml.org/; description = "A YAML 1.1 parser and emitter written in C"; diff --git a/pkgs/development/libraries/libzen/default.nix b/pkgs/development/libraries/libzen/default.nix new file mode 100644 index 00000000000..5a2723487a4 --- /dev/null +++ b/pkgs/development/libraries/libzen/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchurl, automake, autoconf, libtool, pkgconfig }: + +let version = "0.4.30"; in + +stdenv.mkDerivation { + name = "libzen-${version}"; + src = fetchurl { + url = "http://mediaarea.net/download/source/libzen/${version}/libzen_${version}.tar.bz2"; + sha256 = "1ripvyzz2lw9nx2j8mkjgjfpabrz6knwxri52asqf1abnszbry64"; + }; + + buildInputs = [ automake autoconf libtool pkgconfig ]; + configureFlags = [ "--enable-shared" ]; + + sourceRoot = "./ZenLib/Project/GNU/Library/"; + + preConfigure = "sh autogen"; + + meta = { + description = "Shared library for libmediainfo and mediainfo"; + homepage = http://mediaarea.net/; + license = stdenv.lib.licenses.bsd2; + platforms = stdenv.lib.platforms.linux; + maintainers = [ stdenv.lib.maintainers.devhell ]; + }; +} diff --git a/pkgs/development/libraries/mailcore2/default.nix b/pkgs/development/libraries/mailcore2/default.nix new file mode 100644 index 00000000000..a2891f9207d --- /dev/null +++ b/pkgs/development/libraries/mailcore2/default.nix @@ -0,0 +1,55 @@ +{ stdenv, lib, fetchFromGitHub, cmake, libetpan, icu, cyrus_sasl, libctemplate +, libuchardet, pkgconfig, glib, libtidy, libxml2, libuuid, openssl +}: + +stdenv.mkDerivation rec { + name = "mailcore2-${version}"; + + version = "0.5"; + + src = fetchFromGitHub { + owner = "MailCore"; + repo = "mailcore2"; + rev = version; + sha256 = "1f2kpw8ha4j43jlimw0my9b7x1gbik7yyg1m87q6nhbbsci78qly"; + }; + + buildInputs = [ + libetpan cmake icu cyrus_sasl libctemplate libuchardet pkgconfig glib + libtidy libxml2 libuuid openssl + ]; + + postPatch = '' + substituteInPlace CMakeLists.txt \ + --replace "tidy/tidy.h" "tidy.h" \ + --replace "/usr/include/tidy" "${libtidy}/include" \ + --replace "/usr/include/libxml2" "${libxml2}/include/libxml2" \ + ''; + + cmakeFlags = [ + "-DBUILD_SHARED_LIBS=ON" + ]; + + installPhase = '' + mkdir $out + cp -r src/include $out + + mkdir $out/lib + cp src/libMailCore.so $out/lib + ''; + + doCheck = true; + checkPhase = '' + ( + cd unittest + LD_LIBRARY_PATH="$(cd ../src; pwd)" TZ=PST8PDT ./unittestcpp ../../unittest/data + ) + ''; + + meta = with lib; { + description = "A simple and asynchronous API to work with e-mail protocols IMAP, POP and SMTP"; + homepage = http://libmailcore.com; + license = licenses.bsd3; + maintainers = with maintainers; [ cstrahan ]; + }; +} diff --git a/pkgs/development/libraries/mesa/default.nix b/pkgs/development/libraries/mesa/default.nix index 842f3dc7d9b..a3b40eb612c 100644 --- a/pkgs/development/libraries/mesa/default.nix +++ b/pkgs/development/libraries/mesa/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, intltool, flex, bison, autoreconfHook, substituteAll +{ stdenv, fetchurl, fetchpatch, pkgconfig, intltool, flex, bison, autoreconfHook, substituteAll , python, libxml2Python, file, expat, makedepend , libdrm, xorg, wayland, udev, llvm, libffi , libvdpau, libelf @@ -45,6 +45,12 @@ stdenv.mkDerivation { ./glx_ro_text_segm.patch # fix for grsecurity/PaX # TODO: revive ./dricore-gallium.patch when it gets ported (from Ubuntu), # as it saved ~35 MB in $drivers; watch https://launchpad.net/ubuntu/+source/mesa/+changelog + (fetchpatch { + name = "fix-lp_test_arit.diff"; + url = "http://cgit.freedesktop.org/mesa/mesa/patch/" + + "?id=8148a06b8fdb734f7f9a11ce787ee6505939fdaa"; + sha256 = "0k2bnl7d28nx2y88jchw6jj4f3xfdjjvz4vpvhc40060c2iz8fla"; + }) ] ++ optional stdenv.isLinux (substituteAll { src = ./dlopen-absolute-paths.diff; @@ -78,7 +84,7 @@ stdenv.mkDerivation { "--with-dri-drivers=i965,r200,radeon" "--with-gallium-drivers=i915,nouveau,r300,r600,svga,swrast,radeonsi" - "--with-egl-platforms=x11,drm" "--enable-gbm" + "--with-egl-platforms=x11,wayland,drm" "--enable-gbm" ] ++ optional enableTextureFloats "--enable-texture-float" ++ optionals enableExtraFeatures [ @@ -97,13 +103,13 @@ stdenv.mkDerivation { autoreconfHook intltool expat libxml2Python llvm glproto dri2proto dri3proto presentproto libX11 libXext libxcb libXt libXfixes libxshmfence - libffi /* wayland */ libvdpau libelf + libffi wayland libvdpau libelf ] ++ optionals enableExtraFeatures [ /*libXvMC*/ ] ++ optional stdenv.isLinux udev ; enableParallelBuilding = true; - #doCheck = true; # https://bugs.freedesktop.org/show_bug.cgi?id=67672 + doCheck = true; # move gallium-related stuff to $drivers, so $out doesn't depend on LLVM; # also move libOSMesa to $osmesa, as it's relatively big diff --git a/pkgs/development/libraries/opencollada/default.nix b/pkgs/development/libraries/opencollada/default.nix new file mode 100644 index 00000000000..20003f23874 --- /dev/null +++ b/pkgs/development/libraries/opencollada/default.nix @@ -0,0 +1,28 @@ +{ lib, stdenv, fetchFromGitHub, cmake, pkgconfig, libxml2, pcre }: + +# The exact revision specified by Blender's install_deps.sh script. +let rev = "18da7f4109a8eafaa290a33f5550501cc4c8bae8"; in + +stdenv.mkDerivation { + name = "opencollada-1.3-${rev}"; + + src = fetchFromGitHub { + owner = "KhronosGroup"; + repo = "OpenCOLLADA"; + inherit rev; + sha256 = "0ach32ws95mh0ijd8sr22kxka3riq72bb9ng46vs3615dxn7h18d"; + }; + + buildInputs = [ cmake pkgconfig ]; + + propagatedBuildInputs = [ libxml2 pcre ]; + + enableParallelBuilding = true; + + meta = { + description = "A library for handling the COLLADA file format"; + homepage = https://github.com/KhronosGroup/OpenCOLLADA/; + maintainers = [ stdenv.lib.maintainers.eelco ]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/development/libraries/opencv/2.1.nix b/pkgs/development/libraries/opencv/2.1.nix index 4b0ccc0903f..302ac10d4ab 100644 --- a/pkgs/development/libraries/opencv/2.1.nix +++ b/pkgs/development/libraries/opencv/2.1.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { meta = { description = "Open Computer Vision Library with more than 500 algorithms"; homepage = http://opencv.willowgarage.com/; - license = "BSD"; + license = stdenv.lib.licenses.bsd3; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; broken = true; diff --git a/pkgs/development/libraries/opencv/default.nix b/pkgs/development/libraries/opencv/default.nix index 45ac75340b1..7814e88f693 100644 --- a/pkgs/development/libraries/opencv/default.nix +++ b/pkgs/development/libraries/opencv/default.nix @@ -1,17 +1,22 @@ { lib, stdenv, fetchurl, cmake, gtk, libjpeg, libpng, libtiff, jasper, ffmpeg -, pkgconfig, gstreamer, xineLib, glib, python27, python27Packages, unzip +, fetchpatch, pkgconfig, gstreamer, xineLib, glib, python27, python27Packages, unzip , enableBloat ? false }: -let v = "2.4.9"; in +let v = "2.4.10"; in stdenv.mkDerivation rec { name = "opencv-${v}"; src = fetchurl { url = "mirror://sourceforge/opencvlibrary/opencv-${v}.zip"; - sha256 = "0wacpc00dr57w4lxfvllqa177cnbgy2zmcx8pnf8x62lh6210c40"; + sha256 = "1ilnfm7id8jqg5xmfjhbq81sjxx64av90kwxcs8zv5rp523wpx0v"; }; + patches = [(fetchpatch { + url = "https://github.com/Itseez/opencv/commit/ea50be0529c24.diff"; + sha256 = "0nm02v7rmfcndj3jzmv3mrqh3hk5n6axx6gdxndyhabn201hqswn"; + })]; + buildInputs = [ unzip libjpeg libpng libtiff ] ++ lib.optionals enableBloat [ gtk glib jasper ffmpeg xineLib gstreamer python27 python27Packages.numpy ]; @@ -20,11 +25,15 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + cmakeFlags = [ + "-DCMAKE_BUILD_TYPE=Release" + ]; + meta = { description = "Open Computer Vision Library with more than 500 algorithms"; - homepage = http://opencv.willowgarage.com/; - license = "BSD"; - maintainers = with stdenv.lib.maintainers; [viric]; + homepage = http://opencv.org/; + license = stdenv.lib.licenses.bsd3; + maintainers = with stdenv.lib.maintainers; [viric flosse]; platforms = with stdenv.lib.platforms; linux; }; } diff --git a/pkgs/development/libraries/openjpeg/default.nix b/pkgs/development/libraries/openjpeg/default.nix index 97981218478..7f23929efb0 100644 --- a/pkgs/development/libraries/openjpeg/default.nix +++ b/pkgs/development/libraries/openjpeg/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.openjpeg.org/; description = "Open-source JPEG 2000 codec written in C language"; - license = "BSD"; + license = stdenv.lib.licenses.bsd2; platforms = stdenv.lib.platforms.all; }; } diff --git a/pkgs/development/libraries/pcl/default.nix b/pkgs/development/libraries/pcl/default.nix index b9943b44331..a71709b554b 100644 --- a/pkgs/development/libraries/pcl/default.nix +++ b/pkgs/development/libraries/pcl/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation { meta = { homepage = http://pointclouds.org/; description = "Open project for 2D/3D image and point cloud processing"; - license = "BSD"; + license = stdenv.lib.licenses.bsd3; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; broken = true; diff --git a/pkgs/development/libraries/pdf2xml/default.nix b/pkgs/development/libraries/pdf2xml/default.nix index 4f3cd931fce..c7c5aff2455 100644 --- a/pkgs/development/libraries/pdf2xml/default.nix +++ b/pkgs/development/libraries/pdf2xml/default.nix @@ -21,6 +21,8 @@ stdenv.mkDerivation { sed -i 's|XPDF = xpdf_3.01|XPDF = ${libxpdf}/lib|' Makefile mkdir exe + + buildFlags+=" CXX=$CXX" ''; installPhase = '' diff --git a/pkgs/development/libraries/phonon-backend-vlc/default.nix b/pkgs/development/libraries/phonon-backend-vlc/default.nix index 8a196463639..8883f5c11d9 100644 --- a/pkgs/development/libraries/phonon-backend-vlc/default.nix +++ b/pkgs/development/libraries/phonon-backend-vlc/default.nix @@ -1,26 +1,37 @@ -{ stdenv, fetchurl, xz, qt4, vlc, automoc4, cmake, pkgconfig, phonon }: +{ stdenv, fetchurl, xz, vlc, automoc4, cmake, pkgconfig, phonon +, qt4 ? null, qt5 ? null, withQt5 ? false }: + +with stdenv.lib; + +assert (withQt5 -> qt5 != null); assert (!withQt5 -> qt4 != null); let pname = "phonon-backend-vlc"; - v = "0.7.2"; - vlc_ = vlc.override { inherit qt4; }; #Force using the same qt version + v = "0.8.1"; + # Force same Qt version in phonon and VLC + vlc_ = vlc.override { inherit qt4 qt5 withQt5; }; + phonon_ = phonon.override { inherit qt4 qt5 withQt5; }; in stdenv.mkDerivation { name = "${pname}-${v}"; src = fetchurl { - url = "mirror://kde/stable/phonon/${pname}/${v}/src/${pname}-${v}.tar.xz"; - sha256 = "1acmbn8pmmq16gcz825dlzaf3haj6avp1bmcxzpkjd1fvxh86y0a"; + url = "mirror://kde/stable/phonon/${pname}/${v}/${pname}-${v}.tar.xz"; + sha256 = "1fyfh7qyb6rld350v2fgz452ld96d3z5ifchr323q0vc3hb9k222"; }; nativeBuildInputs = [ cmake pkgconfig automoc4 xz ]; - buildInputs = [ qt4 vlc_ phonon ]; + buildInputs = [ vlc_ phonon_ (if withQt5 then qt5 else qt4)]; + + cmakeFlags = optional withQt5 "-DPHONON_BUILD_PHONON4QT5=ON"; meta = { + homepage = http://phonon.kde.org/; description = "VideoLAN backend for Phonon multimedia framework"; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.urkud ]; + platforms = platforms.linux; + maintainers = with maintainers; [ ttuegel urkud ]; + license = licenses.lgpl21Plus; }; } diff --git a/pkgs/development/libraries/phonon/default.nix b/pkgs/development/libraries/phonon/default.nix index 7fd99ab0244..df32f04bb6c 100644 --- a/pkgs/development/libraries/phonon/default.nix +++ b/pkgs/development/libraries/phonon/default.nix @@ -1,25 +1,33 @@ -{ stdenv, fetchurl, cmake, automoc4, qt4, pulseaudio }: +{ stdenv, fetchurl, cmake, automoc4, pulseaudio +, qt4 ? null, qt5 ? null, withQt5 ? false }: + +assert (withQt5 -> qt5 != null); assert (!withQt5 -> qt4 != null); + +with stdenv.lib; let - v = "4.7.2"; + v = "4.8.1"; in stdenv.mkDerivation rec { name = "phonon-${v}"; src = fetchurl { - url = "mirror://kde/stable/phonon/${v}/${name}.tar.xz"; - sha256 = "1ghidabmi6vnnmz8q272qi259nb8bbqlbayqk52ln98fs8s9g7l1"; + url = "mirror://kde/stable/phonon/${v}/phonon-${v}.tar.xz"; + sha256 = "1l97h1jj3gvl1chx1qbipizfvjgqc05wrhdcflc76c2krlk03jmn"; }; - buildInputs = [ qt4 pulseaudio ]; + buildInputs = [ (if withQt5 then qt5 else qt4) pulseaudio ]; nativeBuildInputs = [ cmake automoc4 ]; + cmakeFlags = optional withQt5 "-DPHONON_BUILD_PHONON4QT5=ON"; + meta = { homepage = http://phonon.kde.org/; description = "Multimedia API for Qt"; license = stdenv.lib.licenses.lgpl2; platforms = stdenv.lib.platforms.linux; - }; + maintainers = with stdenv.lib.maintainers; [ ttuegel ]; + }; } diff --git a/pkgs/development/libraries/podofo/default.nix b/pkgs/development/libraries/podofo/default.nix index b1464817a70..2a35fbd7515 100644 --- a/pkgs/development/libraries/podofo/default.nix +++ b/pkgs/development/libraries/podofo/default.nix @@ -11,12 +11,12 @@ stdenv.mkDerivation rec { propagatedBuildInputs = [ zlib freetype libjpeg libtiff fontconfig openssl libpng ]; nativeBuildInputs = [ cmake ]; - buildInputs = [ lua5 stdenv.gcc.libc ]; + buildInputs = [ lua5 stdenv.cc.libc ]; crossAttrs = { propagatedBuildInputs = [ zlib.crossDrv freetype.crossDrv libjpeg.crossDrv libtiff.crossDrv fontconfig.crossDrv openssl.crossDrv libpng.crossDrv - lua5.crossDrv stdenv.gccCross.libc ]; + lua5.crossDrv stdenv.ccCross.libc ]; }; # fix finding freetype-2.5 diff --git a/pkgs/development/libraries/poker-eval/default.nix b/pkgs/development/libraries/poker-eval/default.nix new file mode 100644 index 00000000000..1291617ad6f --- /dev/null +++ b/pkgs/development/libraries/poker-eval/default.nix @@ -0,0 +1,24 @@ +{stdenv, fetchurl}: + +stdenv.mkDerivation rec { + name = "poker-eval-138.0"; + + src = fetchurl { + url = "http://download.gna.org/pokersource/sources/${name}.tar.gz"; + sha256 = "0s6gvcdwdi6j7nrg6mmb5l971gclk0p99bcbfsynx1gnj159wrcj"; + }; + + patchPhase = '' + sed -i -e 's#pkgincludedir = $(includedir)/@PACKAGE@#pkgincludedir = $(includedir)#g' Makefile.in + sed -i -e 's#pkgincludedir = $(includedir)/@PACKAGE@#pkgincludedir = $(includedir)#g' include/Makefile.in + sed -i -e 's#includedir=@includedir@/poker-eval#includedir=@includedir@/#g' poker-eval.pc.in + ''; + + meta = { + homepage = http://pokersource.org/poker-eval/; + description = "poker hand evaluator"; + license = stdenv.lib.licenses.gpl3; + maintainers = [stdenv.lib.maintainers.mtreskin]; + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/development/libraries/polkit-qt-1/default.nix b/pkgs/development/libraries/polkit-qt-1/default.nix index 13bc992d026..c60ae560fe5 100644 --- a/pkgs/development/libraries/polkit-qt-1/default.nix +++ b/pkgs/development/libraries/polkit-qt-1/default.nix @@ -1,20 +1,22 @@ -{ stdenv, fetchurl, cmake, qt4, pkgconfig, polkit, automoc4, glib }: +{ stdenv, fetchurl, cmake, pkgconfig, polkit, automoc4, glib +, qt4 ? null, qt5 ? null, withQt5 ? false }: -stdenv.mkDerivation rec { - name = "polkit-qt-1-0.103.0"; +assert (withQt5 -> qt5 != null); assert (!withQt5 -> qt4 != null); + +stdenv.mkDerivation { + name = "polkit-qt-1-0.112.0"; src = fetchurl { - url = "mirror://kde/stable/apps/KDE4.x/admin/${name}.tar.bz2"; - sha256 = "0k17sb70ywk94dmncnkyig03sg1hcfbhi5wlc77xf3rxirmmccif"; + url = "mirror://kde/stable/apps/KDE4.x/admin/polkit-qt-1-0.112.0.tar.bz2"; + sha256 = "1ip78x20hjqvm08kxhp6gb8hf6k5n6sxyx6kk2yvvq53djzh7yv7"; }; - patches = [ ./polkit-install.patch ]; + nativeBuildInputs = [ cmake automoc4 pkgconfig ]; - nativeBuildInputs = [ cmake automoc4 ]; - - propagatedBuildInputs = [ polkit glib qt4 ]; + propagatedBuildInputs = [ polkit glib (if withQt5 then qt5 else qt4) ]; meta = { description = "A Qt wrapper around PolKit"; + maintainers = with stdenv.lib.maintainers; [ ttuegel ]; }; } diff --git a/pkgs/development/libraries/polkit-qt-1/polkit-install.patch b/pkgs/development/libraries/polkit-qt-1/polkit-install.patch deleted file mode 100644 index 79beda2a318..00000000000 --- a/pkgs/development/libraries/polkit-qt-1/polkit-install.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ru -x '*~' polkit-qt-1-0.99.0-orig/PolkitQt-1Config.cmake.in polkit-qt-1-0.99.0/PolkitQt-1Config.cmake.in ---- polkit-qt-1-0.99.0-orig/PolkitQt-1Config.cmake.in 2010-12-08 18:22:28.000000000 +0100 -+++ polkit-qt-1-0.99.0/PolkitQt-1Config.cmake.in 2011-07-12 13:26:51.000000000 +0200 -@@ -15,7 +15,7 @@ - - set(POLKITQT-1_INCLUDE_DIR "@INCLUDE_INSTALL_DIR@/polkit-qt-1") - set(POLKITQT-1_LIB_DIR "@LIB_INSTALL_DIR@") --set(POLKITQT-1_POLICY_FILES_INSTALL_DIR "${POLKITQT-1_INSTALL_DIR}/share/polkit-1/actions") -+set(POLKITQT-1_POLICY_FILES_INSTALL_DIR "${CMAKE_INSTALL_PREFIX}/share/polkit-1/actions") - - # Compatibility - if(WIN32) diff --git a/pkgs/development/libraries/poppler/default.nix b/pkgs/development/libraries/poppler/default.nix index feb3750907f..39059905a02 100644 --- a/pkgs/development/libraries/poppler/default.nix +++ b/pkgs/development/libraries/poppler/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchgit, pkgconfig, cmake, libiconvOrEmpty, libintlOrEmpty +{ stdenv, fetchurl, fetchpatch, pkgconfig, cmake, libiconvOrEmpty, libintlOrEmpty , zlib, curl, cairo, freetype, fontconfig, lcms, libjpeg, openjpeg , qt4Support ? false, qt4 ? null }: @@ -7,6 +7,14 @@ let version = "0.28.1"; # even major numbers are stable sha256 = "01pxjdbhvpxf00ncf8d9wxc8gkcqcxz59lwrpa151ah988inxkrc"; + # This is for Okular (and similar) to support subpixel rendering. + # It's kept from upstream because of political reasons. + qtcairo_patch = fetchpatch { + url = "https://github.com/giddie/poppler-qt4-cairo-backend/compare/" + + "fa1d636...b30f96c.diff"; # update to current maint...qt4-lcd + sha256 = "0g18y247k2vcz1n56rnfpy226f22v4r9c7pk8cf2h9l12vz2qxkm"; + }; + poppler_drv = nameSuff: merge: stdenv.mkDerivation (stdenv.lib.mergeAttrsByFuncDefaultsClean [ rec { name = "poppler-${nameSuff}-${version}"; @@ -53,6 +61,7 @@ let poppler_glib = poppler_drv "glib" { }; poppler_qt4 = poppler_drv "qt4" { + patches = [ qtcairo_patch ]; propagatedBuildInputs = [ qt4 poppler_glib ]; NIX_LDFLAGS = "-lpoppler"; postConfigure = '' diff --git a/pkgs/development/libraries/qimageblitz/default.nix b/pkgs/development/libraries/qimageblitz/default.nix index 1f820b33e81..dcf453fd8e1 100644 --- a/pkgs/development/libraries/qimageblitz/default.nix +++ b/pkgs/development/libraries/qimageblitz/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { meta = { description = "Graphical effect and filter library for KDE4"; - license = "BSD"; + license = stdenv.lib.licenses.bsd2; homepage = "http://${pn}.sourceforge.net"; }; } 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 943d780473a..a8d8beb4145 100644 --- a/pkgs/development/libraries/qt-4.x/4.8/default.nix +++ b/pkgs/development/libraries/qt-4.x/4.8/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { # remove impure reference to /usr/lib/libstdc++.6.dylib # there might be more references, but this is the only one I could find substituteInPlace tools/macdeployqt/tests/tst_deployment_mac.cpp \ - --replace /usr/lib/libstdc++.6.dylib "${stdenv.gcc}/lib/libstdc++.6.dylib" + --replace /usr/lib/libstdc++.6.dylib "${stdenv.cc}/lib/libstdc++.6.dylib" ''; patches = @@ -53,7 +53,7 @@ stdenv.mkDerivation rec { (substituteAll { src = ./dlopen-absolute-paths.diff; inherit cups icu libXfixes; - glibc = stdenv.gcc.libc; + glibc = stdenv.cc.libc; openglDriver = if mesaSupported then mesa.driverLink else "/no-such-path"; }) ] ++ stdenv.lib.optional gtkStyle (substituteAll { diff --git a/pkgs/development/libraries/qt-5/dlopen-gtkstyle.patch b/pkgs/development/libraries/qt-5/0001-dlopen-gtkstyle.patch similarity index 58% rename from pkgs/development/libraries/qt-5/dlopen-gtkstyle.patch rename to pkgs/development/libraries/qt-5/0001-dlopen-gtkstyle.patch index 05ff30b7ac3..3f411139f5b 100644 --- a/pkgs/development/libraries/qt-5/dlopen-gtkstyle.patch +++ b/pkgs/development/libraries/qt-5/0001-dlopen-gtkstyle.patch @@ -1,7 +1,31 @@ -diff -ruN qt-everywhere-opensource-src-5.1.1-orig/qtbase/src/widgets/styles/qgtkstyle_p.cpp qt-everywhere-opensource-src-5.1.1/qtbase/src/widgets/styles/qgtkstyle_p.cpp ---- qt-everywhere-opensource-src-5.1.1-orig/qtbase/src/widgets/styles/qgtkstyle_p.cpp 2013-08-25 20:03:30.000000000 +0200 -+++ qt-everywhere-opensource-src-5.1.1/qtbase/src/widgets/styles/qgtkstyle_p.cpp 2013-09-25 17:58:04.229373681 +0200 -@@ -348,7 +348,7 @@ +From 35d5995a58c86a6addbf0aaf0d1be64d39182872 Mon Sep 17 00:00:00 2001 +From: Thomas Tuegel +Date: Mon, 1 Dec 2014 17:21:58 -0600 +Subject: [PATCH] dlopen-gtkstyle + +--- + qtbase/src/widgets/styles/qgtk2painter.cpp | 2 +- + qtbase/src/widgets/styles/qgtkstyle_p.cpp | 12 ++++++------ + 2 files changed, 7 insertions(+), 7 deletions(-) + +diff --git a/qtbase/src/widgets/styles/qgtk2painter.cpp b/qtbase/src/widgets/styles/qgtk2painter.cpp +index 7b9bd97..075947a 100644 +--- a/qtbase/src/widgets/styles/qgtk2painter.cpp ++++ b/qtbase/src/widgets/styles/qgtk2painter.cpp +@@ -104,7 +104,7 @@ static void initGtk() + static bool initialized = false; + if (!initialized) { + // enforce the "0" suffix, so we'll open libgtk-x11-2.0.so.0 +- QLibrary libgtk(QLS("gtk-x11-2.0"), 0, 0); ++ QLibrary libgtk(QLS("@gtk@/lib/libgtk-x11-2.0"), 0, 0); + + QGtk2PainterPrivate::gdk_pixmap_new = (Ptr_gdk_pixmap_new)libgtk.resolve("gdk_pixmap_new"); + QGtk2PainterPrivate::gdk_pixbuf_get_from_drawable = (Ptr_gdk_pixbuf_get_from_drawable)libgtk.resolve("gdk_pixbuf_get_from_drawable"); +diff --git a/qtbase/src/widgets/styles/qgtkstyle_p.cpp b/qtbase/src/widgets/styles/qgtkstyle_p.cpp +index 2c64225..3343d32 100644 +--- a/qtbase/src/widgets/styles/qgtkstyle_p.cpp ++++ b/qtbase/src/widgets/styles/qgtkstyle_p.cpp +@@ -334,7 +334,7 @@ void QGtkStylePrivate::gtkWidgetSetFocus(GtkWidget *widget, bool focus) void QGtkStylePrivate::resolveGtk() const { // enforce the "0" suffix, so we'll open libgtk-x11-2.0.so.0 @@ -10,7 +34,7 @@ diff -ruN qt-everywhere-opensource-src-5.1.1-orig/qtbase/src/widgets/styles/qgtk gtk_init = (Ptr_gtk_init)libgtk.resolve("gtk_init"); gtk_window_new = (Ptr_gtk_window_new)libgtk.resolve("gtk_window_new"); -@@ -461,8 +461,8 @@ +@@ -432,8 +432,8 @@ void QGtkStylePrivate::resolveGtk() const pango_font_description_get_family = (Ptr_pango_font_description_get_family)libgtk.resolve("pango_font_description_get_family"); pango_font_description_get_style = (Ptr_pango_font_description_get_style)libgtk.resolve("pango_font_description_get_style"); @@ -21,7 +45,7 @@ diff -ruN qt-everywhere-opensource-src-5.1.1-orig/qtbase/src/widgets/styles/qgtk } /* \internal -@@ -630,9 +630,9 @@ +@@ -601,9 +601,9 @@ void QGtkStylePrivate::cleanupGtkWidgets() static bool resolveGConf() { if (!QGtkStylePrivate::gconf_client_get_default) { @@ -34,3 +58,6 @@ diff -ruN qt-everywhere-opensource-src-5.1.1-orig/qtbase/src/widgets/styles/qgtk } return (QGtkStylePrivate::gconf_client_get_default !=0); } +-- +2.1.3 + diff --git a/pkgs/development/libraries/qt-5/0002-dlopen-webkit-nsplugin.patch b/pkgs/development/libraries/qt-5/0002-dlopen-webkit-nsplugin.patch new file mode 100644 index 00000000000..0752cdcf479 --- /dev/null +++ b/pkgs/development/libraries/qt-5/0002-dlopen-webkit-nsplugin.patch @@ -0,0 +1,53 @@ +From 8c30f72dbe11752e8ed25f292c6e5695d7733f72 Mon Sep 17 00:00:00 2001 +From: Thomas Tuegel +Date: Mon, 1 Dec 2014 17:22:23 -0600 +Subject: [PATCH] dlopen-webkit-nsplugin + +--- + qtwebkit/Source/WebCore/plugins/qt/PluginPackageQt.cpp | 2 +- + qtwebkit/Source/WebCore/plugins/qt/PluginViewQt.cpp | 2 +- + .../WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp | 2 +- + 3 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/qtwebkit/Source/WebCore/plugins/qt/PluginPackageQt.cpp b/qtwebkit/Source/WebCore/plugins/qt/PluginPackageQt.cpp +index 679480b..2c373cc 100644 +--- a/qtwebkit/Source/WebCore/plugins/qt/PluginPackageQt.cpp ++++ b/qtwebkit/Source/WebCore/plugins/qt/PluginPackageQt.cpp +@@ -132,7 +132,7 @@ static void initializeGtk(QLibrary* module = 0) + } + } + +- QLibrary library(QLatin1String("libgtk-x11-2.0"), 0); ++ QLibrary library(QLatin1String("@gtk@/lib/libgtk-x11-2.0"), 0); + if (library.load()) { + typedef void *(*gtk_init_check_ptr)(int*, char***); + gtk_init_check_ptr gtkInitCheck = (gtk_init_check_ptr)library.resolve("gtk_init_check"); +diff --git a/qtwebkit/Source/WebCore/plugins/qt/PluginViewQt.cpp b/qtwebkit/Source/WebCore/plugins/qt/PluginViewQt.cpp +index de06a2f..363bde5 100644 +--- a/qtwebkit/Source/WebCore/plugins/qt/PluginViewQt.cpp ++++ b/qtwebkit/Source/WebCore/plugins/qt/PluginViewQt.cpp +@@ -697,7 +697,7 @@ static Display *getPluginDisplay() + // support gdk based plugins (like flash) that use a different X connection. + // The code below has the same effect as this one: + // Display *gdkDisplay = gdk_x11_display_get_xdisplay(gdk_display_get_default()); +- QLibrary library(QLatin1String("libgdk-x11-2.0"), 0); ++ QLibrary library(QLatin1String("@gdk_pixbuf@/lib/libgdk-x11-2.0"), 0); + if (!library.load()) + return 0; + +diff --git a/qtwebkit/Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp b/qtwebkit/Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp +index d734ff6..62a2197 100644 +--- a/qtwebkit/Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp ++++ b/qtwebkit/Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp +@@ -64,7 +64,7 @@ static Display* getPluginDisplay() + // The code below has the same effect as this one: + // Display *gdkDisplay = gdk_x11_display_get_xdisplay(gdk_display_get_default()); + +- QLibrary library(QLatin1String("libgdk-x11-2.0"), 0); ++ QLibrary library(QLatin1String("@gdk_pixbuf@/libgdk-x11-2.0"), 0); + if (!library.load()) + return 0; + +-- +2.1.3 + diff --git a/pkgs/development/libraries/qt-5/0003-glib-2.32.patch b/pkgs/development/libraries/qt-5/0003-glib-2.32.patch new file mode 100644 index 00000000000..4abb69da4d8 --- /dev/null +++ b/pkgs/development/libraries/qt-5/0003-glib-2.32.patch @@ -0,0 +1,25 @@ +From a41c3e3a3a1ce4b373b1bbb98f3a835e9e8a0718 Mon Sep 17 00:00:00 2001 +From: Thomas Tuegel +Date: Mon, 1 Dec 2014 17:22:39 -0600 +Subject: [PATCH] glib-2.32 + +--- + qtscript/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Threading.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/qtscript/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Threading.h b/qtscript/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Threading.h +index 1f6d25e..087c3fb 100644 +--- a/qtscript/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Threading.h ++++ b/qtscript/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Threading.h +@@ -81,7 +81,7 @@ + #include + #elif PLATFORM(GTK) + #include +-typedef struct _GMutex GMutex; ++typedef union _GMutex GMutex; + typedef struct _GCond GCond; + #endif + +-- +2.1.3 + diff --git a/pkgs/development/libraries/qt-5/0004-dlopen-resolv.patch b/pkgs/development/libraries/qt-5/0004-dlopen-resolv.patch new file mode 100644 index 00000000000..e6b921b771d --- /dev/null +++ b/pkgs/development/libraries/qt-5/0004-dlopen-resolv.patch @@ -0,0 +1,39 @@ +From 63af41c6eeca28c911c13b1a77afeaf860863c2d Mon Sep 17 00:00:00 2001 +From: Thomas Tuegel +Date: Mon, 1 Dec 2014 17:22:55 -0600 +Subject: [PATCH] dlopen-resolv + +--- + qtbase/src/network/kernel/qdnslookup_unix.cpp | 2 +- + qtbase/src/network/kernel/qhostinfo_unix.cpp | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/qtbase/src/network/kernel/qdnslookup_unix.cpp b/qtbase/src/network/kernel/qdnslookup_unix.cpp +index 8c5a0eb..27ebf16 100644 +--- a/qtbase/src/network/kernel/qdnslookup_unix.cpp ++++ b/qtbase/src/network/kernel/qdnslookup_unix.cpp +@@ -87,7 +87,7 @@ static void resolveLibrary() + if (!lib.load()) + #endif + { +- lib.setFileName(QLatin1String("resolv")); ++ lib.setFileName(QLatin1String("@glibc/lib/resolv")); + if (!lib.load()) + return; + } +diff --git a/qtbase/src/network/kernel/qhostinfo_unix.cpp b/qtbase/src/network/kernel/qhostinfo_unix.cpp +index df8c8b1..613d0e0 100644 +--- a/qtbase/src/network/kernel/qhostinfo_unix.cpp ++++ b/qtbase/src/network/kernel/qhostinfo_unix.cpp +@@ -103,7 +103,7 @@ static void resolveLibrary() + if (!lib.load()) + #endif + { +- lib.setFileName(QLatin1String("resolv")); ++ lib.setFileName(QLatin1String("@glibc@/lib/libresolv")); + if (!lib.load()) + return; + } +-- +2.1.3 + diff --git a/pkgs/development/libraries/qt-5/0005-dlopen-gl.patch b/pkgs/development/libraries/qt-5/0005-dlopen-gl.patch new file mode 100644 index 00000000000..d112427bdd6 --- /dev/null +++ b/pkgs/development/libraries/qt-5/0005-dlopen-gl.patch @@ -0,0 +1,25 @@ +From 6aaf6858bf817172a4c503158e1701c4837ee790 Mon Sep 17 00:00:00 2001 +From: Thomas Tuegel +Date: Mon, 1 Dec 2014 17:23:08 -0600 +Subject: [PATCH] dlopen-gl + +--- + qtbase/src/plugins/platforms/xcb/qglxintegration.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/qtbase/src/plugins/platforms/xcb/qglxintegration.cpp b/qtbase/src/plugins/platforms/xcb/qglxintegration.cpp +index 67235e0..2220a2e 100644 +--- a/qtbase/src/plugins/platforms/xcb/qglxintegration.cpp ++++ b/qtbase/src/plugins/platforms/xcb/qglxintegration.cpp +@@ -434,7 +434,7 @@ void (*QGLXContext::getProcAddress(const QByteArray &procName)) () + { + extern const QString qt_gl_library_name(); + // QLibrary lib(qt_gl_library_name()); +- QLibrary lib(QLatin1String("GL")); ++ QLibrary lib(QLatin1String("@openglDriver@/lib/libGL")); + glXGetProcAddressARB = (qt_glXGetProcAddressARB) lib.resolve("glXGetProcAddressARB"); + } + } +-- +2.1.3 + diff --git a/pkgs/development/libraries/qt-5/0006-tzdir.patch b/pkgs/development/libraries/qt-5/0006-tzdir.patch new file mode 100644 index 00000000000..d5a74b25fb3 --- /dev/null +++ b/pkgs/development/libraries/qt-5/0006-tzdir.patch @@ -0,0 +1,52 @@ +From 775fd74351faaabd45f6751618b28e2b05812d05 Mon Sep 17 00:00:00 2001 +From: Thomas Tuegel +Date: Mon, 1 Dec 2014 17:23:22 -0600 +Subject: [PATCH] tzdir + +--- + qtbase/src/corelib/tools/qtimezoneprivate_tz.cpp | 21 +++++++++++++++------ + 1 file changed, 15 insertions(+), 6 deletions(-) + +diff --git a/qtbase/src/corelib/tools/qtimezoneprivate_tz.cpp b/qtbase/src/corelib/tools/qtimezoneprivate_tz.cpp +index b4ea91e..a56a245 100644 +--- a/qtbase/src/corelib/tools/qtimezoneprivate_tz.cpp ++++ b/qtbase/src/corelib/tools/qtimezoneprivate_tz.cpp +@@ -68,7 +68,10 @@ typedef QHash QTzTimeZoneHash; + // Parse zone.tab table, assume lists all installed zones, if not will need to read directories + static QTzTimeZoneHash loadTzTimeZones() + { +- QString path = QStringLiteral("/usr/share/zoneinfo/zone.tab"); ++ QString path = qgetenv("TZDIR"); ++ path += "/zone.tab"; ++ if (!QFile::exists(path)) ++ path = QStringLiteral("/usr/share/zoneinfo/zone.tab"); + if (!QFile::exists(path)) + path = QStringLiteral("/usr/lib/zoneinfo/zone.tab"); + +@@ -559,12 +562,18 @@ void QTzTimeZonePrivate::init(const QByteArray &ianaId) + if (!tzif.open(QIODevice::ReadOnly)) + return; + } else { +- // Open named tz, try modern path first, if fails try legacy path +- tzif.setFileName(QLatin1String("/usr/share/zoneinfo/") + QString::fromLocal8Bit(ianaId)); ++ // Try TZDIR first ++ QString zoneinfoDir = qgetenv("TZDIR"); ++ zoneinfoDir += "/" + QString::fromLocal8Bit(ianaId); ++ tzif.setFileName(zoneinfoDir); + if (!tzif.open(QIODevice::ReadOnly)) { +- tzif.setFileName(QLatin1String("/usr/lib/zoneinfo/") + QString::fromLocal8Bit(ianaId)); +- if (!tzif.open(QIODevice::ReadOnly)) +- return; ++ // Open named tz, try modern path first, if fails try legacy path ++ tzif.setFileName(QLatin1String("/usr/share/zoneinfo/") + QString::fromLocal8Bit(ianaId)); ++ if (!tzif.open(QIODevice::ReadOnly)) { ++ tzif.setFileName(QLatin1String("/usr/lib/zoneinfo/") + QString::fromLocal8Bit(ianaId)); ++ if (!tzif.open(QIODevice::ReadOnly)) ++ return; ++ } + } + } + +-- +2.1.3 + diff --git a/pkgs/development/libraries/qt-5/0007-dlopen-webkit-gtk.patch b/pkgs/development/libraries/qt-5/0007-dlopen-webkit-gtk.patch new file mode 100644 index 00000000000..9582b714c90 --- /dev/null +++ b/pkgs/development/libraries/qt-5/0007-dlopen-webkit-gtk.patch @@ -0,0 +1,25 @@ +From 089db8835c80bf2b7dd91a97a5c6eb26636b6ab9 Mon Sep 17 00:00:00 2001 +From: Thomas Tuegel +Date: Mon, 1 Dec 2014 17:26:39 -0600 +Subject: [PATCH] dlopen-webkit-gtk + +--- + qtwebkit/Source/WebKit2/PluginProcess/qt/PluginProcessMainQt.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/qtwebkit/Source/WebKit2/PluginProcess/qt/PluginProcessMainQt.cpp b/qtwebkit/Source/WebKit2/PluginProcess/qt/PluginProcessMainQt.cpp +index 8de6521..0b25748 100644 +--- a/qtwebkit/Source/WebKit2/PluginProcess/qt/PluginProcessMainQt.cpp ++++ b/qtwebkit/Source/WebKit2/PluginProcess/qt/PluginProcessMainQt.cpp +@@ -53,7 +53,7 @@ static void messageHandler(QtMsgType type, const QMessageLogContext&, const QStr + + static bool initializeGtk() + { +- QLibrary gtkLibrary(QLatin1String("libgtk-x11-2.0"), 0); ++ QLibrary gtkLibrary(QLatin1String("@gtk@/lib/libgtk-x11-2.0"), 0); + if (!gtkLibrary.load()) + return false; + typedef void* (*gtk_init_ptr)(void*, void*); +-- +2.1.3 + diff --git a/pkgs/development/libraries/qt-5/0008-dlopen-webkit-udev.patch b/pkgs/development/libraries/qt-5/0008-dlopen-webkit-udev.patch new file mode 100644 index 00000000000..e8a4ba6a215 --- /dev/null +++ b/pkgs/development/libraries/qt-5/0008-dlopen-webkit-udev.patch @@ -0,0 +1,31 @@ +From 25d2922cce383fcaa4c138e0cc6c8d92328eeacb Mon Sep 17 00:00:00 2001 +From: Thomas Tuegel +Date: Mon, 1 Dec 2014 17:30:41 -0600 +Subject: [PATCH] dlopen-webkit-udev + +--- + qtwebkit/Source/WebCore/platform/qt/GamepadsQt.cpp | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/qtwebkit/Source/WebCore/platform/qt/GamepadsQt.cpp b/qtwebkit/Source/WebCore/platform/qt/GamepadsQt.cpp +index 60ff317..da8ac69 100644 +--- a/qtwebkit/Source/WebCore/platform/qt/GamepadsQt.cpp ++++ b/qtwebkit/Source/WebCore/platform/qt/GamepadsQt.cpp +@@ -111,12 +111,12 @@ private: + bool load() + { + m_libUdev.setLoadHints(QLibrary::ResolveAllSymbolsHint); +- m_libUdev.setFileNameAndVersion(QStringLiteral("udev"), 1); ++ m_libUdev.setFileNameAndVersion(QStringLiteral("@udev@/lib/libudev"), 1); + m_loaded = m_libUdev.load(); + if (resolveMethods()) + return true; + +- m_libUdev.setFileNameAndVersion(QStringLiteral("udev"), 0); ++ m_libUdev.setFileNameAndVersion(QStringLiteral("@udev@/lib/libudev"), 0); + m_loaded = m_libUdev.load(); + return resolveMethods(); + } +-- +2.1.3 + diff --git a/pkgs/development/libraries/qt-5/0009-dlopen-serialport-udev.patch b/pkgs/development/libraries/qt-5/0009-dlopen-serialport-udev.patch new file mode 100644 index 00000000000..e1e66a3ce95 --- /dev/null +++ b/pkgs/development/libraries/qt-5/0009-dlopen-serialport-udev.patch @@ -0,0 +1,28 @@ +From 17c7257e54c00ea2121f2cf95fb2be5e5db6b4ad Mon Sep 17 00:00:00 2001 +From: Thomas Tuegel +Date: Mon, 1 Dec 2014 17:31:03 -0600 +Subject: [PATCH] dlopen-serialport-udev + +--- + qtserialport/src/serialport/qtudev_p.h | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/qtserialport/src/serialport/qtudev_p.h b/qtserialport/src/serialport/qtudev_p.h +index 09940ab..45460f9 100644 +--- a/qtserialport/src/serialport/qtudev_p.h ++++ b/qtserialport/src/serialport/qtudev_p.h +@@ -119,9 +119,9 @@ inline void *resolveSymbol(QLibrary *udevLibrary, const char *symbolName) + inline bool resolveSymbols(QLibrary *udevLibrary) + { + if (!udevLibrary->isLoaded()) { +- udevLibrary->setFileNameAndVersion(QStringLiteral("udev"), 1); ++ udevLibrary->setFileNameAndVersion(QStringLiteral("@udev@/lib/libudev"), 1); + if (!udevLibrary->load()) { +- udevLibrary->setFileNameAndVersion(QStringLiteral("udev"), 0); ++ udevLibrary->setFileNameAndVersion(QStringLiteral("@udev@/lib/libudev"), 0); + if (!udevLibrary->load()) { + qWarning("Failed to load the library: %s, supported version(s): %i and %i", qPrintable(udevLibrary->fileName()), 1, 0); + return false; +-- +2.1.3 + diff --git a/pkgs/development/libraries/qt-5/0010-dlopen-libXcursor.patch b/pkgs/development/libraries/qt-5/0010-dlopen-libXcursor.patch new file mode 100644 index 00000000000..49ade86fae3 --- /dev/null +++ b/pkgs/development/libraries/qt-5/0010-dlopen-libXcursor.patch @@ -0,0 +1,29 @@ +From b56e3737ca97e3de664603976989da4419297eb3 Mon Sep 17 00:00:00 2001 +From: Thomas Tuegel +Date: Mon, 1 Dec 2014 17:33:51 -0600 +Subject: [PATCH] dlopen-libXcursor + +--- + qtbase/src/plugins/platforms/xcb/qxcbcursor.cpp | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/qtbase/src/plugins/platforms/xcb/qxcbcursor.cpp b/qtbase/src/plugins/platforms/xcb/qxcbcursor.cpp +index 6dbac90..4b23fc2 100644 +--- a/qtbase/src/plugins/platforms/xcb/qxcbcursor.cpp ++++ b/qtbase/src/plugins/platforms/xcb/qxcbcursor.cpp +@@ -305,10 +305,10 @@ QXcbCursor::QXcbCursor(QXcbConnection *conn, QXcbScreen *screen) + #ifdef XCB_USE_XLIB + static bool function_ptrs_not_initialized = true; + if (function_ptrs_not_initialized) { +- QLibrary xcursorLib(QLatin1String("Xcursor"), 1); ++ QLibrary xcursorLib(QLatin1String("@libXcursor@/lib/libXcursor"), 1); + bool xcursorFound = xcursorLib.load(); + if (!xcursorFound) { // try without the version number +- xcursorLib.setFileName(QLatin1String("Xcursor")); ++ xcursorLib.setFileName(QLatin1String("@libXcursor@/lib/Xcursor")); + xcursorFound = xcursorLib.load(); + } + if (xcursorFound) { +-- +2.1.3 + diff --git a/pkgs/development/libraries/qt-5/0011-dlopen-openssl.patch b/pkgs/development/libraries/qt-5/0011-dlopen-openssl.patch new file mode 100644 index 00000000000..d08061dd5dd --- /dev/null +++ b/pkgs/development/libraries/qt-5/0011-dlopen-openssl.patch @@ -0,0 +1,38 @@ +From 99d458c93698b2d4f16ff164ed54237279ffbb64 Mon Sep 17 00:00:00 2001 +From: Thomas Tuegel +Date: Mon, 1 Dec 2014 17:35:21 -0600 +Subject: [PATCH] dlopen-openssl + +--- + qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp b/qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp +index 4e6200f..d9c3e7d 100644 +--- a/qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp ++++ b/qtbase/src/network/ssl/qsslsocket_openssl_symbols.cpp +@@ -585,8 +585,8 @@ static QPair loadOpenSsl() + #endif + #if defined(SHLIB_VERSION_NUMBER) && !defined(Q_OS_QNX) // on QNX, the libs are always libssl.so and libcrypto.so + // first attempt: the canonical name is libssl.so. +- libssl->setFileNameAndVersion(QLatin1String("ssl"), QLatin1String(SHLIB_VERSION_NUMBER)); +- libcrypto->setFileNameAndVersion(QLatin1String("crypto"), QLatin1String(SHLIB_VERSION_NUMBER)); ++ libssl->setFileNameAndVersion(QLatin1String("@openssl@/lib/libssl"), QLatin1String(SHLIB_VERSION_NUMBER)); ++ libcrypto->setFileNameAndVersion(QLatin1String("@openssl@/lib/libcrypto"), QLatin1String(SHLIB_VERSION_NUMBER)); + if (libcrypto->load() && libssl->load()) { + // libssl.so. and libcrypto.so. found + return pair; +@@ -597,8 +597,8 @@ static QPair loadOpenSsl() + #endif + + // second attempt: find the development files libssl.so and libcrypto.so +- libssl->setFileNameAndVersion(QLatin1String("ssl"), -1); +- libcrypto->setFileNameAndVersion(QLatin1String("crypto"), -1); ++ libssl->setFileNameAndVersion(QLatin1String("@openssl@/lib/libssl"), -1); ++ libcrypto->setFileNameAndVersion(QLatin1String("@openssl@/lib/libcrypto"), -1); + if (libcrypto->load() && libssl->load()) { + // libssl.so.0 and libcrypto.so.0 found + return pair; +-- +2.1.3 + diff --git a/pkgs/development/libraries/qt-5/0012-dlopen-dbus.patch b/pkgs/development/libraries/qt-5/0012-dlopen-dbus.patch new file mode 100644 index 00000000000..f32386e114b --- /dev/null +++ b/pkgs/development/libraries/qt-5/0012-dlopen-dbus.patch @@ -0,0 +1,25 @@ +From eec8a79c6cc9e2c65fd43db48ca2347de3ae0c5e Mon Sep 17 00:00:00 2001 +From: Thomas Tuegel +Date: Mon, 1 Dec 2014 17:38:04 -0600 +Subject: [PATCH] dlopen-dbus + +--- + qtbase/src/dbus/qdbus_symbols.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/qtbase/src/dbus/qdbus_symbols.cpp b/qtbase/src/dbus/qdbus_symbols.cpp +index a7a1b67..661baf1 100644 +--- a/qtbase/src/dbus/qdbus_symbols.cpp ++++ b/qtbase/src/dbus/qdbus_symbols.cpp +@@ -93,7 +93,7 @@ bool qdbus_loadLibDBus() + + static int majorversions[] = { 3, 2, -1 }; + lib->unload(); +- lib->setFileName(QLatin1String("dbus-1")); ++ lib->setFileName(QLatin1String("@dbus_libs@/lib/libdbus-1")); + for (uint i = 0; i < sizeof(majorversions) / sizeof(majorversions[0]); ++i) { + lib->setFileNameAndVersion(lib->fileName(), majorversions[i]); + if (lib->load() && lib->resolve("dbus_connection_open_private")) +-- +2.1.3 + diff --git a/pkgs/development/libraries/qt-5/default.nix b/pkgs/development/libraries/qt-5/default.nix index fe290fd69fc..98fd20c44c0 100644 --- a/pkgs/development/libraries/qt-5/default.nix +++ b/pkgs/development/libraries/qt-5/default.nix @@ -3,9 +3,9 @@ , mesaSupported, mesa, mesa_glu, openssl, dbus, cups, pkgconfig , libtiff, glib, icu, mysql, postgresql, sqlite, perl, coreutils, libXi , gdk_pixbuf, python, gdb, xlibs, libX11, libxcb, xcbutil, xcbutilimage -, xcbutilkeysyms, xcbutilwm,udev, libxml2, libxslt, pcre, libxkbcommon +, xcbutilkeysyms, xcbutilwm, udev, libxml2, libxslt, pcre, libxkbcommon , alsaLib, gstreamer, gst_plugins_base -, pulseaudio, bison, flex, gperf, ruby, libwebp +, pulseaudio, bison, flex, gperf, ruby, libwebp, libXcursor , flashplayerFix ? false , gtkStyle ? false, libgnomeui, gtk, GConf, gnome_vfs , buildDocs ? false @@ -17,8 +17,8 @@ with stdenv.lib; let - v_maj = "5.2"; - v_min = "1"; + v_maj = "5.3"; + v_min = "2"; ver = "${v_maj}.${v_min}"; in @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://download.qt-project.org/official_releases/qt/" + "${v_maj}/${ver}/single/qt-everywhere-opensource-src-${ver}.tar.gz"; - sha256 = "18bxrnyis7xbhpxpf7w42i54hs4qr062b1wx4c0dpmja3lc29sc4"; + sha256 = "0b98n2jl62dyqxwn1gdj9xmk8wrrdxnazr65fdk5qw1hmlpgvly8"; }; # The version property must be kept because it will be included into the QtSDK package name @@ -45,23 +45,40 @@ stdenv.mkDerivation rec { ''; patches = - [ ./glib-2.32.patch + optional gtkStyle (substituteAll { - src = ./qt-5.2-dlopen-absolute-paths.patch; - inherit cups icu libXfixes; - glibc = stdenv.gcc.libc; - openglDriver = if mesaSupported then mesa.driverLink else "/no-such-path"; - }) - ] ++ optional gtkStyle (substituteAll { - src = ./dlopen-gtkstyle.patch; + src = ./0001-dlopen-gtkstyle.patch; # substituteAll ignores env vars starting with capital letter gconf = GConf; inherit gnome_vfs libgnomeui gtk; }) - ++ optional flashplayerFix (substituteAll { - src = ./dlopen-webkit-nsplugin.patch; + ++ optional flashplayerFix + (substituteAll { + src = ./0002-dlopen-webkit-nsplugin.patch; inherit gtk gdk_pixbuf; - }); + }) + ++ optional flashplayerFix + (substituteAll { + src = ./0007-dlopen-webkit-gtk.patch; + inherit gtk; + }) + ++ [ + ./0003-glib-2.32.patch + (substituteAll { + src = ./0004-dlopen-resolv.patch; + glibc = stdenv.cc.libc; + }) + (substituteAll { + src = ./0005-dlopen-gl.patch; + openglDriver = if mesaSupported then mesa.driverLink else "/no-such-path"; + }) + ./0006-tzdir.patch + (substituteAll { src = ./0008-dlopen-webkit-udev.patch; inherit udev; }) + (substituteAll { src = ./0009-dlopen-serialport-udev.patch; inherit udev; }) + (substituteAll { src = ./0010-dlopen-libXcursor.patch; inherit libXcursor; }) + (substituteAll { src = ./0011-dlopen-openssl.patch; inherit openssl; }) + (substituteAll { src = ./0012-dlopen-dbus.patch; dbus_libs = dbus; }) + ]; preConfigure = '' export LD_LIBRARY_PATH="$PWD/qtbase/lib:$PWD/qtbase/plugins/platforms:$PWD/qttools/lib:$LD_LIBRARY_PATH" @@ -92,7 +109,6 @@ stdenv.mkDerivation rec { -gui -widgets -opengl desktop - -javascript-jit -qml-debug -nis -iconv @@ -144,6 +160,9 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ python perl pkgconfig ]; + # freetype-2.5.4 changed signedness of some struct fields + NIX_CFLAGS_COMPILE = "-Wno-error=sign-compare"; + postInstall = '' ${optionalString buildDocs '' @@ -160,7 +179,7 @@ stdenv.mkDerivation rec { homepage = http://qt-project.org; description = "A cross-platform application framework for C++"; license = "GPL/LGPL"; - maintainers = [ maintainers.bbenoist ]; + maintainers = with maintainers; [ bbenoist qknight ttuegel ]; platforms = platforms.linux; }; } diff --git a/pkgs/development/libraries/qt-5/dlopen-webkit-nsplugin.patch b/pkgs/development/libraries/qt-5/dlopen-webkit-nsplugin.patch deleted file mode 100644 index 7cd90551454..00000000000 --- a/pkgs/development/libraries/qt-5/dlopen-webkit-nsplugin.patch +++ /dev/null @@ -1,36 +0,0 @@ -diff -ruN qt-everywhere-opensource-src-5.1.1-orig/qtwebkit/Source/WebCore/plugins/qt/PluginPackageQt.cpp qt-everywhere-opensource-src-5.1.1/qtwebkit/Source/WebCore/plugins/qt/PluginPackageQt.cpp ---- qt-everywhere-opensource-src-5.1.1-orig/qtwebkit/Source/WebCore/plugins/qt/PluginPackageQt.cpp 2013-08-25 20:04:47.000000000 +0200 -+++ qt-everywhere-opensource-src-5.1.1/qtwebkit/Source/WebCore/plugins/qt/PluginPackageQt.cpp 2013-09-25 17:59:45.925363807 +0200 -@@ -132,7 +132,7 @@ - } - } - -- QLibrary library(QLatin1String("libgtk-x11-2.0"), 0); -+ QLibrary library(QLatin1String("@gtk@/lib/libgtk-x11-2.0"), 0); - if (library.load()) { - typedef void *(*gtk_init_check_ptr)(int*, char***); - gtk_init_check_ptr gtkInitCheck = (gtk_init_check_ptr)library.resolve("gtk_init_check"); -diff -ruN qt-everywhere-opensource-src-5.1.1-orig/qtwebkit/Source/WebCore/plugins/qt/PluginViewQt.cpp qt-everywhere-opensource-src-5.1.1/qtwebkit/Source/WebCore/plugins/qt/PluginViewQt.cpp ---- qt-everywhere-opensource-src-5.1.1-orig/qtwebkit/Source/WebCore/plugins/qt/PluginViewQt.cpp 2013-08-25 20:04:47.000000000 +0200 -+++ qt-everywhere-opensource-src-5.1.1/qtwebkit/Source/WebCore/plugins/qt/PluginViewQt.cpp 2013-09-25 18:00:29.551215155 +0200 -@@ -702,7 +702,7 @@ - // support gdk based plugins (like flash) that use a different X connection. - // The code below has the same effect as this one: - // Display *gdkDisplay = gdk_x11_display_get_xdisplay(gdk_display_get_default()); -- QLibrary library(QLatin1String("libgdk-x11-2.0"), 0); -+ QLibrary library(QLatin1String("@gdk_pixbuf@/lib/libgdk-x11-2.0"), 0); - if (!library.load()) - return 0; - -diff -ruN qt-everywhere-opensource-src-5.1.1-orig/qtwebkit/Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp qt-everywhere-opensource-src-5.1.1/qtwebkit/Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp ---- qt-everywhere-opensource-src-5.1.1-orig/qtwebkit/Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp 2013-08-25 20:04:42.000000000 +0200 -+++ qt-everywhere-opensource-src-5.1.1/qtwebkit/Source/WebKit2/WebProcess/Plugins/Netscape/x11/NetscapePluginX11.cpp 2013-09-25 18:04:54.955408293 +0200 -@@ -64,7 +64,7 @@ - // The code below has the same effect as this one: - // Display *gdkDisplay = gdk_x11_display_get_xdisplay(gdk_display_get_default()); - -- QLibrary library(QLatin1String("libgdk-x11-2.0"), 0); -+ QLibrary library(QLatin1String("@gdk_pixbuf@/libgdk-x11-2.0"), 0); - if (!library.load()) - return 0; - diff --git a/pkgs/development/libraries/qt-5/glib-2.32.patch b/pkgs/development/libraries/qt-5/glib-2.32.patch deleted file mode 100644 index eb71e79d147..00000000000 --- a/pkgs/development/libraries/qt-5/glib-2.32.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -ruN qt-everywhere-opensource-src-5.1.1-orig/qtscript/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Threading.h qt-everywhere-opensource-src-5.1.1/qtscript/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Threading.h ---- qt-everywhere-opensource-src-5.1.1-orig/qtscript/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Threading.h 2013-08-25 20:04:35.000000000 +0200 -+++ qt-everywhere-opensource-src-5.1.1/qtscript/src/3rdparty/javascriptcore/JavaScriptCore/wtf/Threading.h 2013-09-25 18:09:22.154639482 +0200 -@@ -81,7 +81,7 @@ - #include - #elif PLATFORM(GTK) - #include --typedef struct _GMutex GMutex; -+typedef union _GMutex GMutex; - typedef struct _GCond GCond; - #endif - diff --git a/pkgs/development/libraries/qt-5/qt-5.2-dlopen-absolute-paths.patch b/pkgs/development/libraries/qt-5/qt-5.2-dlopen-absolute-paths.patch deleted file mode 100644 index 3163e235d02..00000000000 --- a/pkgs/development/libraries/qt-5/qt-5.2-dlopen-absolute-paths.patch +++ /dev/null @@ -1,36 +0,0 @@ -diff -ruN qt-everywhere-opensource-src-5.1.1-orig/qtbase/src/network/kernel/qhostinfo_unix.cpp qt-everywhere-opensource-src-5.1.1/qtbase/src/network/kernel/qhostinfo_unix.cpp ---- qt-everywhere-opensource-src-5.1.1-orig/qtbase/src/network/kernel/qhostinfo_unix.cpp 2013-08-25 20:03:35.000000000 +0200 -+++ qt-everywhere-opensource-src-5.1.1/qtbase/src/network/kernel/qhostinfo_unix.cpp 2013-09-25 17:43:14.047015411 +0200 -@@ -103,7 +103,7 @@ - if (!lib.load()) - #endif - { -- lib.setFileName(QLatin1String("resolv")); -+ lib.setFileName(QLatin1String("@glibc@/lib/libresolv")); - if (!lib.load()) - return; - } -diff -ruN qt-everywhere-opensource-src-5.1.1-orig/qtbase/src/plugins/platforms/xcb/qglxintegration.cpp qt-everywhere-opensource-src-5.1.1/qtbase/src/plugins/platforms/xcb/qglxintegration.cpp ---- qt-everywhere-opensource-src-5.1.1-orig/qtbase/src/plugins/platforms/xcb/qglxintegration.cpp 2013-08-25 20:03:35.000000000 +0200 -+++ qt-everywhere-opensource-src-5.1.1/qtbase/src/plugins/platforms/xcb/qglxintegration.cpp 2013-09-25 17:51:29.834674976 +0200 -@@ -379,7 +379,7 @@ - { - extern const QString qt_gl_library_name(); - // QLibrary lib(qt_gl_library_name()); -- QLibrary lib(QLatin1String("GL")); -+ QLibrary lib(QLatin1String("@openglDriver@/lib/libGL")); - glXGetProcAddressARB = (qt_glXGetProcAddressARB) lib.resolve("glXGetProcAddressARB"); - } - } -diff -ruN qt-everywhere-opensource-src-5.1.1-orig/qtbase/src/printsupport/kernel/qcups.cpp qt-everywhere-opensource-src-5.1.1/qtbase/src/printsupport/kernel/qcups.cpp ---- qt-everywhere-opensource-src-5.1.1-orig/qtbase/src/printsupport/kernel/qcups.cpp 2013-08-25 20:03:36.000000000 +0200 -+++ qt-everywhere-opensource-src-5.1.1/qtbase/src/printsupport/kernel/qcups.cpp 2013-09-25 17:40:35.895942599 +0200 -@@ -91,7 +91,7 @@ - - static void resolveCups() - { -- QLibrary cupsLib(QLatin1String("cups"), 2); -+ QLibrary cupsLib(QLatin1String("@cups@/lib/libcups"), 2); - if(cupsLib.load()) { - _cupsGetDests = (CupsGetDests) cupsLib.resolve("cupsGetDests"); - _cupsFreeDests = (CupsFreeDests) cupsLib.resolve("cupsFreeDests"); diff --git a/pkgs/development/libraries/qt-5/qt-5.3-dlopen-absolute-paths.patch b/pkgs/development/libraries/qt-5/qt-5.3-dlopen-absolute-paths.patch deleted file mode 100644 index 66cf342c107..00000000000 --- a/pkgs/development/libraries/qt-5/qt-5.3-dlopen-absolute-paths.patch +++ /dev/null @@ -1,24 +0,0 @@ -diff -ruN qt-everywhere-opensource-src-5.1.1-orig/qtbase/src/network/kernel/qhostinfo_unix.cpp qt-everywhere-opensource-src-5.1.1/qtbase/src/network/kernel/qhostinfo_unix.cpp ---- qt-everywhere-opensource-src-5.1.1-orig/qtbase/src/network/kernel/qhostinfo_unix.cpp 2013-08-25 20:03:35.000000000 +0200 -+++ qt-everywhere-opensource-src-5.1.1/qtbase/src/network/kernel/qhostinfo_unix.cpp 2013-09-25 17:43:14.047015411 +0200 -@@ -103,7 +103,7 @@ - if (!lib.load()) - #endif - { -- lib.setFileName(QLatin1String("resolv")); -+ lib.setFileName(QLatin1String("@glibc@/lib/libresolv")); - if (!lib.load()) - return; - } -diff -ruN qt-everywhere-opensource-src-5.1.1-orig/qtbase/src/plugins/platforms/xcb/qglxintegration.cpp qt-everywhere-opensource-src-5.1.1/qtbase/src/plugins/platforms/xcb/qglxintegration.cpp ---- qt-everywhere-opensource-src-5.1.1-orig/qtbase/src/plugins/platforms/xcb/qglxintegration.cpp 2013-08-25 20:03:35.000000000 +0200 -+++ qt-everywhere-opensource-src-5.1.1/qtbase/src/plugins/platforms/xcb/qglxintegration.cpp 2013-09-25 17:51:29.834674976 +0200 -@@ -379,7 +379,7 @@ - { - extern const QString qt_gl_library_name(); - // QLibrary lib(qt_gl_library_name()); -- QLibrary lib(QLatin1String("GL")); -+ QLibrary lib(QLatin1String("@openglDriver@/lib/libGL")); - glXGetProcAddressARB = (qt_glXGetProcAddressARB) lib.resolve("glXGetProcAddressARB"); - } - } diff --git a/pkgs/development/libraries/qt-5/qt-5.3.nix b/pkgs/development/libraries/qt-5/qt-5.3.nix deleted file mode 100644 index 18b464c6f24..00000000000 --- a/pkgs/development/libraries/qt-5/qt-5.3.nix +++ /dev/null @@ -1,165 +0,0 @@ -{ stdenv, fetchurl, substituteAll, libXrender, libXext -, libXfixes, freetype, fontconfig, zlib, libjpeg, libpng -, mesaSupported, mesa, mesa_glu, openssl, dbus, cups, pkgconfig -, libtiff, glib, icu, mysql, postgresql, sqlite, perl, coreutils, libXi -, gdk_pixbuf, python, gdb, xlibs, libX11, libxcb, xcbutil, xcbutilimage -, xcbutilkeysyms, xcbutilwm,udev, libxml2, libxslt, pcre, libxkbcommon -, alsaLib, gstreamer, gst_plugins_base -, pulseaudio, bison, flex, gperf, ruby, libwebp -, flashplayerFix ? false -, gtkStyle ? false, libgnomeui, gtk, GConf, gnome_vfs -, buildDocs ? false -, buildExamples ? false -, buildTests ? false -, developerBuild ? false -}: - -with stdenv.lib; - -let - v_maj = "5.3"; - v_min = "1"; - ver = "${v_maj}.${v_min}"; -in - -stdenv.mkDerivation rec { - name = "qt-${ver}"; - - src = fetchurl { - url = "http://download.qt-project.org/official_releases/qt/" - + "${v_maj}/${ver}/single/qt-everywhere-opensource-src-${ver}.tar.gz"; - sha256 = "189mgfqxjg0jp0vkfrj55p9brl018wzf7lir8yjr0pajp8jqd2ds"; - }; - - # The version property must be kept because it will be included into the QtSDK package name - version = ver; - - prePatch = '' - substituteInPlace configure --replace /bin/pwd pwd - substituteInPlace qtbase/configure --replace /bin/pwd pwd - substituteInPlace qtbase/src/corelib/global/global.pri --replace /bin/ls ${coreutils}/bin/ls - substituteInPlace qtbase/src/plugins/platforminputcontexts/compose/generator/qtablegenerator.cpp \ - --replace /usr/share/X11/locale ${libX11}/share/X11/locale \ - --replace /usr/lib/X11/locale ${libX11}/share/X11/locale - sed -e 's@/\(usr\|opt\)/@/var/empty/@g' -i config.tests/*/*.test -i qtbase/mkspecs/*/*.conf - ''; - - patches = - [ ./glib-2.32.patch - (substituteAll { - src = ./qt-5.3-dlopen-absolute-paths.patch; - inherit cups icu libXfixes; - glibc = stdenv.gcc.libc; - openglDriver = if mesaSupported then mesa.driverLink else "/no-such-path"; - }) - ] ++ optional gtkStyle (substituteAll { - src = ./dlopen-gtkstyle.patch; - # substituteAll ignores env vars starting with capital letter - gconf = GConf; - inherit gnome_vfs libgnomeui gtk; - }) - ++ optional flashplayerFix (substituteAll { - src = ./dlopen-webkit-nsplugin.patch; - inherit gtk gdk_pixbuf; - }); - - preConfigure = '' - export LD_LIBRARY_PATH="$PWD/qtbase/lib:$PWD/qtbase/plugins/platforms:$PWD/qttools/lib:$LD_LIBRARY_PATH" - export MAKEFLAGS=-j$NIX_BUILD_CORES - ''; - - prefixKey = "-prefix "; - - # -no-eglfs, -no-directfb, -no-linuxfb and -no-kms because of the current minimalist mesa - # TODO Remove obsolete and useless flags once the build will be totally mastered - configureFlags = '' - -verbose - -confirm-license - -opensource - - -release - -shared - -c++11 - ${optionalString developerBuild "-developer-build"} - -largefile - -accessibility - -rpath - -optimized-qmake - -strip - -reduce-relocations - -system-proxies - - -gui - -widgets - -opengl desktop - -qml-debug - -nis - -iconv - -icu - -pch - -glib - -xcb - -qpa xcb - -${optionalString (cups == null) "no-"}cups - - -no-eglfs - -no-directfb - -no-linuxfb - -no-kms - - -system-zlib - -system-libpng - -system-libjpeg - -system-xcb - -system-xkbcommon - -openssl-linked - -dbus-linked - - -system-sqlite - -${if mysql != null then "plugin" else "no"}-sql-mysql - -${if postgresql != null then "plugin" else "no"}-sql-psql - - -make libs - -make tools - -${optionalString (buildExamples == false) "no"}make examples - -${optionalString (buildTests == false) "no"}make tests - ''; - - propagatedBuildInputs = [ - xlibs.libXcomposite libX11 libxcb libXext libXrender libXi - fontconfig freetype openssl dbus.libs glib udev libxml2 libxslt pcre - zlib libjpeg libpng libtiff sqlite icu - libwebp alsaLib gstreamer gst_plugins_base pulseaudio - xcbutil xcbutilimage xcbutilkeysyms xcbutilwm libxkbcommon - ] - # 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 - ++ optionals mesaSupported [ mesa mesa_glu ] - ++ optional (cups != null) cups - ++ optional (mysql != null) mysql - ++ optional (postgresql != null) postgresql; - - buildInputs = [ gdb bison flex gperf ruby ]; - - nativeBuildInputs = [ python perl pkgconfig ]; - - postInstall = - '' - ${optionalString buildDocs '' - make docs && make install_docs - ''} - - # Don't retain build-time dependencies like gdb and ruby. - sed '/QMAKE_DEFAULT_.*DIRS/ d' -i $out/mkspecs/qconfig.pri - ''; - - enableParallelBuilding = true; # often fails on Hydra, as well as qt4 - - meta = { - homepage = http://qt-project.org; - description = "A cross-platform application framework for C++"; - license = "GPL/LGPL"; - maintainers = [ maintainers.bbenoist maintainers.qknight ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/development/libraries/scmccid/default.nix b/pkgs/development/libraries/scmccid/default.nix index 1b0039952d7..7dcde2a09a8 100644 --- a/pkgs/development/libraries/scmccid/default.nix +++ b/pkgs/development/libraries/scmccid/default.nix @@ -1,6 +1,6 @@ {stdenv, fetchurl, patchelf, libusb}: -assert stdenv ? gcc && stdenv.gcc.libc != null; +assert stdenv ? cc && stdenv.cc.libc != null; stdenv.mkDerivation rec { name = "scmccid-5.0.11"; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { buildInputs = [ patchelf ]; installPhase = '' - RPATH=${libusb}/lib:${stdenv.gcc.libc}/lib + RPATH=${libusb}/lib:${stdenv.cc.libc}/lib for a in proprietary/*/Contents/Linux/*.so*; do if ! test -L $a; then diff --git a/pkgs/development/libraries/serf/default.nix b/pkgs/development/libraries/serf/default.nix index 49d7cec9590..b2e6cbfc7e5 100644 --- a/pkgs/development/libraries/serf/default.nix +++ b/pkgs/development/libraries/serf/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { buildPhase = '' scons PREFIX="$out" OPENSSL="${openssl}" ZLIB="${zlib}" APR="$(echo "${apr}"/bin/*-config)" \ APU="$(echo "${aprutil}"/bin/*-config)" GSSAPI="${krb5}" CC="${ - if stdenv.isDarwin then "clang" else "${stdenv.gcc}/bin/gcc" + if stdenv.isDarwin then "clang" else "${stdenv.cc}/bin/gcc" }" ''; diff --git a/pkgs/development/libraries/sodium/default.nix b/pkgs/development/libraries/sodium/default.nix index 7e51d411bc4..207e3d023f9 100644 --- a/pkgs/development/libraries/sodium/default.nix +++ b/pkgs/development/libraries/sodium/default.nix @@ -3,11 +3,11 @@ let s = # Generated upstream information rec { baseName="sodium"; - version="1.0.0"; + version="1.0.1"; name="${baseName}-${version}"; - hash="19f9vf0shfp4rc4l791r6xjg06z4i8psj1zkjkm3z5b640yzxlff"; - url="http://download.dnscrypt.org/libsodium/releases/libsodium-1.0.0.tar.gz"; - sha256="19f9vf0shfp4rc4l791r6xjg06z4i8psj1zkjkm3z5b640yzxlff"; + hash="1x9src824c3ansgvnphhnnnnyrd0spspf7hwmxijv7pglj3hh2f3"; + url="http://download.dnscrypt.org/libsodium/releases/libsodium-1.0.1.tar.gz"; + sha256="1x9src824c3ansgvnphhnnnnyrd0spspf7hwmxijv7pglj3hh2f3"; }; buildInputs = [ ]; diff --git a/pkgs/development/libraries/soundtouch/default.nix b/pkgs/development/libraries/soundtouch/default.nix new file mode 100644 index 00000000000..dcb09af84f9 --- /dev/null +++ b/pkgs/development/libraries/soundtouch/default.nix @@ -0,0 +1,22 @@ +{stdenv, fetchurl, autoconf, automake, libtool}: + +stdenv.mkDerivation rec { + pName = "soundtouch"; + name = "${pName}-1.8.0"; + src = fetchurl { + url = "http://www.surina.net/soundtouch/${name}.tar.gz"; + sha256 = "3d4161d74ca25c5a98c69dbb8ea10fd2be409ba1a3a0bf81db407c4c261f166b"; + }; + + buildInputs = [ autoconf automake libtool ]; + + preConfigurePhases = "./bootstrap"; + + meta = { + description = "A program and library for changing the tempo, pitch and playback rate of audio"; + homepage = http://www.surina.net/soundtouch/; + downloadPage = http://www.surina.net/soundtouch/sourcecode.html; + license = stdenv.lib.licenses.lgpl21; + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/development/libraries/startup-notification/default.nix b/pkgs/development/libraries/startup-notification/default.nix index 2683a01a290..b4b29b54881 100644 --- a/pkgs/development/libraries/startup-notification/default.nix +++ b/pkgs/development/libraries/startup-notification/default.nix @@ -15,6 +15,6 @@ stdenv.mkDerivation { meta = { homepage = http://www.freedesktop.org/software/startup-notification; description = "Application startup notification and feedback library"; - license = "BSD"; + license = stdenv.lib.licenses.lgpl2; }; } diff --git a/pkgs/development/libraries/stlport/default.nix b/pkgs/development/libraries/stlport/default.nix index 5588646e53a..30f87d36ddf 100644 --- a/pkgs/development/libraries/stlport/default.nix +++ b/pkgs/development/libraries/stlport/default.nix @@ -21,5 +21,6 @@ stdenv.mkDerivation rec { description = "An implementation of the C++ Standard Library"; homepage = http://sourceforge.net/projects/stlport/; license = stdenv.lib.licenses.free; # seems BSD-like + broken = true; # probably glibc-2.20 -related issue }; } diff --git a/pkgs/development/libraries/strigi/default.nix b/pkgs/development/libraries/strigi/default.nix index 6b8b611d3f7..ee89eda327d 100644 --- a/pkgs/development/libraries/strigi/default.nix +++ b/pkgs/development/libraries/strigi/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { CLUCENE_HOME = clucene_core; buildInputs = - [ zlib bzip2 stdenv.gcc.libc libxml2 qt4 exiv2 clucene_core fam dbus_tools ]; + [ zlib bzip2 stdenv.cc.libc libxml2 qt4 exiv2 clucene_core fam dbus_tools ]; nativeBuildInputs = [ cmake pkgconfig perl ]; diff --git a/pkgs/development/libraries/tdb/default.nix b/pkgs/development/libraries/tdb/default.nix index ce43202ee43..18bb73e707b 100644 --- a/pkgs/development/libraries/tdb/default.nix +++ b/pkgs/development/libraries/tdb/default.nix @@ -5,11 +5,11 @@ }: stdenv.mkDerivation rec { - name = "tdb-1.3.1"; + name = "tdb-1.3.3"; src = fetchurl { url = "http://samba.org/ftp/tdb/${name}.tar.gz"; - sha256 = "1qzcl8n57vpxwd8048djna3zwjy6ji56c2bnvmnr1hw0x1d9hagz"; + sha256 = "03jg7gvyi5ljj93zwvqw1d1p7a9gqy0v4rxwn7ypw4ipxyiavpjl"; }; buildInputs = [ diff --git a/pkgs/development/libraries/telepathy/glib/default.nix b/pkgs/development/libraries/telepathy/glib/default.nix index 6c0806ec4cd..9167ecc76d4 100644 --- a/pkgs/development/libraries/telepathy/glib/default.nix +++ b/pkgs/development/libraries/telepathy/glib/default.nix @@ -15,6 +15,10 @@ stdenv.mkDerivation rec { buildInputs = [pkgconfig libxslt] ++ stdenv.lib.optional valaSupport vala; + preConfigure = '' + substituteInPlace telepathy-glib/telepathy-glib.pc.in --replace Requires.private Requires + ''; + meta = { homepage = http://telepathy.freedesktop.org; }; diff --git a/pkgs/development/libraries/thrift/default.nix b/pkgs/development/libraries/thrift/default.nix index 53c3ddc3539..a09a8a530a5 100644 --- a/pkgs/development/libraries/thrift/default.nix +++ b/pkgs/development/libraries/thrift/default.nix @@ -1,35 +1,32 @@ -{ stdenv, fetchgit, boost, zlib, libevent, openssl, python, automake, autoconf -, libtool, pkgconfig, bison, flex +{ stdenv, fetchurl, boost, zlib, libevent, openssl, python, pkgconfig, bison +, flex }: -stdenv.mkDerivation { - name = "thrift-0.9.1"; +stdenv.mkDerivation rec { + name = "thrift-${version}"; + version = "0.9.2"; - # I take git, because the tarball is broken. - # http://stackoverflow.com/questions/18643642/libtool-error-building-thrift-0-9-1-on-ubuntu-13-04 - src = fetchgit { - url = "https://git-wip-us.apache.org/repos/asf/thrift.git"; - rev = "ff980c1432936c6bc897c60469ab05b5e0c6cb5e"; - md5 = "466aca9e43e43df868f4385af50e32f6"; + src = fetchurl { + url = "http://archive.apache.org/dist/thrift/${version}/${name}.tar.gz"; + sha256 = "0w4m6hjmgr1wqac9p5zyfxx2wwqay730qi14fzxba7f46hwhvxff"; }; #enableParallelBuilding = true; problems on hydra - # Fixes build error: /lib/libfl.so: undefined reference to `yylex'. - # Patch exists in upstream git repo, so it can be removed on the next version - # bump. - patches = [ ./yylex.patch ]; - # Workaround to make the python wrapper not drop this package: # pythonFull.buildEnv.override { extraLibs = [ thrift ]; } pythonPath = []; buildInputs = [ - boost zlib libevent openssl python automake autoconf libtool pkgconfig - bison flex + boost zlib libevent openssl python pkgconfig bison flex ]; - preConfigure = "sh bootstrap.sh; export PY_PREFIX=$out"; + preConfigure = "export PY_PREFIX=$out"; + + # TODO: package boost-test, so we can run the test suite. (Currently it fails + # to find libboost_unit_test_framework.a.) + configureFlags = "--enable-tests=no"; + doCheck = false; meta = with stdenv.lib; { description = "Library for scalable cross-language services"; diff --git a/pkgs/development/libraries/thrift/yylex.patch b/pkgs/development/libraries/thrift/yylex.patch deleted file mode 100644 index 3700bc6a436..00000000000 --- a/pkgs/development/libraries/thrift/yylex.patch +++ /dev/null @@ -1,23 +0,0 @@ -Fixes build error: - - /lib/libfl.so: undefined reference to `yylex' - -The same patch exists in upstream thrift git repo, commit -ec8daae71004b3c2346bf12b2d74e52ed0815337 -"THRIFT-2386: Thrift refuses to link yylex". -diff --git a/compiler/cpp/src/main.h b/compiler/cpp/src/main.h -index 87af5f6..27285f5 100644 ---- a/compiler/cpp/src/main.h -+++ b/compiler/cpp/src/main.h -@@ -28,8 +28,9 @@ - /** - * Defined in the flex library - */ -- --int yylex(void); -+extern "C" { -+ int yylex(void); -+} - - int yyparse(void); - diff --git a/pkgs/development/libraries/tremor/default.nix b/pkgs/development/libraries/tremor/default.nix index d55ea6166e8..c8eb6e3bdab 100644 --- a/pkgs/development/libraries/tremor/default.nix +++ b/pkgs/development/libraries/tremor/default.nix @@ -20,6 +20,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://xiph.org/tremor/; description = "Fixed-point version of the Ogg Vorbis decoder"; - license = "BSD"; + license = stdenv.lib.licenses.bsd3; }; } diff --git a/pkgs/development/libraries/tsocks/default.nix b/pkgs/development/libraries/tsocks/default.nix index e33234304d2..778762f1bf8 100644 --- a/pkgs/development/libraries/tsocks/default.nix +++ b/pkgs/development/libraries/tsocks/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { description = "Transparent SOCKS v4 proxying library"; homepage = http://tsocks.sourceforge.net/; license = stdenv.lib.licenses.gpl2; - maintainers = [ maintainers.phreedom ]; + maintainers = with maintainers; [ edwtjo phreedom ]; platforms = platforms.linux; }; } \ No newline at end of file diff --git a/pkgs/development/libraries/v8/default.nix b/pkgs/development/libraries/v8/default.nix index 3abac0feab3..86dbcd1ec56 100644 --- a/pkgs/development/libraries/v8/default.nix +++ b/pkgs/development/libraries/v8/default.nix @@ -57,8 +57,8 @@ stdenv.mkDerivation rec { ''; postFixup = if stdenv.isDarwin then '' - install_name_tool -change /usr/local/lib/libv8.dylib $out/lib/libv8.dylib -change /usr/lib/libgcc_s.1.dylib ${stdenv.gcc.gcc}/lib/libgcc_s.1.dylib $out/bin/d8 - install_name_tool -id $out/lib/libv8.dylib -change /usr/lib/libgcc_s.1.dylib ${stdenv.gcc.gcc}/lib/libgcc_s.1.dylib $out/lib/libv8.dylib + install_name_tool -change /usr/local/lib/libv8.dylib $out/lib/libv8.dylib -change /usr/lib/libgcc_s.1.dylib ${stdenv.cc.gcc}/lib/libgcc_s.1.dylib $out/bin/d8 + install_name_tool -id $out/lib/libv8.dylib -change /usr/lib/libgcc_s.1.dylib ${stdenv.cc.gcc}/lib/libgcc_s.1.dylib $out/lib/libv8.dylib '' else null; meta = with stdenv.lib; { diff --git a/pkgs/development/libraries/vtk/default.nix b/pkgs/development/libraries/vtk/default.nix index 9d16edb0f2e..62fce3c1d2d 100644 --- a/pkgs/development/libraries/vtk/default.nix +++ b/pkgs/development/libraries/vtk/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { meta = { description = "Open source libraries for 3D computer graphics, image processing and visualization"; homepage = http://www.vtk.org/; - license = "BSD"; + license = stdenv.lib.licenses.bsd3; maintainers = with stdenv.lib.maintainers; [ viric bbenoist ]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/development/libraries/wtk/builder.sh b/pkgs/development/libraries/wtk/builder.sh index 6db9469e46d..ef0085da924 100644 --- a/pkgs/development/libraries/wtk/builder.sh +++ b/pkgs/development/libraries/wtk/builder.sh @@ -22,6 +22,6 @@ for i in $libraries; do rpath=$rpath${rpath:+:}$i/lib done find $out -type f -perm +100 \ - -exec patchelf --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" {} \; + -exec patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" {} \; find $out -type f -perm +100 \ -exec patchelf --set-rpath "$rpath" {} \; diff --git a/pkgs/development/libraries/wtk/default.nix b/pkgs/development/libraries/wtk/default.nix index 1ff34d45ba3..8544513e580 100644 --- a/pkgs/development/libraries/wtk/default.nix +++ b/pkgs/development/libraries/wtk/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { buildInputs = [ unzip ]; - libraries = [ xlibs.libXpm xlibs.libXt xlibs.libX11 xlibs.libICE xlibs.libSM stdenv.gcc.gcc ]; + libraries = [ xlibs.libXpm xlibs.libXt xlibs.libX11 xlibs.libICE xlibs.libSM stdenv.cc.gcc ]; meta = { homepage = http://java.sun.com/products/sjwtoolkit/download.html; diff --git a/pkgs/development/misc/amdapp-sdk/default.nix b/pkgs/development/misc/amdapp-sdk/default.nix index 021c84fee0f..02cf9b03bd7 100644 --- a/pkgs/development/misc/amdapp-sdk/default.nix +++ b/pkgs/development/misc/amdapp-sdk/default.nix @@ -46,7 +46,7 @@ in stdenv.mkDerivation rec { patchFlags = "-p0"; buildInputs = [ makeWrapper perl mesa xorg.libX11 xorg.libXext xorg.libXaw xorg.libXi xorg.libXxf86vm ]; - propagatedBuildInputs = [ stdenv.gcc ]; + propagatedBuildInputs = [ stdenv.cc ]; NIX_LDFLAGS = "-lX11 -lXext -lXmu -lXi -lXxf86vm"; doCheck = false; @@ -81,13 +81,13 @@ in stdenv.mkDerivation rec { cp -r "./samples/opencl/bin/${arch}/"* "$out/samples/opencl/bin" for f in $(find "$out/samples/opencl/bin/" -type f -not -name "*.*"); do - wrapProgram "$f" --prefix PATH ":" "${stdenv.gcc}/bin" + wrapProgram "$f" --prefix PATH ":" "${stdenv.cc}/bin" done'' else "" } # Create wrappers - patchelf --set-interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" $out/bin/clinfo - patchelf --set-rpath ${stdenv.gcc.gcc}/lib64:${stdenv.gcc.gcc}/lib $out/bin/clinfo + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $out/bin/clinfo + patchelf --set-rpath ${stdenv.cc.gcc}/lib64:${stdenv.cc.gcc}/lib $out/bin/clinfo # Fix modes find "$out/" -type f -exec chmod 644 {} \; diff --git a/pkgs/development/misc/avr8-burn-omat/default.nix b/pkgs/development/misc/avr8-burn-omat/default.nix index a0466091a52..e074a4c4646 100644 --- a/pkgs/development/misc/avr8-burn-omat/default.nix +++ b/pkgs/development/misc/avr8-burn-omat/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, unzip }: stdenv.mkDerivation { - name = "avr8-burn-omat-2.0.1"; + name = "avr8-burn-omat-2.1.2"; src = fetchurl { - url = http://avr8-burn-o-mat.brischalle.de/AVR8_Burn-O-Mat_2_0_1.zip; - sha256 = "0nqlrbsx7z5r3b9y9wb6b7wawa3yxwx07zn7l4g4s59scxah2skk"; + url = http://avr8-burn-o-mat.aaabbb.de/AVR8_Burn-O-Mat_2_1_2.zip; + sha256 = "1sik243xqx7kbdddcq3va8h8q2wijf9ffhgp752hx725x3pjh9ss"; }; - buildInputs = [unzip]; + buildInputs = [ unzip ]; phases = "unpackPhase installPhase"; @@ -24,9 +24,10 @@ stdenv.mkDerivation { chmod +x $out/bin/avr8-burn-omat ''; - meta = { + meta = with stdenv.lib; { description = "GUI tool for avrdude"; - homepage = http://avr8-burn-o-mat.brischalle.de/avr8_burn_o_mat_avrdude_gui_en.html; + homepage = http://avr8-burn-o-mat.aaabbb.de/avr8_burn_o_mat_avrdude_gui_en.html; license = stdenv.lib.licenses.gpl3; + platforms = platforms.all; }; } diff --git a/pkgs/development/mobile/androidenv/androidndk.nix b/pkgs/development/mobile/androidenv/androidndk.nix index 91dbdc77361..9f5393949ca 100644 --- a/pkgs/development/mobile/androidenv/androidndk.nix +++ b/pkgs/development/mobile/androidenv/androidndk.nix @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { find $out \( \ \( -type f -a -name "*.so*" \) -o \ \( -type f -a -perm /0100 \) \ - \) -exec patchelf --set-interpreter ${stdenv.gcc.libc}/lib/ld-*so.? \ + \) -exec patchelf --set-interpreter ${stdenv.cc.libc}/lib/ld-*so.? \ --set-rpath ${zlib}/lib:${ncurses}/lib {} \; # fix ineffective PROGDIR / MYNDKDIR determination for i in ndk-build ndk-gdb ndk-gdb-py diff --git a/pkgs/development/mobile/androidenv/androidsdk.nix b/pkgs/development/mobile/androidenv/androidsdk.nix index 533c605cf24..1e0df06de27 100644 --- a/pkgs/development/mobile/androidenv/androidsdk.nix +++ b/pkgs/development/mobile/androidenv/androidsdk.nix @@ -9,19 +9,19 @@ stdenv.mkDerivation rec { name = "android-sdk-${version}"; - version = "23.0.2"; - + version = "24.0.1"; + src = if (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux") then fetchurl { url = "http://dl.google.com/android/android-sdk_r${version}-linux.tgz"; - md5 = "94a8c62086a7398cc0e73e1c8e65f71e"; + sha1 = "fb46b9afa04e09d3c33fa9bfee5c99e9ec6a9523"; } else if stdenv.system == "x86_64-darwin" then fetchurl { url = "http://dl.google.com/android/android-sdk_r${version}-macosx.zip"; - md5 = "322787b0e6c629d926c28690c79ac0d8"; + sha1 = "7097c09c72645d7ad33c81a37b1a1363a9df2a54"; } else throw "platform not ${stdenv.system} supported!"; - + buildCommand = '' mkdir -p $out/libexec cd $out/libexec @@ -34,8 +34,8 @@ stdenv.mkDerivation rec { for i in emulator emulator-arm emulator-mips emulator-x86 mksdcard do - patchelf --set-interpreter ${stdenv_32bit.gcc.libc}/lib/ld-linux.so.2 $i - patchelf --set-rpath ${stdenv_32bit.gcc.gcc}/lib $i + patchelf --set-interpreter ${stdenv_32bit.cc.libc}/lib/ld-linux.so.2 $i + patchelf --set-rpath ${stdenv_32bit.cc.gcc}/lib $i done ${stdenv.lib.optionalString (stdenv.system == "x86_64-linux") '' @@ -43,8 +43,8 @@ stdenv.mkDerivation rec { for i in emulator64-arm emulator64-mips emulator64-x86 do - patchelf --set-interpreter ${stdenv.gcc.libc}/lib/ld-linux-x86-64.so.2 $i - patchelf --set-rpath ${stdenv.gcc.gcc}/lib64 $i + patchelf --set-interpreter ${stdenv.cc.libc}/lib/ld-linux-x86-64.so.2 $i + patchelf --set-rpath ${stdenv.cc.gcc}/lib64 $i done ''} @@ -80,11 +80,11 @@ stdenv.mkDerivation rec { # The monitor requires some more patching cd lib/monitor-x86 - patchelf --set-interpreter ${stdenv.gcc.libc}/lib/ld-linux.so.2 monitor + patchelf --set-interpreter ${stdenv.cc.libc}/lib/ld-linux.so.2 monitor patchelf --set-rpath ${libX11}/lib:${libXext}/lib:${libXrender}/lib:${freetype}/lib:${fontconfig}/lib libcairo-swt.so wrapProgram `pwd`/monitor \ - --prefix LD_LIBRARY_PATH : ${gtk}/lib:${atk}/lib:${stdenv.gcc.gcc}/lib + --prefix LD_LIBRARY_PATH : ${gtk}/lib:${atk}/lib:${stdenv.cc.gcc}/lib cd ../.. '' @@ -93,11 +93,11 @@ stdenv.mkDerivation rec { # The monitor requires some more patching cd lib/monitor-x86_64 - patchelf --set-interpreter ${stdenv.gcc.libc}/lib/ld-linux-x86-64.so.2 monitor + patchelf --set-interpreter ${stdenv.cc.libc}/lib/ld-linux-x86-64.so.2 monitor patchelf --set-rpath ${libX11}/lib:${libXext}/lib:${libXrender}/lib:${freetype}/lib:${fontconfig}/lib libcairo-swt.so wrapProgram `pwd`/monitor \ - --prefix LD_LIBRARY_PATH : ${gtk}/lib:${atk}/lib:${stdenv.gcc.gcc}/lib + --prefix LD_LIBRARY_PATH : ${gtk}/lib:${atk}/lib:${stdenv.cc.gcc}/lib cd ../.. '' diff --git a/pkgs/development/mobile/androidenv/build-tools.nix b/pkgs/development/mobile/androidenv/build-tools.nix index 11beb29f3ce..0f736b8c383 100644 --- a/pkgs/development/mobile/androidenv/build-tools.nix +++ b/pkgs/development/mobile/androidenv/build-tools.nix @@ -1,18 +1,18 @@ {stdenv, stdenv_32bit, fetchurl, unzip, zlib_32bit}: stdenv.mkDerivation { - name = "android-build-tools-r20"; + name = "android-build-tools-r21.1.2"; src = if (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux") then fetchurl { - url = https://dl-ssl.google.com/android/repository/build-tools_r20-linux.zip; - sha1 = "b688905526a5584d1327a662d871a635ff502758"; + url = https://dl-ssl.google.com/android/repository/build-tools_r21.1.2-linux.zip; + sha1 = "5e35259843bf2926113a38368b08458735479658"; } else if stdenv.system == "x86_64-darwin" then fetchurl { - url = https://dl-ssl.google.com/android/repository/build-tools_r20-macosx.zip; - sha1 = "1240f629411c108a714c4ddd756937c7fab93f83"; + url = https://dl-ssl.google.com/android/repository/build-tools_r21.1.2-macosx.zip; + sha1 = "e7c906b4ba0eea93b32ba36c610dbd6b204bff48"; } else throw "System ${stdenv.system} not supported!"; - + buildCommand = '' mkdir -p $out/build-tools cd $out/build-tools @@ -25,32 +25,32 @@ stdenv.mkDerivation { # Patch the interpreter for i in aapt aidl dexdump llvm-rs-cc do - patchelf --set-interpreter ${stdenv_32bit.gcc.libc}/lib/ld-linux.so.2 $i + patchelf --set-interpreter ${stdenv_32bit.cc.libc}/lib/ld-linux.so.2 $i done # These binaries need to find libstdc++ and libgcc_s for i in aidl libLLVM.so do - patchelf --set-rpath ${stdenv_32bit.gcc.gcc}/lib $i + patchelf --set-rpath ${stdenv_32bit.cc.gcc}/lib $i done # These binaries need to find libstdc++, libgcc_s and libraries in the current folder for i in libbcc.so libbcinfo.so libclang.so llvm-rs-cc do - patchelf --set-rpath ${stdenv_32bit.gcc.gcc}/lib:`pwd` $i + patchelf --set-rpath ${stdenv_32bit.cc.gcc}/lib:`pwd` $i done # These binaries also need zlib in addition to libstdc++ for i in zipalign do - patchelf --set-interpreter ${stdenv_32bit.gcc.libc}/lib/ld-linux.so.2 $i - patchelf --set-rpath ${stdenv_32bit.gcc.gcc}/lib:${zlib_32bit}/lib $i + patchelf --set-interpreter ${stdenv_32bit.cc.libc}/lib/ld-linux.so.2 $i + patchelf --set-rpath ${stdenv_32bit.cc.gcc}/lib:${zlib_32bit}/lib $i done # These binaries need to find libstdc++, libgcc_s, and zlib for i in aapt dexdump do - patchelf --set-rpath ${stdenv_32bit.gcc.gcc}/lib:${zlib_32bit}/lib $i + patchelf --set-rpath ${stdenv_32bit.cc.gcc}/lib:${zlib_32bit}/lib $i done ''} diff --git a/pkgs/development/mobile/androidenv/default.nix b/pkgs/development/mobile/androidenv/default.nix index 37e4db45822..513b0763446 100644 --- a/pkgs/development/mobile/androidenv/default.nix +++ b/pkgs/development/mobile/androidenv/default.nix @@ -128,6 +128,12 @@ rec { useGoogleAPIs = true; }; + androidsdk_5_0_1 = androidsdk { + platformVersions = [ "21" ]; + abiVersions = [ "armeabi-v7a" "x86" ]; + useGoogleAPIs = true; + }; + androidndk = import ./androidndk.nix { inherit (pkgs) stdenv fetchurl zlib ncurses p7zip lib makeWrapper; inherit (pkgs) coreutils file findutils gawk gnugrep gnused jdk which; diff --git a/pkgs/development/mobile/androidenv/platform-tools.nix b/pkgs/development/mobile/androidenv/platform-tools.nix index a7a2661bd37..c4724dd41da 100644 --- a/pkgs/development/mobile/androidenv/platform-tools.nix +++ b/pkgs/development/mobile/androidenv/platform-tools.nix @@ -1,18 +1,23 @@ {stdenv, stdenv_32bit, fetchurl, unzip}: +let + version = "21"; + +in + stdenv.mkDerivation { - name = "android-platform-tools-r19"; + name = "android-platform-tools-r${version}"; src = if (stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux") then fetchurl { - url = https://dl-ssl.google.com/android/repository/platform-tools_r19-linux.zip; - sha1 = "66ee37daf8a2a8f1aa8939ccd4093658e30aa49b"; + url = "https://dl-ssl.google.com/android/repository/platform-tools_r${version}-linux.zip"; + sha256 = "35a1762b355451e000a816d97d9af640ca99ae6c5b5b406a3e680210af8106ad"; } else if stdenv.system == "x86_64-darwin" then fetchurl { - url = https://dl-ssl.google.com/android/repository/platform-tools_r19-macosx.zip; - sha1 = "69af30f488163dfc3da8cef1bb6cc7e8a6df5681"; + url = "https://dl-ssl.google.com/android/repository/platform-tools_r${version}-macosx.zip"; + sha256 = "30ae8724da3db772a776d616b4746516f24ae81330e84315a7ce0c49e0b0b3cb"; } else throw "System ${stdenv.system} not supported!"; - + buildCommand = '' mkdir -p $out cd $out @@ -23,8 +28,8 @@ stdenv.mkDerivation { '' for i in adb fastboot do - patchelf --set-interpreter ${stdenv_32bit.gcc.libc}/lib/ld-linux.so.2 $i - patchelf --set-rpath ${stdenv_32bit.gcc.gcc}/lib $i + patchelf --set-interpreter ${stdenv_32bit.cc.libc}/lib/ld-linux.so.2 $i + patchelf --set-rpath ${stdenv_32bit.cc.gcc}/lib $i done ''} ''; diff --git a/pkgs/development/mobile/androidenv/platforms-linux.nix b/pkgs/development/mobile/androidenv/platforms-linux.nix index feb967d0108..4ce1e421478 100644 --- a/pkgs/development/mobile/androidenv/platforms-linux.nix +++ b/pkgs/development/mobile/androidenv/platforms-linux.nix @@ -229,6 +229,16 @@ in }; }; - + + platform_21 = buildPlatform { + name = "android-platform-5.0.1"; + src = fetchurl { + url = https://dl-ssl.google.com/android/repository/android-21_r02.zip; + sha1 = "53536556059bb29ae82f414fd2e14bc335a4eb4c"; + }; + meta = { + description = "Android SDK Platform 5.0.1"; + }; + }; + } - \ No newline at end of file diff --git a/pkgs/development/mobile/androidenv/platforms-macosx.nix b/pkgs/development/mobile/androidenv/platforms-macosx.nix index 0e93ed9412b..1f41d8dda9e 100644 --- a/pkgs/development/mobile/androidenv/platforms-macosx.nix +++ b/pkgs/development/mobile/androidenv/platforms-macosx.nix @@ -229,6 +229,17 @@ in }; }; + + platform_21 = buildPlatform { + name = "android-platform-5.0.1"; + src = fetchurl { + url = https://dl-ssl.google.com/android/repository/android-21_r02.zip; + sha1 = "53536556059bb29ae82f414fd2e14bc335a4eb4c"; + }; + meta = { + description = "Android SDK Platform 5.0.1"; + }; + }; + } - \ No newline at end of file diff --git a/pkgs/development/mobile/androidenv/support-repository.nix b/pkgs/development/mobile/androidenv/support-repository.nix index 66a532328b1..6905cb24993 100644 --- a/pkgs/development/mobile/androidenv/support-repository.nix +++ b/pkgs/development/mobile/androidenv/support-repository.nix @@ -1,10 +1,10 @@ {stdenv, fetchurl, unzip}: stdenv.mkDerivation { - name = "android-support-repository-r5"; + name = "android-support-repository-r9"; src = fetchurl { - url = http://dl-ssl.google.com/android/repository/android_m2repository_r05.zip; - sha1 = "2ee9723da079ba0d4fe2a185e00ded842de96f13"; + url = http://dl-ssl.google.com/android/repository/android_m2repository_r09.zip; + sha256 = "e5295cdbc086251a2904c081038a7f10056359481c66ecff40e59177fd1c753c"; }; buildCommand = '' diff --git a/pkgs/development/mobile/androidenv/support.nix b/pkgs/development/mobile/androidenv/support.nix index ca1988527e2..d9d24f9bf9f 100644 --- a/pkgs/development/mobile/androidenv/support.nix +++ b/pkgs/development/mobile/androidenv/support.nix @@ -1,10 +1,10 @@ {stdenv, fetchurl, unzip}: stdenv.mkDerivation { - name = "android-support-r18"; + name = "android-support-r21"; src = fetchurl { - url = https://dl-ssl.google.com/android/repository/support_r18.zip; - sha1 = "bd67b4b8a6bac629f24c8aea75c3619a26d9a568"; + url = https://dl-ssl.google.com/android/repository/support_r21.zip; + sha1 = "f9ef8def5c64f17cd8bc41c5efddd37cb155f0be"; }; buildCommand = '' @@ -14,4 +14,4 @@ stdenv.mkDerivation { ''; buildInputs = [ unzip ]; -} \ No newline at end of file +} diff --git a/pkgs/development/mobile/flashtool/default.nix b/pkgs/development/mobile/flashtool/default.nix index 92b8c9a1845..d22eeb6c213 100644 --- a/pkgs/development/mobile/flashtool/default.nix +++ b/pkgs/development/mobile/flashtool/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { ln -s ${libusb1}/lib/libusb-1.0.so.0 ./x10flasher_lib/linux/lib32/libusbx-1.0.so chmod +x x10flasher_lib/unyaffs.linux.x86 x10flasher_lib/bin2elf x10flasher_lib/bin2sin - patchelf --set-interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" x10flasher_lib/unyaffs.linux.x86 + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" x10flasher_lib/unyaffs.linux.x86 ln -sf unyaffs.linux.x86 x10flasher_lib/unyaffs.linux ln -s swt32.jar x10flasher_lib/swtlin/swt.jar diff --git a/pkgs/development/mobile/titaniumenv/titaniumsdk-3.1.nix b/pkgs/development/mobile/titaniumenv/titaniumsdk-3.1.nix index 50346ac5115..0fc6b7dca50 100644 --- a/pkgs/development/mobile/titaniumenv/titaniumsdk-3.1.nix +++ b/pkgs/development/mobile/titaniumenv/titaniumsdk-3.1.nix @@ -45,11 +45,11 @@ stdenv.mkDerivation { ${if stdenv.system == "i686-linux" then '' - patchelf --set-interpreter ${stdenv.gcc.libc}/lib/ld-linux.so.2 titanium_prep.linux32 + patchelf --set-interpreter ${stdenv.cc.libc}/lib/ld-linux.so.2 titanium_prep.linux32 '' else if stdenv.system == "x86_64-linux" then '' - patchelf --set-interpreter ${stdenv.gcc.libc}/lib/ld-linux-x86-64.so.2 titanium_prep.linux64 + patchelf --set-interpreter ${stdenv.cc.libc}/lib/ld-linux-x86-64.so.2 titanium_prep.linux64 '' else ""} diff --git a/pkgs/development/mobile/titaniumenv/titaniumsdk-3.2.nix b/pkgs/development/mobile/titaniumenv/titaniumsdk-3.2.nix index 2ac4040714b..b8f288131ed 100644 --- a/pkgs/development/mobile/titaniumenv/titaniumsdk-3.2.nix +++ b/pkgs/development/mobile/titaniumenv/titaniumsdk-3.2.nix @@ -44,11 +44,11 @@ stdenv.mkDerivation { ${if stdenv.system == "i686-linux" then '' - patchelf --set-interpreter ${stdenv.gcc.libc}/lib/ld-linux.so.2 titanium_prep.linux32 + patchelf --set-interpreter ${stdenv.cc.libc}/lib/ld-linux.so.2 titanium_prep.linux32 '' else if stdenv.system == "x86_64-linux" then '' - patchelf --set-interpreter ${stdenv.gcc.libc}/lib/ld-linux-x86-64.so.2 titanium_prep.linux64 + patchelf --set-interpreter ${stdenv.cc.libc}/lib/ld-linux-x86-64.so.2 titanium_prep.linux64 '' else ""} diff --git a/pkgs/development/mobile/titaniumenv/titaniumsdk-3.3.nix b/pkgs/development/mobile/titaniumenv/titaniumsdk-3.3.nix index be3628f2644..2d1cd049b14 100644 --- a/pkgs/development/mobile/titaniumenv/titaniumsdk-3.3.nix +++ b/pkgs/development/mobile/titaniumenv/titaniumsdk-3.3.nix @@ -44,11 +44,11 @@ stdenv.mkDerivation { ${if stdenv.system == "i686-linux" then '' - patchelf --set-interpreter ${stdenv.gcc.libc}/lib/ld-linux.so.2 titanium_prep.linux32 + patchelf --set-interpreter ${stdenv.cc.libc}/lib/ld-linux.so.2 titanium_prep.linux32 '' else if stdenv.system == "x86_64-linux" then '' - patchelf --set-interpreter ${stdenv.gcc.libc}/lib/ld-linux-x86-64.so.2 titanium_prep.linux64 + patchelf --set-interpreter ${stdenv.cc.libc}/lib/ld-linux-x86-64.so.2 titanium_prep.linux64 '' else ""} diff --git a/pkgs/development/mobile/titaniumenv/titaniumsdk-3.4.nix b/pkgs/development/mobile/titaniumenv/titaniumsdk-3.4.nix index 1baf57a94cf..c8fbb435f30 100644 --- a/pkgs/development/mobile/titaniumenv/titaniumsdk-3.4.nix +++ b/pkgs/development/mobile/titaniumenv/titaniumsdk-3.4.nix @@ -44,11 +44,11 @@ stdenv.mkDerivation { ${if stdenv.system == "i686-linux" then '' - patchelf --set-interpreter ${stdenv.gcc.libc}/lib/ld-linux.so.2 titanium_prep.linux32 + patchelf --set-interpreter ${stdenv.cc.libc}/lib/ld-linux.so.2 titanium_prep.linux32 '' else if stdenv.system == "x86_64-linux" then '' - patchelf --set-interpreter ${stdenv.gcc.libc}/lib/ld-linux-x86-64.so.2 titanium_prep.linux64 + patchelf --set-interpreter ${stdenv.cc.libc}/lib/ld-linux-x86-64.so.2 titanium_prep.linux64 '' else ""} diff --git a/pkgs/development/ocaml-modules/dypgen/default.nix b/pkgs/development/ocaml-modules/dypgen/default.nix index 9de4df9288b..63a48219b15 100644 --- a/pkgs/development/ocaml-modules/dypgen/default.nix +++ b/pkgs/development/ocaml-modules/dypgen/default.nix @@ -28,6 +28,6 @@ stdenv.mkDerivation { homepage = http://dypgen.free.fr; description = "Dypgen GLR self extensible parser generator"; license = stdenv.lib.licenses.cecill-b; -# maintainers = [ stdenv.lib.maintainers.roconnor ]; + platforms = ocaml.meta.platforms; }; } diff --git a/pkgs/development/ocaml-modules/fieldslib/default.nix b/pkgs/development/ocaml-modules/fieldslib/default.nix new file mode 100644 index 00000000000..28b83d3af46 --- /dev/null +++ b/pkgs/development/ocaml-modules/fieldslib/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchurl, ocaml, findlib, ocaml_typeconv, camlp4 }: + +assert stdenv.lib.versionOlder "4.00" (stdenv.lib.getVersion ocaml); + +stdenv.mkDerivation { + name = "ocaml-fieldslib-109.20.03"; + + src = fetchurl { + url = https://ocaml.janestreet.com/ocaml-core/109.20.00/individual/fieldslib-109.20.03.tar.gz; + sha256 = "1dkzk0wf26rhvji80dz1r56dp6x9zqrnp87wldd4pj56jli94vir"; + }; + + buildInputs = [ ocaml findlib ]; + propagatedBuildInputs = [ ocaml_typeconv camlp4 ]; + + createFindlibDestdir = true; + + meta = with stdenv.lib; { + homepage = https://ocaml.janestreet.com/; + description = "OCaml syntax extension to define first class values representing record fields, to get and set record fields, iterate and fold over all fields of a record and create new record values"; + license = licenses.asl20; + maintainers = [ maintainers.vbgl ]; + platforms = ocaml.meta.platforms; + }; +} diff --git a/pkgs/development/ocaml-modules/ulex/default.nix b/pkgs/development/ocaml-modules/ulex/default.nix index 72efaa0606d..123641ba1ac 100644 --- a/pkgs/development/ocaml-modules/ulex/default.nix +++ b/pkgs/development/ocaml-modules/ulex/default.nix @@ -25,6 +25,7 @@ stdenv.mkDerivation { homepage = http://www.cduce.org/download.html; description = "ulex is a lexer generator for Unicode and OCaml"; license = stdenv.lib.licenses.mit; + platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.roconnor ]; }; } diff --git a/pkgs/development/ocaml-modules/uucp/default.nix b/pkgs/development/ocaml-modules/uucp/default.nix index 2ee39cab9f4..121f333f543 100644 --- a/pkgs/development/ocaml-modules/uucp/default.nix +++ b/pkgs/development/ocaml-modules/uucp/default.nix @@ -4,7 +4,7 @@ let inherit (stdenv.lib) getVersion versionAtLeast; pname = "uucp"; - version = "0.9.0"; + version = "0.9.1"; webpage = "http://erratique.ch/software/${pname}"; in @@ -16,7 +16,7 @@ stdenv.mkDerivation { src = fetchurl { url = "${webpage}/releases/${pname}-${version}.tbz"; - sha256 = "1cwjr16cg03h30r97lnb32g725qi7ma76kr2aly5smc3m413dhqy"; + sha256 = "0mbrh5fi2b9a4bl71p7hfs0wwbw023ww44n20x0syxn806wjlrkm"; }; buildInputs = [ ocaml findlib opam ]; diff --git a/pkgs/development/perl-modules/MooseXAttributeHelpers-perl-5.20.patch b/pkgs/development/perl-modules/MooseXAttributeHelpers-perl-5.20.patch new file mode 100644 index 00000000000..161f79a637b --- /dev/null +++ b/pkgs/development/perl-modules/MooseXAttributeHelpers-perl-5.20.patch @@ -0,0 +1,33 @@ +diff --git a/t/003_basic_hash.t b/t/003_basic_hash.t +index 1f842ae..c21ac52 100644 +--- a/t/003_basic_hash.t ++++ b/t/003_basic_hash.t +@@ -170,10 +170,10 @@ is_deeply($options->provides, { + is($options->type_constraint->type_parameter, 'Str', '... got the right container type'); + + $stuff->set_option( oink => "blah", xxy => "flop" ); +-my @key_value = $stuff->key_value; ++my @key_value = sort{ $a->[0] cmp $b->[0] } $stuff->key_value; + is_deeply( + \@key_value, +- [ [ 'xxy', 'flop' ], [ 'quantity', 4 ], [ 'oink', 'blah' ] ], ++ [ sort{ $a->[0] cmp $b->[0] } [ 'xxy', 'flop' ], [ 'quantity', 4 ], [ 'oink', 'blah' ] ], + '... got the right key value pairs' + ); + +diff --git a/t/203_trait_hash.t b/t/203_trait_hash.t +index 8e876b1..451c0bb 100644 +--- a/t/203_trait_hash.t ++++ b/t/203_trait_hash.t +@@ -156,10 +156,10 @@ is_deeply($options->provides, { + is($options->type_constraint->type_parameter, 'Str', '... got the right container type'); + + $stuff->set_option( oink => "blah", xxy => "flop" ); +-my @key_value = $stuff->key_value; ++my @key_value = sort{ $a->[0] cmp $b->[0] } $stuff->key_value; + is_deeply( + \@key_value, +- [ [ 'xxy', 'flop' ], [ 'quantity', 4 ], [ 'oink', 'blah' ] ], ++ [ sort{ $a->[0] cmp $b->[0] } [ 'xxy', 'flop' ], [ 'quantity', 4 ], [ 'oink', 'blah' ] ], + '... got the right key value pairs' + ); diff --git a/pkgs/development/python-modules/pylint/default.nix b/pkgs/development/python-modules/pylint/default.nix index 552def7241b..2216b898bcc 100644 --- a/pkgs/development/python-modules/pylint/default.nix +++ b/pkgs/development/python-modules/pylint/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, pythonPackages }: pythonPackages.buildPythonPackage rec { - name = "pylint-1.2.1"; + name = "pylint-1.4.0"; namePrefix = ""; src = fetchurl { url = "https://pypi.python.org/packages/source/p/pylint/${name}.tar.gz"; - sha256 = "0q7zj5hgmz27wifhcqyaddc9yc5b2q6p16788zzm3da6qshv7xk3"; + md5 = "c164738f90213981db5d3297a60b4138"; }; propagatedBuildInputs = with pythonPackages; [ astroid ]; diff --git a/pkgs/development/python-modules/pyqt/4.x.nix b/pkgs/development/python-modules/pyqt/4.x.nix index 92a5fd2dc07..92b74c952fa 100644 --- a/pkgs/development/python-modules/pyqt/4.x.nix +++ b/pkgs/development/python-modules/pyqt/4.x.nix @@ -1,13 +1,13 @@ -{ stdenv, fetchurl, python, sip, qt4, pythonDBus, pkgconfig, lndir, makeWrapper }: +{ stdenv, fetchurl, python, pythonPackages, qt4, pythonDBus, pkgconfig, lndir, makeWrapper }: -let version = "4.10.2"; # kde410.pykde4 doesn't build with 4.10.3 +let version = "4.11.3"; in stdenv.mkDerivation { name = "PyQt-x11-gpl-${version}"; src = fetchurl { url = "mirror://sourceforge/pyqt/PyQt4/PyQt-${version}/PyQt-x11-gpl-${version}.tar.gz"; - sha256 = "1zp69caqq195ymp911d0cka8619q78hzmfxvj7c51w2y53zg4z3l"; + sha256 = "11jnfjw79s0b0qdd9s6kd69w87vf16dhagbhbmwbmrp2vgf80dw5"; }; configurePhase = '' @@ -30,7 +30,7 @@ stdenv.mkDerivation { buildInputs = [ python pkgconfig makeWrapper qt4 lndir ]; - propagatedBuildInputs = [ sip ]; + propagatedBuildInputs = [ pythonPackages.sip_4_16 ]; postInstall = '' for i in $out/bin/*; do diff --git a/pkgs/development/python-modules/pyqt/5.x.nix b/pkgs/development/python-modules/pyqt/5.x.nix index 2d2a2ed5151..83dac459284 100644 --- a/pkgs/development/python-modules/pyqt/5.x.nix +++ b/pkgs/development/python-modules/pyqt/5.x.nix @@ -29,7 +29,8 @@ in stdenv.mkDerivation { export PYTHONPATH=$PYTHONPATH:$out/lib/${python.libPrefix}/site-packages substituteInPlace configure.py \ - --replace 'install_dir=pydbusmoddir' "install_dir='$out/lib/${python.libPrefix}/site-packages/dbus/mainloop'" + --replace 'install_dir=pydbusmoddir' "install_dir='$out/lib/${python.libPrefix}/site-packages/dbus/mainloop'" \ + --replace "ModuleMetadata(qmake_QT=['webkitwidgets'])" "ModuleMetadata(qmake_QT=['webkitwidgets', 'printsupport'])" ${python.executable} configure.py -w \ --confirm-license \ diff --git a/pkgs/development/python-modules/sip/4.16.nix b/pkgs/development/python-modules/sip/4.16.nix index 210346062f9..b10852d17f3 100644 --- a/pkgs/development/python-modules/sip/4.16.nix +++ b/pkgs/development/python-modules/sip/4.16.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, python, isPyPy }: if isPyPy then throw "sip not supported for interpreter ${python.executable}" else stdenv.mkDerivation rec { - name = "sip-4.16.1"; + name = "sip-4.16.4"; src = fetchurl { url = "mirror://sourceforge/pyqt/sip/${name}/${name}.tar.gz"; - sha256 = "1hknl71ij924syc9ik9nk4z051q3n75y7w27q9i07awpd39sp7m4"; + sha256 = "1xapklcz5ndilax0gr2h1fqzhdzh7yvxfb3y0rxfcag1qlzl9nnf"; }; configurePhase = '' diff --git a/pkgs/development/tools/analysis/rr/default.nix b/pkgs/development/tools/analysis/rr/default.nix index c2ab7a334fe..992d797c189 100644 --- a/pkgs/development/tools/analysis/rr/default.nix +++ b/pkgs/development/tools/analysis/rr/default.nix @@ -1,17 +1,27 @@ -{ stdenv, fetchFromGitHub, cmake, libpfm, zlib }: +{ stdenv, fetchFromGitHub, cmake, libpfm, zlib, python }: stdenv.mkDerivation rec { - version = "2.0.0"; + version = "3.0.0"; name = "rr-${version}"; src = fetchFromGitHub { owner = "mozilla"; repo = "rr"; rev = version; - sha256 = "0mlxkj35zmm15dgnc7rfynnh2s2hpym01147vwc8pwv8qgab903s"; + sha256 = "1h4ddq7mmi0sfj6mh1qg2bfs3x7gz5qmn9dlnmpkrp38rqgnnhrg"; }; - buildInputs = [ cmake libpfm zlib ]; + patchPhase = '' + substituteInPlace src/Command.cc --replace '_BSD_SOURCE' '_DEFAULT_SOURCE' + '' + # On 64bit machines, don't build the 32-bit components for debugging + # 32-bit binaries. This sucks but I don't know how to make 'gcc' cooperate + # easily with how CMake works to build 32 and 64bit binaries at once. + + stdenv.lib.optionalString (stdenv.system == "x86_64-linux") '' + substituteInPlace CMakeLists.txt --replace 'if(rr_64BIT)' 'if(false)' + ''; + + buildInputs = [ cmake libpfm zlib python ]; cmakeFlags = "-DCMAKE_C_FLAGS_RELEASE:STRING= -DCMAKE_CXX_FLAGS_RELEASE:STRING="; meta = { @@ -25,7 +35,7 @@ stdenv.mkDerivation rec { ''; license = "custom"; - maintainers = [ stdenv.lib.maintainers.pierron ]; - platforms = [ "i686-linux" ]; + maintainers = with stdenv.lib.maintainers; [ pierron thoughtpolice ]; + platforms = stdenv.lib.platforms.linux; }; -} \ No newline at end of file +} diff --git a/pkgs/development/tools/analysis/valgrind/default.nix b/pkgs/development/tools/analysis/valgrind/default.nix index 27fd739ed54..28456d931e0 100644 --- a/pkgs/development/tools/analysis/valgrind/default.nix +++ b/pkgs/development/tools/analysis/valgrind/default.nix @@ -1,15 +1,13 @@ { stdenv, fetchurl, perl, gdb }: stdenv.mkDerivation rec { - name = "valgrind-3.10.0"; + name = "valgrind-3.10.1"; src = fetchurl { url = "http://valgrind.org/downloads/${name}.tar.bz2"; - sha256 = "1jgd42vsx0bcblp91bd61hd5wpy0gghh09wxgm65m666vy17y103"; + sha256 = "15xrzhfnwwn7n1sfbkwvdbvs6zk0zx718n6zd5i1nrnvdp13s9gs"; }; - patches = [ ./glibc-2.19.patch ]; - # Perl is needed for `cg_annotate'. # GDB is needed to provide a sane default for `--db-command'. nativeBuildInputs = [ perl ]; diff --git a/pkgs/development/tools/analysis/valgrind/glibc-2.19.patch b/pkgs/development/tools/analysis/valgrind/glibc-2.19.patch deleted file mode 100644 index 137b0a325b0..00000000000 --- a/pkgs/development/tools/analysis/valgrind/glibc-2.19.patch +++ /dev/null @@ -1,39 +0,0 @@ -https://projects.archlinux.org/svntogit/packages.git/plain/trunk/valgrind-3.9.0-glibc-2.19.patch?h=packages/valgrind - -diff -Naur valgrind-3.9.0-orig/configure valgrind-3.9.0/configure ---- valgrind-3.9.0-orig/configure 2013-11-01 09:33:32.000000000 +1000 -+++ valgrind-3.9.0/configure 2014-02-08 09:28:06.063248544 +1000 -@@ -6689,6 +6689,16 @@ - DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" - DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}" - ;; -+ 2.19) -+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: 2.19 family" >&5 -+$as_echo "2.19 family" >&6; } -+ -+$as_echo "#define GLIBC_2_19 1" >>confdefs.h -+ -+ DEFAULT_SUPP="glibc-2.X.supp ${DEFAULT_SUPP}" -+ DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" -+ DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}" -+ ;; - darwin) - { $as_echo "$as_me:${as_lineno-$LINENO}: result: Darwin" >&5 - $as_echo "Darwin" >&6; } -diff -Naur valgrind-3.9.0-orig/configure.ac valgrind-3.9.0/configure.ac ---- valgrind-3.9.0-orig/configure.ac 2013-11-01 09:28:16.000000000 +1000 -+++ valgrind-3.9.0/configure.ac 2014-02-08 09:27:38.870385366 +1000 -@@ -918,6 +918,13 @@ - DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" - DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}" - ;; -+ 2.19) -+ AC_MSG_RESULT(2.19 family) -+ AC_DEFINE([GLIBC_2_19], 1, [Define to 1 if you're using glibc 2.19.x]) -+ DEFAULT_SUPP="glibc-2.X.supp ${DEFAULT_SUPP}" -+ DEFAULT_SUPP="glibc-2.34567-NPTL-helgrind.supp ${DEFAULT_SUPP}" -+ DEFAULT_SUPP="glibc-2.X-drd.supp ${DEFAULT_SUPP}" -+ ;; - darwin) - AC_MSG_RESULT(Darwin) - AC_DEFINE([DARWIN_LIBC], 1, [Define to 1 if you're using Darwin]) diff --git a/pkgs/development/tools/atom-shell/default.nix b/pkgs/development/tools/atom-shell/default.nix index 141ba284cc0..872fc43a257 100644 --- a/pkgs/development/tools/atom-shell/default.nix +++ b/pkgs/development/tools/atom-shell/default.nix @@ -6,7 +6,7 @@ let atomEnv = buildEnv { name = "env-atom"; paths = [ - stdenv.gcc.gcc zlib glib dbus gtk atk pango freetype libgnome_keyring3 + stdenv.cc.gcc zlib glib dbus gtk atk pango freetype libgnome_keyring3 fontconfig gdk_pixbuf cairo cups expat libgpgerror alsaLib nspr gconf nss xlibs.libXrender xlibs.libX11 xlibs.libXext xlibs.libXdamage xlibs.libXtst xlibs.libXcomposite xlibs.libXi xlibs.libXfixes xlibs.libXrandr @@ -32,7 +32,7 @@ in stdenv.mkDerivation rec { installPhase = '' mkdir -p $out/bin unzip -d $out/bin $src - patchelf --set-interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \ + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ $out/bin/atom mv $out/bin/atom $out/bin/atom-shell wrapProgram $out/bin/atom-shell \ diff --git a/pkgs/development/tools/build-managers/buildbot-slave/default.nix b/pkgs/development/tools/build-managers/buildbot-slave/default.nix index 870664c252a..715b009a17e 100644 --- a/pkgs/development/tools/build-managers/buildbot-slave/default.nix +++ b/pkgs/development/tools/build-managers/buildbot-slave/default.nix @@ -1,12 +1,12 @@ { stdenv, buildPythonPackage, fetchurl, coreutils, twisted }: buildPythonPackage (rec { - name = "buildbot-slave-0.8.8"; + name = "buildbot-slave-0.8.10"; namePrefix = ""; src = fetchurl { - url = "http://buildbot.googlecode.com/files/${name}.tar.gz"; - sha256 = "1k1pk3y0rk6j01wc491jblryr4ajqg1ing9m3sjaw9s5sga34xcb"; + url = "https://pypi.python.org/packages/source/b/buildbot-slave/${name}.tar.gz"; + sha256 = "09pncw44c7vqrl7zyn1nvfismiqi9s51axk9cqxn9gq7jhj38mpg"; }; patchPhase = '' diff --git a/pkgs/development/tools/build-managers/buildbot/default.nix b/pkgs/development/tools/build-managers/buildbot/default.nix index ccbf74e528e..8193845770c 100644 --- a/pkgs/development/tools/build-managers/buildbot/default.nix +++ b/pkgs/development/tools/build-managers/buildbot/default.nix @@ -9,12 +9,12 @@ assert enableDebugClient -> pygobject != null && pyGtkGlade != null; buildPythonPackage (rec { - name = "buildbot-0.8.8"; + name = "buildbot-0.8.10"; namePrefix = ""; src = fetchurl { - url = "http://buildbot.googlecode.com/files/${name}.tar.gz"; - sha256 = "1l1rsy82zv8582wypw00ac0k0wsr82ky74f3np4clbrxv3ry64sh"; + url = "https://pypi.python.org/packages/source/b/buildbot/${name}.tar.gz"; + sha256 = "1x5513mjvd3mwwadawk6v3ca2wh5mcmgnn5h9jhq1jw1plp4v5n4"; }; patchPhase = diff --git a/pkgs/development/tools/build-managers/cargo/common.nix b/pkgs/development/tools/build-managers/cargo/common.nix index 447aed27570..04eaec9daef 100644 --- a/pkgs/development/tools/build-managers/cargo/common.nix +++ b/pkgs/development/tools/build-managers/cargo/common.nix @@ -14,16 +14,16 @@ rec { else throw "no snapshot to boostrap for this platform (missing platform url suffix)"; snapshotHash = if stdenv.system == "i686-linux" - then "3204c8a38721199f69d2971db887d1dc71a63825" + then "4dea04e278192c5409f43794a98f20a8f59df2d9" else if stdenv.system == "x86_64-linux" - then "39ca0d02eac184bc764ff9c1f645ca361715c5c2" + then "3e48c573d3c4d26591feb7bfe988174720f08374" else if stdenv.system == "i686-darwin" - then "ebc1836424c4b3ba49f9adef271c50d2a8e134c0" + then "dc3d498c0567af4a0820e91756dcfff8fde0efac" else if stdenv.system == "x86_64-darwin" - then "a2045e95984b65eab4a704152566f8ab9a3be518" + then "f301bd8c3c93a5c88698c69190e464af1525ac96" else throw "no snapshot for platform ${stdenv.system}"; - snapshotDate = "2014-11-22"; + snapshotDate = "2014-12-21"; snapshotName = "cargo-nightly-${platform}.tar.gz"; snapshot = stdenv.mkDerivation { @@ -37,8 +37,8 @@ rec { mkdir -p "$out" cp -r bin "$out/bin" '' + (if stdenv.isLinux then '' - patchelf --interpreter "${stdenv.glibc}/lib/${stdenv.gcc.dynamicLinker}" \ - --set-rpath "${stdenv.gcc.gcc}/lib/:${stdenv.gcc.gcc}/lib64/:${zlib}/lib" \ + patchelf --interpreter "${stdenv.glibc}/lib/${stdenv.cc.dynamicLinker}" \ + --set-rpath "${stdenv.cc.gcc}/lib/:${stdenv.cc.gcc}/lib64/:${zlib}/lib" \ "$out/bin/cargo" '' else ""); }; diff --git a/pkgs/development/tools/build-managers/gradle/default.nix b/pkgs/development/tools/build-managers/gradle/default.nix index 62662d273c8..3bbfff9221b 100644 --- a/pkgs/development/tools/build-managers/gradle/default.nix +++ b/pkgs/development/tools/build-managers/gradle/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, unzip, jdk, makeWrapper }: stdenv.mkDerivation rec { - name = "gradle-2.1"; + name = "gradle-2.2.1"; src = fetchurl { url = "http://services.gradle.org/distributions/${name}-bin.zip"; - sha256 = "0y7qifc61nng24zn73bdwh5d0m25dnllfiwfkyw220mblag4zviy"; + sha256 = "420aa50738299327b611c10b8304b749e8d3a579407ee9e755b15921d95ff418"; }; installPhase = '' @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { makeWrapper ${jdk}/bin/java $out/bin/gradle \ --set JAVA_HOME ${jdk} \ - --add-flags "-classpath $out/lib/gradle-launcher-2.1.jar org.gradle.launcher.GradleMain" + --add-flags "-classpath $out/lib/gradle-launcher-2.2.1.jar org.gradle.launcher.GradleMain" ''; phases = "unpackPhase installPhase"; diff --git a/pkgs/development/tools/cdecl/default.nix b/pkgs/development/tools/cdecl/default.nix index 48d04fd48ab..9e9fcfcc19d 100644 --- a/pkgs/development/tools/cdecl/default.nix +++ b/pkgs/development/tools/cdecl/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation { preBuild = '' ${gnused}/bin/sed 's/getline/cdecl_getline/g' -i cdecl.c; makeFlagsArray=(CFLAGS="-DBSD -DUSE_READLINE -std=gnu89" LIBS=-lreadline); - makeFlags="$makeFlags PREFIX=$out BINDIR=$out/bin MANDIR=$out/man1 CATDIR=$out/cat1"; + makeFlags="$makeFlags PREFIX=$out BINDIR=$out/bin MANDIR=$out/man1 CATDIR=$out/cat1 CC=$CC"; mkdir -p $out/bin; ''; buildInputs = [yacc flex readline ncurses]; diff --git a/pkgs/development/tools/continuous-integration/jenkins/default.nix b/pkgs/development/tools/continuous-integration/jenkins/default.nix index 7ba30991d20..4b9a8280f5e 100644 --- a/pkgs/development/tools/continuous-integration/jenkins/default.nix +++ b/pkgs/development/tools/continuous-integration/jenkins/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "jenkins-${version}"; - version = "1.579"; + version = "1.594"; src = fetchurl { url = "http://mirrors.jenkins-ci.org/war/${version}/jenkins.war"; - sha256 = "1l2a8h3js42gkqn8kiysbgrxksqmhmmfp9l4kbrmw609q2wn5119"; + sha256 = "1ypinl78avvir9499xargjbrzxv2b8kspjicsg8xzk5wsymzybn1"; }; meta = with stdenv.lib; { description = "An extendable open source continuous integration server"; diff --git a/pkgs/development/tools/documentation/haddock/default.nix b/pkgs/development/tools/documentation/haddock/default.nix index 3b3d91a1f2f..e809312d576 100644 --- a/pkgs/development/tools/documentation/haddock/default.nix +++ b/pkgs/development/tools/documentation/haddock/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "haddock"; - version = "2.15.0"; - sha256 = "1vay0v0a02xj2m40w71vmjadlm6pzv309r1jhr61xv1wnj88i75w"; + version = "2.15.0.1"; + sha256 = "0pvhhqackfikmp5zg6v6lysvr69f3f9f78xcjs4sd68f0rby7fdp"; isLibrary = false; isExecutable = true; buildDepends = [ haddockApi ]; diff --git a/pkgs/development/tools/haskell/c2hs/default.nix b/pkgs/development/tools/haskell/c2hs/default.nix index fe8992e9989..830283d6420 100644 --- a/pkgs/development/tools/haskell/c2hs/default.nix +++ b/pkgs/development/tools/haskell/c2hs/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "c2hs"; - version = "0.19.1"; - sha256 = "18vk4q43bn4n59mcjid382dlm113nwll94hsqhqvk52sp1jkmjn3"; + version = "0.20.1"; + sha256 = "1w2w9zxirzjd5lniwqakq59glgsh4mw3565x2l9qrin0bfjxkn3h"; isLibrary = false; isExecutable = true; buildDepends = [ dlist filepath languageC ]; diff --git a/pkgs/development/tools/haskell/cabal2nix/default.nix b/pkgs/development/tools/haskell/cabal2nix/default.nix index 315dfc6e2da..0cb947a340e 100644 --- a/pkgs/development/tools/haskell/cabal2nix/default.nix +++ b/pkgs/development/tools/haskell/cabal2nix/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "cabal2nix"; - version = "1.71"; - sha256 = "1hhw1i4gqsd73mrj60sza36dqfz32ydh70sk9182m4wpgpsrwxvr"; + version = "1.72"; + sha256 = "0xa7v9nwhaymc40qlh7ndv6xvqmfxmc3rp860v0h4swfqsb9bsvr"; isLibrary = false; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/tools/haskell/ghc-events-analyze/default.nix b/pkgs/development/tools/haskell/ghc-events-analyze/default.nix index b58d8d1429b..cbf871820ff 100644 --- a/pkgs/development/tools/haskell/ghc-events-analyze/default.nix +++ b/pkgs/development/tools/haskell/ghc-events-analyze/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "ghc-events-analyze"; - version = "0.2.0"; - sha256 = "04px1p0pnx54414m7sdpmdhj2dpsi1z8bjm8jq2yzh66854xiyh4"; + version = "0.2.1"; + sha256 = "0lf063p2wj2d1hxb5hx4bcid3a3ni3g9x8sglm5q5kfbmdk7awj4"; isLibrary = false; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/tools/haskell/hlint/default.nix b/pkgs/development/tools/haskell/hlint/default.nix index 0699337640f..17813ac1a33 100644 --- a/pkgs/development/tools/haskell/hlint/default.nix +++ b/pkgs/development/tools/haskell/hlint/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "hlint"; - version = "1.9.12"; - sha256 = "0ga66b7lpvgx2w1fg5gnilncg75dfxcjcrx9hvjyxh7fin4y1z6a"; + version = "1.9.13"; + sha256 = "1cj487l3jvrp43acwk3ihc5mzyqwxxa0nqahad27sd3bbmx86p4a"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/development/tools/haskell/packdeps/default.nix b/pkgs/development/tools/haskell/packdeps/default.nix new file mode 100644 index 00000000000..292f6af944f --- /dev/null +++ b/pkgs/development/tools/haskell/packdeps/default.nix @@ -0,0 +1,19 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, Cabal, filepath, split, tar, text, time }: + +cabal.mkDerivation (self: { + pname = "packdeps"; + version = "0.4.0.3"; + sha256 = "08an9nwg448d3w4yds67l02mgikmjmn52pvva3i386fv4hfkabhp"; + isLibrary = true; + isExecutable = true; + buildDepends = [ Cabal filepath split tar text time ]; + meta = { + homepage = "http://packdeps.haskellers.com/"; + description = "Check your cabal packages for lagging dependencies"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = with self.stdenv.lib.maintainers; [ bergey ]; + }; +}) diff --git a/pkgs/development/tools/misc/autoconf-archive/default.nix b/pkgs/development/tools/misc/autoconf-archive/default.nix new file mode 100644 index 00000000000..0e6ca01c625 --- /dev/null +++ b/pkgs/development/tools/misc/autoconf-archive/default.nix @@ -0,0 +1,17 @@ +{ stdenv, fetchurl, xz }: +stdenv.mkDerivation rec { + name = "autoconf-archive-${version}"; + version = "2014.10.15"; + + src = fetchurl { + url = "http://ftp.heanet.ie/mirrors/gnu/autoconf-archive/autoconf-archive-${version}.tar.xz"; + sha256 = "198yrdf8bhrpl7insdyzn65zd60qll0gr9vpz7fl7dpcj78yc7gy"; + }; + buildInputs = [ xz ]; + + meta = with stdenv.lib; { + description = "Archive of autoconf m4 macros."; + homepage = http://www.gnu.org/software/autoconf-archive/; + license = licenses.gpl3; + }; +} diff --git a/pkgs/development/tools/misc/cflow/default.nix b/pkgs/development/tools/misc/cflow/default.nix index b1322d461ee..fb15be14261 100644 --- a/pkgs/development/tools/misc/cflow/default.nix +++ b/pkgs/development/tools/misc/cflow/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { patchPhase = '' substituteInPlace "src/cflow.h" \ --replace "/usr/bin/cpp" \ - "$(cat ${stdenv.gcc}/nix-support/orig-gcc)/bin/cpp" + "$(cat ${stdenv.cc}/nix-support/orig-gcc)/bin/cpp" ''; buildInputs = [ gettext ] ++ diff --git a/pkgs/development/tools/misc/gdb/pstack.nix b/pkgs/development/tools/misc/gdb/pstack.nix deleted file mode 100644 index 12cdc654260..00000000000 --- a/pkgs/development/tools/misc/gdb/pstack.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ stdenv, gdb }: -stdenv.mkDerivation { - name = "pstack-20120823"; - buildCommand = '' - mkdir -p $out/bin - cat > $out/bin/pstack < node_modules/${name}/package.json < node_modules/${name}/package.json </dev/null || true + if [ -d "$out/lib/node_modules/.bin" ]; then + ln -sv $out/lib/node_modules/.bin $out/bin + ${patchShebangs "$out/lib/node_modules/.bin/*"} fi - '') args.passthru.names)} - ${concatStrings (mapAttrsToList (name: dep: '' - mv node_modules/${name} $out/lib/node_modules - '') peerDeps)} - mv node_modules/.bin $out/lib/node_modules 2>/dev/null || true - mv node_modules $out/.dependent-node-modules - if [ -d "$out/lib/node_modules/.bin" ]; then - ln -sv $out/lib/node_modules/.bin $out/bin - node=`type -p node` - coffee=`type -p coffee || true` - find -L $out/lib/node_modules/.bin/* -type f -print0 | \ - xargs -0 sed --follow-symlinks -i \ - -e 's@#!/usr/bin/env node@#!'"$node"'@' \ - -e 's@#!/usr/bin/env coffee@#!'"$coffee"'@' \ - -e 's@#!/.*/node@#!'"$node"'@' \ - -e 's@#!/.*/coffee@#!'"$coffee"'@' - fi + ) + runHook postInstall ''; @@ -141,6 +236,10 @@ let # Make buildNodePackage useful with --run-env nativeBuildInputs = (args.nativeBuildInputs or []) ++ deps ++ peerDependencies ++ neededNatives; + + # Expose list of recursive dependencies upstream, up to the package that + # caused recursive dependency + recursiveDeps = (flatten (map (d: remove name d.recursiveDeps) deps)) ++ (attrNames recursiveDeps); }); in self diff --git a/pkgs/development/web/nodejs/default.nix b/pkgs/development/web/nodejs/default.nix index f796567b555..06aeec77fbd 100644 --- a/pkgs/development/web/nodejs/default.nix +++ b/pkgs/development/web/nodejs/default.nix @@ -8,7 +8,7 @@ let ln -sv /usr/sbin/dtrace $out/bin ''; - version = if unstableVersion then "0.11.13" else "0.10.32"; + version = if unstableVersion then "0.11.13" else "0.10.33"; # !!! Should we also do shared libuv? deps = { @@ -37,7 +37,7 @@ in stdenv.mkDerivation { url = "http://nodejs.org/dist/v${version}/node-v${version}.tar.gz"; sha256 = if unstableVersion then "1642zj3sajhqflfhb8fsvy84w9mm85wagm8w8300gydd2q6fkmhm" - else "040g0gh2nl593ml1fcqp68vxa5kj7aiw1nqirda1c69d7l70s4n2"; + else "07h8vl750svjg8x5zhxhwjkx03jpy2m6h3fbj7fd1rj4671jdp3m"; }; configureFlags = concatMap sharedConfigureFlags (builtins.attrNames deps); diff --git a/pkgs/development/web/wml/default.nix b/pkgs/development/web/wml/default.nix new file mode 100644 index 00000000000..d3c67ec14d3 --- /dev/null +++ b/pkgs/development/web/wml/default.nix @@ -0,0 +1,47 @@ +{ stdenv, fetchurl, perlPackages, ncurses, lynx, makeWrapper }: + +perlPackages.buildPerlPackage rec { + name = "wml-2.0.11"; + + src = fetchurl { + url = "http://thewml.org/distrib/${name}.tar.gz"; + sha256 = "0jjxpq91x7y2mgixz7ghqp01m24qa37wl3zz515rrzv7x8cyy4cf"; + }; + + # Getting lots of Non-ASCII character errors from pod2man. + # Inserting =encoding utf8 before the first =head occurrence. + # Wasn't able to fix mp4h. + preConfigure = '' + touch Makefile.PL + for i in wml_backend/p6_asubst/asubst.src wml_aux/freetable/freetable.src wml_docs/*.pod wml_include/des/*.src wml_include/fmt/*.src; do + sed -i '0,/^=head/{s/^=head/=encoding utf8\n=head/}' $i + done + sed -i 's/ doc / /g' wml_backend/p2_mp4h/Makefile.in + sed -i '/p2_mp4h\/doc/d' Makefile.in + ''; + + buildInputs = [ perlPackages.perl ncurses lynx makeWrapper ]; + + patches = [ ./redhat-with-thr.patch ./dynaloader.patch ./no_bitvector.patch ]; + + preFixup = '' + substituteInPlace $out/bin/wml \ + --replace "File::PathConvert::realpath" "Cwd::realpath" \ + --replace "File::PathConvert::abs2rel" "File::Spec->abs2rel" \ + --replace "File::PathConvert" "File::Spec" + + wrapProgram $out/bin/wml \ + --set PERL5LIB ${with perlPackages; stdenv.lib.makePerlPath [ + BitVector TermReadKey ImageSize + ]} + ''; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + homepage = http://thewml.org/; + description = "Off-line HTML generation toolkit for Unix"; + license = licenses.gpl2; + platforms = platforms.linux; + }; +} \ No newline at end of file diff --git a/pkgs/development/web/wml/dynaloader.patch b/pkgs/development/web/wml/dynaloader.patch new file mode 100644 index 00000000000..89b9f0427f9 --- /dev/null +++ b/pkgs/development/web/wml/dynaloader.patch @@ -0,0 +1,11 @@ +--- a/wml_backend/p3_eperl/configure 2009-10-03 19:12:29.000000000 -0500 ++++ b/wml_backend/p3_eperl/configure 2009-10-03 19:12:45.000000000 -0500 +@@ -678,7 +678,7 @@ + #define HAVE_PERL_DYNALOADER 1 + EOF + +- perl_dla=$perl_archlib/auto/DynaLoader/DynaLoader.a ++ perl_dla=$perl_archlib/CORE/libperl.so + ;; + * ) + rc=no \ No newline at end of file diff --git a/pkgs/development/web/wml/no_bitvector.patch b/pkgs/development/web/wml/no_bitvector.patch new file mode 100644 index 00000000000..d5fe926c4c7 --- /dev/null +++ b/pkgs/development/web/wml/no_bitvector.patch @@ -0,0 +1,10 @@ +--- a/wml_common/Makefile.in 2014-12-17 00:28:25.156736048 +0100 ++++ b/wml_common/Makefile.in 2014-12-17 00:28:30.501817958 +0100 +@@ -45,7 +45,6 @@ + have_gd=0 + + SUBDIRS = \ +- bitvector \ + filepathconvert \ + gd \ + getoptlong \ diff --git a/pkgs/development/web/wml/redhat-with-thr.patch b/pkgs/development/web/wml/redhat-with-thr.patch new file mode 100644 index 00000000000..4b06ccb3f56 --- /dev/null +++ b/pkgs/development/web/wml/redhat-with-thr.patch @@ -0,0 +1,19 @@ +Description: Fix FTBFS with Perl 5.16 + Patch taken from Fedora +Debian-Bug: 676263 +Fedora-Bug: 839609 +Author: Jitka Plesnikova +Origin: https://bugzilla.redhat.com/show_bug.cgi?id=839609 + +--- a/wml_backend/p3_eperl/eperl_perl5.h 2012-07-27 10:49:27.048508799 +0200 ++++ b/wml_backend/p3_eperl/eperl_perl5.h 2012-07-27 10:50:16.288714291 +0200 +@@ -72,9 +72,6 @@ + # define PL_curstash curstash + #endif + +-#ifndef WITH_THR +-# define PL_defoutgv defoutgv +-#endif + + /* + Initialization of locales when building a new Perl interpreter. \ No newline at end of file diff --git a/pkgs/games/Allure/default.nix b/pkgs/games/Allure/default.nix index 532ef092f09..63d6a0a2fb2 100644 --- a/pkgs/games/Allure/default.nix +++ b/pkgs/games/Allure/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "Allure"; - version = "0.4.99.0"; - sha256 = "1i4v1h4ynx4aap0nmf8qn2qx22wqfgypr83l7bh38fd4qibsvx3q"; + version = "0.4.100.0"; + sha256 = "15rkj5xab23wqr2d44xbri7hggbb3zmmka41xfiscqq4ifagfj4m"; isLibrary = false; isExecutable = true; buildDepends = [ enummapsetTh filepath LambdaHack text ]; @@ -13,7 +13,7 @@ cabal.mkDerivation (self: { meta = { homepage = "http://allureofthestars.com"; description = "Near-future Sci-Fi roguelike and tactical squad game"; - license = "unknown"; + license = "AGPL"; platforms = self.ghc.meta.platforms; }; }) diff --git a/pkgs/games/LambdaHack/default.nix b/pkgs/games/LambdaHack/default.nix index eb4edf2b36a..2130c423cfe 100644 --- a/pkgs/games/LambdaHack/default.nix +++ b/pkgs/games/LambdaHack/default.nix @@ -1,28 +1,30 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, assertFailure, async, binary, deepseq, enummapsetTh -, filepath, gtk, hashable, hsini, keys, miniutter, mtl, prettyShow -, random, stm, text, transformers, unorderedContainers, vector -, vectorBinaryInstances, x11, zlib +{ cabal, assertFailure, async, binary, dataDefault, deepseq +, enummapsetTh, filepath, gtk, hashable, hsini, keys, miniutter +, mtl, prettyShow, random, stm, text, transformers +, unorderedContainers, vector, vectorBinaryInstances, zlib }: cabal.mkDerivation (self: { pname = "LambdaHack"; - version = "0.4.99.0"; - sha256 = "1mcz44akf706a0q1xr4h7hlf1gj60570bi8im6jpg73k728314cp"; + version = "0.4.100.0"; + sha256 = "15v3aagwsh180603an3wd7rfgbjzgamdw270ciw2m03v8pkg9d28"; isLibrary = true; isExecutable = true; buildDepends = [ - assertFailure async binary deepseq enummapsetTh filepath gtk - hashable hsini keys miniutter mtl prettyShow random stm text - transformers unorderedContainers vector vectorBinaryInstances zlib + assertFailure async binary dataDefault deepseq enummapsetTh + filepath gtk hashable hsini keys miniutter mtl prettyShow random + stm text transformers unorderedContainers vector + vectorBinaryInstances zlib ]; testDepends = [ - assertFailure async binary deepseq enummapsetTh filepath hashable - hsini keys miniutter mtl prettyShow random stm text transformers - unorderedContainers vector vectorBinaryInstances zlib + assertFailure async binary dataDefault deepseq enummapsetTh + filepath hashable hsini keys miniutter mtl prettyShow random stm + text transformers unorderedContainers vector vectorBinaryInstances + zlib ]; - pkgconfigDepends = [ gtk x11 ]; + pkgconfigDepends = [ gtk ]; meta = { homepage = "http://github.com/LambdaHack/LambdaHack"; description = "A game engine library for roguelike dungeon crawlers"; diff --git a/pkgs/games/adom/default.nix b/pkgs/games/adom/default.nix index ef5aba96d09..62357208677 100644 --- a/pkgs/games/adom/default.nix +++ b/pkgs/games/adom/default.nix @@ -7,7 +7,7 @@ let inherit (xlibs) libXext libX11; - lpath = "${stdenv.gcc.gcc}/lib64:" + stdenv.lib.makeSearchPath "lib" [ + lpath = "${stdenv.cc.gcc}/lib64:" + stdenv.lib.makeSearchPath "lib" [ zlib libmad libpng12 libcaca libXext libX11 mesa alsaLib pulseaudio]; in @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { done ${patchelf}/bin/patchelf \ - --set-interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \ + --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ --set-rpath "$out/lib:${lpath}" \ $out/adom diff --git a/pkgs/games/andyetitmoves/default.nix b/pkgs/games/andyetitmoves/default.nix index ae04c57aa26..de363df2630 100644 --- a/pkgs/games/andyetitmoves/default.nix +++ b/pkgs/games/andyetitmoves/default.nix @@ -41,14 +41,14 @@ stdenv.mkDerivation rec { mkdir -p $out/{opt/andyetitmoves,bin} cp -r * $out/opt/andyetitmoves/ - fullPath=${stdenv.gcc.gcc}/lib64 + fullPath=${stdenv.cc.gcc}/lib64 for i in $nativeBuildInputs; do fullPath=$fullPath''${fullPath:+:}$i/lib done binName=${if commercialVersion then "AndYetItMoves" else "AndYetItMovesDemo"} - patchelf --set-interpreter $(cat $NIX_GCC/nix-support/dynamic-linker) --set-rpath $fullPath $out/opt/andyetitmoves/lib/$binName + patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) --set-rpath $fullPath $out/opt/andyetitmoves/lib/$binName cat > $out/bin/$binName << EOF #!/bin/sh cd $out/opt/andyetitmoves diff --git a/pkgs/games/atanks/default.nix b/pkgs/games/atanks/default.nix index 587fefe600b..edad4b4b456 100644 --- a/pkgs/games/atanks/default.nix +++ b/pkgs/games/atanks/default.nix @@ -11,11 +11,11 @@ let (builtins.attrNames (builtins.removeAttrs x helperArgNames)); sourceInfo = rec { baseName="atanks"; - version = "6.0"; + version = "6.1"; name="${baseName}-${version}"; project="${baseName}"; url="mirror://sourceforge/project/${project}/${baseName}/${name}/${name}.tar.gz"; - sha256 = "0460zwzd800vcgsmd1dzb7j5wcy3lf9hsdw152f6p2mbd0nq5pds"; + sha256 = "1azs9amqkgs7qglx0vk9bg2fhn73lq89372scnfp45hinrh52vqi"; }; in rec { diff --git a/pkgs/games/banner/default.nix b/pkgs/games/banner/default.nix index b443a76b9a7..e0dac80a8fe 100644 --- a/pkgs/games/banner/default.nix +++ b/pkgs/games/banner/default.nix @@ -12,9 +12,9 @@ let sha256 = hash; }; - configurePhase = "make dep"; + configurePhase = "make dep CC=$CC"; - buildPhase = "make OPTIM='-DNDEBUG -O3'"; + buildPhase = "make OPTIM='-DNDEBUG -O3' CC=$CC"; installPhase = '' make INSTBASEDIR=$out install diff --git a/pkgs/games/castle-combat/default.nix b/pkgs/games/castle-combat/default.nix index a9ed0592385..94ddcc1b056 100644 --- a/pkgs/games/castle-combat/default.nix +++ b/pkgs/games/castle-combat/default.nix @@ -39,8 +39,8 @@ buildPythonPackage rec { fixLoaderPath = let dollar = "\$"; in '' sed -i "$out/bin/castle-combat" \ - -e "/^exec/ iexport LD_LIBRARY_PATH=\"$(cat ${stdenv.gcc}/nix-support/orig-gcc)/lib\:"'${dollar}'"LD_LIBRARY_PATH\"\\ -export LD_LIBRARY_PATH=\"$(cat ${stdenv.gcc}/nix-support/orig-gcc)/lib64\:"'${dollar}'"LD_LIBRARY_PATH\"" + -e "/^exec/ iexport LD_LIBRARY_PATH=\"$(cat ${stdenv.cc}/nix-support/orig-gcc)/lib\:"'${dollar}'"LD_LIBRARY_PATH\"\\ +export LD_LIBRARY_PATH=\"$(cat ${stdenv.cc}/nix-support/orig-gcc)/lib64\:"'${dollar}'"LD_LIBRARY_PATH\"" ''; # ^ # `--- The run-time says: "libgcc_s.so.1 must be installed for diff --git a/pkgs/games/dwarf-fortress/default.nix b/pkgs/games/dwarf-fortress/default.nix index ac037efe88a..8b4e8bfce82 100644 --- a/pkgs/games/dwarf-fortress/default.nix +++ b/pkgs/games/dwarf-fortress/default.nix @@ -4,17 +4,17 @@ let baseVersion = "40"; - patchVersion = "18"; + patchVersion = "19"; srcs = { df_unfuck = fetchgit { url = "https://github.com/svenstaro/dwarf_fortress_unfuck"; - rev = "f7ef8d4fa92bcbbf8e4790056c6c3668e3c3b20b"; - sha256 = "0kpb3gzjllvi1lahhi74cp2ny1dl7kvnhdlca7i2yxkmyzaaj9qy"; + rev = "dadf3d48e93a2800db5d4f98d775ba8453ca55a4"; + sha256 = "011pbcfc3a0mnwqg3pkhngnb1h7z1jbx4qbvj03blpzfjia075sv"; }; df = fetchurl { url = "http://www.bay12games.com/dwarves/df_${baseVersion}_${patchVersion}_linux.tar.bz2"; - sha256 = "0l29dn24xhkyj8fvmz8318i5sz2wpl420mwy1ccpdd3yfd3hrjmb"; + sha256 = "16xb6py7l1hf9hc7gn50nwajqgmv01zdhbkh7g6a8gnx7wlhl2p9"; }; }; @@ -25,6 +25,7 @@ assert stdenv.system == "i686-linux"; stdenv.mkDerivation rec { name = "dwarf-fortress-0.${baseVersion}.${patchVersion}"; + inherit baseVersion patchVersion; buildInputs = [ SDL SDL_image SDL_ttf gtk2 glib glew mesa ncurses openal glibc libsndfile pango atk cmake gdk_pixbuf]; src = "${srcs.df_unfuck} ${srcs.df}"; @@ -46,13 +47,20 @@ stdenv.mkDerivation rec { cd ../../ cp -r ./df_linux/* $out/share/df_linux rm $out/share/df_linux/libs/lib* - patchelf --set-rpath "${stdenv.lib.makeLibraryPath [ stdenv.gcc.gcc stdenv.glibc ]}:$out/share/df_linux/libs" $out/share/df_linux/libs/Dwarf_Fortress + + # Store the original hash for dwarf-therapist + echo $(md5sum $out/share/df_linux/libs/Dwarf_Fortress | cut -c1-8) > $out/share/df_linux/hash.md5.orig + # Fix rpath + patchelf --set-rpath "${stdenv.lib.makeLibraryPath [ stdenv.cc.gcc stdenv.glibc ]}:$out/share/df_linux/libs" $out/share/df_linux/libs/Dwarf_Fortress cp -f ./git-export/build/libgraphics.so $out/share/df_linux/libs/libgraphics.so cp $permission $out/share/df_linux/nix_permission patchelf --set-interpreter ${glibc}/lib/ld-linux.so.2 $out/share/df_linux/libs/Dwarf_Fortress + # Store new hash for dwarf-therapist + echo $(md5sum $out/share/df_linux/libs/Dwarf_Fortress | cut -c1-8) > $out/share/df_linux/hash.md5.patched + cat > $out/bin/dwarf-fortress << EOF #!${stdenv.shell} @@ -77,7 +85,7 @@ stdenv.mkDerivation rec { done # now run Dwarf Fortress! - export LD_LIBRARY_PATH=\${stdenv.gcc}/lib:${SDL}/lib:${SDL_image}/lib/:${SDL_ttf}/lib/:${gtk2}/lib/:${glib}/lib/:${mesa}/lib/:${openal}/lib/:${libsndfile}/lib:\$DF_DIR/df_linux/libs/ + export LD_LIBRARY_PATH=\${stdenv.cc}/lib:${SDL}/lib:${SDL_image}/lib/:${SDL_ttf}/lib/:${gtk2}/lib/:${glib}/lib/:${mesa}/lib/:${openal}/lib/:${libsndfile}/lib:\$DF_DIR/df_linux/libs/ export SDL_DISABLE_LOCK_KEYS=1 # Work around for bug in Debian/Ubuntu SDL patch. #export SDL_VIDEO_CENTERED=1 # Centre the screen. Messes up resizing. diff --git a/pkgs/games/dwarf-therapist/default.nix b/pkgs/games/dwarf-therapist/default.nix index 8cc1b9933cd..9ecfe3c0acd 100644 --- a/pkgs/games/dwarf-therapist/default.nix +++ b/pkgs/games/dwarf-therapist/default.nix @@ -1,39 +1,30 @@ -{ stdenv, coreutils, fetchhg, qt4, dwarf_fortress, bash, makeWrapper }: +{ stdenv, coreutils, fetchurl, qt4, dwarf_fortress, bash, makeWrapper }: +let + version = "30.1.0"; + df = dwarf_fortress; +in stdenv.mkDerivation rec { - name = "dwarf-therapist-${rev}"; - rev = "eeeac8544d94"; + name = "dwarf-therapist-${version}"; - src = fetchhg { - url = "https://code.google.com/r/splintermind-attributes/"; - inherit rev; - sha256 = "0a9m967q6p2q3plrl6qysg1xrdmg65jzil6awjh2wr3g10x2x15z"; + src = fetchurl { + url = "https://github.com/splintermind/Dwarf-Therapist/archive/v${version}.tar.gz"; + sha256 = "1x9dkis6b3f8iqcfrc2cj9mcgkwf0rzhxhq2lgy4xdr2n0yjkyv7"; }; # Needed for hashing - dwarfBinary = "${dwarf_fortress}/share/df_linux/libs/Dwarf_Fortress"; + dfHashFile = "${df}/share/df_linux/hash.md5"; - buildInputs = [ coreutils qt4 dwarf_fortress makeWrapper ]; + buildInputs = [ coreutils qt4 df makeWrapper ]; enableParallelBuilding = false; - preConfigure = '' + configurePhase = '' substituteInPlace dwarftherapist.pro \ --replace /usr/bin $out/bin \ --replace /usr/share $out/share \ --replace "INSTALLS += doc" "" - ''; - preBuild = '' - # Log to current directory, otherwise it crashes if log/ doesn't - # exist Note: Whis is broken because we cd to the nix store in the - # wrapper-script - substituteInPlace src/dwarftherapist.cpp \ - --replace "log/run.log" "dwarf-therapist.log" - ''; - - buildPhase = '' - qmake INSTALL_PREFIX=$out; - make; + qmake INSTALL_PREFIX=$out ''; postInstall = '' @@ -46,8 +37,8 @@ stdenv.mkDerivation rec { postFixup = '' # Fix checksum of memory access directives - substituteInPlace $out/share/dwarftherapist/etc/memory_layouts/linux/v034.11.ini \ - --replace "e966ee88" $(md5sum ${dwarfBinary} | cut -c1-8) + substituteInPlace $out/share/dwarftherapist/memory_layouts/linux/v0${df.baseVersion}.${df.patchVersion}.ini \ + --replace $(cat "${dfHashFile}.orig") $(cat "${dfHashFile}.patched") ''; meta = { @@ -58,4 +49,4 @@ stdenv.mkDerivation rec { hydraPlatforms = []; homepage = https://code.google.com/r/splintermind-attributes/; }; -} +} diff --git a/pkgs/games/eduke32/default.nix b/pkgs/games/eduke32/default.nix index 1d93b24d38a..cc47f948240 100644 --- a/pkgs/games/eduke32/default.nix +++ b/pkgs/games/eduke32/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { ''; buildPhase = '' - make OPTLEVEL=0 + make OPTLEVEL=0 USE_LIBPNG=0 ''; installPhase = '' diff --git a/pkgs/games/gemrb/default.nix b/pkgs/games/gemrb/default.nix index dc89e405e24..86da7686eef 100644 --- a/pkgs/games/gemrb/default.nix +++ b/pkgs/games/gemrb/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, cmake, SDL, openal, zlib, libpng, python, libvorbis }: -assert stdenv.gcc.libc != null; +assert stdenv.cc.libc != null; stdenv.mkDerivation rec { name = "gemrb-0.8.1"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { # TODO: make libpng, libvorbis, sdl_mixer, freetype, vlc, glew (and other gl reqs) optional # Necessary to find libdl. - CMAKE_LIBRARY_PATH = "${stdenv.gcc.libc}/lib"; + CMAKE_LIBRARY_PATH = "${stdenv.cc.libc}/lib"; # Can't have -werror because of the Vorbis header files. cmakeFlags = "-DDISABLE_WERROR=ON -DCMAKE_VERBOSE_MAKEFILE=ON"; diff --git a/pkgs/games/gltron/default.nix b/pkgs/games/gltron/default.nix index d925c8810bf..ebdd95f7073 100644 --- a/pkgs/games/gltron/default.nix +++ b/pkgs/games/gltron/default.nix @@ -20,5 +20,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.gpl2Plus; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; + broken = true; # see http://sourceforge.net/p/gltron/bugs/15 }; } diff --git a/pkgs/games/gsb/default.nix b/pkgs/games/gsb/default.nix index 757d3cf7681..cfdc729f5d3 100644 --- a/pkgs/games/gsb/default.nix +++ b/pkgs/games/gsb/default.nix @@ -25,18 +25,18 @@ stdenv.mkDerivation rec { phases = "unpackPhase installPhase"; # XXX: stdenv.lib.makeLibraryPath doesn't pick up /lib64 - libPath = stdenv.lib.makeLibraryPath [ stdenv.gcc.gcc stdenv.gcc.libc ] + libPath = stdenv.lib.makeLibraryPath [ stdenv.cc.gcc stdenv.cc.libc ] + ":" + stdenv.lib.makeLibraryPath [ SDL SDL_image libjpeg62 libpng12 mesa ] + ":" + stdenv.lib.makeLibraryPath [ curl3 openal libvorbis libogg ] + ":" + stdenv.lib.makeLibraryPath [ libX11 libXext libXft fontconfig zlib ] - + ":" + stdenv.gcc.gcc + "/lib64"; + + ":" + stdenv.cc.gcc + "/lib64"; installPhase = '' mkdir -p $out/libexec/positech/GSB/ mkdir -p $out/bin patchelf \ - --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \ + --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ --set-rpath $libPath \ ./GSB.bin.$arch diff --git a/pkgs/games/megaglest/default.nix b/pkgs/games/megaglest/default.nix index 29841797148..6d884f082c9 100644 --- a/pkgs/games/megaglest/default.nix +++ b/pkgs/games/megaglest/default.nix @@ -8,7 +8,7 @@ let name = "megaglest-lib-env"; paths = [ SDL xlibs.libSM xlibs.libICE xlibs.libX11 xlibs.libXext xercesc openal libvorbis lua libjpeg libpng curl fontconfig ftgl freetype - stdenv.gcc.gcc glew mesa_glu mesa_drivers wxGTK ]; + stdenv.cc.gcc glew mesa_glu mesa_drivers wxGTK ]; }; path-env = buildEnv { name = "megaglest-path-env"; diff --git a/pkgs/games/oilrush/default.nix b/pkgs/games/oilrush/default.nix index 49dbb7ba82b..18c955f1cc1 100644 --- a/pkgs/games/oilrush/default.nix +++ b/pkgs/games/oilrush/default.nix @@ -23,27 +23,27 @@ stdenv.mkDerivation { cd bin for f in launcher_$arch libQtCoreUnigine_$arch.so.4 OilRush_$arch do - patchelf --set-interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" $f + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $f done - patchelf --set-rpath ${stdenv.gcc.gcc}/lib64:${stdenv.gcc.gcc}/lib:${libX11}/lib:${libXext}/lib:${libXrender}/lib:${fontconfig}/lib:${freetype}/lib\ + patchelf --set-rpath ${stdenv.cc.gcc}/lib64:${stdenv.cc.gcc}/lib:${libX11}/lib:${libXext}/lib:${libXrender}/lib:${fontconfig}/lib:${freetype}/lib\ launcher_$arch - patchelf --set-rpath ${stdenv.gcc.gcc}/lib64:${stdenv.gcc.gcc}/lib\ + patchelf --set-rpath ${stdenv.cc.gcc}/lib64:${stdenv.cc.gcc}/lib\ libNetwork_$arch.so - patchelf --set-rpath ${stdenv.gcc.gcc}/lib64:${stdenv.gcc.gcc}/lib\ + patchelf --set-rpath ${stdenv.cc.gcc}/lib64:${stdenv.cc.gcc}/lib\ libQtCoreUnigine_$arch.so.4 - patchelf --set-rpath ${stdenv.gcc.gcc}/lib64:${stdenv.gcc.gcc}/lib:${libX11}/lib:${libXext}/lib:${libXrender}/lib:${fontconfig}/lib:${freetype}/lib\ + patchelf --set-rpath ${stdenv.cc.gcc}/lib64:${stdenv.cc.gcc}/lib:${libX11}/lib:${libXext}/lib:${libXrender}/lib:${fontconfig}/lib:${freetype}/lib\ libQtGuiUnigine_$arch.so.4 - patchelf --set-rpath ${stdenv.gcc.gcc}/lib64:${stdenv.gcc.gcc}/lib\ + patchelf --set-rpath ${stdenv.cc.gcc}/lib64:${stdenv.cc.gcc}/lib\ libQtNetworkUnigine_$arch.so.4 - patchelf --set-rpath ${stdenv.gcc.gcc}/lib64:${stdenv.gcc.gcc}/lib:${libX11}/lib:${libXext}/lib:${libXrender}/lib:${fontconfig}/lib:${freetype}/lib\ + patchelf --set-rpath ${stdenv.cc.gcc}/lib64:${stdenv.cc.gcc}/lib:${libX11}/lib:${libXext}/lib:${libXrender}/lib:${fontconfig}/lib:${freetype}/lib\ libQtWebKitUnigine_$arch.so.4 - patchelf --set-rpath ${stdenv.gcc.gcc}/lib64:${stdenv.gcc.gcc}/lib\ + patchelf --set-rpath ${stdenv.cc.gcc}/lib64:${stdenv.cc.gcc}/lib\ libQtXmlUnigine_$arch.so.4 - patchelf --set-rpath ${stdenv.gcc.gcc}/lib64:${stdenv.gcc.gcc}/lib\ + patchelf --set-rpath ${stdenv.cc.gcc}/lib64:${stdenv.cc.gcc}/lib\ libRakNet_$arch.so - patchelf --set-rpath ${stdenv.gcc.gcc}/lib64:${stdenv.gcc.gcc}/lib:${libX11}/lib:${libXext}/lib:${libXinerama}/lib:${libXrandr}/lib\ + patchelf --set-rpath ${stdenv.cc.gcc}/lib64:${stdenv.cc.gcc}/lib:${libX11}/lib:${libXext}/lib:${libXinerama}/lib:${libXrandr}/lib\ libUnigine_$arch.so - patchelf --set-rpath ${stdenv.gcc.gcc}/lib64:${stdenv.gcc.gcc}/lib:${libX11}/lib:${libXext}/lib:${libXinerama}/lib:${libXrandr}/lib\ + patchelf --set-rpath ${stdenv.cc.gcc}/lib64:${stdenv.cc.gcc}/lib:${libX11}/lib:${libXext}/lib:${libXinerama}/lib:${libXrandr}/lib\ OilRush_$arch ''; installPhase = '' diff --git a/pkgs/games/openarena/default.nix b/pkgs/games/openarena/default.nix new file mode 100644 index 00000000000..7db727a13fd --- /dev/null +++ b/pkgs/games/openarena/default.nix @@ -0,0 +1,41 @@ +{ fetchurl, makeWrapper, patchelf, pkgs, stdenv, SDL, libogg, libvorbis }: + +stdenv.mkDerivation rec { + name = "openarena-${version}"; + version = "0.8.8"; + + src = fetchurl { + name = "openarena.zip"; + url = "http://openarena.ws/request.php?4"; + sha256 = "0jmc1cmdz1rcvqc9ilzib1kilpwap6v0d331l6q53wsibdzsz3ss"; + }; + + buildInputs = [ pkgs.unzip patchelf makeWrapper]; + + installPhase = let + gameDir = "$out/openarena-$version"; + interpreter = "${stdenv.glibc}/lib/ld-linux*.so.?"; + in '' + mkdir -pv $out/bin + cd $out + unzip $src + + if [ "${stdenv.system}" == "x86_64-linux" ]; then + patchelf --set-interpreter ${interpreter} ${gameDir}/openarena.x86_64 + makeWrapper "${gameDir}/openarena.x86_64" "$out/bin/openarena" \ + --prefix LD_LIBRARY_PATH : "${SDL}/lib:${libogg}/lib:${libvorbis}/lib" + else + patchelf --set-interpreter ${interpreter} ${gameDir}/openarena.i386 + makeWrapper "${gameDir}/openarena.i386" "$out/bin/openarena" \ + --prefix LD_LIBRARY_PATH : "${SDL}/lib:${libogg}/lib:${libvorbis}/lib" + fi + ''; + + meta = { + description = "Crossplatform openarena client"; + homepage = http://openarena.ws/; + maintainers = [ stdenv.lib.maintainers.wyvie ]; + platforms = stdenv.lib.platforms.linux; + license = stdenv.lib.licenses.gpl2; + }; +} diff --git a/pkgs/games/openttd/default.nix b/pkgs/games/openttd/default.nix index a1af42814d1..d8ae07705c6 100644 --- a/pkgs/games/openttd/default.nix +++ b/pkgs/games/openttd/default.nix @@ -17,6 +17,12 @@ stdenv.mkDerivation rec { "--without-liblzo2" ]; + # NOTE: Remove this patch in 1.4.5 or greater + patches = [ + # Adapted from svn r27079 + ./fix-freetype-1.4.4.patch + ]; + makeFlags = "INSTALL_PERSONAL_DIR="; postInstall = '' diff --git a/pkgs/games/openttd/fix-freetype-1.4.4.patch b/pkgs/games/openttd/fix-freetype-1.4.4.patch new file mode 100644 index 00000000000..37706ce05c9 --- /dev/null +++ b/pkgs/games/openttd/fix-freetype-1.4.4.patch @@ -0,0 +1,31 @@ +diff --git a/src/fontcache.cpp b/src/fontcache.cpp +=================================================================== +--- a/src/fontcache.cpp ++++ b/src/fontcache.cpp +@@ -537,6 +537,6 @@ + + /* Add 1 pixel for the shadow on the medium font. Our sprite must be at least 1x1 pixel */ +- int width = max(1, slot->bitmap.width + (this->fs == FS_NORMAL)); +- int height = max(1, slot->bitmap.rows + (this->fs == FS_NORMAL)); ++ unsigned int width = max(1U, (unsigned int)slot->bitmap.width + (this->fs == FS_NORMAL)); ++ unsigned int height = max(1U, (unsigned int)slot->bitmap.rows + (this->fs == FS_NORMAL)); + + /* Limit glyph size to prevent overflows later on. */ +@@ -554,6 +554,6 @@ + /* Draw shadow for medium size */ + if (this->fs == FS_NORMAL && !aa) { +- for (int y = 0; y < slot->bitmap.rows; y++) { +- for (int x = 0; x < slot->bitmap.width; x++) { ++ for (unsigned int y = 0; y < (unsigned int)slot->bitmap.rows; y++) { ++ for (unsigned int x = 0; x < (unsigned int)slot->bitmap.width; x++) { + if (aa ? (slot->bitmap.buffer[x + y * slot->bitmap.pitch] > 0) : HasBit(slot->bitmap.buffer[(x / 8) + y * slot->bitmap.pitch], 7 - (x % 8))) { + sprite.data[1 + x + (1 + y) * sprite.width].m = SHADOW_COLOUR; +@@ -564,6 +564,6 @@ + } + +- for (int y = 0; y < slot->bitmap.rows; y++) { +- for (int x = 0; x < slot->bitmap.width; x++) { ++ for (unsigned int y = 0; y < (unsigned int)slot->bitmap.rows; y++) { ++ for (unsigned int x = 0; x < (unsigned int)slot->bitmap.width; x++) { + if (aa ? (slot->bitmap.buffer[x + y * slot->bitmap.pitch] > 0) : HasBit(slot->bitmap.buffer[(x / 8) + y * slot->bitmap.pitch], 7 - (x % 8))) { + sprite.data[x + y * sprite.width].m = FACE_COLOUR; diff --git a/pkgs/games/planetaryannihilation/default.nix b/pkgs/games/planetaryannihilation/default.nix index 7c58b4ca1e8..b018aa94d9f 100755 --- a/pkgs/games/planetaryannihilation/default.nix +++ b/pkgs/games/planetaryannihilation/default.nix @@ -34,13 +34,13 @@ stdenv.mkDerivation { ln -s ${systemd}/lib/libudev.so.1 $out/lib/libudev.so.0 - patchelf --set-interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" "$out/PA" - patchelf --set-interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" --set-rpath "${stdenv.lib.makeLibraryPath [ stdenv.gcc.gcc xlibs.libXdamage xorg.libXfixes gtk glib stdenv.glibc "$out" xlibs.libXext pango udev xlibs.libX11 xlibs.libXcomposite alsaLib atk nspr fontconfig cairo pango nss freetype gnome3.gconf gdk_pixbuf xlibs.libXrender ]}:{stdenv.gcc.gcc}/lib64:${stdenv.glibc}/lib64" "$out/host/CoherentUI_Host.bin" + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$out/PA" + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" --set-rpath "${stdenv.lib.makeLibraryPath [ stdenv.cc.gcc xlibs.libXdamage xorg.libXfixes gtk glib stdenv.glibc "$out" xlibs.libXext pango udev xlibs.libX11 xlibs.libXcomposite alsaLib atk nspr fontconfig cairo pango nss freetype gnome3.gconf gdk_pixbuf xlibs.libXrender ]}:{stdenv.cc.gcc}/lib64:${stdenv.glibc}/lib64" "$out/host/CoherentUI_Host.bin" - wrapProgram $out/PA --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ stdenv.gcc.gcc stdenv.glibc xlibs.libX11 xlibs.libXcursor gtk glib curl "$out" ]}:${stdenv.gcc.gcc}/lib64:${stdenv.glibc}/lib64" + wrapProgram $out/PA --prefix LD_LIBRARY_PATH : "${stdenv.lib.makeLibraryPath [ stdenv.cc.gcc stdenv.glibc xlibs.libX11 xlibs.libXcursor gtk glib curl "$out" ]}:${stdenv.cc.gcc}/lib64:${stdenv.glibc}/lib64" for f in $out/lib/*; do - patchelf --set-rpath "${stdenv.lib.makeLibraryPath [ stdenv.gcc.gcc curl xlibs.libX11 stdenv.glibc xlibs.libXcursor "$out" ]}:${stdenv.gcc.gcc}/lib64:${stdenv.glibc}/lib64" $f + patchelf --set-rpath "${stdenv.lib.makeLibraryPath [ stdenv.cc.gcc curl xlibs.libX11 stdenv.glibc xlibs.libXcursor "$out" ]}:${stdenv.cc.gcc}/lib64:${stdenv.glibc}/lib64" $f done ''; diff --git a/pkgs/games/quake3/wrapper/default.nix b/pkgs/games/quake3/wrapper/default.nix index 84d93cefa21..aa7e33f9cd0 100644 --- a/pkgs/games/quake3/wrapper/default.nix +++ b/pkgs/games/quake3/wrapper/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation { inherit game paks mesa name; - gcc = stdenv.gcc.gcc; + gcc = stdenv.cc.gcc; meta = { inherit description; diff --git a/pkgs/games/sdlmame/default.nix b/pkgs/games/sdlmame/default.nix index 8488d357fc5..2b6b0bf76da 100644 --- a/pkgs/games/sdlmame/default.nix +++ b/pkgs/games/sdlmame/default.nix @@ -22,8 +22,8 @@ stdenv.mkDerivation rec { installPhase = '' patchelf \ - --set-interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \ - --set-rpath "${alsaLib}/lib:${qt48}/lib:${SDL}/lib:${fontconfig}/lib:${freetype}/lib:${SDL_ttf}/lib:${xlibs.libX11}/lib:${xlibs.libXinerama}/lib:${stdenv.gcc.gcc}/lib" \ + --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + --set-rpath "${alsaLib}/lib:${qt48}/lib:${SDL}/lib:${fontconfig}/lib:${freetype}/lib:${SDL_ttf}/lib:${xlibs.libX11}/lib:${xlibs.libXinerama}/lib:${stdenv.cc.gcc}/lib" \ share/sdlmame/sdlmame mkdir -p "$out/bin" diff --git a/pkgs/games/spring/default.nix b/pkgs/games/spring/default.nix index f7716672186..4b4fdc662bb 100644 --- a/pkgs/games/spring/default.nix +++ b/pkgs/games/spring/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { postInstall = '' wrapProgram "$out/bin/spring" \ - --prefix LD_LIBRARY_PATH : "${stdenv.gcc.gcc}/lib::${systemd}/lib" + --prefix LD_LIBRARY_PATH : "${stdenv.cc.gcc}/lib::${systemd}/lib" ''; meta = with stdenv.lib; { diff --git a/pkgs/games/tibia/default.nix b/pkgs/games/tibia/default.nix index 11b04a3e742..1bda08b6aa8 100644 --- a/pkgs/games/tibia/default.nix +++ b/pkgs/games/tibia/default.nix @@ -3,11 +3,11 @@ with stdenv.lib; assert stdenv.isi686; stdenv.mkDerivation { - name = "tibia-10.64"; + name = "tibia-10.71"; src = fetchurl { - url = http://static.tibia.com/download/tibia1064.tgz; - sha256 = "0g3hg65aclbhdm3sfpxxzyc4cdv1q6i2mzzgq2h8bpyc1m3in1j9"; + url = http://static.tibia.com/download/tibia1071.tgz; + sha256 = "183949xfvbbxbhj4i85ybcfv7h9j1f4va4c61wjzbhyjf55vj69a"; }; shell = stdenv.shell; @@ -25,7 +25,7 @@ stdenv.mkDerivation { cp -r * $out/res patchelf --set-interpreter ${glibc}/lib/ld-linux.so.2 \ - --set-rpath ${stdenv.gcc.gcc}/lib:${libX11}/lib:${mesa}/lib \ + --set-rpath ${stdenv.cc.gcc}/lib:${libX11}/lib:${mesa}/lib \ "$out/res/Tibia" # We've patchelf'd the files. The main ‘Tibia’ binary is a bit diff --git a/pkgs/games/tremulous/default.nix b/pkgs/games/tremulous/default.nix index 5c175be8af0..3fcbff42527 100644 --- a/pkgs/games/tremulous/default.nix +++ b/pkgs/games/tremulous/default.nix @@ -28,8 +28,8 @@ stdenv.mkDerivation rec { patches = [ ./parse.patch ]; patchFlags = "-p 0"; NIX_LD_FLAGS = '' - -rpath ${stdenv.gcc}/lib - -rpath ${stdenv.gcc}/lib64 + -rpath ${stdenv.cc}/lib + -rpath ${stdenv.cc}/lib64 ''; buildPhase = '' cd Release_1.011 diff --git a/pkgs/games/ue4demos/default.nix b/pkgs/games/ue4demos/default.nix index 10975f88516..501c9431e71 100644 --- a/pkgs/games/ue4demos/default.nix +++ b/pkgs/games/ue4demos/default.nix @@ -12,7 +12,7 @@ let rtdeps = stdenv.lib.makeLibraryPath [ xlibs.libXxf86vm xlibs.libXext openal ] - + ":" + stdenv.lib.makeSearchPath "lib64" [ stdenv.gcc.gcc ]; + + ":" + stdenv.lib.makeSearchPath "lib64" [ stdenv.cc.gcc ]; buildCommand = '' diff --git a/pkgs/games/ultrastardx/default.nix b/pkgs/games/ultrastardx/default.nix index 47fcd2dc4cf..96f7b8a52fc 100644 --- a/pkgs/games/ultrastardx/default.nix +++ b/pkgs/games/ultrastardx/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { # The fpc is not properly wrapped to add -rpath. I add this manually. # I even do a trick on lib/lib64 for libgcc, that I expect it will work. preBuild = '' - export NIX_LDFLAGS="$NIX_LDFLAGS -rpath ${SDL}/lib -rpath ${SDL_image}/lib -rpath ${libpng}/lib -rpath ${freetype}/lib -rpath ${portaudio}/lib -rpath ${ffmpeg}/lib -rpath ${zlib}/lib -rpath ${sqlite}/lib -rpath ${libX11}/lib -rpath ${pcre}/lib -rpath ${lua}/lib -rpath ${stdenv.gcc.gcc}/lib64 -rpath ${stdenv.gcc.gcc}/lib" + export NIX_LDFLAGS="$NIX_LDFLAGS -rpath ${SDL}/lib -rpath ${SDL_image}/lib -rpath ${libpng}/lib -rpath ${freetype}/lib -rpath ${portaudio}/lib -rpath ${ffmpeg}/lib -rpath ${zlib}/lib -rpath ${sqlite}/lib -rpath ${libX11}/lib -rpath ${pcre}/lib -rpath ${lua}/lib -rpath ${stdenv.cc.gcc}/lib64 -rpath ${stdenv.cc.gcc}/lib" sed -i 414,424d Makefile ''; diff --git a/pkgs/games/ut2004demo/builder.sh b/pkgs/games/ut2004demo/builder.sh index 52b043b53fd..ca6b4fe1092 100644 --- a/pkgs/games/ut2004demo/builder.sh +++ b/pkgs/games/ut2004demo/builder.sh @@ -25,5 +25,5 @@ mkdir $out # Set the ELF interpreter to our own Glibc. for i in "$out/System/ucc-bin" "$out/System/ut2004-bin"; do - patchelf --set-interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" "$i" + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$i" done diff --git a/pkgs/games/vessel/default.nix b/pkgs/games/vessel/default.nix index 8a92490b6e0..8eec6ecb23c 100644 --- a/pkgs/games/vessel/default.nix +++ b/pkgs/games/vessel/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { phases = "installPhase"; ld_preload = ./isatty.c; - libPath = stdenv.lib.makeLibraryPath [ stdenv.gcc.gcc stdenv.gcc.libc ] + libPath = stdenv.lib.makeLibraryPath [ stdenv.cc.gcc stdenv.cc.libc ] + ":" + stdenv.lib.makeLibraryPath [ SDL pulseaudio alsaLib ] ; installPhase = '' @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { echo @@@ # if we call ld.so $(bin) we don't need to set the ELF interpreter, and save a patchelf step. - LD_PRELOAD=./isatty.so $(cat $NIX_GCC/nix-support/dynamic-linker) $src << IM_A_BOT + LD_PRELOAD=./isatty.so $(cat $NIX_CC/nix-support/dynamic-linker) $src << IM_A_BOT n $out/libexec/strangeloop/vessel/ IM_A_BOT @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { # props to Ethan Lee (the Vessel porter) for understanding # how $ORIGIN works in rpath. There is hope for humanity. patchelf \ - --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \ + --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ --set-rpath $libPath:$out/libexec/strangeloop/vessel/x86/ \ $out/libexec/strangeloop/vessel/x86/vessel.x86 diff --git a/pkgs/games/worldofgoo/default.nix b/pkgs/games/worldofgoo/default.nix index c39ffb1de05..1deda8e1ba4 100644 --- a/pkgs/games/worldofgoo/default.nix +++ b/pkgs/games/worldofgoo/default.nix @@ -45,15 +45,15 @@ stdenv.mkDerivation rec { phases = "unpackPhase installPhase"; # XXX: stdenv.lib.makeLibraryPath doesn't pick up /lib64 - libPath = stdenv.lib.makeLibraryPath [ stdenv.gcc.gcc stdenv.gcc.libc ] + libPath = stdenv.lib.makeLibraryPath [ stdenv.cc.gcc stdenv.cc.libc ] + ":" + stdenv.lib.makeLibraryPath [libX11 libXext libXau libxcb libXdmcp SDL SDL_mixer libvorbis mesa ] - + ":" + stdenv.gcc.gcc + "/lib64"; + + ":" + stdenv.cc.gcc + "/lib64"; installPhase = '' mkdir -p $out/libexec/2dboy/WorldOfGoo/ mkdir -p $out/bin - patchelf --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" --set-rpath $libPath ./WorldOfGoo.bin64 + patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" --set-rpath $libPath ./WorldOfGoo.bin64 cp -r * $out/libexec/2dboy/WorldOfGoo/ diff --git a/pkgs/misc/cups/default.nix b/pkgs/misc/cups/default.nix index 0f99902badb..883de8d2b9d 100644 --- a/pkgs/misc/cups/default.nix +++ b/pkgs/misc/cups/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation { propagatedBuildInputs = [ openssl ]; - configureFlags = "--localstatedir=/var --enable-dbus"; # --with-dbusdir + configureFlags = "--localstatedir=/var --sysconfdir=/etc --enable-dbus"; # --with-dbusdir installFlags = [ # Don't try to write in /var at build time. @@ -31,6 +31,7 @@ stdenv.mkDerivation { "DBUSDIR=$(out)/etc/dbus-1" "INITDIR=$(out)/etc/rc.d" "XINETD=$(out)/etc/xinetd.d" + "SERVERROOT=$(out)/etc/cups" # Idem for /usr. "MENUDIR=$(out)/share/applications" "ICONDIR=$(out)/share/icons" @@ -38,6 +39,12 @@ stdenv.mkDerivation { "CUPS_PRIMARY_SYSTEM_GROUP=root" ]; + postInstall = + '' + # Delete obsolete stuff that conflicts with cups-filters. + rm -rf $out/share/cups/banners $out/share/cups/data/testprint + ''; + meta = { homepage = "http://www.cups.org/"; description = "A standards-based printing system for UNIX"; diff --git a/pkgs/misc/cups/drivers/samsung/builder.sh b/pkgs/misc/cups/drivers/samsung/builder.sh index 58e1c0cd781..db54d8a6c93 100644 --- a/pkgs/misc/cups/drivers/samsung/builder.sh +++ b/pkgs/misc/cups/drivers/samsung/builder.sh @@ -28,7 +28,7 @@ ln -s ppd model cd $out/lib/cups/filter for i in $(ls); do echo patching $i... - patchelf --set-interpreter $(cat $NIX_GCC/nix-support/dynamic-linker) $i || echo "(couldn't set interpreter)" + patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) $i || echo "(couldn't set interpreter)" patchelf --set-rpath $cups/lib:$gcc/lib:$glibc/lib $i # This might not be necessary. done diff --git a/pkgs/misc/cups/filters.nix b/pkgs/misc/cups/filters.nix index 31ef0bc0efc..524662a0ee6 100644 --- a/pkgs/misc/cups/filters.nix +++ b/pkgs/misc/cups/filters.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pkgconfig, cups, poppler, fontconfig -, libjpeg, libpng, perl, ijs, qpdf, dbus }: +, libjpeg, libpng, perl, ijs, qpdf, dbus, substituteAll, bash }: stdenv.mkDerivation rec { name = "cups-filters-${version}"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "1bq48nnrarlbf6qc93bz1n5wlh6j420gppbck3r45sinwhz5wa7m"; }; - buildInputs = [ + buildInputs = [ pkgconfig cups poppler fontconfig libjpeg libpng perl ijs qpdf dbus ]; @@ -18,9 +18,36 @@ stdenv.mkDerivation rec { preBuild = '' substituteInPlace Makefile --replace "/etc/rc.d" "$out/etc/rc.d" ''; + configureFlags = "--with-pdftops=pdftops --enable-imagefilters"; + makeFlags = "CUPS_SERVERBIN=$(out)/lib/cups CUPS_DATADIR=$(out)/share/cups CUPS_SERVERROOT=$(out)/etc/cups"; + postConfigure = + '' + # Ensure that bannertopdf can find the PDF templates in + # $out. (By default, it assumes that cups and cups-filters are + # installed in the same prefix.) + substituteInPlace config.h --replace ${cups}/share/cups/data $out/share/cups/data + + # Ensure that gstoraster can find gs in $PATH. + substituteInPlace filter/gstoraster.c --replace execve execvpe + ''; + + patches = [ + (substituteAll { + src = ./longer-shell-path.patch; + bash = "${bash}/bin/bash"; + }) + ]; + + postInstall = + '' + for i in $out/lib/cups/filter/{pstopdf,texttops,imagetops}; do + substituteInPlace $i --replace 'which ' 'type -p ' + done + ''; + meta = { homepage = http://www.linuxfoundation.org/collaborate/workgroups/openprinting/cups-filters; description = "Backends, filters, and other software that was once part of the core CUPS distribution but is no longer maintained by Apple Inc"; diff --git a/pkgs/misc/cups/longer-shell-path.patch b/pkgs/misc/cups/longer-shell-path.patch new file mode 100644 index 00000000000..a15fd483225 --- /dev/null +++ b/pkgs/misc/cups/longer-shell-path.patch @@ -0,0 +1,13 @@ +diff --git a/filter/foomatic-rip/foomaticrip.c b/filter/foomatic-rip/foomaticrip.c +index 1c019aa..431d2f9 100644 +--- a/filter/foomatic-rip/foomaticrip.c ++++ b/filter/foomatic-rip/foomaticrip.c +@@ -174,7 +174,7 @@ char cupsfilterpath[PATH_MAX] = "/usr/local/lib/cups/filter:" + "/opt/cups/filter:" + "/usr/lib/cups/filter"; + +-char modern_shell[64] = "/bin/bash"; ++char modern_shell[128] = "@bash@"; + + void config_set_option(const char *key, const char *value) + { diff --git a/pkgs/misc/drivers/gutenprint/bin.nix b/pkgs/misc/drivers/gutenprint/bin.nix index 1def4b7d1c9..828fbb8884b 100644 --- a/pkgs/misc/drivers/gutenprint/bin.nix +++ b/pkgs/misc/drivers/gutenprint/bin.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation { phases = "buildPhase"; - libPath = stdenv.lib.makeLibraryPath [ stdenv.gcc.gcc zlib ]; + libPath = stdenv.lib.makeLibraryPath [ stdenv.cc.gcc zlib ]; buildPhase = '' ar -x $src data.tar.gz @@ -53,7 +53,7 @@ stdenv.mkDerivation { $out/cups/lib/backend/{canon,epson} \ $out/sbin/cups-genppd.5.0 \ ; do - patchelf --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \ + patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ --set-rpath $libPath $p done diff --git a/pkgs/misc/emulators/dolphin-emu/master.nix b/pkgs/misc/emulators/dolphin-emu/master.nix index becf5e60db6..1bb23911c86 100644 --- a/pkgs/misc/emulators/dolphin-emu/master.nix +++ b/pkgs/misc/emulators/dolphin-emu/master.nix @@ -30,7 +30,9 @@ stdenv.mkDerivation rec { homepage = http://dolphin-emu.org/; description = "Gamecube/Wii/Triforce emulator for x86_64 and ARM"; license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.linux; maintainers = with stdenv.lib.maintainers; [ MP2E ]; + # x86_32 is an unsupported platform. + # Enable generic build if you really want a JIT-less binary. + platforms = [ "x86_64-linux" ]; }; } diff --git a/pkgs/misc/emulators/nestopia/build-fix.patch b/pkgs/misc/emulators/nestopia/build-fix.patch new file mode 100644 index 00000000000..a7d82ead15c --- /dev/null +++ b/pkgs/misc/emulators/nestopia/build-fix.patch @@ -0,0 +1,18 @@ +diff -wbBur rdanbrook-nestopia-f1dde9b/Makefile rdanbrook-nestopia-f1dde9b.my/Makefile +--- rdanbrook-nestopia-f1dde9b/Makefile 2013-01-20 20:10:25.000000000 +0400 ++++ rdanbrook-nestopia-f1dde9b.my/Makefile 2013-01-21 15:18:54.727577673 +0400 +@@ -197,11 +197,11 @@ + install -m 0644 NstDatabase.xml $(DATADIR) + install -m 0644 source/unix/icons/*.png $(DATADIR)/icons + install -m 0644 source/unix/icons/*.svg $(DATADIR)/icons +- install -m 0644 source/unix/icons/nestopia.svg $(PREFIX)/share/pixmaps +- xdg-desktop-menu install --novendor $(DATADIR)/nestopia.desktop ++ install -m 0644 source/unix/icons/nestopia.svg $(PREFIX)/share/pixmaps/nestopia.svg ++ install -Dm0644 $(DATADIR)/nestopia.desktop $(PREFIX)/share/applications/nestopia.desktop + + uninstall: +- xdg-desktop-menu uninstall $(DATADIR)/nestopia.desktop ++ rm $(PREFIX)/share/applications/nestopia.desktop + rm $(PREFIX)/share/pixmaps/nestopia.svg + rm $(BINDIR)/$(BIN) + rm -rf $(DATADIR) diff --git a/pkgs/misc/emulators/nestopia/default.nix b/pkgs/misc/emulators/nestopia/default.nix new file mode 100644 index 00000000000..f2aa1e06ec8 --- /dev/null +++ b/pkgs/misc/emulators/nestopia/default.nix @@ -0,0 +1,38 @@ +{ stdenv, fetchurl, pkgconfig, SDL2, alsaLib, gtk3, mesa_glu, makeWrapper +, mesa, libarchive, libao, unzip, xdg_utils, gsettings_desktop_schemas }: + +stdenv.mkDerivation rec { + name = "nestopia-1.46.2"; + src = fetchurl { + url = https://github.com/rdanbrook/nestopia/archive/1.46.2.tar.gz; + sha256 = "07h49xwvg61dx20rk5p4r3ax2ar5y0ppvm60cqwqljyi9rdfbh7p"; + }; + + enableParallelBuilding = true; + + buildInputs = [ pkgconfig SDL2 alsaLib gtk3 mesa_glu mesa makeWrapper + libarchive libao unzip xdg_utils gsettings_desktop_schemas ]; + + installPhase = '' + mkdir -p $out/{bin,share/nestopia} + make install PREFIX=$out + ''; + + preFixup = '' + for f in $out/bin/*; do + wrapProgram $f \ + --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH:$out/share" + done + ''; + + patches = [ ./build-fix.patch ]; + + meta = { + homepage = http://0ldsk00l.ca/nestopia/; + description = "NES emulator with a focus on accuracy"; + license = stdenv.lib.licenses.gpl2; + platforms = stdenv.lib.platforms.linux; + maintainers = with stdenv.lib.maintainers; [ MP2E ]; + }; +} + diff --git a/pkgs/misc/emulators/retroarch/cores.nix b/pkgs/misc/emulators/retroarch/cores.nix index 5da82ab3452..01670ca4688 100644 --- a/pkgs/misc/emulators/retroarch/cores.nix +++ b/pkgs/misc/emulators/retroarch/cores.nix @@ -9,7 +9,7 @@ let stdenv.lib.makeOverridable stdenv.mkDerivation rec { name = "libretro-${core}-${version}"; - version = "20141109"; + version = "20141224"; inherit src; buildInputs = [ makeWrapper retroarch zlib ] ++ a.extraBuildInputs or []; @@ -53,8 +53,8 @@ in core = "4do"; src = fetchRetro { repo = core + "-libretro"; - rev = "be95d71e0a7f9cd5f378b9a9793ef38a16d81f26"; - sha256 = "0s8fs42xa01c2qaznhnlvi4syafgyzrw8lzz8l5lipyrzrawj9dm"; + rev = "47fee1687d8946e84af2ef4d28a693f5f14199d3"; + sha256 = "0bhn761akcb5623yvbndm79pbfackbhaqcaqhrqwvk0ja13pry4l"; }; description = "Port of 4DO/libfreedo to libretro"; }).override { @@ -65,8 +65,8 @@ in core = "bsnes-mercury"; src = fetchRetro { repo = core; - rev = "41e0425b5e13be15c46be847ea00c757f241ab58"; - sha256 = "0i6lvf6m702pam8jngg9arcysmwm6g4cv83n987h9c0ny3lf0n90"; + rev = "6e08947a3eeee4c3ac0c33a5e6739cde02dbda3c"; + sha256 = "1dkbjhm99r26fagypqlgdrp6v4dhs554cspzp1maryl3nrr57wf8"; }; description = "Fork of bsnes with HLE DSP emulation restored"; }).override { @@ -77,8 +77,8 @@ in core = "desmume"; src = fetchRetro { repo = core; - rev = "4aefde628b35cda78a2bdf47f2f0a565c0a386a0"; - sha256 = "0rkf4vdjlqj850b28drjm4w3vq0jj02ipsbfhpr23i79n4r2pi5a"; + rev = "362fee2cc242082d73cd0f7260554e202dd80d78"; + sha256 = "0n27kgjqam81q0cbmnmlq1dslyg9wbnz96r8pwjlbv7pp97rp7br"; }; description = "libretro wrapper for desmume NDS emulator"; }).override { @@ -89,8 +89,8 @@ in core = "fceumm"; src = fetchRetro { repo = "libretro-" + core; - rev = "1655de8b6ca8ad36287e04ac6179e6618521d41f"; - sha256 = "0v4kais1qhbc0nxaarc99cx3vnc5sgr2yp4ajh97wb90srsdkh46"; + rev = "b10d6d4600bfe6b0f2d793785d19a46479a4e7ef"; + sha256 = "1nrs8hb5yb0iigz1nhzzamlmybjyhjcb41y07ckwx9kzx0w72sjz"; }; description = "FCEUmm libretro port"; }; @@ -99,8 +99,8 @@ in core = "fba"; src = fetchRetro { repo = core + "-libretro"; - rev = "586ea5e4a1bd61f3d209dfbf18bca66b1bbb92cc"; - sha256 = "0cqaqxirf5l1i4fwcdsjd7nnzb3xgfr5k9vdlj9y9k4viffd6drd"; + rev = "55023b0466465f9d50ad82fd6f1549a89234bcab"; + sha256 = "147a9if99mnv12fp70r4h3171m95gzmiq6rlf9axf4693h6kzb02"; }; description = "Port of Final Burn Alpha to libretro"; }).override { @@ -115,8 +115,8 @@ in core = "gambatte"; src = fetchRetro { repo = core + "-libretro"; - rev = "3283b2943a9164d3bb88bd62a20f74e33fffc058"; - sha256 = "0yl03zrb09n1w5ija38z7vi7vvaqdmy65v397g3bfm99rrl8g2kw"; + rev = "6aa6a514b58671106352a525cbc9c39ce8633cdd"; + sha256 = "0ai0l8wwi61rsq4cm3h5n039s78xrhrxvxn4nbav1mn70ynzijx7"; }; description = "Gambatte libretro port"; }).override { @@ -127,8 +127,8 @@ in core = "genesis-plus-gx"; src = fetchRetro { repo = "Genesis-Plus-GX"; - rev = "67d86709a279422f2c3c769ac910682df29397db"; - sha256 = "18m03yjakjg2hcasrjqyz54r55vrn8wwq768zhk6x8gdnnhqc1hy"; + rev = "3b3eae18e742b99142ea2a412e80b9152933ab59"; + sha256 = "01mn2m1wg026wy1ffcv36wv0pvm18xnin27v681vd7bma96dl7p0"; }; description = "Enhanced Genesis Plus libretro port"; }; @@ -137,8 +137,8 @@ in core = "mednafen-pce-fast"; src = fetchRetro { repo = "beetle-pce-fast-libretro"; - rev = "a26abf39887bb994f9b3e7645e46e6455e992729"; - sha256 = "0iws9fyw7m6wpr9vly66nzrfmiafrb96bnxidb1mdqgnldkwh8zi"; + rev = "0a389287025c0166e7b89bf0320ab1c6f8a5a561"; + sha256 = "1s8l3pddgw060wb177wx6ysa040k45wy5vlvbjjvq1rj3352izk4"; }; description = "Port of Mednafen's PC Engine core to libretro"; }).override { @@ -149,8 +149,8 @@ in core = "mupen64plus"; src = fetchRetro { repo = core + "-libretro"; - rev = "fc97025211c82e4298034b9a7fe9f0a074c9eef7"; - sha256 = "04dq7rygfk47bix18a12cajb2k1k3absk5jmykcbg8znvcnlf4pi"; + rev = "b97ce52e49d255cd3e87fd6dc44ddd9a596d0be4"; + sha256 = "1disddd35c45ffp7irsgcf0y906f44d7rkjv96gxs6vvzwxifiih"; }; description = "Libretro port of Mupen64 Plus, GL only"; @@ -163,8 +163,8 @@ in core = "nestopia"; src = fetchRetro { repo = core; - rev = "d3d9ed1b3f8e32e8cbf90e72e8ed37d9fe1624c3"; - sha256 = "081dhxgr05m1warqga3fxmdnzyaa9c9bjw1b6glbsdgbl9iq4wq9"; + rev = "3b030c93edcc8f49e2f6323b1df7fc78759accd8"; + sha256 = "0gr4s6p40j5qiyg94kpa8v3083cbp2ccdq5zp6kkpjskxzkdfhqg"; }; description = "nestopia undead libretro port"; }).override { @@ -175,8 +175,8 @@ in core = "picodrive"; src = fetchRetro { repo = core; - rev = "54c1a1e8c284ede3e0da887ec4ce088f78f7fc30"; - sha256 = "0qd3daxgq5jdp46gff6ih65nnksil8j26v0wdf798mignknq4p44"; + rev = "2babf3518e258cc3d6649f6e34a267e83dffd7d9"; + sha256 = "13l9ppr8v33a7jmgjpg9hqwim30mybscnwqj2bch5v0w6h3qynzh"; }; description = "Fast MegaDrive/MegaCD/32X emulator"; @@ -190,8 +190,8 @@ in core = "prboom"; src = fetchRetro { repo = "libretro-" + core; - rev = "5adbe263ce9771c8c5e007f94cfbb193979158ac"; - sha256 = "0yj8fy3ax52k9kmsf70g57dh889m80hjc3wqz9f3fp6xyxzpvz1j"; + rev = "437fd00bf58158bf3c5e2e49237d9344f320584a"; + sha256 = "0g9dvmywph5r8ly20bn3xkm12271n726s5g9z0f2pd75pnv13q86"; }; description = "Prboom libretro port"; }).override { @@ -202,8 +202,8 @@ in core = "ppsspp"; src = fetchRetro { repo = "libretro-" + core; - rev = "a4956befd41f388ebfc28ea555e0f9325b76c1d3"; - sha256 = "0v91i6257b7rpdlylcswcxfkan6knswb166ia5y4yr8pldc1kbj6"; + rev = "b82a36232f677f48e95d6f284184cb8c935d4ad2"; + sha256 = "0bzqs9v37qyh6dl5jsrmm46iwy04h7ypgnibxajrxg1795ccb3rr"; }; description = "ppsspp libretro port"; extraBuildInputs = [ mesa ffmpeg ]; @@ -215,8 +215,8 @@ in core = "quicknes"; src = fetchRetro { repo = "QuickNES_Core"; - rev = "06f83f603c52ad8fae197beca6fdf241ed338dc3"; - sha256 = "065yy5jm0b43xdn0dswp06h2b11dzvbyrsyjvigrax5mjy5mi6wd"; + rev = "0dab65e2a962640c517f23f2668b76315faf977e"; + sha256 = "12cv2ph72y6c0clcqssdyma1jxn8yi7x2ifyf2g77rbaswxr26r4"; }; description = "QuickNES libretro port"; }).override { @@ -227,8 +227,8 @@ in core = "scummvm"; src = fetchRetro { repo = core; - rev = "7dc8e24f1759dfca852014451dfca9103d8b1f04"; - sha256 = "12ya5g6d1bpsf332w5h49jjcxbr3dbjqiaddd3p7s6gzlyzzg1xf"; + rev = "bf30f7a146ab3d0ea5bcff43b1db489118b78cdf"; + sha256 = "1xgl2vsssa5mxhavcyghxrbab4lfbp9gnpy6ckhrxdd0n08kvyys"; }; description = "Libretro port of ScummVM"; @@ -241,8 +241,8 @@ in core = "snes9x"; src = fetchRetro { repo = core; - rev = "e57447bbfd5daf62a00e1a31cfa400b419fe7963"; - sha256 = "06p7m8whazy9gih968f4nzdsp66n1fg6q3g2lbwwzj6izlli5cyg"; + rev = "e41b0a2832fdcacc30498f23ddadd193376f837f"; + sha256 = "0k9zxc9g6hhkc18mdgskjp99ljgay8jqmqhir4aahsfqyxhwypgm"; }; description = " Port of SNES9x git to libretro"; }).override { @@ -253,8 +253,8 @@ in core = "snes9x-next"; src = fetchRetro { repo = core; - rev = "8fd34aeadf421c758702d820dedb58a4d10b01a2"; - sha256 = "0vwg6qkpdqzkb4cvk50czl5g69qg8n5s2fhi9rvaq383ngv6sdsh"; + rev = "c04566c04b1f07979f8a8f6d5bbcb844d7594aec"; + sha256 = "0lmrbmjk7qnkgz7n7dm744nps8zgbv76kz62vcja2kl5bq24kaxc"; }; description = "Optimized port/rewrite of SNES9x 1.52+ to Libretro"; }; @@ -263,8 +263,8 @@ in core = "stella"; src = fetchRetro { repo = core + "-libretro"; - rev = "31a455828e8f72c53283cb782e799ce54e4f1ee6"; - sha256 = "0ab7prnc2igbmzlh6gh7ln25c6767w4ypgskl1xsbn93k2dwzkpx"; + rev = "4c8e93ce4b250b3b2d2743bae48eca25983f29db"; + sha256 = "1r016r9a0vwdnlms9s9hnzvszvkhpshjiyi2zql0zs2c1jbja6ia"; }; description = "Port of Stella to libretro"; }).override { @@ -275,8 +275,8 @@ in core = "vbam"; src = fetchRetro { repo = core + "-libretro"; - rev = "9b851867cffab8416edd89d8fe92bbad7f82810e"; - sha256 = "1n6wgxwcg7xm3vy0xigr1qbjkyxj5b2ih1pqpifjx83c47a9m9ka"; + rev = "9baba21956add58fba7c411ddd752682f0d93270"; + sha256 = "1dxshbkgv7xjg3lzv9lwsyhgxjmxzfsvd6xpwmdmh3pjllfrgy1p"; }; description = "vanilla VBA-M libretro port"; }).override { @@ -287,8 +287,8 @@ in core = "vba-next"; src = fetchRetro { repo = core; - rev = "97a74706f57a9d01c02cb764b5140185308f80c8"; - sha256 = "0m80bd843pvagbggi5xxnwljaijl97lcqml76n62zx4rzx8256y7"; + rev = "54c37ea9e26c5480352eee92a80eb659c9b5cb39"; + sha256 = "0hkd1n00i3kwr5ids7b2c034xvx3nskg2316nli99ky511yq5cfd"; }; description = "VBA-M libretro port with modifications for speed"; }; diff --git a/pkgs/misc/emulators/retroarch/default.nix b/pkgs/misc/emulators/retroarch/default.nix index aa17bac7343..faa143d9273 100644 --- a/pkgs/misc/emulators/retroarch/default.nix +++ b/pkgs/misc/emulators/retroarch/default.nix @@ -4,12 +4,12 @@ stdenv.mkDerivation rec { name = "retroarch-bare-${version}"; - version = "20141109"; + version = "20141224"; src = fetchgit { url = git://github.com/libretro/RetroArch.git; - rev = "88b21b87e7554860f4b252bc59ac99fa4032393e"; - sha256 = "0w2diklpv7wl6bmdw4msn90qn7f650q789crdawn63nbqg0rj8a2"; + rev = "8b4176263988e750daf0c6d709fdceb4672e111e"; + sha256 = "1l2iqgb7vlkh6kcwr4ggcn58ldyh63v9zvjmv26z8pxiqa1zr1xs"; }; buildInputs = [ pkgconfig ffmpeg mesa nvidia_cg_toolkit freetype libxml2 libv4l coreutils diff --git a/pkgs/misc/emulators/wine/stable.nix b/pkgs/misc/emulators/wine/stable.nix index 60b4e24cf2c..49591a3f38f 100644 --- a/pkgs/misc/emulators/wine/stable.nix +++ b/pkgs/misc/emulators/wine/stable.nix @@ -4,7 +4,7 @@ }: assert stdenv.isLinux; -assert stdenv.gcc.gcc != null; +assert stdenv.cc.gcc != null; let version = "1.6.2"; @@ -46,7 +46,7 @@ in stdenv.mkDerivation rec { # them to the RPATH so that the user doesn't have to set them in # LD_LIBRARY_PATH. NIX_LDFLAGS = map (path: "-rpath ${path}/lib ") [ - freetype fontconfig stdenv.gcc.gcc mesa mesa_noglu.osmesa libdrm + freetype fontconfig stdenv.cc.gcc mesa mesa_noglu.osmesa libdrm xlibs.libXinerama xlibs.libXrender xlibs.libXrandr xlibs.libXcursor xlibs.libXcomposite libpng libjpeg openssl gnutls cups @@ -65,7 +65,7 @@ in stdenv.mkDerivation rec { paxmark psmr $out/bin/wine{,-preloader} - wrapProgram $out/bin/wine --prefix LD_LIBRARY_PATH : ${stdenv.gcc.gcc}/lib + wrapProgram $out/bin/wine --prefix LD_LIBRARY_PATH : ${stdenv.cc.gcc}/lib ''; enableParallelBuilding = true; diff --git a/pkgs/misc/emulators/wine/unstable.nix b/pkgs/misc/emulators/wine/unstable.nix index aa99d696f5f..fa421dce603 100644 --- a/pkgs/misc/emulators/wine/unstable.nix +++ b/pkgs/misc/emulators/wine/unstable.nix @@ -4,15 +4,15 @@ }: assert stdenv.isLinux; -assert stdenv.gcc.gcc != null; +assert stdenv.cc.gcc != null; let - version = "1.7.30"; + version = "1.7.33"; name = "wine-${version}"; src = fetchurl { url = "mirror://sourceforge/wine/${name}.tar.bz2"; - sha256 = "0v08w2av46y4wxrl8q4k9fhbi2cgawjaxclahqnpfw098bqcmxqh"; + sha256 = "0xcjsh3635i8wpzixzsl05m3dkq74vq193x3ipjr3fy0l9prslg3"; }; gecko = fetchurl { @@ -46,7 +46,7 @@ in stdenv.mkDerivation rec { # them to the RPATH so that the user doesn't have to set them in # LD_LIBRARY_PATH. NIX_LDFLAGS = map (path: "-rpath ${path}/lib ") [ - freetype fontconfig stdenv.gcc.gcc mesa mesa_noglu.osmesa libdrm + freetype fontconfig stdenv.cc.gcc mesa mesa_noglu.osmesa libdrm xlibs.libXinerama xlibs.libXrender xlibs.libXrandr xlibs.libXcursor xlibs.libXcomposite libpng libjpeg openssl gnutls cups ncurses @@ -62,7 +62,7 @@ in stdenv.mkDerivation rec { install -D ${gecko} $out/share/wine/gecko/${gecko64.name} '' + '' install -D ${mono} $out/share/wine/mono/${mono.name} - wrapProgram $out/bin/wine --prefix LD_LIBRARY_PATH : ${stdenv.gcc.gcc}/lib + wrapProgram $out/bin/wine --prefix LD_LIBRARY_PATH : ${stdenv.cc.gcc}/lib ''; enableParallelBuilding = true; diff --git a/pkgs/misc/foldingathome/default.nix b/pkgs/misc/foldingathome/default.nix index 945d6556837..aaa932c0a1c 100644 --- a/pkgs/misc/foldingathome/default.nix +++ b/pkgs/misc/foldingathome/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation { installPhase = '' BINFILES="fah6 mpiexec"; for a in $BINFILES; do - patchelf --set-interpreter $(cat $NIX_GCC/nix-support/dynamic-linker) $a + patchelf --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) $a done mkdir -p $out/bin cp $BINFILES $out/bin diff --git a/pkgs/misc/gxemul/default.nix b/pkgs/misc/gxemul/default.nix index 5cad3c964e4..8538932339c 100644 --- a/pkgs/misc/gxemul/default.nix +++ b/pkgs/misc/gxemul/default.nix @@ -1,4 +1,4 @@ -{ composableDerivation, fetchurl }: +{ stdenv, composableDerivation, fetchurl }: let edf = composableDerivation.edf; name = "gxemul-0.4.6"; @@ -29,9 +29,9 @@ composableDerivation.composableDerivation {} { configurePhase = "./configure"; meta = { - license = "BSD"; + license = stdenv.lib.licenses.bsd3; description = "A Machine Emulator, mainly emulates MIPS, but supports other CPU types"; - homepage = http://gavare.se/gxemul/; + homepage = http://gxemul.sourceforge.net/; }; mergeAttrBy = { installPhase = a : b : "${a}\n${b}"; }; diff --git a/pkgs/misc/my-env/default.nix b/pkgs/misc/my-env/default.nix index 7d37576e4cd..b9b29cdabe3 100644 --- a/pkgs/misc/my-env/default.nix +++ b/pkgs/misc/my-env/default.nix @@ -58,7 +58,7 @@ { mkDerivation, substituteAll, pkgs }: { stdenv ? pkgs.stdenv, name, buildInputs ? [] - , propagatedBuildInputs ? [], gcc ? stdenv.gcc, cTags ? [], extraCmds ? "" + , propagatedBuildInputs ? [], gcc ? stdenv.cc, cTags ? [], extraCmds ? "" , cleanupCmds ? "", shell ? "${pkgs.bashInteractive}/bin/bash --norc"}: mkDerivation { diff --git a/pkgs/misc/screensavers/alock/default.nix b/pkgs/misc/screensavers/alock/default.nix index 9db2fe45ed3..c2405c9c380 100644 --- a/pkgs/misc/screensavers/alock/default.nix +++ b/pkgs/misc/screensavers/alock/default.nix @@ -2,13 +2,13 @@ , libX11, pam, libgcrypt, libXrender, imlib2 }: stdenv.mkDerivation rec { - date = "20140724"; + date = "20141209"; name = "alock-${date}"; src = fetchgit { url = https://github.com/Arkq/alock; - rev = "928ae09a85627570b7f6986fe161b71327405fc0"; - sha256 = "0z605w2cf0pc988qq931b2zis6dqavm0wcjfdmr6q4vamvinjfv0"; + rev = "5ab7e6014faa1659c2d55bf9734bfa3ce7137443"; + sha256 = "07wf3vxh54ncxslp3zf8m7szpqbissxf8q9rs5zgvg333zdqd49s"; }; preConfigure = "autoreconf -fvi"; diff --git a/pkgs/misc/screensavers/xscreensaver/default.nix b/pkgs/misc/screensavers/xscreensaver/default.nix index 29acf04000c..cb937a94000 100644 --- a/pkgs/misc/screensavers/xscreensaver/default.nix +++ b/pkgs/misc/screensavers/xscreensaver/default.nix @@ -4,12 +4,12 @@ }: stdenv.mkDerivation rec { - version = "5.30"; + version = "5.32"; name = "xscreensaver-${version}"; src = fetchurl { url = "http://www.jwz.org/xscreensaver/${name}.tar.gz"; - sha256 = "0ljx10fsypdddcx43lwhrwqa9ksp9djv7p4i1y7760m4frl1fw9p"; + sha256 = "1gckra8lsd383av15r7lv9rszw6mp8n1gpcb5qs5nbrdkl3sclj2"; }; buildInputs = diff --git a/pkgs/misc/themes/gtk3/clearlooks-phenix/default.nix b/pkgs/misc/themes/gtk3/clearlooks-phenix/default.nix new file mode 100644 index 00000000000..905e26998a0 --- /dev/null +++ b/pkgs/misc/themes/gtk3/clearlooks-phenix/default.nix @@ -0,0 +1,36 @@ +{ stdenv, fetchurl, gtk }: + +stdenv.mkDerivation rec { + version = "5.0.7"; + name = "clearlooks-phenix-${version}"; + + src = fetchurl { + url = "http://github.com/jpfleury/clearlooks-phenix/archive/${version}.tar.gz"; + sha256 = "107jx3p3zwzy8xy0m8hwzs1kp8j60xgc3dja27r3vwhb3x3y1i8k"; + }; + + dontBuild = true; + installPhase = '' + mkdir -p $out/share/themes/Clearlooks-Phenix + cp -r . $out/share/themes/Clearlooks-Phenix/ + ''; + + preferLocalBuild = true; + + meta = with stdenv.lib; { + description = "GTK3 port of the Clearlooks theme"; + longDescription = '' + The Clearlooks-Phénix project aims at creating a GTK3 port of Clearlooks, + the default theme for Gnome 2. Style is also included for GTK2, Unity and + for Metacity, Openbox and Xfwm4 window managers. + + You should install this theme into your user profile and then set + GTK_DATA_PREFIX to `~/.nix-profile`. + ''; + homepage = https://github.com/jpfleury/clearlooks-phenix; + downloadPage = https://github.com/jpfleury/clearlooks-phenix/releases; + license = licenses.gpl3; + maintainers = [ maintainers.prikhi ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix index af75adf2976..2ca31d523fe 100644 --- a/pkgs/misc/vim-plugins/default.nix +++ b/pkgs/misc/vim-plugins/default.nix @@ -1,153 +1,24 @@ # TODO check that no license information gets lost -{ fetchurl, bash, stdenv, python, cmake, vim, perl, ruby, unzip, which, fetchgit, fetchzip, llvmPackages, zip }: +{ fetchurl, bash, stdenv, python, cmake, vim, vimUtils, perl, ruby, unzip, + which, fetchgit, fetchhg, fetchzip, llvmPackages, zip, vim_configurable, + vimPlugins +}: -/* -Typical plugin files: - - plugin/P1.vim - autoload/P1.vim - ftplugin/xyz.vim - doc/plugin-documentation.txt (traditional documentation) - README(.md) (nowadays thanks to github) - -Traditionally plugins were installed into ~/.vim/* so it was your task to keep track -of which files belong to what plugin. Now this problem is "fixed" by nix which -assembles your profile for you. - -Vim offers the :h rtp setting which works for most plugins. Thus adding adding -this to your .vimrc should make most plugins work: - - set rtp+=~/.nix-profile/share/vim-plugins/youcompleteme - " or for p in ["youcompleteme"] | exec 'set rtp+=~/.nix-profile/share/vim-plugins/'.p | endfor - -Its what pathogen, vundle, vim-addon-manager (VAM) and others use. -Learn about some differences by visiting http://vim-wiki.mawercer.de/wiki/topic/vim%20plugin%20managment.html. - -If you want Nix to create a .vimrc for you have a look at vimrc in all-packages.nix. -It also contains VAM code illustrating how to make VAM find plugins in arbitrary locations -*/ - -# provide a function creating tag files for vim help documentation (doc/*.txt) - -let rtpPath = "share/vim-plugins"; - - vimHelpTags = '' - vimHelpTags(){ - if [ -d "$1/doc" ]; then - ${vim}/bin/vim -N -u NONE -i NONE -n -e -s -c "helptags $1/doc" +quit! - fi - } - ''; - - addRtp = path: derivation: - derivation // { rtp = "${derivation}/${path}"; }; - - buildVimPlugin = a@{ - name, - namePrefix ? "vimplugin-", - src, - buildPhase ? "", - path ? (builtins.parseDrvName name).name, - ... - }: - addRtp "${rtpPath}/${path}" (stdenv.mkDerivation (a // { - name = namePrefix + name; - - inherit buildPhase; - - installPhase = '' - target=$out/${rtpPath}/${path} - mkdir -p $out/${rtpPath} - cp -r . $target - ${vimHelpTags} - vimHelpTags $target - ''; - })); +let +inherit (vimUtils.override {inherit vim;}) rtpPath addRtp buildVimPlugin + buildVimPluginFrom2Nix vimHelpTags; in -# The attr names in this set should be equal to names used in the vim-pi project [1] so that -# VAM's dependencies work. How to find the name? -# * http://vam.mawercer.de/ or VAM's -# * grep vim-pi -# * use VAM's completion or :AddonsInfo command -# -# How to create derivations? Experimental derivation creation is provided by VAM, example usage: -# call nix#ExportPluginsForNix({'path_to_nixpkgs': '/etc/nixos/nixpkgs', 'names': ["vim-addon-manager", "vim-addon-nix"], 'cache_file': 'cache'}) -# -# [1] https://bitbucket.org/vimcommunity/vim-pi -/* - Some of the plugin definitions below are generated the following VimL command - provided by vim-addon-manager. - - " Copy /tmp/tmp.vim file and run: :source /tmp/tmp.vim - call nix#ExportPluginsForNix({ - \ 'path_to_nixpkgs': '/etc/nixos/nixpkgs', - \ 'cache_file': '/tmp/vim2nix-cache', - \ 'names': [ - \ "vim-addon-syntax-checker", - \ "vim-addon-other", - \ "vim-addon-local-vimrc", - \ "snipmate", - \ "vim-snippets", - \ "vim-addon-mru", - \ "vim-addon-commenting", - \ "vim-addon-sql", - \ "vim-addon-async", - \ "vim-addon-toggle-buffer", - \ "vim-addon-mw-utils", - \ "matchit.zip", - \ "vim-addon-xdebug", - \ "vim-addon-php-manual", - \ "sourcemap.vim", - \ "vim-iced-coffee-script", - \ "ctrlp", - \ "commentary", - \ "Colour_Sampler_Pack", - \ "Solarized", - \ "vim-coffee-script", - \ "vim-easy-align", - \ "Tagbar", - \ "Tabular", - \ "table-mode", - \ "Syntastic", - \ "vim-signature", - \ "surround", - \ "Supertab", - \ "rust", - \ "rainbow_parentheses", - \ "pathogen", - \ "quickfixstatus", - \ "The_NERD_Commenter", - \ "The_NERD_tree", - \ "vim-latex-live-preview", - \ "Hoogle", - \ "Gundo", - \ "vim-gitgutter", - \ "Gist", - \ "ghcmod", - \ "fugitive", - \ "extradite", - \ "vim-airline", - \ "VimOutliner", - \ "vim2hs", - \ "undotree", - \ "UltiSnips", - \ "wombat256", - \ "vundle", - \ "WebAPI", - \ "YankRing", - \ "vim-addon-manager", - \ "vim-addon-nix", - \ "YUNOcommit" - \ ], - \ }) - -# TODO: think about how to add license information? -*/ - +# This attrs contains two sections: +# The first contains plugins added manually, the second contains plugins +# generated by call nix#ExportPluginsForNix. +# Documentation & usage see vim-utils.nix. +# attribute names should be the same as used by vim-pi to make dependency +# resolution work rec { - inherit rtpPath; + + ### section I: manually mantained plugins a = buildVimPlugin { name = "a-git-2010-11-06"; @@ -192,28 +63,6 @@ rec { }; }; - coffee-script = vim-coffee-script; - - coffeeScript = coffee-script; # backwards compat, added 2014-10-18 - - colors-solarized = Solarized; - - colorsamplerpack = Colour_Sampler_Pack; - - Colour_Sampler_Pack = buildVimPlugin { - name = "Colour_Sampler_Pack"; - src = fetchurl { - url = "http://www.vim.org/scripts/download_script.php?src_id=18915"; - name = "ColorSamplerPack.zip"; - sha256 = "1wsrb3vpqn9fncnalfpvc8r92wk1mcskm4shb3s2h9x5dyihf2rd"; - }; - buildInputs = [ unzip ]; - dependencies = []; - meta = { - url = "http://www.vim.org/scripts/script.php?script_id=625"; - }; - }; - command-t = buildVimPlugin rec { version = "1.8"; name = "command-t-${version}"; @@ -233,28 +82,6 @@ rec { command_T = command-t; # backwards compat, added 2014-10-18 - commentary = buildVimPlugin { - name = "commentary"; - src = fetchgit { - url = "git://github.com/tpope/vim-commentary"; - rev = "401dbd8abee69defe66acf5e9ccc85e2746c27e2"; - sha256 = "3deec79d6c40a6c91fa504423f38c9f6a9e3495804f1996e2420d0ad34fe2da8"; - }; - dependencies = []; - }; - - ctrlp = buildVimPlugin { - name = "ctrlp"; - src = fetchgit { - url = "git://github.com/kien/ctrlp.vim"; - rev = "b5d3fe66a58a13d2ff8b6391f4387608496a030f"; - sha256 = "41f7884973770552395b96f8693da70999dc815462d4018c560d3ff6be462e76"; - }; - dependencies = []; - }; - - easy-align = vim-easy-align; - easymotion = buildVimPlugin { name = "easymotion-git-2014-09-29"; src = fetchgit { @@ -284,51 +111,6 @@ rec { }; }; - extradite = buildVimPlugin { - name = "extradite"; - src = fetchgit { - url = "git://github.com/int3/vim-extradite"; - rev = "af4f3a51b6b654d655121b93c0cd9d8fe9a0c85d"; - sha256 = "d1d29cfbc654134be383747f2cd6b14b7a87de75f997af6a041f14d7ef61ade6"; - }; - dependencies = []; - }; - - fugitive = buildVimPlugin { - name = "fugitive"; - src = fetchgit { - url = "git://github.com/tpope/vim-fugitive"; - rev = "0374322ba5d85ae44dd9dc44ef31ca015a59097e"; - sha256 = "3bb09693726c4f9fc1695bc8b40c45d64a6a0f1d9a4243b4a79add841013ad6c"; - }; - dependencies = []; - }; - - ghc-mod-vim = ghcmod; - - ghcmod = buildVimPlugin { - name = "ghcmod"; - src = fetchgit { - url = "git://github.com/eagletmt/ghcmod-vim"; - rev = "d5c6c7f3c85608b5b76dc3e7e001f60b86c32cb9"; - sha256 = "ab56d470ea18da3fae021e22bba14460505e61a94f8bf707778dff5eec51cd6d"; - }; - dependencies = []; - }; - - Gist = buildVimPlugin { - name = "Gist"; - src = fetchgit { - url = "git://github.com/mattn/gist-vim"; - rev = "d609d93472db9cf45bd701bebe51adc356631547"; - sha256 = "e5cabc03d5015c589a32f11c654ab9fbd1e91d26ba01f4b737685be81852c511"; - }; - buildInputs = [ zip ]; - dependencies = []; - }; - - gist-vim = Gist; - gitgutter = vim-gitgutter; golang = buildVimPlugin { @@ -344,18 +126,6 @@ rec { }; }; - Gundo = buildVimPlugin { - name = "Gundo"; - src = fetchgit { - url = "https://bitbucket.org/sjl/gundo.vim"; - rev = ""; - sha256 = ""; - }; - dependencies = []; - }; - - gundo = Gundo; - hardtime = buildVimPlugin { name = "hardtime-git-2014-10-21"; src = fetchgit { @@ -424,18 +194,6 @@ rec { }; }; - Hoogle = buildVimPlugin { - name = "Hoogle"; - src = fetchgit { - url = "git://github.com/Twinside/vim-hoogle"; - rev = "81f28318b0d4174984c33df99db7752891c5c4e9"; - sha256 = "0f96f3badb6218cac87d0f7027ff032ecc74f08ad3ada542898278ce11cbd5a0"; - }; - dependencies = []; - }; - - hoogle = Hoogle; - idris-vim = buildVimPlugin { name = "idris-vim-git-2014-10-14"; src = fetchgit { @@ -475,8 +233,6 @@ rec { }; }; - latex-live-preview = vim-latex-live-preview; - lushtags = buildVimPlugin { name = "lushtags-git-2013-12-27"; src = fetchgit { @@ -490,20 +246,6 @@ rec { }; }; - matchit.zip = buildVimPlugin { - name = "matchit.zip"; - src = fetchurl { - url = "http://www.vim.org/scripts/download_script.php?src_id=8196"; - name = "matchit.zip"; - sha256 = "1bbm8j1bhb70kagwdimwy9vcvlrz9ax5bk2a7wrmn4cy87f9xj4l"; - }; - buildInputs = [ unzip ]; - dependencies = []; - meta = { - url = "http://www.vim.org/scripts/script.php?script_id=39"; - }; - }; - neco-ghc = buildVimPlugin { name = "neco-ghc-git-2014-10-17"; src = fetchgit { @@ -560,28 +302,6 @@ rec { nerdcommenter = The_NERD_Commenter; - nerdtree = The_NERD_tree; - - pathogen = buildVimPlugin { - name = "pathogen"; - src = fetchgit { - url = "git://github.com/tpope/vim-pathogen"; - rev = "91e6378908721d20514bbe5d18d292a0a15faf0c"; - sha256 = "24c1897d6b58576b2189c90050a7f8ede72a51343c752e9d030e833dbe5cac6f"; - }; - dependencies = []; - }; - - quickfixstatus = buildVimPlugin { - name = "quickfixstatus"; - src = fetchgit { - url = "git://github.com/dannyob/quickfixstatus"; - rev = "fd3875b914fc51bbefefa8c4995588c088163053"; - sha256 = "7b6831d5da1c23d95f3158c67e4376d32c2f62ab2e30d02d3f3e14dcfd867d9b"; - }; - dependencies = []; - }; - quickrun = buildVimPlugin { name = "quickrun-git-2014-10-08"; src = fetchgit { @@ -614,26 +334,6 @@ rec { }; }; - rainbow_parentheses = buildVimPlugin { - name = "rainbow_parentheses"; - src = fetchgit { - url = "git://github.com/kien/rainbow_parentheses.vim"; - rev = "eb8baa5428bde10ecc1cb14eed1d6e16f5f24695"; - sha256 = "47975a426d06f41811882691d8a51f32bc72f590477ed52b298660486b2488e3"; - }; - dependencies = []; - }; - - rust = buildVimPlugin { - name = "rust"; - src = fetchgit { - url = "git://github.com/wting/rust.vim"; - rev = "0cf510adc5a83ad4c256f576fd36b38c74349d43"; - sha256 = "839f4ea2e045fc41fa2292882576237dc36d714bd78e46728c6696c44d2851d8"; - }; - dependencies = []; - }; - shabadou = buildVimPlugin { name = "shabadou-git-2014-07-27"; src = fetchgit { @@ -647,38 +347,6 @@ rec { }; }; - signature = vim-signature; - - snipmate = buildVimPlugin { - name = "snipmate"; - src = fetchgit { - url = "git://github.com/garbas/vim-snipmate"; - rev = "e6eb057a58e2fe98137997157d0eff9d1a975888"; - sha256 = "4d8f9091b92a75f21d96a6f6a862aa4ad5671ab8317ceef4498eeb14a1524190"; - }; - dependencies = ["vim-addon-mw-utils" "tlib"]; - }; - - Solarized = buildVimPlugin { - name = "Solarized"; - src = fetchgit { - url = "git://github.com/altercation/vim-colors-solarized"; - rev = "528a59f26d12278698bb946f8fb82a63711eec21"; - sha256 = "a1b2ef696eee94dafa76431c31ee260acdd13a7cf87939f27eca431d5aa5a315"; - }; - dependencies = []; - }; - - sourcemap.vim = buildVimPlugin { - name = "sourcemap.vim"; - src = fetchgit { - url = "git://github.com/chikatoike/sourcemap.vim"; - rev = "0dd82d40faea2fdb0771067f46c01deb41610ba1"; - sha256 = "a08c77aea39be4a0a980d62673d1d17fecc518a8aeb9101210e453aaacb78fbd"; - }; - dependencies = []; - }; - stylish-haskell = buildVimPlugin { name = "stylish-haskell-git-2014-07-14"; src = fetchgit { @@ -694,50 +362,6 @@ rec { stylishHaskell = stylish-haskell; # backwards compat, added 2014-10-18 - Supertab = buildVimPlugin { - name = "Supertab"; - src = fetchgit { - url = "git://github.com/ervandew/supertab"; - rev = "fd4e0d06c2b1d9bff2eef1d15e7895b3b4da7cd7"; - sha256 = "5919521b95519d4baa8ed146c340ca739fa7f31dfd305c74ca0ace324ba93d74"; - }; - dependencies = []; - }; - - supertab = Supertab; - - surround = buildVimPlugin { - name = "surround"; - src = fetchgit { - url = "git://github.com/tpope/vim-surround"; - rev = "fa433e0b7330753688f715f3be5d10dc480f20e5"; - sha256 = "5f01daf72d23fc065f4e4e8eac734275474f32bfa276a9d90ce0d20dfe24058d"; - }; - dependencies = []; - }; - - Syntastic = buildVimPlugin { - name = "Syntastic"; - src = fetchgit { - url = "git://github.com/scrooloose/syntastic"; - rev = "e4c94d67a9ba7f35397b4a2f0daa8f346a84a8b9"; - sha256 = "366b5568ddf0db0e35a19bbd3ae4d0dc4accaefe5fdd14159540d26a76e3a96e"; - }; - dependencies = []; - }; - - syntastic = Syntastic; - - table-mode = buildVimPlugin { - name = "table-mode"; - src = fetchgit { - url = "git://github.com/dhruvasagar/vim-table-mode"; - rev = "ea78f6256513b4b853ea01b55b18baf0f9d99f8c"; - sha256 = "570a9660b17489ec6a976d878aec45470bc91c8da41f0e3ab8f09962683b2da7"; - }; - dependencies = []; - }; - tabmerge = buildVimPlugin { name = "tabmerge-git-2010-10-17"; src = fetchgit { @@ -751,30 +375,6 @@ rec { }; }; - Tabular = buildVimPlugin { - name = "Tabular"; - src = fetchgit { - url = "git://github.com/godlygeek/tabular"; - rev = "60f25648814f0695eeb6c1040d97adca93c4e0bb"; - sha256 = "28c860ad621587f2c3213fae47d1a3997746527c17d51e9ab94c209eb7bfeb0f"; - }; - dependencies = []; - }; - - tabular = Tabular; - - Tagbar = buildVimPlugin { - name = "Tagbar"; - src = fetchgit { - url = "git://github.com/majutsushi/tagbar"; - rev = "5283bc834a8c39b058d5eef1173e323b23b04fa0"; - sha256 = "ed2bcbbb9caf476251cbbe650fc685b9e781390f9966f0c75ff02da0677deb1c"; - }; - dependencies = []; - }; - - tagbar = Tagbar; - taglist = buildVimPlugin { name = "taglist-4.6"; meta = with stdenv.lib; { @@ -798,26 +398,6 @@ rec { buildInputs = [ unzip ]; }; - The_NERD_Commenter = buildVimPlugin { - name = "The_NERD_Commenter"; - src = fetchgit { - url = "git://github.com/scrooloose/nerdcommenter"; - rev = "6549cfde45339bd4f711504196ff3e8b766ef5e6"; - sha256 = "ef270ae5617237d68b3d618068e758af8ffd8d3ba27a3799149f7a106cfd178e"; - }; - dependencies = []; - }; - - The_NERD_tree = buildVimPlugin { - name = "The_NERD_tree"; - src = fetchgit { - url = "git://github.com/scrooloose/nerdtree"; - rev = "f8fd2ecce20f5005e6313ce57d6d2a209890c946"; - sha256 = "b86f8923d4068add210101d34c5272b575dcb1c1352992ee878af59db581fd75"; - }; - dependencies = []; - }; - thumbnail = buildVimPlugin { name = "thumbnail-git-2014-07-24"; src = fetchgit { @@ -831,16 +411,6 @@ rec { }; }; - tlib = buildVimPlugin { - name = "tlib"; - src = fetchgit { - url = "git://github.com/tomtom/tlib_vim"; - rev = "88c5a2427e12397f9b5b1819e3d80c2eebe2c411"; - sha256 = "6cbbeb7fcda26028f73836ce3bae880db3e250cf8289804e6e28cb914854b7de"; - }; - dependencies = []; - }; - tmux-navigator = buildVimPlugin { name = "tmux-navigator-git-2014-09-09"; src = fetchgit { @@ -869,316 +439,6 @@ rec { }; }; - UltiSnips = buildVimPlugin { - name = "UltiSnips"; - src = fetchgit { - url = "git://github.com/sirver/ultisnips"; - rev = "cb8536d7240f5f458c292f8aa38fc50278222fe8"; - sha256 = "95bc88fc3dae45896893797cff9bb697f3701572c27442898c661d004b50be16"; - }; - dependencies = []; - }; - - undotree = buildVimPlugin { - name = "undotree"; - src = fetchgit { - url = "git://github.com/mbbill/undotree"; - rev = "88e4a9bc2f7916f24441faf884853a01ba11d294"; - sha256 = "ad55b88db051f57d0c7ddc226a7b7778daab58fa67dc8ac1d78432c0e7d38520"; - }; - dependencies = []; - }; - - vim-addon-actions = buildVimPlugin { - name = "vim-addon-actions"; - src = fetchgit { - url = "git://github.com/MarcWeber/vim-addon-actions"; - rev = "a5d20500fb8812958540cf17862bd73e7af64936"; - sha256 = "d2c3eb7a1f29e7233c6fcf3b02d07efebe8252d404ee593419ad399a5fdf6383"; - }; - dependencies = ["vim-addon-mw-utils" "tlib"]; - }; - - vim-addon-async = buildVimPlugin { - name = "vim-addon-async"; - src = fetchgit { - url = "git://github.com/MarcWeber/vim-addon-async"; - rev = "dadc96e188f1cdacbac62129eb29a1eacfed792c"; - sha256 = "27f941e21a8ca5940bd20914e2a9e3809e554f3ef2c27b3bafb9a153107a5d07"; - }; - dependencies = ["vim-addon-signs"]; - }; - - vim-addon-background-cmd = buildVimPlugin { - name = "vim-addon-background-cmd"; - src = fetchgit { - url = "git://github.com/MarcWeber/vim-addon-background-cmd"; - rev = "14df72660a95804a57c02b9ff0ae3198608e2491"; - sha256 = "5c2ece1f3ff7653eb7c1b40180554e8e89e5ae43d67e7cc159d95c0156135687"; - }; - dependencies = ["vim-addon-mw-utils"]; - }; - - vim-addon-commenting = buildVimPlugin { - name = "vim-addon-commenting"; - src = fetchgit { - url = "git://github.com/MarcWeber/vim-addon-commenting"; - rev = "b7cf748ac1c9bf555cbd347589e3b7196030d20b"; - sha256 = "4ad7d5f6669f0a1b4a24c9ce3649c030d7d3fc8588de4d4d6c3269140fbe9b3e"; - }; - dependencies = []; - }; - - vim-addon-completion = buildVimPlugin { - name = "vim-addon-completion"; - src = fetchgit { - url = "git://github.com/MarcWeber/vim-addon-completion"; - rev = "80f717d68df5b0d7b32228229ddfd29c3e86e435"; - sha256 = "c8c0af8760f2622c4caef371482916861f68a850eb6a7cd746fe8c9ab405c859"; - }; - dependencies = ["tlib"]; - }; - - vim-addon-errorformats = buildVimPlugin { - name = "vim-addon-errorformats"; - src = fetchgit { - url = "git://github.com/MarcWeber/vim-addon-errorformats"; - rev = "dcbb203ad5f56e47e75fdee35bc92e2ba69e1d28"; - sha256 = "a1260206545d5ae17f2e6b3319f5cf1808b74e792979b1c6667d75974cc53f95"; - }; - dependencies = []; - }; - - vim-addon-goto-thing-at-cursor = buildVimPlugin { - name = "vim-addon-goto-thing-at-cursor"; - src = fetchgit { - url = "git://github.com/MarcWeber/vim-addon-goto-thing-at-cursor"; - rev = "f052e094bdb351829bf72ae3435af9042e09a6e4"; - sha256 = "34658ac99d9a630db9c544b3dfcd2c3df69afa5209e27558cc022b7afc2078ea"; - }; - dependencies = ["tlib"]; - }; - - vim-addon-local-vimrc = buildVimPlugin { - name = "vim-addon-local-vimrc"; - src = fetchgit { - url = "git://github.com/MarcWeber/vim-addon-local-vimrc"; - rev = "7689b55ee86dd6046923fd28ceab49da3881abfe"; - sha256 = "f11d13676e2fdfcc9cabc991577f0b2e85909665b6f245aa02f21ff78d6a8556"; - }; - dependencies = []; - }; - - vim-addon-manager = buildVimPlugin { - name = "vim-addon-manager"; - src = fetchgit { - url = "git://github.com/MarcWeber/vim-addon-manager"; - rev = "d6de0d52bfe338eb373a4908b51b0eb89eaf42b0"; - sha256 = "4becba76d3389e4ace9e01c4393bc7bf38767eecf9eee239689054b9ee0c1fc9"; - }; - dependencies = []; - }; - - vim-addon-mru = buildVimPlugin { - name = "vim-addon-mru"; - src = fetchgit { - url = "git://github.com/MarcWeber/vim-addon-mru"; - rev = "e41e39bd9d1bf78ccfd8d5e1bc05ae5e1026c2bb"; - sha256 = "15b70f796f28cbd999060fea7f47408fa8a6cb176cd4915b9cc3dc6c53eed960"; - }; - dependencies = ["vim-addon-other" "vim-addon-mw-utils"]; - }; - - vim-addon-mw-utils = buildVimPlugin { - name = "vim-addon-mw-utils"; - src = fetchgit { - url = "git://github.com/MarcWeber/vim-addon-mw-utils"; - rev = "0c5612fa31ee434ba055e21c76f456244b3b5109"; - sha256 = "4e1b6d1b59050f1063e58ef4bee9e9603616ad184cd9ef7466d0ec3d8e22b91c"; - }; - dependencies = []; - }; - - vim-addon-nix = buildVimPlugin { - name = "vim-addon-nix"; - src = fetchgit { - url = "git://github.com/MarcWeber/vim-addon-nix"; - rev = "7b0a376bb1797fef8da2dc14e768f318bcb671e8"; - sha256 = "c2b0f6f50083063b5e801b872f38d4f00307fe5d7a4f3977a108e5cd10c1c410"; - }; - dependencies = ["vim-addon-completion" "vim-addon-goto-thing-at-cursor" "vim-addon-errorformats" "vim-addon-actions" "vim-addon-mw-utils" "tlib"]; - }; - - vim-addon-other = buildVimPlugin { - name = "vim-addon-other"; - src = fetchgit { - url = "git://github.com/MarcWeber/vim-addon-other"; - rev = "f78720c9cb5bf871cabb13c7cbf94378dbf0163b"; - sha256 = "43f027e4b7576031072515c23c2b09f7f2c8bba7ee43a1e2041a4371bd954d1b"; - }; - dependencies = ["vim-addon-actions" "vim-addon-mw-utils"]; - }; - - vim-addon-php-manual = buildVimPlugin { - name = "vim-addon-php-manual"; - src = fetchgit { - url = "git://github.com/MarcWeber/vim-addon-php-manual"; - rev = "e09ccdce3d2132771d0bd32884553207cc7122d0"; - sha256 = "b2f44be3a1ceca9de7789ea9b5fd36035b720ea529f4301f3771b010d1e453c2"; - }; - dependencies = []; - }; - - vim-addon-signs = buildVimPlugin { - name = "vim-addon-signs"; - src = fetchgit { - url = "git://github.com/MarcWeber/vim-addon-signs"; - rev = "17a49f293d18174ff09d1bfff5ba86e8eee8e8ae"; - sha256 = "a9c03a32e758d51106741605188cb7f00db314c73a26cae75c0c9843509a8fb8"; - }; - dependencies = []; - }; - - vim-addon-sql = buildVimPlugin { - name = "vim-addon-sql"; - src = fetchgit { - url = "git://github.com/MarcWeber/vim-addon-sql"; - rev = "05b8a0c211f1ae4c515c64e91dec555cdf20d90b"; - sha256 = "a1334ae694e0a03229bacc8ba7e08e7223df240244c7378e3f1bd91d74e957c2"; - }; - dependencies = ["vim-addon-completion" "vim-addon-background-cmd" "tlib"]; - }; - - vim-addon-syntax-checker = buildVimPlugin { - name = "vim-addon-syntax-checker"; - src = fetchgit { - url = "git://github.com/MarcWeber/vim-addon-syntax-checker"; - rev = "8eb7217e636ca717d4de5cd03cc0180c5b66ae77"; - sha256 = "aef048e664653b5007df71ac24ed34ec55d8938c763d3f80885a122e445a9b3d"; - }; - dependencies = ["vim-addon-mw-utils" "tlib"]; - }; - - vim-addon-toggle-buffer = buildVimPlugin { - name = "vim-addon-toggle-buffer"; - src = fetchgit { - url = "git://github.com/MarcWeber/vim-addon-toggle-buffer"; - rev = "a1b38b9c5709cba666ed2d84ef06548f675c6b0b"; - sha256 = "672166ecfe0599177afb56b444366f587f77e9659c256ac4e41ee45cb2df6055"; - }; - dependencies = ["vim-addon-mw-utils" "tlib"]; - }; - - vim-addon-xdebug = buildVimPlugin { - name = "vim-addon-xdebug"; - src = fetchgit { - url = "git://github.com/MarcWeber/vim-addon-xdebug"; - rev = "45f26407305b4ce6f8f5f37d2b5e6e4354104172"; - sha256 = "0a7bf2caf36772c94bd25bfbf46bf628623809c9cfab447ff788eb74149464ef"; - }; - dependencies = ["WebAPI" "vim-addon-mw-utils" "vim-addon-signs" "vim-addon-async"]; - }; - - vim-airline = buildVimPlugin { - name = "vim-airline"; - src = fetchgit { - url = "git://github.com/bling/vim-airline"; - rev = "256dec6800342c121c1b26dabc06dafb0c91edca"; - sha256 = "9bb684da91bffc80d8489210fc74476895be81772b1d1370ee0b9a9ec7469750"; - }; - dependencies = []; - }; - - vim-coffee-script = buildVimPlugin { - name = "vim-coffee-script"; - src = fetchgit { - url = "git://github.com/kchmck/vim-coffee-script"; - rev = "827e4a38b07479433b619091469a7495a392df8a"; - sha256 = "89ee4c7cce9f3310be502df6b2dd2e70a715c0b06882afc9c8169fbf58b207d0"; - }; - dependencies = []; - }; - - vim-easy-align = buildVimPlugin { - name = "vim-easy-align"; - src = fetchgit { - url = "git://github.com/junegunn/vim-easy-align"; - rev = "2595ebf9333f3598502276b29f78ad39965bc595"; - sha256 = "1223b587c515169d4b735bf56f109f7bfc4f7c1327e76865f498309f7472ef78"; - }; - dependencies = []; - }; - - vim-gitgutter = buildVimPlugin { - name = "vim-gitgutter"; - src = fetchgit { - url = "git://github.com/airblade/vim-gitgutter"; - rev = "39f011909620e0c7ae555efdace20c3963ac88af"; - sha256 = "585c367c8cf72d7ef511b3beca3d1eae1d68bbd61b9a8d4dc7aea6e0caa4813a"; - }; - dependencies = []; - }; - - vim-iced-coffee-script = buildVimPlugin { - name = "vim-iced-coffee-script"; - src = fetchgit { - url = "git://github.com/noc7c9/vim-iced-coffee-script"; - rev = "e42e0775fa4b1f8840c55cd36ac3d1cedbc1dea2"; - sha256 = "c7859591975a51a1736f99a433d7ca3e7638b417340a0472a63995e16d8ece93"; - }; - dependencies = ["vim-coffee-script"]; - }; - - vim-latex-live-preview = buildVimPlugin { - name = "vim-latex-live-preview"; - src = fetchgit { - url = "git://github.com/xuhdev/vim-latex-live-preview"; - rev = "18625ceca4de5984f3df50cdd0202fc13eb9e37c"; - sha256 = "261852d3830189a50176f997a4c6b4ec7e25893c5b7842a3eb57eb7771158722"; - }; - dependencies = []; - }; - - vim-signature = buildVimPlugin { - name = "vim-signature"; - src = fetchgit { - url = "git://github.com/kshenoy/vim-signature"; - rev = "29fc095535c4a3206d3194305739b33cd72ffad2"; - sha256 = "46101330cd291dd819552ba1f47571342fe671d6985d06897c34465b87fd7bc4"; - }; - dependencies = []; - }; - - vim-snippets = buildVimPlugin { - name = "vim-snippets"; - src = fetchgit { - url = "git://github.com/honza/vim-snippets"; - rev = "d05ca095ef93e256b45accb1e4b56ae3c44af125"; - sha256 = "1685ebe317ad1029bfc25e06c8f14cc3c14db887a7e1d743378c3748e416ac77"; - }; - dependencies = []; - }; - - vim2hs = buildVimPlugin { - name = "vim2hs"; - src = fetchgit { - url = "git://github.com/dag/vim2hs"; - rev = "f2afd55704bfe0a2d66e6b270d247e9b8a7b1664"; - sha256 = "485fc58595bb4e50f2239bec5a4cbb0d8f5662aa3f744e42c110cd1d66b7e5b0"; - }; - dependencies = []; - }; - - VimOutliner = buildVimPlugin { - name = "VimOutliner"; - src = fetchgit { - url = "git://github.com/vimoutliner/vimoutliner"; - rev = "91dccce033ca3924ad47831d29cd93fccc546013"; - sha256 = "c6dd19df1432908574e84a339a15076ddf8bfd6dfd2544b220928c29d9f752d3"; - }; - dependencies = []; - }; - vimproc = buildVimPlugin { name = "vimproc-git-2014-10-03"; src = fetchgit { @@ -1226,16 +486,6 @@ rec { ''; }; - vundle = buildVimPlugin { - name = "vundle"; - src = fetchgit { - url = "git://github.com/gmarik/vundle"; - rev = "0b28e334e65b6628b0a61c412fcb45204a2f2bab"; - sha256 = "9681d471d1391626cb9ad22b2b469003d9980cd23c5c3a8d34666376447e6204"; - }; - dependencies = []; - }; - watchdogs = buildVimPlugin { name = "watchdogs-git-2014-10-18"; src = fetchgit { @@ -1249,33 +499,6 @@ rec { }; }; - WebAPI = buildVimPlugin { - name = "WebAPI"; - src = fetchgit { - url = "git://github.com/mattn/webapi-vim"; - rev = "a7789abffe936db56e3152e23733847f94755753"; - sha256 = "455b84d9fd13200ff5ced5d796075f434a7fb9c00f506769174579266ae2be80"; - }; - buildInputs = [ zip ]; - dependencies = []; - }; - - webapi-vim = WebAPI; - - wombat256 = buildVimPlugin { - name = "wombat256"; - src = fetchurl { - url = "http://www.vim.org/scripts/download_script.php?src_id=13400"; - name = "wombat256mod.vim"; - sha256 = "1san0jg9sfm6chhnr1wc5nhczlp11ibca0v7i4gf68h9ick9mysn"; - }; - buildInputs = [ unzip ]; - dependencies = []; - meta = { - url = "http://www.vim.org/scripts/script.php?script_id=2465"; - }; - }; - xdebug = buildVimPlugin { name = "xdebug-git-2012-08-15"; src = fetchgit { @@ -1290,22 +513,6 @@ rec { }; }; - YankRing = buildVimPlugin { - name = "YankRing"; - src = fetchurl { - url = "http://www.vim.org/scripts/download_script.php?src_id=20842"; - name = "yankring_180.zip"; - sha256 = "0bsq4pxagy12jqxzs7gcf25k5ahwif13ayb9k8clyhm0jjdkf0la"; - }; - buildInputs = [ unzip ]; - dependencies = []; - meta = { - url = "http://www.vim.org/scripts/script.php?script_id=1234"; - }; - }; - - yankring = YankRing; - YouCompleteMe = addRtp "${rtpPath}/youcompleteme" (stdenv.mkDerivation { src = fetchgit { url = "https://github.com/Valloric/YouCompleteMe.git"; @@ -1354,11 +561,624 @@ rec { YUNOcommit = buildVimPlugin { name = "YUNOcommit"; src = fetchgit { - url = "git://github.com/esneide/YUNOcommit.vim"; - rev = "10e0d674bfba05e88359dbe0ded4eb1d806b1342"; - sha256 = "8efe7129ccc1cd13a09ffd4b5f8abe1fca12c434768ff57b865844cf40d49b41"; + url = "https://github.com/esneider/YUNOcommit.vim"; + rev = "981082055a73ef076d7e27477874d2303153a448"; + sha256 = "4bfd80720c353884e5c373b5457397a63e5e2e4ab4a97d6ce86c1740ac3b4c56"; + }; dependencies = []; }; + + ### section II: automatically generated plugin derivations + # Update with vimUtils.vimPlugins.pluginnames2Nix command + + # This is not a plugin, it provides bin/vim-open-buffer-with-plugins-derivations + # which recreates this the following derivations based on ./vim-plugin-names + pluginnames2nix = vimUtils.pluginnames2Nix { + name = "vim-plugin-names-to-nix"; + namefiles = [./vim-plugin-names]; + }; + + # aliasess + tabular = Tabular; + tagbar = Tagbar; + coffee-script = vim-coffee-script; + coffeeScript = coffee-script; # backwards compat, added 2014-10-18 + colors-solarized = Solarized; + colorsamplerpack = Colour_Sampler_Pack; + easy-align = vim-easy-align; + ghc-mod-vim = ghcmod; + gist-vim = Gist; + gundo = Gundo; + hoogle = Hoogle; + latex-live-preview = vim-latex-live-preview; + nerdtree = The_NERD_tree; + signature = vim-signature; + supertab = Supertab; + syntastic = Syntastic; + webapi-vim = WebAPI; + yankring = YankRing; + + + ### The following derivations are generated by nix#ExportPluginsForNix + + "Colour_Sampler_Pack" = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "Colour_Sampler_Pack"; + src = fetchurl { + url = "http://www.vim.org/scripts/download_script.php?src_id=18915"; + name = "ColorSamplerPack.zip"; + sha256 = "1wsrb3vpqn9fncnalfpvc8r92wk1mcskm4shb3s2h9x5dyihf2rd"; + }; + buildInputs = [ unzip ]; + dependencies = []; + meta = { + url = "http://www.vim.org/scripts/script.php?script_id=625"; + }; + + + }; + "Gist" = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "Gist"; + src = fetchgit { + url = "git://github.com/mattn/gist-vim"; + rev = "d609d93472db9cf45bd701bebe51adc356631547"; + sha256 = "e5cabc03d5015c589a32f11c654ab9fbd1e91d26ba01f4b737685be81852c511"; + }; + dependencies = []; + + }; + "Gundo" = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "Gundo"; + src = fetchhg { + url = "https://bitbucket.org/sjl/gundo.vim"; + rev = "eb9fc8676b89"; + sha256 = "05lcxrd9ibfi02ja4jvl5y5pp884b8kh9aarw045b0mlldygv6cp"; + }; + dependencies = []; + + }; + "Hoogle" = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "Hoogle"; + src = fetchgit { + url = "git://github.com/Twinside/vim-hoogle"; + rev = "81f28318b0d4174984c33df99db7752891c5c4e9"; + sha256 = "0f96f3badb6218cac87d0f7027ff032ecc74f08ad3ada542898278ce11cbd5a0"; + }; + dependencies = []; + + }; + "Solarized" = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "Solarized"; + src = fetchgit { + url = "git://github.com/altercation/vim-colors-solarized"; + rev = "528a59f26d12278698bb946f8fb82a63711eec21"; + sha256 = "a1b2ef696eee94dafa76431c31ee260acdd13a7cf87939f27eca431d5aa5a315"; + }; + dependencies = []; + + }; + "Supertab" = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "Supertab"; + src = fetchgit { + url = "git://github.com/ervandew/supertab"; + rev = "b0ca47f4570385043f270f9278ba6d50d1d2fa00"; + sha256 = "24e3e63096a6b6f7f00d985ae6f31377154566d6483fb81572a474053fa43082"; + }; + dependencies = []; + + }; + "Syntastic" = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "Syntastic"; + src = fetchgit { + url = "git://github.com/scrooloose/syntastic"; + rev = "30b4ce3411f539f695ab8def7fc69c2f835eb8fe"; + sha256 = "c61e2bcd4455525ec2520d75e7b204e39757731f85f5f72ed179f2068ac33700"; + }; + dependencies = []; + + }; + "Tabular" = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "Tabular"; + src = fetchgit { + url = "git://github.com/godlygeek/tabular"; + rev = "60f25648814f0695eeb6c1040d97adca93c4e0bb"; + sha256 = "28c860ad621587f2c3213fae47d1a3997746527c17d51e9ab94c209eb7bfeb0f"; + }; + dependencies = []; + + }; + "Tagbar" = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "Tagbar"; + src = fetchgit { + url = "git://github.com/majutsushi/tagbar"; + rev = "f9c5f24576e82aae5ab8a5480f1ae48615354e40"; + sha256 = "e1ff486f27c0980fee959db69da5617c4653910504b20aeabe87037a8b68712a"; + }; + dependencies = []; + + }; + "The_NERD_Commenter" = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "The_NERD_Commenter"; + src = fetchgit { + url = "git://github.com/scrooloose/nerdcommenter"; + rev = "6549cfde45339bd4f711504196ff3e8b766ef5e6"; + sha256 = "ef270ae5617237d68b3d618068e758af8ffd8d3ba27a3799149f7a106cfd178e"; + }; + dependencies = []; + + }; + "The_NERD_tree" = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "The_NERD_tree"; + src = fetchgit { + url = "git://github.com/scrooloose/nerdtree"; + rev = "3b98a7fcae8f9fff356907171f0406ff8cd28921"; + sha256 = "deec2ce33249829ae3925478d7d1925ea99e20c37dcc86db7c3bfac4fdc706e0"; + }; + dependencies = []; + + }; + "UltiSnips" = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "UltiSnips"; + src = fetchgit { + url = "git://github.com/sirver/ultisnips"; + rev = "b26f2c97b7d9be708eef0b4ba0cdfb53c868d9c3"; + sha256 = "094055f6255d207c04e26f15ee15019eb9d4b1710c24061c7f8074d23583b9b2"; + }; + dependencies = []; + + }; + "VimOutliner" = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "VimOutliner"; + src = fetchgit { + url = "git://github.com/vimoutliner/vimoutliner"; + rev = "469f49b5f28bc2b838a80568c9413f690cc3ffb6"; + sha256 = "38f88f9bbc43622809404c0054a7a4e9b2214166f3b2784511e4fda05bcb4713"; + }; + dependencies = []; + + }; + "WebAPI" = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "WebAPI"; + src = fetchgit { + url = "git://github.com/mattn/webapi-vim"; + rev = "a7789abffe936db56e3152e23733847f94755753"; + sha256 = "455b84d9fd13200ff5ced5d796075f434a7fb9c00f506769174579266ae2be80"; + }; + dependencies = []; + + }; + "YankRing" = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "YankRing"; + src = fetchurl { + url = "http://www.vim.org/scripts/download_script.php?src_id=20842"; + name = "yankring_180.zip"; + sha256 = "0bsq4pxagy12jqxzs7gcf25k5ahwif13ayb9k8clyhm0jjdkf0la"; + }; + buildInputs = [ unzip ]; + dependencies = []; + meta = { + url = "http://www.vim.org/scripts/script.php?script_id=1234"; + }; + + + }; + "commentary" = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "commentary"; + src = fetchgit { + url = "git://github.com/tpope/vim-commentary"; + rev = "9c685131a5facfa0d643feca3a61b41c007d8170"; + sha256 = "2a9f394d0669429469c2f1ddaf9a722c2773f35da08ea9496d3b4b4e85b6038d"; + }; + dependencies = []; + + }; + "ctrlp" = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "ctrlp"; + src = fetchgit { + url = "git://github.com/kien/ctrlp.vim"; + rev = "b5d3fe66a58a13d2ff8b6391f4387608496a030f"; + sha256 = "41f7884973770552395b96f8693da70999dc815462d4018c560d3ff6be462e76"; + }; + dependencies = []; + + }; + "extradite" = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "extradite"; + src = fetchgit { + url = "git://github.com/int3/vim-extradite"; + rev = "af4f3a51b6b654d655121b93c0cd9d8fe9a0c85d"; + sha256 = "d1d29cfbc654134be383747f2cd6b14b7a87de75f997af6a041f14d7ef61ade6"; + }; + dependencies = []; + + }; + "fugitive" = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "fugitive"; + src = fetchgit { + url = "git://github.com/tpope/vim-fugitive"; + rev = "2c8461db084d205903a792a23163faa546f143c9"; + sha256 = "c2569877958fcc5d181cc5b9e26d6b0b022c30aa9ce0908dd96131b44eb90729"; + }; + dependencies = []; + + }; + "ghcmod" = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "ghcmod"; + src = fetchgit { + url = "git://github.com/eagletmt/ghcmod-vim"; + rev = "d5c6c7f3c85608b5b76dc3e7e001f60b86c32cb9"; + sha256 = "ab56d470ea18da3fae021e22bba14460505e61a94f8bf707778dff5eec51cd6d"; + }; + dependencies = []; + + }; + "github:MarcWeber/vim-addon-vim2nix" = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "github-MarcWeber-vim-addon-vim2nix"; + src = fetchgit { + url = "git://github.com/MarcWeber/vim-addon-vim2nix"; + rev = "1aef89c05ef199fccff34be807ed7eefd914ca41"; + sha256 = "b078fd91cf978ee4cf7002630a83d3381ad781fa99e3ce118185b7f0f417ba2a"; + }; + dependencies = []; + + }; + "matchit.zip" = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "matchit.zip"; + src = fetchurl { + url = "http://www.vim.org/scripts/download_script.php?src_id=8196"; + name = "matchit.zip"; + sha256 = "1bbm8j1bhb70kagwdimwy9vcvlrz9ax5bk2a7wrmn4cy87f9xj4l"; + }; + buildInputs = [ unzip ]; + dependencies = []; + meta = { + url = "http://www.vim.org/scripts/script.php?script_id=39"; + }; + + unpackPhase = '' + ( + sourceRoot=d + mkdir $sourceRoot; cd $sourceRoot; + unzip $src + ) + ''; + }; + "pathogen" = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "pathogen"; + src = fetchgit { + url = "git://github.com/tpope/vim-pathogen"; + rev = "b9fb0dfd811004010f5f6903edef42d6004ebea2"; + sha256 = "62ec7e9721651aa86aa716d47c2057771f7d093f414c3b98f50a759d210db4c7"; + }; + dependencies = []; + + }; + "quickfixstatus" = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "quickfixstatus"; + src = fetchgit { + url = "git://github.com/dannyob/quickfixstatus"; + rev = "fd3875b914fc51bbefefa8c4995588c088163053"; + sha256 = "7b6831d5da1c23d95f3158c67e4376d32c2f62ab2e30d02d3f3e14dcfd867d9b"; + }; + dependencies = []; + + }; + "rainbow_parentheses" = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "rainbow_parentheses"; + src = fetchgit { + url = "git://github.com/kien/rainbow_parentheses.vim"; + rev = "eb8baa5428bde10ecc1cb14eed1d6e16f5f24695"; + sha256 = "47975a426d06f41811882691d8a51f32bc72f590477ed52b298660486b2488e3"; + }; + dependencies = []; + + }; + "rust" = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "rust"; + src = fetchgit { + url = "git://github.com/wting/rust.vim"; + rev = "0fd423990cfa69336fb6c1d5d58aa2091e7b4e76"; + sha256 = "21f3decedb24478bc391152bf26a9b88d9e4fa5fcdbdb8a558d95b6bb7be2ff1"; + }; + dependencies = []; + + }; + "snipmate" = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "snipmate"; + src = fetchgit { + url = "git://github.com/garbas/vim-snipmate"; + rev = "8cb6c3ebe267873dc5abb9a36305c75d9564dea4"; + sha256 = "f4692709724a50ff14ccdd5692d90ebdb950417267adb2228f5ce6006471bad4"; + }; + dependencies = ["vim-addon-mw-utils" "tlib"]; + + }; + "sourcemap.vim" = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "sourcemap.vim"; + src = fetchgit { + url = "git://github.com/chikatoike/sourcemap.vim"; + rev = "0dd82d40faea2fdb0771067f46c01deb41610ba1"; + sha256 = "a08c77aea39be4a0a980d62673d1d17fecc518a8aeb9101210e453aaacb78fbd"; + }; + dependencies = []; + + }; + "surround" = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "surround"; + src = fetchgit { + url = "git://github.com/tpope/vim-surround"; + rev = "fa433e0b7330753688f715f3be5d10dc480f20e5"; + sha256 = "5f01daf72d23fc065f4e4e8eac734275474f32bfa276a9d90ce0d20dfe24058d"; + }; + dependencies = []; + + }; + "table-mode" = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "table-mode"; + src = fetchgit { + url = "git://github.com/dhruvasagar/vim-table-mode"; + rev = "e1258702126463b30e32a8a4cd1ba28689a93ef8"; + sha256 = "2b8ac53a0a346f27db617dade3bd3e4da7d5b560a99c636da7d27cf5622a6690"; + }; + dependencies = []; + + }; + "undotree" = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "undotree"; + src = fetchgit { + url = "git://github.com/mbbill/undotree"; + rev = "88e4a9bc2f7916f24441faf884853a01ba11d294"; + sha256 = "ad55b88db051f57d0c7ddc226a7b7778daab58fa67dc8ac1d78432c0e7d38520"; + }; + dependencies = []; + + }; + "vim-addon-async" = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-addon-async"; + src = fetchgit { + url = "git://github.com/MarcWeber/vim-addon-async"; + rev = "dadc96e188f1cdacbac62129eb29a1eacfed792c"; + sha256 = "27f941e21a8ca5940bd20914e2a9e3809e554f3ef2c27b3bafb9a153107a5d07"; + }; + dependencies = ["vim-addon-signs"]; + + }; + "vim-addon-commenting" = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-addon-commenting"; + src = fetchgit { + url = "git://github.com/MarcWeber/vim-addon-commenting"; + rev = "b7cf748ac1c9bf555cbd347589e3b7196030d20b"; + sha256 = "4ad7d5f6669f0a1b4a24c9ce3649c030d7d3fc8588de4d4d6c3269140fbe9b3e"; + }; + dependencies = []; + + }; + "vim-addon-local-vimrc" = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-addon-local-vimrc"; + src = fetchgit { + url = "git://github.com/MarcWeber/vim-addon-local-vimrc"; + rev = "7689b55ee86dd6046923fd28ceab49da3881abfe"; + sha256 = "f11d13676e2fdfcc9cabc991577f0b2e85909665b6f245aa02f21ff78d6a8556"; + }; + dependencies = []; + + }; + "vim-addon-manager" = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-addon-manager"; + src = fetchgit { + url = "git://github.com/MarcWeber/vim-addon-manager"; + rev = "345c4b357843b14f4622f212e4d1e0e3f8a7f08a"; + sha256 = "d8fba7dd089f4a919f91dc284537880d7a841c26dacb503ea08b15dce35e7626"; + }; + dependencies = []; + + }; + "vim-addon-mru" = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-addon-mru"; + src = fetchgit { + url = "git://github.com/MarcWeber/vim-addon-mru"; + rev = "e41e39bd9d1bf78ccfd8d5e1bc05ae5e1026c2bb"; + sha256 = "15b70f796f28cbd999060fea7f47408fa8a6cb176cd4915b9cc3dc6c53eed960"; + }; + dependencies = ["vim-addon-other" "vim-addon-mw-utils"]; + + }; + "vim-addon-mw-utils" = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-addon-mw-utils"; + src = fetchgit { + url = "git://github.com/MarcWeber/vim-addon-mw-utils"; + rev = "0c5612fa31ee434ba055e21c76f456244b3b5109"; + sha256 = "4e1b6d1b59050f1063e58ef4bee9e9603616ad184cd9ef7466d0ec3d8e22b91c"; + }; + dependencies = []; + + }; + "vim-addon-nix" = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-addon-nix"; + src = fetchgit { + url = "git://github.com/MarcWeber/vim-addon-nix"; + rev = "7b0a376bb1797fef8da2dc14e768f318bcb671e8"; + sha256 = "c2b0f6f50083063b5e801b872f38d4f00307fe5d7a4f3977a108e5cd10c1c410"; + }; + dependencies = ["vim-addon-completion" "vim-addon-goto-thing-at-cursor" "vim-addon-errorformats" "vim-addon-actions" "vim-addon-mw-utils" "tlib"]; + + }; + "vim-addon-other" = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-addon-other"; + src = fetchgit { + url = "git://github.com/MarcWeber/vim-addon-other"; + rev = "f78720c9cb5bf871cabb13c7cbf94378dbf0163b"; + sha256 = "43f027e4b7576031072515c23c2b09f7f2c8bba7ee43a1e2041a4371bd954d1b"; + }; + dependencies = ["vim-addon-actions" "vim-addon-mw-utils"]; + + }; + "vim-addon-php-manual" = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-addon-php-manual"; + src = fetchgit { + url = "git://github.com/MarcWeber/vim-addon-php-manual"; + rev = "e09ccdce3d2132771d0bd32884553207cc7122d0"; + sha256 = "b2f44be3a1ceca9de7789ea9b5fd36035b720ea529f4301f3771b010d1e453c2"; + }; + dependencies = []; + + }; + "vim-addon-sql" = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-addon-sql"; + src = fetchgit { + url = "git://github.com/MarcWeber/vim-addon-sql"; + rev = "05b8a0c211f1ae4c515c64e91dec555cdf20d90b"; + sha256 = "a1334ae694e0a03229bacc8ba7e08e7223df240244c7378e3f1bd91d74e957c2"; + }; + dependencies = ["vim-addon-completion" "vim-addon-background-cmd" "tlib"]; + + }; + "vim-addon-syntax-checker" = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-addon-syntax-checker"; + src = fetchgit { + url = "git://github.com/MarcWeber/vim-addon-syntax-checker"; + rev = "8eb7217e636ca717d4de5cd03cc0180c5b66ae77"; + sha256 = "aef048e664653b5007df71ac24ed34ec55d8938c763d3f80885a122e445a9b3d"; + }; + dependencies = ["vim-addon-mw-utils" "tlib"]; + + }; + "vim-addon-toggle-buffer" = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-addon-toggle-buffer"; + src = fetchgit { + url = "git://github.com/MarcWeber/vim-addon-toggle-buffer"; + rev = "a1b38b9c5709cba666ed2d84ef06548f675c6b0b"; + sha256 = "672166ecfe0599177afb56b444366f587f77e9659c256ac4e41ee45cb2df6055"; + }; + dependencies = ["vim-addon-mw-utils" "tlib"]; + + }; + "vim-addon-xdebug" = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-addon-xdebug"; + src = fetchgit { + url = "git://github.com/MarcWeber/vim-addon-xdebug"; + rev = "45f26407305b4ce6f8f5f37d2b5e6e4354104172"; + sha256 = "0a7bf2caf36772c94bd25bfbf46bf628623809c9cfab447ff788eb74149464ef"; + }; + dependencies = ["WebAPI" "vim-addon-mw-utils" "vim-addon-signs" "vim-addon-async"]; + + }; + "vim-airline" = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-airline"; + src = fetchgit { + url = "git://github.com/bling/vim-airline"; + rev = "4a2208821e1d334c4d3cdf66cd1fd0968755e16a"; + sha256 = "ea2d8bb459ae2cc378a46409c7e86db9b1cc8349bd3d2451c9a5db8ae9c8ea1d"; + }; + dependencies = []; + + }; + "vim-coffee-script" = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-coffee-script"; + src = fetchgit { + url = "git://github.com/kchmck/vim-coffee-script"; + rev = "827e4a38b07479433b619091469a7495a392df8a"; + sha256 = "89ee4c7cce9f3310be502df6b2dd2e70a715c0b06882afc9c8169fbf58b207d0"; + }; + dependencies = []; + + }; + "vim-easy-align" = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-easy-align"; + src = fetchgit { + url = "git://github.com/junegunn/vim-easy-align"; + rev = "246139c57c4a82a9787974165dfeb7bee7dacc9c"; + sha256 = "9205b94f985f633b5cbdde63a4c5a36ce5c4f92f8a89c124ff4ba66458f98cbf"; + }; + dependencies = []; + + }; + "vim-gitgutter" = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-gitgutter"; + src = fetchgit { + url = "git://github.com/airblade/vim-gitgutter"; + rev = "88c7916d2f653e13cbbcd2c461c83c403d09ca46"; + sha256 = "df56b3cd81a71cd3a4286d878a4cfd7b53c3b7b09f3cf45fa41653050315056c"; + }; + dependencies = []; + + }; + "vim-iced-coffee-script" = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-iced-coffee-script"; + src = fetchgit { + url = "git://github.com/noc7c9/vim-iced-coffee-script"; + rev = "e42e0775fa4b1f8840c55cd36ac3d1cedbc1dea2"; + sha256 = "c7859591975a51a1736f99a433d7ca3e7638b417340a0472a63995e16d8ece93"; + }; + dependencies = []; + + }; + "vim-latex-live-preview" = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-latex-live-preview"; + src = fetchgit { + url = "git://github.com/xuhdev/vim-latex-live-preview"; + rev = "18625ceca4de5984f3df50cdd0202fc13eb9e37c"; + sha256 = "261852d3830189a50176f997a4c6b4ec7e25893c5b7842a3eb57eb7771158722"; + }; + dependencies = []; + + }; + "vim-signature" = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-signature"; + src = fetchgit { + url = "git://github.com/kshenoy/vim-signature"; + rev = "598a9275668d772ca18cc052246b96edcbe61de0"; + sha256 = "1c410aaec24840b0e0566cd6e6df100ca3c7fb83d92337efdfc359494b6c49f8"; + }; + dependencies = []; + + }; + "vim-snippets" = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-snippets"; + src = fetchgit { + url = "git://github.com/honza/vim-snippets"; + rev = "436038094a27ed635aaa11ebf50ccddc2d4b9328"; + sha256 = "1db34df31ff1526394de42997e21b47cea152dc2c014dbbb1f3bbeb8986820e1"; + }; + dependencies = []; + + }; + "vim2hs" = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim2hs"; + src = fetchgit { + url = "git://github.com/dag/vim2hs"; + rev = "f2afd55704bfe0a2d66e6b270d247e9b8a7b1664"; + sha256 = "485fc58595bb4e50f2239bec5a4cbb0d8f5662aa3f744e42c110cd1d66b7e5b0"; + }; + dependencies = []; + + }; + "vundle" = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vundle"; + src = fetchgit { + url = "git://github.com/gmarik/vundle"; + rev = "0b28e334e65b6628b0a61c412fcb45204a2f2bab"; + sha256 = "9681d471d1391626cb9ad22b2b469003d9980cd23c5c3a8d34666376447e6204"; + }; + dependencies = []; + + }; + "wombat256" = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "wombat256"; + src = fetchurl { + url = "http://www.vim.org/scripts/download_script.php?src_id=13400"; + name = "wombat256mod.vim"; + sha256 = "1san0jg9sfm6chhnr1wc5nhczlp11ibca0v7i4gf68h9ick9mysn"; + }; + buildInputs = [ unzip ]; + dependencies = []; + meta = { + url = "http://www.vim.org/scripts/script.php?script_id=2465"; + }; + + + }; + + } diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names new file mode 100644 index 00000000000..f685f6743be --- /dev/null +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -0,0 +1,55 @@ +"vim-addon-syntax-checker" +"vim-addon-other" +"vim-addon-local-vimrc" +"snipmate" +"vim-snippets" +"vim-addon-mru" +"vim-addon-commenting" +"vim-addon-sql" +"vim-addon-async" +"vim-addon-toggle-buffer" +"vim-addon-mw-utils" +"matchit.zip" +"vim-addon-xdebug" +"vim-addon-php-manual" +"sourcemap.vim" +"vim-iced-coffee-script" +"ctrlp" +"commentary" +"Colour_Sampler_Pack" +"Solarized" +"vim-coffee-script" +"vim-easy-align" +"Tagbar" +"Tabular" +"table-mode" +"Syntastic" +"vim-signature" +"surround" +"Supertab" +"rust" +"rainbow_parentheses" +"pathogen" +"quickfixstatus" +"The_NERD_Commenter" +"The_NERD_tree" +"vim-latex-live-preview" +"Hoogle" +"Gundo" +"vim-gitgutter" +"Gist" +"ghcmod" +"fugitive" +"extradite" +"vim-airline" +"VimOutliner" +"vim2hs" +"undotree" +"UltiSnips" +"wombat256" +"vundle" +"WebAPI" +"YankRing" +"vim-addon-manager" +"vim-addon-nix" +"github:MarcWeber/vim-addon-vim2nix" diff --git a/pkgs/misc/vim-plugins/vim-utils.nix b/pkgs/misc/vim-plugins/vim-utils.nix new file mode 100644 index 00000000000..6b5dd139525 --- /dev/null +++ b/pkgs/misc/vim-plugins/vim-utils.nix @@ -0,0 +1,384 @@ +{stdenv, vim, vimPlugins, vim_configurable, buildEnv, writeText, writeScriptBin}: + +/* + +USAGE EXAMPLE +============= + +Install Vim like this eg using nixos option environment.systemPackages which will provide +vim-with-plugins in PATH: + + vim_configurable.customize { + name = "vim-with-plugins"; + + # add custom .vimrc lines like this: + vimrcConfig.customRC = '' + set hidden + ''; + + vimrcConfig.vam.knownPlugins = pkgs.vimPlugins; # optional + vimrcConfig.vam.pluginDictionaries = [ + # load always + { name = "youcompleteme"; } + { names = ["youcompleteme" "foo"]; } + + # only load when opening a .php file + { name = "phpCompletion"; ft_regex = "^php\$"; } + { name = "phpCompletion"; filename_regex = "^.php\$"; } + + # provide plugin which can be loaded manually: + { name = "phpCompletion"; tag = "lazy"; } + + # full ducomentation at github.com/MarcWeber/vim-addon-manager + ]; + + # there is a pathogen implementation as well, but its startup is slower and [VAM] has more feature + # vimrcConfig.pathogen.knownPlugins = vimPlugins; # optional + # vimrcConfig.pathogen.pluginNames = ["vim-addon-nix"]; + }; + +WHAT IS A VIM PLUGIN? +===================== +Typical plugin files: + + plugin/P1.vim + autoload/P1.vim + ftplugin/xyz.vim + doc/plugin-documentation.txt (traditional documentation) + README(.md) (nowadays thanks to github) + + +Vim offers the :h rtp setting which works for most plugins. Thus adding +this to your .vimrc should make most plugins work: + + set rtp+=~/.nix-profile/share/vim-plugins/youcompleteme + " or for p in ["youcompleteme"] | exec 'set rtp+=~/.nix-profile/share/vim-plugins/'.p | endfor + +which is what the [VAM]/pathogen solutions above basically do. + +Learn about about plugin Vim plugin mm managers at +http://vim-wiki.mawercer.de/wiki/topic/vim%20plugin%20managment.html. + +The documentation can be accessed by Vim's :help command if it was tagged. +See vimHelpTags sample code below. + +CONTRIBUTING AND CUSTOMIZING +============================ +The example file pkgs/misc/vim-plugins/default.nix provides both: +* manually mantained plugins +* plugins created by VAM's nix#ExportPluginsForNix implementation + +I highly recommend to lookup vim plugin attribute names at the [vim-pi] project + which is a database containing all plugins from +vim.org and quite a lot of found at github and similar sources. vim-pi's documented purpose +is to associate vim.org script ids to human readable names so that dependencies +can be describe easily. + +How to find a name? + * http://vam.mawercer.de/ or VAM's + * grep vim-pi + * use VAM's completion or :AddonsInfo command + +It might happen than a plugin is not known by vim-pi yet. We encourage you to +contribute to vim-pi so that plugins can be updated automatically. + + +CREATING DERVITATIONS AUTOMATICALLY BY PLUGIN NAME +================================================== +Most convenient is to use a ~/.vim-scripts file putting a plugin name into each line +as documented by [VAM]'s README.md +It is the same format you pass to vimrcConfig.vam.pluginDictionaries from the +usage example above. + +Then create a temp vim file and insert: + + let opts = {} + let opts.path_to_nixpkgs = '/etc/nixos/nixpkgs' + let opts.cache_file = '/tmp/export-vim-plugin-for-nix-cache-file' + let opts.plugin_dictionaries = map(readfile("vim-plugins"), 'eval(v:val)') + " add more files + " let opts.plugin_dictionaries += map(.. other file ) + call nix#ExportPluginsForNix(opts) + +Then ":source %" it. + +nix#ExportPluginsForNix is provided by github.com/MarcWeber/vim-addon-vim2nix + +A buffer will open containing the plugin derivation lines as well list +fitting the vimrcConfig.vam.pluginDictionaries option. + +Thus the most simple usage would be: + + vim_with_plugins = + let vim = vim_configurable; + inherit (vimUtil.override {inherit vim}) rtpPath addRtp buildVimPlugin vimHelpTags; + vimPlugins = [ + # the derivation list from the buffer created by nix#ExportPluginsForNix + # don't set which will default to pkgs.vimPlugins + ]; + in vim.customize { + name = "vim-with-plugins"; + + vimrcConfig.customRC = '' .. ''; + + vimrcConfig.vam.knownPlugins = vimPlugins; + vimrcConfig.vam.pluginDictionaries = [ + # the plugin list form ~/.vim-scripts turned into nix format added to + # the buffer created by the nix#ExportPluginsForNix + ]; + } + +vim_with_plugins can be installed like any other application within Nix. + +[VAM] https://github.com/MarcWeber/vim-addon-manager +[vim-pi] https://bitbucket.org/vimcommunity/vim-pi +*/ + + +let + inherit (stdenv) lib; + + findDependenciesRecursively = {knownPlugins, names}: + + let depsOf = name: (builtins.getAttr name knownPlugins).dependencies or []; + + recurseNames = path: names: lib.concatMap (name: recurse ([name]++path)) names; + + recurse = path: + let name = builtins.head path; + in if builtins.elem name (builtins.tail path) + then throw "recursive vim dependencies" + else [name] ++ recurseNames path (depsOf name); + + in lib.uniqList { inputList = recurseNames [] names; }; + + vimrcFile = { + vam ? null, + pathogen ? null, + customRC ? "" + }: + + let + /* pathogen mostly can set &rtp at startup time. Its used very commonly. + */ + pathogenImpl = lib.optionalString (pathogen != null) + (let + knownPlugins = pathogen.knownPlugins or vimPlugins; + + plugins = map (name: knownPlugins.${name}) (findDependenciesRecursively { inherit knownPlugins; names = pathogen.pluginNames; }); + + pluginsEnv = buildEnv { + name = "pathogen-plugin-env"; + paths = map (x: "${x}/${vimPlugins.rtpPath}") plugins; + }; + in + '' + let &rtp.=(empty(&rtp)?"":',')."${vimPlugins.pathogen.rtp}" + execute pathogen#infect('${pluginsEnv}/{}') + ''); + + /* + vim-addon-manager = VAM + + * maps names to plugin location + + * manipulates &rtp at startup time + or when Vim has been running for a while + + * can activate plugins laziy (eg when loading a specific filetype) + + * knows about vim plugin dependencies (addon-info.json files) + + * still is minimalistic (only loads one file), the "check out" code it also + has only gets loaded when a plugin is requested which is not found on disk + yet + + */ + vamImpl = lib.optionalString (vam != null) + (let + knownPlugins = vam.knownPlugins or vimPlugins; + + toNames = x: + if builtins.isString x then [x] + else (lib.optional (x ? name) x.name) + ++ (x.names or []); + + names = findDependenciesRecursively { inherit knownPlugins; names = lib.concatMap toNames vam.pluginDictionaries; }; + + # Vim almost reads JSON, so eventually JSON support should be added to Nix + # TODO: proper quoting + toNix = x: + if (builtins.isString x) then "'${x}'" + else if builtins.isAttrs x && builtins ? out then toNix "${x}" # a derivation + else if builtins.isAttrs x then "{${lib.concatStringsSep ", " (lib.mapAttrsToList (n: v: "${toNix n}: ${toNix v}") x)}}" + else if builtins.isList x then "[${lib.concatMapStringsSep ", " toNix x}]" + else throw "turning ${lib.showVal x} into a VimL thing not implemented yet"; + + in assert builtins.hasAttr "vim-addon-manager" knownPlugins; + '' + let g:nix_plugin_locations = {} + ${lib.concatMapStrings (name: '' + let g:nix_plugin_locations['${name}'] = "${knownPlugins.${name}.rtp}" + '') names} + let g:nix_plugin_locations['vim-addon-manager'] = "${knownPlugins."vim-addon-manager".rtp}" + + let g:vim_addon_manager = {} + + if exists('g:nix_plugin_locations') + " nix managed config + + " override default function making VAM aware of plugin locations: + fun! NixPluginLocation(name) + let path = get(g:nix_plugin_locations, a:name, "") + return path == "" ? vam#DefaultPluginDirFromName(a:name) : path + endfun + let g:vim_addon_manager.plugin_dir_by_name = 'NixPluginLocation' + " tell Vim about VAM: + let &rtp.=(empty(&rtp)?"":','). g:nix_plugin_locations['vim-addon-manager'] + else + " standalone config + + let &rtp.=(empty(&rtp)?"":',').c.plugin_root_dir.'/vim-addon-manager' + if !isdirectory(c.plugin_root_dir.'/vim-addon-manager/autoload') + " checkout VAM + execute '!git clone --depth=1 git://github.com/MarcWeber/vim-addon-manager ' + \ shellescape(c.plugin_root_dir.'/vim-addon-manager', 1) + endif + endif + + " tell vam about which plugins to load when: + let l = [] + ${lib.concatMapStrings (p: "call add(l, ${toNix p})\n") vam.pluginDictionaries} + call vam#Scripts(l, {}) + ''); + + # somebody else could provide these implementations + vundleImpl = ""; + + neobundleImpl = ""; + + + in writeText "vimrc" '' + " minimal setup, generated by NIX + set nocompatible + filetype indent plugin on | syn on + + ${vamImpl} + ${pathogenImpl} + ${vundleImpl} + ${neobundleImpl} + + ${customRC} + ''; + +in + +rec { + inherit vimrcFile; + + # shell script with custom name passing [-u vimrc] [-U gvimrc] to vim + vimWithRC = {vimExecutable, name ? null, vimrcFile ? null, gvimrcFile ? null}: + let rcOption = o: file: stdenv.lib.optionalString (file != null) "-${o} ${file}"; + in writeScriptBin (if name == null then "vim" else name) '' + #!/bin/sh + exec ${vimExecutable} ${rcOption "u" vimrcFile} ${rcOption "U" gvimrcFile} "$@" + ''; + + # add a customize option to a vim derivation + makeCustomizable = vim: vim // { + customize = {name, vimrcConfig}: vimWithRC { + vimExecutable = "${vim}/bin/vim"; + inherit name; + vimrcFile = vimrcFile vimrcConfig; + }; + }; + + pluginnames2Nix = {name, namefiles} : vim_configurable.customize { + inherit name; + vimrcConfig.vam.knownPlugins = vimPlugins; + vimrcConfig.vam.pluginDictionaries = ["github:MarcWeber/vim-addon-vim2nix"]; + vimrcConfig.customRC = '' + " Yes - this is impure and will create the cache file and checkout vim-pi + " into ~/.vim/vim-addons + let g:vim_addon_manager.plugin_root_dir = "/tmp/vim2nix-".$USER + if !isdirectory(g:vim_addon_manager.plugin_root_dir) + call mkdir(g:vim_addon_manager.plugin_root_dir) + else + echom repeat("=", 80) + echom "WARNING: reusing cache directory :".g:vim_addon_manager.plugin_root_dir + echom repeat("=", 80) + endif + let opts = {} + let opts.nix_prefetch_git = "${../../../pkgs/build-support/fetchgit/nix-prefetch-git}" + let opts.nix_prefetch_hg = "${../../../pkgs/build-support/fetchhg/nix-prefetch-hg}" + let opts.cache_file = g:vim_addon_manager.plugin_root_dir.'/cache' + let opts.plugin_dictionaries = [] + ${lib.concatMapStrings (file: "let opts.plugin_dictionaries += map(readfile(\"${file}\"), 'eval(v:val)')\n") namefiles } + + " uncomment for debugging failures + " let opts.try_catch = 0 + + " add more files + " let opts.plugin_dictionaries += map(.. other file ) + call nix#ExportPluginsForNix(opts) + ''; + }; + + rtpPath = "share/vim-plugins"; + + vimHelpTags = '' + vimHelpTags(){ + if [ -d "$1/doc" ]; then + ${vim}/bin/vim -N -u NONE -i NONE -n -e -s -c "helptags $1/doc" +quit! + fi + } + ''; + + addRtp = path: derivation: + derivation // { rtp = "${derivation}/${path}"; }; + + buildVimPlugin = a@{ + name, + namePrefix ? "vimplugin-", + src, + unpackPhase ? "", + configurePhase ? "", + buildPhase ? "", + path ? (builtins.parseDrvName name).name, + addonInfo ? null, + ... + }: + addRtp "${rtpPath}/${path}" (stdenv.mkDerivation (a // { + name = namePrefix + name; + + inherit unpackPhase configurePhase buildPhase addonInfo; + + installPhase = '' + target=$out/${rtpPath}/${path} + mkdir -p $out/${rtpPath} + cp -r . $target + ${vimHelpTags} + vimHelpTags $target + if [ -n "$addonInfo" ]; then + echo "$addonInfo" > $target/addon-info.json + fi + ''; + })); + + buildVimPluginFrom2Nix = a: buildVimPlugin ({ + buildPhase = ":"; + configurePhase =":"; + } // a); + + # test cases: + test_vim_with_vim_addon_nix_using_vam = vim_configurable.customize { + name = "vim-with-vim-addon-nix-using-vam"; + vimrcConfig.vam.pluginDictionaries = [{name = "vim-addon-nix"; }]; + }; + + test_vim_with_vim_addon_nix_using_pathogen = vim_configurable.customize { + name = "vim-with-vim-addon-nix-using-pathogen"; + vimrcConfig.pathogen.pluginNames = [ "vim-addon-nix" ]; + }; + +} diff --git a/pkgs/misc/vim-plugins/vimrc.nix b/pkgs/misc/vim-plugins/vimrc.nix deleted file mode 100644 index 4e97d7f1d54..00000000000 --- a/pkgs/misc/vim-plugins/vimrc.nix +++ /dev/null @@ -1,203 +0,0 @@ -{stdenv, vimPlugins, vim_configurable, buildEnv, writeText, writeScriptBin}: - - /* usage example:: - let vimrcConfig = { - - # If you like pathogen use such - pathogen.knownPlugins = vimPlugins; # optional - pathogen.pluginNames = ["vim-addon-nix"]; - - # If you like VAM use such: - vam.knownPlugins = vimPlugins; # optional - vam.pluginDictionaries = [ - # load always - { name = "youcompleteme"; } - { names = ["youcompleteme" "foo"]; } - # only load when opening a .php file - { name = "phpCompletion"; ft_regex = "^php\$"; } - { name = "phpCompletion"; filename_regex = "^.php\$"; } - - # provide plugin which can be loaded manually: - { name = "phpCompletion"; tag = "lazy"; } - ]; - - # if you like NeoBundle or Vundle provide an implementation - - # add custom .vimrc lines like this: - customRC = '' - set hidden - ''; - }; - in vim_configurable.customize { name = "vim-with-plugins"; inherit vimrcConfig; }; - - */ - -let - inherit (stdenv) lib; - - findDependenciesRecursively = {knownPlugins, names}: - - let depsOf = name: (builtins.getAttr name knownPlugins).dependencies or []; - - recurseNames = path: names: lib.concatMap (name: recurse ([name]++path)) names; - - recurse = path: - let name = builtins.head path; - in if builtins.elem name (builtins.tail path) - then throw "recursive vim dependencies" - else [name] ++ recurseNames path (depsOf name); - - in lib.uniqList { inputList = recurseNames [] names; }; - - vimrcFile = { - vam ? null, - pathogen ? null, - customRC ? "" - }: - - let - /* pathogen mostly can set &rtp at startup time. Its used very commonly. - */ - pathogenImpl = lib.optionalString (pathogen != null) - (let - knownPlugins = pathogen.knownPlugins or vimPlugins; - - plugins = map (name: knownPlugins.${name}) (findDependenciesRecursively { inherit knownPlugins; names = pathogen.pluginNames; }); - - pluginsEnv = buildEnv { - name = "pathogen-plugin-env"; - paths = map (x: "${x}/${vimPlugins.rtpPath}") plugins; - }; - in - '' - let &rtp.=(empty(&rtp)?"":',')."${vimPlugins.pathogen.rtp}" - execute pathogen#infect('${pluginsEnv}/{}') - ''); - - /* - vim-addon-manager = VAM - - * maps names to plugin location - - * manipulates &rtp at startup time - or when Vim has been running for a while - - * can activate plugins laziy (eg when loading a specific filetype) - - * knows about vim plugin dependencies (addon-info.json files) - - * still is minimalistic (only loads one file), the "check out" code it also - has only gets loaded when a plugin is requested which is not found on disk - yet - - */ - vamImpl = lib.optionalString (vam != null) - (let - knownPlugins = vam.knownPlugins or vimPlugins; - - toNames = x: - if builtins.isString x then [x] - else (lib.optional (x ? name) x.name) - ++ (x.names or []); - - names = findDependenciesRecursively { inherit knownPlugins; names = lib.concatMap toNames vam.pluginDictionaries; }; - - # Vim almost reads JSON, so eventually JSON support should be added to Nix - # TODO: proper quoting - toNix = x: - if (builtins.isString x) then "'${x}'" - else if builtins.isAttrs x && builtins ? out then toNix "${x}" # a derivation - else if builtins.isAttrs x then "{${lib.concatStringsSep ", " (lib.mapAttrsToList (n: v: "${toNix n}: ${toNix v}") x)}}" - else if builtins.isList x then "[${lib.concatMapStringsSep ", " toNix x}]" - else throw "turning ${lib.showVal x} into a VimL thing not implemented yet"; - - in assert builtins.hasAttr "vim-addon-manager" knownPlugins; - '' - let g:nix_plugin_locations = {} - ${lib.concatMapStrings (name: '' - let g:nix_plugin_locations['${name}'] = "${knownPlugins.${name}.rtp}" - '') names} - let g:nix_plugin_locations['vim-addon-manager'] = "${vimPlugins."vim-addon-manager".rtp}" - - let g:vim_addon_manager = {} - - if exists('g:nix_plugin_locations') - " nix managed config - - " override default function making VAM aware of plugin locations: - fun! NixPluginLocation(name) - let path = get(g:nix_plugin_locations, a:name, "") - return path == "" ? vam#DefaultPluginDirFromName(a:name) : path - endfun - let g:vim_addon_manager.plugin_dir_by_name = 'NixPluginLocation' - " tell Vim about VAM: - let &rtp.=(empty(&rtp)?"":','). g:nix_plugin_locations['vim-addon-manager'] - else - " standalone config - - let &rtp.=(empty(&rtp)?"":',').c.plugin_root_dir.'/vim-addon-manager' - if !isdirectory(c.plugin_root_dir.'/vim-addon-manager/autoload') - " checkout VAM - execute '!git clone --depth=1 git://github.com/MarcWeber/vim-addon-manager ' - \ shellescape(c.plugin_root_dir.'/vim-addon-manager', 1) - endif - endif - - " tell vam about which plugins to load when: - let l = [] - ${lib.concatMapStrings (p: "call add(l, ${toNix p})\n") vam.pluginDictionaries} - call vam#Scripts(l, {}) - ''); - - # somebody else could provide these implementations - vundleImpl = ""; - - neobundleImpl = ""; - - - in writeText "vimrc" '' - " minimal setup, generated by NIX - set nocompatible - filetype indent plugin on | syn on - - ${vamImpl} - ${pathogenImpl} - ${vundleImpl} - ${neobundleImpl} - - ${customRC} - ''; - -in - -rec { - inherit vimrcFile; - - # shell script with custom name passing [-u vimrc] [-U gvimrc] to vim - vimWithRC = {vimExecutable, name ? null, vimrcFile ? null, gvimrcFile ? null}: - let rcOption = o: file: stdenv.lib.optionalString (file != null) "-${o} ${file}"; - in writeScriptBin (if name == null then "vim" else name) '' - #!/bin/sh - exec ${vimExecutable} ${rcOption "u" vimrcFile} ${rcOption "U" gvimrcFile} "$@" - ''; - - # add a customize option to a vim derivation - makeCustomizable = vim: vim // { - customize = {name, vimrcConfig}: vimWithRC { - vimExecutable = "${vim}/bin/vim"; - inherit name; - vimrcFile = vimrcFile vimrcConfig; - }; - }; - - # test cases: - test_vim_with_vim_addon_nix_using_vam = vim_configurable.customize { - name = "vim-with-vim-addon-nix-using-vam"; - vimrcConfig.vam.pluginDictionaries = [{name = "vim-addon-nix"; }]; - }; - - test_vim_with_vim_addon_nix_using_pathogen = vim_configurable.customize { - name = "vim-with-vim-addon-nix-using-pathogen"; - vimrcConfig.pathogen.pluginNames = [ "vim-addon-nix" ]; - }; -} diff --git a/pkgs/os-specific/linux/apparmor/default.nix b/pkgs/os-specific/linux/apparmor/default.nix index e1ae7a6d4d4..f68b436bed1 100644 --- a/pkgs/os-specific/linux/apparmor/default.nix +++ b/pkgs/os-specific/linux/apparmor/default.nix @@ -77,9 +77,13 @@ stdenv.mkDerivation rec { cd .. cp -r kernel-patches $out ''; - installPhase = '' + + installPhase = let + perlVersion = (builtins.parseDrvName perl.name).version; + in '' for i in $out/bin/*; do - wrapProgram $i --prefix PERL5LIB : "$PERL5LIB:$out/lib/perl5/5.10.1/i686-linux-thread-multi/" + wrapProgram $i --prefix PERL5LIB : \ + "$PERL5LIB:$out/lib/perl5/${perlVersion}/${stdenv.system}-thread-multi/" done ''; diff --git a/pkgs/os-specific/linux/ati-drivers/builder.sh b/pkgs/os-specific/linux/ati-drivers/builder.sh index 325fb869a70..8df03910146 100644 --- a/pkgs/os-specific/linux/ati-drivers/builder.sh +++ b/pkgs/os-specific/linux/ati-drivers/builder.sh @@ -224,6 +224,7 @@ fi # libstdc++ and gcc are needed by some libs patchelf --set-rpath $gcc/$lib_arch $out/lib/libatiadlxx.so + patchelf --set-rpath $gcc/$lib_arch $out/lib/xorg/modules/glesx.so } if test -z "$libsOnly"; then diff --git a/pkgs/os-specific/linux/ati-drivers/default.nix b/pkgs/os-specific/linux/ati-drivers/default.nix index 11657d34291..4f64b135832 100644 --- a/pkgs/os-specific/linux/ati-drivers/default.nix +++ b/pkgs/os-specific/linux/ati-drivers/default.nix @@ -31,21 +31,20 @@ assert (!libsOnly) -> kernel != null; with stdenv.lib; stdenv.mkDerivation { - name = "ati-drivers-14.4" + (optionalString (!libsOnly) "-${kernel.version}"); + name = "ati-drivers-14.12" + (optionalString (!libsOnly) "-${kernel.version}"); builder = ./builder.sh; inherit libXxf86vm xf86vidmodeproto; - gcc = stdenv.gcc.gcc; + gcc = stdenv.cc.gcc; src = fetchurl { - url = http://www2.ati.com/drivers/linux/amd-catalyst-14-4-rev2-linux-x86-x86-64-may6.zip; - sha256 = "1xbhn55yifis9b0lzb3s03hc1bcq8jmy7l96m4x8d842n7ji7qlk"; + url = http://www2.ati.com/drivers/linux/amd-catalyst-omega-14.12-linux-run-installers.zip; + sha256 = "0jd2scrdlyapynxfjdrarnwcdzxjqrk5fg5i10g3bm0ay8v9hrk8"; curlOpts = "--referer http://support.amd.com/en-us/download/desktop?os=Linux%20x86_64"; }; - # most patches are taken from gentoo - patchPhase = "patch -p1 < ${./gentoo-patches.patch}"; + patchPhase = "patch -p1 < ${./fglrx_3.17rc6-no_hotplug.patch}"; patchPhaseSamples = "patch -p2 < ${./patch-samples.patch}"; buildInputs = diff --git a/pkgs/os-specific/linux/ati-drivers/fglrx_3.17rc6-no_hotplug.patch b/pkgs/os-specific/linux/ati-drivers/fglrx_3.17rc6-no_hotplug.patch new file mode 100644 index 00000000000..7afd54a59c5 --- /dev/null +++ b/pkgs/os-specific/linux/ati-drivers/fglrx_3.17rc6-no_hotplug.patch @@ -0,0 +1,31 @@ +source: https://aur.archlinux.org/packages/catalyst/ + +diff -uNr 14.9/common/lib/modules/fglrx/build_mod/firegl_public.c 14.9/common/lib/modules/fglrx/build_mod/firegl_public.c +--- 14.9/common/lib/modules/fglrx/build_mod/firegl_public.c 2014-09-09 16:10:17.000000000 +0200 ++++ 14.9/common/lib/modules/fglrx/build_mod/firegl_public.c 2014-09-26 19:01:44.000000000 +0200 +@@ -1093,6 +1093,9 @@ + // directly here to allow suspend/resume without X server start. + firegl_pci_save_state((KCL_PCI_DevHandle)pdev, privdev); + pci_disable_device(pdev); ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,17,0) ++ pci_ignore_hotplug(pdev); ++#endif + PMSG_EVENT(pdev->dev.power.power_state) = state; + } + else +diff -uNr 14.9/common/lib/modules/fglrx/build_mod/kcl_acpi.c 14.9/common/lib/modules/fglrx/build_mod/kcl_acpi.c +--- 14.9/common/lib/modules/fglrx/build_mod/kcl_acpi.c 2014-09-09 16:10:17.000000000 +0200 ++++ 14.9/common/lib/modules/fglrx/build_mod/kcl_acpi.c 2014-09-26 18:57:27.000000000 +0200 +@@ -840,10 +840,12 @@ + if(tdev != NULL) + { + device = (acpi_device_adr(tdev) >> 16) & 0xffff; ++#if LINUX_VERSION_CODE < KERNEL_VERSION(3,17,0) + if(PCI_SLOT(pdev->devfn) == device) + { + tdev->flags.no_hotplug = true; + } ++#endif + } + #endif + return 0; diff --git a/pkgs/os-specific/linux/ati-drivers/gentoo-patches.patch b/pkgs/os-specific/linux/ati-drivers/gentoo-patches.patch deleted file mode 100644 index fd1d12cccb6..00000000000 --- a/pkgs/os-specific/linux/ati-drivers/gentoo-patches.patch +++ /dev/null @@ -1,33 +0,0 @@ -diff --git a/common/lib/modules/fglrx/build_mod/firegl_public.c b/common/lib/modules/fglrx/build_mod/firegl_public.c -index d3ad3ce..9362b58 100755 ---- a/common/lib/modules/fglrx/build_mod/firegl_public.c -+++ b/common/lib/modules/fglrx/build_mod/firegl_public.c -@@ -34,6 +34,11 @@ - #include - #endif - -+#if LINUX_VERSION_CODE >= KERNEL_VERSION(3,5,0) -+#include -+#endif -+ -+ - #if !defined(CONFIG_X86) - #if !defined(CONFIG_X86_PC) - #if !defined(CONFIG_X86_XEN) -@@ -1543,9 +1548,17 @@ KCL_TYPE_Pid ATI_API_CALL KCL_GetTgid(void) - KCL_TYPE_Uid ATI_API_CALL KCL_GetEffectiveUid(void) - { - #ifdef current_euid -+# if LINUX_VERSION_CODE >= KERNEL_VERSION(3,5,0) -+ return __kuid_val(current_euid()); -+# else - return current_euid(); -+# endif - #else -+# if LINUX_VERSION_CODE >= KERNEL_VERSION(3,5,0) -+ return __kuid_val(current->euid); -+# else - return current->euid; -+# endif - #endif - } diff --git a/pkgs/os-specific/linux/blcr/default.nix b/pkgs/os-specific/linux/blcr/default.nix index 43673c899b4..7681e8e3c31 100644 --- a/pkgs/os-specific/linux/blcr/default.nix +++ b/pkgs/os-specific/linux/blcr/default.nix @@ -1,17 +1,17 @@ { stdenv, fetchurl, kernel, perl, makeWrapper }: -# BLCR 0.8.4 works for kernel version up to 2.6.38 (including 2.6.38.x) # BLCR 0.8.5 should works for kernel version up to 3.7.1 +# BLCR 0.8.6 should works for kernel version up to 3.17.x assert stdenv.isLinux; -assert builtins.compareVersions "3.7.2" kernel.version == 1; +assert builtins.compareVersions "3.18" kernel.version == 1; stdenv.mkDerivation { - name = "blcr_${kernel.version}-0.8.5"; + name = "blcr_${kernel.version}-0.8.6pre4"; src = fetchurl { - url = http://crd.lbl.gov/assets/Uploads/FTG/Projects/CheckpointRestart/downloads/blcr-0.8.5.tar.gz; - sha256 = "01a809nfbr715pnidlslv55pxadm3021l97p98zkqy8chyrnkjb0"; + url = https://upc-bugs.lbl.gov/blcr-dist/blcr-0.8.6_b4.tar.gz; + sha256 = "1a3gdhdnmk592jc652szxgfz8rjd8dax5jwxfsypiqx5lgkj3m21"; }; buildInputs = [ perl makeWrapper ]; diff --git a/pkgs/os-specific/linux/broadcom-sta/cfg80211_inform_bss-3.18.patch b/pkgs/os-specific/linux/broadcom-sta/cfg80211_inform_bss-3.18.patch new file mode 100644 index 00000000000..100ac9161a6 --- /dev/null +++ b/pkgs/os-specific/linux/broadcom-sta/cfg80211_inform_bss-3.18.patch @@ -0,0 +1,21 @@ +Found on a random place http://web.archiveorange.com/archive/v/CcRuxYExfvTxfKcBFLah +Nicolas Viéville, Oct 27 2014 +diff -Naur hybrid-v35_64-nodebug-pcoem-6_30_223_248.orig/src/wl/sys/wl_cfg80211_hybrid.c hybrid-v35_64-nodebug-pcoem-6_30_223_248/src/wl/sys/wl_cfg80211_hybrid.c +--- hybrid-v35_64-nodebug-pcoem-6_30_223_248.orig/src/wl/sys/wl_cfg80211_hybrid.c 2014-09-10 19:27:13.301316000 +0200 ++++ hybrid-v35_64-nodebug-pcoem-6_30_223_248/src/wl/sys/wl_cfg80211_hybrid.c 2014-10-27 11:21:58.213536239 +0100 +@@ -2025,7 +2025,15 @@ + notify_ie = (u8 *)bi + le16_to_cpu(bi->ie_offset); + notify_ielen = le32_to_cpu(bi->ie_length); ++#if LINUX_VERSION_CODE >= KERNEL_VERSION(3, 18, 0) ++ cbss = cfg80211_inform_bss(wiphy, channel, ++ (mgmt_type == IEEE80211_STYPE_PROBE_RESP) ? CFG80211_BSS_FTYPE_PRESP : CFG80211_BSS_FTYPE_BEACON, ++ (const u8 *)(bi->BSSID.octet), ++ 0, beacon_proberesp->capab_info, beacon_proberesp->beacon_int, ++ (const u8 *)notify_ie, notify_ielen, signal, GFP_KERNEL); ++#else + cbss = cfg80211_inform_bss(wiphy, channel, (const u8 *)(bi->BSSID.octet), + 0, beacon_proberesp->capab_info, beacon_proberesp->beacon_int, + (const u8 *)notify_ie, notify_ielen, signal, GFP_KERNEL); ++#endif + if (unlikely(!cbss)) + return -ENOMEM; diff --git a/pkgs/os-specific/linux/broadcom-sta/default.nix b/pkgs/os-specific/linux/broadcom-sta/default.nix index e88b41a36ae..94f51911295 100644 --- a/pkgs/os-specific/linux/broadcom-sta/default.nix +++ b/pkgs/os-specific/linux/broadcom-sta/default.nix @@ -20,6 +20,7 @@ stdenv.mkDerivation { ./license.patch ./cfg80211_ibss_joined-channel-parameter.patch ./netdev-3.17.patch + ./cfg80211_inform_bss-3.18.patch ]; makeFlags = "KBASE=${kernel.dev}/lib/modules/${kernel.modDirVersion}"; diff --git a/pkgs/os-specific/linux/busybox/busybox-in-store.patch b/pkgs/os-specific/linux/busybox/busybox-in-store.patch new file mode 100644 index 00000000000..ea245a49259 --- /dev/null +++ b/pkgs/os-specific/linux/busybox/busybox-in-store.patch @@ -0,0 +1,16 @@ +Allow BusyBox to be invoked as "-busybox". This is +necessary when it's run from the Nix store as -busybox during +stdenv bootstrap. + +diff -ru -x '*~' busybox-1.22.1-orig/libbb/appletlib.c busybox-1.22.1/libbb/appletlib.c +--- busybox-1.22.1-orig/libbb/appletlib.c 2014-01-09 19:15:44.000000000 +0100 ++++ busybox-1.22.1/libbb/appletlib.c 2014-10-29 09:53:01.232052068 +0100 +@@ -764,7 +764,7 @@ + int applet = find_applet_by_name(name); + if (applet >= 0) + run_applet_no_and_exit(applet, argv); +- if (strncmp(name, "busybox", 7) == 0) ++ if (strstr(name, "busybox") != 0) + exit(busybox_main(argv)); + } + diff --git a/pkgs/os-specific/linux/busybox/default.nix b/pkgs/os-specific/linux/busybox/default.nix index 34eb19380d4..47f9fb9a5a4 100644 --- a/pkgs/os-specific/linux/busybox/default.nix +++ b/pkgs/os-specific/linux/busybox/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, enableStatic ? false, extraConfig ? ""}: +{ lib, stdenv, uclibc, fetchurl, enableStatic ? false, enableMinimal ? false, useUclibc ? false, extraConfig ? "" }: let configParser = '' @@ -7,14 +7,7 @@ let NAME=`echo "$LINE" | cut -d \ -f 1` OPTION=`echo "$LINE" | cut -d \ -f 2` - if test -z "$NAME"; then - continue - fi - - if test "$NAME" == "CLEAR"; then - echo "parseconfig: CLEAR" - echo > .config - fi + if ! [[ "$NAME" =~ ^CONFIG_ ]]; then continue; fi echo "parseconfig: removing $NAME" sed -i /$NAME'\(=\| \)'/d .config @@ -25,19 +18,6 @@ let } ''; - nixConfig = '' - CONFIG_PREFIX "$out" - CONFIG_INSTALL_NO_USR y - - # Use the external mount.cifs program. - CONFIG_FEATURE_MOUNT_CIFS n - CONFIG_FEATURE_MOUNT_HELPERS y - ''; - - staticConfig = stdenv.lib.optionalString enableStatic '' - CONFIG_STATIC y - ''; - in stdenv.mkDerivation rec { @@ -48,17 +28,34 @@ stdenv.mkDerivation rec { sha256 = "12v7nri79v8gns3inmz4k24q7pcnwi00hybs0wddfkcy1afh42xf"; }; + patches = [ ./busybox-in-store.patch ]; + configurePhase = '' export KCONFIG_NOTIMESTAMP=1 - make defconfig + make ${if enableMinimal then "allnoconfig" else "defconfig"} + ${configParser} + cat << EOF | parseconfig - ${staticConfig} - ${nixConfig} + + CONFIG_PREFIX "$out" + CONFIG_INSTALL_NO_USR y + + ${lib.optionalString enableStatic '' + CONFIG_STATIC y + ''} + + # Use the external mount.cifs program. + CONFIG_FEATURE_MOUNT_CIFS n + CONFIG_FEATURE_MOUNT_HELPERS y + ${extraConfig} $extraCrossConfig EOF + make oldconfig + '' + lib.optionalString useUclibc '' + makeFlagsArray+=("CC=gcc -isystem ${uclibc}/include -B${uclibc}/lib -L${uclibc}/lib") ''; crossAttrs = { @@ -75,8 +72,8 @@ stdenv.mkDerivation rec { meta = { description = "Tiny versions of common UNIX utilities in a single small executable"; homepage = http://busybox.net/; - license = stdenv.lib.licenses.gpl2; - maintainers = with stdenv.lib.maintainers; [viric]; - platforms = with stdenv.lib.platforms; linux; + license = lib.licenses.gpl2; + maintainers = [ lib.maintainers.viric ]; + platforms = lib.platforms.linux; }; } diff --git a/pkgs/os-specific/linux/busybox/include-missing-sys-resource-header.patch b/pkgs/os-specific/linux/busybox/include-missing-sys-resource-header.patch deleted file mode 100644 index 8163a86e3cd..00000000000 --- a/pkgs/os-specific/linux/busybox/include-missing-sys-resource-header.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/include/libbb.h b/include/libbb.h -index f12800f..e7806c2 100644 ---- a/include/libbb.h -+++ b/include/libbb.h -@@ -40,6 +40,7 @@ - #include - #include - #include -+#include - #include - #include - #include diff --git a/pkgs/os-specific/linux/cpufrequtils/default.nix b/pkgs/os-specific/linux/cpufrequtils/default.nix index d056e60f2da..b7822035c20 100644 --- a/pkgs/os-specific/linux/cpufrequtils/default.nix +++ b/pkgs/os-specific/linux/cpufrequtils/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { -i Makefile ''; - buildInputs = [ stdenv.gcc.libc.kernelHeaders libtool gettext ]; + buildInputs = [ stdenv.cc.libc.kernelHeaders libtool gettext ]; meta = { description = "Tools to display or change the CPU governor settings"; diff --git a/pkgs/os-specific/linux/disk-indicator/default.nix b/pkgs/os-specific/linux/disk-indicator/default.nix index b60232a9b75..11c1e7ee8a2 100644 --- a/pkgs/os-specific/linux/disk-indicator/default.nix +++ b/pkgs/os-specific/linux/disk-indicator/default.nix @@ -18,6 +18,8 @@ stdenv.mkDerivation { buildPhase = "make -f makefile"; + NIX_CFLAGS_COMPILE = "-Wno-error=cpp"; + installPhase = '' mkdir -p "$out/bin" cp ./disk_indicator "$out/bin/" diff --git a/pkgs/os-specific/linux/e3cfsprogs/default.nix b/pkgs/os-specific/linux/e3cfsprogs/default.nix index 89d5ad5158c..ef25d59a9df 100644 --- a/pkgs/os-specific/linux/e3cfsprogs/default.nix +++ b/pkgs/os-specific/linux/e3cfsprogs/default.nix @@ -11,20 +11,10 @@ stdenv.mkDerivation { sha256 = "8dd3de546aeb1ae42fb05409aeb724a145fe9aa1dbe1115441c2297c9d48cf31"; }; - configureFlags = - if stdenv ? isDietLibC - then "" - else "--enable-dynamic-e2fsck --enable-elf-shlibs"; + configureFlags ="--enable-dynamic-e2fsck --enable-elf-shlibs"; buildInputs = [gettext]; preInstall = "installFlagsArray=('LN=ln -s')"; postInstall = "make install-libs"; - - NIX_CFLAGS_COMPILE = - if stdenv ? isDietLibC then - "-UHAVE_SYS_PRCTL_H " + - (if stdenv.system == "x86_64-linux" then "-DHAVE_LSEEK64_PROTOTYPE=1 -Dstat64=stat" else "") - else ""; } - #note that ext3cow requires the ext3cow kernel patch !!!! diff --git a/pkgs/os-specific/linux/eudev/default.nix b/pkgs/os-specific/linux/eudev/default.nix index d9ffbfa622e..16eb933e176 100644 --- a/pkgs/os-specific/linux/eudev/default.nix +++ b/pkgs/os-specific/linux/eudev/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, pkgconfig, glib, gperf}: +{stdenv, fetchurl, pkgconfig, glib, gperf, utillinux}: let s = # Generated upstream information rec { @@ -9,7 +9,7 @@ let sha256="0shf5vqiz9fdxl95aa1a8vh0xjxwim3psc39wr2xr8lnahf11vva"; }; buildInputs = [ - glib pkgconfig gperf + glib pkgconfig gperf utillinux ]; in stdenv.mkDerivation { @@ -18,6 +18,24 @@ stdenv.mkDerivation { src = fetchurl { inherit (s) url sha256; }; + configureFlags = [ + "--localstatedir=/var" + "--sysconfdir=/etc" + ]; + makeFlags = [ + "hwdb_bin=/var/lib/udev/hwdb.bin" + "udevrulesdir=/etc/udev/rules.d" + ]; + installFlags = + [ + "localstatedir=$(TMPDIR)/var" + "sysconfdir=$(out)/etc" + "udevconfdir=$(out)/etc/udev" + "udevhwdbbin=$(out)/var/lib/udev/hwdb.bin" + "udevhwdbdir=$(out)/var/lib/udev/hwdb.d" + "udevrulesdir=$(out)/var/lib/udev/rules.d" + ]; + enableParallelBuilding = true; meta = { inherit (s) version; description = ''An udev fork by Gentoo''; diff --git a/pkgs/os-specific/linux/firejail/default.nix b/pkgs/os-specific/linux/firejail/default.nix index eb8e7cf390a..9f3397fc8ef 100644 --- a/pkgs/os-specific/linux/firejail/default.nix +++ b/pkgs/os-specific/linux/firejail/default.nix @@ -3,11 +3,11 @@ let s = # Generated upstream information rec { baseName="firejail"; - version="0.9.16"; + version="0.9.18"; name="${baseName}-${version}"; - hash="1213ln6rqb1w0ba98zwi5p40f7gzpz4rqn621zz72v0z1q1vfkrp"; - url="mirror://sourceforge/project/firejail/firejail/firejail-0.9.16-rc1.tar.bz2"; - sha256="1213ln6rqb1w0ba98zwi5p40f7gzpz4rqn621zz72v0z1q1vfkrp"; + hash="0qsjbnx9xzvzcbq7wdcf51v5abi4ml9jsai7w6xmns51qx4325a2"; + url="mirror://sourceforge/project/firejail/firejail/firejail-0.9.18-rc1.tar.bz2"; + sha256="0qsjbnx9xzvzcbq7wdcf51v5abi4ml9jsai7w6xmns51qx4325a2"; }; buildInputs = [ ]; diff --git a/pkgs/os-specific/linux/ftop/default.nix b/pkgs/os-specific/linux/ftop/default.nix new file mode 100644 index 00000000000..4733ce95bb2 --- /dev/null +++ b/pkgs/os-specific/linux/ftop/default.nix @@ -0,0 +1,37 @@ +{ stdenv, fetchurl, ncurses }: + +stdenv.mkDerivation rec { + name = "ftop-1.0"; + + src = fetchurl { + url = "http://ftop.googlecode.com/files/${name}.tar.bz2"; + sha256 = "3a705f4f291384344cd32c3dd5f5f6a7cd7cea7624c83cb7e923966dbcd47f82"; + }; + + buildInputs = [ ncurses ]; + + patches = [ + ./ftop-fix_buffer_overflow.patch + ./ftop-fix_printf_format.patch + ]; + patchFlags = "-p0"; + + postPatch = '' + substituteInPlace configure --replace "curses" "ncurses" + ''; + + meta = with stdenv.lib; { + description = "Show progress of open files and file systems"; + homepage = https://code.google.com/p/ftop/; + license = with licenses; gpl3Plus; + longDescription = '' + Ftop is to files what top is to processes. The progress of all open files + and file systems can be monitored. If run as a regular user, the set of + open files will be limited to those in that user's processes (which is + generally all that is of interest to the user). + As with top, the items are displayed in order from most to least active. + ''; + maintainers = with maintainers; [ nckx ]; + platforms = with platforms; linux; + }; +} diff --git a/pkgs/os-specific/linux/ftop/ftop-fix_buffer_overflow.patch b/pkgs/os-specific/linux/ftop/ftop-fix_buffer_overflow.patch new file mode 100644 index 00000000000..f10fa6a33b8 --- /dev/null +++ b/pkgs/os-specific/linux/ftop/ftop-fix_buffer_overflow.patch @@ -0,0 +1,11 @@ +--- src/ftop.c.orig 2010-06-15 21:42:15.000000000 +0200 ++++ src/ftop.c 2010-06-15 21:45:38.000000000 +0200 +@@ -935,7 +935,7 @@ + { + if (bar_used > 0) + { +- snprintf(rate_buf, bar_used + 1, "%s", tmp_buf); ++ snprintf(rate_buf, bar_used >= sizeof(rate_buf) ? sizeof(rate_buf) : bar_used + 1, "%s", tmp_buf); + p_attron(p, A_REVERSE); + p_printf(p, "%s", rate_buf); + if (bar_used > bytes) diff --git a/pkgs/os-specific/linux/ftop/ftop-fix_printf_format.patch b/pkgs/os-specific/linux/ftop/ftop-fix_printf_format.patch new file mode 100644 index 00000000000..afb04306428 --- /dev/null +++ b/pkgs/os-specific/linux/ftop/ftop-fix_printf_format.patch @@ -0,0 +1,20 @@ +--- src/ftop.c.orig 2010-06-15 23:14:50.000000000 +0200 ++++ src/ftop.c 2010-06-15 23:15:52.000000000 +0200 +@@ -222,7 +222,7 @@ + p_eol(p, part); + + cols = snprintf(tmp_buf, sizeof(tmp_buf), +- "Processes: %u total, %u unreadable", ++ "Processes: %zu total, %zu unreadable", + s->num_processes + s->num_unreadable_processes, + s->num_unreadable_processes); + +@@ -244,7 +244,7 @@ + p_eol(p, part); + + snprintf(tmp_buf, sizeof(tmp_buf), +- "Open Files: %u regular, %u dir, %u chr, %u blk, %u pipe, %u sock, %u misc", ++ "Open Files: %zu regular, %zu dir, %zu chr, %zu blk, %zu pipe, %zu sock, %zu misc", + s->num_reg, s->num_dir, s->num_chr, s->num_blk, s->num_pipe, + s->num_sock, s->num_misc); + diff --git a/pkgs/os-specific/linux/iptables/default.nix b/pkgs/os-specific/linux/iptables/default.nix index 0e022e0c4a1..2221250d57c 100644 --- a/pkgs/os-specific/linux/iptables/default.nix +++ b/pkgs/os-specific/linux/iptables/default.nix @@ -1,7 +1,8 @@ {stdenv, fetchurl}: stdenv.mkDerivation rec { - name = "iptables-1.4.21"; + name = "iptables-${version}"; + version = "1.4.21"; src = fetchurl { url = "http://www.netfilter.org/projects/iptables/files/${name}.tar.bz2"; @@ -17,5 +18,8 @@ stdenv.mkDerivation rec { description = "A program to configure the Linux IP packet filtering ruleset"; homepage = http://www.netfilter.org/projects/iptables/index.html; platforms = stdenv.lib.platforms.linux; + downloadPage = "http://www.netfilter.org/projects/iptables/files/"; + updateWalker = true; + inherit version; }; } diff --git a/pkgs/os-specific/linux/iw/default.nix b/pkgs/os-specific/linux/iw/default.nix index a3b2f23c8c7..262b673822b 100644 --- a/pkgs/os-specific/linux/iw/default.nix +++ b/pkgs/os-specific/linux/iw/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = { description = "Tool to use nl80211"; homepage = http://wireless.kernel.org/en/users/Documentation/iw; - license = "BSD"; + license = stdenv.lib.licenses.isc; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/os-specific/linux/kernel-headers/3.7.nix b/pkgs/os-specific/linux/kernel-headers/3.12.nix similarity index 94% rename from pkgs/os-specific/linux/kernel-headers/3.7.nix rename to pkgs/os-specific/linux/kernel-headers/3.12.nix index 9bf189c40ed..2fd34c68edc 100644 --- a/pkgs/os-specific/linux/kernel-headers/3.7.nix +++ b/pkgs/os-specific/linux/kernel-headers/3.12.nix @@ -4,7 +4,7 @@ assert cross == null -> stdenv.isLinux; let - version = "3.12.6"; + version = "3.12.32"; kernelHeadersBaseConfig = if cross == null @@ -17,8 +17,8 @@ stdenv.mkDerivation { name = "linux-headers-${version}"; src = fetchurl { - url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.bz2"; - sha256 = "1qh6f1az0flfrbkdjx1i9r7yf31ad0gxigax91nd33z2jmd6h4df"; + url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; + sha256 = "1hzws2bf267hfk81ywqcxspkyi1lg56x63izdc0pv1338xcfas53"; }; targetConfig = if cross != null then cross.config else null; diff --git a/pkgs/os-specific/linux/kernel/linux-3.10.nix b/pkgs/os-specific/linux/kernel/linux-3.10.nix index 88e00e2f3bd..80143bb4905 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.10.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.10.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, ... } @ args: import ./generic.nix (args // rec { - version = "3.10.61"; + version = "3.10.63"; extraMeta.branch = "3.10"; src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "1pxkm4ix1051qma535087zkshwmwhirb73wyfhqaqrxp4177rja2"; + sha256 = "0ajgw7xr4ilbssr9lcs4078584kr5nlycc3gc28ywc29z7vi8sjm"; }; features.iwlwifi = true; diff --git a/pkgs/os-specific/linux/kernel/linux-3.12.nix b/pkgs/os-specific/linux/kernel/linux-3.12.nix index 8c68a09a535..1dd49edf6d7 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.12.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.12.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, ... } @ args: import ./generic.nix (args // rec { - version = "3.12.33"; + version = "3.12.35"; extraMeta.branch = "3.12"; src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "18vrlrda8xa6j7771x8bwl7vrhvi2kmrp91nlwhkqr4siwkh0jxp"; + sha256 = "1krzd21hi93kwmffaxfbmyh8cbxl6afgma3yk14xm5ff5z0nlaxy"; }; features.iwlwifi = true; diff --git a/pkgs/os-specific/linux/kernel/linux-3.14.nix b/pkgs/os-specific/linux/kernel/linux-3.14.nix index c301a312112..7d4c741193f 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.14.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.14.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, ... } @ args: import ./generic.nix (args // rec { - version = "3.14.25"; + version = "3.14.27"; # Remember to update grsecurity! extraMeta.branch = "3.14"; src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "07zwiywmijg5z8iy628w9f8rhi8j4hjd3raczq9pm7dqryayyaj2"; + sha256 = "09fxykm280zy3jq2zak6qiglsgv4756ryqwmx23hl014rk8bzszn"; }; features.iwlwifi = true; diff --git a/pkgs/os-specific/linux/kernel/linux-3.17.nix b/pkgs/os-specific/linux/kernel/linux-3.17.nix index cc77f4409db..fd21f3c285c 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.17.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.17.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, ... } @ args: import ./generic.nix (args // rec { - version = "3.17.4"; + version = "3.17.7"; # Remember to update grsecurity! extraMeta.branch = "3.17"; src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "0ayh9y58iv38h76jl2r77856af2cazzkwcdhjqmccibajjf42maa"; + sha256 = "074f56sz22wqnn21gamwf63llhsqc2hgb7dzkbkd5gqjx6pfdj53"; }; features.iwlwifi = true; diff --git a/pkgs/os-specific/linux/kernel/linux-3.18.nix b/pkgs/os-specific/linux/kernel/linux-3.18.nix new file mode 100644 index 00000000000..7e8fd723dd2 --- /dev/null +++ b/pkgs/os-specific/linux/kernel/linux-3.18.nix @@ -0,0 +1,17 @@ +{ stdenv, fetchurl, ... } @ args: + +import ./generic.nix (args // rec { + version = "3.18.1"; + extraMeta.branch = "3.18"; + + src = fetchurl { + url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; + sha256 = "13m0s2m0zg304w86yvcmxgbjl41c4kc420044avi8rnr1xwcscsq"; + }; + + features.iwlwifi = true; + features.efiBootStub = true; + features.needsCifsUtils = true; + features.canDisableNetfilterConntrackHelpers = true; + features.netfilterRPFilter = true; +} // (args.argsOverride or {})) diff --git a/pkgs/os-specific/linux/kernel/linux-3.2.nix b/pkgs/os-specific/linux/kernel/linux-3.2.nix index ee7bd59f255..330b643e46a 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.2.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.2.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, ... } @ args: import ./generic.nix (args // rec { - version = "3.2.64"; + version = "3.2.65"; extraMeta.branch = "3.2"; src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "0niw4pbfc5dd46wzgvfnza8isyl01v1lva4njlwnrzag6x9fj0qp"; + sha256 = "1j9ibivhrkav5dfb7pv5m2j2y4577nqxp63npcpmna7wp7y132wm"; }; # We don't provide these patches if grsecurity is enabled, because diff --git a/pkgs/os-specific/linux/kernel/linux-3.4.nix b/pkgs/os-specific/linux/kernel/linux-3.4.nix index 868918ef945..d4da722f6c2 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.4.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.4.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, ... } @ args: import ./generic.nix (args // rec { - version = "3.4.104"; + version = "3.4.105"; extraMeta.branch = "3.4"; src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "0xf2w4lccws2pps89hmh7ry8n43wr9p65yvdajba4qfxxy5jvx4b"; + sha256 = "0xhwdkpcmvbvk1rq0mz2f2pmh322flly7wr66wdd5bypfvanrk23"; }; kernelPatches = args.kernelPatches ++ diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index 18241472011..561eadf2f21 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -60,17 +60,17 @@ rec { }; grsecurity_stable = grsecPatch - { kversion = "3.14.25"; - revision = "201411260106"; + { kversion = "3.14.27"; + revision = "201412211908"; branch = "stable"; - sha256 = "19131hkbf8zrqq31iiw99hslb5g29yqfl67jzlc4y4c8092s7fdm"; + sha256 = "1xs34v1k970sv4i0a9qjcgk7i4cihl2xlgp1q7v320idpxrcym3a"; }; grsecurity_unstable = grsecPatch - { kversion = "3.17.4"; - revision = "201411260107"; + { kversion = "3.17.7"; + revision = "201412211910"; branch = "test"; - sha256 = "1ynwmgm5c2fcd2dr76s3sqap3bv9b04p7qvf92pa1p4hgj2lva2n"; + sha256 = "1s3ksf44mah398ix4ar49m6d8xwkk991pl1m8m441yhpm8h1ss3w"; }; grsec_fix_path = diff --git a/pkgs/os-specific/linux/kernel/perf.nix b/pkgs/os-specific/linux/kernel/perf.nix index 8b8f7e1e78d..be375ea310f 100644 --- a/pkgs/os-specific/linux/kernel/perf.nix +++ b/pkgs/os-specific/linux/kernel/perf.nix @@ -25,6 +25,8 @@ stdenv.mkDerivation { buildInputs = [ elfutils python perl newt slang pkgconfig] ++ stdenv.lib.optional withGtk gtk; + NIX_CFLAGS_COMPILE = "-Wno-error=cpp"; + installFlags = "install install-man ASCIIDOC8=1"; inherit elfutils; diff --git a/pkgs/os-specific/linux/ktap/default.nix b/pkgs/os-specific/linux/ktap/default.nix index b91fc871350..2cb4f60f75b 100644 --- a/pkgs/os-specific/linux/ktap/default.nix +++ b/pkgs/os-specific/linux/ktap/default.nix @@ -1,5 +1,7 @@ { stdenv, fetchgit, kernel, useFFI ? false }: +assert builtins.substring 0 4 kernel.version != "3.18"; + let ffiArgs = stdenv.lib.optionalString useFFI "FFI=1"; in diff --git a/pkgs/os-specific/linux/libsepol/default.nix b/pkgs/os-specific/linux/libsepol/default.nix index c469fe93493..29b6d80445a 100644 --- a/pkgs/os-specific/linux/libsepol/default.nix +++ b/pkgs/os-specific/linux/libsepol/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation rec { name = "libsepol-${version}"; version = "2.3"; se_release = "20140506"; - se_url = "${meta.homepage}/releases"; + se_url = "https://raw.githubusercontent.com/wiki/SELinuxProject/selinux/files/releases"; src = fetchurl { url = "${se_url}/${se_release}/libsepol-${version}.tar.gz"; diff --git a/pkgs/os-specific/linux/lttng-modules/6f0af2643c40b57280796eaa4fe60ce4f678b6dc.patch b/pkgs/os-specific/linux/lttng-modules/6f0af2643c40b57280796eaa4fe60ce4f678b6dc.patch new file mode 100644 index 00000000000..2c9cb9835d1 --- /dev/null +++ b/pkgs/os-specific/linux/lttng-modules/6f0af2643c40b57280796eaa4fe60ce4f678b6dc.patch @@ -0,0 +1,71 @@ +From 6f0af2643c40b57280796eaa4fe60ce4f678b6dc Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Andr=C3=A9=20Goddard=20Rosa?= +Date: Thu, 13 Nov 2014 21:33:02 -0800 +Subject: [PATCH] Fix compilation on Linux kernel >= 3.18.0 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Since kernel commit 8a9522d2fe compilation fails as kvm_age_page +tracepoint had its signature changed, so update it accordingly. + +Tested pointing to kernels: + git reset --hard v3.17; make init/version.o + git reset --hard v3.18-rc1; make init/version.o + +Signed-off-by: André Goddard Rosa +Signed-off-by: Mathieu Desnoyers +--- + instrumentation/events/lttng-module/kvm.h | 29 +++++++++++++++++++++++++++++ + 1 file changed, 29 insertions(+) + mode change 100644 => 100755 instrumentation/events/lttng-module/kvm.h + +diff --git a/instrumentation/events/lttng-module/kvm.h b/instrumentation/events/lttng-module/kvm.h +old mode 100644 +new mode 100755 +index c0d42e2..4f95095 +--- a/instrumentation/events/lttng-module/kvm.h ++++ b/instrumentation/events/lttng-module/kvm.h +@@ -232,6 +232,34 @@ LTTNG_TRACEPOINT_EVENT(kvm_fpu, + TP_printk("%s", __print_symbolic(__entry->load, kvm_fpu_load_symbol)) + ) + ++#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,18,0)) ++ ++LTTNG_TRACEPOINT_EVENT(kvm_age_page, ++ TP_PROTO(ulong gfn, int level, struct kvm_memory_slot *slot, int ref), ++ TP_ARGS(gfn, level, slot, ref), ++ ++ TP_STRUCT__entry( ++ __field( u64, hva ) ++ __field( u64, gfn ) ++ __field( u8, level ) ++ __field( u8, referenced ) ++ ), ++ ++ TP_fast_assign( ++ tp_assign(gfn, gfn) ++ tp_assign(level, level) ++ tp_assign(hva, ((gfn - slot->base_gfn) << ++ PAGE_SHIFT) + slot->userspace_addr) ++ tp_assign(referenced, ref) ++ ), ++ ++ TP_printk("hva %llx gfn %llx level %u %s", ++ __entry->hva, __entry->gfn, __entry->level, ++ __entry->referenced ? "YOUNG" : "OLD") ++) ++ ++#else ++ + LTTNG_TRACEPOINT_EVENT(kvm_age_page, + TP_PROTO(ulong hva, struct kvm_memory_slot *slot, int ref), + TP_ARGS(hva, slot, ref), +@@ -254,6 +282,7 @@ LTTNG_TRACEPOINT_EVENT(kvm_age_page, + __entry->referenced ? "YOUNG" : "OLD") + ) + #endif ++#endif + + #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,38)) + diff --git a/pkgs/os-specific/linux/lttng-modules/build-fix.patch b/pkgs/os-specific/linux/lttng-modules/build-fix.patch new file mode 100644 index 00000000000..76f449b8b2c --- /dev/null +++ b/pkgs/os-specific/linux/lttng-modules/build-fix.patch @@ -0,0 +1,30 @@ +[PATCH] Update compaction instrumentation for 3.14.x stable kernels + +Conditional compilation introduced by lttng-modules commit + + 0007344741ef65259bc52dea72259173dfbf96c0 + +needs to be applied to kernels 3.14.25 and up in the 3.14.x branch. + +Signed-off-by: Simon Marchi +Reported-by: Bjørn Forsman +--- + instrumentation/events/lttng-module/compaction.h | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/instrumentation/events/lttng-module/compaction.h b/instrumentation/events/lttng-module/compaction.h +index ee23aa9..773a6ad 100644 +--- a/instrumentation/events/lttng-module/compaction.h ++++ b/instrumentation/events/lttng-module/compaction.h +@@ -46,7 +46,8 @@ LTTNG_TRACEPOINT_EVENT_INSTANCE(mm_compaction_isolate_template, mm_compaction_is + TP_ARGS(nr_scanned, nr_taken) + ) + +-#if (LINUX_VERSION_CODE >= KERNEL_VERSION(3,16,0)) ++#if LTTNG_KERNEL_RANGE(3,14,25, 3,15,0) || \ ++ (LINUX_VERSION_CODE >= KERNEL_VERSION(3,16,0)) + LTTNG_TRACEPOINT_EVENT(mm_compaction_migratepages, + + TP_PROTO(unsigned long nr_all, +-- +2.1.3 diff --git a/pkgs/os-specific/linux/lttng-modules/default.nix b/pkgs/os-specific/linux/lttng-modules/default.nix index 315265f8203..871edf87b7a 100644 --- a/pkgs/os-specific/linux/lttng-modules/default.nix +++ b/pkgs/os-specific/linux/lttng-modules/default.nix @@ -13,6 +13,9 @@ stdenv.mkDerivation rec { sha256 = "01gha02ybbzr86v6s6bqn649jiw5k89kb363b9s1iv8igrdlzhl1"; }; + # from upstream ML, should be in the next release + patches = [ ./build-fix.patch ./6f0af2643c40b57280796eaa4fe60ce4f678b6dc.patch ]; + preConfigure = '' export KERNELDIR="${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" export INSTALL_MOD_PATH="$out" diff --git a/pkgs/os-specific/linux/lvm2/default.nix b/pkgs/os-specific/linux/lvm2/default.nix index dbce7602301..1d4ecdec98d 100644 --- a/pkgs/os-specific/linux/lvm2/default.nix +++ b/pkgs/os-specific/linux/lvm2/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, pkgconfig, udev, utillinux, coreutils, enable_dmeventd ? false }: let - version = "2.02.111"; + version = "2.02.114"; in stdenv.mkDerivation { @@ -9,7 +9,7 @@ stdenv.mkDerivation { src = fetchurl { url = "ftp://sources.redhat.com/pub/lvm2/releases/LVM2.${version}.tgz"; - sha256 = "096xjcay4l2ph2dlyknic11pmz65jfgjs34fblqi9xh7zrr3x3vd"; + sha256 = "19bl536yylyi873p46prfwv086bg0sg0q5l4c7x6lnlwzfnb176y"; }; configureFlags = diff --git a/pkgs/os-specific/linux/macchanger/default.nix b/pkgs/os-specific/linux/macchanger/default.nix index 1bbad958bfd..1f046de40ed 100644 --- a/pkgs/os-specific/linux/macchanger/default.nix +++ b/pkgs/os-specific/linux/macchanger/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = { description = "A utility for viewing/manipulating the MAC address of network interfaces"; - maintainer = with stdenv.lib.maintainers; [ joachifm ]; + maintainers = with stdenv.lib.maintainers; [ joachifm ]; license = with stdenv.lib.licenses; gpl2Plus; homepage = "https://www.gnu.org/software/macchanger"; platform = with stdenv.lib.platforms; linux; diff --git a/pkgs/os-specific/linux/module-init-tools/default.nix b/pkgs/os-specific/linux/module-init-tools/default.nix index 4877a2c7794..1302d7b1fef 100644 --- a/pkgs/os-specific/linux/module-init-tools/default.nix +++ b/pkgs/os-specific/linux/module-init-tools/default.nix @@ -26,10 +26,6 @@ stdenv.mkDerivation { postInstall = "rm $out/sbin/insmod.static"; # don't need it - # We don't want bash (and therefore glibc) in the closure of the - # output, since we want to put this in a initrd. - dontPatchShebangs = stdenv ? isDietLibC; - meta = { homepage = http://www.kernel.org/pub/linux/utils/kernel/module-init-tools/; description = "Tools for loading and managing Linux kernel modules"; diff --git a/pkgs/os-specific/linux/nftables/default.nix b/pkgs/os-specific/linux/nftables/default.nix index e8dd56ab9e2..9834443a74d 100644 --- a/pkgs/os-specific/linux/nftables/default.nix +++ b/pkgs/os-specific/linux/nftables/default.nix @@ -1,12 +1,12 @@ -{ stdenv, fetchurl, docbook2x, docbook_xml_dtd_45 +{ stdenv, fetchurl, pkgconfig, docbook2x, docbook_xml_dtd_45 , flex, bison, libmnl, libnftnl, gmp, readline }: stdenv.mkDerivation rec { - name = "nftables-0.3"; + name = "nftables-0.4"; src = fetchurl { url = "http://netfilter.org/projects/nftables/files/${name}.tar.bz2"; - sha256 = "0bww48hc424svxfx3fpqxmbmp0n42ahs1f28f5f6g29d8i2jcdsd"; + sha256 = "0g0x6mf5580kr1azrff0ryxxym43qr72fwir7agmz4b8bjvnkjpn"; }; configureFlags = [ @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { XML_CATALOG_FILES = "${docbook_xml_dtd_45}/xml/dtd/docbook/catalog.xml"; - buildInputs = [ docbook2x flex bison libmnl libnftnl gmp readline ]; + buildInputs = [ pkgconfig docbook2x flex bison libmnl libnftnl gmp readline ]; meta = with stdenv.lib; { description = "the project that aims to replace the existing {ip,ip6,arp,eb}tables framework"; diff --git a/pkgs/os-specific/linux/nvidia-x11/builder-legacy173.sh b/pkgs/os-specific/linux/nvidia-x11/builder-legacy173.sh index 7d39dd31189..5d47df9a87a 100755 --- a/pkgs/os-specific/linux/nvidia-x11/builder-legacy173.sh +++ b/pkgs/os-specific/linux/nvidia-x11/builder-legacy173.sh @@ -81,7 +81,7 @@ installPhase() { for i in nvidia-settings nvidia-xconfig; do cp usr/bin/$i $out/bin/$i - patchelf --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \ + patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ --set-rpath $out/lib:$programPath:$glPath $out/bin/$i done diff --git a/pkgs/os-specific/linux/nvidia-x11/builder-legacy304.sh b/pkgs/os-specific/linux/nvidia-x11/builder-legacy304.sh index 7771fb988f5..20666fdb061 100755 --- a/pkgs/os-specific/linux/nvidia-x11/builder-legacy304.sh +++ b/pkgs/os-specific/linux/nvidia-x11/builder-legacy304.sh @@ -72,7 +72,7 @@ installPhase() { for i in nvidia-settings nvidia-xconfig; do cp $i $out/bin/$i - patchelf --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \ + patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ --set-rpath $out/lib:$programPath:$glPath $out/bin/$i done diff --git a/pkgs/os-specific/linux/nvidia-x11/builder-legacy340.sh b/pkgs/os-specific/linux/nvidia-x11/builder-legacy340.sh index 4291116f4ef..5d6647d1ee0 100755 --- a/pkgs/os-specific/linux/nvidia-x11/builder-legacy340.sh +++ b/pkgs/os-specific/linux/nvidia-x11/builder-legacy340.sh @@ -51,7 +51,7 @@ installPhase() { for i in nvidia-settings nvidia-smi; do cp $i $out/bin/$i - patchelf --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \ + patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ --set-rpath $out/lib:$programPath:$glPath $out/bin/$i done diff --git a/pkgs/os-specific/linux/nvidia-x11/builder.sh b/pkgs/os-specific/linux/nvidia-x11/builder.sh new file mode 100755 index 00000000000..5d6647d1ee0 --- /dev/null +++ b/pkgs/os-specific/linux/nvidia-x11/builder.sh @@ -0,0 +1,107 @@ +source $stdenv/setup + +dontPatchELF=1 # must keep libXv, $out in RPATH + + +unpackFile() { + skip=$(sed 's/^skip=//; t; d' $src) + tail -n +$skip $src | xz -d | tar xvf - + sourceRoot=. +} + + +buildPhase() { + if test -z "$libsOnly"; then + # Create the module. + echo "Building linux driver against kernel: $kernel"; + cd kernel + kernelVersion=$(cd $kernel/lib/modules && ls) + sysSrc=$(echo $kernel/lib/modules/$kernelVersion/source) + sysOut=$(echo $kernel/lib/modules/$kernelVersion/build) + unset src # used by the nv makefile + make SYSSRC=$sysSrc SYSOUT=$sysOut module + cd uvm + make SYSSRC=$sysSrc SYSOUT=$sysOut module + cd .. + cd .. + fi +} + + +installPhase() { + + if test -z "$libsOnly"; then + # Install the kernel module. + mkdir -p $out/lib/modules/$kernelVersion/misc + cp kernel/nvidia.ko $out/lib/modules/$kernelVersion/misc + cp kernel/uvm/nvidia-uvm.ko $out/lib/modules/$kernelVersion/misc + + # Install the X driver. + mkdir -p $out/lib/xorg/modules + cp -p libnvidia-wfb.* $out/lib/xorg/modules/ + mkdir -p $out/lib/xorg/modules/drivers + cp -p nvidia_drv.so $out/lib/xorg/modules/drivers + mkdir -p $out/lib/xorg/modules/extensions + cp -p libglx.so.* $out/lib/xorg/modules/extensions + + #patchelf --set-rpath $out/lib $out/lib/xorg/modules/extensions/libglx.so.*.* + + # Install the programs. + mkdir -p $out/bin + + for i in nvidia-settings nvidia-smi; do + cp $i $out/bin/$i + patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + --set-rpath $out/lib:$programPath:$glPath $out/bin/$i + done + + # Header files etc. + mkdir -p $out/include/nvidia + cp -p *.h $out/include/nvidia + + mkdir -p $out/share/man/man1 + cp -p *.1.gz $out/share/man/man1 + rm $out/share/man/man1/nvidia-xconfig.1.gz + + mkdir -p $out/share/applications + cp -p *.desktop $out/share/applications + + mkdir -p $out/share/pixmaps + cp -p nvidia-settings.png $out/share/pixmaps + + # Patch the `nvidia-settings.desktop' file. + substituteInPlace $out/share/applications/nvidia-settings.desktop \ + --replace '__UTILS_PATH__' $out/bin \ + --replace '__PIXMAP_PATH__' $out/share/pixmaps + + # Test a bit. + $out/bin/nvidia-settings --version + fi + + + # Install libGL and friends. + mkdir -p "$out/lib/vendors" + cp -p nvidia.icd $out/lib/vendors/ + + cp -prd *.so.* tls "$out/lib/" + rm "$out"/lib/lib{glx,nvidia-wfb}.so.* # handled separately + + for libname in `find "$out/lib/" -name '*.so.*'` + do + # I'm lazy to differentiate needed libs per-library, as the closure is the same. + # Unfortunately --shrink-rpath would strip too much. + patchelf --set-rpath "$out/lib:$allLibPath" "$libname" + + libname_short=`echo -n "$libname" | sed 's/so\..*/so/'` + ln -srnf "$libname" "$libname_short" + ln -srnf "$libname" "$libname_short.1" + done + + #patchelf --set-rpath $out/lib:$glPath $out/lib/libGL.so.*.* + #patchelf --set-rpath $out/lib:$glPath $out/lib/libvdpau_nvidia.so.*.* + #patchelf --set-rpath $cudaPath $out/lib/libcuda.so.*.* + #patchelf --set-rpath $openclPath $out/lib/libnvidia-opencl.so.*.* +} + + +genericBuild diff --git a/pkgs/os-specific/linux/nvidia-x11/default.nix b/pkgs/os-specific/linux/nvidia-x11/default.nix new file mode 100644 index 00000000000..0d27c89eac2 --- /dev/null +++ b/pkgs/os-specific/linux/nvidia-x11/default.nix @@ -0,0 +1,61 @@ +{ stdenv, fetchurl, kernel ? null, xlibs, zlib, perl +, gtk, atk, pango, glib, gdk_pixbuf +, # Whether to build the libraries only (i.e. not the kernel module or + # nvidia-settings). Used to support 32-bit binaries on 64-bit + # Linux. + libsOnly ? false +}: + +with stdenv.lib; + +assert (!libsOnly) -> kernel != null; + +let + + versionNumber = "343.36"; + # Policy: use the highest stable version as the default (on our master). + inherit (stdenv.lib) makeLibraryPath; +in + +stdenv.mkDerivation { + name = "nvidia-x11-${versionNumber}${optionalString (!libsOnly) "-${kernel.version}"}"; + + builder = ./builder.sh; + + src = + if stdenv.system == "i686-linux" then + fetchurl { + url = "http://us.download.nvidia.com/XFree86/Linux-x86/${versionNumber}/NVIDIA-Linux-x86-${versionNumber}.run"; + sha256 = "17l23dp725883xcyy1n178pcl6lj27psrgbxymc356x2pngwkhcc"; + } + else if stdenv.system == "x86_64-linux" then + fetchurl { + url = "http://us.download.nvidia.com/XFree86/Linux-x86_64/${versionNumber}/NVIDIA-Linux-x86_64-${versionNumber}-no-compat32.run"; + sha256 = "0djvh9wmazrfvpgyiqrz81kjk2war20xyjjr2kncxyplzk28mw97"; + } + else throw "nvidia-x11 does not support platform ${stdenv.system}"; + + inherit versionNumber libsOnly; + + kernel = if libsOnly then null else kernel.dev; + + dontStrip = true; + + glPath = makeLibraryPath [xlibs.libXext xlibs.libX11 xlibs.libXrandr]; + cudaPath = makeLibraryPath [zlib stdenv.cc.gcc]; + openclPath = makeLibraryPath [zlib]; + allLibPath = makeLibraryPath [xlibs.libXext xlibs.libX11 xlibs.libXrandr zlib stdenv.cc.gcc]; + + programPath = optionalString (!libsOnly) (makeLibraryPath + [ gtk atk pango glib gdk_pixbuf xlibs.libXv ] ); + + buildInputs = [ perl ]; + + meta = with stdenv.lib.meta; { + homepage = http://www.nvidia.com/object/unix.html; + description = "X.org driver and kernel module for NVIDIA graphics cards"; + license = licenses.unfreeRedistributable; + platforms = platforms.linux; + maintainers = [ maintainers.vcunat ]; + }; +} diff --git a/pkgs/os-specific/linux/nvidia-x11/legacy173.nix b/pkgs/os-specific/linux/nvidia-x11/legacy173.nix index 9182139c0a8..79d8adfb2e1 100644 --- a/pkgs/os-specific/linux/nvidia-x11/legacy173.nix +++ b/pkgs/os-specific/linux/nvidia-x11/legacy173.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation { glPath = stdenv.lib.makeLibraryPath [xlibs.libXext xlibs.libX11 xlibs.libXrandr]; - cudaPath = stdenv.lib.makeLibraryPath [zlib stdenv.gcc.gcc]; + cudaPath = stdenv.lib.makeLibraryPath [zlib stdenv.cc.gcc]; programPath = stdenv.lib.makeLibraryPath [ gtk atk pango glib gdk_pixbuf xlibs.libXv ]; diff --git a/pkgs/os-specific/linux/nvidia-x11/legacy304.nix b/pkgs/os-specific/linux/nvidia-x11/legacy304.nix index 9acaee797f0..e37b4354408 100644 --- a/pkgs/os-specific/linux/nvidia-x11/legacy304.nix +++ b/pkgs/os-specific/linux/nvidia-x11/legacy304.nix @@ -8,7 +8,7 @@ with stdenv.lib; -let versionNumber = "304.123"; in +let versionNumber = "304.125"; in stdenv.mkDerivation { name = "nvidia-x11-${versionNumber}${optionalString (!libsOnly) "-${kernel.version}"}"; @@ -19,12 +19,12 @@ stdenv.mkDerivation { if stdenv.system == "i686-linux" then fetchurl { url = "http://us.download.nvidia.com/XFree86/Linux-x86/${versionNumber}/NVIDIA-Linux-x86-${versionNumber}.run"; - sha256 = "09gljwxw14img7hw0xdxd24cvpvlymdxssmxa9gikdrw2w04j0ym"; + sha256 = "1xy4g3yc73mb932cfr25as648k12sxpyymppb8nia3lijakv7idf"; } else if stdenv.system == "x86_64-linux" then fetchurl { url = "http://us.download.nvidia.com/XFree86/Linux-x86_64/${versionNumber}/NVIDIA-Linux-x86_64-${versionNumber}-no-compat32.run"; - sha256 = "0vxw4gp78g06h5inwkhl989p9mq0m8rqipz9a67rdc4s364r243s"; + sha256 = "08p6hikn7pbfg0apnsbaqyyh2s9m5r0ckqzgjvxirn5qcyll0g5a"; } else throw "nvidia-x11 does not support platform ${stdenv.system}"; @@ -36,7 +36,7 @@ stdenv.mkDerivation { glPath = stdenv.lib.makeLibraryPath [xlibs.libXext xlibs.libX11 xlibs.libXrandr]; - cudaPath = stdenv.lib.makeLibraryPath [zlib stdenv.gcc.gcc]; + cudaPath = stdenv.lib.makeLibraryPath [zlib stdenv.cc.gcc]; programPath = optionalString (!libsOnly) (stdenv.lib.makeLibraryPath [ gtk atk pango glib gdk_pixbuf xlibs.libXv ] ); diff --git a/pkgs/os-specific/linux/nvidia-x11/legacy340.nix b/pkgs/os-specific/linux/nvidia-x11/legacy340.nix index ad0c0c0b367..7af7e63c388 100644 --- a/pkgs/os-specific/linux/nvidia-x11/legacy340.nix +++ b/pkgs/os-specific/linux/nvidia-x11/legacy340.nix @@ -12,7 +12,7 @@ assert (!libsOnly) -> kernel != null; let - versionNumber = "340.58"; + versionNumber = "340.65"; /* This branch is needed for G8x, G9x, and GT2xx GPUs, and motherboard chipsets based on them. Ongoing support for new Linux kernels and X servers, as well as fixes for critical bugs, will be included in 340.* legacy releases through the end of 2019. @@ -29,12 +29,12 @@ stdenv.mkDerivation { if stdenv.system == "i686-linux" then fetchurl { url = "http://us.download.nvidia.com/XFree86/Linux-x86/${versionNumber}/NVIDIA-Linux-x86-${versionNumber}.run"; - sha256 = "0nzvfqn3cv2n486i38r3badd5jlmfv7x6k9s47calrqnd3q8zi3w"; + sha256 = "0wyrxhkfyjpa0l5xxpy4g9h3c34dv5bqif8nk70cm53pbm1i31g7"; } else if stdenv.system == "x86_64-linux" then fetchurl { url = "http://us.download.nvidia.com/XFree86/Linux-x86_64/${versionNumber}/NVIDIA-Linux-x86_64-${versionNumber}-no-compat32.run"; - sha256 = "0h78wmb1yyr1xah6x22ifk9gzd2jvg3vhhg091nvyhcvpmbjq806"; + sha256 = "0yabf3d3aq2qmlzxw99y5lasdm5y7dq2n7l3gvak8iqx0k9cihh3"; } else throw "nvidia-x11 does not support platform ${stdenv.system}"; @@ -45,9 +45,9 @@ stdenv.mkDerivation { dontStrip = true; glPath = makeLibraryPath [xlibs.libXext xlibs.libX11 xlibs.libXrandr]; - cudaPath = makeLibraryPath [zlib stdenv.gcc.gcc]; + cudaPath = makeLibraryPath [zlib stdenv.cc.gcc]; openclPath = makeLibraryPath [zlib]; - allLibPath = makeLibraryPath [xlibs.libXext xlibs.libX11 xlibs.libXrandr zlib stdenv.gcc.gcc]; + allLibPath = makeLibraryPath [xlibs.libXext xlibs.libX11 xlibs.libXrandr zlib stdenv.cc.gcc]; programPath = optionalString (!libsOnly) (makeLibraryPath [ gtk atk pango glib gdk_pixbuf xlibs.libXv ] ); diff --git a/pkgs/os-specific/linux/ocz-toolbox/default.nix b/pkgs/os-specific/linux/ocz-toolbox/default.nix new file mode 100644 index 00000000000..65d4fa0f07a --- /dev/null +++ b/pkgs/os-specific/linux/ocz-toolbox/default.nix @@ -0,0 +1,37 @@ +{ stdenv, fetchurl, libXrender, fontconfig, freetype, libXext, libX11 }: + +let arch = if stdenv.system == "x86_64-linux" then "64" + else if stdenv.system == "i686-linux" then "32" + else abort "OCZ Toolbox only support {x86-64,i686}-linux targets"; +in stdenv.mkDerivation rec { + version = "4.9.0.634"; + name = "ocz-toolbox-${version}"; + + src = fetchurl { + url = "http://ocz.com/consumer/download/firmware/OCZToolbox_v${version}_linux.tar.gz"; + sha256 = "0h51p5bg9h2smxxy1r4xkzzjjavhgql7yy12qmjk0vbh13flgx3y"; + }; + + prePatch = '' + cd linux${arch} + ''; + + libPath = stdenv.lib.makeLibraryPath [ stdenv.cc.gcc libXrender fontconfig freetype libXext libX11 ]; + + installPhase = '' + install -Dm755 OCZToolbox $out/bin/OCZToolbox + patchelf \ + --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + --set-rpath "$libPath" \ + $out/bin/OCZToolbox + ''; + + dontStrip = true; + + meta = with stdenv.lib; { + description = "Update firmware and BIOS, secure erase, view SMART attributes, and view drive details of your OCZ SSD"; + homepage = "http://ocz.com/consumer/download/firmware"; + license = licenses.unfree; + maintainers = with maintainers; [ abbradar ]; + }; +} diff --git a/pkgs/os-specific/linux/opengl/xorg-sys/default.nix b/pkgs/os-specific/linux/opengl/xorg-sys/default.nix index 5c1cf1a90d3..acd1499a36c 100644 --- a/pkgs/os-specific/linux/opengl/xorg-sys/default.nix +++ b/pkgs/os-specific/linux/opengl/xorg-sys/default.nix @@ -11,6 +11,6 @@ stdenv.mkDerivation { name = "xorg-sys-opengl-3"; builder = ./builder.sh; - neededLibs = [xlibs.libXxf86vm xlibs.libXext expat libdrm stdenv.gcc.gcc]; + neededLibs = [xlibs.libXxf86vm xlibs.libXext expat libdrm stdenv.cc.gcc]; } diff --git a/pkgs/os-specific/linux/powertop/default.nix b/pkgs/os-specific/linux/powertop/default.nix index 630fe04e226..befe16f72f2 100644 --- a/pkgs/os-specific/linux/powertop/default.nix +++ b/pkgs/os-specific/linux/powertop/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, gettext, libnl, ncurses, pciutils, pkgconfig, zlib }: stdenv.mkDerivation rec { - name = "powertop-2.6.1"; + name = "powertop-2.7"; src = fetchurl { url = "https://01.org/sites/default/files/downloads/powertop/${name}.tar.gz"; - sha256 = "1r103crmkdk617qrxqjzy2mlhaacbpg5q795546zwcxlbdnxwk03"; + sha256 = "1jkqqr3l1x98m7rgin1dgfzxqwj4vciw9lyyq1kl9bdswa818jwd"; }; buildInputs = [ gettext libnl ncurses pciutils pkgconfig zlib ]; diff --git a/pkgs/os-specific/linux/prl-tools/default.nix b/pkgs/os-specific/linux/prl-tools/default.nix index bd73bc77c82..f76d409fcfb 100644 --- a/pkgs/os-specific/linux/prl-tools/default.nix +++ b/pkgs/os-specific/linux/prl-tools/default.nix @@ -83,7 +83,7 @@ stdenv.mkDerivation rec { ''; libPath = with xorg; - stdenv.lib.makeLibraryPath ([ stdenv.gcc.gcc libXrandr libXext libX11 libXcomposite libXinerama ] + stdenv.lib.makeLibraryPath ([ stdenv.cc.gcc libXrandr libXext libX11 libXcomposite libXinerama ] ++ lib.optionals (!libsOnly) [ libXi glib dbus_glib zlib ]); desktops = map (x: substituteAll ({ @@ -120,7 +120,7 @@ stdenv.mkDerivation rec { for i in $out/bin/* $out/sbin/*; do patchelf \ - --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \ + --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ --set-rpath "$out/lib:$libPath" \ $i done diff --git a/pkgs/os-specific/linux/sinit/default.nix b/pkgs/os-specific/linux/sinit/default.nix new file mode 100644 index 00000000000..783e5fa2063 --- /dev/null +++ b/pkgs/os-specific/linux/sinit/default.nix @@ -0,0 +1,36 @@ +{stdenv, fetchgit, rcinit ? null, rcshutdown ? null, rcreboot ? null}: +let + s = # Generated upstream information + rec { + baseName="sinit"; + version="0.9.2"; + name="${baseName}-${version}"; + url="http://git.suckless.org/sinit/"; + sha256="0nncyzwnszwlqcvx1jf42rn1n2dd5vcxkndqb1b546pgpifniivp"; + rev = "refs/tags/v${version}"; + }; + buildInputs = [ + ]; +in +stdenv.mkDerivation { + inherit (s) name version; + inherit buildInputs; + src = fetchgit { + inherit (s) url sha256 rev; + }; + makeFlags = ["PREFIX=$(out)"]; + preConfigure = "" + + (stdenv.lib.optionalString (rcinit != null) ''sed -re 's@(rcinitcmd[^"]*")[^"]*"@\1${rcinit}"@' -i config.def.h; '') + + (stdenv.lib.optionalString (rcshutdown != null) ''sed -re 's@(rc(reboot|poweroff)cmd[^"]*")[^"]*"@\1${rcshutdown}"@' -i config.def.h; '') + + (stdenv.lib.optionalString (rcreboot != null) ''sed -re 's@(rc(reboot)cmd[^"]*")[^"]*"@\1${rcreboot}"@' -i config.def.h; '') + ; + meta = { + inherit (s) version; + description = ''A very minimal Linux init implementation from suckless.org''; + license = stdenv.lib.licenses.mit ; + maintainers = [stdenv.lib.maintainers.raskin]; + platforms = stdenv.lib.platforms.linux; + homepage = "http://tools.suckless.org/sinit"; + downloadPage = "http://git.suckless.org/sinit"; + }; +} diff --git a/pkgs/os-specific/linux/spl/default.nix b/pkgs/os-specific/linux/spl/default.nix index 7f1dad248e6..0648be4e41a 100644 --- a/pkgs/os-specific/linux/spl/default.nix +++ b/pkgs/os-specific/linux/spl/default.nix @@ -1,13 +1,17 @@ -{ stdenv, fetchurl, kernel, perl, autoconf, automake, libtool, coreutils, gawk }: +{ stdenv, fetchFromGitHub, kernel, perl, autoconf, automake, libtool, coreutils, gawk }: -stdenv.mkDerivation { - name = "spl-0.6.3-${kernel.version}"; - src = fetchurl { - url = http://archive.zfsonlinux.org/downloads/zfsonlinux/spl/spl-0.6.3.tar.gz; - sha256 = "1qqzyj2if5wai4jiwml4i8s6v8k7hbi7jmiph800lhkk5j8s72l9"; +stdenv.mkDerivation rec { + name = "spl-${version}-${kernel.version}"; + version = "0.6.3-1.2"; + + src = fetchFromGitHub { + owner = "zfsonlinux"; + repo = "spl"; + rev = "spl-${version}"; + sha256 = "0id0m3sfpkz8w7b2pc51px8kvz8xnaf8msps57ddarxidmxvb45g"; }; - patches = [ ./install_prefix.patch ./const.patch ./kernel-3.16.patch ./kernel-3.17.patch ]; + patches = [ ./install_prefix.patch ./const.patch ]; buildInputs = [ perl autoconf automake libtool ]; diff --git a/pkgs/os-specific/linux/sysdig/default.nix b/pkgs/os-specific/linux/sysdig/default.nix index 1398b91303b..6b9526c15b2 100644 --- a/pkgs/os-specific/linux/sysdig/default.nix +++ b/pkgs/os-specific/linux/sysdig/default.nix @@ -3,10 +3,10 @@ let inherit (stdenv.lib) optional optionalString; s = rec { baseName="sysdig"; - version = "0.1.91"; + version = "0.1.93"; name="${baseName}-${version}"; url="https://github.com/draios/sysdig/archive/${version}.tar.gz"; - sha256 = "0a34zinw54nkxawby847yzc3wzbw4dgi849pvwyd28391pxpxayy"; + sha256 = "0rcbls1i82z2mwd3kcsidvhbb0xf0f4p7l2z3168wbpsh5nm9clz"; }; buildInputs = [ cmake zlib luajit diff --git a/pkgs/os-specific/linux/sysstat/default.nix b/pkgs/os-specific/linux/sysstat/default.nix index 69940ceb132..28d6f0b21a8 100644 --- a/pkgs/os-specific/linux/sysstat/default.nix +++ b/pkgs/os-specific/linux/sysstat/default.nix @@ -1,11 +1,10 @@ { stdenv, fetchurl, gettext, bzip2 }: - stdenv.mkDerivation rec { - name = "sysstat-11.0.1"; + name = "sysstat-11.0.2"; src = fetchurl { url = "http://perso.orange.fr/sebastien.godard/${name}.tar.xz"; - sha256 = "1cwgsxvs7jkr3il6r344mw46502yjnhrsbcp4217vh4b7xv6czaq"; + sha256 = "15hv3ylr5i6nrrdhyjnp4xld51gpv0cn3hjgy6068ybwpvgpzn5c"; }; buildInputs = [ gettext ]; @@ -15,10 +14,13 @@ stdenv.mkDerivation rec { export PATH_CHKCONFIG=/no-such-program export BZIP=${bzip2}/bin/bzip2 export SYSTEMCTL=systemctl - makeFlagsArray=(DESTDIR=$out SYSCONFIG_DIR=$out/etc IGNORE_MAN_GROUP=y CHOWN=true) - installTargets="install_base install_nls install_man" ''; + makeFlags = "SYSCONFIG_DIR=$(out)/etc IGNORE_MAN_GROUP=y CHOWN=true"; + installTargets = "install_base install_nls install_man"; + + patches = [ ./install.patch ]; + meta = { homepage = http://sebastien.godard.pagesperso-orange.fr/; description = "A collection of performance monitoring tools for Linux (such as sar, iostat and pidstat)"; diff --git a/pkgs/os-specific/linux/sysstat/install.patch b/pkgs/os-specific/linux/sysstat/install.patch new file mode 100644 index 00000000000..473fa30b98b --- /dev/null +++ b/pkgs/os-specific/linux/sysstat/install.patch @@ -0,0 +1,13 @@ +diff -rc sysstat-11.0.1/Makefile.in sysstat-11.0.1-new/Makefile.in +*** sysstat-11.0.1/Makefile.in 2014-08-30 15:38:39.000000000 +0200 +--- sysstat-11.0.1-new/Makefile.in 2014-12-18 14:40:45.466349009 +0100 +*************** +*** 331,337 **** + install_base: all sa1 sa2 sysstat.sysconfig install_man install_nls \ + contrib/isag/isag + mkdir -p $(DESTDIR)$(SA_LIB_DIR) +- mkdir -p $(DESTDIR)$(SA_DIR) + ifeq ($(CLEAN_SA_DIR),y) + find $(DESTDIR)$(SA_DIR) \( -name 'sar??' -o -name 'sa??' -o -name 'sar??.gz' -o -name 'sa??.gz' \) \ + -exec rm -f {} \; +--- 331,336 ---- diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index 2df23cf0e16..e1b8f9ea92c 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -20,11 +20,8 @@ stdenv.mkDerivation rec { patches = [ # These are all changes between upstream and - # https://github.com/edolstra/systemd/tree/nixos-v216. + # https://github.com/edolstra/systemd/tree/nixos-v217. ./fixes.patch - # Fixes systemd-journald so that it does not get killed - # by systemd-journal-flush starting too quickly - ./systemd-journald-type-notify.patch ]; buildInputs = @@ -89,7 +86,7 @@ stdenv.mkDerivation rec { # This is needed because systemd uses the gold linker, which doesn't # yet have the wrapper script to add rpath flags automatically. - NIX_LDFLAGS = "-rpath ${pam}/lib -rpath ${libcap}/lib -rpath ${acl}/lib -rpath ${stdenv.gcc.gcc}/lib"; + NIX_LDFLAGS = "-rpath ${pam}/lib -rpath ${libcap}/lib -rpath ${acl}/lib -rpath ${stdenv.cc.gcc}/lib"; PYTHON_BINARY = "${coreutils}/bin/env python"; # don't want a build time dependency on Python diff --git a/pkgs/os-specific/linux/systemd/fixes.patch b/pkgs/os-specific/linux/systemd/fixes.patch index ff31b4a75d4..182927486c5 100644 --- a/pkgs/os-specific/linux/systemd/fixes.patch +++ b/pkgs/os-specific/linux/systemd/fixes.patch @@ -13,6 +13,186 @@ index e30d9a8..a3d399b 100644 # Ignore raid devices that are not yet assembled and started SUBSYSTEM=="block", ENV{DEVTYPE}=="disk", KERNEL=="md*", TEST!="md/array_state", ENV{SYSTEMD_READY}="0" SUBSYSTEM=="block", ENV{DEVTYPE}=="disk", KERNEL=="md*", ATTR{md/array_state}=="|clear|inactive", ENV{SYSTEMD_READY}="0" +diff --git a/src/core/job.c b/src/core/job.c +index eaa4bb1..db44fee 100644 +--- a/src/core/job.c ++++ b/src/core/job.c +@@ -352,6 +352,9 @@ bool job_type_is_redundant(JobType a, UnitActiveState b) { + return + b == UNIT_ACTIVATING; + ++ case JOB_NOP: ++ return true; ++ + default: + assert_not_reached("Invalid job type"); + } +diff --git a/src/core/job.h b/src/core/job.h +index 1e7c61b..ee8e54a 100644 +--- a/src/core/job.h ++++ b/src/core/job.h +@@ -49,9 +49,11 @@ enum JobType { + _JOB_TYPE_MAX_MERGING, + + /* JOB_NOP can enter into a transaction, but as it won't pull in +- * any dependencies, it won't have to merge with anything. +- * job_install() avoids the problem of merging JOB_NOP too (it's +- * special-cased, only merges with other JOB_NOPs). */ ++ * any dependencies and it uses the special 'nop_job' slot in Unit, ++ * it won't have to merge with anything (except possibly into another ++ * JOB_NOP, previously installed). JOB_NOP is special-cased in ++ * job_type_is_*() functions so that the transaction can be ++ * activated. */ + JOB_NOP = _JOB_TYPE_MAX_MERGING, /* do nothing */ + + _JOB_TYPE_MAX_IN_TRANSACTION, +@@ -190,11 +192,15 @@ _pure_ static inline bool job_type_is_mergeable(JobType a, JobType b) { + } + + _pure_ static inline bool job_type_is_conflicting(JobType a, JobType b) { +- return !job_type_is_mergeable(a, b); ++ return a != JOB_NOP && b != JOB_NOP && !job_type_is_mergeable(a, b); + } + + _pure_ static inline bool job_type_is_superset(JobType a, JobType b) { + /* Checks whether operation a is a "superset" of b in its actions */ ++ if (b == JOB_NOP) ++ return true; ++ if (a == JOB_NOP) ++ return false; + return a == job_type_lookup_merge(a, b); + } + +diff --git a/src/core/manager.c b/src/core/manager.c +index d427d88..256d6f7 100644 +--- a/src/core/manager.c ++++ b/src/core/manager.c +@@ -662,9 +662,11 @@ static int manager_setup_notify(Manager *m) { + return -errno; + } + +- if (m->running_as == SYSTEMD_SYSTEM) ++ if (m->running_as == SYSTEMD_SYSTEM) { + m->notify_socket = strdup("/run/systemd/notify"); +- else { ++ if (!m->notify_socket) ++ return log_oom(); ++ } else { + const char *e; + + e = getenv("XDG_RUNTIME_DIR"); +@@ -674,9 +676,11 @@ static int manager_setup_notify(Manager *m) { + } + + m->notify_socket = strappend(e, "/systemd/notify"); ++ if (!m->notify_socket) ++ return log_oom(); ++ ++ mkdir_parents_label(m->notify_socket, 0755); + } +- if (!m->notify_socket) +- return log_oom(); + + strncpy(sa.un.sun_path, m->notify_socket, sizeof(sa.un.sun_path)-1); + r = bind(fd, &sa.sa, offsetof(struct sockaddr_un, sun_path) + strlen(sa.un.sun_path)); +diff --git a/src/core/shutdown.c b/src/core/shutdown.c +index 20cf526..03cfddc 100644 +--- a/src/core/shutdown.c ++++ b/src/core/shutdown.c +@@ -75,7 +75,9 @@ static int parse_argv(int argc, char *argv[]) { + assert(argc >= 1); + assert(argv); + +- while ((c = getopt_long(argc, argv, "", options, NULL)) >= 0) ++ /* "-" prevents getopt from permuting argv[] and moving the verb away ++ * from argv[1]. Our interface to initrd promises it'll be there. */ ++ while ((c = getopt_long(argc, argv, "-", options, NULL)) >= 0) + switch (c) { + + case ARG_LOG_LEVEL: +@@ -113,6 +115,13 @@ static int parse_argv(int argc, char *argv[]) { + + break; + ++ case '\001': ++ if (!arg_verb) ++ arg_verb = optarg; ++ else ++ log_error("Excess arguments, ignoring"); ++ break; ++ + case '?': + return -EINVAL; + +@@ -120,15 +129,11 @@ static int parse_argv(int argc, char *argv[]) { + assert_not_reached("Unhandled option code."); + } + +- if (optind >= argc) { ++ if (!arg_verb) { + log_error("Verb argument missing."); + return -EINVAL; + } + +- arg_verb = argv[optind]; +- +- if (optind + 1 < argc) +- log_error("Excess arguments, ignoring"); + return 0; + } + +diff --git a/src/core/snapshot.c b/src/core/snapshot.c +index 5eed615..c2678cb 100644 +--- a/src/core/snapshot.c ++++ b/src/core/snapshot.c +@@ -208,7 +208,7 @@ int snapshot_create(Manager *m, const char *name, bool cleanup, sd_bus_error *e, + return sd_bus_error_setf(e, SD_BUS_ERROR_INVALID_ARGS, "Unit name %s lacks snapshot suffix.", name); + + if (manager_get_unit(m, name)) +- sd_bus_error_setf(e, BUS_ERROR_UNIT_EXISTS, "Snapshot %s exists already.", name); ++ return sd_bus_error_setf(e, BUS_ERROR_UNIT_EXISTS, "Snapshot %s exists already.", name); + + } else { + +diff --git a/src/core/systemd.pc.in b/src/core/systemd.pc.in +index d5b86bf..9c66e7b 100644 +--- a/src/core/systemd.pc.in ++++ b/src/core/systemd.pc.in +@@ -14,8 +14,8 @@ systemduserunitdir=@userunitdir@ + systemduserpresetdir=@userpresetdir@ + systemdsystemconfdir=@pkgsysconfdir@/system + systemduserconfdir=@pkgsysconfdir@/user +-systemdsystemunitpath=${systemdsystemconfdir}:/etc/systemd/system:/run/systemd/system:/usr/local/lib/systemd/system:${systemdsystemunitdir}:/usr/lib/systemd/system:/lib/systemd/system +-systemduserunitpath=${systemduserconfdir}:/etc/systemd/user:/run/systemd/user:/usr/local/lib/systemd/user:/usr/local/share/systemd/user:${systemduserunitdir}:/usr/lib/systemd/user:/usr/share/systemd/user ++systemdsystemunitpath=${systemdsystemconfdir}:/etc/systemd/system:/etc/systemd-mutable/system:/nix/var/nix/profiles/default/lib/systemd/user:/run/systemd/system:${systemdsystemunitdir} ++systemduserunitpath=${systemduserconfdir}:/etc/systemd/user:/etc/systemd-mutable/user:/nix/var/nix/profiles/default/lib/systemd/system:/run/systemd/user:${systemduserunitdir} + systemdsystemgeneratordir=@systemgeneratordir@ + systemdusergeneratordir=@usergeneratordir@ + systemdsleepdir=@systemsleepdir@ +diff --git a/src/core/timer.c b/src/core/timer.c +index a3713e2..5c4e9f9 100644 +--- a/src/core/timer.c ++++ b/src/core/timer.c +@@ -521,6 +521,7 @@ fail: + + static int timer_start(Unit *u) { + Timer *t = TIMER(u); ++ TimerValue *v; + + assert(t); + assert(t->state == TIMER_DEAD || t->state == TIMER_FAILED); +@@ -530,6 +531,11 @@ static int timer_start(Unit *u) { + + t->last_trigger = DUAL_TIMESTAMP_NULL; + ++ /* Reenable all timers that depend on unit activation time */ ++ LIST_FOREACH(value, v, t->values) ++ if (v->base == TIMER_ACTIVE) ++ v->disabled = false; ++ + if (t->stamp_path) { + struct stat st; + diff --git a/src/core/umount.c b/src/core/umount.c index cffa453..4d1a9ff 100644 --- a/src/core/umount.c @@ -26,6 +206,19 @@ index cffa453..4d1a9ff 100644 #ifndef HAVE_SPLIT_USR || path_equal(m->path, "/usr") #endif +diff --git a/src/delta/delta.c b/src/delta/delta.c +index 25c4a0b..e1f2d6d 100644 +--- a/src/delta/delta.c ++++ b/src/delta/delta.c +@@ -487,7 +487,7 @@ static int parse_flags(const char *flag_str, int flags) { + const char *word, *state; + size_t l; + +- FOREACH_WORD(word, l, flag_str, state) { ++ FOREACH_WORD_SEPARATOR(word, l, flag_str, ",", state) { + if (strneq("masked", word, l)) + flags |= SHOW_MASKED; + else if (strneq ("equivalent", word, l)) diff --git a/src/fsck/fsck.c b/src/fsck/fsck.c index 70a5918..1926e52 100644 --- a/src/fsck/fsck.c @@ -40,19 +233,377 @@ index 70a5918..1926e52 100644 cmdline[i++] = "-T"; /* +diff --git a/src/fstab-generator/fstab-generator.c b/src/fstab-generator/fstab-generator.c +index e257c12..1e04553 100644 +--- a/src/fstab-generator/fstab-generator.c ++++ b/src/fstab-generator/fstab-generator.c +@@ -485,7 +485,7 @@ static int add_usr_mount(void) { + return log_oom(); + } + +- if (!arg_usr_what || !arg_usr_options) ++ if (!arg_usr_what) + return 0; + + what = fstab_node_to_udev_node(arg_usr_what); +@@ -494,7 +494,13 @@ static int add_usr_mount(void) { + return -1; + } + +- opts = arg_usr_options; ++ if (!arg_usr_options) ++ opts = arg_root_rw > 0 ? "rw" : "ro"; ++ else if (!mount_test_option(arg_usr_options, "ro") && ++ !mount_test_option(arg_usr_options, "rw")) ++ opts = strappenda(arg_usr_options, ",", arg_root_rw > 0 ? "rw" : "ro"); ++ else ++ opts = arg_usr_options; + + log_debug("Found entry what=%s where=/sysroot/usr type=%s", what, strna(arg_usr_fstype)); + return add_mount(what, +diff --git a/src/hostname/hostnamectl.c b/src/hostname/hostnamectl.c +index e487369..ff4e9c9 100644 +--- a/src/hostname/hostnamectl.c ++++ b/src/hostname/hostnamectl.c +@@ -536,5 +536,5 @@ int main(int argc, char *argv[]) { + r = hostnamectl_main(bus, argc, argv); + + finish: +- return r < 0 ? EXIT_FAILURE : r; ++ return r < 0 ? EXIT_FAILURE : EXIT_SUCCESS; + } +diff --git a/src/journal/journal-file.c b/src/journal/journal-file.c +index 8a2c0fc..9de3ddd 100644 +--- a/src/journal/journal-file.c ++++ b/src/journal/journal-file.c +@@ -1657,7 +1657,7 @@ static int generic_array_bisect( + } + } + +- if (k > n) { ++ if (k >= n) { + if (direction == DIRECTION_UP) { + i = n; + subtract_one = true; +diff --git a/src/journal/journalctl.c b/src/journal/journalctl.c +index f50faf4..03579fd 100644 +--- a/src/journal/journalctl.c ++++ b/src/journal/journalctl.c +@@ -682,7 +682,7 @@ static int parse_argv(int argc, char *argv[]) { + assert_not_reached("Unhandled option"); + } + +- if (arg_follow && !arg_no_tail && arg_lines == ARG_LINES_DEFAULT) ++ if (arg_follow && !arg_no_tail && !arg_since && arg_lines == ARG_LINES_DEFAULT) + arg_lines = 10; + + if (!!arg_directory + !!arg_file + !!arg_machine > 1) { +diff --git a/src/journal/journald-server.c b/src/journal/journald-server.c +index 12735c4..08b143b 100644 +--- a/src/journal/journald-server.c ++++ b/src/journal/journald-server.c +@@ -1655,6 +1655,7 @@ void server_done(Server *s) { + free(s->buffer); + free(s->tty_path); + free(s->cgroup_root); ++ free(s->hostname_field); + + if (s->mmap) + mmap_cache_unref(s->mmap); +diff --git a/src/libsystemd-network/network-internal.c b/src/libsystemd-network/network-internal.c +index 372f3ed..d56ee51 100644 +--- a/src/libsystemd-network/network-internal.c ++++ b/src/libsystemd-network/network-internal.c +@@ -392,10 +392,12 @@ void serialize_dhcp_routes(FILE *f, const char *key, struct sd_dhcp_route *route + + fprintf(f, "%s=", key); + +- for (i = 0; i < size; i++) +- fprintf(f, "%s/%" PRIu8 ",%s%s", inet_ntoa(routes[i].dst_addr), +- routes[i].dst_prefixlen, inet_ntoa(routes[i].gw_addr), ++ for (i = 0; i < size; i++) { ++ fprintf(f, "%s/%" PRIu8, inet_ntoa(routes[i].dst_addr), ++ routes[i].dst_prefixlen); ++ fprintf(f, ",%s%s", inet_ntoa(routes[i].gw_addr), + (i < (size - 1)) ? " ": ""); ++ } + + fputs("\n", f); + } +diff --git a/src/libsystemd-network/sd-dhcp-client.c b/src/libsystemd-network/sd-dhcp-client.c +index 0eba4c3..9986b52 100644 +--- a/src/libsystemd-network/sd-dhcp-client.c ++++ b/src/libsystemd-network/sd-dhcp-client.c +@@ -68,7 +68,6 @@ struct sd_dhcp_client { + uint32_t mtu; + uint32_t xid; + usec_t start_time; +- uint16_t secs; + unsigned int attempt; + usec_t request_sent; + sd_event_source *timeout_t1; +@@ -321,10 +320,12 @@ static int client_message_init(sd_dhcp_client *client, DHCPPacket **ret, + _cleanup_free_ DHCPPacket *packet; + size_t optlen, optoffset, size; + be16_t max_size; ++ usec_t time_now; ++ uint16_t secs; + int r; + + assert(client); +- assert(client->secs); ++ assert(client->start_time); + assert(ret); + assert(_optlen); + assert(_optoffset); +@@ -344,7 +345,15 @@ static int client_message_init(sd_dhcp_client *client, DHCPPacket **ret, + + /* Although 'secs' field is a SHOULD in RFC 2131, certain DHCP servers + refuse to issue an DHCP lease if 'secs' is set to zero */ +- packet->dhcp.secs = htobe16(client->secs); ++ r = sd_event_now(client->event, clock_boottime_or_monotonic(), &time_now); ++ if (r < 0) ++ return r; ++ assert(time_now >= client->start_time); ++ ++ /* seconds between sending first and last DISCOVER ++ * must always be strictly positive to deal with broken servers */ ++ secs = ((time_now - client->start_time) / USEC_PER_SEC) ? : 1; ++ packet->dhcp.secs = htobe16(secs); + + /* RFC2132 section 4.1 + A client that cannot receive unicast IP datagrams until its protocol +@@ -441,24 +450,12 @@ static int dhcp_client_send_raw(sd_dhcp_client *client, DHCPPacket *packet, + static int client_send_discover(sd_dhcp_client *client) { + _cleanup_free_ DHCPPacket *discover = NULL; + size_t optoffset, optlen; +- usec_t time_now; + int r; + + assert(client); + assert(client->state == DHCP_STATE_INIT || + client->state == DHCP_STATE_SELECTING); + +- /* See RFC2131 section 4.4.1 */ +- +- r = sd_event_now(client->event, clock_boottime_or_monotonic(), &time_now); +- if (r < 0) +- return r; +- assert(time_now >= client->start_time); +- +- /* seconds between sending first and last DISCOVER +- * must always be strictly positive to deal with broken servers */ +- client->secs = ((time_now - client->start_time) / USEC_PER_SEC) ? : 1; +- + r = client_message_init(client, &discover, DHCP_DISCOVER, + &optlen, &optoffset); + if (r < 0) +@@ -875,10 +872,8 @@ static int client_start(sd_dhcp_client *client) { + } + client->fd = r; + +- if (client->state == DHCP_STATE_INIT) { ++ if (client->state == DHCP_STATE_INIT || client->state == DHCP_STATE_INIT_REBOOT) + client->start_time = now(clock_boottime_or_monotonic()); +- client->secs = 0; +- } + + return client_initialize_events(client, client_receive_message_raw); + } +@@ -1269,6 +1264,9 @@ static int client_handle_message(sd_dhcp_client *client, DHCPMessage *message, + if (r >= 0) { + client->timeout_resend = + sd_event_source_unref(client->timeout_resend); ++ client->receive_message = ++ sd_event_source_unref(client->receive_message); ++ client->fd = asynchronous_close(client->fd); + + if (IN_SET(client->state, DHCP_STATE_REQUESTING, + DHCP_STATE_REBOOTING)) +diff --git a/src/libsystemd-network/sd-dhcp-lease.c b/src/libsystemd-network/sd-dhcp-lease.c +index 4fb01c0..b7c9a07 100644 +--- a/src/libsystemd-network/sd-dhcp-lease.c ++++ b/src/libsystemd-network/sd-dhcp-lease.c +@@ -50,7 +50,7 @@ int sd_dhcp_lease_get_address(sd_dhcp_lease *lease, struct in_addr *addr) { + + int sd_dhcp_lease_get_lifetime(sd_dhcp_lease *lease, uint32_t *lifetime) { + assert_return(lease, -EINVAL); +- assert_return(lease, -EINVAL); ++ assert_return(lifetime, -EINVAL); + + *lifetime = lease->lifetime; + +diff --git a/src/libsystemd-network/sd-dhcp6-client.c b/src/libsystemd-network/sd-dhcp6-client.c +index fa4f9b5..dbec1a2 100644 +--- a/src/libsystemd-network/sd-dhcp6-client.c ++++ b/src/libsystemd-network/sd-dhcp6-client.c +@@ -200,19 +200,19 @@ int sd_dhcp6_client_set_duid(sd_dhcp6_client *client, uint16_t type, uint8_t *du + + switch (type) { + case DHCP6_DUID_LLT: +- if (duid_len <= sizeof(client->duid.llt)) ++ if (duid_len <= sizeof(client->duid.llt) - 2) + return -EINVAL; + break; + case DHCP6_DUID_EN: +- if (duid_len != sizeof(client->duid.en)) ++ if (duid_len != sizeof(client->duid.en) - 2) + return -EINVAL; + break; + case DHCP6_DUID_LL: +- if (duid_len <= sizeof(client->duid.ll)) ++ if (duid_len <= sizeof(client->duid.ll) - 2) + return -EINVAL; + break; + case DHCP6_DUID_UUID: +- if (duid_len != sizeof(client->duid.uuid)) ++ if (duid_len != sizeof(client->duid.uuid) - 2) + return -EINVAL; + break; + default: +@@ -222,7 +222,7 @@ int sd_dhcp6_client_set_duid(sd_dhcp6_client *client, uint16_t type, uint8_t *du + + client->duid.raw.type = htobe16(type); + memcpy(&client->duid.raw.data, duid, duid_len); +- client->duid_len = duid_len; ++ client->duid_len = duid_len + 2; /* +2 for sizeof(type) */ + + return 0; + } +diff --git a/src/libsystemd/sd-bus/bus-match.c b/src/libsystemd/sd-bus/bus-match.c +index 18afe0f..5658c61 100644 +--- a/src/libsystemd/sd-bus/bus-match.c ++++ b/src/libsystemd/sd-bus/bus-match.c +@@ -537,7 +537,7 @@ static int bus_match_find_compare_value( + else if (BUS_MATCH_CAN_HASH(t)) + n = hashmap_get(c->compare.children, value_str); + else { +- for (n = c->child; !value_node_same(n, t, value_u8, value_str); n = n->next) ++ for (n = c->child; n && !value_node_same(n, t, value_u8, value_str); n = n->next) + ; + } + +diff --git a/src/libsystemd/sd-bus/bus-objects.c b/src/libsystemd/sd-bus/bus-objects.c +index 0ab1119..6c3230a 100644 +--- a/src/libsystemd/sd-bus/bus-objects.c ++++ b/src/libsystemd/sd-bus/bus-objects.c +@@ -617,6 +617,9 @@ static int property_get_set_callbacks_run( + return r; + + } else { ++ const char *signature = NULL; ++ char type = 0; ++ + if (c->vtable->type != _SD_BUS_VTABLE_WRITABLE_PROPERTY) + return sd_bus_reply_method_errorf(m, SD_BUS_ERROR_PROPERTY_READ_ONLY, "Property '%s' is not writable.", c->member); + +@@ -628,6 +631,13 @@ static int property_get_set_callbacks_run( + + c->last_iteration = bus->iteration_counter; + ++ r = sd_bus_message_peek_type(m, &type, &signature); ++ if (r < 0) ++ return r; ++ ++ if (type != 'v' || !streq(strempty(signature), strempty(c->vtable->x.property.signature))) ++ return sd_bus_reply_method_errorf(m, SD_BUS_ERROR_INVALID_ARGS, "Incorrect parameters for property '%s', expected '%s', got '%s'.", c->member, strempty(c->vtable->x.property.signature), strempty(signature)); ++ + r = sd_bus_message_enter_container(m, 'v', c->vtable->x.property.signature); + if (r < 0) + return r; +diff --git a/src/libsystemd/sd-rtnl/rtnl-message.c b/src/libsystemd/sd-rtnl/rtnl-message.c +index b501a52..740133a 100644 +--- a/src/libsystemd/sd-rtnl/rtnl-message.c ++++ b/src/libsystemd/sd-rtnl/rtnl-message.c +@@ -36,6 +36,8 @@ + #define GET_CONTAINER(m, i) ((i) < (m)->n_containers ? (struct rtattr*)((uint8_t*)(m)->hdr + (m)->container_offsets[i]) : NULL) + #define PUSH_CONTAINER(m, new) (m)->container_offsets[(m)->n_containers ++] = (uint8_t*)(new) - (uint8_t*)(m)->hdr; + ++#define RTA_TYPE(rta) ((rta)->rta_type & NLA_TYPE_MASK) ++ + static int message_new_empty(sd_rtnl *rtnl, sd_rtnl_message **ret) { + sd_rtnl_message *m; + +@@ -566,8 +568,8 @@ int sd_rtnl_message_append_string(sd_rtnl_message *m, unsigned short type, const + size = (size_t)r; + + if (size) { +- length = strnlen(data, size); +- if (length >= size) ++ length = strnlen(data, size+1); ++ if (length > size) + return -EINVAL; + } else + length = strlen(data); +@@ -1066,7 +1068,7 @@ int rtnl_message_parse(sd_rtnl_message *m, + *rta_tb_size = max + 1; + + for (; RTA_OK(rta, rt_len); rta = RTA_NEXT(rta, rt_len)) { +- type = rta->rta_type; ++ type = RTA_TYPE(rta); + + /* if the kernel is newer than the headers we used + when building, we ignore out-of-range attributes +@@ -1222,7 +1224,7 @@ int socket_read_message(sd_rtnl *rtnl) { + } + } + +- for (new_msg = rtnl->rbuffer; NLMSG_OK(new_msg, len); new_msg = NLMSG_NEXT(new_msg, len)) { ++ for (new_msg = rtnl->rbuffer; NLMSG_OK(new_msg, len) && !done; new_msg = NLMSG_NEXT(new_msg, len)) { + _cleanup_rtnl_message_unref_ sd_rtnl_message *m = NULL; + const NLType *nl_type; + +@@ -1237,7 +1239,8 @@ int socket_read_message(sd_rtnl *rtnl) { + if (new_msg->nlmsg_type == NLMSG_DONE) { + /* finished reading multi-part message */ + done = true; +- break; ++ ++ continue; + } + + /* check that we support this message type */ +diff --git a/src/libudev/libudev-device.c b/src/libudev/libudev-device.c +index 2699374..e2afcb8 100644 +--- a/src/libudev/libudev-device.c ++++ b/src/libudev/libudev-device.c +@@ -730,8 +730,13 @@ _public_ struct udev_device *udev_device_new_from_syspath(struct udev *udev, con + return NULL; + } else { + /* everything else just needs to be a directory */ +- if (stat(path, &statbuf) != 0 || !S_ISDIR(statbuf.st_mode)) ++ if (stat(path, &statbuf) != 0) + return NULL; ++ ++ if (!S_ISDIR(statbuf.st_mode)) { ++ errno = EISDIR; ++ return NULL; ++ } + } + + udev_device = udev_device_new(udev); diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c -index b6d9bc6..04fbe57 100644 +index b6d9bc6..759794f 100644 --- a/src/nspawn/nspawn.c +++ b/src/nspawn/nspawn.c -@@ -758,7 +758,7 @@ static int mount_binds(const char *dest, +@@ -758,7 +758,7 @@ static int mount_binds(const char *dest, char **l, bool ro) { * and char devices. */ if (S_ISDIR(source_st.st_mode)) { r = mkdir_label(where, 0755); - if (r < 0) { -+ if (r < 0 && r != -EEXIST) { ++ if (r < 0 && errno != EEXIST) { log_error("Failed to create mount point %s: %s", where, strerror(-r)); - + return r; +@@ -818,7 +818,7 @@ static int mount_tmpfs(const char *dest) { + return log_oom(); + + r = mkdir_label(where, 0755); +- if (r < 0) { ++ if (r < 0 && errno != EEXIST) { + log_error("creating mount point for tmpfs %s failed: %s", where, strerror(-r)); + + return r; @@ -3073,6 +3073,7 @@ int main(int argc, char *argv[]) { goto finish; } @@ -69,8 +620,234 @@ index b6d9bc6..04fbe57 100644 } } else { char template[] = "/tmp/nspawn-root-XXXXXX"; +diff --git a/src/resolve/resolved-dns-packet.c b/src/resolve/resolved-dns-packet.c +index 7375f77..ec8efcc 100644 +--- a/src/resolve/resolved-dns-packet.c ++++ b/src/resolve/resolved-dns-packet.c +@@ -866,7 +866,7 @@ fail: + + int dns_packet_read_name(DnsPacket *p, char **_ret, + bool allow_compression, size_t *start) { +- size_t saved_rindex, after_rindex = 0; ++ size_t saved_rindex, after_rindex = 0, jump_barrier; + _cleanup_free_ char *ret = NULL; + size_t n = 0, allocated = 0; + bool first = true; +@@ -876,6 +876,7 @@ int dns_packet_read_name(DnsPacket *p, char **_ret, + assert(_ret); + + saved_rindex = p->rindex; ++ jump_barrier = p->rindex; + + for (;;) { + uint8_t c, d; +@@ -922,7 +923,7 @@ int dns_packet_read_name(DnsPacket *p, char **_ret, + goto fail; + + ptr = (uint16_t) (c & ~0xc0) << 8 | (uint16_t) d; +- if (ptr < DNS_PACKET_HEADER_SIZE || ptr >= saved_rindex) { ++ if (ptr < DNS_PACKET_HEADER_SIZE || ptr >= jump_barrier) { + r = -EBADMSG; + goto fail; + } +@@ -930,9 +931,13 @@ int dns_packet_read_name(DnsPacket *p, char **_ret, + if (after_rindex == 0) + after_rindex = p->rindex; + ++ /* Jumps are limited to a "prior occurence" (RFC-1035 4.1.4) */ ++ jump_barrier = ptr; + p->rindex = ptr; +- } else ++ } else { ++ r = -EBADMSG; + goto fail; ++ } + } + + if (!GREEDY_REALLOC(ret, allocated, n + 1)) { +diff --git a/src/resolve/resolved.c b/src/resolve/resolved.c +index 7d258c9..6dd4cad 100644 +--- a/src/resolve/resolved.c ++++ b/src/resolve/resolved.c +@@ -108,7 +108,7 @@ int main(int argc, char *argv[]) { + + finish: + sd_notify(false, +- "STOPPIN=1\n" ++ "STOPPING=1\n" + "STATUS=Shutting down..."); + + return r < 0 ? EXIT_FAILURE : EXIT_SUCCESS; +diff --git a/src/run/run.c b/src/run/run.c +index e3b6293..dcefb5c 100644 +--- a/src/run/run.c ++++ b/src/run/run.c +@@ -573,9 +573,12 @@ int main(int argc, char* argv[]) { + if (r <= 0) + goto finish; + +- r = find_binary(argv[optind], &command); ++ r = find_binary(argv[optind], arg_transport == BUS_TRANSPORT_LOCAL, &command); + if (r < 0) { +- log_error("Failed to find executable %s: %s", argv[optind], strerror(-r)); ++ log_error("Failed to find executable %s%s: %s", ++ argv[optind], ++ arg_transport == BUS_TRANSPORT_LOCAL ? "" : " on local system", ++ strerror(-r)); + goto finish; + } + argv[optind] = command; +diff --git a/src/shared/install.c b/src/shared/install.c +index 035b44c..cab93e8 100644 +--- a/src/shared/install.c ++++ b/src/shared/install.c +@@ -1620,12 +1620,10 @@ int unit_file_enable( + STRV_FOREACH(i, files) { + UnitFileState state; + ++ /* We only want to know if this unit is masked, so we ignore ++ * errors from unit_file_get_state, deferring other checks. ++ * This allows templated units to be enabled on the fly. */ + state = unit_file_get_state(scope, root_dir, *i); +- if (state < 0) { +- log_error("Failed to get unit file state for %s: %s", *i, strerror(-state)); +- return state; +- } +- + if (state == UNIT_FILE_MASKED || state == UNIT_FILE_MASKED_RUNTIME) { + log_error("Failed to enable unit: Unit %s is masked", *i); + return -ENOTSUP; +diff --git a/src/shared/path-lookup.c b/src/shared/path-lookup.c +index 8f75a8e..c800e01 100644 +--- a/src/shared/path-lookup.c ++++ b/src/shared/path-lookup.c +@@ -86,17 +86,14 @@ static char** user_dirs( + const char * const config_unit_paths[] = { + USER_CONFIG_UNIT_PATH, + "/etc/systemd/user", ++ "/etc/systemd-mutable/user", + NULL + }; + + const char * const runtime_unit_path = "/run/systemd/user"; + + const char * const data_unit_paths[] = { +- "/usr/local/lib/systemd/user", +- "/usr/local/share/systemd/user", + USER_DATA_UNIT_PATH, +- "/usr/lib/systemd/user", +- "/usr/share/systemd/user", + NULL + }; + +@@ -260,13 +257,11 @@ int lookup_paths_init( + STRV_IFNOTNULL(generator_early), + USER_CONFIG_UNIT_PATH, + "/etc/systemd/user", ++ "/etc/systemd-mutable/user", ++ "/nix/var/nix/profiles/default/lib/systemd/user", + "/run/systemd/user", + STRV_IFNOTNULL(generator), +- "/usr/local/lib/systemd/user", +- "/usr/local/share/systemd/user", + USER_DATA_UNIT_PATH, +- "/usr/lib/systemd/user", +- "/usr/share/systemd/user", + STRV_IFNOTNULL(generator_late), + NULL); + } else +@@ -276,14 +271,11 @@ int lookup_paths_init( + STRV_IFNOTNULL(generator_early), + SYSTEM_CONFIG_UNIT_PATH, + "/etc/systemd/system", ++ "/etc/systemd-mutable/system", ++ "/nix/var/nix/profiles/default/lib/systemd/system", + "/run/systemd/system", + STRV_IFNOTNULL(generator), +- "/usr/local/lib/systemd/system", + SYSTEM_DATA_UNIT_PATH, +- "/usr/lib/systemd/system", +-#ifdef HAVE_SPLIT_USR +- "/lib/systemd/system", +-#endif + STRV_IFNOTNULL(generator_late), + NULL); + +diff --git a/src/shared/path-util.c b/src/shared/path-util.c +index 67566bc..be03695 100644 +--- a/src/shared/path-util.c ++++ b/src/shared/path-util.c +@@ -563,11 +563,11 @@ int path_is_os_tree(const char *path) { + return r >= 0; + } + +-int find_binary(const char *name, char **filename) { ++int find_binary(const char *name, bool local, char **filename) { + assert(name); + + if (is_path(name)) { +- if (access(name, X_OK) < 0) ++ if (local && access(name, X_OK) < 0) + return -errno; + + if (filename) { +@@ -657,7 +657,7 @@ int fsck_exists(const char *fstype) { + + checker = strappenda("fsck.", fstype); + +- r = find_binary(checker, &p); ++ r = find_binary(checker, true, &p); + if (r < 0) + return r; + +diff --git a/src/shared/path-util.h b/src/shared/path-util.h +index 8d171a5..bd0d324 100644 +--- a/src/shared/path-util.h ++++ b/src/shared/path-util.h +@@ -55,7 +55,7 @@ int path_is_mount_point(const char *path, bool allow_symlink); + int path_is_read_only_fs(const char *path); + int path_is_os_tree(const char *path); + +-int find_binary(const char *name, char **filename); ++int find_binary(const char *name, bool local, char **filename); + + bool paths_check_timestamp(const char* const* paths, usec_t *paths_ts_usec, bool update); + +diff --git a/src/shared/virt.c b/src/shared/virt.c +index f9c4e67..f10baab 100644 +--- a/src/shared/virt.c ++++ b/src/shared/virt.c +@@ -293,8 +293,26 @@ int detect_container(const char **id) { + + r = read_one_line_file("/run/systemd/container", &m); + if (r == -ENOENT) { +- r = 0; +- goto finish; ++ ++ /* Fallback for cases where PID 1 was not ++ * systemd (for example, cases where ++ * init=/bin/sh is used. */ ++ ++ r = getenv_for_pid(1, "container", &m); ++ if (r <= 0) { ++ ++ /* If that didn't work, give up, ++ * assume no container manager. ++ * ++ * Note: This means we still cannot ++ * detect containers if init=/bin/sh ++ * is passed but privileges dropped, ++ * as /proc/1/environ is only readable ++ * with privileges. */ ++ ++ r = 0; ++ goto finish; ++ } + } + if (r < 0) + return r; diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c -index 28eaa6a..6292c09 100644 +index 28eaa6a..3866308 100644 --- a/src/systemctl/systemctl.c +++ b/src/systemctl/systemctl.c @@ -2651,7 +2651,7 @@ static int start_unit_one( @@ -82,6 +859,89 @@ index 28eaa6a..6292c09 100644 return log_oom(); } +@@ -6917,8 +6917,13 @@ done: + + static int halt_now(enum action a) { + +-/* Make sure C-A-D is handled by the kernel from this +- * point on... */ ++ /* The kernel will automaticall flush ATA disks and suchlike ++ * on reboot(), but the file systems need to be synce'd ++ * explicitly in advance. */ ++ sync(); ++ ++ /* Make sure C-A-D is handled by the kernel from this point ++ * on... */ + reboot(RB_ENABLE_CAD); + + switch (a) { +diff --git a/src/test/test-path-util.c b/src/test/test-path-util.c +index 63d64b2..57264de 100644 +--- a/src/test/test-path-util.c ++++ b/src/test/test-path-util.c +@@ -85,29 +85,30 @@ static void test_path(void) { + } + } + +-static void test_find_binary(const char *self) { ++static void test_find_binary(const char *self, bool local) { + char *p; + +- assert_se(find_binary("/bin/sh", &p) == 0); ++ assert_se(find_binary("/bin/sh", local, &p) == 0); + puts(p); + assert_se(streq(p, "/bin/sh")); + free(p); + +- assert_se(find_binary(self, &p) == 0); ++ assert_se(find_binary(self, local, &p) == 0); + puts(p); + assert_se(endswith(p, "/test-path-util")); + assert_se(path_is_absolute(p)); + free(p); + +- assert_se(find_binary("sh", &p) == 0); ++ assert_se(find_binary("sh", local, &p) == 0); + puts(p); + assert_se(endswith(p, "/sh")); + assert_se(path_is_absolute(p)); + free(p); + +- assert_se(find_binary("xxxx-xxxx", &p) == -ENOENT); ++ assert_se(find_binary("xxxx-xxxx", local, &p) == -ENOENT); + +- assert_se(find_binary("/some/dir/xxxx-xxxx", &p) == -ENOENT); ++ assert_se(find_binary("/some/dir/xxxx-xxxx", local, &p) == ++ (local ? -ENOENT : 0)); + } + + static void test_prefixes(void) { +@@ -244,7 +245,8 @@ static void test_strv_resolve(void) { + + int main(int argc, char **argv) { + test_path(); +- test_find_binary(argv[0]); ++ test_find_binary(argv[0], true); ++ test_find_binary(argv[0], false); + test_prefixes(); + test_path_join(); + test_fsck_exists(); +diff --git a/src/udev/udevd.c b/src/udev/udevd.c +index 2e6c713..193702c 100644 +--- a/src/udev/udevd.c ++++ b/src/udev/udevd.c +@@ -994,9 +994,9 @@ static void kernel_cmdline_options(struct udev *udev) { + if (r < 0) + log_warning("Invalid udev.exec-delay ignored: %s", opt + 16); + } else if (startswith(opt, "udev.event-timeout=")) { +- r = safe_atou64(opt + 16, &arg_event_timeout_usec); ++ r = safe_atou64(opt + 19, &arg_event_timeout_usec); + if (r < 0) { +- log_warning("Invalid udev.event-timeout ignored: %s", opt + 16); ++ log_warning("Invalid udev.event-timeout ignored: %s", opt + 19); + break; + } + arg_event_timeout_usec *= USEC_PER_SEC; diff --git a/units/console-getty.service.m4.in b/units/console-getty.service.m4.in index 8ac51a4..cae9fb5 100644 --- a/units/console-getty.service.m4.in @@ -95,11 +955,14 @@ index 8ac51a4..cae9fb5 100644 Restart=always RestartSec=0 diff --git a/units/container-getty@.service.m4.in b/units/container-getty@.service.m4.in -index 4f7794b..bad2a9a 100644 +index 4f7794b..6dfc2e9 100644 --- a/units/container-getty@.service.m4.in +++ b/units/container-getty@.service.m4.in -@@ -16,7 +16,6 @@ Before=getty.target +@@ -14,9 +14,9 @@ After=rc-local.service + )m4_dnl + Before=getty.target IgnoreOnIsolate=yes ++ConditionPathExists=/dev/pts/%I [Service] -ExecStart=-/sbin/agetty --noclear --keep-baud pts/%I 115200,38400,9600 $TERM @@ -216,25 +1079,34 @@ index ecf3de4..7e83446 100644 ExecStop=@rootlibexecdir@/systemd-backlight save %i +X-RestartIfChanged=false diff --git a/units/systemd-journal-flush.service.in b/units/systemd-journal-flush.service.in -index 699670b..2612220 100644 +index 699670b..ba22c6d 100644 --- a/units/systemd-journal-flush.service.in +++ b/units/systemd-journal-flush.service.in -@@ -10,8 +10,9 @@ Description=Trigger Flushing of Journal to Persistent Storage +@@ -10,8 +10,10 @@ Description=Trigger Flushing of Journal to Persistent Storage Documentation=man:systemd-journald.service(8) man:journald.conf(5) DefaultDependencies=no Requires=systemd-journald.service -After=systemd-journald.service local-fs.target remote-fs.target +After=systemd-journald.service ++After=systemd-remount-fs.service Before=systemd-user-sessions.service systemd-tmpfiles-setup.service +RequiresMountsFor=/var/log/journal [Service] ExecStart=@rootbindir@/journalctl --flush diff --git a/units/systemd-journald.service.in b/units/systemd-journald.service.in -index 4de38fa..4b6daea 100644 +index 4de38fa..2f23c13 100644 --- a/units/systemd-journald.service.in +++ b/units/systemd-journald.service.in -@@ -26,3 +26,8 @@ WatchdogSec=1min +@@ -14,6 +14,7 @@ After=systemd-journald.socket systemd-journald-dev-log.socket syslog.socket + Before=sysinit.target + + [Service] ++Type=notify + Sockets=systemd-journald.socket systemd-journald-dev-log.socket + ExecStart=@rootlibexecdir@/systemd-journald + Restart=always +@@ -26,3 +27,8 @@ WatchdogSec=1min # Increase the default a bit in order to allow many simultaneous # services being run since we keep one fd open per service. LimitNOFILE=16384 diff --git a/pkgs/os-specific/linux/systemd/systemd-journald-type-notify.patch b/pkgs/os-specific/linux/systemd/systemd-journald-type-notify.patch deleted file mode 100644 index 820b23fbfa2..00000000000 --- a/pkgs/os-specific/linux/systemd/systemd-journald-type-notify.patch +++ /dev/null @@ -1,35 +0,0 @@ -From a87a38c20196a4aeb56b6ba71d688eefd0b21c30 Mon Sep 17 00:00:00 2001 -From: Michal Schmidt -Date: Tue, 4 Nov 2014 20:28:08 +0100 -Subject: [PATCH] units: make systemd-journald.service Type=notify - -It already calls sd_notify(), so it looks like an oversight. - -Without it, its ordering to systemd-journal-flush.service is -non-deterministic and the SIGUSR1 from flushing may kill journald before -it has its signal handlers set up. - -https://bugs.freedesktop.org/show_bug.cgi?id=85871 -https://bugzilla.redhat.com/show_bug.cgi?id=1159641 ---- -(foutrelis: dropped systemd-journald-audit.socket from Sockets= in order to - apply to systemd 217) - - units/systemd-journald.service.in | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/units/systemd-journald.service.in b/units/systemd-journald.service.in -index 7ee67fd..8d380c8 100644 ---- a/units/systemd-journald.service.in -+++ b/units/systemd-journald.service.in -@@ -14,6 +14,7 @@ After=systemd-journald.socket systemd-journald-dev-log.socket systemd-journald-a - Before=sysinit.target - - [Service] -+Type=notify - Sockets=systemd-journald.socket systemd-journald-dev-log.socket - ExecStart=@rootlibexecdir@/systemd-journald - Restart=always --- -2.1.3 - diff --git a/pkgs/os-specific/linux/uclibc/default.nix b/pkgs/os-specific/linux/uclibc/default.nix index a0df3d526f5..1b866711225 100644 --- a/pkgs/os-specific/linux/uclibc/default.nix +++ b/pkgs/os-specific/linux/uclibc/default.nix @@ -16,11 +16,6 @@ let continue fi - if test "$NAME" == "CLEAR"; then - echo "parseconfig: CLEAR" - echo > .config - fi - echo "parseconfig: removing $NAME" sed -i /^$NAME=/d .config @@ -51,13 +46,14 @@ let ''; in + stdenv.mkDerivation { - name = "uclibc-0.9.33.2" + stdenv.lib.optionalString (cross != null) + name = "uclibc-0.9.34-pre-20141215" + stdenv.lib.optionalString (cross != null) ("-" + cross.config); src = fetchurl { - url = http://www.uclibc.org/downloads/uClibc-0.9.33.2.tar.bz2; - sha256 = "0qhngsbzj2s6nz92b1s2p0dmvwk8xiqpy58j7ljzw186grvjr3cq"; + url = http://www.uclibc.org/downloads/snapshots/uClibc-20141215.tar.bz2; + sha256 = "07d1fmnc2yapfhhadr5c8q7591xqxxqmiicmcgcn8sqmaxppzp5f"; }; # 'ftw' needed to build acl, a coreutils dependency @@ -80,6 +76,8 @@ stdenv.mkDerivation { buildInputs = stdenv.lib.optional (gccCross != null) gccCross; + enableParallelBuilding = true; + installPhase = '' mkdir -p $out make PREFIX=$out VERBOSE=1 install ${crossMakeFlag} @@ -92,7 +90,7 @@ stdenv.mkDerivation { # Derivations may check for the existance of this attribute, to know what to link to. inherit libiconv; }; - + meta = { homepage = http://www.uclibc.org/; description = "A small implementation of the C library"; diff --git a/pkgs/os-specific/linux/udisks/2-default.nix b/pkgs/os-specific/linux/udisks/2-default.nix index 6c9b743fe17..7888fc51be0 100644 --- a/pkgs/os-specific/linux/udisks/2-default.nix +++ b/pkgs/os-specific/linux/udisks/2-default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, pkgconfig, intltool -, expat, acl, udev, glib, libatasmart, polkit +, expat, acl, systemd, glib, libatasmart, polkit , libxslt, docbook_xsl, utillinux, mdadm }: stdenv.mkDerivation rec { - name = "udisks-2.1.3"; + name = "udisks-2.1.4"; src = fetchurl { url = "http://udisks.freedesktop.org/releases/${name}.tar.bz2"; - sha256 = "0bb3403pa23j317b7z9ikdigr6ll5cl93l4hiy4afjgfa7b2zjaw"; + sha256 = "1fqrwmdyn5vc5r7wixh2f013ca1qf3kwy4ia8mh9282a7bfliqd4"; }; patches = [ ./force-path.patch ]; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkgconfig intltool ]; - propagatedBuildInputs = [ expat acl udev glib libatasmart polkit ]; # in closure anyway + propagatedBuildInputs = [ expat acl systemd glib libatasmart polkit ]; # in closure anyway buildInputs = [ libxslt docbook_xsl ]; diff --git a/pkgs/os-specific/linux/upower/0.99.nix b/pkgs/os-specific/linux/upower/0.99.nix index c42fea16d35..58133db9023 100644 --- a/pkgs/os-specific/linux/upower/0.99.nix +++ b/pkgs/os-specific/linux/upower/0.99.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, glib, dbus, dbus_glib, dbus_tools, polkit +{ stdenv, fetchurl, pkgconfig, glib, dbus, dbus_glib, dbus_tools , intltool, libxslt, docbook_xsl, udev, libusb1, pmutils , useSystemd ? true, systemd, gobjectIntrospection }: @@ -6,15 +6,15 @@ assert stdenv.isLinux; stdenv.mkDerivation rec { - name = "upower-0.99.0"; + name = "upower-0.99.2"; src = fetchurl { url = "http://upower.freedesktop.org/releases/${name}.tar.xz"; - sha256 = "189rd8j5czy4fs7imxvr38icjh9vlgdz6ki2h08v530h96clndaz"; + sha256 = "0vwlh20jmaf01m38kfn8yx2869a3clmkzlycrj99rf4nvwx4bp79"; }; buildInputs = - [ dbus_glib polkit intltool libxslt docbook_xsl udev libusb1 gobjectIntrospection ] + [ dbus_glib intltool libxslt docbook_xsl udev libusb1 gobjectIntrospection ] ++ stdenv.lib.optional useSystemd systemd; nativeBuildInputs = [ pkgconfig ]; @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { ++ stdenv.lib.optional useSystemd [ "--enable-systemd" "--with-systemdsystemunitdir=$(out)/etc/systemd/system" - "--with-systemdutildir=$(out)/lib/systemd/system-sleep" + "--with-systemdutildir=$(out)/lib/systemd" "--with-udevrulesdir=$(out)/lib/udev/rules.d" ]; diff --git a/pkgs/os-specific/linux/upower/default.nix b/pkgs/os-specific/linux/upower/default.nix index 605d3d7adc5..90914284773 100644 --- a/pkgs/os-specific/linux/upower/default.nix +++ b/pkgs/os-specific/linux/upower/default.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { ++ stdenv.lib.optional useSystemd [ "--enable-systemd" "--with-systemdsystemunitdir=$(out)/etc/systemd/system" - "--with-systemdutildir=$(out)/lib/systemd/system-sleep" + "--with-systemdutildir=$(out)/lib/systemd" "--with-udevrulesdir=$(out)/lib/udev/rules.d" ]; diff --git a/pkgs/os-specific/linux/util-linux/default.nix b/pkgs/os-specific/linux/util-linux/default.nix index 123f8e4354b..3b76eb63ea5 100644 --- a/pkgs/os-specific/linux/util-linux/default.nix +++ b/pkgs/os-specific/linux/util-linux/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, zlib, ncurses ? null, perl ? null, pam }: stdenv.mkDerivation rec { - name = "util-linux-2.25.1"; + name = "util-linux-2.25.2"; src = fetchurl { url = "mirror://kernel/linux/utils/util-linux/v2.25/${name}.tar.xz"; - sha256 = "4701305ae22790c3a92ce48e50794fa05b7ee01f4227f419a171c100d08986e8"; + sha256 = "e0457f715b73f4a349e1acb08cb410bf0edc9a74a3f75c357070f31f70e33cd6"; }; crossAttrs = { diff --git a/pkgs/os-specific/linux/v4l2loopback/default.nix b/pkgs/os-specific/linux/v4l2loopback/default.nix index 5b88d4c7556..127341412ab 100644 --- a/pkgs/os-specific/linux/v4l2loopback/default.nix +++ b/pkgs/os-specific/linux/v4l2loopback/default.nix @@ -14,6 +14,8 @@ stdenv.mkDerivation rec { sed -i '/depmod/d' Makefile export PATH=${kmod}/sbin:$PATH ''; + + patches = [ ./kernel-3.18-fix.patch ]; buildInputs = [ kmod ]; diff --git a/pkgs/os-specific/linux/v4l2loopback/kernel-3.18-fix.patch b/pkgs/os-specific/linux/v4l2loopback/kernel-3.18-fix.patch new file mode 100644 index 00000000000..9f6dc57f322 --- /dev/null +++ b/pkgs/os-specific/linux/v4l2loopback/kernel-3.18-fix.patch @@ -0,0 +1,31 @@ +From 21195cd6d1ff767a271359dfa7d201078f766611 Mon Sep 17 00:00:00 2001 +From: tatokis +Date: Mon, 24 Nov 2014 16:28:33 +0200 +Subject: [PATCH] Updated v4l2loopback.c to compile on >= 3.18 kernel + +--- + v4l2loopback.c | 9 +++++++-- + 1 file changed, 7 insertions(+), 2 deletions(-) + +diff --git a/v4l2loopback.c b/v4l2loopback.c +index bb228bb..67f6ed4 100644 +--- a/v4l2loopback.c ++++ b/v4l2loopback.c +@@ -498,10 +498,15 @@ static ssize_t attr_store_maxopeners(struct device *cd, + { + struct v4l2_loopback_device *dev = NULL; + unsigned long curr = 0; +- ++ ++ #if LINUX_VERSION_CODE >= KERNEL_VERSION(3,18,0) ++ if (kstrtoul(buf, 0, &curr)) ++ return -EINVAL; ++ #else + if (strict_strtoul(buf, 0, &curr)) + return -EINVAL; +- ++ #endif ++ + dev = v4l2loopback_cd2dev(cd); + + if (dev->max_openers == curr) diff --git a/pkgs/os-specific/linux/v86d/default.nix b/pkgs/os-specific/linux/v86d/default.nix index 2ad3087d6a1..f7e0c5ca5e2 100644 --- a/pkgs/os-specific/linux/v86d/default.nix +++ b/pkgs/os-specific/linux/v86d/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = { description = "A userspace helper that runs x86 code in an emulated environment"; homepage = http://dev.gentoo.org/~spock/projects/uvesafb/; - license = "BSD"; + license = stdenv.lib.licenses.gpl2; platforms = [ "i686-linux" "x86_64-linux" ]; }; } diff --git a/pkgs/os-specific/linux/zfs/bc151f7b312dea09c6ec5b9a320e65140789643a.patch b/pkgs/os-specific/linux/zfs/bc151f7b312dea09c6ec5b9a320e65140789643a.patch new file mode 100644 index 00000000000..382c8ce63ee --- /dev/null +++ b/pkgs/os-specific/linux/zfs/bc151f7b312dea09c6ec5b9a320e65140789643a.patch @@ -0,0 +1,84 @@ +From bc151f7b312dea09c6ec5b9a320e65140789643a Mon Sep 17 00:00:00 2001 +From: Ned Bass +Date: Thu, 16 Oct 2014 13:52:56 -0700 +Subject: [PATCH] Remove checks for mandatory locks + +The Linux VFS handles mandatory locks generically so we shouldn't +need to check for conflicting locks in zfs_read(), zfs_write(), or +zfs_freesp(). Linux 3.18 removed the lock_may_read() and +lock_may_write() interfaces which we were relying on for this +purpose. Rather than emulating those interfaces we remove the +redundant checks. + +Signed-off-by: Ned Bass +Signed-off-by: Brian Behlendorf +Closes #2804 +--- + module/zfs/zfs_vnops.c | 18 ------------------ + module/zfs/zfs_znode.c | 10 ---------- + 2 files changed, 28 deletions(-) + +diff --git a/module/zfs/zfs_vnops.c b/module/zfs/zfs_vnops.c +index 33f9e0e..2f55e56 100644 +--- a/module/zfs/zfs_vnops.c ++++ b/module/zfs/zfs_vnops.c +@@ -474,15 +474,6 @@ zfs_read(struct inode *ip, uio_t *uio, int ioflag, cred_t *cr) + } + + /* +- * Check for mandatory locks +- */ +- if (mandatory_lock(ip) && +- !lock_may_read(ip, uio->uio_loffset, uio->uio_resid)) { +- ZFS_EXIT(zsb); +- return (SET_ERROR(EAGAIN)); +- } +- +- /* + * If we're in FRSYNC mode, sync out this znode before reading it. + */ + if (ioflag & FRSYNC || zsb->z_os->os_sync == ZFS_SYNC_ALWAYS) +@@ -651,15 +642,6 @@ zfs_write(struct inode *ip, uio_t *uio, int ioflag, cred_t *cr) + } + + /* +- * Check for mandatory locks before calling zfs_range_lock() +- * in order to prevent a deadlock with locks set via fcntl(). +- */ +- if (mandatory_lock(ip) && !lock_may_write(ip, woff, n)) { +- ZFS_EXIT(zsb); +- return (SET_ERROR(EAGAIN)); +- } +- +- /* + * Pre-fault the pages to ensure slow (eg NFS) pages + * don't hold up txg. + * Skip this if uio contains loaned arc_buf. +diff --git a/module/zfs/zfs_znode.c b/module/zfs/zfs_znode.c +index 90dbfd3..f02c021 100644 +--- a/module/zfs/zfs_znode.c ++++ b/module/zfs/zfs_znode.c +@@ -1546,7 +1546,6 @@ zfs_trunc(znode_t *zp, uint64_t end) + int + zfs_freesp(znode_t *zp, uint64_t off, uint64_t len, int flag, boolean_t log) + { +- struct inode *ip = ZTOI(zp); + dmu_tx_t *tx; + zfs_sb_t *zsb = ZTOZSB(zp); + zilog_t *zilog = zsb->z_log; +@@ -1567,15 +1566,6 @@ zfs_freesp(znode_t *zp, uint64_t off, uint64_t len, int flag, boolean_t log) + goto out; + } + +- /* +- * Check for any locks in the region to be freed. +- */ +- if (ip->i_flock && mandatory_lock(ip)) { +- uint64_t length = (len ? len : zp->z_size - off); +- if (!lock_may_write(ip, off, length)) +- return (SET_ERROR(EAGAIN)); +- } +- + if (len == 0) { + error = zfs_trunc(zp, off); + } else { diff --git a/pkgs/os-specific/linux/zfs/default.nix b/pkgs/os-specific/linux/zfs/default.nix index a5b8429c03a..3661137fc29 100644 --- a/pkgs/os-specific/linux/zfs/default.nix +++ b/pkgs/os-specific/linux/zfs/default.nix @@ -1,17 +1,19 @@ -{ stdenv, fetchurl, kernel, spl, perl, autoconf, automake, libtool, zlib, libuuid, coreutils, utillinux }: +{ stdenv, fetchFromGitHub, kernel, spl, perl, autoconf, automake, libtool, zlib, libuuid, coreutils, utillinux }: -stdenv.mkDerivation { - name = "zfs-0.6.3-${kernel.version}"; +stdenv.mkDerivation rec { + name = "zfs-${version}-${kernel.version}"; + version = "0.6.3-1.2"; - src = fetchurl { - url = http://archive.zfsonlinux.org/downloads/zfsonlinux/zfs/zfs-0.6.3.tar.gz; - sha256 = "06rrip9fxn13x6qnyp6br68r9pcygb95lld25hnnj88m2vagvg19"; + src = fetchFromGitHub { + owner = "zfsonlinux"; + repo = "zfs"; + rev = "zfs-${version}"; + sha256 = "1iqkh08ikmsg8zi7s2pr46z9z7lshbb65pv2ihg1llwmgcm42r9r"; }; patches = [ ./mount_zfs_prefix.patch ./nix-build.patch # Remove in >=0.6.4 - ./remove-lock-checks.patch # Remove in >=0.6.4 ]; buildInputs = [ spl perl autoconf automake libtool zlib libuuid coreutils ]; diff --git a/pkgs/os-specific/linux/zfs/git.nix b/pkgs/os-specific/linux/zfs/git.nix index e5002bbbb3f..fde5310deed 100644 --- a/pkgs/os-specific/linux/zfs/git.nix +++ b/pkgs/os-specific/linux/zfs/git.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation { sha256 = "1yqsfdhyzh33aisfvwqd692n5kfgnlz7yjixd2gqn8vx9bv0dz0b"; }; - patches = [ ./mount_zfs_prefix.patch ./nix-build.patch ]; + patches = [ ./mount_zfs_prefix.patch ./nix-build.patch ./bc151f7b312dea09c6ec5b9a320e65140789643a.patch ]; buildInputs = [ spl_git perl autoconf automake libtool zlib libuuid coreutils ]; diff --git a/pkgs/servers/fleet/default.nix b/pkgs/servers/fleet/default.nix index e3a53c85052..9a122ae90a6 100644 --- a/pkgs/servers/fleet/default.nix +++ b/pkgs/servers/fleet/default.nix @@ -1,30 +1,33 @@ -{ stdenv, lib, go, fetchurl, fetchgit, fetchhg, fetchbzr, fetchFromGitHub }: +{ stdenv, lib, go, fetchFromGitHub }: stdenv.mkDerivation rec { - version = "0.5.0"; name = "fleet-${version}"; + version = "0.9.0"; - src = import ./deps.nix { - inherit stdenv lib fetchgit fetchhg fetchbzr fetchFromGitHub; + src = fetchFromGitHub { + owner = "coreos"; + repo = "fleet"; + rev = "v${version}"; + sha256 = "0gjminfprprs1nmg9y9a0qkyl9spixrk4pc2b7bl0lxdgpq2yiid"; }; buildInputs = [ go ]; buildPhase = '' - export GOPATH=$src - go build -v -o fleet github.com/coreos/fleet + patchShebangs build + ./build ''; installPhase = '' - mkdir -p $out/bin - mv fleet $out/bin + mkdir -p $out + mv bin $out ''; meta = with stdenv.lib; { description = "A distributed init system"; homepage = http://coreos.com/using-coreos/clustering/; license = licenses.asl20; - maintainers = with maintainers; [ cstrahan ]; + maintainers = with maintainers; [ cstrahan offline ]; platforms = platforms.unix; }; } diff --git a/pkgs/servers/fleet/deps.nix b/pkgs/servers/fleet/deps.nix deleted file mode 100644 index d0529db37a2..00000000000 --- a/pkgs/servers/fleet/deps.nix +++ /dev/null @@ -1,81 +0,0 @@ -{ stdenv, lib, fetchgit, fetchhg, fetchbzr, fetchFromGitHub }: - -let - goDeps = [ - { - root = "code.google.com/p/gogoprotobuf"; - src = fetchgit { - url = "https://code.google.com/p/gogoprotobuf"; - rev = "7fd1620f09261338b6b1ca1289ace83aee0ec946"; - sha256 = "0f13y29zpxkv7b7kwnszygvg04fd5m9r8vpkl1wa3gxnc6az54i9"; - }; - } - { - root = "github.com/coreos/etcd"; - src = fetchFromGitHub { - owner = "coreos"; - repo = "etcd"; - rev = "1359d29fa451b059bb76b51260610d92853e7316"; - sha256 = "0iz3vmf3nfp1i5r8al207wm0jvj68i47a814w90b1jl8g4f2amp7"; - }; - } - { - root = "github.com/coreos/fleet"; - src = fetchFromGitHub { - owner = "coreos"; - repo = "fleet"; - rev = "da0a02ed3b07d83b0b542dcdee56e08d2457ab9c"; - sha256 = "0b8aq4ppyv1fjvf3f2qjq80mvjvf9r104bf4048wgsrs0pccs6s8"; - }; - } - { - root = "github.com/coreos/raft"; - src = fetchFromGitHub { - owner = "coreos"; - repo = "raft"; - rev = "67dca7288f1665b59860421673d46314f4348e45"; - sha256 = "1l27kjkwcxgx89d2m537plagbp1wh6qlzxirza6lliblrgxry6mw"; - }; - } - { - root = "github.com/stathat/go"; - src = fetchFromGitHub { - owner = "stathat"; - repo = "go"; - rev = "01d012b9ee2ecc107cb28b6dd32d9019ed5c1d77"; - sha256 = "0mrn70wjfcs4rfkmga3hbfqmbjk33skcsc8pyqxp02bzpwdpc4bi"; - }; - } - { - root = "github.com/stretchr/objx"; - src = fetchFromGitHub { - owner = "stretchr"; - repo = "objx"; - rev = "cbeaeb16a013161a98496fad62933b1d21786672"; - sha256 = "1xn7iibjik77h6h0jilfvcjkkzaqz45baf44p3rb2i03hbmkqkp1"; - }; - } - { - root = "github.com/stretchr/testify"; - src = fetchFromGitHub { - owner = "stretchr"; - repo = "testify"; - rev = "3e03dde72495487a4deb74152ac205d0619fbc8d"; - sha256 = "1xd9sbi6y68cfwkxgybcz0dbfx4r6jmxq51wjj6six3wm9p7m8ls"; - }; - } - ]; - -in - -stdenv.mkDerivation rec { - name = "go-deps"; - - buildCommand = - lib.concatStrings - (map (dep: '' - mkdir -p $out/src/`dirname ${dep.root}` - ln -s ${dep.src} $out/src/${dep.root} - '') goDeps); -} - diff --git a/pkgs/servers/http/lighttpd/default.nix b/pkgs/servers/http/lighttpd/default.nix index 899914b6446..8803b8134f7 100644 --- a/pkgs/servers/http/lighttpd/default.nix +++ b/pkgs/servers/http/lighttpd/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Lightweight high-performance web server"; homepage = http://www.lighttpd.net/; - license = "BSD"; + license = stdenv.lib.licenses.bsd3; platforms = platforms.linux; maintainers = [ maintainers.bjornfor ]; }; diff --git a/pkgs/servers/http/nginx/unstable.nix b/pkgs/servers/http/nginx/unstable.nix index a946672f9a7..009b091d15f 100644 --- a/pkgs/servers/http/nginx/unstable.nix +++ b/pkgs/servers/http/nginx/unstable.nix @@ -10,10 +10,10 @@ with stdenv.lib; let - version = "1.7.7"; + version = "1.7.8"; mainSrc = fetchurl { url = "http://nginx.org/download/nginx-${version}.tar.gz"; - sha256 = "1lmzq36ysi0hwvqpiaz0dpmwvdwbrn9aw1rm1xcabkl2g855l0by"; + sha256 = "1rg8c2z6df6flz5vz6k7iixm4f3d27svnncf810vilyk0b1mxxqj"; }; rtmp-ext = fetchFromGitHub { diff --git a/pkgs/servers/http/nix-binary-cache/nix-binary-cache.cgi.in b/pkgs/servers/http/nix-binary-cache/nix-binary-cache.cgi.in index 219ab9763ad..1afe8854fed 100644 --- a/pkgs/servers/http/nix-binary-cache/nix-binary-cache.cgi.in +++ b/pkgs/servers/http/nix-binary-cache/nix-binary-cache.cgi.in @@ -51,7 +51,7 @@ case "$QUERY_STRING" in *.narinfo) hash=${QUERY_STRING%.narinfo} hash=${hash#/} - path="$(echo "$STORE_DIR/$hash-"* )" + path="$(echo "$STORE_DIR/$hash-"* | @coreutils@/sort | @coreutils@/head -n 1)" if [ -n "$path" ] && [ -e "$path" ]; then header info="$( diff --git a/pkgs/servers/http/openresty/default.nix b/pkgs/servers/http/openresty/default.nix index 8c878e856b8..65c81c455b9 100644 --- a/pkgs/servers/http/openresty/default.nix +++ b/pkgs/servers/http/openresty/default.nix @@ -7,11 +7,11 @@ with stdenv.lib; stdenv.mkDerivation rec { name = "openresty-${version}"; - version = "1.7.4.1rc2"; + version = "1.7.7.1"; src = fetchurl { url = "http://openresty.org/download/ngx_openresty-${version}.tar.gz"; - sha256 = "1208snm0g1x2p9ybl8br7mmcl5c4g4xzhm80n5jfjprr85gb7ajx"; + sha256 = "1m541k2lys3155f0r94abgcmm2hgvv56q0i4fk58w6fa8n4h62z0"; }; buildInputs = [ openssl zlib pcre libxml2 libxslt gd geoip perl ]; @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { preConfigure = '' export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${libxml2}/include/libxml2 $additionalFlags" - export PATH="$PATH:${stdenv.gcc.libc}/sbin" + export PATH="$PATH:${stdenv.cc.libc}/sbin" patchShebangs . ''; diff --git a/pkgs/servers/icecast/default.nix b/pkgs/servers/icecast/default.nix index 6b8a75e6901..4a89c5ad83b 100644 --- a/pkgs/servers/icecast/default.nix +++ b/pkgs/servers/icecast/default.nix @@ -3,11 +3,11 @@ , libvorbis, libtheora, speex, libkate, libopus }: stdenv.mkDerivation rec { - name = "icecast-2.4.0"; + name = "icecast-2.4.1"; src = fetchurl { url = "http://downloads.xiph.org/releases/icecast/${name}.tar.gz"; - sha256 = "0chg8v3c0wkbakjcw73rsfccx13f28arrmmbz9p5fsmiw5bykdqp"; + sha256 = "0js5lylrgklhvvaksx46zc8lc975qb1bns8h1ms545nv071rxy23"; }; buildInputs = [ libxml2 libxslt curl libvorbis libtheora speex libkate libopus ]; diff --git a/pkgs/servers/mail/opensmtpd/default.nix b/pkgs/servers/mail/opensmtpd/default.nix index 7c442bf8c7e..8cabb8cac94 100644 --- a/pkgs/servers/mail/opensmtpd/default.nix +++ b/pkgs/servers/mail/opensmtpd/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { ]; meta = { - homepage = http://www.postfix.org/; + homepage = https://www.opensmtpd.org/; description = '' A free implementation of the server-side SMTP protocol as defined by RFC 5321, with some additional standard extensions diff --git a/pkgs/servers/monitoring/bosun/default.nix b/pkgs/servers/monitoring/bosun/default.nix index dfbf8d1b927..5c3938c1b6e 100644 --- a/pkgs/servers/monitoring/bosun/default.nix +++ b/pkgs/servers/monitoring/bosun/default.nix @@ -1,31 +1,21 @@ -{ stdenv, fetchgit, fetchurl, go }: -let - go-fs = fetchgit { - url = git://github.com/rakyll/statik.git; - rev = "f19d7c21cd036701d42ec176b13e0946cc9591b0"; - sha256 = "0vaa8xzkmj1dgiayg7ccrniapz4f4rhsizx2hybyc5rgmalfj9ac"; - }; - -in stdenv.mkDerivation rec { +{ stdenv, fetchurl, go }: +stdenv.mkDerivation rec { name = "bosun-${version}"; - version = "20141119233013"; + version = "20141204222654"; src = fetchurl { url = "https://github.com/bosun-monitor/bosun/archive/${version}.tar.gz"; - sha256 = "0l16g073ixk42g3jz1r0lhmvssc0k8s1vnr9pvgxs897rzpdjjm1"; + sha256 = "1jwhfwf24zhncrirna3q1vhap4f955bqx3sws3ryk5gp1w99l36n"; }; buildInputs = [ go ]; sourceRoot = "."; buildPhase = '' - mkdir -p src/github.com/bosun-monitor - mv bosun-${version} src/github.com/bosun-monitor/bosun - - mkdir -p src/github.com/rakyll - ln -s ${go-fs} src/github.com/rakyll/statik + mkdir -p src + mv bosun-${version} src/bosun.org export GOPATH=$PWD - go build -v -o bosun src/github.com/bosun-monitor/bosun/main.go + go build -v -o bosun src/bosun.org/cmd/bosun/main.go ''; installPhase = '' @@ -40,6 +30,6 @@ in stdenv.mkDerivation rec { ''; homepage = http://bosun.org; license = licenses.mit; - platforms = ["x86_64-linux"]; + platforms = platforms.unix; }; } diff --git a/pkgs/servers/monitoring/bosun/scollector.nix b/pkgs/servers/monitoring/bosun/scollector.nix index 137b59714c1..176d42d382a 100644 --- a/pkgs/servers/monitoring/bosun/scollector.nix +++ b/pkgs/servers/monitoring/bosun/scollector.nix @@ -1,22 +1,21 @@ -{ stdenv, fetchgit, fetchurl, go }: -let - -in stdenv.mkDerivation rec { - name = "scollector-20141119233025"; +{ stdenv, fetchurl, go }: +stdenv.mkDerivation rec { + name = "scollector-${version}"; + version = "20141204222654"; src = fetchurl { - url = https://github.com/bosun-monitor/scollector/archive/20141119233025.tar.gz; - sha256 = "13f7hg4mswcdl76ksx8ds3297rslsswb1hq327b3xm1wyr42k6wa"; + url = "https://github.com/bosun-monitor/bosun/archive/${version}.tar.gz"; + sha256 = "1jwhfwf24zhncrirna3q1vhap4f955bqx3sws3ryk5gp1w99l36n"; }; buildInputs = [ go ]; sourceRoot = "."; buildPhase = '' - mkdir -p src/github.com/bosun-monitor - mv scollector-20141119233025 src/github.com/bosun-monitor/scollector + mkdir -p src + mv bosun-${version} src/bosun.org export GOPATH=$PWD - go build -v -o scollector src/github.com/bosun-monitor/scollector/main.go + go build -v -o scollector src/bosun.org/cmd/scollector/main.go ''; installPhase = '' diff --git a/pkgs/servers/monitoring/newrelic-sysmond/default.nix b/pkgs/servers/monitoring/newrelic-sysmond/default.nix new file mode 100644 index 00000000000..777cfe805bf --- /dev/null +++ b/pkgs/servers/monitoring/newrelic-sysmond/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchurl }: + +assert stdenv.system == "x86_64-linux"; + +stdenv.mkDerivation rec { + name = "newrelic-sysmond-1.5.1.93"; + + src = fetchurl { + url = "http://download.newrelic.com/server_monitor/release/newrelic-sysmond-1.5.1.93-linux.tar.gz"; + + sha256 = "1bfwyczcf7pvji8lx566jxgy8dhyf1gmqmi64lj10673a86axnwz"; + }; + + installPhase = '' + mkdir -p $out/bin + install -v -m755 daemon/nrsysmond.x64 $out/bin/nrsysmond + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + $out/bin/nrsysmond + ''; + + meta = { + homepage = http://newrelic.com/; + + description = "System-wide monitoring for newrelic"; + + license = stdenv.lib.licenses.unfree; + + maintainers = [ stdenv.lib.maintainers.shlevy ]; + }; +} diff --git a/pkgs/servers/monitoring/seyren/default.nix b/pkgs/servers/monitoring/seyren/default.nix index e428067ab62..ab8365c23f8 100644 --- a/pkgs/servers/monitoring/seyren/default.nix +++ b/pkgs/servers/monitoring/seyren/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { phases = ["installPhase"]; - buildInputs = [ makeWrapper jre src ]; + buildInputs = [ makeWrapper jre ]; installPhase = '' mkdir -p "$out"/bin diff --git a/pkgs/servers/monitoring/zabbix/2.0.nix b/pkgs/servers/monitoring/zabbix/2.0.nix index 399fb54875a..9ce027409fd 100644 --- a/pkgs/servers/monitoring/zabbix/2.0.nix +++ b/pkgs/servers/monitoring/zabbix/2.0.nix @@ -17,8 +17,8 @@ let '' substituteInPlace ./configure \ --replace " -static" "" \ - ${stdenv.lib.optionalString (stdenv.gcc.libc != null) '' - --replace /usr/include/iconv.h ${stdenv.gcc.libc}/include/iconv.h + ${stdenv.lib.optionalString (stdenv.cc.libc != null) '' + --replace /usr/include/iconv.h ${stdenv.cc.libc}/include/iconv.h ''} ''; diff --git a/pkgs/servers/monitoring/zabbix/2.2.nix b/pkgs/servers/monitoring/zabbix/2.2.nix index df9da3c467b..1e8d03ec2b6 100644 --- a/pkgs/servers/monitoring/zabbix/2.2.nix +++ b/pkgs/servers/monitoring/zabbix/2.2.nix @@ -22,8 +22,8 @@ let '' substituteInPlace ./configure \ --replace " -static" "" \ - ${stdenv.lib.optionalString (stdenv.gcc.libc != null) '' - --replace /usr/include/iconv.h ${stdenv.gcc.libc}/include/iconv.h + ${stdenv.lib.optionalString (stdenv.cc.libc != null) '' + --replace /usr/include/iconv.h ${stdenv.cc.libc}/include/iconv.h ''} ''; diff --git a/pkgs/servers/monitoring/zabbix/default.nix b/pkgs/servers/monitoring/zabbix/default.nix index ca4df9ce340..5d8541ab870 100644 --- a/pkgs/servers/monitoring/zabbix/default.nix +++ b/pkgs/servers/monitoring/zabbix/default.nix @@ -2,19 +2,19 @@ let - version = "1.8.21"; + version = "1.8.22"; src = fetchurl { url = "mirror://sourceforge/zabbix/zabbix-${version}.tar.gz"; - sha256 = "1ssqi31blkl1lyv9vjrsrrn494grdng187s8xwfv79adk2w94paw"; + sha256 = "0cjj3c4j4b9sl3hgh1fck330z9q0gz2k68g227y0paal6k6f54g7"; }; preConfigure = '' substituteInPlace ./configure \ --replace " -static" "" \ - ${stdenv.lib.optionalString (stdenv.gcc.libc != null) '' - --replace /usr/include/iconv.h ${stdenv.gcc.libc}/include/iconv.h + ${stdenv.lib.optionalString (stdenv.cc.libc != null) '' + --replace /usr/include/iconv.h ${stdenv.cc.libc}/include/iconv.h ''} ''; diff --git a/pkgs/servers/mpd/default.nix b/pkgs/servers/mpd/default.nix index 6c5f6b0ca4f..4b1e8569cd9 100644 --- a/pkgs/servers/mpd/default.nix +++ b/pkgs/servers/mpd/default.nix @@ -25,13 +25,13 @@ let opt = stdenv.lib.optional; mkFlag = c: f: if c then "--enable-${f}" else "--disable-${f}"; major = "0.19"; - minor = "5"; + minor = "6"; in stdenv.mkDerivation rec { name = "mpd-${major}.${minor}"; src = fetchurl { url = "http://www.musicpd.org/download/mpd/${major}/${name}.tar.gz"; - sha256 = "09rhppfspzhx7jjz3rv8b71gasrkg6i9l25xm94l9sf36jgd2m33"; + sha256 = "023h2d9x4yg1z2glnwf8h2j0p1xhn1hb0wf02mg70j3p0bz63imj"; }; buildInputs = [ pkgconfig glib boost ] diff --git a/pkgs/servers/nosql/hyperdex/busybee.nix b/pkgs/servers/nosql/hyperdex/busybee.nix new file mode 100644 index 00000000000..19482db6f5a --- /dev/null +++ b/pkgs/servers/nosql/hyperdex/busybee.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchurl, unzip, autoconf, automake, libtool, + libpo6, libe, pkgconfig }: + +stdenv.mkDerivation rec { + name = "busybee-${version}"; + version = "0.5.2"; + + src = fetchurl { + url = "https://github.com/rescrv/busybee/archive/releases/${version}.zip"; + sha256 = "0gr5h2j9rzwarblgcgddnxj39i282rvgn9vqlrcd60dx8c4dkm29"; + }; + buildInputs = [ + autoconf + automake + libe + libpo6 + libtool + pkgconfig + unzip + ]; + preConfigure = "autoreconf -i"; + + meta = with stdenv.lib; { + description = "BusyBee is a high-performance messaging layer."; + homepage = https://github.com/rescrv/busybee; + license = licenses.bsd3; + }; +} diff --git a/pkgs/servers/nosql/hyperdex/default.nix b/pkgs/servers/nosql/hyperdex/default.nix new file mode 100644 index 00000000000..036a3412b86 --- /dev/null +++ b/pkgs/servers/nosql/hyperdex/default.nix @@ -0,0 +1,57 @@ +{ stdenv, fetchurl, makeWrapper, unzip, autoconf, automake, libtool, + python, sodium, pkgconfig, popt, glog, xz, json_c, gperf, yacc, + flex, haskellPackages, help2man, autoconf-archive, callPackage }: + +assert stdenv.isLinux; + +let +hyperleveldb = callPackage ./hyperleveldb.nix {}; +libpo6 = callPackage ./libpo6.nix {}; +libe = callPackage ./libe.nix { inherit libpo6; }; +busybee = callPackage ./busybee.nix { inherit libpo6 libe; }; +replicant = callPackage ./replicant.nix { + inherit libpo6 libe busybee hyperleveldb; +}; +libmacaroons = callPackage ./libmacaroons.nix { }; + +in +stdenv.mkDerivation rec { + name = "hyperdex-${version}"; + version = "1.5.0"; + + src = fetchurl { + url = "https://github.com/rescrv/HyperDex/archive/releases/${version}.zip"; + sha256 = "0s1capy2hj45f5rmdb4fk0wxy7vz69krplhba57f6wrkpcz1zb57"; + }; + + buildInputs = [ + autoconf + autoconf-archive + automake + busybee + glog + hyperleveldb + json_c + libe + libmacaroons + libpo6 + libtool + pkgconfig + popt + python + replicant + unzip + gperf + yacc + flex + help2man + haskellPackages.pandoc + ]; + preConfigure = "autoreconf -fi"; + + meta = with stdenv.lib; { + description = "HyperDex is a scalable, searchable key-value store"; + homepage = http://hyperdex.org; + license = licenses.bsd3; + }; +} diff --git a/pkgs/servers/nosql/hyperdex/hyperleveldb.nix b/pkgs/servers/nosql/hyperdex/hyperleveldb.nix new file mode 100644 index 00000000000..c39f618f6cb --- /dev/null +++ b/pkgs/servers/nosql/hyperdex/hyperleveldb.nix @@ -0,0 +1,20 @@ +{ stdenv, fetchurl, unzip, autoconf, automake, libtool }: + +stdenv.mkDerivation rec { + name = "hyperleveldb-${version}"; + version = "1.2.1"; + + src = fetchurl { + url = "https://github.com/rescrv/HyperLevelDB/archive/releases/${version}.zip"; + sha256 = "0xrzhwkrm7f2wz3jn4iqn1dim2pmgjhmpb1fy23fwa06v0q18hw8"; + }; + buildInputs = [ unzip autoconf automake libtool ]; + preConfigure = "autoreconf -i"; + + meta = with stdenv.lib; { + description = ''A fork of LevelDB intended to meet the needs of + HyperDex while remaining compatible with LevelDB.''; + homepage = https://github.com/rescrv/HyperLevelDB; + license = licenses.bsd3; + }; +} diff --git a/pkgs/servers/nosql/hyperdex/libe.nix b/pkgs/servers/nosql/hyperdex/libe.nix new file mode 100644 index 00000000000..cc5232e13f2 --- /dev/null +++ b/pkgs/servers/nosql/hyperdex/libe.nix @@ -0,0 +1,19 @@ +{ stdenv, fetchurl, unzip, autoconf, automake, libtool, libpo6, pkgconfig }: + +stdenv.mkDerivation rec { + name = "libe-${version}"; + version = "0.8.1"; + + src = fetchurl { + url = "https://github.com/rescrv/e/archive/releases/0.8.1.zip"; + sha256 = "1l13axsi52j2qaxbdnszdvfxksi7rwm2j1rrf0nlh990m6a3yg3s"; + }; + buildInputs = [ unzip autoconf automake libtool libpo6 pkgconfig ]; + preConfigure = "autoreconf -i"; + + meta = with stdenv.lib; { + description = "Library containing high-performance datastructures and utilities for C++"; + homepage = https://github.com/rescrv/e; + license = licenses.bsd3; + }; +} diff --git a/pkgs/servers/nosql/hyperdex/libmacaroons.nix b/pkgs/servers/nosql/hyperdex/libmacaroons.nix new file mode 100644 index 00000000000..2d709c5bbd1 --- /dev/null +++ b/pkgs/servers/nosql/hyperdex/libmacaroons.nix @@ -0,0 +1,20 @@ +{ stdenv, fetchurl, unzip, autoconf, automake, libtool, + pkgconfig, sodium, python }: +stdenv.mkDerivation rec { + name = "libmacaroons-${version}"; + version = "HEAD"; + + src = fetchurl { + url = "https://github.com/rescrv/libmacaroons/archive/6febf3ce6c4c77a46d24b40ed29b03ffbfb175a7.zip"; + sha256 = "0b4qgim87398chvc3qhxfqv2l1cyl65rhyknln8lk0gq9y00p1ik"; + }; + buildInputs = [ unzip autoconf automake libtool python sodium pkgconfig ]; + preConfigure = "autoreconf -i"; + + meta = with stdenv.lib; { + description = ''Macaroons are flexible authorization credentials that + support decentralized delegation, attenuation, and verification.''; + homepage = https://github.com/rescrv/libmacaroons; + license = licenses.bsd3; + }; +} diff --git a/pkgs/servers/nosql/hyperdex/libpo6.nix b/pkgs/servers/nosql/hyperdex/libpo6.nix new file mode 100644 index 00000000000..166a5e21c6b --- /dev/null +++ b/pkgs/servers/nosql/hyperdex/libpo6.nix @@ -0,0 +1,19 @@ +{ stdenv, fetchurl, unzip, autoconf, automake, libtool }: + +stdenv.mkDerivation rec { + name = "libpo6-${version}"; + version = "0.5.2"; + + src = fetchurl { + url = "https://github.com/rescrv/po6/archive/releases/${version}.zip"; + sha256 = "14g3ichshnc4wd0iq3q3ymgaq84gjsbqcyn6lri7c7djgkhqijjx"; + }; + buildInputs = [ unzip autoconf automake libtool ]; + preConfigure = "autoreconf -i"; + + meta = with stdenv.lib; { + description = "POSIX wrappers for C++"; + homepage = https://github.com/rescrv/po6; + license = licenses.bsd3; + }; +} diff --git a/pkgs/servers/nosql/hyperdex/replicant.nix b/pkgs/servers/nosql/hyperdex/replicant.nix new file mode 100644 index 00000000000..c064aa419cd --- /dev/null +++ b/pkgs/servers/nosql/hyperdex/replicant.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchurl, unzip, autoconf, automake, libtool, glog, + hyperleveldb, libe, pkgconfig, popt, libpo6, busybee }: + +stdenv.mkDerivation rec { + name = "replicant-${version}"; + version = "0.5.2"; + + src = fetchurl { + url = "https://github.com/rescrv/Replicant/archive/releases/0.6.3.zip"; + sha256 = "1fbagz0nbvinkqr5iw5y187dm4klkswrxnl5ysq8waglg2nj8zzi"; + }; + buildInputs = [ + autoconf + automake + busybee + glog + hyperleveldb + libe + libpo6 + libtool + pkgconfig + popt + unzip + ]; + preConfigure = "autoreconf -i"; + + meta = with stdenv.lib; { + description = "A system for maintaining replicated state machines."; + homepage = https://github.com/rescrv/Replicant; + license = licenses.bsd3; + }; +} diff --git a/pkgs/servers/nosql/influxdb/default.nix b/pkgs/servers/nosql/influxdb/default.nix index 3eba1b9f895..34336095214 100644 --- a/pkgs/servers/nosql/influxdb/default.nix +++ b/pkgs/servers/nosql/influxdb/default.nix @@ -18,9 +18,9 @@ stdenv.mkDerivation rec { installPhase = '' install -D influxdb $out/bin/influxdb - patchelf --set-interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" $out/bin/influxdb + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $out/bin/influxdb wrapProgram "$out/bin/influxdb" \ - --prefix LD_LIBRARY_PATH : "${stdenv.gcc.gcc}/lib:${stdenv.gcc.gcc}/lib64:${zlib}/lib:${bzip2}/lib" + --prefix LD_LIBRARY_PATH : "${stdenv.cc.gcc}/lib:${stdenv.cc.gcc}/lib64:${zlib}/lib:${bzip2}/lib" mkdir -p $out/share/influxdb cp -R admin scripts config.toml $out/share/influxdb diff --git a/pkgs/servers/nosql/mongodb/default.nix b/pkgs/servers/nosql/mongodb/default.nix index 02cdc02cd4d..62ea55d00c1 100644 --- a/pkgs/servers/nosql/mongodb/default.nix +++ b/pkgs/servers/nosql/mongodb/default.nix @@ -3,7 +3,7 @@ with stdenv.lib; -let version = "2.6.5"; +let version = "2.6.6"; system-libraries = [ "pcre" "boost" @@ -28,7 +28,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "http://downloads.mongodb.org/src/mongodb-src-r${version}.tar.gz"; - sha256 = "0v58kyp4cj4yag0djnswfiifrcll5y7x772y99b3afg89xicpmjm"; + sha256 = "0shb069xsqyslazdq66smr7ifppvdclbzpdjhrj2y3qb78y70pbm"; }; nativeBuildInputs = [ scons ]; diff --git a/pkgs/servers/nosql/redis/default.nix b/pkgs/servers/nosql/redis/default.nix index e733ef3d009..b9c2e83d582 100644 --- a/pkgs/servers/nosql/redis/default.nix +++ b/pkgs/servers/nosql/redis/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = http://redis.io; description = "An open source, advanced key-value store"; - license = "BSD"; + license = stdenv.lib.licenses.bsd3; platforms = platforms.unix; maintainers = [ maintainers.berdario ]; }; diff --git a/pkgs/servers/openafs-client/default.nix b/pkgs/servers/openafs-client/default.nix index 4f4ec5cbc06..5c1b2c16c6d 100644 --- a/pkgs/servers/openafs-client/default.nix +++ b/pkgs/servers/openafs-client/default.nix @@ -2,6 +2,7 @@ kernel, glibc, ncurses, perl, krb5 }: assert stdenv.isLinux; +assert builtins.substring 0 4 kernel.version != "3.18"; stdenv.mkDerivation { name = "openafs-1.6.9-${kernel.version}"; diff --git a/pkgs/servers/prayer/default.nix b/pkgs/servers/prayer/default.nix index 781fca1c33d..1e476cb2301 100644 --- a/pkgs/servers/prayer/default.nix +++ b/pkgs/servers/prayer/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, perl, openssl, db, zlib, uwimap, htmlTidy, pam}: +{ stdenv, fetchurl, perl, openssl, db, zlib, uwimap, html-tidy, pam}: let ssl = stdenv.lib.optionals uwimap.withSSL @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "135fjbxjn385b6cjys6qhbwfw61mdcl2akkll4jfpdzfvhbxlyda"; }; - buildInputs = [ openssl db zlib uwimap htmlTidy pam ]; + buildInputs = [ openssl db zlib uwimap html-tidy pam ]; nativeBuildInputs = [ perl ]; NIX_LDFLAGS = "-lpam"; diff --git a/pkgs/servers/restund/default.nix b/pkgs/servers/restund/default.nix index d6952e9700e..b6fd650086f 100644 --- a/pkgs/servers/restund/default.nix +++ b/pkgs/servers/restund/default.nix @@ -15,8 +15,8 @@ stdenv.mkDerivation rec { ''PREFIX=$(out)'' "USE_MYSQL=1" ] - ++ stdenv.lib.optional (stdenv.gcc.gcc != null) "SYSROOT_ALT=${stdenv.gcc.gcc}" - ++ stdenv.lib.optional (stdenv.gcc.libc != null) "SYSROOT=${stdenv.gcc.libc}" + ++ stdenv.lib.optional (stdenv.cc.gcc != null) "SYSROOT_ALT=${stdenv.cc.gcc}" + ++ stdenv.lib.optional (stdenv.cc.libc != null) "SYSROOT=${stdenv.cc.libc}" ; NIX_LDFLAGS='' -L${mysql}/lib/mysql ''; meta = { @@ -28,5 +28,6 @@ stdenv.mkDerivation rec { downloadPage = "http://www.creytiv.com/pub/"; updateWalker = true; downloadURLRegexp = "/restund-.*[.]tar[.]"; + broken = true; # probably due to glibc-2.20 }; } diff --git a/pkgs/servers/rpcbind/default.nix b/pkgs/servers/rpcbind/default.nix index 8d8a677647c..31be5eef7c8 100644 --- a/pkgs/servers/rpcbind/default.nix +++ b/pkgs/servers/rpcbind/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = { description = "ONC RPC portmapper"; - license = "BSD"; + license = stdenv.lib.licenses.bsd3; longDescription = '' Universal addresses to RPC program number mapper. ''; diff --git a/pkgs/servers/samba/default.nix b/pkgs/servers/samba/default.nix index 08f12d97506..b0b1b152e9b 100644 --- a/pkgs/servers/samba/default.nix +++ b/pkgs/servers/samba/default.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { "--localstatedir=/var" ] ++ (stdenv.lib.optional winbind "--with-winbind") - ++ (stdenv.lib.optional (stdenv.gcc.libc != null) "--with-libiconv=${stdenv.gcc.libc}"); + ++ (stdenv.lib.optional (stdenv.cc.libc != null) "--with-libiconv=${stdenv.cc.libc}"); # Need to use a DESTDIR because `make install' tries to write in /var and /etc. installFlags = "DESTDIR=$(TMPDIR)/inst"; diff --git a/pkgs/servers/sip/freeswitch/default.nix b/pkgs/servers/sip/freeswitch/default.nix index c4a5fcc4284..5b6ff15cb10 100644 --- a/pkgs/servers/sip/freeswitch/default.nix +++ b/pkgs/servers/sip/freeswitch/default.nix @@ -12,6 +12,8 @@ stdenv.mkDerivation rec { buildInputs = [ ncurses curl pkgconfig gnutls readline openssl perl libjpeg libzrtpcpp ]; + NIX_CFLAGS_COMPILE = "-Wno-error=cpp"; + meta = { description = "Cross-Platform Scalable FREE Multi-Protocol Soft Switch"; homepage = http://freeswitch.org/; diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index 04f82022373..3c36b1aad6b 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "mariadb-${version}"; - version = "10.0.14"; + version = "10.0.15"; src = fetchurl { url = "https://downloads.mariadb.org/interstitial/mariadb-${version}/source/mariadb-${version}.tar.gz"; - sha256 = "07g3w841q8qw0mwi6grk65a2iky9x3axpxkb4c2a72i7pd7cl3mc"; + sha256 = "1n09553brmprs9m6siwjc1ca4b9b1giqasv3mhdrnijda1lcnm4i"; }; buildInputs = [ cmake ncurses openssl bison boost libxml2 judy libevent groff ] @@ -17,6 +17,8 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DWITH_READLINE=yes" "-DWITH_EMBEDDED_SERVER=yes" "-DINSTALL_SCRIPTDIR=bin" ]; + NIX_CFLAGS_COMPILE = "-Wno-error=cpp"; + enableParallelBuilding = true; prePatch = '' diff --git a/pkgs/servers/sql/mysql/5.1.x.nix b/pkgs/servers/sql/mysql/5.1.x.nix index b422b993832..3389f811489 100644 --- a/pkgs/servers/sql/mysql/5.1.x.nix +++ b/pkgs/servers/sql/mysql/5.1.x.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { name = "mysql-5.1.73"; src = fetchurl { - url = "http://cdn.mysql.com/Downloads/MySQL-5.1/${name}.tar.gz"; + url = "mirror://mysql/MySQL-5.1/${name}.tar.gz"; sha256 = "1dfwi4ck0vq6sdci6gz0031s7zz5lc3pddqlgm0292s00l9y5sq5"; }; diff --git a/pkgs/servers/sql/mysql/5.5.x.nix b/pkgs/servers/sql/mysql/5.5.x.nix index 5c57ae87d20..64fbabb0800 100644 --- a/pkgs/servers/sql/mysql/5.5.x.nix +++ b/pkgs/servers/sql/mysql/5.5.x.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { version = "5.5.40"; src = fetchurl { - url = "http://mysql.mirrors.pair.com/Downloads/MySQL-5.5/${name}.tar.gz"; + url = "mirror://mysql/MySQL-5.5/${name}.tar.gz"; sha256 = "0q29nzmmxm78b89qjfzgm93r0glaam3xw3zfx1k8ihii39v22dsd"; }; diff --git a/pkgs/servers/sql/oracle-xe/default.nix b/pkgs/servers/sql/oracle-xe/default.nix index cd333152a2a..cb150fc5fd4 100644 --- a/pkgs/servers/sql/oracle-xe/default.nix +++ b/pkgs/servers/sql/oracle-xe/default.nix @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { \( -name '*.sh' \ -o -path "$basedir/bin/*" \ \) -print -exec "${patchelf}/bin/patchelf" \ - --interpreter "$(cat "$NIX_GCC/nix-support/dynamic-linker")" \ + --interpreter "$(cat "$NIX_CC/nix-support/dynamic-linker")" \ --set-rpath "${libs}:$out/libexec/oracle/lib" \ --force-rpath '{}' \; ''; diff --git a/pkgs/servers/sql/virtuoso/6.x.nix b/pkgs/servers/sql/virtuoso/6.x.nix index 9453b8d2cdb..4de0ace0c03 100644 --- a/pkgs/servers/sql/virtuoso/6.x.nix +++ b/pkgs/servers/sql/virtuoso/6.x.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { buildInputs = [ libxml2 openssl readline gawk ]; - CPP = "${stdenv.gcc}/bin/gcc -E"; + CPP = "${stdenv.cc}/bin/gcc -E"; configureFlags = " --enable-shared --disable-all-vads --with-readline=${readline} diff --git a/pkgs/servers/sql/virtuoso/7.x.nix b/pkgs/servers/sql/virtuoso/7.x.nix index 0c310b18901..de610f9a729 100644 --- a/pkgs/servers/sql/virtuoso/7.x.nix +++ b/pkgs/servers/sql/virtuoso/7.x.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { buildInputs = [ libxml2 openssl readline gawk ]; - CPP = "${stdenv.gcc}/bin/gcc -E"; + CPP = "${stdenv.cc}/bin/gcc -E"; configureFlags = " --enable-shared --disable-all-vads --with-readline=${readline} diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index efe35b42b40..659a582f39c 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -1375,11 +1375,11 @@ let }) // {inherit ;}; xf86inputevdev = (mkDerivation "xf86inputevdev" { - name = "xf86-input-evdev-2.8.4"; + name = "xf86-input-evdev-2.9.1"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-input-evdev-2.8.4.tar.bz2; - sha256 = "030haki1h0m85h91c91812gdnk6znfamw5kpr010zxwwbsgxxyl5"; + url = mirror://xorg/individual/driver/xf86-input-evdev-2.9.1.tar.bz2; + sha256 = "1y82hpx86rngb0yrvcl4ni88wkc3zf9dj25myjk91b7ymll07qqc"; }; buildInputs = [pkgconfig inputproto udev xorgserver xproto ]; }) // {inherit inputproto udev xorgserver xproto ;}; @@ -1555,14 +1555,14 @@ let }) // {inherit fontsproto libpciaccess randrproto renderproto videoproto xextproto xorgserver xproto ;}; xf86videointel = (mkDerivation "xf86videointel" { - name = "xf86-video-intel-2.99.916"; + name = "xf86-video-intel-2.99.917"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-intel-2.99.916.tar.bz2; - sha256 = "00gd3v3xgrmj8aliwjxkml13gfqvcbjazb6l5m1wkry39agq36j0"; + url = mirror://xorg/individual/driver/xf86-video-intel-2.99.917.tar.bz2; + sha256 = "1jb7jspmzidfixbc0gghyjmnmpqv85i7pi13l4h2hn2ml3p83dq0"; }; - buildInputs = [pkgconfig dri2proto dri3proto fontsproto glamoregl libdrm libpng udev libpciaccess presentproto randrproto renderproto libX11 xcbutil libxcb libXext xextproto xf86driproto libXfixes xorgserver xproto libXrandr libXrender libxshmfence libXvMC ]; - }) // {inherit dri2proto dri3proto fontsproto glamoregl libdrm libpng udev libpciaccess presentproto randrproto renderproto libX11 xcbutil libxcb libXext xextproto xf86driproto libXfixes xorgserver xproto libXrandr libXrender libxshmfence libXvMC ;}; + buildInputs = [pkgconfig dri2proto dri3proto fontsproto glamoregl libdrm libpng udev libpciaccess presentproto randrproto renderproto libX11 xcbutil libxcb libXcursor libXdamage libXext xextproto xf86driproto libXfixes xorgserver xproto libXrandr libXrender libxshmfence libXtst libXvMC ]; + }) // {inherit dri2proto dri3proto fontsproto glamoregl libdrm libpng udev libpciaccess presentproto randrproto renderproto libX11 xcbutil libxcb libXcursor libXdamage libXext xextproto xf86driproto libXfixes xorgserver xproto libXrandr libXrender libxshmfence libXtst libXvMC ;}; xf86videomach64 = (mkDerivation "xf86videomach64" { name = "xf86-video-mach64-6.9.4"; @@ -1645,11 +1645,11 @@ let }) // {inherit fontsproto glproto libdrm udev libpciaccess randrproto renderproto videoproto libX11 libXext xextproto xf86driproto xorgserver xproto libXvMC ;}; xf86videoqxl = (mkDerivation "xf86videoqxl" { - name = "xf86-video-qxl-0.1.2"; + name = "xf86-video-qxl-0.1.3"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/driver/xf86-video-qxl-0.1.2.tar.bz2; - sha256 = "09sjpkg7klzzg9sagmqpsw911501vqk9wdd4nr0jkqqanvkx39s3"; + url = mirror://xorg/individual/driver/xf86-video-qxl-0.1.3.tar.bz2; + sha256 = "1368dd5mihn3s098n7wa3fpjkp8pnamabfjjipkqs9zyrcvncy3m"; }; buildInputs = [pkgconfig fontsproto libdrm udev libpciaccess randrproto renderproto videoproto xf86dgaproto xorgserver xproto ]; }) // {inherit fontsproto libdrm udev libpciaccess randrproto renderproto videoproto xf86dgaproto xorgserver xproto ;}; @@ -1865,11 +1865,11 @@ let }) // {inherit inputproto libX11 libXext libXi libXinerama libXrandr ;}; xkbcomp = (mkDerivation "xkbcomp" { - name = "xkbcomp-1.2.4"; + name = "xkbcomp-1.3.0"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/X11R7.7/src/everything/xkbcomp-1.2.4.tar.bz2; - sha256 = "0bas1d2wjiy5zy9d0g92d2p9pwv4aapfbfidi7hxy8ax8jmwkl4i"; + url = mirror://xorg/individual/app/xkbcomp-1.3.0.tar.bz2; + sha256 = "0aibcbhhjlwcrxh943xg2dswwx5bz1x0pmhs28b55gzsg0vrgb6g"; }; buildInputs = [pkgconfig libX11 libxkbfile xproto ]; }) // {inherit libX11 libxkbfile xproto ;}; @@ -1985,14 +1985,14 @@ let }) // {inherit ;}; xorgserver = (mkDerivation "xorgserver" { - name = "xorg-server-1.16.1"; + name = "xorg-server-1.16.2.901"; builder = ./builder.sh; src = fetchurl { - url = mirror://xorg/individual/xserver/xorg-server-1.16.1.tar.bz2; - sha256 = "0q706wdbwipyfcvywl7apih3p5mrms3p0wr1hdj5jyzvr5p7qrzl"; + url = mirror://xorg/individual/xserver/xorg-server-1.16.2.901.tar.bz2; + sha256 = "19jb8v26wc332ramwjdg5vjh3s36kr7n46s6fdfaxrj1wif5m27g"; }; - buildInputs = [pkgconfig renderproto libdrm openssl libX11 libXau libXaw libxcb xcbutil xcbutilwm xcbutilimage xcbutilkeysyms libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libxshmfence libXt ]; - }) // {inherit renderproto libdrm openssl libX11 libXau libXaw libxcb xcbutil xcbutilwm xcbutilimage xcbutilkeysyms libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libxshmfence libXt ;}; + buildInputs = [pkgconfig dri2proto dri3proto renderproto libdrm openssl libX11 libXau libXaw libxcb xcbutil xcbutilwm xcbutilimage xcbutilkeysyms libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libxshmfence libXt ]; + }) // {inherit dri2proto dri3proto renderproto libdrm openssl libX11 libXau libXaw libxcb xcbutil xcbutilwm xcbutilimage xcbutilkeysyms libXdmcp libXfixes libxkbfile libXmu libXpm libXrender libXres libxshmfence libXt ;}; xorgsgmldoctools = (mkDerivation "xorgsgmldoctools" { name = "xorg-sgml-doctools-1.11"; diff --git a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl index 9c6618d3b10..7b2c20e05eb 100755 --- a/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl +++ b/pkgs/servers/x11/xorg/generate-expr-from-tarballs.pl @@ -36,6 +36,8 @@ $pcMap{"libudev"} = "udev"; $pcMap{"gl"} = "mesa"; $pcMap{"\$PIXMAN"} = "pixman"; $pcMap{"\$RENDERPROTO"} = "renderproto"; +$pcMap{"\$DRI3PROTO"} = "dri3proto"; +$pcMap{"\$DRI2PROTO"} = "dri2proto"; my $downloadCache = "./download-cache"; @@ -207,6 +209,7 @@ while (<>) { process \@requires, $1 while $file =~ /XDMCP_MODULES=\"(.*)\"/g; process \@requires, $1 while $file =~ /XORG_MODULES=\"(.*)\"/g; process \@requires, $1 while $file =~ /NEEDED=\"(.*)\"/g; + process \@requires, $1 while $file =~ /ivo_requires=\"(.*)\"/g; process \@requires, $1 while $file =~ /XORG_DRIVER_CHECK_EXT\([^,]*,([^\)]*)\)/g; push @requires, "libxslt" if $pkg =~ /libxcb/; diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index a29d184e48c..45122780cdd 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -173,6 +173,7 @@ in xf86inputevdev = attrs: attrs // { preBuild = "sed -e '/motion_history_proc/d; /history_size/d;' -i src/*.c"; installFlags = "sdkdir=\${out}/include/xorg"; + buildInputs = attrs.buildInputs ++ [ args.mtdev args.libevdev ]; }; xf86inputmouse = attrs: attrs // { @@ -194,6 +195,11 @@ in "--with-xorg-conf-dir=$(out)/share/X11/xorg.conf.d" "--with-udev-rules-dir=$(out)/lib/udev/rules.d" ]; + patches = [( args.fetchpatch { + url = "http://cgit.freedesktop.org/xorg/driver/xf86-input-vmmouse/patch/" + + "?id=1cbbc03c4b37d57760c57bd2e0b0f89d744a5795"; + sha256 = "1qkhwj2yal0cz15lv9557d10ylvxlq05ibq43pm2rrvqdg3mb6h4"; + })]; }; xf86videoati = attrs: attrs // { @@ -209,6 +215,11 @@ in xf86videovmware = attrs: attrs // { buildInputs = attrs.buildInputs ++ [ args.mesa_drivers ]; # for libxatracker + patches = [( args.fetchpatch { + url = "http://cgit.freedesktop.org/xorg/driver/xf86-video-vmware/patch/" + + "?id=4664412d7a5266d2b392957406b34abc5db95e48"; + sha256 = "1gix83f1is91iq1zd66nj4k72jm24jjjd9s9l0bzpzhgc8smqdk2"; + })]; }; xf86videoqxl = attrs: attrs // { @@ -255,7 +266,7 @@ in recordproto libXext pixman libXfont damageproto xcmiscproto bigreqsproto libpciaccess inputproto xextproto randrproto renderproto presentproto - dri2proto kbproto xineramaproto resourceproto scrnsaverproto videoproto + dri2proto dri3proto kbproto xineramaproto resourceproto scrnsaverproto videoproto ]; commonPatches = [ ./xorgserver-xkbcomp-path.patch ]; # XQuartz requires two compilations: the first to get X / XQuartz, diff --git a/pkgs/servers/x11/xorg/tarballs-7.7.list b/pkgs/servers/x11/xorg/tarballs-7.7.list index d3a2f1b45f9..4ac572cb201 100644 --- a/pkgs/servers/x11/xorg/tarballs-7.7.list +++ b/pkgs/servers/x11/xorg/tarballs-7.7.list @@ -41,7 +41,7 @@ mirror://xorg/X11R7.7/src/everything/font-mutt-misc-1.0.3.tar.bz2 mirror://xorg/X11R7.7/src/everything/font-schumacher-misc-1.1.2.tar.bz2 mirror://xorg/X11R7.7/src/everything/font-screen-cyrillic-1.0.4.tar.bz2 mirror://xorg/X11R7.7/src/everything/font-sony-misc-1.0.3.tar.bz2 -mirror://xorg/X11R7.7/src/everything/fontsproto-2.1.3.tar.bz2 +mirror://xorg/individual/proto/fontsproto-2.1.3.tar.bz2 mirror://xorg/X11R7.7/src/everything/font-sun-misc-1.0.3.tar.bz2 mirror://xorg/X11R7.7/src/everything/font-util-1.3.0.tar.bz2 mirror://xorg/X11R7.7/src/everything/font-winitzki-cyrillic-1.0.3.tar.bz2 @@ -115,7 +115,7 @@ mirror://xorg/individual/proto/xextproto-7.3.0.tar.bz2 mirror://xorg/X11R7.7/src/everything/xf86bigfontproto-1.2.0.tar.bz2 mirror://xorg/X11R7.7/src/everything/xf86dgaproto-2.1.tar.bz2 mirror://xorg/X11R7.7/src/everything/xf86driproto-2.1.1.tar.bz2 -mirror://xorg/individual/driver/xf86-input-evdev-2.8.4.tar.bz2 +mirror://xorg/individual/driver/xf86-input-evdev-2.9.1.tar.bz2 mirror://xorg/individual/driver/xf86-input-joystick-1.6.2.tar.bz2 mirror://xorg/individual/driver/xf86-input-keyboard-1.8.0.tar.bz2 mirror://xorg/individual/driver/xf86-input-mouse-1.9.1.tar.bz2 @@ -134,11 +134,11 @@ mirror://xorg/individual/driver/xf86-video-geode-2.11.16.tar.bz2 mirror://xorg/individual/driver/xf86-video-glide-1.2.2.tar.bz2 mirror://xorg/individual/driver/xf86-video-glint-1.2.8.tar.bz2 mirror://xorg/individual/driver/xf86-video-i128-1.3.6.tar.bz2 -mirror://xorg/individual/driver/xf86-video-intel-2.99.916.tar.bz2 +mirror://xorg/individual/driver/xf86-video-intel-2.99.917.tar.bz2 mirror://xorg/individual/driver/xf86-video-mach64-6.9.4.tar.bz2 mirror://xorg/individual/driver/xf86-video-mga-1.6.3.tar.bz2 mirror://xorg/individual/driver/xf86-video-modesetting-0.9.0.tar.bz2 -mirror://xorg/individual/driver/xf86-video-qxl-0.1.2.tar.bz2 +mirror://xorg/individual/driver/xf86-video-qxl-0.1.3.tar.bz2 mirror://xorg/individual/driver/xf86-video-neomagic-1.2.8.tar.bz2 mirror://xorg/X11R7.7/src/everything/xf86-video-newport-0.2.4.tar.bz2 mirror://xorg/individual/driver/xf86-video-nv-2.1.20.tar.bz2 @@ -162,7 +162,7 @@ mirror://xorg/X11R7.7/src/everything/xgamma-1.0.5.tar.bz2 mirror://xorg/individual/app/xhost-1.0.6.tar.bz2 mirror://xorg/X11R7.7/src/everything/xineramaproto-1.2.1.tar.bz2 mirror://xorg/individual/app/xinput-1.6.1.tar.bz2 -mirror://xorg/X11R7.7/src/everything/xkbcomp-1.2.4.tar.bz2 +mirror://xorg/individual/app/xkbcomp-1.3.0.tar.bz2 mirror://xorg/X11R7.7/src/everything/xkbevd-1.1.3.tar.bz2 mirror://xorg/individual/app/xkbutils-1.0.4.tar.bz2 mirror://xorg/individual/data/xkeyboard-config/xkeyboard-config-2.11.tar.bz2 @@ -171,7 +171,7 @@ mirror://xorg/X11R7.7/src/everything/xlsatoms-1.1.1.tar.bz2 mirror://xorg/individual/app/xlsclients-1.1.3.tar.bz2 mirror://xorg/individual/app/xmodmap-1.0.8.tar.bz2 mirror://xorg/X11R7.7/src/everything/xorg-docs-1.7.tar.bz2 -mirror://xorg/individual/xserver/xorg-server-1.16.1.tar.bz2 +mirror://xorg/individual/xserver/xorg-server-1.16.2.901.tar.bz2 mirror://xorg/X11R7.7/src/everything/xorg-sgml-doctools-1.11.tar.bz2 mirror://xorg/X11R7.7/src/everything/xpr-1.0.4.tar.bz2 mirror://xorg/individual/app/xprop-1.2.2.tar.bz2 diff --git a/pkgs/servers/x11/xorg/xwayland.nix b/pkgs/servers/x11/xorg/xwayland.nix new file mode 100644 index 00000000000..f43a9c67160 --- /dev/null +++ b/pkgs/servers/x11/xorg/xwayland.nix @@ -0,0 +1,41 @@ + +{ stdenv, wayland, xorgserver, xkbcomp, xkeyboard_config, epoxy, libxslt, libunwind, makeWrapper }: + +with stdenv.lib; + +overrideDerivation xorgserver (oldAttrs: { + + name = "xwayland-${xorgserver.version}"; + propagatedNativeBuildInputs = oldAttrs.propagatedNativeBuildInputs + ++ [wayland epoxy libxslt makeWrapper libunwind]; + configureFlags = [ + "--disable-docs" + "--disable-devel-docs" + "--enable-xwayland" + "--disable-xorg" + "--disable-xvfb" + "--disable-xnest" + "--disable-xquartz" + "--disable-xwin" + "--with-default-font-path=" + "--with-xkb-bin-directory=${xkbcomp}/bin" + "--with-xkb-path=${xkeyboard_config}/etc/X11/xkb" + "--with-xkb-output=$out/share/X11/xkb/compiled" + ]; + + postInstall = '' + rm -fr $out/share/X11/xkb/compiled + ln -s /var/tmp $out/share/X11/xkb/compiled + ''; + +}) // { + meta = { + description = "An X server for interfacing X11 apps with the Wayland protocol"; + homepage = http://wayland.freedesktop.org/xserver.html; + license = licenses.mit; + platforms = platforms.linux; + }; +} + + + diff --git a/pkgs/shells/bash/bash-4.2-patches.nix b/pkgs/shells/bash/bash-4.2-patches.nix deleted file mode 100644 index 8ec6bf73835..00000000000 --- a/pkgs/shells/bash/bash-4.2-patches.nix +++ /dev/null @@ -1,57 +0,0 @@ -# Automatically generated by `update-patch-set.sh'; do not edit. - -patch: [ -(patch "001" "0yml2b6yarrr0dzv7h45lz4126i228hvqbqacqzg4jkcawla0v4d") -(patch "002" "1yffzfxryvqns513yv3r46slkysa3nbqv40442xfxb4rw4kwkfpy") -(patch "003" "1kdl9hcpf1m7gz0ja3mvin3syprl2kmbxc3wm27391wc04apq2js") -(patch "004" "1ha0453cjqdgkns2xkdgpd2izj5b6xlsc9a2w5b3sn6j63wb0d2f") -(patch "005" "182r2iyk27l28b8kyppfavvzxhax6vn5n1zyy3yirf0463klj5x8") -(patch "006" "1labcciavnfmn0alncz1x92ydrsriikcimw24rwzmnidbaa4h4f9") -(patch "007" "15byzdqvavc3zg2lbzzdwpdy43kzdnvmr89nya211pa3yjn2cn20") -(patch "008" "0dr4p83m2xpxhvd61yny0gdlasq6r9mpyiz220998y0alq8hs213") -(patch "009" "086b9jkyjgf2zhwln72d7s5x759iskgg3r4hdrw6b5y1ni059vg7") -(patch "010" "1p23m9kssdmpnjfp96bjmmshzf25cdzlyjygdw8j6sayqa159z5c") -(patch "011" "0chm4r6zv2kafq1g8xs7r0gixmw9h9r63rgd38rdgfvyk8ssx4d4") -(patch "012" "1f5pp64rv4mx3r34577pmb15pyxvhmdhmliccnwz20nssbqk6i1m") -(patch "013" "1sl5rxl3kz39xbnbaf0085jcx0l19l2yqjk0ja2wirmwrg3ca4il") -(patch "014" "0cwb5ilgx1gcbvnfk93pcpyhvq5wzasyvyllbxrk51c517k7i9mm") -(patch "015" "164afkc75534x1ad1h6qkl511k2cpirqs2kyx1jddwxx0j1nm1rd") -(patch "016" "19p20g7h7563m79vvy0adkpzlaxg192affzsm1rxm67wyyycr598") -(patch "017" "0zzfva20hxfrj5njd321pcjfydiv0kzcqryxfdh1sxlc95228mbk") -(patch "018" "0ka9pfnjmdak8lvmbryv2r1kkrlffnxbqjxq656la39pf9qlbag2") -(patch "019" "0mpb0whacppwcdx7pcnf0ah5vjvkw14ang6r2rh9fmkn401cvdx8") -(patch "020" "0vrwv9wpbr692kf427npmsxzvn007d9alk6jf99v7307s3q76is9") -(patch "021" "1p5s6apnnbmx4yf1kzndw7fiwvdxamkcgqiv937mwmr6w9xsk1x8") -(patch "022" "0sswp2c63pclvdwi2hbkwbqf9ysmiw6mmi0qinl2pkgqyyfzdkcx") -(patch "023" "1gzhcmwj0741libjqwln4r4h9k7lskprc4q87hvqgj56y6a17hax") -(patch "024" "1rlrdfk67g8as6pr076ldhjhnkd2c86mb4ci18fjivivsfyjdj4r") -(patch "025" "05am4w789v630x0a6a9wrxhvrjvs73fjn68i55qdand5sxpn9c0d") -(patch "026" "1li3sd3hpdxhh257hdwzzn2g18m4ksflx6crqswv9qxwmgx0rsg7") -(patch "027" "0hpdywvny6vihls2qqlwwxkvps7q710vp6szq117zhgwarr6n7qc") -(patch "028" "0ypdn590h5f8y7kvk2sk93vcjbh5vrcwsaasvprsm0ds77g2chi0") -(patch "029" "10gm73rvfhr42v7i70qqc56wl8l459i2frs6ifrcsnmw2w48rc6h") -(patch "030" "1bmg8iz95jijxp89czwaw9msppgj220233nbrn66s4qsb5k46n8j") -(patch "031" "1yfrz093hghhlrj8na48dzc8v6ax34mj5i0h6l3bnpvp6i6qrwsm") -(patch "032" "1vci8xh1r8f59j6d95iljw9i555jm1fm2lssm1ycprdivdivba73") -(patch "033" "0js38r5gmlyz70zjfw0m2j08h26c3vma2vy8gbsb5pwzss82glgm") -(patch "034" "1f213qpvqnv2bm79a01r44xjlwk65483cxvw6kgwx28k20rg7h81") -(patch "035" "1pvqxpm7m1y7ab5srq3s7r095z34nbcr62gz6nb89d1qn1iy9kff") -(patch "036" "1yma0m9wrk6a15x36libb8a0cz7gmzihv6lvmrrd5i1ar4dklagy") -(patch "037" "0x0niqv7zwqvz4l8n9nivhk0g0036jh5h3vlkil3095vsgfqqmy7") -(patch "038" "0mvdpsxxs4bn5zvsm04yfsplhcrv6y0avpwilj5yasr0vwdsijdq") -(patch "039" "148pkj5s73ym0jhpr8d3z5vfily4chm0am4yms4506ijc0531ygl") -(patch "040" "0v5a98ybibwsd4iyh18gy0kc51mx8qn9w2wfpjaiycn7yg5gjrdj") -(patch "041" "1szmm8xv41hvbzgxfwrj6dg85wa7zy3781nnil428rlzpm8ikk05") -(patch "042" "017kpdqy6v9sgi2a931wyzpix86n9mkalpm6n9cb45v58lgmraps") -(patch "043" "0mswgjk3z80qm1mb93jmbql27nbczxk86cw5byf0m29y1y2869nw") -(patch "044" "1rk6jywzfvg1crvhib1zk37rsps73minhr7l4vcb3vfdkin2vlqh") -(patch "045" "0vcqn9rb26bahhrarbwhpa0ny0nrf4vyrzh97d44lfcxypqfzdyx") -(patch "046" "0vc1ngkxkamwr022ww3vjp9ww9c647az4pjn175c1v60d0xk5hcm") -(patch "047" "0ymgimqz65sx2izg1dvm1h5cc01arl3j9j5137212l1ls00r55y1") -(patch "048" "091xk1ms7ycnczsl3fx461gjhj69j6ycnfijlymwj6mj60ims6km") -(patch "049" "03jipi8qz5baf1dyhld7yvazkkad7lz5czchrjsrnglzvm6df74h") -(patch "050" "19lb9nh0x5siwf21xkga3khy5pa3srfrlx97mby4cfz8am2bh68s") -(patch "051" "0705948wzi27zxphkh5vx4n62i671afyrb4qx276n49sq9xk859y") -(patch "052" "036wc4azli48ri7641fflxh6j95fnsma2167hbn80v7p91qzm67h") -(patch "053" "1pnkzx8bj8rz219wk8kxs8iga1k2wn13g1yvg3dci19qakbr7ri0") -] diff --git a/pkgs/shells/bash/bash-4.3-patches.nix b/pkgs/shells/bash/bash-4.3-patches.nix new file mode 100644 index 00000000000..cd1fb578e62 --- /dev/null +++ b/pkgs/shells/bash/bash-4.3-patches.nix @@ -0,0 +1,34 @@ +# Automatically generated by `update-patch-set.sh'; do not edit. + +patch: [ +(patch "001" "0hip2n2s5hws8p4nfcz37379zn6cak83ljsm64z52rw6ckrdzczc") +(patch "002" "0ashj5d1g3zbyr7zf0r72s5wnk96cz1xj919y3jajadbc9qcvrzf") +(patch "003" "0z88q4daq7dmw93iqd9c5i5d1sndklih3nrh0v75746da2n6w3h0") +(patch "004" "0f0kh9j5k4ym6knshscx31przm50x5cc7ifkwqk0swh6clna982y") +(patch "005" "1ym3b8b7lgmdp3dklp8qaqhyq965wd5392namq8mz7rb0d231j0s") +(patch "006" "04q20igq49py49ynb0f83f6f52cdkyqwd9bpic6akr0m5pkqwr50") +(patch "007" "18zkz23d9myshrwfcwcdjk7qmkqp8az5n91ni9jaixlwqlhy64qi") +(patch "008" "0pprcwvh7ngdli0x95pc1cpssg4qg7layi9xrv2jq6c7965ajhcr") +(patch "009" "19a0pf0alp30d1bjj0zf3zq2f5n0s6y91w7brm9jyswl51kns8n0") +(patch "010" "1dzhr5ammyijisz48cqi5vaw26hfr5vh9smnqxq4qc9p06f7j1ff") +(patch "011" "0fvzdzzi142a8rf3v965r6gbpn0k7fv2gif1yq8a4160vcn40qvw") +(patch "012" "04lcgfcyz7p3zagb4hkia3hkpd7lii9m8ycy9qqwzyrm1c1pj4ry") +(patch "013" "0y9cqi378z6flapkd5k5lfl4lq3ivzg4njj3i3wmw7xb6r9wma5z") +(patch "014" "04xcb0k9fxxq4vashgzb98567xzdnm4655nlm4jvfvjv6si6ykas") +(patch "015" "13ay6lldy1p00xj41nfjpq8lai3vw2qwca79gx6s80z04j53wa8k") +(patch "016" "0wq7bvx3pfw90pnfb86yg5nr9jgjsvm2nq5rrkqxf6zn977hpmlj") +(patch "017" "103p7sibihv6cshqj12k546zsbz0dnd5cv5vlx1719avddfc4rqj") +(patch "018" "0n1x3812y1brb9xbabaj3fvr4cpvm2225iwckmqk2fcpkq5b9a3s") +(patch "019" "08rd1p7zpzgbpmmmnj2im8wj2pcwmbbx51psr9vdc5c049si9ad7") +(patch "020" "163c6g05qpag2plx5q795pmw3f3m904jy7z93xj2i08pgzc8cpna") +(patch "021" "1a90cl3h10dh8k9f2ddrsjmw5ywaw2d5x78xb4fd2sryi039yhs1") +(patch "022" "120s0s4qcqd0q12j1iv0hkpf9fp3w5jnqw646kv66n66jnxlfkgx") +(patch "023" "1m00sfi88p2akgiyrg4hw0gvz3s1586pkzjdr3dm73vs773m1hls") +(patch "024" "0v0gjqzjsqjfgj5x17fq7g649k94jn8zq92qsxkhc2d6l215hl1v") +(patch "025" "0lcj96i659q35f1jcmwwbnw3p7w7vvlxjxqi989vn6d6qksqcl8y") +(patch "026" "0k919ir0inwn4wai2vdzpbwqq5h54fnrlkmgccxjg91v3ch15k1f") +(patch "027" "1gnsfvq6bhb3srlbh0cannj2hackdsipcg7z0ds7zlk1hp96mdqy") +(patch "028" "17a65c4fn4c5rgsiw9gqqnzhznh3gwnd2xzzv2dppyi48znxpc78") +(patch "029" "14k27p28r5l2fz3r03kd0x72vvsq8bja8c6hjz5kxikbzsbs7i2c") +(patch "030" "0nrqb0m7s89qsrbfaffpilc5gcf82bx9yvgzld4hr79p5y54yhw5") +] diff --git a/pkgs/shells/bash/default.nix b/pkgs/shells/bash/default.nix index ca12c26f256..cc3108841b6 100644 --- a/pkgs/shells/bash/default.nix +++ b/pkgs/shells/bash/default.nix @@ -3,7 +3,7 @@ assert interactive -> readline != null; let - realName = "bash-4.2"; + realName = "bash-4.3"; baseConfigureFlags = if interactive then "--with-installed-readline" else "--disable-readline"; in @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://gnu/bash/${realName}.tar.gz"; - sha256 = "a27a1179ec9c0830c65c6aa5d7dab60f7ce1a2a608618570f96bfa72e95ab3d8"; + sha256 = "1m14s1f61mf6bijfibcjm9y6pkyvz6gibyl8p4hxq90fisi8gimg"; }; NIX_CFLAGS_COMPILE = '' @@ -30,11 +30,11 @@ stdenv.mkDerivation rec { (let patch = nr: sha256: fetchurl { - url = "mirror://gnu/bash/bash-4.2-patches/bash42-${nr}"; + url = "mirror://gnu/bash/bash-4.3-patches/bash43-${nr}"; inherit sha256; }; in - import ./bash-4.2-patches.nix patch); + import ./bash-4.3-patches.nix patch); crossAttrs = { configureFlags = baseConfigureFlags + diff --git a/pkgs/shells/ipython/default.nix b/pkgs/shells/ipython/default.nix index 990eb174baf..09b2d30ea7c 100644 --- a/pkgs/shells/ipython/default.nix +++ b/pkgs/shells/ipython/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, buildPythonPackage, pythonPackages, pyqt4 ? null, sip ? null +{ stdenv, fetchurl, buildPythonPackage, pythonPackages, pyqt4 ? null , notebookSupport ? true # ipython notebook , qtconsoleSupport ? true # ipython qtconsole , pylabSupport ? true # ipython --pylab (backend: agg - no gui, just file) @@ -10,15 +10,15 @@ # pyqt4 for both. assert qtconsoleSupport == true -> pyqt4 != null; -assert pylabQtSupport == true -> pyqt4 != null && sip != null; +assert pylabQtSupport == true -> pyqt4 != null; buildPythonPackage rec { - name = "ipython-2.2.0"; + name = "ipython-2.3.1"; namePrefix = ""; src = fetchurl { url = "http://pypi.python.org/packages/source/i/ipython/${name}.tar.gz"; - sha256 = "1qk44lmir24gnwb3gxh0mqcghc8ln1i5ygxpalh06bx0ajx7gjmp"; + sha256 = "1764gi5m3ff481rjk336cw6i2h4zlc0nxam9rc5m8m7yl9m4d61y"; }; propagatedBuildInputs = [ @@ -37,7 +37,6 @@ buildPythonPackage rec { ] ++ stdenv.lib.optionals pylabQtSupport [ pythonPackages.matplotlib pyqt4 - sip ]; doCheck = false; @@ -45,7 +44,7 @@ buildPythonPackage rec { meta = { homepage = http://ipython.scipy.org/; description = "An interactive computing environment for Python"; - license = "BSD"; + license = stdenv.lib.licenses.bsd3; longDescription = '' The goal of IPython is to create a comprehensive environment for interactive and exploratory computing. It consists of an diff --git a/pkgs/stdenv/adapters.nix b/pkgs/stdenv/adapters.nix index cf95a5edfad..6d8ca55a0fc 100644 --- a/pkgs/stdenv/adapters.nix +++ b/pkgs/stdenv/adapters.nix @@ -8,7 +8,7 @@ rec { # Override the compiler in stdenv for specific packages. - overrideGCC = stdenv: gcc: stdenv.override { allowedRequisites = null; inherit gcc; }; + overrideGCC = stdenv: gcc: stdenv.override { allowedRequisites = null; cc = gcc; }; # Add some arbitrary packages to buildInputs for specific packages. @@ -29,63 +29,6 @@ rec { overrideSetup = stdenv: setupScript: stdenv.override { inherit setupScript; }; - # Return a modified stdenv that uses dietlibc to create small - # statically linked binaries. - useDietLibC = stdenv: stdenv // - { mkDerivation = args: stdenv.mkDerivation (args // { - NIX_CFLAGS_LINK = "-static"; - - # libcompat.a contains some commonly used functions. - NIX_LDFLAGS = "-lcompat"; - - # These are added *after* the command-line flags, so we'll - # always optimise for size. - NIX_CFLAGS_COMPILE = - args.NIX_CFLAGS_COMPILE or "" - + " -Os -s -D_BSD_SOURCE=1"; - - configureFlags = - args.configureFlags or "" - + " --disable-shared"; # brrr... - - NIX_GCC = import ../build-support/gcc-wrapper { - inherit stdenv; - libc = pkgs.dietlibc; - inherit (stdenv.gcc) gcc binutils nativeTools nativePrefix; - nativeLibc = false; - }; - }); - isDietLibC = true; - }; - - - # Return a modified stdenv that uses klibc to create small - # statically linked binaries. - useKlibc = stdenv: klibc: stdenv // - { mkDerivation = args: stdenv.mkDerivation (args // { - NIX_CFLAGS_LINK = "-static"; - - # These are added *after* the command-line flags, so we'll - # always optimise for size. - NIX_CFLAGS_COMPILE = - args.NIX_CFLAGS_COMPILE or "" + " -Os -s"; - - configureFlags = - args.configureFlags or "" + " --disable-shared"; # brrr... - - NIX_GCC = pkgs.runCommand "klibc-wrapper" {} '' - mkdir -p $out/bin - ln -s ${klibc}/bin/klcc $out/bin/gcc - ln -s ${klibc}/bin/klcc $out/bin/cc - mkdir -p $out/nix-support - echo 'PATH=$PATH:${stdenv.gcc.binutils}/bin' > $out/nix-support/setup-hook - ''; - }); - isKlibc = true; - isStatic = true; - }; - - # Return a modified stdenv that tries to build statically linked # binaries. makeStaticBinaries = stdenv: stdenv // diff --git a/pkgs/stdenv/darwin/default.nix b/pkgs/stdenv/darwin/default.nix index 45d417cdce7..e7ee53178c7 100644 --- a/pkgs/stdenv/darwin/default.nix +++ b/pkgs/stdenv/darwin/default.nix @@ -18,7 +18,7 @@ import ../generic rec { system = stdenv.system; - gcc = import ../../build-support/gcc-wrapper { + cc = import ../../build-support/gcc-wrapper { nativeTools = false; nativeLibc = true; inherit stdenv; @@ -34,8 +34,8 @@ import ../generic rec { fetchurlBoot = stdenv.fetchurlBoot; overrides = pkgs_: { - inherit gcc; - inherit (gcc) binutils; + inherit cc; + inherit (cc) binutils; inherit (pkgs) gzip bzip2 xz bash coreutils diffutils findutils gawk gnumake gnused gnutar gnugrep gnupatch perl libcxx libcxxabi; diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix index f41515154c6..d50ac9f430e 100644 --- a/pkgs/stdenv/generic/default.nix +++ b/pkgs/stdenv/generic/default.nix @@ -1,6 +1,6 @@ let lib = import ../../../lib; in lib.makeOverridable ( -{ system, name ? "stdenv", preHook ? "", initialPath, gcc, shell +{ system, name ? "stdenv", preHook ? "", initialPath, cc, shell , allowedRequisites ? null, extraAttrs ? {}, overrides ? (pkgs: {}), config , # The `fetchurl' to use for downloading curl and its dependencies @@ -48,7 +48,7 @@ let ../../build-support/setup-hooks/patch-shebangs.sh ../../build-support/setup-hooks/move-sbin.sh ../../build-support/setup-hooks/move-lib64.sh - gcc + cc ]; # Add a utility function to produce derivations that use this @@ -198,7 +198,7 @@ let inherit overrides; - inherit gcc; + inherit cc; } # Propagate any extra attributes. For instance, we use this to diff --git a/pkgs/stdenv/generic/setup.sh b/pkgs/stdenv/generic/setup.sh index 904cc13e06c..1cc60ebf02b 100644 --- a/pkgs/stdenv/generic/setup.sh +++ b/pkgs/stdenv/generic/setup.sh @@ -176,10 +176,11 @@ fi # Check that the pre-hook initialised SHELL. if [ -z "$SHELL" ]; then echo "SHELL not set"; exit 1; fi +BASH="$SHELL" +export CONFIG_SHELL="$SHELL" # Execute the pre-hook. -export CONFIG_SHELL="$SHELL" if [ -z "$shell" ]; then export shell=$SHELL; fi runHook preHook @@ -387,7 +388,7 @@ substituteAll() { local output="$2" # Select all environment variables that start with a lowercase character. - for envVar in $(env | sed "s/^[^a-z].*//" | sed "s/^\([^=]*\)=.*/\1/"); do + for envVar in $(env | sed -e $'s/^\([a-z][^=]*\)=.*/\\1/; t \n d'); do if [ "$NIX_DEBUG" = "1" ]; then echo "$envVar -> ${!envVar}" fi diff --git a/pkgs/stdenv/linux/bootstrap/i686.nix b/pkgs/stdenv/linux/bootstrap/i686.nix index 7b6b3ee8034..e02bb1e83d3 100644 --- a/pkgs/stdenv/linux/bootstrap/i686.nix +++ b/pkgs/stdenv/linux/bootstrap/i686.nix @@ -1,39 +1,12 @@ -let - - fetch = { file, sha256 }: import { - url = "http://tarballs.nixos.org/stdenv-linux/i686/r24519/${file}"; - inherit sha256; +{ + busybox = import { + url = http://tarballs.nixos.org/stdenv-linux/i686/8d66a51a872af1ab58edc68a2ebddcc79958b563/busybox; + sha256 = "9278001d11bb0359d0cc1b30bd5c9823f0b9c65db127d6dfcc1f6bbc000d15a0"; executable = true; }; -in { - sh = fetch { - file = "sh"; - sha256 = "1l6sdhyqjlh4m5gj3pfpi8aisp1m012lpwxfcc4v1x8g429mflmy"; - }; - - bzip2 = fetch { - file = "bzip2"; - sha256 = "1p5nkrdn52jm6rsx8x3wwjpsh83f2qsjl1qckkgnkplwhj23zjp7"; - }; - - mkdir = fetch { - file = "mkdir"; - sha256 = "02ff7i9ph9ahiapsg2v9c3pwr7sl73sk4n7ic112ljkrgwkail33"; - }; - - cpio = fetch { - file = "cpio"; - sha256 = "046if3aqqramyhrn2yxrjf4bfkl8x1bcqxhvi7ml9nrv9smx8irg"; - }; - - curl = fetch { - file = "curl.bz2"; - sha256 = "1v0yfb4gcdyqpl2fxlxjh337r28c23iqm7vwck4p4643xd55di7q"; - }; - - bootstrapTools = { - url = http://tarballs.nixos.org/stdenv-linux/i686/r24519/bootstrap-tools.cpio.bz2; - sha256 = "0imypaxy6piwbk8ff2y1nr7yk49pqmdgdbv6g8miq1zs5yfip6ij"; + bootstrapTools = import { + url = http://tarballs.nixos.org/stdenv-linux/i686/8d66a51a872af1ab58edc68a2ebddcc79958b563/bootstrap-tools.tar.xz; + sha256 = "6bc27ce9b08adcca0298f5fe80fe67f5bbb2dffdd1d8666fd44cb76ace198a25"; }; } diff --git a/pkgs/stdenv/linux/bootstrap/x86_64.nix b/pkgs/stdenv/linux/bootstrap/x86_64.nix index 71961e6961e..df803dae032 100644 --- a/pkgs/stdenv/linux/bootstrap/x86_64.nix +++ b/pkgs/stdenv/linux/bootstrap/x86_64.nix @@ -1,10 +1,9 @@ -# Use the static tools for i686-linux. They work on x86_64-linux -# machines as well. +# Use busybox for i686-linux since it works on x86_64-linux as well. (import ./i686.nix) // { - bootstrapTools = { - url = http://tarballs.nixos.org/stdenv-linux/x86_64/r23302/bootstrap-tools.cpio.bz2; - sha256 = "0w89kqhx47yl0jifp2vffp073pyrqha5f312kp971smi4h41drna"; + bootstrapTools = import { + url = http://tarballs.nixos.org/stdenv-linux/x86_64/8d66a51a872af1ab58edc68a2ebddcc79958b563/bootstrap-tools.tar.xz; + sha256 = "325230b74d3d98f62ddcb595543887d09cd8421745a4eda229d2a87a1f1ed336"; }; } diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix index 76849c2c61a..f68f63975b2 100644 --- a/pkgs/stdenv/linux/default.nix +++ b/pkgs/stdenv/linux/default.nix @@ -40,20 +40,15 @@ rec { bootstrapTools = derivation { name = "bootstrap-tools"; - builder = bootstrapFiles.sh; + builder = bootstrapFiles.busybox; args = if system == "armv5tel-linux" || system == "armv6l-linux" || system == "armv7l-linux" then [ ./scripts/unpack-bootstrap-tools-arm.sh ] - else [ ./scripts/unpack-bootstrap-tools.sh ]; + else [ "ash" "-e" ./scripts/unpack-bootstrap-tools.sh ]; - # FIXME: get rid of curl. - inherit (bootstrapFiles) bzip2 mkdir curl cpio; - - tarball = import { - inherit (bootstrapFiles.bootstrapTools) url sha256; - }; + tarball = bootstrapFiles.bootstrapTools; inherit system; @@ -88,9 +83,9 @@ rec { curl = bootstrapTools; }; - gcc = if isNull gccPlain - then "/no-such-path" - else lib.makeOverridable (import ../../build-support/gcc-wrapper) { + cc = if isNull gccPlain + then "/no-such-path" + else lib.makeOverridable (import ../../build-support/gcc-wrapper) { nativeTools = false; nativeLibc = false; gcc = gccPlain; @@ -237,7 +232,7 @@ rec { gcc = lib.makeOverridable (import ../../build-support/gcc-wrapper) { nativeTools = false; nativeLibc = false; - gcc = stage4.stdenv.gcc.gcc; + gcc = stage4.stdenv.cc.gcc; libc = stage4.pkgs.glibc; inherit (stage4.pkgs) binutils coreutils; name = ""; @@ -272,9 +267,9 @@ rec { extraBuildInputs = [ stage4.pkgs.patchelf stage4.pkgs.paxctl ]; - gcc = stage4.pkgs.gcc; + cc = stage4.pkgs.gcc; - shell = gcc.shell; + shell = cc.shell; inherit (stage4.stdenv) fetchurlBoot; @@ -291,7 +286,7 @@ rec { ]; overrides = pkgs: { - inherit gcc; + inherit cc; inherit (stage4.pkgs) gzip bzip2 xz bash binutils coreutils diffutils findutils gawk glibc gnumake gnused gnutar gnugrep gnupatch patchelf diff --git a/pkgs/stdenv/linux/make-bootstrap-tools.nix b/pkgs/stdenv/linux/make-bootstrap-tools.nix index 9116b222569..767b1f288c0 100644 --- a/pkgs/stdenv/linux/make-bootstrap-tools.nix +++ b/pkgs/stdenv/linux/make-bootstrap-tools.nix @@ -1,4 +1,4 @@ -{system ? builtins.currentSystem}: +{ system ? builtins.currentSystem }: with import ../../top-level/all-packages.nix {inherit system;}; @@ -6,84 +6,32 @@ rec { # We want coreutils without ACL support. - coreutils_ = coreutils.override (args: { + coreutilsMinimal = coreutils.override (args: { aclSupport = false; }); - # bzip2 wants utime.h, a header 'legacy' in uclibc - uclibcForBzip2 = uclibc.override { - extraConfig = '' - UCLIBC_SUSV3_LEGACY y - UCLIBC_SUSV4_LEGACY y - ''; - }; - - gccLinkStatic = wrapGCCWith (import ../../build-support/gcc-wrapper) uclibcForBzip2 - stdenv.gcc.gcc; - stdenvLinkStatic = overrideGCC stdenv gccLinkStatic; - - curlStatic = import ../../tools/networking/curl { - stdenv = stdenvLinkStatic; - inherit fetchurl; + curlMinimal = curl.override { zlibSupport = false; sslSupport = false; - linkStatic = true; + scpSupport = false; }; - - bzip2Static = import ../../tools/compression/bzip2 { - stdenv = stdenvLinkStatic; - inherit fetchurl; - linkStatic = true; - }; - - #gccNoShared = wrapGCC ( gcc.gcc.override { enableShared = false; } ); - - busyboxStaticSh = busybox.override { + busyboxMinimal = busybox.override { + useUclibc = true; + enableStatic = true; + enableMinimal = true; extraConfig = '' - CLEAR - CONFIG_STATIC y - CONFIG_ASH y - CONFIG_BASH_COMPAT y - CONFIG_ASH_ALIAS y - CONFIG_ASH_GETOPTS y - CONFIG_ASH_CMDCMD y - CONFIG_ASH_JOB_CONTROL y CONFIG_ASH_BUILTIN_ECHO y - CONFIG_ASH_BUILTIN_PRINTF y CONFIG_ASH_BUILTIN_TEST y - ''; - }; - - busyboxStaticLn = busybox.override { - extraConfig = '' - CLEAR - CONFIG_STATIC y - CONFIG_LN y - ''; - }; - - busyboxStaticMkdir = busybox.override { - extraConfig = '' - CLEAR - CONFIG_STATIC y + CONFIG_ASH_OPTIMIZE_FOR_SIZE y CONFIG_MKDIR y + CONFIG_TAR y + CONFIG_UNXZ y ''; }; - busyboxStaticCpio = busybox.override { - extraConfig = '' - CLEAR - CONFIG_STATIC y - CONFIG_CPIO y - # (shlevy) Are these necessary? - CONFIG_FEATURE_CPIO_O y - CONFIG_FEATURE_CPIO_P y - ''; - }; - - build = + build = stdenv.mkDerivation { name = "build"; @@ -91,7 +39,7 @@ rec { buildInputs = [nukeReferences cpio]; buildCommand = '' - set -x + set -x mkdir -p $out/bin $out/lib $out/libexec # Copy what we need of Glibc. @@ -104,27 +52,29 @@ rec { cp -d ${glibc}/lib/libpthread*.so* $out/lib cp -d ${glibc}/lib/libnsl*.so* $out/lib cp -d ${glibc}/lib/libutil*.so* $out/lib + cp -d ${glibc}/lib/libnss*.so* $out/lib + cp -d ${glibc}/lib/libresolv*.so* $out/lib cp -d ${glibc}/lib/crt?.o $out/lib - + cp -rL ${glibc}/include $out chmod -R u+w $out/include - + # Hopefully we won't need these. rm -rf $out/include/mtd $out/include/rdma $out/include/sound $out/include/video find $out/include -name .install -exec rm {} \; find $out/include -name ..install.cmd -exec rm {} \; mv $out/include $out/include-glibc - + # Copy coreutils, bash, etc. - cp ${coreutils_}/bin/* $out/bin + cp ${coreutilsMinimal}/bin/* $out/bin (cd $out/bin && rm vdir dir sha*sum pinky factor pathchk runcon shuf who whoami shred users) - + cp ${bash}/bin/bash $out/bin cp ${findutils}/bin/find $out/bin cp ${findutils}/bin/xargs $out/bin cp -d ${diffutils}/bin/* $out/bin cp -d ${gnused}/bin/* $out/bin - cp -d ${gnugrep}/bin/* $out/bin + cp -d ${gnugrep}/bin/grep $out/bin cp ${gawk}/bin/gawk $out/bin cp -d ${gawk}/bin/awk $out/bin cp ${gnutar}/bin/tar $out/bin @@ -133,9 +83,11 @@ rec { cp -d ${gnumake}/bin/* $out/bin cp -d ${patch}/bin/* $out/bin cp ${patchelf}/bin/* $out/bin + cp ${curlMinimal}/bin/curl $out/bin + cp -d ${curlMinimal}/lib/libcurl* $out/lib cp -d ${gnugrep.pcre}/lib/libpcre*.so* $out/lib # needed by grep - + # Copy what we need of GCC. cp -d ${gcc.gcc}/bin/gcc $out/bin cp -d ${gcc.gcc}/bin/cpp $out/bin @@ -151,6 +103,8 @@ rec { rm -rf $out/lib/gcc/*/*/plugin #rm -f $out/lib/gcc/*/*/*.a cp -rd ${gcc.gcc}/libexec/* $out/libexec + chmod -R u+w $out/libexec + rm -rf $out/libexec/gcc/*/*/plugin mkdir $out/include cp -rd ${gcc.gcc}/include/c++ $out/include chmod -R u+w $out/include @@ -159,19 +113,18 @@ rec { cp -d ${gmpxx}/lib/libgmp*.so* $out/lib cp -d ${mpfr}/lib/libmpfr*.so* $out/lib - cp -d ${ppl}/lib/libppl*.so* $out/lib - cp -d ${cloogppl}/lib/libcloog*.so* $out/lib cp -d ${mpc}/lib/libmpc*.so* $out/lib cp -d ${zlib}/lib/libz.so* $out/lib cp -d ${libelf}/lib/libelf.so* $out/lib - + # Copy binutils. for i in as ld ar ranlib nm strip readelf objdump; do cp ${binutils}/bin/$i $out/bin done + cp -d ${binutils}/lib/lib*.so* $out/lib chmod -R u+w $out - + # Strip executables even further. for i in $out/bin/* $out/libexec/gcc/*/*/*; do if test -x $i -a ! -L $i; then @@ -189,19 +142,10 @@ rec { mv $out/.pack $out/pack mkdir $out/on-server - (cd $out/pack && (find | cpio -o -H newc)) | bzip2 > $out/on-server/bootstrap-tools.cpio.bz2 - - mkdir $out/in-nixpkgs - cp ${busyboxStaticSh}/bin/busybox $out/in-nixpkgs/sh - cp ${busyboxStaticCpio}/bin/busybox $out/in-nixpkgs/cpio - cp ${busyboxStaticMkdir}/bin/busybox $out/in-nixpkgs/mkdir - cp ${busyboxStaticLn}/bin/busybox $out/in-nixpkgs/ln - cp ${curlStatic}/bin/curl $out/in-nixpkgs - cp ${bzip2Static}/bin/bzip2 $out/in-nixpkgs - chmod u+w $out/in-nixpkgs/* - strip $out/in-nixpkgs/* - nuke-refs $out/in-nixpkgs/* - bzip2 $out/in-nixpkgs/curl + tar cvfJ $out/on-server/bootstrap-tools.tar.xz -C $out/pack . + cp ${busyboxMinimal}/bin/busybox $out/on-server + chmod u+w $out/on-server/busybox + nuke-refs $out/on-server/busybox ''; # */ # The result should not contain any references (store paths) so @@ -210,22 +154,33 @@ rec { allowedReferences = []; }; - + unpack = - - stdenv.mkDerivation { + + derivation { name = "unpack"; + inherit system; + builder = "${build}/on-server/busybox"; + args = [ "ash" "-e" "-c" "eval \"$buildCommand\"" ]; buildCommand = '' - ${build}/in-nixpkgs/mkdir $out - ${build}/in-nixpkgs/bzip2 -d < ${build}/on-server/bootstrap-tools.cpio.bz2 | (cd $out && ${build}/in-nixpkgs/cpio -v -i) + export PATH=${build}/on-server:$out/bin + + busybox mkdir $out + < ${build}/on-server/bootstrap-tools.tar.xz busybox unxz | busybox tar x -C $out for i in $out/bin/* $out/libexec/gcc/*/*/*; do - echo patching $i - if ! test -L $i; then - LD_LIBRARY_PATH=$out/lib $out/lib/ld-linux*.so.2 \ - $out/bin/patchelf --set-interpreter $out/lib/ld-linux*.so.2 --set-rpath $out/lib --force-rpath $i - fi + if [ -L "$i" ]; then continue; fi + if [ -z "''${i##*/liblto*}" ]; then continue; fi + echo patching "$i" + LD_LIBRARY_PATH=$out/lib $out/lib/ld-linux*.so.2 \ + $out/bin/patchelf --set-interpreter $out/lib/ld-linux*.so.2 --set-rpath $out/lib --force-rpath "$i" + done + + for i in $out/lib/libpcre*; do + if [ -L "$i" ]; then continue; fi + echo patching "$i" + $out/bin/patchelf --set-rpath $out/lib --force-rpath "$i" done # Fix the libc linker script. @@ -241,11 +196,12 @@ rec { test = - stdenv.mkDerivation { + derivation { name = "test"; + inherit system; + builder = "${build}/on-server/busybox"; + args = [ "ash" "-e" "-c" "eval \"$buildCommand\"" ]; - realBuilder = "${unpack}/bin/bash"; - buildCommand = '' export PATH=${unpack}/bin ls -l @@ -259,23 +215,22 @@ rec { awk --version grep --version gcc --version - - ${build}/in-nixpkgs/sh -c 'echo Hello World' + curl --version ldlinux=$(echo ${unpack}/lib/ld-linux*.so.2) export CPP="cpp -idirafter ${unpack}/include-glibc -B${unpack}" export CC="gcc -idirafter ${unpack}/include-glibc -B${unpack} -Wl,-dynamic-linker,$ldlinux -Wl,-rpath,${unpack}/lib" export CXX="g++ -idirafter ${unpack}/include-glibc -B${unpack} -Wl,-dynamic-linker,$ldlinux -Wl,-rpath,${unpack}/lib" - + echo '#include ' >> foo.c echo '#include ' >> foo.c - echo 'int main() { printf("Hello World\n"); return 0; }' >> foo.c + echo 'int main() { printf("Hello World\\n"); return 0; }' >> foo.c $CC -o $out/bin/foo foo.c $out/bin/foo echo '#include ' >> bar.cc - echo 'int main() { std::cout << "Hello World\n"; }' >> bar.cc + echo 'int main() { std::cout << "Hello World\\n"; }' >> bar.cc $CXX -v -o $out/bin/bar bar.cc $out/bin/bar @@ -286,5 +241,5 @@ rec { make install ''; # */ }; - + } diff --git a/pkgs/stdenv/linux/scripts/unpack-bootstrap-tools.sh b/pkgs/stdenv/linux/scripts/unpack-bootstrap-tools.sh index 422dc6dd5fe..52953c9b88d 100644 --- a/pkgs/stdenv/linux/scripts/unpack-bootstrap-tools.sh +++ b/pkgs/stdenv/linux/scripts/unpack-bootstrap-tools.sh @@ -1,9 +1,7 @@ -set -e - # Unpack the bootstrap tools tarball. echo Unpacking the bootstrap tools... -$mkdir $out -$bzip2 -d < $tarball | (cd $out && $cpio -i) +$builder mkdir $out +< $tarball $builder unxz | $builder tar x -C $out # Set the ELF interpreter / RPATH in the bootstrap binaries. echo Patching the bootstrap tools... @@ -21,32 +19,17 @@ fi LD_LIBRARY_PATH=$out/lib $LD_BINARY $out/bin/cp $out/bin/patchelf . for i in $out/bin/* $out/libexec/gcc/*/*/*; do - echo patching $i - if ! test -L $i; then - LD_LIBRARY_PATH=$out/lib $LD_BINARY \ - $out/bin/patchelf --set-interpreter $LD_BINARY --set-rpath $out/lib --force-rpath $i - LD_LIBRARY_PATH=$out/lib $LD_BINARY \ - $out/bin/patchelf --set-interpreter $LD_BINARY --set-rpath $out/lib --force-rpath $i - fi -done -for i in $out/lib/librt* ; do - echo patching $i - if ! test -L $i; then - LD_LIBRARY_PATH=$out/lib $LD_BINARY \ - $out/bin/patchelf --set-interpreter $LD_BINARY --set-rpath $out/lib --force-rpath $i - LD_LIBRARY_PATH=$out/lib $LD_BINARY \ - $out/bin/patchelf --set-interpreter $LD_BINARY --set-rpath $out/lib --force-rpath $i - fi + if [ -L "$i" ]; then continue; fi + if [ -z "${i##*/liblto*}" ]; then continue; fi + echo patching "$i" + LD_LIBRARY_PATH=$out/lib $out/lib/ld-linux*.so.2 \ + $out/bin/patchelf --set-interpreter $LD_BINARY --set-rpath $out/lib --force-rpath "$i" done -for i in $out/lib/libgmp* $out/lib/libppl* $out/lib/libcloog* $out/lib/libmpc* $out/lib/libpcre* $out/lib/libstdc++*.so.*[0-9]; do - echo trying to patch $i - if test -f $i -a ! -L $i; then - LD_LIBRARY_PATH=$out/lib $LD_BINARY \ - $out/bin/patchelf --set-rpath $out/lib --force-rpath $i - LD_LIBRARY_PATH=$out/lib $LD_BINARY \ - $out/bin/patchelf --set-rpath $out/lib --force-rpath $i - fi +for i in $out/lib/libpcre*; do + if [ -L "$i" ]; then continue; fi + echo patching "$i" + $out/bin/patchelf --set-rpath $out/lib --force-rpath "$i" done # Fix the libc linker script. @@ -60,13 +43,21 @@ mv $out/lib/libpthread.so.tmp $out/lib/libpthread.so ln -s bash $out/bin/sh ln -s bzip2 $out/bin/bunzip2 -# Mimic the gunzip script as in gzip installations +# Provide a gunzip script. cat > $out/bin/gunzip < $out/bin/curl -chmod +x $out/bin/curl +# Provide fgrep/egrep. +echo "#! $out/bin/sh" > $out/bin/egrep +echo "exec $out/bin/grep -E \"\$@\"" >> $out/bin/egrep +echo "#! $out/bin/sh" > $out/bin/fgrep +echo "exec $out/bin/grep -F \"\$@\"" >> $out/bin/fgrep + +# Provide xz (actually only xz -d will work). +echo "#! $out/bin/sh" > $out/bin/xz +echo "exec $builder unxz \"\$@\"" >> $out/bin/xz + +chmod +x $out/bin/egrep $out/bin/fgrep $out/bin/xz diff --git a/pkgs/stdenv/native/default.nix b/pkgs/stdenv/native/default.nix index 213f844365e..45c8ebb7021 100644 --- a/pkgs/stdenv/native/default.nix +++ b/pkgs/stdenv/native/default.nix @@ -73,7 +73,7 @@ rec { # A function that builds a "native" stdenv (one that uses tools in # /usr etc.). makeStdenv = - { gcc, fetchurl, extraPath ? [], overrides ? (pkgs: { }) }: + { cc, fetchurl, extraPath ? [], overrides ? (pkgs: { }) }: import ../generic { preHook = @@ -88,17 +88,17 @@ rec { fetchurlBoot = fetchurl; - inherit system shell gcc overrides config; + inherit system shell cc overrides config; }; stdenvBoot0 = makeStdenv { - gcc = "/no-such-path"; + cc = "/no-such-path"; fetchurl = null; }; - gcc = import ../../build-support/gcc-wrapper { + cc = import ../../build-support/gcc-wrapper { name = "gcc-native"; nativeTools = true; nativeLibc = true; @@ -116,7 +116,7 @@ rec { # First build a stdenv based only on tools outside the store. stdenvBoot1 = makeStdenv { - inherit gcc fetchurl; + inherit cc fetchurl; } // {inherit fetchurl;}; stdenvBoot1Pkgs = allPackages { @@ -129,7 +129,7 @@ rec { # systems don't have, so we mustn't rely on the native environment # providing it). stdenvBoot2 = makeStdenv { - inherit gcc fetchurl; + inherit cc fetchurl; extraPath = [ stdenvBoot1Pkgs.xz ]; overrides = pkgs: { inherit (stdenvBoot1Pkgs) xz; }; }; diff --git a/pkgs/tools/X11/primus/default.nix b/pkgs/tools/X11/primus/default.nix index f457d25fe1b..684713bebb1 100644 --- a/pkgs/tools/X11/primus/default.nix +++ b/pkgs/tools/X11/primus/default.nix @@ -35,6 +35,6 @@ stdenv.mkDerivation { meta = { homepage = https://github.com/amonakov/primus; description = "Faster OpenGL offloading for Bumblebee"; - maintainer = maintainers.coconnor; + maintainers = maintainers.coconnor; }; } diff --git a/pkgs/tools/X11/vdpauinfo/default.nix b/pkgs/tools/X11/vdpauinfo/default.nix index 0b1d889d700..2332cd1bc51 100644 --- a/pkgs/tools/X11/vdpauinfo/default.nix +++ b/pkgs/tools/X11/vdpauinfo/default.nix @@ -1,18 +1,20 @@ { stdenv, fetchurl, pkgconfig, xlibs, libvdpau }: stdenv.mkDerivation rec { - name = "vdpauinfo-0.1"; + name = "vdpauinfo-0.9"; src = fetchurl { url = "http://people.freedesktop.org/~aplattner/vdpau/${name}.tar.gz"; - sha256 = "17q1spsrd5i4jzhpacbs0bb4blf74j8s45rpg0znyc1yjfk5dj5h"; + sha256 = "1qy84clsz3l3hvhaxw01rl4bjqlsaml5l63rc43vck6vh8vgwh50"; }; - buildInputs = [ pkgconfig xlibs.libX11 libvdpau ]; + buildInputs = [ pkgconfig libvdpau ]; - meta = { + meta = with stdenv.lib; { homepage = http://people.freedesktop.org/~aplattner/vdpau/; description = "Tool to query the Video Decode and Presentation API for Unix (VDPAU) abilities of the system"; - license = "bsd"; + license = licenses.mit; # expat version + platforms = platforms.unix; + maintainers = [ maintainers.vcunat ]; }; } diff --git a/pkgs/tools/X11/xdotool/default.nix b/pkgs/tools/X11/xdotool/default.nix index 9224c3b2d9c..2eeb61dfaf4 100644 --- a/pkgs/tools/X11/xdotool/default.nix +++ b/pkgs/tools/X11/xdotool/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { meta = { homepage = http://www.semicomplete.com/projects/xdotool/; description = "Fake keyboard/mouse input, window management, and more"; - license = "BSD"; + license = stdenv.lib.licenses.bsd3; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/tools/admin/awscli/default.nix b/pkgs/tools/admin/awscli/default.nix index 9b9ae350d2c..334e7f6ce1d 100644 --- a/pkgs/tools/admin/awscli/default.nix +++ b/pkgs/tools/admin/awscli/default.nix @@ -2,15 +2,15 @@ pythonPackages.buildPythonPackage rec { name = "awscli-${version}"; - version = "1.5.5"; + version = "1.6.10"; namePrefix = ""; src = fetchurl { url = "https://github.com/aws/aws-cli/archive/${version}.tar.gz"; - sha256 = "1xqaav4g07jzv8i4hkf52dimgmc0zv0fj9rbvz5kiln8470qzifw"; + sha256 = "1g25yqxpcjrwjiibwgjrlqdyx6hpdlcb6zr2s05w592gr9gpbwpm"; }; - propagatedBuildInputs = [ + propagatedBuildInputs = [ pythonPackages.botocore pythonPackages.bcdoc pythonPackages.six @@ -19,4 +19,11 @@ pythonPackages.buildPythonPackage rec { pythonPackages.rsa pythonPackages.pyasn1 ]; + + meta = { + homepage = https://aws.amazon.com/cli/; + description = "Unified tool to manage your AWS services"; + license = stdenv.lib.licenses.asl20; + maintainers = with stdenv.lib.maintainers; [ muflax ]; + }; } diff --git a/pkgs/tools/admin/tightvnc/default.nix b/pkgs/tools/admin/tightvnc/default.nix index 407242cf2d9..396b3bb88ab 100644 --- a/pkgs/tools/admin/tightvnc/default.nix +++ b/pkgs/tools/admin/tightvnc/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation { # for the builder script inherit xauth fontDirectories perl; - gcc = stdenv.gcc.gcc; + gcc = stdenv.cc.gcc; buildInputs = [x11 zlib libjpeg imake gccmakedep libXmu libXaw libXpm libXp xauth]; builder = ./builder.sh; diff --git a/pkgs/tools/archivers/cpio/default.nix b/pkgs/tools/archivers/cpio/default.nix index 2f3a1b97487..0bfa81cb947 100644 --- a/pkgs/tools/archivers/cpio/default.nix +++ b/pkgs/tools/archivers/cpio/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl}: +{ stdenv, fetchurl, fetchpatch }: stdenv.mkDerivation { name = "cpio-2.11"; @@ -8,7 +8,15 @@ stdenv.mkDerivation { sha256 = "bb820bfd96e74fc6ce43104f06fe733178517e7f5d1cdee553773e8eff7d5bbd"; }; - patches = [ ./no-gets.patch ] ++ stdenv.lib.optional stdenv.isDarwin ./darwin-fix.patch; + patches = [ + ./no-gets.patch + (fetchpatch { + name = "CVE-2014-9112.diff"; + url = "http://pkgs.fedoraproject.org/cgit/cpio.git/plain/cpio-2.11" + + "-CVE-2014-9112.patch?h=f21&id=b475b4d6f31c95e073edc95c742a33a39ef4ec95"; + sha256 = "0c9yrysvpwbmiq7ph84dk6mv46hddiyvkgya1zsmj76n9ypb1b4i"; + }) + ] ++ stdenv.lib.optional stdenv.isDarwin ./darwin-fix.patch; meta = { homepage = http://www.gnu.org/software/cpio/; diff --git a/pkgs/tools/archivers/sharutils/default.nix b/pkgs/tools/archivers/sharutils/default.nix index 281a148a5ca..0d56e79d024 100644 --- a/pkgs/tools/archivers/sharutils/default.nix +++ b/pkgs/tools/archivers/sharutils/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { '' # Fix for building on Glibc 2.16. Won't be needed once the # gnulib in sharutils is updated. - sed -i ${stdenv.lib.optionalString (stdenv.isBSD && stdenv.gcc.nativeTools) "''"} '/gets is a security hole/d' lib/stdio.in.h + sed -i ${stdenv.lib.optionalString (stdenv.isBSD && stdenv.cc.nativeTools) "''"} '/gets is a security hole/d' lib/stdio.in.h ''; # GNU Gettext is needed on non-GNU platforms. diff --git a/pkgs/tools/archivers/unrar/default.nix b/pkgs/tools/archivers/unrar/default.nix index 9ef93a30b68..1d11a8ab478 100644 --- a/pkgs/tools/archivers/unrar/default.nix +++ b/pkgs/tools/archivers/unrar/default.nix @@ -11,6 +11,10 @@ stdenv.mkDerivation { sha256 = "13ida8vcamiagl40d9yfjma9k6givxczhx278f1p7bv9wgb8gfmc"; }; + preBuild = '' + export buildFlags="CXX=$CXX" + ''; + installPhase = '' installBin unrar diff --git a/pkgs/tools/archivers/zpaq/default.nix b/pkgs/tools/archivers/zpaq/default.nix index 1ed5866a692..f1338e9ecb5 100644 --- a/pkgs/tools/archivers/zpaq/default.nix +++ b/pkgs/tools/archivers/zpaq/default.nix @@ -3,11 +3,11 @@ let s = # Generated upstream information rec { baseName="zpaq"; - version="655"; + version="660"; name="${baseName}-${version}"; - hash="09wjss6vbziwvfmcngb64xd2yih79z1ypgrn4ni7ag8cifx9257c"; - url="http://mattmahoney.net/dc/zpaq655.zip"; - sha256="09wjss6vbziwvfmcngb64xd2yih79z1ypgrn4ni7ag8cifx9257c"; + hash="1p6b56zf676bkfc20lxhjh9bsgh92z6bln7b0kxibh8s8aa7vzjq"; + url="http://mattmahoney.net/dc/zpaq660.zip"; + sha256="1p6b56zf676bkfc20lxhjh9bsgh92z6bln7b0kxibh8s8aa7vzjq"; }; buildInputs = [ unzip @@ -29,14 +29,14 @@ stdenv.mkDerivation { }; sourceRoot = "."; buildPhase = '' - g++ -shared -O3 libzpaq.cpp ${compileFlags} -o libzpaq.so - g++ -O3 -L. -L"$out/lib" -lzpaq divsufsort.c zpaq.cpp -o zpaq + g++ -O3 -march=native -Dunix libzpaq.cpp -pthread --shared -o libzpaq.so -fPIC + g++ -O3 -march=native -Dunix zpaq.cpp -lzpaq -L. -L"$out/lib" -pthread -o zpaq ''; installPhase = '' mkdir -p "$out"/{bin,include,lib,share/doc/zpaq} cp libzpaq.so "$out/lib" cp zpaq "$out/bin" - cp libzpaq.h divsufsort.h "$out/include" + cp libzpaq.h "$out/include" cp readme.txt "$out/share/doc/zpaq" ''; meta = { diff --git a/pkgs/tools/audio/pasystray/default.nix b/pkgs/tools/audio/pasystray/default.nix index 500c8add4c6..42a2c9c3a12 100644 --- a/pkgs/tools/audio/pasystray/default.nix +++ b/pkgs/tools/audio/pasystray/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, unzip, autoconf, automake, pkgconfig, gnome_icon_theme, avahi, gtk3, libnotify, pulseaudio, x11}: +{stdenv, fetchurl, unzip, autoconf, automake, makeWrapper, pkgconfig, gnome_icon_theme, avahi, gtk3, libnotify, pulseaudio, x11}: stdenv.mkDerivation rec { name = "pasystray-0.4.0"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "1gpb7yqcxqglv50iqbkg2lg3r0z07jm4ir2zqmvns6sgddks590w"; }; - buildInputs = [ unzip autoconf automake pkgconfig gnome_icon_theme avahi gtk3 libnotify pulseaudio x11 ]; + buildInputs = [ unzip autoconf automake makeWrapper pkgconfig gnome_icon_theme avahi gtk3 libnotify pulseaudio x11 ]; preConfigure = '' aclocal @@ -17,6 +17,11 @@ stdenv.mkDerivation rec { automake --add-missing ''; + preFixup = '' + wrapProgram "$out/bin/pasystray" \ + --prefix XDG_DATA_DIRS : "${gnome_icon_theme}/share:$GSETTINGS_SCHEMAS_PATH" + ''; + meta = with stdenv.lib; { description = "PulseAudio system tray"; homepage = "https://github.com/christophgysin/pasystray"; diff --git a/pkgs/tools/backup/attic/default.nix b/pkgs/tools/backup/attic/default.nix new file mode 100644 index 00000000000..99190021e23 --- /dev/null +++ b/pkgs/tools/backup/attic/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchzip, python3Packages, openssl, acl }: + +python3Packages.buildPythonPackage rec { + name = "attic-0.14"; + namePrefix = ""; + + src = fetchzip { + url = "https://github.com/jborg/attic/archive/0.14.tar.gz"; + sha256 = "17y7kihykaf84sy9cm00fn4wcc7rnhv2792kcwplylz7dsm7ksiw"; + }; + + propagatedBuildInputs = with python3Packages; + [ cython msgpack openssl acl ]; + + preConfigure = '' + export ATTIC_OPENSSL_PREFIX="${openssl}" + ''; + + meta = with stdenv.lib; { + description = "A deduplication backup program"; + homepage = "https://attic-backup.org"; + license = licenses.bsd3; + maintainers = [ maintainers.wscott ]; + platforms = platforms.unix; # Darwin and FreeBSD mentioned on homepage + }; +} diff --git a/pkgs/tools/backup/bareos/default.nix b/pkgs/tools/backup/bareos/default.nix index 5ac59327c4b..ed94d8037fd 100644 --- a/pkgs/tools/backup/bareos/default.nix +++ b/pkgs/tools/backup/bareos/default.nix @@ -9,12 +9,12 @@ assert sqlite != null || postgresql != null || mysql != null; with stdenv.lib; stdenv.mkDerivation rec { name = "bareos-${version}"; - version = "14.2.1"; + version = "14.2.2"; src = fetchgit { url = "git://github.com/bareos/bareos"; rev = "refs/tags/Release/${version}"; - sha256 = "0m7v1szi45m71zjhj3inn5hh9f4529slhiihm88rfw8006aqb6ly"; + sha256 = "05mkhhgnkz6y3m5msf1zq3b63k2l2fci9xg0k9347b3shmg61pqd"; }; buildInputs = [ diff --git a/pkgs/tools/backup/bup/default.nix b/pkgs/tools/backup/bup/default.nix index d1748cc252e..1964f01b077 100644 --- a/pkgs/tools/backup/bup/default.nix +++ b/pkgs/tools/backup/bup/default.nix @@ -1,30 +1,26 @@ -{ stdenv, fetchgit, python, pyxattr, pylibacl, setuptools, fuse, git, perl, pandoc, makeWrapper +{ stdenv, fetchzip, python, pyxattr, pylibacl, setuptools, fuse, git, perl, pandoc, makeWrapper , par2cmdline, par2Support ? false }: assert par2Support -> par2cmdline != null; -let rev = "96c6fa2a70425fff1e73d2e0945f8e242411ab58"; in +let version = "0.26"; in with stdenv.lib; stdenv.mkDerivation { - name = "bup-0.25-rc1-107-${stdenv.lib.strings.substring 0 7 rev}"; + name = "bup-${version}"; - src = fetchgit { - url = "https://github.com/bup/bup.git"; - inherit rev; - sha256 = "0d9hgyh1g5qcpdvnqv3a5zy67x79yx9qx557rxrnxyzqckp9v75n"; + src = fetchzip { + url = "https://github.com/bup/bup/archive/${version}.tar.gz"; + sha256 = "0g7b0xl3kg0z6rn81fvzl1xnvva305i7pjih2hm68mcj0adk3v0d"; }; buildInputs = [ python git ]; nativeBuildInputs = [ pandoc perl makeWrapper ]; patchPhase = '' + patchShebangs . substituteInPlace Makefile --replace "-Werror" "" - for f in "cmd/"* "lib/tornado/"* "lib/tornado/test/"* "t/"* wvtest.py main.py; do - test -f $f || continue - substituteInPlace $f --replace "/usr/bin/env python" "${python}/bin/python" - done substituteInPlace Makefile --replace "./format-subst.pl" "perl ./format-subst.pl" '' + optionalString par2Support '' substituteInPlace cmd/fsck-cmd.py --replace "['par2'" "['${par2cmdline}/bin/par2'" @@ -56,5 +52,7 @@ stdenv.mkDerivation { ''; hydraPlatforms = stdenv.lib.platforms.linux; + maintainers = with stdenv.lib.maintainers; [ muflax ]; + }; } diff --git a/pkgs/tools/compression/bzip2/default.nix b/pkgs/tools/compression/bzip2/default.nix index 256f574c2e0..74da91431a4 100644 --- a/pkgs/tools/compression/bzip2/default.nix +++ b/pkgs/tools/compression/bzip2/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation { }; sharedLibrary = - !stdenv.isDarwin && !(stdenv ? isDietLibC) && !(stdenv ? isStatic) && stdenv.system != "i686-cygwin" && !linkStatic; + !stdenv.isDarwin && !(stdenv ? isStatic) && stdenv.system != "i686-cygwin" && !linkStatic; patchPhase = stdenv.lib.optionalString stdenv.isDarwin "substituteInPlace Makefile --replace 'CC=gcc' 'CC=clang'"; diff --git a/pkgs/tools/filesystems/btrfsprogs/3.16.nix b/pkgs/tools/filesystems/btrfsprogs/3.16.nix deleted file mode 100644 index e1d4b8bd31c..00000000000 --- a/pkgs/tools/filesystems/btrfsprogs/3.16.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ stdenv, fetchurl, attr, acl, zlib, libuuid, e2fsprogs, lzo -, asciidoc, xmlto, docbook_xml_dtd_45, docbook_xsl, libxslt }: - -let version = "3.16"; in - -stdenv.mkDerivation rec { - name = "btrfs-progs-${version}"; - - src = fetchurl { - url = "mirror://kernel/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v${version}.tar.xz"; - sha256 = "0phbrgipl04q8cdj9nnshik7b6p2bg51jxb3l1gvfc04dkgm2xls"; - }; - - buildInputs = [ - attr acl zlib libuuid e2fsprogs lzo - asciidoc xmlto docbook_xml_dtd_45 docbook_xsl libxslt - ]; - - # for btrfs to get the rpath to libgcc_s, needed for pthread_cancel to work - NIX_CFLAGS_LINK = "-lgcc_s"; - - makeFlags = "prefix=$(out)"; - - meta = with stdenv.lib; { - description = "Utilities for the btrfs filesystem"; - homepage = https://btrfs.wiki.kernel.org/; - license = licenses.gpl2; - maintainers = with maintainers; [ raskin wkennington ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/tools/filesystems/btrfsprogs/default.nix b/pkgs/tools/filesystems/btrfsprogs/default.nix index 2fa81510243..0a07ad8c154 100644 --- a/pkgs/tools/filesystems/btrfsprogs/default.nix +++ b/pkgs/tools/filesystems/btrfsprogs/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, attr, acl, zlib, libuuid, e2fsprogs, lzo , asciidoc, xmlto, docbook_xml_dtd_45, docbook_xsl, libxslt }: -let version = "3.17.2"; in +let version = "3.17.3"; in stdenv.mkDerivation rec { name = "btrfs-progs-${version}"; src = fetchurl { url = "mirror://kernel/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v${version}.tar.xz"; - sha256 = "1ijn8kd13hliqph9vijfl9zzvnkb6d6i7fqggbiwjvhslhjcgv2h"; + sha256 = "0b5cvp8qk569r73003s2wisws6s8zlbmq9d1sdrmjlavv7w9zgg7"; }; buildInputs = [ diff --git a/pkgs/tools/filesystems/ceph/default.nix b/pkgs/tools/filesystems/ceph/default.nix index 76e7b8eaea0..93352e4d129 100644 --- a/pkgs/tools/filesystems/ceph/default.nix +++ b/pkgs/tools/filesystems/ceph/default.nix @@ -14,12 +14,12 @@ let in stdenv.mkDerivation rec { name="ceph-${version}"; - version="0.88"; + version="0.90"; src = fetchgit { url = "git://github.com/ceph/ceph.git"; rev = "refs/tags/v${version}"; - sha256 = "1wf77mlx94h2mn75qqgb37xbdagl7zh0b579qh7gc1z4wcb8b8h0"; + sha256 = "17w06qw38cxmin30ssz981hkkpnh5kp7f8xpnwga7rb7fhi8w6ia"; }; patches = [ diff --git a/pkgs/tools/filesystems/duff/default.nix b/pkgs/tools/filesystems/duff/default.nix new file mode 100644 index 00000000000..d0667da7f60 --- /dev/null +++ b/pkgs/tools/filesystems/duff/default.nix @@ -0,0 +1,40 @@ +{ stdenv, fetchurl, autoconf, automake, gettext }: + +stdenv.mkDerivation rec { + name = "duff-${version}"; + version = "0.5.2"; + + src = fetchurl { + url = "https://github.com/elmindreda/duff/archive/${version}.tar.gz"; + sha256 = "149dd80f9758085ed199c37aa32ad869409fa5e2c8da8a51294bd64ca886e058"; + }; + + buildInputs = [ autoconf automake gettext ]; + + preConfigure = '' + # duff is currently badly packaged, requiring us to do extra work here that + # should be done upstream. If that is ever fixed, this entire phase can be + # removed along with all buildInputs. + + # gettexttize rightly refuses to run non-interactively: + cp ${gettext}/bin/gettextize . + substituteInPlace gettextize \ + --replace "read dummy" "echo (Automatically acknowledged)" + ./gettextize + sed 's@po/Makefile.in\( .*\)po/Makefile.in@po/Makefile.in \1@' \ + -i configure.ac + autoreconf -i + ''; + + meta = with stdenv.lib; { + description = "Quickly find duplicate files."; + homepage = http://duff.dreda.org/; + license = with licenses; zlib; + longDescription = '' + Duff is a Unix command-line utility for quickly finding duplicates in + a given set of files. + ''; + maintainers = with maintainers; [ nckx ]; + platforms = with platforms; all; + }; +} diff --git a/pkgs/tools/filesystems/fatsort/default.nix b/pkgs/tools/filesystems/fatsort/default.nix new file mode 100644 index 00000000000..3e483a29364 --- /dev/null +++ b/pkgs/tools/filesystems/fatsort/default.nix @@ -0,0 +1,20 @@ +{stdenv, fetchurl, help2man}: + +stdenv.mkDerivation { + name = "fatsort"; + src = fetchurl { + url = mirror://sourceforge/fatsort/fatsort-1.3.365.tar.gz; + sha256 = "0g9zn2ns86g7zmy0y8hw1w1zhnd51hy8yl6kflyhxs49n5sc7b3p"; + }; + + patches = [ ./fatsort-Makefiles.patch ]; + + buildInputs = [ help2man ]; + + meta = { + homepage = http://fatsort.sourceforge.net/; + description = "Sorts FAT partition table, for devices that don't do sorting of files."; + maintainers = [ stdenv.lib.maintainers.kovirobi ]; + license = stdenv.lib.licenses.gpl2; + }; +} diff --git a/pkgs/tools/filesystems/fatsort/fatsort-Makefiles.patch b/pkgs/tools/filesystems/fatsort/fatsort-Makefiles.patch new file mode 100644 index 00000000000..9c9f58e97ab --- /dev/null +++ b/pkgs/tools/filesystems/fatsort/fatsort-Makefiles.patch @@ -0,0 +1,31 @@ +diff -uNr fatsort-1.3.365-a/Makefile fatsort-1.3.365-b/Makefile +--- fatsort-1.3.365-a/Makefile 2014-04-08 19:19:36.000000000 +0100 ++++ fatsort-1.3.365-b/Makefile 2014-12-14 18:31:55.982857720 +0000 +@@ -1,4 +1,5 @@ +-MANDIR=/usr/local/share/man/man1 ++PREFIX=$(out) ++MANDIR=$(PREFIX)/share/man/man1 + + INSTALL_FLAGS=-m 0755 -p -D + +diff -uNr fatsort-1.3.365-a/src/Makefile fatsort-1.3.365-b/src/Makefile +--- fatsort-1.3.365-a/src/Makefile 2014-04-08 19:19:36.000000000 +0100 ++++ fatsort-1.3.365-b/src/Makefile 2014-12-14 18:32:08.282870461 +0000 +@@ -1,3 +1,5 @@ ++PREFIX=$(out) ++ + CC=gcc + LD=gcc + +@@ -33,9 +35,9 @@ + + # Mac OS X does not have a "/usr/local/sbin" + ifeq ($(UNAME),Darwin) +-SBINDIR=/usr/local/bin ++SBINDIR=$(PREFIX)/bin + else +-SBINDIR=/usr/local/sbin ++SBINDIR=$(PREFIX)/sbin + endif + + OBJ=fatsort.o FAT_fs.o fileio.o endianness.o signal.o entrylist.o errors.o options.o clusterchain.o sort.o misc.o natstrcmp.o stringlist.o diff --git a/pkgs/tools/filesystems/glusterfs/default.nix b/pkgs/tools/filesystems/glusterfs/default.nix index a101958d828..28f14a9fe78 100644 --- a/pkgs/tools/filesystems/glusterfs/default.nix +++ b/pkgs/tools/filesystems/glusterfs/default.nix @@ -4,11 +4,11 @@ let s = # Generated upstream information rec { baseName="glusterfs"; - version="3.6.0"; + version="3.6.1"; name="${baseName}-${version}"; - hash="1c4lscqc5kvn5yj5pspvml59n1czspfqqdwhz73hbjd5lbqak9ml"; - url="http://download.gluster.org/pub/gluster/glusterfs/3.6/3.6.0/glusterfs-3.6.0.tar.gz"; - sha256="1c4lscqc5kvn5yj5pspvml59n1czspfqqdwhz73hbjd5lbqak9ml"; + hash="1p16h5l3bg463l2zhw0rrbfdbkjnykssjmpwzlplsbq38aqqzcnh"; + url="http://download.gluster.org/pub/gluster/glusterfs/3.6/3.6.1/glusterfs-3.6.1.tar.gz"; + sha256="1p16h5l3bg463l2zhw0rrbfdbkjnykssjmpwzlplsbq38aqqzcnh"; }; buildInputs = [ fuse bison flex_2_5_35 openssl python ncurses readline @@ -19,12 +19,17 @@ stdenv.mkDerivation rec { inherit (s) name version; inherit buildInputs; + preConfigure = '' ./autogen.sh ''; + configureFlags = [ - ''--with-mountutildir="$out/sbin"'' + ''--with-mountutildir="$out/sbin" --localstatedir=/var'' ]; + + makeFlags = "DESTDIR=$(out)"; + preInstall = '' substituteInPlace api/examples/Makefile --replace '$(DESTDIR)' $out substituteInPlace geo-replication/syncdaemon/Makefile --replace '$(DESTDIR)' $out @@ -32,6 +37,12 @@ rec { substituteInPlace xlators/features/glupy/examples/Makefile --replace '$(DESTDIR)' $out substituteInPlace xlators/features/glupy/src/Makefile --replace '$(DESTDIR)' $out ''; + + postInstall = '' + cp -r $out/$out/* $out + rm -r $out/nix + ''; + src = fetchurl { inherit (s) url sha256; }; diff --git a/pkgs/tools/filesystems/squashfs/default.nix b/pkgs/tools/filesystems/squashfs/default.nix index a016627b7a4..5e1700af017 100644 --- a/pkgs/tools/filesystems/squashfs/default.nix +++ b/pkgs/tools/filesystems/squashfs/default.nix @@ -12,8 +12,6 @@ stdenv.mkDerivation rec { buildInputs = [ zlib xz ]; preBuild = "cd squashfs-tools"; - - NIX_LDFLAGS = "-lgcc_s"; # for pthread_cancel installFlags = "INSTALL_DIR=\${out}/bin"; diff --git a/pkgs/tools/filesystems/tmsu/default.nix b/pkgs/tools/filesystems/tmsu/default.nix new file mode 100644 index 00000000000..01d2f86a3a9 --- /dev/null +++ b/pkgs/tools/filesystems/tmsu/default.nix @@ -0,0 +1,59 @@ +{ stdenv, fetchgit, fetchFromGitHub, go, fuse }: + +stdenv.mkDerivation rec { + name = "tmsu-${version}"; + version = "0.4.3"; + + go-sqlite3 = fetchgit { + url = "git://github.com/mattn/go-sqlite3"; + rev = "c9a0db5d8951646743317f0756da0339fe144dd5"; + sha256 = "0j01nr3q89qs9n9zzp8gsr94hl9v0gnis6hmndl9ms554bhlv99p"; + }; + + go-fuse = fetchgit { + url = "git://github.com/hanwen/go-fuse"; + rev = "8c85ded140ac1889372a0e22d8d21e3d10a303bd"; + sha256 = "1kssndvrbcxvf85x6c6lgn5kpcl7d788z3sxrv1szik4acb6n2sa"; + }; + + src = fetchFromGitHub { + owner = "oniony"; + repo = "tmsu"; + rev = "v${version}"; + sha256 = "1jwmzqn3rd59malkp7ypjphd863afablhfsdxjnlap7zx72zb3dn"; + }; + + buildInputs = [ go fuse ]; + + preBuild = '' + mkdir -p src/github.com/mattn/go-sqlite3/ + ln -s ${go-sqlite3}/* src/github.com/mattn/go-sqlite3 + + mkdir -p src/github.com/hanwen/go-fuse + ln -s ${go-fuse}/* src/github.com/hanwen/go-fuse + + mkdir -p src/github.com/oniony/tmsu + ln -s ${src}/* src/github.com/oniony/tmsu + + export GOPATH=$PWD + ''; + + installPhase = '' + mkdir -p $out/bin + mkdir -p $out/sbin + mkdir -p $out/share/man + mkdir -p $out/share/zsh/site-functions + make install INSTALL_DIR=$out/bin \ + MOUNT_INSTALL_DIR=$out/sbin \ + MAN_INSTALL_DIR=$out/share/man \ + ZSH_COMP_INSTALL_DIR=$out/share/zsh/site-functions + ''; + + meta = with stdenv.lib; { + homepage = http://www.tmsu.org; + description = "A tool for tagging your files using a virtual filesystem"; + maintainers = with maintainers; [ pSub ]; + license = licenses.gpl3; + platforms = platforms.all; + }; +} \ No newline at end of file diff --git a/pkgs/tools/filesystems/xfsprogs/default.nix b/pkgs/tools/filesystems/xfsprogs/default.nix index 019f2178204..c01fc6ff4b3 100644 --- a/pkgs/tools/filesystems/xfsprogs/default.nix +++ b/pkgs/tools/filesystems/xfsprogs/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, gettext, libuuid, readline }: stdenv.mkDerivation rec { - name = "xfsprogs-3.2.1"; + name = "xfsprogs-3.2.2"; src = fetchurl { urls = map (dir: "ftp://oss.sgi.com/projects/xfs/${dir}/${name}.tar.gz") [ "cmd_tars" "previous" ]; - sha256 = "0rsp31qrz0wskr70dwzl5ignkac7j98j7m9cy6wl57zy716fmy43"; + sha256 = "1aszsqz7gkqdagads18ybslbfkyxq893rykmsz9lm7f33pi5qlhs"; }; prePatch = '' @@ -21,8 +21,8 @@ stdenv.mkDerivation rec { ''; patches = [ - # This patch fixes shared libs installation, still not fixed in 3.2.1 - ./xfsprogs-3.1.11-sharelibs.patch + # This patch fixes shared libs installation, still not fixed in 3.2.2 + ./xfsprogs-3.2.2-sharedlibs.patch ]; buildInputs = [ gettext libuuid readline ]; diff --git a/pkgs/tools/filesystems/xfsprogs/xfsprogs-3.1.11-sharelibs.patch b/pkgs/tools/filesystems/xfsprogs/xfsprogs-3.2.2-sharedlibs.patch similarity index 63% rename from pkgs/tools/filesystems/xfsprogs/xfsprogs-3.1.11-sharelibs.patch rename to pkgs/tools/filesystems/xfsprogs/xfsprogs-3.2.2-sharedlibs.patch index 38599bd651f..118874a5e99 100644 --- a/pkgs/tools/filesystems/xfsprogs/xfsprogs-3.1.11-sharelibs.patch +++ b/pkgs/tools/filesystems/xfsprogs/xfsprogs-3.2.2-sharedlibs.patch @@ -2,9 +2,33 @@ use libtool to do all installing. do not use the manual file install as that'll copy files directly from the .libs/ subdir which might have rpaths that we do not want. ---- a/libdisk/Makefile -+++ b/libdisk/Makefile -@@ -25,6 +25,7 @@ +--- xfsprogs-3.2.2/include/buildmacros ++++ xfsprogs-3.2.2/include/buildmacros +@@ -70,18 +70,9 @@ + # /usr/lib. + ifeq ($(ENABLE_SHARED),yes) + INSTALL_LTLIB_DEV = \ +- cd $(TOPDIR)/$(LIBNAME)/.libs; \ +- ../$(INSTALL) -m 755 -d $(PKG_LIB_DIR); \ +- ../$(INSTALL) -m 644 -T old_lib $(LIBNAME).lai $(PKG_LIB_DIR); \ +- ../$(INSTALL) -m 644 $(LIBNAME).lai $(PKG_LIB_DIR)/$(LIBNAME).la ; \ +- ../$(INSTALL) -m 755 -d $(PKG_ROOT_LIB_DIR); \ +- ../$(INSTALL) -T so_base $(LIBNAME).lai $(PKG_ROOT_LIB_DIR); \ +- if [ "x$(shell readlink -f $(PKG_LIB_DIR))" != \ +- "x$(shell readlink -f $(PKG_ROOT_LIB_DIR))"; ]; then \ +- ../$(INSTALL) -S $(PKG_LIB_DIR)/$(LIBNAME).a $(PKG_ROOT_LIB_DIR)/$(LIBNAME).a; \ +- ../$(INSTALL) -S $(PKG_LIB_DIR)/$(LIBNAME).la $(PKG_ROOT_LIB_DIR)/$(LIBNAME).la; \ +- ../$(INSTALL) -S $(PKG_ROOT_LIB_DIR)/$(LIBNAME).so $(PKG_LIB_DIR)/$(LIBNAME).so; \ +- fi ++ set -e; cd $(TOPDIR)/$(LIBNAME); \ ++ $(INSTALL) -m 755 -d $(PKG_LIB_DIR); \ ++ env -uDIST_ROOT $(LTINSTALL) $(TOPDIR)/$(LIBNAME)/$(LIBNAME).la $(DIST_ROOT)$(PKG_LIB_DIR)/$(LIBNAME).la + else + INSTALL_LTLIB_DEV = $(INSTALL_LTLIB_STATIC) + endif +--- xfsprogs-3.2.2/libdisk/Makefile ++++ xfsprogs-3.2.2/libdisk/Makefile +@@ -31,6 +31,7 @@ install: default install-dev: default @@ -12,8 +36,8 @@ that we do not want. install-qa: install-dev ---- a/libhandle/Makefile -+++ b/libhandle/Makefile +--- xfsprogs-3.2.2/libhandle/Makefile ++++ xfsprogs-3.2.2/libhandle/Makefile @@ -20,7 +20,6 @@ include $(BUILDRULES) @@ -22,32 +46,33 @@ that we do not want. install-dev: default $(INSTALL_LTLIB_DEV) ---- a/libxcmd/Makefile -+++ b/libxcmd/Makefile -@@ -32,6 +32,11 @@ +--- xfsprogs-3.2.2/libxcmd/Makefile ++++ xfsprogs-3.2.2/libxcmd/Makefile +@@ -34,6 +34,11 @@ include $(BUILDRULES) -install install-dev install-qa: default +install: default + -+install-dev: default ++ install-dev: default + $(INSTALL_LTLIB_DEV) + +install-qa: default - -include .dep ---- a/libxfs/Makefile -+++ b/libxfs/Makefile -@@ -41,5 +41,6 @@ + -include .ltdep +--- xfsprogs-3.2.2/libxfs/Makefile ++++ xfsprogs-3.2.2/libxfs/Makefile +@@ -86,6 +86,7 @@ install: default install-dev: default + $(INSTALL_LTLIB_DEV) install-qa: default ---- a/libxlog/Makefile -+++ b/libxlog/Makefile + +--- xfsprogs-3.2.2/libxlog/Makefile ++++ xfsprogs-3.2.2/libxlog/Makefile @@ -12,6 +12,8 @@ CFILES = xfs_log_recover.c util.c @@ -69,10 +94,10 @@ that we do not want. + +install-qa: default - -include .dep ---- a/Makefile -+++ b/Makefile -@@ -66,6 +66,8 @@ + -include .ltdep +--- xfsprogs-3.2.2/Makefile ++++ xfsprogs-3.2.2/Makefile +@@ -63,6 +63,8 @@ mkfs: libxfs quota: libxcmd repair: libxfs libxlog @@ -81,26 +106,3 @@ that we do not want. ifneq ($(ENABLE_BLKID), yes) mkfs: libdisk ---- a/include/buildmacros -+++ b/include/buildmacros -@@ -71,17 +71,9 @@ - # /usr/lib. - ifeq ($(ENABLE_SHARED),yes) - INSTALL_LTLIB_DEV = \ -- cd $(TOPDIR)/$(LIBNAME)/.libs; \ -- ../$(INSTALL) -m 755 -d $(PKG_LIB_DIR); \ -- ../$(INSTALL) -m 644 -T old_lib $(LIBNAME).lai $(PKG_LIB_DIR); \ -- ../$(INSTALL) -m 644 $(LIBNAME).lai $(PKG_LIB_DIR)/$(LIBNAME).la ; \ -- ../$(INSTALL) -m 755 -d $(PKG_ROOT_LIB_DIR); \ -- ../$(INSTALL) -T so_base $(LIBNAME).lai $(PKG_ROOT_LIB_DIR); \ -- if test "x$(PKG_LIB_DIR)" != "x$(PKG_ROOT_LIB_DIR)" ; then \ -- ../$(INSTALL) -S $(PKG_LIB_DIR)/$(LIBNAME).a $(PKG_ROOT_LIB_DIR)/$(LIBNAME).a; \ -- ../$(INSTALL) -S $(PKG_LIB_DIR)/$(LIBNAME).la $(PKG_ROOT_LIB_DIR)/$(LIBNAME).la; \ -- ../$(INSTALL) -S $(PKG_ROOT_LIB_DIR)/$(LIBNAME).so $(PKG_LIB_DIR)/$(LIBNAME).so; \ -- fi -+ set -e; cd $(TOPDIR)/$(LIBNAME); \ -+ $(INSTALL) -m 755 -d $(PKG_LIB_DIR); \ -+ env -uDIST_ROOT $(LTINSTALL) $(TOPDIR)/$(LIBNAME)/$(LIBNAME).la $(DIST_ROOT)$(PKG_LIB_DIR)/$(LIBNAME).la - else - INSTALL_LTLIB_DEV = $(INSTALL_LTLIB_STATIC) - endif diff --git a/pkgs/tools/filesystems/yandex-disk/default.nix b/pkgs/tools/filesystems/yandex-disk/default.nix index 8b0b3a9898b..2397a53c193 100644 --- a/pkgs/tools/filesystems/yandex-disk/default.nix +++ b/pkgs/tools/filesystems/yandex-disk/default.nix @@ -5,12 +5,12 @@ assert stdenv.isLinux; let p = if stdenv.is64bit then { arch = "x86_64"; - gcclib = "${stdenv.gcc.gcc}/lib64"; + gcclib = "${stdenv.cc.gcc}/lib64"; sha256 = "09kw7f0qsvx3vx1c1zb117yf3yk7kkz66agspz5xx9b0zh6i82jw"; } else { arch = "i386"; - gcclib = "${stdenv.gcc.gcc}/lib"; + gcclib = "${stdenv.cc.gcc}/lib"; sha256 = "0f2230c91120f05159281b39c620ab6bad6559ce8a17a0874d0a82350ebba426"; }; in @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { $out/etc/bash_completion.d/yandex-disk-completion.bash ${patchelf}/bin/patchelf \ - --set-interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \ + --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ --set-rpath "${zlib}/lib:${p.gcclib}" \ $out/bin/yandex-disk ''; diff --git a/pkgs/tools/graphics/cuneiform/default.nix b/pkgs/tools/graphics/cuneiform/default.nix index 0e94571503c..38d5df22fd7 100644 --- a/pkgs/tools/graphics/cuneiform/default.nix +++ b/pkgs/tools/graphics/cuneiform/default.nix @@ -31,7 +31,7 @@ rec { needLib64 = a.stdenv.system == "x86_64-linux"; postInstall = a.fullDepEntry('' - patchelf --set-rpath $out/lib${if needLib64 then "64" else ""}${if a.stdenv.gcc.gcc != null then ":${a.stdenv.gcc.gcc}/lib" else ""}${if a.stdenv.gcc.gcc != null && needLib64 then ":${a.stdenv.gcc.gcc}/lib64" else ""}:${a.imagemagick}/lib $out/bin/cuneiform + patchelf --set-rpath $out/lib${if needLib64 then "64" else ""}${if a.stdenv.cc.gcc != null then ":${a.stdenv.cc.gcc}/lib" else ""}${if a.stdenv.cc.gcc != null && needLib64 then ":${a.stdenv.cc.gcc}/lib64" else ""}:${a.imagemagick}/lib $out/bin/cuneiform '') ["minInit" "addInputs" "doMakeInstall"]; name = "cuneiform-" + version; diff --git a/pkgs/tools/misc/bfr/default.nix b/pkgs/tools/misc/bfr/default.nix index 78383f4185d..3be824d9a40 100644 --- a/pkgs/tools/misc/bfr/default.nix +++ b/pkgs/tools/misc/bfr/default.nix @@ -1,18 +1,21 @@ { stdenv, fetchurl, perl }: -stdenv.mkDerivation { +stdenv.mkDerivation rec { name = "bfr-1.6"; + version = "1.6"; src = fetchurl { - url = http://www.glines.org/bin/pk/bfr-1.6.tar.bz2; + url = "http://www.sourcefiles.org/Utilities/Text_Utilities/bfr-${version}.tar.bz2"; sha256 = "0fadfssvj9klj4dq9wdrzys1k2a1z2j0p6kgnfgbjv0n1bq6h4cy"; }; buildInputs = [ perl ]; - meta = { - description = "general-purpose command-line pipe buffer"; + meta = with stdenv.lib; { + description = "A general-purpose command-line pipe buffer"; homepage = http://www.glines.org/wiki/bfr; license = stdenv.lib.licenses.gpl2; + maintainers = with maintainers; [ pSub ]; + platforms = platforms.linux; }; } diff --git a/pkgs/tools/misc/coreutils/default.nix b/pkgs/tools/misc/coreutils/default.nix index 5be34ad5f31..28f45d972e2 100644 --- a/pkgs/tools/misc/coreutils/default.nix +++ b/pkgs/tools/misc/coreutils/default.nix @@ -27,8 +27,8 @@ let buildInputs = [ gmp ] ++ optional aclSupport acl.crossDrv ++ optionals selinuxSupport [ libselinux.crossDrv libsepol.crossDrv ] - ++ optional (stdenv.gccCross.libc ? libiconv) - stdenv.gccCross.libc.libiconv.crossDrv; + ++ optional (stdenv.ccCross.libc ? libiconv) + stdenv.ccCross.libc.libiconv.crossDrv; buildPhase = '' make || ( diff --git a/pkgs/tools/misc/cv/default.nix b/pkgs/tools/misc/cv/default.nix index 28c6347a63d..b953ffc1897 100644 --- a/pkgs/tools/misc/cv/default.nix +++ b/pkgs/tools/misc/cv/default.nix @@ -1,16 +1,17 @@ -{ stdenv, fetchFromGitHub }: +{ stdenv, fetchFromGitHub, ncurses }: stdenv.mkDerivation rec { - name = "cv-2014-07-20"; + name = "cv-${version}"; + version = "0.6"; src = fetchFromGitHub { owner = "Xfennec"; repo = "cv"; - rev = "7441de974cc13f3b07903bb86c41be4e45c8e81b"; - sha256 = "19ky88b52a8zcv7lx802y4zi3sp0cdhya08cnax0yvlwwq43w6x9"; + rev = "v${version}"; + sha256 = "0nhhgkaghfp8rw23013j17yn9bqcwcrz0fylwkvx1krp5r8dalis"; }; - buildInputs = [ ]; + buildInputs = [ ncurses ]; makeFlags = [ "PREFIX=$(out)" ]; diff --git a/pkgs/tools/misc/figlet/default.nix b/pkgs/tools/misc/figlet/default.nix index 99c7a056051..ac812fb9881 100644 --- a/pkgs/tools/misc/figlet/default.nix +++ b/pkgs/tools/misc/figlet/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { preConfigure = '' mkdir -p $out/{man/man6,bin} - makeFlags="DESTDIR=$out/bin MANDIR=$out/man/man6 DEFAULTFONTDIR=$out/share/figlet" + makeFlags="DESTDIR=$out/bin MANDIR=$out/man/man6 DEFAULTFONTDIR=$out/share/figlet CC=cc LD=cc" ''; meta = { diff --git a/pkgs/tools/misc/goaccess/default.nix b/pkgs/tools/misc/goaccess/default.nix index 0f8f82acaed..7aea9870b84 100644 --- a/pkgs/tools/misc/goaccess/default.nix +++ b/pkgs/tools/misc/goaccess/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl, pkgconfig, geoip, ncurses, glib }: let - version = "0.8"; + version = "0.8.5"; mainSrc = fetchurl { - url = "http://tar.goaccess.prosoftcorp.com/goaccess-${version}.tar.gz"; - sha256 = "a61215b1f3e82bdb50c892e843f1a85d6d85f882915d694a5672911fab955eea"; + url = "http://tar.goaccess.io/goaccess-${version}.tar.gz"; + sha256 = "121s1hva33nq0g5n354ln68nalv2frg8slm7n84r81bmi2wvdim4"; }; in diff --git a/pkgs/tools/misc/grub/2.0x.nix b/pkgs/tools/misc/grub/2.0x.nix index e5471a6c404..1dbdfff7448 100644 --- a/pkgs/tools/misc/grub/2.0x.nix +++ b/pkgs/tools/misc/grub/2.0x.nix @@ -77,7 +77,7 @@ stdenv.mkDerivation rec { -e "s|/usr/src/unifont.bdf|$PWD/unifont.bdf|g" ''; - patches = [ ./fix-bash-completion.patch ]; + patches = [ ./fix-bash-completion.patch ./glibc-2.20.patch ]; configureFlags = optional zfsSupport "--enable-libzfs" ++ optionals efiSupport [ "--with-platform=efi" "--target=${efiSystems.${stdenv.system}.target}" "--program-prefix=" ]; diff --git a/pkgs/tools/misc/grub/glibc-2.20.patch b/pkgs/tools/misc/grub/glibc-2.20.patch new file mode 100644 index 00000000000..6bb4f677541 --- /dev/null +++ b/pkgs/tools/misc/grub/glibc-2.20.patch @@ -0,0 +1,29 @@ +* grub-core/kern/emu/hostfs.c: squahes below warning + warning: #warning "_BSD_SOURCE and _SVID_SOURCE are deprecated, use +_DEFAULT_SOURCE" + +Signed-off-by: Khem Raj + +Upstream-Status: Submitted +--- + grub-core/kern/emu/hostfs.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/grub-core/kern/emu/hostfs.c b/grub-core/kern/emu/hostfs.c +index 7e725f6..823116d 100644 +--- a/grub-core/kern/emu/hostfs.c ++++ b/grub-core/kern/emu/hostfs.c +@@ -19,7 +19,11 @@ + + #include + ++/* Legacy feature macro.*/ + #define _BSD_SOURCE ++/* New feature macro that provides everything _BSD_SOURCE and ++ * _SVID_SOURCE provided and possibly more. */ ++#define _DEFAULT_SOURCE + #include + #include + #include +-- +2.1.0 diff --git a/pkgs/tools/misc/less/default.nix b/pkgs/tools/misc/less/default.nix index 615063bbbcc..f7790fd3468 100644 --- a/pkgs/tools/misc/less/default.nix +++ b/pkgs/tools/misc/less/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, ncurses }: stdenv.mkDerivation rec { - name = "less-470"; + name = "less-471"; src = fetchurl { url = "http://www.greenwoodsoftware.com/less/${name}.tar.gz"; - sha256 = "1vw6bp9wkr2ymvhmf0ikrv8m1zm5ww78s48ny7ks0zjf2i8xr4gi"; + sha256 = "1y17zfrn91fs71jry5gp9ibj7darglhr42krimw7hqsjkbx17xip"; }; # Look for ‘sysless’ in /etc. diff --git a/pkgs/tools/misc/logstash-forwarder/default.nix b/pkgs/tools/misc/logstash-forwarder/default.nix index 961dbc08335..0874ef38eb3 100644 --- a/pkgs/tools/misc/logstash-forwarder/default.nix +++ b/pkgs/tools/misc/logstash-forwarder/default.nix @@ -1,12 +1,12 @@ -{ stdenv, fetchgit, go_1_1 }: +{ stdenv, fetchgit, go }: stdenv.mkDerivation { - name = "logstash-forwarder-20140410"; + name = "logstash-forwarder-20141216"; src = fetchgit { url = https://github.com/elasticsearch/logstash-forwarder.git; - rev = "ec504792108ab6536b45bcf6dff6d26a6b56fef3"; - sha256 = "309545ceaec171bee997cad260bef1433e041b9f3bfe617d475bcf79924f943d"; + rev = "6082bd8aaecb2180f5b56f4fb1b2940a6935ef7b"; + sha256 = "1686rlx5p7d2806cg8y4376m4l7nvg1yjgg52ccrs0v4fnqs6292"; }; - buildInputs = [ go_1_1 ]; + buildInputs = [ go ]; installPhase = '' mkdir -p $out/bin cp build/bin/logstash-forwarder $out/bin @@ -15,6 +15,6 @@ stdenv.mkDerivation { meta = { license = stdenv.lib.licenses.asl20; homepage = https://github.com/elasticsearch/logstash-forwarder; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; }; } diff --git a/pkgs/tools/misc/megacli/default.nix b/pkgs/tools/misc/megacli/default.nix index 2d45bee4907..d34c66bd587 100644 --- a/pkgs/tools/misc/megacli/default.nix +++ b/pkgs/tools/misc/megacli/default.nix @@ -15,14 +15,14 @@ stdenv.mkDerivation rec { buildInputs = [rpmextract ncurses unzip makeWrapper]; libPath = stdenv.lib.makeLibraryPath - [ stdenv.gcc.gcc stdenv.gcc.libc ncurses ]; + [ stdenv.cc.gcc stdenv.cc.libc ncurses ]; buildCommand = '' mkdir -p $out/bin cd $out unzip ${src} rpmextract linux/MegaCli-8.07.07-1.noarch.rpm - ${patchelf}/bin/patchelf --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" --set-rpath ${libPath}:$out/opt/lsi/3rdpartylibs/x86_64:$out/opt/lsi/3rdpartylibs:${stdenv.gcc.gcc}/lib64:${stdenv.gcc.gcc}/lib opt/MegaRAID/MegaCli/MegaCli64 + ${patchelf}/bin/patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" --set-rpath ${libPath}:$out/opt/lsi/3rdpartylibs/x86_64:$out/opt/lsi/3rdpartylibs:${stdenv.cc.gcc}/lib64:${stdenv.cc.gcc}/lib opt/MegaRAID/MegaCli/MegaCli64 wrapProgram $out/opt/MegaRAID/MegaCli/MegaCli64 --set LD_LIBRARY_PATH $out/opt/lsi/3rdpartylibs/x86_64 ln -s $out/opt/MegaRAID/MegaCli/MegaCli64 $out/bin/MegaCli64 eval fixupPhase diff --git a/pkgs/tools/misc/moreutils/default.nix b/pkgs/tools/misc/moreutils/default.nix new file mode 100644 index 00000000000..4c7bb9ad77e --- /dev/null +++ b/pkgs/tools/misc/moreutils/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchurl, libxml2, libxslt, docbook-xsl, perl, IPCRun, TimeDate, TimeDuration, makeWrapper }: + +with stdenv.lib; +stdenv.mkDerivation rec { + name = "moreutils-${version}"; + version = "0.54"; + + src = fetchurl { + url = "http://ftp.de.debian.org/debian/pool/main/m/moreutils/moreutils_${version}.orig.tar.gz"; + sha256 = "17sj7d4l69gc7l17awwvq44rl137qc0lmi41z04apj5vdd6iqa2h"; + }; + + preBuild = '' + substituteInPlace Makefile --replace /usr/share/xml/docbook/stylesheet/docbook-xsl ${docbook-xsl}/xml/xsl/docbook + ''; + + buildInputs = [ libxml2 libxslt docbook-xsl makeWrapper ]; + + propagatedBuildInputs = [ perl IPCRun TimeDate TimeDuration ]; + + installFlags = "PREFIX=$(out)"; + + postInstall = "wrapProgram $out/bin/chronic --prefix PERL5LIB : $PERL5LIB"; + + meta = { + description = "Growing collection of the unix tools that nobody thought to write long ago when unix was young."; + homepage = https://joeyh.name/code/moreutils/; + maintainers = with maintainers; [ koral ]; + }; +} diff --git a/pkgs/tools/misc/mrtg/default.nix b/pkgs/tools/misc/mrtg/default.nix new file mode 100644 index 00000000000..043cbf1edf1 --- /dev/null +++ b/pkgs/tools/misc/mrtg/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchurl, perl, gd, rrdtool }: + +stdenv.mkDerivation rec { + + version = "2.17.4"; + name = "mrtg-${version}"; + + src = fetchurl { + url = "http://oss.oetiker.ch/mrtg/pub/${name}.tar.gz"; + sha256 = "0r93ipscfp7py0b1dcx65s58q7dlwndqhprf8w4945a0h2p7zyjy"; + }; + + buildInputs = [ + perl gd rrdtool + ]; + + meta = { + description = "The Multi Router Traffic Grapher"; + homepage = http://oss.oetiker.ch/mrtg/; + license = stdenv.lib.licenses.gpl2; + maintainers = [ stdenv.lib.maintainers.robberer ]; + }; +} diff --git a/pkgs/tools/misc/opentsdb/default.nix b/pkgs/tools/misc/opentsdb/default.nix index 868e993737b..6f9695ba363 100644 --- a/pkgs/tools/misc/opentsdb/default.nix +++ b/pkgs/tools/misc/opentsdb/default.nix @@ -1,145 +1,11 @@ { stdenv, autoconf, automake, curl, fetchurl, jdk, jre, makeWrapper, nettools, python }: with stdenv.lib; -let - thirdPartyDeps = { - guava = { - "guava-18.0.jar" = fetchurl { - url = http://repo1.maven.org/maven2/com/google/guava/guava/18.0/guava-18.0.jar; - md5 = "947641f6bb535b1d942d1bc387c45290"; - }; - }; - gwt = { - "gwt-dev-2.6.0.jar" = fetchurl { - url = http://central.maven.org/maven2/com/google/gwt/gwt-dev/2.6.0/gwt-dev-2.6.0.jar; - md5 = "23d8bf52709230c2c7e6dd817261f9ee"; - }; - "gwt-user-2.6.0.jar" = fetchurl { - url = http://repo1.maven.org/maven2/com/google/gwt/gwt-user/2.6.0/gwt-user-2.6.0.jar; - md5 = "99226fc2764f2b8fd6db6e05d0847659"; - }; - }; - hamcrest = { - "hamcrest-core-1.3.jar" = fetchurl { - url = http://central.maven.org/maven2/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar; - md5 = "6393363b47ddcbba82321110c3e07519"; - }; - }; - hbase = { - "asynchbase-1.6.0.jar" = fetchurl { - url = http://central.maven.org/maven2/org/hbase/asynchbase/1.6.0/asynchbase-1.6.0.jar; - md5 = "6738dd73fd48d30cbf5c78f62bc18852"; - }; - }; - jackson = { - "jackson-annotations-2.4.3.jar" = fetchurl { - url = http://repo1.maven.org/maven2/com/fasterxml/jackson/core/jackson-annotations/2.4.3/jackson-annotations-2.4.3.jar; - md5 = "31ef4fa866f9d24960a6807c9c299e98"; - }; - "jackson-core-2.4.3.jar" = fetchurl { - url = http://central.maven.org/maven2/com/fasterxml/jackson/core/jackson-core/2.4.3/jackson-core-2.4.3.jar; - md5 = "750ef3d86f04fe0d6d14d6ae904a6d2d"; - }; - "jackson-databind-2.4.3.jar" = fetchurl { - url = http://repo1.maven.org/maven2/com/fasterxml/jackson/core/jackson-databind/2.4.3/jackson-databind-2.4.3.jar; - md5 = "4fcb9f74280eaa21de10191212c65b11"; - }; - }; - javassist = { - "javassist-3.18.1-GA.jar" = fetchurl { - url = http://central.maven.org/maven2/org/javassist/javassist/3.18.1-GA/javassist-3.18.1-GA.jar; - md5 = "5bb83868c87334320562af7eded65cc2"; - }; - }; - junit = { - "junit-4.11.jar" = fetchurl { - url = http://repo1.maven.org/maven2/junit/junit/4.11/junit-4.11.jar; - md5 = "3c42be5ea7cbf3635716abbb429cb90d"; - }; - }; - logback = { - "logback-classic-1.0.13.jar" = fetchurl { - url = https://opentsdb.googlecode.com/files/logback-classic-1.0.13.jar; - md5 = "b4dc8eb42150aafd6d9fd3d211807621"; - }; - "logback-core-1.0.13.jar" = fetchurl { - url = https://opentsdb.googlecode.com/files/logback-core-1.0.13.jar; - md5 = "3d5f8ce8dca36e493d39177b71958bd4"; - }; - }; - mockito = { - "mockito-1.9.0.jar" = fetchurl { - url = https://opentsdb.googlecode.com/files/mockito-1.9.0.jar; - md5 = "cab21b44958a173a5b1d55a6aff0ab54"; - }; - "mockito-core-1.9.5.jar" = fetchurl { - url = https://opentsdb.googlecode.com/files/mockito-core-1.9.5.jar; - md5 = "98f3076e2a691d1ac291624e5a46b80b"; - }; - }; - netty = { - "netty-3.9.4.Final.jar" = fetchurl { - url = http://central.maven.org/maven2/io/netty/netty/3.9.4.Final/netty-3.9.4.Final.jar; - md5 = "b3701ef46c7518d0d63705e2f092dbe5"; - }; - }; - objenesis = { - "objenesis-1.3.jar" = fetchurl { - url = http://repo1.maven.org/maven2/org/objenesis/objenesis/1.3/objenesis-1.3.jar; - md5 = "2d649907bd6203f2661f70d430a6ade8"; - }; - }; - powermock = { - "powermock-mockito-release-full-1.5.4-full.jar" = fetchurl { - url = http://repo1.maven.org/maven2/org/powermock/powermock-mockito-release-full/1.5.4/powermock-mockito-release-full-1.5.4-full.jar; - md5 = "5dee1dce6952bb7338d4d053157ae647"; - }; - }; - protobuf = { - "protobuf-java-2.5.0.jar" = fetchurl { - url = http://repo1.maven.org/maven2/com/google/protobuf/protobuf-java/2.5.0/protobuf-java-2.5.0.jar; - md5 = "a44473b98947e2a54c54e0db1387d137"; - }; - }; - slf4j = { - "log4j-over-slf4j-1.7.7.jar" = fetchurl { - url = http://repo1.maven.org/maven2/org/slf4j/log4j-over-slf4j/1.7.7/log4j-over-slf4j-1.7.7.jar; - md5 = "93ab42a5216afd683c35988c6b6fc3d8"; - }; - "slf4j-api-1.7.7.jar" = fetchurl { - url = http://repo1.maven.org/maven2/org/slf4j/slf4j-api/1.7.7/slf4j-api-1.7.7.jar; - md5 = "ca4280bf93d64367723ae5c8d42dd0b9"; - }; - }; - suasync = { - "suasync-1.4.0.jar" = fetchurl { - url = https://opentsdb.googlecode.com/files/suasync-1.4.0.jar; - md5 = "289ce3f3e6a9bb17857981eacf6d74b6"; - }; - }; - validation-api = { - "validation-api-1.0.0.GA.jar" = fetchurl { - url = http://repo1.maven.org/maven2/javax/validation/validation-api/1.0.0.GA/validation-api-1.0.0.GA.jar; - md5 = "40c1ee909493066397a6d4d9f8d375d8"; - }; - "validation-api-1.0.0.GA-sources.jar" = fetchurl { - url = http://repo1.maven.org/maven2/javax/validation/validation-api/1.0.0.GA/validation-api-1.0.0.GA-sources.jar; - md5 = "f816682933b59c5ffe32bdb4ab4bf628"; - }; - }; - zookeeper = { - "zookeeper-3.3.6.jar" = fetchurl { - url = https://opentsdb.googlecode.com/files/zookeeper-3.3.6.jar; - md5 = "02786e11c19d1671640992f1bda4a858"; - }; - }; - }; - -in stdenv.mkDerivation rec { +stdenv.mkDerivation rec { name = "opentsdb-2.1.0-rc1"; src = fetchurl { - url = https://github.com/OpenTSDB/opentsdb/archive/v2.1.0RC1.tar.gz; - sha256 = "01li02j8kjanmas2gxkcz3gsn54nyfyvqdylxz3fqqjgg6y7hrm7"; + url = https://github.com/OpenTSDB/opentsdb/releases/download/v2.1.0RC1/opentsdb-2.1.0RC1.tar.gz; + sha256 = "1vvhzdl2wgbzy2lvlyx40pks47ma6szs9ka4dwjf123xyixv0rmz"; }; buildInputs = [ autoconf automake curl jdk makeWrapper nettools python ]; @@ -150,23 +16,9 @@ in stdenv.mkDerivation rec { mkdir build cd build ../configure --prefix=$out - patchShebangs ./build-aux/ + patchShebangs ../build-aux/ ''; - buildPhase = - concatStringsSep - "\n" - (mapAttrsToList - (folder: jars: - "mkdir -p third_party/${folder}\n" + - (concatStringsSep - "\n" - (mapAttrsToList - (jar: src: - "ln -s ${src} third_party/${folder}/${jar}") - jars))) - thirdPartyDeps); - installPhase = '' make install wrapProgram $out/bin/tsdb \ diff --git a/pkgs/tools/misc/pipelight/default.nix b/pkgs/tools/misc/pipelight/default.nix index 42882c2701a..5ead0e7c8ba 100644 --- a/pkgs/tools/misc/pipelight/default.nix +++ b/pkgs/tools/misc/pipelight/default.nix @@ -3,13 +3,13 @@ }: let - wine_patches_version = "1.7.30"; - wine_hash = "0v08w2av46y4wxrl8q4k9fhbi2cgawjaxclahqnpfw098bqcmxqh"; + wine_patches_version = "1.7.33"; + wine_hash = "0xcjsh3635i8wpzixzsl05m3dkq74vq193x3ipjr3fy0l9prslg3"; wine_patches = fetchgit { url = "git://github.com/compholio/wine-compholio.git"; rev = "refs/tags/v${wine_patches_version}"; - sha256 = "02i0bpxxiyxavlcd5qm7wv0q4bm9bxr3ng3w2k234ww7cyndm0ws"; + sha256 = "09af0cwdskz4clps39f48cp4lzm41kdzg30q8b511nyl0dppd75r"; }; wine_custom = @@ -45,13 +45,13 @@ let in stdenv.mkDerivation rec { - version = "0.2.7.3"; + version = "0.2.8"; name = "pipelight-${version}"; src = fetchurl { url = "https://bitbucket.org/mmueller2012/pipelight/get/v${version}.tar.gz"; - sha256 = "0lifgs3aakyxfk6r2f2p27z0iqzgz1dinqfgwx3vdh3l93s8aifv"; + sha256 = "1i440rf22fmd2w86dlm1mpi3nb7410rfczc0yldnhgsvp5p3sm5f"; }; buildInputs = [ wine_custom xlibs.libX11 gcc48_multi mesa curl ]; diff --git a/pkgs/tools/misc/plantuml/default.nix b/pkgs/tools/misc/plantuml/default.nix index 6ba3d9a4f59..6de3474d2d7 100644 --- a/pkgs/tools/misc/plantuml/default.nix +++ b/pkgs/tools/misc/plantuml/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, jre, graphviz }: stdenv.mkDerivation rec { - version = "7991"; + version = "8012"; name = "plantuml-${version}"; src = fetchurl { url = "mirror://sourceforge/project/plantuml/plantuml.${version}.jar"; - sha256 = "0afhgiq2165ahj8ww0pmk69nqgpibllp9nhpk8wapg3zknh2hx5r"; + sha256 = "12l2kmp6jaz6lmcj16ljhrpb1bm7zzz5qgvihhymvk66rfjd3ybz"; }; # It's only a .jar file and a shell wrapper diff --git a/pkgs/tools/misc/profile-sync-daemon/default.nix b/pkgs/tools/misc/profile-sync-daemon/default.nix new file mode 100644 index 00000000000..d3f017171cb --- /dev/null +++ b/pkgs/tools/misc/profile-sync-daemon/default.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchurl, rsync, glibc, gawk }: + +stdenv.mkDerivation rec { + version = "v5.53"; + name = "profile-sync-daemon-${version}"; + + src = fetchurl { + url = "http://github.com/graysky2/profile-sync-daemon/archive/${version}.tar.gz"; + sha256 = "0m7h9l7dndqgb5k3grpc00f6dpg73p6h4q5sgkf8bvyzvcbdafwx"; + }; + + installPhase = "PREFIX=\"\" DESTDIR=$out make install-systemd-all"; + + preferLocalBuild = true; + + meta = with stdenv.lib; { + description = "Syncs browser profile dirs to RAM"; + longDescription = '' + Profile-sync-daemon (psd) is a tiny pseudo-daemon designed to manage your + browser's profile in tmpfs and to periodically sync it back to your + physical disc (HDD/SSD). This is accomplished via a symlinking step and + an innovative use of rsync to maintain back-up and synchronization + between the two. One of the major design goals of psd is a completely + transparent user experience. + ''; + homepage = https://github.com/graysky2/profile-sync-daemon; + downloadPage = https://github.com/graysky2/profile-sync-daemon/releases; + license = licenses.mit; + maintainers = [ maintainers.prikhi ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/tools/misc/remind/default.nix b/pkgs/tools/misc/remind/default.nix index 95d3b5f183f..18137312a3d 100644 --- a/pkgs/tools/misc/remind/default.nix +++ b/pkgs/tools/misc/remind/default.nix @@ -1,7 +1,7 @@ {stdenv, fetchurl} : stdenv.mkDerivation { - name = "remind-3.1.8"; + name = "remind-3.1.13"; src = fetchurl { url = http://www.roaringpenguin.com/files/download/remind-03.01.13.tar.gz; sha256 = "0kzw1d53nlj90qfsibbs2gkzp1hamqqxpj57ip4kz1j1xgan69ng"; @@ -11,7 +11,7 @@ stdenv.mkDerivation { homepage = http://www.roaringpenguin.com/products/remind; description = "Sophisticated calendar and alarm program for the console"; license = stdenv.lib.licenses.gpl2; - maintainers = with stdenv.lib.maintainers; [viric raskin]; + maintainers = with stdenv.lib.maintainers; [viric raskin kovirobi]; platforms = with stdenv.lib.platforms; linux; }; } diff --git a/pkgs/tools/misc/screen/default.nix b/pkgs/tools/misc/screen/default.nix index daf9d344400..d4377c14fad 100644 --- a/pkgs/tools/misc/screen/default.nix +++ b/pkgs/tools/misc/screen/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.gnu.org/software/screen/; - description = "a window manager that multiplexes a physical terminal"; + description = "A window manager that multiplexes a physical terminal"; license = stdenv.lib.licenses.gpl2Plus; longDescription = diff --git a/pkgs/tools/misc/timidity/default.nix b/pkgs/tools/misc/timidity/default.nix index afe75c572c0..664647514aa 100644 --- a/pkgs/tools/misc/timidity/default.nix +++ b/pkgs/tools/misc/timidity/default.nix @@ -4,11 +4,11 @@ let inherit (composableDerivation) edf; in composableDerivation.composableDerivation {} { - name = "timidity-2.13.0"; + name = "timidity-2.14.0"; src = fetchurl { - url = mirror://sourceforge/timidity/TiMidity++-2.13.0.tar.bz2; - sha256 = "1jbmk0m375fh5nj2awqzns7pdjbi7dxpjdwcix04zipfcilppbmf"; + url = mirror://sourceforge/timidity/TiMidity++-2.14.0.tar.bz2; + sha256 = "0xk41w4qbk23z1fvqdyfblbz10mmxsllw0svxzjw5sa9y11vczzr"; }; mergeAttrBy.audioModes = a : b : "${a},${b}"; @@ -55,8 +55,10 @@ composableDerivation.composableDerivation {} { tar --strip-components=1 -xf $instruments -C $out/share/timidity/ ''; - meta = { + meta = with stdenv.lib; { + homepage = http://sourceforge.net/projects/timidity/; + license = licenses.gpl2; description = "A software MIDI renderer"; - maintainers = [ stdenv.lib.maintainers.marcweber ]; + maintainers = [ maintainers.marcweber ]; }; } diff --git a/pkgs/tools/misc/trash-cli/default.nix b/pkgs/tools/misc/trash-cli/default.nix new file mode 100644 index 00000000000..1c8a2e495b6 --- /dev/null +++ b/pkgs/tools/misc/trash-cli/default.nix @@ -0,0 +1,40 @@ +{ stdenv, fetchurl, substituteAll, coreutils, python2, python2Packages }: + +assert stdenv.isLinux; + +python2Packages.buildPythonPackage rec { + name = "trash-cli-${version}"; + version = "0.12.9.14"; + namePrefix = ""; + + src = fetchurl { + url = "https://github.com/andreafrancia/trash-cli/archive/${version}.tar.gz"; + sha256 = "10idvzrlppj632pw6mpk1zy9arn1x4lly4d8nfy9cz4zqv06lhvh"; + }; + + + patches = [ + # Fix paths. + (substituteAll { + src = ./nix-paths.patch; + df = "${coreutils}/bin/df"; + python = "${python2}/bin/${python2.executable}"; + libc = "${stdenv.cc.libc}/lib/libc.so.6"; + }) + + # Apply https://github.com/JaviMerino/trash-cli/commit/4f45a37a3 + # to fix failing test case. + ./fix_should_output_info_for_multiple_files.patch + ]; + + buildInputs = with python2Packages; [ nose mock ]; + + checkPhase = "nosetests"; + + meta = with stdenv.lib; { + homepage = https://github.com/andreafrancia/trash-cli; + description = "Command line tool for the desktop trash can"; + maintainer = [ maintainers.rycee ]; + license = licenses.gpl2; + }; +} diff --git a/pkgs/tools/misc/trash-cli/fix_should_output_info_for_multiple_files.patch b/pkgs/tools/misc/trash-cli/fix_should_output_info_for_multiple_files.patch new file mode 100644 index 00000000000..17947be7482 --- /dev/null +++ b/pkgs/tools/misc/trash-cli/fix_should_output_info_for_multiple_files.patch @@ -0,0 +1,60 @@ +From 4f45a37a390d7c844dd9c9b58fff7259a77ffff9 Mon Sep 17 00:00:00 2001 +From: Javi Merino +Date: Sun, 31 Aug 2014 05:45:17 -0700 +Subject: [PATCH] Fix should_output_info_for_multiple_files + +Test should_output_info_for_multiple_files fails because the output is +not in the same order as the input. Add assert_equal_any_order() to +the OutputCollector, which sorts the expected and actual lines so that +the output matches even if the order in which they are shown in +trash-list is different. +--- + integration_tests/describe_trash_list.py | 8 +++++--- + integration_tests/output_collector.py | 8 ++++++++ + 2 files changed, 13 insertions(+), 3 deletions(-) + +diff --git a/integration_tests/describe_trash_list.py b/integration_tests/describe_trash_list.py +index 6dd8d30..3489a22 100644 +--- a/integration_tests/describe_trash_list.py ++++ b/integration_tests/describe_trash_list.py +@@ -73,9 +73,9 @@ def should_output_info_for_multiple_files(self): + + self.user.run_trash_list() + +- self.user.should_read_output( "2000-01-01 00:00:01 /file1\n" +- "2000-01-01 00:00:02 /file2\n" +- "2000-01-01 00:00:03 /file3\n") ++ self.user.should_read_output_any_order( "2000-01-01 00:00:01 /file1\n" ++ "2000-01-01 00:00:02 /file2\n" ++ "2000-01-01 00:00:03 /file3\n") + + @istest + def should_output_unknown_dates_with_question_marks(self): +@@ -294,6 +294,8 @@ def error(self): + raise ValueError() + def should_read_output(self, expected_value): + self.stdout.assert_equal_to(expected_value) ++ def should_read_output_any_order(self, expected_value): ++ self.stdout.assert_equal_any_order(expected_value) + def should_read_error(self, expected_value): + self.stderr.assert_equal_to(expected_value) + def output(self): +diff --git a/integration_tests/output_collector.py b/integration_tests/output_collector.py +index 06dc002..7f3704f 100644 +--- a/integration_tests/output_collector.py ++++ b/integration_tests/output_collector.py +@@ -9,6 +9,14 @@ def write(self,data): + self.stream.write(data) + def assert_equal_to(self, expected): + return self.should_be(expected) ++ def assert_equal_any_order(self, expected): ++ actual_sorted = sorted(self.stream.getvalue().splitlines(1)) ++ actual = "".join(actual_sorted) ++ ++ expected_sorted = sorted(expected.splitlines(1)) ++ expected = "".join(expected_sorted) ++ ++ assert_equals_with_unidiff(expected, actual) + def should_be(self, expected): + assert_equals_with_unidiff(expected, self.stream.getvalue()) + def should_match(self, regex): diff --git a/pkgs/tools/misc/trash-cli/nix-paths.patch b/pkgs/tools/misc/trash-cli/nix-paths.patch new file mode 100644 index 00000000000..29412027b7a --- /dev/null +++ b/pkgs/tools/misc/trash-cli/nix-paths.patch @@ -0,0 +1,39 @@ +diff -Nurp trash-cli-0.12.9.14-orig/integration_tests/test_trash_rm_script.py trash-cli-0.12.9.14/integration_tests/test_trash_rm_script.py +--- trash-cli-0.12.9.14-orig/integration_tests/test_trash_rm_script.py 2014-12-23 10:10:43.808470486 +0100 ++++ trash-cli-0.12.9.14/integration_tests/test_trash_rm_script.py 2014-12-23 10:11:02.688517975 +0100 +@@ -9,7 +9,7 @@ from pprint import pprint + @istest + class WhenNoArgs: + def setUp(self): +- process = Popen(['python', 'trashcli/rm.py'], ++ process = Popen(['@python@', 'trashcli/rm.py'], + env={'PYTHONPATH':'.'}, + stdin=None, + stdout=PIPE, +diff -Nurp trash-cli-0.12.9.14-orig/trashcli/list_mount_points.py trash-cli-0.12.9.14/trashcli/list_mount_points.py +--- trash-cli-0.12.9.14-orig/trashcli/list_mount_points.py 2014-12-23 10:10:43.808470486 +0100 ++++ trash-cli-0.12.9.14/trashcli/list_mount_points.py 2014-12-23 10:19:04.954796457 +0100 +@@ -12,7 +12,7 @@ def mount_points_from_getmnt(): + + def mount_points_from_df(): + import subprocess +- df_output = subprocess.Popen(["df", "-P"], stdout=subprocess.PIPE).stdout ++ df_output = subprocess.Popen(["@df@", "-P"], stdout=subprocess.PIPE).stdout + return list(_mount_points_from_df_output(df_output)) + + def _mount_points_from_df_output(df_output): +@@ -46,13 +46,7 @@ def _mounted_filesystems_from_getmnt() : + ("mnt_freq", c_int), # Dump frequency (in days). + ("mnt_passno", c_int)] # Pass number for `fsck'. + +- if sys.platform == "cygwin": +- libc_name = "cygwin1.dll" +- else: +- libc_name = find_library("c") +- +- if libc_name == None : +- libc_name="/lib/libc.so.6" # fix for my Gentoo 4.0 ++ libc_name = "@libc@" + + libc = cdll.LoadLibrary(libc_name) + libc.getmntent.restype = POINTER(mntent_struct) diff --git a/pkgs/tools/misc/wyrd/default.nix b/pkgs/tools/misc/wyrd/default.nix new file mode 100644 index 00000000000..d76e393aaaa --- /dev/null +++ b/pkgs/tools/misc/wyrd/default.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchurl, ocaml, ncurses, remind }: + +stdenv.mkDerivation rec { + version = "1.4.6"; + name = "wyrd-${version}"; + + src = fetchurl { + url = "http://pessimization.com/software/wyrd/wyrd-${version}.tar.gz"; + sha256 = "0zlrg602q781q8dij62lwdprpfliyy9j1rqfqcz8p2wgndpivddj"; + }; + + buildInputs = [ ocaml ncurses remind ]; + + preferLocalBuild = true; + + meta = with stdenv.lib; { + description = "A text-based front-end to Remind"; + longDescription = '' + Wyrd is a text-based front-end to Remind, a sophisticated + calendar and alarm program. Remind's power lies in its + programmability, and Wyrd does not hide this capability behind + flashy GUI dialogs. Rather, Wyrd is designed to make you more + efficient at editing your reminder files directly. + ''; + homepage = http://pessimization.com/software/wyrd/; + downloadPage = http://pessimization.com/software/wyrd/; + license = licenses.gpl2; + maintainers = [ maintainers.prikhi ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix index 88d6ff1ff06..585dead7354 100644 --- a/pkgs/tools/misc/youtube-dl/default.nix +++ b/pkgs/tools/misc/youtube-dl/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, python, zip }: let - version = "2014.11.27"; + version = "2014.12.17.2"; in stdenv.mkDerivation rec { name = "youtube-dl-${version}"; src = fetchurl { url = "http://youtube-dl.org/downloads/${version}/${name}.tar.gz"; - sha256 = "0bmjlp3jk5nd2i9jpbqbv2smh5rdxcjajv7fccfinmi6v2bjm1aa"; + sha256 = "1yk8dw0p4nh68p4rcncwl95gcjwn147wyp2anfhn0gr8b95wcb1h"; }; buildInputs = [ python ]; @@ -29,6 +29,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.unlicense; platforms = with stdenv.lib.platforms; linux ++ darwin; - maintainers = with stdenv.lib.maintainers; [ bluescreen303 simons phreedom AndersonTorres ]; + maintainers = with stdenv.lib.maintainers; [ bluescreen303 simons phreedom AndersonTorres fuuzetsu ]; }; } diff --git a/pkgs/tools/networking/atftp/default.nix b/pkgs/tools/networking/atftp/default.nix index 8524a964f15..28568183db7 100644 --- a/pkgs/tools/networking/atftp/default.nix +++ b/pkgs/tools/networking/atftp/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl, readline, tcp_wrappers, pcre, makeWrapper }: assert stdenv.isLinux; -assert stdenv.gcc.gcc != null; +assert stdenv.cc.gcc != null; let version = "0.7"; debianPatch = fetchurl { @@ -18,7 +18,7 @@ stdenv.mkDerivation { buildInputs = [ readline tcp_wrappers pcre makeWrapper ]; patches = [ debianPatch ]; postInstall = '' - wrapProgram $out/sbin/atftpd --prefix LD_LIBRARY_PATH : ${stdenv.gcc.gcc}/lib${if stdenv.system == "x86_64-linux" then "64" else ""} + wrapProgram $out/sbin/atftpd --prefix LD_LIBRARY_PATH : ${stdenv.cc.gcc}/lib${if stdenv.system == "x86_64-linux" then "64" else ""} ''; meta = { description = "Advanced tftp tools"; diff --git a/pkgs/tools/networking/axel/default.nix b/pkgs/tools/networking/axel/default.nix index 4103d17bfa2..8726f4aae21 100644 --- a/pkgs/tools/networking/axel/default.nix +++ b/pkgs/tools/networking/axel/default.nix @@ -1,16 +1,18 @@ {stdenv, fetchurl}: -stdenv.mkDerivation { - name = "axel-2.4"; +stdenv.mkDerivation rec { + name = "axel-${version}"; + version = "2.4"; + src = fetchurl { - urls = [ - #https://alioth.debian.org/frs/download.php/3016/axel-2.4.tar.bz2 - mirror://debian/pool/main/a/axel/axel_2.4.orig.tar.gz - ]; + url = "mirror://debian/pool/main/a/axel/axel_${version}.orig.tar.gz"; sha256 = "0dl0r9byd2ps90cq2nj1y7ib6gnkb5y9f3a3fmhcnjrm9smmg6im"; }; - meta = { + meta = with stdenv.lib; { description = "Console downloading program with some features for parallel connections for faster downloading"; + homepage = http://axel.alioth.debian.org/; + maintainers = with maintainers; [ pSub ]; + platforms = platforms.linux; }; } diff --git a/pkgs/tools/networking/cmst/default.nix b/pkgs/tools/networking/cmst/default.nix index 52a1baa05a6..47e4a56380c 100644 --- a/pkgs/tools/networking/cmst/default.nix +++ b/pkgs/tools/networking/cmst/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchgit, qt5, makeWrapper, libX11 }: stdenv.mkDerivation rec { - name = "cmst-2014.08.23"; + name = "cmst-2014.12.05"; rev = "refs/tags/${name}"; src = fetchgit { url = "git://github.com/andrew-bibb/cmst.git"; inherit rev; - sha256 = "07g5i929jxlh6vm0ad8x33qmf2sryiichlv37x7fpn20h3xcsia0"; + sha256 = "070rxv3kyn41ra7nnk1wbqvy6fjg38h7hrdv4dn71b201kmzd194"; }; buildInputs = [ qt5 makeWrapper ]; @@ -15,6 +15,19 @@ stdenv.mkDerivation rec { substituteInPlace ./cmst.pro \ --replace "/usr/bin" "$out/bin" \ --replace "/usr/share" "$out/usr/share" + + substituteInPlace ./cmst.pri \ + --replace "/usr/lib" "$out/lib" \ + --replace "/usr/share" "$out/share" + + substituteInPlace ./apps/cmstapp/cmstapp.pro \ + --replace "/usr/bin" "$out/bin" \ + --replace "/usr/share" "$out/share" + + substituteInPlace ./apps/rootapp/rootapp.pro \ + --replace "/etc" "$out/etc" \ + --replace "/usr/share" "$out/share" + ''; buildPhase = '' diff --git a/pkgs/tools/networking/connect/default.nix b/pkgs/tools/networking/connect/default.nix index 8723c53c322..5ccbc8d0cae 100644 --- a/pkgs/tools/networking/connect/default.nix +++ b/pkgs/tools/networking/connect/default.nix @@ -1,22 +1,21 @@ { stdenv, fetchurl }: -stdenv.mkDerivation rec { - name = "connect-1.95"; +let + + version = "1.104"; + +in stdenv.mkDerivation { + name = "connect-${version}"; src = fetchurl { - url = http://savannah.gnu.org/maintenance/connect.c; - sha256 = "11dx07pcanwaq71g4xh8d4blr5j7iy0ilmb0fkgpj8p22blb74mf"; + url = "https://bitbucket.org/gotoh/connect/get/${version}.tar.bz2"; + sha256 = "0h7bfh1b2kcw5ddpbif57phdxpf8if0cm01pgwc6avp6dqxcsqp2"; }; - phases = "unpackPhase buildPhase fixupPhase"; + makeFlags = [ "CC=cc" ]; # gcc and/or clang compat - unpackPhase = '' - cp $src connect.c - ''; - - buildPhase = '' - mkdir -p $out/bin - gcc -o $out/bin/connect connect.c + installPhase = '' + install -D -m ugo=rx connect $out/bin/connect ''; meta = { @@ -25,7 +24,7 @@ stdenv.mkDerivation rec { This proxy traversal tool is intended to assist OpenSSH (via ProxyCommand in ~/.ssh/config) and GIT (via $GIT_PROXY_COMMAND) utilize SOCKS and https proxies. ''; - homepage = http://bent.latency.net/bent/git/goto-san-connect-1.85/src/connect.html; # source URL is busted there + homepage = https://bitbucket.org/gotoh/connect/wiki/Home; license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.gnu; maintainers = with stdenv.lib.maintainers; [ jcumming ]; diff --git a/pkgs/tools/networking/connman/default.nix b/pkgs/tools/networking/connman/default.nix index 7d955b44950..8194dc990c6 100644 --- a/pkgs/tools/networking/connman/default.nix +++ b/pkgs/tools/networking/connman/default.nix @@ -2,12 +2,13 @@ openvpn, vpnc, glib, dbus, iptables, gnutls, policykit, polkit, wpa_supplicant, readline6, pptp, ppp, tree }: -stdenv.mkDerivation { - name = "connman-1.24"; +stdenv.mkDerivation rec { + name = "connman-${version}"; + version = "1.26"; src = fetchgit { url = "git://git.kernel.org/pub/scm/network/connman/connman.git"; - rev = "11b8a873988ab5fc3f360c5b6fb25a6761fe7683"; - sha256 = "12z1krm5qnjyamc3qr2px7wvz7qkss7jk5brnmhyalqmcnkwcbrm"; + rev = "refs/tags/${version}"; + sha256 = "0pj404iyq6x9x4i2dwqk1dx95yglx7pvkm8cvh13bf50dim92cv9"; }; buildInputs = [ autoconf automake libtool pkgconfig openconnect polkit diff --git a/pkgs/tools/networking/curl/7.15.nix b/pkgs/tools/networking/curl/7.15.nix index 0a87eaa944c..2b13437d95c 100644 --- a/pkgs/tools/networking/curl/7.15.nix +++ b/pkgs/tools/networking/curl/7.15.nix @@ -32,6 +32,12 @@ stdenv.mkDerivation rec { preConfigure = '' sed -e 's|/usr/bin|/no-such-path|g' -i.bak configure ''; + + # make curl honor CURL_CA_BUNDLE & SSL_CERT_FILE + postConfigure = '' + echo '#define CURL_CA_BUNDLE (getenv("CURL_CA_BUNDLE") || getenv("SSL_CERT_FILE"))' >> lib/curl_config.h + ''; + configureFlags = [ ( if sslSupport then "--with-ssl=${openssl}" else "--without-ssl" ) ( if scpSupport then "--with-libssh2=${libssh2}" else "--without-libssh2" ) @@ -43,7 +49,6 @@ stdenv.mkDerivation rec { dontDisableStatic = linkStatic; - CFLAGS = if stdenv ? isDietLibC then "-DHAVE_INET_NTOA_R_2_ARGS=1" else ""; LDFLAGS = if linkStatic then "-static" else ""; CXX = "g++"; CXXCPP = "g++ -E"; diff --git a/pkgs/tools/networking/curl/default.nix b/pkgs/tools/networking/curl/default.nix index 85b935ebd76..b54df60ef0a 100644 --- a/pkgs/tools/networking/curl/default.nix +++ b/pkgs/tools/networking/curl/default.nix @@ -4,7 +4,6 @@ , scpSupport ? false, libssh2 ? null , gssSupport ? false, gss ? null , c-aresSupport ? false, c-ares ? null -, linkStatic ? false }: assert zlibSupport -> zlib != null; @@ -36,35 +35,28 @@ stdenv.mkDerivation rec { rm src/tool_hugehelp.c ''; + # make curl honor CURL_CA_BUNDLE & SSL_CERT_FILE + postConfigure = '' + echo '#define CURL_CA_BUNDLE (getenv("CURL_CA_BUNDLE") ? getenv("CURL_CA_BUNDLE") : getenv("SSL_CERT_FILE"))' >> lib/curl_config.h + ''; + configureFlags = [ ( if sslSupport then "--with-ssl=${openssl}" else "--without-ssl" ) ( if scpSupport then "--with-libssh2=${libssh2}" else "--without-libssh2" ) ] ++ stdenv.lib.optional c-aresSupport "--enable-ares=${c-ares}" - ++ stdenv.lib.optional gssSupport "--with-gssapi=${gss}" - ++ stdenv.lib.optionals linkStatic [ "--enable-static" "--disable-shared" ] - ; + ++ stdenv.lib.optional gssSupport "--with-gssapi=${gss}"; - dontDisableStatic = linkStatic; - - CFLAGS = if stdenv ? isDietLibC then "-DHAVE_INET_NTOA_R_2_ARGS=1" else ""; - LDFLAGS = if linkStatic then "-static" else ""; CXX = "g++"; CXXCPP = "g++ -E"; - # libtool hack to get a static binary. Notice that to 'configure' I passed - # other LDFLAGS, because it doesn't use libtool for linking in the tests. - makeFlags = if linkStatic then "LDFLAGS=-all-static" else ""; - crossAttrs = { # We should refer to the cross built openssl # For the 'urandom', maybe it should be a cross-system option configureFlags = [ ( if sslSupport then "--with-ssl=${openssl.crossDrv}" else "--without-ssl" ) "--with-random /dev/urandom" - ] - ++ stdenv.lib.optionals linkStatic [ "--enable-static" "--disable-shared" ] - ; + ]; }; passthru = { diff --git a/pkgs/tools/networking/dhcpcd/default.nix b/pkgs/tools/networking/dhcpcd/default.nix index 927d60e8124..c84a140d4bc 100644 --- a/pkgs/tools/networking/dhcpcd/default.nix +++ b/pkgs/tools/networking/dhcpcd/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, udev }: stdenv.mkDerivation rec { - name = "dhcpcd-6.5.1"; + name = "dhcpcd-6.6.6"; src = fetchurl { url = "mirror://roy/dhcpcd/${name}.tar.bz2"; - sha256 = "0y0falxxlahr2i630ydraq4ldr7d5mg8ar0s5np5ddl76w58dlrp"; + sha256 = "0893gixhz68ngqa1vcshmvkwy58kmlj3f1qvd877sgrir06bpg96"; }; patches = [ /* ./lxc_ro_promote_secondaries.patch */ ]; diff --git a/pkgs/tools/networking/dnstop/default.nix b/pkgs/tools/networking/dnstop/default.nix index 00984a4ee70..c1a41d98f4b 100644 --- a/pkgs/tools/networking/dnstop/default.nix +++ b/pkgs/tools/networking/dnstop/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation { meta = { description = "libpcap application that displays DNS traffic on your network"; - homepage = "http://dns.measurement-factory.com/tools/dnstop"; - license = "BSD"; + homepage = http://dns.measurement-factory.com/tools/dnstop; + license = stdenv.lib.licenses.bsd3; }; } diff --git a/pkgs/tools/networking/dropbear/default.nix b/pkgs/tools/networking/dropbear/default.nix index c9b0101a7e6..15422d81f41 100644 --- a/pkgs/tools/networking/dropbear/default.nix +++ b/pkgs/tools/networking/dropbear/default.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { # http://www.gnu.org/software/make/manual/html_node/Libraries_002fSearch.html preConfigure = '' - makeFlags=VPATH=`cat $NIX_GCC/nix-support/orig-libc`/lib + makeFlags=VPATH=`cat $NIX_CC/nix-support/orig-libc`/lib ''; crossAttrs = { # This works for uclibc, at least. preConfigure = '' - makeFlags=VPATH=`cat ${stdenv.gccCross}/nix-support/orig-libc`/lib + makeFlags=VPATH=`cat ${stdenv.ccCross}/nix-support/orig-libc`/lib ''; }; diff --git a/pkgs/tools/networking/inadyn/default.nix b/pkgs/tools/networking/inadyn/default.nix index a821684e5b4..7e4d5fbe5f0 100644 --- a/pkgs/tools/networking/inadyn/default.nix +++ b/pkgs/tools/networking/inadyn/default.nix @@ -17,6 +17,8 @@ stdenv.mkDerivation { buildInputs = [ gnutls ]; + NIX_CFLAGS_COMPILE = "-Wno-error=cpp"; + meta = { homepage = http://inadyn.sourceforge.net/; description = "Free dynamic DNS client"; diff --git a/pkgs/tools/networking/mu/default.nix b/pkgs/tools/networking/mu/default.nix index e83b935ff22..924eb2f9f42 100644 --- a/pkgs/tools/networking/mu/default.nix +++ b/pkgs/tools/networking/mu/default.nix @@ -3,12 +3,12 @@ , gtk3, webkit, libsoup, icu, withMug ? false /* doesn't build with current gtk3 */ }: stdenv.mkDerivation rec { - version = "0.9.10"; + version = "0.9.11"; name = "mu-${version}"; src = fetchurl { url = "https://github.com/djcb/mu/archive/v${version}.tar.gz"; - sha256 = "0yrkzf0czp85fd3g4zh95z648lsvkc4g2r8xbjn48xgba1ygqbyq"; + sha256 = "01n1lzq4pfsm5pn932p948d1z55yqc7kkm1ifjxjchb3k8lr66fh"; }; buildInputs = diff --git a/pkgs/tools/networking/network-manager/default.nix b/pkgs/tools/networking/network-manager/default.nix index ed4b3812e28..505f42d2f3d 100644 --- a/pkgs/tools/networking/network-manager/default.nix +++ b/pkgs/tools/networking/network-manager/default.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { [ ( substituteAll { src = ./nixos-purity.patch; inherit avahi dnsmasq ppp bind; - glibc = stdenv.gcc.libc; + glibc = stdenv.cc.libc; }) ./libnl-3.2.25.patch ]; diff --git a/pkgs/tools/networking/ntp/default.nix b/pkgs/tools/networking/ntp/default.nix index 465f15184f1..fca6f2e34ad 100644 --- a/pkgs/tools/networking/ntp/default.nix +++ b/pkgs/tools/networking/ntp/default.nix @@ -1,21 +1,19 @@ -{ stdenv, fetchurl, libcap }: +{ stdenv, fetchurl, pkgconfig, libcap, openssl }: assert stdenv.isLinux -> libcap != null; stdenv.mkDerivation rec { - name = "ntp-4.2.6p5"; + name = "ntp-4.2.8"; src = fetchurl { url = "http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/${name}.tar.gz"; - sha256 = "077r69a41hasl8zf5c44km7cqgfhrkaj6a4jnr75j7nkz5qq7ayn"; + sha256 = "1vnqa1542d01xmlkw8f3rq57y360b2j7yxkkg9b11955nvw0v4if"; }; - configureFlags = '' - --without-crypto - ${if stdenv.isLinux then "--enable-linuxcaps" else ""} - ''; + nativeBuildInputs = [ pkgconfig ]; - buildInputs = stdenv.lib.optional stdenv.isLinux libcap; + buildInputs = [ openssl ] + ++ stdenv.lib.optional stdenv.isLinux libcap; meta = { homepage = http://www.ntp.org/; diff --git a/pkgs/tools/networking/openssh/default.nix b/pkgs/tools/networking/openssh/default.nix index 05b97bdcaac..19957de5d1c 100644 --- a/pkgs/tools/networking/openssh/default.nix +++ b/pkgs/tools/networking/openssh/default.nix @@ -75,5 +75,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.bsd2; platforms = platforms.unix; maintainers = with maintainers; [ eelco ]; + broken = hpnSupport; # probably after 6.7 update }; } diff --git a/pkgs/tools/networking/openvpn/update-resolv-conf.nix b/pkgs/tools/networking/openvpn/update-resolv-conf.nix index 37d38555e61..3afa17b0a82 100644 --- a/pkgs/tools/networking/openvpn/update-resolv-conf.nix +++ b/pkgs/tools/networking/openvpn/update-resolv-conf.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Script to update your /etc/resolv.conf with DNS settings that come from the received push dhcp-options"; homepage = https://github.com/masterkorp/openvpn-update-resolv-conf/; - maintainer = maintainers.abbradar; + maintainers = maintainers.abbradar; license = licenses.gpl2; platforms = platforms.unix; }; diff --git a/pkgs/tools/networking/oslrd/default.nix b/pkgs/tools/networking/oslrd/default.nix index 44f32e93474..90f686f77ea 100644 --- a/pkgs/tools/networking/oslrd/default.nix +++ b/pkgs/tools/networking/oslrd/default.nix @@ -16,8 +16,8 @@ stdenv.mkDerivation rec { meta = { description = "An adhoc wireless mesh routing daemon"; - license = "BSD"; - homepage = "http://olsr.org/"; + license = stdenv.lib.licenses.bsd3; + homepage = http://olsr.org/; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; }; diff --git a/pkgs/tools/networking/par2cmdline/default.nix b/pkgs/tools/networking/par2cmdline/default.nix index bb5bee8868f..20446387f4a 100644 --- a/pkgs/tools/networking/par2cmdline/default.nix +++ b/pkgs/tools/networking/par2cmdline/default.nix @@ -1,22 +1,28 @@ -{stdenv, fetchurl}: +{stdenv, fetchzip, autoconf, automake}: -stdenv.mkDerivation { - name = "par2cmdline-0.4"; - - src = fetchurl { - url = mirror://sourceforge/parchive/par2cmdline-0.4.tar.gz; - sha256 = "0xznx4vgf9nd0ijm2xi2zrb42wb891ypa948z54q5jkvrzdvfcly"; +stdenv.mkDerivation rec { + name = "par2cmdline-${version}"; + version = "0.6.11"; + + src = fetchzip { + url = "https://github.com/BlackIkeEagle/par2cmdline/archive/v${version}.tar.gz"; + sha256 = "0maywssv468ia7rf8jyq4axwahgli3nfykl7x3zip503psywjj8a"; }; - patches = [ - (fetchurl { - url = "http://sources.gentoo.org/viewcvs.py/*checkout*/gentoo-x86/app-arch/par2cmdline/files/par2cmdline-0.4-gcc4.patch?rev=1.1.1.1"; - sha256 = "1xrkr13qw5vqi2qbr2p43nqbq83nywk4bgvq7nfvrca4z60s787d"; - }) - ]; + buildInputs = [ autoconf automake ]; + + preConfigure = "autoreconf"; meta = { - homepage = http://parchive.sourceforge.net/; - description = "A command-line tool for repairing downloaded files using PARs (parity archives)"; + homepage = https://github.com/BlackIkeEagle/par2cmdline; + description = "PAR 2.0 compatible file verification and repair tool"; + longDescription = '' + par2cmdline is a program for creating and using PAR2 files to detect + damage in data files and repair them if necessary. It can be used with + any kind of file. + ''; + license = stdenv.lib.licenses.gpl2Plus; + maintainers = with stdenv.lib.maintainers; [ muflax ]; + }; } diff --git a/pkgs/tools/networking/ppp/default.nix b/pkgs/tools/networking/ppp/default.nix index 6f6f2a0da55..ad69f5751a0 100644 --- a/pkgs/tools/networking/ppp/default.nix +++ b/pkgs/tools/networking/ppp/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { [ ( substituteAll { src = ./nix-purity.patch; inherit libpcap; - glibc = stdenv.gcc.libc; + glibc = stdenv.cc.libc; }) ./nonpriv.patch ]; diff --git a/pkgs/tools/networking/privoxy/default.nix b/pkgs/tools/networking/privoxy/default.nix index c6a57c238a4..2d213690729 100644 --- a/pkgs/tools/networking/privoxy/default.nix +++ b/pkgs/tools/networking/privoxy/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, autoreconfHook, zlib, pcre, w3m, man }: stdenv.mkDerivation { - name = "privoxy-3.0.21"; + name = "privoxy-3.0.22"; src = fetchurl { - url = mirror://sourceforge/ijbswa/Sources/3.0.21%20%28stable%29/privoxy-3.0.21-stable-src.tar.gz; - sha256 = "1f6xb7aa47p90c26vqaw74y6drs9gpnhxsgby3mx0awdjh0ydisy"; + url = mirror://sourceforge/ijbswa/Sources/3.0.22%20%28stable%29/privoxy-3.0.22-stable-src.tar.gz; + sha256 = "0hfcxyb0i7dr6jfxw0y4kqcr09p8gjvcs7igyizyl5in3zn4y88s"; }; buildInputs = [ autoreconfHook zlib pcre w3m man ]; diff --git a/pkgs/tools/networking/slimrat/default.nix b/pkgs/tools/networking/slimrat/default.nix index 9006fadfcdb..f73a1bc5bcc 100644 --- a/pkgs/tools/networking/slimrat/default.nix +++ b/pkgs/tools/networking/slimrat/default.nix @@ -26,6 +26,6 @@ stdenv.mkDerivation { meta = { homepage = http://code.google.com/p/slimrat/; description = "Linux Rapidshare downloader"; - license = "BSD"; + license = stdenv.lib.licenses.mit; }; } diff --git a/pkgs/tools/networking/strongswan/default.nix b/pkgs/tools/networking/strongswan/default.nix index a41bc5e5b8f..871cd3e8f47 100644 --- a/pkgs/tools/networking/strongswan/default.nix +++ b/pkgs/tools/networking/strongswan/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, gmp, pkgconfig, python }: +{ stdenv, fetchurl, gmp, pkgconfig, python, autoreconfHook }: stdenv.mkDerivation rec { name = "strongswan-5.2.1"; @@ -10,7 +10,13 @@ stdenv.mkDerivation rec { dontPatchELF = true; - buildInputs = [ gmp pkgconfig python ]; + buildInputs = [ gmp pkgconfig python autoreconfHook ]; + + patches = [ + ./ext_auth-path.patch + ./firewall_defaults.patch + ./updown-path.patch + ]; configureFlags = [ "--enable-swanctl" "--enable-cmd" ]; diff --git a/pkgs/tools/networking/strongswan/ext_auth-path.patch b/pkgs/tools/networking/strongswan/ext_auth-path.patch new file mode 100644 index 00000000000..397537ad8d8 --- /dev/null +++ b/pkgs/tools/networking/strongswan/ext_auth-path.patch @@ -0,0 +1,13 @@ +Index: strongswan-5.2.1/src/libcharon/plugins/ext_auth/ext_auth_listener.c +=================================================================== +--- strongswan-5.2.1.orig/src/libcharon/plugins/ext_auth/ext_auth_listener.c ++++ strongswan-5.2.1/src/libcharon/plugins/ext_auth/ext_auth_listener.c +@@ -101,6 +101,8 @@ METHOD(listener_t, authorize, bool, + + *success = FALSE; + ++ push_env(envp, countof(envp), "PATH=%s", getenv("PATH")); ++ + push_env(envp, countof(envp), "IKE_UNIQUE_ID=%u", + ike_sa->get_unique_id(ike_sa)); + push_env(envp, countof(envp), "IKE_NAME=%s", diff --git a/pkgs/tools/networking/strongswan/firewall_defaults.patch b/pkgs/tools/networking/strongswan/firewall_defaults.patch new file mode 100644 index 00000000000..12c446c8c9a --- /dev/null +++ b/pkgs/tools/networking/strongswan/firewall_defaults.patch @@ -0,0 +1,32 @@ +Index: strongswan-5.2.1/src/starter/confread.c +=================================================================== +--- strongswan-5.2.1.orig/src/starter/confread.c ++++ strongswan-5.2.1/src/starter/confread.c +@@ -43,7 +43,7 @@ + static const char ike_defaults[] = "aes128-sha1-modp2048,3des-sha1-modp1536"; + static const char esp_defaults[] = "aes128-sha1,3des-sha1"; + +-static const char firewall_defaults[] = IPSEC_SCRIPT " _updown iptables"; ++static const char firewall_defaults[] = IPSEC_SBINDIR "/" IPSEC_SCRIPT " _updown iptables"; + + /** + * Provided by GPERF +Index: strongswan-5.2.1/src/starter/Makefile.am +=================================================================== +--- strongswan-5.2.1.orig/src/starter/Makefile.am ++++ strongswan-5.2.1/src/starter/Makefile.am +@@ -18,10 +18,12 @@ AM_CPPFLAGS = \ + -I$(top_srcdir)/src/libhydra \ + -I$(top_srcdir)/src/starter \ + -I$(top_srcdir)/src/stroke \ +- -DIPSEC_DIR=\"${ipsecdir}\" \ ++ -DIPSEC_BINDIR=\"${bindir}\" \ + -DIPSEC_CONFDIR=\"${sysconfdir}\" \ +- -DIPSEC_PIDDIR=\"${piddir}\" \ ++ -DIPSEC_DIR=\"${ipsecdir}\" \ + -DIPSEC_EAPDIR=\"${eapdir}\" \ ++ -DIPSEC_PIDDIR=\"${piddir}\" \ ++ -DIPSEC_SBINDIR=\"${sbindir}\" \ + -DIPSEC_SCRIPT=\"${ipsec_script}\" \ + -DDEV_RANDOM=\"${random_device}\" \ + -DDEV_URANDOM=\"${urandom_device}\" \ diff --git a/pkgs/tools/networking/strongswan/updown-path.patch b/pkgs/tools/networking/strongswan/updown-path.patch new file mode 100644 index 00000000000..f01da7d7bce --- /dev/null +++ b/pkgs/tools/networking/strongswan/updown-path.patch @@ -0,0 +1,26 @@ +Index: strongswan-5.2.1/src/_updown/_updown.in +=================================================================== +--- strongswan-5.2.1.orig/src/_updown/_updown.in ++++ strongswan-5.2.1/src/_updown/_updown.in +@@ -125,7 +125,7 @@ + # + + # define a minimum PATH environment in case it is not set +-PATH="/sbin:/bin:/usr/sbin:/usr/bin:@sbindir@" ++PATH="${PATH:-/sbin:/bin:/usr/sbin:/usr/bin}" + export PATH + + # uncomment to log VPN connections +Index: strongswan-5.2.1/src/libcharon/plugins/updown/updown_listener.c +=================================================================== +--- strongswan-5.2.1.orig/src/libcharon/plugins/updown/updown_listener.c ++++ strongswan-5.2.1/src/libcharon/plugins/updown/updown_listener.c +@@ -240,6 +240,8 @@ static void invoke_once(private_updown_l + process_t *process; + char *envp[128] = {}; + ++ push_env(envp, countof(envp), "PATH=%s", getenv("PATH")); ++ + me = ike_sa->get_my_host(ike_sa); + other = ike_sa->get_other_host(ike_sa); + diff --git a/pkgs/tools/networking/tinc/pre.nix b/pkgs/tools/networking/tinc/pre.nix index 037fddac4d5..b1261257846 100644 --- a/pkgs/tools/networking/tinc/pre.nix +++ b/pkgs/tools/networking/tinc/pre.nix @@ -1,12 +1,12 @@ { stdenv, fetchgit, autoreconfHook, texinfo, ncurses, readline, zlib, lzo, openssl }: stdenv.mkDerivation rec { - name = "tinc-1.1pref57d53c"; + name = "tinc-1.1pre199573"; src = fetchgit { url = "git://tinc-vpn.org/tinc"; - rev = "f57d53c3ad9af89489e15a8cfd94b56937bf3179"; - sha256 = "0yangrl5krygdk8djryq50qfvxn0ng9zh3aj81q6shaji7gcgiyb"; + rev = "199573f1e834290290a1c278072a153b90443b05"; + sha256 = "0fdk99h742pv7aim1fjaxd5zz6qbabm43s307s6ncvcp1gp6l8x9"; }; buildInputs = [ autoreconfHook texinfo ncurses readline zlib lzo openssl ]; diff --git a/pkgs/tools/networking/trickle/default.nix b/pkgs/tools/networking/trickle/default.nix index 254dc168ec8..d10e645dc87 100644 --- a/pkgs/tools/networking/trickle/default.nix +++ b/pkgs/tools/networking/trickle/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { meta = { description = "Lightweight userspace bandwidth shaper"; - license = "BSD"; + license = stdenv.lib.licenses.bsd3; homepage = http://monkey.org/~marius/pages/?page=trickle; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/tools/package-management/cabal-install/1.20.0.3.nix b/pkgs/tools/package-management/cabal-install/1.20.0.4.nix similarity index 63% rename from pkgs/tools/package-management/cabal-install/1.20.0.3.nix rename to pkgs/tools/package-management/cabal-install/1.20.0.4.nix index 1a18222ed6b..a6222dfc688 100644 --- a/pkgs/tools/package-management/cabal-install/1.20.0.3.nix +++ b/pkgs/tools/package-management/cabal-install/1.20.0.4.nix @@ -1,35 +1,36 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, Cabal, filepath, HTTP, HUnit, mtl, network, QuickCheck -, random, stm, testFramework, testFrameworkHunit +{ cabal, Cabal, filepath, HTTP, HUnit, mtl, network, networkUri +, QuickCheck, random, stm, testFramework, testFrameworkHunit , testFrameworkQuickcheck2, time, zlib }: cabal.mkDerivation (self: { pname = "cabal-install"; - version = "1.20.0.3"; - sha256 = "050b9dc4khfc1fs283p1635zni25z4b55gi5ffwvg4mfpkrmdgfj"; + version = "1.20.0.4"; + sha256 = "171lkr8jw5k3l58gn41jmbp47kf3b8iq9dds0v8qx7wxzlxy0kz1"; isLibrary = false; isExecutable = true; buildDepends = [ - Cabal filepath HTTP mtl network random stm time zlib + Cabal filepath HTTP mtl network networkUri random stm time zlib ]; testDepends = [ Cabal filepath HTTP HUnit mtl network QuickCheck stm testFramework testFrameworkHunit testFrameworkQuickcheck2 time zlib ]; + doCheck = false; postInstall = '' mkdir $out/etc mv bash-completion $out/etc/bash_completion.d ''; patchPhase = '' - sed -i -e 's|random .*1.1,|random,|' cabal-install.cabal + sed -i -e 's|random .*< 1.1,|random,|' cabal-install.cabal ''; meta = { homepage = "http://www.haskell.org/cabal/"; description = "The command-line interface for Cabal and Hackage"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.andres ]; + maintainers = with self.stdenv.lib.maintainers; [ andres ]; }; }) diff --git a/pkgs/tools/package-management/nix-repl/default.nix b/pkgs/tools/package-management/nix-repl/default.nix index f812ea58a0b..35f4f36b473 100644 --- a/pkgs/tools/package-management/nix-repl/default.nix +++ b/pkgs/tools/package-management/nix-repl/default.nix @@ -1,17 +1,18 @@ -{ stdenv, fetchgit, nix, readline, boehmgc }: +{ lib, stdenv, fetchFromGitHub, nix, readline, boehmgc }: -with stdenv.lib; +let rev = "f92408136ed08804bab14b3e2a2def9b8effd7eb"; in -stdenv.mkDerivation rec { - name = "nix-repl-${getVersion nix}-${substring 0 7 src.rev}"; +stdenv.mkDerivation { + name = "nix-repl-${lib.getVersion nix}-${lib.substring 0 7 rev}"; - src = fetchgit { - url = https://github.com/edolstra/nix-repl.git; - rev = "1734e8a1491ef831c83c2620b6b0f4a590b67c1f"; - sha256 = "12fld2780jh3ww2n59s9z7afwjkmfhwh4dqn3wjva4ff8fx3n0mf"; + src = fetchFromGitHub { + owner = "edolstra"; + repo = "nix-repl"; + inherit rev; + sha256 = "1vl36d3n7hrw4vy2n358zx210ygkj4lmd8zsiifna6x7w7q388bj"; }; - buildInputs = [ nix readline boehmgc ]; + buildInputs = [ nix readline ]; buildPhase = "true"; @@ -19,18 +20,18 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out/bin - g++ -O3 -Wall -std=c++0x \ + $CXX -O3 -Wall -std=c++0x \ -o $out/bin/nix-repl nix-repl.cc \ -I${nix}/include/nix \ -lnixformat -lnixutil -lnixstore -lnixexpr -lnixmain -lreadline -lgc \ - -DNIX_VERSION=${(builtins.parseDrvName nix.name).version} + -DNIX_VERSION=\"${(builtins.parseDrvName nix.name).version}\" ''; meta = { homepage = https://github.com/edolstra/nix-repl; description = "An interactive environment for evaluating and building Nix expressions"; - maintainers = [ maintainers.eelco ]; - license = licenses.gpl3; + maintainers = [ lib.maintainers.eelco ]; + license = lib.licenses.gpl3; platforms = nix.meta.platforms; }; } diff --git a/pkgs/tools/package-management/nix-serve/default.nix b/pkgs/tools/package-management/nix-serve/default.nix new file mode 100644 index 00000000000..9b42a722e96 --- /dev/null +++ b/pkgs/tools/package-management/nix-serve/default.nix @@ -0,0 +1,40 @@ +{ lib, stdenv, fetchFromGitHub, perl, nix, perlPackages }: + +let rev = "4c24e3ffa7d267d67d87135e7ac4c9198e449cd3"; in + +stdenv.mkDerivation rec { + name = "nix-serve-0.1-${lib.substring 0 7 rev}"; + + src = fetchFromGitHub { + owner = "edolstra"; + repo = "nix-serve"; + inherit rev; + sha256 = "1c0ip4w00j86412l2qf0dwzjr9jzimiygbx82x15r46kr3cpk7kp"; + }; + + buildInputs = [ perl nix perlPackages.Plack perlPackages.Starman ]; + + buildPhase = "true"; + + # FIXME: unfortunate cut&paste. + installPhase = + '' + mkdir -p $out/libexec/nix-serve + cp nix-serve.psgi $out/libexec/nix-serve/nix-serve.psgi + + mkdir -p $out/bin + cat > $out/bin/nix-serve <&2 + exit 1 + fi +fi + +mkdir -p "$dbdir" +if ! [ -d "$dbdir" ]; then + echo "$0: error: '$dbdir' must be a writable directory" >&2 + exit 1 +fi + +echo "NSS database: $dbdir" +echo "BEID library: $libfile" + +dbdir="sql:$dbdir" + +case "$1" in +add) echo "Adding $dbentry to database:" + modutil -dbdir "$dbdir" -add "$dbentry" -libfile "$libfile" || + echo "Tip: try removing the module before adding it again." ;; +remove) echo "Removing $dbentry from database:" + modutil -dbdir "$dbdir" -delete "$dbentry" ;; +show) echo "Displaying $dbentry database entry, if any:" + echo "Note: this may fail if you don't have the correct permissions." ;; +*) echo "$0: unknown action: '$1'" >&2 + echo "Try --help for usage information." + exit 1 ;; +esac + +ret=$? + +modutil -dbdir "$dbdir" -list "$dbentry" 2>/dev/null + +exit $ret diff --git a/pkgs/tools/security/fprot/default.nix b/pkgs/tools/security/fprot/default.nix index b43ea402f6d..14a4c985d50 100644 --- a/pkgs/tools/security/fprot/default.nix +++ b/pkgs/tools/security/fprot/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { cp f-prot.conf.default $out/opt/f-prot/f-prot.conf ln -s $out/opt/f-prot/fpupdate $out/bin/fpupdate - patchelf --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" $out/opt/f-prot/fpupdate + patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $out/opt/f-prot/fpupdate mkdir -p $out/share/man/ mkdir -p $out/share/man/man1 diff --git a/pkgs/tools/security/gnupg/21.nix b/pkgs/tools/security/gnupg/21.nix index e1f849560c8..75510c94606 100644 --- a/pkgs/tools/security/gnupg/21.nix +++ b/pkgs/tools/security/gnupg/21.nix @@ -5,14 +5,14 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "gnupg-2.1.0"; + name = "gnupg-2.1.1"; src = fetchurl { url = "mirror://gnupg/gnupg/${name}.tar.bz2"; - sha256 = "12q5shx6ldqad3rky154nv8f2cy57sxy9idivz93ggqm1bsw7a0n"; + sha256 = "0jffj23a02gw7gmrh9j9ynp50bvl2pc2y74i9ii65nvm50fx1v3h"; }; - patches = [ ./socket-activate.patch ]; + patches = [ ./socket-activate-2.1.1.patch ]; buildInputs = [ pkgconfig libgcrypt libassuan libksba npth diff --git a/pkgs/tools/security/gnupg/socket-activate.patch b/pkgs/tools/security/gnupg/socket-activate-2.1.1.patch similarity index 61% rename from pkgs/tools/security/gnupg/socket-activate.patch rename to pkgs/tools/security/gnupg/socket-activate-2.1.1.patch index 02aa0652e03..2c2d7b54250 100644 --- a/pkgs/tools/security/gnupg/socket-activate.patch +++ b/pkgs/tools/security/gnupg/socket-activate-2.1.1.patch @@ -1,19 +1,9 @@ -From 8fde13d07c0059040ed531ca3ac365f5780ff240 Mon Sep 17 00:00:00 2001 -From: Shea Levy -Date: Tue, 18 Nov 2014 14:34:53 -0500 -Subject: [PATCH] gpg-agent: Enable socket activation +Port Shea Levy's socket activation patch to version 2.1.1. -This allows gpg-agent to be managed by tools such as systemd or launchd ---- - agent/gpg-agent.c | 62 ++++++++++++++++++++++++++++++++++++------------------ - doc/gpg-agent.texi | 21 +++++++++++++++++- - 2 files changed, 61 insertions(+), 22 deletions(-) - -diff --git a/agent/gpg-agent.c b/agent/gpg-agent.c -index 5960fe3..2f06982 100644 ---- a/agent/gpg-agent.c -+++ b/agent/gpg-agent.c -@@ -124,7 +124,9 @@ enum cmd_and_opt_values +diff -Naur gnupg-2.1.1-upstream/agent/gpg-agent.c gnupg-2.1.1/agent/gpg-agent.c +--- gnupg-2.1.1-upstream/agent/gpg-agent.c 2014-12-01 05:04:57.000000000 -0430 ++++ gnupg-2.1.1/agent/gpg-agent.c 2014-12-23 17:13:48.029286035 -0430 +@@ -125,7 +125,9 @@ oPuttySupport, oDisableScdaemon, oDisableCheckOwnSocket, @@ -24,22 +14,22 @@ index 5960fe3..2f06982 100644 }; -@@ -138,6 +140,8 @@ static ARGPARSE_OPTS opts[] = { - { 301, NULL, 0, N_("@Options:\n ") }, +@@ -143,6 +145,8 @@ + ARGPARSE_group (301, N_("@Options:\n ")), - { oDaemon, "daemon", 0, N_("run in daemon mode (background)") }, -+ { oAgentFD, "agent-fd", 1, "@" }, -+ { oSSHAgentFD, "ssh-agent-fd", 1, "@" }, - { oServer, "server", 0, N_("run in server mode (foreground)") }, - { oVerbose, "verbose", 0, N_("verbose") }, - { oQuiet, "quiet", 0, N_("be somewhat more quiet") }, -@@ -596,6 +600,31 @@ parse_rereadable_options (ARGPARSE_ARGS *pargs, int reread) + ARGPARSE_s_n (oDaemon, "daemon", N_("run in daemon mode (background)")), ++ ARGPARSE_s_i (oAgentFD, "agent-fd", "@"), ++ ARGPARSE_s_i (oSSHAgentFD, "ssh-agent-fd", "@"), + ARGPARSE_s_n (oServer, "server", N_("run in server mode (foreground)")), + ARGPARSE_s_n (oVerbose, "verbose", N_("verbose")), + ARGPARSE_s_n (oQuiet, "quiet", N_("be somewhat more quiet")), +@@ -627,6 +631,31 @@ return 1; /* handled */ } +/* Handle agent socket(s) */ +static void -+handle_agent_socks(int fd, int fd_ssh) ++handle_agent_socks(int fd, int fd_extra, int fd_ssh) +{ +#ifndef HAVE_W32_SYSTEM + if (chdir("/")) @@ -59,13 +49,13 @@ index 5960fe3..2f06982 100644 +#endif /*!HAVE_W32_SYSTEM*/ + + log_info ("%s %s started\n", strusage(11), strusage(13) ); -+ handle_connections (fd, fd_ssh); ++ handle_connections (fd, fd_extra, fd_ssh); + assuan_sock_close (fd); +} /* The main entry point. */ int -@@ -612,6 +641,8 @@ main (int argc, char **argv ) +@@ -643,6 +672,8 @@ int default_config =1; int pipe_server = 0; int is_daemon = 0; @@ -74,7 +64,7 @@ index 5960fe3..2f06982 100644 int nodetach = 0; int csh_style = 0; char *logfile = NULL; -@@ -819,6 +850,8 @@ main (int argc, char **argv ) +@@ -850,6 +881,8 @@ case oSh: csh_style = 0; break; case oServer: pipe_server = 1; break; case oDaemon: is_daemon = 1; break; @@ -83,7 +73,7 @@ index 5960fe3..2f06982 100644 case oDisplay: default_display = xstrdup (pargs.r.ret_str); break; case oTTYname: default_ttyname = xstrdup (pargs.r.ret_str); break; -@@ -904,7 +937,8 @@ main (int argc, char **argv ) +@@ -940,7 +973,8 @@ bind_textdomain_codeset (PACKAGE_GT, "UTF-8"); #endif @@ -93,18 +83,18 @@ index 5960fe3..2f06982 100644 { /* We have been called without any options and thus we merely check whether an agent is already running. We do this right -@@ -1054,6 +1088,10 @@ main (int argc, char **argv ) +@@ -1090,6 +1124,10 @@ agent_deinit_default_ctrl (ctrl); xfree (ctrl); } + else if (fd_agent != GNUPG_INVALID_FD) + { -+ handle_agent_socks(fd_agent, fd_ssh_agent); ++ handle_agent_socks(fd_agent, GNUPG_INVALID_FD, fd_ssh_agent); + } else if (!is_daemon) ; /* NOTREACHED */ else -@@ -1238,26 +1276,8 @@ main (int argc, char **argv ) +@@ -1287,26 +1325,8 @@ log_set_prefix (NULL, oldflags | JNLIB_LOG_RUN_DETACHED); opt.running_detached = 1; } @@ -123,19 +113,19 @@ index 5960fe3..2f06982 100644 - sa.sa_flags = 0; - sigaction (SIGPIPE, &sa, NULL); - } - #endif /*!HAVE_W32_SYSTEM*/ +-#endif /*!HAVE_W32_SYSTEM*/ - - log_info ("%s %s started\n", strusage(11), strusage(13) ); -- handle_connections (fd, opt.ssh_support ? fd_ssh : GNUPG_INVALID_FD); +- handle_connections (fd, fd_extra, fd_ssh); - assuan_sock_close (fd); -+ handle_agent_socks(fd, opt.ssh_support ? fd_ssh : GNUPG_INVALID_FD); ++#endif /*!HAVE_W32_SYSTEM*/ ++ handle_agent_socks(fd, fd_extra, fd_ssh); } return 0; -diff --git a/doc/gpg-agent.texi b/doc/gpg-agent.texi -index a4079d7..1556e54 100644 ---- a/doc/gpg-agent.texi -+++ b/doc/gpg-agent.texi +diff -Naur gnupg-2.1.1-upstream/doc/gpg-agent.texi gnupg-2.1.1/doc/gpg-agent.texi +--- gnupg-2.1.1-upstream/doc/gpg-agent.texi 2014-12-05 09:56:37.000000000 -0430 ++++ gnupg-2.1.1/doc/gpg-agent.texi 2014-12-23 16:26:38.366391186 -0430 @@ -43,7 +43,15 @@ .IR file ] .RI [ options ] @@ -153,7 +143,7 @@ index a4079d7..1556e54 100644 @end ifset @mansect description -@@ -186,6 +194,11 @@ Yet another way is creating +@@ -186,6 +194,11 @@ a new process as a child of gpg-agent: @code{gpg-agent --daemon /bin/sh}. This way you get a new shell with the environment setup properly; if you exit from this shell, gpg-agent terminates as well. @@ -165,9 +155,9 @@ index a4079d7..1556e54 100644 @end table @mansect options -@@ -532,6 +545,12 @@ Ignore requests to change the current @code{tty} or X window system's - @code{DISPLAY} variable respectively. This is useful to lock the - pinentry to pop up at the @code{tty} or display you started the agent. +@@ -545,6 +558,12 @@ + remote machine. + +@item --ssh-agent-fd @var{fd} +@opindex ssh-agent-fd diff --git a/pkgs/tools/security/hashcat/default.nix b/pkgs/tools/security/hashcat/default.nix index 699901ad59e..806fcb613ca 100644 --- a/pkgs/tools/security/hashcat/default.nix +++ b/pkgs/tools/security/hashcat/default.nix @@ -4,10 +4,10 @@ assert stdenv.isLinux; let bits = if stdenv.system == "x86_64-linux" then "64" else "32"; - libPath = stdenv.lib.makeLibraryPath [ stdenv.gcc.libc ]; + libPath = stdenv.lib.makeLibraryPath [ stdenv.cc.libc ]; fixBin = x: '' - patchelf --interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" \ + patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ --set-rpath ${libPath} ${x} ''; in diff --git a/pkgs/tools/security/john/default.nix b/pkgs/tools/security/john/default.nix index 97f67dfbd71..fb1131b5f98 100644 --- a/pkgs/tools/security/john/default.nix +++ b/pkgs/tools/security/john/default.nix @@ -6,6 +6,7 @@ stdenv.mkDerivation rec { name = "JohnTheRipper-${version}"; version = "8a3e3c1d"; buildInputs = [ openssl nss nspr krb5 gmp zlib libpcap re2 ]; + NIX_CFLAGS_COMPILE = "-DJOHN_SYSTEMWIDE=1"; preConfigure = ''cd src''; installPhase = '' ensureDir $out/share/john/ diff --git a/pkgs/tools/security/lastpass-cli/default.nix b/pkgs/tools/security/lastpass-cli/default.nix new file mode 100644 index 00000000000..a3652f62232 --- /dev/null +++ b/pkgs/tools/security/lastpass-cli/default.nix @@ -0,0 +1,34 @@ +{ stdenv, lib, fetchFromGitHub, pkgconfig, openssl, curl, libxml2, libxslt, asciidoc, docbook_xsl }: + +stdenv.mkDerivation rec { + name = "lastpass-cli-${version}"; + + version = "0.4.0"; + + src = fetchFromGitHub { + owner = "lastpass"; + repo = "lastpass-cli"; + rev = "v${version}"; + sha256 = "1r06lifjc28sm88d6x3xwn76l9fjwjmd1wbmvr9j8rna889q0wl9"; + }; + + buildInputs = [ + openssl curl libxml2 pkgconfig asciidoc docbook_xsl libxslt + ]; + + prePatch = '' + substituteInPlace version.h --replace "0.3.0" "0.4.0" + ''; + + makeFlags = "PREFIX=$(out)"; + + installTargets = "install install-doc"; + + meta = with lib; { + description = "Stores, retrieves, generates, and synchronizes passwords securely"; + homepage = "https://github.com/lastpass/lastpass-cli"; + license = licenses.gpl2Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ cstrahan ]; + }; +} diff --git a/pkgs/tools/security/pinentry/default.nix b/pkgs/tools/security/pinentry/default.nix index 9dfd7ff9052..bd81b61e12a 100644 --- a/pkgs/tools/security/pinentry/default.nix +++ b/pkgs/tools/security/pinentry/default.nix @@ -6,11 +6,11 @@ assert useGtk || useNcurses || useQt4; stdenv.mkDerivation rec { - name = "pinentry-0.8.4"; + name = "pinentry-0.9.0"; src = fetchurl { url = "mirror://gnupg/pinentry/${name}.tar.bz2"; - sha256 = "04jnlfncj9d5rg0j4gmsi2l1q9q7c6gjbvxfnfh3nx6b8szv779m"; + sha256 = "1awhajq21hcjgqfxg9czaxg555gij4bba6axrwg8w6lfmc3ml14h"; }; buildInputs = let opt = stdenv.lib.optional; in [] diff --git a/pkgs/tools/security/polkit-kde-agent/default.nix b/pkgs/tools/security/polkit-kde-agent/default.nix index 7696ee93bce..b3990b53a87 100644 --- a/pkgs/tools/security/polkit-kde-agent/default.nix +++ b/pkgs/tools/security/polkit-kde-agent/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, kdelibs, polkit_qt_1, gettext }: +{ stdenv, fetchurl, kdelibs, polkit_qt4, gettext }: stdenv.mkDerivation rec { name = "polkit-kde-agent-1-0.99.0"; @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "0rxlq6x0vhvha8i6w109zpzzacp4imins55v4p4fq7a3k0kgywg3"; }; - buildInputs = [ kdelibs polkit_qt_1 ]; + buildInputs = [ kdelibs polkit_qt4 ]; nativeBuildInputs = [ gettext ]; diff --git a/pkgs/tools/security/srm/default.nix b/pkgs/tools/security/srm/default.nix new file mode 100644 index 00000000000..db14a5b0e0c --- /dev/null +++ b/pkgs/tools/security/srm/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + + name = "srm-" + version; + version = "1.2.14"; + + src = fetchurl { + url = "mirror://sourceforge/project/srm/1.2.14/srm-1.2.14.tar.gz"; + sha256 = "1irwwpb7yhmii2v4vz1fjkmmhw7w7qd1ak9arn9zfg3mgcnwl32q"; + }; + + meta = with stdenv.lib; { + description = "Delete files securely"; + longDescription = '' + srm (secure rm) is a command-line compatible rm(1) which + overwrites file contents before unlinking. The goal is to + provide drop in security for users who wish to prevent recovery + of deleted information, even if the machine is compromised. + ''; + homepage = "http://srm.sourceforge.net"; + license = licenses.mit; + maintainers = with maintainers; [ edwtjo ]; + platforms = platforms.linux; + }; + +} \ No newline at end of file diff --git a/pkgs/tools/security/sudo/default.nix b/pkgs/tools/security/sudo/default.nix index 1448aa93c7d..783bd1ad7ff 100644 --- a/pkgs/tools/security/sudo/default.nix +++ b/pkgs/tools/security/sudo/default.nix @@ -3,20 +3,20 @@ }: stdenv.mkDerivation rec { - name = "sudo-1.8.11"; + name = "sudo-1.8.11p2"; src = fetchurl { urls = [ "ftp://ftp.sudo.ws/pub/sudo/${name}.tar.gz" "ftp://ftp.sudo.ws/pub/sudo/OLD/${name}.tar.gz" ]; - sha256 = "0if82pvmz7m3qkj3sc9yy8mpcd7lmbn0mhrgnd1zpszvnpkps5x3"; + sha256 = "1bd1zf85q15z015268w9vchzwypzalc3v2dnddmwy67s32a88cw1"; }; configureFlags = [ "--with-env-editor" "--with-editor=/run/current-system/sw/bin/nano" - "--with-rundir=/var/run" + "--with-rundir=/run" "--with-vardir=/var/db/sudo" "--with-logpath=/var/log/sudo.log" "--with-sendmail=${sendmailPath}" @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - postInstall = + postInstall = '' rm -f $out/share/doc/sudo/ChangeLog ''; @@ -48,7 +48,7 @@ stdenv.mkDerivation rec { meta = { description = "A command to run commands as root"; - longDescription = + longDescription = '' Sudo (su "do") allows a system administrator to delegate authority to give certain users (or groups of users) the ability diff --git a/pkgs/tools/security/tcpcrypt/0001-Run-tcpcryptd-under-uid-93-instead-of-666.patch b/pkgs/tools/security/tcpcrypt/0001-Run-tcpcryptd-under-uid-93-instead-of-666.patch deleted file mode 100644 index addf00796a8..00000000000 --- a/pkgs/tools/security/tcpcrypt/0001-Run-tcpcryptd-under-uid-93-instead-of-666.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 4ef50d76a2da61be60fea448690e24f35bc37299 Mon Sep 17 00:00:00 2001 -From: Peter Simons -Date: Wed, 11 Sep 2013 17:19:29 +0200 -Subject: [PATCH] Run tcpcryptd under uid 93 instead of 666. - ---- - user/src/linux.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/user/src/linux.c b/user/src/linux.c -index b51e6b2..8199193 100644 ---- a/user/src/linux.c -+++ b/user/src/linux.c -@@ -198,7 +198,7 @@ void linux_drop_privs(void) - - cap_free(caps); - -- if (setuid(666) == -1) -+ if (setuid(93) == -1) - err(1, "setuid()"); - - caps = cap_init(); --- -1.8.3.4 - diff --git a/pkgs/tools/security/tcpcrypt/default.nix b/pkgs/tools/security/tcpcrypt/default.nix index 17c6993826d..be21f92cd76 100644 --- a/pkgs/tools/security/tcpcrypt/default.nix +++ b/pkgs/tools/security/tcpcrypt/default.nix @@ -1,26 +1,23 @@ -{ fetchurl, stdenv, autoconf, automake, libtool +{ fetchurl, stdenv, autoconf, automake, libtool, autoreconfHook , openssl, libcap, libnfnetlink, libnetfilter_queue }: -let - rev = "0e07772316061ad67b8770e7d98d5dd099c9c7c7"; -in stdenv.mkDerivation rec { - name = "tcpcrypt-2011.07.22"; + name = "tcpcrypt-0.3-rc1"; src = fetchurl { - url = "https://github.com/sorbo/tcpcrypt/archive/${rev}.tar.gz"; - sha256 = "1f1f1iawlvipnccwh31fxnb8yam1fgh36m0qcbc29qk1ggwrfnkk"; + url = "https://github.com/scslab/tcpcrypt/archive/v0.3-rc1.tar.gz"; + sha256 = "1k79xfip95kyy91b6rnmsgl66g52zrnm92ln4jms133nm2k9s4sa"; name = "${name}.tar.gz"; }; dontStrip = true; - buildInputs = [ autoconf automake libtool openssl libcap libnfnetlink libnetfilter_queue ]; + buildInputs = [ autoreconfHook autoconf automake libtool openssl libcap libnfnetlink libnetfilter_queue ]; - patches = [ ./0001-Run-tcpcryptd-under-uid-93-instead-of-666.patch ]; - - preConfigure = "cd user; autoreconf -i"; + postUnpack = '' + mkdir $sourceRoot/m4 + ''; meta = { homepage = "http://tcpcrypt.org/"; diff --git a/pkgs/tools/security/thc-hydra/default.nix b/pkgs/tools/security/thc-hydra/default.nix index 8b65b27b66b..29c29d6b93a 100644 --- a/pkgs/tools/security/thc-hydra/default.nix +++ b/pkgs/tools/security/thc-hydra/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, openssl, libidn, ncurses, pcre, libssh }: +{ stdenv, fetchurl, openssl, libidn, ncurses, pcre, libssh, postgresql92 }: with stdenv.lib; @@ -12,8 +12,8 @@ stdenv.mkDerivation rec { }; preConfigure = '' - substituteInPlace configure --replace "\$LIBDIRS" "${openssl}/lib ${pcre}/lib ${libssh}/lib" - substituteInPlace configure --replace "\$INCDIRS" "${openssl}/include ${pcre}/include ${libssh}/include" + substituteInPlace configure --replace "\$LIBDIRS" "${openssl}/lib ${pcre}/lib ${libssh}/lib ${postgresql92}/lib" + substituteInPlace configure --replace "\$INCDIRS" "${openssl}/include ${pcre}/include ${libssh}/include ${postgresql92}/include" ''; buildInputs = [ openssl libidn ncurses pcre libssh ]; diff --git a/pkgs/tools/security/tor/default.nix b/pkgs/tools/security/tor/default.nix index 8eddc992f9f..a6c8ecc2015 100644 --- a/pkgs/tools/security/tor/default.nix +++ b/pkgs/tools/security/tor/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, libevent, openssl, zlib }: +{ stdenv, fetchurl, libevent, openssl, zlib, torsocks }: stdenv.mkDerivation rec { name = "tor-0.2.5.10"; @@ -8,10 +8,20 @@ stdenv.mkDerivation rec { sha256 = "0fx8qnwh2f8ykfx0np4hyznjfi4xfy96z59pk96y3zyjvjjh5pdk"; }; - buildInputs = [ libevent openssl zlib ]; + # Note: torsocks is specified as a dependency, as the distributed + # 'torify' wrapper attempts to use it; although there is no + # ./configure time check for any of this. + buildInputs = [ libevent openssl zlib torsocks ]; CFLAGS = "-lgcc_s"; + # Patch 'torify' to point directly to torsocks. + patchPhase = '' + substituteInPlace contrib/client-tools/torify \ + --replace 'pathfind torsocks' true \ + --replace 'exec torsocks' 'exec ${torsocks}/bin/torsocks' + ''; + doCheck = true; meta = { @@ -31,7 +41,8 @@ stdenv.mkDerivation rec { license="mBSD"; - maintainers = with stdenv.lib.maintainers; [ phreedom ludo doublec ]; + maintainers = with stdenv.lib.maintainers; + [ phreedom ludo doublec thoughtpolice ]; platforms = stdenv.lib.platforms.gnu; # arbitrary choice }; } diff --git a/pkgs/tools/security/tor/tor-arm.nix b/pkgs/tools/security/tor/tor-arm.nix new file mode 100644 index 00000000000..6c4d61d825f --- /dev/null +++ b/pkgs/tools/security/tor/tor-arm.nix @@ -0,0 +1,52 @@ +{ stdenv, fetchurl, python, setuptools, lsof, nettools, makeWrapper +, pythonPackages, ncurses }: + +stdenv.mkDerivation rec { + name = "tor-arm-${version}"; + version = "1.4.5.0"; + + src = fetchurl { + url = "https://www.atagar.com/arm/resources/static/arm-${version}.tar.bz2"; + sha256 = "1yi87gdglkvi1a23hv5c3k7mc18g0rw7b05lfcw81qyxhlapf3pw"; + }; + + buildInputs = + [ python pythonPackages.curses setuptools lsof nettools makeWrapper ]; + + patchPhase = '' + substituteInPlace ./setup.py --replace "/usr/bin" "$out/bin" + substituteInPlace ./src/util/connections.py \ + --replace "lsof -wnPi" "${lsof}/bin/lsof" + substituteInPlace ./src/util/torTools.py \ + --replace "netstat -npl" "${nettools}/bin/netstat -npl" \ + --replace "lsof -wnPi" "${lsof}/bin/lsof" + + substituteInPlace ./arm --replace '"$0" = /usr/bin/arm' 'true' + substituteInPlace ./arm --replace "python" "${python}/bin/python" + + for i in ./install ./arm ./src/gui/controller.py ./src/cli/wizard.py ./src/resources/torrcOverride/override.h ./src/resources/torrcOverride/override.py ./src/resources/arm.1 ./setup.py; do + substituteInPlace $i --replace "/usr/share" "$out/share" + done + ''; + + installPhase = '' + mkdir -p $out/share/arm $out/bin $out/libexec + python setup.py install --prefix=$out + cp -R src/TorCtl $out/libexec + + for i in $(cd $out/bin && ls); do + wrapProgram $out/bin/$i \ + --prefix PYTHONPATH : "$(toPythonPath $out):$(toPythonPath ${pythonPackages.curses}):$out/libexec:$PYTHONPATH" \ + --set TERMINFO "${ncurses}/share/terminfo" \ + --set TERM "xterm" + done + ''; + + meta = { + description = "Anonymizing relay monitor for Tor"; + homepage = "https://www.atagar.com/arm/"; + license = stdenv.lib.licenses.gpl3; + platforms = stdenv.lib.platforms.unix; + maintainers = [ stdenv.lib.maintainers.thoughtpolice ]; + }; +} diff --git a/pkgs/tools/security/tor/torbrowser.nix b/pkgs/tools/security/tor/torbrowser.nix index 15660630201..b0209757c06 100644 --- a/pkgs/tools/security/tor/torbrowser.nix +++ b/pkgs/tools/security/tor/torbrowser.nix @@ -9,7 +9,7 @@ let torEnv = buildEnv { name = "tor-env"; paths = [ - stdenv.gcc.gcc zlib glib alsaLib dbus dbus_glib gtk atk pango freetype + stdenv.cc.gcc zlib glib alsaLib dbus dbus_glib gtk atk pango freetype fontconfig gdk_pixbuf cairo xlibs.libXrender xlibs.libX11 xlibs.libXext xlibs.libXt ]; @@ -20,18 +20,18 @@ let in stdenv.mkDerivation rec { name = "tor-browser-${version}"; - version = "4.0.1"; + version = "4.0.2"; src = fetchurl { url = "https://archive.torproject.org/tor-package-archive/torbrowser/${version}/tor-browser-linux${bits}-${version}_en-US.tar.xz"; sha256 = if bits == "64" then - "1cz36g7jfcz8xs7sa2fl44g1bxlrl0psbsx5hig6j5ydsl87vyak" else - "135ya109skzd4x8zhmsiwjg6d533yijbdrscm36lsplgcf7dx8l3"; + "02ibpkfq6cmr5dxgps9hr0dk1vgmda3m4g24yq6cg15sp94147mh" else + "1cxhkbdrwixfg81wwd6hdf5zbil12mff4yfqxzlwp55iqh49skry"; }; patchPhase = '' - patchelf --set-interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" Browser/firefox - patchelf --set-interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" Browser/TorBrowser/Tor/tor + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" Browser/firefox + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" Browser/TorBrowser/Tor/tor ''; doCheck = true; @@ -64,10 +64,11 @@ in stdenv.mkDerivation rec { buildInputs = [ stdenv ]; - meta = with stdenv.lib; { - description = "Tor Browser Bundle for GNU/Linux, everything you need to safely browse the Internet"; - homepage = https://www.torproject.org/; - platforms = ["i686-linux" "x86_64-linux"]; - maintainers = [ maintainers.offline maintainers.matejc maintainers.doublec ]; + meta = { + description = "Tor Browser Bundle"; + homepage = https://www.torproject.org/; + platforms = stdenv.lib.platforms.linux; + maintainers = with stdenv.lib.maintainers; + [ offline matejc doublec thoughtpolice ]; }; } diff --git a/pkgs/tools/security/tor/torsocks.nix b/pkgs/tools/security/tor/torsocks.nix index 7db547bbe1c..d4a725fa04a 100644 --- a/pkgs/tools/security/tor/torsocks.nix +++ b/pkgs/tools/security/tor/torsocks.nix @@ -1,13 +1,13 @@ -{ stdenv, fetchgit, autoreconfHook }: +{ stdenv, fetchgit, autoreconfHook, which }: + stdenv.mkDerivation rec { - pname = "torsocks"; - name = "${pname}-${version}"; - version = "1.3"; - + name = "torsocks-${version}"; + version = "2.0.0"; + src = fetchgit { - url = meta.repositories.git; - rev = "refs/tags/${version}"; - sha256 = "1cqplb36fkdb81kzf48xlxclf64wnp8r56x1gjayax1h6x4aal1w"; + url = meta.repositories.git; + rev = "refs/tags/v${version}"; + sha256 = "e3868ae8baadce1854cc9e604a5fcfa0433a15e4eb1223cc9da5b3c586db0048"; }; buildInputs = [ autoreconfHook ]; @@ -15,11 +15,17 @@ stdenv.mkDerivation rec { export configureFlags="$configureFlags --libdir=$out/lib" ''; + patchPhase = '' + substituteInPlace src/bin/torsocks.in \ + --replace which ${which}/bin/which + ''; + meta = { - description = "use socks-friendly applications with Tor"; - homepage = http://code.google.com/p/torsocks/; + description = "Wrapper to safely torify applications"; + homepage = http://code.google.com/p/torsocks/; repositories.git = https://git.torproject.org/torsocks.git; - license = stdenv.lib.licenses.gpl2; - maintainers = [ stdenv.lib.maintainers.phreedom ]; + license = stdenv.lib.licenses.gpl2; + platforms = stdenv.lib.platforms.unix; + maintainers = with stdenv.lib.maintainers; [ phreedom thoughtpolice ]; }; } diff --git a/pkgs/tools/system/collectd/default.nix b/pkgs/tools/system/collectd/default.nix index 4210a0a04a5..692016153a6 100644 --- a/pkgs/tools/system/collectd/default.nix +++ b/pkgs/tools/system/collectd/default.nix @@ -33,8 +33,6 @@ stdenv.mkDerivation rec { sha256 = "1q365zx6d1wyhv7n97bagfxqnqbhj2j14zz552nhmjviy8lj2ibm"; }; - NIX_LDFLAGS = "-lgcc_s"; # for pthread_cancel - buildInputs = [ pkgconfig curl iptables libcredis libdbi libgcrypt libmemcached cyrus_sasl libmodbus libnotify gdk_pixbuf liboping libpcap libsigrok libvirt @@ -45,6 +43,8 @@ stdenv.mkDerivation rec { # for some reason libsigrok isn't auto-detected configureFlags = stdenv.lib.optional (libsigrok != null) "--with-libsigrok"; + NIX_CFLAGS_COMPILE = "-Wno-error=cpp"; + meta = with stdenv.lib; { description = "Daemon which collects system performance statistics periodically"; homepage = http://collectd.org; diff --git a/pkgs/tools/system/freeipmi/default.nix b/pkgs/tools/system/freeipmi/default.nix index c07d5d98805..343e532e34b 100644 --- a/pkgs/tools/system/freeipmi/default.nix +++ b/pkgs/tools/system/freeipmi/default.nix @@ -1,12 +1,12 @@ { fetchurl, stdenv, libgcrypt, readline }: stdenv.mkDerivation rec { - version = "1.4.6"; + version = "1.4.7"; name = "freeipmi-${version}"; src = fetchurl { url = "mirror://gnu/freeipmi/${name}.tar.gz"; - sha256 = "1br68qlg0hw6mc4v64hliqydl83qg2ldfxc50yi4xvca6wll6h3f"; + sha256 = "1j33b2spj1vzjf1ymfrgka5h7imijmdwg9jdjfb92b2ccld9jj6l"; }; buildInputs = [ libgcrypt readline ]; diff --git a/pkgs/tools/system/gdmap/default.nix b/pkgs/tools/system/gdmap/default.nix index e9592b36666..3d3809610e4 100644 --- a/pkgs/tools/system/gdmap/default.nix +++ b/pkgs/tools/system/gdmap/default.nix @@ -12,8 +12,11 @@ stdenv.mkDerivation rec { patches = [ ./get_sensitive.patch ./set_flags.patch ]; - meta = { + meta = with stdenv.lib; { homepage = http://gdmap.sourceforge.net; description = "Recursive rectangle map of disk usage"; + license = licenses.gpl2; + platforms = platforms.all; + maintainers = [ maintainers.bjornfor ]; }; } diff --git a/pkgs/tools/system/ipmitool/default.nix b/pkgs/tools/system/ipmitool/default.nix index 027017247b7..eedca8bd7fd 100644 --- a/pkgs/tools/system/ipmitool/default.nix +++ b/pkgs/tools/system/ipmitool/default.nix @@ -26,8 +26,8 @@ stdenv.mkDerivation { meta = { description = ''Command-line interface to IPMI-enabled devices''; - license = "BSD"; - homepage = "http://ipmitool.sourceforge.net"; + license = stdenv.lib.licenses.bsd3; + homepage = http://ipmitool.sourceforge.net; platforms = stdenv.lib.platforms.unix; maintainers = [ stdenv.lib.maintainers.simons ]; diff --git a/pkgs/tools/system/journal-mailer/default.nix b/pkgs/tools/system/journal-mailer/default.nix new file mode 100644 index 00000000000..5de15f8457a --- /dev/null +++ b/pkgs/tools/system/journal-mailer/default.nix @@ -0,0 +1,34 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, baseCompat, fetchgit, hspec, hspecExpectations +, libsystemdJournal, mimeMail, mtl, pipes, pipesBytestring +, pipesSafe, QuickCheck, silently, stringConversions, temporary +, text, time, unorderedContainers, yaml +}: + +cabal.mkDerivation (self: { + pname = "journal-mailer"; + version = "0.1.1.0"; + src = fetchgit { + url = "https://github.com/zalora/journal-mailer.git"; + sha256 = "cd28b39746fd8a9652eb5d4dc5dcfd66704826d1ee466572fb47925b054cd07b"; + rev = "ab1b4df09e7ddbe139959374437331cdddf754b2"; + }; + isLibrary = false; + isExecutable = true; + buildDepends = [ + baseCompat libsystemdJournal mimeMail pipes pipesBytestring + pipesSafe stringConversions text time unorderedContainers yaml + ]; + testDepends = [ + baseCompat hspec hspecExpectations libsystemdJournal mimeMail mtl + pipes pipesBytestring pipesSafe QuickCheck silently + stringConversions temporary text time unorderedContainers yaml + ]; + meta = { + description = "Sends out emails for every severe message logged to systemd's journal"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.tv ]; + }; +}) diff --git a/pkgs/tools/system/plan9port/builder.sh b/pkgs/tools/system/plan9port/builder.sh index f97706fa719..2131a5bad86 100644 --- a/pkgs/tools/system/plan9port/builder.sh +++ b/pkgs/tools/system/plan9port/builder.sh @@ -4,17 +4,20 @@ tar xvfz $src cd plan9port -cflags="echo \"CFLAGS='-I${libXt}/include'\" >> \$PLAN9/config" - -sed -i "43i\\${cflags}" INSTALL +echo CFLAGS=\"-I${fontconfig}/include -I${libXt}/include\" > LOCAL.config +echo X11=\"${libXt}/include\" >> LOCAL.config for p in $patches; do echo "applying patch $p" patch -p1 < $p done -./INSTALL -r $out/plan9 - export PLAN9=$out/plan9 mkdir -p $PLAN9 + +for f in `grep -l -r /usr/local/plan9`; do + sed "s,/usr/local/plan9,${PLAN9},g" -i $f +done + +./INSTALL -r $PLAN9 cp -R * $PLAN9 diff --git a/pkgs/tools/system/plan9port/default.nix b/pkgs/tools/system/plan9port/default.nix index 39dba1c182d..709f83d3cbe 100644 --- a/pkgs/tools/system/plan9port/default.nix +++ b/pkgs/tools/system/plan9port/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, libX11, libXt +{stdenv, fetchurl, which, libX11, libXt, fontconfig , xproto ? null , xextproto ? null , libXext ? null }: @@ -17,7 +17,8 @@ stdenv.mkDerivation rec { sha256 = "1sza12j3db7i54r3pzli8wmby6aiyzmyfj8w0nidmawkwv6jdf6b"; }; - buildInputs = stdenv.lib.optionals (!stdenv.isDarwin) [ libX11 xproto libXt xextproto libXext ]; + NIX_LDFLAGS="-lgcc_s"; + buildInputs = stdenv.lib.optionals (!stdenv.isDarwin) [ which libX11 fontconfig xproto libXt xextproto libXext ]; enableParallelBuilding = true; @@ -25,8 +26,10 @@ stdenv.mkDerivation rec { homepage = "http://swtch.com/plan9port/"; description = "Plan 9 from User Space"; license = licenses.lpl-102; + maintainers = [ stdenv.lib.maintainers.ftrvxmtrx ]; platforms = platforms.unix; }; inherit libXt; + inherit fontconfig; } diff --git a/pkgs/tools/system/safe-rm/default.nix b/pkgs/tools/system/safe-rm/default.nix index 1cd7743e152..6afb6a09f2e 100644 --- a/pkgs/tools/system/safe-rm/default.nix +++ b/pkgs/tools/system/safe-rm/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { name = "safe-rm-${version}"; - version = "0.11"; + version = "0.12"; src = fetchgit { url = "https://gitorious.org/safe-rm/mainline.git"; rev = "refs/tags/${name}"; - sha256 = "1csnqq22pfbg9dwhv13x60jih0gn07bn5rwg2nhi0dsslzk4l496"; + sha256 = "1n8ir96rwsg9r47lp3avl5sw548gvyh12zk5riflmmdvq907yi0s"; }; propagatedBuildInputs = [ perl coreutils ]; diff --git a/pkgs/tools/typesetting/pdf2djvu/default.upstream b/pkgs/tools/typesetting/pdf2djvu/default.upstream deleted file mode 100644 index 1bb4aebdc61..00000000000 --- a/pkgs/tools/typesetting/pdf2djvu/default.upstream +++ /dev/null @@ -1,10 +0,0 @@ -url http://code.google.com/p/pdf2djvu/downloads/list -version_link '[.]tar[.][a-z0-9]+$' -process 'code[.]google[.]com//' '' -version '.*_([0-9.]+[0-9]).*' '\1' - -do_overwrite () { - ensure_hash - set_var_value version "$CURRENT_VERSION" - set_var_value sha256 "$CURRENT_HASH" -} diff --git a/pkgs/tools/virtualization/cloud-init/default.nix b/pkgs/tools/virtualization/cloud-init/default.nix new file mode 100644 index 00000000000..48eb68242e1 --- /dev/null +++ b/pkgs/tools/virtualization/cloud-init/default.nix @@ -0,0 +1,34 @@ +{ lib, pythonPackages, fetchurl }: + +let version = "0.7.6"; + +in pythonPackages.buildPythonPackage rec { + name = "cloud-init-0.7.6"; + namePrefix = ""; + + src = fetchurl { + url = "https://launchpad.net/cloud-init/trunk/${version}/+download/cloud-init-${version}.tar.gz"; + sha256 = "1mry5zdkfaq952kn1i06wiggc66cqgfp6qgnlpk0mr7nnwpd53wy"; + }; + + preBuild = '' + patchShebangs ./tools + + substituteInPlace setup.py \ + --replace /usr $out \ + --replace /etc $out/etc \ + --replace /lib/systemd $out/lib/systemd \ + ''; + + pythonPath = with pythonPackages; [ cheetah jinja2 prettytable + oauth pyserial configobj pyyaml argparse requests jsonpatch ]; + + setupPyInstallFlags = ["--init-system systemd"]; + + meta = { + homepage = http://cloudinit.readthedocs.org; + description = "provides configuration and customization of cloud instance"; + maintainers = [ lib.maintainers.madjar ]; + platforms = lib.platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d4c0f841cad..12c382e6f55 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -252,7 +252,7 @@ let }; autoreconfHook = makeSetupHook - { substitutions = { inherit autoconf automake libtool; }; } + { substitutions = { inherit autoconf automake libtool gettext; }; } ../build-support/setup-hooks/autoreconf.sh; buildEnv = import ../build-support/buildenv { @@ -437,7 +437,10 @@ let ../build-support/setup-hooks/make-coverage-analysis-report.sh; # intended to be used like nix-build -E 'with {}; enableDebugging fooPackage' - enableDebugging = pkg : pkg.override { stdenv = stdenvAdapters.keepDebugInfo pkg.stdenv; }; + enableDebugging = pkg: pkg.override { stdenv = stdenvAdapters.keepDebugInfo pkg.stdenv; }; + + findXMLCatalogs = makeSetupHook { } ../build-support/setup-hooks/find-xml-catalogs.sh; + ### TOOLS @@ -496,6 +499,8 @@ let jre = jdk; }; + apitrace = callPackage ../applications/graphics/apitrace {}; + argyllcms = callPackage ../tools/graphics/argyllcms {}; arp-scan = callPackage ../tools/misc/arp-scan { }; @@ -511,6 +516,8 @@ let }; }; + attic = callPackage ../tools/backup/attic { }; + awscli = callPackage ../tools/admin/awscli { }; ec2_api_tools = callPackage ../tools/virtualization/ec2-api-tools { }; @@ -540,6 +547,8 @@ let grc = callPackage ../tools/misc/grc { }; + lastpass-cli = callPackage ../tools/security/lastpass-cli { }; + otool = callPackage ../os-specific/darwin/otool { }; pass = callPackage ../tools/security/pass { @@ -604,7 +613,9 @@ let bchunk = callPackage ../tools/cd-dvd/bchunk { }; - bfr = callPackage ../tools/misc/bfr { }; + bfr = callPackage ../tools/misc/bfr { + perl = perl516; # Docs fail to build with newer versions + }; bindfs = callPackage ../tools/filesystems/bindfs { }; @@ -645,7 +656,6 @@ let bsod = callPackage ../misc/emulators/bsod { }; btrfsProgs = callPackage ../tools/filesystems/btrfsprogs { }; - btrfsProgs-3_16 = callPackage ../tools/filesystems/btrfsprogs/3.16.nix { }; bwm_ng = callPackage ../tools/networking/bwm-ng { }; @@ -657,6 +667,8 @@ let ccnet = callPackage ../tools/networking/ccnet { }; + cloud-init = callPackage ../tools/virtualization/cloud-init { }; + consul = callPackage ../servers/consul { inherit ruby rubyLibs; }; @@ -1035,6 +1047,8 @@ let dtach = callPackage ../tools/misc/dtach { }; + duff = callPackage ../tools/filesystems/duff { }; + duo-unix = callPackage ../tools/security/duo-unix { }; duplicity = callPackage ../tools/backup/duplicity { @@ -1067,6 +1081,8 @@ let edk2 = callPackage ../development/compilers/edk2 { }; + eid-mw = callPackage ../tools/security/eid-mw { }; + eid-viewer = callPackage ../tools/security/eid-viewer { }; emscripten = callPackage ../development/compilers/emscripten { }; @@ -1131,6 +1147,8 @@ let fakechroot = callPackage ../tools/system/fakechroot { }; + fatsort = callPackage ../tools/filesystems/fatsort { }; + fatrace = callPackage ../os-specific/linux/fatrace { }; fcitx = callPackage ../tools/inputmethods/fcitx { }; @@ -1217,6 +1235,8 @@ let ftgl212 = callPackage ../development/libraries/ftgl/2.1.2.nix { }; + ftop = callPackage ../os-specific/linux/ftop { }; + fuppes = callPackage ../tools/networking/fuppes { ffmpeg = ffmpeg_0_6_90; }; @@ -1260,6 +1280,12 @@ let gifsicle = callPackage ../tools/graphics/gifsicle { }; + gitlab = callPackage ../applications/version-management/gitlab { + libiconv = libiconvOrLibc; + }; + + gitlab-shell = callPackage ../applications/version-management/gitlab-shell { }; + glusterfs = callPackage ../tools/filesystems/glusterfs { }; glmark2 = callPackage ../tools/graphics/glmark2 { }; @@ -1618,6 +1644,8 @@ let liboauth = callPackage ../development/libraries/liboauth { }; + libtidy = callPackage ../development/libraries/libtidy { }; + libtirpc = callPackage ../development/libraries/ti-rpc { }; libshout = callPackage ../development/libraries/libshout { }; @@ -1757,6 +1785,11 @@ let monit = callPackage ../tools/system/monit { }; + moreutils = callPackage ../tools/misc/moreutils { + inherit (perlPackages) IPCRun TimeDate TimeDuration; + docbook-xsl = docbook_xsl; + }; + mosh = callPackage ../tools/networking/mosh { inherit (perlPackages) IOTty; }; @@ -1765,6 +1798,8 @@ let mr = callPackage ../applications/version-management/mr { }; + mrtg = callPackage ../tools/misc/mrtg { }; + mscgen = callPackage ../tools/graphics/mscgen { }; msf = builderDefsPackage (import ../tools/security/metasploit/3.1.nix) { @@ -1807,6 +1842,8 @@ let ndjbdns = callPackage ../tools/networking/ndjbdns { }; + nestopia = callPackage ../misc/emulators/nestopia { }; + netatalk = callPackage ../tools/filesystems/netatalk { }; netcdf = callPackage ../development/libraries/netcdf { }; @@ -1893,7 +1930,6 @@ let nox = callPackage ../tools/package-management/nox { pythonPackages = python3Packages; - nix = nixUnstable; }; nss_pam_ldapd = callPackage ../tools/networking/nss-pam-ldapd {}; @@ -1931,6 +1967,8 @@ let obnam = callPackage ../tools/backup/obnam { }; + ocz-toolbox = callPackage ../os-specific/linux/ocz-toolbox { }; + odt2txt = callPackage ../tools/text/odt2txt { }; odamex = callPackage ../games/odamex { }; @@ -1939,6 +1977,8 @@ let inherit (pythonPackages) sqlite3; }; + openarena = callPackage ../games/openarena { }; + opencryptoki = callPackage ../tools/security/opencryptoki { }; onscripter-en = callPackage ../games/onscripter-en { }; @@ -2152,6 +2192,8 @@ let prey-bash-client = callPackage ../tools/security/prey { }; + profile-sync-daemon = callPackage ../tools/misc/profile-sync-daemon { }; + projectm = callPackage ../applications/audio/projectm { }; proot = callPackage ../tools/system/proot { }; @@ -2210,6 +2252,8 @@ let ranger = callPackage ../applications/misc/ranger { }; + rawdog = callPackage ../applications/networking/feedreaders/rawdog { }; + privateer = callPackage ../games/privateer { }; redmine = callPackage ../applications/version-management/redmine { }; @@ -2236,6 +2280,8 @@ let remmina = callPackage ../applications/networking/remote/remmina {}; + remotebox = callPackage ../applications/virtualization/remotebox {}; + renameutils = callPackage ../tools/misc/renameutils { }; replace = callPackage ../tools/text/replace { }; @@ -2261,6 +2307,7 @@ let rng_tools = callPackage ../tools/security/rng-tools { }; rsnapshot = callPackage ../tools/backup/rsnapshot { + perl = perl516; # fails to create docs: POD document had syntax errors # For the `logger' command, we can use either `utillinux' or # GNU Inetutils. The latter is more portable. logger = inetutils; @@ -2524,8 +2571,12 @@ let tmin = callPackage ../tools/security/tmin { }; + tmsu = callPackage ../tools/filesystems/tmsu { }; + tor = callPackage ../tools/security/tor { }; + tor-arm = callPackage ../tools/security/tor/tor-arm.nix { }; + torbutton = callPackage ../tools/security/torbutton { }; torbrowser = callPackage ../tools/security/tor/torbrowser.nix { @@ -2540,6 +2591,8 @@ let traceroute = callPackage ../tools/networking/traceroute { }; + trash-cli = callPackage ../tools/misc/trash-cli { }; + trickle = callPackage ../tools/networking/trickle {}; trousers = callPackage ../tools/security/trousers { }; @@ -2636,7 +2689,7 @@ let html2text = callPackage ../tools/text/html2text { }; - htmlTidy = callPackage ../tools/text/html-tidy { }; + html-tidy = callPackage ../tools/text/html-tidy { }; html-xml-utils = callPackage ../tools/text/xml/html-xml-utils { }; @@ -2773,10 +2826,14 @@ let inherit (xlibs) libX11 libXext libXrender; }; + wml = callPackage ../development/web/wml { }; + wv = callPackage ../tools/misc/wv { }; wv2 = callPackage ../tools/misc/wv2 { }; + wyrd = callPackage ../tools/misc/wyrd { }; + x86info = callPackage ../os-specific/linux/x86info { }; x11_ssh_askpass = callPackage ../tools/networking/x11-ssh-askpass { }; @@ -3204,7 +3261,7 @@ let libXrandr xproto renderproto xextproto inputproto randrproto; }); - gnat = gnat45; + gnat = gnat45; # failed to make 4.6 or 4.8 build gnat45 = wrapGCC (gcc45.gcc.override { name = "gnat"; @@ -3219,20 +3276,7 @@ let ppl = null; }); - gnat46 = wrapGCC (gcc46.gcc.override { - name = "gnat"; - langCC = false; - langC = true; - langAda = true; - profiledCompiler = false; - gnatboot = gnat45; - # We can't use the ppl stuff, because we would have - # libstdc++ problems. - ppl = null; - cloog = null; - }); - - gnatboot = wrapGCC (import ../development/compilers/gnatboot { + gnatboot = wrapGCC-old (import ../development/compilers/gnatboot { inherit fetchurl stdenv; }); @@ -3316,7 +3360,7 @@ let builtins.substring 0 (builtins.stringLength "packages_") name == "packages_" ) haskell)); - haskellPackages = haskellPackages_ghc783; + haskellPackages = haskellPackages_ghc784; haskellPackages_ghc6104 = haskell.packages_ghc6104; haskellPackages_ghc6123 = haskell.packages_ghc6123; @@ -3324,9 +3368,9 @@ let haskellPackages_ghc722 = haskell.packages_ghc722; haskellPackages_ghc742 = haskell.packages_ghc742; haskellPackages_ghc763 = haskell.packages_ghc763; - haskellPackages_ghc783_no_profiling = recurseIntoAttrs haskell.packages_ghc783.noProfiling; - haskellPackages_ghc783_profiling = recurseIntoAttrs haskell.packages_ghc783.profiling; - haskellPackages_ghc783 = recurseIntoAttrs haskell.packages_ghc783.highPrio; + haskellPackages_ghc784_no_profiling = recurseIntoAttrs haskell.packages_ghc784.noProfiling; + haskellPackages_ghc784_profiling = recurseIntoAttrs haskell.packages_ghc784.profiling; + haskellPackages_ghc784 = recurseIntoAttrs haskell.packages_ghc784.highPrio; haskellPackages_ghcHEAD = haskell.packages_ghcHEAD; haskellPackages_ghcjs = haskell.packages_ghcjs; @@ -3594,7 +3638,9 @@ let libpng = libpng12; giflib = giflib_4_1; }; - camlimages_4_1 = callPackage ../development/ocaml-modules/camlimages/4.1.nix {}; + camlimages_4_1 = callPackage ../development/ocaml-modules/camlimages/4.1.nix { + giflib = giflib_4_1; + }; camlimages = camlimages_4_1; biniou = callPackage ../development/ocaml-modules/biniou { }; @@ -3621,6 +3667,8 @@ let eliom = callPackage ../development/ocaml-modules/eliom { }; + fieldslib = callPackage ../development/ocaml-modules/fieldslib { }; + findlib = callPackage ../development/tools/ocaml/findlib { }; fix = callPackage ../development/ocaml-modules/fix { }; @@ -3883,15 +3931,17 @@ let win32hello = callPackage ../development/compilers/visual-c++/test { }; wrapGCCWith = gccWrapper: glibc: baseGCC: gccWrapper { - nativeTools = stdenv.gcc.nativeTools or false; - nativeLibc = stdenv.gcc.nativeLibc or false; - nativePrefix = stdenv.gcc.nativePrefix or ""; + nativeTools = stdenv.cc.nativeTools or false; + nativeLibc = stdenv.cc.nativeLibc or false; + nativePrefix = stdenv.cc.nativePrefix or ""; gcc = baseGCC; libc = glibc; inherit stdenv binutils coreutils zlib; }; wrapGCC = wrapGCCWith (makeOverridable (import ../build-support/gcc-wrapper)) glibc; + # legacy version, used for gnat bootstrapping + wrapGCC-old = wrapGCCWith (makeOverridable (import ../build-support/gcc-wrapper-old)) glibc; wrapGCCCross = {gcc, libc, binutils, cross, shell ? "", name ? "gcc-cross-wrapper"}: @@ -4018,7 +4068,6 @@ let mujs = callPackage ../development/interpreters/mujs { }; nix-exec = callPackage ../development/interpreters/nix-exec { - nix = nixUnstable; git = gitMinimal; }; @@ -4043,15 +4092,13 @@ let ocropus = callPackage ../applications/misc/ocropus { }; - perl514 = callPackage ../development/interpreters/perl/5.14 { }; + perl516 = callPackage ../development/interpreters/perl/5.16 { }; - perl516 = callPackage ../development/interpreters/perl/5.16 { + perl520 = callPackage ../development/interpreters/perl/5.20 { fetchurl = fetchurlBoot; }; - perl520 = callPackage ../development/interpreters/perl/5.20 { }; - - perl = if system != "i686-cygwin" then perl516 else sysPerl; + perl = if system != "i686-cygwin" then perl520 else sysPerl; php = php54; @@ -4059,17 +4106,6 @@ let inherit php pkgs; }); - php53 = callPackage ../development/interpreters/php/5.3.nix { }; - - php_fpm53 = callPackage ../development/interpreters/php/5.3.nix { - config = config // { - php = (config.php or {}) // { - fpm = true; - apxs2 = false; - }; - }; - }; - php54 = callPackage ../development/interpreters/php/5.4.nix { }; picolisp = callPackage ../development/interpreters/picolisp {}; @@ -4303,6 +4339,8 @@ let autoconf = callPackage ../development/tools/misc/autoconf { }; + autoconf-archive = callPackage ../development/tools/misc/autoconf-archive { }; + autoconf213 = callPackage ../development/tools/misc/autoconf/2.13.nix { }; autocutsel = callPackage ../tools/X11/autocutsel{ }; @@ -4359,7 +4397,7 @@ let dateutil = pythonPackages.dateutil_1_5; }; - buildbotSlave = callPackage ../development/tools/build-managers/buildbot-slave { + buildbot-slave = callPackage ../development/tools/build-managers/buildbot-slave { inherit (pythonPackages) twisted; }; @@ -4663,8 +4701,6 @@ let premake = premake4; - pstack = callPackage ../development/tools/misc/gdb/pstack.nix { }; - racerRust = callPackage ../development/tools/rust/racer { rust = rustcMaster; }; radare = callPackage ../development/tools/analysis/radare { @@ -4693,7 +4729,7 @@ let remake = callPackage ../development/tools/build-managers/remake { }; - rr = callPackage_i686 ../development/tools/analysis/rr { }; + rr = callPackage ../development/tools/analysis/rr { }; saleae-logic = callPackage ../development/tools/misc/saleae-logic { }; @@ -5005,8 +5041,6 @@ let cppunit = callPackage ../development/libraries/cppunit { }; - cppnetlib = callPackage ../development/libraries/cppnetlib { }; - cracklib = callPackage ../development/libraries/cracklib { }; cryptopp = callPackage ../development/libraries/crypto++ { }; @@ -5123,7 +5157,7 @@ let vpxSupport = !stdenv.isMips; }; - ffmpeg_2_3 = callPackage ../development/libraries/ffmpeg/2.3.x.nix { }; + ffmpeg_2_2 = callPackage ../development/libraries/ffmpeg/2.2.x.nix { }; ffmpeg_2 = callPackage ../development/libraries/ffmpeg/2.x.nix { }; @@ -5157,6 +5191,8 @@ let fontconfig = callPackage ../development/libraries/fontconfig { }; + fontconfig-ultimate = callPackage ../development/libraries/fontconfig-ultimate {}; + folly = callPackage ../development/libraries/folly { }; makeFontsConf = let fontconfig_ = fontconfig; in {fontconfig ? fontconfig_, fontDirectories}: @@ -5232,7 +5268,7 @@ let glfw2 = callPackage ../development/libraries/glfw/2.x.nix { }; glfw3 = callPackage ../development/libraries/glfw/3.x.nix { }; - glibc = callPackage ../development/libraries/glibc/2.19 { + glibc = callPackage ../development/libraries/glibc { kernelHeaders = linuxHeaders; installLocales = config.glibc.locales or false; machHeaders = null; @@ -5240,13 +5276,13 @@ let gccCross = null; }; - glibc_memusage = callPackage ../development/libraries/glibc/2.19 { + glibc_memusage = callPackage ../development/libraries/glibc { kernelHeaders = linuxHeaders; installLocales = false; withGd = true; }; - glibcCross = forceNativeDrv (makeOverridable (import ../development/libraries/glibc/2.19) + glibcCross = forceNativeDrv (makeOverridable (import ../development/libraries/glibc) (let crossGNU = crossSystem != null && crossSystem.config == "i586-pc-gnu"; in { inherit stdenv fetchurl; @@ -5274,16 +5310,17 @@ let installLocales = config.glibc.locales or false; }; - glibcLocales = callPackage ../development/libraries/glibc/2.19/locales.nix { }; + glibcLocales = callPackage ../development/libraries/glibc/locales.nix { }; - glibcInfo = callPackage ../development/libraries/glibc/2.19/info.nix { }; + glibcInfo = callPackage ../development/libraries/glibc/info.nix { }; - glibc_multi = callPackage ../development/libraries/glibc/2.19/multi.nix { + glibc_multi = callPackage ../development/libraries/glibc/multi.nix { inherit glibc; glibc32 = (import ./all-packages.nix {system = "i686-linux";}).glibc; }; glm = callPackage ../development/libraries/glm { }; + glm_0954 = callPackage ../development/libraries/glm/0954.nix { }; glog = callPackage ../development/libraries/glog { }; @@ -5372,10 +5409,6 @@ let gnutls = gnutls32; - gnutls31 = callPackage ../development/libraries/gnutls/3.1.nix { - guileBindings = config.gnutls.guile or false; - }; - gnutls32 = callPackage ../development/libraries/gnutls/3.2.nix { guileBindings = config.gnutls.guile or false; }; @@ -5626,8 +5659,6 @@ let libpng = libpng12; }; - lgi = callPackage ../development/libraries/lgi { }; - lib3ds = callPackage ../development/libraries/lib3ds { }; libaacs = callPackage ../development/libraries/libaacs { }; @@ -5691,6 +5722,8 @@ let libchardet = callPackage ../development/libraries/libchardet { }; + libuchardet = callPackage ../development/libraries/libuchardet { }; + libchop = callPackage ../development/libraries/libchop { }; libcm = callPackage ../development/libraries/libcm { }; @@ -5900,6 +5933,8 @@ let libmcrypt = callPackage ../development/libraries/libmcrypt {}; + libmediainfo = callPackage ../development/libraries/libmediainfo { }; + libmhash = callPackage ../development/libraries/libmhash {}; libmodbus = callPackage ../development/libraries/libmodbus {}; @@ -5946,14 +5981,14 @@ let libiconvOrEmpty = if libiconvOrNull == null then [] else [libiconv]; libiconvOrNull = - if gcc.libc or null != null || stdenv.isGlibc + if stdenv.cc.libc or null != null || stdenv.isGlibc then null else libiconv; # The logic behind this attribute is broken: libiconvOrNull==null does # NOT imply libiconv=glibc! On Darwin, for example, we have a native # libiconv library which is not glibc. - libiconvOrLibc = if libiconvOrNull == null then gcc.libc else libiconv; + libiconvOrLibc = if libiconvOrNull == null then stdenv.cc.libc else libiconv; # On non-GNU systems we need GNU Gettext for libintl. libintlOrEmpty = stdenv.lib.optional (!stdenv.isLinux) gettext; @@ -6308,6 +6343,8 @@ let libyubikey = callPackage ../development/libraries/libyubikey { }; + libzen = callPackage ../development/libraries/libzen { }; + libzip = callPackage ../development/libraries/libzip { }; libzdb = callPackage ../development/libraries/libzdb { }; @@ -6514,6 +6551,8 @@ let opencascade_oce = callPackage ../development/libraries/opencascade/oce.nix { }; + opencollada = callPackage ../development/libraries/opencollada { }; + opencsg = callPackage ../development/libraries/opencsg { }; openct = callPackage ../development/libraries/openct { }; @@ -6586,11 +6625,23 @@ let pdf2xml = callPackage ../development/libraries/pdf2xml {} ; - phonon = callPackage ../development/libraries/phonon { }; + phonon = callPackage ../development/libraries/phonon { inherit qt4; }; + + phonon_qt5 = phonon.override { + withQt5 = true; + inherit qt5; + qt4 = null; + }; phonon_backend_gstreamer = callPackage ../development/libraries/phonon-backend-gstreamer { }; - phonon_backend_vlc = callPackage ../development/libraries/phonon-backend-vlc { }; + phonon_backend_vlc = callPackage ../development/libraries/phonon-backend-vlc { inherit qt4; }; + + phonon_qt5_backend_vlc = phonon_backend_vlc.override { + withQt5 = true; + inherit qt5; + qt4 = null; + }; physfs = callPackage ../development/libraries/physfs { }; @@ -6604,11 +6655,20 @@ let podofo = callPackage ../development/libraries/podofo { lua5 = lua5_1; }; + poker-eval = callPackage ../development/libraries/poker-eval { }; + polkit = callPackage ../development/libraries/polkit { spidermonkey = spidermonkey_185; }; - polkit_qt_1 = callPackage ../development/libraries/polkit-qt-1 { }; + polkit_qt4 = callPackage ../development/libraries/polkit-qt-1 { + inherit qt4; + }; + + polkit_qt5 = callPackage ../development/libraries/polkit-qt-1 { + inherit qt5; + withQt5 = true; + }; policykit = callPackage ../development/libraries/policykit { }; @@ -6689,21 +6749,6 @@ let qtLib = qt48Full; }; - qt53Full = appendToName "full" (qt53.override { - buildDocs = true; - buildExamples = true; - buildTests = true; - developerBuild = true; - }); - - qt53 = callPackage ../development/libraries/qt-5/qt-5.3.nix { - mesa = mesa_noglu; - cups = if stdenv.isLinux then cups else null; - # GNOME dependencies are not used unless gtkStyle == true - inherit (gnome) libgnomeui GConf gnome_vfs; - bison = bison2; # error: too few arguments to function 'int yylex(... - }; - qt5 = callPackage ../development/libraries/qt-5 { mesa = mesa_noglu; cups = if stdenv.isLinux then cups else null; @@ -6722,6 +6767,7 @@ let qt5SDK = qtcreator.override { sdkBuild = true; qtLib = qt5Full; + withDocumentation = false; # fails to setup some paths }; qtcreator = callPackage ../development/qtcreator { @@ -6875,6 +6921,8 @@ let sord = callPackage ../development/libraries/sord {}; + soundtouch = callPackage ../development/libraries/soundtouch {}; + spandsp = callPackage ../development/libraries/spandsp {}; speechd = callPackage ../development/libraries/speechd { }; @@ -6899,13 +6947,15 @@ let sratom = callPackage ../development/libraries/audio/sratom { }; + srm = callPackage ../tools/security/srm { }; + srtp = callPackage ../development/libraries/srtp {}; srtp_linphone = callPackage ../development/libraries/srtp/linphone.nix { }; sqlite = lowPrio (callPackage ../development/libraries/sqlite { }); - sqliteInteractive = appendToName "interactive" (sqlite.override { interactive = true; }); + sqlite-interactive = appendToName "interactive" (sqlite.override { interactive = true; }); sqlcipher = lowPrio (callPackage ../development/libraries/sqlcipher { readline = null; @@ -7182,6 +7232,8 @@ let cppzmq = callPackage ../development/libraries/cppzmq {}; + czmq = callPackage ../development/libraries/czmq { }; + zziplib = callPackage ../development/libraries/zziplib { }; ### DEVELOPMENT / LIBRARIES / AGDA @@ -7320,14 +7372,6 @@ let overrides = (config.perlPackageOverrides or (p: {})) pkgs; }); - perl514Packages = import ./perl-packages.nix { - pkgs = pkgs // { - perl = perl514; - buildPerlPackage = import ../development/perl-modules/generic perl514; - }; - overrides = (config.perl514PackageOverrides or (p: {})) pkgs; - }; - perlXMLParser = perlPackages.XMLParser; ack = perlPackages.ack; @@ -7415,8 +7459,6 @@ let rhpl = callPackage ../development/python-modules/rhpl { }; - sip = pythonPackages.sip; - pyqt4 = callPackage ../development/python-modules/pyqt/4.x.nix { stdenv = if stdenv.isDarwin then clangStdenv @@ -7709,6 +7751,8 @@ let influxdb = callPackage ../servers/nosql/influxdb { }; + hyperdex = callPackage ../servers/nosql/hyperdex { }; + mysql51 = import ../servers/sql/mysql/5.1.x.nix { inherit fetchurl ncurses zlib perl openssl stdenv; ps = procps; /* !!! Linux only */ @@ -7730,6 +7774,8 @@ let net_snmp = callPackage ../servers/monitoring/net-snmp { }; + newrelic-sysmond = callPackage ../servers/monitoring/newrelic-sysmond { }; + riemann = callPackage ../servers/monitoring/riemann { }; oidentd = callPackage ../servers/identd/oidentd { }; @@ -7886,6 +7932,8 @@ let xorgVideoUnichrome = callPackage ../servers/x11/xorg/unichrome/default.nix { }; + xwayland = with xorg; callPackage ../servers/x11/xorg/xwayland.nix { }; + yaws = callPackage ../servers/http/yaws { }; zabbix = recurseIntoAttrs (import ../servers/monitoring/zabbix { @@ -7906,7 +7954,7 @@ let _915resolution = callPackage ../os-specific/linux/915resolution { }; - nfsUtils = callPackage ../os-specific/linux/nfs-utils { }; + nfs-utils = callPackage ../os-specific/linux/nfs-utils { }; acpi = callPackage ../os-specific/linux/acpi { }; @@ -7934,6 +7982,7 @@ let apparmor = callPackage ../os-specific/linux/apparmor { inherit (perlPackages) LocaleGettext TermReadKey RpcXML; bison = bison2; + perl = perl516; # ${perl}/.../CORE/handy.h:124:34: error: 'bool' undeclared }; atop = callPackage ../os-specific/linux/atop { }; @@ -8158,7 +8207,7 @@ let # -- Linux kernel expressions ------------------------------------------------ - linuxHeaders = linuxHeaders_3_7; + linuxHeaders = linuxHeaders_3_12; linuxHeaders24Cross = forceNativeDrv (import ../os-specific/linux/kernel-headers/2.4.nix { inherit stdenv fetchurl perl; @@ -8170,7 +8219,7 @@ let cross = assert crossSystem != null; crossSystem; }); - linuxHeaders_3_7 = callPackage ../os-specific/linux/kernel-headers/3.7.nix { }; + linuxHeaders_3_12 = callPackage ../os-specific/linux/kernel-headers/3.12.nix { }; linuxHeaders_3_14 = callPackage ../os-specific/linux/kernel-headers/3.14.nix { }; @@ -8228,7 +8277,7 @@ let ]; }; - linux_3_16 = makeOverridable (import ../os-specific/linux/kernel/linux-3.16.nix) { + linux_3_17 = makeOverridable (import ../os-specific/linux/kernel/linux-3.17.nix) { inherit fetchurl stdenv perl buildLinux; kernelPatches = lib.optionals ((platform.kernelArch or null) == "mips") [ kernelPatches.mips_fpureg_emu @@ -8237,7 +8286,7 @@ let ]; }; - linux_3_17 = makeOverridable (import ../os-specific/linux/kernel/linux-3.17.nix) { + linux_3_18 = makeOverridable (import ../os-specific/linux/kernel/linux-3.18.nix) { inherit fetchurl stdenv perl buildLinux; kernelPatches = lib.optionals ((platform.kernelArch or null) == "mips") [ kernelPatches.mips_fpureg_emu @@ -8326,11 +8375,10 @@ let nvidiabl = callPackage ../os-specific/linux/nvidiabl { }; - nvidia_x11 = self.nvidia_x11_legacy340; - nvidia_x11_legacy173 = callPackage ../os-specific/linux/nvidia-x11/legacy173.nix { }; nvidia_x11_legacy304 = callPackage ../os-specific/linux/nvidia-x11/legacy304.nix { }; nvidia_x11_legacy340 = callPackage ../os-specific/linux/nvidia-x11/legacy340.nix { }; + nvidia_x11 = callPackage ../os-specific/linux/nvidia-x11 { }; openafsClient = callPackage ../servers/openafs-client { }; @@ -8387,8 +8435,8 @@ let linuxPackages = linuxPackages_3_14; # Update this when adding the newest kernel major version! - linux_latest = pkgs.linux_3_17; - linuxPackages_latest = pkgs.linuxPackages_3_17; + linux_latest = pkgs.linux_3_18; + linuxPackages_latest = pkgs.linuxPackages_3_18; # Build the kernel modules for the some of the kernels. linuxPackages_3_2 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_2 linuxPackages_3_2); @@ -8398,8 +8446,8 @@ let linuxPackages_3_10_tuxonice = linuxPackagesFor pkgs.linux_3_10_tuxonice linuxPackages_3_10_tuxonice; linuxPackages_3_12 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_12 linuxPackages_3_12); linuxPackages_3_14 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_14 linuxPackages_3_14); - linuxPackages_3_16 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_16 linuxPackages_3_16); linuxPackages_3_17 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_17 linuxPackages_3_17); + linuxPackages_3_18 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_18 linuxPackages_3_18); linuxPackages_testing = recurseIntoAttrs (linuxPackagesFor pkgs.linux_testing linuxPackages_testing); # grsecurity flavors @@ -8583,6 +8631,11 @@ let shadow = callPackage ../os-specific/linux/shadow { }; + sinit = callPackage ../os-specific/linux/sinit { + rcinit = "/etc/rc.d/rc.init"; + rcshutdown = "/etc/rc.d/rc.shutdown"; + }; + smem = callPackage ../os-specific/linux/smem { }; statifier = builderDefsPackage (import ../os-specific/linux/statifier) { }; @@ -8827,6 +8880,8 @@ let inherit (perlPackages) FontTTF; }; + dina-font = callPackage ../data/fonts/dina { }; + docbook5 = callPackage ../data/sgml+xml/schemas/docbook-5.0 { }; docbook_sgml_dtd_31 = callPackage ../data/sgml+xml/schemas/sgml-dtd/docbook/3.1.nix { }; @@ -8867,6 +8922,8 @@ let inherit (gnome3) gsettings_desktop_schemas; + gyre-fonts = callPackage ../data/fonts/gyre {}; + hicolor_icon_theme = callPackage ../data/icons/hicolor-icon-theme { }; inconsolata = callPackage ../data/fonts/inconsolata {}; @@ -8879,6 +8936,8 @@ let kochi-substitute-naga10 = callPackage ../data/fonts/kochi-substitute-naga10 {}; + league-of-moveable-type = callPackage ../data/fonts/league-of-moveable-type {}; + liberation_ttf_from_source = callPackage ../data/fonts/redhat-liberation-fonts { }; liberation_ttf_binary = callPackage ../data/fonts/redhat-liberation-fonts/binary.nix { }; liberation_ttf = liberation_ttf_binary; @@ -8915,7 +8974,9 @@ let proggyfonts = callPackage ../data/fonts/proggyfonts { }; - pthreadmanpages = callPackage ../data/documentation/pthread-man-pages { }; + pthreadmanpages = callPackage ../data/documentation/pthread-man-pages { + perl = perl516; # syntax error at troffprepro line 49, near "do subst(" + }; shared_mime_info = callPackage ../data/misc/shared-mime-info { }; @@ -9063,6 +9124,8 @@ let milkytracker = callPackage ../applications/audio/milkytracker { }; + schismtracker = callPackage ../applications/audio/schismtracker { }; + aumix = callPackage ../applications/audio/aumix { gtkGUI = false; }; @@ -9085,6 +9148,7 @@ let }; awesome-3-5 = callPackage ../applications/window-managers/awesome { cairo = cairo.override { xcbSupport = true; }; + luaPackages = luaPackages.override { inherit lua; }; }; awesome = awesome-3-5; @@ -9164,6 +9228,8 @@ let }; funpidgin = carrier; + cava = callPackage ../applications/audio/cava { }; + cc1394 = callPackage ../applications/video/cc1394 { }; cddiscid = callPackage ../applications/audio/cd-discid { }; @@ -9260,7 +9326,7 @@ let d4x = callPackage ../applications/misc/d4x { }; - darcs = with haskellPackages_ghc783; callPackage ../applications/version-management/darcs { + darcs = with haskellPackages_ghc784; callPackage ../applications/version-management/darcs { cabal = cabal.override { extension = self : super : { enableSharedExecutables = false; @@ -9314,6 +9380,8 @@ let dunst = callPackage ../applications/misc/dunst { }; + devede = callPackage ../applications/video/devede { }; + dvb_apps = callPackage ../applications/video/dvb-apps { }; dvdauthor = callPackage ../applications/video/dvdauthor { }; @@ -9419,6 +9487,7 @@ let gitModes = callPackage ../applications/editors/emacs-modes/git-modes { }; haskellMode = callPackage ../applications/editors/emacs-modes/haskell { }; + haskellModeGit = lowPrio (callPackage ../applications/editors/emacs-modes/haskell/git.nix { }); hsc3Mode = callPackage ../applications/editors/emacs-modes/hsc3 { }; @@ -9872,6 +9941,10 @@ let gpsd = callPackage ../servers/gpsd { }; + gtk2fontsel = callPackage ../applications/misc/gtk2fontsel { + inherit (gnome2) gtk; + }; + guitone = callPackage ../applications/version-management/guitone { graphviz = graphviz_2_32; }; @@ -10062,6 +10135,7 @@ let zip = zip.override { enableNLS = false; }; jdk = openjdk; boost = boost155; + glm = glm_0954; fontsConf = makeFontsConf { fontDirectories = [ freefont_ttf xorg.fontmiscmisc xorg.fontbhttf @@ -10136,6 +10210,10 @@ let mda_lv2 = callPackage ../applications/audio/mda-lv2 { }; + mediainfo = callPackage ../applications/misc/mediainfo { }; + + mediainfo-gui = callPackage ../applications/misc/mediainfo-gui { }; + meld = callPackage ../applications/version-management/meld { inherit (gnome) scrollkeeper; pygtk = pyGtkGlade; @@ -10154,6 +10232,8 @@ let meshlab = callPackage ../applications/graphics/meshlab { }; + metersLv2 = callPackage ../applications/audio/meters_lv2 { }; + mhwaveedit = callPackage ../applications/audio/mhwaveedit {}; mid2key = callPackage ../applications/audio/mid2key { }; @@ -10175,6 +10255,8 @@ let minidjvu = callPackage ../applications/graphics/minidjvu { }; + mimms = callPackage ../applications/audio/mimms {}; + mirage = callPackage ../applications/graphics/mirage {}; mixxx = callPackage ../applications/audio/mixxx { @@ -10227,9 +10309,11 @@ let }; easytag = callPackage ../applications/audio/easytag { - inherit (gnome3) gnome_icon_theme; + inherit (gnome3) gnome_icon_theme dconf; }; + mp3gain = callPackage ../applications/audio/mp3gain { }; + mp3info = callPackage ../applications/audio/mp3info { }; mp3splt = callPackage ../applications/audio/mp3splt { }; @@ -10702,11 +10786,7 @@ let lightdm_gtk_greeter = callPackage ../applications/display-managers/lightdm-gtk-greeter { }; - # slic3r 0.9.10b says: "Running Slic3r under Perl >= 5.16 is not supported nor recommended" - slic3r = callPackage ../applications/misc/slic3r { - perlPackages = perl514Packages; - perl = perl514; - }; + slic3r = callPackage ../applications/misc/slic3r { }; curaengine = callPackage ../applications/misc/curaengine { }; @@ -10727,9 +10807,7 @@ let smartdeblur = callPackage ../applications/graphics/smartdeblur { }; - snapper = callPackage ../tools/misc/snapper { - btrfsProgs = btrfsProgs-3_16; - }; + snapper = callPackage ../tools/misc/snapper { }; snd = callPackage ../applications/audio/snd { }; @@ -10848,6 +10926,8 @@ let telepathy_salut = callPackage ../applications/networking/instant-messengers/telepathy/salut {}; + telepathy_idle = callPackage ../applications/networking/instant-messengers/telepathy/idle {}; + terminator = callPackage ../applications/misc/terminator { vte = gnome.vte.override { pythonSupport = true; }; inherit (pythonPackages) notify; @@ -10947,7 +11027,7 @@ let vanitygen = callPackage ../applications/misc/vanitygen { }; - vanubi = callPackage ../applications/editors/vanubi { }; + vanubi = callPackage ../applications/editors/vanubi { vala = vala_0_26; }; vbindiff = callPackage ../applications/editors/vbindiff { }; @@ -10970,7 +11050,7 @@ let vimHugeX = vim_configurable; - vim_configurable = vimrc.makeCustomizable (callPackage ../applications/editors/vim/configurable.nix { + vim_configurable = vimUtils.makeCustomizable (callPackage ../applications/editors/vim/configurable.nix { inherit (pkgs) fetchurl fetchhg stdenv ncurses pkgconfig gettext composableDerivation lib config glib gtk python perl tcl ruby; inherit (pkgs.xlibs) libX11 libXext libSM libXpm libXt libXaw libXau libXmu @@ -11054,7 +11134,7 @@ let }; vlc = callPackage ../applications/video/vlc { - ffmpeg = ffmpeg_2_3; + ffmpeg = ffmpeg_2_2; }; vmpk = callPackage ../applications/audio/vmpk { }; @@ -11077,8 +11157,6 @@ let weechat = callPackage ../applications/networking/irc/weechat { }; - weechatDevel = lowPrio (callPackage ../applications/networking/irc/weechat/devel.nix { }); - westonLite = callPackage ../applications/window-managers/weston { pango = null; freerdp = null; @@ -11086,6 +11164,7 @@ let vaapi = null; libva = null; libwebp = null; + xwayland = null; }; weston = callPackage ../applications/window-managers/weston { @@ -11133,6 +11212,7 @@ let in import ../applications/networking/browsers/firefox/wrapper.nix { inherit stdenv lib makeWrapper makeDesktopItem browser browserName desktopName nameSuffix icon; + libtrick = true; plugins = assert !(enableGnash && enableAdobeFlash); assert !(jre && icedtea); @@ -11150,7 +11230,8 @@ let ++ lib.optional (cfg.enableTrezor or false) trezor-bridge ); libs = [ gstreamer gst_plugins_base ] ++ lib.optionals (cfg.enableQuakeLive or false) - (with xlibs; [ stdenv.gcc libX11 libXxf86dga libXxf86vm libXext libXt alsaLib zlib ]); + (with xlibs; [ stdenv.cc libX11 libXxf86dga libXxf86vm libXext libXt alsaLib zlib ]); + gst_plugins = [ gst_plugins_base gst_plugins_good gst_plugins_bad gst_plugins_ugly gst_ffmpeg ]; gtk_modules = [ libcanberra ]; }; @@ -11234,6 +11315,8 @@ let xbmc = xbmcPlain; }; + kodi = callPackage ../applications/video/kodi { }; + xbmc-retroarch-advanced-launchers = callPackage ../misc/emulators/retroarch/xbmc-advanced-launchers.nix { cores = retroArchCores; @@ -11410,10 +11493,7 @@ let pygtk = pyGtkGlade; }; - zotero = callPackage ../applications/office/zotero { - inherit (gnome) libIDL; - inherit (pythonPackages) pysqlite; - }; + zotero = callPackage ../applications/office/zotero {}; zynaddsubfx = callPackage ../applications/audio/zynaddsubfx { }; @@ -11543,7 +11623,7 @@ let icbm3d = callPackage ../games/icbm3d { }; ingen = callPackage ../applications/audio/ingen { - boost = boost155; + inherit (pythonPackages) rdflib; }; instead = callPackage ../games/instead { @@ -11797,6 +11877,8 @@ let cjs = callPackage ../desktops/cinnamon/cjs.nix { }; }; + clearlooks-phenix = callPackage ../misc/themes/gtk3/clearlooks-phenix { }; + enlightenment = callPackage ../desktops/enlightenment { }; e19 = recurseIntoAttrs ( @@ -12181,6 +12263,8 @@ let heq = callPackage ../development/coq-modules/heq {}; + interval = callPackage ../development/coq-modules/interval {}; + mathcomp = callPackage ../development/coq-modules/mathcomp {}; paco = callPackage ../development/coq-modules/paco {}; @@ -12524,6 +12608,8 @@ let lilypond = callPackage ../misc/lilypond { guile = guile_1_8; }; + mailcore2 = callPackage ../development/libraries/mailcore2 { }; + martyr = callPackage ../development/libraries/martyr { }; mess = callPackage ../misc/emulators/mess { @@ -12541,17 +12627,24 @@ let stateDir = config.nix.stateDir or "/nix/var"; }; + /* nixUnstable = callPackage ../tools/package-management/nix/unstable.nix { storeDir = config.nix.storeDir or "/nix/store"; stateDir = config.nix.stateDir or "/nix/var"; }; + */ + nixUnstable = nixStable; nixops = callPackage ../tools/package-management/nixops { }; + nixopsUnstable = callPackage ../tools/package-management/nixops/unstable.nix { }; + nix-prefetch-scripts = callPackage ../tools/package-management/nix-prefetch-scripts { }; nix-repl = callPackage ../tools/package-management/nix-repl { }; + nix-serve = callPackage ../tools/package-management/nix-serve { }; + nut = callPackage ../applications/misc/nut { }; solfege = callPackage ../misc/solfege { @@ -12763,7 +12856,7 @@ let viewnior = callPackage ../applications/graphics/viewnior { }; - vimrc = callPackage ../misc/vim-plugins/vimrc.nix { inherit writeText; }; + vimUtils = callPackage ../misc/vim-plugins/vim-utils.nix { inherit writeText; }; vimPlugins = recurseIntoAttrs (callPackage ../misc/vim-plugins { }); @@ -12896,6 +12989,10 @@ let jquery_ui = jquery-ui; # added 2014-09-07 youtubeDL = youtube-dl; # added 2014-10-26 rdiff_backup = rdiff-backup; # added 2014-11-23 + htmlTidy = html-tidy; # added 2014-12-06 + sqliteInteractive = sqlite-interactive; # added 2014-12-06 + nfsUtils = nfs-utils; # added 2014-12-06 + buildbotSlave = buildbot-slave; # added 2014-12-09 opentsdb = callPackage ../tools/misc/opentsdb {}; diff --git a/pkgs/top-level/haskell-defaults.nix b/pkgs/top-level/haskell-defaults.nix index 84d06530958..9d8177d49b8 100644 --- a/pkgs/top-level/haskell-defaults.nix +++ b/pkgs/top-level/haskell-defaults.nix @@ -15,19 +15,22 @@ # Older compilers inherit the overrides from newer ones. ghcHEADPrefs = self : super : super // { - cabalInstall_1_20_0_3 = super.cabalInstall_1_20_0_3.override { Cabal = null; }; + cabalInstall_1_20_0_4 = super.cabalInstall_1_20_0_4.override { Cabal = null; }; mtl = self.mtl_2_2_1; - transformersCompat = super.transformersCompat_0_3_3; }; - ghc783Prefs = self : super : ghcHEADPrefs self super // { - cabalInstall_1_20_0_3 = super.cabalInstall_1_20_0_3.override { Cabal = self.Cabal_1_20_0_2; }; + ghc784Prefs = self : super : ghcHEADPrefs self super // { + cabalInstall_1_20_0_4 = super.cabalInstall_1_20_0_4.override { Cabal = self.Cabal_1_20_0_2; }; codex = super.codex.override { hackageDb = super.hackageDb.override { Cabal = self.Cabal_1_20_0_2; }; }; + jailbreakCabal = super.jailbreakCabal.override { Cabal = self.Cabal_1_20_0_2; }; MonadRandom = self.MonadRandom_0_2_0_1; # newer versions require transformers >= 0.4.x mtl = self.mtl_2_1_3_1; + transformersCompat = super.transformersCompat.override { cabal = self.cabal.override { + extension = self: super: { configureFlags = "-fthree " + super.configureFlags or ""; }; + }; }; }; - ghc763Prefs = self : super : ghc783Prefs self super // { + ghc763Prefs = self : super : ghc784Prefs self super // { aeson = self.aeson_0_7_0_4; ariadne = super.ariadne.override { haskellNames = self.haskellNames.override { @@ -81,7 +84,6 @@ binary = self.binary_0_7_2_2; # core package in ghc >= 7.2.2 caseInsensitive = super.caseInsensitive; # undo the override from ghc 7.2.2 HsSyck = self.HsSyck_0_51; - jailbreakCabal = super.jailbreakCabal.override { Cabal = self.Cabal_1_16_0_3; }; random = null; # core package in ghc <= 7.0.x }; @@ -94,6 +96,7 @@ deepseq = self.deepseq_1_2_0_1; dlist = super.dlist.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; }; exceptions = null; # none of our versions compile + jailbreakCabal = super.jailbreakCabal.override { Cabal = self.Cabal_1_16_0_3; }; logict = super.logict.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; }; monadPar = self.monadPar_0_1_0_3; nats = null; # none of our versions compile @@ -226,10 +229,10 @@ }; }; - packages_ghc783 = - packages { ghcPath = ../development/compilers/ghc/7.8.3.nix; + packages_ghc784 = + packages { ghcPath = ../development/compilers/ghc/7.8.4.nix; ghcBinary = if stdenv.isDarwin then ghc783Binary else ghc742Binary; - prefFun = ghc783Prefs; + prefFun = ghc784Prefs; }; packages_ghcjs = diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 6f6c30aaaf3..1d640875212 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -240,6 +240,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in bencoding = callPackage ../development/libraries/haskell/bencoding {}; + bencode = callPackage ../development/libraries/haskell/bencode {}; + bert = callPackage ../development/libraries/haskell/bert {}; bifunctors = callPackage ../development/libraries/haskell/bifunctors {}; @@ -249,6 +251,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in binary_0_7_2_2 = callPackage ../development/libraries/haskell/binary/0.7.2.2.nix {}; binary = null; # core package since ghc >= 7.2.x + binaryStrict = callPackage ../development/libraries/haskell/binary-strict {}; + binaryConduit = callPackage ../development/libraries/haskell/binary-conduit {}; binaryShared = callPackage ../development/libraries/haskell/binary-shared {}; @@ -261,6 +265,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in libusb = pkgs.libusb1; }; + bindingsPortaudio = callPackage ../development/libraries/haskell/bindings-portaudio {}; + bindingsPosix = callPackage ../development/libraries/haskell/bindings-posix {}; bitarray = callPackage ../development/libraries/haskell/bitarray {}; @@ -341,6 +347,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in bzlib = callPackage ../development/libraries/haskell/bzlib {}; + call = callPackage ../development/libraries/haskell/call {}; + c2hs = callPackage ../development/tools/haskell/c2hs {}; c2hsc = callPackage ../development/tools/haskell/c2hsc {}; @@ -360,7 +368,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in cairo = callPackage ../development/libraries/haskell/cairo { inherit (pkgs) cairo zlib; - libc = pkgs.stdenv.gcc.libc; + libc = pkgs.stdenv.cc.libc; }; carray = callPackage ../development/libraries/haskell/carray {}; @@ -550,6 +558,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in csv = callPackage ../development/libraries/haskell/csv {}; + csv-conduit = callPackage ../development/libraries/haskell/csv-conduit {}; + cssText = callPackage ../development/libraries/haskell/css-text {}; cufft = callPackage ../development/libraries/haskell/cufft {}; @@ -774,6 +784,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in entropy = callPackage ../development/libraries/haskell/entropy {}; + elevator = callPackage ../development/libraries/haskell/elevator {}; + equationalReasoning = callPackage ../development/libraries/haskell/equational-reasoning {}; equivalence = callPackage ../development/libraries/haskell/equivalence {}; @@ -970,7 +982,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in glade = callPackage ../development/libraries/haskell/glade { inherit (pkgs.gnome) libglade; gtkC = pkgs.gtk; - libc = pkgs.stdenv.gcc.libc; + libc = pkgs.stdenv.cc.libc; }; GLFW = callPackage ../development/libraries/haskell/GLFW {}; @@ -979,7 +991,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in glib = callPackage ../development/libraries/haskell/glib { glib = pkgs.glib; - libc = pkgs.stdenv.gcc.libc; + libc = pkgs.stdenv.cc.libc; }; Glob = callPackage ../development/libraries/haskell/Glob {}; @@ -996,6 +1008,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in glossRasterAccelerate = callPackage ../development/libraries/haskell/gloss-raster-accelerate {}; + glossRendering = callPackage ../development/libraries/haskell/gloss-rendering {}; + glpkHs = callPackage ../development/libraries/haskell/glpk-hs {}; GLURaw = callPackage ../development/libraries/haskell/GLURaw {}; @@ -1016,7 +1030,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in gtk = callPackage ../development/libraries/haskell/gtk { inherit (pkgs) gtk; - libc = pkgs.stdenv.gcc.libc; + libc = pkgs.stdenv.cc.libc; }; gtk3 = callPackage ../development/libraries/haskell/gtk3 { @@ -1029,7 +1043,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in gtksourceview2 = callPackage ../development/libraries/haskell/gtksourceview2 { inherit (pkgs.gnome) gtksourceview; - libc = pkgs.stdenv.gcc.libc; + libc = pkgs.stdenv.cc.libc; }; gtkTraymanager = callPackage ../development/libraries/haskell/gtk-traymanager {}; @@ -1205,9 +1219,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in hi = callPackage ../development/libraries/haskell/hi {}; - hindent = callPackage ../development/libraries/haskell/hindent { - haskellSrcExts = self.haskellSrcExts_1_15_0_1; - }; + hindent = callPackage ../development/libraries/haskell/hindent {}; hint = callPackage ../development/libraries/haskell/hint {}; @@ -1345,6 +1357,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in hspecDiscover = callPackage ../development/libraries/haskell/hspec-discover {}; + hspecLaws = callPackage ../development/libraries/haskell/hspec-laws {}; + hstatsd = callPackage ../development/libraries/haskell/hstatsd {}; hsyslog = callPackage ../development/libraries/haskell/hsyslog {}; @@ -1445,10 +1459,6 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in ivory = callPackage ../development/libraries/haskell/ivory {}; - ixdopp = callPackage ../development/libraries/haskell/ixdopp { - preprocessorTools = self.preprocessorTools_0_1_3; - }; - ixset = callPackage ../development/libraries/haskell/ixset {}; ixShapable = callPackage ../development/libraries/haskell/ix-shapable {}; @@ -1559,6 +1569,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in libmpd = callPackage ../development/libraries/haskell/libmpd {}; + libnotify = callPackage ../development/libraries/haskell/libnotify { inherit (pkgs) libnotify; }; + liblastfm = callPackage ../development/libraries/haskell/liblastfm {}; libsystemdJournal = callPackage ../development/libraries/haskell/libsystemd-journal {}; @@ -1569,14 +1581,20 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in liftedBase = callPackage ../development/libraries/haskell/lifted-base {}; + linAlg = callPackage ../development/libraries/haskell/lin-alg {}; + linear = callPackage ../development/libraries/haskell/linear {}; + linearOpenGL = callPackage ../development/libraries/haskell/linear-opengl {}; + linuxInotify = callPackage ../development/libraries/haskell/linux-inotify {}; List = callPackage ../development/libraries/haskell/List {}; lists = callPackage ../development/libraries/haskell/lists {}; + listT = callPackage ../development/libraries/haskell/list-t {}; + listExtras = callPackage ../development/libraries/haskell/listExtras {}; listTries = callPackage ../development/libraries/haskell/list-tries {}; @@ -1704,8 +1722,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in monadIO = callPackage ../development/libraries/haskell/monadIO {}; monadPar_0_1_0_3 = callPackage ../development/libraries/haskell/monad-par/0.1.0.3.nix {}; - monadPar_0_3_4_6 = callPackage ../development/libraries/haskell/monad-par/0.3.4.6.nix {}; - monadPar = self.monadPar_0_3_4_6; + monadPar_0_3_4_7 = callPackage ../development/libraries/haskell/monad-par/0.3.4.7.nix {}; + monadPar = self.monadPar_0_3_4_7; monadParallel = callPackage ../development/libraries/haskell/monad-parallel {}; @@ -1716,8 +1734,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in MonadPrompt = callPackage ../development/libraries/haskell/MonadPrompt {}; MonadRandom_0_2_0_1 = callPackage ../development/libraries/haskell/MonadRandom/0.2.0.1.nix {}; - MonadRandom_0_3 = callPackage ../development/libraries/haskell/MonadRandom/0.3.nix {}; - MonadRandom = self.MonadRandom_0_3; + MonadRandom_0_3_0_1 = callPackage ../development/libraries/haskell/MonadRandom/0.3.0.1.nix {}; + MonadRandom = self.MonadRandom_0_3_0_1; monadStm = callPackage ../development/libraries/haskell/monad-stm {}; @@ -1749,6 +1767,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in mtlparse = callPackage ../development/libraries/haskell/mtlparse {}; + mtlPrelude = callPackage ../development/libraries/haskell/mtl-prelude {}; + mueval = callPackage ../development/libraries/haskell/mueval {}; muevalWrapper = callPackage ../development/libraries/haskell/mueval/wrapper.nix {}; @@ -1767,6 +1787,10 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in murmurHash = callPackage ../development/libraries/haskell/murmur-hash {}; + mvc = callPackage ../development/libraries/haskell/mvc {}; + + mvcUpdates = callPackage ../development/libraries/haskell/mvc-updates {}; + mwcRandom = callPackage ../development/libraries/haskell/mwc-random {}; mysql = callPackage ../development/libraries/haskell/mysql { @@ -1851,6 +1875,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in oeis = callPackage ../development/libraries/haskell/oeis {}; + ofx = callPackage ../development/libraries/haskell/ofx {}; + opaleye = callPackage ../development/libraries/haskell/opaleye {}; OpenAL = callPackage ../development/libraries/haskell/OpenAL {}; @@ -1871,6 +1897,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in optparseApplicative_0_11_0_1 = callPackage ../development/libraries/haskell/optparse-applicative/0.11.0.1.nix {}; optparseApplicative = self.optparseApplicative_0_11_0_1; + packdeps = callPackage ../development/tools/haskell/packdeps {}; + pathPieces = callPackage ../development/libraries/haskell/path-pieces {}; patience = callPackage ../development/libraries/haskell/patience {}; @@ -1883,12 +1911,12 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in pango = callPackage ../development/libraries/haskell/pango { inherit (pkgs) pango; - libc = pkgs.stdenv.gcc.libc; + libc = pkgs.stdenv.cc.libc; }; parallel_3_2_0_3 = callPackage ../development/libraries/haskell/parallel/3.2.0.3.nix {}; - parallel_3_2_0_4 = callPackage ../development/libraries/haskell/parallel/3.2.0.4.nix {}; - parallel = self.parallel_3_2_0_4; + parallel_3_2_0_5 = callPackage ../development/libraries/haskell/parallel/3.2.0.5.nix {}; + parallel = self.parallel_3_2_0_5; parallelIo = callPackage ../development/libraries/haskell/parallel-io {}; @@ -1990,7 +2018,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in poppler = callPackage ../development/libraries/haskell/poppler { popplerGlib = pkgs.poppler.poppler_glib; - libc = pkgs.stdenv.gcc.libc; + libc = pkgs.stdenv.cc.libc; }; posixPaths = callPackage ../development/libraries/haskell/posix-paths {}; @@ -2016,9 +2044,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in preludeSafeenum = callPackage ../development/libraries/haskell/prelude-safeenum {}; - preprocessorTools_0_1_3 = callPackage ../development/libraries/haskell/preprocessor-tools/0.1.3.nix {}; - preprocessorTools_1_0_1 = callPackage ../development/libraries/haskell/preprocessor-tools/1.0.1.nix {}; - preprocessorTools = self.preprocessorTools_1_0_1; + preprocessorTools = callPackage ../development/libraries/haskell/preprocessor-tools {}; presburger = callPackage ../development/libraries/haskell/presburger {}; @@ -2077,6 +2103,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in quickcheckPropertyMonad = callPackage ../development/libraries/haskell/quickcheck-property-monad {}; + quickcheckUnicode = callPackage ../development/libraries/haskell/quickcheck-unicode {}; + qrencode = callPackage ../development/libraries/haskell/qrencode { inherit (pkgs) qrencode; }; @@ -2216,8 +2244,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in sbv = callPackage ../development/libraries/haskell/sbv {}; scientific_0_2_0_2 = callPackage ../development/libraries/haskell/scientific/0.2.0.2.nix {}; - scientific_0_3_3_2 = callPackage ../development/libraries/haskell/scientific/0.3.3.2.nix {}; - scientific = self.scientific_0_3_3_2; + scientific_0_3_3_3 = callPackage ../development/libraries/haskell/scientific/0.3.3.3.nix {}; + scientific = self.scientific_0_3_3_3; scotty = callPackage ../development/libraries/haskell/scotty {}; @@ -2239,13 +2267,13 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in servant = callPackage ../development/libraries/haskell/servant {}; - servantPool = callPackage ../development/libraries/haskell/servant-pool {}; + servantServer = callPackage ../development/libraries/haskell/servant-server {}; - servantPostgresql = callPackage ../development/libraries/haskell/servant-postgresql {}; + servantClient = callPackage ../development/libraries/haskell/servant-client {}; - servantResponse = callPackage ../development/libraries/haskell/servant-response {}; + servantDocs = callPackage ../development/libraries/haskell/servant-docs {}; - servantScotty = callPackage ../development/libraries/haskell/servant-scotty {}; + servantJquery = callPackage ../development/libraries/haskell/servant-jquery {}; setenv = callPackage ../development/libraries/haskell/setenv {}; @@ -2456,7 +2484,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in stripe = callPackage ../development/libraries/haskell/stripe {}; svgcairo = callPackage ../development/libraries/haskell/svgcairo { - libc = pkgs.stdenv.gcc.libc; + libc = pkgs.stdenv.cc.libc; }; SVGFonts = callPackage ../development/libraries/haskell/SVGFonts {}; @@ -2553,8 +2581,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in text_0_11_2_3 = callPackage ../development/libraries/haskell/text/0.11.2.3.nix {}; text_1_1_1_3 = callPackage ../development/libraries/haskell/text/1.1.1.3.nix {}; - text_1_2_0_0 = callPackage ../development/libraries/haskell/text/1.2.0.0.nix {}; - text = self.text_1_2_0_0; + text_1_2_0_3 = callPackage ../development/libraries/haskell/text/1.2.0.3.nix {}; + text = self.text_1_2_0_3; textBinary = callPackage ../development/libraries/haskell/text-binary {}; @@ -2614,10 +2642,12 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in tls = callPackage ../development/libraries/haskell/tls {}; + torrent = callPackage ../development/libraries/haskell/torrent {}; + tostring = callPackage ../development/libraries/haskell/tostring {}; transformers_0_3_0_0 = callPackage ../development/libraries/haskell/transformers/0.3.0.0.nix {}; - transformers_0_4_1_0 = callPackage ../development/libraries/haskell/transformers/0.4.1.0.nix {}; + transformers_0_4_2_0 = callPackage ../development/libraries/haskell/transformers/0.4.2.0.nix {}; transformers = null; # core package since ghc >= 7.8.x transformersBase = callPackage ../development/libraries/haskell/transformers-base {}; @@ -2645,6 +2675,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in twitterTypesLens = callPackage ../development/libraries/haskell/twitter-types-lens {}; + typeAligned = callPackage ../development/libraries/haskell/type-aligned {}; + TypeCompose = callPackage ../development/libraries/haskell/TypeCompose {}; typeEq = callPackage ../development/libraries/haskell/type-eq {}; @@ -2742,8 +2774,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in vect = callPackage ../development/libraries/haskell/vect {}; vector_0_10_9_3 = callPackage ../development/libraries/haskell/vector/0.10.9.3.nix {}; - vector_0_10_12_1 = callPackage ../development/libraries/haskell/vector/0.10.12.1.nix {}; - vector = self.vector_0_10_12_1; + vector_0_10_12_2 = callPackage ../development/libraries/haskell/vector/0.10.12.2.nix {}; + vector = self.vector_0_10_12_2; vectorAlgorithms = callPackage ../development/libraries/haskell/vector-algorithms {}; @@ -2932,8 +2964,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in zeromq4Haskell = callPackage ../development/libraries/haskell/zeromq4-haskell { zeromq = pkgs.zeromq4; }; zipArchive_0_2_2_1 = callPackage ../development/libraries/haskell/zip-archive/0.2.2.1.nix {}; - zipArchive_0_2_3_4 = callPackage ../development/libraries/haskell/zip-archive/0.2.3.4.nix {}; - zipArchive = self.zipArchive_0_2_3_4; + zipArchive_0_2_3_5 = callPackage ../development/libraries/haskell/zip-archive/0.2.3.5.nix {}; + zipArchive = self.zipArchive_0_2_3_5; zipper = callPackage ../development/libraries/haskell/zipper {}; @@ -2949,7 +2981,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in # Compilers. - Agda = callPackage ../development/compilers/agda { haskellSrcExts = self.haskellSrcExts_1_15_0_1; }; + Agda = callPackage ../development/compilers/agda {}; epic = callPackage ../development/compilers/epic {}; @@ -3138,11 +3170,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in cabalInstall_1_16_0_2 = callPackage ../tools/package-management/cabal-install/1.16.0.2.nix { Cabal = self.Cabal_1_16_0_3; }; cabalInstall_1_18_0_3 = callPackage ../tools/package-management/cabal-install/1.18.0.3.nix { Cabal = self.Cabal_1_18_1_3; }; - cabalInstall_1_20_0_3 = callPackage ../tools/package-management/cabal-install/1.20.0.3.nix { - HTTP = self.HTTP.override { network = self.network_2_5_0_0; }; - Cabal = self.Cabal_1_20_0_2; - }; - cabalInstall = self.cabalInstall_1_20_0_3; + cabalInstall_1_20_0_4 = callPackage ../tools/package-management/cabal-install/1.20.0.4.nix { Cabal = self.Cabal_1_20_0_2; }; + cabalInstall = self.cabalInstall_1_20_0_4; CabalGhcjs = callPackage ../development/tools/haskell/Cabal-ghcjs {}; cabalInstallGhcjs = callPackage ../development/tools/haskell/cabal-install-ghcjs {}; @@ -3166,6 +3195,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in jailbreakCabal = callPackage ../development/tools/haskell/jailbreak-cabal {}; + journalMailer = callPackage ../tools/system/journal-mailer {}; + keter = callPackage ../development/tools/haskell/keter {}; lhs2tex = callPackage ../tools/typesetting/lhs2tex {}; diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix index 245483e76b3..eeff4a47f9e 100644 --- a/pkgs/top-level/lua-packages.nix +++ b/pkgs/top-level/lua-packages.nix @@ -5,8 +5,9 @@ for each package in a separate file: the call to the function would be almost as must code as the function itself. */ -{ fetchurl, stdenv, lua, callPackage, unzip, zziplib -, pcre, oniguruma, gnulib, tre, glibc, sqlite, openssl, expat +{ fetchurl, stdenv, lua, callPackage, unzip, zziplib, pkgconfig, libtool +, pcre, oniguruma, gnulib, tre, glibc, sqlite, openssl, expat, cairo +, perl, gtk, python, glib, gobjectIntrospection }: let @@ -14,6 +15,7 @@ let isLua52 = lua.luaversion == "5.2"; self = _self; _self = with self; { + inherit lua; inherit (stdenv.lib) maintainers; #define build lua package function @@ -255,4 +257,31 @@ let license = stdenv.lib.licenses.mit; }; }; + + lgi = stdenv.mkDerivation rec { + name = "lgi-${version}"; + version = "0.7.2"; + + src = fetchurl { + url = "https://github.com/pavouk/lgi/archive/${version}.tar.gz"; + sha256 = "0ihl7gg77b042vsfh0k7l53b7sl3d7mmrq8ns5lrsf71dzrr19bn"; + }; + + meta = with stdenv.lib; { + description = "GObject-introspection based dynamic Lua binding to GObject based libraries"; + homepage = https://github.com/pavouk/lgi; + license = "custom"; + maintainers = with maintainers; [ lovek323 ]; + platforms = platforms.unix; + }; + + buildInputs = [ glib gobjectIntrospection lua pkgconfig ]; + + makeFlags = [ "LUA_VERSION=${lua.luaversion}" ]; + + preBuild = '' + sed -i "s|/usr/local|$out|" lgi/Makefile + ''; + }; + }; in self diff --git a/pkgs/top-level/node-packages-generated.nix b/pkgs/top-level/node-packages-generated.nix index b2ce39216cc..10a19fda8ae 100644 --- a/pkgs/top-level/node-packages-generated.nix +++ b/pkgs/top-level/node-packages-generated.nix @@ -137,44 +137,22 @@ self.by-version."abbrev"."1.0.5"; by-spec."abbrev"."~1.0.5" = self.by-version."abbrev"."1.0.5"; - by-spec."accepts"."1.0.0" = - self.by-version."accepts"."1.0.0"; - by-version."accepts"."1.0.0" = lib.makeOverridable self.buildNodePackage { - name = "accepts-1.0.0"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/accepts/-/accepts-1.0.0.tgz"; - name = "accepts-1.0.0.tgz"; - sha1 = "3604c765586c3b9cf7877b6937cdbd4587f947dc"; - }) - ]; - buildInputs = - (self.nativeDeps."accepts" or []); - deps = { - "mime-1.2.11" = self.by-version."mime"."1.2.11"; - "negotiator-0.3.0" = self.by-version."negotiator"."0.3.0"; - }; - peerDependencies = [ - ]; - passthru.names = [ "accepts" ]; - }; by-spec."accepts"."~1.1.0" = - self.by-version."accepts"."1.1.3"; - by-version."accepts"."1.1.3" = lib.makeOverridable self.buildNodePackage { - name = "accepts-1.1.3"; + self.by-version."accepts"."1.1.4"; + by-version."accepts"."1.1.4" = lib.makeOverridable self.buildNodePackage { + name = "accepts-1.1.4"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/accepts/-/accepts-1.1.3.tgz"; - name = "accepts-1.1.3.tgz"; - sha1 = "14d99f8ee3ea69f8709d4bd17ffe153bef0f6c6d"; + url = "http://registry.npmjs.org/accepts/-/accepts-1.1.4.tgz"; + name = "accepts-1.1.4.tgz"; + sha1 = "d71c96f7d41d0feda2c38cd14e8a27c04158df4a"; }) ]; buildInputs = (self.nativeDeps."accepts" or []); deps = { - "mime-types-2.0.3" = self.by-version."mime-types"."2.0.3"; + "mime-types-2.0.4" = self.by-version."mime-types"."2.0.4"; "negotiator-0.4.9" = self.by-version."negotiator"."0.4.9"; }; peerDependencies = [ @@ -182,9 +160,11 @@ passthru.names = [ "accepts" ]; }; by-spec."accepts"."~1.1.2" = - self.by-version."accepts"."1.1.3"; + self.by-version."accepts"."1.1.4"; by-spec."accepts"."~1.1.3" = - self.by-version."accepts"."1.1.3"; + self.by-version."accepts"."1.1.4"; + by-spec."accepts"."~1.1.4" = + self.by-version."accepts"."1.1.4"; by-spec."acorn"."^0.8.0" = self.by-version."acorn"."0.8.0"; by-version."acorn"."0.8.0" = lib.makeOverridable self.buildNodePackage { @@ -348,7 +328,7 @@ buildInputs = (self.nativeDeps."airplay-js" or []); deps = { - "mdns-js-0.2.2" = self.by-version."mdns-js"."0.2.2"; + "mdns-js-0.2.4" = self.by-version."mdns-js"."0.2.4"; "plist-with-patches-0.5.1" = self.by-version."plist-with-patches"."0.5.1"; }; peerDependencies = [ @@ -419,26 +399,6 @@ ]; passthru.names = [ "ansi" ]; }; - by-spec."ansi"."~0.2.1" = - self.by-version."ansi"."0.2.1"; - by-version."ansi"."0.2.1" = lib.makeOverridable self.buildNodePackage { - name = "ansi-0.2.1"; - bin = true; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/ansi/-/ansi-0.2.1.tgz"; - name = "ansi-0.2.1.tgz"; - sha1 = "3ab568ec18cd0ab7753c83117d57dad684a1c017"; - }) - ]; - buildInputs = - (self.nativeDeps."ansi" or []); - deps = { - }; - peerDependencies = [ - ]; - passthru.names = [ "ansi" ]; - }; by-spec."ansi"."~0.3.0" = self.by-version."ansi"."0.3.0"; by-version."ansi"."0.3.0" = lib.makeOverridable self.buildNodePackage { @@ -501,6 +461,26 @@ }; by-spec."ansi-regex"."^0.2.1" = self.by-version."ansi-regex"."0.2.1"; + by-spec."ansi-regex"."^1.0.0" = + self.by-version."ansi-regex"."1.1.0"; + by-version."ansi-regex"."1.1.0" = lib.makeOverridable self.buildNodePackage { + name = "ansi-regex-1.1.0"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/ansi-regex/-/ansi-regex-1.1.0.tgz"; + name = "ansi-regex-1.1.0.tgz"; + sha1 = "67792c5d6ad05c792d6cd6057ac8f5e69ebf4357"; + }) + ]; + buildInputs = + (self.nativeDeps."ansi-regex" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "ansi-regex" ]; + }; by-spec."ansi-remover"."*" = self.by-version."ansi-remover"."0.0.2"; by-version."ansi-remover"."0.0.2" = lib.makeOverridable self.buildNodePackage { @@ -639,7 +619,7 @@ (self.nativeDeps."archiver" or []); deps = { "async-0.9.0" = self.by-version."async"."0.9.0"; - "buffer-crc32-0.2.4" = self.by-version."buffer-crc32"."0.2.4"; + "buffer-crc32-0.2.5" = self.by-version."buffer-crc32"."0.2.5"; "glob-4.0.6" = self.by-version."glob"."4.0.6"; "lazystream-0.1.0" = self.by-version."lazystream"."0.1.0"; "lodash-2.4.1" = self.by-version."lodash"."2.4.1"; @@ -718,7 +698,27 @@ passthru.names = [ "argparse" ]; }; by-spec."argparse"."~ 0.1.11" = - self.by-version."argparse"."0.1.15"; + self.by-version."argparse"."0.1.16"; + by-version."argparse"."0.1.16" = lib.makeOverridable self.buildNodePackage { + name = "argparse-0.1.16"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/argparse/-/argparse-0.1.16.tgz"; + name = "argparse-0.1.16.tgz"; + sha1 = "cfd01e0fbba3d6caed049fbd758d40f65196f57c"; + }) + ]; + buildInputs = + (self.nativeDeps."argparse" or []); + deps = { + "underscore-1.7.0" = self.by-version."underscore"."1.7.0"; + "underscore.string-2.4.0" = self.by-version."underscore.string"."2.4.0"; + }; + peerDependencies = [ + ]; + passthru.names = [ "argparse" ]; + }; by-spec."array-filter"."~0.0.0" = self.by-version."array-filter"."0.0.1"; by-version."array-filter"."0.0.1" = lib.makeOverridable self.buildNodePackage { @@ -841,7 +841,7 @@ ]; passthru.names = [ "asn1" ]; }; - by-spec."asn1.js".">=0.6.0-0 >=0.6.4-0 <0.7.0-0" = + by-spec."asn1.js".">=0.6.0-0 >=0.6.5-0 <0.7.0-0" = self.by-version."asn1.js"."0.6.5"; by-version."asn1.js"."0.6.5" = lib.makeOverridable self.buildNodePackage { name = "asn1.js-0.6.5"; @@ -864,7 +864,7 @@ }; by-spec."asn1.js"."^0.6.0" = self.by-version."asn1.js"."0.6.5"; - by-spec."asn1.js"."^0.6.4" = + by-spec."asn1.js"."^0.6.5" = self.by-version."asn1.js"."0.6.5"; by-spec."asn1.js-rfc3280"."^0.5.1" = self.by-version."asn1.js-rfc3280"."0.5.1"; @@ -1135,26 +1135,8 @@ self.by-version."async"."0.2.10"; by-spec."async"."~0.2.9" = self.by-version."async"."0.2.10"; - by-spec."async"."~0.8" = - self.by-version."async"."0.8.0"; - by-version."async"."0.8.0" = lib.makeOverridable self.buildNodePackage { - name = "async-0.8.0"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/async/-/async-0.8.0.tgz"; - name = "async-0.8.0.tgz"; - sha1 = "ee65ec77298c2ff1456bc4418a052d0f06435112"; - }) - ]; - buildInputs = - (self.nativeDeps."async" or []); - deps = { - }; - peerDependencies = [ - ]; - passthru.names = [ "async" ]; - }; + by-spec."async"."~0.9" = + self.by-version."async"."0.9.0"; by-spec."async"."~0.9.0" = self.by-version."async"."0.9.0"; by-spec."async-each"."~0.1.5" = @@ -1199,15 +1181,15 @@ passthru.names = [ "async-some" ]; }; by-spec."aws-sdk"."*" = - self.by-version."aws-sdk"."2.0.29"; - by-version."aws-sdk"."2.0.29" = lib.makeOverridable self.buildNodePackage { - name = "aws-sdk-2.0.29"; + self.by-version."aws-sdk"."2.1.4"; + by-version."aws-sdk"."2.1.4" = lib.makeOverridable self.buildNodePackage { + name = "aws-sdk-2.1.4"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/aws-sdk/-/aws-sdk-2.0.29.tgz"; - name = "aws-sdk-2.0.29.tgz"; - sha1 = "01c8f18d43a1174637e04dad20cd04673385e18b"; + url = "http://registry.npmjs.org/aws-sdk/-/aws-sdk-2.1.4.tgz"; + name = "aws-sdk-2.1.4.tgz"; + sha1 = "228a70fb95bb8ccf721423b87ab1c60a147cd38d"; }) ]; buildInputs = @@ -1220,7 +1202,7 @@ ]; passthru.names = [ "aws-sdk" ]; }; - "aws-sdk" = self.by-version."aws-sdk"."2.0.29"; + "aws-sdk" = self.by-version."aws-sdk"."2.1.4"; by-spec."aws-sdk".">=1.2.0 <2" = self.by-version."aws-sdk"."1.18.0"; by-version."aws-sdk"."1.18.0" = lib.makeOverridable self.buildNodePackage { @@ -1365,6 +1347,26 @@ ]; passthru.names = [ "backoff" ]; }; + by-spec."balanced-match"."^0.2.0" = + self.by-version."balanced-match"."0.2.0"; + by-version."balanced-match"."0.2.0" = lib.makeOverridable self.buildNodePackage { + name = "balanced-match-0.2.0"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/balanced-match/-/balanced-match-0.2.0.tgz"; + name = "balanced-match-0.2.0.tgz"; + sha1 = "38f6730c03aab6d5edbb52bd934885e756d71674"; + }) + ]; + buildInputs = + (self.nativeDeps."balanced-match" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "balanced-match" ]; + }; by-spec."base62"."0.1.1" = self.by-version."base62"."0.1.1"; by-version."base62"."0.1.1" = lib.makeOverridable self.buildNodePackage { @@ -1757,7 +1759,7 @@ deps = { "bencode-0.6.0" = self.by-version."bencode"."0.6.0"; "buffer-equal-0.0.1" = self.by-version."buffer-equal"."0.0.1"; - "compact2string-1.3.0" = self.by-version."compact2string"."1.3.0"; + "compact2string-1.4.0" = self.by-version."compact2string"."1.4.0"; "debug-1.0.4" = self.by-version."debug"."1.0.4"; "hat-0.0.3" = self.by-version."hat"."0.0.3"; "inherits-2.0.1" = self.by-version."inherits"."2.0.1"; @@ -1765,7 +1767,7 @@ "once-1.3.1" = self.by-version."once"."1.3.1"; "portfinder-0.2.1" = self.by-version."portfinder"."0.2.1"; "run-parallel-1.0.0" = self.by-version."run-parallel"."1.0.0"; - "string2compact-1.2.0" = self.by-version."string2compact"."1.2.0"; + "string2compact-1.2.1" = self.by-version."string2compact"."1.2.1"; }; peerDependencies = [ ]; @@ -1789,7 +1791,7 @@ "addr-to-ip-port-1.4.0" = self.by-version."addr-to-ip-port"."1.4.0"; "bencode-0.6.0" = self.by-version."bencode"."0.6.0"; "buffer-equal-0.0.1" = self.by-version."buffer-equal"."0.0.1"; - "compact2string-1.3.0" = self.by-version."compact2string"."1.3.0"; + "compact2string-1.4.0" = self.by-version."compact2string"."1.4.0"; "debug-2.1.0" = self.by-version."debug"."2.1.0"; "hat-0.0.3" = self.by-version."hat"."0.0.3"; "inherits-2.0.1" = self.by-version."inherits"."2.0.1"; @@ -1797,22 +1799,22 @@ "k-bucket-0.4.2" = self.by-version."k-bucket"."0.4.2"; "once-1.3.1" = self.by-version."once"."1.3.1"; "run-parallel-1.0.0" = self.by-version."run-parallel"."1.0.0"; - "string2compact-1.2.0" = self.by-version."string2compact"."1.2.0"; + "string2compact-1.2.1" = self.by-version."string2compact"."1.2.1"; }; peerDependencies = [ ]; passthru.names = [ "bittorrent-dht" ]; }; by-spec."bittorrent-tracker"."^2.0.0" = - self.by-version."bittorrent-tracker"."2.9.1"; - by-version."bittorrent-tracker"."2.9.1" = lib.makeOverridable self.buildNodePackage { - name = "bittorrent-tracker-2.9.1"; + self.by-version."bittorrent-tracker"."2.10.0"; + by-version."bittorrent-tracker"."2.10.0" = lib.makeOverridable self.buildNodePackage { + name = "bittorrent-tracker-2.10.0"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/bittorrent-tracker/-/bittorrent-tracker-2.9.1.tgz"; - name = "bittorrent-tracker-2.9.1.tgz"; - sha1 = "a1168960898a02bc193f95d60d07504a31154cee"; + url = "http://registry.npmjs.org/bittorrent-tracker/-/bittorrent-tracker-2.10.0.tgz"; + name = "bittorrent-tracker-2.10.0.tgz"; + sha1 = "faa80f136d37432c2a3db6a9c21a4d92c89f2b56"; }) ]; buildInputs = @@ -1821,7 +1823,7 @@ "bencode-0.6.0" = self.by-version."bencode"."0.6.0"; "bn.js-0.15.2" = self.by-version."bn.js"."0.15.2"; "buffer-equal-0.0.1" = self.by-version."buffer-equal"."0.0.1"; - "compact2string-1.3.0" = self.by-version."compact2string"."1.3.0"; + "compact2string-1.4.0" = self.by-version."compact2string"."1.4.0"; "concat-stream-1.4.7" = self.by-version."concat-stream"."1.4.7"; "debug-2.1.0" = self.by-version."debug"."2.1.0"; "extend.js-0.0.1" = self.by-version."extend.js"."0.0.1"; @@ -1830,14 +1832,15 @@ "ip-0.3.2" = self.by-version."ip"."0.3.2"; "once-1.3.1" = self.by-version."once"."1.3.1"; "portfinder-0.2.1" = self.by-version."portfinder"."0.2.1"; - "string2compact-1.2.0" = self.by-version."string2compact"."1.2.0"; + "run-series-1.0.2" = self.by-version."run-series"."1.0.2"; + "string2compact-1.2.1" = self.by-version."string2compact"."1.2.1"; }; peerDependencies = [ ]; passthru.names = [ "bittorrent-tracker" ]; }; by-spec."bittorrent-tracker"."^2.6.0" = - self.by-version."bittorrent-tracker"."2.9.1"; + self.by-version."bittorrent-tracker"."2.10.0"; by-spec."bl"."^0.9.0" = self.by-version."bl"."0.9.3"; by-version."bl"."0.9.3" = lib.makeOverridable self.buildNodePackage { @@ -1885,15 +1888,15 @@ by-spec."block-stream"."0.0.7" = self.by-version."block-stream"."0.0.7"; by-spec."bluebird".">= 1.2.1" = - self.by-version."bluebird"."2.3.11"; - by-version."bluebird"."2.3.11" = lib.makeOverridable self.buildNodePackage { - name = "bluebird-2.3.11"; + self.by-version."bluebird"."2.4.0"; + by-version."bluebird"."2.4.0" = lib.makeOverridable self.buildNodePackage { + name = "bluebird-2.4.0"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/bluebird/-/bluebird-2.3.11.tgz"; - name = "bluebird-2.3.11.tgz"; - sha1 = "15bb78ed32abf27b090640c0f85e4b91f615c8b6"; + url = "http://registry.npmjs.org/bluebird/-/bluebird-2.4.0.tgz"; + name = "bluebird-2.4.0.tgz"; + sha1 = "db8f4afa2682459cc625235e155e0782e719b279"; }) ]; buildInputs = @@ -1950,6 +1953,26 @@ self.by-version."bn.js"."0.15.2"; by-spec."bn.js"."^0.15.2" = self.by-version."bn.js"."0.15.2"; + by-spec."bn.js"."^0.16.0" = + self.by-version."bn.js"."0.16.0"; + by-version."bn.js"."0.16.0" = lib.makeOverridable self.buildNodePackage { + name = "bn.js-0.16.0"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/bn.js/-/bn.js-0.16.0.tgz"; + name = "bn.js-0.16.0.tgz"; + sha1 = "5b6f7ea86ec2f8e065dee2b4d5f1540314bf523e"; + }) + ]; + buildInputs = + (self.nativeDeps."bn.js" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "bn.js" ]; + }; by-spec."bncode"."^0.2.3" = self.by-version."bncode"."0.2.3"; by-version."bncode"."0.2.3" = lib.makeOverridable self.buildNodePackage { @@ -2012,7 +2035,7 @@ "on-finished-2.1.0" = self.by-version."on-finished"."2.1.0"; "qs-2.2.4" = self.by-version."qs"."2.2.4"; "raw-body-1.3.0" = self.by-version."raw-body"."1.3.0"; - "type-is-1.5.3" = self.by-version."type-is"."1.5.3"; + "type-is-1.5.4" = self.by-version."type-is"."1.5.4"; }; peerDependencies = [ ]; @@ -2040,7 +2063,7 @@ "on-finished-2.1.1" = self.by-version."on-finished"."2.1.1"; "qs-2.3.3" = self.by-version."qs"."2.3.3"; "raw-body-1.3.1" = self.by-version."raw-body"."1.3.1"; - "type-is-1.5.3" = self.by-version."type-is"."1.5.3"; + "type-is-1.5.4" = self.by-version."type-is"."1.5.4"; }; peerDependencies = [ ]; @@ -2115,7 +2138,7 @@ "chmodr-0.1.0" = self.by-version."chmodr"."0.1.0"; "decompress-zip-0.0.8" = self.by-version."decompress-zip"."0.0.8"; "fstream-1.0.3" = self.by-version."fstream"."1.0.3"; - "fstream-ignore-1.0.1" = self.by-version."fstream-ignore"."1.0.1"; + "fstream-ignore-1.0.2" = self.by-version."fstream-ignore"."1.0.2"; "glob-4.0.6" = self.by-version."glob"."4.0.6"; "graceful-fs-3.0.5" = self.by-version."graceful-fs"."3.0.5"; "handlebars-2.0.0" = self.by-version."handlebars"."2.0.0"; @@ -2143,7 +2166,7 @@ "tar-fs-0.5.2" = self.by-version."tar-fs"."0.5.2"; "tmp-0.0.23" = self.by-version."tmp"."0.0.23"; "update-notifier-0.2.0" = self.by-version."update-notifier"."0.2.0"; - "which-1.0.7" = self.by-version."which"."1.0.7"; + "which-1.0.8" = self.by-version."which"."1.0.8"; }; peerDependencies = [ ]; @@ -2362,6 +2385,28 @@ ]; passthru.names = [ "bplist-parser" ]; }; + by-spec."brace-expansion"."^1.0.0" = + self.by-version."brace-expansion"."1.1.0"; + by-version."brace-expansion"."1.1.0" = lib.makeOverridable self.buildNodePackage { + name = "brace-expansion-1.1.0"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.0.tgz"; + name = "brace-expansion-1.1.0.tgz"; + sha1 = "c9b7d03c03f37bc704be100e522b40db8f6cfcd9"; + }) + ]; + buildInputs = + (self.nativeDeps."brace-expansion" or []); + deps = { + "balanced-match-0.2.0" = self.by-version."balanced-match"."0.2.0"; + "concat-map-0.0.1" = self.by-version."concat-map"."0.0.1"; + }; + peerDependencies = [ + ]; + passthru.names = [ "brace-expansion" ]; + }; by-spec."brfs"."0.0.8" = self.by-version."brfs"."0.0.8"; by-version."brfs"."0.0.8" = lib.makeOverridable self.buildNodePackage { @@ -2529,28 +2574,28 @@ by-spec."browser-request"."~0.3.1" = self.by-version."browser-request"."0.3.3"; by-spec."browser-resolve"."^1.3.0" = - self.by-version."browser-resolve"."1.4.1"; - by-version."browser-resolve"."1.4.1" = lib.makeOverridable self.buildNodePackage { - name = "browser-resolve-1.4.1"; + self.by-version."browser-resolve"."1.5.0"; + by-version."browser-resolve"."1.5.0" = lib.makeOverridable self.buildNodePackage { + name = "browser-resolve-1.5.0"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/browser-resolve/-/browser-resolve-1.4.1.tgz"; - name = "browser-resolve-1.4.1.tgz"; - sha1 = "65ac7963f65bd49fa50711c877a1e273bb17a85b"; + url = "http://registry.npmjs.org/browser-resolve/-/browser-resolve-1.5.0.tgz"; + name = "browser-resolve-1.5.0.tgz"; + sha1 = "716cc9008aa2161a38e4c823bb5aa097cff40447"; }) ]; buildInputs = (self.nativeDeps."browser-resolve" or []); deps = { - "resolve-0.7.4" = self.by-version."resolve"."0.7.4"; + "resolve-1.0.0" = self.by-version."resolve"."1.0.0"; }; peerDependencies = [ ]; passthru.names = [ "browser-resolve" ]; }; by-spec."browser-resolve"."^1.3.1" = - self.by-version."browser-resolve"."1.4.1"; + self.by-version."browser-resolve"."1.5.0"; by-spec."browser-resolve"."~1.2.1" = self.by-version."browser-resolve"."1.2.4"; by-version."browser-resolve"."1.2.4" = lib.makeOverridable self.buildNodePackage { @@ -2590,8 +2635,8 @@ (self.nativeDeps."browserchannel" or []); deps = { "hat-0.0.3" = self.by-version."hat"."0.0.3"; - "connect-2.27.4" = self.by-version."connect"."2.27.4"; - "request-2.49.0" = self.by-version."request"."2.49.0"; + "connect-2.27.6" = self.by-version."connect"."2.27.6"; + "request-2.51.0" = self.by-version."request"."2.51.0"; "ascii-json-0.2.0" = self.by-version."ascii-json"."0.2.0"; }; peerDependencies = [ @@ -2600,15 +2645,15 @@ }; "browserchannel" = self.by-version."browserchannel"."2.0.0"; by-spec."browserify"."*" = - self.by-version."browserify"."6.3.3"; - by-version."browserify"."6.3.3" = lib.makeOverridable self.buildNodePackage { - name = "browserify-6.3.3"; + self.by-version."browserify"."7.0.3"; + by-version."browserify"."7.0.3" = lib.makeOverridable self.buildNodePackage { + name = "browserify-7.0.3"; bin = true; src = [ (fetchurl { - url = "http://registry.npmjs.org/browserify/-/browserify-6.3.3.tgz"; - name = "browserify-6.3.3.tgz"; - sha1 = "d2a5031a24aec8045eb8174b501bf3f6248455d4"; + url = "http://registry.npmjs.org/browserify/-/browserify-7.0.3.tgz"; + name = "browserify-7.0.3.tgz"; + sha1 = "b839f84ed22c24b67f79af68002e5684c73d534e"; }) ]; buildInputs = @@ -2617,29 +2662,29 @@ "JSONStream-0.8.4" = self.by-version."JSONStream"."0.8.4"; "assert-1.1.2" = self.by-version."assert"."1.1.2"; "browser-pack-3.2.0" = self.by-version."browser-pack"."3.2.0"; - "browser-resolve-1.4.1" = self.by-version."browser-resolve"."1.4.1"; + "browser-resolve-1.5.0" = self.by-version."browser-resolve"."1.5.0"; "browserify-zlib-0.1.4" = self.by-version."browserify-zlib"."0.1.4"; - "buffer-2.8.1" = self.by-version."buffer"."2.8.1"; + "buffer-2.8.2" = self.by-version."buffer"."2.8.2"; "builtins-0.0.7" = self.by-version."builtins"."0.0.7"; "commondir-0.0.1" = self.by-version."commondir"."0.0.1"; "concat-stream-1.4.7" = self.by-version."concat-stream"."1.4.7"; "console-browserify-1.1.0" = self.by-version."console-browserify"."1.1.0"; "constants-browserify-0.0.1" = self.by-version."constants-browserify"."0.0.1"; - "crypto-browserify-3.6.0" = self.by-version."crypto-browserify"."3.6.0"; + "crypto-browserify-3.7.0" = self.by-version."crypto-browserify"."3.7.0"; "deep-equal-0.2.1" = self.by-version."deep-equal"."0.2.1"; "defined-0.0.0" = self.by-version."defined"."0.0.0"; "deps-sort-1.3.5" = self.by-version."deps-sort"."1.3.5"; "domain-browser-1.1.3" = self.by-version."domain-browser"."1.1.3"; "duplexer2-0.0.2" = self.by-version."duplexer2"."0.0.2"; "events-1.0.2" = self.by-version."events"."1.0.2"; - "glob-4.2.2" = self.by-version."glob"."4.2.2"; + "glob-4.3.2" = self.by-version."glob"."4.3.2"; "http-browserify-1.7.0" = self.by-version."http-browserify"."1.7.0"; "https-browserify-0.0.0" = self.by-version."https-browserify"."0.0.0"; "inherits-2.0.1" = self.by-version."inherits"."2.0.1"; "insert-module-globals-6.1.0" = self.by-version."insert-module-globals"."6.1.0"; "isarray-0.0.1" = self.by-version."isarray"."0.0.1"; "labeled-stream-splicer-1.0.2" = self.by-version."labeled-stream-splicer"."1.0.2"; - "module-deps-3.5.10" = self.by-version."module-deps"."3.5.10"; + "module-deps-3.6.3" = self.by-version."module-deps"."3.6.3"; "os-browserify-0.1.2" = self.by-version."os-browserify"."0.1.2"; "parents-0.0.3" = self.by-version."parents"."0.0.3"; "path-browserify-0.0.0" = self.by-version."path-browserify"."0.0.0"; @@ -2668,7 +2713,7 @@ ]; passthru.names = [ "browserify" ]; }; - "browserify" = self.by-version."browserify"."6.3.3"; + "browserify" = self.by-version."browserify"."7.0.3"; by-spec."browserify"."3.46.0" = self.by-version."browserify"."3.46.0"; by-version."browserify"."3.46.0" = lib.makeOverridable self.buildNodePackage { @@ -2855,16 +2900,16 @@ ]; passthru.names = [ "browserify" ]; }; - by-spec."browserify-aes"."0.6.0" = - self.by-version."browserify-aes"."0.6.0"; - by-version."browserify-aes"."0.6.0" = lib.makeOverridable self.buildNodePackage { - name = "browserify-aes-0.6.0"; + by-spec."browserify-aes"."0.6.1" = + self.by-version."browserify-aes"."0.6.1"; + by-version."browserify-aes"."0.6.1" = lib.makeOverridable self.buildNodePackage { + name = "browserify-aes-0.6.1"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/browserify-aes/-/browserify-aes-0.6.0.tgz"; - name = "browserify-aes-0.6.0.tgz"; - sha1 = "07df03037306a94f453da08cbaf1b42afcc3b18f"; + url = "http://registry.npmjs.org/browserify-aes/-/browserify-aes-0.6.1.tgz"; + name = "browserify-aes-0.6.1.tgz"; + sha1 = "a7466136ffcb0a2a955d98afa8dc2ced6dc6c004"; }) ]; buildInputs = @@ -2876,27 +2921,25 @@ ]; passthru.names = [ "browserify-aes" ]; }; - by-spec."browserify-sign"."2.4.0" = - self.by-version."browserify-sign"."2.4.0"; - by-version."browserify-sign"."2.4.0" = lib.makeOverridable self.buildNodePackage { - name = "browserify-sign-2.4.0"; + by-spec."browserify-sign"."2.6.0" = + self.by-version."browserify-sign"."2.6.0"; + by-version."browserify-sign"."2.6.0" = lib.makeOverridable self.buildNodePackage { + name = "browserify-sign-2.6.0"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/browserify-sign/-/browserify-sign-2.4.0.tgz"; - name = "browserify-sign-2.4.0.tgz"; - sha1 = "55bef52192091216336db4fb0bcc88c1d8f049fd"; + url = "http://registry.npmjs.org/browserify-sign/-/browserify-sign-2.6.0.tgz"; + name = "browserify-sign-2.6.0.tgz"; + sha1 = "35def87585f0d8f4b116783a55e1a3711a2c48e3"; }) ]; buildInputs = (self.nativeDeps."browserify-sign" or []); deps = { - "asn1.js-0.6.5" = self.by-version."asn1.js"."0.6.5"; - "asn1.js-rfc3280-0.5.1" = self.by-version."asn1.js-rfc3280"."0.5.1"; "bn.js-0.15.2" = self.by-version."bn.js"."0.15.2"; "elliptic-0.15.15" = self.by-version."elliptic"."0.15.15"; "inherits-2.0.1" = self.by-version."inherits"."2.0.1"; - "pemstrip-0.0.1" = self.by-version."pemstrip"."0.0.1"; + "parse-asn1-1.2.0" = self.by-version."parse-asn1"."1.2.0"; "readable-stream-1.1.13" = self.by-version."readable-stream"."1.1.13"; }; peerDependencies = [ @@ -2966,36 +3009,16 @@ ]; passthru.names = [ "bson" ]; }; - by-spec."bson"."0.2.5" = - self.by-version."bson"."0.2.5"; - by-version."bson"."0.2.5" = lib.makeOverridable self.buildNodePackage { - name = "bson-0.2.5"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/bson/-/bson-0.2.5.tgz"; - name = "bson-0.2.5.tgz"; - sha1 = "500d26d883ddc8e02f2c88011627636111c105c5"; - }) - ]; - buildInputs = - (self.nativeDeps."bson" or []); - deps = { - }; - peerDependencies = [ - ]; - passthru.names = [ "bson" ]; - }; by-spec."bson"."~0.2" = - self.by-version."bson"."0.2.15"; - by-version."bson"."0.2.15" = lib.makeOverridable self.buildNodePackage { - name = "bson-0.2.15"; + self.by-version."bson"."0.2.16"; + by-version."bson"."0.2.16" = lib.makeOverridable self.buildNodePackage { + name = "bson-0.2.16"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/bson/-/bson-0.2.15.tgz"; - name = "bson-0.2.15.tgz"; - sha1 = "556402c74bf33d8008122cc3091dc8b3b90e330c"; + url = "http://registry.npmjs.org/bson/-/bson-0.2.16.tgz"; + name = "bson-0.2.16.tgz"; + sha1 = "c4d056d16631ec481e8ef33659c01e581d2b97ed"; }) ]; buildInputs = @@ -3008,15 +3031,15 @@ passthru.names = [ "bson" ]; }; by-spec."buffer"."^2.3.0" = - self.by-version."buffer"."2.8.1"; - by-version."buffer"."2.8.1" = lib.makeOverridable self.buildNodePackage { - name = "buffer-2.8.1"; + self.by-version."buffer"."2.8.2"; + by-version."buffer"."2.8.2" = lib.makeOverridable self.buildNodePackage { + name = "buffer-2.8.2"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/buffer/-/buffer-2.8.1.tgz"; - name = "buffer-2.8.1.tgz"; - sha1 = "6c632bf47cb7ec86509254ed42ab080937986114"; + url = "http://registry.npmjs.org/buffer/-/buffer-2.8.2.tgz"; + name = "buffer-2.8.2.tgz"; + sha1 = "d73c214c0334384dc29b04ee0ff5f5527c7974e7"; }) ]; buildInputs = @@ -3093,15 +3116,15 @@ passthru.names = [ "buffer-crc32" ]; }; by-spec."buffer-crc32"."~0.2.1" = - self.by-version."buffer-crc32"."0.2.4"; - by-version."buffer-crc32"."0.2.4" = lib.makeOverridable self.buildNodePackage { - name = "buffer-crc32-0.2.4"; + self.by-version."buffer-crc32"."0.2.5"; + by-version."buffer-crc32"."0.2.5" = lib.makeOverridable self.buildNodePackage { + name = "buffer-crc32-0.2.5"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.4.tgz"; - name = "buffer-crc32-0.2.4.tgz"; - sha1 = "f729c4c5d2eb39ba49f29422175cc20b0bf1b96f"; + url = "http://registry.npmjs.org/buffer-crc32/-/buffer-crc32-0.2.5.tgz"; + name = "buffer-crc32-0.2.5.tgz"; + sha1 = "db003ac2671e62ebd6ece78ea2c2e1b405736e91"; }) ]; buildInputs = @@ -3710,21 +3733,21 @@ by-spec."chmodr"."~0.1.0" = self.by-version."chmodr"."0.1.0"; by-spec."chokidar".">=0.8.2" = - self.by-version."chokidar"."0.11.1"; - by-version."chokidar"."0.11.1" = lib.makeOverridable self.buildNodePackage { - name = "chokidar-0.11.1"; + self.by-version."chokidar"."0.12.5"; + by-version."chokidar"."0.12.5" = lib.makeOverridable self.buildNodePackage { + name = "chokidar-0.12.5"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/chokidar/-/chokidar-0.11.1.tgz"; - name = "chokidar-0.11.1.tgz"; - sha1 = "b00e01717de445783782ef5c48a803e05fed0fc4"; + url = "http://registry.npmjs.org/chokidar/-/chokidar-0.12.5.tgz"; + name = "chokidar-0.12.5.tgz"; + sha1 = "69ce0c49752dc4d32b5a45023b4b83661f858107"; }) ]; buildInputs = (self.nativeDeps."chokidar" or []); deps = { - "readdirp-1.1.0" = self.by-version."readdirp"."1.1.0"; + "readdirp-1.3.0" = self.by-version."readdirp"."1.3.0"; "async-each-0.1.6" = self.by-version."async-each"."0.1.6"; "fsevents-0.3.1" = self.by-version."fsevents"."0.3.1"; }; @@ -3753,15 +3776,15 @@ passthru.names = [ "chownr" ]; }; by-spec."clean-css"."2.2.x" = - self.by-version."clean-css"."2.2.19"; - by-version."clean-css"."2.2.19" = lib.makeOverridable self.buildNodePackage { - name = "clean-css-2.2.19"; + self.by-version."clean-css"."2.2.22"; + by-version."clean-css"."2.2.22" = lib.makeOverridable self.buildNodePackage { + name = "clean-css-2.2.22"; bin = true; src = [ (fetchurl { - url = "http://registry.npmjs.org/clean-css/-/clean-css-2.2.19.tgz"; - name = "clean-css-2.2.19.tgz"; - sha1 = "b5863312e2e13fdf693e44d60b41ce45cbb6fdbd"; + url = "http://registry.npmjs.org/clean-css/-/clean-css-2.2.22.tgz"; + name = "clean-css-2.2.22.tgz"; + sha1 = "2346e4656bb16a0afc25f00bd75273fdcd53ff35"; }) ]; buildInputs = @@ -3774,7 +3797,7 @@ passthru.names = [ "clean-css" ]; }; by-spec."clean-css"."~2.2.0" = - self.by-version."clean-css"."2.2.19"; + self.by-version."clean-css"."2.2.22"; by-spec."cli"."0.6.x" = self.by-version."cli"."0.6.5"; by-version."cli"."0.6.5" = lib.makeOverridable self.buildNodePackage { @@ -3821,7 +3844,7 @@ ]; passthru.names = [ "cli-color" ]; }; - by-spec."cli-table"."^0.3.0" = + by-spec."cli-table"."^0.3.1" = self.by-version."cli-table"."0.3.1"; by-version."cli-table"."0.3.1" = lib.makeOverridable self.buildNodePackage { name = "cli-table-0.3.1"; @@ -3889,7 +3912,28 @@ passthru.names = [ "cliff" ]; }; by-spec."cliff"."~0.1.9" = - self.by-version."cliff"."0.1.9"; + self.by-version."cliff"."0.1.10"; + by-version."cliff"."0.1.10" = lib.makeOverridable self.buildNodePackage { + name = "cliff-0.1.10"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/cliff/-/cliff-0.1.10.tgz"; + name = "cliff-0.1.10.tgz"; + sha1 = "53be33ea9f59bec85609ee300ac4207603e52013"; + }) + ]; + buildInputs = + (self.nativeDeps."cliff" or []); + deps = { + "colors-1.0.3" = self.by-version."colors"."1.0.3"; + "eyes-0.1.8" = self.by-version."eyes"."0.1.8"; + "winston-0.8.3" = self.by-version."winston"."0.8.3"; + }; + peerDependencies = [ + ]; + passthru.names = [ "cliff" ]; + }; by-spec."clivas"."^0.1.4" = self.by-version."clivas"."0.1.4"; by-version."clivas"."0.1.4" = lib.makeOverridable self.buildNodePackage { @@ -3970,16 +4014,16 @@ ]; passthru.names = [ "clone" ]; }; - by-spec."clone"."^0.1.18" = - self.by-version."clone"."0.1.18"; - by-version."clone"."0.1.18" = lib.makeOverridable self.buildNodePackage { - name = "clone-0.1.18"; + by-spec."clone"."^0.2.0" = + self.by-version."clone"."0.2.0"; + by-version."clone"."0.2.0" = lib.makeOverridable self.buildNodePackage { + name = "clone-0.2.0"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/clone/-/clone-0.1.18.tgz"; - name = "clone-0.1.18.tgz"; - sha1 = "64a0d5d57eaa85a1a8af380cd1db8c7b3a895f66"; + url = "http://registry.npmjs.org/clone/-/clone-0.2.0.tgz"; + name = "clone-0.2.0.tgz"; + sha1 = "c6126a90ad4f72dbf5acdb243cc37724fe93fc1f"; }) ]; buildInputs = @@ -3990,10 +4034,28 @@ ]; passthru.names = [ "clone" ]; }; - by-spec."clone"."~0.1.18" = - self.by-version."clone"."0.1.18"; by-spec."clone"."~0.1.5" = - self.by-version."clone"."0.1.18"; + self.by-version."clone"."0.1.19"; + by-version."clone"."0.1.19" = lib.makeOverridable self.buildNodePackage { + name = "clone-0.1.19"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/clone/-/clone-0.1.19.tgz"; + name = "clone-0.1.19.tgz"; + sha1 = "613fb68639b26a494ac53253e15b1a6bd88ada85"; + }) + ]; + buildInputs = + (self.nativeDeps."clone" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "clone" ]; + }; + by-spec."clone"."~0.2.0" = + self.by-version."clone"."0.2.0"; by-spec."clone-stats"."^0.0.1" = self.by-version."clone-stats"."0.0.1"; by-version."clone-stats"."0.0.1" = lib.makeOverridable self.buildNodePackage { @@ -4038,8 +4100,6 @@ ]; passthru.names = [ "cmd-shim" ]; }; - by-spec."cmd-shim"."~1.1.1" = - self.by-version."cmd-shim"."1.1.2"; by-spec."cmd-shim"."~2.0.1" = self.by-version."cmd-shim"."2.0.1"; by-version."cmd-shim"."2.0.1" = lib.makeOverridable self.buildNodePackage { @@ -4191,7 +4251,7 @@ (self.nativeDeps."color" or []); deps = { "color-convert-0.5.2" = self.by-version."color-convert"."0.5.2"; - "color-string-0.2.1" = self.by-version."color-string"."0.2.1"; + "color-string-0.2.4" = self.by-version."color-string"."0.2.4"; }; peerDependencies = [ ]; @@ -4217,22 +4277,42 @@ ]; passthru.names = [ "color-convert" ]; }; - by-spec."color-string"."0.2.x" = - self.by-version."color-string"."0.2.1"; - by-version."color-string"."0.2.1" = lib.makeOverridable self.buildNodePackage { - name = "color-string-0.2.1"; + by-spec."color-name"."1.0.x" = + self.by-version."color-name"."1.0.0"; + by-version."color-name"."1.0.0" = lib.makeOverridable self.buildNodePackage { + name = "color-name-1.0.0"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/color-string/-/color-string-0.2.1.tgz"; - name = "color-string-0.2.1.tgz"; - sha1 = "2f3c1e6c1d04ddf751633b28db7fbc152055d34e"; + url = "http://registry.npmjs.org/color-name/-/color-name-1.0.0.tgz"; + name = "color-name-1.0.0.tgz"; + sha1 = "ce3579a4ef43b672bee4f37e8876332b5a36e6b5"; + }) + ]; + buildInputs = + (self.nativeDeps."color-name" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "color-name" ]; + }; + by-spec."color-string"."0.2.x" = + self.by-version."color-string"."0.2.4"; + by-version."color-string"."0.2.4" = lib.makeOverridable self.buildNodePackage { + name = "color-string-0.2.4"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/color-string/-/color-string-0.2.4.tgz"; + name = "color-string-0.2.4.tgz"; + sha1 = "221ff64234f71aaa3e13bc8c7e8c95f3cdd8f81a"; }) ]; buildInputs = (self.nativeDeps."color-string" or []); deps = { - "color-convert-0.5.2" = self.by-version."color-convert"."0.5.2"; + "color-name-1.0.0" = self.by-version."color-name"."1.0.0"; }; peerDependencies = [ ]; @@ -4302,42 +4382,24 @@ }; by-spec."colors"."~0.6.2" = self.by-version."colors"."0.6.2"; - by-spec."columnify"."0.1.2" = - self.by-version."columnify"."0.1.2"; - by-version."columnify"."0.1.2" = lib.makeOverridable self.buildNodePackage { - name = "columnify-0.1.2"; + by-spec."colors"."~1.0.3" = + self.by-version."colors"."1.0.3"; + by-spec."columnify"."~1.3.2" = + self.by-version."columnify"."1.3.2"; + by-version."columnify"."1.3.2" = lib.makeOverridable self.buildNodePackage { + name = "columnify-1.3.2"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/columnify/-/columnify-0.1.2.tgz"; - name = "columnify-0.1.2.tgz"; - sha1 = "ab1a1f1e37b26ba4b87c6920fb717fe51c827042"; + url = "http://registry.npmjs.org/columnify/-/columnify-1.3.2.tgz"; + name = "columnify-1.3.2.tgz"; + sha1 = "61bd578a9269ae6fd949ce36fff589f3702c7867"; }) ]; buildInputs = (self.nativeDeps."columnify" or []); deps = { - }; - peerDependencies = [ - ]; - passthru.names = [ "columnify" ]; - }; - by-spec."columnify"."~1.2.1" = - self.by-version."columnify"."1.2.1"; - by-version."columnify"."1.2.1" = lib.makeOverridable self.buildNodePackage { - name = "columnify-1.2.1"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/columnify/-/columnify-1.2.1.tgz"; - name = "columnify-1.2.1.tgz"; - sha1 = "921ec51c178f4126d3c07e9acecd67a55c7953e4"; - }) - ]; - buildInputs = - (self.nativeDeps."columnify" or []); - deps = { - "strip-ansi-1.0.0" = self.by-version."strip-ansi"."1.0.0"; + "strip-ansi-2.0.0" = self.by-version."strip-ansi"."2.0.0"; "wcwidth-1.0.0" = self.by-version."wcwidth"."1.0.0"; }; peerDependencies = [ @@ -4361,7 +4423,7 @@ deps = { "inline-source-map-0.3.0" = self.by-version."inline-source-map"."0.3.0"; "convert-source-map-0.3.5" = self.by-version."convert-source-map"."0.3.5"; - "source-map-0.1.40" = self.by-version."source-map"."0.1.40"; + "source-map-0.1.41" = self.by-version."source-map"."0.1.41"; }; peerDependencies = [ ]; @@ -4472,8 +4534,6 @@ ]; passthru.names = [ "commander" ]; }; - by-spec."commander"."2.0.x" = - self.by-version."commander"."2.0.0"; by-spec."commander"."2.1.0" = self.by-version."commander"."2.1.0"; by-version."commander"."2.1.0" = lib.makeOverridable self.buildNodePackage { @@ -4534,16 +4594,16 @@ ]; passthru.names = [ "commander" ]; }; - by-spec."commander"."2.x" = - self.by-version."commander"."2.5.0"; - by-version."commander"."2.5.0" = lib.makeOverridable self.buildNodePackage { - name = "commander-2.5.0"; + by-spec."commander"."2.5.x" = + self.by-version."commander"."2.5.1"; + by-version."commander"."2.5.1" = lib.makeOverridable self.buildNodePackage { + name = "commander-2.5.1"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/commander/-/commander-2.5.0.tgz"; - name = "commander-2.5.0.tgz"; - sha1 = "d777b6a4d847d423e5d475da864294ac1ff5aa9d"; + url = "http://registry.npmjs.org/commander/-/commander-2.5.1.tgz"; + name = "commander-2.5.1.tgz"; + sha1 = "23c61f6e47be143cc02e7ad4bb1c47f5cd5a2883"; }) ]; buildInputs = @@ -4554,14 +4614,14 @@ ]; passthru.names = [ "commander" ]; }; + by-spec."commander"."2.x" = + self.by-version."commander"."2.5.1"; by-spec."commander"."~2.0.0" = self.by-version."commander"."2.0.0"; by-spec."commander"."~2.1.0" = self.by-version."commander"."2.1.0"; - by-spec."commander"."~2.3.0" = - self.by-version."commander"."2.3.0"; by-spec."commander"."~2.5.0" = - self.by-version."commander"."2.5.0"; + self.by-version."commander"."2.5.1"; by-spec."commondir"."0.0.1" = self.by-version."commondir"."0.0.1"; by-version."commondir"."0.0.1" = lib.makeOverridable self.buildNodePackage { @@ -4585,20 +4645,21 @@ by-spec."commondir"."~0.0.1" = self.by-version."commondir"."0.0.1"; by-spec."compact2string"."^1.2.0" = - self.by-version."compact2string"."1.3.0"; - by-version."compact2string"."1.3.0" = lib.makeOverridable self.buildNodePackage { - name = "compact2string-1.3.0"; + self.by-version."compact2string"."1.4.0"; + by-version."compact2string"."1.4.0" = lib.makeOverridable self.buildNodePackage { + name = "compact2string-1.4.0"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/compact2string/-/compact2string-1.3.0.tgz"; - name = "compact2string-1.3.0.tgz"; - sha1 = "5e5d32fe4d40ca853ec0f6f22f7952aa9fe36135"; + url = "http://registry.npmjs.org/compact2string/-/compact2string-1.4.0.tgz"; + name = "compact2string-1.4.0.tgz"; + sha1 = "a99cd96ea000525684b269683ae2222d6eea7b49"; }) ]; buildInputs = (self.nativeDeps."compact2string" or []); deps = { + "ipaddr.js-0.1.6" = self.by-version."ipaddr.js"."0.1.6"; }; peerDependencies = [ ]; @@ -4639,7 +4700,7 @@ buildInputs = (self.nativeDeps."compress-commons" or []); deps = { - "buffer-crc32-0.2.4" = self.by-version."buffer-crc32"."0.2.4"; + "buffer-crc32-0.2.5" = self.by-version."buffer-crc32"."0.2.5"; "crc32-stream-0.3.1" = self.by-version."crc32-stream"."0.3.1"; "readable-stream-1.0.33" = self.by-version."readable-stream"."1.0.33"; }; @@ -4682,7 +4743,7 @@ buildInputs = (self.nativeDeps."compressible" or []); deps = { - "mime-db-1.2.0" = self.by-version."mime-db"."1.2.0"; + "mime-db-1.3.1" = self.by-version."mime-db"."1.3.1"; }; peerDependencies = [ ]; @@ -4726,7 +4787,7 @@ buildInputs = (self.nativeDeps."compression" or []); deps = { - "accepts-1.1.3" = self.by-version."accepts"."1.1.3"; + "accepts-1.1.4" = self.by-version."accepts"."1.1.4"; "bytes-1.0.0" = self.by-version."bytes"."1.0.0"; "compressible-2.0.1" = self.by-version."compressible"."2.0.1"; "debug-2.0.0" = self.by-version."debug"."2.0.0"; @@ -4737,22 +4798,22 @@ ]; passthru.names = [ "compression" ]; }; - by-spec."compression"."~1.2.1" = - self.by-version."compression"."1.2.1"; - by-version."compression"."1.2.1" = lib.makeOverridable self.buildNodePackage { - name = "compression-1.2.1"; + by-spec."compression"."~1.2.2" = + self.by-version."compression"."1.2.2"; + by-version."compression"."1.2.2" = lib.makeOverridable self.buildNodePackage { + name = "compression-1.2.2"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/compression/-/compression-1.2.1.tgz"; - name = "compression-1.2.1.tgz"; - sha1 = "12ebaac04d308ca6103618a9716ce5634b939e9c"; + url = "http://registry.npmjs.org/compression/-/compression-1.2.2.tgz"; + name = "compression-1.2.2.tgz"; + sha1 = "637604c25ed659c0d5c9fac1038fc2f2d5494dbf"; }) ]; buildInputs = (self.nativeDeps."compression" or []); deps = { - "accepts-1.1.3" = self.by-version."accepts"."1.1.3"; + "accepts-1.1.4" = self.by-version."accepts"."1.1.4"; "bytes-1.0.0" = self.by-version."bytes"."1.0.0"; "compressible-2.0.1" = self.by-version."compressible"."2.0.1"; "debug-2.1.0" = self.by-version."debug"."2.1.0"; @@ -4763,6 +4824,26 @@ ]; passthru.names = [ "compression" ]; }; + by-spec."concat-map"."0.0.1" = + self.by-version."concat-map"."0.0.1"; + by-version."concat-map"."0.0.1" = lib.makeOverridable self.buildNodePackage { + name = "concat-map-0.0.1"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz"; + name = "concat-map-0.0.1.tgz"; + sha1 = "d8a96bd77fd68df7793a73036a3ba0d5405d477b"; + }) + ]; + buildInputs = + (self.nativeDeps."concat-map" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "concat-map" ]; + }; by-spec."concat-stream"."^1.4.1" = self.by-version."concat-stream"."1.4.7"; by-version."concat-stream"."1.4.7" = lib.makeOverridable self.buildNodePackage { @@ -4811,7 +4892,7 @@ deps = { "js-yaml-0.3.7" = self.by-version."js-yaml"."0.3.7"; "coffee-script-1.8.0" = self.by-version."coffee-script"."1.8.0"; - "vows-0.8.1" = self.by-version."vows"."0.8.1"; + "vows-0.9.0-rc1" = self.by-version."vows"."0.9.0-rc1"; }; peerDependencies = [ ]; @@ -4886,7 +4967,7 @@ deps = { "qs-2.3.3" = self.by-version."qs"."2.3.3"; "mime-1.2.11" = self.by-version."mime"."1.2.11"; - "formidable-1.0.15" = self.by-version."formidable"."1.0.15"; + "formidable-1.0.16" = self.by-version."formidable"."1.0.16"; }; peerDependencies = [ ]; @@ -4969,16 +5050,16 @@ ]; passthru.names = [ "connect" ]; }; - by-spec."connect"."2.27.4" = - self.by-version."connect"."2.27.4"; - by-version."connect"."2.27.4" = lib.makeOverridable self.buildNodePackage { - name = "connect-2.27.4"; + by-spec."connect"."2.27.6" = + self.by-version."connect"."2.27.6"; + by-version."connect"."2.27.6" = lib.makeOverridable self.buildNodePackage { + name = "connect-2.27.6"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/connect/-/connect-2.27.4.tgz"; - name = "connect-2.27.4.tgz"; - sha1 = "12592c9d105326c5191176f8d57e760d6650c830"; + url = "http://registry.npmjs.org/connect/-/connect-2.27.6.tgz"; + name = "connect-2.27.6.tgz"; + sha1 = "3a097322ce731ce302e736d42e262b6d3b753d48"; }) ]; buildInputs = @@ -4990,16 +5071,16 @@ "cookie-0.1.2" = self.by-version."cookie"."0.1.2"; "cookie-parser-1.3.3" = self.by-version."cookie-parser"."1.3.3"; "cookie-signature-1.0.5" = self.by-version."cookie-signature"."1.0.5"; - "compression-1.2.1" = self.by-version."compression"."1.2.1"; + "compression-1.2.2" = self.by-version."compression"."1.2.2"; "connect-timeout-1.4.0" = self.by-version."connect-timeout"."1.4.0"; "csurf-1.6.3" = self.by-version."csurf"."1.6.3"; "debug-2.1.0" = self.by-version."debug"."2.1.0"; "depd-1.0.0" = self.by-version."depd"."1.0.0"; "errorhandler-1.2.3" = self.by-version."errorhandler"."1.2.3"; - "express-session-1.9.2" = self.by-version."express-session"."1.9.2"; + "express-session-1.9.3" = self.by-version."express-session"."1.9.3"; "finalhandler-0.3.2" = self.by-version."finalhandler"."0.3.2"; "fresh-0.2.4" = self.by-version."fresh"."0.2.4"; - "http-errors-1.2.7" = self.by-version."http-errors"."1.2.7"; + "http-errors-1.2.8" = self.by-version."http-errors"."1.2.8"; "media-typer-0.3.0" = self.by-version."media-typer"."0.3.0"; "method-override-2.3.0" = self.by-version."method-override"."2.3.0"; "morgan-1.4.1" = self.by-version."morgan"."1.4.1"; @@ -5009,9 +5090,9 @@ "qs-2.3.3" = self.by-version."qs"."2.3.3"; "response-time-2.2.0" = self.by-version."response-time"."2.2.0"; "serve-favicon-2.1.7" = self.by-version."serve-favicon"."2.1.7"; - "serve-index-1.5.1" = self.by-version."serve-index"."1.5.1"; + "serve-index-1.5.3" = self.by-version."serve-index"."1.5.3"; "serve-static-1.7.1" = self.by-version."serve-static"."1.7.1"; - "type-is-1.5.3" = self.by-version."type-is"."1.5.3"; + "type-is-1.5.4" = self.by-version."type-is"."1.5.4"; "utils-merge-1.0.0" = self.by-version."utils-merge"."1.0.0"; "vhost-3.0.0" = self.by-version."vhost"."3.0.0"; "pause-0.0.1" = self.by-version."pause"."0.0.1"; @@ -5109,7 +5190,7 @@ passthru.names = [ "connect" ]; }; by-spec."connect"."~2" = - self.by-version."connect"."2.27.4"; + self.by-version."connect"."2.27.6"; by-spec."connect"."~2.26.0" = self.by-version."connect"."2.26.6"; by-version."connect"."2.26.6" = lib.makeOverridable self.buildNodePackage { @@ -5151,7 +5232,7 @@ "serve-favicon-2.1.7" = self.by-version."serve-favicon"."2.1.7"; "serve-index-1.2.1" = self.by-version."serve-index"."1.2.1"; "serve-static-1.6.4" = self.by-version."serve-static"."1.6.4"; - "type-is-1.5.3" = self.by-version."type-is"."1.5.3"; + "type-is-1.5.4" = self.by-version."type-is"."1.5.4"; "vhost-3.0.0" = self.by-version."vhost"."3.0.0"; "pause-0.0.1" = self.by-version."pause"."0.0.1"; }; @@ -5215,7 +5296,7 @@ buildInputs = (self.nativeDeps."connect-jade-static" or []); deps = { - "jade-1.8.1" = self.by-version."jade"."1.8.1"; + "jade-1.8.2" = self.by-version."jade"."1.8.2"; }; peerDependencies = [ ]; @@ -5223,27 +5304,27 @@ }; "connect-jade-static" = self.by-version."connect-jade-static"."0.1.4"; by-spec."connect-mongo"."*" = - self.by-version."connect-mongo"."0.4.1"; - by-version."connect-mongo"."0.4.1" = lib.makeOverridable self.buildNodePackage { - name = "connect-mongo-0.4.1"; + self.by-version."connect-mongo"."0.4.2"; + by-version."connect-mongo"."0.4.2" = lib.makeOverridable self.buildNodePackage { + name = "connect-mongo-0.4.2"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/connect-mongo/-/connect-mongo-0.4.1.tgz"; - name = "connect-mongo-0.4.1.tgz"; - sha1 = "01ed3e71558fb3f0fdc97b784ef974f9909ddd11"; + url = "http://registry.npmjs.org/connect-mongo/-/connect-mongo-0.4.2.tgz"; + name = "connect-mongo-0.4.2.tgz"; + sha1 = "a9817a9a229d790460ab0bf946ee0ce8ac3ccba7"; }) ]; buildInputs = (self.nativeDeps."connect-mongo" or []); deps = { - "mongodb-1.3.23" = self.by-version."mongodb"."1.3.23"; + "mongodb-1.4.25" = self.by-version."mongodb"."1.4.25"; }; peerDependencies = [ ]; passthru.names = [ "connect-mongo" ]; }; - "connect-mongo" = self.by-version."connect-mongo"."0.4.1"; + "connect-mongo" = self.by-version."connect-mongo"."0.4.2"; by-spec."connect-timeout"."1.0.0" = self.by-version."connect-timeout"."1.0.0"; by-version."connect-timeout"."1.0.0" = lib.makeOverridable self.buildNodePackage { @@ -5304,7 +5385,7 @@ (self.nativeDeps."connect-timeout" or []); deps = { "debug-2.1.0" = self.by-version."debug"."2.1.0"; - "http-errors-1.2.7" = self.by-version."http-errors"."1.2.7"; + "http-errors-1.2.8" = self.by-version."http-errors"."1.2.8"; "ms-0.6.2" = self.by-version."ms"."0.6.2"; "on-headers-1.0.0" = self.by-version."on-headers"."1.0.0"; }; @@ -5390,7 +5471,7 @@ buildInputs = (self.nativeDeps."constantinople" or []); deps = { - "uglify-js-2.4.15" = self.by-version."uglify-js"."2.4.15"; + "uglify-js-2.4.16" = self.by-version."uglify-js"."2.4.16"; }; peerDependencies = [ ]; @@ -5888,7 +5969,7 @@ buildInputs = (self.nativeDeps."couch-login" or []); deps = { - "request-2.49.0" = self.by-version."request"."2.49.0"; + "request-2.51.0" = self.by-version."request"."2.51.0"; }; peerDependencies = [ ]; @@ -5997,7 +6078,7 @@ (self.nativeDeps."crc32-stream" or []); deps = { "readable-stream-1.0.33" = self.by-version."readable-stream"."1.0.33"; - "buffer-crc32-0.2.4" = self.by-version."buffer-crc32"."0.2.4"; + "buffer-crc32-0.2.5" = self.by-version."buffer-crc32"."0.2.5"; }; peerDependencies = [ ]; @@ -6109,25 +6190,26 @@ passthru.names = [ "crypto" ]; }; by-spec."crypto-browserify"."^3.0.0" = - self.by-version."crypto-browserify"."3.6.0"; - by-version."crypto-browserify"."3.6.0" = lib.makeOverridable self.buildNodePackage { - name = "crypto-browserify-3.6.0"; + self.by-version."crypto-browserify"."3.7.0"; + by-version."crypto-browserify"."3.7.0" = lib.makeOverridable self.buildNodePackage { + name = "crypto-browserify-3.7.0"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.6.0.tgz"; - name = "crypto-browserify-3.6.0.tgz"; - sha1 = "6f74a6d30cf0bd11ef5168410bbdc7a65f6d01cb"; + url = "http://registry.npmjs.org/crypto-browserify/-/crypto-browserify-3.7.0.tgz"; + name = "crypto-browserify-3.7.0.tgz"; + sha1 = "5b9de9b65b04f22a087cb0339db5232f536323cc"; }) ]; buildInputs = (self.nativeDeps."crypto-browserify" or []); deps = { - "browserify-aes-0.6.0" = self.by-version."browserify-aes"."0.6.0"; - "browserify-sign-2.4.0" = self.by-version."browserify-sign"."2.4.0"; + "browserify-aes-0.6.1" = self.by-version."browserify-aes"."0.6.1"; "create-ecdh-1.0.0" = self.by-version."create-ecdh"."1.0.0"; "diffie-hellman-2.2.0" = self.by-version."diffie-hellman"."2.2.0"; + "browserify-sign-2.6.0" = self.by-version."browserify-sign"."2.6.0"; "pbkdf2-compat-2.0.1" = self.by-version."pbkdf2-compat"."2.0.1"; + "public-encrypt-1.0.1" = self.by-version."public-encrypt"."1.0.1"; "ripemd160-0.2.0" = self.by-version."ripemd160"."0.2.0"; "sha.js-2.3.0" = self.by-version."sha.js"."2.3.0"; }; @@ -6301,7 +6383,7 @@ "cookie-0.1.2" = self.by-version."cookie"."0.1.2"; "cookie-signature-1.0.5" = self.by-version."cookie-signature"."1.0.5"; "csrf-2.0.2" = self.by-version."csrf"."2.0.2"; - "http-errors-1.2.7" = self.by-version."http-errors"."1.2.7"; + "http-errors-1.2.8" = self.by-version."http-errors"."1.2.8"; }; peerDependencies = [ ]; @@ -6643,7 +6725,7 @@ }; by-spec."debug"."^0.8.1" = self.by-version."debug"."0.8.1"; - by-spec."debug"."^1.0.0" = + by-spec."debug"."^1.0" = self.by-version."debug"."1.0.4"; by-version."debug"."1.0.4" = lib.makeOverridable self.buildNodePackage { name = "debug-1.0.4"; @@ -6664,16 +6746,18 @@ ]; passthru.names = [ "debug" ]; }; + by-spec."debug"."^1.0.0" = + self.by-version."debug"."1.0.4"; by-spec."debug"."^1.0.2" = self.by-version."debug"."1.0.4"; by-spec."debug"."^2.0.0" = self.by-version."debug"."2.1.0"; by-spec."debug"."^2.1.0" = self.by-version."debug"."2.1.0"; + by-spec."debug"."~0.7.2" = + self.by-version."debug"."0.7.4"; by-spec."debug"."~0.7.4" = self.by-version."debug"."0.7.4"; - by-spec."debug"."~0.8" = - self.by-version."debug"."0.8.1"; by-spec."debug"."~0.8.1" = self.by-version."debug"."0.8.1"; by-spec."debug"."~0.x" = @@ -6856,6 +6940,26 @@ ]; passthru.names = [ "deep-extend" ]; }; + by-spec."deep-is"."~0.1.2" = + self.by-version."deep-is"."0.1.3"; + by-version."deep-is"."0.1.3" = lib.makeOverridable self.buildNodePackage { + name = "deep-is-0.1.3"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz"; + name = "deep-is-0.1.3.tgz"; + sha1 = "b369d6fb5dbc13eecf524f91b070feedc357cf34"; + }) + ]; + buildInputs = + (self.nativeDeps."deep-is" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "deep-is" ]; + }; by-spec."deepmerge"."*" = self.by-version."deepmerge"."0.2.7"; by-version."deepmerge"."0.2.7" = lib.makeOverridable self.buildNodePackage { @@ -6892,7 +6996,7 @@ buildInputs = (self.nativeDeps."defaults" or []); deps = { - "clone-0.1.18" = self.by-version."clone"."0.1.18"; + "clone-0.1.19" = self.by-version."clone"."0.1.19"; }; peerDependencies = [ ]; @@ -7152,7 +7256,7 @@ deps = { "acorn-0.9.0" = self.by-version."acorn"."0.9.0"; "defined-0.0.0" = self.by-version."defined"."0.0.0"; - "escodegen-1.4.1" = self.by-version."escodegen"."1.4.1"; + "escodegen-1.4.3" = self.by-version."escodegen"."1.4.3"; }; peerDependencies = [ ]; @@ -7290,8 +7394,26 @@ }; by-spec."diff"."~1.0.7" = self.by-version."diff"."1.0.8"; - by-spec."diff"."~1.0.8" = - self.by-version."diff"."1.0.8"; + by-spec."diff"."~1.2.0" = + self.by-version."diff"."1.2.0"; + by-version."diff"."1.2.0" = lib.makeOverridable self.buildNodePackage { + name = "diff-1.2.0"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/diff/-/diff-1.2.0.tgz"; + name = "diff-1.2.0.tgz"; + sha1 = "52166e04bef0e146541015d0af19a7860ff95644"; + }) + ]; + buildInputs = + (self.nativeDeps."diff" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "diff" ]; + }; by-spec."diffie-hellman"."2.2.0" = self.by-version."diffie-hellman"."2.2.0"; by-version."diffie-hellman"."2.2.0" = lib.makeOverridable self.buildNodePackage { @@ -7314,16 +7436,16 @@ ]; passthru.names = [ "diffie-hellman" ]; }; - by-spec."director"."1.2.3" = - self.by-version."director"."1.2.3"; - by-version."director"."1.2.3" = lib.makeOverridable self.buildNodePackage { - name = "director-1.2.3"; + by-spec."director"."1.2.7" = + self.by-version."director"."1.2.7"; + by-version."director"."1.2.7" = lib.makeOverridable self.buildNodePackage { + name = "director-1.2.7"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/director/-/director-1.2.3.tgz"; - name = "director-1.2.3.tgz"; - sha1 = "ba68a09312751bb77c52acc75e1f9fd9d3cb15bf"; + url = "http://registry.npmjs.org/director/-/director-1.2.7.tgz"; + name = "director-1.2.7.tgz"; + sha1 = "bfd3741075fd7fb1a5b2e13658c5f4bec77736f3"; }) ]; buildInputs = @@ -7523,6 +7645,28 @@ }; by-spec."duplexer2"."~0.0.2" = self.by-version."duplexer2"."0.0.2"; + by-spec."each-async"."^1.1.0" = + self.by-version."each-async"."1.1.0"; + by-version."each-async"."1.1.0" = lib.makeOverridable self.buildNodePackage { + name = "each-async-1.1.0"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/each-async/-/each-async-1.1.0.tgz"; + name = "each-async-1.1.0.tgz"; + sha1 = "d7473d5140a870414d5736a337e596fee14d369b"; + }) + ]; + buildInputs = + (self.nativeDeps."each-async" or []); + deps = { + "onetime-1.0.0" = self.by-version."onetime"."1.0.0"; + "setimmediate-1.0.2" = self.by-version."setimmediate"."1.0.2"; + }; + peerDependencies = [ + ]; + passthru.names = [ "each-async" ]; + }; by-spec."editor"."0.0.4" = self.by-version."editor"."0.0.4"; by-version."editor"."0.0.4" = lib.makeOverridable self.buildNodePackage { @@ -7543,26 +7687,6 @@ ]; passthru.names = [ "editor" ]; }; - by-spec."editor"."0.0.5" = - self.by-version."editor"."0.0.5"; - by-version."editor"."0.0.5" = lib.makeOverridable self.buildNodePackage { - name = "editor-0.0.5"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/editor/-/editor-0.0.5.tgz"; - name = "editor-0.0.5.tgz"; - sha1 = "8c38877781f2547011c1aeffdbe50cafcc59794a"; - }) - ]; - buildInputs = - (self.nativeDeps."editor" or []); - deps = { - }; - peerDependencies = [ - ]; - passthru.names = [ "editor" ]; - }; by-spec."editor"."~0.1.0" = self.by-version."editor"."0.1.0"; by-version."editor"."0.1.0" = lib.makeOverridable self.buildNodePackage { @@ -7688,6 +7812,31 @@ ]; passthru.names = [ "elliptic" ]; }; + by-spec."empty-trash"."*" = + self.by-version."empty-trash"."1.1.0"; + by-version."empty-trash"."1.1.0" = lib.makeOverridable self.buildNodePackage { + name = "empty-trash-1.1.0"; + bin = true; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/empty-trash/-/empty-trash-1.1.0.tgz"; + name = "empty-trash-1.1.0.tgz"; + sha1 = "6b3527ffb5edc2a27ed7e15886414af37a2c3e8e"; + }) + ]; + buildInputs = + (self.nativeDeps."empty-trash" or []); + deps = { + "minimist-1.1.0" = self.by-version."minimist"."1.1.0"; + "run-applescript-1.0.1" = self.by-version."run-applescript"."1.0.1"; + "update-notifier-0.2.2" = self.by-version."update-notifier"."0.2.2"; + "xdg-empty-trash-1.0.0" = self.by-version."xdg-empty-trash"."1.0.0"; + }; + peerDependencies = [ + ]; + passthru.names = [ "empty-trash" ]; + }; + "empty-trash" = self.by-version."empty-trash"."1.1.0"; by-spec."encoding"."~0.1.7" = self.by-version."encoding"."0.1.11"; by-version."encoding"."0.1.11" = lib.makeOverridable self.buildNodePackage { @@ -7851,7 +8000,7 @@ buildInputs = (self.nativeDeps."errorhandler" or []); deps = { - "accepts-1.1.3" = self.by-version."accepts"."1.1.3"; + "accepts-1.1.4" = self.by-version."accepts"."1.1.4"; "escape-html-1.0.1" = self.by-version."escape-html"."1.0.1"; }; peerDependencies = [ @@ -7978,6 +8127,26 @@ "escape-html" = self.by-version."escape-html"."1.0.1"; by-spec."escape-html"."1.0.1" = self.by-version."escape-html"."1.0.1"; + by-spec."escape-string-applescript"."^1.0.0" = + self.by-version."escape-string-applescript"."1.0.0"; + by-version."escape-string-applescript"."1.0.0" = lib.makeOverridable self.buildNodePackage { + name = "escape-string-applescript-1.0.0"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/escape-string-applescript/-/escape-string-applescript-1.0.0.tgz"; + name = "escape-string-applescript-1.0.0.tgz"; + sha1 = "6f1c2294245d82c63bc03338dc19a94aa8428892"; + }) + ]; + buildInputs = + (self.nativeDeps."escape-string-applescript" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "escape-string-applescript" ]; + }; by-spec."escape-string-regexp"."1.0.2" = self.by-version."escape-string-regexp"."1.0.2"; by-version."escape-string-regexp"."1.0.2" = lib.makeOverridable self.buildNodePackage { @@ -8016,7 +8185,7 @@ (self.nativeDeps."escodegen" or []); deps = { "esprima-1.2.2" = self.by-version."esprima"."1.2.2"; - "source-map-0.1.40" = self.by-version."source-map"."0.1.40"; + "source-map-0.1.41" = self.by-version."source-map"."0.1.41"; }; peerDependencies = [ ]; @@ -8039,7 +8208,7 @@ deps = { "esprima-1.0.4" = self.by-version."esprima"."1.0.4"; "estraverse-0.0.4" = self.by-version."estraverse"."0.0.4"; - "source-map-0.1.40" = self.by-version."source-map"."0.1.40"; + "source-map-0.1.41" = self.by-version."source-map"."0.1.41"; }; peerDependencies = [ ]; @@ -8063,31 +8232,32 @@ "esutils-1.0.0" = self.by-version."esutils"."1.0.0"; "estraverse-1.5.1" = self.by-version."estraverse"."1.5.1"; "esprima-1.1.1" = self.by-version."esprima"."1.1.1"; - "source-map-0.1.40" = self.by-version."source-map"."0.1.40"; + "source-map-0.1.41" = self.by-version."source-map"."0.1.41"; }; peerDependencies = [ ]; passthru.names = [ "escodegen" ]; }; by-spec."escodegen"."^1.4.1" = - self.by-version."escodegen"."1.4.1"; - by-version."escodegen"."1.4.1" = lib.makeOverridable self.buildNodePackage { - name = "escodegen-1.4.1"; + self.by-version."escodegen"."1.4.3"; + by-version."escodegen"."1.4.3" = lib.makeOverridable self.buildNodePackage { + name = "escodegen-1.4.3"; bin = true; src = [ (fetchurl { - url = "http://registry.npmjs.org/escodegen/-/escodegen-1.4.1.tgz"; - name = "escodegen-1.4.1.tgz"; - sha1 = "8c2562ff45da348975953e8c0a57f40848962ec7"; + url = "http://registry.npmjs.org/escodegen/-/escodegen-1.4.3.tgz"; + name = "escodegen-1.4.3.tgz"; + sha1 = "2b2422bf18c95e2542effaabc0c998712d490291"; }) ]; buildInputs = (self.nativeDeps."escodegen" or []); deps = { - "estraverse-1.8.0" = self.by-version."estraverse"."1.8.0"; + "estraverse-1.9.0" = self.by-version."estraverse"."1.9.0"; "esutils-1.1.6" = self.by-version."esutils"."1.1.6"; "esprima-1.2.2" = self.by-version."esprima"."1.2.2"; - "source-map-0.1.40" = self.by-version."source-map"."0.1.40"; + "optionator-0.4.0" = self.by-version."optionator"."0.4.0"; + "source-map-0.1.41" = self.by-version."source-map"."0.1.41"; }; peerDependencies = [ ]; @@ -8111,7 +8281,7 @@ "esprima-1.0.4" = self.by-version."esprima"."1.0.4"; "estraverse-1.5.1" = self.by-version."estraverse"."1.5.1"; "esutils-1.0.0" = self.by-version."esutils"."1.0.0"; - "source-map-0.1.40" = self.by-version."source-map"."0.1.40"; + "source-map-0.1.41" = self.by-version."source-map"."0.1.41"; }; peerDependencies = [ ]; @@ -8132,7 +8302,7 @@ buildInputs = (self.nativeDeps."escope" or []); deps = { - "estraverse-1.8.0" = self.by-version."estraverse"."1.8.0"; + "estraverse-1.9.0" = self.by-version."estraverse"."1.9.0"; }; peerDependencies = [ ]; @@ -8334,15 +8504,15 @@ passthru.names = [ "esrefactor" ]; }; by-spec."estraverse".">= 0.0.2" = - self.by-version."estraverse"."1.8.0"; - by-version."estraverse"."1.8.0" = lib.makeOverridable self.buildNodePackage { - name = "estraverse-1.8.0"; + self.by-version."estraverse"."1.9.0"; + by-version."estraverse"."1.9.0" = lib.makeOverridable self.buildNodePackage { + name = "estraverse-1.9.0"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/estraverse/-/estraverse-1.8.0.tgz"; - name = "estraverse-1.8.0.tgz"; - sha1 = "3f1264fb62c8500dbae5e4f73705cd576d6af428"; + url = "http://registry.npmjs.org/estraverse/-/estraverse-1.9.0.tgz"; + name = "estraverse-1.9.0.tgz"; + sha1 = "738824ba445fab7ff2e42c7a7a98e7cf7ac2becf"; }) ]; buildInputs = @@ -8353,8 +8523,8 @@ ]; passthru.names = [ "estraverse" ]; }; - by-spec."estraverse"."^1.5.1" = - self.by-version."estraverse"."1.8.0"; + by-spec."estraverse"."^1.9.0" = + self.by-version."estraverse"."1.9.0"; by-spec."estraverse"."~0.0.4" = self.by-version."estraverse"."0.0.4"; by-version."estraverse"."0.0.4" = lib.makeOverridable self.buildNodePackage { @@ -8397,7 +8567,25 @@ }; by-spec."estraverse"."~1.8.0" = self.by-version."estraverse"."1.8.0"; - by-spec."esutils"."^1.1.4" = + by-version."estraverse"."1.8.0" = lib.makeOverridable self.buildNodePackage { + name = "estraverse-1.8.0"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/estraverse/-/estraverse-1.8.0.tgz"; + name = "estraverse-1.8.0.tgz"; + sha1 = "3f1264fb62c8500dbae5e4f73705cd576d6af428"; + }) + ]; + buildInputs = + (self.nativeDeps."estraverse" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "estraverse" ]; + }; + by-spec."esutils"."^1.1.6" = self.by-version."esutils"."1.1.6"; by-version."esutils"."1.1.6" = lib.makeOverridable self.buildNodePackage { name = "esutils-1.1.6"; @@ -8544,10 +8732,10 @@ ]; passthru.names = [ "eventemitter2" ]; }; - by-spec."eventemitter2"."~0.4.11" = - self.by-version."eventemitter2"."0.4.14"; by-spec."eventemitter2"."~0.4.13" = self.by-version."eventemitter2"."0.4.14"; + by-spec."eventemitter2"."~0.4.14" = + self.by-version."eventemitter2"."0.4.14"; by-spec."eventemitter3"."*" = self.by-version."eventemitter3"."0.1.6"; by-version."eventemitter3"."0.1.6" = lib.makeOverridable self.buildNodePackage { @@ -8623,7 +8811,7 @@ buildInputs = (self.nativeDeps."everyauth" or []); deps = { - "oauth-0.9.11" = self.by-version."oauth"."0.9.11"; + "oauth-0.9.12" = self.by-version."oauth"."0.9.12"; "request-2.9.203" = self.by-version."request"."2.9.203"; "connect-2.3.9" = self.by-version."connect"."2.3.9"; "openid-0.5.9" = self.by-version."openid"."0.5.9"; @@ -8631,7 +8819,7 @@ "node-swt-0.1.1" = self.by-version."node-swt"."0.1.1"; "node-wsfederation-0.1.1" = self.by-version."node-wsfederation"."0.1.1"; "debug-0.5.0" = self.by-version."debug"."0.5.0"; - "express-3.18.4" = self.by-version."express"."3.18.4"; + "express-3.18.6" = self.by-version."express"."3.18.6"; }; peerDependencies = [ ]; @@ -8676,7 +8864,7 @@ buildInputs = (self.nativeDeps."express" or []); deps = { - "accepts-1.1.3" = self.by-version."accepts"."1.1.3"; + "accepts-1.1.4" = self.by-version."accepts"."1.1.4"; "content-disposition-0.5.0" = self.by-version."content-disposition"."0.5.0"; "cookie-signature-1.0.5" = self.by-version."cookie-signature"."1.0.5"; "debug-2.1.0" = self.by-version."debug"."2.1.0"; @@ -8695,7 +8883,7 @@ "range-parser-1.0.2" = self.by-version."range-parser"."1.0.2"; "send-0.10.1" = self.by-version."send"."0.10.1"; "serve-static-1.7.1" = self.by-version."serve-static"."1.7.1"; - "type-is-1.5.3" = self.by-version."type-is"."1.5.3"; + "type-is-1.5.4" = self.by-version."type-is"."1.5.4"; "vary-1.0.0" = self.by-version."vary"."1.0.0"; "cookie-0.1.2" = self.by-version."cookie"."0.1.2"; "merge-descriptors-0.0.2" = self.by-version."merge-descriptors"."0.0.2"; @@ -8750,7 +8938,7 @@ "range-parser-0.0.4" = self.by-version."range-parser"."0.0.4"; "mkdirp-0.3.5" = self.by-version."mkdirp"."0.3.5"; "cookie-0.0.5" = self.by-version."cookie"."0.0.5"; - "buffer-crc32-0.2.4" = self.by-version."buffer-crc32"."0.2.4"; + "buffer-crc32-0.2.5" = self.by-version."buffer-crc32"."0.2.5"; "fresh-0.1.0" = self.by-version."fresh"."0.1.0"; "methods-0.0.1" = self.by-version."methods"."0.0.1"; "send-0.1.0" = self.by-version."send"."0.1.0"; @@ -8793,22 +8981,22 @@ passthru.names = [ "express" ]; }; by-spec."express"."3.x" = - self.by-version."express"."3.18.4"; - by-version."express"."3.18.4" = lib.makeOverridable self.buildNodePackage { - name = "express-3.18.4"; + self.by-version."express"."3.18.6"; + by-version."express"."3.18.6" = lib.makeOverridable self.buildNodePackage { + name = "express-3.18.6"; bin = true; src = [ (fetchurl { - url = "http://registry.npmjs.org/express/-/express-3.18.4.tgz"; - name = "express-3.18.4.tgz"; - sha1 = "7b40ad2c10a987692ee97a387c21593011f03712"; + url = "http://registry.npmjs.org/express/-/express-3.18.6.tgz"; + name = "express-3.18.6.tgz"; + sha1 = "cbcc7cb610d061ac619e5d090a5539353a3e870b"; }) ]; buildInputs = (self.nativeDeps."express" or []); deps = { "basic-auth-1.0.0" = self.by-version."basic-auth"."1.0.0"; - "connect-2.27.4" = self.by-version."connect"."2.27.4"; + "connect-2.27.6" = self.by-version."connect"."2.27.6"; "content-disposition-0.5.0" = self.by-version."content-disposition"."0.5.0"; "commander-1.3.2" = self.by-version."commander"."1.3.2"; "cookie-signature-1.0.5" = self.by-version."cookie-signature"."1.0.5"; @@ -8835,6 +9023,50 @@ }; by-spec."express".">=3.0.0" = self.by-version."express"."5.0.0-alpha.1"; + by-spec."express"."^4.0" = + self.by-version."express"."4.10.6"; + by-version."express"."4.10.6" = lib.makeOverridable self.buildNodePackage { + name = "express-4.10.6"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/express/-/express-4.10.6.tgz"; + name = "express-4.10.6.tgz"; + sha1 = "a9015979ccf38b11a39c0f726dcf6c4b85a4e758"; + }) + ]; + buildInputs = + (self.nativeDeps."express" or []); + deps = { + "accepts-1.1.4" = self.by-version."accepts"."1.1.4"; + "content-disposition-0.5.0" = self.by-version."content-disposition"."0.5.0"; + "cookie-signature-1.0.5" = self.by-version."cookie-signature"."1.0.5"; + "debug-2.1.0" = self.by-version."debug"."2.1.0"; + "depd-1.0.0" = self.by-version."depd"."1.0.0"; + "escape-html-1.0.1" = self.by-version."escape-html"."1.0.1"; + "etag-1.5.1" = self.by-version."etag"."1.5.1"; + "finalhandler-0.3.2" = self.by-version."finalhandler"."0.3.2"; + "fresh-0.2.4" = self.by-version."fresh"."0.2.4"; + "media-typer-0.3.0" = self.by-version."media-typer"."0.3.0"; + "methods-1.1.0" = self.by-version."methods"."1.1.0"; + "on-finished-2.1.1" = self.by-version."on-finished"."2.1.1"; + "parseurl-1.3.0" = self.by-version."parseurl"."1.3.0"; + "path-to-regexp-0.1.3" = self.by-version."path-to-regexp"."0.1.3"; + "proxy-addr-1.0.4" = self.by-version."proxy-addr"."1.0.4"; + "qs-2.3.3" = self.by-version."qs"."2.3.3"; + "range-parser-1.0.2" = self.by-version."range-parser"."1.0.2"; + "send-0.10.1" = self.by-version."send"."0.10.1"; + "serve-static-1.7.1" = self.by-version."serve-static"."1.7.1"; + "type-is-1.5.4" = self.by-version."type-is"."1.5.4"; + "vary-1.0.0" = self.by-version."vary"."1.0.0"; + "cookie-0.1.2" = self.by-version."cookie"."0.1.2"; + "merge-descriptors-0.0.2" = self.by-version."merge-descriptors"."0.0.2"; + "utils-merge-1.0.0" = self.by-version."utils-merge"."1.0.0"; + }; + peerDependencies = [ + ]; + passthru.names = [ "express" ]; + }; by-spec."express"."~3.1.1" = self.by-version."express"."3.1.2"; by-version."express"."3.1.2" = lib.makeOverridable self.buildNodePackage { @@ -8855,7 +9087,7 @@ "range-parser-0.0.4" = self.by-version."range-parser"."0.0.4"; "mkdirp-0.3.5" = self.by-version."mkdirp"."0.3.5"; "cookie-0.0.5" = self.by-version."cookie"."0.0.5"; - "buffer-crc32-0.2.4" = self.by-version."buffer-crc32"."0.2.4"; + "buffer-crc32-0.2.5" = self.by-version."buffer-crc32"."0.2.5"; "fresh-0.1.0" = self.by-version."fresh"."0.1.0"; "methods-0.0.1" = self.by-version."methods"."0.0.1"; "send-0.1.0" = self.by-version."send"."0.1.0"; @@ -8898,87 +9130,8 @@ ]; passthru.names = [ "express" ]; }; - by-spec."express"."~4.0" = - self.by-version."express"."4.0.0"; - by-version."express"."4.0.0" = lib.makeOverridable self.buildNodePackage { - name = "express-4.0.0"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/express/-/express-4.0.0.tgz"; - name = "express-4.0.0.tgz"; - sha1 = "274dc82933c9f574cc38a0ce5ea8172be9c6b094"; - }) - ]; - buildInputs = - (self.nativeDeps."express" or []); - deps = { - "parseurl-1.0.1" = self.by-version."parseurl"."1.0.1"; - "accepts-1.0.0" = self.by-version."accepts"."1.0.0"; - "type-is-1.0.0" = self.by-version."type-is"."1.0.0"; - "range-parser-1.0.0" = self.by-version."range-parser"."1.0.0"; - "cookie-0.1.0" = self.by-version."cookie"."0.1.0"; - "buffer-crc32-0.2.1" = self.by-version."buffer-crc32"."0.2.1"; - "fresh-0.2.2" = self.by-version."fresh"."0.2.2"; - "methods-0.1.0" = self.by-version."methods"."0.1.0"; - "send-0.2.0" = self.by-version."send"."0.2.0"; - "cookie-signature-1.0.3" = self.by-version."cookie-signature"."1.0.3"; - "merge-descriptors-0.0.2" = self.by-version."merge-descriptors"."0.0.2"; - "utils-merge-1.0.0" = self.by-version."utils-merge"."1.0.0"; - "escape-html-1.0.1" = self.by-version."escape-html"."1.0.1"; - "qs-0.6.6" = self.by-version."qs"."0.6.6"; - "serve-static-1.0.1" = self.by-version."serve-static"."1.0.1"; - "path-to-regexp-0.1.2" = self.by-version."path-to-regexp"."0.1.2"; - "debug-0.8.1" = self.by-version."debug"."0.8.1"; - }; - peerDependencies = [ - ]; - passthru.names = [ "express" ]; - }; by-spec."express"."~4.10.3" = - self.by-version."express"."4.10.4"; - by-version."express"."4.10.4" = lib.makeOverridable self.buildNodePackage { - name = "express-4.10.4"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/express/-/express-4.10.4.tgz"; - name = "express-4.10.4.tgz"; - sha1 = "31aa70acdad6b6093945c30523df8537336deb58"; - }) - ]; - buildInputs = - (self.nativeDeps."express" or []); - deps = { - "accepts-1.1.3" = self.by-version."accepts"."1.1.3"; - "content-disposition-0.5.0" = self.by-version."content-disposition"."0.5.0"; - "cookie-signature-1.0.5" = self.by-version."cookie-signature"."1.0.5"; - "debug-2.1.0" = self.by-version."debug"."2.1.0"; - "depd-1.0.0" = self.by-version."depd"."1.0.0"; - "escape-html-1.0.1" = self.by-version."escape-html"."1.0.1"; - "etag-1.5.1" = self.by-version."etag"."1.5.1"; - "finalhandler-0.3.2" = self.by-version."finalhandler"."0.3.2"; - "fresh-0.2.4" = self.by-version."fresh"."0.2.4"; - "media-typer-0.3.0" = self.by-version."media-typer"."0.3.0"; - "methods-1.1.0" = self.by-version."methods"."1.1.0"; - "on-finished-2.1.1" = self.by-version."on-finished"."2.1.1"; - "parseurl-1.3.0" = self.by-version."parseurl"."1.3.0"; - "path-to-regexp-0.1.3" = self.by-version."path-to-regexp"."0.1.3"; - "proxy-addr-1.0.4" = self.by-version."proxy-addr"."1.0.4"; - "qs-2.3.3" = self.by-version."qs"."2.3.3"; - "range-parser-1.0.2" = self.by-version."range-parser"."1.0.2"; - "send-0.10.1" = self.by-version."send"."0.10.1"; - "serve-static-1.7.1" = self.by-version."serve-static"."1.7.1"; - "type-is-1.5.3" = self.by-version."type-is"."1.5.3"; - "vary-1.0.0" = self.by-version."vary"."1.0.0"; - "cookie-0.1.2" = self.by-version."cookie"."0.1.2"; - "merge-descriptors-0.0.2" = self.by-version."merge-descriptors"."0.0.2"; - "utils-merge-1.0.0" = self.by-version."utils-merge"."1.0.0"; - }; - peerDependencies = [ - ]; - passthru.names = [ "express" ]; - }; + self.by-version."express"."4.10.6"; by-spec."express-form"."*" = self.by-version."express-form"."0.12.4"; by-version."express-form"."0.12.4" = lib.makeOverridable self.buildNodePackage { @@ -9080,15 +9233,15 @@ passthru.names = [ "express-session" ]; }; by-spec."express-session"."~1.9.2" = - self.by-version."express-session"."1.9.2"; - by-version."express-session"."1.9.2" = lib.makeOverridable self.buildNodePackage { - name = "express-session-1.9.2"; + self.by-version."express-session"."1.9.3"; + by-version."express-session"."1.9.3" = lib.makeOverridable self.buildNodePackage { + name = "express-session-1.9.3"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/express-session/-/express-session-1.9.2.tgz"; - name = "express-session-1.9.2.tgz"; - sha1 = "cb831ff8d2d9cb6e64c167f678af6f62ae6bb076"; + url = "http://registry.npmjs.org/express-session/-/express-session-1.9.3.tgz"; + name = "express-session-1.9.3.tgz"; + sha1 = "7d2fc387af6fd928775213bfe9d635a5705a84ce"; }) ]; buildInputs = @@ -9108,6 +9261,8 @@ ]; passthru.names = [ "express-session" ]; }; + by-spec."express-session"."~1.9.3" = + self.by-version."express-session"."1.9.3"; by-spec."extend"."*" = self.by-version."extend"."2.0.0"; by-version."extend"."2.0.0" = lib.makeOverridable self.buildNodePackage { @@ -9272,6 +9427,8 @@ }; by-spec."eyes"."~0.1.6" = self.by-version."eyes"."0.1.8"; + by-spec."eyes"."~0.1.8" = + self.by-version."eyes"."0.1.8"; by-spec."falafel"."~0.1.6" = self.by-version."falafel"."0.1.6"; by-version."falafel"."0.1.6" = lib.makeOverridable self.buildNodePackage { @@ -9293,7 +9450,51 @@ ]; passthru.names = [ "falafel" ]; }; + by-spec."fast-levenshtein"."~1.0.0" = + self.by-version."fast-levenshtein"."1.0.6"; + by-version."fast-levenshtein"."1.0.6" = lib.makeOverridable self.buildNodePackage { + name = "fast-levenshtein-1.0.6"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-1.0.6.tgz"; + name = "fast-levenshtein-1.0.6.tgz"; + sha1 = "3bedb184e39f95cb0d88928688e6b1ee3273446a"; + }) + ]; + buildInputs = + (self.nativeDeps."fast-levenshtein" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "fast-levenshtein" ]; + }; by-spec."faye-websocket"."*" = + self.by-version."faye-websocket"."0.9.1"; + by-version."faye-websocket"."0.9.1" = lib.makeOverridable self.buildNodePackage { + name = "faye-websocket-0.9.1"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/faye-websocket/-/faye-websocket-0.9.1.tgz"; + name = "faye-websocket-0.9.1.tgz"; + sha1 = "01a206fbf2aae351f1ef6e7d3adf6069dd7ccc13"; + }) + ]; + buildInputs = + (self.nativeDeps."faye-websocket" or []); + deps = { + "websocket-driver-0.5.1" = self.by-version."websocket-driver"."0.5.1"; + }; + peerDependencies = [ + ]; + passthru.names = [ "faye-websocket" ]; + }; + "faye-websocket" = self.by-version."faye-websocket"."0.9.1"; + by-spec."faye-websocket".">= 0.4.1" = + self.by-version."faye-websocket"."0.9.1"; + by-spec."faye-websocket"."^0.7.3 || ^0.8.0" = self.by-version."faye-websocket"."0.8.1"; by-version."faye-websocket"."0.8.1" = lib.makeOverridable self.buildNodePackage { name = "faye-websocket-0.8.1"; @@ -9308,17 +9509,12 @@ buildInputs = (self.nativeDeps."faye-websocket" or []); deps = { - "websocket-driver-0.4.0" = self.by-version."websocket-driver"."0.4.0"; + "websocket-driver-0.5.1" = self.by-version."websocket-driver"."0.5.1"; }; peerDependencies = [ ]; passthru.names = [ "faye-websocket" ]; }; - "faye-websocket" = self.by-version."faye-websocket"."0.8.1"; - by-spec."faye-websocket".">= 0.4.1" = - self.by-version."faye-websocket"."0.8.1"; - by-spec."faye-websocket"."^0.7.3 || ^0.8.0" = - self.by-version."faye-websocket"."0.8.1"; by-spec."faye-websocket"."~0.7.0" = self.by-version."faye-websocket"."0.7.3"; by-version."faye-websocket"."0.7.3" = lib.makeOverridable self.buildNodePackage { @@ -9334,7 +9530,7 @@ buildInputs = (self.nativeDeps."faye-websocket" or []); deps = { - "websocket-driver-0.4.0" = self.by-version."websocket-driver"."0.4.0"; + "websocket-driver-0.5.1" = self.by-version."websocket-driver"."0.5.1"; }; peerDependencies = [ ]; @@ -9381,7 +9577,7 @@ deps = { "colors-0.6.2" = self.by-version."colors"."0.6.2"; "keypress-0.2.1" = self.by-version."keypress"."0.2.1"; - "sprintf-0.1.4" = self.by-version."sprintf"."0.1.4"; + "sprintf-0.1.5" = self.by-version."sprintf"."0.1.5"; }; peerDependencies = [ ]; @@ -9601,15 +9797,15 @@ passthru.names = [ "flagged-respawn" ]; }; by-spec."flatiron"."*" = - self.by-version."flatiron"."0.4.2"; - by-version."flatiron"."0.4.2" = lib.makeOverridable self.buildNodePackage { - name = "flatiron-0.4.2"; + self.by-version."flatiron"."0.4.3"; + by-version."flatiron"."0.4.3" = lib.makeOverridable self.buildNodePackage { + name = "flatiron-0.4.3"; bin = true; src = [ (fetchurl { - url = "http://registry.npmjs.org/flatiron/-/flatiron-0.4.2.tgz"; - name = "flatiron-0.4.2.tgz"; - sha1 = "cffae218dae8229d6668c34453eefd9a44c0e418"; + url = "http://registry.npmjs.org/flatiron/-/flatiron-0.4.3.tgz"; + name = "flatiron-0.4.3.tgz"; + sha1 = "248cf79a3da7d7dc379e2a11c92a2719cbb540f6"; }) ]; buildInputs = @@ -9618,15 +9814,15 @@ "broadway-0.3.6" = self.by-version."broadway"."0.3.6"; "optimist-0.6.0" = self.by-version."optimist"."0.6.0"; "prompt-0.2.14" = self.by-version."prompt"."0.2.14"; - "director-1.2.3" = self.by-version."director"."1.2.3"; + "director-1.2.7" = self.by-version."director"."1.2.7"; }; peerDependencies = [ ]; passthru.names = [ "flatiron" ]; }; - "flatiron" = self.by-version."flatiron"."0.4.2"; + "flatiron" = self.by-version."flatiron"."0.4.3"; by-spec."flatiron"."~0.4.2" = - self.by-version."flatiron"."0.4.2"; + self.by-version."flatiron"."0.4.3"; by-spec."follow-redirects"."0.0.3" = self.by-version."follow-redirects"."0.0.3"; by-version."follow-redirects"."0.0.3" = lib.makeOverridable self.buildNodePackage { @@ -9705,11 +9901,11 @@ (self.nativeDeps."forever" or []); deps = { "colors-0.6.2" = self.by-version."colors"."0.6.2"; - "cliff-0.1.9" = self.by-version."cliff"."0.1.9"; - "flatiron-0.4.2" = self.by-version."flatiron"."0.4.2"; + "cliff-0.1.10" = self.by-version."cliff"."0.1.10"; + "flatiron-0.4.3" = self.by-version."flatiron"."0.4.3"; "forever-monitor-1.5.2" = self.by-version."forever-monitor"."1.5.2"; "nconf-0.6.9" = self.by-version."nconf"."0.6.9"; - "nssocket-0.5.2" = self.by-version."nssocket"."0.5.2"; + "nssocket-0.5.3" = self.by-version."nssocket"."0.5.3"; "optimist-0.6.1" = self.by-version."optimist"."0.6.1"; "timespan-2.3.0" = self.by-version."timespan"."2.3.0"; "utile-0.2.1" = self.by-version."utile"."0.2.1"; @@ -9906,7 +10102,30 @@ ]; passthru.names = [ "form-data" ]; }; - by-spec."formatio"."~1.1.1" = + by-spec."form-data"."~0.2.0" = + self.by-version."form-data"."0.2.0"; + by-version."form-data"."0.2.0" = lib.makeOverridable self.buildNodePackage { + name = "form-data-0.2.0"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/form-data/-/form-data-0.2.0.tgz"; + name = "form-data-0.2.0.tgz"; + sha1 = "26f8bc26da6440e299cbdcfb69035c4f77a6e466"; + }) + ]; + buildInputs = + (self.nativeDeps."form-data" or []); + deps = { + "async-0.9.0" = self.by-version."async"."0.9.0"; + "combined-stream-0.0.7" = self.by-version."combined-stream"."0.0.7"; + "mime-types-2.0.4" = self.by-version."mime-types"."2.0.4"; + }; + peerDependencies = [ + ]; + passthru.names = [ "form-data" ]; + }; + by-spec."formatio"."1.1.1" = self.by-version."formatio"."1.1.1"; by-version."formatio"."1.1.1" = lib.makeOverridable self.buildNodePackage { name = "formatio-1.1.1"; @@ -9921,7 +10140,7 @@ buildInputs = (self.nativeDeps."formatio" or []); deps = { - "samsam-1.1.1" = self.by-version."samsam"."1.1.1"; + "samsam-1.1.2" = self.by-version."samsam"."1.1.2"; }; peerDependencies = [ ]; @@ -9988,15 +10207,15 @@ passthru.names = [ "formidable" ]; }; by-spec."formidable"."1.0.x" = - self.by-version."formidable"."1.0.15"; - by-version."formidable"."1.0.15" = lib.makeOverridable self.buildNodePackage { - name = "formidable-1.0.15"; + self.by-version."formidable"."1.0.16"; + by-version."formidable"."1.0.16" = lib.makeOverridable self.buildNodePackage { + name = "formidable-1.0.16"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/formidable/-/formidable-1.0.15.tgz"; - name = "formidable-1.0.15.tgz"; - sha1 = "91363d59cc51ddca2be84ca0336ec0135606c155"; + url = "http://registry.npmjs.org/formidable/-/formidable-1.0.16.tgz"; + name = "formidable-1.0.16.tgz"; + sha1 = "4916cfdfc4cbed020b257a6a9505a9ab38c2cd0e"; }) ]; buildInputs = @@ -10109,6 +10328,30 @@ }; by-spec."fresh"."~0.2.1" = self.by-version."fresh"."0.2.4"; + by-spec."fs-extra"."^0.12.0" = + self.by-version."fs-extra"."0.12.0"; + by-version."fs-extra"."0.12.0" = lib.makeOverridable self.buildNodePackage { + name = "fs-extra-0.12.0"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/fs-extra/-/fs-extra-0.12.0.tgz"; + name = "fs-extra-0.12.0.tgz"; + sha1 = "407cf6e11321e440d66f9486fba1cc9eb4c21868"; + }) + ]; + buildInputs = + (self.nativeDeps."fs-extra" or []); + deps = { + "ncp-0.6.0" = self.by-version."ncp"."0.6.0"; + "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0"; + "jsonfile-2.0.0" = self.by-version."jsonfile"."2.0.0"; + "rimraf-2.2.8" = self.by-version."rimraf"."2.2.8"; + }; + peerDependencies = [ + ]; + passthru.names = [ "fs-extra" ]; + }; by-spec."fs-extra"."~0.6.1" = self.by-version."fs-extra"."0.6.4"; by-version."fs-extra"."0.6.4" = lib.makeOverridable self.buildNodePackage { @@ -10133,22 +10376,23 @@ ]; passthru.names = [ "fs-extra" ]; }; - by-spec."fs-vacuum"."~1.2.2" = - self.by-version."fs-vacuum"."1.2.2"; - by-version."fs-vacuum"."1.2.2" = lib.makeOverridable self.buildNodePackage { - name = "fs-vacuum-1.2.2"; + by-spec."fs-vacuum"."~1.2.5" = + self.by-version."fs-vacuum"."1.2.5"; + by-version."fs-vacuum"."1.2.5" = lib.makeOverridable self.buildNodePackage { + name = "fs-vacuum-1.2.5"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/fs-vacuum/-/fs-vacuum-1.2.2.tgz"; - name = "fs-vacuum-1.2.2.tgz"; - sha1 = "0e26ca2b14eb4ceb4b590a92aad585756ed18e40"; + url = "http://registry.npmjs.org/fs-vacuum/-/fs-vacuum-1.2.5.tgz"; + name = "fs-vacuum-1.2.5.tgz"; + sha1 = "a5cbaa844b4b3a7cff139f3cc90e7f7007e5fbb8"; }) ]; buildInputs = (self.nativeDeps."fs-vacuum" or []); deps = { "graceful-fs-3.0.5" = self.by-version."graceful-fs"."3.0.5"; + "path-is-inside-1.0.1" = self.by-version."path-is-inside"."1.0.1"; "rimraf-2.2.8" = self.by-version."rimraf"."2.2.8"; }; peerDependencies = [ @@ -10294,9 +10538,11 @@ }; by-spec."fstream"."^1.0.2" = self.by-version."fstream"."1.0.3"; - by-spec."fstream"."~0.1.23" = + by-spec."fstream"."~0.1.17" = self.by-version."fstream"."0.1.31"; - by-spec."fstream"."~0.1.25" = + by-spec."fstream"."~0.1.22" = + self.by-version."fstream"."0.1.31"; + by-spec."fstream"."~0.1.23" = self.by-version."fstream"."0.1.31"; by-spec."fstream"."~0.1.28" = self.by-version."fstream"."0.1.31"; @@ -10306,16 +10552,39 @@ self.by-version."fstream"."1.0.3"; by-spec."fstream"."~1.0.3" = self.by-version."fstream"."1.0.3"; - by-spec."fstream-ignore"."^1.0.0" = - self.by-version."fstream-ignore"."1.0.1"; - by-version."fstream-ignore"."1.0.1" = lib.makeOverridable self.buildNodePackage { - name = "fstream-ignore-1.0.1"; + by-spec."fstream-ignore"."0.0.7" = + self.by-version."fstream-ignore"."0.0.7"; + by-version."fstream-ignore"."0.0.7" = lib.makeOverridable self.buildNodePackage { + name = "fstream-ignore-0.0.7"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/fstream-ignore/-/fstream-ignore-1.0.1.tgz"; - name = "fstream-ignore-1.0.1.tgz"; - sha1 = "153df36c4fa2cb006fb915dc71ac9d75f6a17c82"; + url = "http://registry.npmjs.org/fstream-ignore/-/fstream-ignore-0.0.7.tgz"; + name = "fstream-ignore-0.0.7.tgz"; + sha1 = "eea3033f0c3728139de7b57ab1b0d6d89c353c63"; + }) + ]; + buildInputs = + (self.nativeDeps."fstream-ignore" or []); + deps = { + "minimatch-0.2.14" = self.by-version."minimatch"."0.2.14"; + "fstream-0.1.31" = self.by-version."fstream"."0.1.31"; + "inherits-2.0.1" = self.by-version."inherits"."2.0.1"; + }; + peerDependencies = [ + ]; + passthru.names = [ "fstream-ignore" ]; + }; + by-spec."fstream-ignore"."^1.0.0" = + self.by-version."fstream-ignore"."1.0.2"; + by-version."fstream-ignore"."1.0.2" = lib.makeOverridable self.buildNodePackage { + name = "fstream-ignore-1.0.2"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/fstream-ignore/-/fstream-ignore-1.0.2.tgz"; + name = "fstream-ignore-1.0.2.tgz"; + sha1 = "18c891db01b782a74a7bff936a0f24997741c7ab"; }) ]; buildInputs = @@ -10323,14 +10592,14 @@ deps = { "fstream-1.0.3" = self.by-version."fstream"."1.0.3"; "inherits-2.0.1" = self.by-version."inherits"."2.0.1"; - "minimatch-1.0.0" = self.by-version."minimatch"."1.0.0"; + "minimatch-2.0.1" = self.by-version."minimatch"."2.0.1"; }; peerDependencies = [ ]; passthru.names = [ "fstream-ignore" ]; }; by-spec."fstream-ignore"."~1.0.1" = - self.by-version."fstream-ignore"."1.0.1"; + self.by-version."fstream-ignore"."1.0.2"; by-spec."fstream-npm"."~0.1.3" = self.by-version."fstream-npm"."0.1.8"; by-version."fstream-npm"."0.1.8" = lib.makeOverridable self.buildNodePackage { @@ -10346,15 +10615,13 @@ buildInputs = (self.nativeDeps."fstream-npm" or []); deps = { - "fstream-ignore-1.0.1" = self.by-version."fstream-ignore"."1.0.1"; + "fstream-ignore-1.0.2" = self.by-version."fstream-ignore"."1.0.2"; "inherits-2.0.1" = self.by-version."inherits"."2.0.1"; }; peerDependencies = [ ]; passthru.names = [ "fstream-npm" ]; }; - by-spec."fstream-npm"."~0.1.6" = - self.by-version."fstream-npm"."0.1.8"; by-spec."fstream-npm"."~1.0.1" = self.by-version."fstream-npm"."1.0.1"; by-version."fstream-npm"."1.0.1" = lib.makeOverridable self.buildNodePackage { @@ -10370,7 +10637,7 @@ buildInputs = (self.nativeDeps."fstream-npm" or []); deps = { - "fstream-ignore-1.0.1" = self.by-version."fstream-ignore"."1.0.1"; + "fstream-ignore-1.0.2" = self.by-version."fstream-ignore"."1.0.2"; "inherits-2.0.1" = self.by-version."inherits"."2.0.1"; }; peerDependencies = [ @@ -10482,15 +10749,15 @@ passthru.names = [ "getobject" ]; }; by-spec."git-run"."*" = - self.by-version."git-run"."0.3.0"; - by-version."git-run"."0.3.0" = lib.makeOverridable self.buildNodePackage { - name = "git-run-0.3.0"; + self.by-version."git-run"."0.3.1"; + by-version."git-run"."0.3.1" = lib.makeOverridable self.buildNodePackage { + name = "git-run-0.3.1"; bin = true; src = [ (self.patchSource fetchurl { - url = "http://registry.npmjs.org/git-run/-/git-run-0.3.0.tgz"; - name = "git-run-0.3.0.tgz"; - sha1 = "6ac02b93a93e10803ebfec8a5703fb416cafc0b1"; + url = "http://registry.npmjs.org/git-run/-/git-run-0.3.1.tgz"; + name = "git-run-0.3.1.tgz"; + sha1 = "34a59d4a90c1501d491ea87d478d26c877808415"; }) ]; buildInputs = @@ -10503,27 +10770,7 @@ ]; passthru.names = [ "git-run" ]; }; - "git-run" = self.by-version."git-run"."0.3.0"; - by-spec."github-url-from-git"."1.1.1" = - self.by-version."github-url-from-git"."1.1.1"; - by-version."github-url-from-git"."1.1.1" = lib.makeOverridable self.buildNodePackage { - name = "github-url-from-git-1.1.1"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/github-url-from-git/-/github-url-from-git-1.1.1.tgz"; - name = "github-url-from-git-1.1.1.tgz"; - sha1 = "1f89623453123ef9623956e264c60bf4c3cf5ccf"; - }) - ]; - buildInputs = - (self.nativeDeps."github-url-from-git" or []); - deps = { - }; - peerDependencies = [ - ]; - passthru.names = [ "github-url-from-git" ]; - }; + "git-run" = self.by-version."git-run"."0.3.1"; by-spec."github-url-from-git"."^1.3.0" = self.by-version."github-url-from-git"."1.4.0"; by-version."github-url-from-git"."1.4.0" = lib.makeOverridable self.buildNodePackage { @@ -10546,28 +10793,26 @@ }; by-spec."github-url-from-git"."~1.1.1" = self.by-version."github-url-from-git"."1.1.1"; - by-spec."github-url-from-git"."~1.4.0" = - self.by-version."github-url-from-git"."1.4.0"; - by-spec."github-url-from-username-repo"."0.0.2" = - self.by-version."github-url-from-username-repo"."0.0.2"; - by-version."github-url-from-username-repo"."0.0.2" = lib.makeOverridable self.buildNodePackage { - name = "github-url-from-username-repo-0.0.2"; + by-version."github-url-from-git"."1.1.1" = lib.makeOverridable self.buildNodePackage { + name = "github-url-from-git-1.1.1"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/github-url-from-username-repo/-/github-url-from-username-repo-0.0.2.tgz"; - name = "github-url-from-username-repo-0.0.2.tgz"; - sha1 = "0d9ee8e2bca36d5f065a1bcd23eb3f1fa3d636bd"; + url = "http://registry.npmjs.org/github-url-from-git/-/github-url-from-git-1.1.1.tgz"; + name = "github-url-from-git-1.1.1.tgz"; + sha1 = "1f89623453123ef9623956e264c60bf4c3cf5ccf"; }) ]; buildInputs = - (self.nativeDeps."github-url-from-username-repo" or []); + (self.nativeDeps."github-url-from-git" or []); deps = { }; peerDependencies = [ ]; - passthru.names = [ "github-url-from-username-repo" ]; + passthru.names = [ "github-url-from-git" ]; }; + by-spec."github-url-from-git"."~1.4.0" = + self.by-version."github-url-from-git"."1.4.0"; by-spec."github-url-from-username-repo"."^0.1.0" = self.by-version."github-url-from-username-repo"."0.1.0"; by-version."github-url-from-username-repo"."0.1.0" = lib.makeOverridable self.buildNodePackage { @@ -10635,15 +10880,15 @@ passthru.names = [ "glob" ]; }; by-spec."glob"."3 || 4" = - self.by-version."glob"."4.2.2"; - by-version."glob"."4.2.2" = lib.makeOverridable self.buildNodePackage { - name = "glob-4.2.2"; + self.by-version."glob"."4.3.2"; + by-version."glob"."4.3.2" = lib.makeOverridable self.buildNodePackage { + name = "glob-4.3.2"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/glob/-/glob-4.2.2.tgz"; - name = "glob-4.2.2.tgz"; - sha1 = "ad2b047653a58c387e15deb43a19497f83fd2a80"; + url = "http://registry.npmjs.org/glob/-/glob-4.3.2.tgz"; + name = "glob-4.3.2.tgz"; + sha1 = "351ec7dafc29256b253ad86cd6b48c5a3404b76d"; }) ]; buildInputs = @@ -10651,7 +10896,7 @@ deps = { "inflight-1.0.4" = self.by-version."inflight"."1.0.4"; "inherits-2.0.1" = self.by-version."inherits"."2.0.1"; - "minimatch-1.0.0" = self.by-version."minimatch"."1.0.0"; + "minimatch-2.0.1" = self.by-version."minimatch"."2.0.1"; "once-1.3.1" = self.by-version."once"."1.3.1"; }; peerDependencies = [ @@ -10710,15 +10955,17 @@ passthru.names = [ "glob" ]; }; by-spec."glob"."4.x" = - self.by-version."glob"."4.2.2"; + self.by-version."glob"."4.3.2"; by-spec."glob".">=3.2.7 <4" = self.by-version."glob"."3.2.11"; - by-spec."glob"."^4.0.0" = - self.by-version."glob"."4.2.2"; + by-spec."glob"."^3.2.1" = + self.by-version."glob"."3.2.11"; by-spec."glob"."^4.0.2" = - self.by-version."glob"."4.2.2"; + self.by-version."glob"."4.3.2"; by-spec."glob"."^4.0.5" = - self.by-version."glob"."4.2.2"; + self.by-version."glob"."4.3.2"; + by-spec."glob"."^4.3.1" = + self.by-version."glob"."4.3.2"; by-spec."glob"."~ 3.2.1" = self.by-version."glob"."3.2.11"; by-spec."glob"."~3.1.21" = @@ -10748,8 +10995,6 @@ self.by-version."glob"."3.2.11"; by-spec."glob"."~3.2.3" = self.by-version."glob"."3.2.11"; - by-spec."glob"."~3.2.6" = - self.by-version."glob"."3.2.11"; by-spec."glob"."~3.2.7" = self.by-version."glob"."3.2.11"; by-spec."glob"."~3.2.8" = @@ -10760,25 +11005,25 @@ self.by-version."glob"."4.0.6"; by-spec."glob"."~4.0.6" = self.by-version."glob"."4.0.6"; - by-spec."glob"."~4.2.1" = - self.by-version."glob"."4.2.2"; + by-spec."glob"."~4.3.1" = + self.by-version."glob"."4.3.2"; by-spec."glob-stream"."^3.1.5" = - self.by-version."glob-stream"."3.1.17"; - by-version."glob-stream"."3.1.17" = lib.makeOverridable self.buildNodePackage { - name = "glob-stream-3.1.17"; + self.by-version."glob-stream"."3.1.18"; + by-version."glob-stream"."3.1.18" = lib.makeOverridable self.buildNodePackage { + name = "glob-stream-3.1.18"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/glob-stream/-/glob-stream-3.1.17.tgz"; - name = "glob-stream-3.1.17.tgz"; - sha1 = "bc3093856149bf9b7454935abe523ec7ab26ec1e"; + url = "http://registry.npmjs.org/glob-stream/-/glob-stream-3.1.18.tgz"; + name = "glob-stream-3.1.18.tgz"; + sha1 = "9170a5f12b790306fdfe598f313f8f7954fd143b"; }) ]; buildInputs = (self.nativeDeps."glob-stream" or []); deps = { - "glob-4.2.2" = self.by-version."glob"."4.2.2"; - "minimatch-1.0.0" = self.by-version."minimatch"."1.0.0"; + "glob-4.3.2" = self.by-version."glob"."4.3.2"; + "minimatch-2.0.1" = self.by-version."minimatch"."2.0.1"; "ordered-read-streams-0.1.0" = self.by-version."ordered-read-streams"."0.1.0"; "glob2base-0.0.12" = self.by-version."glob2base"."0.0.12"; "unique-stream-1.0.0" = self.by-version."unique-stream"."1.0.0"; @@ -10874,6 +11119,27 @@ ]; passthru.names = [ "got" ]; }; + by-spec."got"."^1.0.1" = + self.by-version."got"."1.2.2"; + by-version."got"."1.2.2" = lib.makeOverridable self.buildNodePackage { + name = "got-1.2.2"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/got/-/got-1.2.2.tgz"; + name = "got-1.2.2.tgz"; + sha1 = "d9430ba32f6a30218243884418767340aafc0400"; + }) + ]; + buildInputs = + (self.nativeDeps."got" or []); + deps = { + "object-assign-1.0.0" = self.by-version."object-assign"."1.0.0"; + }; + peerDependencies = [ + ]; + passthru.names = [ "got" ]; + }; by-spec."graceful-fs"."1.2" = self.by-version."graceful-fs"."1.2.3"; by-version."graceful-fs"."1.2.3" = lib.makeOverridable self.buildNodePackage { @@ -10960,7 +11226,7 @@ self.by-version."graceful-fs"."3.0.5"; by-spec."graceful-fs"."~3.0.2" = self.by-version."graceful-fs"."3.0.5"; - by-spec."graceful-fs"."~3.0.4" = + by-spec."graceful-fs"."~3.0.5" = self.by-version."graceful-fs"."3.0.5"; by-spec."gridfs-stream"."*" = self.by-version."gridfs-stream"."0.5.3"; @@ -11052,7 +11318,7 @@ "rimraf-2.2.8" = self.by-version."rimraf"."2.2.8"; "lodash-0.9.2" = self.by-version."lodash"."0.9.2"; "underscore.string-2.2.1" = self.by-version."underscore.string"."2.2.1"; - "which-1.0.7" = self.by-version."which"."1.0.7"; + "which-1.0.8" = self.by-version."which"."1.0.8"; "js-yaml-2.0.5" = self.by-version."js-yaml"."2.0.5"; "exit-0.1.2" = self.by-version."exit"."0.1.2"; "getobject-0.1.0" = self.by-version."getobject"."0.1.0"; @@ -11109,7 +11375,7 @@ (self.nativeDeps."grunt-contrib-cssmin" or []); deps = { "chalk-0.4.0" = self.by-version."chalk"."0.4.0"; - "clean-css-2.2.19" = self.by-version."clean-css"."2.2.19"; + "clean-css-2.2.22" = self.by-version."clean-css"."2.2.22"; "maxmin-0.2.2" = self.by-version."maxmin"."0.2.2"; }; peerDependencies = [ @@ -11133,7 +11399,7 @@ buildInputs = (self.nativeDeps."grunt-contrib-jshint" or []); deps = { - "jshint-2.5.10" = self.by-version."jshint"."2.5.10"; + "jshint-2.5.11" = self.by-version."jshint"."2.5.11"; "hooker-0.2.3" = self.by-version."hooker"."0.2.3"; }; peerDependencies = [ @@ -11210,7 +11476,7 @@ "chalk-0.5.1" = self.by-version."chalk"."0.5.1"; "lodash-2.4.1" = self.by-version."lodash"."2.4.1"; "maxmin-1.0.0" = self.by-version."maxmin"."1.0.0"; - "uglify-js-2.4.15" = self.by-version."uglify-js"."2.4.15"; + "uglify-js-2.4.16" = self.by-version."uglify-js"."2.4.16"; "uri-path-0.0.2" = self.by-version."uri-path"."0.0.2"; }; peerDependencies = [ @@ -11288,7 +11554,7 @@ "exit-0.1.2" = self.by-version."exit"."0.1.2"; "underscore.string-2.2.1" = self.by-version."underscore.string"."2.2.1"; "getobject-0.1.0" = self.by-version."getobject"."0.1.0"; - "which-1.0.7" = self.by-version."which"."1.0.7"; + "which-1.0.8" = self.by-version."which"."1.0.8"; }; peerDependencies = [ ]; @@ -11333,7 +11599,7 @@ (self.nativeDeps."guifi-earth" or []); deps = { "coffee-script-1.8.0" = self.by-version."coffee-script"."1.8.0"; - "jade-1.8.1" = self.by-version."jade"."1.8.1"; + "jade-1.8.2" = self.by-version."jade"."1.8.2"; "q-2.0.2" = self.by-version."q"."2.0.2"; "xml2js-0.4.4" = self.by-version."xml2js"."0.4.4"; "msgpack-0.2.4" = self.by-version."msgpack"."0.2.4"; @@ -11362,14 +11628,14 @@ "chalk-0.5.1" = self.by-version."chalk"."0.5.1"; "deprecated-0.0.1" = self.by-version."deprecated"."0.0.1"; "gulp-util-3.0.1" = self.by-version."gulp-util"."3.0.1"; - "interpret-0.3.8" = self.by-version."interpret"."0.3.8"; + "interpret-0.3.10" = self.by-version."interpret"."0.3.10"; "liftoff-0.13.6" = self.by-version."liftoff"."0.13.6"; "minimist-1.1.0" = self.by-version."minimist"."1.1.0"; "orchestrator-0.3.7" = self.by-version."orchestrator"."0.3.7"; "pretty-hrtime-0.2.2" = self.by-version."pretty-hrtime"."0.2.2"; - "semver-4.1.0" = self.by-version."semver"."4.1.0"; + "semver-4.1.1" = self.by-version."semver"."4.1.1"; "tildify-1.0.0" = self.by-version."tildify"."1.0.0"; - "v8flags-1.0.5" = self.by-version."v8flags"."1.0.5"; + "v8flags-1.0.6" = self.by-version."v8flags"."1.0.6"; "vinyl-fs-0.3.13" = self.by-version."vinyl-fs"."0.3.13"; }; peerDependencies = [ @@ -11400,7 +11666,7 @@ "minimist-1.1.0" = self.by-version."minimist"."1.1.0"; "multipipe-0.1.2" = self.by-version."multipipe"."0.1.2"; "through2-0.6.3" = self.by-version."through2"."0.6.3"; - "vinyl-0.4.5" = self.by-version."vinyl"."0.4.5"; + "vinyl-0.4.6" = self.by-version."vinyl"."0.4.6"; }; peerDependencies = [ ]; @@ -12045,15 +12311,15 @@ passthru.names = [ "http-browserify" ]; }; by-spec."http-errors"."~1.2.7" = - self.by-version."http-errors"."1.2.7"; - by-version."http-errors"."1.2.7" = lib.makeOverridable self.buildNodePackage { - name = "http-errors-1.2.7"; + self.by-version."http-errors"."1.2.8"; + by-version."http-errors"."1.2.8" = lib.makeOverridable self.buildNodePackage { + name = "http-errors-1.2.8"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/http-errors/-/http-errors-1.2.7.tgz"; - name = "http-errors-1.2.7.tgz"; - sha1 = "b881fa12c59b0079fd4ced456bf8dbc9610d3b78"; + url = "http://registry.npmjs.org/http-errors/-/http-errors-1.2.8.tgz"; + name = "http-errors-1.2.8.tgz"; + sha1 = "8ee5fe0b51982221d796c0c4712d76f72097a4d0"; }) ]; buildInputs = @@ -12066,6 +12332,8 @@ ]; passthru.names = [ "http-errors" ]; }; + by-spec."http-errors"."~1.2.8" = + self.by-version."http-errors"."1.2.8"; by-spec."http-proxy"."1.0.2" = self.by-version."http-proxy"."1.0.2"; by-version."http-proxy"."1.0.2" = lib.makeOverridable self.buildNodePackage { @@ -12220,27 +12488,28 @@ passthru.names = [ "i" ]; }; by-spec."i18next"."*" = - self.by-version."i18next"."1.7.4"; - by-version."i18next"."1.7.4" = lib.makeOverridable self.buildNodePackage { - name = "i18next-1.7.4"; + self.by-version."i18next"."1.7.8"; + by-version."i18next"."1.7.8" = lib.makeOverridable self.buildNodePackage { + name = "i18next-1.7.8"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/i18next/-/i18next-1.7.4.tgz"; - name = "i18next-1.7.4.tgz"; - sha1 = "b61629c9de95a5c076acb2f954f8a882ac0772af"; + url = "http://registry.npmjs.org/i18next/-/i18next-1.7.8.tgz"; + name = "i18next-1.7.8.tgz"; + sha1 = "d100ad29ec5906b61de766479786fe00ce68e5c3"; }) ]; buildInputs = (self.nativeDeps."i18next" or []); deps = { "cookies-0.5.0" = self.by-version."cookies"."0.5.0"; + "json5-0.2.0" = self.by-version."json5"."0.2.0"; }; peerDependencies = [ ]; passthru.names = [ "i18next" ]; }; - "i18next" = self.by-version."i18next"."1.7.4"; + "i18next" = self.by-version."i18next"."1.7.8"; by-spec."ibrik"."~2.0.0" = self.by-version."ibrik"."2.0.0"; by-version."ibrik"."2.0.0" = lib.makeOverridable self.buildNodePackage { @@ -12258,9 +12527,9 @@ deps = { "lodash-2.4.1" = self.by-version."lodash"."2.4.1"; "coffee-script-1.8.0" = self.by-version."coffee-script"."1.8.0"; - "istanbul-0.3.2" = self.by-version."istanbul"."0.3.2"; + "istanbul-0.3.5" = self.by-version."istanbul"."0.3.5"; "estraverse-1.8.0" = self.by-version."estraverse"."1.8.0"; - "which-1.0.7" = self.by-version."which"."1.0.7"; + "which-1.0.8" = self.by-version."which"."1.0.8"; "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0"; "optimist-0.6.1" = self.by-version."optimist"."0.6.1"; "esprima-1.2.2" = self.by-version."esprima"."1.2.2"; @@ -12543,51 +12812,26 @@ ]; passthru.names = [ "init-package-json" ]; }; - by-spec."init-package-json"."0.0.14" = - self.by-version."init-package-json"."0.0.14"; - by-version."init-package-json"."0.0.14" = lib.makeOverridable self.buildNodePackage { - name = "init-package-json-0.0.14"; + by-spec."init-package-json"."~1.1.3" = + self.by-version."init-package-json"."1.1.3"; + by-version."init-package-json"."1.1.3" = lib.makeOverridable self.buildNodePackage { + name = "init-package-json-1.1.3"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/init-package-json/-/init-package-json-0.0.14.tgz"; - name = "init-package-json-0.0.14.tgz"; - sha1 = "bd5f7b2d73b54957388cca3ce61190340c8a05b7"; + url = "http://registry.npmjs.org/init-package-json/-/init-package-json-1.1.3.tgz"; + name = "init-package-json-1.1.3.tgz"; + sha1 = "1d633c151a4909891afc8ee13cace8b336c0c9c2"; }) ]; buildInputs = (self.nativeDeps."init-package-json" or []); deps = { + "glob-4.3.2" = self.by-version."glob"."4.3.2"; "promzard-0.2.2" = self.by-version."promzard"."0.2.2"; "read-1.0.5" = self.by-version."read"."1.0.5"; "read-package-json-1.2.7" = self.by-version."read-package-json"."1.2.7"; - "semver-2.3.2" = self.by-version."semver"."2.3.2"; - "glob-3.2.11" = self.by-version."glob"."3.2.11"; - }; - peerDependencies = [ - ]; - passthru.names = [ "init-package-json" ]; - }; - by-spec."init-package-json"."~1.1.2" = - self.by-version."init-package-json"."1.1.2"; - by-version."init-package-json"."1.1.2" = lib.makeOverridable self.buildNodePackage { - name = "init-package-json-1.1.2"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/init-package-json/-/init-package-json-1.1.2.tgz"; - name = "init-package-json-1.1.2.tgz"; - sha1 = "bc6c02d1da87253141600972f0d6bdcdd016990e"; - }) - ]; - buildInputs = - (self.nativeDeps."init-package-json" or []); - deps = { - "glob-4.2.2" = self.by-version."glob"."4.2.2"; - "promzard-0.2.2" = self.by-version."promzard"."0.2.2"; - "read-1.0.5" = self.by-version."read"."1.0.5"; - "read-package-json-1.2.7" = self.by-version."read-package-json"."1.2.7"; - "semver-4.1.0" = self.by-version."semver"."4.1.0"; + "semver-4.1.1" = self.by-version."semver"."4.1.1"; }; peerDependencies = [ ]; @@ -12608,7 +12852,7 @@ buildInputs = (self.nativeDeps."inline-source-map" or []); deps = { - "source-map-0.1.40" = self.by-version."source-map"."0.1.40"; + "source-map-0.1.41" = self.by-version."source-map"."0.1.41"; }; peerDependencies = [ ]; @@ -12635,7 +12879,7 @@ "lodash-2.4.1" = self.by-version."lodash"."2.4.1"; "mute-stream-0.0.4" = self.by-version."mute-stream"."0.0.4"; "readline2-0.1.0" = self.by-version."readline2"."0.1.0"; - "rx-2.3.18" = self.by-version."rx"."2.3.18"; + "rx-2.3.22" = self.by-version."rx"."2.3.22"; "through-2.3.6" = self.by-version."through"."2.3.6"; }; peerDependencies = [ @@ -12662,7 +12906,7 @@ "lodash-2.4.1" = self.by-version."lodash"."2.4.1"; "mute-stream-0.0.4" = self.by-version."mute-stream"."0.0.4"; "readline2-0.1.0" = self.by-version."readline2"."0.1.0"; - "rx-2.3.18" = self.by-version."rx"."2.3.18"; + "rx-2.3.22" = self.by-version."rx"."2.3.22"; "through-2.3.6" = self.by-version."through"."2.3.6"; }; peerDependencies = [ @@ -12796,7 +13040,7 @@ "lodash.debounce-2.4.1" = self.by-version."lodash.debounce"."2.4.1"; "object-assign-1.0.0" = self.by-version."object-assign"."1.0.0"; "os-name-1.0.1" = self.by-version."os-name"."1.0.1"; - "request-2.49.0" = self.by-version."request"."2.49.0"; + "request-2.51.0" = self.by-version."request"."2.51.0"; "tough-cookie-0.12.1" = self.by-version."tough-cookie"."0.12.1"; }; peerDependencies = [ @@ -12804,15 +13048,15 @@ passthru.names = [ "insight" ]; }; by-spec."interpret"."^0.3.2" = - self.by-version."interpret"."0.3.8"; - by-version."interpret"."0.3.8" = lib.makeOverridable self.buildNodePackage { - name = "interpret-0.3.8"; + self.by-version."interpret"."0.3.10"; + by-version."interpret"."0.3.10" = lib.makeOverridable self.buildNodePackage { + name = "interpret-0.3.10"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/interpret/-/interpret-0.3.8.tgz"; - name = "interpret-0.3.8.tgz"; - sha1 = "23c65e60ed18a3e21cddccf96e8a6658548cda8b"; + url = "http://registry.npmjs.org/interpret/-/interpret-0.3.10.tgz"; + name = "interpret-0.3.10.tgz"; + sha1 = "088c25de731c6c5b112a90f0071cfaf459e5a7bb"; }) ]; buildInputs = @@ -12864,15 +13108,15 @@ passthru.names = [ "ip" ]; }; by-spec."ip-regex"."^1.0.0" = - self.by-version."ip-regex"."1.0.1"; - by-version."ip-regex"."1.0.1" = lib.makeOverridable self.buildNodePackage { - name = "ip-regex-1.0.1"; + self.by-version."ip-regex"."1.0.2"; + by-version."ip-regex"."1.0.2" = lib.makeOverridable self.buildNodePackage { + name = "ip-regex-1.0.2"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/ip-regex/-/ip-regex-1.0.1.tgz"; - name = "ip-regex-1.0.1.tgz"; - sha1 = "3f1da464e47290591023a70617e45361b41123f7"; + url = "http://registry.npmjs.org/ip-regex/-/ip-regex-1.0.2.tgz"; + name = "ip-regex-1.0.2.tgz"; + sha1 = "1e7daad2c2d0c268729ecca91f8ec463ad58f56b"; }) ]; buildInputs = @@ -12924,7 +13168,7 @@ ]; passthru.names = [ "ipaddr.js" ]; }; - by-spec."ipaddr.js"."^0.1.5" = + by-spec."ipaddr.js".">= 0.1.5" = self.by-version."ipaddr.js"."0.1.6"; by-version."ipaddr.js"."0.1.6" = lib.makeOverridable self.buildNodePackage { name = "ipaddr.js-0.1.6"; @@ -12944,6 +13188,8 @@ ]; passthru.names = [ "ipaddr.js" ]; }; + by-spec."ipaddr.js"."^0.1.5" = + self.by-version."ipaddr.js"."0.1.6"; by-spec."ironhorse"."*" = self.by-version."ironhorse"."0.0.10"; by-version."ironhorse"."0.0.10" = lib.makeOverridable self.buildNodePackage { @@ -12965,14 +13211,14 @@ "fs-walk-0.0.1" = self.by-version."fs-walk"."0.0.1"; "async-0.9.0" = self.by-version."async"."0.9.0"; "express-5.0.0-alpha.1" = self.by-version."express"."5.0.0-alpha.1"; - "jade-1.8.1" = self.by-version."jade"."1.8.1"; + "jade-1.8.2" = self.by-version."jade"."1.8.2"; "passport-0.2.1" = self.by-version."passport"."0.2.1"; "passport-http-0.2.2" = self.by-version."passport-http"."0.2.2"; - "js-yaml-3.2.3" = self.by-version."js-yaml"."3.2.3"; - "mongoose-3.8.19" = self.by-version."mongoose"."3.8.19"; + "js-yaml-3.2.4" = self.by-version."js-yaml"."3.2.4"; + "mongoose-3.8.21" = self.by-version."mongoose"."3.8.21"; "gridfs-stream-0.5.3" = self.by-version."gridfs-stream"."0.5.3"; "temp-0.8.1" = self.by-version."temp"."0.8.1"; - "kue-0.8.9" = self.by-version."kue"."0.8.9"; + "kue-0.8.11" = self.by-version."kue"."0.8.11"; "redis-0.12.1" = self.by-version."redis"."0.12.1"; "hiredis-0.1.17" = self.by-version."hiredis"."0.1.17"; }; @@ -13036,12 +13282,32 @@ buildInputs = (self.nativeDeps."is-ip" or []); deps = { - "ip-regex-1.0.1" = self.by-version."ip-regex"."1.0.1"; + "ip-regex-1.0.2" = self.by-version."ip-regex"."1.0.2"; }; peerDependencies = [ ]; passthru.names = [ "is-ip" ]; }; + by-spec."is-npm"."^1.0.0" = + self.by-version."is-npm"."1.0.0"; + by-version."is-npm"."1.0.0" = lib.makeOverridable self.buildNodePackage { + name = "is-npm-1.0.0"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/is-npm/-/is-npm-1.0.0.tgz"; + name = "is-npm-1.0.0.tgz"; + sha1 = "f2fb63a65e4905b406c86072765a1a4dc793b9f4"; + }) + ]; + buildInputs = + (self.nativeDeps."is-npm" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "is-npm" ]; + }; by-spec."is-promise"."~1" = self.by-version."is-promise"."1.0.1"; by-version."is-promise"."1.0.1" = lib.makeOverridable self.buildNodePackage { @@ -13125,15 +13391,15 @@ by-spec."isarray"."~0.0.1" = self.by-version."isarray"."0.0.1"; by-spec."isstream"."0.1.x" = - self.by-version."isstream"."0.1.0"; - by-version."isstream"."0.1.0" = lib.makeOverridable self.buildNodePackage { - name = "isstream-0.1.0"; + self.by-version."isstream"."0.1.1"; + by-version."isstream"."0.1.1" = lib.makeOverridable self.buildNodePackage { + name = "isstream-0.1.1"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/isstream/-/isstream-0.1.0.tgz"; - name = "isstream-0.1.0.tgz"; - sha1 = "1fc062509b8c8902ee78d0a8d015ad3251472285"; + url = "http://registry.npmjs.org/isstream/-/isstream-0.1.1.tgz"; + name = "isstream-0.1.1.tgz"; + sha1 = "48332c5999893996ba253c81c7bd6e7ae0905c4f"; }) ]; buildInputs = @@ -13145,15 +13411,15 @@ passthru.names = [ "isstream" ]; }; by-spec."istanbul"."*" = - self.by-version."istanbul"."0.3.2"; - by-version."istanbul"."0.3.2" = lib.makeOverridable self.buildNodePackage { - name = "istanbul-0.3.2"; + self.by-version."istanbul"."0.3.5"; + by-version."istanbul"."0.3.5" = lib.makeOverridable self.buildNodePackage { + name = "istanbul-0.3.5"; bin = true; src = [ (fetchurl { - url = "http://registry.npmjs.org/istanbul/-/istanbul-0.3.2.tgz"; - name = "istanbul-0.3.2.tgz"; - sha1 = "e1ce9a9ec80d51dcbbeca82149f3befdc21d6835"; + url = "http://registry.npmjs.org/istanbul/-/istanbul-0.3.5.tgz"; + name = "istanbul-0.3.5.tgz"; + sha1 = "ef9ca4c1d5e6a5deac2245842051b59763a2de37"; }) ]; buildInputs = @@ -13165,43 +13431,42 @@ "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0"; "nopt-3.0.1" = self.by-version."nopt"."3.0.1"; "fileset-0.1.5" = self.by-version."fileset"."0.1.5"; - "which-1.0.7" = self.by-version."which"."1.0.7"; + "which-1.0.8" = self.by-version."which"."1.0.8"; "async-0.9.0" = self.by-version."async"."0.9.0"; "abbrev-1.0.5" = self.by-version."abbrev"."1.0.5"; "wordwrap-0.0.2" = self.by-version."wordwrap"."0.0.2"; "resolve-0.7.4" = self.by-version."resolve"."0.7.4"; - "js-yaml-3.2.3" = self.by-version."js-yaml"."3.2.3"; + "js-yaml-3.2.4" = self.by-version."js-yaml"."3.2.4"; "once-1.3.1" = self.by-version."once"."1.3.1"; }; peerDependencies = [ ]; passthru.names = [ "istanbul" ]; }; - "istanbul" = self.by-version."istanbul"."0.3.2"; + "istanbul" = self.by-version."istanbul"."0.3.5"; by-spec."istanbul"."~0.3.0" = - self.by-version."istanbul"."0.3.2"; + self.by-version."istanbul"."0.3.5"; by-spec."istanbul"."~0.3.2" = - self.by-version."istanbul"."0.3.2"; + self.by-version."istanbul"."0.3.5"; by-spec."jade"."*" = - self.by-version."jade"."1.8.1"; - by-version."jade"."1.8.1" = lib.makeOverridable self.buildNodePackage { - name = "jade-1.8.1"; + self.by-version."jade"."1.8.2"; + by-version."jade"."1.8.2" = lib.makeOverridable self.buildNodePackage { + name = "jade-1.8.2"; bin = true; src = [ (fetchurl { - url = "http://registry.npmjs.org/jade/-/jade-1.8.1.tgz"; - name = "jade-1.8.1.tgz"; - sha1 = "7f28dfd42832fda613e4a28fd0febb3f423c464f"; + url = "http://registry.npmjs.org/jade/-/jade-1.8.2.tgz"; + name = "jade-1.8.2.tgz"; + sha1 = "0db3630b2cb8145f6bf144d760b56e6b0bbb0aa0"; }) ]; buildInputs = (self.nativeDeps."jade" or []); deps = { "character-parser-1.2.1" = self.by-version."character-parser"."1.2.1"; - "commander-2.5.0" = self.by-version."commander"."2.5.0"; + "commander-2.5.1" = self.by-version."commander"."2.5.1"; "constantinople-3.0.1" = self.by-version."constantinople"."3.0.1"; "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0"; - "monocle-1.1.51" = self.by-version."monocle"."1.1.51"; "transformers-2.1.0" = self.by-version."transformers"."2.1.0"; "void-elements-1.0.0" = self.by-version."void-elements"."1.0.0"; "with-4.0.0" = self.by-version."with"."4.0.0"; @@ -13210,7 +13475,7 @@ ]; passthru.names = [ "jade" ]; }; - "jade" = self.by-version."jade"."1.8.1"; + "jade" = self.by-version."jade"."1.8.2"; by-spec."jade"."0.26.3" = self.by-version."jade"."0.26.3"; by-version."jade"."0.26.3" = lib.makeOverridable self.buildNodePackage { @@ -13283,7 +13548,7 @@ passthru.names = [ "jade" ]; }; by-spec."jade".">= 0.0.1" = - self.by-version."jade"."1.8.1"; + self.by-version."jade"."1.8.2"; by-spec."jade"."~0.35.0" = self.by-version."jade"."0.35.0"; by-version."jade"."0.35.0" = lib.makeOverridable self.buildNodePackage { @@ -13334,53 +13599,53 @@ }; "jayschema" = self.by-version."jayschema"."0.3.1"; by-spec."jfs"."*" = - self.by-version."jfs"."0.2.3"; - by-version."jfs"."0.2.3" = lib.makeOverridable self.buildNodePackage { - name = "jfs-0.2.3"; + self.by-version."jfs"."0.2.4"; + by-version."jfs"."0.2.4" = lib.makeOverridable self.buildNodePackage { + name = "jfs-0.2.4"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/jfs/-/jfs-0.2.3.tgz"; - name = "jfs-0.2.3.tgz"; - sha1 = "1b87551f83055e69b509fe8c3066d0c702b01574"; + url = "http://registry.npmjs.org/jfs/-/jfs-0.2.4.tgz"; + name = "jfs-0.2.4.tgz"; + sha1 = "62f95459de0930af30fb6c570ec68237bc2fdd76"; }) ]; buildInputs = (self.nativeDeps."jfs" or []); deps = { "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0"; - "node-uuid-1.4.1" = self.by-version."node-uuid"."1.4.1"; + "node-uuid-1.4.2" = self.by-version."node-uuid"."1.4.2"; "async-0.9.0" = self.by-version."async"."0.9.0"; - "clone-0.1.18" = self.by-version."clone"."0.1.18"; + "clone-0.2.0" = self.by-version."clone"."0.2.0"; }; peerDependencies = [ ]; passthru.names = [ "jfs" ]; }; - "jfs" = self.by-version."jfs"."0.2.3"; + "jfs" = self.by-version."jfs"."0.2.4"; by-spec."js-yaml"."*" = - self.by-version."js-yaml"."3.2.3"; - by-version."js-yaml"."3.2.3" = lib.makeOverridable self.buildNodePackage { - name = "js-yaml-3.2.3"; + self.by-version."js-yaml"."3.2.4"; + by-version."js-yaml"."3.2.4" = lib.makeOverridable self.buildNodePackage { + name = "js-yaml-3.2.4"; bin = true; src = [ (fetchurl { - url = "http://registry.npmjs.org/js-yaml/-/js-yaml-3.2.3.tgz"; - name = "js-yaml-3.2.3.tgz"; - sha1 = "a3af632d13df5bfa95f3b8f3c4b61efe212cd750"; + url = "http://registry.npmjs.org/js-yaml/-/js-yaml-3.2.4.tgz"; + name = "js-yaml-3.2.4.tgz"; + sha1 = "f2cfb5f5e1d251ff438f41d63139750001021083"; }) ]; buildInputs = (self.nativeDeps."js-yaml" or []); deps = { - "argparse-0.1.15" = self.by-version."argparse"."0.1.15"; + "argparse-0.1.16" = self.by-version."argparse"."0.1.16"; "esprima-1.0.4" = self.by-version."esprima"."1.0.4"; }; peerDependencies = [ ]; passthru.names = [ "js-yaml" ]; }; - "js-yaml" = self.by-version."js-yaml"."3.2.3"; + "js-yaml" = self.by-version."js-yaml"."3.2.4"; by-spec."js-yaml"."0.3.x" = self.by-version."js-yaml"."0.3.7"; by-version."js-yaml"."0.3.7" = lib.makeOverridable self.buildNodePackage { @@ -13416,7 +13681,7 @@ buildInputs = (self.nativeDeps."js-yaml" or []); deps = { - "argparse-0.1.15" = self.by-version."argparse"."0.1.15"; + "argparse-0.1.16" = self.by-version."argparse"."0.1.16"; "esprima-1.0.4" = self.by-version."esprima"."1.0.4"; }; peerDependencies = [ @@ -13438,7 +13703,7 @@ buildInputs = (self.nativeDeps."js-yaml" or []); deps = { - "argparse-0.1.15" = self.by-version."argparse"."0.1.15"; + "argparse-0.1.16" = self.by-version."argparse"."0.1.16"; "esprima-1.0.4" = self.by-version."esprima"."1.0.4"; }; peerDependencies = [ @@ -13446,7 +13711,7 @@ passthru.names = [ "js-yaml" ]; }; by-spec."js-yaml"."3.x" = - self.by-version."js-yaml"."3.2.3"; + self.by-version."js-yaml"."3.2.4"; by-spec."js-yaml"."~2.0.5" = self.by-version."js-yaml"."2.0.5"; by-version."js-yaml"."2.0.5" = lib.makeOverridable self.buildNodePackage { @@ -13462,7 +13727,7 @@ buildInputs = (self.nativeDeps."js-yaml" or []); deps = { - "argparse-0.1.15" = self.by-version."argparse"."0.1.15"; + "argparse-0.1.16" = self.by-version."argparse"."0.1.16"; "esprima-1.0.4" = self.by-version."esprima"."1.0.4"; }; peerDependencies = [ @@ -13484,7 +13749,7 @@ buildInputs = (self.nativeDeps."js-yaml" or []); deps = { - "argparse-0.1.15" = self.by-version."argparse"."0.1.15"; + "argparse-0.1.16" = self.by-version."argparse"."0.1.16"; "esprima-1.0.4" = self.by-version."esprima"."1.0.4"; }; peerDependencies = [ @@ -13514,15 +13779,15 @@ by-spec."jsesc"."~0.4.3" = self.by-version."jsesc"."0.4.3"; by-spec."jshint"."*" = - self.by-version."jshint"."2.5.10"; - by-version."jshint"."2.5.10" = lib.makeOverridable self.buildNodePackage { - name = "jshint-2.5.10"; + self.by-version."jshint"."2.5.11"; + by-version."jshint"."2.5.11" = lib.makeOverridable self.buildNodePackage { + name = "jshint-2.5.11"; bin = true; src = [ (fetchurl { - url = "http://registry.npmjs.org/jshint/-/jshint-2.5.10.tgz"; - name = "jshint-2.5.10.tgz"; - sha1 = "2fef47ee0901914e31832123d5d3f434c28060ef"; + url = "http://registry.npmjs.org/jshint/-/jshint-2.5.11.tgz"; + name = "jshint-2.5.11.tgz"; + sha1 = "e2d95858bbb1aa78300108a2e81099fb095622e0"; }) ]; buildInputs = @@ -13541,9 +13806,9 @@ ]; passthru.names = [ "jshint" ]; }; - "jshint" = self.by-version."jshint"."2.5.10"; + "jshint" = self.by-version."jshint"."2.5.11"; by-spec."jshint"."~2.5.0" = - self.by-version."jshint"."2.5.10"; + self.by-version."jshint"."2.5.11"; by-spec."json-schema"."0.2.2" = self.by-version."json-schema"."0.2.2"; by-version."json-schema"."0.2.2" = lib.makeOverridable self.buildNodePackage { @@ -13645,6 +13910,46 @@ ]; passthru.names = [ "json-stringify-safe" ]; }; + by-spec."json5"."^0.2.0" = + self.by-version."json5"."0.2.0"; + by-version."json5"."0.2.0" = lib.makeOverridable self.buildNodePackage { + name = "json5-0.2.0"; + bin = true; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/json5/-/json5-0.2.0.tgz"; + name = "json5-0.2.0.tgz"; + sha1 = "b6d7035c70c4570f883c7edc759de3ae03db3343"; + }) + ]; + buildInputs = + (self.nativeDeps."json5" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "json5" ]; + }; + by-spec."jsonfile"."^2.0.0" = + self.by-version."jsonfile"."2.0.0"; + by-version."jsonfile"."2.0.0" = lib.makeOverridable self.buildNodePackage { + name = "jsonfile-2.0.0"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/jsonfile/-/jsonfile-2.0.0.tgz"; + name = "jsonfile-2.0.0.tgz"; + sha1 = "c3944f350bd3c078b392e0aa1633b44662fcf06b"; + }) + ]; + buildInputs = + (self.nativeDeps."jsonfile" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "jsonfile" ]; + }; by-spec."jsonfile"."~1.0.1" = self.by-version."jsonfile"."1.0.1"; by-version."jsonfile"."1.0.1" = lib.makeOverridable self.buildNodePackage { @@ -13830,7 +14135,7 @@ deps = { "di-0.0.1" = self.by-version."di"."0.0.1"; "socket.io-0.9.17" = self.by-version."socket.io"."0.9.17"; - "chokidar-0.11.1" = self.by-version."chokidar"."0.11.1"; + "chokidar-0.12.5" = self.by-version."chokidar"."0.12.5"; "glob-3.2.11" = self.by-version."glob"."3.2.11"; "minimatch-0.2.14" = self.by-version."minimatch"."0.2.14"; "http-proxy-0.10.4" = self.by-version."http-proxy"."0.10.4"; @@ -13844,7 +14149,7 @@ "useragent-2.0.10" = self.by-version."useragent"."2.0.10"; "graceful-fs-2.0.3" = self.by-version."graceful-fs"."2.0.3"; "connect-2.26.6" = self.by-version."connect"."2.26.6"; - "source-map-0.1.40" = self.by-version."source-map"."0.1.40"; + "source-map-0.1.41" = self.by-version."source-map"."0.1.41"; }; peerDependencies = [ ]; @@ -13862,15 +14167,15 @@ by-spec."karma"."~0.12.0" = self.by-version."karma"."0.12.28"; by-spec."karma-chrome-launcher"."*" = - self.by-version."karma-chrome-launcher"."0.1.5"; - by-version."karma-chrome-launcher"."0.1.5" = lib.makeOverridable self.buildNodePackage { - name = "karma-chrome-launcher-0.1.5"; + self.by-version."karma-chrome-launcher"."0.1.7"; + by-version."karma-chrome-launcher"."0.1.7" = lib.makeOverridable self.buildNodePackage { + name = "karma-chrome-launcher-0.1.7"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/karma-chrome-launcher/-/karma-chrome-launcher-0.1.5.tgz"; - name = "karma-chrome-launcher-0.1.5.tgz"; - sha1 = "70e95dca5c4d7a15884850daa3ab60d648dbfe8b"; + url = "http://registry.npmjs.org/karma-chrome-launcher/-/karma-chrome-launcher-0.1.7.tgz"; + name = "karma-chrome-launcher-0.1.7.tgz"; + sha1 = "c248cc01d5ae17dafdb16319d0badf637dfb6e59"; }) ]; buildInputs = @@ -13882,7 +14187,7 @@ ]; passthru.names = [ "karma-chrome-launcher" ]; }; - "karma-chrome-launcher" = self.by-version."karma-chrome-launcher"."0.1.5"; + "karma-chrome-launcher" = self.by-version."karma-chrome-launcher"."0.1.7"; by-spec."karma-coverage"."*" = self.by-version."karma-coverage"."0.2.7"; by-version."karma-coverage"."0.2.7" = lib.makeOverridable self.buildNodePackage { @@ -13898,7 +14203,7 @@ buildInputs = (self.nativeDeps."karma-coverage" or []); deps = { - "istanbul-0.3.2" = self.by-version."istanbul"."0.3.2"; + "istanbul-0.3.5" = self.by-version."istanbul"."0.3.5"; "ibrik-2.0.0" = self.by-version."ibrik"."2.0.0"; "dateformat-1.0.11" = self.by-version."dateformat"."1.0.11"; "minimatch-0.3.0" = self.by-version."minimatch"."0.3.0"; @@ -13933,15 +14238,15 @@ }; "karma-junit-reporter" = self.by-version."karma-junit-reporter"."0.2.2"; by-spec."karma-mocha"."*" = - self.by-version."karma-mocha"."0.1.9"; - by-version."karma-mocha"."0.1.9" = lib.makeOverridable self.buildNodePackage { - name = "karma-mocha-0.1.9"; + self.by-version."karma-mocha"."0.1.10"; + by-version."karma-mocha"."0.1.10" = lib.makeOverridable self.buildNodePackage { + name = "karma-mocha-0.1.10"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/karma-mocha/-/karma-mocha-0.1.9.tgz"; - name = "karma-mocha-0.1.9.tgz"; - sha1 = "d777a98d655e08330f7893e833c369f82bd10191"; + url = "http://registry.npmjs.org/karma-mocha/-/karma-mocha-0.1.10.tgz"; + name = "karma-mocha-0.1.10.tgz"; + sha1 = "29ed51d4b121af1373444ec555b20a905bf42b92"; }) ]; buildInputs = @@ -13954,7 +14259,7 @@ ]; passthru.names = [ "karma-mocha" ]; }; - "karma-mocha" = self.by-version."karma-mocha"."0.1.9"; + "karma-mocha" = self.by-version."karma-mocha"."0.1.10"; by-spec."karma-requirejs"."*" = self.by-version."karma-requirejs"."0.2.2"; by-version."karma-requirejs"."0.2.2" = lib.makeOverridable self.buildNodePackage { @@ -14086,6 +14391,27 @@ ]; passthru.names = [ "kerberos" ]; }; + by-spec."kerberos"."0.0.7" = + self.by-version."kerberos"."0.0.7"; + by-version."kerberos"."0.0.7" = lib.makeOverridable self.buildNodePackage { + name = "kerberos-0.0.7"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/kerberos/-/kerberos-0.0.7.tgz"; + name = "kerberos-0.0.7.tgz"; + sha1 = "48db5e268e59ebb1626fd3c76ff8ff7f267a9852"; + }) + ]; + buildInputs = + (self.nativeDeps."kerberos" or []); + deps = { + "nan-1.3.0" = self.by-version."nan"."1.3.0"; + }; + peerDependencies = [ + ]; + passthru.names = [ "kerberos" ]; + }; by-spec."kew"."0.4.0" = self.by-version."kew"."0.4.0"; by-version."kew"."0.4.0" = lib.makeOverridable self.buildNodePackage { @@ -14235,15 +14561,15 @@ }; "knox" = self.by-version."knox"."0.9.1"; by-spec."kue"."*" = - self.by-version."kue"."0.8.9"; - by-version."kue"."0.8.9" = lib.makeOverridable self.buildNodePackage { - name = "kue-0.8.9"; + self.by-version."kue"."0.8.11"; + by-version."kue"."0.8.11" = lib.makeOverridable self.buildNodePackage { + name = "kue-0.8.11"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/kue/-/kue-0.8.9.tgz"; - name = "kue-0.8.9.tgz"; - sha1 = "6fb2c7d4014f26a64ebf76c092085fe9db16fdcb"; + url = "http://registry.npmjs.org/kue/-/kue-0.8.11.tgz"; + name = "kue-0.8.11.tgz"; + sha1 = "0e18c6f827b73deb68a6ee06b55c14d4797450b0"; }) ]; buildInputs = @@ -14262,7 +14588,7 @@ ]; passthru.names = [ "kue" ]; }; - "kue" = self.by-version."kue"."0.8.9"; + "kue" = self.by-version."kue"."0.8.11"; by-spec."labeled-stream-splicer"."^1.0.0" = self.by-version."labeled-stream-splicer"."1.0.2"; by-version."labeled-stream-splicer"."1.0.2" = lib.makeOverridable self.buildNodePackage { @@ -14307,6 +14633,27 @@ ]; passthru.names = [ "latest-version" ]; }; + by-spec."latest-version"."^1.0.0" = + self.by-version."latest-version"."1.0.0"; + by-version."latest-version"."1.0.0" = lib.makeOverridable self.buildNodePackage { + name = "latest-version-1.0.0"; + bin = true; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/latest-version/-/latest-version-1.0.0.tgz"; + name = "latest-version-1.0.0.tgz"; + sha1 = "84f40e5c90745c7e4f7811624d6152c381d931d9"; + }) + ]; + buildInputs = + (self.nativeDeps."latest-version" or []); + deps = { + "package-json-1.0.1" = self.by-version."package-json"."1.0.1"; + }; + peerDependencies = [ + ]; + passthru.names = [ "latest-version" ]; + }; by-spec."lazy"."~1.0.11" = self.by-version."lazy"."1.0.11"; by-version."lazy"."1.0.11" = lib.makeOverridable self.buildNodePackage { @@ -14409,9 +14756,9 @@ deps = { "graceful-fs-3.0.5" = self.by-version."graceful-fs"."3.0.5"; "mime-1.2.11" = self.by-version."mime"."1.2.11"; - "request-2.49.0" = self.by-version."request"."2.49.0"; + "request-2.51.0" = self.by-version."request"."2.51.0"; "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0"; - "source-map-0.1.40" = self.by-version."source-map"."0.1.40"; + "source-map-0.1.41" = self.by-version."source-map"."0.1.41"; "promise-6.0.1" = self.by-version."promise"."6.0.1"; }; peerDependencies = [ @@ -14438,13 +14785,35 @@ "mime-1.2.11" = self.by-version."mime"."1.2.11"; "request-2.40.0" = self.by-version."request"."2.40.0"; "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0"; - "clean-css-2.2.19" = self.by-version."clean-css"."2.2.19"; - "source-map-0.1.40" = self.by-version."source-map"."0.1.40"; + "clean-css-2.2.22" = self.by-version."clean-css"."2.2.22"; + "source-map-0.1.41" = self.by-version."source-map"."0.1.41"; }; peerDependencies = [ ]; passthru.names = [ "less" ]; }; + by-spec."levn"."~0.2.5" = + self.by-version."levn"."0.2.5"; + by-version."levn"."0.2.5" = lib.makeOverridable self.buildNodePackage { + name = "levn-0.2.5"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/levn/-/levn-0.2.5.tgz"; + name = "levn-0.2.5.tgz"; + sha1 = "ba8d339d0ca4a610e3a3f145b9caf48807155054"; + }) + ]; + buildInputs = + (self.nativeDeps."levn" or []); + deps = { + "prelude-ls-1.1.1" = self.by-version."prelude-ls"."1.1.1"; + "type-check-0.3.1" = self.by-version."type-check"."0.3.1"; + }; + peerDependencies = [ + ]; + passthru.names = [ "levn" ]; + }; by-spec."lexical-scope"."~0.0.14" = self.by-version."lexical-scope"."0.0.15"; by-version."lexical-scope"."0.0.15" = lib.makeOverridable self.buildNodePackage { @@ -15361,32 +15730,32 @@ passthru.names = [ "lsmod" ]; }; by-spec."ltx"."*" = - self.by-version."ltx"."0.7.2"; - by-version."ltx"."0.7.2" = lib.makeOverridable self.buildNodePackage { - name = "ltx-0.7.2"; + self.by-version."ltx"."0.8.0"; + by-version."ltx"."0.8.0" = lib.makeOverridable self.buildNodePackage { + name = "ltx-0.8.0"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/ltx/-/ltx-0.7.2.tgz"; - name = "ltx-0.7.2.tgz"; - sha1 = "70a6aa8fa5fd426a422a41ba3d54a15ccdde680c"; + url = "http://registry.npmjs.org/ltx/-/ltx-0.8.0.tgz"; + name = "ltx-0.8.0.tgz"; + sha1 = "08aeb2f68c4c7d20ab35e9dcb7519fd80824c529"; }) ]; buildInputs = (self.nativeDeps."ltx" or []); deps = { "sax-0.6.1" = self.by-version."sax"."0.6.1"; - "node-expat-2.3.3" = self.by-version."node-expat"."2.3.3"; + "node-expat-2.3.4" = self.by-version."node-expat"."2.3.4"; }; peerDependencies = [ ]; passthru.names = [ "ltx" ]; }; - "ltx" = self.by-version."ltx"."0.7.2"; + "ltx" = self.by-version."ltx"."0.8.0"; by-spec."ltx"."0.x" = - self.by-version."ltx"."0.7.2"; + self.by-version."ltx"."0.8.0"; by-spec."ltx".">= 0.2.0" = - self.by-version."ltx"."0.7.2"; + self.by-version."ltx"."0.8.0"; by-spec."ltx"."^0.5.2" = self.by-version."ltx"."0.5.2"; by-version."ltx"."0.5.2" = lib.makeOverridable self.buildNodePackage { @@ -15403,7 +15772,7 @@ (self.nativeDeps."ltx" or []); deps = { "sax-0.6.1" = self.by-version."sax"."0.6.1"; - "node-expat-2.3.3" = self.by-version."node-expat"."2.3.3"; + "node-expat-2.3.4" = self.by-version."node-expat"."2.3.4"; }; peerDependencies = [ ]; @@ -15411,6 +15780,26 @@ }; by-spec."ltx"."^0.7.2" = self.by-version."ltx"."0.7.2"; + by-version."ltx"."0.7.2" = lib.makeOverridable self.buildNodePackage { + name = "ltx-0.7.2"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/ltx/-/ltx-0.7.2.tgz"; + name = "ltx-0.7.2.tgz"; + sha1 = "70a6aa8fa5fd426a422a41ba3d54a15ccdde680c"; + }) + ]; + buildInputs = + (self.nativeDeps."ltx" or []); + deps = { + "sax-0.6.1" = self.by-version."sax"."0.6.1"; + "node-expat-2.3.4" = self.by-version."node-expat"."2.3.4"; + }; + peerDependencies = [ + ]; + passthru.names = [ "ltx" ]; + }; by-spec."ltx"."~0.3.2" = self.by-version."ltx"."0.3.4"; by-version."ltx"."0.3.4" = lib.makeOverridable self.buildNodePackage { @@ -15451,14 +15840,14 @@ (self.nativeDeps."ltx" or []); deps = { "sax-0.6.1" = self.by-version."sax"."0.6.1"; - "node-expat-2.3.3" = self.by-version."node-expat"."2.3.3"; + "node-expat-2.3.4" = self.by-version."node-expat"."2.3.4"; }; peerDependencies = [ ]; passthru.names = [ "ltx" ]; }; by-spec."ltx"."~0.x" = - self.by-version."ltx"."0.7.2"; + self.by-version."ltx"."0.8.0"; by-spec."m8".">= 0.4.3" = self.by-version."m8"."0.4.4"; by-version."m8"."0.4.4" = lib.makeOverridable self.buildNodePackage { @@ -15611,7 +16000,7 @@ "chalk-0.5.1" = self.by-version."chalk"."0.5.1"; "figures-1.3.5" = self.by-version."figures"."1.3.5"; "gzip-size-1.0.0" = self.by-version."gzip-size"."1.0.0"; - "pretty-bytes-1.0.1" = self.by-version."pretty-bytes"."1.0.1"; + "pretty-bytes-1.0.2" = self.by-version."pretty-bytes"."1.0.2"; }; peerDependencies = [ ]; @@ -15642,37 +16031,37 @@ passthru.names = [ "maxmin" ]; }; by-spec."mdns-js"."git+https://github.com/guerrerocarlos/node-mdns-js" = - self.by-version."mdns-js"."0.2.2"; - by-version."mdns-js"."0.2.2" = lib.makeOverridable self.buildNodePackage { - name = "mdns-js-0.2.2"; + self.by-version."mdns-js"."0.2.4"; + by-version."mdns-js"."0.2.4" = lib.makeOverridable self.buildNodePackage { + name = "mdns-js-0.2.4"; bin = false; src = [ (fetchgit { url = "https://github.com/guerrerocarlos/node-mdns-js"; - rev = "25b81ef88fa2f9ad8ebc875ac3e1d3f36a87ed61"; - sha256 = "1f6fee2a00345e9c82e0d49818f7137cf3288072bddfdc6225b738184804e103"; + rev = "36fc8ed207a6c7d571d1f98a186b8d3686c7f261"; + sha256 = "b14121656f33817843d09452ff3d562bbedda28cda2cba3e8ba436c9541f75ee"; }) ]; buildInputs = (self.nativeDeps."mdns-js" or []); deps = { "debug-0.8.1" = self.by-version."debug"."0.8.1"; - "mdns-js-packet-0.1.3" = self.by-version."mdns-js-packet"."0.1.3"; + "mdns-js-packet-0.1.8" = self.by-version."mdns-js-packet"."0.1.8"; }; peerDependencies = [ ]; passthru.names = [ "mdns-js" ]; }; by-spec."mdns-js-packet"."0.1.x" = - self.by-version."mdns-js-packet"."0.1.3"; - by-version."mdns-js-packet"."0.1.3" = lib.makeOverridable self.buildNodePackage { - name = "mdns-js-packet-0.1.3"; + self.by-version."mdns-js-packet"."0.1.8"; + by-version."mdns-js-packet"."0.1.8" = lib.makeOverridable self.buildNodePackage { + name = "mdns-js-packet-0.1.8"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/mdns-js-packet/-/mdns-js-packet-0.1.3.tgz"; - name = "mdns-js-packet-0.1.3.tgz"; - sha1 = "a98ad52e1e74e96b00aab239af4354687a16db01"; + url = "http://registry.npmjs.org/mdns-js-packet/-/mdns-js-packet-0.1.8.tgz"; + name = "mdns-js-packet-0.1.8.tgz"; + sha1 = "e5a205c6e26e22a1df58e5f38057e80a6f84ee26"; }) ]; buildInputs = @@ -16117,15 +16506,15 @@ by-spec."mime"."~1.2.9" = self.by-version."mime"."1.2.11"; by-spec."mime-db"."1.x" = - self.by-version."mime-db"."1.2.0"; - by-version."mime-db"."1.2.0" = lib.makeOverridable self.buildNodePackage { - name = "mime-db-1.2.0"; + self.by-version."mime-db"."1.3.1"; + by-version."mime-db"."1.3.1" = lib.makeOverridable self.buildNodePackage { + name = "mime-db-1.3.1"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/mime-db/-/mime-db-1.2.0.tgz"; - name = "mime-db-1.2.0.tgz"; - sha1 = "76b92e7ecac673f5dab066a10b66faea1be2f01f"; + url = "http://registry.npmjs.org/mime-db/-/mime-db-1.3.1.tgz"; + name = "mime-db-1.3.1.tgz"; + sha1 = "b1cd51ee8c4a674c49e03a96d67565fc768ce941"; }) ]; buildInputs = @@ -16136,8 +16525,8 @@ ]; passthru.names = [ "mime-db" ]; }; - by-spec."mime-db"."~1.2.0" = - self.by-version."mime-db"."1.2.0"; + by-spec."mime-db"."~1.3.0" = + self.by-version."mime-db"."1.3.1"; by-spec."mime-types"."~1.0.1" = self.by-version."mime-types"."1.0.2"; by-version."mime-types"."1.0.2" = lib.makeOverridable self.buildNodePackage { @@ -16159,26 +16548,28 @@ passthru.names = [ "mime-types" ]; }; by-spec."mime-types"."~2.0.3" = - self.by-version."mime-types"."2.0.3"; - by-version."mime-types"."2.0.3" = lib.makeOverridable self.buildNodePackage { - name = "mime-types-2.0.3"; + self.by-version."mime-types"."2.0.4"; + by-version."mime-types"."2.0.4" = lib.makeOverridable self.buildNodePackage { + name = "mime-types-2.0.4"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/mime-types/-/mime-types-2.0.3.tgz"; - name = "mime-types-2.0.3.tgz"; - sha1 = "70b5cb5165b55dcb4972839f16d6077b0bb506f4"; + url = "http://registry.npmjs.org/mime-types/-/mime-types-2.0.4.tgz"; + name = "mime-types-2.0.4.tgz"; + sha1 = "855a612979141d806ba5104294a28c731c6ea790"; }) ]; buildInputs = (self.nativeDeps."mime-types" or []); deps = { - "mime-db-1.2.0" = self.by-version."mime-db"."1.2.0"; + "mime-db-1.3.1" = self.by-version."mime-db"."1.3.1"; }; peerDependencies = [ ]; passthru.names = [ "mime-types" ]; }; + by-spec."mime-types"."~2.0.4" = + self.by-version."mime-types"."2.0.4"; by-spec."mimelib"."~0.2.15" = self.by-version."mimelib"."0.2.18"; by-version."mimelib"."0.2.18" = lib.makeOverridable self.buildNodePackage { @@ -16334,9 +16725,30 @@ by-spec."minimatch"."1.0.x" = self.by-version."minimatch"."1.0.0"; by-spec."minimatch".">=0.2.4" = - self.by-version."minimatch"."1.0.0"; + self.by-version."minimatch"."2.0.1"; + by-version."minimatch"."2.0.1" = lib.makeOverridable self.buildNodePackage { + name = "minimatch-2.0.1"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/minimatch/-/minimatch-2.0.1.tgz"; + name = "minimatch-2.0.1.tgz"; + sha1 = "6c3760b45f66ed1cd5803143ee8d372488f02c37"; + }) + ]; + buildInputs = + (self.nativeDeps."minimatch" or []); + deps = { + "brace-expansion-1.1.0" = self.by-version."brace-expansion"."1.1.0"; + }; + peerDependencies = [ + ]; + passthru.names = [ "minimatch" ]; + }; by-spec."minimatch"."^1.0.0" = self.by-version."minimatch"."1.0.0"; + by-spec."minimatch"."^2.0.1" = + self.by-version."minimatch"."2.0.1"; by-spec."minimatch"."~0.2" = self.by-version."minimatch"."0.2.14"; by-version."minimatch"."0.2.14" = lib.makeOverridable self.buildNodePackage { @@ -16359,18 +16771,20 @@ ]; passthru.names = [ "minimatch" ]; }; + by-spec."minimatch"."~0.2.0" = + self.by-version."minimatch"."0.2.14"; by-spec."minimatch"."~0.2.11" = self.by-version."minimatch"."0.2.14"; by-spec."minimatch"."~0.2.12" = self.by-version."minimatch"."0.2.14"; - by-spec."minimatch"."~0.2.14" = - self.by-version."minimatch"."0.2.14"; by-spec."minimatch"."~0.2.9" = self.by-version."minimatch"."0.2.14"; by-spec."minimatch"."~0.3.0" = self.by-version."minimatch"."0.3.0"; by-spec."minimatch"."~1.0.0" = self.by-version."minimatch"."1.0.0"; + by-spec."minimatch"."~2.0.1" = + self.by-version."minimatch"."2.0.1"; by-spec."minimist"."0.0.8" = self.by-version."minimist"."0.0.8"; by-version."minimist"."0.0.8" = lib.makeOverridable self.buildNodePackage { @@ -16391,26 +16805,6 @@ ]; passthru.names = [ "minimist" ]; }; - by-spec."minimist"."^0.1.0" = - self.by-version."minimist"."0.1.0"; - by-version."minimist"."0.1.0" = lib.makeOverridable self.buildNodePackage { - name = "minimist-0.1.0"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/minimist/-/minimist-0.1.0.tgz"; - name = "minimist-0.1.0.tgz"; - sha1 = "99df657a52574c21c9057497df742790b2b4c0de"; - }) - ]; - buildInputs = - (self.nativeDeps."minimist" or []); - deps = { - }; - peerDependencies = [ - ]; - passthru.names = [ "minimist" ]; - }; by-spec."minimist"."^1.1.0" = self.by-version."minimist"."1.1.0"; by-version."minimist"."1.1.0" = lib.makeOverridable self.buildNodePackage { @@ -16498,15 +16892,15 @@ passthru.names = [ "ministyle" ]; }; by-spec."miniwrite"."~0.1.3" = - self.by-version."miniwrite"."0.1.3"; - by-version."miniwrite"."0.1.3" = lib.makeOverridable self.buildNodePackage { - name = "miniwrite-0.1.3"; + self.by-version."miniwrite"."0.1.4"; + by-version."miniwrite"."0.1.4" = lib.makeOverridable self.buildNodePackage { + name = "miniwrite-0.1.4"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/miniwrite/-/miniwrite-0.1.3.tgz"; - name = "miniwrite-0.1.3.tgz"; - sha1 = "9e893efb435f853454ca0321b86a44378e8c50c6"; + url = "http://registry.npmjs.org/miniwrite/-/miniwrite-0.1.4.tgz"; + name = "miniwrite-0.1.4.tgz"; + sha1 = "72f02385c0ac37d542efe27dc6764b31908725ce"; }) ]; buildInputs = @@ -16723,15 +17117,15 @@ passthru.names = [ "mocha" ]; }; by-spec."mocha-phantomjs"."*" = - self.by-version."mocha-phantomjs"."3.5.1"; - by-version."mocha-phantomjs"."3.5.1" = lib.makeOverridable self.buildNodePackage { - name = "mocha-phantomjs-3.5.1"; + self.by-version."mocha-phantomjs"."3.5.2"; + by-version."mocha-phantomjs"."3.5.2" = lib.makeOverridable self.buildNodePackage { + name = "mocha-phantomjs-3.5.2"; bin = true; src = [ (fetchurl { - url = "http://registry.npmjs.org/mocha-phantomjs/-/mocha-phantomjs-3.5.1.tgz"; - name = "mocha-phantomjs-3.5.1.tgz"; - sha1 = "e5460eff3e859b98be73a743f11cb5cae3c58d00"; + url = "http://registry.npmjs.org/mocha-phantomjs/-/mocha-phantomjs-3.5.2.tgz"; + name = "mocha-phantomjs-3.5.2.tgz"; + sha1 = "4d7474d373acc9f828c90d868035be527cdf367b"; }) ]; buildInputs = @@ -16745,7 +17139,7 @@ ]; passthru.names = [ "mocha-phantomjs" ]; }; - "mocha-phantomjs" = self.by-version."mocha-phantomjs"."3.5.1"; + "mocha-phantomjs" = self.by-version."mocha-phantomjs"."3.5.2"; by-spec."mocha-unfunk-reporter"."*" = self.by-version."mocha-unfunk-reporter"."0.4.0"; by-version."mocha-unfunk-reporter"."0.4.0" = lib.makeOverridable self.buildNodePackage { @@ -16763,7 +17157,7 @@ deps = { "jsesc-0.4.3" = self.by-version."jsesc"."0.4.3"; "unfunk-diff-0.0.2" = self.by-version."unfunk-diff"."0.0.2"; - "miniwrite-0.1.3" = self.by-version."miniwrite"."0.1.3"; + "miniwrite-0.1.4" = self.by-version."miniwrite"."0.1.4"; "ministyle-0.1.4" = self.by-version."ministyle"."0.1.4"; }; peerDependencies = [ @@ -16771,23 +17165,23 @@ passthru.names = [ "mocha-unfunk-reporter" ]; }; "mocha-unfunk-reporter" = self.by-version."mocha-unfunk-reporter"."0.4.0"; - by-spec."module-deps"."^3.5.0" = - self.by-version."module-deps"."3.5.10"; - by-version."module-deps"."3.5.10" = lib.makeOverridable self.buildNodePackage { - name = "module-deps-3.5.10"; + by-spec."module-deps"."^3.6.3" = + self.by-version."module-deps"."3.6.3"; + by-version."module-deps"."3.6.3" = lib.makeOverridable self.buildNodePackage { + name = "module-deps-3.6.3"; bin = true; src = [ (fetchurl { - url = "http://registry.npmjs.org/module-deps/-/module-deps-3.5.10.tgz"; - name = "module-deps-3.5.10.tgz"; - sha1 = "2754737d4f9e52b60daa4abb242ade6c85ecde99"; + url = "http://registry.npmjs.org/module-deps/-/module-deps-3.6.3.tgz"; + name = "module-deps-3.6.3.tgz"; + sha1 = "4ffec778d74eb4c75d3102c1f414789fb6b6f277"; }) ]; buildInputs = (self.nativeDeps."module-deps" or []); deps = { "JSONStream-0.7.4" = self.by-version."JSONStream"."0.7.4"; - "browser-resolve-1.4.1" = self.by-version."browser-resolve"."1.4.1"; + "browser-resolve-1.5.0" = self.by-version."browser-resolve"."1.5.0"; "concat-stream-1.4.7" = self.by-version."concat-stream"."1.4.7"; "detective-4.0.0" = self.by-version."detective"."4.0.0"; "duplexer2-0.0.2" = self.by-version."duplexer2"."0.0.2"; @@ -16992,28 +17386,6 @@ ]; passthru.names = [ "mongodb" ]; }; - by-spec."mongodb"."1.3.x" = - self.by-version."mongodb"."1.3.23"; - by-version."mongodb"."1.3.23" = lib.makeOverridable self.buildNodePackage { - name = "mongodb-1.3.23"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/mongodb/-/mongodb-1.3.23.tgz"; - name = "mongodb-1.3.23.tgz"; - sha1 = "874a5212162b16188aeeaee5e06067766c8e9e86"; - }) - ]; - buildInputs = - (self.nativeDeps."mongodb" or []); - deps = { - "bson-0.2.5" = self.by-version."bson"."0.2.5"; - "kerberos-0.0.3" = self.by-version."kerberos"."0.0.3"; - }; - peerDependencies = [ - ]; - passthru.names = [ "mongodb" ]; - }; by-spec."mongodb"."1.4.12" = self.by-version."mongodb"."1.4.12"; by-version."mongodb"."1.4.12" = lib.makeOverridable self.buildNodePackage { @@ -17029,7 +17401,7 @@ buildInputs = (self.nativeDeps."mongodb" or []); deps = { - "bson-0.2.15" = self.by-version."bson"."0.2.15"; + "bson-0.2.16" = self.by-version."bson"."0.2.16"; "kerberos-0.0.4" = self.by-version."kerberos"."0.0.4"; "readable-stream-1.1.13" = self.by-version."readable-stream"."1.1.13"; }; @@ -17037,6 +17409,29 @@ ]; passthru.names = [ "mongodb" ]; }; + by-spec."mongodb"."1.4.x" = + self.by-version."mongodb"."1.4.25"; + by-version."mongodb"."1.4.25" = lib.makeOverridable self.buildNodePackage { + name = "mongodb-1.4.25"; + bin = false; + src = [ + (self.patchSource fetchurl { + url = "http://registry.npmjs.org/mongodb/-/mongodb-1.4.25.tgz"; + name = "mongodb-1.4.25.tgz"; + sha1 = "58c09f9f2143db564ef2370fe9375a81f3daf96e"; + }) + ]; + buildInputs = + (self.nativeDeps."mongodb" or []); + deps = { + "bson-0.2.16" = self.by-version."bson"."0.2.16"; + "kerberos-0.0.7" = self.by-version."kerberos"."0.0.7"; + "readable-stream-1.1.13" = self.by-version."readable-stream"."1.1.13"; + }; + peerDependencies = [ + ]; + passthru.names = [ "mongodb" ]; + }; by-spec."mongoose"."3.6.7" = self.by-version."mongoose"."3.6.7"; by-version."mongoose"."3.6.7" = lib.makeOverridable self.buildNodePackage { @@ -17094,15 +17489,15 @@ }; "mongoose" = self.by-version."mongoose"."3.6.20"; by-spec."mongoose"."3.8.x" = - self.by-version."mongoose"."3.8.19"; - by-version."mongoose"."3.8.19" = lib.makeOverridable self.buildNodePackage { - name = "mongoose-3.8.19"; + self.by-version."mongoose"."3.8.21"; + by-version."mongoose"."3.8.21" = lib.makeOverridable self.buildNodePackage { + name = "mongoose-3.8.21"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/mongoose/-/mongoose-3.8.19.tgz"; - name = "mongoose-3.8.19.tgz"; - sha1 = "53b82129c895bbb1e91094cb34d4a03920b1dcb4"; + url = "http://registry.npmjs.org/mongoose/-/mongoose-3.8.21.tgz"; + name = "mongoose-3.8.21.tgz"; + sha1 = "ba96d6e73b7b73a5c133ca886de316994df2a2f0"; }) ]; buildInputs = @@ -17274,6 +17669,27 @@ ]; passthru.names = [ "morgan" ]; }; + by-spec."mount-point"."^1.0.0" = + self.by-version."mount-point"."1.0.3"; + by-version."mount-point"."1.0.3" = lib.makeOverridable self.buildNodePackage { + name = "mount-point-1.0.3"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/mount-point/-/mount-point-1.0.3.tgz"; + name = "mount-point-1.0.3.tgz"; + sha1 = "43adac2467a9dc8abf4b784a0d7b7453ab58df4d"; + }) + ]; + buildInputs = + (self.nativeDeps."mount-point" or []); + deps = { + "node-df-0.1.1" = self.by-version."node-df"."0.1.1"; + }; + peerDependencies = [ + ]; + passthru.names = [ "mount-point" ]; + }; by-spec."mout"."~0.9.0" = self.by-version."mout"."0.9.1"; by-version."mout"."0.9.1" = lib.makeOverridable self.buildNodePackage { @@ -17418,6 +17834,26 @@ ]; passthru.names = [ "ms" ]; }; + by-spec."ms"."0.7.0" = + self.by-version."ms"."0.7.0"; + by-version."ms"."0.7.0" = lib.makeOverridable self.buildNodePackage { + name = "ms-0.7.0"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/ms/-/ms-0.7.0.tgz"; + name = "ms-0.7.0.tgz"; + sha1 = "865be94c2e7397ad8a57da6a633a6e2f30798b83"; + }) + ]; + buildInputs = + (self.nativeDeps."ms" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "ms" ]; + }; by-spec."msgpack".">= 0.0.1" = self.by-version."msgpack"."0.2.4"; by-version."msgpack"."0.2.4" = lib.makeOverridable self.buildNodePackage { @@ -17567,21 +18003,23 @@ passthru.names = [ "mv" ]; }; by-spec."mz"."1" = - self.by-version."mz"."1.1.0"; - by-version."mz"."1.1.0" = lib.makeOverridable self.buildNodePackage { - name = "mz-1.1.0"; + self.by-version."mz"."1.2.0"; + by-version."mz"."1.2.0" = lib.makeOverridable self.buildNodePackage { + name = "mz-1.2.0"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/mz/-/mz-1.1.0.tgz"; - name = "mz-1.1.0.tgz"; - sha1 = "fa63f08f20a1f6985cc1d9a33efa8db608cd6b9c"; + url = "http://registry.npmjs.org/mz/-/mz-1.2.0.tgz"; + name = "mz-1.2.0.tgz"; + sha1 = "efc279d54f32f54e6169cf0bed838c22fc417fe8"; }) ]; buildInputs = (self.nativeDeps."mz" or []); deps = { "native-or-bluebird-1.1.2" = self.by-version."native-or-bluebird"."1.1.2"; + "thenify-2.0.0" = self.by-version."thenify"."2.0.0"; + "thenify-all-1.0.0" = self.by-version."thenify-all"."1.0.0"; }; peerDependencies = [ ]; @@ -17891,6 +18329,26 @@ ]; passthru.names = [ "ncp" ]; }; + by-spec."ncp"."^0.6.0" = + self.by-version."ncp"."0.6.0"; + by-version."ncp"."0.6.0" = lib.makeOverridable self.buildNodePackage { + name = "ncp-0.6.0"; + bin = true; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/ncp/-/ncp-0.6.0.tgz"; + name = "ncp-0.6.0.tgz"; + sha1 = "df8ce021e262be21b52feb3d3e5cfaab12491f0d"; + }) + ]; + buildInputs = + (self.nativeDeps."ncp" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "ncp" ]; + }; by-spec."ncp"."~0.4.2" = self.by-version."ncp"."0.4.2"; by-spec."ncp"."~1.0.1" = @@ -17993,8 +18451,6 @@ ]; passthru.names = [ "negotiator" ]; }; - by-spec."negotiator"."~0.3.0" = - self.by-version."negotiator"."0.3.0"; by-spec."net-ping"."1.1.7" = self.by-version."net-ping"."1.1.7"; by-version."net-ping"."1.1.7" = lib.makeOverridable self.buildNodePackage { @@ -18142,11 +18598,11 @@ "diff-1.0.8" = self.by-version."diff"."1.0.8"; "dox-0.4.6" = self.by-version."dox"."0.4.6"; "jade-0.35.0" = self.by-version."jade"."0.35.0"; - "node-uuid-1.4.1" = self.by-version."node-uuid"."1.4.1"; + "node-uuid-1.4.2" = self.by-version."node-uuid"."1.4.2"; "optimist-0.6.1" = self.by-version."optimist"."0.6.1"; "request-2.27.0" = self.by-version."request"."2.27.0"; "semver-2.1.0" = self.by-version."semver"."2.1.0"; - "sprintf-0.1.4" = self.by-version."sprintf"."0.1.4"; + "sprintf-0.1.5" = self.by-version."sprintf"."0.1.5"; "temp-0.6.0" = self.by-version."temp"."0.6.0"; "wrench-1.5.8" = self.by-version."wrench"."1.5.8"; "uglify-js-2.3.6" = self.by-version."uglify-js"."2.3.6"; @@ -18156,16 +18612,37 @@ ]; passthru.names = [ "node-appc" ]; }; - by-spec."node-expat"."*" = - self.by-version."node-expat"."2.3.3"; - by-version."node-expat"."2.3.3" = lib.makeOverridable self.buildNodePackage { - name = "node-expat-2.3.3"; + by-spec."node-df"."^0.1.1" = + self.by-version."node-df"."0.1.1"; + by-version."node-df"."0.1.1" = lib.makeOverridable self.buildNodePackage { + name = "node-df-0.1.1"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/node-expat/-/node-expat-2.3.3.tgz"; - name = "node-expat-2.3.3.tgz"; - sha1 = "fd7bfe475c9dd30b634cc1279c7a68aea900ebfa"; + url = "http://registry.npmjs.org/node-df/-/node-df-0.1.1.tgz"; + name = "node-df-0.1.1.tgz"; + sha1 = "42ec5a15b7b491164b3de7edeef2e346a0e500ea"; + }) + ]; + buildInputs = + (self.nativeDeps."node-df" or []); + deps = { + "underscore-1.7.0" = self.by-version."underscore"."1.7.0"; + }; + peerDependencies = [ + ]; + passthru.names = [ "node-df" ]; + }; + by-spec."node-expat"."*" = + self.by-version."node-expat"."2.3.4"; + by-version."node-expat"."2.3.4" = lib.makeOverridable self.buildNodePackage { + name = "node-expat-2.3.4"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/node-expat/-/node-expat-2.3.4.tgz"; + name = "node-expat-2.3.4.tgz"; + sha1 = "f2659ee57ca6226d0d0a3957eeae71c1b3f67f61"; }) ]; buildInputs = @@ -18179,9 +18656,9 @@ ]; passthru.names = [ "node-expat" ]; }; - "node-expat" = self.by-version."node-expat"."2.3.3"; + "node-expat" = self.by-version."node-expat"."2.3.4"; by-spec."node-expat".">=1.4.1" = - self.by-version."node-expat"."2.3.3"; + self.by-version."node-expat"."2.3.4"; by-spec."node-expat"."~2.1.4" = self.by-version."node-expat"."2.1.4"; by-version."node-expat"."2.1.4" = lib.makeOverridable self.buildNodePackage { @@ -18204,9 +18681,9 @@ passthru.names = [ "node-expat" ]; }; by-spec."node-expat"."~2.3.0" = - self.by-version."node-expat"."2.3.3"; + self.by-version."node-expat"."2.3.4"; by-spec."node-expat"."~2.3.1" = - self.by-version."node-expat"."2.3.3"; + self.by-version."node-expat"."2.3.4"; by-spec."node-gyp"."*" = self.by-version."node-gyp"."1.0.2"; by-version."node-gyp"."1.0.2" = lib.makeOverridable self.buildNodePackage { @@ -18223,18 +18700,18 @@ (self.nativeDeps."node-gyp" or []); deps = { "fstream-1.0.3" = self.by-version."fstream"."1.0.3"; - "glob-4.2.2" = self.by-version."glob"."4.2.2"; + "glob-4.3.2" = self.by-version."glob"."4.3.2"; "graceful-fs-3.0.5" = self.by-version."graceful-fs"."3.0.5"; "minimatch-1.0.0" = self.by-version."minimatch"."1.0.0"; "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0"; "nopt-3.0.1" = self.by-version."nopt"."3.0.1"; "npmlog-0.1.1" = self.by-version."npmlog"."0.1.1"; "osenv-0.1.0" = self.by-version."osenv"."0.1.0"; - "request-2.49.0" = self.by-version."request"."2.49.0"; + "request-2.51.0" = self.by-version."request"."2.51.0"; "rimraf-2.2.8" = self.by-version."rimraf"."2.2.8"; - "semver-4.1.0" = self.by-version."semver"."4.1.0"; + "semver-4.1.1" = self.by-version."semver"."4.1.1"; "tar-1.0.3" = self.by-version."tar"."1.0.3"; - "which-1.0.7" = self.by-version."which"."1.0.7"; + "which-1.0.8" = self.by-version."which"."1.0.8"; }; peerDependencies = [ ]; @@ -18264,82 +18741,82 @@ "nopt-2.2.1" = self.by-version."nopt"."2.2.1"; "npmlog-0.1.1" = self.by-version."npmlog"."0.1.1"; "osenv-0.1.0" = self.by-version."osenv"."0.1.0"; - "request-2.49.0" = self.by-version."request"."2.49.0"; + "request-2.51.0" = self.by-version."request"."2.51.0"; "rimraf-2.2.8" = self.by-version."rimraf"."2.2.8"; "semver-2.1.0" = self.by-version."semver"."2.1.0"; "tar-0.1.20" = self.by-version."tar"."0.1.20"; - "which-1.0.7" = self.by-version."which"."1.0.7"; + "which-1.0.8" = self.by-version."which"."1.0.8"; }; peerDependencies = [ ]; passthru.names = [ "node-gyp" ]; }; - by-spec."node-gyp"."~0.12.2" = - self.by-version."node-gyp"."0.12.2"; - by-version."node-gyp"."0.12.2" = lib.makeOverridable self.buildNodePackage { - name = "node-gyp-0.12.2"; - bin = true; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/node-gyp/-/node-gyp-0.12.2.tgz"; - name = "node-gyp-0.12.2.tgz"; - sha1 = "bdca7e7025feb308ddd7fd3434300e47703ec57a"; - }) - ]; - buildInputs = - (self.nativeDeps."node-gyp" or []); - deps = { - "glob-3.2.11" = self.by-version."glob"."3.2.11"; - "graceful-fs-2.0.3" = self.by-version."graceful-fs"."2.0.3"; - "fstream-0.1.31" = self.by-version."fstream"."0.1.31"; - "minimatch-0.4.0" = self.by-version."minimatch"."0.4.0"; - "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0"; - "nopt-2.2.1" = self.by-version."nopt"."2.2.1"; - "npmlog-0.1.1" = self.by-version."npmlog"."0.1.1"; - "osenv-0.1.0" = self.by-version."osenv"."0.1.0"; - "request-2.49.0" = self.by-version."request"."2.49.0"; - "rimraf-2.2.8" = self.by-version."rimraf"."2.2.8"; - "semver-2.2.1" = self.by-version."semver"."2.2.1"; - "tar-0.1.20" = self.by-version."tar"."0.1.20"; - "which-1.0.7" = self.by-version."which"."1.0.7"; - }; - peerDependencies = [ - ]; - passthru.names = [ "node-gyp" ]; - }; - by-spec."node-gyp"."~1.0.1" = + by-spec."node-gyp"."~1.0.2" = self.by-version."node-gyp"."1.0.2"; by-spec."node-inspector"."*" = - self.by-version."node-inspector"."0.7.4"; - by-version."node-inspector"."0.7.4" = lib.makeOverridable self.buildNodePackage { - name = "node-inspector-0.7.4"; + self.by-version."node-inspector"."0.8.1"; + by-version."node-inspector"."0.8.1" = lib.makeOverridable self.buildNodePackage { + name = "node-inspector-0.8.1"; bin = true; src = [ (fetchurl { - url = "http://registry.npmjs.org/node-inspector/-/node-inspector-0.7.4.tgz"; - name = "node-inspector-0.7.4.tgz"; - sha1 = "3d07234f0834e7f1e21a1669eceaa224a7be43f2"; + url = "http://registry.npmjs.org/node-inspector/-/node-inspector-0.8.1.tgz"; + name = "node-inspector-0.8.1.tgz"; + sha1 = "2e7e88d47c4dc0761497f2fba520ca2310985950"; }) ]; buildInputs = (self.nativeDeps."node-inspector" or []); deps = { - "express-4.0.0" = self.by-version."express"."4.0.0"; - "async-0.8.0" = self.by-version."async"."0.8.0"; + "express-4.10.6" = self.by-version."express"."4.10.6"; + "serve-favicon-2.2.0" = self.by-version."serve-favicon"."2.2.0"; + "async-0.9.0" = self.by-version."async"."0.9.0"; "glob-3.2.11" = self.by-version."glob"."3.2.11"; - "rc-0.3.5" = self.by-version."rc"."0.3.5"; + "rc-0.5.4" = self.by-version."rc"."0.5.4"; "strong-data-uri-0.1.1" = self.by-version."strong-data-uri"."0.1.1"; - "debug-0.8.1" = self.by-version."debug"."0.8.1"; + "debug-1.0.4" = self.by-version."debug"."1.0.4"; "ws-0.4.32" = self.by-version."ws"."0.4.32"; - "opener-1.3.0" = self.by-version."opener"."1.3.0"; - "yargs-1.2.6" = self.by-version."yargs"."1.2.6"; - "which-1.0.7" = self.by-version."which"."1.0.7"; + "opener-1.4.0" = self.by-version."opener"."1.4.0"; + "yargs-1.3.3" = self.by-version."yargs"."1.3.3"; + "which-1.0.8" = self.by-version."which"."1.0.8"; + "v8-debug-0.3.1" = self.by-version."v8-debug"."0.3.1"; + "v8-profiler-5.2.1" = self.by-version."v8-profiler"."5.2.1"; + "semver-3.0.1" = self.by-version."semver"."3.0.1"; }; peerDependencies = [ ]; passthru.names = [ "node-inspector" ]; }; - "node-inspector" = self.by-version."node-inspector"."0.7.4"; + "node-inspector" = self.by-version."node-inspector"."0.8.1"; + by-spec."node-pre-gyp"."0.5.x" = + self.by-version."node-pre-gyp"."0.5.31"; + by-version."node-pre-gyp"."0.5.31" = lib.makeOverridable self.buildNodePackage { + name = "node-pre-gyp-0.5.31"; + bin = true; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.5.31.tgz"; + name = "node-pre-gyp-0.5.31.tgz"; + sha1 = "8c91516f0009e4691413c8c3f2d8a060deb607ba"; + }) + ]; + buildInputs = + (self.nativeDeps."node-pre-gyp" or []); + deps = { + "nopt-3.0.1" = self.by-version."nopt"."3.0.1"; + "npmlog-0.1.1" = self.by-version."npmlog"."0.1.1"; + "request-2.51.0" = self.by-version."request"."2.51.0"; + "semver-4.1.1" = self.by-version."semver"."4.1.1"; + "tar-1.0.3" = self.by-version."tar"."1.0.3"; + "tar-pack-2.0.0" = self.by-version."tar-pack"."2.0.0"; + "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0"; + "rc-0.5.4" = self.by-version."rc"."0.5.4"; + "rimraf-2.2.8" = self.by-version."rimraf"."2.2.8"; + }; + peerDependencies = [ + ]; + passthru.names = [ "node-pre-gyp" ]; + }; by-spec."node-protobuf"."*" = self.by-version."node-protobuf"."1.2.2"; by-version."node-protobuf"."1.2.2" = lib.makeOverridable self.buildNodePackage { @@ -18512,15 +18989,15 @@ }; "node-uptime" = self.by-version."node-uptime"."3.2.0"; by-spec."node-uuid"."*" = - self.by-version."node-uuid"."1.4.1"; - by-version."node-uuid"."1.4.1" = lib.makeOverridable self.buildNodePackage { - name = "node-uuid-1.4.1"; - bin = false; + self.by-version."node-uuid"."1.4.2"; + by-version."node-uuid"."1.4.2" = lib.makeOverridable self.buildNodePackage { + name = "node-uuid-1.4.2"; + bin = true; src = [ (fetchurl { - url = "http://registry.npmjs.org/node-uuid/-/node-uuid-1.4.1.tgz"; - name = "node-uuid-1.4.1.tgz"; - sha1 = "39aef510e5889a3dca9c895b506c73aae1bac048"; + url = "http://registry.npmjs.org/node-uuid/-/node-uuid-1.4.2.tgz"; + name = "node-uuid-1.4.2.tgz"; + sha1 = "907db3d11b7b6a2cf4f905fb7199f14ae7379ba0"; }) ]; buildInputs = @@ -18531,7 +19008,7 @@ ]; passthru.names = [ "node-uuid" ]; }; - "node-uuid" = self.by-version."node-uuid"."1.4.1"; + "node-uuid" = self.by-version."node-uuid"."1.4.2"; by-spec."node-uuid"."1.3.3" = self.by-version."node-uuid"."1.3.3"; by-version."node-uuid"."1.3.3" = lib.makeOverridable self.buildNodePackage { @@ -18574,12 +19051,32 @@ }; by-spec."node-uuid"."1.4.1" = self.by-version."node-uuid"."1.4.1"; + by-version."node-uuid"."1.4.1" = lib.makeOverridable self.buildNodePackage { + name = "node-uuid-1.4.1"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/node-uuid/-/node-uuid-1.4.1.tgz"; + name = "node-uuid-1.4.1.tgz"; + sha1 = "39aef510e5889a3dca9c895b506c73aae1bac048"; + }) + ]; + buildInputs = + (self.nativeDeps."node-uuid" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "node-uuid" ]; + }; by-spec."node-uuid"."^1.4.1" = - self.by-version."node-uuid"."1.4.1"; + self.by-version."node-uuid"."1.4.2"; by-spec."node-uuid"."~1.4.0" = - self.by-version."node-uuid"."1.4.1"; + self.by-version."node-uuid"."1.4.2"; by-spec."node-uuid"."~1.4.1" = - self.by-version."node-uuid"."1.4.1"; + self.by-version."node-uuid"."1.4.2"; + by-spec."node-uuid"."~1.4.2" = + self.by-version."node-uuid"."1.4.2"; by-spec."node-wsfederation".">=0.1.1" = self.by-version."node-wsfederation"."0.1.1"; by-version."node-wsfederation"."0.1.1" = lib.makeOverridable self.buildNodePackage { @@ -18616,17 +19113,17 @@ buildInputs = (self.nativeDeps."node-xmpp" or []); deps = { - "node-expat-2.3.3" = self.by-version."node-expat"."2.3.3"; - "ltx-0.7.2" = self.by-version."ltx"."0.7.2"; - "request-2.49.0" = self.by-version."request"."2.49.0"; + "node-expat-2.3.4" = self.by-version."node-expat"."2.3.4"; + "ltx-0.8.0" = self.by-version."ltx"."0.8.0"; + "request-2.51.0" = self.by-version."request"."2.51.0"; "browser-request-0.3.3" = self.by-version."browser-request"."0.3.3"; - "faye-websocket-0.8.1" = self.by-version."faye-websocket"."0.8.1"; + "faye-websocket-0.9.1" = self.by-version."faye-websocket"."0.9.1"; "browserify-3.19.1" = self.by-version."browserify"."3.19.1"; "brfs-0.0.8" = self.by-version."brfs"."0.0.8"; "node-xmpp-component-1.0.0-alpha1" = self.by-version."node-xmpp-component"."1.0.0-alpha1"; - "node-xmpp-client-1.0.0-alpha18" = self.by-version."node-xmpp-client"."1.0.0-alpha18"; + "node-xmpp-client-1.0.0-alpha19" = self.by-version."node-xmpp-client"."1.0.0-alpha19"; "node-xmpp-server-1.0.0-alpha11" = self.by-version."node-xmpp-server"."1.0.0-alpha11"; - "node-xmpp-core-1.0.0-alpha11" = self.by-version."node-xmpp-core"."1.0.0-alpha11"; + "node-xmpp-core-1.0.0-alpha12" = self.by-version."node-xmpp-core"."1.0.0-alpha12"; }; peerDependencies = [ ]; @@ -18648,11 +19145,11 @@ buildInputs = (self.nativeDeps."node-xmpp" or []); deps = { - "node-expat-2.3.3" = self.by-version."node-expat"."2.3.3"; - "ltx-0.7.2" = self.by-version."ltx"."0.7.2"; - "request-2.49.0" = self.by-version."request"."2.49.0"; + "node-expat-2.3.4" = self.by-version."node-expat"."2.3.4"; + "ltx-0.8.0" = self.by-version."ltx"."0.8.0"; + "request-2.51.0" = self.by-version."request"."2.51.0"; "browser-request-0.3.3" = self.by-version."browser-request"."0.3.3"; - "faye-websocket-0.8.1" = self.by-version."faye-websocket"."0.8.1"; + "faye-websocket-0.9.1" = self.by-version."faye-websocket"."0.9.1"; "browserify-3.19.1" = self.by-version."browserify"."3.19.1"; "brfs-0.0.8" = self.by-version."brfs"."0.0.8"; "node-xmpp-component-0.3.0" = self.by-version."node-xmpp-component"."0.3.0"; @@ -18692,15 +19189,15 @@ }; "node-xmpp-client" = self.by-version."node-xmpp-client"."1.0.0-alpha9"; by-spec."node-xmpp-client"."git+https://github.com/node-xmpp/node-xmpp-client.git" = - self.by-version."node-xmpp-client"."1.0.0-alpha18"; - by-version."node-xmpp-client"."1.0.0-alpha18" = lib.makeOverridable self.buildNodePackage { - name = "node-xmpp-client-1.0.0-alpha18"; + self.by-version."node-xmpp-client"."1.0.0-alpha19"; + by-version."node-xmpp-client"."1.0.0-alpha19" = lib.makeOverridable self.buildNodePackage { + name = "node-xmpp-client-1.0.0-alpha19"; bin = false; src = [ (fetchgit { url = "https://github.com/node-xmpp/node-xmpp-client.git"; - rev = "7a7b32a65405e087a72e37f534dfb62aa0dc005a"; - sha256 = "5744e791465babfd1c2678304c3ef08a23371f9d1f9b45364d9dfd7e7a62e1c3"; + rev = "74bf98a62700bee8e32ba7723abd35320917b8d7"; + sha256 = "7dd69c6b8a4b8d7fef0109432c5b8add5560c9a108955b0adce7ee29507b5a26"; }) ]; buildInputs = @@ -18757,7 +19254,7 @@ buildInputs = (self.nativeDeps."node-xmpp-component" or []); deps = { - "ltx-0.7.2" = self.by-version."ltx"."0.7.2"; + "ltx-0.8.0" = self.by-version."ltx"."0.8.0"; "node-xmpp-core-1.0.0-alpha1" = self.by-version."node-xmpp-core"."1.0.0-alpha1"; }; peerDependencies = [ @@ -18833,7 +19330,7 @@ "node-stringprep-0.6.2" = self.by-version."node-stringprep"."0.6.2"; "reconnect-core-0.0.1" = self.by-version."reconnect-core"."0.0.1"; "tls-connect-0.2.2" = self.by-version."tls-connect"."0.2.2"; - "ltx-0.7.2" = self.by-version."ltx"."0.7.2"; + "ltx-0.8.0" = self.by-version."ltx"."0.8.0"; "debug-0.8.1" = self.by-version."debug"."0.8.1"; }; peerDependencies = [ @@ -18847,15 +19344,15 @@ by-spec."node-xmpp-core"."^1.0.0-alpha9" = self.by-version."node-xmpp-core"."1.0.0-alpha9"; by-spec."node-xmpp-core"."git+https://github.com/node-xmpp/node-xmpp-core.git" = - self.by-version."node-xmpp-core"."1.0.0-alpha11"; - by-version."node-xmpp-core"."1.0.0-alpha11" = lib.makeOverridable self.buildNodePackage { - name = "node-xmpp-core-1.0.0-alpha11"; + self.by-version."node-xmpp-core"."1.0.0-alpha12"; + by-version."node-xmpp-core"."1.0.0-alpha12" = lib.makeOverridable self.buildNodePackage { + name = "node-xmpp-core-1.0.0-alpha12"; bin = false; src = [ (self.patchSource fetchgit { url = "https://github.com/node-xmpp/node-xmpp-core.git"; - rev = "f10cef6ab105c1542f698c5648c47e685adc38ad"; - sha256 = "734a4681af2078d8f3daf1e8aeb2b4121003115a804e1666e416e87b48720ebc"; + rev = "ba6ec76654191dbb338a83dc5cd8b5d3c264ad7f"; + sha256 = "714ae11501ba59fffe06ed8c312672628363f55640c9c8d78c4654ad63976971"; }) ]; buildInputs = @@ -18911,13 +19408,13 @@ buildInputs = (self.nativeDeps."node-xmpp-joap" or []); deps = { - "node-expat-2.3.3" = self.by-version."node-expat"."2.3.3"; + "node-expat-2.3.4" = self.by-version."node-expat"."2.3.4"; "node-xmpp-0.15.0" = self.by-version."node-xmpp"."0.15.0"; "node-stringprep-0.6.2" = self.by-version."node-stringprep"."0.6.2"; "ltx-0.6.0" = self.by-version."ltx"."0.6.0"; "async-0.9.0" = self.by-version."async"."0.9.0"; "toobusy-0.2.4" = self.by-version."toobusy"."0.2.4"; - "node-uuid-1.4.1" = self.by-version."node-uuid"."1.4.1"; + "node-uuid-1.4.2" = self.by-version."node-uuid"."1.4.2"; }; peerDependencies = [ ]; @@ -18956,8 +19453,8 @@ src = [ (fetchgit { url = "https://github.com/node-xmpp/node-xmpp-server.git"; - rev = "535abf75c95c3e500ebb14a863b81bfa4da529db"; - sha256 = "5abac2a86079c6f4ba1371a6a6455f6ae022e19965151dc0c309c875f2629eb9"; + rev = "e61c1f97064e32dc9d5ac857a3915710ada88e84"; + sha256 = "6683bd693d37e0b435373a99f3f7f44e64be00d36eb736d30e66e9f8af874e2c"; }) ]; buildInputs = @@ -19060,29 +19557,29 @@ passthru.names = [ "nodemailer" ]; }; by-spec."nodemon"."*" = - self.by-version."nodemon"."1.2.1"; - by-version."nodemon"."1.2.1" = lib.makeOverridable self.buildNodePackage { - name = "nodemon-1.2.1"; + self.by-version."nodemon"."1.3.0-6"; + by-version."nodemon"."1.3.0-6" = lib.makeOverridable self.buildNodePackage { + name = "nodemon-1.3.0-6"; bin = true; src = [ (fetchurl { - url = "http://registry.npmjs.org/nodemon/-/nodemon-1.2.1.tgz"; - name = "nodemon-1.2.1.tgz"; - sha1 = "02a288045652e92350e7d752a8054472ed2c4824"; + url = "http://registry.npmjs.org/nodemon/-/nodemon-1.3.0-6.tgz"; + name = "nodemon-1.3.0-6.tgz"; + sha1 = "8b2c8a4397da6138428cb6a6dcdb4288a89d98c8"; }) ]; buildInputs = (self.nativeDeps."nodemon" or []); deps = { - "update-notifier-0.1.10" = self.by-version."update-notifier"."0.1.10"; "minimatch-0.3.0" = self.by-version."minimatch"."0.3.0"; "ps-tree-0.0.3" = self.by-version."ps-tree"."0.0.3"; + "update-notifier-0.1.10" = self.by-version."update-notifier"."0.1.10"; }; peerDependencies = [ ]; passthru.names = [ "nodemon" ]; }; - "nodemon" = self.by-version."nodemon"."1.2.1"; + "nodemon" = self.by-version."nodemon"."1.3.0-6"; by-spec."nomnom"."1.6.x" = self.by-version."nomnom"."1.6.2"; by-version."nomnom"."1.6.2" = lib.makeOverridable self.buildNodePackage { @@ -19214,8 +19711,6 @@ ]; passthru.names = [ "nopt" ]; }; - by-spec."nopt"."~2.1.2" = - self.by-version."nopt"."2.1.2"; by-spec."nopt"."~2.2.0" = self.by-version."nopt"."2.2.1"; by-spec."nopt"."~3.0.0" = @@ -19262,7 +19757,7 @@ deps = { "github-url-from-git-1.4.0" = self.by-version."github-url-from-git"."1.4.0"; "github-url-from-username-repo-1.0.2" = self.by-version."github-url-from-username-repo"."1.0.2"; - "semver-4.1.0" = self.by-version."semver"."4.1.0"; + "semver-4.1.1" = self.by-version."semver"."4.1.1"; }; peerDependencies = [ ]; @@ -19273,15 +19768,15 @@ by-spec."normalize-package-data"."~1.0.3" = self.by-version."normalize-package-data"."1.0.3"; by-spec."npm"."*" = - self.by-version."npm"."2.1.11"; - by-version."npm"."2.1.11" = lib.makeOverridable self.buildNodePackage { - name = "npm-2.1.11"; + self.by-version."npm"."2.1.15"; + by-version."npm"."2.1.15" = lib.makeOverridable self.buildNodePackage { + name = "npm-2.1.15"; bin = true; src = [ (fetchurl { - url = "http://registry.npmjs.org/npm/-/npm-2.1.11.tgz"; - name = "npm-2.1.11.tgz"; - sha1 = "1eed4c04e4c8c745bc721baba1b4fe42f2af140c"; + url = "http://registry.npmjs.org/npm/-/npm-2.1.15.tgz"; + name = "npm-2.1.15.tgz"; + sha1 = "7a4e3ce676ee8879a4e6935ae104877b5f99b8d5"; }) ]; buildInputs = @@ -19299,25 +19794,25 @@ "chmodr-0.1.0" = self.by-version."chmodr"."0.1.0"; "chownr-0.0.1" = self.by-version."chownr"."0.0.1"; "cmd-shim-2.0.1" = self.by-version."cmd-shim"."2.0.1"; - "columnify-1.2.1" = self.by-version."columnify"."1.2.1"; + "columnify-1.3.2" = self.by-version."columnify"."1.3.2"; "config-chain-1.1.8" = self.by-version."config-chain"."1.1.8"; "dezalgo-1.0.1" = self.by-version."dezalgo"."1.0.1"; "editor-0.1.0" = self.by-version."editor"."0.1.0"; - "fs-vacuum-1.2.2" = self.by-version."fs-vacuum"."1.2.2"; + "fs-vacuum-1.2.5" = self.by-version."fs-vacuum"."1.2.5"; "fs-write-stream-atomic-1.0.2" = self.by-version."fs-write-stream-atomic"."1.0.2"; "fstream-1.0.3" = self.by-version."fstream"."1.0.3"; "fstream-npm-1.0.1" = self.by-version."fstream-npm"."1.0.1"; "github-url-from-git-1.4.0" = self.by-version."github-url-from-git"."1.4.0"; "github-url-from-username-repo-1.0.2" = self.by-version."github-url-from-username-repo"."1.0.2"; - "glob-4.2.2" = self.by-version."glob"."4.2.2"; + "glob-4.3.2" = self.by-version."glob"."4.3.2"; "graceful-fs-3.0.5" = self.by-version."graceful-fs"."3.0.5"; "inflight-1.0.4" = self.by-version."inflight"."1.0.4"; "inherits-2.0.1" = self.by-version."inherits"."2.0.1"; "ini-1.3.2" = self.by-version."ini"."1.3.2"; - "init-package-json-1.1.2" = self.by-version."init-package-json"."1.1.2"; + "init-package-json-1.1.3" = self.by-version."init-package-json"."1.1.3"; "lockfile-1.0.0" = self.by-version."lockfile"."1.0.0"; "lru-cache-2.5.0" = self.by-version."lru-cache"."2.5.0"; - "minimatch-1.0.0" = self.by-version."minimatch"."1.0.0"; + "minimatch-2.0.1" = self.by-version."minimatch"."2.0.1"; "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0"; "node-gyp-1.0.2" = self.by-version."node-gyp"."1.0.2"; "nopt-3.0.1" = self.by-version."nopt"."3.0.1"; @@ -19325,7 +19820,7 @@ "npm-cache-filename-1.0.1" = self.by-version."npm-cache-filename"."1.0.1"; "npm-install-checks-1.0.4" = self.by-version."npm-install-checks"."1.0.4"; "npm-package-arg-2.1.3" = self.by-version."npm-package-arg"."2.1.3"; - "npm-registry-client-4.0.4" = self.by-version."npm-registry-client"."4.0.4"; + "npm-registry-client-4.0.5" = self.by-version."npm-registry-client"."4.0.5"; "npm-user-validate-0.1.1" = self.by-version."npm-user-validate"."0.1.1"; "npmlog-0.1.1" = self.by-version."npmlog"."0.1.1"; "once-1.3.1" = self.by-version."once"."1.3.1"; @@ -19337,17 +19832,17 @@ "read-package-json-1.2.7" = self.by-version."read-package-json"."1.2.7"; "readable-stream-1.0.33" = self.by-version."readable-stream"."1.0.33"; "realize-package-specifier-1.3.0" = self.by-version."realize-package-specifier"."1.3.0"; - "request-2.48.0" = self.by-version."request"."2.48.0"; + "request-2.51.0" = self.by-version."request"."2.51.0"; "retry-0.6.1" = self.by-version."retry"."0.6.1"; "rimraf-2.2.8" = self.by-version."rimraf"."2.2.8"; - "semver-4.1.0" = self.by-version."semver"."4.1.0"; + "semver-4.1.1" = self.by-version."semver"."4.1.1"; "sha-1.3.0" = self.by-version."sha"."1.3.0"; "slide-1.1.6" = self.by-version."slide"."1.1.6"; "sorted-object-1.0.0" = self.by-version."sorted-object"."1.0.0"; "tar-1.0.3" = self.by-version."tar"."1.0.3"; "text-table-0.2.0" = self.by-version."text-table"."0.2.0"; "uid-number-0.0.6" = self.by-version."uid-number"."0.0.6"; - "which-1.0.7" = self.by-version."which"."1.0.7"; + "which-1.0.8" = self.by-version."which"."1.0.8"; "wrappy-1.0.1" = self.by-version."wrappy"."1.0.1"; "write-file-atomic-1.1.0" = self.by-version."write-file-atomic"."1.1.0"; }; @@ -19355,7 +19850,7 @@ ]; passthru.names = [ "npm" ]; }; - "npm" = self.by-version."npm"."2.1.11"; + "npm" = self.by-version."npm"."2.1.15"; by-spec."npm"."1.3.4" = self.by-version."npm"."1.3.4"; by-version."npm"."1.3.4" = lib.makeOverridable self.buildNodePackage { @@ -19380,7 +19875,7 @@ "nopt-2.1.2" = self.by-version."nopt"."2.1.2"; "rimraf-2.2.8" = self.by-version."rimraf"."2.2.8"; "request-2.21.0" = self.by-version."request"."2.21.0"; - "which-1.0.7" = self.by-version."which"."1.0.7"; + "which-1.0.8" = self.by-version."which"."1.0.8"; "tar-0.1.20" = self.by-version."tar"."0.1.20"; "fstream-0.1.31" = self.by-version."fstream"."0.1.31"; "block-stream-0.0.7" = self.by-version."block-stream"."0.0.7"; @@ -19417,73 +19912,8 @@ ]; passthru.names = [ "npm" ]; }; - by-spec."npm"."1.3.x" = - self.by-version."npm"."1.3.26"; - by-version."npm"."1.3.26" = lib.makeOverridable self.buildNodePackage { - name = "npm-1.3.26"; - bin = true; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/npm/-/npm-1.3.26.tgz"; - name = "npm-1.3.26.tgz"; - sha1 = "bc07bf7cb58710078141c885c2d492fd570f606d"; - }) - ]; - buildInputs = - (self.nativeDeps."npm" or []); - deps = { - "semver-2.2.1" = self.by-version."semver"."2.2.1"; - "ini-1.1.0" = self.by-version."ini"."1.1.0"; - "slide-1.1.6" = self.by-version."slide"."1.1.6"; - "abbrev-1.0.5" = self.by-version."abbrev"."1.0.5"; - "graceful-fs-2.0.3" = self.by-version."graceful-fs"."2.0.3"; - "minimatch-0.2.14" = self.by-version."minimatch"."0.2.14"; - "nopt-2.1.2" = self.by-version."nopt"."2.1.2"; - "rimraf-2.2.8" = self.by-version."rimraf"."2.2.8"; - "request-2.30.0" = self.by-version."request"."2.30.0"; - "which-1.0.7" = self.by-version."which"."1.0.7"; - "tar-0.1.20" = self.by-version."tar"."0.1.20"; - "fstream-0.1.31" = self.by-version."fstream"."0.1.31"; - "block-stream-0.0.7" = self.by-version."block-stream"."0.0.7"; - "mkdirp-0.3.5" = self.by-version."mkdirp"."0.3.5"; - "read-1.0.5" = self.by-version."read"."1.0.5"; - "lru-cache-2.5.0" = self.by-version."lru-cache"."2.5.0"; - "node-gyp-0.12.2" = self.by-version."node-gyp"."0.12.2"; - "fstream-npm-0.1.8" = self.by-version."fstream-npm"."0.1.8"; - "uid-number-0.0.6" = self.by-version."uid-number"."0.0.6"; - "archy-0.0.2" = self.by-version."archy"."0.0.2"; - "chownr-0.0.1" = self.by-version."chownr"."0.0.1"; - "npmlog-0.0.6" = self.by-version."npmlog"."0.0.6"; - "ansi-0.2.1" = self.by-version."ansi"."0.2.1"; - "npm-registry-client-0.3.6" = self.by-version."npm-registry-client"."0.3.6"; - "read-package-json-1.1.9" = self.by-version."read-package-json"."1.1.9"; - "read-installed-0.2.5" = self.by-version."read-installed"."0.2.5"; - "glob-3.2.11" = self.by-version."glob"."3.2.11"; - "init-package-json-0.0.14" = self.by-version."init-package-json"."0.0.14"; - "osenv-0.1.0" = self.by-version."osenv"."0.1.0"; - "lockfile-0.4.3" = self.by-version."lockfile"."0.4.3"; - "retry-0.6.1" = self.by-version."retry"."0.6.1"; - "once-1.3.1" = self.by-version."once"."1.3.1"; - "npmconf-0.1.16" = self.by-version."npmconf"."0.1.16"; - "opener-1.3.0" = self.by-version."opener"."1.3.0"; - "chmodr-0.1.0" = self.by-version."chmodr"."0.1.0"; - "cmd-shim-1.1.2" = self.by-version."cmd-shim"."1.1.2"; - "sha-1.2.4" = self.by-version."sha"."1.2.4"; - "editor-0.0.5" = self.by-version."editor"."0.0.5"; - "child-process-close-0.1.1" = self.by-version."child-process-close"."0.1.1"; - "npm-user-validate-0.0.3" = self.by-version."npm-user-validate"."0.0.3"; - "github-url-from-git-1.1.1" = self.by-version."github-url-from-git"."1.1.1"; - "github-url-from-username-repo-0.0.2" = self.by-version."github-url-from-username-repo"."0.0.2"; - "text-table-0.2.0" = self.by-version."text-table"."0.2.0"; - "ansicolors-0.3.2" = self.by-version."ansicolors"."0.3.2"; - "ansistyles-0.1.3" = self.by-version."ansistyles"."0.1.3"; - "path-is-inside-1.0.1" = self.by-version."path-is-inside"."1.0.1"; - "columnify-0.1.2" = self.by-version."columnify"."0.1.2"; - }; - peerDependencies = [ - ]; - passthru.names = [ "npm" ]; - }; + by-spec."npm"."2.1.x" = + self.by-version."npm"."2.1.15"; by-spec."npm-cache-filename"."~1.0.1" = self.by-version."npm-cache-filename"."1.0.1"; by-version."npm-cache-filename"."1.0.1" = lib.makeOverridable self.buildNodePackage { @@ -19505,31 +19935,31 @@ passthru.names = [ "npm-cache-filename" ]; }; by-spec."npm-check-updates"."*" = - self.by-version."npm-check-updates"."1.2.0"; - by-version."npm-check-updates"."1.2.0" = lib.makeOverridable self.buildNodePackage { - name = "npm-check-updates-1.2.0"; + self.by-version."npm-check-updates"."1.3.0"; + by-version."npm-check-updates"."1.3.0" = lib.makeOverridable self.buildNodePackage { + name = "npm-check-updates-1.3.0"; bin = true; src = [ (fetchurl { - url = "http://registry.npmjs.org/npm-check-updates/-/npm-check-updates-1.2.0.tgz"; - name = "npm-check-updates-1.2.0.tgz"; - sha1 = "9e055cdc4a6fad8043bb95adf23eb74f5718c3ec"; + url = "http://registry.npmjs.org/npm-check-updates/-/npm-check-updates-1.3.0.tgz"; + name = "npm-check-updates-1.3.0.tgz"; + sha1 = "5d42413cd754fc29d32029ad37eb975a2206f598"; }) ]; buildInputs = (self.nativeDeps."npm-check-updates" or []); deps = { - "npm-1.3.26" = self.by-version."npm"."1.3.26"; - "commander-2.0.0" = self.by-version."commander"."2.0.0"; - "async-0.2.10" = self.by-version."async"."0.2.10"; - "read-package-json-1.1.9" = self.by-version."read-package-json"."1.1.9"; - "semver-2.2.1" = self.by-version."semver"."2.2.1"; + "npm-2.1.15" = self.by-version."npm"."2.1.15"; + "commander-2.5.1" = self.by-version."commander"."2.5.1"; + "async-0.9.0" = self.by-version."async"."0.9.0"; + "read-package-json-1.2.7" = self.by-version."read-package-json"."1.2.7"; + "semver-4.1.1" = self.by-version."semver"."4.1.1"; }; peerDependencies = [ ]; passthru.names = [ "npm-check-updates" ]; }; - "npm-check-updates" = self.by-version."npm-check-updates"."1.2.0"; + "npm-check-updates" = self.by-version."npm-check-updates"."1.3.0"; by-spec."npm-install-checks"."~1.0.2" = self.by-version."npm-install-checks"."1.0.4"; by-version."npm-install-checks"."1.0.4" = lib.makeOverridable self.buildNodePackage { @@ -19546,7 +19976,7 @@ (self.nativeDeps."npm-install-checks" or []); deps = { "npmlog-0.1.1" = self.by-version."npmlog"."0.1.1"; - "semver-4.1.0" = self.by-version."semver"."4.1.0"; + "semver-4.1.1" = self.by-version."semver"."4.1.1"; }; peerDependencies = [ ]; @@ -19567,7 +19997,7 @@ buildInputs = (self.nativeDeps."npm-package-arg" or []); deps = { - "semver-4.1.0" = self.by-version."semver"."4.1.0"; + "semver-4.1.1" = self.by-version."semver"."4.1.1"; }; peerDependencies = [ ]; @@ -19590,7 +20020,7 @@ buildInputs = (self.nativeDeps."npm-registry-client" or []); deps = { - "request-2.49.0" = self.by-version."request"."2.49.0"; + "request-2.51.0" = self.by-version."request"."2.51.0"; "graceful-fs-2.0.3" = self.by-version."graceful-fs"."2.0.3"; "semver-2.0.11" = self.by-version."semver"."2.0.11"; "slide-1.1.6" = self.by-version."slide"."1.1.6"; @@ -19620,7 +20050,7 @@ buildInputs = (self.nativeDeps."npm-registry-client" or []); deps = { - "request-2.49.0" = self.by-version."request"."2.49.0"; + "request-2.51.0" = self.by-version."request"."2.51.0"; "graceful-fs-2.0.3" = self.by-version."graceful-fs"."2.0.3"; "semver-2.3.2" = self.by-version."semver"."2.3.2"; "slide-1.1.6" = self.by-version."slide"."1.1.6"; @@ -19635,45 +20065,16 @@ ]; passthru.names = [ "npm-registry-client" ]; }; - by-spec."npm-registry-client"."~0.3.5" = - self.by-version."npm-registry-client"."0.3.6"; - by-version."npm-registry-client"."0.3.6" = lib.makeOverridable self.buildNodePackage { - name = "npm-registry-client-0.3.6"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/npm-registry-client/-/npm-registry-client-0.3.6.tgz"; - name = "npm-registry-client-0.3.6.tgz"; - sha1 = "c48a2a03643769acc49672860f7920ec6bffac6e"; - }) - ]; - buildInputs = - (self.nativeDeps."npm-registry-client" or []); - deps = { - "request-2.49.0" = self.by-version."request"."2.49.0"; - "graceful-fs-2.0.3" = self.by-version."graceful-fs"."2.0.3"; - "semver-2.3.2" = self.by-version."semver"."2.3.2"; - "slide-1.1.6" = self.by-version."slide"."1.1.6"; - "chownr-0.0.1" = self.by-version."chownr"."0.0.1"; - "mkdirp-0.3.5" = self.by-version."mkdirp"."0.3.5"; - "rimraf-2.2.8" = self.by-version."rimraf"."2.2.8"; - "retry-0.6.0" = self.by-version."retry"."0.6.0"; - "npmlog-0.1.1" = self.by-version."npmlog"."0.1.1"; - }; - peerDependencies = [ - ]; - passthru.names = [ "npm-registry-client" ]; - }; by-spec."npm-registry-client"."~4.0.4" = - self.by-version."npm-registry-client"."4.0.4"; - by-version."npm-registry-client"."4.0.4" = lib.makeOverridable self.buildNodePackage { - name = "npm-registry-client-4.0.4"; + self.by-version."npm-registry-client"."4.0.5"; + by-version."npm-registry-client"."4.0.5" = lib.makeOverridable self.buildNodePackage { + name = "npm-registry-client-4.0.5"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/npm-registry-client/-/npm-registry-client-4.0.4.tgz"; - name = "npm-registry-client-4.0.4.tgz"; - sha1 = "6935cde6460a3bf1cb6019d7523196e0fb96fb62"; + url = "http://registry.npmjs.org/npm-registry-client/-/npm-registry-client-4.0.5.tgz"; + name = "npm-registry-client-4.0.5.tgz"; + sha1 = "27d37ca0c7bbd5df14f4ae35223a4d588dd4fea6"; }) ]; buildInputs = @@ -19685,10 +20086,10 @@ "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0"; "normalize-package-data-1.0.3" = self.by-version."normalize-package-data"."1.0.3"; "once-1.3.1" = self.by-version."once"."1.3.1"; - "request-2.49.0" = self.by-version."request"."2.49.0"; + "request-2.51.0" = self.by-version."request"."2.51.0"; "retry-0.6.1" = self.by-version."retry"."0.6.1"; "rimraf-2.2.8" = self.by-version."rimraf"."2.2.8"; - "semver-4.1.0" = self.by-version."semver"."4.1.0"; + "semver-4.1.1" = self.by-version."semver"."4.1.1"; "slide-1.1.6" = self.by-version."slide"."1.1.6"; "npmlog-0.1.1" = self.by-version."npmlog"."0.1.1"; }; @@ -19696,6 +20097,8 @@ ]; passthru.names = [ "npm-registry-client" ]; }; + by-spec."npm-registry-client"."~4.0.5" = + self.by-version."npm-registry-client"."4.0.5"; by-spec."npm-user-validate"."0.0.3" = self.by-version."npm-user-validate"."0.0.3"; by-version."npm-user-validate"."0.0.3" = lib.makeOverridable self.buildNodePackage { @@ -19843,7 +20246,7 @@ "nopt-3.0.1" = self.by-version."nopt"."3.0.1"; "once-1.3.1" = self.by-version."once"."1.3.1"; "osenv-0.1.0" = self.by-version."osenv"."0.1.0"; - "semver-4.1.0" = self.by-version."semver"."4.1.0"; + "semver-4.1.1" = self.by-version."semver"."4.1.1"; "uid-number-0.0.5" = self.by-version."uid-number"."0.0.5"; }; peerDependencies = [ @@ -19872,7 +20275,7 @@ "nopt-3.0.1" = self.by-version."nopt"."3.0.1"; "once-1.3.1" = self.by-version."once"."1.3.1"; "osenv-0.1.0" = self.by-version."osenv"."0.1.0"; - "semver-4.1.0" = self.by-version."semver"."4.1.0"; + "semver-4.1.1" = self.by-version."semver"."4.1.1"; "uid-number-0.0.5" = self.by-version."uid-number"."0.0.5"; }; peerDependencies = [ @@ -19881,8 +20284,6 @@ }; by-spec."npmconf"."~0.1.1" = self.by-version."npmconf"."0.1.16"; - by-spec."npmconf"."~0.1.12" = - self.by-version."npmconf"."0.1.16"; by-spec."npmconf"."~0.1.2" = self.by-version."npmconf"."0.1.16"; by-spec."npmconf"."~2.1.1" = @@ -19931,41 +20332,20 @@ ]; passthru.names = [ "npmlog" ]; }; - by-spec."npmlog"."0.0.6" = - self.by-version."npmlog"."0.0.6"; - by-version."npmlog"."0.0.6" = lib.makeOverridable self.buildNodePackage { - name = "npmlog-0.0.6"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/npmlog/-/npmlog-0.0.6.tgz"; - name = "npmlog-0.0.6.tgz"; - sha1 = "685043fe71aa1665d6e3b2acef180640caf40873"; - }) - ]; - buildInputs = - (self.nativeDeps."npmlog" or []); - deps = { - "ansi-0.2.1" = self.by-version."ansi"."0.2.1"; - }; - peerDependencies = [ - ]; - passthru.names = [ "npmlog" ]; - }; by-spec."npmlog"."0.1" = self.by-version."npmlog"."0.1.1"; by-spec."npmlog"."~0.1.1" = self.by-version."npmlog"."0.1.1"; by-spec."nssocket"."~0.5.1" = - self.by-version."nssocket"."0.5.2"; - by-version."nssocket"."0.5.2" = lib.makeOverridable self.buildNodePackage { - name = "nssocket-0.5.2"; + self.by-version."nssocket"."0.5.3"; + by-version."nssocket"."0.5.3" = lib.makeOverridable self.buildNodePackage { + name = "nssocket-0.5.3"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/nssocket/-/nssocket-0.5.2.tgz"; - name = "nssocket-0.5.2.tgz"; - sha1 = "7ea1d0c3106620f722cdff4ddfd5aac5b2553536"; + url = "http://registry.npmjs.org/nssocket/-/nssocket-0.5.3.tgz"; + name = "nssocket-0.5.3.tgz"; + sha1 = "883ca2ec605f5ed64a4d5190b2625401928f8f8d"; }) ]; buildInputs = @@ -19999,15 +20379,15 @@ passthru.names = [ "numeral" ]; }; by-spec."oauth"."https://github.com/ciaranj/node-oauth/tarball/master" = - self.by-version."oauth"."0.9.11"; - by-version."oauth"."0.9.11" = lib.makeOverridable self.buildNodePackage { - name = "oauth-0.9.11"; + self.by-version."oauth"."0.9.12"; + by-version."oauth"."0.9.12" = lib.makeOverridable self.buildNodePackage { + name = "oauth-0.9.12"; bin = false; src = [ (fetchurl { url = "https://github.com/ciaranj/node-oauth/tarball/master"; - name = "oauth-0.9.11.tgz"; - sha256 = "783dead39b8df22dfff8961fcfb3e65622375d4308c12c1fbce2ae2e4da20184"; + name = "oauth-0.9.12.tgz"; + sha256 = "e06c3c3537e9c802c8ad00640b9f91bf2857cf8cc91209e355b5646f4da8b3e7"; }) ]; buildInputs = @@ -20317,6 +20697,26 @@ self.by-version."once"."1.3.1"; by-spec."once"."~1.3.1" = self.by-version."once"."1.3.1"; + by-spec."onetime"."^1.0.0" = + self.by-version."onetime"."1.0.0"; + by-version."onetime"."1.0.0" = lib.makeOverridable self.buildNodePackage { + name = "onetime-1.0.0"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/onetime/-/onetime-1.0.0.tgz"; + name = "onetime-1.0.0.tgz"; + sha1 = "3a08a8e39d7816df52d34886374fb8ed8b651f62"; + }) + ]; + buildInputs = + (self.nativeDeps."onetime" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "onetime" ]; + }; by-spec."open"."0.0.2" = self.by-version."open"."0.0.2"; by-version."open"."0.0.2" = lib.makeOverridable self.buildNodePackage { @@ -20357,6 +20757,26 @@ ]; passthru.names = [ "open" ]; }; + by-spec."opener"."^1.3.0" = + self.by-version."opener"."1.4.0"; + by-version."opener"."1.4.0" = lib.makeOverridable self.buildNodePackage { + name = "opener-1.4.0"; + bin = true; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/opener/-/opener-1.4.0.tgz"; + name = "opener-1.4.0.tgz"; + sha1 = "d11f86eeeb076883735c9d509f538fe82d10b941"; + }) + ]; + buildInputs = + (self.nativeDeps."opener" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "opener" ]; + }; by-spec."opener"."~1.3.0" = self.by-version."opener"."1.3.0"; by-version."opener"."1.3.0" = lib.makeOverridable self.buildNodePackage { @@ -20379,24 +20799,6 @@ }; by-spec."opener"."~1.4.0" = self.by-version."opener"."1.4.0"; - by-version."opener"."1.4.0" = lib.makeOverridable self.buildNodePackage { - name = "opener-1.4.0"; - bin = true; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/opener/-/opener-1.4.0.tgz"; - name = "opener-1.4.0.tgz"; - sha1 = "d11f86eeeb076883735c9d509f538fe82d10b941"; - }) - ]; - buildInputs = - (self.nativeDeps."opener" or []); - deps = { - }; - peerDependencies = [ - ]; - passthru.names = [ "opener" ]; - }; by-spec."openid".">=0.2.0" = self.by-version."openid"."0.5.9"; by-version."openid"."0.5.9" = lib.makeOverridable self.buildNodePackage { @@ -20534,6 +20936,32 @@ self.by-version."optimist"."0.6.1"; by-spec."optimist"."~0.6.1" = self.by-version."optimist"."0.6.1"; + by-spec."optionator"."^0.4.0" = + self.by-version."optionator"."0.4.0"; + by-version."optionator"."0.4.0" = lib.makeOverridable self.buildNodePackage { + name = "optionator-0.4.0"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/optionator/-/optionator-0.4.0.tgz"; + name = "optionator-0.4.0.tgz"; + sha1 = "e79c7926ff7d550f92c714dfc3da21d7877ebea6"; + }) + ]; + buildInputs = + (self.nativeDeps."optionator" or []); + deps = { + "prelude-ls-1.1.1" = self.by-version."prelude-ls"."1.1.1"; + "deep-is-0.1.3" = self.by-version."deep-is"."0.1.3"; + "wordwrap-0.0.2" = self.by-version."wordwrap"."0.0.2"; + "type-check-0.3.1" = self.by-version."type-check"."0.3.1"; + "levn-0.2.5" = self.by-version."levn"."0.2.5"; + "fast-levenshtein-1.0.6" = self.by-version."fast-levenshtein"."1.0.6"; + }; + peerDependencies = [ + ]; + passthru.names = [ "optionator" ]; + }; by-spec."options".">=0.0.5" = self.by-version."options"."0.0.6"; by-version."options"."0.0.6" = lib.makeOverridable self.buildNodePackage { @@ -20795,6 +21223,28 @@ ]; passthru.names = [ "package-json" ]; }; + by-spec."package-json"."^1.0.0" = + self.by-version."package-json"."1.0.1"; + by-version."package-json"."1.0.1" = lib.makeOverridable self.buildNodePackage { + name = "package-json-1.0.1"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/package-json/-/package-json-1.0.1.tgz"; + name = "package-json-1.0.1.tgz"; + sha1 = "89cc831317c4d17922413d5318b23c904e5cf43e"; + }) + ]; + buildInputs = + (self.nativeDeps."package-json" or []); + deps = { + "got-1.2.2" = self.by-version."got"."1.2.2"; + "registry-url-2.0.0" = self.by-version."registry-url"."2.0.0"; + }; + peerDependencies = [ + ]; + passthru.names = [ "package-json" ]; + }; by-spec."pako"."~0.2.0" = self.by-version."pako"."0.2.5"; by-version."pako"."0.2.5" = lib.makeOverridable self.buildNodePackage { @@ -20877,6 +21327,29 @@ ]; passthru.names = [ "parents" ]; }; + by-spec."parse-asn1"."^1.2.0" = + self.by-version."parse-asn1"."1.2.0"; + by-version."parse-asn1"."1.2.0" = lib.makeOverridable self.buildNodePackage { + name = "parse-asn1-1.2.0"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/parse-asn1/-/parse-asn1-1.2.0.tgz"; + name = "parse-asn1-1.2.0.tgz"; + sha1 = "d6a8926be45c4ff032842bd86b36b7b574a810ae"; + }) + ]; + buildInputs = + (self.nativeDeps."parse-asn1" or []); + deps = { + "asn1.js-0.6.5" = self.by-version."asn1.js"."0.6.5"; + "asn1.js-rfc3280-0.5.1" = self.by-version."asn1.js-rfc3280"."0.5.1"; + "pemstrip-0.0.1" = self.by-version."pemstrip"."0.0.1"; + }; + peerDependencies = [ + ]; + passthru.names = [ "parse-asn1" ]; + }; by-spec."parse-torrent"."^1.4.0" = self.by-version."parse-torrent"."1.7.0"; by-version."parse-torrent"."1.7.0" = lib.makeOverridable self.buildNodePackage { @@ -21094,7 +21567,7 @@ ]; passthru.names = [ "path-browserify" ]; }; - by-spec."path-is-inside"."~1.0.0" = + by-spec."path-is-inside"."^1.0.1" = self.by-version."path-is-inside"."1.0.1"; by-version."path-is-inside"."1.0.1" = lib.makeOverridable self.buildNodePackage { name = "path-is-inside-1.0.1"; @@ -21114,6 +21587,8 @@ ]; passthru.names = [ "path-is-inside" ]; }; + by-spec."path-is-inside"."~1.0.0" = + self.by-version."path-is-inside"."1.0.1"; by-spec."path-platform"."^0.0.1" = self.by-version."path-platform"."0.0.1"; by-version."path-platform"."0.0.1" = lib.makeOverridable self.buildNodePackage { @@ -21134,26 +21609,6 @@ ]; passthru.names = [ "path-platform" ]; }; - by-spec."path-to-regexp"."0.1.2" = - self.by-version."path-to-regexp"."0.1.2"; - by-version."path-to-regexp"."0.1.2" = lib.makeOverridable self.buildNodePackage { - name = "path-to-regexp-0.1.2"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.2.tgz"; - name = "path-to-regexp-0.1.2.tgz"; - sha1 = "9b2b151f9cc3018c9eea50ca95729e05781712b4"; - }) - ]; - buildInputs = - (self.nativeDeps."path-to-regexp" or []); - deps = { - }; - peerDependencies = [ - ]; - passthru.names = [ "path-to-regexp" ]; - }; by-spec."path-to-regexp"."0.1.3" = self.by-version."path-to-regexp"."0.1.3"; by-version."path-to-regexp"."0.1.3" = lib.makeOverridable self.buildNodePackage { @@ -21288,7 +21743,7 @@ "pump-0.3.5" = self.by-version."pump"."0.3.5"; "range-parser-1.0.2" = self.by-version."range-parser"."1.0.2"; "rc-0.4.0" = self.by-version."rc"."0.4.0"; - "read-torrent-1.1.0" = self.by-version."read-torrent"."1.1.0"; + "read-torrent-1.2.0" = self.by-version."read-torrent"."1.2.0"; "torrent-stream-0.16.2" = self.by-version."torrent-stream"."0.16.2"; "windows-no-runnable-0.0.6" = self.by-version."windows-no-runnable"."0.0.6"; "xtend-4.0.0" = self.by-version."xtend"."4.0.0"; @@ -21393,7 +21848,7 @@ "request-2.42.0" = self.by-version."request"."2.42.0"; "request-progress-0.3.1" = self.by-version."request-progress"."0.3.1"; "rimraf-2.2.8" = self.by-version."rimraf"."2.2.8"; - "which-1.0.7" = self.by-version."which"."1.0.7"; + "which-1.0.8" = self.by-version."which"."1.0.8"; }; peerDependencies = [ ]; @@ -21618,6 +22073,26 @@ ]; passthru.names = [ "posix-getopt" ]; }; + by-spec."prelude-ls"."~1.1.0" = + self.by-version."prelude-ls"."1.1.1"; + by-version."prelude-ls"."1.1.1" = lib.makeOverridable self.buildNodePackage { + name = "prelude-ls-1.1.1"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/prelude-ls/-/prelude-ls-1.1.1.tgz"; + name = "prelude-ls-1.1.1.tgz"; + sha1 = "c0b86c1ffd151ad3cc75e7e3fe38d7a1bf33728a"; + }) + ]; + buildInputs = + (self.nativeDeps."prelude-ls" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "prelude-ls" ]; + }; by-spec."pretty-bytes"."^0.1.0" = self.by-version."pretty-bytes"."0.1.2"; by-version."pretty-bytes"."0.1.2" = lib.makeOverridable self.buildNodePackage { @@ -21639,15 +22114,15 @@ passthru.names = [ "pretty-bytes" ]; }; by-spec."pretty-bytes"."^1.0.0" = - self.by-version."pretty-bytes"."1.0.1"; - by-version."pretty-bytes"."1.0.1" = lib.makeOverridable self.buildNodePackage { - name = "pretty-bytes-1.0.1"; + self.by-version."pretty-bytes"."1.0.2"; + by-version."pretty-bytes"."1.0.2" = lib.makeOverridable self.buildNodePackage { + name = "pretty-bytes-1.0.2"; bin = true; src = [ (fetchurl { - url = "http://registry.npmjs.org/pretty-bytes/-/pretty-bytes-1.0.1.tgz"; - name = "pretty-bytes-1.0.1.tgz"; - sha1 = "afd0b459da61834ac36617b05f9daa0beb043e3e"; + url = "http://registry.npmjs.org/pretty-bytes/-/pretty-bytes-1.0.2.tgz"; + name = "pretty-bytes-1.0.2.tgz"; + sha1 = "b38f90c0b93d9942a4c4bec6cb5f367d51d80120"; }) ]; buildInputs = @@ -21955,6 +22430,28 @@ }; by-spec."ps-tree"."~0.0.3" = self.by-version."ps-tree"."0.0.3"; + by-spec."public-encrypt"."1.0.1" = + self.by-version."public-encrypt"."1.0.1"; + by-version."public-encrypt"."1.0.1" = lib.makeOverridable self.buildNodePackage { + name = "public-encrypt-1.0.1"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/public-encrypt/-/public-encrypt-1.0.1.tgz"; + name = "public-encrypt-1.0.1.tgz"; + sha1 = "f4d881f0068cdd24017ef4baa4f49b9d8d055c46"; + }) + ]; + buildInputs = + (self.nativeDeps."public-encrypt" or []); + deps = { + "bn.js-0.16.0" = self.by-version."bn.js"."0.16.0"; + "parse-asn1-1.2.0" = self.by-version."parse-asn1"."1.2.0"; + }; + peerDependencies = [ + ]; + passthru.names = [ "public-encrypt" ]; + }; by-spec."pump"."^0.3.1" = self.by-version."pump"."0.3.5"; by-version."pump"."0.3.5" = lib.makeOverridable self.buildNodePackage { @@ -22606,7 +23103,7 @@ deps = { "cookie-0.1.0" = self.by-version."cookie"."0.1.0"; "lsmod-0.0.3" = self.by-version."lsmod"."0.0.3"; - "node-uuid-1.4.1" = self.by-version."node-uuid"."1.4.1"; + "node-uuid-1.4.2" = self.by-version."node-uuid"."1.4.2"; "stack-trace-0.0.7" = self.by-version."stack-trace"."0.0.7"; }; peerDependencies = [ @@ -22787,30 +23284,7 @@ ]; passthru.names = [ "rc" ]; }; - by-spec."rc"."~0.3.0" = - self.by-version."rc"."0.3.5"; - by-version."rc"."0.3.5" = lib.makeOverridable self.buildNodePackage { - name = "rc-0.3.5"; - bin = true; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/rc/-/rc-0.3.5.tgz"; - name = "rc-0.3.5.tgz"; - sha1 = "fce2220593be57aa1296685a7e37ed003dfcc728"; - }) - ]; - buildInputs = - (self.nativeDeps."rc" or []); - deps = { - "minimist-0.0.10" = self.by-version."minimist"."0.0.10"; - "deep-extend-0.2.11" = self.by-version."deep-extend"."0.2.11"; - "ini-1.1.0" = self.by-version."ini"."1.1.0"; - }; - peerDependencies = [ - ]; - passthru.names = [ "rc" ]; - }; - by-spec."rc"."~0.5.4" = + by-spec."rc"."^0.5.1" = self.by-version."rc"."0.5.4"; by-version."rc"."0.5.4" = lib.makeOverridable self.buildNodePackage { name = "rc-0.5.4"; @@ -22834,16 +23308,22 @@ ]; passthru.names = [ "rc" ]; }; + by-spec."rc"."~0.5.0" = + self.by-version."rc"."0.5.4"; + by-spec."rc"."~0.5.1" = + self.by-version."rc"."0.5.4"; + by-spec."rc"."~0.5.4" = + self.by-version."rc"."0.5.4"; by-spec."react"."*" = - self.by-version."react"."0.12.1"; - by-version."react"."0.12.1" = lib.makeOverridable self.buildNodePackage { - name = "react-0.12.1"; + self.by-version."react"."0.12.2"; + by-version."react"."0.12.2" = lib.makeOverridable self.buildNodePackage { + name = "react-0.12.2"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/react/-/react-0.12.1.tgz"; - name = "react-0.12.1.tgz"; - sha1 = "b73836f4f1888ce79c9372208398a3fb5483bc35"; + url = "http://registry.npmjs.org/react/-/react-0.12.2.tgz"; + name = "react-0.12.2.tgz"; + sha1 = "1c4f0b08818146eeab4f0ab39257e0aa52027e00"; }) ]; buildInputs = @@ -22855,7 +23335,7 @@ ]; passthru.names = [ "react" ]; }; - "react" = self.by-version."react"."0.12.1"; + "react" = self.by-version."react"."0.12.2"; by-spec."read"."1" = self.by-version."read"."1.0.5"; by-version."read"."1.0.5" = lib.makeOverridable self.buildNodePackage { @@ -22925,7 +23405,7 @@ "debuglog-1.0.1" = self.by-version."debuglog"."1.0.1"; "read-package-json-1.2.7" = self.by-version."read-package-json"."1.2.7"; "readdir-scoped-modules-1.0.1" = self.by-version."readdir-scoped-modules"."1.0.1"; - "semver-4.1.0" = self.by-version."semver"."4.1.0"; + "semver-4.1.1" = self.by-version."semver"."4.1.1"; "slide-1.1.6" = self.by-version."slide"."1.1.6"; "util-extend-1.0.1" = self.by-version."util-extend"."1.0.1"; "graceful-fs-3.0.5" = self.by-version."graceful-fs"."3.0.5"; @@ -22951,7 +23431,7 @@ deps = { "github-url-from-git-1.4.0" = self.by-version."github-url-from-git"."1.4.0"; "github-url-from-username-repo-1.0.2" = self.by-version."github-url-from-username-repo"."1.0.2"; - "glob-4.2.2" = self.by-version."glob"."4.2.2"; + "glob-4.3.2" = self.by-version."glob"."4.3.2"; "lru-cache-2.5.0" = self.by-version."lru-cache"."2.5.0"; "normalize-package-data-1.0.3" = self.by-version."normalize-package-data"."1.0.3"; "graceful-fs-3.0.5" = self.by-version."graceful-fs"."3.0.5"; @@ -22960,7 +23440,9 @@ ]; passthru.names = [ "read-package-json" ]; }; - by-spec."read-package-json"."1.1.x" = + by-spec."read-package-json"."1.2.x" = + self.by-version."read-package-json"."1.2.7"; + by-spec."read-package-json"."~1.1.0" = self.by-version."read-package-json"."1.1.9"; by-version."read-package-json"."1.1.9" = lib.makeOverridable self.buildNodePackage { name = "read-package-json-1.1.9"; @@ -22984,30 +23466,27 @@ ]; passthru.names = [ "read-package-json" ]; }; - by-spec."read-package-json"."~1.1.0" = - self.by-version."read-package-json"."1.1.9"; - by-spec."read-package-json"."~1.1.6" = - self.by-version."read-package-json"."1.1.9"; by-spec."read-package-json"."~1.2.7" = self.by-version."read-package-json"."1.2.7"; by-spec."read-torrent"."^1.1.0" = - self.by-version."read-torrent"."1.1.0"; - by-version."read-torrent"."1.1.0" = lib.makeOverridable self.buildNodePackage { - name = "read-torrent-1.1.0"; + self.by-version."read-torrent"."1.2.0"; + by-version."read-torrent"."1.2.0" = lib.makeOverridable self.buildNodePackage { + name = "read-torrent-1.2.0"; bin = true; src = [ (fetchurl { - url = "http://registry.npmjs.org/read-torrent/-/read-torrent-1.1.0.tgz"; - name = "read-torrent-1.1.0.tgz"; - sha1 = "a34506d88b50682e01cb638576b4fccebfe706ed"; + url = "http://registry.npmjs.org/read-torrent/-/read-torrent-1.2.0.tgz"; + name = "read-torrent-1.2.0.tgz"; + sha1 = "2b5fa465ab1e3a9a2e478403b425910ae66c58a9"; }) ]; buildInputs = (self.nativeDeps."read-torrent" or []); deps = { - "request-2.16.6" = self.by-version."request"."2.16.6"; - "parse-torrent-1.0.0" = self.by-version."parse-torrent"."1.0.0"; "magnet-uri-2.0.1" = self.by-version."magnet-uri"."2.0.1"; + "parse-torrent-1.0.0" = self.by-version."parse-torrent"."1.0.0"; + "request-2.16.6" = self.by-version."request"."2.16.6"; + "xtend-4.0.0" = self.by-version."xtend"."4.0.0"; }; peerDependencies = [ ]; @@ -23060,30 +23539,6 @@ ]; passthru.names = [ "readable-stream" ]; }; - by-spec."readable-stream"."1.0" = - self.by-version."readable-stream"."1.0.33"; - by-version."readable-stream"."1.0.33" = lib.makeOverridable self.buildNodePackage { - name = "readable-stream-1.0.33"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz"; - name = "readable-stream-1.0.33.tgz"; - sha1 = "3a360dd66c1b1d7fd4705389860eda1d0f61126c"; - }) - ]; - buildInputs = - (self.nativeDeps."readable-stream" or []); - deps = { - "core-util-is-1.0.1" = self.by-version."core-util-is"."1.0.1"; - "isarray-0.0.1" = self.by-version."isarray"."0.0.1"; - "string_decoder-0.10.31" = self.by-version."string_decoder"."0.10.31"; - "inherits-2.0.1" = self.by-version."inherits"."2.0.1"; - }; - peerDependencies = [ - ]; - passthru.names = [ "readable-stream" ]; - }; by-spec."readable-stream"."1.0.27-1" = self.by-version."readable-stream"."1.0.27-1"; by-version."readable-stream"."1.0.27-1" = lib.makeOverridable self.buildNodePackage { @@ -23112,6 +23567,28 @@ self.by-version."readable-stream"."1.1.13"; by-spec."readable-stream".">=1.0.33-1 <1.1.0-0" = self.by-version."readable-stream"."1.0.33"; + by-version."readable-stream"."1.0.33" = lib.makeOverridable self.buildNodePackage { + name = "readable-stream-1.0.33"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/readable-stream/-/readable-stream-1.0.33.tgz"; + name = "readable-stream-1.0.33.tgz"; + sha1 = "3a360dd66c1b1d7fd4705389860eda1d0f61126c"; + }) + ]; + buildInputs = + (self.nativeDeps."readable-stream" or []); + deps = { + "core-util-is-1.0.1" = self.by-version."core-util-is"."1.0.1"; + "isarray-0.0.1" = self.by-version."isarray"."0.0.1"; + "string_decoder-0.10.31" = self.by-version."string_decoder"."0.10.31"; + "inherits-2.0.1" = self.by-version."inherits"."2.0.1"; + }; + peerDependencies = [ + ]; + passthru.names = [ "readable-stream" ]; + }; by-spec."readable-stream".">=1.1.13-1 <1.2.0-0" = self.by-version."readable-stream"."1.1.13"; by-spec."readable-stream"."^1.0.2" = @@ -23187,16 +23664,16 @@ ]; passthru.names = [ "readdir-scoped-modules" ]; }; - by-spec."readdirp"."^1.1.0" = - self.by-version."readdirp"."1.1.0"; - by-version."readdirp"."1.1.0" = lib.makeOverridable self.buildNodePackage { - name = "readdirp-1.1.0"; + by-spec."readdirp"."^1.2.0" = + self.by-version."readdirp"."1.3.0"; + by-version."readdirp"."1.3.0" = lib.makeOverridable self.buildNodePackage { + name = "readdirp-1.3.0"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/readdirp/-/readdirp-1.1.0.tgz"; - name = "readdirp-1.1.0.tgz"; - sha1 = "6506f9d5d8bb2edc19c855a60bb92feca5fae39c"; + url = "http://registry.npmjs.org/readdirp/-/readdirp-1.3.0.tgz"; + name = "readdirp-1.3.0.tgz"; + sha1 = "eaf1a9b463be9a8190fc9ae163aa1ac934aa340b"; }) ]; buildInputs = @@ -23225,14 +23702,14 @@ buildInputs = (self.nativeDeps."readdirp" or []); deps = { - "minimatch-1.0.0" = self.by-version."minimatch"."1.0.0"; + "minimatch-2.0.1" = self.by-version."minimatch"."2.0.1"; }; peerDependencies = [ ]; passthru.names = [ "readdirp" ]; }; - by-spec."readdirp"."~1.1.0" = - self.by-version."readdirp"."1.1.0"; + by-spec."readdirp"."~1.3.0" = + self.by-version."readdirp"."1.3.0"; by-spec."readline2"."~0.1.0" = self.by-version."readline2"."0.1.0"; by-version."readline2"."0.1.0" = lib.makeOverridable self.buildNodePackage { @@ -23487,6 +23964,27 @@ ]; passthru.names = [ "registry-url" ]; }; + by-spec."registry-url"."^2.0.0" = + self.by-version."registry-url"."2.0.0"; + by-version."registry-url"."2.0.0" = lib.makeOverridable self.buildNodePackage { + name = "registry-url-2.0.0"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/registry-url/-/registry-url-2.0.0.tgz"; + name = "registry-url-2.0.0.tgz"; + sha1 = "f42feb744865eef37a33d38edec4cff9ea92f643"; + }) + ]; + buildInputs = + (self.nativeDeps."registry-url" or []); + deps = { + "rc-0.5.4" = self.by-version."rc"."0.5.4"; + }; + peerDependencies = [ + ]; + passthru.names = [ "registry-url" ]; + }; by-spec."repeating"."^1.1.0" = self.by-version."repeating"."1.1.0"; by-version."repeating"."1.1.0" = lib.makeOverridable self.buildNodePackage { @@ -23533,15 +24031,15 @@ passthru.names = [ "replace" ]; }; by-spec."request"."2" = - self.by-version."request"."2.49.0"; - by-version."request"."2.49.0" = lib.makeOverridable self.buildNodePackage { - name = "request-2.49.0"; + self.by-version."request"."2.51.0"; + by-version."request"."2.51.0" = lib.makeOverridable self.buildNodePackage { + name = "request-2.51.0"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/request/-/request-2.49.0.tgz"; - name = "request-2.49.0.tgz"; - sha1 = "0d4f6348dc3348059b553e4db60fd2478de662a7"; + url = "http://registry.npmjs.org/request/-/request-2.51.0.tgz"; + name = "request-2.51.0.tgz"; + sha1 = "35d00bbecc012e55f907b1bd9e0dbd577bfef26e"; }) ]; buildInputs = @@ -23550,10 +24048,10 @@ "bl-0.9.3" = self.by-version."bl"."0.9.3"; "caseless-0.8.0" = self.by-version."caseless"."0.8.0"; "forever-agent-0.5.2" = self.by-version."forever-agent"."0.5.2"; - "form-data-0.1.4" = self.by-version."form-data"."0.1.4"; + "form-data-0.2.0" = self.by-version."form-data"."0.2.0"; "json-stringify-safe-5.0.0" = self.by-version."json-stringify-safe"."5.0.0"; "mime-types-1.0.2" = self.by-version."mime-types"."1.0.2"; - "node-uuid-1.4.1" = self.by-version."node-uuid"."1.4.1"; + "node-uuid-1.4.2" = self.by-version."node-uuid"."1.4.2"; "qs-2.3.3" = self.by-version."qs"."2.3.3"; "tunnel-agent-0.4.0" = self.by-version."tunnel-agent"."0.4.0"; "tough-cookie-0.12.1" = self.by-version."tough-cookie"."0.12.1"; @@ -23569,9 +24067,9 @@ passthru.names = [ "request" ]; }; by-spec."request"."2 >=2.20.0" = - self.by-version."request"."2.49.0"; + self.by-version."request"."2.51.0"; by-spec."request"."2 >=2.25.0" = - self.by-version."request"."2.49.0"; + self.by-version."request"."2.51.0"; by-spec."request"."2.16.x" = self.by-version."request"."2.16.6"; by-version."request"."2.16.6" = lib.makeOverridable self.buildNodePackage { @@ -23590,7 +24088,7 @@ "form-data-0.0.10" = self.by-version."form-data"."0.0.10"; "mime-1.2.11" = self.by-version."mime"."1.2.11"; "hawk-0.10.2" = self.by-version."hawk"."0.10.2"; - "node-uuid-1.4.1" = self.by-version."node-uuid"."1.4.1"; + "node-uuid-1.4.2" = self.by-version."node-uuid"."1.4.2"; "cookie-jar-0.2.0" = self.by-version."cookie-jar"."0.2.0"; "aws-sign-0.2.0" = self.by-version."aws-sign"."0.2.0"; "oauth-sign-0.2.0" = self.by-version."oauth-sign"."0.2.0"; @@ -23622,7 +24120,7 @@ "json-stringify-safe-5.0.0" = self.by-version."json-stringify-safe"."5.0.0"; "mime-types-1.0.2" = self.by-version."mime-types"."1.0.2"; "forever-agent-0.5.2" = self.by-version."forever-agent"."0.5.2"; - "node-uuid-1.4.1" = self.by-version."node-uuid"."1.4.1"; + "node-uuid-1.4.2" = self.by-version."node-uuid"."1.4.2"; "tough-cookie-0.12.1" = self.by-version."tough-cookie"."0.12.1"; "form-data-0.1.4" = self.by-version."form-data"."0.1.4"; "tunnel-agent-0.4.0" = self.by-version."tunnel-agent"."0.4.0"; @@ -23657,7 +24155,7 @@ "qs-1.2.2" = self.by-version."qs"."1.2.2"; "json-stringify-safe-5.0.0" = self.by-version."json-stringify-safe"."5.0.0"; "mime-types-1.0.2" = self.by-version."mime-types"."1.0.2"; - "node-uuid-1.4.1" = self.by-version."node-uuid"."1.4.1"; + "node-uuid-1.4.2" = self.by-version."node-uuid"."1.4.2"; "tunnel-agent-0.4.0" = self.by-version."tunnel-agent"."0.4.0"; "tough-cookie-0.12.1" = self.by-version."tough-cookie"."0.12.1"; "form-data-0.1.4" = self.by-version."form-data"."0.1.4"; @@ -23692,7 +24190,7 @@ "form-data-0.1.4" = self.by-version."form-data"."0.1.4"; "json-stringify-safe-5.0.0" = self.by-version."json-stringify-safe"."5.0.0"; "mime-types-1.0.2" = self.by-version."mime-types"."1.0.2"; - "node-uuid-1.4.1" = self.by-version."node-uuid"."1.4.1"; + "node-uuid-1.4.2" = self.by-version."node-uuid"."1.4.2"; "qs-2.3.3" = self.by-version."qs"."2.3.3"; "tunnel-agent-0.4.0" = self.by-version."tunnel-agent"."0.4.0"; "tough-cookie-0.12.1" = self.by-version."tough-cookie"."0.12.1"; @@ -23727,18 +24225,20 @@ ]; passthru.names = [ "request" ]; }; + by-spec."request"."2.x" = + self.by-version."request"."2.51.0"; by-spec."request".">= 2.9.153" = - self.by-version."request"."2.49.0"; + self.by-version."request"."2.51.0"; by-spec."request"."^2.36.0" = - self.by-version."request"."2.49.0"; + self.by-version."request"."2.51.0"; by-spec."request"."^2.40.0" = - self.by-version."request"."2.49.0"; + self.by-version."request"."2.51.0"; by-spec."request"."^2.47.0" = - self.by-version."request"."2.49.0"; + self.by-version."request"."2.51.0"; by-spec."request"."^2.48.0" = - self.by-version."request"."2.49.0"; + self.by-version."request"."2.51.0"; by-spec."request"."~2" = - self.by-version."request"."2.49.0"; + self.by-version."request"."2.51.0"; by-spec."request"."~2.16.2" = self.by-version."request"."2.16.6"; by-spec."request"."~2.21.0" = @@ -23765,7 +24265,7 @@ "aws-sign-0.3.0" = self.by-version."aws-sign"."0.3.0"; "oauth-sign-0.3.0" = self.by-version."oauth-sign"."0.3.0"; "cookie-jar-0.3.0" = self.by-version."cookie-jar"."0.3.0"; - "node-uuid-1.4.1" = self.by-version."node-uuid"."1.4.1"; + "node-uuid-1.4.2" = self.by-version."node-uuid"."1.4.2"; "mime-1.2.11" = self.by-version."mime"."1.2.11"; "form-data-0.0.8" = self.by-version."form-data"."0.0.8"; }; @@ -23797,7 +24297,7 @@ "aws-sign-0.3.0" = self.by-version."aws-sign"."0.3.0"; "oauth-sign-0.3.0" = self.by-version."oauth-sign"."0.3.0"; "cookie-jar-0.3.0" = self.by-version."cookie-jar"."0.3.0"; - "node-uuid-1.4.1" = self.by-version."node-uuid"."1.4.1"; + "node-uuid-1.4.2" = self.by-version."node-uuid"."1.4.2"; "mime-1.2.11" = self.by-version."mime"."1.2.11"; "form-data-0.1.4" = self.by-version."form-data"."0.1.4"; }; @@ -23805,38 +24305,6 @@ ]; passthru.names = [ "request" ]; }; - by-spec."request"."~2.30.0" = - self.by-version."request"."2.30.0"; - by-version."request"."2.30.0" = lib.makeOverridable self.buildNodePackage { - name = "request-2.30.0"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/request/-/request-2.30.0.tgz"; - name = "request-2.30.0.tgz"; - sha1 = "8e0d36f0806e8911524b072b64c5ee535a09d861"; - }) - ]; - buildInputs = - (self.nativeDeps."request" or []); - deps = { - "qs-0.6.6" = self.by-version."qs"."0.6.6"; - "json-stringify-safe-5.0.0" = self.by-version."json-stringify-safe"."5.0.0"; - "forever-agent-0.5.2" = self.by-version."forever-agent"."0.5.2"; - "node-uuid-1.4.1" = self.by-version."node-uuid"."1.4.1"; - "mime-1.2.11" = self.by-version."mime"."1.2.11"; - "tough-cookie-0.9.15" = self.by-version."tough-cookie"."0.9.15"; - "form-data-0.1.4" = self.by-version."form-data"."0.1.4"; - "tunnel-agent-0.3.0" = self.by-version."tunnel-agent"."0.3.0"; - "http-signature-0.10.0" = self.by-version."http-signature"."0.10.0"; - "oauth-sign-0.3.0" = self.by-version."oauth-sign"."0.3.0"; - "hawk-1.0.0" = self.by-version."hawk"."1.0.0"; - "aws-sign2-0.5.0" = self.by-version."aws-sign2"."0.5.0"; - }; - peerDependencies = [ - ]; - passthru.names = [ "request" ]; - }; by-spec."request"."~2.40.0" = self.by-version."request"."2.40.0"; by-spec."request"."~2.42.0" = @@ -23862,7 +24330,7 @@ "form-data-0.1.4" = self.by-version."form-data"."0.1.4"; "json-stringify-safe-5.0.0" = self.by-version."json-stringify-safe"."5.0.0"; "mime-types-1.0.2" = self.by-version."mime-types"."1.0.2"; - "node-uuid-1.4.1" = self.by-version."node-uuid"."1.4.1"; + "node-uuid-1.4.2" = self.by-version."node-uuid"."1.4.2"; "qs-1.2.2" = self.by-version."qs"."1.2.2"; "tunnel-agent-0.4.0" = self.by-version."tunnel-agent"."0.4.0"; "tough-cookie-0.12.1" = self.by-version."tough-cookie"."0.12.1"; @@ -23897,7 +24365,7 @@ "form-data-0.1.4" = self.by-version."form-data"."0.1.4"; "json-stringify-safe-5.0.0" = self.by-version."json-stringify-safe"."5.0.0"; "mime-types-1.0.2" = self.by-version."mime-types"."1.0.2"; - "node-uuid-1.4.1" = self.by-version."node-uuid"."1.4.1"; + "node-uuid-1.4.2" = self.by-version."node-uuid"."1.4.2"; "qs-2.3.3" = self.by-version."qs"."2.3.3"; "tunnel-agent-0.4.0" = self.by-version."tunnel-agent"."0.4.0"; "tough-cookie-0.12.1" = self.by-version."tough-cookie"."0.12.1"; @@ -23912,6 +24380,8 @@ ]; passthru.names = [ "request" ]; }; + by-spec."request"."~2.51.0" = + self.by-version."request"."2.51.0"; by-spec."request-progress"."0.3.0" = self.by-version."request-progress"."0.3.0"; by-version."request-progress"."0.3.0" = lib.makeOverridable self.buildNodePackage { @@ -24017,7 +24487,7 @@ ]; passthru.names = [ "resolve" ]; }; - by-spec."resolve"."0.7.4" = + by-spec."resolve"."0.7.x" = self.by-version."resolve"."0.7.4"; by-version."resolve"."0.7.4" = lib.makeOverridable self.buildNodePackage { name = "resolve-0.7.4"; @@ -24037,8 +24507,26 @@ ]; passthru.names = [ "resolve" ]; }; - by-spec."resolve"."0.7.x" = - self.by-version."resolve"."0.7.4"; + by-spec."resolve"."1.0.0" = + self.by-version."resolve"."1.0.0"; + by-version."resolve"."1.0.0" = lib.makeOverridable self.buildNodePackage { + name = "resolve-1.0.0"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/resolve/-/resolve-1.0.0.tgz"; + name = "resolve-1.0.0.tgz"; + sha1 = "2a6e3b314dcd57c6519e8e2282af8687e8de61c6"; + }) + ]; + buildInputs = + (self.nativeDeps."resolve" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "resolve" ]; + }; by-spec."resolve"."~0.3.0" = self.by-version."resolve"."0.3.1"; by-version."resolve"."0.3.1" = lib.makeOverridable self.buildNodePackage { @@ -24071,24 +24559,6 @@ self.by-version."resolve"."0.7.4"; by-spec."resolve"."~1.0.0" = self.by-version."resolve"."1.0.0"; - by-version."resolve"."1.0.0" = lib.makeOverridable self.buildNodePackage { - name = "resolve-1.0.0"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/resolve/-/resolve-1.0.0.tgz"; - name = "resolve-1.0.0.tgz"; - sha1 = "2a6e3b314dcd57c6519e8e2282af8687e8de61c6"; - }) - ]; - buildInputs = - (self.nativeDeps."resolve" or []); - deps = { - }; - peerDependencies = [ - ]; - passthru.names = [ "resolve" ]; - }; by-spec."response-time"."1.0.0" = self.by-version."response-time"."1.0.0"; by-version."response-time"."1.0.0" = lib.makeOverridable self.buildNodePackage { @@ -24204,7 +24674,7 @@ buildInputs = (self.nativeDeps."rethinkdb" or []); deps = { - "bluebird-2.3.11" = self.by-version."bluebird"."2.3.11"; + "bluebird-2.4.0" = self.by-version."bluebird"."2.4.0"; }; peerDependencies = [ ]; @@ -24438,6 +24908,26 @@ ]; passthru.names = [ "ruglify" ]; }; + by-spec."run-applescript"."^1.0.0" = + self.by-version."run-applescript"."1.0.1"; + by-version."run-applescript"."1.0.1" = lib.makeOverridable self.buildNodePackage { + name = "run-applescript-1.0.1"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/run-applescript/-/run-applescript-1.0.1.tgz"; + name = "run-applescript-1.0.1.tgz"; + sha1 = "9f0be74a910dcea702caba65f747563706e86fe2"; + }) + ]; + buildInputs = + (self.nativeDeps."run-applescript" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "run-applescript" ]; + }; by-spec."run-parallel"."^1.0.0" = self.by-version."run-parallel"."1.0.0"; by-version."run-parallel"."1.0.0" = lib.makeOverridable self.buildNodePackage { @@ -24458,6 +24948,26 @@ ]; passthru.names = [ "run-parallel" ]; }; + by-spec."run-series"."^1.0.2" = + self.by-version."run-series"."1.0.2"; + by-version."run-series"."1.0.2" = lib.makeOverridable self.buildNodePackage { + name = "run-series-1.0.2"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/run-series/-/run-series-1.0.2.tgz"; + name = "run-series-1.0.2.tgz"; + sha1 = "63d0d361b9aa2509c85bd790810a8bd9d302bc8e"; + }) + ]; + buildInputs = + (self.nativeDeps."run-series" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "run-series" ]; + }; by-spec."rusha-browserify"."^0.7.3" = self.by-version."rusha-browserify"."0.7.3"; by-version."rusha-browserify"."0.7.3" = lib.makeOverridable self.buildNodePackage { @@ -24479,15 +24989,15 @@ passthru.names = [ "rusha-browserify" ]; }; by-spec."rx"."^2.2.27" = - self.by-version."rx"."2.3.18"; - by-version."rx"."2.3.18" = lib.makeOverridable self.buildNodePackage { - name = "rx-2.3.18"; + self.by-version."rx"."2.3.22"; + by-version."rx"."2.3.22" = lib.makeOverridable self.buildNodePackage { + name = "rx-2.3.22"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/rx/-/rx-2.3.18.tgz"; - name = "rx-2.3.18.tgz"; - sha1 = "4ae726e3d770db47f070b532f9840c717b2385ba"; + url = "http://registry.npmjs.org/rx/-/rx-2.3.22.tgz"; + name = "rx-2.3.22.tgz"; + sha1 = "031fba769eaba0b74dbad2f0e7aeaed9b1b8199d"; }) ]; buildInputs = @@ -24528,15 +25038,15 @@ }; "s3http" = self.by-version."s3http"."0.0.5"; by-spec."samsam"."~1.1" = - self.by-version."samsam"."1.1.1"; - by-version."samsam"."1.1.1" = lib.makeOverridable self.buildNodePackage { - name = "samsam-1.1.1"; + self.by-version."samsam"."1.1.2"; + by-version."samsam"."1.1.2" = lib.makeOverridable self.buildNodePackage { + name = "samsam-1.1.2"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/samsam/-/samsam-1.1.1.tgz"; - name = "samsam-1.1.1.tgz"; - sha1 = "48d64ee2a7aecaaeccebe2f0a68a49687d3a49b1"; + url = "http://registry.npmjs.org/samsam/-/samsam-1.1.2.tgz"; + name = "samsam-1.1.2.tgz"; + sha1 = "bec11fdc83a9fda063401210e40176c3024d1567"; }) ]; buildInputs = @@ -24740,15 +25250,15 @@ }; "selenium-webdriver" = self.by-version."selenium-webdriver"."2.44.0"; by-spec."semver"."*" = - self.by-version."semver"."4.1.0"; - by-version."semver"."4.1.0" = lib.makeOverridable self.buildNodePackage { - name = "semver-4.1.0"; + self.by-version."semver"."4.1.1"; + by-version."semver"."4.1.1" = lib.makeOverridable self.buildNodePackage { + name = "semver-4.1.1"; bin = true; src = [ (fetchurl { - url = "http://registry.npmjs.org/semver/-/semver-4.1.0.tgz"; - name = "semver-4.1.0.tgz"; - sha1 = "bc80a9ff68532814362cc3cfda3c7b75ed9c321c"; + url = "http://registry.npmjs.org/semver/-/semver-4.1.1.tgz"; + name = "semver-4.1.1.tgz"; + sha1 = "8d63e2e90df847e626d48ae068cd65786b0ed3d3"; }) ]; buildInputs = @@ -24759,7 +25269,7 @@ ]; passthru.names = [ "semver" ]; }; - "semver" = self.by-version."semver"."4.1.0"; + "semver" = self.by-version."semver"."4.1.1"; by-spec."semver"."1.1.0" = self.by-version."semver"."1.1.0"; by-version."semver"."1.1.0" = lib.makeOverridable self.buildNodePackage { @@ -24821,9 +25331,9 @@ passthru.names = [ "semver" ]; }; by-spec."semver"."2 >=2.2.1 || 3.x || 4" = - self.by-version."semver"."4.1.0"; + self.by-version."semver"."4.1.1"; by-spec."semver"."2 || 3 || 4" = - self.by-version."semver"."4.1.0"; + self.by-version."semver"."4.1.1"; by-spec."semver"."2.0.11" = self.by-version."semver"."2.0.11"; by-version."semver"."2.0.11" = lib.makeOverridable self.buildNodePackage { @@ -24844,16 +25354,34 @@ ]; passthru.names = [ "semver" ]; }; - by-spec."semver"."2.2.x" = - self.by-version."semver"."2.2.1"; - by-version."semver"."2.2.1" = lib.makeOverridable self.buildNodePackage { - name = "semver-2.2.1"; + by-spec."semver"."2.x" = + self.by-version."semver"."2.3.2"; + by-spec."semver"."2.x || 3.x || 4" = + self.by-version."semver"."4.1.1"; + by-spec."semver"."4" = + self.by-version."semver"."4.1.1"; + by-spec."semver"."4.1.x" = + self.by-version."semver"."4.1.1"; + by-spec."semver".">=2.0.10 <3.0.0" = + self.by-version."semver"."2.3.2"; + by-spec."semver".">=2.2.1 <3" = + self.by-version."semver"."2.3.2"; + by-spec."semver"."^2.2.1" = + self.by-version."semver"."2.3.2"; + by-spec."semver"."^2.3.0" = + self.by-version."semver"."2.3.2"; + by-spec."semver"."^2.3.0 || 3.x || 4" = + self.by-version."semver"."4.1.1"; + by-spec."semver"."^3.0.1" = + self.by-version."semver"."3.0.1"; + by-version."semver"."3.0.1" = lib.makeOverridable self.buildNodePackage { + name = "semver-3.0.1"; bin = true; src = [ (fetchurl { - url = "http://registry.npmjs.org/semver/-/semver-2.2.1.tgz"; - name = "semver-2.2.1.tgz"; - sha1 = "7941182b3ffcc580bff1c17942acdf7951c0d213"; + url = "http://registry.npmjs.org/semver/-/semver-3.0.1.tgz"; + name = "semver-3.0.1.tgz"; + sha1 = "720ac012515a252f91fb0dd2e99a56a70d6cf078"; }) ]; buildInputs = @@ -24864,24 +25392,10 @@ ]; passthru.names = [ "semver" ]; }; - by-spec."semver"."2.x" = - self.by-version."semver"."2.3.2"; - by-spec."semver"."2.x || 3.x || 4" = - self.by-version."semver"."4.1.0"; - by-spec."semver"."4" = - self.by-version."semver"."4.1.0"; - by-spec."semver".">=2.0.10 <3.0.0" = - self.by-version."semver"."2.3.2"; - by-spec."semver".">=2.2.1 <3" = - self.by-version."semver"."2.3.2"; - by-spec."semver"."^2.2.1" = - self.by-version."semver"."2.3.2"; - by-spec."semver"."^2.3.0" = - self.by-version."semver"."2.3.2"; - by-spec."semver"."^2.3.0 || 3.x || 4" = - self.by-version."semver"."4.1.0"; + by-spec."semver"."^4.0.0" = + self.by-version."semver"."4.1.1"; by-spec."semver"."^4.1.0" = - self.by-version."semver"."4.1.0"; + self.by-version."semver"."4.1.1"; by-spec."semver"."~1.1.4" = self.by-version."semver"."1.1.4"; by-spec."semver"."~2.0.5" = @@ -24912,10 +25426,30 @@ self.by-version."semver"."2.1.0"; by-spec."semver"."~2.2.1" = self.by-version."semver"."2.2.1"; + by-version."semver"."2.2.1" = lib.makeOverridable self.buildNodePackage { + name = "semver-2.2.1"; + bin = true; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/semver/-/semver-2.2.1.tgz"; + name = "semver-2.2.1.tgz"; + sha1 = "7941182b3ffcc580bff1c17942acdf7951c0d213"; + }) + ]; + buildInputs = + (self.nativeDeps."semver" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "semver" ]; + }; by-spec."semver"."~2.3.0" = self.by-version."semver"."2.3.2"; by-spec."semver"."~4.1.0" = - self.by-version."semver"."4.1.0"; + self.by-version."semver"."4.1.1"; + by-spec."semver"."~4.1.1" = + self.by-version."semver"."4.1.1"; by-spec."semver-diff"."^0.1.0" = self.by-version."semver-diff"."0.1.0"; by-version."semver-diff"."0.1.0" = lib.makeOverridable self.buildNodePackage { @@ -24937,6 +25471,27 @@ ]; passthru.names = [ "semver-diff" ]; }; + by-spec."semver-diff"."^2.0.0" = + self.by-version."semver-diff"."2.0.0"; + by-version."semver-diff"."2.0.0" = lib.makeOverridable self.buildNodePackage { + name = "semver-diff-2.0.0"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/semver-diff/-/semver-diff-2.0.0.tgz"; + name = "semver-diff-2.0.0.tgz"; + sha1 = "d43024f91aa7843937dc1379002766809f7480d2"; + }) + ]; + buildInputs = + (self.nativeDeps."semver-diff" or []); + deps = { + "semver-4.1.1" = self.by-version."semver"."4.1.1"; + }; + peerDependencies = [ + ]; + passthru.names = [ "semver-diff" ]; + }; by-spec."send"."*" = self.by-version."send"."0.10.1"; by-version."send"."0.10.1" = lib.makeOverridable self.buildNodePackage { @@ -25041,30 +25596,6 @@ }; by-spec."send"."0.10.1" = self.by-version."send"."0.10.1"; - by-spec."send"."0.2.0" = - self.by-version."send"."0.2.0"; - by-version."send"."0.2.0" = lib.makeOverridable self.buildNodePackage { - name = "send-0.2.0"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/send/-/send-0.2.0.tgz"; - name = "send-0.2.0.tgz"; - sha1 = "067abf45cff8bffb29cbdb7439725b32388a2c58"; - }) - ]; - buildInputs = - (self.nativeDeps."send" or []); - deps = { - "debug-2.1.0" = self.by-version."debug"."2.1.0"; - "mime-1.2.11" = self.by-version."mime"."1.2.11"; - "fresh-0.2.4" = self.by-version."fresh"."0.2.4"; - "range-parser-1.0.2" = self.by-version."range-parser"."1.0.2"; - }; - peerDependencies = [ - ]; - passthru.names = [ "send" ]; - }; by-spec."send"."0.3.0" = self.by-version."send"."0.3.0"; by-version."send"."0.3.0" = lib.makeOverridable self.buildNodePackage { @@ -25162,6 +25693,30 @@ ]; passthru.names = [ "sequencify" ]; }; + by-spec."serve-favicon"."^2.1.1" = + self.by-version."serve-favicon"."2.2.0"; + by-version."serve-favicon"."2.2.0" = lib.makeOverridable self.buildNodePackage { + name = "serve-favicon-2.2.0"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/serve-favicon/-/serve-favicon-2.2.0.tgz"; + name = "serve-favicon-2.2.0.tgz"; + sha1 = "a0c25ee8a652e1a638a67db46269cd52a8705858"; + }) + ]; + buildInputs = + (self.nativeDeps."serve-favicon" or []); + deps = { + "etag-1.5.1" = self.by-version."etag"."1.5.1"; + "fresh-0.2.4" = self.by-version."fresh"."0.2.4"; + "ms-0.7.0" = self.by-version."ms"."0.7.0"; + "parseurl-1.3.0" = self.by-version."parseurl"."1.3.0"; + }; + peerDependencies = [ + ]; + passthru.names = [ "serve-favicon" ]; + }; by-spec."serve-favicon"."~2.1.5" = self.by-version."serve-favicon"."2.1.7"; by-version."serve-favicon"."2.1.7" = lib.makeOverridable self.buildNodePackage { @@ -25224,7 +25779,7 @@ buildInputs = (self.nativeDeps."serve-index" or []); deps = { - "accepts-1.1.3" = self.by-version."accepts"."1.1.3"; + "accepts-1.1.4" = self.by-version."accepts"."1.1.4"; "batch-0.5.1" = self.by-version."batch"."0.5.1"; "debug-2.0.0" = self.by-version."debug"."2.0.0"; "parseurl-1.3.0" = self.by-version."parseurl"."1.3.0"; @@ -25233,53 +25788,32 @@ ]; passthru.names = [ "serve-index" ]; }; - by-spec."serve-index"."~1.5.1" = - self.by-version."serve-index"."1.5.1"; - by-version."serve-index"."1.5.1" = lib.makeOverridable self.buildNodePackage { - name = "serve-index-1.5.1"; + by-spec."serve-index"."~1.5.3" = + self.by-version."serve-index"."1.5.3"; + by-version."serve-index"."1.5.3" = lib.makeOverridable self.buildNodePackage { + name = "serve-index-1.5.3"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/serve-index/-/serve-index-1.5.1.tgz"; - name = "serve-index-1.5.1.tgz"; - sha1 = "11e2cec8b7cdc801a8a766ebf36c1372c956e84a"; + url = "http://registry.npmjs.org/serve-index/-/serve-index-1.5.3.tgz"; + name = "serve-index-1.5.3.tgz"; + sha1 = "412cbc82bf6e2b97ba3247166cd1f425404e75e7"; }) ]; buildInputs = (self.nativeDeps."serve-index" or []); deps = { - "accepts-1.1.3" = self.by-version."accepts"."1.1.3"; + "accepts-1.1.4" = self.by-version."accepts"."1.1.4"; "batch-0.5.1" = self.by-version."batch"."0.5.1"; "debug-2.1.0" = self.by-version."debug"."2.1.0"; - "http-errors-1.2.7" = self.by-version."http-errors"."1.2.7"; - "mime-types-2.0.3" = self.by-version."mime-types"."2.0.3"; + "http-errors-1.2.8" = self.by-version."http-errors"."1.2.8"; + "mime-types-2.0.4" = self.by-version."mime-types"."2.0.4"; "parseurl-1.3.0" = self.by-version."parseurl"."1.3.0"; }; peerDependencies = [ ]; passthru.names = [ "serve-index" ]; }; - by-spec."serve-static"."1.0.1" = - self.by-version."serve-static"."1.0.1"; - by-version."serve-static"."1.0.1" = lib.makeOverridable self.buildNodePackage { - name = "serve-static-1.0.1"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/serve-static/-/serve-static-1.0.1.tgz"; - name = "serve-static-1.0.1.tgz"; - sha1 = "10dcbfd44b3e0291a131fc9ab4ab25a9f5a78a42"; - }) - ]; - buildInputs = - (self.nativeDeps."serve-static" or []); - deps = { - "send-0.1.4" = self.by-version."send"."0.1.4"; - }; - peerDependencies = [ - ]; - passthru.names = [ "serve-static" ]; - }; by-spec."serve-static"."1.1.0" = self.by-version."serve-static"."1.1.0"; by-version."serve-static"."1.1.0" = lib.makeOverridable self.buildNodePackage { @@ -25370,6 +25904,26 @@ ]; passthru.names = [ "setimmediate" ]; }; + by-spec."setimmediate"."^1.0.2" = + self.by-version."setimmediate"."1.0.2"; + by-version."setimmediate"."1.0.2" = lib.makeOverridable self.buildNodePackage { + name = "setimmediate-1.0.2"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/setimmediate/-/setimmediate-1.0.2.tgz"; + name = "setimmediate-1.0.2.tgz"; + sha1 = "d8221c4fdfeb2561556c5184fa05fb7ce0af73bd"; + }) + ]; + buildInputs = + (self.nativeDeps."setimmediate" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "setimmediate" ]; + }; by-spec."sha"."~1.0.1" = self.by-version."sha"."1.0.1"; by-version."sha"."1.0.1" = lib.makeOverridable self.buildNodePackage { @@ -25391,28 +25945,6 @@ ]; passthru.names = [ "sha" ]; }; - by-spec."sha"."~1.2.1" = - self.by-version."sha"."1.2.4"; - by-version."sha"."1.2.4" = lib.makeOverridable self.buildNodePackage { - name = "sha-1.2.4"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/sha/-/sha-1.2.4.tgz"; - name = "sha-1.2.4.tgz"; - sha1 = "1f9a377f27b6fdee409b9b858e43da702be48a4d"; - }) - ]; - buildInputs = - (self.nativeDeps."sha" or []); - deps = { - "graceful-fs-3.0.5" = self.by-version."graceful-fs"."3.0.5"; - "readable-stream-1.0.33" = self.by-version."readable-stream"."1.0.33"; - }; - peerDependencies = [ - ]; - passthru.names = [ "sha" ]; - }; by-spec."sha"."~1.3.0" = self.by-version."sha"."1.3.0"; by-version."sha"."1.3.0" = lib.makeOverridable self.buildNodePackage { @@ -25566,80 +26098,80 @@ by-spec."shelljs"."0.3.x" = self.by-version."shelljs"."0.3.0"; by-spec."should"."*" = - self.by-version."should"."4.3.0"; - by-version."should"."4.3.0" = lib.makeOverridable self.buildNodePackage { - name = "should-4.3.0"; + self.by-version."should"."4.4.1"; + by-version."should"."4.4.1" = lib.makeOverridable self.buildNodePackage { + name = "should-4.4.1"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/should/-/should-4.3.0.tgz"; - name = "should-4.3.0.tgz"; - sha1 = "6fd50fadf9b54134a352f2fd74657b1e97231ad6"; + url = "http://registry.npmjs.org/should/-/should-4.4.1.tgz"; + name = "should-4.4.1.tgz"; + sha1 = "15063e66f23797046bd5e478bade00adb4b6b37b"; }) ]; buildInputs = (self.nativeDeps."should" or []); deps = { - "should-equal-0.1.0" = self.by-version."should-equal"."0.1.0"; - "should-format-0.0.2" = self.by-version."should-format"."0.0.2"; + "should-equal-0.2.3" = self.by-version."should-equal"."0.2.3"; + "should-format-0.0.5" = self.by-version."should-format"."0.0.5"; }; peerDependencies = [ ]; passthru.names = [ "should" ]; }; - "should" = self.by-version."should"."4.3.0"; - by-spec."should-equal"."0.1.0" = - self.by-version."should-equal"."0.1.0"; - by-version."should-equal"."0.1.0" = lib.makeOverridable self.buildNodePackage { - name = "should-equal-0.1.0"; + "should" = self.by-version."should"."4.4.1"; + by-spec."should-equal"."0.2.3" = + self.by-version."should-equal"."0.2.3"; + by-version."should-equal"."0.2.3" = lib.makeOverridable self.buildNodePackage { + name = "should-equal-0.2.3"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/should-equal/-/should-equal-0.1.0.tgz"; - name = "should-equal-0.1.0.tgz"; - sha1 = "6db4a398a0d5a1a5806350b1de8cb4e964071dab"; + url = "http://registry.npmjs.org/should-equal/-/should-equal-0.2.3.tgz"; + name = "should-equal-0.2.3.tgz"; + sha1 = "d14c3336ebeeb6ff3c13a5a646fa1f2c39957ed9"; }) ]; buildInputs = (self.nativeDeps."should-equal" or []); deps = { - "should-type-0.0.1" = self.by-version."should-type"."0.0.1"; + "should-type-0.0.3" = self.by-version."should-type"."0.0.3"; }; peerDependencies = [ ]; passthru.names = [ "should-equal" ]; }; - by-spec."should-format"."0.0.2" = - self.by-version."should-format"."0.0.2"; - by-version."should-format"."0.0.2" = lib.makeOverridable self.buildNodePackage { - name = "should-format-0.0.2"; + by-spec."should-format"."0.0.5" = + self.by-version."should-format"."0.0.5"; + by-version."should-format"."0.0.5" = lib.makeOverridable self.buildNodePackage { + name = "should-format-0.0.5"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/should-format/-/should-format-0.0.2.tgz"; - name = "should-format-0.0.2.tgz"; - sha1 = "5c058691a1d6177f8b8fa8b8bba0b38cc05d346f"; + url = "http://registry.npmjs.org/should-format/-/should-format-0.0.5.tgz"; + name = "should-format-0.0.5.tgz"; + sha1 = "77f4f9546495632310aae14adfec82416e18d0d9"; }) ]; buildInputs = (self.nativeDeps."should-format" or []); deps = { - "should-type-0.0.1" = self.by-version."should-type"."0.0.1"; + "should-type-0.0.3" = self.by-version."should-type"."0.0.3"; }; peerDependencies = [ ]; passthru.names = [ "should-format" ]; }; - by-spec."should-type"."0.0.1" = - self.by-version."should-type"."0.0.1"; - by-version."should-type"."0.0.1" = lib.makeOverridable self.buildNodePackage { - name = "should-type-0.0.1"; + by-spec."should-type"."0.0.3" = + self.by-version."should-type"."0.0.3"; + by-version."should-type"."0.0.3" = lib.makeOverridable self.buildNodePackage { + name = "should-type-0.0.3"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/should-type/-/should-type-0.0.1.tgz"; - name = "should-type-0.0.1.tgz"; - sha1 = "ec62a4eae75cabfab3734cd9925da49773cb9be8"; + url = "http://registry.npmjs.org/should-type/-/should-type-0.0.3.tgz"; + name = "should-type-0.0.3.tgz"; + sha1 = "de19d7ea791ce02a191cffcc168bf3691c9e7680"; }) ]; buildInputs = @@ -25737,15 +26269,15 @@ passthru.names = [ "simplesmtp" ]; }; by-spec."sinon"."*" = - self.by-version."sinon"."1.12.1"; - by-version."sinon"."1.12.1" = lib.makeOverridable self.buildNodePackage { - name = "sinon-1.12.1"; + self.by-version."sinon"."1.12.2"; + by-version."sinon"."1.12.2" = lib.makeOverridable self.buildNodePackage { + name = "sinon-1.12.2"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/sinon/-/sinon-1.12.1.tgz"; - name = "sinon-1.12.1.tgz"; - sha1 = "c51a7d083e9992854bb99519faf5c25c9a04009a"; + url = "http://registry.npmjs.org/sinon/-/sinon-1.12.2.tgz"; + name = "sinon-1.12.2.tgz"; + sha1 = "dd893d1f93bfa652ae7c2a08c6eaa42898452c94"; }) ]; buildInputs = @@ -25759,7 +26291,7 @@ ]; passthru.names = [ "sinon" ]; }; - "sinon" = self.by-version."sinon"."1.12.1"; + "sinon" = self.by-version."sinon"."1.12.2"; by-spec."slasp"."*" = self.by-version."slasp"."0.0.4"; by-version."slasp"."0.0.4" = lib.makeOverridable self.buildNodePackage { @@ -25869,35 +26401,33 @@ self.by-version."slide"."1.1.6"; by-spec."slide"."~1.1.4" = self.by-version."slide"."1.1.6"; - by-spec."slide"."~1.1.5" = - self.by-version."slide"."1.1.6"; by-spec."slide"."~1.1.6" = self.by-version."slide"."1.1.6"; by-spec."sloc"."*" = - self.by-version."sloc"."0.1.7"; - by-version."sloc"."0.1.7" = lib.makeOverridable self.buildNodePackage { - name = "sloc-0.1.7"; + self.by-version."sloc"."0.1.9"; + by-version."sloc"."0.1.9" = lib.makeOverridable self.buildNodePackage { + name = "sloc-0.1.9"; bin = true; src = [ (fetchurl { - url = "http://registry.npmjs.org/sloc/-/sloc-0.1.7.tgz"; - name = "sloc-0.1.7.tgz"; - sha1 = "57dee8c946d54cea5188b70cd6549a22e0615679"; + url = "http://registry.npmjs.org/sloc/-/sloc-0.1.9.tgz"; + name = "sloc-0.1.9.tgz"; + sha1 = "af12b4f713d079c65056435fe67ff11580770873"; }) ]; buildInputs = (self.nativeDeps."sloc" or []); deps = { - "commander-2.3.0" = self.by-version."commander"."2.3.0"; + "commander-2.5.1" = self.by-version."commander"."2.5.1"; "async-0.9.0" = self.by-version."async"."0.9.0"; "cli-table-0.3.1" = self.by-version."cli-table"."0.3.1"; - "readdirp-1.1.0" = self.by-version."readdirp"."1.1.0"; + "readdirp-1.3.0" = self.by-version."readdirp"."1.3.0"; }; peerDependencies = [ ]; passthru.names = [ "sloc" ]; }; - "sloc" = self.by-version."sloc"."0.1.7"; + "sloc" = self.by-version."sloc"."0.1.9"; by-spec."smartdc"."*" = self.by-version."smartdc"."7.3.0"; by-version."smartdc"."7.3.0" = lib.makeOverridable self.buildNodePackage { @@ -26112,7 +26642,7 @@ (self.nativeDeps."sockjs" or []); deps = { "faye-websocket-0.8.1" = self.by-version."faye-websocket"."0.8.1"; - "node-uuid-1.4.1" = self.by-version."node-uuid"."1.4.1"; + "node-uuid-1.4.2" = self.by-version."node-uuid"."1.4.2"; }; peerDependencies = [ ]; @@ -26140,15 +26670,15 @@ passthru.names = [ "sorted-object" ]; }; by-spec."source-map"."*" = - self.by-version."source-map"."0.1.40"; - by-version."source-map"."0.1.40" = lib.makeOverridable self.buildNodePackage { - name = "source-map-0.1.40"; + self.by-version."source-map"."0.1.41"; + by-version."source-map"."0.1.41" = lib.makeOverridable self.buildNodePackage { + name = "source-map-0.1.41"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/source-map/-/source-map-0.1.40.tgz"; - name = "source-map-0.1.40.tgz"; - sha1 = "7e0ee49ec0452aa9ac2b93ad5ae54ef33e82b37f"; + url = "http://registry.npmjs.org/source-map/-/source-map-0.1.41.tgz"; + name = "source-map-0.1.41.tgz"; + sha1 = "d6cc9c8a9bb5d995dc69b38457bd4b1747327f5a"; }) ]; buildInputs = @@ -26160,7 +26690,7 @@ ]; passthru.names = [ "source-map" ]; }; - "source-map" = self.by-version."source-map"."0.1.40"; + "source-map" = self.by-version."source-map"."0.1.41"; by-spec."source-map"."0.1.31" = self.by-version."source-map"."0.1.31"; by-version."source-map"."0.1.31" = lib.makeOverridable self.buildNodePackage { @@ -26204,21 +26734,21 @@ passthru.names = [ "source-map" ]; }; by-spec."source-map"."0.1.x" = - self.by-version."source-map"."0.1.40"; + self.by-version."source-map"."0.1.41"; by-spec."source-map".">= 0.1.2" = - self.by-version."source-map"."0.1.40"; + self.by-version."source-map"."0.1.41"; by-spec."source-map"."^0.1.x" = - self.by-version."source-map"."0.1.40"; + self.by-version."source-map"."0.1.41"; by-spec."source-map"."~0.1.30" = - self.by-version."source-map"."0.1.40"; + self.by-version."source-map"."0.1.41"; by-spec."source-map"."~0.1.31" = - self.by-version."source-map"."0.1.40"; + self.by-version."source-map"."0.1.41"; by-spec."source-map"."~0.1.33" = - self.by-version."source-map"."0.1.40"; - by-spec."source-map"."~0.1.37" = - self.by-version."source-map"."0.1.40"; + self.by-version."source-map"."0.1.41"; + by-spec."source-map"."~0.1.40" = + self.by-version."source-map"."0.1.41"; by-spec."source-map"."~0.1.7" = - self.by-version."source-map"."0.1.40"; + self.by-version."source-map"."0.1.41"; by-spec."spdy"."1.7.1" = self.by-version."spdy"."1.7.1"; by-version."spdy"."1.7.1" = lib.makeOverridable self.buildNodePackage { @@ -26260,15 +26790,15 @@ passthru.names = [ "speedometer" ]; }; by-spec."sprintf"."~0.1.2" = - self.by-version."sprintf"."0.1.4"; - by-version."sprintf"."0.1.4" = lib.makeOverridable self.buildNodePackage { - name = "sprintf-0.1.4"; + self.by-version."sprintf"."0.1.5"; + by-version."sprintf"."0.1.5" = lib.makeOverridable self.buildNodePackage { + name = "sprintf-0.1.5"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/sprintf/-/sprintf-0.1.4.tgz"; - name = "sprintf-0.1.4.tgz"; - sha1 = "6f870a8f4aae1c7fe53eee02b6ca31aa2d78863b"; + url = "http://registry.npmjs.org/sprintf/-/sprintf-0.1.5.tgz"; + name = "sprintf-0.1.5.tgz"; + sha1 = "8f83e39a9317c1a502cb7db8050e51c679f6edcf"; }) ]; buildInputs = @@ -26280,9 +26810,9 @@ passthru.names = [ "sprintf" ]; }; by-spec."sprintf"."~0.1.3" = - self.by-version."sprintf"."0.1.4"; + self.by-version."sprintf"."0.1.5"; by-spec."sprintf"."~0.1.4" = - self.by-version."sprintf"."0.1.4"; + self.by-version."sprintf"."0.1.5"; by-spec."ssh-agent"."0.2.1" = self.by-version."ssh-agent"."0.2.1"; by-version."ssh-agent"."0.2.1" = lib.makeOverridable self.buildNodePackage { @@ -26709,16 +27239,37 @@ ]; passthru.names = [ "string-length" ]; }; - by-spec."string2compact"."^1.1.1" = - self.by-version."string2compact"."1.2.0"; - by-version."string2compact"."1.2.0" = lib.makeOverridable self.buildNodePackage { - name = "string2compact-1.2.0"; + by-spec."string-length"."^1.0.0" = + self.by-version."string-length"."1.0.0"; + by-version."string-length"."1.0.0" = lib.makeOverridable self.buildNodePackage { + name = "string-length-1.0.0"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/string2compact/-/string2compact-1.2.0.tgz"; - name = "string2compact-1.2.0.tgz"; - sha1 = "ecf1fcd84c9f8fc0562f818b06422f60f588b01e"; + url = "http://registry.npmjs.org/string-length/-/string-length-1.0.0.tgz"; + name = "string-length-1.0.0.tgz"; + sha1 = "5f0564b174feb299595a763da71513266370d3a9"; + }) + ]; + buildInputs = + (self.nativeDeps."string-length" or []); + deps = { + "strip-ansi-2.0.0" = self.by-version."strip-ansi"."2.0.0"; + }; + peerDependencies = [ + ]; + passthru.names = [ "string-length" ]; + }; + by-spec."string2compact"."^1.1.1" = + self.by-version."string2compact"."1.2.1"; + by-version."string2compact"."1.2.1" = lib.makeOverridable self.buildNodePackage { + name = "string2compact-1.2.1"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/string2compact/-/string2compact-1.2.1.tgz"; + name = "string2compact-1.2.1.tgz"; + sha1 = "a560cd737415e380f2518b83c38bb97093e981af"; }) ]; buildInputs = @@ -26855,22 +27406,22 @@ ]; passthru.names = [ "strip-ansi" ]; }; - by-spec."strip-ansi"."^1.0.0" = - self.by-version."strip-ansi"."1.0.0"; - by-version."strip-ansi"."1.0.0" = lib.makeOverridable self.buildNodePackage { - name = "strip-ansi-1.0.0"; + by-spec."strip-ansi"."^2.0.0" = + self.by-version."strip-ansi"."2.0.0"; + by-version."strip-ansi"."2.0.0" = lib.makeOverridable self.buildNodePackage { + name = "strip-ansi-2.0.0"; bin = true; src = [ (fetchurl { - url = "http://registry.npmjs.org/strip-ansi/-/strip-ansi-1.0.0.tgz"; - name = "strip-ansi-1.0.0.tgz"; - sha1 = "6c021321d6ece161a3c608fbab268c7328901c73"; + url = "http://registry.npmjs.org/strip-ansi/-/strip-ansi-2.0.0.tgz"; + name = "strip-ansi-2.0.0.tgz"; + sha1 = "fa8d69432e97674746f55f51d076ae78b18df13f"; }) ]; buildInputs = (self.nativeDeps."strip-ansi" or []); deps = { - "ansi-regex-0.2.1" = self.by-version."ansi-regex"."0.2.1"; + "ansi-regex-1.1.0" = self.by-version."ansi-regex"."1.1.0"; }; peerDependencies = [ ]; @@ -26999,7 +27550,7 @@ "debug-2.1.0" = self.by-version."debug"."2.1.0"; "sax-0.5.8" = self.by-version."sax"."0.5.8"; "glob-3.2.11" = self.by-version."glob"."3.2.11"; - "source-map-0.1.40" = self.by-version."source-map"."0.1.40"; + "source-map-0.1.41" = self.by-version."source-map"."0.1.41"; }; peerDependencies = [ ]; @@ -27421,8 +27972,8 @@ self.by-version."tar"."1.0.3"; by-spec."tar"."~0.1.17" = self.by-version."tar"."0.1.20"; - by-spec."tar"."~0.1.19" = - self.by-version."tar"."0.1.20"; + by-spec."tar"."~1.0.1" = + self.by-version."tar"."1.0.3"; by-spec."tar"."~1.0.3" = self.by-version."tar"."1.0.3"; by-spec."tar-fs"."0.5.2" = @@ -27448,6 +27999,35 @@ ]; passthru.names = [ "tar-fs" ]; }; + by-spec."tar-pack"."~2.0.0" = + self.by-version."tar-pack"."2.0.0"; + by-version."tar-pack"."2.0.0" = lib.makeOverridable self.buildNodePackage { + name = "tar-pack-2.0.0"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/tar-pack/-/tar-pack-2.0.0.tgz"; + name = "tar-pack-2.0.0.tgz"; + sha1 = "c2c401c02dd366138645e917b3a6baa256a9dcab"; + }) + ]; + buildInputs = + (self.nativeDeps."tar-pack" or []); + deps = { + "uid-number-0.0.3" = self.by-version."uid-number"."0.0.3"; + "once-1.1.1" = self.by-version."once"."1.1.1"; + "debug-0.7.4" = self.by-version."debug"."0.7.4"; + "rimraf-2.2.8" = self.by-version."rimraf"."2.2.8"; + "fstream-0.1.31" = self.by-version."fstream"."0.1.31"; + "tar-0.1.20" = self.by-version."tar"."0.1.20"; + "fstream-ignore-0.0.7" = self.by-version."fstream-ignore"."0.0.7"; + "readable-stream-1.0.33" = self.by-version."readable-stream"."1.0.33"; + "graceful-fs-1.2.3" = self.by-version."graceful-fs"."1.2.3"; + }; + peerDependencies = [ + ]; + passthru.names = [ "tar-pack" ]; + }; by-spec."tar-stream"."^0.4.6" = self.by-version."tar-stream"."0.4.7"; by-version."tar-stream"."0.4.7" = lib.makeOverridable self.buildNodePackage { @@ -27564,6 +28144,48 @@ ]; passthru.names = [ "text-table" ]; }; + by-spec."thenify"."2" = + self.by-version."thenify"."2.0.0"; + by-version."thenify"."2.0.0" = lib.makeOverridable self.buildNodePackage { + name = "thenify-2.0.0"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/thenify/-/thenify-2.0.0.tgz"; + name = "thenify-2.0.0.tgz"; + sha1 = "a1c6a07b4274787c412289d4f8679b545205f186"; + }) + ]; + buildInputs = + (self.nativeDeps."thenify" or []); + deps = { + "native-or-bluebird-1.1.2" = self.by-version."native-or-bluebird"."1.1.2"; + }; + peerDependencies = [ + ]; + passthru.names = [ "thenify" ]; + }; + by-spec."thenify-all"."1" = + self.by-version."thenify-all"."1.0.0"; + by-version."thenify-all"."1.0.0" = lib.makeOverridable self.buildNodePackage { + name = "thenify-all-1.0.0"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/thenify-all/-/thenify-all-1.0.0.tgz"; + name = "thenify-all-1.0.0.tgz"; + sha1 = "3663df4aed595ff671467c0683cd74350b87e1cf"; + }) + ]; + buildInputs = + (self.nativeDeps."thenify-all" or []); + deps = { + "thenify-2.0.0" = self.by-version."thenify"."2.0.0"; + }; + peerDependencies = [ + ]; + passthru.names = [ "thenify-all" ]; + }; by-spec."thirty-two"."~0.0.1" = self.by-version."thirty-two"."0.0.2"; by-version."thirty-two"."0.0.2" = lib.makeOverridable self.buildNodePackage { @@ -27954,7 +28576,7 @@ "optimist-0.6.1" = self.by-version."optimist"."0.6.1"; "request-2.27.0" = self.by-version."request"."2.27.0"; "semver-2.2.1" = self.by-version."semver"."2.2.1"; - "sprintf-0.1.4" = self.by-version."sprintf"."0.1.4"; + "sprintf-0.1.5" = self.by-version."sprintf"."0.1.5"; "temp-0.6.0" = self.by-version."temp"."0.6.0"; "winston-0.6.2" = self.by-version."winston"."0.6.2"; "wrench-1.5.8" = self.by-version."wrench"."1.5.8"; @@ -28071,9 +28693,9 @@ deps = { "bitfield-0.1.0" = self.by-version."bitfield"."0.1.0"; "bittorrent-dht-2.6.4" = self.by-version."bittorrent-dht"."2.6.4"; - "bittorrent-tracker-2.9.1" = self.by-version."bittorrent-tracker"."2.9.1"; + "bittorrent-tracker-2.10.0" = self.by-version."bittorrent-tracker"."2.10.0"; "bncode-0.5.3" = self.by-version."bncode"."0.5.3"; - "compact2string-1.3.0" = self.by-version."compact2string"."1.3.0"; + "compact2string-1.4.0" = self.by-version."compact2string"."1.4.0"; "end-of-stream-0.1.5" = self.by-version."end-of-stream"."0.1.5"; "hat-0.0.3" = self.by-version."hat"."0.0.3"; "ip-0.3.2" = self.by-version."ip"."0.3.2"; @@ -28107,9 +28729,9 @@ deps = { "bitfield-0.1.0" = self.by-version."bitfield"."0.1.0"; "bittorrent-dht-1.5.0" = self.by-version."bittorrent-dht"."1.5.0"; - "bittorrent-tracker-2.9.1" = self.by-version."bittorrent-tracker"."2.9.1"; + "bittorrent-tracker-2.10.0" = self.by-version."bittorrent-tracker"."2.10.0"; "bncode-0.5.3" = self.by-version."bncode"."0.5.3"; - "compact2string-1.3.0" = self.by-version."compact2string"."1.3.0"; + "compact2string-1.4.0" = self.by-version."compact2string"."1.4.0"; "end-of-stream-0.1.5" = self.by-version."end-of-stream"."0.1.5"; "hat-0.0.3" = self.by-version."hat"."0.0.3"; "ip-0.3.2" = self.by-version."ip"."0.3.2"; @@ -28169,27 +28791,6 @@ }; by-spec."tough-cookie"."^0.12.1" = self.by-version."tough-cookie"."0.12.1"; - by-spec."tough-cookie"."~0.9.15" = - self.by-version."tough-cookie"."0.9.15"; - by-version."tough-cookie"."0.9.15" = lib.makeOverridable self.buildNodePackage { - name = "tough-cookie-0.9.15"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/tough-cookie/-/tough-cookie-0.9.15.tgz"; - name = "tough-cookie-0.9.15.tgz"; - sha1 = "75617ac347e3659052b0350131885829677399f6"; - }) - ]; - buildInputs = - (self.nativeDeps."tough-cookie" or []); - deps = { - "punycode-1.3.2" = self.by-version."punycode"."1.3.2"; - }; - peerDependencies = [ - ]; - passthru.names = [ "tough-cookie" ]; - }; by-spec."traceur"."0.0.55" = self.by-version."traceur"."0.0.55"; by-version."traceur"."0.0.55" = lib.makeOverridable self.buildNodePackage { @@ -28205,8 +28806,8 @@ buildInputs = (self.nativeDeps."traceur" or []); deps = { - "commander-2.5.0" = self.by-version."commander"."2.5.0"; - "glob-4.2.2" = self.by-version."glob"."4.2.2"; + "commander-2.5.1" = self.by-version."commander"."2.5.1"; + "glob-4.3.2" = self.by-version."glob"."4.3.2"; "semver-2.3.2" = self.by-version."semver"."2.3.2"; }; peerDependencies = [ @@ -28236,6 +28837,32 @@ ]; passthru.names = [ "transformers" ]; }; + by-spec."trash"."*" = + self.by-version."trash"."1.2.0"; + by-version."trash"."1.2.0" = lib.makeOverridable self.buildNodePackage { + name = "trash-1.2.0"; + bin = true; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/trash/-/trash-1.2.0.tgz"; + name = "trash-1.2.0.tgz"; + sha1 = "125a91e6a5c1608a1bc3d9f74b6310554c376619"; + }) + ]; + buildInputs = + (self.nativeDeps."trash" or []); + deps = { + "escape-string-applescript-1.0.0" = self.by-version."escape-string-applescript"."1.0.0"; + "meow-1.0.0" = self.by-version."meow"."1.0.0"; + "run-applescript-1.0.1" = self.by-version."run-applescript"."1.0.1"; + "update-notifier-0.2.2" = self.by-version."update-notifier"."0.2.2"; + "xdg-trash-1.0.5" = self.by-version."xdg-trash"."1.0.5"; + }; + peerDependencies = [ + ]; + passthru.names = [ "trash" ]; + }; + "trash" = self.by-version."trash"."1.2.0"; by-spec."traverse".">=0.3.0 <0.4" = self.by-version."traverse"."0.3.9"; by-version."traverse"."0.3.9" = lib.makeOverridable self.buildNodePackage { @@ -28356,6 +28983,27 @@ ]; passthru.names = [ "tunnel-agent" ]; }; + by-spec."type-check"."~0.3.1" = + self.by-version."type-check"."0.3.1"; + by-version."type-check"."0.3.1" = lib.makeOverridable self.buildNodePackage { + name = "type-check-0.3.1"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/type-check/-/type-check-0.3.1.tgz"; + name = "type-check-0.3.1.tgz"; + sha1 = "9233923c4da174d0ac5480ecfd6ef84c349eb58d"; + }) + ]; + buildInputs = + (self.nativeDeps."type-check" or []); + deps = { + "prelude-ls-1.1.1" = self.by-version."prelude-ls"."1.1.1"; + }; + peerDependencies = [ + ]; + passthru.names = [ "type-check" ]; + }; by-spec."type-detect"."0.1.1" = self.by-version."type-detect"."0.1.1"; by-version."type-detect"."0.1.1" = lib.makeOverridable self.buildNodePackage { @@ -28376,53 +29024,34 @@ ]; passthru.names = [ "type-detect" ]; }; - by-spec."type-is"."1.0.0" = - self.by-version."type-is"."1.0.0"; - by-version."type-is"."1.0.0" = lib.makeOverridable self.buildNodePackage { - name = "type-is-1.0.0"; - bin = false; - src = [ - (fetchurl { - url = "http://registry.npmjs.org/type-is/-/type-is-1.0.0.tgz"; - name = "type-is-1.0.0.tgz"; - sha1 = "4ff424e97349a1ee1910b4bfc488595ecdc443fc"; - }) - ]; - buildInputs = - (self.nativeDeps."type-is" or []); - deps = { - "mime-1.2.11" = self.by-version."mime"."1.2.11"; - }; - peerDependencies = [ - ]; - passthru.names = [ "type-is" ]; - }; by-spec."type-is"."~1.5.1" = - self.by-version."type-is"."1.5.3"; - by-version."type-is"."1.5.3" = lib.makeOverridable self.buildNodePackage { - name = "type-is-1.5.3"; + self.by-version."type-is"."1.5.4"; + by-version."type-is"."1.5.4" = lib.makeOverridable self.buildNodePackage { + name = "type-is-1.5.4"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/type-is/-/type-is-1.5.3.tgz"; - name = "type-is-1.5.3.tgz"; - sha1 = "b7fb92d0abc628393f10dd260932cca65fe9ff68"; + url = "http://registry.npmjs.org/type-is/-/type-is-1.5.4.tgz"; + name = "type-is-1.5.4.tgz"; + sha1 = "f2afe8635dcf2d159096202be6e120423fa19837"; }) ]; buildInputs = (self.nativeDeps."type-is" or []); deps = { "media-typer-0.3.0" = self.by-version."media-typer"."0.3.0"; - "mime-types-2.0.3" = self.by-version."mime-types"."2.0.3"; + "mime-types-2.0.4" = self.by-version."mime-types"."2.0.4"; }; peerDependencies = [ ]; passthru.names = [ "type-is" ]; }; by-spec."type-is"."~1.5.2" = - self.by-version."type-is"."1.5.3"; + self.by-version."type-is"."1.5.4"; by-spec."type-is"."~1.5.3" = - self.by-version."type-is"."1.5.3"; + self.by-version."type-is"."1.5.4"; + by-spec."type-is"."~1.5.4" = + self.by-version."type-is"."1.5.4"; by-spec."typechecker"."~2.0.1" = self.by-version."typechecker"."2.0.8"; by-version."typechecker"."2.0.8" = lib.makeOverridable self.buildNodePackage { @@ -28485,15 +29114,15 @@ }; "typescript" = self.by-version."typescript"."1.3.0"; by-spec."uglify-js"."*" = - self.by-version."uglify-js"."2.4.15"; - by-version."uglify-js"."2.4.15" = lib.makeOverridable self.buildNodePackage { - name = "uglify-js-2.4.15"; + self.by-version."uglify-js"."2.4.16"; + by-version."uglify-js"."2.4.16" = lib.makeOverridable self.buildNodePackage { + name = "uglify-js-2.4.16"; bin = true; src = [ (fetchurl { - url = "http://registry.npmjs.org/uglify-js/-/uglify-js-2.4.15.tgz"; - name = "uglify-js-2.4.15.tgz"; - sha1 = "12bc6d84345fbc306e13f7075d6437a8bf64d7e3"; + url = "http://registry.npmjs.org/uglify-js/-/uglify-js-2.4.16.tgz"; + name = "uglify-js-2.4.16.tgz"; + sha1 = "84143487eb480efd7d0789c7ecfbd48a695839f9"; }) ]; buildInputs = @@ -28508,7 +29137,7 @@ ]; passthru.names = [ "uglify-js" ]; }; - "uglify-js" = self.by-version."uglify-js"."2.4.15"; + "uglify-js" = self.by-version."uglify-js"."2.4.16"; by-spec."uglify-js"."1.2.5" = self.by-version."uglify-js"."1.2.5"; by-version."uglify-js"."1.2.5" = lib.makeOverridable self.buildNodePackage { @@ -28545,7 +29174,7 @@ (self.nativeDeps."uglify-js" or []); deps = { "async-0.2.10" = self.by-version."async"."0.2.10"; - "source-map-0.1.40" = self.by-version."source-map"."0.1.40"; + "source-map-0.1.41" = self.by-version."source-map"."0.1.41"; "optimist-0.3.7" = self.by-version."optimist"."0.3.7"; "uglify-to-browserify-1.0.2" = self.by-version."uglify-to-browserify"."1.0.2"; }; @@ -28555,8 +29184,30 @@ }; by-spec."uglify-js"."2.4.15" = self.by-version."uglify-js"."2.4.15"; + by-version."uglify-js"."2.4.15" = lib.makeOverridable self.buildNodePackage { + name = "uglify-js-2.4.15"; + bin = true; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/uglify-js/-/uglify-js-2.4.15.tgz"; + name = "uglify-js-2.4.15.tgz"; + sha1 = "12bc6d84345fbc306e13f7075d6437a8bf64d7e3"; + }) + ]; + buildInputs = + (self.nativeDeps."uglify-js" or []); + deps = { + "async-0.2.10" = self.by-version."async"."0.2.10"; + "source-map-0.1.34" = self.by-version."source-map"."0.1.34"; + "optimist-0.3.7" = self.by-version."optimist"."0.3.7"; + "uglify-to-browserify-1.0.2" = self.by-version."uglify-to-browserify"."1.0.2"; + }; + peerDependencies = [ + ]; + passthru.names = [ "uglify-js" ]; + }; by-spec."uglify-js"."^2.4.0" = - self.by-version."uglify-js"."2.4.15"; + self.by-version."uglify-js"."2.4.16"; by-spec."uglify-js"."~2.2" = self.by-version."uglify-js"."2.2.5"; by-version."uglify-js"."2.2.5" = lib.makeOverridable self.buildNodePackage { @@ -28572,7 +29223,7 @@ buildInputs = (self.nativeDeps."uglify-js" or []); deps = { - "source-map-0.1.40" = self.by-version."source-map"."0.1.40"; + "source-map-0.1.41" = self.by-version."source-map"."0.1.41"; "optimist-0.3.7" = self.by-version."optimist"."0.3.7"; }; peerDependencies = [ @@ -28597,7 +29248,7 @@ (self.nativeDeps."uglify-js" or []); deps = { "async-0.2.10" = self.by-version."async"."0.2.10"; - "source-map-0.1.40" = self.by-version."source-map"."0.1.40"; + "source-map-0.1.41" = self.by-version."source-map"."0.1.41"; "optimist-0.3.7" = self.by-version."optimist"."0.3.7"; }; peerDependencies = [ @@ -28607,7 +29258,7 @@ by-spec."uglify-js"."~2.3.6" = self.by-version."uglify-js"."2.3.6"; by-spec."uglify-js"."~2.4.0" = - self.by-version."uglify-js"."2.4.15"; + self.by-version."uglify-js"."2.4.16"; by-spec."uglify-to-browserify"."~1.0.0" = self.by-version."uglify-to-browserify"."1.0.2"; by-version."uglify-to-browserify"."1.0.2" = lib.makeOverridable self.buildNodePackage { @@ -28648,6 +29299,26 @@ ]; passthru.names = [ "uid-number" ]; }; + by-spec."uid-number"."0.0.3" = + self.by-version."uid-number"."0.0.3"; + by-version."uid-number"."0.0.3" = lib.makeOverridable self.buildNodePackage { + name = "uid-number-0.0.3"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/uid-number/-/uid-number-0.0.3.tgz"; + name = "uid-number-0.0.3.tgz"; + sha1 = "cefb0fa138d8d8098da71a40a0d04a8327d6e1cc"; + }) + ]; + buildInputs = + (self.nativeDeps."uid-number" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "uid-number" ]; + }; by-spec."uid-number"."0.0.5" = self.by-version."uid-number"."0.0.5"; by-version."uid-number"."0.0.5" = lib.makeOverridable self.buildNodePackage { @@ -28685,7 +29356,7 @@ buildInputs = (self.nativeDeps."uid-safe" or []); deps = { - "mz-1.1.0" = self.by-version."mz"."1.1.0"; + "mz-1.2.0" = self.by-version."mz"."1.2.0"; "base64-url-1.0.0" = self.by-version."base64-url"."1.0.0"; }; peerDependencies = [ @@ -28734,7 +29405,7 @@ "rfile-1.0.0" = self.by-version."rfile"."1.0.0"; "ruglify-1.0.0" = self.by-version."ruglify"."1.0.0"; "through-2.3.6" = self.by-version."through"."2.3.6"; - "uglify-js-2.4.15" = self.by-version."uglify-js"."2.4.15"; + "uglify-js-2.4.16" = self.by-version."uglify-js"."2.4.16"; }; peerDependencies = [ ]; @@ -28758,7 +29429,7 @@ "rfile-1.0.0" = self.by-version."rfile"."1.0.0"; "ruglify-1.0.0" = self.by-version."ruglify"."1.0.0"; "through-2.3.6" = self.by-version."through"."2.3.6"; - "uglify-js-2.4.15" = self.by-version."uglify-js"."2.4.15"; + "uglify-js-2.4.16" = self.by-version."uglify-js"."2.4.16"; }; peerDependencies = [ ]; @@ -28835,6 +29506,8 @@ self.by-version."underscore"."1.7.0"; by-spec."underscore".">=1.5.0" = self.by-version."underscore"."1.7.0"; + by-spec."underscore"."^1.6.0" = + self.by-version."underscore"."1.7.0"; by-spec."underscore"."~1.4.3" = self.by-version."underscore"."1.4.4"; by-version."underscore"."1.4.4" = lib.makeOverridable self.buildNodePackage { @@ -28877,6 +29550,8 @@ ]; passthru.names = [ "underscore" ]; }; + by-spec."underscore"."~1.7.0" = + self.by-version."underscore"."1.7.0"; by-spec."underscore.string"."~2.2.1" = self.by-version."underscore.string"."2.2.1"; by-version."underscore.string"."2.2.1" = lib.makeOverridable self.buildNodePackage { @@ -28919,6 +29594,26 @@ }; by-spec."underscore.string"."~2.3.3" = self.by-version."underscore.string"."2.3.3"; + by-spec."underscore.string"."~2.4.0" = + self.by-version."underscore.string"."2.4.0"; + by-version."underscore.string"."2.4.0" = lib.makeOverridable self.buildNodePackage { + name = "underscore.string-2.4.0"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/underscore.string/-/underscore.string-2.4.0.tgz"; + name = "underscore.string-2.4.0.tgz"; + sha1 = "8cdd8fbac4e2d2ea1e7e2e8097c42f442280f85b"; + }) + ]; + buildInputs = + (self.nativeDeps."underscore.string" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "underscore.string" ]; + }; by-spec."unfunk-diff"."~0.0.1" = self.by-version."unfunk-diff"."0.0.2"; by-version."unfunk-diff"."0.0.2" = lib.makeOverridable self.buildNodePackage { @@ -28957,7 +29652,7 @@ buildInputs = (self.nativeDeps."ungit" or []); deps = { - "express-4.10.4" = self.by-version."express"."4.10.4"; + "express-4.10.6" = self.by-version."express"."4.10.6"; "superagent-0.21.0" = self.by-version."superagent"."0.21.0"; "lodash-2.4.1" = self.by-version."lodash"."2.4.1"; "temp-0.8.1" = self.by-version."temp"."0.8.1"; @@ -28969,7 +29664,7 @@ "winston-0.8.3" = self.by-version."winston"."0.8.3"; "passport-0.2.1" = self.by-version."passport"."0.2.1"; "passport-local-1.0.0" = self.by-version."passport-local"."1.0.0"; - "semver-4.1.0" = self.by-version."semver"."4.1.0"; + "semver-4.1.1" = self.by-version."semver"."4.1.1"; "forever-monitor-1.1.0" = self.by-version."forever-monitor"."1.1.0"; "open-0.0.5" = self.by-version."open"."0.0.5"; "optimist-0.6.1" = self.by-version."optimist"."0.6.1"; @@ -28983,12 +29678,12 @@ "deep-extend-0.3.2" = self.by-version."deep-extend"."0.3.2"; "raven-0.7.2" = self.by-version."raven"."0.7.2"; "knockout-3.2.0" = self.by-version."knockout"."3.2.0"; - "npm-registry-client-4.0.4" = self.by-version."npm-registry-client"."4.0.4"; + "npm-registry-client-4.0.5" = self.by-version."npm-registry-client"."4.0.5"; "npmconf-2.1.1" = self.by-version."npmconf"."2.1.1"; "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0"; "body-parser-1.9.3" = self.by-version."body-parser"."1.9.3"; "cookie-parser-1.3.3" = self.by-version."cookie-parser"."1.3.3"; - "express-session-1.9.2" = self.by-version."express-session"."1.9.2"; + "express-session-1.9.3" = self.by-version."express-session"."1.9.3"; "serve-static-1.7.1" = self.by-version."serve-static"."1.7.1"; }; peerDependencies = [ @@ -29061,6 +29756,34 @@ ]; passthru.names = [ "update-notifier" ]; }; + by-spec."update-notifier"."^0.2.0" = + self.by-version."update-notifier"."0.2.2"; + by-version."update-notifier"."0.2.2" = lib.makeOverridable self.buildNodePackage { + name = "update-notifier-0.2.2"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/update-notifier/-/update-notifier-0.2.2.tgz"; + name = "update-notifier-0.2.2.tgz"; + sha1 = "e69b3a784b4e686a2acd98f5e66944591996e187"; + }) + ]; + buildInputs = + (self.nativeDeps."update-notifier" or []); + deps = { + "chalk-0.5.1" = self.by-version."chalk"."0.5.1"; + "configstore-0.3.1" = self.by-version."configstore"."0.3.1"; + "is-npm-1.0.0" = self.by-version."is-npm"."1.0.0"; + "latest-version-1.0.0" = self.by-version."latest-version"."1.0.0"; + "semver-diff-2.0.0" = self.by-version."semver-diff"."2.0.0"; + "string-length-1.0.0" = self.by-version."string-length"."1.0.0"; + }; + peerDependencies = [ + ]; + passthru.names = [ "update-notifier" ]; + }; + by-spec."update-notifier"."^0.2.1" = + self.by-version."update-notifier"."0.2.2"; by-spec."update-notifier"."~0.1.8" = self.by-version."update-notifier"."0.1.10"; by-version."update-notifier"."0.1.10" = lib.makeOverridable self.buildNodePackage { @@ -29078,7 +29801,7 @@ deps = { "chalk-0.4.0" = self.by-version."chalk"."0.4.0"; "configstore-0.3.1" = self.by-version."configstore"."0.3.1"; - "request-2.49.0" = self.by-version."request"."2.49.0"; + "request-2.51.0" = self.by-version."request"."2.51.0"; "semver-2.3.2" = self.by-version."semver"."2.3.2"; }; peerDependencies = [ @@ -29351,6 +30074,26 @@ ]; passthru.names = [ "utils-merge" ]; }; + by-spec."uuid"."^2.0.1" = + self.by-version."uuid"."2.0.1"; + by-version."uuid"."2.0.1" = lib.makeOverridable self.buildNodePackage { + name = "uuid-2.0.1"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/uuid/-/uuid-2.0.1.tgz"; + name = "uuid-2.0.1.tgz"; + sha1 = "c2a30dedb3e535d72ccf82e343941a50ba8533ac"; + }) + ]; + buildInputs = + (self.nativeDeps."uuid" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "uuid" ]; + }; by-spec."uuid"."~1.4.1" = self.by-version."uuid"."1.4.2"; by-version."uuid"."1.4.2" = lib.makeOverridable self.buildNodePackage { @@ -29373,34 +30116,60 @@ }; by-spec."uuid"."~2.0.1" = self.by-version."uuid"."2.0.1"; - by-version."uuid"."2.0.1" = lib.makeOverridable self.buildNodePackage { - name = "uuid-2.0.1"; + by-spec."v8-debug"."~0.3.0" = + self.by-version."v8-debug"."0.3.1"; + by-version."v8-debug"."0.3.1" = lib.makeOverridable self.buildNodePackage { + name = "v8-debug-0.3.1"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/uuid/-/uuid-2.0.1.tgz"; - name = "uuid-2.0.1.tgz"; - sha1 = "c2a30dedb3e535d72ccf82e343941a50ba8533ac"; + url = "http://registry.npmjs.org/v8-debug/-/v8-debug-0.3.1.tgz"; + name = "v8-debug-0.3.1.tgz"; + sha1 = "a2a552db05515246e480a97184a9eaa0cfc20e6b"; }) ]; buildInputs = - (self.nativeDeps."uuid" or []); + (self.nativeDeps."v8-debug" or []); deps = { + "node-pre-gyp-0.5.31" = self.by-version."node-pre-gyp"."0.5.31"; + "nan-1.2.0" = self.by-version."nan"."1.2.0"; }; peerDependencies = [ ]; - passthru.names = [ "uuid" ]; + passthru.names = [ "v8-debug" ]; }; - by-spec."v8flags"."^1.0.1" = - self.by-version."v8flags"."1.0.5"; - by-version."v8flags"."1.0.5" = lib.makeOverridable self.buildNodePackage { - name = "v8flags-1.0.5"; + by-spec."v8-profiler"."~5.2.0" = + self.by-version."v8-profiler"."5.2.1"; + by-version."v8-profiler"."5.2.1" = lib.makeOverridable self.buildNodePackage { + name = "v8-profiler-5.2.1"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/v8flags/-/v8flags-1.0.5.tgz"; - name = "v8flags-1.0.5.tgz"; - sha1 = "d352362031d3286bcd906da45fe27a3b760e38e5"; + url = "http://registry.npmjs.org/v8-profiler/-/v8-profiler-5.2.1.tgz"; + name = "v8-profiler-5.2.1.tgz"; + sha1 = "674acc65ebac9c914d578180c8713791386c23e7"; + }) + ]; + buildInputs = + (self.nativeDeps."v8-profiler" or []); + deps = { + "node-pre-gyp-0.5.31" = self.by-version."node-pre-gyp"."0.5.31"; + "nan-1.2.0" = self.by-version."nan"."1.2.0"; + }; + peerDependencies = [ + ]; + passthru.names = [ "v8-profiler" ]; + }; + by-spec."v8flags"."^1.0.1" = + self.by-version."v8flags"."1.0.6"; + by-version."v8flags"."1.0.6" = lib.makeOverridable self.buildNodePackage { + name = "v8flags-1.0.6"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/v8flags/-/v8flags-1.0.6.tgz"; + name = "v8flags-1.0.6.tgz"; + sha1 = "dc6b3d3347fabd196fad52b996059168918241b1"; }) ]; buildInputs = @@ -29661,21 +30430,21 @@ passthru.names = [ "vinyl" ]; }; by-spec."vinyl"."^0.4.0" = - self.by-version."vinyl"."0.4.5"; - by-version."vinyl"."0.4.5" = lib.makeOverridable self.buildNodePackage { - name = "vinyl-0.4.5"; + self.by-version."vinyl"."0.4.6"; + by-version."vinyl"."0.4.6" = lib.makeOverridable self.buildNodePackage { + name = "vinyl-0.4.6"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/vinyl/-/vinyl-0.4.5.tgz"; - name = "vinyl-0.4.5.tgz"; - sha1 = "b1015e63bbd350d5f90e6c26b3a2e628294da8e0"; + url = "http://registry.npmjs.org/vinyl/-/vinyl-0.4.6.tgz"; + name = "vinyl-0.4.6.tgz"; + sha1 = "2f356c87a550a255461f36bbeb2a5ba8bf784847"; }) ]; buildInputs = (self.nativeDeps."vinyl" or []); deps = { - "clone-0.1.18" = self.by-version."clone"."0.1.18"; + "clone-0.2.0" = self.by-version."clone"."0.2.0"; "clone-stats-0.0.1" = self.by-version."clone-stats"."0.0.1"; }; peerDependencies = [ @@ -29698,13 +30467,13 @@ (self.nativeDeps."vinyl-fs" or []); deps = { "defaults-1.0.0" = self.by-version."defaults"."1.0.0"; - "glob-stream-3.1.17" = self.by-version."glob-stream"."3.1.17"; + "glob-stream-3.1.18" = self.by-version."glob-stream"."3.1.18"; "glob-watcher-0.0.6" = self.by-version."glob-watcher"."0.0.6"; "graceful-fs-3.0.5" = self.by-version."graceful-fs"."3.0.5"; "mkdirp-0.5.0" = self.by-version."mkdirp"."0.5.0"; "strip-bom-1.0.0" = self.by-version."strip-bom"."1.0.0"; "through2-0.6.3" = self.by-version."through2"."0.6.3"; - "vinyl-0.4.5" = self.by-version."vinyl"."0.4.5"; + "vinyl-0.4.6" = self.by-version."vinyl"."0.4.6"; }; peerDependencies = [ ]; @@ -29754,23 +30523,23 @@ passthru.names = [ "void-elements" ]; }; by-spec."vows".">=0.5.13" = - self.by-version."vows"."0.8.1"; - by-version."vows"."0.8.1" = lib.makeOverridable self.buildNodePackage { - name = "vows-0.8.1"; + self.by-version."vows"."0.9.0-rc1"; + by-version."vows"."0.9.0-rc1" = lib.makeOverridable self.buildNodePackage { + name = "vows-0.9.0-rc1"; bin = true; src = [ (fetchurl { - url = "http://registry.npmjs.org/vows/-/vows-0.8.1.tgz"; - name = "vows-0.8.1.tgz"; - sha1 = "e09e988ce594ca05a08d72abcca34e88db559131"; + url = "http://registry.npmjs.org/vows/-/vows-0.9.0-rc1.tgz"; + name = "vows-0.9.0-rc1.tgz"; + sha1 = "601cb87d69556bf9c7ce8cad36cbc2c98781921f"; }) ]; buildInputs = (self.nativeDeps."vows" or []); deps = { "eyes-0.1.8" = self.by-version."eyes"."0.1.8"; - "diff-1.0.8" = self.by-version."diff"."1.0.8"; - "glob-4.0.6" = self.by-version."glob"."4.0.6"; + "diff-1.2.0" = self.by-version."diff"."1.2.0"; + "glob-4.3.2" = self.by-version."glob"."4.3.2"; }; peerDependencies = [ ]; @@ -29957,27 +30726,50 @@ }; "webdrvr" = self.by-version."webdrvr"."2.43.0-0"; by-spec."websocket-driver".">=0.3.6" = - self.by-version."websocket-driver"."0.4.0"; - by-version."websocket-driver"."0.4.0" = lib.makeOverridable self.buildNodePackage { - name = "websocket-driver-0.4.0"; + self.by-version."websocket-driver"."0.5.1"; + by-version."websocket-driver"."0.5.1" = lib.makeOverridable self.buildNodePackage { + name = "websocket-driver-0.5.1"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/websocket-driver/-/websocket-driver-0.4.0.tgz"; - name = "websocket-driver-0.4.0.tgz"; - sha1 = "71fa992e5d41c2cc5e290420687d0601efd06b7a"; + url = "http://registry.npmjs.org/websocket-driver/-/websocket-driver-0.5.1.tgz"; + name = "websocket-driver-0.5.1.tgz"; + sha1 = "dd954c0a42a9962a31296f84cc465ca4b74c2611"; }) ]; buildInputs = (self.nativeDeps."websocket-driver" or []); deps = { + "websocket-extensions-0.1.0" = self.by-version."websocket-extensions"."0.1.0"; }; peerDependencies = [ ]; passthru.names = [ "websocket-driver" ]; }; by-spec."websocket-driver".">=0.4.0" = - self.by-version."websocket-driver"."0.4.0"; + self.by-version."websocket-driver"."0.5.1"; + by-spec."websocket-driver".">=0.5.1" = + self.by-version."websocket-driver"."0.5.1"; + by-spec."websocket-extensions".">=0.1.0" = + self.by-version."websocket-extensions"."0.1.0"; + by-version."websocket-extensions"."0.1.0" = lib.makeOverridable self.buildNodePackage { + name = "websocket-extensions-0.1.0"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.0.tgz"; + name = "websocket-extensions-0.1.0.tgz"; + sha1 = "43567457158085e83ce7050f17ac6d988936320a"; + }) + ]; + buildInputs = + (self.nativeDeps."websocket-extensions" or []); + deps = { + }; + peerDependencies = [ + ]; + passthru.names = [ "websocket-extensions" ]; + }; by-spec."when"."~3.4.6" = self.by-version."when"."3.4.6"; by-version."when"."3.4.6" = lib.makeOverridable self.buildNodePackage { @@ -29999,15 +30791,15 @@ passthru.names = [ "when" ]; }; by-spec."which"."1" = - self.by-version."which"."1.0.7"; - by-version."which"."1.0.7" = lib.makeOverridable self.buildNodePackage { - name = "which-1.0.7"; + self.by-version."which"."1.0.8"; + by-version."which"."1.0.8" = lib.makeOverridable self.buildNodePackage { + name = "which-1.0.8"; bin = true; src = [ (fetchurl { - url = "http://registry.npmjs.org/which/-/which-1.0.7.tgz"; - name = "which-1.0.7.tgz"; - sha1 = "853133f40e5bd2783e51a06774959455cc8ee865"; + url = "http://registry.npmjs.org/which/-/which-1.0.8.tgz"; + name = "which-1.0.8.tgz"; + sha1 = "c2ff319534ac4a1fa45df2221b56c36279903ded"; }) ]; buildInputs = @@ -30019,11 +30811,13 @@ passthru.names = [ "which" ]; }; by-spec."which"."1.0.x" = - self.by-version."which"."1.0.7"; + self.by-version."which"."1.0.8"; + by-spec."which"."^1.0.5" = + self.by-version."which"."1.0.8"; by-spec."which"."~1.0.5" = - self.by-version."which"."1.0.7"; - by-spec."which"."~1.0.7" = - self.by-version."which"."1.0.7"; + self.by-version."which"."1.0.8"; + by-spec."which"."~1.0.8" = + self.by-version."which"."1.0.8"; by-spec."windows-no-runnable"."~0.0.6" = self.by-version."windows-no-runnable"."0.0.6"; by-version."windows-no-runnable"."0.0.6" = lib.makeOverridable self.buildNodePackage { @@ -30085,7 +30879,7 @@ "colors-0.6.2" = self.by-version."colors"."0.6.2"; "cycle-1.0.3" = self.by-version."cycle"."1.0.3"; "eyes-0.1.8" = self.by-version."eyes"."0.1.8"; - "isstream-0.1.0" = self.by-version."isstream"."0.1.0"; + "isstream-0.1.1" = self.by-version."isstream"."0.1.1"; "pkginfo-0.3.0" = self.by-version."pkginfo"."0.3.0"; "stack-trace-0.0.9" = self.by-version."stack-trace"."0.0.9"; }; @@ -30428,6 +31222,95 @@ ]; passthru.names = [ "xcode" ]; }; + by-spec."xdg-basedir"."^1.0.0" = + self.by-version."xdg-basedir"."1.0.0"; + by-version."xdg-basedir"."1.0.0" = lib.makeOverridable self.buildNodePackage { + name = "xdg-basedir-1.0.0"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/xdg-basedir/-/xdg-basedir-1.0.0.tgz"; + name = "xdg-basedir-1.0.0.tgz"; + sha1 = "95ea42a738d98a9470fd5a21d08556dbd61dc74a"; + }) + ]; + buildInputs = + (self.nativeDeps."xdg-basedir" or []); + deps = { + "user-home-1.1.0" = self.by-version."user-home"."1.1.0"; + }; + peerDependencies = [ + ]; + passthru.names = [ "xdg-basedir" ]; + }; + by-spec."xdg-empty-trash"."^1.0.0" = + self.by-version."xdg-empty-trash"."1.0.0"; + by-version."xdg-empty-trash"."1.0.0" = lib.makeOverridable self.buildNodePackage { + name = "xdg-empty-trash-1.0.0"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/xdg-empty-trash/-/xdg-empty-trash-1.0.0.tgz"; + name = "xdg-empty-trash-1.0.0.tgz"; + sha1 = "007ec95403863f705ec09335b8c9166858021959"; + }) + ]; + buildInputs = + (self.nativeDeps."xdg-empty-trash" or []); + deps = { + "each-async-1.1.0" = self.by-version."each-async"."1.1.0"; + "rimraf-2.2.8" = self.by-version."rimraf"."2.2.8"; + }; + peerDependencies = [ + ]; + passthru.names = [ "xdg-empty-trash" ]; + }; + by-spec."xdg-trash"."^1.0.0" = + self.by-version."xdg-trash"."1.0.5"; + by-version."xdg-trash"."1.0.5" = lib.makeOverridable self.buildNodePackage { + name = "xdg-trash-1.0.5"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/xdg-trash/-/xdg-trash-1.0.5.tgz"; + name = "xdg-trash-1.0.5.tgz"; + sha1 = "5473316b2a1ec2e9329fbeb4d767ffe939cc1c82"; + }) + ]; + buildInputs = + (self.nativeDeps."xdg-trash" or []); + deps = { + "each-async-1.1.0" = self.by-version."each-async"."1.1.0"; + "fs-extra-0.12.0" = self.by-version."fs-extra"."0.12.0"; + "uuid-2.0.1" = self.by-version."uuid"."2.0.1"; + "xdg-trashdir-1.0.3" = self.by-version."xdg-trashdir"."1.0.3"; + }; + peerDependencies = [ + ]; + passthru.names = [ "xdg-trash" ]; + }; + by-spec."xdg-trashdir"."^1.0.0" = + self.by-version."xdg-trashdir"."1.0.3"; + by-version."xdg-trashdir"."1.0.3" = lib.makeOverridable self.buildNodePackage { + name = "xdg-trashdir-1.0.3"; + bin = false; + src = [ + (fetchurl { + url = "http://registry.npmjs.org/xdg-trashdir/-/xdg-trashdir-1.0.3.tgz"; + name = "xdg-trashdir-1.0.3.tgz"; + sha1 = "8df4be55629617be0c5ece0b76ab6cac658d52c7"; + }) + ]; + buildInputs = + (self.nativeDeps."xdg-trashdir" or []); + deps = { + "mount-point-1.0.3" = self.by-version."mount-point"."1.0.3"; + "xdg-basedir-1.0.0" = self.by-version."xdg-basedir"."1.0.0"; + }; + peerDependencies = [ + ]; + passthru.names = [ "xdg-trashdir" ]; + }; by-spec."xml2js"."0.2.4" = self.by-version."xml2js"."0.2.4"; by-version."xml2js"."0.2.4" = lib.makeOverridable self.buildNodePackage { @@ -30707,22 +31590,21 @@ }; by-spec."xtend"."~3.0.0" = self.by-version."xtend"."3.0.0"; - by-spec."yargs"."~1.2.1" = - self.by-version."yargs"."1.2.6"; - by-version."yargs"."1.2.6" = lib.makeOverridable self.buildNodePackage { - name = "yargs-1.2.6"; + by-spec."yargs"."^1.2.1" = + self.by-version."yargs"."1.3.3"; + by-version."yargs"."1.3.3" = lib.makeOverridable self.buildNodePackage { + name = "yargs-1.3.3"; bin = false; src = [ (fetchurl { - url = "http://registry.npmjs.org/yargs/-/yargs-1.2.6.tgz"; - name = "yargs-1.2.6.tgz"; - sha1 = "9c7b4a82fd5d595b2bf17ab6dcc43135432fe34b"; + url = "http://registry.npmjs.org/yargs/-/yargs-1.3.3.tgz"; + name = "yargs-1.3.3.tgz"; + sha1 = "054de8b61f22eefdb7207059eaef9d6b83fb931a"; }) ]; buildInputs = (self.nativeDeps."yargs" or []); deps = { - "minimist-0.1.0" = self.by-version."minimist"."0.1.0"; }; peerDependencies = [ ]; diff --git a/pkgs/top-level/node-packages.json b/pkgs/top-level/node-packages.json index 5f6761bde05..f63c614424f 100644 --- a/pkgs/top-level/node-packages.json +++ b/pkgs/top-level/node-packages.json @@ -146,4 +146,6 @@ , "sloc" , "peerflix" , "peerflix-server" +, "trash" +, "empty-trash" ] diff --git a/pkgs/top-level/node-packages.nix b/pkgs/top-level/node-packages.nix index 0aa26d34753..9127dfbbb43 100644 --- a/pkgs/top-level/node-packages.nix +++ b/pkgs/top-level/node-packages.nix @@ -14,16 +14,7 @@ rec { inherit (pkgs) runCommand; }; - patchSource = fn: srcAttrs: - let src = fn srcAttrs; in pkgs.runCommand src.name {} '' - mkdir unpack - cd unpack - unpackFile ${src} - chmod -R +w */ - mv */ package 2>/dev/null || true - sed -i -e "s/:\s*\"latest\"/: \"*\"/" -e "s/:\s\+\"[A-Za-z0-9_-]\+\/[A-Za-z0-9_-]\+\"/: \"*\"/" -e "s/:\s*\"\(https\?\|git\(\+\(ssh\|http\|https\)\)\?\):\/\/[^\"]*\"/: \"*\"/" package/package.json - mv */ $out - ''; + patchSource = fn: srcAttrs: fn srcAttrs; # Backwards compat patchLatest = patchSource fetchurl; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index d02a4f69a16..812af3e4c3e 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -178,13 +178,13 @@ let self = _self // overrides; _self = with self; { }; AppCmd = buildPerlPackage { - name = "App-Cmd-0.320"; + name = "App-Cmd-0.326"; src = fetchurl { - url = mirror://cpan/authors/id/R/RJ/RJBS/App-Cmd-0.320.tar.gz; - sha256 = "ca6174f634bbe5b73c5f5ad6e0f3b3385568934282f4e848da8e78025b2b185e"; + url = mirror://cpan/authors/id/R/RJ/RJBS/App-Cmd-0.326.tar.gz; + sha256 = "1z6vp1am170fczc0srj63rdvrdbrjk3acmj6ka5v5n6qim4xsv9b"; }; buildInputs = [ TestFatal ]; - propagatedBuildInputs = [ CaptureTiny ClassLoad DataOptList GetoptLongDescriptive IOTieCombine StringRewritePrefix SubExporter SubInstall ]; + propagatedBuildInputs = [ CaptureTiny ClassLoad DataOptList GetoptLongDescriptive IOTieCombine StringRewritePrefix SubExporter ModulePluggable SubInstall ]; meta = { homepage = https://github.com/rjbs/app-cmd; description = "Write command line apps with less suffering"; @@ -239,6 +239,19 @@ let self = _self // overrides; _self = with self; { }; }; + ArchiveExtract = buildPerlPackage { + name = "Archive-Extract-0.74"; + src = fetchurl { + url = mirror://cpan/authors/id/B/BI/BINGOS/Archive-Extract-0.74.tar.gz; + sha256 = "b297d230fe91720a423a01482db7e037b2acf589f9c8f58cef39f3148374e216"; + }; + propagatedBuildInputs = [ if_ ]; + meta = { + description = "Generic archive extracting mechanism"; + license = "perl"; + }; + }; + ArchiveZip = buildPerlPackage { name = "Archive-Zip-1.16"; src = fetchurl { @@ -329,19 +342,7 @@ let self = _self // overrides; _self = with self; { }; }; - autodie = buildPerlPackage { - name = "autodie-2.20"; - src = fetchurl { - url = mirror://cpan/authors/id/P/PJ/PJF/autodie-2.20.tar.gz; - sha256 = "346763c582cd8066b4e5d07e4013202f9f9296d32b42343e117dbfb13ea6e4f0"; - }; - meta = { - description = "Replace functions with ones that succeed or die with lexical scope"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - maintainers = with maintainers; [ ocharles ]; - platforms = stdenv.lib.platforms.unix; - }; - }; + autodie = null; # part of Perl autovivification = buildPerlPackage { name = "autovivification-0.12"; @@ -547,6 +548,21 @@ let self = _self // overrides; _self = with self; { }; }; + Cairo = buildPerlPackage rec { + name = "Cairo-1.105"; + src = fetchurl { + url = "mirror://cpan/authors/id/X/XA/XAOC/${name}.tar.gz"; + sha256 = "0im025wy1346w7b7hi6im08bfn6x4ma0cxmjz6xnk8riizm1s84q"; + }; + buildInputs = [ ExtUtilsDepends ExtUtilsPkgConfig pkgs.cairo ]; + meta = { + homepage = http://gtk2-perl.sourceforge.net/; + description = "Perl interface to the cairo 2d vector graphics library"; + maintainers = with maintainers; [ nckx ]; + license = with stdenv.lib.licenses; [ lgpl21Plus ]; + }; + }; + cam_pdf = buildPerlPackage rec { name = "CAM-PDF-1.60"; src = fetchurl { @@ -643,16 +659,16 @@ let self = _self // overrides; _self = with self; { }; CatalystActionREST = buildPerlPackage { - name = "Catalyst-Action-REST-1.07"; + name = "Catalyst-Action-REST-1.17"; src = fetchurl { - url = mirror://cpan/authors/id/B/BO/BOBTFISH/Catalyst-Action-REST-1.07.tar.gz; - sha256 = "0c893iia1bmqlrknylaqhc9ln1xqz7yw9z639rxmyjyidx5b4q0d"; + url = mirror://cpan/authors/id/F/FR/FREW/Catalyst-Action-REST-1.17.tar.gz; + sha256 = "c833c6ba2150b035b0486ff568c1e5928c14bb53d6a70758271feb969aaedde6"; }; - propagatedBuildInputs = [ CatalystRuntime ClassInspector ConfigGeneral DataSerializer DataTaxi FreezeThaw HTMLParser JSONXS LWPUserAgent Moose MROCompat namespaceautoclean ParamsValidate PHPSerialization URIFind XMLSimple YAMLSyck ]; + buildInputs = [ TestRequires ]; + propagatedBuildInputs = [ CatalystRuntime ClassInspector LWP MROCompat ModulePluggable Moose ParamsValidate URIFind namespaceautoclean ]; meta = { description = "Automated REST Method Dispatching"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; - platforms = stdenv.lib.platforms.linux; + license = "perl"; }; }; @@ -1127,10 +1143,10 @@ let self = _self // overrides; _self = with self; { }; CGIFormBuilder = buildPerlPackage rec { - name = "CGI-FormBuilder-3.0501"; + name = "CGI-FormBuilder-3.09"; src = fetchurl { url = "mirror://cpan/authors/id/N/NW/NWIGER/${name}.tgz"; - sha256 = "031sgxifl2dq8d4s4d9vnixvqdd3p952k0jrkyqp823k74glps25"; + sha256 = "0qx8kxj0iy55ss9kraqr8q2m4igi2ylajff7d6qvphqpfx90fjb5"; }; }; @@ -1498,11 +1514,16 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ IOCompress ]; }; - ConfigAny = buildPerlPackage rec { + ConfigAny = buildPerlPackage { name = "Config-Any-0.24"; src = fetchurl { - url = "mirror://cpan/modules/by-module/Config/${name}.tar.gz"; - sha256 = "06n6jn3q3xhk57icwip0ihzqixxav6sgp6rrb35hahj1z748y3vi"; + url = mirror://cpan/authors/id/B/BR/BRICAS/Config-Any-0.24.tar.gz; + sha256 = "710f8fc8f9414205cb58399bfbb4d9aaf7883f8ce046cee22913f6818795c61a"; + }; + propagatedBuildInputs = [ ModulePluggable ]; + meta = { + description = "Load configuration from different file formats, transparently"; + license = "perl"; }; }; @@ -1639,11 +1660,11 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ CGICookieXS ]; }; - Coro = buildPerlPackage { - name = "Coro-6.37"; + Coro = buildPerlPackage rec { + name = "Coro-6.41"; src = fetchurl { - url = mirror://cpan/authors/id/M/ML/MLEHMANN/Coro-6.37.tar.gz; - sha256 = "08qkwv7rpyb7zcp128crjakflc027sjkx9d2s1gzc21grsq9a456"; + url = "mirror://cpan/authors/id/M/ML/MLEHMANN/${name}.tar.gz"; + sha256 = "1r1gam4yyl6w88ga8rkbvj33v1r5ald3ryqlpg13c7y1i79yizxa"; }; propagatedBuildInputs = [ AnyEvent Guard CommonSense ]; meta = { @@ -1733,6 +1754,21 @@ let self = _self // overrides; _self = with self; { }; }; + CPANPLUS = buildPerlPackage { + name = "CPANPLUS-0.9152"; + src = fetchurl { + url = mirror://cpan/authors/id/B/BI/BINGOS/CPANPLUS-0.9152.tar.gz; + sha256 = "732d9978ca6e8cde9b16431e1d1bafa543a66d8bce3fbfca4e5ac297a348ad17"; + }; + propagatedBuildInputs = [ ArchiveExtract LogMessage ModulePluggable ObjectAccessor PackageConstants ]; + doCheck = false; + meta = { + homepage = http://github.com/jib/cpanplus-devel; + description = "Ameliorated interface to the CPAN"; + license = "perl"; + }; + }; + CPANUploader = buildPerlPackage { name = "CPAN-Uploader-0.103006"; src = fetchurl { @@ -2200,15 +2236,15 @@ let self = _self // overrides; _self = with self; { }; DateTimeFormatFlexible = buildPerlPackage { - name = "DateTime-Format-Flexible-0.25"; + name = "DateTime-Format-Flexible-0.26"; src = fetchurl { - url = mirror://cpan/authors/id/T/TH/THINC/DateTime-Format-Flexible-0.25.tar.gz; - sha256 = "cd3267e68736ece386d677289b334d4ef1f33ff2524b17b9c9deb53d20420090"; + url = mirror://cpan/authors/id/T/TH/THINC/DateTime-Format-Flexible-0.26.tar.gz; + sha256 = "436efbc5e87cc385112e1c44336427fea32df670caf2b7d6dbb7a113ac6e693d"; }; - propagatedBuildInputs = [ DateTime DateTimeFormatBuilder DateTimeTimeZone ListMoreUtils TestMockTime ]; + propagatedBuildInputs = [ DateTime DateTimeFormatBuilder DateTimeTimeZone ListMoreUtils ModulePluggable TestMockTime ]; meta = { description = "DateTime::Format::Flexible - Flexibly parse strings and turn them into DateTime objects"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = "perl"; }; }; @@ -3094,11 +3130,13 @@ let self = _self // overrides; _self = with self; { name = "Email-Abstract-3.007"; src = fetchurl { url = mirror://cpan/authors/id/R/RJ/RJBS/Email-Abstract-3.007.tar.gz; - sha256 = "1a7aynf5jd5lr77x4k51hphnbmxf6p0s2gm1a6fbmxjqlnimm48h"; + sha256 = "10915aa3a558f6ba9c51a13ea1c135aed765e185a14cd2cfc9b434599cf5eaa8"; }; - propagatedBuildInputs = [ EmailSimple MROCompat ]; + propagatedBuildInputs = [ EmailSimple MROCompat ModulePluggable ]; meta = { - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + homepage = https://github.com/rjbs/Email-Abstract; + description = "Unified interface to mail representations"; + license = "perl"; }; }; @@ -3320,10 +3358,10 @@ let self = _self // overrides; _self = with self; { }; ExceptionBase = buildPerlPackage { - name = "Exception-Base-0.2401"; + name = "Exception-Base-0.25"; src = fetchurl { - url = mirror://cpan/authors/id/D/DE/DEXTER/Exception-Base-0.2401.tar.gz; - sha256 = "0z4pckv3iwzz5s4xrv96kg9620s96kim57nfrxbqhh6pyd5jfazv"; + url = mirror://cpan/authors/id/D/DE/DEXTER/Exception-Base-0.25.tar.gz; + sha256 = "1s2is862xba2yy633wn2nklrya36yrlwxlbpqjrv8m31xj2c8khw"; }; buildInputs = [ TestUnitLite ]; meta = { @@ -3597,17 +3635,20 @@ let self = _self // overrides; _self = with self; { }; }; - FileChangeNotify = buildPerlModule rec { + FileChangeNotify = buildPerlModule { name = "File-ChangeNotify-0.24"; src = fetchurl { - url = "mirror://cpan/authors/id/D/DR/DROLSKY/${name}.tar.gz"; - sha256 = "090i265f73jlcl5rv250791vw32j9vvl4nd5abc7myg0klb8109w"; + url = mirror://cpan/authors/id/D/DR/DROLSKY/File-ChangeNotify-0.24.tar.gz; + sha256 = "3c8180169de0f97ad852a55942f74e520cbe433aa0889d0b65548ee38a111124"; }; buildInputs = [ TestException ]; propagatedBuildInputs = - [ ClassMOP Moose MooseXParamsValidate MooseXSemiAffordanceAccessor - namespaceautoclean - ] ++ stdenv.lib.optional stdenv.isLinux LinuxInotify2; + [ ClassLoad ListMoreUtils ModulePluggable Moose MooseXParamsValidate MooseXSemiAffordanceAccessor namespaceautoclean ] + ++ stdenv.lib.optional stdenv.isLinux LinuxInotify2; + meta = { + description = "Watch for changes to files, cross-platform style"; + license = "artistic_2"; + }; }; Filechdir = buildPerlPackage rec { @@ -3916,12 +3957,8 @@ let self = _self // overrides; _self = with self; { # Patch has been sent upstream. patches = [ ../development/perl-modules/gd-options-passthrough-and-fontconfig.patch ]; - # Remove a failing test. The test does a binary comparison of a generated - # file with a file packaged with the source, and these are different - # ( although the images look the same to my eye ); this is - # possibly because the source packaged image was generated with a - # different version of some library ( libpng maybe? ). - postPatch = "sed -ie 's/if (GD::Image->can(.newFromJpeg.)) {/if ( 0 ) {/' t/GD.t"; + # tests fail + doCheck = false; makeMakerFlags = "--lib_png_path=${pkgs.libpng} --lib_jpeg_path=${pkgs.libjpeg} --lib_zlib_path=${pkgs.zlib} --lib_ft_path=${pkgs.freetype} --lib_fontconfig_path=${pkgs.fontconfig} --lib_xpm_path=${pkgs.xlibs.libXpm}"; }; @@ -3971,6 +4008,21 @@ let self = _self // overrides; _self = with self; { }; }; + Glib = buildPerlPackage rec { + name = "Glib-1.306"; + src = fetchurl { + url = "mirror://cpan/authors/id/X/XA/XAOC/${name}.tar.gz"; + sha256 = "0j4kf707vy9vhpifwl6icc7rqyf75z2lhc626af7ag8srqva81ic"; + }; + buildInputs = [ ExtUtilsDepends ExtUtilsPkgConfig pkgs.glib ]; + meta = { + homepage = http://gtk2-perl.sourceforge.net/; + description = "Perl wrappers for the GLib utility and Object libraries"; + maintainers = with maintainers; [ nckx ]; + license = with stdenv.lib.licenses; [ lgpl3Plus ]; + }; + }; + GnuPG = buildPerlPackage { name = "GnuPG-0.19"; src = fetchurl { @@ -4036,6 +4088,21 @@ let self = _self // overrides; _self = with self; { buildInputs = [ DataUUID CryptCBC ]; }; + Gtk2 = buildPerlPackage rec { + name = "Gtk2-1.2493"; + src = fetchurl { + url = "mirror://cpan/authors/id/X/XA/XAOC/${name}.tar.gz"; + sha256 = "1zhrvwl584yrf0b1rrkli0k2ly221xhdyix8ykmm9zs674gain0z"; + }; + buildInputs = [ ExtUtilsDepends ExtUtilsPkgConfig Pango pkgs.gtk2 ]; + meta = { + homepage = http://gtk2-perl.sourceforge.net/; + description = "Perl interface to the 2.x series of the Gimp Toolkit library"; + maintainers = with maintainers; [ nckx ]; + license = with stdenv.lib.licenses; [ lgpl21Plus ]; + }; + }; + Guard = buildPerlPackage { name = "Guard-1.022"; src = fetchurl { @@ -4183,11 +4250,13 @@ let self = _self // overrides; _self = with self; { }; HTMLFormHandler = buildPerlPackage { - name = "HTML-FormHandler-0.40056"; + name = "HTML-FormHandler-0.40057"; src = fetchurl { - url = mirror://cpan/authors/id/G/GS/GSHANK/HTML-FormHandler-0.40056.tar.gz; - sha256 = "012wijl69qjazghq2ywikk0jdxjbd9rfsxmwwq7lbpfjy2fiymqx"; + url = mirror://cpan/authors/id/G/GS/GSHANK/HTML-FormHandler-0.40057.tar.gz; + sha256 = "1hn9shhbsi4pdp396ia2hky3i0imnxgwvhy57gp0jjhy5qyvafvm"; }; + # a single test is failing on perl 5.20 + doCheck = false; buildInputs = [ FileShareDirInstall PadWalker TestDifferences TestException TestMemoryCycle ]; propagatedBuildInputs = [ ClassLoad DataClone DateTime DateTimeFormatStrptime EmailValid FileShareDir HTMLTree JSON ListAllUtils Moose MooseXGetopt MooseXTypes MooseXTypesCommon MooseXTypesLoadableClass SubExporter SubName TryTiny aliased namespaceautoclean ]; meta = { @@ -4472,6 +4541,20 @@ let self = _self // overrides; _self = with self; { }; }; + ImageSize = buildPerlPackage rec { + name = "Image-Size-3.232"; + src = fetchurl { + url = "mirror://cpan/authors/id/R/RJ/RJRAY/${name}.tar.gz"; + sha256 = "1mx065134gy75pgdldh65118bpcs6yfbqmr7bf9clwq44zslxhxc"; + }; + buildInputs = [ TestMore ]; + propagatedBuildInputs = [ ModuleRuntime ]; + meta = { + description = "Read the dimensions of an image in several popular formats"; + license = with stdenv.lib.licenses; [ artistic1 lgpl21Plus ]; + }; + }; + ImportInto = buildPerlPackage { name = "Import-Into-1.002004"; src = fetchurl { @@ -5101,6 +5184,19 @@ let self = _self // overrides; _self = with self; { }; }; + LogMessage = buildPerlPackage { + name = "Log-Message-0.08"; + src = fetchurl { + url = mirror://cpan/authors/id/B/BI/BINGOS/Log-Message-0.08.tar.gz; + sha256 = "bd697dd62aaf26d118e9f0a0813429deb1c544e4501559879b61fcbdfe99fe46"; + }; + propagatedBuildInputs = [ if_ ]; + meta = { + description = "Powerful and flexible message logging mechanism"; + license = "perl"; + }; + }; + LogTrace = buildPerlPackage rec { name = "Log-Trace-1.070"; src = fetchurl { @@ -5615,16 +5711,16 @@ let self = _self // overrides; _self = with self; { }; ModuleInstall = buildPerlPackage { - name = "Module-Install-1.06"; + name = "Module-Install-1.14"; src = fetchurl { - url = mirror://cpan/authors/id/A/AD/ADAMK/Module-Install-1.06.tar.gz; - sha256 = "06a5375q1cr21rzcr07z3n8w6hv611a9p199jrnpsj9vbcwwi7ny"; + url = mirror://cpan/authors/id/B/BI/BINGOS/Module-Install-1.14.tar.gz; + sha256 = "3f02f0a33603aff2f5cf06d15f74d1a9be65e844ada99e1a9c2102330ffa0d49"; }; buildInputs = [ YAMLTiny ]; - propagatedBuildInputs = [ FileRemove LWPUserAgent ModuleScanDeps PARDist YAMLTiny ]; + propagatedBuildInputs = [ FileRemove ModuleScanDeps YAMLTiny ]; meta = { description = "Standalone, extensible Perl module installer"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = "perl"; }; }; @@ -5748,14 +5844,15 @@ let self = _self // overrides; _self = with self; { }; ModuleScanDeps = buildPerlPackage { - name = "Module-ScanDeps-1.10"; + name = "Module-ScanDeps-1.17"; src = fetchurl { - url = mirror://cpan/authors/id/R/RS/RSCHUPP/Module-ScanDeps-1.10.tar.gz; - sha256 = "0z85zqvqpj2ck80sw91hmzn94q8m3s40anybw324xh3pcrm9cg5s"; + url = mirror://cpan/authors/id/R/RS/RSCHUPP/Module-ScanDeps-1.17.tar.gz; + sha256 = "1b2999344919826476c59e08e65e4877121b4da1e847c9f354841df688927dd2"; }; + buildInputs = [ TestRequires ]; meta = { description = "Recursively scan Perl code for dependencies"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = "perl"; }; }; @@ -5880,13 +5977,13 @@ let self = _self // overrides; _self = with self; { }; MooseXAppCmd = buildPerlPackage { - name = "MooseX-App-Cmd-0.10"; + name = "MooseX-App-Cmd-0.27"; src = fetchurl { - url = mirror://cpan/authors/id/M/MJ/MJGARDNER/MooseX-App-Cmd-0.10.tar.gz; - sha256 = "6d2d8fdc4f3f7fa76dc82c10d71b099f1572c054a72f373e5a9fa6237e48634a"; + url = mirror://cpan/authors/id/M/MJ/MJGARDNER/MooseX-App-Cmd-0.27.tar.gz; + sha256 = "18wf8xmp0b8g76rlkmzw9m026w0l5k972w3z9xcskwqmg9p0wg3k"; }; - buildInputs = [ MooseXConfigFromFile TestOutput YAML ]; - propagatedBuildInputs = [ AppCmd GetoptLongDescriptive Moose MooseXConfigFromFile MooseXGetopt MooseXHasOptions MooseXMarkAsMethods Testuseok ]; + buildInputs = [ MooseXConfigFromFile TestOutput YAML MouseXGetOpt ]; + propagatedBuildInputs = [ AppCmd GetoptLongDescriptive Moose AnyMoose MooseXConfigFromFile MooseXGetopt MooseXHasOptions MooseXMarkAsMethods Testuseok ]; meta = { homepage = http://metacpan.org/release/MooseX-App-Cmd; description = "Mashes up MooseX::Getopt and App::Cmd"; @@ -5896,6 +5993,91 @@ let self = _self // overrides; _self = with self; { }; }; + MouseXSimpleConfig = buildPerlPackage { + name = "MouseX-SimpleConfig-0.11"; + src = fetchurl { + url = mirror://cpan/authors/id/M/MJ/MJGARDNER/MouseX-SimpleConfig-0.11.tar.gz; + sha256 = "257f384091d33d340373a6153947039c698dc449d1ef989335644fc3d2da0069"; + }; + buildInputs = [ Mouse PathClass ]; + propagatedBuildInputs = [ ConfigAny Mouse MouseXConfigFromFile ]; + meta = { + description = "A Mouse role for setting attributes from a simple configfile"; + license = "perl"; + }; + }; + + + TestUseAllModules = buildPerlPackage { + name = "Test-UseAllModules-0.17"; + src = fetchurl { + url = mirror://cpan/authors/id/I/IS/ISHIGAKI/Test-UseAllModules-0.17.tar.gz; + sha256 = "a71f2fe8b96ab8bfc2760aa1d3135ea049a5b20dcb105457b769a1195c7a2509"; + }; + meta = { + description = "Do use_ok() for all the MANIFESTed modules"; + license = "perl"; + }; + }; + + MouseXTypesPathClass = buildPerlPackage { + name = "MouseX-Types-Path-Class-0.07"; + src = fetchurl { + url = mirror://cpan/authors/id/M/MA/MASAKI/MouseX-Types-Path-Class-0.07.tar.gz; + sha256 = "228d4b4f3f0ed9547278691d0b7c5fe53d90874a69df709a49703c6af87c09de"; + }; + buildInputs = [ TestUseAllModules ]; + propagatedBuildInputs = [ Mouse MouseXTypes PathClass ]; + meta = { + description = "A Path::Class type library for Mouse"; + license = "perl"; + }; + }; + + MouseXTypes = buildPerlPackage { + name = "MouseX-Types-0.06"; + src = fetchurl { + url = mirror://cpan/authors/id/G/GF/GFUJI/MouseX-Types-0.06.tar.gz; + sha256 = "77288441fdadd15beeec9a0813ece8aec1542f1d8ceaaec14755b3f316fbcf8b"; + }; + buildInputs = [ TestException ]; + propagatedBuildInputs = [ AnyMoose Mouse ]; + meta = { + description = "Organize your Mouse types in libraries"; + license = "perl"; + }; + }; + + MouseXConfigFromFile = buildPerlPackage { + name = "MouseX-ConfigFromFile-0.05"; + src = fetchurl { + url = mirror://cpan/authors/id/M/MA/MASAKI/MouseX-ConfigFromFile-0.05.tar.gz; + sha256 = "921b31cb13fc1f982a602f8e23815b7add23a224257e43790e287504ce879534"; + }; + buildInputs = [ TestUseAllModules ]; + propagatedBuildInputs = [ Mouse MouseXTypesPathClass ]; + meta = { + description = "An abstract Mouse role for setting attributes from a configfile"; + license = "perl"; + }; + }; + + MouseXGetOpt = buildPerlModule { + name = "mousex-getopt-0.35"; + src = fetchurl { + url = mirror://cpan/authors/id/T/TO/TOKUHIROM/mousex-getopt-0.35.tar.gz; + sha256 = "5abe243a1ab05d64562358604de1d31d36994414c5c5eaeac688897129d2f9ae"; + }; + buildInputs = [ Mouse MouseXConfigFromFile MouseXSimpleConfig TestException TestWarn ]; + propagatedBuildInputs = [ GetoptLongDescriptive Mouse ]; + meta = { + homepage = https://github.com/gfx/mousex-getopt; + description = "A Mouse role for processing command line options"; + license = "perl"; + }; + }; + + MooseXAttributeChained = buildPerlModule rec { name = "MooseX-Attribute-Chained-1.0.1"; src = fetchurl { @@ -5911,6 +6093,7 @@ let self = _self // overrides; _self = with self; { url = mirror://cpan/authors/id/D/DR/DROLSKY/MooseX-AttributeHelpers-0.23.tar.gz; sha256 = "3f63f60d94d840a309d9137f78605e15f07c977fd15a4f4b55bd47b65ed52be1"; }; + patches = [ ../development/perl-modules/MooseXAttributeHelpers-perl-5.20.patch ]; buildInputs = [ Moose TestException ]; propagatedBuildInputs = [ Moose ]; meta = { @@ -6235,17 +6418,17 @@ let self = _self // overrides; _self = with self; { }; MooseXTypes = buildPerlPackage { - name = "MooseX-Types-0.35"; + name = "MooseX-Types-0.45"; src = fetchurl { - url = mirror://cpan/authors/id/D/DR/DROLSKY/MooseX-Types-0.35.tar.gz; - sha256 = "11namg9pjw328ybvj70cgn15aac093jwdm4jv0b173gb7vkflx8a"; + url = mirror://cpan/authors/id/E/ET/ETHER/MooseX-Types-0.45.tar.gz; + sha256 = "d01ff4a3db78e1150101b4b63569e4bce3ced3b5b0024c52c87575e0820609c7"; }; - buildInputs = [ TestFatal TestMoose TestRequires ]; - propagatedBuildInputs = [ CarpClan Moose namespaceclean SubInstall SubName ]; + buildInputs = [ ModuleBuildTiny Moose TestFatal TestRequires if_ ]; + propagatedBuildInputs = [ CarpClan ModuleRuntime Moose SubExporter SubName namespaceautoclean ]; meta = { - homepage = http://search.cpan.org/perldoc?CPAN::Meta::Spec; + homepage = https://github.com/moose/MooseX-Types; description = "Organise your Moose types in libraries"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = "perl"; }; }; @@ -6815,6 +6998,18 @@ let self = _self // overrides; _self = with self; { }; }; + ObjectAccessor = buildPerlPackage { + name = "Object-Accessor-0.48"; + src = fetchurl { + url = mirror://cpan/authors/id/B/BI/BINGOS/Object-Accessor-0.48.tar.gz; + sha256 = "76cb824a27b6b4e560409fcf6fd5b3bfbbd38b72f1f3d37ed0b54bd9c0baeade"; + }; + meta = { + description = "Per object accessors"; + license = "perl"; + }; + }; + ObjectInsideOut = buildPerlPackage { name = "Object-InsideOut-3.98"; src = fetchurl { @@ -6887,6 +7082,18 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ NetOpenIDCommon JSON LWP ]; }; + PackageConstants = buildPerlPackage { + name = "Package-Constants-0.04"; + src = fetchurl { + url = mirror://cpan/authors/id/B/BI/BINGOS/Package-Constants-0.04.tar.gz; + sha256 = "7e09a88da2c0df24f498eb3a133f7d979404a7bc853f21afa2ba68dfd859a880"; + }; + meta = { + description = "List constants defined in a package"; + license = "perl"; + }; + }; + PackageDeprecationManager = buildPerlPackage { name = "Package-DeprecationManager-0.13"; src = fetchurl { @@ -6931,6 +7138,22 @@ let self = _self // overrides; _self = with self; { }; }; + Pango = buildPerlPackage rec { + name = "Pango-1.226"; + src = fetchurl { + url = "mirror://cpan/authors/id/X/XA/XAOC/${name}.tar.gz"; + sha256 = "0r4jx7d6gj6ixk2r5yr70biy1lpjxir08aywkw02g85wg6zkjw4z"; + }; + buildInputs = [ ExtUtilsDepends ExtUtilsPkgConfig pkgs.pango ]; + propagatedBuildInputs = [ Cairo Glib ]; + meta = { + homepage = http://gtk2-perl.sourceforge.net/; + description = "Layout and render international text"; + maintainers = with maintainers; [ nckx ]; + license = with stdenv.lib.licenses; [ lgpl21Plus ]; + }; + }; + ParamsClassify = buildPerlPackage rec { name = "Params-Classify-0.013"; src = fetchurl { @@ -7541,11 +7764,15 @@ let self = _self // overrides; _self = with self; { }; }; - RegexpCommon = buildPerlPackage rec { - name = "Regexp-Common-2.122"; + RegexpCommon = buildPerlPackage { + name = "Regexp-Common-2013031301"; src = fetchurl { - url = "mirror://cpan/authors/id/A/AB/ABIGAIL/${name}.tar.gz"; - sha256 = "1mi411nfsx58nfsgjsbyck50x9d0yfvwqpw63iavajlpx1z38n8r"; + url = mirror://cpan/authors/id/A/AB/ABIGAIL/Regexp-Common-2013031301.tar.gz; + sha256 = "729a8198d264aa64ecbb233ff990507f97fbb66bda746b95f3286f50f5f25c84"; + }; + meta = { + description = "Provide commonly requested regular expressions"; + license = "mit"; }; }; @@ -7856,18 +8083,36 @@ let self = _self // overrides; _self = with self; { }; SQLTranslator = buildPerlPackage rec { - name = "SQL-Translator-0.11006"; + name = "SQL-Translator-0.11020"; src = fetchurl { - url = "mirror://cpan/authors/id/R/RI/RIBASUSHI/${name}.tar.gz"; - sha256 = "0ifnzap3pgkxvkv2gxpmv02637pfraza5m4zk99braw319ra4mla"; + url = "mirror://cpan/authors/id/I/IL/ILMARI/${name}.tar.gz"; + sha256 = "18mqnppwk1076sxcink5ajk75ysway0bd049hwxvk8md39x0y7ar"; }; propagatedBuildInputs = [ ClassBase ClassDataInheritable ClassMakeMethods DigestSHA1 CarpClan IOStringy ParseRecDescent ClassAccessor DBI FileShareDir XMLWriter YAML TestDifferences TemplateToolkit GraphViz XMLLibXML TestPod TextRecordParser HTMLParser - SpreadsheetParseExcel Graph GD + SpreadsheetParseExcel Graph GD Moo TryTiny PackageVariant ]; + meta = { + platforms = stdenv.lib.platforms.linux; + }; }; + + PackageVariant = buildPerlPackage { + name = "Package-Variant-1.002002"; + src = fetchurl { + url = mirror://cpan/authors/id/H/HA/HAARG/Package-Variant-1.002002.tar.gz; + sha256 = "826780f19522f42c6b3d9f717ab6b5400f198cec08f4aa15b71aef9aa17e9b13"; + }; + buildInputs = [ TestFatal ]; + propagatedBuildInputs = [ ImportInto ModuleRuntime strictures ]; + meta = { + description = "Parameterizable packages"; + license = "perl"; + }; + }; + Starman = buildPerlModule { name = "Starman-0.4010"; @@ -9080,11 +9325,17 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ProbePerl IPCRun3]; }; - TestSharedFork = buildPerlPackage rec { - name = "Test-SharedFork-0.18"; + TestSharedFork = buildPerlPackage { + name = "Test-SharedFork-0.29"; src = fetchurl { - url = "mirror://cpan/authors/id/T/TO/TOKUHIROM/${name}.tar.gz"; - sha256 = "1wc41jzi780w75m2ry1038mzxyz7386r8rmhbnmj3krcdxy676cc"; + url = mirror://cpan/authors/id/E/EX/EXODIST/Test-SharedFork-0.29.tar.gz; + sha256 = "63af7788cc35b9b7e6fa37c61220ca66abd6364d8bb90c20038e3d8241988a6e"; + }; + buildInputs = [ TestRequires ]; + meta = { + homepage = https://github.com/tokuhirom/Test-SharedFork; + description = "Fork test"; + license = "perl"; }; }; @@ -9725,10 +9976,15 @@ let self = _self // overrides; _self = with self; { }; UNIVERSALcan = buildPerlPackage { - name = "UNIVERSAL-can-1.12"; + name = "UNIVERSAL-can-1.20140328"; src = fetchurl { - url = mirror://cpan/authors/id/C/CH/CHROMATIC/UNIVERSAL-can-1.12.tar.gz; - sha256 = "1abadbgcy11cmlmj9qf1v73ycic1qhysxv5xx81h8s4p81alialr"; + url = mirror://cpan/authors/id/C/CH/CHROMATIC/UNIVERSAL-can-1.20140328.tar.gz; + sha256 = "522da9f274786fe2cba99bc77cc1c81d2161947903d7fad10bd62dfb7f11990f"; + }; + meta = { + homepage = https://github.com/chromatic/UNIVERSAL-can; + description = "Work around buggy code calling UNIVERSAL::can() as a function"; + license = "perl"; }; }; @@ -10256,10 +10512,10 @@ let self = _self // overrides; _self = with self; { }; YAMLLibYAML = buildPerlPackage rec { - name = "YAML-LibYAML-0.41"; + name = "YAML-LibYAML-0.52"; src = fetchurl { url = "mirror://cpan/authors/id/I/IN/INGY/${name}.tar.gz"; - sha256 = "1kj506lpg3fhqq0726p6y2h7pk24l6xihfyhqqsf8gd6lckl8rcs"; + sha256 = "14qajsfbi2syjz38iynj8c6qf0rv1zmy71kydzvvg9kcq1ib3h86"; }; }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 802f316d026..ffd81c232a3 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -144,6 +144,7 @@ let pyqt4 = callPackage ../development/python-modules/pyqt/4.x.nix { pythonDBus = self.dbus; + pythonPackages = self; }; pyqt5 = callPackage ../development/python-modules/pyqt/5.x.nix { @@ -428,13 +429,13 @@ let apscheduler = buildPythonPackage rec { - name = "APScheduler-2.1.2"; + name = "APScheduler-3.0.1"; - propagatedBuildInputs = with self; [ futures tzlocal six pytest mock]; + propagatedBuildInputs = with self; [ futures tzlocal six pytest mock sqlalchemy9 ]; src = pkgs.fetchurl { - url = "https://pypi.python.org/packages/source/A/APScheduler/APScheduler-2.1.2.tar.gz"; - md5 = "6862959d460c16ef325d63e1fc3a6684"; + url = "https://pypi.python.org/packages/source/A/APScheduler/${name}.tar.gz"; + sha256 = "1dcyk58svhhd7flpq0fbyzcp0z3a1as4ddmdv1rxqvqng0sxhwaf"; }; meta = with pkgs.stdenv.lib; { @@ -522,11 +523,11 @@ let }); astroid = buildPythonPackage (rec { - name = "astroid-1.2.1"; - propagatedBuildInputs = with self; [ logilab_common ]; + name = "astroid-1.3.2"; + propagatedBuildInputs = with self; [ logilab_common six ]; src = pkgs.fetchurl { - url = "https://pypi.python.org/packages/source/a/astroid/${name}.zip"; - md5 = "337017c82a28c97741797493fb2c980f"; + url = "https://pypi.python.org/packages/source/a/astroid/${name}.tar.gz"; + md5 = "2ab96129a977b6eba27765a15d1a9bf2"; }; }); @@ -1064,12 +1065,12 @@ let }; botocore = buildPythonPackage rec { - version = "0.69.0"; + version = "0.80.0"; name = "botocore-${version}"; src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/b/botocore/${name}.tar.gz"; - md5 = "b71fe35ee01e636b54de28f1f875f084"; + sha256 = "1zmsg0n21wq25v1dgnmf3hvw8yszxyryiylmp4alybcsg8nkg5fz"; }; propagatedBuildInputs = @@ -1856,11 +1857,11 @@ let }; pycollada = buildPythonPackage rec { - name = "pycollada-0.4"; + name = "pycollada-0.4.1"; src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/p/pycollada/${name}.tar.gz"; - md5 = "5d0f00c035491b945cdccdfd8a698ad2"; + sha256 = "0i50lh98550pwr95zgzrgiqzsspm09wl52xlv83y5nrsz4mblylv"; }; # pycollada-0.4 needs python-dateutil==1.5 @@ -2033,6 +2034,29 @@ let }; }); + # flexget requires 2.1 + dateutil_2_1 = buildPythonPackage (rec { + name = "dateutil-2.1"; + + src = pkgs.fetchurl { + url = "http://pypi.python.org/packages/source/p/python-dateutil/python-${name}.tar.gz"; + sha256 = "1vlx0lpsxjxz64pz87csx800cwfqznjyr2y7nk3vhmzhkwzyqi2c"; + }; + + propagatedBuildInputs = with self; [ self.six ]; + + preBuild = '' + export LOCALE_ARCHIVE=${localePath} + export LC_ALL="en_US.UTF-8" + ''; + + meta = { + description = "Powerful extensions to the standard datetime module"; + homepage = http://pypi.python.org/pypi/python-dateutil; + license = "BSD-style"; + }; + }); + decorator = buildPythonPackage rec { name = "decorator-3.4.0"; @@ -2197,6 +2221,21 @@ let }; }; + dockerpty = buildPythonPackage rec { + name = "dockerpty-0.3.2"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/d/dockerpty/${name}.tar.gz"; + md5 = "1f97b24d2f4b2c345f176f91655002dd"; + }; + + meta = { + description = "Functionality needed to operate the pseudo-tty (PTY) allocated to a docker container"; + homepage = https://github.com/d11wtq/dockerpty; + license = licenses.asl20; + }; + }; + docker_registry_core = buildPythonPackage rec { name = "docker-registry-core-2.0.3"; disabled = isPy3k; @@ -2253,6 +2292,20 @@ let }; }; + docopt = buildPythonPackage rec { + name = "docopt-0.6.2"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/d/docopt/${name}.tar.gz"; + md5 = "4bc74561b37fad5d3e7d037f82a4c3b1"; + }; + + meta = { + description = "Pythonic argument parser, that will make you smile"; + homepage = http://docopt.org/; + license = licenses.mit; + }; + }; dogpile_cache = buildPythonPackage rec { name = "dogpile.cache-0.5.4"; @@ -2355,12 +2408,12 @@ let dropbox = buildPythonPackage rec { - name = "dropbox-2.0.0"; - doCheck = !isPy3k; # failures with hash randomization + name = "dropbox-2.2.0"; + doCheck = false; # python 2.7.9 does verify ssl certificates src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/d/dropbox/${name}.zip"; - sha256 = "1bi2z1lql6ryylfflmizhqn98ab55777vn7n5krhqz40pdcjilkx"; + sha256 = "069jrwb67brqh0sics8fgqdf2mv5y5jl9k5729x8vf80pq2c9p36"; }; propagatedBuildInputs = with self; [ urllib3 mock setuptools ]; @@ -2732,6 +2785,42 @@ let }; }; + jsonpatch = buildPythonPackage rec { + name = "jsonpatch-1.8"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/j/jsonpatch/jsonpatch-1.8.tar.gz"; + sha256 = "0xhp6prvk219vnzixbj231wymd458nqbnmsf5fn4252092prvig5"; + }; + + propagatedBuildInputs = with self; [ six jsonpointer ]; + + meta = { + description = "Apply JSON-Patches (RFC 6902)"; + homepage = "https://github.com/stefankoegl/python-json-patch"; + license = stdenv.lib.licenses.bsd3; + platforms = stdenv.lib.platforms.all; + }; + }; + + jsonpointer = buildPythonPackage rec { + name = "jsonpointer-1.4"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/j/jsonpointer/jsonpointer-1.4.tar.gz"; + sha256 = "1d0555smqwdbi0nm48hyqzywb9m2jlz5izgv56ll3zk7viz3b7fb"; + }; + + #propagatedBuildInputs = with self; [ six jsonpointer ]; + + meta = { + description = "Identify specific nodes in a JSON document (RFC 6901)"; + homepage = "https://github.com/stefankoegl/python-json-pointer"; + license = stdenv.lib.licenses.bsd3; + platforms = stdenv.lib.platforms.all; + }; + }; + jsonwatch = buildPythonPackage rec { name = "jsonwatch-0.2.0"; @@ -2852,7 +2941,7 @@ let md5 = "9c4c5a59b878aed78e96a6ae58c6c185"; }; - propagatedBuildInputs = [ pkgs.pyqt4 pkgs.sip pkgs.pkgconfig pkgs.popplerQt4 ]; + propagatedBuildInputs = [ pkgs.pyqt4 pkgs.pkgconfig pkgs.popplerQt4 ]; preBuild = "${python}/bin/${python.executable} setup.py build_ext" + " --include-dirs=${pkgs.popplerQt4}/include/poppler/"; @@ -3475,11 +3564,11 @@ let }; deluge = buildPythonPackage rec { - name = "deluge-1.3.10"; + name = "deluge-1.3.11"; src = pkgs.fetchurl { url = "http://download.deluge-torrent.org/source/${name}.tar.bz2"; - sha256 = "1x8ylcw88a6x3zyvyxmzjsbcy9dr2s5dxam2aw6harb4n1l2v9kd"; + sha256 = "16681sg7yi03jqyifhalnw4vavb8sj94cisldal7nviai8dz9qc3"; }; propagatedBuildInputs = with self; [ @@ -3916,6 +4005,45 @@ let }; }); + fig = buildPythonPackage rec { + name = "fig-1.0.1"; + disabled = isPy3k || isPyPy; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/f/fig/${name}.tar.gz"; + md5 = "e1c82296fe2362fae21b3cb0dfee8cb2"; + }; + + propagatedBuildInputs = with self; [ + six requests2 pyyaml texttable docopt + (dockerpty.override { + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/d/dockerpty/dockerpty-0.3.2.tar.gz"; + md5 = "1f97b24d2f4b2c345f176f91655002dd"; + }; + }) + (docker.override { + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/d/docker-py/docker-py-0.5.3.tar.gz"; + md5 = "809b7b8c144f5e37787e72b030ee353f"; + }; + }) + (websocket_client.override { + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/w/websocket-client/websocket-client-0.11.0.tar.gz"; + md5 = "fcffbb5ac10941d9ace416d14d1e3ec8"; + }; + }) + ]; + + doCheck = false; + + meta = { + homepage = http://www.fig.sh/; + description = "Fast, isolated development environments using Docker"; + license = stdenv.lib.licenses.asl20; + }; + }; flake8 = buildPythonPackage (rec { name = "flake8-2.1.0"; @@ -3975,21 +4103,22 @@ let }; flexget = buildPythonPackage rec { - version = "1.2.201"; + version = "1.2.234"; name = "FlexGet-${version}"; disabled = isPy3k; src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/F/FlexGet/${name}.tar.gz"; - md5 = "e940845fc38ee602109a876455a02084"; + md5 = "0897b6db25e8a28e809d131a8ad017e4"; }; + doCheck = false; + buildInputs = with self; [ nose ]; - propagatedBuildInputs = with self; [ paver feedparser sqlalchemy pyyaml rpyc + propagatedBuildInputs = with self; [ paver feedparser sqlalchemy9 pyyaml rpyc beautifulsoup4 html5lib pyrss2gen pynzb progressbar jinja2 flask - cherrypy requests dateutil_1_5 jsonschema python_tvrage tmdb3 - guessit pathpy - ] + cherrypy requests dateutil_2_1 jsonschema python_tvrage tmdb3 + guessit pathpy apscheduler ] # enable deluge and transmission plugin support, if they're installed ++ stdenv.lib.optional (pkgs.config.pythonPackages.deluge or false) pythonpackages.deluge @@ -4462,17 +4591,17 @@ let }; guessit = buildPythonPackage rec { - version = "0.9.3"; + version = "0.9.4"; name = "guessit-${version}"; disabled = isPy3k; src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/g/guessit/${name}.tar.gz"; - sha256 = "16kbxdz5zm3mfn739ynis04zw76x2gn1lz5d7vcwh8hzaj16yyk6"; + sha256 = "068d3dmyk4v04p2zna0340lsdnpkm10gyza62apd9akgjh9rfs48"; }; propagatedBuildInputs = with self; [ - dateutil_1_5 requests stevedore babelfish pyyaml + dateutil_2_1 requests stevedore babelfish pyyaml ]; # A unicode test fails @@ -4849,11 +4978,11 @@ let jmespath = buildPythonPackage rec { - name = "jmespath-0.4.1"; + name = "jmespath-0.5.0"; src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/j/jmespath/${name}.tar.gz"; - md5 = "a11ae39472672a650dfb55feab7d65eb"; + sha256 = "1hiqqaz1a9qv1j8n02r9c2c010krr0ar2sf35j2z2kci7ywky963"; }; propagatedBuildInputs = with self; [ ply ]; @@ -5612,6 +5741,23 @@ let }; }; + mutag = buildPythonPackage rec { + disabled = ! isPy3k; + name = "mutag-0.0.2-2ffa0258ca"; + src = pkgs.fetchgit { + url = "https://github.com/aroig/mutag.git"; + sha256 = "0azq2sb32mv6wyjlw1hk01c23isl4x1hya52lqnhknak299s5fml"; + rev = "2ffa0258cadaf79313241f43bf2c1caaf197d9c2"; + }; + + propagatedBuildInputs = with self; [ pyparsing ]; + + meta = { + homepage = https://github.com/aroig/mutag; + license = stdenv.lib.licenses.gpl3; + maintainers = [ stdenv.lib.maintainers.DamienCassou ]; + }; + }; mutagen = buildPythonPackage (rec { name = "mutagen-1.23"; @@ -6095,6 +6241,22 @@ let }; }; + oauth = buildPythonPackage (rec { + name = "oauth-1.0.1"; + + src = pkgs.fetchurl { + url = "http://pypi.python.org/packages/source/o/oauth/oauth-1.0.1.tar.gz"; + sha256 = "0pdgi35hczsslil4890xqawnbpdazkgf2v1443847h5hy2gq2sg7"; + }; + + meta = { + homepage = "http://code.google.com/p/oauth"; + description = "Library for OAuth version 1.0a."; + license = licenses.mit; + platforms = stdenv.lib.platforms.all; + }; + }); + oauth2 = buildPythonPackage (rec { name = "oauth2-1.5.211"; disabled = isPy3k; @@ -6141,20 +6303,23 @@ let obfsproxy = buildPythonPackage ( rec { - name = "obfsproxy-0.2.2"; + name = "obfsproxy-${version}"; + version = "0.2.12"; + src = pkgs.fetchgit { url = meta.repositories.git; - rev = "3c4e843a30c430aec1de03e0e09ef654072efc03"; - sha256 = "8fd1e63a37bc42add7609d97d50ecd81da81881bcf7015a9e2958531dbf39018"; + rev = "refs/tags/${name}"; + sha256 = "82d694aa7f3de7327fc4dc517fb262ab076f536ed6d4377573c76df8cf019dcf"; }; - propagatedBuildInputs = with self; [ pyptlib argparse twisted pycrypto ]; + propagatedBuildInputs = with self; + [ pyptlib argparse twisted pycrypto pyyaml ]; meta = { description = "a pluggable transport proxy"; homepage = https://www.torproject.org/projects/obfsproxy; repositories.git = https://git.torproject.org/pluggable-transports/obfsproxy.git; - maintainers = [ stdenv.lib.maintainers.phreedom ]; + maintainers = with stdenv.lib.maintainers; [ phreedom thoughtpolice ]; }; }); @@ -6308,6 +6473,9 @@ let # https://github.com/paramiko/paramiko/issues/449 doCheck = !(isPyPy || isPy33); checkPhase = '' + # test_util needs to resolve an hostname, thus failing when the fw blocks it + sed '/UtilTest/d' -i test.py + ${python}/bin/${python.executable} test.py --no-sftp --no-big-file ''; @@ -6465,6 +6633,26 @@ let }; }; + percol = buildPythonPackage rec { + name = "percol-${version}"; + version = "0.0.7"; + disabled = isPy3k; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/p/percol/${name}.tar.gz"; + sha256 = "01444z62clvx9rms9aiqx47s0fbvsfgbp6hlfff344xl7kc4l2gj"; + }; + + propagatedBuildInputs = with self; [ modules.curses ]; + + meta = { + homepage = https://github.com/mooz/percol; + description = "Adds flavor of interactive filtering to the traditional pipe concept of shell"; + license = licenses.mit; + maintainers = with stdenv.lib.maintainers; [ koral ]; + }; + }; + pexpect = buildPythonPackage { name = "pexpect-2.3"; @@ -6857,6 +7045,27 @@ let }; }; + pycosat = pythonPackages.buildPythonPackage rec { + name = "pycosat-0.6.0"; + + propagatedBuildInputs = with pythonPackages; [ ]; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/p/pycosat/${name}.tar.gz"; + sha256 = "02sdn2998jlrm35smn1530hix3kzwyc1jv49cjdcnvfvrqqi3rww"; + }; + + meta = with stdenv.lib; { + description = ''PicoSAT is a popular SAT solver written by Armin + Biere in pure C. This package provides efficient Python bindings + to picosat on the C level, i.e. when importing pycosat, the + picosat solver becomes part of the Python process itself. For + ease of deployment, the picosat source (namely picosat.c and + picosat.h) is included in this project.''; + homepage = https://github.com/ContinuumIO/pycosat; + license = licenses.mit; + }; + }; pygit2 = buildPythonPackage rec { name = "pygit2-0.21.2"; @@ -7391,10 +7600,14 @@ let pyptlib = buildPythonPackage (rec { name = "pyptlib-${version}"; - version = "0.0.3"; + disabled = isPyPy || isPy3k; + version = "0.0.6"; + + doCheck = false; # No such file or directory errors on 32bit + src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/p/pyptlib/pyptlib-${version}.tar.gz"; - sha256 = "0mklak456jqifx57j9jmpb69h3ybxc880qk86pg4g8jk0i14pxh3"; + sha256 = "01y6vbwncqb0hxlnin6whd9wrrm5my4qzjhk76fnix78v7ip515r"; }; meta = { description = "A python implementation of the Pluggable Transports for Circumvention specification for Tor"; @@ -8647,8 +8860,6 @@ let scikitlearn = buildPythonPackage { name = "scikit-learn-0.15.2"; - disabled = isPy3k; - src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/s/scikit-learn/scikit-learn-0.15.2.tar.gz"; md5 = "d9822ad0238e17b382a3c756ea94fe0d"; @@ -8710,15 +8921,14 @@ let sha256 = "13aqm0dwy17ghimy7m2mxjwlyc1k7zk5icxzrs1sa896056f1dyy"; }; - preInstall = '' + patchPhase = '' cp "${x_ignore_nofocus}/cpp/linux-specific/"* . - sed -i 's|dlopen(library,|dlopen("libX11.so.6",|' x_ignore_nofocus.c + substituteInPlace x_ignore_nofocus.c --replace "/usr/lib/libX11.so.6" "${pkgs.xlibs.libX11}/lib/libX11.so.6" gcc -c -fPIC x_ignore_nofocus.c -o x_ignore_nofocus.o gcc -shared \ -Wl,${if stdenv.isDarwin then "-install_name" else "-soname"},x_ignore_nofocus.so \ -o x_ignore_nofocus.so \ - x_ignore_nofocus.o \ - ${if stdenv.isDarwin then "-lx11" else ""} + x_ignore_nofocus.o cp -v x_ignore_nofocus.so py/selenium/webdriver/firefox/${if pkgs.stdenv.is64bit then "amd64" else "x86"}/ ''; }; @@ -9716,6 +9926,21 @@ let }; }; + texttable = self.buildPythonPackage rec { + name = "texttable-0.8.1"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/t/texttable/${name}.tar.gz"; + md5 = "4fe37704f16ecf424b91e122defedd7e"; + }; + + meta = with stdenv.lib; { + description = "A module to generate a formatted text table, using ASCII characters"; + homepage = http://foutaise.org/code/; + license = licenses.lgpl2; + }; + }; + tmdb3 = buildPythonPackage rec { name = "tmdb3-${version}"; version = "0.6.17"; @@ -11950,7 +12175,16 @@ let sha256 = "07fyvwp4rga47ayfsmb79p2784sqrih0sglwnd9c4x6g63xgljvb"; }; - propagatedBuildInputs = with self; [ pygtk pyyaml pygobject dbus notify pkgs.udisks2 pkgs.gettext ]; + preConfigure = '' + export XDG_RUNTIME_DIR=/tmp + ''; + + propagatedBuildInputs = with self; [ pkgs.gobjectIntrospection pkgs.gtk3 pyyaml pygobject3 pkgs.libnotify pkgs.udisks2 pkgs.gettext self.docopt ]; + + preFixup = '' + wrapProgram $out/bin/* \ + --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" + ''; # tests require dbusmock doCheck = false; @@ -11963,12 +12197,12 @@ let }; }; - pythonefl_1_11 = buildPythonPackage rec { + pythonefl_1_12 = buildPythonPackage rec { name = "python-efl-${version}"; - version = "1.11.0"; + version = "1.12.0"; src = pkgs.fetchurl { - url = "http://download.enlightenment.org/rel/bindings/python/${name}.tar.xz"; - sha256 = "1d4hj39alg6j7ah1bc8wvlka9d13i8iy3fxxraik2f60w6811i48"; + url = "http://download.enlightenment.org/rel/bindings/python/${name}.tar.gz"; + sha256 = "0rxv5nrqg5c2l93ns2k6gjil1y7qq6amfh5slkarm3kv8fzk17xv"; }; preConfigure = '' export NIX_CFLAGS_COMPILE="-I${pkgs.e19.efl}/include/eo-1 -I${pkgs.e19.efl}/include/eina-1 -I${pkgs.e19.efl}/include/eina-1/eina -I${pkgs.e19.efl}/include/evas-1 -I${self.dbus}/include/dbus-1.0 -I${pkgs.e19.efl}/include/efl-1 -I${pkgs.e19.efl}/include/eet-1 -I${pkgs.e19.efl}/include/ecore-1 -I${pkgs.e19.efl}/include/ecore-evas-1 -I${pkgs.e19.efl}/include/ecore-file-1 -I${pkgs.e19.efl}/include/ecore-input-1 -I${pkgs.e19.efl}/include/ecore-imf-1 -I${pkgs.e19.efl}/include/ecore-con-1 -I${pkgs.e19.efl}/include/edje-1 -I${pkgs.e19.efl}/include/eldbus-1 -I${pkgs.e19.efl}/include/efreet-1 -I${pkgs.e19.efl}/include/ethumb-client-1 -I${pkgs.e19.efl}/include/ethumb-1 -I${pkgs.e19.efl}/include/ecore-x-1 $NIX_CFLAGS_COMPILE" @@ -12078,7 +12312,7 @@ let }; propagatedBuildInputs = with self; [ boto-230 crcmod httplib2 gcs-oauth2-boto-plugin google_api_python_client gflags - retry_decorator pkgs.pyopenssl socksipy-branch ]; + retry_decorator pkgs.pyopenssl socksipy-branch crcmod ]; }; pypi2nix = self.buildPythonPackage rec { diff --git a/pkgs/top-level/release-small.nix b/pkgs/top-level/release-small.nix index 87eba72f4fc..8929da61ead 100644 --- a/pkgs/top-level/release-small.nix +++ b/pkgs/top-level/release-small.nix @@ -119,7 +119,7 @@ with import ./release-lib.nix { inherit supportedSystems; }; mysql51 = linux; ncat = linux; netcat = all; - nfsUtils = linux; + nfs-utils = linux; nix = all; nixUnstable = all; nss_ldap = linux; diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index 90a82be0e05..946228cf889 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -121,7 +121,7 @@ let gzip = all; hddtemp = linux; host = linux; - htmlTidy = all; + html-tidy = all; iana_etc = linux; icewm = linux; ifplugd = linux;