From 1d5d7fdee2e85460e44b9931f3259254c2092806 Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Wed, 14 May 2014 17:53:58 +0200 Subject: [PATCH 001/843] pam: Add logFailures option for adding pam_tally to su --- nixos/modules/programs/shadow.nix | 2 +- nixos/modules/security/pam.nix | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/nixos/modules/programs/shadow.nix b/nixos/modules/programs/shadow.nix index 27a18c726a3..9763332ed97 100644 --- a/nixos/modules/programs/shadow.nix +++ b/nixos/modules/programs/shadow.nix @@ -82,7 +82,7 @@ in security.pam.services = { chsh = { rootOK = true; }; chfn = { rootOK = true; }; - su = { rootOK = true; forwardXAuth = true; }; + su = { rootOK = true; forwardXAuth = true; logFailures = true; }; passwd = {}; # Note: useradd, groupadd etc. aren't setuid root, so it # doesn't really matter what the PAM config says as long as it diff --git a/nixos/modules/security/pam.nix b/nixos/modules/security/pam.nix index 6a5eb4c720f..76fbd9b671f 100644 --- a/nixos/modules/security/pam.nix +++ b/nixos/modules/security/pam.nix @@ -132,6 +132,12 @@ let description = "Whether to update /var/log/wtmp."; }; + logFailures = mkOption { + default = false; + type = types.bool; + description = "Whether to log authentication failures in /var/log/faillog."; + }; + text = mkOption { type = types.nullOr types.lines; description = "Contents of the PAM service file."; @@ -159,6 +165,8 @@ let # Authentication management. ${optionalString cfg.rootOK "auth sufficient pam_rootok.so"} + ${optionalString cfg.logFailures + "auth required pam_tally.so"} ${optionalString (config.security.pam.enableSSHAgentAuth && cfg.sshAgentAuth) "auth sufficient ${pkgs.pam_ssh_agent_auth}/libexec/pam_ssh_agent_auth.so file=~/.ssh/authorized_keys:~/.ssh/authorized_keys2:/etc/ssh/authorized_keys.d/%u"} ${optionalString cfg.usbAuth -- GitLab From d39684b69bb196de3e3440cc7fb0a749f6b7bc6c Mon Sep 17 00:00:00 2001 From: Chris Farmiloe Date: Sat, 21 Jun 2014 14:02:35 +0200 Subject: [PATCH 002/843] Simple nixos module to enable configuration of freetds and setup the expected environment variables --- nixos/modules/module-list.nix | 1 + nixos/modules/programs/freetds.nix | 61 ++++++++++++++++++++++++++++++ 2 files changed, 62 insertions(+) create mode 100644 nixos/modules/programs/freetds.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index a82cef3e076..2cdb8a900d8 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -58,6 +58,7 @@ ./programs/ssmtp.nix ./programs/venus.nix ./programs/wvdial.nix + ./programs/freetds.nix ./programs/zsh/zsh.nix ./programs/screen.nix ./rename.nix diff --git a/nixos/modules/programs/freetds.nix b/nixos/modules/programs/freetds.nix new file mode 100644 index 00000000000..398fd104363 --- /dev/null +++ b/nixos/modules/programs/freetds.nix @@ -0,0 +1,61 @@ +# Global configuration for freetds environment. + +{ config, lib, pkgs, ... }: + +with lib; + +let + + cfg = config.environment.freetds; + +in +{ + ###### interface + + options = { + + environment.freetds = mkOption { + type = types.attrsOf types.str; + default = {}; + example = { + MYDATABASE = + '' + host = 10.0.2.100 + port = 1433 + tds version = 7.2 + ''; + }; + description = + '' + Configure freetds database entries. Each attribute denotes + a section within freetds.conf, and the value (a string) is the config + content for that section. When at least one entry is configured + the global environment variables FREETDSCONF, FREETDS and SYBASE + will be configured to allow the programs that use freetds to find the + library and config. + ''; + + }; + + }; + + ###### implementation + + config = mkIf (length (attrNames cfg) > 0) { + + environment.variables.FREETDSCONF = "/etc/freetds.conf"; + environment.variables.FREETDS = "/etc/freetds.conf"; + environment.variables.SYBASE = "${pkgs.freetds}"; + + environment.etc."freetds.conf" = { text = + (concatStrings (mapAttrsToList (name: value: + '' + [${name}] + ${value} + '' + ) cfg)); + }; + + }; + +} -- GitLab From 86c283824f76d849acbe6f97c34250c8c5533499 Mon Sep 17 00:00:00 2001 From: Daniel Zinn Date: Mon, 23 Jun 2014 06:11:34 -0700 Subject: [PATCH 003/843] If cuda headers are presented to nix in $out/include they are added to future gcc calls via a -isystem flag. However, cuda does not allow kernel calls from template function if these are located in system-headers. We thus move headers from $out/include to $out/usr_include and add a custom hook to add these headers via -I. --- pkgs/development/compilers/cudatoolkit/5.5.nix | 3 +++ pkgs/development/compilers/cudatoolkit/6.0.nix | 3 +++ pkgs/development/compilers/cudatoolkit/setup-hook.sh | 8 ++++++++ 3 files changed, 14 insertions(+) create mode 100644 pkgs/development/compilers/cudatoolkit/setup-hook.sh diff --git a/pkgs/development/compilers/cudatoolkit/5.5.nix b/pkgs/development/compilers/cudatoolkit/5.5.nix index 99f0828012f..bf4009f08be 100644 --- a/pkgs/development/compilers/cudatoolkit/5.5.nix +++ b/pkgs/development/compilers/cudatoolkit/5.5.nix @@ -51,8 +51,11 @@ stdenv.mkDerivation rec { perl ./install-linux.pl --prefix="$out" rm $out/tools/CUDA_Occupancy_Calculator.xls perl ./install-sdk-linux.pl --prefix="$sdk" --cudaprefix="$out" + mv $out/include $out/usr_include ''; + setupHook = ./setup-hook.sh; + meta = { license = [ "nonfree" ]; }; diff --git a/pkgs/development/compilers/cudatoolkit/6.0.nix b/pkgs/development/compilers/cudatoolkit/6.0.nix index 573cc826221..5da4b3d0a4a 100644 --- a/pkgs/development/compilers/cudatoolkit/6.0.nix +++ b/pkgs/development/compilers/cudatoolkit/6.0.nix @@ -51,8 +51,11 @@ stdenv.mkDerivation rec { perl ./install-linux.pl --prefix="$out" rm $out/tools/CUDA_Occupancy_Calculator.xls perl ./install-sdk-linux.pl --prefix="$sdk" --cudaprefix="$out" + mv $out/include $out/usr_include ''; + setupHook = ./setup-hook.sh; + meta = { license = [ "nonfree" ]; }; diff --git a/pkgs/development/compilers/cudatoolkit/setup-hook.sh b/pkgs/development/compilers/cudatoolkit/setup-hook.sh new file mode 100644 index 00000000000..1b75a2e91ba --- /dev/null +++ b/pkgs/development/compilers/cudatoolkit/setup-hook.sh @@ -0,0 +1,8 @@ +addIncludePath () { + if test -d "$1/usr_include" + then + export NIX_CFLAGS_COMPILE="${NIX_CFLAGS_COMPILE} -I$1/usr_include" + fi +} + +envHooks=(${envHooks[@]} addIncludePath) -- GitLab From de4d6f0447393a0a2c688461740d12b886a57f9d Mon Sep 17 00:00:00 2001 From: Chris Double Date: Mon, 30 Jun 2014 12:08:34 +1200 Subject: [PATCH 004/843] Add namecoin cryptocurrency --- pkgs/applications/misc/namecoin/default.nix | 37 +++++++++++++++++++++ pkgs/applications/misc/namecoin/qt.nix | 33 ++++++++++++++++++ pkgs/top-level/all-packages.nix | 3 ++ 3 files changed, 73 insertions(+) create mode 100644 pkgs/applications/misc/namecoin/default.nix create mode 100644 pkgs/applications/misc/namecoin/qt.nix diff --git a/pkgs/applications/misc/namecoin/default.nix b/pkgs/applications/misc/namecoin/default.nix new file mode 100644 index 00000000000..1a26403e6f4 --- /dev/null +++ b/pkgs/applications/misc/namecoin/default.nix @@ -0,0 +1,37 @@ +{ fetchgit, stdenv, db4, boost, openssl, unzip }: + +stdenv.mkDerivation rec { + version = "0.3.75"; + name = "namecoin-${version}"; + + src = fetchgit { + url = "https://github.com/namecoin/namecoin"; + rev = "31ea638d4ba7f0a3011cb25483f4c7d293134c7a"; + sha256 = "c14a5663cba675b3508937a26a812316559938fd7b64659dd00749a9f5d7e9e0"; + }; + + # Don't build with miniupnpc due to namecoin using a different verison that + # ships with NixOS and it is API incompatible. + buildInputs = [ db4 boost openssl unzip ]; + + patchPhase = '' + sed -e 's/-Wl,-Bstatic//g' -e 's/-l gthread-2.0//g' -e 's/-l z//g' -i src/Makefile + ''; + + buildPhase = '' + make -C src INCLUDEPATHS= LIBPATHS= + ''; + + installPhase = '' + mkdir -p $out/bin + cp src/namecoind $out/bin + ''; + + meta = { + description = "Decentralized open source information registration and transfer system based on the Bitcoin cryptocurrency"; + homepage = "http://namecoin.info"; + license = "MIT"; + maintainers = [ "Chris Double " ]; + platforms = with stdenv.lib.platforms; linux; + }; +} diff --git a/pkgs/applications/misc/namecoin/qt.nix b/pkgs/applications/misc/namecoin/qt.nix new file mode 100644 index 00000000000..08dbee26f0b --- /dev/null +++ b/pkgs/applications/misc/namecoin/qt.nix @@ -0,0 +1,33 @@ +{ fetchgit, stdenv, db4, boost, openssl, qt4, unzip, namecoin }: + +stdenv.mkDerivation rec { + version = "0.3.75"; + name = "namecoin-qt-${version}"; + + src = namecoin.src; + + # Don't build with miniupnpc due to namecoin using a different verison that + # ships with NixOS and it is API incompatible. + buildInputs = [ db4 boost openssl unzip qt4 ]; + + configurePhase = '' + qmake USE_UPNP=- + ''; + + buildPhase = '' + make + ''; + + installPhase = '' + mkdir -p $out/bin + cp namecoin-qt $out/bin + ''; + + meta = { + description = "Decentralized open source information registration and transfer system based on the Bitcoin cryptocurrency"; + homepage = "http://namecoin.info"; + license = "MIT"; + maintainers = [ "Chris Double " ]; + platforms = with stdenv.lib.platforms; linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cfb4ac4ba82..b8a97d5a432 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9169,6 +9169,9 @@ let mutt = callPackage ../applications/networking/mailreaders/mutt { }; + namecoin = callPackage ../applications/misc/namecoin { }; + namecoinqt = callPackage ../applications/misc/namecoin/qt.nix { }; + pcmanfm = callPackage ../applications/misc/pcmanfm { }; ruby_gpgme = callPackage ../development/libraries/ruby_gpgme { -- GitLab From c6c889b4ea8295607fc43d99ae4a2f62a31bab6c Mon Sep 17 00:00:00 2001 From: Chris Double Date: Fri, 4 Jul 2014 15:19:08 +1200 Subject: [PATCH 005/843] Add Self programming language --- .../development/interpreters/self/default.nix | 44 +++++++++++++++++++ pkgs/development/interpreters/self/self | 18 ++++++++ pkgs/top-level/all-packages.nix | 2 + 3 files changed, 64 insertions(+) create mode 100644 pkgs/development/interpreters/self/default.nix create mode 100755 pkgs/development/interpreters/self/self diff --git a/pkgs/development/interpreters/self/default.nix b/pkgs/development/interpreters/self/default.nix new file mode 100644 index 00000000000..b379044789d --- /dev/null +++ b/pkgs/development/interpreters/self/default.nix @@ -0,0 +1,44 @@ +{ fetchurl, fetchgit, stdenv, xlibs, gcc44, makeWrapper, ncurses, cmake }: + +stdenv.mkDerivation rec { + # The Self wrapper stores source in $XDG_DATA_HOME/self or ~/.local/share/self + # so that it can be written to when using the Self transposer. Running 'Self' + # after installation runs without an image. You can then build a Self image with: + # $ cd ~/.local/share/self/objects + # $ Self + # > 'worldBuilder.self' _RunScript + # + # This image can later be started with: + # $ Self -s myimage.snap + # + version = "4.5.0"; + name = "self-${version}"; + + src = fetchgit { + url = "https://github.com/russellallen/self"; + rev = "d16bcaad3c5092dae81ad0b16d503f2a53b8ef86"; + sha256 = "966025b71542e44fc830b951f404f5721ad410ed24f7236fd0cd820ea0fc5731"; + }; + + # gcc 4.6 and above causes crashes on Self startup but gcc 4.4 works. + buildInputs = [ gcc44 ncurses xlibs.libX11 xlibs.libXext makeWrapper cmake ]; + + selfWrapper = ./self; + + installPhase = '' + mkdir -p "$out"/bin + cp ./vm/Self "$out"/bin/Self.wrapped + mkdir -p "$out"/share/self + cp -r ../objects "$out"/share/self/ + makeWrapper $selfWrapper $out/bin/Self \ + --set SELF_ROOT "$out" + ''; + + meta = { + description = "A prototype-based dynamic object-oriented programming language, environment, and virtual machine"; + homepage = "http://selflanguage.org/"; + license = stdenv.lib.licenses.bsd3; + maintainer = [ "Chris Double " ]; + platforms = with stdenv.lib.platforms; linux; + }; +} diff --git a/pkgs/development/interpreters/self/self b/pkgs/development/interpreters/self/self new file mode 100755 index 00000000000..d504682086b --- /dev/null +++ b/pkgs/development/interpreters/self/self @@ -0,0 +1,18 @@ +#! /usr/bin/env bash + +export SELF_HOME="$HOME/.local/share/self" +if [ -n "$XDG_DATA_HOME" ] + then export SELF_HOME="$XDG_DATA_HOME/self" +fi + +if [ ! -d $SELF_HOME ]; then + mkdir -p $SELF_HOME +fi + +if [ ! -d $SELF_HOME/objects ]; then + mkdir -p $SELF_HOME/objects + cp -r $SELF_ROOT/share/self/objects/* $SELF_HOME/objects + chmod -R +w $SELF_HOME/objects +fi + +exec $SELF_ROOT/bin/Self.wrapped "$@" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 11d06f40e50..f4978b706f4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3625,6 +3625,8 @@ let scheme48 = callPackage ../development/interpreters/scheme48 { }; + self = callPackage_i686 ../development/interpreters/self { }; + spark = callPackage ../applications/networking/cluster/spark { }; spidermonkey = callPackage ../development/interpreters/spidermonkey { }; -- GitLab From d82c95cf170b9c46ff64afa283cb15b8cd4f5c3d Mon Sep 17 00:00:00 2001 From: Christoph Hrdinka Date: Thu, 10 Jul 2014 09:55:50 +0200 Subject: [PATCH 006/843] glibc_multi: move glibc_multi script out of all-packages.nix --- .../libraries/glibc/2.19/multi.nix | 31 +++++++++++++++++ pkgs/top-level/all-packages.nix | 34 +++---------------- 2 files changed, 35 insertions(+), 30 deletions(-) create mode 100644 pkgs/development/libraries/glibc/2.19/multi.nix diff --git a/pkgs/development/libraries/glibc/2.19/multi.nix b/pkgs/development/libraries/glibc/2.19/multi.nix new file mode 100644 index 00000000000..ad4a34152b6 --- /dev/null +++ b/pkgs/development/libraries/glibc/2.19/multi.nix @@ -0,0 +1,31 @@ +{ runCommand, glibc, glibc32 +}: + +runCommand "${glibc.name}-multi" + { inherit glibc32; + glibc64 = glibc; + } + '' + mkdir -p $out + ln -s $glibc64/* $out/ + + rm $out/lib $out/lib64 + mkdir -p $out/lib + ln -s $glibc64/lib/* $out/lib + ln -s $glibc32/lib $out/lib/32 + ln -s lib $out/lib64 + + # fixing ldd RLTDLIST + rm $out/bin + cp -rs $glibc64/bin $out + chmod u+w $out/bin + rm $out/bin/ldd + sed -e "s|^RTLDLIST=.*$|RTLDLIST=\"$out/lib/ld-2.19.so $out/lib/32/ld-linux.so.2\"|g" \ + $glibc64/bin/ldd > $out/bin/ldd + chmod 555 $out/bin/ldd + + rm $out/include + cp -rs $glibc32/include $out + chmod -R u+w $out/include + cp -rsf $glibc64/include $out + '' diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f3714770c5f..edf75394cb9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4634,36 +4634,10 @@ let glibcInfo = callPackage ../development/libraries/glibc/2.19/info.nix { }; - glibc_multi = - runCommand "${glibc.name}-multi" - { glibc64 = glibc; - glibc32 = (import ./all-packages.nix {system = "i686-linux";}).glibc; - } - '' - mkdir -p $out - ln -s $glibc64/* $out/ - - rm $out/lib $out/lib64 - mkdir -p $out/lib - ln -s $glibc64/lib/* $out/lib - ln -s $glibc32/lib $out/lib/32 - ln -s lib $out/lib64 - - # fixing ldd RLTDLIST - rm $out/bin - cp -rs $glibc64/bin $out - chmod u+w $out/bin - rm $out/bin/ldd - sed -e "s|^RTLDLIST=.*$|RTLDLIST=\"$out/lib/ld-2.19.so $out/lib/32/ld-linux.so.2\"|g" \ - $glibc64/bin/ldd > $out/bin/ldd - chmod 555 $out/bin/ldd - - rm $out/include - cp -rs $glibc32/include $out - chmod -R u+w $out/include - cp -rsf $glibc64/include $out - '' # */ - ; + glibc_multi = callPackage ../development/libraries/glibc/2.19/multi.nix { + inherit glibc; + glibc32 = (import ./all-packages.nix {system = "i686-linux";}).glibc; + }; glm = callPackage ../development/libraries/glm { }; -- GitLab From cab929c6c25d69012dc9d161b0068a5c3bf26718 Mon Sep 17 00:00:00 2001 From: System administrator Date: Thu, 10 Jul 2014 14:32:08 +0200 Subject: [PATCH 007/843] httpd: disable logging when logFormat = "none" --- nixos/modules/services/web-servers/apache-httpd/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/web-servers/apache-httpd/default.nix b/nixos/modules/services/web-servers/apache-httpd/default.nix index 6d0416fbb15..b1a247163a4 100644 --- a/nixos/modules/services/web-servers/apache-httpd/default.nix +++ b/nixos/modules/services/web-servers/apache-httpd/default.nix @@ -130,7 +130,7 @@ let ''; - loggingConf = '' + loggingConf = (if mainCfg.logFormat != "none" then '' ErrorLog ${mainCfg.logDir}/error_log LogLevel notice @@ -141,7 +141,9 @@ let LogFormat "%{User-agent}i" agent CustomLog ${mainCfg.logDir}/access_log ${mainCfg.logFormat} - ''; + '' else '' + ErrorLog /dev/null + ''); browserHacks = '' -- GitLab From 10981178a966f0d8bfc77a680921d85e5497e453 Mon Sep 17 00:00:00 2001 From: Boris Sukholitko Date: Sat, 12 Jul 2014 18:17:50 +0300 Subject: [PATCH 008/843] Add emscripten: LLVM to JavaScript compiler --- .../compilers/emscripten-fastcomp/default.nix | 42 +++++++++++++++++++ .../compilers/emscripten/default.nix | 40 ++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 ++ 3 files changed, 86 insertions(+) create mode 100644 pkgs/development/compilers/emscripten-fastcomp/default.nix create mode 100644 pkgs/development/compilers/emscripten/default.nix diff --git a/pkgs/development/compilers/emscripten-fastcomp/default.nix b/pkgs/development/compilers/emscripten-fastcomp/default.nix new file mode 100644 index 00000000000..3eb9aef528c --- /dev/null +++ b/pkgs/development/compilers/emscripten-fastcomp/default.nix @@ -0,0 +1,42 @@ +{ stdenv, fetchgit, python }: + +let + tag = "1.21.0"; +in + +stdenv.mkDerivation rec { + name = "emscripten-fastcomp-${tag}"; + + srcFC = fetchgit { + url = git://github.com/kripken/emscripten-fastcomp; + rev = "refs/tags/${tag}"; + sha256 = "0mcxzg2cfg0s1vfm3bh1ar4xsddb6xkv1dsdbgnpx38lbj1mvfs1"; + }; + + srcFL = fetchgit { + url = git://github.com/kripken/emscripten-fastcomp-clang; + rev = "refs/tags/${tag}"; + sha256 = "0s2jcn36d236cfpryjpgaazjp3cg83d0h78g6kk1j6vdppv3vgnp"; + }; + + buildInputs = [ python ]; + buildCommand = '' + cp -as ${srcFC} $TMPDIR/src + chmod +w $TMPDIR/src/tools + cp -as ${srcFL} $TMPDIR/src/tools/clang + + chmod +w $TMPDIR/src + mkdir $TMPDIR/src/build + cd $TMPDIR/src/build + + ../configure --enable-optimized --disable-assertions --enable-targets=host,js + make + cp -a Release/bin $out + ''; + meta = with stdenv.lib; { + homepage = https://github.com/kripken/emscripten-fastcomp; + description = "emscripten llvm"; + maintainers = with maintainers; [ bosu ]; + license = "University of Illinois/NCSA Open Source License"; + }; +} diff --git a/pkgs/development/compilers/emscripten/default.nix b/pkgs/development/compilers/emscripten/default.nix new file mode 100644 index 00000000000..dc81b90b4b9 --- /dev/null +++ b/pkgs/development/compilers/emscripten/default.nix @@ -0,0 +1,40 @@ +{ stdenv, fetchgit, emscriptenfastcomp, python, nodejs, closurecompiler, jre }: + +let + tag = "1.21.0"; +in + +stdenv.mkDerivation rec { + name = "emscripten-${tag}"; + + src = fetchgit { + url = git://github.com/kripken/emscripten; + rev = "refs/tags/${tag}"; + sha256 = "0y17ab4nhd3521b50sv2i2667w0rlcnmlkpkgw5j3fsh8awxgf32"; + }; + + buildCommand = '' + mkdir $out + cp -a $src $out/bin + chmod -R +w $out/bin + grep -rl '^#!/usr.*python' $out/bin | xargs sed -i -s 's@^#!/usr.*python.*@#!${python}/bin/python@' + sed -i -e "s,EM_CONFIG = '~/.emscripten',EM_CONFIG = '$out/config'," $out/bin/tools/shared.py + sed -i -e 's,^.*did not see a source tree above the LLVM.*$, return True,' $out/bin/tools/shared.py + sed -i -e 's,def check_sanity(force=False):,def check_sanity(force=False):\n return,' $out/bin/tools/shared.py + + echo "EMSCRIPTEN_ROOT = '$out/bin'" > $out/config + echo "LLVM_ROOT = '${emscriptenfastcomp}'" >> $out/config + echo "PYTHON = '${python}/bin/python'" >> $out/config + echo "NODE_JS = '${nodejs}/bin/node'" >> $out/config + echo "JS_ENGINES = [NODE_JS]" >> $out/config + echo "COMPILER_ENGINE = NODE_JS" >> $out/config + echo "CLOSURE_COMPILER = '${closurecompiler}/bin/closure-compiler'" >> $out/config + echo "JAVA = '${jre}/bin/java'" >> $out/config + ''; + meta = with stdenv.lib; { + homepage = https://github.com/kripken/emscripten; + description = "An LLVM-to-JavaScript Compiler"; + maintainers = with maintainers; [ bosu ]; + license = "MIT and University of Illinois/NCSA Open Source License"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 450b28bd85e..a8cf3722008 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -957,6 +957,10 @@ let edk2 = callPackage ../development/compilers/edk2 { }; + emscripten = callPackage ../development/compilers/emscripten { }; + + emscriptenfastcomp = callPackage ../development/compilers/emscripten-fastcomp { }; + efibootmgr = callPackage ../tools/system/efibootmgr { }; elasticsearch = callPackage ../servers/search/elasticsearch { }; -- GitLab From a0c91d66f1d63192a8145e5d0314eaa701542604 Mon Sep 17 00:00:00 2001 From: taku0 Date: Sun, 13 Jul 2014 15:46:34 +0900 Subject: [PATCH 009/843] uim, gtk-exe-env, qt-plugin-env: Add input method modules for GTK+ and Qt --- nixos/modules/config/gtk-exe-env.nix | 41 ++++ nixos/modules/config/qt-plugin-env.nix | 37 +++ nixos/modules/module-list.nix | 3 + nixos/modules/programs/environment.nix | 2 +- nixos/modules/programs/uim.nix | 29 +++ pkgs/development/libraries/gtk+/2.x.nix | 7 + pkgs/development/libraries/gtk+/3.x.nix | 7 + pkgs/tools/inputmethods/uim/default.nix | 44 ++++ .../inputmethods/uim/immodules_cache.patch | 231 ++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 + 10 files changed, 404 insertions(+), 1 deletion(-) create mode 100644 nixos/modules/config/gtk-exe-env.nix create mode 100644 nixos/modules/config/qt-plugin-env.nix create mode 100644 nixos/modules/programs/uim.nix create mode 100644 pkgs/tools/inputmethods/uim/default.nix create mode 100644 pkgs/tools/inputmethods/uim/immodules_cache.patch diff --git a/nixos/modules/config/gtk-exe-env.nix b/nixos/modules/config/gtk-exe-env.nix new file mode 100644 index 00000000000..b565072e3a7 --- /dev/null +++ b/nixos/modules/config/gtk-exe-env.nix @@ -0,0 +1,41 @@ +{ config, pkgs, lib, ... }: + +{ + imports = [ + ]; + + options = { + gtkPlugins = lib.mkOption { + type = lib.types.listOf lib.types.path; + default = []; + description = '' + Plugin packages for GTK+ such as input methods. + ''; + }; + }; + + config = { + environment.variables = if builtins.length config.gtkPlugins > 0 + then + let + paths = [ pkgs.gtk2 pkgs.gtk3 ] ++ config.gtkPlugins; + env = pkgs.buildEnv { + name = "gtk-exe-env"; + + inherit paths; + + postBuild = lib.concatStringsSep "\n" + (map (d: d.gtkExeEnvPostBuild or "") paths); + + ignoreCollisions = true; + }; + in { + GTK_EXE_PREFIX = builtins.toString env; + GTK_PATH = [ + "${env}/lib/gtk-2.0" + "${env}/lib/gtk-3.0" + ]; + } + else {}; + }; +} diff --git a/nixos/modules/config/qt-plugin-env.nix b/nixos/modules/config/qt-plugin-env.nix new file mode 100644 index 00000000000..c5986560416 --- /dev/null +++ b/nixos/modules/config/qt-plugin-env.nix @@ -0,0 +1,37 @@ +{ config, pkgs, lib, ... }: + +{ + imports = [ + ]; + + options = { + qtPlugins = lib.mkOption { + type = lib.types.listOf lib.types.path; + default = []; + description = '' + Plugin packages for Qt such as input methods. + ''; + }; + }; + + config = { + environment.variables = if builtins.length config.qtPlugins > 0 + then + let + paths = [ pkgs.qt48 ] ++ config.qtPlugins; + env = pkgs.buildEnv { + name = "qt-plugin-env"; + + inherit paths; + + postBuild = lib.concatStringsSep "\n" + (map (d: d.qtPluginEnvPostBuild or "") paths); + + ignoreCollisions = true; + }; + in { + QT_PLUGIN_PATH = [ (builtins.toString env) ]; + } + else {}; + }; +} diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index a9039eea71d..74f4eebd619 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -5,6 +5,7 @@ ./config/fonts/fonts.nix ./config/fonts/ghostscript.nix ./config/gnu.nix + ./config/gtk-exe-env.nix ./config/i18n.nix ./config/krb5.nix ./config/ldap.nix @@ -13,6 +14,7 @@ ./config/nsswitch.nix ./config/power-management.nix ./config/pulseaudio.nix + ./config/qt-plugin-env.nix ./config/shells-environment.nix ./config/system-environment.nix ./config/swap.nix @@ -56,6 +58,7 @@ ./programs/shell.nix ./programs/ssh.nix ./programs/ssmtp.nix + ./programs/uim.nix ./programs/venus.nix ./programs/wvdial.nix ./programs/zsh/zsh.nix diff --git a/nixos/modules/programs/environment.nix b/nixos/modules/programs/environment.nix index 80c3e83fe81..4a510805b01 100644 --- a/nixos/modules/programs/environment.nix +++ b/nixos/modules/programs/environment.nix @@ -52,7 +52,7 @@ in STRIGI_PLUGIN_PATH = [ "${i}/lib/strigi/" ]; QT_PLUGIN_PATH = [ "${i}/lib/qt4/plugins" "${i}/lib/kde4/plugins" ]; QTWEBKIT_PLUGIN_PATH = [ "${i}/lib/mozilla/plugins/" ]; - GTK_PATH = [ "${i}/lib/gtk-2.0" ]; + GTK_PATH = [ "${i}/lib/gtk-2.0" "${i}/lib/gtk-3.0" ]; XDG_CONFIG_DIRS = [ "${i}/etc/xdg" ]; XDG_DATA_DIRS = [ "${i}/share" ]; MOZ_PLUGIN_PATH = [ "${i}/lib/mozilla/plugins" ]; diff --git a/nixos/modules/programs/uim.nix b/nixos/modules/programs/uim.nix new file mode 100644 index 00000000000..237da3415dc --- /dev/null +++ b/nixos/modules/programs/uim.nix @@ -0,0 +1,29 @@ +{ config, pkgs, ... }: + +with pkgs.lib; + +let + cfg = config.uim; +in +{ + options = { + uim = { + enable = mkOption { + type = types.bool; + default = false; + example = true; + description = "enable UIM input method"; + }; + }; + }; + + config = mkIf cfg.enable { + environment.systemPackages = [ pkgs.uim ]; + gtkPlugins = [ pkgs.uim ]; + qtPlugins = [ pkgs.uim ]; + environment.variables.GTK_IM_MODULE = "uim"; + environment.variables.QT_IM_MODULE = "uim"; + environment.variables.XMODIFIERS = "@im=uim"; + services.xserver.displayManager.sessionCommands = "uim-xim &"; + }; +} diff --git a/pkgs/development/libraries/gtk+/2.x.nix b/pkgs/development/libraries/gtk+/2.x.nix index c57179364a7..5abba3102ff 100644 --- a/pkgs/development/libraries/gtk+/2.x.nix +++ b/pkgs/development/libraries/gtk+/2.x.nix @@ -37,6 +37,13 @@ stdenv.mkDerivation rec { postInstall = "rm -rf $out/share/gtk-doc"; + passthru = { + gtkExeEnvPostBuild = '' + rm $out/lib/gtk-2.0/2.10.0/immodules.cache + $out/bin/gtk-query-immodules-2.0 $out/lib/gtk-2.0/2.10.0/immodules/*.so > $out/lib/gtk-2.0/2.10.0/immodules.cache + ''; # workaround for bug of nix-mode for Emacs */ ''; + }; + meta = with stdenv.lib; { description = "A multi-platform toolkit for creating graphical user interfaces"; homepage = http://www.gtk.org/; diff --git a/pkgs/development/libraries/gtk+/3.x.nix b/pkgs/development/libraries/gtk+/3.x.nix index ef8f3e39883..acd15b8269c 100644 --- a/pkgs/development/libraries/gtk+/3.x.nix +++ b/pkgs/development/libraries/gtk+/3.x.nix @@ -38,6 +38,13 @@ stdenv.mkDerivation rec { postInstall = "rm -rf $out/share/gtk-doc"; + passthru = { + gtkExeEnvPostBuild = '' + rm $out/lib/gtk-3.0/3.0.0/immodules.cache + $out/bin/gtk-query-immodules-3.0 $out/lib/gtk-3.0/3.0.0/immodules/*.so > $out/lib/gtk-3.0/3.0.0/immodules.cache + ''; # workaround for bug of nix-mode for Emacs */ ''; + }; + meta = { description = "A multi-platform toolkit for creating graphical user interfaces"; diff --git a/pkgs/tools/inputmethods/uim/default.nix b/pkgs/tools/inputmethods/uim/default.nix new file mode 100644 index 00000000000..b8ee95fae92 --- /dev/null +++ b/pkgs/tools/inputmethods/uim/default.nix @@ -0,0 +1,44 @@ +{stdenv, fetchurl, intltool, pkgconfig, qt4, gtk2, gtk3, kdelibs, cmake, ... }: + +stdenv.mkDerivation rec { + version = "1.8.6"; + name = "uim-${version}"; + + buildInputs = [ + intltool + pkgconfig + qt4 + gtk2 + gtk3 + kdelibs + cmake + ]; + + patches = [ ./immodules_cache.patch ]; + + configureFlags = [ + "--with-gtk2" + "--with-gtk3" + "--enable-kde4-applet" + "--enable-notify=knotify4" + "--enable-pref" + "--with-qt4" + "--with-qt4-immodule" + "--with-skk" + "--with-x" + ]; + + dontUseCmakeConfigure = true; + + src = fetchurl { + url = "http://uim.googlecode.com/files/uim-${version}.tar.bz2"; + sha1 = "43b9dbdead6797880e6cfc9c032ecb2d37d42777"; + }; + + meta = { + homepage = "http://code.google.com/p/uim/"; + description = "A multilingual input method framework"; + license = stdenv.lib.licenses.bsd3; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/tools/inputmethods/uim/immodules_cache.patch b/pkgs/tools/inputmethods/uim/immodules_cache.patch new file mode 100644 index 00000000000..c2d08b661e3 --- /dev/null +++ b/pkgs/tools/inputmethods/uim/immodules_cache.patch @@ -0,0 +1,231 @@ +diff -ru -x '*~' uim-1.8.6.orig/gtk2/immodule/Makefile.am uim-1.8.6/gtk2/immodule/Makefile.am +--- uim-1.8.6.orig/gtk2/immodule/Makefile.am 2013-06-30 13:26:09.000000000 +0900 ++++ uim-1.8.6/gtk2/immodule/Makefile.am 2014-07-13 21:51:26.538400004 +0900 +@@ -1,5 +1,5 @@ + uim_gtk_im_module_path = $(libdir)/gtk-2.0 +-uim_gtk_im_module_file = $(DESTDIR)$(sysconfdir)/gtk-2.0/gtk.immodules ++uim_gtk_im_module_file = $(uim_gtk_im_module_path)/@GTK_BINARY_VERSION@/immodules.cache + + moduledir = $(uim_gtk_im_module_path)/@GTK_BINARY_VERSION@/immodules + +@@ -38,48 +38,12 @@ + + install-data-hook: gtk-rc-get-immodule-file + if test -z $(DESTDIR); then \ +- if test $(libdir) = $(GTK_LIBDIR); then \ +- if type $(QUERY_COMMAND) > /dev/null 2>&1; then \ +- $(QUERY_COMMAND) > `$(GTK_RC_GET_IMMODULE_FILE)`; \ +- echo "*** \"`$(GTK_RC_GET_IMMODULE_FILE)`\" is updated. ***"; \ +- else \ +- echo "********************** Warning ***********************"; \ +- echo " $(QUERY_COMMAND) not found"; \ +- echo " Please make sure to update"; \ +- echo " \"`$(GTK_RC_GET_IMMODULE_FILE)`\""; \ +- echo " manually."; \ +- echo "******************************************************"; \ +- fi \ +- else \ +- if type $(QUERY_COMMAND) > /dev/null 2>&1; then \ +- $(mkinstalldirs) $(sysconfdir)/gtk-2.0; \ +- GTK_PATH=$(uim_gtk_im_module_path) $(QUERY_COMMAND) > $(uim_gtk_im_module_file); \ +- echo "******************************************************"; \ +- echo " You need to set"; \ +- echo " GTK_IM_MODULE_FILE=$(uim_gtk_im_module_file)"; \ +- echo " environment variable to use this module."; \ +- echo "******************************************************"; \ +- else \ +- echo "********************** Warning ***********************"; \ +- echo " $(QUERY_COMMAND) not found"; \ +- echo " Please make sure to update"; \ +- echo " \"$(uim_gtk_im_module_file)\""; \ +- echo " manually, and set"; \ +- echo " GTK_IM_MODULE_FILE=$(uim_gtk_im_module_file)"; \ +- echo " environment variable to use this module."; \ +- echo "******************************************************"; \ +- fi \ +- fi \ ++ $(mkinstalldirs) $(uim_gtk_im_module_path)/@GTK_BINARY_VERSION@; \ ++ GTK_PATH=$(uim_gtk_im_module_path) $(QUERY_COMMAND) > $(uim_gtk_im_module_file); \ + fi + uninstall-hook: + if test -z $(DESTDIR); then \ +- if type $(QUERY_COMMAND) > /dev/null 2>&1; then \ +- if test $(libdir) = $(GTK_LIBDIR); then \ +- $(QUERY_COMMAND) > `$(GTK_RC_GET_IMMODULE_FILE)`; \ +- else \ +- GTK_PATH=$(uim_gtk_im_module_path) $(QUERY_COMMAND) > $(uim_gtk_im_module_file); \ +- fi \ +- fi \ ++ GTK_PATH=$(uim_gtk_im_module_path) $(QUERY_COMMAND) > $(uim_gtk_im_module_file); \ + fi + else + install-data-hook: +diff -ru -x '*~' uim-1.8.6.orig/gtk2/immodule/Makefile.in uim-1.8.6/gtk2/immodule/Makefile.in +--- uim-1.8.6.orig/gtk2/immodule/Makefile.in 2013-06-30 13:27:08.000000000 +0900 ++++ uim-1.8.6/gtk2/immodule/Makefile.in 2014-07-13 22:12:27.947595507 +0900 +@@ -434,7 +434,7 @@ + top_srcdir = @top_srcdir@ + uim_pixmapsdir = @uim_pixmapsdir@ + uim_gtk_im_module_path = $(libdir)/gtk-2.0 +-uim_gtk_im_module_file = $(DESTDIR)$(sysconfdir)/gtk-2.0/gtk.immodules ++uim_gtk_im_module_file = $(uim_gtk_im_module_path)/@GTK_BINARY_VERSION@/immodules.cache + moduledir = $(uim_gtk_im_module_path)/@GTK_BINARY_VERSION@/immodules + @GTK2_TRUE@im_uim_la = im-uim.la + @GTK2_TRUE@im_uim_la_CPPFLAGS = -I$(top_srcdir) -I$(top_builddir) +@@ -875,48 +875,12 @@ + + @GTK2_TRUE@install-data-hook: gtk-rc-get-immodule-file + @GTK2_TRUE@ if test -z $(DESTDIR); then \ +-@GTK2_TRUE@ if test $(libdir) = $(GTK_LIBDIR); then \ +-@GTK2_TRUE@ if type $(QUERY_COMMAND) > /dev/null 2>&1; then \ +-@GTK2_TRUE@ $(QUERY_COMMAND) > `$(GTK_RC_GET_IMMODULE_FILE)`; \ +-@GTK2_TRUE@ echo "*** \"`$(GTK_RC_GET_IMMODULE_FILE)`\" is updated. ***"; \ +-@GTK2_TRUE@ else \ +-@GTK2_TRUE@ echo "********************** Warning ***********************"; \ +-@GTK2_TRUE@ echo " $(QUERY_COMMAND) not found"; \ +-@GTK2_TRUE@ echo " Please make sure to update"; \ +-@GTK2_TRUE@ echo " \"`$(GTK_RC_GET_IMMODULE_FILE)`\""; \ +-@GTK2_TRUE@ echo " manually."; \ +-@GTK2_TRUE@ echo "******************************************************"; \ +-@GTK2_TRUE@ fi \ +-@GTK2_TRUE@ else \ +-@GTK2_TRUE@ if type $(QUERY_COMMAND) > /dev/null 2>&1; then \ +-@GTK2_TRUE@ $(mkinstalldirs) $(sysconfdir)/gtk-2.0; \ +-@GTK2_TRUE@ GTK_PATH=$(uim_gtk_im_module_path) $(QUERY_COMMAND) > $(uim_gtk_im_module_file); \ +-@GTK2_TRUE@ echo "******************************************************"; \ +-@GTK2_TRUE@ echo " You need to set"; \ +-@GTK2_TRUE@ echo " GTK_IM_MODULE_FILE=$(uim_gtk_im_module_file)"; \ +-@GTK2_TRUE@ echo " environment variable to use this module."; \ +-@GTK2_TRUE@ echo "******************************************************"; \ +-@GTK2_TRUE@ else \ +-@GTK2_TRUE@ echo "********************** Warning ***********************"; \ +-@GTK2_TRUE@ echo " $(QUERY_COMMAND) not found"; \ +-@GTK2_TRUE@ echo " Please make sure to update"; \ +-@GTK2_TRUE@ echo " \"$(uim_gtk_im_module_file)\""; \ +-@GTK2_TRUE@ echo " manually, and set"; \ +-@GTK2_TRUE@ echo " GTK_IM_MODULE_FILE=$(uim_gtk_im_module_file)"; \ +-@GTK2_TRUE@ echo " environment variable to use this module."; \ +-@GTK2_TRUE@ echo "******************************************************"; \ +-@GTK2_TRUE@ fi \ +-@GTK2_TRUE@ fi \ ++@GTK2_TRUE@ $(mkinstalldirs) $(uim_gtk_im_module_path)/@GTK_BINARY_VERSION@; \ ++@GTK2_TRUE@ GTK_PATH=$(uim_gtk_im_module_path) $(QUERY_COMMAND) > $(uim_gtk_im_module_file); \ + @GTK2_TRUE@ fi + @GTK2_TRUE@uninstall-hook: + @GTK2_TRUE@ if test -z $(DESTDIR); then \ +-@GTK2_TRUE@ if type $(QUERY_COMMAND) > /dev/null 2>&1; then \ +-@GTK2_TRUE@ if test $(libdir) = $(GTK_LIBDIR); then \ +-@GTK2_TRUE@ $(QUERY_COMMAND) > `$(GTK_RC_GET_IMMODULE_FILE)`; \ +-@GTK2_TRUE@ else \ +-@GTK2_TRUE@ GTK_PATH=$(uim_gtk_im_module_path) $(QUERY_COMMAND) > $(uim_gtk_im_module_file); \ +-@GTK2_TRUE@ fi \ +-@GTK2_TRUE@ fi \ ++@GTK2_TRUE@ GTK_PATH=$(uim_gtk_im_module_path) $(QUERY_COMMAND) > $(uim_gtk_im_module_file); \ + @GTK2_TRUE@ fi + @GTK2_FALSE@install-data-hook: + +diff -ru -x '*~' uim-1.8.6.orig/gtk3/immodule/Makefile.am uim-1.8.6/gtk3/immodule/Makefile.am +--- uim-1.8.6.orig/gtk3/immodule/Makefile.am 2013-06-30 13:26:20.000000000 +0900 ++++ uim-1.8.6/gtk3/immodule/Makefile.am 2014-07-13 21:55:38.114246503 +0900 +@@ -45,42 +45,11 @@ + + install-data-hook: gtk3-rc-get-immodule-file + if test -z $(DESTDIR); then \ +- if test $(libdir) = $(GTK3_LIBDIR); then \ +- if type $(QUERY_COMMAND) > /dev/null 2>&1; then \ +- $(QUERY_COMMAND) --update-cache; \ +- echo "*** \"`$(GTK3_RC_GET_IMMODULE_FILE)`\" is updated. ***"; \ +- else \ +- echo "********************** Warning ***********************"; \ +- echo " $(QUERY_COMMAND) not found"; \ +- echo " Please make sure to update"; \ +- echo " \"`$(GTK3_RC_GET_IMMODULE_FILE)`\""; \ +- echo " manually."; \ +- echo "******************************************************"; \ +- fi \ +- else \ +- if type $(QUERY_COMMAND) > /dev/null 2>&1; then \ +- GTK_PATH=$(uim_gtk3_im_module_path) $(QUERY_COMMAND) --update-cache; \ +- else \ +- echo "********************** Warning ***********************"; \ +- echo " $(QUERY_COMMAND) not found"; \ +- echo " Please make sure to update"; \ +- echo " immodules.cache"; \ +- echo " manually, and set"; \ +- echo " GTK_IM_MODULE_FILE=PATH_TO/immodule.cache"; \ +- echo " environment variable to use this module."; \ +- echo "******************************************************"; \ +- fi \ +- fi \ ++ GTK_PATH=$(uim_gtk3_im_module_path) $(QUERY_COMMAND) > $(uim_gtk3_im_module_path)/@GTK3_BINARY_VERSION@/immodules.cache ; \ + fi + uninstall-hook: + if test -z $(DESTDIR); then \ +- if type $(QUERY_COMMAND) > /dev/null 2>&1; then \ +- if test $(libdir) = $(GTK3_LIBDIR); then \ +- $(QUERY_COMMAND) --update-cache; \ +- else \ +- GTK_PATH=$(uim_gtk3_im_module_path) $(QUERY_COMMAND) --update-cache; \ +- fi \ +- fi \ ++ GTK_PATH=$(uim_gtk3_im_module_path) $(QUERY_COMMAND) > $(uim_gtk3_im_module_path)/@GTK3_BINARY_VERSION@/immodules.cache ; \ + fi + else + install-data-hook: +diff -ru -x '*~' uim-1.8.6.orig/gtk3/immodule/Makefile.in uim-1.8.6/gtk3/immodule/Makefile.in +--- uim-1.8.6.orig/gtk3/immodule/Makefile.in 2013-06-30 13:27:08.000000000 +0900 ++++ uim-1.8.6/gtk3/immodule/Makefile.in 2014-07-13 21:56:11.531225832 +0900 +@@ -893,42 +893,11 @@ + + @GTK3_TRUE@install-data-hook: gtk3-rc-get-immodule-file + @GTK3_TRUE@ if test -z $(DESTDIR); then \ +-@GTK3_TRUE@ if test $(libdir) = $(GTK3_LIBDIR); then \ +-@GTK3_TRUE@ if type $(QUERY_COMMAND) > /dev/null 2>&1; then \ +-@GTK3_TRUE@ $(QUERY_COMMAND) --update-cache; \ +-@GTK3_TRUE@ echo "*** \"`$(GTK3_RC_GET_IMMODULE_FILE)`\" is updated. ***"; \ +-@GTK3_TRUE@ else \ +-@GTK3_TRUE@ echo "********************** Warning ***********************"; \ +-@GTK3_TRUE@ echo " $(QUERY_COMMAND) not found"; \ +-@GTK3_TRUE@ echo " Please make sure to update"; \ +-@GTK3_TRUE@ echo " \"`$(GTK3_RC_GET_IMMODULE_FILE)`\""; \ +-@GTK3_TRUE@ echo " manually."; \ +-@GTK3_TRUE@ echo "******************************************************"; \ +-@GTK3_TRUE@ fi \ +-@GTK3_TRUE@ else \ +-@GTK3_TRUE@ if type $(QUERY_COMMAND) > /dev/null 2>&1; then \ +-@GTK3_TRUE@ GTK_PATH=$(uim_gtk3_im_module_path) $(QUERY_COMMAND) --update-cache; \ +-@GTK3_TRUE@ else \ +-@GTK3_TRUE@ echo "********************** Warning ***********************"; \ +-@GTK3_TRUE@ echo " $(QUERY_COMMAND) not found"; \ +-@GTK3_TRUE@ echo " Please make sure to update"; \ +-@GTK3_TRUE@ echo " immodules.cache"; \ +-@GTK3_TRUE@ echo " manually, and set"; \ +-@GTK3_TRUE@ echo " GTK_IM_MODULE_FILE=PATH_TO/immodule.cache"; \ +-@GTK3_TRUE@ echo " environment variable to use this module."; \ +-@GTK3_TRUE@ echo "******************************************************"; \ +-@GTK3_TRUE@ fi \ +-@GTK3_TRUE@ fi \ ++@GTK3_TRUE@ GTK_PATH=$(uim_gtk3_im_module_path) $(QUERY_COMMAND) > $(uim_gtk3_im_module_path)/@GTK3_BINARY_VERSION@/immodules.cache ; \ + @GTK3_TRUE@ fi + @GTK3_TRUE@uninstall-hook: + @GTK3_TRUE@ if test -z $(DESTDIR); then \ +-@GTK3_TRUE@ if type $(QUERY_COMMAND) > /dev/null 2>&1; then \ +-@GTK3_TRUE@ if test $(libdir) = $(GTK3_LIBDIR); then \ +-@GTK3_TRUE@ $(QUERY_COMMAND) --update-cache; \ +-@GTK3_TRUE@ else \ +-@GTK3_TRUE@ GTK_PATH=$(uim_gtk3_im_module_path) $(QUERY_COMMAND) --update-cache; \ +-@GTK3_TRUE@ fi \ +-@GTK3_TRUE@ fi \ ++@GTK3_TRUE@ GTK_PATH=$(uim_gtk3_im_module_path) $(QUERY_COMMAND) > $(uim_gtk3_im_module_path)/@GTK3_BINARY_VERSION@/immodules.cache ; \ + @GTK3_TRUE@ fi + @GTK3_FALSE@install-data-hook: + +diff -ru -x '*~' uim-1.8.6.orig/qt4/immodule/quiminputcontextplugin.pro.in uim-1.8.6/qt4/immodule/quiminputcontextplugin.pro.in +--- uim-1.8.6.orig/qt4/immodule/quiminputcontextplugin.pro.in 2013-06-30 13:26:20.000000000 +0900 ++++ uim-1.8.6/qt4/immodule/quiminputcontextplugin.pro.in 2014-03-09 11:31:19.388085048 +0900 +@@ -35,4 +35,4 @@ + + TARGET = uiminputcontextplugin + +-target.path += @DESTDIR@$$[QT_INSTALL_PLUGINS]/inputmethods ++target.path += @DESTDIR@@exec_prefix@/lib/qt4/plugins/inputmethods diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5edd597f29b..424a9165161 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2325,6 +2325,10 @@ let ttmkfdir = callPackage ../tools/misc/ttmkfdir { }; + uim = callPackage ../tools/inputmethods/uim { + inherit (pkgs.kde4) kdelibs; + }; + unclutter = callPackage ../tools/misc/unclutter { }; unbound = callPackage ../tools/networking/unbound { }; -- GitLab From 64c6d0117ddf088e4915f5eefc230ae4e6405eed Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Wed, 9 Jul 2014 09:42:26 +0200 Subject: [PATCH 010/843] Adds OCaml libraries: uucd, uunf, uutf and xmlm MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Four OCaml libraries contributed by Daniel Bünzli for unicode and xml processing. - xmlm: Streaming XML codec for OCaml - uutf: Non-blocking streaming Unicode codec for OCaml - uunf: Unicode text normalization for OCaml - uucd: Unicode character database decoder for Ocaml Homepage: http://erratique.ch/software --- .../ocaml-modules/uucd/default.nix | 39 +++++++++++++++++++ .../ocaml-modules/uunf/default.nix | 37 ++++++++++++++++++ .../ocaml-modules/uutf/default.nix | 37 ++++++++++++++++++ .../ocaml-modules/xmlm/default.nix | 37 ++++++++++++++++++ pkgs/top-level/all-packages.nix | 5 +++ 5 files changed, 155 insertions(+) create mode 100644 pkgs/development/ocaml-modules/uucd/default.nix create mode 100644 pkgs/development/ocaml-modules/uunf/default.nix create mode 100644 pkgs/development/ocaml-modules/uutf/default.nix create mode 100644 pkgs/development/ocaml-modules/xmlm/default.nix diff --git a/pkgs/development/ocaml-modules/uucd/default.nix b/pkgs/development/ocaml-modules/uucd/default.nix new file mode 100644 index 00000000000..1d0f5c6cd50 --- /dev/null +++ b/pkgs/development/ocaml-modules/uucd/default.nix @@ -0,0 +1,39 @@ +{stdenv, fetchurl, ocaml, findlib, opam, xmlm}: +let + pname = "uucd"; + version = "2.0.0"; + webpage = "http://erratique.ch/software/${pname}"; + ocaml_version = (builtins.parseDrvName ocaml.name).version; +in +stdenv.mkDerivation rec { + + name = "ocaml-${pname}-${version}"; + + src = fetchurl { + url = "${webpage}/releases/${pname}-${version}.tbz"; + sha256 = "12lbrrdjwdxfa99pbg344dfkj51lr5d2ispcj7d7lwsqyxy6h57i"; + }; + + buildInputs = [ ocaml findlib opam xmlm ]; + + createFindlibDestdir = true; + + unpackCmd = "tar xjf $src"; + + buildPhase = "ocaml ./pkg/build.ml native=true native-dynlink=true"; + + installPhase = '' + opam-installer --script --prefix=$out ${pname}.install > install.sh + sh install.sh + ln -s $out/lib/${pname} $out/lib/ocaml/${ocaml_version}/site-lib/ + ''; + + propagatedBuildInputs = [ xmlm ]; + + meta = { + description = "An OCaml module to decode the data of the Unicode character database from its XML representation"; + homepage = "${webpage}"; + platforms = ocaml.meta.platforms; + license = stdenv.lib.licenses.bsd3; + }; +} diff --git a/pkgs/development/ocaml-modules/uunf/default.nix b/pkgs/development/ocaml-modules/uunf/default.nix new file mode 100644 index 00000000000..c807bbd4463 --- /dev/null +++ b/pkgs/development/ocaml-modules/uunf/default.nix @@ -0,0 +1,37 @@ +{stdenv, fetchurl, ocaml, findlib, opam}: +let + pname = "uunf"; + version = "0.9.3"; + webpage = "http://erratique.ch/software/${pname}"; + ocaml_version = (builtins.parseDrvName ocaml.name).version; +in +stdenv.mkDerivation rec { + + name = "ocaml-${pname}-${version}"; + + src = fetchurl { + url = "${webpage}/releases/${pname}-${version}.tbz"; + sha256 = "16cgjy1m0m61srv1pmlc3gr0y40kd4724clvpagdnz68raz4zmn0"; + }; + + buildInputs = [ ocaml findlib opam ]; + + createFindlibDestdir = true; + + unpackCmd = "tar xjf $src"; + + buildPhase = "./pkg/build true false"; + + installPhase = '' + opam-installer --script --prefix=$out ${pname}.install > install.sh + sh install.sh + ln -s $out/lib/${pname} $out/lib/ocaml/${ocaml_version}/site-lib/ + ''; + + meta = { + description = "An OCaml module for normalizing Unicode text"; + homepage = "${webpage}"; + platforms = ocaml.meta.platforms; + license = stdenv.lib.licenses.bsd3; + }; +} diff --git a/pkgs/development/ocaml-modules/uutf/default.nix b/pkgs/development/ocaml-modules/uutf/default.nix new file mode 100644 index 00000000000..862236c169b --- /dev/null +++ b/pkgs/development/ocaml-modules/uutf/default.nix @@ -0,0 +1,37 @@ +{stdenv, fetchurl, ocaml, findlib, opam}: +let + pname = "uutf"; + version = "0.9.3"; + webpage = "http://erratique.ch/software/${pname}"; + ocaml_version = (builtins.parseDrvName ocaml.name).version; +in +stdenv.mkDerivation rec { + + name = "ocaml-${pname}-${version}"; + + src = fetchurl { + url = "${webpage}/releases/${pname}-${version}.tbz"; + sha256 = "0xvq20knmq25902ijpbk91ax92bkymsqkbfklj1537hpn64lydhz"; + }; + + buildInputs = [ ocaml findlib opam ]; + + createFindlibDestdir = true; + + unpackCmd = "tar xjf $src"; + + buildPhase = "./pkg/build true"; + + installPhase = '' + opam-installer --script --prefix=$out ${pname}.install > install.sh + sh install.sh + ln -s $out/lib/${pname} $out/lib/ocaml/${ocaml_version}/site-lib/ + ''; + + meta = { + description = "Non-blocking streaming Unicode codec for OCaml"; + homepage = "${webpage}"; + platforms = ocaml.meta.platforms; + license = stdenv.lib.licenses.bsd3; + }; +} diff --git a/pkgs/development/ocaml-modules/xmlm/default.nix b/pkgs/development/ocaml-modules/xmlm/default.nix new file mode 100644 index 00000000000..bd19ab716f6 --- /dev/null +++ b/pkgs/development/ocaml-modules/xmlm/default.nix @@ -0,0 +1,37 @@ +{stdenv, fetchurl, ocaml, findlib, opam}: +let + pname = "xmlm"; + version = "1.2.0"; + webpage = "http://erratique.ch/software/${pname}"; + ocaml_version = (builtins.parseDrvName ocaml.name).version; +in +stdenv.mkDerivation rec { + + name = "ocaml-${pname}-${version}"; + + src = fetchurl { + url = "${webpage}/releases/${pname}-${version}.tbz"; + sha256 = "1jywcrwn5z3gkgvicr004cxmdaqfmq8wh72f81jqz56iyn5024nh"; + }; + + buildInputs = [ ocaml findlib opam ]; + + createFindlibDestdir = true; + + unpackCmd = "tar xjf $src"; + + buildPhase = "./pkg/build true"; + + installPhase = '' + opam-installer --script --prefix=$out ${pname}.install > install.sh + sh install.sh + ln -s $out/lib/${pname} $out/lib/ocaml/${ocaml_version}/site-lib/ + ''; + + meta = { + description = "An OCaml streaming codec to decode and encode the XML data format"; + homepage = "${webpage}"; + platforms = ocaml.meta.platforms; + license = stdenv.lib.licenses.bsd3; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d128e171bef..2a9c4c86ba4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3293,6 +3293,11 @@ let opam_1_1 = callPackage ../development/tools/ocaml/opam/1.1.nix { }; opam = opam_1_1; + uucd = callPackage ../development/ocaml-modules/uucd { }; + uunf = callPackage ../development/ocaml-modules/uunf { }; + uutf = callPackage ../development/ocaml-modules/uutf { }; + xmlm = callPackage ../development/ocaml-modules/xmlm { }; + yojson = callPackage ../development/ocaml-modules/yojson { }; zarith = callPackage ../development/ocaml-modules/zarith { }; -- GitLab From 8346343aa5e2f92fb75a71217cdd68a53efdf227 Mon Sep 17 00:00:00 2001 From: Andreas Herrmann Date: Tue, 1 Jul 2014 15:55:12 +0200 Subject: [PATCH 011/843] hdf5: Add mpi support Optionally, build the parallel version of hdf5. --- pkgs/tools/misc/hdf5/default.nix | 14 +++++++++++++- 1 file changed, 13 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/misc/hdf5/default.nix b/pkgs/tools/misc/hdf5/default.nix index a7d03d1335f..43b3a3240e6 100644 --- a/pkgs/tools/misc/hdf5/default.nix +++ b/pkgs/tools/misc/hdf5/default.nix @@ -3,6 +3,7 @@ , fetchurl , zlib ? null , szip ? null +, mpi ? null }: stdenv.mkDerivation rec { version = "1.8.13"; @@ -12,11 +13,22 @@ stdenv.mkDerivation rec { sha256 = "1h9qdl321gzm3ihdhlijbl9sh9qcdrw94j7izg64yfqhxj7b7xl2"; }; + passthru = { + mpiSupport = (mpi != null); + inherit mpi; + }; + buildInputs = [] ++ stdenv.lib.optional (zlib != null) zlib ++ stdenv.lib.optional (szip != null) szip; - configureFlags = if szip != null then "--with-szlib=${szip}" else ""; + propagatedBuildInputs = [] + ++ stdenv.lib.optional (mpi != null) mpi; + + configureFlags = " + ${if szip != null then "--with-szlib=${szip}" else ""} + ${if mpi != null then "--enable-parallel" else ""} + "; patches = [./bin-mv.patch]; -- GitLab From 2728b27f75dd51317cd60053a0c4be6bed70e8ae Mon Sep 17 00:00:00 2001 From: Andreas Herrmann Date: Tue, 1 Jul 2014 15:55:29 +0200 Subject: [PATCH 012/843] hdf5: Offer openmpi version of the package --- pkgs/top-level/all-packages.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f0e504ff014..dcba004aab2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1251,6 +1251,12 @@ let hdf5 = callPackage ../tools/misc/hdf5 { szip = null; + mpi = null; + }; + + hdf5-mpi = hdf5.override { + szip = null; + mpi = pkgs.openmpi; }; heimdall = callPackage ../tools/misc/heimdall { }; -- GitLab From 37b064fcc713ddd88e5c3dd297fabf12b7725c1f Mon Sep 17 00:00:00 2001 From: Andreas Herrmann Date: Wed, 2 Jul 2014 15:10:02 +0200 Subject: [PATCH 013/843] hdf5: Optional enableShared flag Required by h5py in mpi mode. --- pkgs/tools/misc/hdf5/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/tools/misc/hdf5/default.nix b/pkgs/tools/misc/hdf5/default.nix index 43b3a3240e6..5cdc468c2a5 100644 --- a/pkgs/tools/misc/hdf5/default.nix +++ b/pkgs/tools/misc/hdf5/default.nix @@ -4,6 +4,7 @@ , zlib ? null , szip ? null , mpi ? null +, enableShared ? true }: stdenv.mkDerivation rec { version = "1.8.13"; @@ -28,6 +29,7 @@ stdenv.mkDerivation rec { configureFlags = " ${if szip != null then "--with-szlib=${szip}" else ""} ${if mpi != null then "--enable-parallel" else ""} + ${if enableShared then "--enable-shared" else ""} "; patches = [./bin-mv.patch]; -- GitLab From 63c062947eb765e4a02bc892e1891da7057fdfec Mon Sep 17 00:00:00 2001 From: Andreas Herrmann Date: Tue, 1 Jul 2014 16:46:15 +0200 Subject: [PATCH 014/843] mpi4py: New package, version 1.3.1 Python wrapper for the message passing interface standard. Currently building without mpe, or vampir-trace support. --- .../python-modules/mpi4py/default.nix | 45 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 6 +++ 2 files changed, 51 insertions(+) create mode 100644 pkgs/development/python-modules/mpi4py/default.nix diff --git a/pkgs/development/python-modules/mpi4py/default.nix b/pkgs/development/python-modules/mpi4py/default.nix new file mode 100644 index 00000000000..74d46def907 --- /dev/null +++ b/pkgs/development/python-modules/mpi4py/default.nix @@ -0,0 +1,45 @@ +{ stdenv, fetchurl, python, buildPythonPackage, mpi, openssh }: + +buildPythonPackage rec { + name = "mpi4py-1.3.1"; + + src = fetchurl { + url = "https://bitbucket.org/mpi4py/mpi4py/downloads/${name}.tar.gz"; + sha256 = "e7bd2044aaac5a6ea87a87b2ecc73b310bb6efe5026031e33067ea3c2efc3507"; + }; + + passthru = { + inherit mpi; + }; + + configurePhase = ""; + + installPhase = '' + mkdir -p "$out/lib/${python.libPrefix}/site-packages" + export PYTHONPATH="$out/lib/${python.libPrefix}/site-packages:$PYTHONPATH" + + ${python}/bin/${python.executable} setup.py install \ + --install-lib=$out/lib/${python.libPrefix}/site-packages \ + --prefix="$out" + + # --install-lib: + # sometimes packages specify where files should be installed outside the usual + # python lib prefix, we override that back so all infrastructure (setup hooks) + # work as expected + ''; + + setupPyBuildFlags = ["--mpicc=${mpi}/bin/mpicc"]; + + buildInputs = [ mpi ]; + # Requires openssh for tests. Tests of dependent packages will also fail, + # if openssh is not present. E.g. h5py with mpi support. + propagatedBuildInputs = [ openssh ]; + + meta = { + description = " + Provides Python bindings for the Message Passing Interface standard. + "; + homepage = "http://code.google.com/p/mpi4py/"; + license = stdenv.lib.licenses.bsd3; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index fccad5c81de..59f00576dad 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -105,6 +105,12 @@ rec { pylabQtSupport = false; }); + mpi4py = callPackage ../development/python-modules/mpi4py { + inherit (pkgs) stdenv fetchurl openssh; + inherit python buildPythonPackage; + mpi = pkgs.openmpi; + }; + nixpart = callPackage ../tools/filesystems/nixpart { }; # This is used for NixOps to make sure we won't break it with the next major -- GitLab From 3c6afb34967a241e2c2e106cb02bad55b5389b94 Mon Sep 17 00:00:00 2001 From: Andreas Herrmann Date: Tue, 1 Jul 2014 16:20:56 +0200 Subject: [PATCH 015/843] h5py: New package, version 2.3.1 A pythonic interface to the hdf5 library. It also supports parallel hdf5. --- .../python-modules/h5py/default.nix | 43 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 13 ++++++ 2 files changed, 56 insertions(+) create mode 100644 pkgs/development/python-modules/h5py/default.nix diff --git a/pkgs/development/python-modules/h5py/default.nix b/pkgs/development/python-modules/h5py/default.nix new file mode 100644 index 00000000000..9ab68ac4cd2 --- /dev/null +++ b/pkgs/development/python-modules/h5py/default.nix @@ -0,0 +1,43 @@ +{ stdenv, fetchurl, python, buildPythonPackage +, numpy, hdf5, cython +, mpiSupport ? false, mpi4py ? null, mpi ? null }: + +assert mpiSupport == hdf5.mpiSupport; +assert mpiSupport -> mpi != null + && mpi4py != null + && mpi == mpi4py.mpi + && mpi == hdf5.mpi + ; + +with stdenv.lib; + +buildPythonPackage rec { + name = "h5py-2.3.1"; + + src = fetchurl { + url = "https://pypi.python.org/packages/source/h/h5py/${name}.tar.gz"; + md5 = "8f32f96d653e904d20f9f910c6d9dd91"; + }; + + setupPyBuildFlags = [ "--hdf5=${hdf5}" ] + ++ optional mpiSupport "--mpi" + ; + setupPyInstallFlags = setupPyBuildFlags; + + preBuild = if mpiSupport then "export CC=${mpi}/bin/mpicc" else ""; + + buildInputs = [ hdf5 cython ] + ++ optional mpiSupport mpi + ; + propagatedBuildInputs = [ numpy ] + ++ optional mpiSupport mpi4py + ; + + meta = { + description = " + The h5py package is a Pythonic interface to the HDF5 binary data format. + "; + homepage = "http://www.h5py.org/"; + license = stdenv.lib.licenses.bsd2; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 59f00576dad..2e7189c3a5b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -89,6 +89,19 @@ rec { ''; }; + h5py = callPackage ../development/python-modules/h5py { + inherit (pkgs) stdenv fetchurl; + inherit python buildPythonPackage cython numpy; + hdf5 = pkgs.hdf5.override { mpi = null; }; + }; + + h5py-mpi = h5py.override { + mpiSupport = true; + mpi = pkgs.openmpi; + hdf5 = pkgs.hdf5.override { mpi = pkgs.openmpi; enableShared = true; }; + inherit mpi4py; + }; + ipython = import ../shells/ipython { inherit (pkgs) stdenv fetchurl sip pyqt4; inherit buildPythonPackage pythonPackages; -- GitLab From 1e0605738a94d834c97d6e7b9d1fc920f649facb Mon Sep 17 00:00:00 2001 From: Andreas Herrmann Date: Sun, 6 Jul 2014 23:13:04 +0200 Subject: [PATCH 016/843] openmpi: Optional configure flags * Activate support for the Sun Grid Engine * Pass PATH/LD_LIBRARY_PATH pointing to the current mpi installation to other processes by default. --- pkgs/development/libraries/openmpi/default.nix | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/openmpi/default.nix b/pkgs/development/libraries/openmpi/default.nix index 678a439fe0a..15160d3afc4 100644 --- a/pkgs/development/libraries/openmpi/default.nix +++ b/pkgs/development/libraries/openmpi/default.nix @@ -1,4 +1,13 @@ -{stdenv, fetchurl, gfortran}: +{stdenv, fetchurl, gfortran + +# Enable the Sun Grid Engine bindings +, enableSGE ? false + +# Pass PATH/LD_LIBRARY_PATH to point to current mpirun by default +, enablePrefix ? false +}: + +with stdenv.lib; stdenv.mkDerivation { name = "openmpi-1.6.5"; @@ -7,6 +16,10 @@ stdenv.mkDerivation { sha256 = "11gws4d3z7934zna2r7m1f80iay2ha17kp42mkh39wjykfwbldzy"; }; buildInputs = [ gfortran ]; + configureFlags = [] + ++ optional enableSGE "--with-sge" + ++ optional enablePrefix "--enable-mpirun-prefix-by-default" + ; meta = { homePage = http://www.open-mpi.org/; description = "Open source MPI-2 implementation"; -- GitLab From 7dfd21e982b0be77259a041f08a4f2834c38d977 Mon Sep 17 00:00:00 2001 From: Ian-Woo Kim Date: Sun, 20 Jul 2014 22:58:46 +0200 Subject: [PATCH 017/843] krb5: explicitly giving --with-tcl=no option for configure to remove impurity --- pkgs/development/libraries/kerberos/krb5.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/libraries/kerberos/krb5.nix b/pkgs/development/libraries/kerberos/krb5.nix index 647a6b03113..eeb09a68afb 100644 --- a/pkgs/development/libraries/kerberos/krb5.nix +++ b/pkgs/development/libraries/kerberos/krb5.nix @@ -23,6 +23,8 @@ stdenv.mkDerivation (rec { cd ${name}/src ''; + configureFlags = "--with-tcl=no"; + #doCheck = true; # report: No suitable file for testing purposes enableParallelBuilding = true; -- GitLab From 7b1a863f1ef3c94338c3ea48cfa3ea94a4539604 Mon Sep 17 00:00:00 2001 From: Paul Colomiets Date: Mon, 21 Jul 2014 18:54:21 +0300 Subject: [PATCH 018/843] Add `--no-same-permission` to `tar` command in node package builder This is because of an error while using `nix` under Archlinux: ``` building path(s) `/nix/store/rwkcbhv9jfhzhandfslg62knl2xw0r7m-node-sources' building /nix/store/rwkcbhv9jfhzhandfslg62knl2xw0r7m-node-sources suspicious ownership or permission on `/nix/store/rwkcbhv9jfhzhandfslg62knl2xw0r7m-node-sources'; rejecting this build output cannot build derivation `/nix/store/01qsszx9y2kyx1x72zr5magy2la98720-uglify-js-2.4.15.drv': 1 dependencies couldn't be built ``` The permissions on all file are like the following: ``` drwxrwxr-x 1 root root 358 Jun 9 17:04 . drwxr-xr-x 1 root root 421110 Jul 21 15:49 .. -rw-rw-r-- 1 root root 22 Jun 9 17:04 .gitattributes ``` After the fix, permissions are OK, and no suspicious error any more. Error is encountered for any node package built. I'm not sure why it fails on Arch but work on nixos, but I believe the flag is safe to add anyway. --- pkgs/development/web/nodejs/build-node-package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/web/nodejs/build-node-package.nix b/pkgs/development/web/nodejs/build-node-package.nix index 544634626b0..7341bbd60f7 100644 --- a/pkgs/development/web/nodejs/build-node-package.nix +++ b/pkgs/development/web/nodejs/build-node-package.nix @@ -8,7 +8,7 @@ let npmFlags = concatStringsSep " " (map (v: "--${v}") flags); sources = runCommand "node-sources" {} '' - tar --no-same-owner -xf ${nodejs.src} + tar --no-same-owner --no-same-permissions -xf ${nodejs.src} mv *node* $out ''; -- GitLab From 50c63f9b320a7016a670580dc5cbdc0bc0864138 Mon Sep 17 00:00:00 2001 From: Luke Clifton Date: Wed, 23 Jul 2014 20:49:43 +0800 Subject: [PATCH 019/843] Added abduco --- pkgs/tools/misc/abduco/default.nix | 28 ++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 30 insertions(+) create mode 100644 pkgs/tools/misc/abduco/default.nix diff --git a/pkgs/tools/misc/abduco/default.nix b/pkgs/tools/misc/abduco/default.nix new file mode 100644 index 00000000000..772c0b982a7 --- /dev/null +++ b/pkgs/tools/misc/abduco/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchurl, writeText, conf? null}: + +with stdenv.lib; + +stdenv.mkDerivation rec { + name = "abduco-0.1"; + + meta = { + homepage = http://brain-dump.org/projects/abduco; + license = "bsd"; + description = "Allows programs to be run independently from its controlling terminal"; + platforms = with platforms; linux; + }; + + src = fetchurl { + url = "http://www.brain-dump.org/projects/abduco/${name}.tar.gz"; + sha256 = "b4ef297cb7cc81170dc7edf75385cb1c55e024a52f90c1dd0bc0e9862e6f39b5"; + }; + + configFile = optionalString (conf!=null) (writeText "config.def.h" conf); + preBuild = optionalString (conf!=null) "cp ${configFile} config.def.h"; + + buildInputs = []; + + installPhase = '' + make PREFIX=$out install + ''; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 137f11b78e7..7810d0a7e9a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -427,6 +427,8 @@ let ### TOOLS + abduco = callPackage ../tools/misc/abduco { }; + acct = callPackage ../tools/system/acct { }; acoustidFingerprinter = callPackage ../tools/audio/acoustid-fingerprinter { -- GitLab From 073369cdaa0bed835c15c645477ee8b1df4230cc Mon Sep 17 00:00:00 2001 From: Vladimir Kirillov Date: Mon, 16 Jun 2014 20:08:38 +0000 Subject: [PATCH 020/843] rsync: sha256 for the patch was updated --- pkgs/applications/networking/sync/rsync/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/sync/rsync/default.nix b/pkgs/applications/networking/sync/rsync/default.nix index 6a5c574f638..00a00530df4 100644 --- a/pkgs/applications/networking/sync/rsync/default.nix +++ b/pkgs/applications/networking/sync/rsync/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { srcs = [mainSrc] ++ stdenv.lib.optional enableCopyDevicesPatch patchesSrc; patches = [(fetchurl { url = "https://git.samba.org/?p=rsync.git;a=commitdiff_plain;h=0dedfbce2c1b851684ba658861fe9d620636c56a"; - sha256 = "1jpwwdf07naqxc8fv1lspc95jgk50j5j3wvf037bjay2qzpwjmvf"; + sha256 = "0j1pqmwsqc5mh815x28izi4baki2y2r5q8k7ma1sgs4xsgjc4rk8"; name = "CVE-2014-2855.patch"; })] ++ stdenv.lib.optional enableCopyDevicesPatch "./patches/copy-devices.diff"; -- GitLab From dcb226deb787df743e04677f3dcbf6fec4c51dfb Mon Sep 17 00:00:00 2001 From: Luke Clifton Date: Sat, 26 Jul 2014 08:39:14 +0800 Subject: [PATCH 021/843] Changed to correct license from licenses.* --- pkgs/tools/misc/abduco/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/misc/abduco/default.nix b/pkgs/tools/misc/abduco/default.nix index 772c0b982a7..a3f5c4a1d61 100644 --- a/pkgs/tools/misc/abduco/default.nix +++ b/pkgs/tools/misc/abduco/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://brain-dump.org/projects/abduco; - license = "bsd"; + license = licenses.isc; description = "Allows programs to be run independently from its controlling terminal"; platforms = with platforms; linux; }; -- GitLab From d105ed081f5e29ca0eab89f591b1d95653773e7f Mon Sep 17 00:00:00 2001 From: Joachim Schiele Date: Thu, 24 Jul 2014 10:12:47 +0200 Subject: [PATCH 022/843] liquidfun: added google liquidfun (a box2d fork) --- .../libraries/liquidfun/default.nix | 50 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 52 insertions(+) create mode 100644 pkgs/development/libraries/liquidfun/default.nix diff --git a/pkgs/development/libraries/liquidfun/default.nix b/pkgs/development/libraries/liquidfun/default.nix new file mode 100644 index 00000000000..02604fb94cf --- /dev/null +++ b/pkgs/development/libraries/liquidfun/default.nix @@ -0,0 +1,50 @@ +{ stdenv, requireFile, cmake, mesa, libX11, libXi, ... }: + +let + sourceInfo = rec { + version="1.1.0"; + name="liquidfun-${version}"; + url="http://github.com/foo/${name}.tar.gz"; + hash="5011a000eacd6202a47317c489e44aa753a833fb562d970e7b8c0da9de01df86"; + }; + +in + +stdenv.mkDerivation rec { + src = requireFile { + url = sourceInfo.url; + sha256 = sourceInfo.hash; + name = sourceInfo.name + ".tar.gz"; + }; + + inherit (sourceInfo) name version; + buildInputs = [ cmake mesa libX11 libXi ]; + + sourceRoot = "liquidfun/Box2D/"; + + preConfigurePhases = "preConfigure"; + + preConfigure = '' + sed -i Box2D/Common/b2Settings.h -e 's@b2_maxPolygonVertices .*@b2_maxPolygonVertices 15@' + substituteInPlace Box2D/CMakeLists.txt --replace "Common/b2GrowableStack.h" "Common/b2GrowableStack.h Common/b2GrowableBuffer.h" + ''; + + configurePhase = '' + mkdir Build + cd Build; + cmake -DBOX2D_INSTALL=ON -DBOX2D_BUILD_SHARED=ON -DCMAKE_INSTALL_PREFIX=$out .. + ''; + + meta = { + description = "2D physics engine based on Box2D"; + maintainers = with stdenv.lib.maintainers; + [ + qknight + ]; + platforms = with stdenv.lib.platforms; + linux; + license = "bsd"; + homepage = https://google.github.io/liquidfun/; + }; +} + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b3ba6a64df2..2128d237387 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5527,6 +5527,8 @@ let lirc = callPackage ../development/libraries/lirc { }; + liquidfun = callPackage ../development/libraries/liquidfun { }; + liquidwar = builderDefsPackage ../games/liquidwar { inherit (xlibs) xproto libX11 libXrender; inherit gmp mesa libjpeg -- GitLab From 87cdc61e784a9d96628127e84b972661c83f9fb6 Mon Sep 17 00:00:00 2001 From: Joachim Schiele Date: Sun, 27 Jul 2014 22:02:38 +0200 Subject: [PATCH 023/843] liquidfun: updated url and license --- pkgs/development/libraries/liquidfun/default.nix | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/liquidfun/default.nix b/pkgs/development/libraries/liquidfun/default.nix index 02604fb94cf..994c013c631 100644 --- a/pkgs/development/libraries/liquidfun/default.nix +++ b/pkgs/development/libraries/liquidfun/default.nix @@ -1,15 +1,13 @@ -{ stdenv, requireFile, cmake, mesa, libX11, libXi, ... }: +{ stdenv, requireFile, cmake, mesa, libX11, libXi }: let sourceInfo = rec { version="1.1.0"; name="liquidfun-${version}"; - url="http://github.com/foo/${name}.tar.gz"; + url="https://github.com/google/liquidfun/releases/download/v${version}/${name}"; hash="5011a000eacd6202a47317c489e44aa753a833fb562d970e7b8c0da9de01df86"; }; - in - stdenv.mkDerivation rec { src = requireFile { url = sourceInfo.url; @@ -43,7 +41,7 @@ stdenv.mkDerivation rec { ]; platforms = with stdenv.lib.platforms; linux; - license = "bsd"; + license = stdenv.lib.licenses.bsd2; homepage = https://google.github.io/liquidfun/; }; } -- GitLab From fea8454d3515dbb5bb45be8763b34ad33342e705 Mon Sep 17 00:00:00 2001 From: Paul Colomiets Date: Sat, 12 Jul 2014 22:51:28 +0300 Subject: [PATCH 024/843] my-env: Preserve http_proxy and ftp_proxy variables There are few build scripts which set them to `nodtd.invalid` to disable downloading files by buildscript. But for user environment we should restore original values --- pkgs/misc/my-env/loadenv.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/misc/my-env/loadenv.sh b/pkgs/misc/my-env/loadenv.sh index 1aab4ac0208..2a990e8685c 100644 --- a/pkgs/misc/my-env/loadenv.sh +++ b/pkgs/misc/my-env/loadenv.sh @@ -2,6 +2,8 @@ OLDPATH="$PATH" OLDTZ="$TZ" +OLD_http_proxy="$http_proxy" +OLD_ftp_proxy="$http_proxy" source @myenvpath@ PATH="$PATH:$OLDPATH" @@ -10,6 +12,8 @@ export NIX_MYENV_NAME="@name@" export buildInputs export NIX_STRIP_DEBUG=0 export TZ="$OLDTZ" +export http_proxy="$OLD_http_proxy" +export ftp_proxy="$OLD_ftp_proxy" if test $# -gt 0; then exec "$@" -- GitLab From fb948c4f28a8e42758467b5fe23a27bca182b481 Mon Sep 17 00:00:00 2001 From: Paul Colomiets Date: Thu, 26 Jun 2014 01:09:15 +0300 Subject: [PATCH 025/843] Upgrade shadow package --- nixos/modules/programs/shadow.nix | 4 +++- pkgs/os-specific/linux/shadow/default.nix | 6 +++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/nixos/modules/programs/shadow.nix b/nixos/modules/programs/shadow.nix index 658b08b3d87..5a467e112c2 100644 --- a/nixos/modules/programs/shadow.nix +++ b/nixos/modules/programs/shadow.nix @@ -100,7 +100,9 @@ in chgpasswd = { rootOK = true; }; }; - security.setuidPrograms = [ "passwd" "chfn" "su" "newgrp" ]; + security.setuidPrograms = [ "passwd" "chfn" "su" "newgrp" + "newuidmap" "newgidmap" # new in shadow 4.2.x + ]; }; diff --git a/pkgs/os-specific/linux/shadow/default.nix b/pkgs/os-specific/linux/shadow/default.nix index b52801cacff..f928dc8e657 100644 --- a/pkgs/os-specific/linux/shadow/default.nix +++ b/pkgs/os-specific/linux/shadow/default.nix @@ -15,11 +15,11 @@ let in stdenv.mkDerivation rec { - name = "shadow-4.1.5.1"; + name = "shadow-4.2.1"; src = fetchurl { - url = "http://pkg-shadow.alioth.debian.org/releases/${name}.tar.bz2"; - sha256 = "1yvqx57vzih0jdy3grir8vfbkxp0cl0myql37bnmi2yn90vk6cma"; + url = "http://pkg-shadow.alioth.debian.org/releases/${name}.tar.xz"; + sha256 = "0h9x1zdbq0pqmygmc1x459jraiqw4gqz8849v268crk78z8r621v"; }; buildInputs = stdenv.lib.optional (pam != null && stdenv.isLinux) pam; -- GitLab From 08b214a8f2b6c9101636df43ded09c07ea9b8259 Mon Sep 17 00:00:00 2001 From: Paul Colomiets Date: Thu, 26 Jun 2014 03:11:28 +0300 Subject: [PATCH 026/843] First implementation of subuid/subgid manipulation module --- nixos/modules/config/users-groups.nix | 83 +++++++++++++++++++++++++++ 1 file changed, 83 insertions(+) diff --git a/nixos/modules/config/users-groups.nix b/nixos/modules/config/users-groups.nix index 5de81a77342..1fd5735fb74 100644 --- a/nixos/modules/config/users-groups.nix +++ b/nixos/modules/config/users-groups.nix @@ -100,6 +100,36 @@ let description = "The path to the user's shell."; }; + subUidRanges = mkOption { + type = types.listOf types.optionSet; + default = []; + example = [ + { startUid = 1000; count = 1; } + { startUid = 100001; count = 65534; } + ]; + options = [ subordinateUidRange ]; + description = '' + Subordinate user ids that user is allowed to use. + They are set into /etc/subuid and are used + by newuidmap for user namespaces. + ''; + }; + + subGidRanges = mkOption { + type = types.listOf types.optionSet; + default = []; + example = [ + { startGid = 100; count = 1; } + { startGid = 1001; count = 999; } + ]; + options = [ subordinateGidRange ]; + description = '' + Subordinate group ids that user is allowed to use. + They are set into /etc/subgid and are used + by newgidmap for user namespaces. + ''; + }; + createHome = mkOption { type = types.bool; default = false; @@ -211,6 +241,36 @@ let }; + subordinateUidRange = { + startUid = mkOption { + type = types.int; + description = '' + Start of the range of subordinate user ids that user is + allowed to use. + ''; + }; + count = mkOption { + type = types.int; + default = 1; + description = ''Count of subordinate user ids''; + }; + }; + + subordinateGidRange = { + startGid = mkOption { + type = types.int; + description = '' + Start of the range of subordinate group ids that user is + allowed to use. + ''; + }; + count = mkOption { + type = types.int; + default = 1; + description = ''Count of subordinate group ids''; + }; + }; + getGroup = gname: let groups = mapAttrsToList (n: g: g) ( @@ -265,6 +325,20 @@ let )) ); + mkSubuidEntry = user: concatStrings ( + map (range: "${user.name}:${toString range.startUid}:${toString range.count}\n") + user.subUidRanges); + + subuidFile = concatStrings (map mkSubuidEntry ( + sortOn "uid" (attrValues cfg.extraUsers))); + + mkSubgidEntry = user: concatStrings ( + map (range: "${user.name}:${toString range.startGid}:${toString range.count}\n") + user.subGidRanges); + + subgidFile = concatStrings (map mkSubgidEntry ( + sortOn "uid" (attrValues cfg.extraUsers))); + # If mutableUsers is true, this script adds all users/groups defined in # users.extra{Users,Groups} to /etc/{passwd,group} iff there isn't any # existing user/group with the same name in those files. @@ -504,6 +578,15 @@ in { # for backwards compatibility system.activationScripts.groups = stringAfter [ "users" ] ""; + environment.etc."subuid" = { + text = subuidFile; + mode = "0644"; + }; + environment.etc."subgid" = { + text = subgidFile; + mode = "0644"; + }; + assertions = [ { assertion = !cfg.enforceIdUniqueness || (uidsAreUnique && gidsAreUnique); message = "uids and gids must be unique!"; -- GitLab From 669443f5c1b75a4c74b4ff19716a8b66af5db8e7 Mon Sep 17 00:00:00 2001 From: Jonathan Glines Date: Fri, 8 Aug 2014 11:16:03 -0600 Subject: [PATCH 027/843] Added gmock (Google Mock) package to complement gtest package. --- pkgs/development/libraries/gmock/default.nix | 38 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 1 + 2 files changed, 39 insertions(+) create mode 100644 pkgs/development/libraries/gmock/default.nix diff --git a/pkgs/development/libraries/gmock/default.nix b/pkgs/development/libraries/gmock/default.nix new file mode 100644 index 00000000000..33c6e00ef65 --- /dev/null +++ b/pkgs/development/libraries/gmock/default.nix @@ -0,0 +1,38 @@ +{ stdenv, fetchurl, unzip, cmake}: + +stdenv.mkDerivation rec { + version = "1.7.0"; + name = "gmock-${version}"; + + src = fetchurl { + url = "https://googlemock.googlecode.com/files/${name}.zip"; + sha256="26fcbb5925b74ad5fc8c26b0495dfc96353f4d553492eb97e85a8a6d2f43095b"; + }; + + buildInputs = [ unzip cmake ]; + + configurePhase = '' + mkdir build + cd build + cmake ../ -DCMAKE_INSTALL_PREFIX=$out + ''; + + buildPhase = '' + # avoid building gtest + make gmock gmock_main + ''; + + installPhase = '' + mkdir -p $out/lib + cp -v libgmock.a libgmock_main.a $out/lib + cp -v -r ../include $out + cp -v -r ../src $out + ''; + + meta = { + description = "Google mock: Google's framework for writing C++ mock classes."; + homepage = https://code.google.com/p/googlemock/; + license = stdenv.lib.licenses.bsd3; + maintainers = [ stdenv.lib.maintainers.auntie ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8590aa74742..e894507b12a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1229,6 +1229,7 @@ let gt5 = callPackage ../tools/system/gt5 { }; gtest = callPackage ../development/libraries/gtest {}; + gmock = callPackage ../development/libraries/gmock {}; gtkdatabox = callPackage ../development/libraries/gtkdatabox {}; -- GitLab From 0aa2c1dc46779a3df6c4e02d3fae39b0de297be8 Mon Sep 17 00:00:00 2001 From: Alexei Robyn Date: Fri, 8 Aug 2014 18:28:26 +1000 Subject: [PATCH 028/843] initrd: Fixed to include/use modprobe config files --- nixos/modules/system/boot/stage-1.nix | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/nixos/modules/system/boot/stage-1.nix b/nixos/modules/system/boot/stage-1.nix index 6a069c5d054..1d387805443 100644 --- a/nixos/modules/system/boot/stage-1.nix +++ b/nixos/modules/system/boot/stage-1.nix @@ -199,6 +199,21 @@ let { object = pkgs.writeText "mdadm.conf" config.boot.initrd.mdadmConf; symlink = "/etc/mdadm.conf"; } + { object = config.environment.etc."modprobe.d/nixos.conf".source; + symlink = "/etc/modprobe.d/nixos.conf"; + } + { object = pkgs.stdenv.mkDerivation { + name = "initrd-kmod-blacklist-ubuntu"; + builder = pkgs.writeText "builder.sh" '' + source $stdenv/setup + target=$out + + ${pkgs.perl}/bin/perl -0pe 's/## file: iwlwifi.conf(.+?)##/##/s;' $src > $out + ''; + src = "${pkgs.kmod-blacklist-ubuntu}/modprobe.conf"; + }; + symlink = "/etc/modprobe.d/ubuntu.conf"; + } ]; }; -- GitLab From fee04927a46a8c2368225486ef9df17bea270b92 Mon Sep 17 00:00:00 2001 From: Ryan Mulligan Date: Sun, 10 Aug 2014 08:39:31 -0700 Subject: [PATCH 029/843] add note about mutableUsers to user management section --- nixos/doc/manual/configuration.xml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/nixos/doc/manual/configuration.xml b/nixos/doc/manual/configuration.xml index 051f0fb8c1e..bbfb434782d 100644 --- a/nixos/doc/manual/configuration.xml +++ b/nixos/doc/manual/configuration.xml @@ -1053,6 +1053,12 @@ a password. However, you can use the passwd program to set a password, which is retained across invocations of nixos-rebuild. +If you set users.mutableUsers to false, then the contents of /etc/passwd +and /etc/group will be congruent to your NixOS configuration. For instance, +if you remove a user from users.extraUsers and run nixos-rebuild, the user +account will cease to exist. Also, imperative commands for managing users +and groups, such as useradd, are no longer available. + A user ID (uid) is assigned automatically. You can also specify a uid manually by adding -- GitLab From 5ec563707cd7ae3a1c345cb1fa9b6696d1de4907 Mon Sep 17 00:00:00 2001 From: Patrick Mahoney Date: Mon, 11 Aug 2014 21:58:00 -0500 Subject: [PATCH 030/843] php: Compile pdo_pgsql support --- pkgs/development/interpreters/php/5.4.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/development/interpreters/php/5.4.nix b/pkgs/development/interpreters/php/5.4.nix index bc5320ff77c..e5069fc2ae4 100644 --- a/pkgs/development/interpreters/php/5.4.nix +++ b/pkgs/development/interpreters/php/5.4.nix @@ -77,6 +77,11 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed) buildInputs = [ postgresql ]; }; + pdo_pgsql = { + configureFlags = ["--with-pdo-pgsql=${postgresql}"]; + buildInputs = [ postgresql ]; + }; + mysql = { configureFlags = ["--with-mysql=${mysql}"]; buildInputs = [ mysql ]; @@ -203,6 +208,7 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed) gettextSupport = config.php.gettext or true; pcntlSupport = config.php.pcntl or true; postgresqlSupport = config.php.postgresql or true; + pdo_pgsqlSupport = config.php.pdo_pgsql or true; readlineSupport = config.php.readline or true; sqliteSupport = config.php.sqlite or true; soapSupport = config.php.soap or true; -- GitLab From 02cb604fd6d77c2768df484219e752d7fbe5b877 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Tue, 12 Aug 2014 20:00:01 +0200 Subject: [PATCH 031/843] initrd.availableKernelModules: add support for keyboards As explained in #2169, some keyboards need special drivers, so these are always added, both on installation and normal systems. --- nixos/modules/profiles/all-hardware.nix | 4 ++-- nixos/modules/system/boot/kernel.nix | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/nixos/modules/profiles/all-hardware.nix b/nixos/modules/profiles/all-hardware.nix index 511c118e2bf..6385ee69500 100644 --- a/nixos/modules/profiles/all-hardware.nix +++ b/nixos/modules/profiles/all-hardware.nix @@ -8,7 +8,7 @@ { # The initrd has to contain any module that might be necessary for - # mounting the CD/DVD. + # supporting the most important parts of HW like drives. boot.initrd.availableKernelModules = [ # SATA/PATA support. "ahci" @@ -43,7 +43,7 @@ "virtio_net" "virtio_pci" "virtio_blk" "virtio_balloon" "virtio_console" # Keyboards - "hid_apple" + "usbhid" "hid_apple" "hid_logitech_dj" "hid_lenovo_tpkbd" "hid_roccat" ]; # Include lots of firmware. diff --git a/nixos/modules/system/boot/kernel.nix b/nixos/modules/system/boot/kernel.nix index 9beb7fabce1..79b173a6ead 100644 --- a/nixos/modules/system/boot/kernel.nix +++ b/nixos/modules/system/boot/kernel.nix @@ -195,6 +195,7 @@ in "xhci_hcd" "usbhid" "hid_generic" + "hid_apple" "hid_logitech_dj" "hid_lenovo_tpkbd" "hid_roccat" # Unix domain sockets (needed by udev). "unix" -- GitLab From 6aa3888d97e26727066182d8a9bd7eb278eaa657 Mon Sep 17 00:00:00 2001 From: Jascha Geerds Date: Wed, 13 Aug 2014 12:10:52 +0200 Subject: [PATCH 032/843] trackpoint: Add emulateWheel option --- nixos/modules/tasks/trackpoint.nix | 44 +++++++++++++++++++++++------- 1 file changed, 34 insertions(+), 10 deletions(-) diff --git a/nixos/modules/tasks/trackpoint.nix b/nixos/modules/tasks/trackpoint.nix index d1c6f8ac156..5d1bb631b54 100644 --- a/nixos/modules/tasks/trackpoint.nix +++ b/nixos/modules/tasks/trackpoint.nix @@ -36,6 +36,14 @@ with lib; configures 97. ''; }; + + emulateWheel = mkOption { + default = false; + type = types.bool; + description = '' + Enable scrolling while holding the middle mouse button. + ''; + }; }; @@ -44,17 +52,33 @@ with lib; ###### implementation - config = mkIf config.hardware.trackpoint.enable { - - services.udev.extraRules = - '' - ACTION=="add|change", SUBSYSTEM=="input", ATTR{name}=="TPPS/2 IBM TrackPoint", ATTR{device/speed}="${toString config.hardware.trackpoint.speed}", ATTR{device/sensitivity}="${toString config.hardware.trackpoint.sensitivity}" - ''; - - system.activationScripts.trackpoint = + config = mkMerge [ + (mkIf config.hardware.trackpoint.enable { + services.udev.extraRules = '' - ${config.systemd.package}/bin/udevadm trigger --attr-match=name="TPPS/2 IBM TrackPoint" + ACTION=="add|change", SUBSYSTEM=="input", ATTR{name}=="TPPS/2 IBM TrackPoint", ATTR{device/speed}="${toString config.hardware.trackpoint.speed}", ATTR{device/sensitivity}="${toString config.hardware.trackpoint.sensitivity}" ''; - }; + system.activationScripts.trackpoint = + '' + ${config.systemd.package}/bin/udevadm trigger --attr-match=name="TPPS/2 IBM TrackPoint" + ''; + }) + + (mkIf config.hardware.trackpoint.emulateWheel { + services.xserver.config = + '' + Section "InputClass" + Identifier "Trackpoint Wheel Emulation" + MatchProduct "TPPS/2 IBM TrackPoint|DualPoint Stick|Synaptics Inc. Composite TouchPad / TrackPoint|ThinkPad USB Keyboard with TrackPoint|USB Trackpoint pointing device|Composite TouchPad / TrackPoint" + MatchDevicePath "/dev/input/event*" + Option "EmulateWheel" "true" + Option "EmulateWheelButton" "2" + Option "Emulate3Buttons" "false" + Option "XAxisMapping" "6 7" + Option "YAxisMapping" "4 5" + EndSection + ''; + }) + ]; } -- GitLab From b63b8260b5e4acc48d6ee62531265e38eb7a2513 Mon Sep 17 00:00:00 2001 From: Thomas Strobel Date: Thu, 14 Aug 2014 02:17:55 +0200 Subject: [PATCH 033/843] Add thermald: Linux Thermal Daemon --- nixos/modules/services/hardware/thermald.nix | 40 ++++++++++++++++++++ pkgs/tools/system/thermald/default.nix | 36 ++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 3 files changed, 78 insertions(+) create mode 100644 nixos/modules/services/hardware/thermald.nix create mode 100644 pkgs/tools/system/thermald/default.nix diff --git a/nixos/modules/services/hardware/thermald.nix b/nixos/modules/services/hardware/thermald.nix new file mode 100644 index 00000000000..d197c723d55 --- /dev/null +++ b/nixos/modules/services/hardware/thermald.nix @@ -0,0 +1,40 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.thermald; + +in { + + ###### interface + + options = { + + services.thermald = { + + enable = mkOption { + default = false; + description = '' + Whether to enable thermald, the temperature management daemon. + ''; + }; + + }; + + }; + + + ###### implementation + + config = mkIf cfg.enable { + + systemd.services.thermald = { + description = "Thermal Daemon Service"; + wantedBy = [ "multi-user.target" ]; + script = "exec ${pkgs.thermald}/sbin/thermald --no-daemon --dbus-enable"; + }; + + }; + +} diff --git a/pkgs/tools/system/thermald/default.nix b/pkgs/tools/system/thermald/default.nix new file mode 100644 index 00000000000..86d121f0c22 --- /dev/null +++ b/pkgs/tools/system/thermald/default.nix @@ -0,0 +1,36 @@ +{ stdenv, fetchurl, unzip, autoconf, automake, libtool, pkgconfig, dbus_libs, dbus_glib, libxml2 }: + +stdenv.mkDerivation rec { + version = "1.3"; + name = "thermald-${version}"; + src = fetchurl { + url = "https://github.com/01org/thermal_daemon/archive/v${version}.zip"; + sha256 = "0jqxc8vvd4lx4z0kcdisk8lpdf823nysvjcfjxlr5wzla1xysqwc"; + }; + buildInputs = [ unzip autoconf automake libtool pkgconfig dbus_libs dbus_glib libxml2 ]; + + patchPhase = ''sed -e 's/upstartconfdir = \/etc\/init/upstartconfdir = $(out)\/etc\/init/' -i data/Makefile.am''; + + preConfigure = '' + export PKG_CONFIG_PATH="${dbus_libs}/lib/pkgconfig:$PKG_CONFIG_PATH" + ./autogen.sh #--prefix="$out" + ''; + + configureFlags = [ + "--sysconfdir=$(out)/etc" "--localstatedir=/var" + "--with-dbus-sys-dir=$(out)/etc/dbus-1/system.d" + "--with-systemdsystemunitdir=$(out)/etc/systemd/system" + ]; + + preInstall = "sysconfdir=$out/etc"; + + + meta = { + description = "Thermal Daemon"; + longDescription = '' + Thermal Daemon + ''; + homepage = https://01.org/linux-thermal-daemon; + license = stdenv.lib.licenses.gpl2; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8c0a5e545cf..98c59895c74 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11322,6 +11322,8 @@ let inherit texLive unzip; }; + thermald = callPackage ../tools/system/thermald { }; + thinkfan = callPackage ../tools/system/thinkfan { }; vice = callPackage ../misc/emulators/vice { -- GitLab From 1da35629cc4c21dcd45ea4d07df2b69325b526d3 Mon Sep 17 00:00:00 2001 From: Thomas Strobel Date: Thu, 14 Aug 2014 12:42:16 +0200 Subject: [PATCH 034/843] Cleanup: remove newlines. --- nixos/modules/services/hardware/thermald.nix | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/nixos/modules/services/hardware/thermald.nix b/nixos/modules/services/hardware/thermald.nix index d197c723d55..5233794a20c 100644 --- a/nixos/modules/services/hardware/thermald.nix +++ b/nixos/modules/services/hardware/thermald.nix @@ -4,37 +4,25 @@ with lib; let cfg = config.services.thermald; - in { - ###### interface - options = { - services.thermald = { - enable = mkOption { default = false; description = '' Whether to enable thermald, the temperature management daemon. ''; }; - }; - }; - ###### implementation - config = mkIf cfg.enable { - systemd.services.thermald = { description = "Thermal Daemon Service"; wantedBy = [ "multi-user.target" ]; script = "exec ${pkgs.thermald}/sbin/thermald --no-daemon --dbus-enable"; }; - }; - } -- GitLab From 320a82dd7f821e3383fe63b21c7c99927913631d Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Fri, 4 Jul 2014 15:11:16 -0500 Subject: [PATCH 035/843] nixos/dhcpcd: Add an explicit interfaces option --- nixos/modules/services/networking/dhcpcd.nix | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/networking/dhcpcd.nix b/nixos/modules/services/networking/dhcpcd.nix index 5a353fc0942..c541d4fa604 100644 --- a/nixos/modules/services/networking/dhcpcd.nix +++ b/nixos/modules/services/networking/dhcpcd.nix @@ -6,6 +6,8 @@ let dhcpcd = if !config.boot.isContainer then pkgs.dhcpcd else pkgs.dhcpcd.override { udev = null; }; + cfg = config.networking.dhcpcd; + # Don't start dhcpcd on explicitly configured interfaces or on # interfaces that are part of a bridge. ignoredInterfaces = @@ -37,7 +39,10 @@ let # (Xen) and virbr* and vnet* (libvirt). denyinterfaces ${toString ignoredInterfaces} lo peth* vif* tap* tun* virbr* vnet* vboxnet* - ${config.networking.dhcpcd.extraConfig} + # Use the list of allowed interfaces if specified + ${optionalString (cfg.allowInterfaces != [ ]) "allowinterfaces ${toString cfg.allowInterfaces}"} + + ${cfg.extraConfig} ''; # Hook for emitting ip-up/ip-down events. @@ -80,6 +85,17 @@ in ''; }; + networking.dhcpcd.allowInterfaces = mkOption { + type = types.listOf types.str; + default = []; + description = '' + Enable the DHCP client for any interface whose name matches + any of the shell glob patterns in this list. Any interface not + explicitly matched by this pattern will be denied. This pattern only + applies when the list is non-empty. + ''; + }; + networking.dhcpcd.extraConfig = mkOption { type = types.lines; default = ""; -- GitLab From a269acf48026b439bce217bd5376bca01298fa07 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Sat, 12 Jul 2014 16:53:25 -0500 Subject: [PATCH 036/843] nixos/dhcpcd: Use null instead of empty list to disable allowInterfaces --- nixos/modules/services/networking/dhcpcd.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/nixos/modules/services/networking/dhcpcd.nix b/nixos/modules/services/networking/dhcpcd.nix index c541d4fa604..198c8cb08b2 100644 --- a/nixos/modules/services/networking/dhcpcd.nix +++ b/nixos/modules/services/networking/dhcpcd.nix @@ -40,7 +40,7 @@ let denyinterfaces ${toString ignoredInterfaces} lo peth* vif* tap* tun* virbr* vnet* vboxnet* # Use the list of allowed interfaces if specified - ${optionalString (cfg.allowInterfaces != [ ]) "allowinterfaces ${toString cfg.allowInterfaces}"} + ${optionalString (cfg.allowInterfaces != null) "allowinterfaces ${toString cfg.allowInterfaces}"} ${cfg.extraConfig} ''; @@ -86,13 +86,13 @@ in }; networking.dhcpcd.allowInterfaces = mkOption { - type = types.listOf types.str; - default = []; + type = types.nullOr (types.listOf types.str); + default = null; description = '' Enable the DHCP client for any interface whose name matches any of the shell glob patterns in this list. Any interface not explicitly matched by this pattern will be denied. This pattern only - applies when the list is non-empty. + applies when non-null. ''; }; -- GitLab From 40d88e9f80075567f4c36e371a3dd36568108b02 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Thu, 26 Jun 2014 00:13:21 -0500 Subject: [PATCH 037/843] nixos/network-interfaces: Add sit interfaces Previously, we had no method for creating 6-to-4 tunneled interfaces. This patch adds the option networking.sits, which allows the user to create named 6-to-4 sit devices. --- nixos/modules/tasks/network-interfaces.nix | 89 ++++++++++++++++++++++ 1 file changed, 89 insertions(+) diff --git a/nixos/modules/tasks/network-interfaces.nix b/nixos/modules/tasks/network-interfaces.nix index 991f9f26145..7dabe70f00c 100644 --- a/nixos/modules/tasks/network-interfaces.nix +++ b/nixos/modules/tasks/network-interfaces.nix @@ -7,6 +7,7 @@ let cfg = config.networking; interfaces = attrValues cfg.interfaces; hasVirtuals = any (i: i.virtual) interfaces; + hasSits = cfg.sits != { }; hasBonds = cfg.bonds != { }; interfaceOpts = { name, ... }: { @@ -321,6 +322,66 @@ in }; }; + networking.sits = mkOption { + type = types.attrsOf types.optionSet; + default = { }; + example = { + hurricane = { + remote = "10.0.0.1"; + local = "10.0.0.22"; + ttl = 255; + }; + msipv6 = { + remote = "192.168.0.1"; + dev = "enp3s0"; + ttl = 127; + }; + }; + description = '' + This option allows you to define 6-to-4 interfaces which should be automatically created. + ''; + options = { + + remote = mkOption { + type = types.nullOr types.str; + default = null; + example = "10.0.0.1"; + description = '' + The address of the remote endpoint to forward traffic over. + ''; + }; + + local = mkOption { + type = types.nullOr types.str; + default = null; + example = "10.0.0.22"; + description = '' + The address of the local endpoint which the remote + side should send packets to. + ''; + }; + + ttl = mkOption { + type = types.nullOr types.int; + default = null; + example = 255; + description = '' + The time-to-live of the connection to the remote tunnel endpoint. + ''; + }; + + dev = mkOption { + type = types.nullOr types.str; + default = null; + example = "enp4s0f0"; + description = '' + The underlying network device on which the tunnel resides. + ''; + }; + + }; + }; + networking.vlans = mkOption { default = { }; example = { @@ -380,6 +441,7 @@ in boot.kernelModules = [ ] ++ optional cfg.enableIPv6 "ipv6" ++ optional hasVirtuals "tun" + ++ optional hasSits "sit" ++ optional hasBonds "bonding"; boot.extraModprobeConfig = @@ -641,6 +703,32 @@ in ''; }; + createSitDevice = n: v: + let + deps = optional (v.dev != null) "sys-subsystem-net-devices-${v.dev}.device"; + in + { description = "6-to-4 Tunnel Interface ${n}"; + wantedBy = [ "network.target" "sys-subsystem-net-devices-${n}.device" ]; + bindsTo = deps; + after = deps; + serviceConfig.Type = "oneshot"; + serviceConfig.RemainAfterExit = true; + path = [ pkgs.iproute ]; + script = '' + # Remove Dead Interfaces + ip link show "${n}" >/dev/null 2>&1 && ip link delete "${n}" + ip link add "${n}" type sit \ + ${optionalString (v.remote != null) "remote \"${v.remote}\""} \ + ${optionalString (v.local != null) "local \"${v.local}\""} \ + ${optionalString (v.ttl != null) "ttl ${toString v.ttl}"} \ + ${optionalString (v.dev != null) "dev \"${v.dev}\""} + ip link set "${n}" up + ''; + postStop = '' + ip link delete "${n}" + ''; + }; + createVlanDevice = n: v: let deps = [ "sys-subsystem-net-devices-${v.interface}.device" ]; @@ -668,6 +756,7 @@ in map createTunDevice (filter (i: i.virtual) interfaces)) // mapAttrs createBridgeDevice cfg.bridges // mapAttrs createBondDevice cfg.bonds + // mapAttrs createSitDevice cfg.sits // mapAttrs createVlanDevice cfg.vlans // { "network-setup" = networkSetup; }; -- GitLab From bc6979f7e1a3a2fe65d813cc18ee5a37ed0e4d4d Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Fri, 4 Jul 2014 15:01:26 -0500 Subject: [PATCH 038/843] nixos/dhcpcd: Don't configure sit devices --- nixos/modules/services/networking/dhcpcd.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/networking/dhcpcd.nix b/nixos/modules/services/networking/dhcpcd.nix index 5a353fc0942..866707c3a91 100644 --- a/nixos/modules/services/networking/dhcpcd.nix +++ b/nixos/modules/services/networking/dhcpcd.nix @@ -7,9 +7,10 @@ let dhcpcd = if !config.boot.isContainer then pkgs.dhcpcd else pkgs.dhcpcd.override { udev = null; }; # Don't start dhcpcd on explicitly configured interfaces or on - # interfaces that are part of a bridge. + # interfaces that are part of a bridge, bond or sit device. ignoredInterfaces = map (i: i.name) (filter (i: i.ipAddress != null) (attrValues config.networking.interfaces)) + ++ mapAttrsToList (i: _: i) config.networking.sits ++ concatLists (attrValues (mapAttrs (n: v: v.interfaces) config.networking.bridges)) ++ concatLists (attrValues (mapAttrs (n: v: v.interfaces) config.networking.bonds)) ++ config.networking.dhcpcd.denyInterfaces; @@ -35,7 +36,7 @@ let # Ignore peth* devices; on Xen, they're renamed physical # Ethernet cards used for bridging. Likewise for vif* and tap* # (Xen) and virbr* and vnet* (libvirt). - denyinterfaces ${toString ignoredInterfaces} lo peth* vif* tap* tun* virbr* vnet* vboxnet* + denyinterfaces ${toString ignoredInterfaces} lo peth* vif* tap* tun* virbr* vnet* vboxnet* sit* ${config.networking.dhcpcd.extraConfig} ''; -- GitLab From 9eea38285bfa28a70a6996c45c84e7c4aceb0bac Mon Sep 17 00:00:00 2001 From: Kosyrev Serge <_deepfire@feelingofgreen.ru> Date: Mon, 4 Aug 2014 13:03:49 +0400 Subject: [PATCH 039/843] chntpw: new expression --- .../00-chntpw-build-arch-autodetect.patch | 25 ++++++++++++++++ .../chntpw/01-chntpw-install-target.patch | 26 +++++++++++++++++ pkgs/tools/security/chntpw/default.nix | 29 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 4 files changed, 82 insertions(+) create mode 100644 pkgs/tools/security/chntpw/00-chntpw-build-arch-autodetect.patch create mode 100644 pkgs/tools/security/chntpw/01-chntpw-install-target.patch create mode 100644 pkgs/tools/security/chntpw/default.nix diff --git a/pkgs/tools/security/chntpw/00-chntpw-build-arch-autodetect.patch b/pkgs/tools/security/chntpw/00-chntpw-build-arch-autodetect.patch new file mode 100644 index 00000000000..9c379adb7df --- /dev/null +++ b/pkgs/tools/security/chntpw/00-chntpw-build-arch-autodetect.patch @@ -0,0 +1,25 @@ +diff -urN chntpw-140201.orig/Makefile chntpw-140201/Makefile +--- chntpw-140201.orig/Makefile 2014-02-01 20:54:37.000000000 +0400 ++++ chntpw-140201/Makefile 2014-08-03 20:26:56.497161881 +0400 +@@ -12,14 +12,13 @@ + + CC=gcc + +-# Force 32 bit +-CFLAGS= -DUSEOPENSSL -g -I. -I$(OSSLINC) -Wall -m32 +-OSSLLIB=$(OSSLPATH)/lib +- +-# 64 bit if default for compiler setup +-#CFLAGS= -DUSEOPENSSL -g -I. -I$(OSSLINC) -Wall +-#OSSLLIB=$(OSSLPATH)/lib64 +- ++ifeq '$(shell gcc -dumpmachine)' 'x86_64-unknown-linux-gnu' ++ CFLAGS= -DUSEOPENSSL -g -I. -I$(OSSLINC) -Wall ++ OSSLLIB=$(OSSLPATH)/lib64 ++else ifeq '$(shell gcc -dumpmachine)' 'i686-unknown-linux-gnu' ++ CFLAGS= -DUSEOPENSSL -g -I. -I$(OSSLINC) -Wall -m32 ++ OSSLLIB=$(OSSLPATH)/lib ++endif + + # This is to link with whatever we have, SSL crypto lib we put in static + #LIBS=-L$(OSSLLIB) $(OSSLLIB)/libcrypto.a diff --git a/pkgs/tools/security/chntpw/01-chntpw-install-target.patch b/pkgs/tools/security/chntpw/01-chntpw-install-target.patch new file mode 100644 index 00000000000..d3163a026f9 --- /dev/null +++ b/pkgs/tools/security/chntpw/01-chntpw-install-target.patch @@ -0,0 +1,26 @@ +diff -urN chntpw-140201.orig/Makefile chntpw-140201/Makefile +--- chntpw-140201.orig/Makefile 2014-08-03 20:26:56.497161881 +0400 ++++ chntpw-140201/Makefile 2014-08-04 12:57:16.563818342 +0400 +@@ -10,6 +10,8 @@ + OSSLPATH=/usr + OSSLINC=$(OSSLPATH)/include + ++PREFIX ?= /usr ++ + CC=gcc + + ifeq '$(shell gcc -dumpmachine)' 'x86_64-unknown-linux-gnu' +@@ -24,8 +26,12 @@ + #LIBS=-L$(OSSLLIB) $(OSSLLIB)/libcrypto.a + LIBS=-L$(OSSLLIB) + ++BINARIES := chntpw chntpw.static cpnt reged reged.static samusrgrp samusrgrp.static sampasswd sampasswd.static + +-all: chntpw chntpw.static cpnt reged reged.static samusrgrp samusrgrp.static sampasswd sampasswd.static ++all: $(BINARIES) ++install: $(BINARIES) ++ mkdir -p $(PREFIX)/bin ++ cp $^ $(PREFIX)/bin + + chntpw: chntpw.o ntreg.o edlib.o libsam.o + $(CC) $(CFLAGS) -o chntpw chntpw.o ntreg.o edlib.o libsam.o $(LIBS) diff --git a/pkgs/tools/security/chntpw/default.nix b/pkgs/tools/security/chntpw/default.nix new file mode 100644 index 00000000000..a1aab355a3c --- /dev/null +++ b/pkgs/tools/security/chntpw/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchurl, unzip }: + +stdenv.mkDerivation rec { + name = "chntpw-${version}"; + + version = "140201"; + + src = fetchurl { + url = "http://pogostick.net/~pnh/ntpasswd/chntpw-source-${version}.zip"; + sha256 = "1k1cxsj0221dpsqi5yibq2hr7n8xywnicl8yyaicn91y8h2hkqln"; + }; + + buildInputs = [ unzip ]; + + patches = [ + ./00-chntpw-build-arch-autodetect.patch + ./01-chntpw-install-target.patch + ]; + + installPhase = '' + make install PREFIX=$out + ''; + + meta = with stdenv.lib; { + homepage = http://pogostick.net/~pnh/ntpasswd/; + description = "An utility to reset the password of any user that has a valid local account on a Windows system"; + license = licenses.gpl2; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 77d2fe85d59..2da8398619f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -604,6 +604,8 @@ let consul = callPackage ../servers/consul { }; consul_ui = callPackage ../servers/consul/ui.nix { }; + chntpw = callPackage ../tools/security/chntpw { }; + coprthr = callPackage ../development/libraries/coprthr { flex = flex_2_5_35; }; -- GitLab From 043dc2b1b4bb547cd4a1a3a6499131a9437d42c7 Mon Sep 17 00:00:00 2001 From: Michel Kuhlmann Date: Fri, 15 Aug 2014 10:50:10 +0200 Subject: [PATCH 040/843] qgis: update 1.8.0 -> 2.4.0 and adding sip Unfortunately adding sip doesn't solve the error-message: Couldn't load SIP module. Python support will be disabled. --- pkgs/applications/misc/qgis/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/misc/qgis/default.nix b/pkgs/applications/misc/qgis/default.nix index cc26a74802b..9a41bcc36ec 100644 --- a/pkgs/applications/misc/qgis/default.nix +++ b/pkgs/applications/misc/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 }: + pyqt4, qwt, fcgi, python, libspatialindex, libspatialite, sip }: stdenv.mkDerivation rec { - name = "qgis-1.8.0"; + name = "qgis-2.4.0"; - buildInputs = [ gdal qt4 flex bison proj geos x11 sqlite gsl pyqt4 qwt + buildInputs = [ gdal qt4 flex bison proj geos x11 sqlite gsl pyqt4 sip qwt fcgi libspatialindex libspatialite ]; nativeBuildInputs = [ cmake python ]; @@ -19,7 +19,9 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://qgis.org/downloads/${name}.tar.bz2"; - sha256 = "1aq32ch61bqsvh39lmrxah1fmh18cd3nqyi1l0sn6ssa3kwf82vh"; + sha256 = "711b7d81ddff45b083a21f05c8aa5093a6a38a0ee42dfcc873234fcef1fcdd76"; + + }; meta = { -- GitLab From 2815cdb8a77c632dacaa9d1d9228af8019d2e4d2 Mon Sep 17 00:00:00 2001 From: Boris Sukholitko Date: Fri, 15 Aug 2014 17:51:50 +0300 Subject: [PATCH 041/843] tigervnc: fix xkb configuration for Xvnc Without those fixes, Xvnc doesn't work at all. --- pkgs/tools/admin/tigervnc/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/admin/tigervnc/default.nix b/pkgs/tools/admin/tigervnc/default.nix index 3d5abd074d9..71e1f29cf1c 100644 --- a/pkgs/tools/admin/tigervnc/default.nix +++ b/pkgs/tools/admin/tigervnc/default.nix @@ -57,7 +57,12 @@ stdenv.mkDerivation rec { patch -p1 < $a done autoreconf -vfi - ./configure $configureFlags --disable-xinerama --disable-xvfb --disable-xnest --disable-xorg --disable-dmx --disable-dri --disable-dri2 --disable-glx --prefix="$out" --disable-unit-tests + ./configure $configureFlags --disable-xinerama --disable-xvfb --disable-xnest \ + --disable-xorg --disable-dmx --disable-dri --disable-dri2 --disable-glx \ + --prefix="$out" --disable-unit-tests \ + --with-xkb-path=${xkeyboard_config}/share/X11/xkb \ + --with-xkb-bin-directory=${xkbcomp}/bin \ + --with-xkb-output=$out/share/X11/xkb/compiled make TIGERVNC_SRCDIR=`pwd`/../.. popd ''; -- GitLab From bce3730a3ceaa00376313f17fc59091885b0f6dc Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sun, 17 Aug 2014 00:31:35 +0200 Subject: [PATCH 042/843] =?UTF-8?q?Adds=20ocaml=20library=20=E2=80=9Ccsv?= =?UTF-8?q?=E2=80=9D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This is a pure OCaml library to read and write CSV files, including all extensions used by Excel — eg. quotes, newlines, 8 bit characters in fields, "0 etc. Homepage: https://forge.ocamlcore.org/projects/csv/ --- .../development/ocaml-modules/csv/default.nix | 27 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 29 insertions(+) create mode 100644 pkgs/development/ocaml-modules/csv/default.nix diff --git a/pkgs/development/ocaml-modules/csv/default.nix b/pkgs/development/ocaml-modules/csv/default.nix new file mode 100644 index 00000000000..7178452e3dd --- /dev/null +++ b/pkgs/development/ocaml-modules/csv/default.nix @@ -0,0 +1,27 @@ +{stdenv, fetchurl, ocaml, findlib}: +stdenv.mkDerivation { + + name = "ocaml-csv-1.3.3"; + + src = fetchurl { + url = "https://forge.ocamlcore.org/frs/download.php/1376/csv-1.3.3.tar.gz"; + sha256 = "19qsvw3n7k4xpy0sw7n5s29kzj91myihjljhr5js6xcxwj4cydh2"; + }; + + buildInputs = [ ocaml findlib ]; + + createFindlibDestdir = true; + + configurePhase = "ocaml setup.ml -configure --prefix $out"; + + buildPhase = "ocaml setup.ml -build"; + + installPhase = "ocaml setup.ml -install"; + + meta = { + description = "A pure OCaml library to read and write CSV files"; + homepage = "https://forge.ocamlcore.org/projects/csv/"; + license = stdenv.lib.licenses.lgpl21; + platforms = ocaml.meta.platforms; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 10a2735f082..0ad9d8b70f2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3203,6 +3203,8 @@ let cryptokit = callPackage ../development/ocaml-modules/cryptokit { }; + csv = callPackage ../development/ocaml-modules/csv { }; + deriving = callPackage ../development/tools/ocaml/deriving { }; easy-format = callPackage ../development/ocaml-modules/easy-format { }; -- GitLab From cfbc0defdeffd5190e8cfdaaf3100184963cf406 Mon Sep 17 00:00:00 2001 From: Nathaniel Baxter Date: Fri, 8 Aug 2014 08:58:18 +1000 Subject: [PATCH 043/843] obconf: Added obconf - A gui configuration tool for openbox --- pkgs/tools/X11/obconf/default.nix | 26 ++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 ++++ 2 files changed, 30 insertions(+) create mode 100644 pkgs/tools/X11/obconf/default.nix diff --git a/pkgs/tools/X11/obconf/default.nix b/pkgs/tools/X11/obconf/default.nix new file mode 100644 index 00000000000..589b684e69b --- /dev/null +++ b/pkgs/tools/X11/obconf/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchurl, pkgconfig, gtk, libglade, openbox, + imlib2, libstartup_notification, makeWrapper }: + +stdenv.mkDerivation rec { + name = "obconf-${version}"; + version = "2.0.4"; + + src = fetchurl { + url = "http://openbox.org/dist/obconf/obconf-${version}.tar.gz"; + sha256 = "1fanjdmd8727kk74x5404vi8v7s4kpq48l583d12fsi4xvsfb8vi"; + }; + + buildInputs = [ + pkgconfig gtk libglade openbox imlib2 libstartup_notification makeWrapper + ]; + + postInstall = '' + wrapProgram $out/bin/obconf --prefix XDG_DATA_DIRS : ${openbox}/share/ + ''; + + meta = { + description = "GUI configuration tool for openbox"; + homepage = "http://openbox.org/wiki/ObConf"; + license = stdenv.lib.licenses.gpl2; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 312959fdb24..8712cce4985 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9391,6 +9391,10 @@ let nvpy = callPackage ../applications/editors/nvpy { }; + obconf = callPackage ../tools/X11/obconf { + inherit (gnome) libglade; + }; + ocrad = callPackage ../applications/graphics/ocrad { }; offrss = callPackage ../applications/networking/offrss { }; -- GitLab From f513e383efbbf7ab7a7d2c0222cfe93e22360da7 Mon Sep 17 00:00:00 2001 From: Tino Breddin Date: Sun, 17 Aug 2014 21:08:45 +0200 Subject: [PATCH 044/843] golang: bump to 1.3.1 --- pkgs/development/compilers/go/1.3.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/go/1.3.nix b/pkgs/development/compilers/go/1.3.nix index fafa045e562..06decd16190 100644 --- a/pkgs/development/compilers/go/1.3.nix +++ b/pkgs/development/compilers/go/1.3.nix @@ -7,11 +7,11 @@ let in stdenv.mkDerivation { - name = "go-1.3"; + name = "go-1.3.1"; src = fetchurl { - url = https://storage.googleapis.com/golang/go1.3.src.tar.gz; - sha256 = "10jkqgzlinzynciw3wr15c7n2vw5q4d2ni65hbs3i61bbdn3x67b"; + url = https://storage.googleapis.com/golang/go1.3.1.src.tar.gz; + sha256 = "fdfa148cc12f1e4ea45a5565261bf43d8a2e7d1fad4a16aed592d606223b93a8"; }; buildInputs = [ bison bash makeWrapper ] ++ lib.optionals stdenv.isLinux [ glibc ] ; -- GitLab From ce3e86702ff00c2f9d9a1d2a61d7d92771eb7540 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benno=20F=C3=BCnfst=C3=BCck?= Date: Sun, 17 Aug 2014 23:00:03 +0200 Subject: [PATCH 045/843] prefetch-git: output human-readable rev to stderr that way, the stdout stays compatible with nix-prefetch-{bzr,svn,hg} --- pkgs/build-support/fetchgit/nix-prefetch-git | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/build-support/fetchgit/nix-prefetch-git b/pkgs/build-support/fetchgit/nix-prefetch-git index fcb01262783..b3cd3488735 100755 --- a/pkgs/build-support/fetchgit/nix-prefetch-git +++ b/pkgs/build-support/fetchgit/nix-prefetch-git @@ -219,7 +219,7 @@ clone_user_rev() { local full_revision=$(cd $dir && (git rev-parse $rev 2> /dev/null || git rev-parse refs/heads/fetchgit) | tail -n1) echo "git revision is $full_revision" - echo "git human-readable version is $(cd $dir && (git describe $full_revision 2> /dev/null || git describe --tags $full_revision 2> /dev/null || echo -- none --))" + echo "git human-readable version is $(cd $dir && (git describe $full_revision 2> /dev/null || git describe --tags $full_revision 2> /dev/null || echo -- none --))" >&2 # Allow doing additional processing before .git removal eval "$NIX_PREFETCH_GIT_CHECKOUT_HOOK" -- GitLab From 7a8cdc66a4cb132b26028ec0d1128c47572d9fac Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Sun, 10 Aug 2014 21:14:41 -0300 Subject: [PATCH 046/843] MPV: update to 0.5.0 Many thanks matejc for the commit! --- pkgs/applications/video/mpv/default.nix | 18 ++++++++++-------- pkgs/top-level/all-packages.nix | 7 ++++--- 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix index 4eec9afdbf3..db1ced49166 100644 --- a/pkgs/applications/video/mpv/default.nix +++ b/pkgs/applications/video/mpv/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, fetchgit, freetype, pkgconfig, freefont_ttf, ffmpeg, libass , lua, perl, libpthreadstubs , lua5_sockets -, python3, docutils, which +, python3, docutils, which, lib , x11Support ? true, libX11 ? null, libXext ? null, mesa ? null, libXxf86vm ? null , xineramaSupport ? true, libXinerama ? null , xvSupport ? true, libXv ? null @@ -20,8 +20,9 @@ # For screenshots , libpngSupport ? true, libpng ? null # for Youtube support -, quviSupport? false, libquvi ? null -, cacaSupport? false, libcaca ? null +, quviSupport ? false, libquvi ? null +, cacaSupport ? false, libcaca ? null +, vaapiSupport ? false, libva ? null }: assert x11Support -> (libX11 != null && libXext != null && mesa != null && libXxf86vm != null); @@ -57,11 +58,11 @@ in stdenv.mkDerivation rec { name = "mpv-${version}"; - version = "0.4.1"; + version = "0.5.0"; src = fetchurl { url = "https://github.com/mpv-player/mpv/archive/v${version}.tar.gz"; - sha256 = "0wqjyzw3kk854zj263k7jyykzfaz1g27z50aqrd26hylg8k135cn"; + sha256 = "17mmc6xm8yir2p379h00q3wy7rplz2s31h6sxswmzbh72xf10g96"; }; buildInputs = with stdenv.lib; @@ -84,6 +85,7 @@ stdenv.mkDerivation rec { ++ optional quviSupport libquvi ++ optional sdl2Support SDL2 ++ optional cacaSupport libcaca + ++ optional vaapiSupport libva ; nativeBuildInputs = [ python3 lua perl ]; @@ -97,7 +99,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; configurePhase = '' - python3 ${waf} configure --prefix=$out + python3 ${waf} configure --prefix=$out ${lib.optionalString vaapiSupport "--enable-vaapi"} patchShebangs TOOLS ''; @@ -124,9 +126,9 @@ stdenv.mkDerivation rec { }; } -# Heavily based on mplayer2 expression +# Many thanks @matejc for this update: 0.5.0 and vaapi (experimental) # TODO: Wayland support -# TODO: investigate libquvi support +# TODO: investigate libquvi problems (related to Youtube support) # TODO: investigate caca support # TODO: investigate lua5_sockets bug diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 312959fdb24..43301c91d54 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9273,9 +9273,10 @@ let mpv = callPackage ../applications/video/mpv { lua = lua5_1; - bs2bSupport = true; - quviSupport = true; - cacaSupport = true; + bs2bSupport = config.mpv.bs2bSupport or true; + quviSupport = config.mpv.quviSupport or false; + cacaSupport = config.mpv.cacaSupport or true; + vaapiSupport = config.mpv.vaapiSupport or false; }; mrxvt = callPackage ../applications/misc/mrxvt { }; -- GitLab From a82e9e4b5c0faaeb4b3366e21b32f589b59c0b23 Mon Sep 17 00:00:00 2001 From: Georges Dubus Date: Tue, 19 Aug 2014 11:00:46 +0200 Subject: [PATCH 047/843] Added e2fsprogs to docker dependencies. Otherwise, it complains about mkfs.ext4 not being present at service start (and stops). --- pkgs/applications/virtualization/docker/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index 4a488a381ab..4571e979c6c 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, makeWrapper, go, lxc, sqlite, iproute, bridge_utils, devicemapper, -btrfsProgs, iptables, bash}: +btrfsProgs, iptables, bash, e2fsprogs}: stdenv.mkDerivation rec { name = "docker-${version}"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { sha256 = "1pa6k3gx940ap3r96xdry6apzkm0ymqra92b2mrp25b25264cqcy"; }; - buildInputs = [ makeWrapper go sqlite lxc iproute bridge_utils devicemapper btrfsProgs iptables ]; + buildInputs = [ makeWrapper go sqlite lxc iproute bridge_utils devicemapper btrfsProgs iptables e2fsprogs]; dontStrip = true; @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { installPhase = '' install -Dm755 ./bundles/${version}/dynbinary/docker-${version} $out/bin/docker install -Dm755 ./bundles/${version}/dynbinary/dockerinit-${version} $out/bin/dockerinit - wrapProgram $out/bin/docker --prefix PATH : "${iproute}/sbin:sbin:${lxc}/bin:${iptables}/sbin" + wrapProgram $out/bin/docker --prefix PATH : "${iproute}/sbin:sbin:${lxc}/bin:${iptables}/sbin:${e2fsprogs}/sbin" # systemd install -Dm644 ./contrib/init/systemd/docker.service $out/etc/systemd/system/docker.service -- GitLab From fe270c011ce246bb7e95a0deec9106f1a04fe8d0 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Mon, 18 Aug 2014 10:08:18 -0300 Subject: [PATCH 048/843] Fluxbox: new package (1.3.5) --- .../window-managers/fluxbox/default.nix | 39 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 41 insertions(+) create mode 100644 pkgs/applications/window-managers/fluxbox/default.nix diff --git a/pkgs/applications/window-managers/fluxbox/default.nix b/pkgs/applications/window-managers/fluxbox/default.nix new file mode 100644 index 00000000000..6c91e773376 --- /dev/null +++ b/pkgs/applications/window-managers/fluxbox/default.nix @@ -0,0 +1,39 @@ +{ stdenv, fetchurl, pkgconfig +, freetype, fribidi +, libXext, libXft, libXpm, libXrandr, libXrender, xextproto +, libXinerama +, imlib2 +}: + +stdenv.mkDerivation rec { + + name = "fluxbox-${version}"; + version = "1.3.5"; + + buildInputs = [ + pkgconfig + freetype fribidi + libXext libXft libXpm libXrandr libXrender xextproto + libXinerama + imlib2 + ]; + + src = fetchurl { + url = "mirror://sourceforge/fluxbox/${name}.tar.bz2"; + sha256 = "164dd7bf59791d09a1e729a4fcd5e7347a1004ba675629860a5cf1a271c32983"; + }; + + meta = { + description = "Full-featured, light-resource X window manager."; + longDescription = '' + Fluxbox is a X window manager based on Blackbox 0.61.1 window manager sources. + It is very light on resources and easy to handle but yet full of features to make an easy, + and extremely fast, desktop experience. It is written in C++ and licensed under MIT license. + ''; + homepage = http://fluxbox.org/; + license = stdenv.lib.licenses.mit; + maintainers = [ stdenv.lib.maintainers.AndersonTorres ]; + platforms = stdenv.lib.platforms.linux; + }; +} +# Many thanks Jack Ryan from Nix-dev mailing list! diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5047bd59f34..6600cb1ae4c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8707,6 +8707,8 @@ let debug = config.flashplayer.debug or false; }; + fluxbox = callPackage ../applications/window-managers/fluxbox { }; + freecad = callPackage ../applications/graphics/freecad { opencascade = opencascade_6_5; inherit (pythonPackages) matplotlib pycollada; -- GitLab From af09d3ebd8908dcde1d28f0e1dff0a7a554af4f1 Mon Sep 17 00:00:00 2001 From: Emery Hemingway Date: Thu, 10 Jul 2014 14:08:38 -0400 Subject: [PATCH 049/843] siproxd: initial service expression --- nixos/modules/misc/ids.nix | 2 + nixos/modules/module-list.nix | 1 + nixos/modules/services/misc/siproxd.nix | 180 ++++++++++++++++++++++++ 3 files changed, 183 insertions(+) create mode 100644 nixos/modules/services/misc/siproxd.nix diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix index fa81ff8a839..9f509ba8cb9 100644 --- a/nixos/modules/misc/ids.nix +++ b/nixos/modules/misc/ids.nix @@ -141,6 +141,7 @@ unifi = 131; gdm = 132; dhcpd = 133; + siproxd = 134; # When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399! @@ -256,6 +257,7 @@ docker = 131; gdm = 132; tss = 133; + siproxd = 134; # 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/module-list.nix b/nixos/modules/module-list.nix index 453899175e0..1fc2959bd8a 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -159,6 +159,7 @@ ./services/misc/nix-ssh-serve.nix ./services/misc/rippled.nix ./services/misc/rogue.nix + ./services/misc/siproxd.nix ./services/misc/svnserve.nix ./services/misc/synergy.nix ./services/monitoring/apcupsd.nix diff --git a/nixos/modules/services/misc/siproxd.nix b/nixos/modules/services/misc/siproxd.nix new file mode 100644 index 00000000000..9e8fb6c228f --- /dev/null +++ b/nixos/modules/services/misc/siproxd.nix @@ -0,0 +1,180 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + + cfg = config.services.siproxd; + + conf = '' + daemonize = 0 + rtp_proxy_enable = 1 + user = siproxd + if_inbound = ${cfg.ifInbound} + if_outbound = ${cfg.ifOutbound} + sip_listen_port = ${toString cfg.sipListenPort} + rtp_port_low = ${toString cfg.rtpPortLow} + rtp_port_high = ${toString cfg.rtpPortHigh} + rtp_dscp = ${toString cfg.rtpDscp} + sip_dscp = ${toString cfg.sipDscp} + ${optionalString (cfg.hostsAllowReg != []) "hosts_allow_reg = ${concatStringsSep "," cfg.hostsAllowReg}"} + ${optionalString (cfg.hostsAllowSip != []) "hosts_allow_sip = ${concatStringsSep "," cfg.hostsAllowSip}"} + ${optionalString (cfg.hostsDenySip != []) "hosts_deny_sip = ${concatStringsSep "," cfg.hostsDenySip}"} + ${if (cfg.passwordFile != "") then "proxy_auth_pwfile = ${cfg.passwordFile}" else ""} + ${cfg.extraConfig} + ''; + + confFile = builtins.toFile "siproxd.conf" conf; + +in +{ + ##### interface + + options = { + + services.siproxd = { + + enable = mkOption { + type = types.bool; + default = false; + description = '' + Whether to enable the Siproxd SIP + proxy/masquerading daemon. + ''; + }; + + ifInbound = mkOption { + type = types.str; + example = "eth0"; + description = "Local network interface"; + }; + + ifOutbound = mkOption { + type = types.str; + example = "ppp0"; + description = "Public network interface"; + }; + + hostsAllowReg = mkOption { + type = types.listOf types.str; + default = [ ]; + example = [ "192.168.1.0/24" "192.168.2.0/24" ]; + description = '' + Acess control list for incoming SIP registrations. + ''; + }; + + hostsAllowSip = mkOption { + type = types.listOf types.str; + default = [ ]; + example = [ "123.45.0.0/16" "123.46.0.0/16" ]; + description = '' + Acess control list for incoming SIP traffic. + ''; + }; + + hostsDenySip = mkOption { + type = types.listOf types.str; + default = [ ]; + example = [ "10.0.0.0/8" "11.0.0.0/8" ]; + description = '' + Acess control list for denying incoming + SIP registrations and traffic. + ''; + }; + + sipListenPort = mkOption { + type = types.int; + default = 5060; + description = '' + Port to listen for incoming SIP messages. + ''; + }; + + rtpPortLow = mkOption { + type = types.int; + default = 7070; + description = '' + Bottom of UDP port range for incoming and outgoing RTP traffic + ''; + }; + + rtpPortHigh = mkOption { + type = types.int; + default = 7089; + description = '' + Top of UDP port range for incoming and outgoing RTP traffic + ''; + }; + + rtpTimeout = mkOption { + type = types.int; + default = 300; + description = '' + Timeout for an RTP stream. If for the specified + number of seconds no data is relayed on an active + stream, it is considered dead and will be killed. + ''; + }; + + rtpDscp = mkOption { + type = types.int; + default = 46; + description = '' + DSCP (differentiated services) value to be assigned + to RTP packets. Allows QOS aware routers to handle + different types traffic with different priorities. + ''; + }; + + sipDscp = mkOption { + type = types.int; + default = 0; + description = '' + DSCP (differentiated services) value to be assigned + to SIP packets. Allows QOS aware routers to handle + different types traffic with different priorities. + ''; + }; + + passwordFile = mkOption { + type = types.str; + default = ""; + description = '' + Path to per-user password file. + ''; + }; + + extraConfig = mkOption { + type = types.lines; + default = ""; + description = '' + Extra configuration to add to siproxd configuration. + ''; + }; + + }; + + }; + + ##### implementation + + config = mkIf cfg.enable { + + users.extraUsers = singleton { + name = "siproxyd"; + uid = config.ids.uids.siproxd; + }; + + systemd.services.siproxd = { + description = "SIP proxy/masquerading daemon"; + wantedBy = [ "multi-user.target" ]; + after = [ "network.target" ]; + serviceConfig = { + ExecStart = "${pkgs.siproxd}/sbin/siproxd -c ${confFile}"; + }; + }; + + }; + +} -- GitLab From 559c7cc2dad4a971f0519c9f4861259fca55c3d1 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 19 Aug 2014 18:39:45 +0200 Subject: [PATCH 050/843] yojson: propagate build inputs (as in PR #3404) --- pkgs/development/ocaml-modules/yojson/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/development/ocaml-modules/yojson/default.nix b/pkgs/development/ocaml-modules/yojson/default.nix index 9237db080d6..562d25550da 100644 --- a/pkgs/development/ocaml-modules/yojson/default.nix +++ b/pkgs/development/ocaml-modules/yojson/default.nix @@ -4,16 +4,18 @@ let version = "1.1.8"; webpage = "http://mjambon.com/${pname}.html"; in -stdenv.mkDerivation rec { +stdenv.mkDerivation { - name = "${pname}-${version}"; + name = "ocaml-${pname}-${version}"; src = fetchurl { - url = "http://mjambon.com/releases/${pname}/${name}.tar.gz"; + url = "http://mjambon.com/releases/${pname}/${pname}-${version}.tar.gz"; sha256 = "0ayx17dimnpavdfyq6dk9xv2x1fx69by85vc6vl3nqxjkcv5d2rv"; }; - buildInputs = [ ocaml findlib cppo easy-format biniou ]; + buildInputs = [ ocaml findlib ]; + + propagatedBuildInputs = [ cppo easy-format biniou ]; createFindlibDestdir = true; -- GitLab From e8d2f8f1092e71c951b95f5a6e1b2227e4d185a9 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 19 Aug 2014 18:42:13 +0200 Subject: [PATCH 051/843] merlin: update to 1.7 --- pkgs/development/tools/ocaml/merlin/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/tools/ocaml/merlin/default.nix b/pkgs/development/tools/ocaml/merlin/default.nix index c0882439f5c..8efb90a9cef 100644 --- a/pkgs/development/tools/ocaml/merlin/default.nix +++ b/pkgs/development/tools/ocaml/merlin/default.nix @@ -1,14 +1,14 @@ -{stdenv, fetchurl, ocaml, findlib, easy-format, biniou, yojson, menhir}: +{stdenv, fetchurl, ocaml, findlib, yojson, menhir}: stdenv.mkDerivation { - name = "merlin-1.6"; + name = "merlin-1.7"; src = fetchurl { - url = "https://github.com/the-lambda-church/merlin/archive/v1.6.tar.gz"; - sha256 = "0wq75hgffaszazrhkl0nfjxgx8bvazi2sjannd8q64hvax8hxzcy"; + url = "https://github.com/the-lambda-church/merlin/archive/v1.7.tar.gz"; + sha256 = "0grprrykah02g8va63lidbcb6n8sd18l2k9spb5rwlcs3xhfw42b"; }; - buildInputs = [ ocaml findlib biniou yojson menhir easy-format ]; + buildInputs = [ ocaml findlib yojson menhir ]; prefixKey = "--prefix "; -- GitLab From c54a8ed1d05091d12d8341dbee7843e348cc2576 Mon Sep 17 00:00:00 2001 From: sfultong Date: Wed, 20 Aug 2014 23:02:16 -0400 Subject: [PATCH 052/843] Merge pull request #1 from sfultongv/sfultong-14.04 updating tomcat to version 7 --- nixos/modules/services/web-servers/tomcat.nix | 2 +- pkgs/servers/http/tomcat/6.0.nix | 27 ++++--------------- pkgs/servers/http/tomcat/7.0.nix | 6 +++++ pkgs/servers/http/tomcat/recent.nix | 24 +++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 5 files changed, 38 insertions(+), 23 deletions(-) create mode 100644 pkgs/servers/http/tomcat/7.0.nix create mode 100644 pkgs/servers/http/tomcat/recent.nix diff --git a/nixos/modules/services/web-servers/tomcat.nix b/nixos/modules/services/web-servers/tomcat.nix index c2f464014ae..2af249a8e96 100644 --- a/nixos/modules/services/web-servers/tomcat.nix +++ b/nixos/modules/services/web-servers/tomcat.nix @@ -5,7 +5,7 @@ with lib; let cfg = config.services.tomcat; - tomcat = pkgs.tomcat6; + tomcat = pkgs.tomcat7; in { diff --git a/pkgs/servers/http/tomcat/6.0.nix b/pkgs/servers/http/tomcat/6.0.nix index ee0049ce08f..19f20cc8823 100644 --- a/pkgs/servers/http/tomcat/6.0.nix +++ b/pkgs/servers/http/tomcat/6.0.nix @@ -1,23 +1,6 @@ -{ stdenv, fetchurl }: - -let version = "6.0.39"; in - -stdenv.mkDerivation rec { - name = "apache-tomcat-${version}"; - - src = fetchurl { - url = "mirror://apache/tomcat/tomcat-6/v${version}/bin/${name}.tar.gz"; +import ./recent.nix + { + versionMajor = "6"; + versionMinor = "0.39"; sha256 = "19qix6affhc252n03smjf482drg3nxd27shni1gvhphgj3zfmgfy"; - }; - - installPhase = - '' - mkdir $out - mv * $out - ''; - - meta = { - homepage = http://tomcat.apache.org/; - description = "An implementation of the Java Servlet and JavaServer Pages technologies"; - }; -} + } diff --git a/pkgs/servers/http/tomcat/7.0.nix b/pkgs/servers/http/tomcat/7.0.nix new file mode 100644 index 00000000000..87bc57eb2b6 --- /dev/null +++ b/pkgs/servers/http/tomcat/7.0.nix @@ -0,0 +1,6 @@ +import ./recent.nix + { + versionMajor = "7"; + versionMinor = "0.55"; + sha256 = "c20934fda63bc7311e2d8e067d67f886890c8be72280425c5f6f8fdd7a376c15"; + } diff --git a/pkgs/servers/http/tomcat/recent.nix b/pkgs/servers/http/tomcat/recent.nix new file mode 100644 index 00000000000..0d11ba7a104 --- /dev/null +++ b/pkgs/servers/http/tomcat/recent.nix @@ -0,0 +1,24 @@ +{ versionMajor, versionMinor, sha256 }: +{ stdenv, fetchurl }: + +let version = "${versionMajor}.${versionMinor}"; in + +stdenv.mkDerivation rec { + name = "apache-tomcat-${version}"; + + src = fetchurl { + url = "mirror://apache/tomcat/tomcat-${versionMajor}/v${version}/bin/${name}.tar.gz"; + inherit sha256; + }; + + installPhase = + '' + mkdir $out + mv * $out + ''; + + meta = { + homepage = http://tomcat.apache.org/; + description = "An implementation of the Java Servlet and JavaServer Pages technologies"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f2c8b83ada5..7aeaf7f7a3c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7022,6 +7022,8 @@ let tomcat6 = callPackage ../servers/http/tomcat/6.0.nix { }; + tomcat7 = callPackage ../servers/http/tomcat/7.0.nix { }; + tomcat_mysql_jdbc = callPackage ../servers/http/tomcat/jdbc/mysql { }; axis2 = callPackage ../servers/http/tomcat/axis2 { }; -- GitLab From 219983d6ad1bec55ab174d064d41d086654f9a17 Mon Sep 17 00:00:00 2001 From: Sam Griffin Date: Wed, 20 Aug 2014 23:23:44 -0400 Subject: [PATCH 053/843] adding tomcat version 8 --- pkgs/servers/http/tomcat/8.0.nix | 6 ++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 8 insertions(+) create mode 100644 pkgs/servers/http/tomcat/8.0.nix diff --git a/pkgs/servers/http/tomcat/8.0.nix b/pkgs/servers/http/tomcat/8.0.nix new file mode 100644 index 00000000000..63b8d2bbc94 --- /dev/null +++ b/pkgs/servers/http/tomcat/8.0.nix @@ -0,0 +1,6 @@ +import ./recent.nix + { + versionMajor = "8"; + versionMinor = "0.9"; + sha256 = "5ea3c8260088ee4fd223a532a4b0c23a10e549c34705e2f190279a1a7f1f83d9"; + } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7aeaf7f7a3c..4ae428bd83e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7023,6 +7023,8 @@ let tomcat6 = callPackage ../servers/http/tomcat/6.0.nix { }; tomcat7 = callPackage ../servers/http/tomcat/7.0.nix { }; + + tomcat8 = callPackage ../servers/http/tomcat/8.0.nix { }; tomcat_mysql_jdbc = callPackage ../servers/http/tomcat/jdbc/mysql { }; -- GitLab From 49fcac0d6b064d99ae00692763f6c638129b66d3 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Tue, 19 Aug 2014 10:40:17 -0300 Subject: [PATCH 054/843] Fluxbox: adding system support (as a module) --- nixos/modules/module-list.nix | 1 + .../services/x11/window-managers/fluxbox.nix | 28 +++++++++++++++++++ .../window-managers/fluxbox/default.nix | 10 ++----- 3 files changed, 31 insertions(+), 8 deletions(-) create mode 100644 nixos/modules/services/x11/window-managers/fluxbox.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 453899175e0..5b1b008a270 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -293,6 +293,7 @@ ./services/x11/window-managers/awesome.nix #./services/x11/window-managers/compiz.nix ./services/x11/window-managers/default.nix + ./services/x11/window-managers/fluxbox.nix ./services/x11/window-managers/icewm.nix ./services/x11/window-managers/bspwm.nix ./services/x11/window-managers/metacity.nix diff --git a/nixos/modules/services/x11/window-managers/fluxbox.nix b/nixos/modules/services/x11/window-managers/fluxbox.nix new file mode 100644 index 00000000000..4748ce99ccf --- /dev/null +++ b/nixos/modules/services/x11/window-managers/fluxbox.nix @@ -0,0 +1,28 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.xserver.windowManager.fluxbox; +in +{ + ###### interface + options = { + services.xserver.windowManager.fluxbox.enable = mkOption { + default = false; + description = "Enable the Fluxbox window manager."; + }; + }; + + ###### implementation + config = mkIf cfg.enable { + services.xserver.windowManager.session = singleton { + name = "fluxbox"; + start = '' + ${pkgs.fluxbox}/bin/startfluxbox & + waitPID=$! + ''; + }; + environment.systemPackages = [ pkgs.fluxbox ]; + }; +} diff --git a/pkgs/applications/window-managers/fluxbox/default.nix b/pkgs/applications/window-managers/fluxbox/default.nix index 6c91e773376..af6545b6151 100644 --- a/pkgs/applications/window-managers/fluxbox/default.nix +++ b/pkgs/applications/window-managers/fluxbox/default.nix @@ -10,13 +10,7 @@ stdenv.mkDerivation rec { name = "fluxbox-${version}"; version = "1.3.5"; - buildInputs = [ - pkgconfig - freetype fribidi - libXext libXft libXpm libXrandr libXrender xextproto - libXinerama - imlib2 - ]; + buildInputs = [ pkgconfig freetype fribidi libXext libXft libXpm libXrandr libXrender xextproto libXinerama imlib2 ]; src = fetchurl { url = "mirror://sourceforge/fluxbox/${name}.tar.bz2"; @@ -24,7 +18,7 @@ stdenv.mkDerivation rec { }; meta = { - description = "Full-featured, light-resource X window manager."; + description = "Full-featured, light-resource X window manager"; longDescription = '' Fluxbox is a X window manager based on Blackbox 0.61.1 window manager sources. It is very light on resources and easy to handle but yet full of features to make an easy, -- GitLab From 6a78135865247e9a93d035569aacffbbdc64969b Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Sun, 10 Aug 2014 21:06:39 -0300 Subject: [PATCH 055/843] Bochs: update to version 2.6.6 --- .../virtualization/bochs/default.nix | 17 ++++++++++------- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/virtualization/bochs/default.nix b/pkgs/applications/virtualization/bochs/default.nix index 75afcb41f80..74ce7bdfcaa 100644 --- a/pkgs/applications/virtualization/bochs/default.nix +++ b/pkgs/applications/virtualization/bochs/default.nix @@ -1,34 +1,34 @@ { stdenv, fetchurl +, pkgconfig, gtk , libX11 , mesa , sdlSupport ? true, SDL ? null , termSupport ? true , ncurses ? null, readline ? null -, wxSupport ? true , gtk ? null , wxGTK ? null , pkgconfig ? null +, wxSupport ? false, wxGTK ? null , wgetSupport ? false, wget ? null , curlSupport ? false, curl ? null }: - assert sdlSupport -> (SDL != null); assert termSupport -> (ncurses != null&& readline != null); -assert wxSupport -> (gtk != null && wxGTK != null && pkgconfig != null); +assert wxSupport -> (gtk != null && wxGTK != null); assert wgetSupport -> (wget != null); assert curlSupport -> (curl != null); stdenv.mkDerivation rec { name = "bochs-${version}"; - version = "2.6.2"; + version = "2.6.6"; src = fetchurl { url = "http://downloads.sourceforge.net/project/bochs/bochs/${version}/${name}.tar.gz"; - sha256 = "042blm1xb9ig4fh2bv8nrrfpgkcxy4hq8yrkx7mrdpm5g4mvfwyr"; + sha256 = "0nlrl218x93vz97n46aw2szsalx97r020mn43fjsif100v7zix6f"; }; buildInputs = with stdenv.lib; - [ libX11 mesa ] + [ pkgconfig gtk libX11 mesa ] ++ optionals sdlSupport [ SDL ] ++ optionals termSupport [ readline ncurses ] - ++ optionals wxSupport [ gtk wxGTK pkgconfig ] + ++ optionals wxSupport [ wxGTK ] ++ optionals wgetSupport [ wget ] ++ optionals curlSupport [ curl ]; @@ -50,6 +50,8 @@ stdenv.mkDerivation rec { --enable-pnic ''; + NIX_CFLAGS_COMPILE="-I${gtk}/include/gtk-2.0/"; + meta = { description = "An open-source IA-32 (x86) PC emulator"; longDescription = '' @@ -61,3 +63,4 @@ stdenv.mkDerivation rec { platforms = stdenv.lib.platforms.linux; }; } +# TODO: study config.bochs.* implementation (like config.ffmpeg.* options) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1c061bd8d3d..945900a4a0f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -579,7 +579,7 @@ let bmon = callPackage ../tools/misc/bmon { }; - bochs = callPackage ../applications/virtualization/bochs { }; + bochs = callPackage ../applications/virtualization/bochs { wxSupport = false; }; boomerang = callPackage ../development/tools/boomerang { }; -- GitLab From a5cf54a52b42d4caf3e967a1744a401cd0de79a2 Mon Sep 17 00:00:00 2001 From: Paul Koerbitz Date: Thu, 21 Aug 2014 16:22:08 +0200 Subject: [PATCH 056/843] Add package for ClipIt, a lightweight GTK clipboard manager --- pkgs/applications/misc/clipit/default.nix | 20 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 22 insertions(+) create mode 100644 pkgs/applications/misc/clipit/default.nix diff --git a/pkgs/applications/misc/clipit/default.nix b/pkgs/applications/misc/clipit/default.nix new file mode 100644 index 00000000000..57f6c229a08 --- /dev/null +++ b/pkgs/applications/misc/clipit/default.nix @@ -0,0 +1,20 @@ +{ fetchurl, stdenv, intltool, pkgconfig, gtk, xdotool }: + +stdenv.mkDerivation rec { + name = "clipit-${version}"; + version = "1.4.2"; + + src = fetchurl { + url = "https://github.com/downloads/shantzu/ClipIt/${name}.tar.gz"; + sha256 = "0jrwn8qfgb15rwspdp1p8hb1nc0ngmpvgr87d4k3lhlvqg2cfqva"; + }; + + buildInputs = [ intltool pkgconfig gtk xdotool ]; + + meta = with stdenv.lib; { + description = "Lightweight GTK+ Clipboard Manager"; + homepage = "http://clipit.rspwn.com"; + license = licenses.gpl3; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f4a1797c890..cd814c3fd6a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8240,6 +8240,8 @@ let cinelerra = callPackage ../applications/video/cinelerra { }; + clipit = callPackage ../applications/misc/clipit { }; + cmus = callPackage ../applications/audio/cmus { }; compiz = callPackage ../applications/window-managers/compiz { -- GitLab From a9baea48dfd61f6650a9c72b9b106479329eaddf Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 21 Aug 2014 16:24:45 +0200 Subject: [PATCH 057/843] openjade: Use default perl --- pkgs/tools/text/sgml/openjade/default.nix | 2 ++ pkgs/tools/text/sgml/openjade/msggen.patch | 34 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 +-- 3 files changed, 37 insertions(+), 3 deletions(-) create mode 100644 pkgs/tools/text/sgml/openjade/msggen.patch diff --git a/pkgs/tools/text/sgml/openjade/default.nix b/pkgs/tools/text/sgml/openjade/default.nix index a2920345afa..3427f62f15b 100644 --- a/pkgs/tools/text/sgml/openjade/default.nix +++ b/pkgs/tools/text/sgml/openjade/default.nix @@ -8,6 +8,8 @@ stdenv.mkDerivation rec { sha256 = "1l92sfvx1f0wmkbvzv1385y1gb3hh010xksi1iyviyclrjb7jb8x"; }; + patches = [ ./msggen.patch ]; + buildInputs = [ opensp perl ]; configureFlags = [ diff --git a/pkgs/tools/text/sgml/openjade/msggen.patch b/pkgs/tools/text/sgml/openjade/msggen.patch new file mode 100644 index 00000000000..d59573fa49c --- /dev/null +++ b/pkgs/tools/text/sgml/openjade/msggen.patch @@ -0,0 +1,34 @@ +http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/app-text/openjade/files/openjade-1.3.2-msggen.pl.patch?revision=1.2 + +Use Getopt::Std in place of getopts.pl. +https://bugs.gentoo.org/show_bug.cgi?id=420083 + +--- a/msggen.pl ++++ b/msggen.pl +@@ -4,6 +4,7 @@ + # See the file COPYING for copying permission. + + use POSIX; ++use Getopt::Std; + + # Package and version. + $package = 'openjade'; +@@ -18,8 +19,7 @@ + undef $opt_l; + undef $opt_p; + undef $opt_t; +-do 'getopts.pl'; +-&Getopts('l:p:t:'); ++getopts('l:p:t:'); + $module = $opt_l; + $pot_file = $opt_p; + +@@ -72,7 +72,7 @@ + else { + $field[0] =~ /^[IWQXE][0-9]$/ || &error("invalid first field");; + $type[$num] = substr($field[0], 0, 1); +- $argc = int(substr($field[0], 1, 1)); ++ $argc = substr($field[0], 1, 1); + } + $nargs[$num] = $argc; + $field[1] =~ /^[a-zA-Z_][a-zA-Z0-9_]+$/ || &error("invalid tag"); diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d77a615abae..6bcb5a7a9bf 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1712,9 +1712,7 @@ let opendylan_bin = callPackage ../development/compilers/opendylan/bin.nix { }; - openjade = callPackage ../tools/text/sgml/openjade { - perl = perl510; - }; + openjade = callPackage ../tools/text/sgml/openjade { }; openobex = callPackage ../tools/bluetooth/openobex { }; -- GitLab From 36a00a0f93eeb4610a65d12842df899259444825 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 21 Aug 2014 16:47:24 +0200 Subject: [PATCH 058/843] perl-5.10: Remove --- .../interpreters/perl/5.10/default.nix | 62 ------ .../interpreters/perl/5.10/no-sys-dirs.patch | 201 ------------------ .../interpreters/perl/5.10/setup-hook.sh | 5 - pkgs/top-level/all-packages.nix | 10 - 4 files changed, 278 deletions(-) delete mode 100644 pkgs/development/interpreters/perl/5.10/default.nix delete mode 100644 pkgs/development/interpreters/perl/5.10/no-sys-dirs.patch delete mode 100644 pkgs/development/interpreters/perl/5.10/setup-hook.sh diff --git a/pkgs/development/interpreters/perl/5.10/default.nix b/pkgs/development/interpreters/perl/5.10/default.nix deleted file mode 100644 index 6af35e275c8..00000000000 --- a/pkgs/development/interpreters/perl/5.10/default.nix +++ /dev/null @@ -1,62 +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.10.1"; - - src = fetchurl { - url = "mirror://cpan/src/${name}.tar.gz"; - sha256 = "0dagnhjgmslfx1jawz986nvc3jh1klk7mn2l8djdca1b9gm2czyb"; - }; - - patches = - [ # Do not look in /usr etc. for dependencies. - ./no-sys-dirs.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 lib/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.10/no-sys-dirs.patch b/pkgs/development/interpreters/perl/5.10/no-sys-dirs.patch deleted file mode 100644 index 29edf68bb64..00000000000 --- a/pkgs/development/interpreters/perl/5.10/no-sys-dirs.patch +++ /dev/null @@ -1,201 +0,0 @@ -diff -rc -x '*~' perl-5.10.1-orig/Configure perl-5.10.1/Configure -*** perl-5.10.1-orig/Configure 2009-08-18 21:03:53.000000000 +0200 ---- perl-5.10.1/Configure 2010-01-26 19:08:32.933792254 +0100 -*************** -*** 103,117 **** - 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" - - for p in $paths - do ---- 103,109 ---- - fi - - : Proper PATH setting -! paths='' - - for p in $paths - do -*************** -*** 1301,1317 **** - archname='' - libnames='' - : change the next line if compiling for Xenix/286 on Xenix/386 -! xlibpth='/usr/lib/386 /lib/386' - : 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" - - : 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" - - : Private path used by Configure to find libraries. Its value - : is prepended to libpth. This variable takes care of special ---- 1293,1304 ---- - archname='' - libnames='' - : change the next line if compiling for Xenix/286 on Xenix/386 -! xlibpth='' - : Possible local library directories to search. -! loclibpth="" - - : general looking path for locating libraries -! glibpth="" - - : Private path used by Configure to find libraries. Its value - : is prepended to libpth. This variable takes care of special -*************** -*** 1329,1336 **** - - : 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" - : - : no include file wanted by default - inclwanted='' ---- 1316,1322 ---- - - : Possible local include directories to search. - : Set locincpth to "" in a hint file to defeat local include searches. -! locincpth="" - : - : no include file wanted by default - inclwanted='' -*************** -*** 1358,1365 **** - 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 - ---- 1344,1349 ---- -*************** -*** 2366,2372 **** - 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 ---- 2350,2355 ---- -*************** -*** 8361,8373 **** - 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` - ;; - esac - if $test -d "$sysman"; then ---- 8344,8351 ---- - echo " " - case "$sysman" in - '') -! syspath='' -! sysman='' - ;; - esac - if $test -d "$sysman"; then -*************** -*** 19476,19484 **** - case "$full_ar" in - '') full_ar=$ar ;; - esac - - : Store the full pathname to the sed program for use in the C program -! full_sed=$sed - - : see what type gids are declared as in the kernel - echo " " ---- 19454,19463 ---- - 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 - - : see what type gids are declared as in the kernel - echo " " -diff -rc -x '*~' perl-5.10.1-orig/ext/Errno/Errno_pm.PL perl-5.10.1/ext/Errno/Errno_pm.PL -*** perl-5.10.1-orig/ext/Errno/Errno_pm.PL 2009-06-27 18:09:45.000000000 +0200 ---- perl-5.10.1/ext/Errno/Errno_pm.PL 2010-01-26 18:08:09.552792021 +0100 -*************** -*** 144,154 **** - 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 -! ) { - # Some Linuxes have weird errno.hs which generate - # no #file or #line directives - my $linux_errno_h = -e '/usr/include/errno.h' ? ---- 144,150 ---- - if ($dep =~ /(\S+errno\.h)/) { - $file{$1} = 1; - } -! } 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 -rc -x '*~' perl-5.10.1-orig/hints/freebsd.sh perl-5.10.1/hints/freebsd.sh -*** perl-5.10.1-orig/hints/freebsd.sh 2009-02-12 23:58:12.000000000 +0100 ---- perl-5.10.1/hints/freebsd.sh 2010-01-26 18:30:01.181854620 +0100 -*************** -*** 118,130 **** - 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" - fi - lddlflags='-Bshareable' - else -! libpth="/usr/lib /usr/local/lib" -! glibpth="/usr/lib /usr/local/lib" - ldflags="-Wl,-E " - lddlflags="-shared " - fi ---- 118,130 ---- - objformat=`/usr/bin/objformat` - if [ x$objformat = xaout ]; then - if [ -e /usr/lib/aout ]; then -! libpth="" -! glibpth="" - fi - lddlflags='-Bshareable' - else -! libpth="" -! glibpth="" - ldflags="-Wl,-E " - lddlflags="-shared " - fi diff --git a/pkgs/development/interpreters/perl/5.10/setup-hook.sh b/pkgs/development/interpreters/perl/5.10/setup-hook.sh deleted file mode 100644 index 6a144a7f780..00000000000 --- a/pkgs/development/interpreters/perl/5.10/setup-hook.sh +++ /dev/null @@ -1,5 +0,0 @@ -addPerlLibPath () { - addToSearchPath PERL5LIB $1/lib/perl5/site_perl -} - -envHooks=(${envHooks[@]} addPerlLibPath) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6bcb5a7a9bf..2a50c2a8627 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3542,8 +3542,6 @@ let impureLibcPath = if stdenv.isLinux then null else "/usr"; }; - perl510 = callPackage ../development/interpreters/perl/5.10 { }; - perl514 = callPackage ../development/interpreters/perl/5.14 { }; perl516 = callPackage ../development/interpreters/perl/5.16 { @@ -6560,14 +6558,6 @@ let overrides = (config.perlPackageOverrides or (p: {})) pkgs; }); - perl510Packages = import ./perl-packages.nix { - pkgs = pkgs // { - perl = perl510; - buildPerlPackage = import ../development/perl-modules/generic perl510; - }; - overrides = (config.perl510PackageOverrides or (p: {})) pkgs; - }; - perl514Packages = import ./perl-packages.nix { pkgs = pkgs // { perl = perl514; -- GitLab From 0c781b3d8f988146ea289bc932daf538c1a8d05a Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 21 Aug 2014 16:49:20 +0200 Subject: [PATCH 059/843] perl-5.8: Remove --- .../interpreters/perl/5.8/default.nix | 67 ------- .../interpreters/perl/5.8/gcc-4.2.patch | 10 -- .../interpreters/perl/5.8/no-sys-dirs.patch | 164 ------------------ .../interpreters/perl/5.8/setup-hook.sh | 5 - pkgs/top-level/all-packages.nix | 4 - 5 files changed, 250 deletions(-) delete mode 100644 pkgs/development/interpreters/perl/5.8/default.nix delete mode 100644 pkgs/development/interpreters/perl/5.8/gcc-4.2.patch delete mode 100644 pkgs/development/interpreters/perl/5.8/no-sys-dirs.patch delete mode 100644 pkgs/development/interpreters/perl/5.8/setup-hook.sh diff --git a/pkgs/development/interpreters/perl/5.8/default.nix b/pkgs/development/interpreters/perl/5.8/default.nix deleted file mode 100644 index b23b95f72b5..00000000000 --- a/pkgs/development/interpreters/perl/5.8/default.nix +++ /dev/null @@ -1,67 +0,0 @@ -{ stdenv, fetchurl -, impureLibcPath ? null -}: - -stdenv.mkDerivation { - name = "perl-5.8.8"; - - phases = "phase"; - phase = - '' -source $stdenv/setup - -if test "$NIX_ENFORCE_PURITY" = "1"; then - GLIBC=${if impureLibcPath == null then "$(cat $NIX_GCC/nix-support/orig-libc)" else impureLibcPath} - extraflags="-Dlocincpth=$GLIBC/include -Dloclibpth=$GLIBC/lib" -fi - -configureScript=./Configure -configureFlags="-de -Dcc=gcc -Dprefix=$out -Uinstallusrbinperl $extraflags" -dontAddPrefix=1 - -preBuild() { - # Make Cwd work on NixOS (where we don't have a /bin/pwd). - substituteInPlace lib/Cwd.pm --replace "'/bin/pwd'" "'$(type -tP pwd)'" -} - -postInstall() { - mkdir -p "$out/nix-support" - cp $setupHook $out/nix-support/setup-hook -} - -unset phases -genericBuild - - ''; - - src = fetchurl { - url = mirror://cpan/src/perl-5.8.8.tar.bz2; - sha256 = "1j8vzc6lva49mwdxkzhvm78dkxyprqs4n4057amqvsh4kh6i92l1"; - }; - - patches = [ - # This patch does the following: - # 1) Do use the PATH environment variable to find the `pwd' command. - # By default, Perl will only look for it in /lib and /usr/lib. - # !!! what are the security implications of this? - # 2) Force the use of , not /usr/include/errno.h, on Linux - # systems. (This actually appears to be due to a bug in Perl.) - ./no-sys-dirs.patch - - # Patch to make Perl 5.8.8 build with GCC 4.2. Taken from - # http://www.nntp.perl.org/group/perl.perl5.porters/2006/11/msg117738.html - ./gcc-4.2.patch - - # Fix for "SysV.xs:7:25: error: asm/page.h: No such file or - # directory" on recent kernel headers. From - # http://bugs.gentoo.org/show_bug.cgi?id=168312. - (fetchurl { - url = http://bugs.gentoo.org/attachment.cgi?id=111427; - sha256 = "017pj0nbqb7kwj3cs727c2l2d8c45l9cwxf71slgb807kn3ppgmn"; - }) - ]; - - setupHook = ./setup-hook.sh; - - passthru.libPrefix = "lib/perl5/site_perl"; -} diff --git a/pkgs/development/interpreters/perl/5.8/gcc-4.2.patch b/pkgs/development/interpreters/perl/5.8/gcc-4.2.patch deleted file mode 100644 index 679a7abde3b..00000000000 --- a/pkgs/development/interpreters/perl/5.8/gcc-4.2.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- perl-5.8.x/makedepend.SH 2006-06-13 15:31:22.000000000 -0400 -+++ perl-5.8.x-andy/makedepend.SH 2006-07-25 14:45:11.000000000 -0400 -@@ -167,6 +167,7 @@ - -e '/^#.*/d' \ - -e '/^#.*/d' \ - -e '/^#.*/d' \ -+ -e '/^#.*/d' \ - -e '/^#.*"-"/d' \ - -e '/: file path prefix .* never used$/d' \ - -e 's#\.[0-9][0-9]*\.c#'"$file.c#" \ diff --git a/pkgs/development/interpreters/perl/5.8/no-sys-dirs.patch b/pkgs/development/interpreters/perl/5.8/no-sys-dirs.patch deleted file mode 100644 index 48588d5a429..00000000000 --- a/pkgs/development/interpreters/perl/5.8/no-sys-dirs.patch +++ /dev/null @@ -1,164 +0,0 @@ -diff -rc perl-orig/Configure perl-5.8.6/Configure -*** perl-orig/Configure 2004-09-10 08:25:52.000000000 +0200 ---- perl-5.8.6/Configure 2005-03-10 12:53:28.000000000 +0100 -*************** -*** 86,100 **** - 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" - - for p in $paths - do ---- 86,92 ---- - fi - - : Proper PATH setting -! paths='' - - for p in $paths - do -*************** -*** 1221,1228 **** - 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" - : - : no include file wanted by default - inclwanted='' ---- 1213,1219 ---- - archname='' - : Possible local include directories to search. - : Set locincpth to "" in a hint file to defeat local include searches. -! locincpth="" - : - : no include file wanted by default - inclwanted='' -*************** -*** 1230,1245 **** - groupstype='' - libnames='' - : change the next line if compiling for Xenix/286 on Xenix/386 -! xlibpth='/usr/lib/386 /lib/386' - : 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" - - : 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" - - : Private path used by Configure to find libraries. Its value - : is prepended to libpth. This variable takes care of special ---- 1221,1232 ---- - groupstype='' - libnames='' - : change the next line if compiling for Xenix/286 on Xenix/386 -! xlibpth='' - : Possible local library directories to search. -! loclibpth="" - - : general looking path for locating libraries -! glibpth="$xlibpth" - - : Private path used by Configure to find libraries. Its value - : is prepended to libpth. This variable takes care of special -*************** -*** 1270,1277 **** - 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 - ---- 1257,1262 ---- -*************** -*** 2267,2273 **** - 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 ---- 2252,2257 ---- -*************** -*** 7910,7922 **** - 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` - ;; - esac - if $test -d "$sysman"; then ---- 7894,7901 ---- - echo " " - case "$sysman" in - '') -! syspath='' -! sysman='' - ;; - esac - if $test -d "$sysman"; then -*************** -*** 17949,17957 **** - case "$full_ar" in - '') full_ar=$ar ;; - esac - - : Store the full pathname to the sed program for use in the C program -! full_sed=$sed - - : see what type gids are declared as in the kernel - echo " " ---- 17928,17937 ---- - 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 - - : see what type gids are declared as in the kernel - echo " " -diff -rc perl-orig/ext/Errno/Errno_pm.PL perl-5.8.6/ext/Errno/Errno_pm.PL -*** perl-orig/ext/Errno/Errno_pm.PL 2004-11-01 15:31:59.000000000 +0100 ---- perl-5.8.6/ext/Errno/Errno_pm.PL 2005-03-10 12:52:31.000000000 +0100 -*************** -*** 105,111 **** - # Watch out for cross compiling for EPOC (usually done on linux) - $file{'/usr/local/epocemx/epocsdk/include/libc/sys/errno.h'} = 1; - } elsif ($^O eq 'linux' && -! $Config{gccversion} ne '' # might be using, say, Intel's icc - ) { - # Some Linuxes have weird errno.hs which generate - # no #file or #line directives ---- 105,111 ---- - # Watch out for cross compiling for EPOC (usually done on linux) - $file{'/usr/local/epocemx/epocsdk/include/libc/sys/errno.h'} = 1; - } elsif ($^O eq 'linux' && -! $Config{gccversion} eq '' # might be using, say, Intel's icc - ) { - # Some Linuxes have weird errno.hs which generate - # no #file or #line directives diff --git a/pkgs/development/interpreters/perl/5.8/setup-hook.sh b/pkgs/development/interpreters/perl/5.8/setup-hook.sh deleted file mode 100644 index d61ec82f4f0..00000000000 --- a/pkgs/development/interpreters/perl/5.8/setup-hook.sh +++ /dev/null @@ -1,5 +0,0 @@ -addPerlLibPath () { - addToSearchPath PERL5LIB $1/lib/site_perl -} - -envHooks=(${envHooks[@]} addPerlLibPath) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2a50c2a8627..751d4c0463f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3538,10 +3538,6 @@ let ocropus = callPackage ../applications/misc/ocropus { }; - perl58 = callPackage ../development/interpreters/perl/5.8 { - impureLibcPath = if stdenv.isLinux then null else "/usr"; - }; - perl514 = callPackage ../development/interpreters/perl/5.14 { }; perl516 = callPackage ../development/interpreters/perl/5.16 { -- GitLab From 186589fdd1d24121ccce38572a157e8bac125332 Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Thu, 21 Aug 2014 17:10:32 +0200 Subject: [PATCH 060/843] leafnode: mark as broken for ZHF --- pkgs/servers/news/leafnode/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/servers/news/leafnode/default.nix b/pkgs/servers/news/leafnode/default.nix index 56d402397ec..23f236a9a34 100644 --- a/pkgs/servers/news/leafnode/default.nix +++ b/pkgs/servers/news/leafnode/default.nix @@ -24,5 +24,6 @@ stdenv.mkDerivation rec { description = "Leafnode implements a store & forward NNTP proxy"; license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.unix; + broken = true; # The user check in the configure does not work in a chroot }; } -- GitLab From dcf17d3d5d9764c84874567ad4576419a968fecf Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Thu, 21 Aug 2014 17:29:51 +0200 Subject: [PATCH 061/843] policycoreutils: fix build on i686 for ZHF --- pkgs/os-specific/linux/policycoreutils/default.nix | 6 +++++- .../linux/policycoreutils/size_format.patch | 11 +++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) create mode 100644 pkgs/os-specific/linux/policycoreutils/size_format.patch diff --git a/pkgs/os-specific/linux/policycoreutils/default.nix b/pkgs/os-specific/linux/policycoreutils/default.nix index d312e25fc2e..ef7e76824db 100644 --- a/pkgs/os-specific/linux/policycoreutils/default.nix +++ b/pkgs/os-specific/linux/policycoreutils/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { sha256 = "1lpwxr5hw3dwhlp2p7y8jcr18mvfcrclwd8c2idz3lmmb3pglk46"; }; - patchPhase = '' + preConfigure = '' substituteInPlace po/Makefile --replace /usr/bin/install install find . -type f -exec sed -i 's,/usr/bin/python,${python}/bin/python,' {} \; ''; @@ -36,6 +36,10 @@ stdenv.mkDerivation rec { makeFlags = "PREFIX=$(out) DESTDIR=$(out) LOCALEDIR=$(out)/share/locale"; + patches = [ ./size_format.patch ]; + + patchFlags = [ "-p0" ]; + meta = with stdenv.lib; { description = "SELinux policy core utilities"; license = licenses.gpl2; diff --git a/pkgs/os-specific/linux/policycoreutils/size_format.patch b/pkgs/os-specific/linux/policycoreutils/size_format.patch new file mode 100644 index 00000000000..04432098547 --- /dev/null +++ b/pkgs/os-specific/linux/policycoreutils/size_format.patch @@ -0,0 +1,11 @@ +--- setfiles/restore.c.orig 2014-08-21 17:26:00.200788259 +0200 ++++ setfiles/restore.c 2014-08-21 17:26:04.728888118 +0200 +@@ -118,7 +118,7 @@ + r_opts->count++; + if (r_opts->count % STAR_COUNT == 0) { + if (r_opts->progress == 1) { +- fprintf(stdout, "\r%luk", (size_t) r_opts->count / STAR_COUNT ); ++ fprintf(stdout, "\r%zuk", (size_t) r_opts->count / STAR_COUNT ); + } else { + if (r_opts->nfile > 0) { + progress = (r_opts->count < r_opts->nfile) ? (100.0 * r_opts->count / r_opts->nfile) : 100; -- GitLab From 8e8adfc11000a6f471fd4e7ff26a1770a9c369d4 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 21 Aug 2014 17:53:36 +0200 Subject: [PATCH 062/843] boehm-gc: Update to 7.2f --- pkgs/development/libraries/boehm-gc/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/boehm-gc/default.nix b/pkgs/development/libraries/boehm-gc/default.nix index 3b2670d988a..cc047da2758 100644 --- a/pkgs/development/libraries/boehm-gc/default.nix +++ b/pkgs/development/libraries/boehm-gc/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "boehm-gc-7.2d"; + name = "boehm-gc-7.2f"; src = fetchurl { - url = http://www.hpl.hp.com/personal/Hans_Boehm/gc/gc_source/gc-7.2d.tar.gz; - sha256 = "0phwa5driahnpn79zqff14w9yc8sn3599cxz91m78hqdcpl0mznr"; + url = http://www.hboehm.info/gc/gc_source/gc-7.2f.tar.gz; + sha256 = "119x7p1cqw40mpwj80xfq879l9m1dkc7vbc1f3bz3kvkf8bf6p16"; }; configureFlags = "--enable-cplusplus"; -- GitLab From 07e130108513db4aaa24a89ff0a225d758046305 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 21 Aug 2014 18:04:56 +0200 Subject: [PATCH 063/843] nixUnstable: Update to 1.8pre3766_809ca33 --- pkgs/tools/package-management/nix/unstable.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/package-management/nix/unstable.nix b/pkgs/tools/package-management/nix/unstable.nix index 731965d9a7c..bba53b0002f 100644 --- a/pkgs/tools/package-management/nix/unstable.nix +++ b/pkgs/tools/package-management/nix/unstable.nix @@ -5,11 +5,11 @@ }: stdenv.mkDerivation rec { - name = "nix-1.8pre3748_02843ba"; + name = "nix-1.8pre3766_809ca33"; src = fetchurl { - url = "http://hydra.nixos.org/build/13483092/download/5/${name}.tar.xz"; - sha256 = "074k5spq07bz6ljbiiwfzsnnnpqlwssigxirkyrcamcyjmig4v34"; + url = "http://hydra.nixos.org/build/13584170/download/5/${name}.tar.xz"; + sha256 = "e6d91e73aabf8e8912f9701bf87b66089c197c5b8c8fbcc1707b888c88b96dfd"; }; nativeBuildInputs = [ perl pkgconfig ]; -- GitLab From fc152248cea140504871893c82acc8f03c327c0a Mon Sep 17 00:00:00 2001 From: Sven Keidel Date: Tue, 19 Aug 2014 23:35:33 +0200 Subject: [PATCH 064/843] cool-old-term: add 0.9 (close #3685, #3575) --- .../misc/cool-old-term/default.nix | 53 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 55 insertions(+) create mode 100644 pkgs/applications/misc/cool-old-term/default.nix diff --git a/pkgs/applications/misc/cool-old-term/default.nix b/pkgs/applications/misc/cool-old-term/default.nix new file mode 100644 index 00000000000..76d78f00402 --- /dev/null +++ b/pkgs/applications/misc/cool-old-term/default.nix @@ -0,0 +1,53 @@ +{ stdenv, fetchFromGitHub, qt53 }: + +stdenv.mkDerivation rec { + version = "0.9"; + name = "cool-old-term-${version}"; + + src = fetchFromGitHub { + owner = "Swordifish90"; + repo = "cool-old-term"; + rev = "2494bc05228290545df8c59c05624a4b903e9068"; + sha256 = "8462f3eded7b2219acc143258544b0dfac32d81e10cac61ff14276d426704c93"; + }; + + buildInputs = [ qt53 ]; + + buildPhase = '' + pushd ./konsole-qml-plugin + qmake konsole-qml-plugin.pro PREFIX=$out + make + popd + ''; + + installPhase = '' + pushd ./konsole-qml-plugin + make install + popd + + install -d $out/bin $out/lib/cool-old-term $out/share/cool-old-term + cp -a ./imports $out/lib/cool-old-term/ + cp -a ./app $out/share/cool-old-term/ + + cat > $out/bin/cool-old-term < Date: Thu, 21 Aug 2014 19:40:13 +0200 Subject: [PATCH 065/843] mit-scheme: update from 9.1.1 to 9.2 and remove broken tag closes #3705 --- .../compilers/mit-scheme/default.nix | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/pkgs/development/compilers/mit-scheme/default.nix b/pkgs/development/compilers/mit-scheme/default.nix index c025fc8073b..b10aaedb483 100644 --- a/pkgs/development/compilers/mit-scheme/default.nix +++ b/pkgs/development/compilers/mit-scheme/default.nix @@ -1,7 +1,7 @@ { fetchurl, stdenv, makeWrapper, gnum4, texinfo, texLive, automake }: let - version = "9.1.1"; + version = "9.2"; bootstrapFromC = ! (stdenv.isi686 || stdenv.isx86_64); arch = if stdenv.isi686 then "-i386" @@ -19,14 +19,14 @@ stdenv.mkDerivation { if stdenv.isi686 then fetchurl { url = "mirror://gnu/mit-scheme/stable.pkg/${version}/mit-scheme-${version}-i386.tar.gz"; - sha256 = "0vi760fy550d9db538m0vzbq1mpdncvw9g8bk4lswk0kcdira55z"; + sha256 = "1fmlpnhf5a75db93phajh4ysbdgrgl72v45lk3kznriprl0a7jc6"; } else if stdenv.isx86_64 then fetchurl { url = "mirror://gnu/mit-scheme/stable.pkg/${version}/mit-scheme-${version}-x86-64.tar.gz"; - sha256 = "1wcxm9hyfc53myvlcn93fyqrnnn4scwkknl9hkbp1cphc6mp291x"; + sha256 = "1skzxxhr0iq96bf0j5m7mvf3i4sppfyfa6gpqn34mwgkw1fx8274"; } else fetchurl { url = "mirror://gnu/mit-scheme/stable.pkg/${version}/mit-scheme-c-${version}.tar.gz"; - sha256 = "0pclakzwxbqgy6wqwvs6ml62wgby8ba8xzmwzdwhx1v8wv05yw1j"; + sha256 = "0w5ib5vsidihb4hb6fma3sp596ykr8izagm57axvgd6lqzwicsjg"; }; configurePhase = @@ -65,7 +65,7 @@ stdenv.mkDerivation { # XXX: The `check' target doesn't exist. doCheck = false; - meta = { + meta = with stdenv.lib; { description = "MIT/GNU Scheme, a native code Scheme compiler"; longDescription = @@ -78,14 +78,12 @@ stdenv.mkDerivation { homepage = http://www.gnu.org/software/mit-scheme/; - license = stdenv.lib.licenses.gpl2Plus; + license = licenses.gpl2Plus; - maintainers = [ stdenv.lib.maintainers.ludo ]; + maintainers = with maintainers; [ ludo ]; # Build fails on Cygwin and Darwin: # . - platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.freebsd; - - broken = true; + platforms = platforms.gnu ++ platforms.freebsd; }; } -- GitLab From d2539c6ff59fc3716637f11e475c6011462b264b Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Thu, 21 Aug 2014 22:09:39 +0400 Subject: [PATCH 066/843] Adding Julia 0.3.0: some progress, but doesn't work yet --- pkgs/development/compilers/julia/0.3.0.nix | 143 ++++++++++++++++++ .../science/math/liblapack/3.5.0.nix | 48 ++++++ pkgs/top-level/all-packages.nix | 10 ++ 3 files changed, 201 insertions(+) create mode 100644 pkgs/development/compilers/julia/0.3.0.nix create mode 100644 pkgs/development/libraries/science/math/liblapack/3.5.0.nix diff --git a/pkgs/development/compilers/julia/0.3.0.nix b/pkgs/development/compilers/julia/0.3.0.nix new file mode 100644 index 00000000000..4eb64aea534 --- /dev/null +++ b/pkgs/development/compilers/julia/0.3.0.nix @@ -0,0 +1,143 @@ +{ stdenv, fetchgit, gfortran, perl, m4, llvm, gmp, pcre, zlib + , readline, fftwSinglePrec, fftw, libunwind, suitesparse, glpk, fetchurl + , ncurses, libunistring, lighttpd, patchelf, openblas, liblapack + , tcl, tk, xproto, libX11, git, mpfr, which + } : +let + realGcc = stdenv.gcc.gcc; +in +stdenv.mkDerivation rec { + pname = "julia"; + version = "0.3.0"; + name = "${pname}-${version}"; + + dsfmt_ver = "2.2"; + grisu_ver = "1.1.1"; + openblas_ver = "v0.2.10"; + lapack_ver = "3.5.0"; + arpack_ver = "3.1.5"; + lighttpd_ver = "1.4.29"; + patchelf_ver = "0.6"; + pcre_ver = "8.31"; + utf8proc_ver = "1.1.6"; + + dsfmt_src = fetchurl { + url = "http://www.math.sci.hiroshima-u.ac.jp/~m-mat/MT/SFMT/dSFMT-src-${dsfmt_ver}.tar.gz"; + name = "dsfmt-${dsfmt_ver}.tar.gz"; + sha256 = "bc3947a9b2253a869fcbab8ff395416cb12958be9dba10793db2cd7e37b26899"; + }; + grisu_src = fetchurl { + url = "http://double-conversion.googlecode.com/files/double-conversion-${grisu_ver}.tar.gz"; + sha256 = "e1cabb73fd69e74f145aea91100cde483aef8b79dc730fcda0a34466730d4d1d"; + }; + openblas_src = fetchurl { + url = "https://github.com/xianyi/OpenBLAS/tarball/${openblas_ver}"; + name = "openblas-${openblas_ver}.tar.gz"; + sha256 = "19ffec70f9678f5c159feadc036ca47720681b782910fbaa95aa3867e7e86d8e"; + }; + arpack_src = fetchurl rec { + url = "http://forge.scilab.org/index.php/p/arpack-ng/downloads/get/arpack-ng_${arpack_ver}.tar.gz"; + sha256 = "05fmg4m0yri47rzgsl2mnr1qbzrs7qyd557p3v9wwxxw0rwcwsd2"; + }; + lapack_src = fetchurl { + url = "http://www.netlib.org/lapack/lapack-${lapack_ver}.tgz"; + name = "lapack-${lapack_ver}.tgz"; + sha256 = "93b910f94f6091a2e71b59809c4db4a14655db527cfc5821ade2e8c8ab75380f"; + }; + lighttpd_src = fetchurl { + url = "http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-${lighttpd_ver}.tar.gz"; + sha256 = "ff9f4de3901d03bb285634c5b149191223d17f1c269a16c863bac44238119c85"; + }; + patchelf_src = fetchurl { + url = "http://hydra.nixos.org/build/1524660/download/2/patchelf-${patchelf_ver}.tar.bz2"; + sha256 = "00bw29vdsscsili65wcb5ay0gvg1w0ljd00sb5xc6br8bylpyzpw"; + }; + pcre_src = fetchurl { + url = "ftp://ftp.csx.cam.ac.uk/pub/software/programming/pcre/pcre-${pcre_ver}.tar.bz2"; + sha256 = "0g4c0z4h30v8g8qg02zcbv7n67j5kz0ri9cfhgkpwg276ljs0y2p"; + }; + utf8proc_src = fetchurl { + url = "http://www.public-software-group.org/pub/projects/utf8proc/v${utf8proc_ver}/utf8proc-v${utf8proc_ver}.tar.gz"; + sha256 = "1rwr84pw92ajjlbcxq0da7yxgg3ijngmrj7vhh2qzsr2h2kqzp7y"; + }; + + src = fetchgit { + url = "git://github.com/JuliaLang/julia.git"; + rev = "refs/tags/v0.3.0"; + sha256 = "1h7icqjiccw26f81r1zwsv31kk6yhavn038h7jp63iv5sdzh5r8i"; + }; + + buildInputs = [ gfortran perl m4 gmp pcre llvm readline zlib + fftw fftwSinglePrec libunwind suitesparse glpk ncurses libunistring patchelf + openblas liblapack tcl tk xproto libX11 git mpfr which + ]; + + configurePhase = '' + for i in GMP LLVM PCRE LAPACK OPENBLAS BLAS READLINE FFTW LIBUNWIND SUITESPARSE GLPK LIGHTTPD ZLIB MPFR; + do + makeFlags="$makeFlags USE_SYSTEM_$i=1 " + done + + copy_kill_hash(){ + cp "$1" "$2/$(basename "$1" | sed -e 's/^[a-z0-9]*-//')" + } + + for i in "${grisu_src}" "${dsfmt_src}" "${arpack_src}" "${patchelf_src}" "${pcre_src}" "${utf8proc_src}"; do + copy_kill_hash "$i" deps + done + + ${if realGcc ==null then "" else + ''export NIX_LDFLAGS="$NIX_LDFLAGS -L${realGcc}/lib -L${realGcc}/lib64 -lpcre -llapack -lm -lfftw3f -lfftw3 -lglpk -lunistring -lz -lgmp -lmpfr"''} + export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -fPIC " + + export LDFLAGS="-L${suitesparse}/lib -L$out/lib/julia -Wl,-rpath,$out/lib/julia" + + export GLPK_PREFIX="${glpk}/include" + + mkdir -p "$out/lib" + sed -e "s@/usr/local/lib@$out/lib@g" -i deps/Makefile + sed -e "s@/usr/lib@$out/lib@g" -i deps/Makefile + + export makeFlags="$makeFlags PREFIX=$out SHELL=${stdenv.shell} prefix=$out" + + export dontPatchELF=1 + + export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$PWD/usr/lib:$PWD/usr/lib/julia" + + patchShebangs . contrib + ''; + + preBuild = '' + mkdir -p usr/lib + + echo "$out" + mkdir -p "$out/lib" + ( + cd "$(mktemp -d)" + for i in "${suitesparse}"/lib/lib*.a; do + ar -x $i + done + gcc *.o --shared -o "$out/lib/libsuitesparse.so" + ) + cp "$out/lib/libsuitesparse.so" usr/lib + for i in umfpack cholmod amd camd colamd spqr; do + ln -s libsuitesparse.so "$out"/lib/lib$i.so; + ln -s libsuitesparse.so "usr"/lib/lib$i.so; + done + ''; + + enableParallelBuilding = false; + + postInstall = '' + rm -f "$out"/lib/julia/sys.{so,dylib,dll} + ''; + + meta = { + description = "High-level performance-oriented dynamical language for technical computing"; + homepage = "http://julialang.org/"; + license = stdenv.lib.licenses.mit; + maintainers = [ stdenv.lib.maintainers.raskin ]; + platforms = with stdenv.lib.platforms; linux; + broken = true; + }; +} diff --git a/pkgs/development/libraries/science/math/liblapack/3.5.0.nix b/pkgs/development/libraries/science/math/liblapack/3.5.0.nix new file mode 100644 index 00000000000..b2167449a2f --- /dev/null +++ b/pkgs/development/libraries/science/math/liblapack/3.5.0.nix @@ -0,0 +1,48 @@ +{ stdenv, fetchurl, gfortran, atlas, cmake, python, shared ? false }: +let + atlasMaybeShared = atlas.override { inherit shared; }; + usedLibExtension = if shared then ".so" else ".a"; +in +stdenv.mkDerivation rec { + version = "3.5.0"; + name = "liblapack-${version}"; + src = fetchurl { + url = "http://www.netlib.org/lapack/lapack-${version}.tgz"; + sha256 = "0lk3f97i9imqascnlf6wr5mjpyxqcdj73pgj97dj2mgvyg9z1n4s"; + }; + + propagatedBuildInputs = [ atlasMaybeShared ]; + buildInputs = [ gfortran cmake ]; + nativeBuildInputs = [ python ]; + + cmakeFlags = [ + "-DUSE_OPTIMIZED_BLAS=ON" + "-DBLAS_ATLAS_f77blas_LIBRARY=${atlasMaybeShared}/lib/libf77blas${usedLibExtension}" + "-DBLAS_ATLAS_atlas_LIBRARY=${atlasMaybeShared}/lib/libatlas${usedLibExtension}" + "-DCMAKE_Fortran_FLAGS=-fPIC" + ] + ++ (stdenv.lib.optional shared "-DBUILD_SHARED_LIBS=ON") + ; + + doCheck = ! shared; + + checkPhase = " + sed -i 's,^#!.*,#!${python}/bin/python,' lapack_testing.py + ctest + "; + + enableParallelBuilding = true; + + passthru = { + blas = atlas; + }; + + meta = { + description = "Linear Algebra PACKage"; + homepage = "http://www.netlib.org/lapack/"; + license = "revised-BSD"; + + platforms = stdenv.lib.platforms.all; + maintainers = [ stdenv.lib.maintainers.simons ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f89d95cbc38..a934a710638 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3099,6 +3099,15 @@ let liblapack = liblapack.override {shared = true;}; llvm = llvm_33; }; + julia030 = let + liblapack = liblapack_3_5_0.override {shared = true;}; + in callPackage ../development/compilers/julia/0.3.0.nix { + inherit liblapack; + suitesparse = suitesparse.override { + inherit liblapack; + }; + llvm = llvm_34; + }; julia = julia021; lazarus = builderDefsPackage (import ../development/compilers/fpc/lazarus.nix) { @@ -10823,6 +10832,7 @@ let jags = callPackage ../applications/science/math/jags { }; liblapack = callPackage ../development/libraries/science/math/liblapack { }; + liblapack_3_5_0 = callPackage ../development/libraries/science/math/liblapack/3.5.0.nix { }; liblbfgs = callPackage ../development/libraries/science/math/liblbfgs { }; -- GitLab From 380ba438ee17ccea1db1247f04583597241c7f4b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Thu, 21 Aug 2014 20:28:25 +0200 Subject: [PATCH 067/843] libtar: fix CVE-2013-4420 by Debian patches CC maintainer @bjornfor. --- pkgs/development/libraries/libtar/default.nix | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libtar/default.nix b/pkgs/development/libraries/libtar/default.nix index 7a8dfa7a622..212a3a23939 100644 --- a/pkgs/development/libraries/libtar/default.nix +++ b/pkgs/development/libraries/libtar/default.nix @@ -1,9 +1,9 @@ -{ stdenv, fetchgit, autoreconfHook }: +{ stdenv, fetchgit, fetchpatch, autoreconfHook }: stdenv.mkDerivation rec { version = "1.2.20"; name = "libtar-${version}"; - + # Maintenance repo for libtar (Arch Linux uses this) src = fetchgit { url = "git://repo.or.cz/libtar.git"; @@ -11,6 +11,19 @@ stdenv.mkDerivation rec { sha256 = "1pjsqnqjaqgkzf1j8m6y5h76bwprffsjjj6gk8rh2fjsha14rqn9"; }; + patches = let + fp = name: sha256: + fetchpatch { + url = "http://sources.debian.net/data/main/libt/libtar/1.2.20-4/debian/patches/${name}.patch"; + inherit sha256; + }; + in [ + (fp "no_static_buffers" "0yv90bhvqjj0v650gzn8fbzhdhzx5z0r1lh5h9nv39wnww435bd0") + (fp "no_maxpathlen" "11riv231wpbdb1cm4nbdwdsik97wny5sxcwdgknqbp61ibk572b7") + (fp "CVE-2013-4420" "0d010190bqgr2ggy02qwxvjaymy9a22jmyfwdfh4086v876cbxpq") + (fp "th_get_size-unsigned-int" "1ravbs5yrfac98mnkrzciw9hd2fxq4dc07xl3wx8y2pv1bzkwm41") + ]; + buildInputs = [ autoreconfHook ]; meta = with stdenv.lib; { -- GitLab From 1bfaed62b3d3a38168a3b792b50b2f987f355534 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Sat, 9 Aug 2014 21:04:06 +0200 Subject: [PATCH 068/843] quassel: add quassel and quassel-client without kde integration Close #3508. --- pkgs/top-level/all-packages.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a934a710638..094e410fafe 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10708,6 +10708,11 @@ let quassel = callPackage ../applications/networking/irc/quassel { dconf = gnome3.dconf; }; + quasselWithoutKDE = (self.quassel.override { + withKDE = false; + tag = "-without-kde"; + }); + quasselDaemon = (self.quassel.override { monolithic = false; daemon = true; @@ -10720,6 +10725,11 @@ let tag = "-client"; }); + quasselClientWithoutKDE = (self.quasselClient.override { + withKDE = false; + tag = "-client-without-kde"; + }); + rekonq = callPackage ../applications/networking/browsers/rekonq { }; kwebkitpart = callPackage ../applications/networking/browsers/kwebkitpart { }; -- GitLab From 08e4d586009768e0f2a874125ac618424703b7f5 Mon Sep 17 00:00:00 2001 From: System administrator Date: Fri, 22 Aug 2014 08:47:42 +0200 Subject: [PATCH 069/843] picard: Fix acoustid-fingerprinter binary path. Signed-off-by: System administrator Merges and closes pull request #3717. Signed-off-by: aszlig --- pkgs/applications/audio/picard/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/audio/picard/default.nix b/pkgs/applications/audio/picard/default.nix index 1ce09a6dd88..07753216d3c 100644 --- a/pkgs/applications/audio/picard/default.nix +++ b/pkgs/applications/audio/picard/default.nix @@ -13,7 +13,7 @@ pythonPackages.buildPythonPackage rec { }; postPatch = let - fpr = "${acoustidFingerprinter}/bin/acoustid_fpcalc"; + fpr = "${acoustidFingerprinter}/bin/acoustid-fingerprinter"; in '' sed -ri -e 's|(TextOption.*"acoustid_fpcalc"[^"]*")[^"]*|\1${fpr}|' \ picard/ui/options/fingerprinting.py -- GitLab From 939b3548a492cea595922dd962168b271ccb697a Mon Sep 17 00:00:00 2001 From: Cray Elliott Date: Fri, 22 Aug 2014 00:13:42 -0700 Subject: [PATCH 070/843] Lens library updated to v4.4 also passes tests again, so doCheck is not needed --- .../libraries/haskell/lens/default.nix | 29 +++++++++---------- 1 file changed, 13 insertions(+), 16 deletions(-) diff --git a/pkgs/development/libraries/haskell/lens/default.nix b/pkgs/development/libraries/haskell/lens/default.nix index 655525e4d59..7a179d54f6b 100644 --- a/pkgs/development/libraries/haskell/lens/default.nix +++ b/pkgs/development/libraries/haskell/lens/default.nix @@ -1,25 +1,23 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, aeson, attoparsec, bifunctors, comonad, contravariant -, deepseq, distributive, doctest, exceptions, filepath, free -, genericDeriving, hashable, hlint, HUnit, mtl, nats, parallel -, primitive, profunctors, QuickCheck, reflection, scientific -, semigroupoids, semigroups, simpleReflect, split, tagged -, testFramework, testFrameworkHunit, testFrameworkQuickcheck2 -, testFrameworkTh, text, transformers, transformersCompat -, unorderedContainers, vector, void, zlib +{ cabal, bifunctors, comonad, contravariant, deepseq, distributive +, doctest, exceptions, filepath, free, genericDeriving, hashable +, hlint, HUnit, mtl, nats, parallel, primitive, profunctors +, QuickCheck, reflection, semigroupoids, semigroups, simpleReflect +, split, tagged, testFramework, testFrameworkHunit +, testFrameworkQuickcheck2, testFrameworkTh, text, transformers +, transformersCompat, unorderedContainers, vector, void, zlib }: cabal.mkDerivation (self: { pname = "lens"; - version = "4.3.3"; - sha256 = "0k7qslnh15xnrj86wwsp0mvz6g363ma4g0dxkmvvg4sa1bxljr1f"; + version = "4.4"; + sha256 = "06ha4px4ywfbi0n3imy2qqjq3656snsz1b0ggkwzvdzmi550sh8w"; buildDepends = [ - aeson attoparsec bifunctors comonad contravariant distributive - exceptions filepath free hashable mtl parallel primitive - profunctors reflection scientific semigroupoids semigroups split - tagged text transformers transformersCompat unorderedContainers - vector void zlib + bifunctors comonad contravariant distributive exceptions filepath + free hashable mtl parallel primitive profunctors reflection + semigroupoids semigroups split tagged text transformers + transformersCompat unorderedContainers vector void zlib ]; testDepends = [ deepseq doctest filepath genericDeriving hlint HUnit mtl nats @@ -27,7 +25,6 @@ cabal.mkDerivation (self: { testFrameworkHunit testFrameworkQuickcheck2 testFrameworkTh text transformers unorderedContainers vector ]; - doCheck = false; meta = { homepage = "http://github.com/ekmett/lens/"; description = "Lenses, Folds and Traversals"; -- GitLab From fbecc246110edc8a6d934dc9897020d9a0abe096 Mon Sep 17 00:00:00 2001 From: Cray Elliott Date: Fri, 22 Aug 2014 00:14:23 -0700 Subject: [PATCH 071/843] Add lens-aeson library, lens 4.4 split all aeson functionality to here --- .../libraries/haskell/lens-aeson/default.nix | 24 +++++++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 26 insertions(+) create mode 100644 pkgs/development/libraries/haskell/lens-aeson/default.nix diff --git a/pkgs/development/libraries/haskell/lens-aeson/default.nix b/pkgs/development/libraries/haskell/lens-aeson/default.nix new file mode 100644 index 00000000000..d19b0bf6dd7 --- /dev/null +++ b/pkgs/development/libraries/haskell/lens-aeson/default.nix @@ -0,0 +1,24 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, aeson, attoparsec, doctest, filepath, genericDeriving +, lens, scientific, semigroups, simpleReflect, text +, unorderedContainers, vector +}: + +cabal.mkDerivation (self: { + pname = "lens-aeson"; + version = "1"; + sha256 = "0zpfpba97kr92lzrmdfk08f3cl42alhx0d73w8sbbwxnnvv4489r"; + buildDepends = [ + aeson attoparsec lens scientific text unorderedContainers vector + ]; + testDepends = [ + doctest filepath genericDeriving semigroups simpleReflect + ]; + meta = { + homepage = "http://github.com/lens/lens-aeson/"; + description = "Law-abiding lenses for aeson"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index acf164d57c7..d09f8119d8d 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1459,6 +1459,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in lens = callPackage ../development/libraries/haskell/lens {}; + lensAeson = callPackage ../development/libraries/haskell/lens-aeson {}; + lensDatetime = callPackage ../development/libraries/haskell/lens-datetime {}; lensFamilyCore = callPackage ../development/libraries/haskell/lens-family-core {}; -- GitLab From b5c1cdd7136b2b074f1009c95c4645d95fc5a28e Mon Sep 17 00:00:00 2001 From: Cray Elliott Date: Fri, 22 Aug 2014 00:15:07 -0700 Subject: [PATCH 072/843] jailbreak cabal-lens so that it builds with lens v4.4 bug report submitted to cabal-lens to request upper bound bump --- pkgs/development/libraries/haskell/cabal-lenses/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/haskell/cabal-lenses/default.nix b/pkgs/development/libraries/haskell/cabal-lenses/default.nix index a4ac5164e1f..ccd23434fe0 100644 --- a/pkgs/development/libraries/haskell/cabal-lenses/default.nix +++ b/pkgs/development/libraries/haskell/cabal-lenses/default.nix @@ -7,6 +7,7 @@ cabal.mkDerivation (self: { version = "0.3"; sha256 = "13nx9cn81cx9cj7fk07akqvz4qkl49dlgb5wl5wanag6bafa6vhl"; buildDepends = [ Cabal lens unorderedContainers ]; + jailbreak = true; meta = { description = "Lenses and traversals for the Cabal library"; license = self.stdenv.lib.licenses.bsd3; -- GitLab From fec81c392f255fed231d13e9ca363632648a05c5 Mon Sep 17 00:00:00 2001 From: Aycan iRiCAN Date: Fri, 22 Aug 2014 12:38:10 +0300 Subject: [PATCH 073/843] Revert "Merge pull request #3718 from MP2E/lens_4_4_update" This reverts commit 53fab4004e171a3490842c921abd8551a73278b1, reversing changes made to 08e4d586009768e0f2a874125ac618424703b7f5. --- .../haskell/cabal-lenses/default.nix | 1 - .../libraries/haskell/lens-aeson/default.nix | 24 --------------- .../libraries/haskell/lens/default.nix | 29 ++++++++++--------- pkgs/top-level/haskell-packages.nix | 2 -- 4 files changed, 16 insertions(+), 40 deletions(-) delete mode 100644 pkgs/development/libraries/haskell/lens-aeson/default.nix diff --git a/pkgs/development/libraries/haskell/cabal-lenses/default.nix b/pkgs/development/libraries/haskell/cabal-lenses/default.nix index ccd23434fe0..a4ac5164e1f 100644 --- a/pkgs/development/libraries/haskell/cabal-lenses/default.nix +++ b/pkgs/development/libraries/haskell/cabal-lenses/default.nix @@ -7,7 +7,6 @@ cabal.mkDerivation (self: { version = "0.3"; sha256 = "13nx9cn81cx9cj7fk07akqvz4qkl49dlgb5wl5wanag6bafa6vhl"; buildDepends = [ Cabal lens unorderedContainers ]; - jailbreak = true; meta = { description = "Lenses and traversals for the Cabal library"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/lens-aeson/default.nix b/pkgs/development/libraries/haskell/lens-aeson/default.nix deleted file mode 100644 index d19b0bf6dd7..00000000000 --- a/pkgs/development/libraries/haskell/lens-aeson/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, aeson, attoparsec, doctest, filepath, genericDeriving -, lens, scientific, semigroups, simpleReflect, text -, unorderedContainers, vector -}: - -cabal.mkDerivation (self: { - pname = "lens-aeson"; - version = "1"; - sha256 = "0zpfpba97kr92lzrmdfk08f3cl42alhx0d73w8sbbwxnnvv4489r"; - buildDepends = [ - aeson attoparsec lens scientific text unorderedContainers vector - ]; - testDepends = [ - doctest filepath genericDeriving semigroups simpleReflect - ]; - meta = { - homepage = "http://github.com/lens/lens-aeson/"; - description = "Law-abiding lenses for aeson"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - }; -}) diff --git a/pkgs/development/libraries/haskell/lens/default.nix b/pkgs/development/libraries/haskell/lens/default.nix index 7a179d54f6b..655525e4d59 100644 --- a/pkgs/development/libraries/haskell/lens/default.nix +++ b/pkgs/development/libraries/haskell/lens/default.nix @@ -1,23 +1,25 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, bifunctors, comonad, contravariant, deepseq, distributive -, doctest, exceptions, filepath, free, genericDeriving, hashable -, hlint, HUnit, mtl, nats, parallel, primitive, profunctors -, QuickCheck, reflection, semigroupoids, semigroups, simpleReflect -, split, tagged, testFramework, testFrameworkHunit -, testFrameworkQuickcheck2, testFrameworkTh, text, transformers -, transformersCompat, unorderedContainers, vector, void, zlib +{ cabal, aeson, attoparsec, bifunctors, comonad, contravariant +, deepseq, distributive, doctest, exceptions, filepath, free +, genericDeriving, hashable, hlint, HUnit, mtl, nats, parallel +, primitive, profunctors, QuickCheck, reflection, scientific +, semigroupoids, semigroups, simpleReflect, split, tagged +, testFramework, testFrameworkHunit, testFrameworkQuickcheck2 +, testFrameworkTh, text, transformers, transformersCompat +, unorderedContainers, vector, void, zlib }: cabal.mkDerivation (self: { pname = "lens"; - version = "4.4"; - sha256 = "06ha4px4ywfbi0n3imy2qqjq3656snsz1b0ggkwzvdzmi550sh8w"; + version = "4.3.3"; + sha256 = "0k7qslnh15xnrj86wwsp0mvz6g363ma4g0dxkmvvg4sa1bxljr1f"; buildDepends = [ - bifunctors comonad contravariant distributive exceptions filepath - free hashable mtl parallel primitive profunctors reflection - semigroupoids semigroups split tagged text transformers - transformersCompat unorderedContainers vector void zlib + aeson attoparsec bifunctors comonad contravariant distributive + exceptions filepath free hashable mtl parallel primitive + profunctors reflection scientific semigroupoids semigroups split + tagged text transformers transformersCompat unorderedContainers + vector void zlib ]; testDepends = [ deepseq doctest filepath genericDeriving hlint HUnit mtl nats @@ -25,6 +27,7 @@ cabal.mkDerivation (self: { testFrameworkHunit testFrameworkQuickcheck2 testFrameworkTh text transformers unorderedContainers vector ]; + doCheck = false; meta = { homepage = "http://github.com/ekmett/lens/"; description = "Lenses, Folds and Traversals"; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index d09f8119d8d..acf164d57c7 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1459,8 +1459,6 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in lens = callPackage ../development/libraries/haskell/lens {}; - lensAeson = callPackage ../development/libraries/haskell/lens-aeson {}; - lensDatetime = callPackage ../development/libraries/haskell/lens-datetime {}; lensFamilyCore = callPackage ../development/libraries/haskell/lens-family-core {}; -- GitLab From 7cdb1bb8aa7a0f559958f56fb53e65608d751117 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 22 Aug 2014 11:37:31 +0200 Subject: [PATCH 074/843] Build a few NixOS system closures on Hydra This will allow us to keep track of the evolution of closure sizes of some typical configurations. (Hydra stores closure sizes in its database.) --- nixos/release.nix | 52 +++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) diff --git a/nixos/release.nix b/nixos/release.nix index ed413d3e928..0620b46d46a 100644 --- a/nixos/release.nix +++ b/nixos/release.nix @@ -78,6 +78,16 @@ let }; + makeClosure = module: forAllSystems (system: (import ./lib/eval-config.nix { + inherit system; + modules = [ module ] ++ lib.singleton + ({ config, lib, ... }: + { fileSystems."/".device = lib.mkDefault "/dev/sda1"; + boot.loader.grub.device = lib.mkDefault "/dev/sda"; + }); + }).config.system.build.toplevel); + + in rec { channel = @@ -242,4 +252,46 @@ in rec { tests.udisks2 = callTest tests/udisks2.nix {}; tests.xfce = callTest tests/xfce.nix {}; + + /* Build a bunch of typical closures so that Hydra can keep track of + the evolution of closure sizes. */ + + closures = { + + smallContainer = makeClosure ({ pkgs, ... }: + { boot.isContainer = true; + services.openssh.enable = true; + }); + + tinyContainer = makeClosure ({ pkgs, ... }: + { boot.isContainer = true; + imports = [ modules/profiles/minimal.nix ]; + }); + + ec2 = makeClosure ({ pkgs, ... }: + { imports = [ modules/virtualisation/amazon-image.nix ]; + }); + + kde = makeClosure ({ pkgs, ... }: + { services.xserver.enable = true; + services.xserver.displayManager.kdm.enable = true; + services.xserver.desktopManager.kde4.enable = true; + }); + + xfce = makeClosure ({ pkgs, ... }: + { services.xserver.enable = true; + services.xserver.desktopManager.xfce.enable = true; + }); + + # Linux/Apache/PostgreSQL/PHP stack. + lapp = makeClosure ({ pkgs, ... }: + { services.httpd.enable = true; + services.httpd.adminAddr = "foo@example.org"; + services.postgresql.enable = true; + services.postgresql.package = pkgs.postgresql93; + environment.systemPackages = [ pkgs.php ]; + }); + + }; + } -- GitLab From ce6b86cc682f0150234a74a644b625e6b6973d83 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 22 Aug 2014 11:57:40 +0200 Subject: [PATCH 075/843] Fix various evaluation problems http://hydra.nixos.org/build/13616685 --- pkgs/applications/editors/idea/default.nix | 2 ++ pkgs/applications/ike/default.nix | 2 ++ pkgs/applications/science/logic/verifast/default.nix | 2 ++ pkgs/applications/science/logic/yices/default.nix | 2 ++ pkgs/development/compilers/cryptol/1.8.x.nix | 2 ++ pkgs/os-specific/linux/kernel/generic.nix | 1 + pkgs/servers/http/openresty/default.nix | 4 +++- pkgs/tools/security/hashcat/default.nix | 2 ++ 8 files changed, 16 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/editors/idea/default.nix b/pkgs/applications/editors/idea/default.nix index e5cfbcdfe17..7cb99ae80cc 100644 --- a/pkgs/applications/editors/idea/default.nix +++ b/pkgs/applications/editors/idea/default.nix @@ -2,6 +2,8 @@ , coreutils, gnugrep, which, git }: +assert stdenv.isLinux; + let buildIdea = diff --git a/pkgs/applications/ike/default.nix b/pkgs/applications/ike/default.nix index 1414310ebf3..48f277ad4c9 100644 --- a/pkgs/applications/ike/default.nix +++ b/pkgs/applications/ike/default.nix @@ -1,6 +1,8 @@ { stdenv, fetchurl, cmake, openssl, libedit, flex, bison, qt4, makeWrapper , gcc, nettools, iproute, linuxHeaders }: +assert stdenv.isLinux; + # NOTE: use $out/etc/iked.conf as sample configuration and also set: dhcp_file "/etc/iked.dhcp"; # launch with "iked -f /etc/iked.conf" diff --git a/pkgs/applications/science/logic/verifast/default.nix b/pkgs/applications/science/logic/verifast/default.nix index 7ab08cf8799..2685f5e53d0 100644 --- a/pkgs/applications/science/logic/verifast/default.nix +++ b/pkgs/applications/science/logic/verifast/default.nix @@ -1,6 +1,8 @@ { stdenv, fetchurl, gtk, gdk_pixbuf, atk, pango, glib, cairo, freetype , fontconfig, libxml2, gnome2 }: +assert stdenv.isLinux; + let libPath = stdenv.lib.makeLibraryPath [ stdenv.gcc.libc stdenv.gcc.gcc gtk gdk_pixbuf atk pango glib cairo diff --git a/pkgs/applications/science/logic/yices/default.nix b/pkgs/applications/science/logic/yices/default.nix index 5a1a4ef1992..b6b34d96d15 100644 --- a/pkgs/applications/science/logic/yices/default.nix +++ b/pkgs/applications/science/logic/yices/default.nix @@ -1,5 +1,7 @@ { stdenv, fetchurl }: +assert stdenv.isLinux; + let libPath = stdenv.lib.makeLibraryPath [ stdenv.gcc.libc ]; in diff --git a/pkgs/development/compilers/cryptol/1.8.x.nix b/pkgs/development/compilers/cryptol/1.8.x.nix index 4cf00ad3806..17382ed9d56 100644 --- a/pkgs/development/compilers/cryptol/1.8.x.nix +++ b/pkgs/development/compilers/cryptol/1.8.x.nix @@ -1,5 +1,7 @@ { stdenv, requireFile, gmp4, ncurses, zlib, clang_33, makeWrapper }: +assert stdenv.isLinux; + let name = "cryptol-${version}-${rev}"; version = "1.8.27"; diff --git a/pkgs/os-specific/linux/kernel/generic.nix b/pkgs/os-specific/linux/kernel/generic.nix index 08611e44856..13250e45494 100644 --- a/pkgs/os-specific/linux/kernel/generic.nix +++ b/pkgs/os-specific/linux/kernel/generic.nix @@ -28,6 +28,7 @@ }: assert stdenv.platform.name == "sheevaplug" -> stdenv.platform.uboot != null; +assert stdenv.isLinux; let diff --git a/pkgs/servers/http/openresty/default.nix b/pkgs/servers/http/openresty/default.nix index e301cc429b9..571cd215356 100644 --- a/pkgs/servers/http/openresty/default.nix +++ b/pkgs/servers/http/openresty/default.nix @@ -1,6 +1,8 @@ { stdenv, fetchurl, fetchgit, openssl, zlib, pcre, libxml2, libxslt, gd, geoip , perl }: +assert stdenv.isLinux; + with stdenv.lib; stdenv.mkDerivation rec { @@ -53,7 +55,7 @@ stdenv.mkDerivation rec { description = "A fast web application server built on Nginx"; homepage = http://openresty.org; license = licenses.bsd2; - platforms = platforms.all; + platforms = platforms.linux; maintainers = with maintainers; [ thoughtpolice ]; }; } diff --git a/pkgs/tools/security/hashcat/default.nix b/pkgs/tools/security/hashcat/default.nix index 5e173724190..699901ad59e 100644 --- a/pkgs/tools/security/hashcat/default.nix +++ b/pkgs/tools/security/hashcat/default.nix @@ -1,5 +1,7 @@ { stdenv, fetchurl, p7zip, patchelf }: +assert stdenv.isLinux; + let bits = if stdenv.system == "x86_64-linux" then "64" else "32"; libPath = stdenv.lib.makeLibraryPath [ stdenv.gcc.libc ]; -- GitLab From 007232ff8f99a086ce58c193d9aaa8ceaa023541 Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Fri, 22 Aug 2014 12:54:02 +0200 Subject: [PATCH 076/843] linphone: mark as broken for ZHF --- .../networking/instant-messengers/linphone/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/networking/instant-messengers/linphone/default.nix b/pkgs/applications/networking/instant-messengers/linphone/default.nix index be12c7e8e2a..e10b4f9c83c 100644 --- a/pkgs/applications/networking/instant-messengers/linphone/default.nix +++ b/pkgs/applications/networking/instant-messengers/linphone/default.nix @@ -28,5 +28,6 @@ stdenv.mkDerivation rec { description = "Open Source video SIP softphone"; license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.gnu; + broken = true; }; } -- GitLab From e2db82874cf497c0dd156680d4c4a8f3b028125c Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Fri, 22 Aug 2014 14:56:33 +0200 Subject: [PATCH 077/843] Updates merlin to 1.7.1 --- pkgs/development/tools/ocaml/merlin/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/ocaml/merlin/default.nix b/pkgs/development/tools/ocaml/merlin/default.nix index 8efb90a9cef..970c07f3546 100644 --- a/pkgs/development/tools/ocaml/merlin/default.nix +++ b/pkgs/development/tools/ocaml/merlin/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, ocaml, findlib, yojson, menhir}: stdenv.mkDerivation { - name = "merlin-1.7"; + name = "merlin-1.7.1"; src = fetchurl { - url = "https://github.com/the-lambda-church/merlin/archive/v1.7.tar.gz"; - sha256 = "0grprrykah02g8va63lidbcb6n8sd18l2k9spb5rwlcs3xhfw42b"; + url = https://github.com/the-lambda-church/merlin/archive/v1.7.1.tar.gz; + sha256 = "c3b60c7b3fddaa2860e0d8ac0d4fed2ed60e319875734c7ac1a93df524c67aff"; }; buildInputs = [ ocaml findlib yojson menhir ]; -- GitLab From 5e1475d76d886d50209b674b31999226381b1329 Mon Sep 17 00:00:00 2001 From: Aycan iRiCAN Date: Fri, 22 Aug 2014 17:55:55 +0300 Subject: [PATCH 078/843] Revert "Revert "Merge pull request #3718 from MP2E/lens_4_4_update"" This reverts commit fec81c392f255fed231d13e9ca363632648a05c5. --- .../haskell/cabal-lenses/default.nix | 1 + .../libraries/haskell/lens-aeson/default.nix | 24 +++++++++++++++ .../libraries/haskell/lens/default.nix | 29 +++++++++---------- pkgs/top-level/haskell-packages.nix | 2 ++ 4 files changed, 40 insertions(+), 16 deletions(-) create mode 100644 pkgs/development/libraries/haskell/lens-aeson/default.nix diff --git a/pkgs/development/libraries/haskell/cabal-lenses/default.nix b/pkgs/development/libraries/haskell/cabal-lenses/default.nix index a4ac5164e1f..ccd23434fe0 100644 --- a/pkgs/development/libraries/haskell/cabal-lenses/default.nix +++ b/pkgs/development/libraries/haskell/cabal-lenses/default.nix @@ -7,6 +7,7 @@ cabal.mkDerivation (self: { version = "0.3"; sha256 = "13nx9cn81cx9cj7fk07akqvz4qkl49dlgb5wl5wanag6bafa6vhl"; buildDepends = [ Cabal lens unorderedContainers ]; + jailbreak = true; meta = { description = "Lenses and traversals for the Cabal library"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/development/libraries/haskell/lens-aeson/default.nix b/pkgs/development/libraries/haskell/lens-aeson/default.nix new file mode 100644 index 00000000000..d19b0bf6dd7 --- /dev/null +++ b/pkgs/development/libraries/haskell/lens-aeson/default.nix @@ -0,0 +1,24 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, aeson, attoparsec, doctest, filepath, genericDeriving +, lens, scientific, semigroups, simpleReflect, text +, unorderedContainers, vector +}: + +cabal.mkDerivation (self: { + pname = "lens-aeson"; + version = "1"; + sha256 = "0zpfpba97kr92lzrmdfk08f3cl42alhx0d73w8sbbwxnnvv4489r"; + buildDepends = [ + aeson attoparsec lens scientific text unorderedContainers vector + ]; + testDepends = [ + doctest filepath genericDeriving semigroups simpleReflect + ]; + meta = { + homepage = "http://github.com/lens/lens-aeson/"; + description = "Law-abiding lenses for aeson"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/libraries/haskell/lens/default.nix b/pkgs/development/libraries/haskell/lens/default.nix index 655525e4d59..7a179d54f6b 100644 --- a/pkgs/development/libraries/haskell/lens/default.nix +++ b/pkgs/development/libraries/haskell/lens/default.nix @@ -1,25 +1,23 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, aeson, attoparsec, bifunctors, comonad, contravariant -, deepseq, distributive, doctest, exceptions, filepath, free -, genericDeriving, hashable, hlint, HUnit, mtl, nats, parallel -, primitive, profunctors, QuickCheck, reflection, scientific -, semigroupoids, semigroups, simpleReflect, split, tagged -, testFramework, testFrameworkHunit, testFrameworkQuickcheck2 -, testFrameworkTh, text, transformers, transformersCompat -, unorderedContainers, vector, void, zlib +{ cabal, bifunctors, comonad, contravariant, deepseq, distributive +, doctest, exceptions, filepath, free, genericDeriving, hashable +, hlint, HUnit, mtl, nats, parallel, primitive, profunctors +, QuickCheck, reflection, semigroupoids, semigroups, simpleReflect +, split, tagged, testFramework, testFrameworkHunit +, testFrameworkQuickcheck2, testFrameworkTh, text, transformers +, transformersCompat, unorderedContainers, vector, void, zlib }: cabal.mkDerivation (self: { pname = "lens"; - version = "4.3.3"; - sha256 = "0k7qslnh15xnrj86wwsp0mvz6g363ma4g0dxkmvvg4sa1bxljr1f"; + version = "4.4"; + sha256 = "06ha4px4ywfbi0n3imy2qqjq3656snsz1b0ggkwzvdzmi550sh8w"; buildDepends = [ - aeson attoparsec bifunctors comonad contravariant distributive - exceptions filepath free hashable mtl parallel primitive - profunctors reflection scientific semigroupoids semigroups split - tagged text transformers transformersCompat unorderedContainers - vector void zlib + bifunctors comonad contravariant distributive exceptions filepath + free hashable mtl parallel primitive profunctors reflection + semigroupoids semigroups split tagged text transformers + transformersCompat unorderedContainers vector void zlib ]; testDepends = [ deepseq doctest filepath genericDeriving hlint HUnit mtl nats @@ -27,7 +25,6 @@ cabal.mkDerivation (self: { testFrameworkHunit testFrameworkQuickcheck2 testFrameworkTh text transformers unorderedContainers vector ]; - doCheck = false; meta = { homepage = "http://github.com/ekmett/lens/"; description = "Lenses, Folds and Traversals"; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index acf164d57c7..d09f8119d8d 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1459,6 +1459,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in lens = callPackage ../development/libraries/haskell/lens {}; + lensAeson = callPackage ../development/libraries/haskell/lens-aeson {}; + lensDatetime = callPackage ../development/libraries/haskell/lens-datetime {}; lensFamilyCore = callPackage ../development/libraries/haskell/lens-family-core {}; -- GitLab From d0aceb402a7ae0e87f0353e673c95fa51d416f19 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Fri, 22 Aug 2014 21:34:17 +0400 Subject: [PATCH 079/843] Update The Buttefly Effect game --- pkgs/games/the-butterfly-effect/default.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/games/the-butterfly-effect/default.nix b/pkgs/games/the-butterfly-effect/default.nix index 44d07cf3ffd..3cf91e11a55 100644 --- a/pkgs/games/the-butterfly-effect/default.nix +++ b/pkgs/games/the-butterfly-effect/default.nix @@ -1,6 +1,6 @@ x@{builderDefsPackage , qt4, box2d, which - ,fetchsvn + ,fetchsvn, cmake , ...}: builderDefsPackage (a : @@ -12,11 +12,11 @@ let (builtins.attrNames (builtins.removeAttrs x helperArgNames)); sourceInfo = rec { baseName="tbe"; - revision="1319"; + revision="2048"; version="r${revision}"; name="${baseName}-${version}"; url="https://tbe.svn.sourceforge.net/svnroot/tbe/trunk"; - hash="e9a7c24f0668ba2f36c472c1d05238fa7d9ed2150d99ce8a927285d099cc0f7f"; + hash="19pqpkil4r5y9j4nszkbs70lq720nvqw8g8magd8nf2n3l9nqm51"; }; in rec { @@ -30,8 +30,7 @@ rec { inherit (sourceInfo) name version; inherit buildInputs; - phaseNames = ["setVars" "doConfigure" "doMakeInstall" "doDeploy"]; - configureCommand = "sh configure"; + phaseNames = ["setVars" "doCmake" "doMakeInstall" "doDeploy"]; setVars = a.noDepEntry '' export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${a.box2d}/include/Box2D" -- GitLab From a147ddc42ce96608aa424f7b8b8784bd938958c7 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 22 Aug 2014 20:23:29 +0200 Subject: [PATCH 080/843] Check whether Nixpkgs evaluates with NIXPKGS_ALLOW_BROKEN=1 --- pkgs/top-level/make-tarball.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/make-tarball.nix b/pkgs/top-level/make-tarball.nix index 70330f4304f..9856586a183 100644 --- a/pkgs/top-level/make-tarball.nix +++ b/pkgs/top-level/make-tarball.nix @@ -66,7 +66,7 @@ releaseTools.sourceTarball rec { # Check that all-packages.nix evaluates on a number of platforms. for platform in i686-linux x86_64-linux x86_64-darwin i686-freebsd x86_64-freebsd; do header "checking pkgs/top-level/all-packages.nix on $platform" - nix-env -f pkgs/top-level/all-packages.nix \ + NIXPKGS_ALLOW_BROKEN=1 nix-env -f pkgs/top-level/all-packages.nix \ --show-trace --argstr system "$platform" \ -qa \* --drv-path --system-filter \* --system --meta --xml > /dev/null stopNest -- GitLab From 8a465c1dfaf59f7dd6b745d3f562262cd0b5ac70 Mon Sep 17 00:00:00 2001 From: Andrew Morsillo Date: Wed, 20 Aug 2014 18:31:14 -0400 Subject: [PATCH 081/843] robomongo: update to 0.8.4 and fix broken build --- pkgs/applications/misc/robomongo/default.nix | 9 ++++----- pkgs/applications/misc/robomongo/robomongo.patch | 13 +++++++++++++ 2 files changed, 17 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/misc/robomongo/default.nix b/pkgs/applications/misc/robomongo/default.nix index ab8a803b7cb..8b0ba581612 100644 --- a/pkgs/applications/misc/robomongo/default.nix +++ b/pkgs/applications/misc/robomongo/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, qt5, openssl, boost, cmake, scons, python, pcre, bzip2 }: stdenv.mkDerivation { - name = "robomongo-0.8.3"; + name = "robomongo-0.8.4"; src = fetchurl { - url = https://github.com/paralect/robomongo/archive/v0.8.3.tar.gz; - sha256 = "1x8vpmqvjscjcw30hf0i5vsrg3rldlwx6z52i1hymlck2jfzkank"; + url = https://github.com/paralect/robomongo/archive/v0.8.4.tar.gz; + sha256 = "199fb08701wrw3ky7gcqyvb3z4027qjcqdnzrx5y7yi3rb4gvkzc"; }; patches = [ ./robomongo.patch ]; @@ -17,9 +17,8 @@ stdenv.mkDerivation { meta = { homepage = "http://robomongo.org/"; description = "Query GUI for mongodb"; - platforms = stdenv.lib.platforms.unix; + platforms = stdenv.lib.platforms.linux; license = stdenv.lib.licenses.gpl3; maintainers = [ stdenv.lib.maintainers.amorsillo ]; - broken = true; }; } diff --git a/pkgs/applications/misc/robomongo/robomongo.patch b/pkgs/applications/misc/robomongo/robomongo.patch index 2305ca732ea..3de6e940d9f 100644 --- a/pkgs/applications/misc/robomongo/robomongo.patch +++ b/pkgs/applications/misc/robomongo/robomongo.patch @@ -1,6 +1,7 @@ Remove check for QT_NO_STYLE_GTK to avoid building with QCleanlooksStyle which results in error due to missing QCleanlooksStyle Ensure environment is preserved for scons build -- scons clears the env but we want to keep the nix build environment Fix typo in cmakelists +Add stdint.h include to mongo driver src diff -rupN robomongo-0.8.3/CMakeLists.txt robomongo-0.8.3-patched/CMakeLists.txt --- robomongo-0.8.3/CMakeLists.txt 2013-10-01 10:55:00.000000000 -0400 +++ robomongo-0.8.3-patched/CMakeLists.txt 2013-12-06 12:22:06.070659856 -0500 @@ -46,3 +47,15 @@ diff -rupN robomongo-0.8.3/src/third-party/mongodb/SConstruct robomongo-0.8.3-pa CLIENT_ARCHIVE='${CLIENT_DIST_BASENAME}${DIST_ARCHIVE_SUFFIX}', CLIENT_DIST_BASENAME=get_option('client-dist-basename'), CLIENT_LICENSE='#distsrc/client/LICENSE.txt', + +diff -rupN robomongo-0.8.4/src/third-party/mongodb/src/mongo/pch.h robomongo-0.8.4-patched/src/third-party/mongodb/src/mongo/pch.h +--- robomongo-0.8.4/src/third-party/mongodb/src/mongo/pch.h 2013-12-13 12:56:35.000000000 -0500 ++++ robomongo-0.8.4-patched/src/third-party/mongodb/src/mongo/pch.h 2014-08-20 18:16:31.788396489 -0400 +@@ -39,6 +39,7 @@ + #include + #include + #include ++#include + + #include "time.h" + #include "string.h" -- GitLab From e0f976ba55f54abcf93d1f5547398e23fbba614e Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Wed, 20 Aug 2014 18:08:07 -0300 Subject: [PATCH 082/843] vym: new package MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit VYM (View Your Mind) is a mind-mapping program. [Bjørn: two whitespace adjustments and quote the "$out" variable.] --- pkgs/applications/misc/vym/default.nix | 35 ++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 37 insertions(+) create mode 100644 pkgs/applications/misc/vym/default.nix diff --git a/pkgs/applications/misc/vym/default.nix b/pkgs/applications/misc/vym/default.nix new file mode 100644 index 00000000000..c23be51c3e8 --- /dev/null +++ b/pkgs/applications/misc/vym/default.nix @@ -0,0 +1,35 @@ +{ stdenv, fetchurl, pkgconfig, qt4 }: + +stdenv.mkDerivation rec { + name = "vym-${version}"; + version = "2.2.4"; + + src = fetchurl { + url = "http://downloads.sourceforge.net/project/vym/${version}/${name}.tar.bz2"; + sha256 = "1x4qp6wpszscbbs4czkfvskm7qjglvxm813nqv281bpy4y1hhvgs"; + }; + + buildInputs = [ pkgconfig qt4 ]; + + configurePhase = '' + qmake PREFIX="$out" + ''; + + meta = { + description = "A mind-mapping software"; + longDescription = '' + VYM (View Your Mind) is a tool to generate and manipulate maps which show your thoughts. + Such maps can help you to improve your creativity and effectivity. You can use them + for time management, to organize tasks, to get an overview over complex contexts, + to sort your ideas etc. + + Maps can be drawn by hand on paper or a flip chart and help to structure your thoughs. + While a tree like structure like shown on this page can be drawn by hand or any drawing software + vym offers much more features to work with such maps. + ''; + homepage = http://www.insilmaril.de/vym/; + license = stdenv.lib.licenses.gpl2; + maintainer = stdenv.lib.maintainers.AndersonTorres; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 094e410fafe..15da2e5e4e1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9957,6 +9957,8 @@ let vwm = callPackage ../applications/window-managers/vwm { }; + vym = callPackage ../applications/misc/vym { }; + w3m = callPackage ../applications/networking/browsers/w3m { graphicsSupport = false; }; -- GitLab From 896ef91242afbad24c9885c97e3916d35b4fe932 Mon Sep 17 00:00:00 2001 From: "ambrop7@gmail.com" Date: Wed, 20 Aug 2014 22:02:39 +0200 Subject: [PATCH 083/843] libuv: Add version 0.11.29. --- pkgs/development/libraries/libuv/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/libuv/default.nix b/pkgs/development/libraries/libuv/default.nix index bd1f926c9cb..b11b889a8d9 100644 --- a/pkgs/development/libraries/libuv/default.nix +++ b/pkgs/development/libraries/libuv/default.nix @@ -100,4 +100,5 @@ in v0_11_24 = "1hygn81iwbdshzrq603qm6k1r7pjflx9qqazmlb72c3vy1hq21c6"; v0_11_25 = "1abszivlxf0sddwvcj3jywfsip5q9vz6axvn40qqyl8sjs80zcvj"; v0_11_26 = "1pfjdwrxhqz1vqcdm42g3j45ghrb4yl7wsngvraclhgqicff1sc3"; + v0_11_29 = "1z07phfwryfy2155p3lxcm2a33h20sfl96lds5dghn157x6csz7m"; } -- GitLab From 85164955608e23d931ddb731e00391741db7ecf3 Mon Sep 17 00:00:00 2001 From: "ambrop7@gmail.com" Date: Wed, 20 Aug 2014 22:03:28 +0200 Subject: [PATCH 084/843] python-pyuv: new package MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Pyuv is a Python interface to libuv, a cross-platform asychronous I/O library. The setup.py is tweaked to that the system version of libuv is used, instead of tying to fetch one with git. [Bjørn: change commit message] --- .../python-modules/pyuv-external-libuv.patch | 27 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 20 ++++++++++++++ 2 files changed, 47 insertions(+) create mode 100644 pkgs/development/python-modules/pyuv-external-libuv.patch diff --git a/pkgs/development/python-modules/pyuv-external-libuv.patch b/pkgs/development/python-modules/pyuv-external-libuv.patch new file mode 100644 index 00000000000..33539d9b4b2 --- /dev/null +++ b/pkgs/development/python-modules/pyuv-external-libuv.patch @@ -0,0 +1,27 @@ +diff --git a/setup.py b/setup.py +index ec0caac..2c1fdb6 100644 +--- a/setup.py ++++ b/setup.py +@@ -6,7 +6,6 @@ try: + from setuptools import setup, Extension + except ImportError: + from distutils.core import setup, Extension +-from setup_libuv import libuv_build_ext, libuv_sdist + + + __version__ = "0.11.5" +@@ -32,12 +31,11 @@ setup(name = "pyuv", + "Programming Language :: Python :: 3.3", + "Programming Language :: Python :: 3.4" + ], +- cmdclass = {'build_ext': libuv_build_ext, +- 'sdist' : libuv_sdist}, + ext_modules = [Extension('pyuv', + sources = ['src/pyuv.c'], ++ libraries = ['uv'], + define_macros=[('MODULE_VERSION', __version__), +- ('LIBUV_REVISION', libuv_build_ext.libuv_revision)] ++ ('LIBUV_REVISION', 'unknown')] + )] + ) + diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d42897857c1..f7e3bf3c2ca 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8248,6 +8248,26 @@ rec { }; }); + pyuv = buildPythonPackage rec { + name = "pyuv-0.11.5"; + + src = fetchurl { + url = "https://github.com/saghul/pyuv/archive/${name}.tar.gz"; + sha256 = "c251952cb4e54c92ab0e871decd13cf73d11ca5dba9f92962de51d12e3a310a9"; + }; + + patches = [ ../development/python-modules/pyuv-external-libuv.patch ]; + + buildInputs = [ pkgs.libuvVersions.v0_11_29 ]; + + meta = { + description = "Python interface for libuv"; + homepage = https://github.com/saghul/pyuv; + repositories.git = git://github.com/saghul/pyuv.git; + license = licenses.mit; + }; + }; + virtualenv = buildPythonPackage rec { name = "virtualenv-1.11.6"; src = fetchurl { -- GitLab From 030439d8fe009772f692239aaa79bd08e506acb2 Mon Sep 17 00:00:00 2001 From: Oliver Charles Date: Fri, 22 Aug 2014 11:21:25 +0100 Subject: [PATCH 085/843] haskellPackages.digestiveFunctorsAeson: Update to 1.1.11 --- .../digestive-functors-aeson/default.nix | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/pkgs/development/libraries/haskell/digestive-functors-aeson/default.nix b/pkgs/development/libraries/haskell/digestive-functors-aeson/default.nix index 924f8bb351d..9bab1ad45db 100644 --- a/pkgs/development/libraries/haskell/digestive-functors-aeson/default.nix +++ b/pkgs/development/libraries/haskell/digestive-functors-aeson/default.nix @@ -1,23 +1,22 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, aeson, digestiveFunctors, HUnit, lens, mtl, safe -, scientific, tasty, tastyHunit, text, vector +{ cabal, aeson, digestiveFunctors, HUnit, lens, lensAeson, mtl +, safe, scientific, tasty, tastyHunit, text, vector }: cabal.mkDerivation (self: { pname = "digestive-functors-aeson"; - version = "1.1.10"; - sha256 = "0ar165rksnj09sb58qx5hm71kn8gzm936ixmfhf7sqbw2kcbw4nx"; - buildDepends = [ aeson digestiveFunctors lens safe text vector ]; + version = "1.1.11"; + sha256 = "0jf62ssyc317x070xkjdnfbb2g8mb19a83hig08j95vyqwjgk4vg"; + buildDepends = [ + aeson digestiveFunctors lens lensAeson safe text vector + ]; testDepends = [ aeson digestiveFunctors HUnit mtl scientific tasty tastyHunit text ]; - jailbreak = true; meta = { homepage = "http://github.com/ocharles/digestive-functors-aeson"; description = "Run digestive-functors forms against JSON"; license = self.stdenv.lib.licenses.gpl3; platforms = self.ghc.meta.platforms; - maintainers = with self.stdenv.lib.maintainers; [ ocharles ]; + maintainers = [ self.stdenv.lib.maintainers.ocharles ]; }; }) -- GitLab From a24775bf22dbdb4f9c21db3a15703d7e6e2c4016 Mon Sep 17 00:00:00 2001 From: Daniel Bergey Date: Sat, 23 Aug 2014 02:05:39 +0000 Subject: [PATCH 086/843] haskell Diagrams libraries latest versions support lens-4.4 - fix broken builds add bergey as maintainer --- lib/maintainers.nix | 1 + pkgs/development/libraries/haskell/diagrams/cairo.nix | 6 +++--- pkgs/development/libraries/haskell/diagrams/contrib.nix | 6 +++--- pkgs/development/libraries/haskell/diagrams/core.nix | 6 +++--- pkgs/development/libraries/haskell/diagrams/lib.nix | 6 +++--- pkgs/development/libraries/haskell/diagrams/postscript.nix | 7 +++---- pkgs/development/libraries/haskell/diagrams/svg.nix | 6 +++--- .../development/libraries/haskell/force-layout/default.nix | 6 +++--- 8 files changed, 22 insertions(+), 22 deletions(-) diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 184fd7036a0..78f0d619cb0 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -22,6 +22,7 @@ bbenoist = "Baptist BENOIST "; bennofs = "Benno Fünfstück "; berdario = "Dario Bertini "; + bergey = "Daniel Bergey "; bjg = "Brian Gough "; bjornfor = "Bjørn Forsman "; bluescreen303 = "Mathijs Kwik "; diff --git a/pkgs/development/libraries/haskell/diagrams/cairo.nix b/pkgs/development/libraries/haskell/diagrams/cairo.nix index c0f678311b9..c8763ca0a45 100644 --- a/pkgs/development/libraries/haskell/diagrams/cairo.nix +++ b/pkgs/development/libraries/haskell/diagrams/cairo.nix @@ -7,18 +7,18 @@ cabal.mkDerivation (self: { pname = "diagrams-cairo"; - version = "1.2"; - sha256 = "0vzjp1i5hk971r7f55gpdl0jibrjg9j4ny7p408kb8zl2ynlxv6l"; + version = "1.2.0.1"; + sha256 = "0y7llxxs34i814nc3c79ykv75znplzqq7njvq7a5fyxl81ji0z4c"; buildDepends = [ cairo colour dataDefaultClass diagramsCore diagramsLib filepath hashable JuicyPixels lens mtl optparseApplicative pango split statestack time transformers vector ]; - jailbreak = true; meta = { homepage = "http://projects.haskell.org/diagrams"; description = "Cairo backend for diagrams drawing EDSL"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.bergey ]; }; }) diff --git a/pkgs/development/libraries/haskell/diagrams/contrib.nix b/pkgs/development/libraries/haskell/diagrams/contrib.nix index 2dcc86d5c9b..7c9e797e305 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"; - sha256 = "1gljmzlhc6vck5lcsq9lhf2k4dik5pp62k85y2kkxgq0mxnmqf0g"; + version = "1.1.2.1"; + sha256 = "05jsqc9wm87hpnaclzfa376m5z8lnp4qgll6lqnfa5m49cqcabki"; buildDepends = [ arithmoi circlePacking colour dataDefault dataDefaultClass diagramsCore diagramsLib forceLayout lens MonadRandom mtl parsec @@ -20,11 +20,11 @@ cabal.mkDerivation (self: { diagramsLib HUnit QuickCheck testFramework testFrameworkHunit testFrameworkQuickcheck2 ]; - jailbreak = true; meta = { homepage = "http://projects.haskell.org/diagrams/"; description = "Collection of user contributions to diagrams EDSL"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.bergey ]; }; }) diff --git a/pkgs/development/libraries/haskell/diagrams/core.nix b/pkgs/development/libraries/haskell/diagrams/core.nix index 9a1245d04d0..c7459972c39 100644 --- a/pkgs/development/libraries/haskell/diagrams/core.nix +++ b/pkgs/development/libraries/haskell/diagrams/core.nix @@ -6,17 +6,17 @@ cabal.mkDerivation (self: { pname = "diagrams-core"; - version = "1.2.0.1"; - sha256 = "01rzd2zdg0pv7b299z6s6i6l6xggiszb2qs00vh5dbss295n1sps"; + version = "1.2.0.2"; + sha256 = "10glkp05pnxx7c7f33654rjcvahslxx010v36wf6zsa8nscdrccn"; buildDepends = [ dualTree lens MemoTrie monoidExtras newtype semigroups vectorSpace vectorSpacePoints ]; - jailbreak = true; meta = { homepage = "http://projects.haskell.org/diagrams"; description = "Core libraries for diagrams EDSL"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.bergey ]; }; }) diff --git a/pkgs/development/libraries/haskell/diagrams/lib.nix b/pkgs/development/libraries/haskell/diagrams/lib.nix index 77047d98291..75ee478ac3f 100644 --- a/pkgs/development/libraries/haskell/diagrams/lib.nix +++ b/pkgs/development/libraries/haskell/diagrams/lib.nix @@ -8,19 +8,19 @@ cabal.mkDerivation (self: { pname = "diagrams-lib"; - version = "1.2.0.1"; - sha256 = "0p7rq97hnal90dciq1nln1s16kdb1xk9rrwaxhkxqr6kjjr2njf4"; + version = "1.2.0.2"; + sha256 = "0ylrsldq7nmqvprgwbw7bkwp31zhgbyxjx462lcayk0lbhqb5k5p"; buildDepends = [ active colour dataDefaultClass diagramsCore dualTree filepath fingertree hashable intervals JuicyPixels lens MemoTrie monoidExtras optparseApplicative safe semigroups tagged vectorSpace vectorSpacePoints ]; - jailbreak = true; meta = { homepage = "http://projects.haskell.org/diagrams"; description = "Embedded domain-specific language for declarative graphics"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.bergey ]; }; }) diff --git a/pkgs/development/libraries/haskell/diagrams/postscript.nix b/pkgs/development/libraries/haskell/diagrams/postscript.nix index 6ecd2dd4a41..c79f637c73f 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"; - sha256 = "0l077libp6h8ka9ygkmajvzdymndlhx60nb5f6jaqvp7yx80hz3m"; + version = "1.1.0.1"; + sha256 = "03747g5y33kzf76hs4y0ak9q6b79r92z130b03bcc2892na62ad6"; buildDepends = [ dataDefaultClass diagramsCore diagramsLib dlist filepath hashable lens monoidExtras mtl semigroups split vectorSpace @@ -18,7 +18,6 @@ cabal.mkDerivation (self: { description = "Postscript backend for diagrams drawing EDSL"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - broken = true; + maintainers = [ self.stdenv.lib.maintainers.bergey ]; }; }) diff --git a/pkgs/development/libraries/haskell/diagrams/svg.nix b/pkgs/development/libraries/haskell/diagrams/svg.nix index f982f427863..fcd08ffce63 100644 --- a/pkgs/development/libraries/haskell/diagrams/svg.nix +++ b/pkgs/development/libraries/haskell/diagrams/svg.nix @@ -7,18 +7,18 @@ cabal.mkDerivation (self: { pname = "diagrams-svg"; - version = "1.1"; - sha256 = "0b34rh35pay4x8dg0i06xvr3d865hbxzj2x77jly9l1j7sa1qaj1"; + version = "1.1.0.1"; + sha256 = "02krwy1v7rhcgg0ps7kd8ym50kh48dcfqm2xz3k6hr32jzqa5hlw"; buildDepends = [ base64Bytestring blazeMarkup blazeSvg colour diagramsCore diagramsLib filepath hashable JuicyPixels lens monoidExtras mtl split time vectorSpace ]; - jailbreak = true; meta = { homepage = "http://projects.haskell.org/diagrams/"; description = "SVG backend for diagrams drawing EDSL"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.bergey ]; }; }) diff --git a/pkgs/development/libraries/haskell/force-layout/default.nix b/pkgs/development/libraries/haskell/force-layout/default.nix index 77259cc1e40..f0f8ae1399d 100644 --- a/pkgs/development/libraries/haskell/force-layout/default.nix +++ b/pkgs/development/libraries/haskell/force-layout/default.nix @@ -4,15 +4,15 @@ cabal.mkDerivation (self: { pname = "force-layout"; - version = "0.3.0.6"; - sha256 = "0qmzz9gbzf1jdk08w3nhnw7l3n5bq5sw5k4r0mdc5y11m38xpgm4"; + version = "0.3.0.7"; + sha256 = "1kq6fg90yj735rpipspykvkmzs2cnwyib6pkph58523bvahgi2dy"; buildDepends = [ dataDefaultClass lens vectorSpace vectorSpacePoints ]; - jailbreak = true; meta = { description = "Simple force-directed layout"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.bergey ]; }; }) -- GitLab From 27e7d1ff0abf51e7c7dbea7c0afbd63a850ad322 Mon Sep 17 00:00:00 2001 From: Cray Elliott Date: Fri, 22 Aug 2014 21:07:42 -0700 Subject: [PATCH 087/843] Lens update to v4.4.0.1 --- pkgs/development/libraries/haskell/lens/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/lens/default.nix b/pkgs/development/libraries/haskell/lens/default.nix index 7a179d54f6b..190dd3fd14e 100644 --- a/pkgs/development/libraries/haskell/lens/default.nix +++ b/pkgs/development/libraries/haskell/lens/default.nix @@ -11,8 +11,8 @@ cabal.mkDerivation (self: { pname = "lens"; - version = "4.4"; - sha256 = "06ha4px4ywfbi0n3imy2qqjq3656snsz1b0ggkwzvdzmi550sh8w"; + version = "4.4.0.1"; + sha256 = "0d1z6jix58g7x9r1jvm335hg2psflqc7w6sq54q486wil55c5vrw"; buildDepends = [ bifunctors comonad contravariant distributive exceptions filepath free hashable mtl parallel primitive profunctors reflection -- GitLab From f0478220d888f247c37a882df4a2ec82571b932c Mon Sep 17 00:00:00 2001 From: Patrick Mahoney Date: Fri, 22 Aug 2014 23:22:55 -0500 Subject: [PATCH 088/843] skalibs: new package Skalibs is a set of general-purpose C programming libraries used for building all software at skarnet.org. --- .../development/libraries/skalibs/default.nix | 58 +++++++++++++++++++ .../libraries/skalibs/getpeereid.patch | 28 +++++++++ pkgs/top-level/all-packages.nix | 2 + 3 files changed, 88 insertions(+) create mode 100644 pkgs/development/libraries/skalibs/default.nix create mode 100644 pkgs/development/libraries/skalibs/getpeereid.patch diff --git a/pkgs/development/libraries/skalibs/default.nix b/pkgs/development/libraries/skalibs/default.nix new file mode 100644 index 00000000000..842d74848df --- /dev/null +++ b/pkgs/development/libraries/skalibs/default.nix @@ -0,0 +1,58 @@ +{stdenv, fetchurl}: + +let + + version = "1.6.0.0"; + +in stdenv.mkDerivation rec { + name = "skalibs-${version}"; + + src = fetchurl { + url = "http://skarnet.org/software/skalibs/${name}.tar.gz"; + sha256 = "0jz3farll9n5jvz3g6wri99s6njkgmnf0r9jqjlg03f20dzv8c8w"; + }; + + sourceRoot = "prog/${name}"; + + # See http://skarnet.org/cgi-bin/archive.cgi?1:mss:75:201405:pkmodhckjklemogbplje + patches = [ ./getpeereid.patch ]; + + configurePhase = '' + pushd conf-compile + + printf "$out/bin" > conf-defaultpath + printf "$out/etc" > conf-etc + printf "$out/bin" > conf-install-command + printf "$out/include" > conf-install-include + printf "$out/libexec" > conf-install-libexec + printf "$out/lib" > conf-install-library + printf "$out/lib" > conf-install-library.so + printf "$out/sysdeps" > conf-install-sysdeps + + # let nix builder strip things, cross-platform + truncate --size 0 conf-stripbins + truncate --size 0 conf-striplibs + + rm -f flag-slashpackage + touch flag-allstatic + touch flag-forcedevr + + popd + ''; + + preBuild = '' + patchShebangs src/sys + ''; + + preInstall = '' + mkdir -p "$out/etc" + ''; + + meta = { + homepage = http://skarnet.org/software/skalibs/; + description = "A set of general-purpose C programming libraries."; + platforms = stdenv.lib.platforms.all; + license = stdenv.lib.licenses.isc; + }; + +} diff --git a/pkgs/development/libraries/skalibs/getpeereid.patch b/pkgs/development/libraries/skalibs/getpeereid.patch new file mode 100644 index 00000000000..c366780e267 --- /dev/null +++ b/pkgs/development/libraries/skalibs/getpeereid.patch @@ -0,0 +1,28 @@ +--- a/src/libstddjb/getpeereid.h ++++ b/src/libstddjb/getpeereid.h +@@ -3,6 +3,14 @@ + #ifndef GETPEEREID_H + #define GETPEEREID_H + ++#include "sysdeps.h" ++ ++#ifdef HASGETPEEREID ++/* syscall exists - do nothing */ ++ ++#else ++ + extern int getpeereid (int, int *, int *) ; + + #endif ++#endif +--- a/src/libstddjb/ipc_eid.c ++++ b/src/libstddjb/ipc_eid.c +@@ -5,7 +5,7 @@ + + int ipc_eid (int s, unsigned int *u, unsigned int *g) + { +- int dummyu, dummyg ; ++ unsigned int dummyu, dummyg ; + if (getpeereid(s, &dummyu, &dummyg) < 0) return -1 ; + *u = (unsigned int)dummyu ; + *g = (unsigned int)dummyg ; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 15da2e5e4e1..6b90a705f1c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6169,6 +6169,8 @@ let sfml_git = callPackage ../development/libraries/sfml { }; + skalibs = callPackage ../development/libraries/skalibs { }; + slang = callPackage ../development/libraries/slang { }; slibGuile = callPackage ../development/libraries/slib { -- GitLab From d8d7cd7ef222ed69258c84d54b95a4caaf2516f3 Mon Sep 17 00:00:00 2001 From: Patrick Mahoney Date: Fri, 22 Aug 2014 23:40:52 -0500 Subject: [PATCH 089/843] execline: new package Execline is a small scripting language, to be used in place of a shell in non-interactive scripts. --- pkgs/tools/misc/execline/default.nix | 54 ++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 56 insertions(+) create mode 100644 pkgs/tools/misc/execline/default.nix diff --git a/pkgs/tools/misc/execline/default.nix b/pkgs/tools/misc/execline/default.nix new file mode 100644 index 00000000000..ba0784138b3 --- /dev/null +++ b/pkgs/tools/misc/execline/default.nix @@ -0,0 +1,54 @@ +{stdenv, fetchurl, skalibs}: + +let + + version = "1.3.1.1"; + +in stdenv.mkDerivation rec { + + name = "execline-${version}"; + + src = fetchurl { + url = "http://skarnet.org/software/execline/${name}.tar.gz"; + sha256 = "1br3qzif166kbp4k813ljbyq058p7mfsp2lj88n8vi4dmj935nzg"; + }; + + buildInputs = [ skalibs ]; + + sourceRoot = "admin/${name}"; + + configurePhase = '' + pushd conf-compile + + printf "$out/bin" > conf-install-command + printf "$out/include" > conf-install-include + printf "$out/lib" > conf-install-library + printf "$out/lib" > conf-install-library.so + printf "$out/sysdeps" > conf-install-sysdeps + + printf "${skalibs}/sysdeps" > import + printf "${skalibs}/include" > path-include + printf "${skalibs}/lib" > path-library + + # let nix builder strip things, cross-platform + truncate --size 0 conf-stripbins + truncate --size 0 conf-striplibs + + rm -f flag-slashpackage + touch flag-allstatic + + popd + ''; + + preBuild = '' + patchShebangs src/sys + ''; + + meta = { + homepage = http://skarnet.org/software/execline/; + description = "A small scripting language, to be used in place of a shell in non-interactive scripts."; + platforms = stdenv.lib.platforms.all; + license = stdenv.lib.licenses.isc; + }; + +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6b90a705f1c..60a49c10ff4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -987,6 +987,8 @@ let exempi = callPackage ../development/libraries/exempi { }; + execline = callPackage ../tools/misc/execline { }; + exercism = callPackage ../development/tools/exercism { }; exif = callPackage ../tools/graphics/exif { }; -- GitLab From f254687071f220fac357eb738c6c8751c1d5149b Mon Sep 17 00:00:00 2001 From: Patrick Mahoney Date: Fri, 22 Aug 2014 23:42:13 -0500 Subject: [PATCH 090/843] s6: new package s6 is skarnet.org's small & secure supervision software suite. The s6-log program is modified to call execlineb directly rather than searching PATH. --- pkgs/servers/s6/default.nix | 57 +++++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 59 insertions(+) create mode 100644 pkgs/servers/s6/default.nix diff --git a/pkgs/servers/s6/default.nix b/pkgs/servers/s6/default.nix new file mode 100644 index 00000000000..045e31207ba --- /dev/null +++ b/pkgs/servers/s6/default.nix @@ -0,0 +1,57 @@ +{stdenv, fetchurl, skalibs, execline}: + +let + + version = "1.1.3.2"; + +in stdenv.mkDerivation rec { + + name = "s6-${version}"; + + src = fetchurl { + url = "http://www.skarnet.org/software/s6/${name}.tar.gz"; + sha256 = "0djxdd3d3mlp63sjqqs0ilf8p68m86c1s98d82fl0kgaaibpsikp"; + }; + + buildInputs = [ skalibs execline ]; + + sourceRoot = "admin/${name}"; + + configurePhase = '' + pushd conf-compile + + printf "$out/bin" > conf-install-command + printf "$out/include" > conf-install-include + printf "$out/lib" > conf-install-library + printf "$out/lib" > conf-install-library.so + printf "$out/sysdeps" > conf-install-sysdeps + + # let nix builder strip things, cross-platform + truncate --size 0 conf-stripbins + truncate --size 0 conf-striplibs + + printf "${skalibs}/sysdeps" > import + printf "%s\n%s" "${skalibs}/include" "${execline}/include" > path-include + printf "%s\n%s" "${skalibs}/lib" "${execline}/lib" > path-library + + rm -f flag-slashpackage + touch flag-allstatic + + popd + ''; + + preBuild = '' + substituteInPlace "src/daemontools-extras/s6-log.c" \ + --replace '"execlineb"' '"${execline}/bin/execlineb"' + + patchShebangs src/sys + ''; + + meta = { + homepage = http://www.skarnet.org/software/s6/; + description = "skarnet.org's small & secure supervision software suite."; + platforms = stdenv.lib.platforms.all; + license = stdenv.lib.licenses.isc; + }; + +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 60a49c10ff4..8f5ce8da047 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6982,6 +6982,8 @@ let rippled = callPackage ../servers/rippled { }; + s6 = callPackage ../servers/s6 { }; + spamassassin = callPackage ../servers/mail/spamassassin { inherit (perlPackages) HTMLParser NetDNS NetAddrIP DBFile HTTPDate MailDKIM LWP IOSocketSSL; -- GitLab From 1615be91ef522cfc9aaeb4eb37b8d3519cd08ea7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= Date: Wed, 9 Jul 2014 00:43:26 +0200 Subject: [PATCH 091/843] Add mlmmj package and nixos module. --- nixos/modules/misc/ids.nix | 2 + nixos/modules/module-list.nix | 1 + nixos/modules/services/mail/mlmmj.nix | 128 ++++++++++++++++++++++++++ pkgs/servers/mail/mlmmj/default.nix | 21 +++++ pkgs/top-level/all-packages.nix | 2 + 5 files changed, 154 insertions(+) create mode 100644 nixos/modules/services/mail/mlmmj.nix create mode 100644 pkgs/servers/mail/mlmmj/default.nix diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix index 9f509ba8cb9..b49837efd50 100644 --- a/nixos/modules/misc/ids.nix +++ b/nixos/modules/misc/ids.nix @@ -142,6 +142,7 @@ gdm = 132; dhcpd = 133; siproxd = 134; + mlmmj = 135; # When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399! @@ -258,6 +259,7 @@ gdm = 132; tss = 133; siproxd = 134; + mlmmj = 135; # 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/module-list.nix b/nixos/modules/module-list.nix index 1fc2959bd8a..c25110fc5b1 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -142,6 +142,7 @@ ./services/mail/dovecot.nix ./services/mail/freepops.nix ./services/mail/mail.nix + ./services/mail/mlmmj.nix ./services/mail/opensmtpd.nix ./services/mail/postfix.nix ./services/mail/spamassassin.nix diff --git a/nixos/modules/services/mail/mlmmj.nix b/nixos/modules/services/mail/mlmmj.nix new file mode 100644 index 00000000000..637974f05cd --- /dev/null +++ b/nixos/modules/services/mail/mlmmj.nix @@ -0,0 +1,128 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + + cfg = config.services.mlmmj; + stateDir = "/var/lib/mlmmj"; + spoolDir = "/var/spool/mlmmj"; + listDir = domain: list: "${spoolDir}/${domain}/${list}"; + listCtl = domain: list: "${listDir domain list}/control"; + transport = domain: list: "${domain}--${list}@local.list.mlmmj mlmmj:${domain}/${list}"; + virtual = domain: list: "${list}@${domain} ${domain}--${list}@local.list.mlmmj"; + alias = domain: list: "${list}: \"|${pkgs.mlmmj}/mlmmj-receive -L ${listDir domain list}/\""; + subjectPrefix = list: "[${list}]"; + listAddress = domain: list: "${list}@${domain}"; + customHeaders = list: domain: [ "List-Id: ${list}" "Reply-To: ${list}@${domain}" ]; + footer = domain: list: "To unsubscribe send a mail to ${list}+unsubscribe@${domain}"; + createList = d: l: '' + ${pkgs.coreutils}/bin/mkdir -p ${listCtl d l} + echo ${listAddress d l} > ${listCtl d l}/listadress + echo "${lib.concatStringsSep "\n" (customHeaders d l)}" > ${listCtl d l}/customheaders + echo ${footer d l} > ${listCtl d l}/footer + echo ${subjectPrefix l} > ${listCtl d l}/prefix + ''; +in + +{ + + ###### interface + + options = { + + services.mlmmj = { + + enable = mkOption { + type = types.bool; + default = false; + description = "Enable mlmmj"; + }; + + user = mkOption { + type = types.str; + default = "mlmmj"; + description = "mailinglist local user"; + }; + + group = mkOption { + type = types.str; + default = "mlmmj"; + description = "mailinglist local group"; + }; + + listDomain = mkOption { + type = types.str; + default = "localhost"; + description = "Set the mailing list domain"; + }; + + mailLists = mkOption { + type = types.listOf types.str; + default = []; + description = "The collection of hosted maillists"; + }; + + }; + + }; + + ###### implementation + + config = mkIf cfg.enable { + + users.extraUsers = singleton { + name = cfg.user; + description = "mlmmj user"; + home = stateDir; + createHome = true; + uid = config.ids.uids.mlmmj; + group = cfg.group; + useDefaultShell = true; + }; + + users.extraGroups = singleton { + name = cfg.group; + gid = config.ids.gids.mlmmj; + }; + + services.postfix = { + enable = true; + recipientDelimiter= "+"; + extraMasterConf = '' + mlmmj unix - n n - - pipe flags=ORhu user=mlmmj argv=${pkgs.mlmmj}/bin/mlmmj-recieve -F -L ${spoolDir}/$nextHop + ''; + + extraAliases = concatMapStrings (alias cfg.listDomain) cfg.mailLists; + + extraConfig = '' + transport = hash:${stateDir}/transports + virtual = hash:${stateDir}/virtuals + ''; + }; + + environment.systemPackages = [ pkgs.mlmmj ]; + + system.activationScripts.mlmmj = '' + ${pkgs.coreutils}/bin/mkdir -p ${stateDir} ${spoolDir}/${cfg.listDomain} + ${pkgs.coreutils}/bin/chown -R ${cfg.user}:${cfg.group} ${spoolDir} + ${lib.concatMapStrings (createList cfg.listDomain) cfg.mailLists} + echo ${lib.concatMapStrings (virtual cfg.listDomain) cfg.mailLists} > ${stateDir}/virtuals + echo ${cfg.listDomain} mailman: > ${stateDir}/transports + echo ${lib.concatMapStrings (transport cfg.listDomain) cfg.mailLists} >> ${stateDir}/transports + ''; + + systemd.services."mlmmj-maintd" = { + description = "mlmmj maintenance daemon"; + wantedBy = [ "multi-user.target" ]; + + serviceConfig = { + User = cfg.user; + Group = cfg.group; + ExecStart = "${pkgs.mlmmj}/bin/mlmmj-maintd -F -d ${spoolDir}/${cfg.listDomain}"; + }; + }; + + }; + +} diff --git a/pkgs/servers/mail/mlmmj/default.nix b/pkgs/servers/mail/mlmmj/default.nix new file mode 100644 index 00000000000..2ad6dedbf69 --- /dev/null +++ b/pkgs/servers/mail/mlmmj/default.nix @@ -0,0 +1,21 @@ +{ stdenv, fetchurl, pkgconfig }: + +stdenv.mkDerivation rec { + + name = "mlmmj-${version}"; + version = "1.2.18.1"; + + src = fetchurl { + url = "http://mlmmj.org/releases/${name}.tar.gz"; + sha256 = "336b6b20a6d7f0dcdc7445ecea0fe4bdacee241f624fcc710b4341780f35e383"; + }; + + meta = with stdenv.lib; { + homepage = http://mlmmj.org; + description = "Mailing List Management Made Joyful"; + maintainers = [ maintainers.edwtjo ]; + platforms = platforms.linux; + license = licenses.mit; + }; + +} \ No newline at end of file diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8f5ce8da047..f353314674f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6853,6 +6853,8 @@ let miniHttpd = callPackage ../servers/http/mini-httpd {}; + mlmmj = callPackage ../servers/mail/mlmmj { }; + myserver = callPackage ../servers/http/myserver { }; nginx = callPackage ../servers/http/nginx { -- GitLab From f439cc7cf6f989e79cfdb8bab90b51737da23e1a Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sun, 6 Jul 2014 17:41:40 +0200 Subject: [PATCH 092/843] Adds javalib and sawja Javalib is a library that parses Java .class files into OCaml data structures. Sawja is a library written in OCaml, relying on Javalib to provide a high level representation of Java bytecode programs. Homepage: http://sawja.inria.fr/ --- .../ocaml-modules/extlib/default.nix | 6 +-- .../javalib/Makefile.config.example.patch | 9 +++++ .../ocaml-modules/javalib/configure.sh.patch | 11 +++++ .../ocaml-modules/javalib/default.nix | 40 +++++++++++++++++++ .../sawja/Makefile.config.example.patch | 9 +++++ .../ocaml-modules/sawja/configure.sh.patch | 11 +++++ .../ocaml-modules/sawja/default.nix | 33 +++++++++++++++ pkgs/top-level/all-packages.nix | 9 +++++ 8 files changed, 125 insertions(+), 3 deletions(-) create mode 100644 pkgs/development/ocaml-modules/javalib/Makefile.config.example.patch create mode 100644 pkgs/development/ocaml-modules/javalib/configure.sh.patch create mode 100644 pkgs/development/ocaml-modules/javalib/default.nix create mode 100644 pkgs/development/ocaml-modules/sawja/Makefile.config.example.patch create mode 100644 pkgs/development/ocaml-modules/sawja/configure.sh.patch create mode 100644 pkgs/development/ocaml-modules/sawja/default.nix diff --git a/pkgs/development/ocaml-modules/extlib/default.nix b/pkgs/development/ocaml-modules/extlib/default.nix index 8b977dd7c52..7bc7e398948 100644 --- a/pkgs/development/ocaml-modules/extlib/default.nix +++ b/pkgs/development/ocaml-modules/extlib/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, ocaml, findlib}: +{stdenv, fetchurl, ocaml, findlib, minimal ? true}: stdenv.mkDerivation { name = "ocaml-extlib-1.6.1"; @@ -14,8 +14,8 @@ stdenv.mkDerivation { configurePhase = "true"; # Skip configure # De facto, option minimal=1 seems to be the default. See the README. - buildPhase = "make minimal=1 build"; - installPhase = "make minimal=1 install"; + buildPhase = "make ${if minimal then "minimal=1" else ""} build"; + installPhase = "make ${if minimal then "minimal=1" else ""} install"; meta = { homepage = http://code.google.com/p/ocaml-extlib/; diff --git a/pkgs/development/ocaml-modules/javalib/Makefile.config.example.patch b/pkgs/development/ocaml-modules/javalib/Makefile.config.example.patch new file mode 100644 index 00000000000..c06144a75c0 --- /dev/null +++ b/pkgs/development/ocaml-modules/javalib/Makefile.config.example.patch @@ -0,0 +1,9 @@ +--- javalib-2.3-orig/Makefile.config.example 2013-10-30 08:35:30.000000000 +0100 ++++ javalib-2.3/Makefile.config.example 2014-07-06 17:32:29.799398394 +0200 +@@ -1,6 +1,3 @@ +-export OCAMLFIND_DESTDIR=$(LOCALDEST) +-export OCAMLPATH=$(LOCALDEST) +- + OCAMLC = $(FINDER) ocamlc $(FLAGS) + OCAMLOPT = $(FINDER) ocamlopt $(OPT_FLAGS) + OCAMLDOC = $(FINDER) ocamldoc diff --git a/pkgs/development/ocaml-modules/javalib/configure.sh.patch b/pkgs/development/ocaml-modules/javalib/configure.sh.patch new file mode 100644 index 00000000000..67e019b277a --- /dev/null +++ b/pkgs/development/ocaml-modules/javalib/configure.sh.patch @@ -0,0 +1,11 @@ +--- javalib-2.3-orig/configure.sh 2013-10-30 08:35:30.000000000 +0100 ++++ javalib-2.3/configure.sh 2014-07-06 17:28:39.025066199 +0200 +@@ -44,7 +44,7 @@ + DESTDIR= + # The ocamlpath variable for the compiler to locate the locally-installed + # packages (depends on LOCALDEST) +-OCAMLPATH= ++#OCAMLPATH= + # The packages that need to be made in addition to Savalib / Sawja + MAKEDEP= + # The packages that need to be made in addition to Savalib / Sawja diff --git a/pkgs/development/ocaml-modules/javalib/default.nix b/pkgs/development/ocaml-modules/javalib/default.nix new file mode 100644 index 00000000000..2fa72dcf07f --- /dev/null +++ b/pkgs/development/ocaml-modules/javalib/default.nix @@ -0,0 +1,40 @@ +{stdenv, fetchurl, which, ocaml, findlib, camlzip, extlib}: +let + pname = "javalib"; + version = "2.3"; + webpage = "http://sawja.inria.fr/"; + ocaml_version = (builtins.parseDrvName ocaml.name).version; +in +stdenv.mkDerivation rec { + + name = "ocaml-${pname}-${version}"; + + src = fetchurl { + url = "https://gforge.inria.fr/frs/download.php/33090/${pname}-${version}.tar.bz2"; + sha256 = "1i8djcanzm250mwilm3jfy37cz0k0x7jbnrz8a5vvdi91kyzh52j"; + }; + + buildInputs = [ which ocaml findlib camlzip extlib ]; + + patches = [ ./configure.sh.patch ./Makefile.config.example.patch ]; + + createFindlibDestdir = true; + + configureScript = "./configure.sh"; + dontAddPrefix = "true"; + + preBuild = '' + make ptrees; + make installptrees; + export OCAMLPATH=$out/lib/ocaml/${ocaml_version}/site-lib/:$OCAMLPATH; + ''; + + propagatedBuildInputs = [ camlzip extlib ]; + + meta = { + description = "A library that parses Java .class files into OCaml data structures"; + homepage = "${webpage}"; + license = stdenv.lib.licenses.lgpl3; + platforms = ocaml.meta.platforms; + }; +} diff --git a/pkgs/development/ocaml-modules/sawja/Makefile.config.example.patch b/pkgs/development/ocaml-modules/sawja/Makefile.config.example.patch new file mode 100644 index 00000000000..4f2cc99e76b --- /dev/null +++ b/pkgs/development/ocaml-modules/sawja/Makefile.config.example.patch @@ -0,0 +1,9 @@ +--- sawja-1.5-orig/Makefile.config.example 2013-10-30 08:35:29.000000000 +0100 ++++ sawja-1.5/Makefile.config.example 2014-07-05 18:54:37.902423482 +0200 +@@ -1,6 +1,3 @@ +-export OCAMLFIND_DESTDIR=$(LOCALDEST) +-export OCAMLPATH=$(LOCALDEST) +- + RECODE=-charset utf-8 + DOCDIR = doc/api + diff --git a/pkgs/development/ocaml-modules/sawja/configure.sh.patch b/pkgs/development/ocaml-modules/sawja/configure.sh.patch new file mode 100644 index 00000000000..8165de242f5 --- /dev/null +++ b/pkgs/development/ocaml-modules/sawja/configure.sh.patch @@ -0,0 +1,11 @@ +--- sawja-1.5-orig/configure.sh 2013-10-30 08:35:29.000000000 +0100 ++++ sawja-1.5/configure.sh 2014-07-05 18:50:26.833798254 +0200 +@@ -39,7 +39,7 @@ + DESTDIR= + # The ocamlpath variable for the compiler to locate the locally-installed + # packages (depends on LOCALDEST) +-OCAMLPATH= ++#OCAMLPATH= + # The path to ocamlfind + FINDER=`which ocamlfind` + # The perl executable diff --git a/pkgs/development/ocaml-modules/sawja/default.nix b/pkgs/development/ocaml-modules/sawja/default.nix new file mode 100644 index 00000000000..bed87a50f81 --- /dev/null +++ b/pkgs/development/ocaml-modules/sawja/default.nix @@ -0,0 +1,33 @@ +{stdenv, fetchurl, which, perl, ocaml, findlib, javalib }: +let + pname = "sawja"; + version = "1.5"; + webpage = "http://sawja.inria.fr/"; +in +stdenv.mkDerivation rec { + + name = "ocaml-${pname}-${version}"; + + src = fetchurl { + url = "https://gforge.inria.fr/frs/download.php/33091/${pname}-${version}.tar.bz2"; + sha256 = "0i8qgqkw9vgj6k2g6npss268ivxdkzx5qj2a52jbd8ih59rn68cm"; + }; + + buildInputs = [ which perl ocaml findlib javalib ]; + + patches = [ ./configure.sh.patch ./Makefile.config.example.patch ]; + + createFindlibDestdir = true; + + configureScript = "./configure.sh"; + dontAddPrefix = "true"; + + propagatedBuildInputs = [ javalib ]; + + meta = { + description = "A library written in OCaml, relying on Javalib to provide a high level representation of Java bytecode programs"; + homepage = "${webpage}"; + license = stdenv.lib.licenses.gpl3Plus; + platforms = ocaml.meta.platforms; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c536e677dbe..a97f2c8c411 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3232,6 +3232,10 @@ let findlib = callPackage ../development/tools/ocaml/findlib { }; + javalib = callPackage ../development/ocaml-modules/javalib { + extlib = ocaml_extlib_maximal; + }; + dypgen = callPackage ../development/ocaml-modules/dypgen { }; patoline = callPackage ../tools/typesetting/patoline { }; @@ -3307,6 +3311,9 @@ let ocaml_sexplib = callPackage ../development/ocaml-modules/sexplib { }; ocaml_extlib = callPackage ../development/ocaml-modules/extlib { }; + ocaml_extlib_maximal = callPackage ../development/ocaml-modules/extlib { + minimal = false; + }; pycaml = callPackage ../development/ocaml-modules/pycaml { }; @@ -3314,6 +3321,8 @@ let opam_1_1 = callPackage ../development/tools/ocaml/opam/1.1.nix { }; opam = opam_1_1; + sawja = callPackage ../development/ocaml-modules/sawja { }; + uucd = callPackage ../development/ocaml-modules/uucd { }; uunf = callPackage ../development/ocaml-modules/uunf { }; uutf = callPackage ../development/ocaml-modules/uutf { }; -- GitLab From 6f50af7206950447cfc9232333e9a4a605c71a39 Mon Sep 17 00:00:00 2001 From: Jos van den Oever Date: Sun, 25 May 2014 11:30:58 +0200 Subject: [PATCH 093/843] Some additional android runtimes. --- pkgs/development/mobile/androidenv/default.nix | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/pkgs/development/mobile/androidenv/default.nix b/pkgs/development/mobile/androidenv/default.nix index bc022bd70b4..422c1516f2d 100644 --- a/pkgs/development/mobile/androidenv/default.nix +++ b/pkgs/development/mobile/androidenv/default.nix @@ -52,6 +52,12 @@ rec { alsaLib_32bit = pkgs_i686.alsaLib; }; + androidsdk_2_1 = androidsdk { + platformVersions = [ "7" ]; + abiVersions = [ "armeabi-v7a" ]; + useGoogleAPIs = true; + }; + androidsdk_2_2 = androidsdk { platformVersions = [ "8" ]; abiVersions = [ "armeabi-v7a" ]; @@ -82,6 +88,12 @@ rec { useGoogleAPIs = true; }; + androidsdk_4_4 = androidsdk { + platformVersions = [ "19" ]; + abiVersions = [ "armeabi-v7a" "x86" ]; + useGoogleAPIs = true; + }; + androidndk = import ./androidndk.nix { inherit (pkgs) stdenv fetchurl zlib ncurses; }; -- GitLab From 503b8afa3faedf6398a5be8e86454bbf6af6baea Mon Sep 17 00:00:00 2001 From: Jaka Hudoklin Date: Sat, 16 Aug 2014 23:53:03 +0200 Subject: [PATCH 094/843] Add neo4j database --- pkgs/servers/nosql/neo4j/default.nix | 39 ++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 41 insertions(+) create mode 100644 pkgs/servers/nosql/neo4j/default.nix diff --git a/pkgs/servers/nosql/neo4j/default.nix b/pkgs/servers/nosql/neo4j/default.nix new file mode 100644 index 00000000000..91c4472e049 --- /dev/null +++ b/pkgs/servers/nosql/neo4j/default.nix @@ -0,0 +1,39 @@ +{ stdenv, fetchurl, makeWrapper, jre, which, gnused }: + +with stdenv.lib; + +stdenv.mkDerivation rec { + name = "neo4j-${version}"; + version = "2.1.3"; + + src = fetchurl { + url = "http://dist.neo4j.org/neo4j-community-${version}-unix.tar.gz"; + sha256 = "0gcyy6ayn8qvxj6za5463lgy320mn4rq7q5qysc26fxjd73drrrk"; + }; + + buildInputs = [ makeWrapper jre which gnused ]; + + patchPhase = '' + substituteInPlace "bin/neo4j" --replace "NEO4J_INSTANCE=\$NEO4J_HOME" "" + ''; + + installPhase = '' + mkdir -p "$out/share/neo4j" + cp -R * "$out/share/neo4j" + + mkdir -p "$out/bin" + makeWrapper "$out/share/neo4j/bin/neo4j" "$out/bin/neo4j" \ + --prefix PATH : "${jre}/bin:${which}/bin:${gnused}/bin" + makeWrapper "$out/share/neo4j/bin/neo4j-shell" "$out/bin/neo4j-shell" \ + --prefix PATH : "${jre}/bin:${which}/bin:${gnused}/bin" + ''; + + meta = with stdenv.lib; { + description = "a highly scalable, robust (fully ACID) native graph database"; + homepage = "http://www.neo4j.org/"; + license = licenses.gpl3; + + maintainers = [ maintainers.offline ]; + platforms = stdenv.lib.platforms.unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d448c606d37..b93b3bdcfca 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6952,6 +6952,8 @@ let nagiosPluginsOfficial = callPackage ../servers/monitoring/nagios/plugins/official-2.x.nix { }; + neo4j = callPackage ../servers/nosql/neo4j { }; + net_snmp = callPackage ../servers/monitoring/net-snmp { }; oidentd = callPackage ../servers/identd/oidentd { }; -- GitLab From 84ea03fa3f91e40c68155a18919a28939c99d895 Mon Sep 17 00:00:00 2001 From: Jaka Hudoklin Date: Sat, 16 Aug 2014 23:53:26 +0200 Subject: [PATCH 095/843] nixos: add neo4j database module --- nixos/modules/misc/ids.nix | 1 + nixos/modules/module-list.nix | 1 + nixos/modules/services/databases/neo4j.nix | 143 +++++++++++++++++++++ 3 files changed, 145 insertions(+) create mode 100644 nixos/modules/services/databases/neo4j.nix diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix index b49837efd50..515105d886a 100644 --- a/nixos/modules/misc/ids.nix +++ b/nixos/modules/misc/ids.nix @@ -143,6 +143,7 @@ dhcpd = 133; siproxd = 134; mlmmj = 135; + neo4j = 136; # When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399! diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index c25110fc5b1..553f8db3696 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -100,6 +100,7 @@ ./services/databases/monetdb.nix ./services/databases/mongodb.nix ./services/databases/mysql.nix + ./services/databases/neo4j.nix ./services/databases/openldap.nix ./services/databases/postgresql.nix ./services/databases/redis.nix diff --git a/nixos/modules/services/databases/neo4j.nix b/nixos/modules/services/databases/neo4j.nix new file mode 100644 index 00000000000..2ef49a95166 --- /dev/null +++ b/nixos/modules/services/databases/neo4j.nix @@ -0,0 +1,143 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.neo4j; + + serverConfig = pkgs.writeText "neo4j-server.properties" '' + org.neo4j.server.database.location=${cfg.dataDir}/data/graph.db + org.neo4j.server.webserver.address=${cfg.host} + org.neo4j.server.webserver.port=${toString cfg.port} + ${optionalString cfg.enableHttps '' + org.neo4j.server.webserver.https.enabled=true + org.neo4j.server.webserver.https.port=${toString cfg.httpsPort} + org.neo4j.server.webserver.https.cert.location=${cfg.cert} + org.neo4j.server.webserver.https.key.location=${cfg.key} + org.neo4j.server.webserver.https.keystore.location=${cfg.dataDir}/data/keystore + ''} + org.neo4j.server.webadmin.rrdb.location=${cfg.dataDir}/data/rrd + org.neo4j.server.webadmin.data.uri=/db/data/ + org.neo4j.server.webadmin.management.uri=/db/manage/ + org.neo4j.server.db.tuning.properties=${pkgs.neo4j}/share/neo4j/conf/neo4j.properties + org.neo4j.server.manage.console_engines=shell + ${cfg.extraServerConfig} + ''; + + loggingConfig = pkgs.writeText "logging.properties" cfg.loggingConfig; + + wrapperConfig = pkgs.writeText "neo4j-wrapper.conf" '' + wrapper.java.additional=-Dorg.neo4j.server.properties=${serverConfig} + wrapper.java.additional=-Djava.util.logging.config.file=${loggingConfig} + wrapper.java.additional=-XX:+UseConcMarkSweepGC + wrapper.java.additional=-XX:+CMSClassUnloadingEnabled + wrapper.pidfile=${cfg.dataDir}/neo4j-server.pid + wrapper.name=neo4j + ''; + +in { + + ###### interface + + options.services.neo4j = { + enable = mkOption { + description = "Whether to enable neo4j."; + default = false; + type = types.uniq types.bool; + }; + + host = mkOption { + description = "Neo4j listen address."; + default = "127.0.0.1"; + type = types.str; + }; + + port = mkOption { + description = "Neo4j port to listen for HTTP traffic."; + default = 7474; + type = types.int; + }; + + enableHttps = mkOption { + description = "Enable https for Neo4j."; + default = false; + type = types.bool; + }; + + httpsPort = mkOption { + description = "Neo4j port to listen for HTTPS traffic."; + default = 7473; + type = types.int; + }; + + cert = mkOption { + description = "Neo4j https certificate."; + default = "${cfg.dataDir}/conf/ssl/neo4j.cert"; + type = types.path; + }; + + key = mkOption { + description = "Neo4j https certificate key."; + default = "${cfg.dataDir}/conf/ssl/neo4j.key"; + type = types.path; + }; + + dataDir = mkOption { + description = "Neo4j data directory."; + default = "/var/lib/neo4j"; + type = types.path; + }; + + loggingConfig = mkOption { + description = "Neo4j logging configuration."; + default = '' + handlers=java.util.logging.ConsoleHandler + .level=INFO + org.neo4j.server.level=INFO + + java.util.logging.ConsoleHandler.level=INFO + java.util.logging.ConsoleHandler.formatter=org.neo4j.server.logging.SimpleConsoleFormatter + java.util.logging.ConsoleHandler.filter=org.neo4j.server.logging.NeoLogFilter + ''; + type = types.lines; + }; + + extraServerConfig = mkOption { + description = "Extra configuration for neo4j server."; + default = ""; + type = types.lines; + }; + + }; + + ###### implementation + + config = mkIf cfg.enable { + systemd.services.neo4j = { + description = "Neo4j Daemon"; + wantedBy = [ "multi-user.target" ]; + after = [ "network-interfaces.target" ]; + environment = { NEO4J_INSTANCE = cfg.dataDir; }; + serviceConfig = { + ExecStart = "${pkgs.neo4j}/bin/neo4j console"; + User = "neo4j"; + PermissionsStartOnly = true; + }; + preStart = '' + mkdir -m 0700 -p ${cfg.dataDir}/{data/graph.db,conf} + ln -fs ${wrapperConfig} ${cfg.dataDir}/conf/neo4j-wrapper.conf + if [ "$(id -u)" = 0 ]; then chown -R neo4j ${cfg.dataDir}; fi + ''; + }; + + environment.systemPackages = [ pkgs.neo4j ]; + + users.extraUsers = singleton { + name = "neo4j"; + uid = config.ids.uids.neo4j; + description = "Neo4j daemon user"; + home = cfg.dataDir; + }; + }; + +} -- GitLab From 1ff1fe44d9b3ffd032f6a50fc8d7fd457740b711 Mon Sep 17 00:00:00 2001 From: Aycan iRiCAN Date: Sat, 23 Aug 2014 12:28:35 +0300 Subject: [PATCH 096/843] Added myself to maintainer of hdaemonize and hweblib --- lib/maintainers.nix | 1 + pkgs/development/libraries/haskell/hdaemonize/default.nix | 1 + pkgs/development/libraries/haskell/hweblib/default.nix | 1 + 3 files changed, 3 insertions(+) diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 78f0d619cb0..8c975b486f1 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -19,6 +19,7 @@ astsmtl = "Alexander Tsamutali "; aszlig = "aszlig "; auntie = "Jonathan Glines "; + aycanirican = "Aycan iRiCAN "; bbenoist = "Baptist BENOIST "; bennofs = "Benno Fünfstück "; berdario = "Dario Bertini "; diff --git a/pkgs/development/libraries/haskell/hdaemonize/default.nix b/pkgs/development/libraries/haskell/hdaemonize/default.nix index e342773775d..f5a67b49626 100644 --- a/pkgs/development/libraries/haskell/hdaemonize/default.nix +++ b/pkgs/development/libraries/haskell/hdaemonize/default.nix @@ -12,5 +12,6 @@ cabal.mkDerivation (self: { description = "Library to handle the details of writing daemons for UNIX"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.aycanirican ]; }; }) diff --git a/pkgs/development/libraries/haskell/hweblib/default.nix b/pkgs/development/libraries/haskell/hweblib/default.nix index 1ce64baa09c..93e0bd62274 100644 --- a/pkgs/development/libraries/haskell/hweblib/default.nix +++ b/pkgs/development/libraries/haskell/hweblib/default.nix @@ -13,5 +13,6 @@ cabal.mkDerivation (self: { description = "Haskell Web Library"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.aycanirican ]; }; }) -- GitLab From 01cc5a98d675ed7a95bc238dce1f8826a3eae8f6 Mon Sep 17 00:00:00 2001 From: Jos van den Oever Date: Sat, 23 Aug 2014 11:21:51 +0200 Subject: [PATCH 097/843] qt-5.3: update to 5.3.1 --- pkgs/development/libraries/qt-5/qt-5.3.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/qt-5/qt-5.3.nix b/pkgs/development/libraries/qt-5/qt-5.3.nix index 1722a1e52a1..18b464c6f24 100644 --- a/pkgs/development/libraries/qt-5/qt-5.3.nix +++ b/pkgs/development/libraries/qt-5/qt-5.3.nix @@ -18,7 +18,7 @@ with stdenv.lib; let v_maj = "5.3"; - v_min = "0"; + v_min = "1"; 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 = "09gp19377zpqyfzk063b3pjz8gjm2x7xsj71bdpmnhs1scz0khcj"; + sha256 = "189mgfqxjg0jp0vkfrj55p9brl018wzf7lir8yjr0pajp8jqd2ds"; }; # The version property must be kept because it will be included into the QtSDK package name -- GitLab From bd32f323d81c59a9c9373422c49b5c57883296d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Sat, 23 Aug 2014 11:39:05 +0200 Subject: [PATCH 098/843] k3d: move patches into source --- .../graphics/k3d/debian-patches.nix | 14 ----- .../graphics/k3d/debian-patches.txt | 3 -- pkgs/applications/graphics/k3d/default.nix | 12 +++-- .../k3d/disable_mutable_in_boost_gil.patch | 20 +++++++ .../graphics/k3d/k3d-0.7.11.0-libpng14.patch | 54 +++++++++++++++++++ .../graphics/k3d/k3d_gtkmm224.patch | 40 ++++++++++++++ 6 files changed, 121 insertions(+), 22 deletions(-) delete mode 100644 pkgs/applications/graphics/k3d/debian-patches.nix delete mode 100644 pkgs/applications/graphics/k3d/debian-patches.txt create mode 100644 pkgs/applications/graphics/k3d/disable_mutable_in_boost_gil.patch create mode 100644 pkgs/applications/graphics/k3d/k3d-0.7.11.0-libpng14.patch create mode 100644 pkgs/applications/graphics/k3d/k3d_gtkmm224.patch diff --git a/pkgs/applications/graphics/k3d/debian-patches.nix b/pkgs/applications/graphics/k3d/debian-patches.nix deleted file mode 100644 index cf6b47ee959..00000000000 --- a/pkgs/applications/graphics/k3d/debian-patches.nix +++ /dev/null @@ -1,14 +0,0 @@ -# Generated by debian-patches.sh from debian-patches.txt -let - prefix = "http://patch-tracker.debian.org/patch/series/dl/k3d/0.8.0.2-18"; -in -[ - { - url = "${prefix}/disable_mutable_in_boost_gil.patch"; - sha256 = "037l86h2hszqgw8arqpzprz5qvngsb61i7lpww617mkvqrc4hiq3"; - } - { - url = "${prefix}/k3d_gtkmm224.patch"; - sha256 = "1c7z2zkqs9qw185q7bhz6vvzl6vlf1zpg9vlhc1f0cz9rgak3gji"; - } -] diff --git a/pkgs/applications/graphics/k3d/debian-patches.txt b/pkgs/applications/graphics/k3d/debian-patches.txt deleted file mode 100644 index a9b4abed2f0..00000000000 --- a/pkgs/applications/graphics/k3d/debian-patches.txt +++ /dev/null @@ -1,3 +0,0 @@ -k3d/0.8.0.2-15 -disable_mutable_in_boost_gil.patch -k3d_gtkmm224.patch diff --git a/pkgs/applications/graphics/k3d/default.nix b/pkgs/applications/graphics/k3d/default.nix index 9f31d94ac7f..35f3bed866d 100644 --- a/pkgs/applications/graphics/k3d/default.nix +++ b/pkgs/applications/graphics/k3d/default.nix @@ -12,11 +12,13 @@ stdenv.mkDerivation rec { sha256 = "01fd2qb0zddif3wz1a2wdmwyzn81cf73678qp2gjs8iikmdz6w7x"; }; - patches = map fetchurl ((import ./debian-patches.nix) ++ - [ { - url = http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/media-gfx/k3d/files/k3d-0.7.11.0-libpng14.patch; - sha256 = "1vl7dbvxg9b54ay0n8dd2v2k3j001h8h1bpr1cbm3vrzv31lnwzx"; - } ]); + patches = [ + # debian package source + ./disable_mutable_in_boost_gil.patch + ./k3d_gtkmm224.patch + # http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/media-gfx/k3d/files/k3d-0.7.11.0-libpng14.patch + ./k3d-0.7.11.0-libpng14.patch + ]; preConfigure = '' export LD_LIBRARY_PATH="$LD_LIBRARY_PATH''${LD_LIBRARY_PATH:+:}$PWD/build/lib" diff --git a/pkgs/applications/graphics/k3d/disable_mutable_in_boost_gil.patch b/pkgs/applications/graphics/k3d/disable_mutable_in_boost_gil.patch new file mode 100644 index 00000000000..1774328c618 --- /dev/null +++ b/pkgs/applications/graphics/k3d/disable_mutable_in_boost_gil.patch @@ -0,0 +1,20 @@ +--- a/k3dsdk/gil/boost/gil/extension/dynamic_image/apply_operation_base.hpp ++++ b/k3dsdk/gil/boost/gil/extension/dynamic_image/apply_operation_base.hpp +@@ -114,7 +114,7 @@ + template + struct reduce_bind1 { + const T2& _t2; +- mutable Op& _op; ++ Op& _op; + + typedef typename Op::result_type result_type; + +@@ -127,7 +127,7 @@ + struct reduce_bind2 { + const Bits1& _bits1; + std::size_t _index1; +- mutable Op& _op; ++ Op& _op; + + typedef typename Op::result_type result_type; + diff --git a/pkgs/applications/graphics/k3d/k3d-0.7.11.0-libpng14.patch b/pkgs/applications/graphics/k3d/k3d-0.7.11.0-libpng14.patch new file mode 100644 index 00000000000..b54168227b4 --- /dev/null +++ b/pkgs/applications/graphics/k3d/k3d-0.7.11.0-libpng14.patch @@ -0,0 +1,54 @@ +diff -ur k3d-source-0.7.11.0.orig/k3dsdk/gil/boost/gil/extension/io/png_io_private.hpp k3d-source-0.7.11.0/k3dsdk/gil/boost/gil/extension/io/png_io_private.hpp +--- k3d-source-0.7.11.0.orig/k3dsdk/gil/boost/gil/extension/io/png_io_private.hpp 2009-03-19 22:28:53.000000000 +0200 ++++ k3d-source-0.7.11.0/k3dsdk/gil/boost/gil/extension/io/png_io_private.hpp 2010-05-12 12:21:50.000000000 +0300 +@@ -148,12 +148,12 @@ + // allocate/initialize the image information data + _info_ptr = png_create_info_struct(_png_ptr); + if (_info_ptr == NULL) { +- png_destroy_read_struct(&_png_ptr,png_infopp_NULL,png_infopp_NULL); ++ png_destroy_read_struct(&_png_ptr,NULL,NULL); + io_error("png_get_file_size: fail to call png_create_info_struct()"); + } + if (setjmp(png_jmpbuf(_png_ptr))) { + //free all of the memory associated with the png_ptr and info_ptr +- png_destroy_read_struct(&_png_ptr, &_info_ptr, png_infopp_NULL); ++ png_destroy_read_struct(&_png_ptr, &_info_ptr, NULL); + io_error("png_get_file_size: fail to call setjmp()"); + } + png_init_io(_png_ptr, get()); +@@ -165,7 +165,7 @@ + png_reader(const char* filename) : file_mgr(filename, "rb") { init(); } + + ~png_reader() { +- png_destroy_read_struct(&_png_ptr,&_info_ptr,png_infopp_NULL); ++ png_destroy_read_struct(&_png_ptr,&_info_ptr,NULL); + } + point2 get_dimensions() { + return point2(png_get_image_width(_png_ptr,_info_ptr), +@@ -177,7 +177,7 @@ + int bit_depth, color_type, interlace_type; + png_get_IHDR(_png_ptr, _info_ptr, + &width, &height,&bit_depth,&color_type,&interlace_type, +- int_p_NULL, int_p_NULL); ++ (int *) NULL, (int *) NULL); + io_error_if(((png_uint_32)view.width()!=width || (png_uint_32)view.height()!= height), + "png_read_view: input view size does not match PNG file size"); + +@@ -219,7 +219,7 @@ + int bit_depth, color_type, interlace_type; + png_get_IHDR(_png_ptr, _info_ptr, + &width, &height,&bit_depth,&color_type,&interlace_type, +- int_p_NULL, int_p_NULL); ++ (int *) NULL, (int *) NULL); + io_error_if(((png_uint_32)view.width()!=width || (png_uint_32)view.height()!= height), + "png_reader_color_convert::apply(): input view size does not match PNG file size"); + switch (color_type) { +@@ -308,7 +308,7 @@ + io_error_if(!_png_ptr,"png_write_initialize: fail to call png_create_write_struct()"); + _info_ptr = png_create_info_struct(_png_ptr); + if (!_info_ptr) { +- png_destroy_write_struct(&_png_ptr,png_infopp_NULL); ++ png_destroy_write_struct(&_png_ptr,NULL); + io_error("png_write_initialize: fail to call png_create_info_struct()"); + } + if (setjmp(png_jmpbuf(_png_ptr))) { diff --git a/pkgs/applications/graphics/k3d/k3d_gtkmm224.patch b/pkgs/applications/graphics/k3d/k3d_gtkmm224.patch new file mode 100644 index 00000000000..2484994531f --- /dev/null +++ b/pkgs/applications/graphics/k3d/k3d_gtkmm224.patch @@ -0,0 +1,40 @@ +--- a/k3dsdk/ngui/main_document_window.cpp ++++ b/k3dsdk/ngui/main_document_window.cpp +@@ -1371,7 +1371,7 @@ + Gtk::HBox import_box(false, 5); + Gtk::Label import_label(_("Choose import plugin:")); + +- Gtk::ComboBox import_combo(model); ++ Gtk::ComboBox import_combo((Glib::RefPtr &) model); + import_combo.pack_start(columns.icon, false); + import_combo.pack_start(columns.label); + import_combo.set_active(0); +@@ -1461,7 +1461,7 @@ + Gtk::HBox export_box(false, 5); + Gtk::Label export_label(_("Choose export plugin:")); + +- Gtk::ComboBox export_combo(model); ++ Gtk::ComboBox export_combo((Glib::RefPtr &) model); + export_combo.pack_start(columns.icon, false); + export_combo.pack_start(columns.label); + export_combo.set_active(0); +--- a/k3dsdk/ngui/render.cpp ++++ b/k3dsdk/ngui/render.cpp +@@ -169,7 +169,7 @@ + row[columns.separator] = false; + } + +- Gtk::ComboBox combo(model); ++ Gtk::ComboBox combo((Glib::RefPtr &) model); + + combo.pack_start(columns.icon, false); + +@@ -295,7 +295,7 @@ + row[columns.separator] = false; + } + +- Gtk::ComboBox combo(model); ++ Gtk::ComboBox combo((Glib::RefPtr &) model); + + combo.pack_start(columns.icon, false); + -- GitLab From a3625b5b2bc3613eb3d665ddb797d56a8b3eaee3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=BCdiger=20Sonderfeld?= Date: Tue, 19 Aug 2014 16:26:12 +0200 Subject: [PATCH 099/843] smplayer: Update to 14.3.0. Requires mplayer to be compiled with FriBiDi support (4de6b9a). --- pkgs/applications/video/smplayer/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/smplayer/default.nix b/pkgs/applications/video/smplayer/default.nix index 8bd5b7c6160..018be742a16 100644 --- a/pkgs/applications/video/smplayer/default.nix +++ b/pkgs/applications/video/smplayer/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, qt4 }: stdenv.mkDerivation rec { - name = "smplayer-0.8.6"; + name = "smplayer-14.3.0"; src = fetchurl { url = "mirror://sourceforge/smplayer/${name}.tar.bz2"; - sha256 = "1p70929j8prc4mgqxvsbcjxy8zwp4r9jk0mp0iddxl7vfyck74g0"; + sha256 = "9b8db20043d1528ee5c6054526779e88a172d2c757429bd7095c794d65ecbc18"; }; buildInputs = [ qt4 ]; -- GitLab From e93eb3305822010062678c30dd7250c14874f87a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Sat, 23 Aug 2014 11:46:43 +0200 Subject: [PATCH 100/843] gtkglext: cleanup --- pkgs/desktops/gnome-2/platform/gtkglext/default.nix | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/pkgs/desktops/gnome-2/platform/gtkglext/default.nix b/pkgs/desktops/gnome-2/platform/gtkglext/default.nix index ee08975b9da..b278dadfe24 100644 --- a/pkgs/desktops/gnome-2/platform/gtkglext/default.nix +++ b/pkgs/desktops/gnome-2/platform/gtkglext/default.nix @@ -15,11 +15,9 @@ stdenv.mkDerivation rec { # `GTK_WIDGET_NO_WINDOW', all of which appear to be deprecated nowadays. CPPFLAGS = "-UGTK_DISABLE_DEPRECATED"; - meta = { + meta = with stdenv.lib; { homepage = http://projects.gnome.org/gtkglext/; - description = "GtkGLExt, an OpenGL extension to GTK+"; - longDescription = '' GtkGLExt is an OpenGL extension to GTK+. It provides additional GDK objects which support OpenGL rendering in GTK+ and GtkWidget API @@ -27,9 +25,7 @@ stdenv.mkDerivation rec { Löf's GtkGLArea, GtkGLExt provides a GtkWidget API that enables OpenGL drawing for standard and custom GTK+ widgets. ''; - - license = stdenv.lib.licenses.lgpl2Plus; - - maintainers = [ ]; + license = licenses.lgpl2Plus; + platforms = platforms.linux; }; } -- GitLab From 116930f5ba52d09df998cd7bf4d991f7c950b7e8 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Sat, 23 Aug 2014 12:03:03 +0200 Subject: [PATCH 101/843] calibre: update from 1.48.0 to 2.0.0 --- pkgs/applications/misc/calibre/default.nix | 36 ++++++++++++---------- pkgs/top-level/all-packages.nix | 4 ++- 2 files changed, 23 insertions(+), 17 deletions(-) diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index 3d814bf6a30..190b57e1070 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -1,30 +1,29 @@ -{ stdenv, fetchurl, python, pyqt4, sip, popplerQt4, pkgconfig, libpng -, imagemagick, libjpeg, fontconfig, podofo, qt48, icu, sqlite +{ stdenv, fetchurl, python, pyqt5, sip_4_16, poppler, pkgconfig, libpng +, imagemagick, libjpeg, fontconfig, podofo, qt5, icu, sqlite , pil, makeWrapper, unrar, chmlib, pythonPackages, xz, libusb1, libmtp +, xdg_utils }: stdenv.mkDerivation rec { - name = "calibre-1.48.0"; + name = "calibre-2.0.0"; src = fetchurl { url = "mirror://sourceforge/calibre/${name}.tar.xz"; - sha256 = "0wplmf3p4s5zwn9ri8ry18bx7k3pw1c1ngrc4msf7i8icq7hj177"; + sha256 = "1fpn8icfyag2ybj2ywd81sva56ycsin56gyap5m9j5crx63p4c91"; }; inherit python; - nativeBuildInputs = [ makeWrapper pkgconfig ]; - patchPhase = '' - tar xf ${qt48.src} - qtdir=$(realpath $(ls | grep qt | grep 4.8 | grep src)) - sed -i setup/build_environment.py \ - -e "s|^qt_private_inc = .*|qt_private_inc = ['$qtdir/include/%s'%(m) for m in ('QtGui', 'QtCore')]|" + sed -i "/pyqt_sip_dir/ s:=.*:= '${pyqt5}/share/sip':" \ + setup/build_environment.py ''; + nativeBuildInputs = [ makeWrapper pkgconfig ]; + buildInputs = - [ python pyqt4 sip popplerQt4 libpng imagemagick libjpeg - fontconfig podofo qt48 pil chmlib icu sqlite libusb1 libmtp + [ python pyqt5 sip_4_16 poppler libpng imagemagick libjpeg + fontconfig podofo qt5 pil chmlib icu sqlite libusb1 libmtp xdg_utils pythonPackages.mechanize pythonPackages.lxml pythonPackages.dateutil pythonPackages.cssutils pythonPackages.beautifulsoup pythonPackages.pillow pythonPackages.sqlite3 pythonPackages.netifaces pythonPackages.apsw @@ -33,14 +32,15 @@ stdenv.mkDerivation rec { installPhase = '' export HOME=$TMPDIR/fakehome - export POPPLER_INC_DIR=${popplerQt4}/include/poppler - export POPPLER_LIB_DIR=${popplerQt4}/lib + export POPPLER_INC_DIR=${poppler}/include/poppler + export POPPLER_LIB_DIR=${poppler}/lib export MAGICK_INC=${imagemagick}/include/ImageMagick export MAGICK_LIB=${imagemagick}/lib export FC_INC_DIR=${fontconfig}/include/fontconfig export FC_LIB_DIR=${fontconfig}/lib export PODOFO_INC_DIR=${podofo}/include/podofo export PODOFO_LIB_DIR=${podofo}/lib + export SIP_BIN=${sip_4_16}/bin/sip python setup.py install --prefix=$out PYFILES="$out/bin/* $out/lib/calibre/calibre/web/feeds/*.py @@ -48,8 +48,12 @@ stdenv.mkDerivation rec { $out/lib/calibre/calibre/ebooks/rtf2xml/*.py" sed -i "s/env python[0-9.]*/python/" $PYFILES + sed -i "2i import sys; sys.argv[0] = 'calibre'" $out/bin/calibre + for a in $out/bin/*; do - wrapProgram $a --prefix PYTHONPATH : $PYTHONPATH --prefix LD_LIBRARY_PATH : ${unrar}/lib --prefix PATH : ${popplerQt4}/bin + wrapProgram $a --prefix PYTHONPATH : $PYTHONPATH \ + --prefix LD_LIBRARY_PATH : ${unrar}/lib \ + --prefix PATH : ${poppler}/bin done ''; @@ -57,7 +61,7 @@ stdenv.mkDerivation rec { description = "Comprehensive e-book software"; homepage = http://calibre-ebook.com; license = licenses.gpl3; - maintainers = with maintainers; [ viric iElectric ]; + maintainers = with maintainers; [ viric iElectric pSub ]; platforms = platforms.linux; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index dac0abde0dd..3d4e983c048 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8277,7 +8277,9 @@ let inherit (gnome) libglade; }; - calibre = callPackage ../applications/misc/calibre { }; + calibre = callPackage ../applications/misc/calibre { + inherit (pythonPackages) pyqt5 sip_4_16; + }; camlistore = callPackage ../applications/misc/camlistore { }; -- GitLab From 01560400aace3e535e4f05b8497d92b0fec6ad5e Mon Sep 17 00:00:00 2001 From: Rickard Nilsson Date: Thu, 21 Aug 2014 17:54:42 +0200 Subject: [PATCH 102/843] libvirt: Update from 1.2.5 to 1.2.7 --- pkgs/development/libraries/libvirt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libvirt/default.nix b/pkgs/development/libraries/libvirt/default.nix index 4027bd8a84e..e2ff06fcd43 100644 --- a/pkgs/development/libraries/libvirt/default.nix +++ b/pkgs/development/libraries/libvirt/default.nix @@ -4,14 +4,14 @@ , dnsmasq, libnl }: -let version = "1.2.5"; in +let version = "1.2.7"; in stdenv.mkDerivation rec { name = "libvirt-${version}"; src = fetchurl { url = "http://libvirt.org/sources/${name}.tar.gz"; - sha256 = "0igd74wkksgv24i2xaa8wx51iqpgjp1v7820pk93m0jv8gipvscf"; + sha256 = "1z6yfzzbf9rvqjq1my7x1br73g8dz8kij3khpb4x520ip8n4dyrx"; }; buildInputs = [ -- GitLab From 52b53dc37022210385b83af58a07e67d4d104f69 Mon Sep 17 00:00:00 2001 From: Rickard Nilsson Date: Sat, 23 Aug 2014 12:07:07 +0200 Subject: [PATCH 103/843] ruby gems: Add riemann-dash --- .../interpreters/ruby/generated.nix | 1955 ++++++----------- 1 file changed, 622 insertions(+), 1333 deletions(-) diff --git a/pkgs/development/interpreters/ruby/generated.nix b/pkgs/development/interpreters/ruby/generated.nix index 84492e09386..01bbaa390f9 100644 --- a/pkgs/development/interpreters/ruby/generated.nix +++ b/pkgs/development/interpreters/ruby/generated.nix @@ -3,180 +3,140 @@ g: # Get dependencies from patched gems { aliases = { - ZenTest = g.ZenTest_4_9_3; - actionmailer = g.actionmailer_4_0_0; - actionpack = g.actionpack_4_0_0; - activemodel = g.activemodel_4_0_0; - activerecord = g.activerecord_4_0_0; - activerecord_deprecated_finders = g.activerecord_deprecated_finders_1_0_3; - activesupport = g.activesupport_4_0_0; - addressable = g.addressable_2_3_5; - arel = g.arel_4_0_0; - atomic = g.atomic_1_1_14; + ZenTest = g.ZenTest_4_10_1; + actionmailer = g.actionmailer_4_1_5; + actionpack = g.actionpack_4_1_5; + actionview = g.actionview_4_1_5; + activemodel = g.activemodel_4_1_5; + activerecord = g.activerecord_4_1_5; + activesupport = g.activesupport_4_1_5; + addressable = g.addressable_2_3_6; + arel = g.arel_5_0_1_20140414130214; atoulme_Antwrap = g.atoulme_Antwrap_0_7_4; - autotest_rails = g.autotest_rails_4_1_2; - aws_sdk = g.aws_sdk_1_16_1; - backports = g.backports_3_3_3; - bitbucket_backup = g.bitbucket_backup_0_3_0; + autotest_rails = g.autotest_rails_4_2_1; + aws_sdk = g.aws_sdk_1_51_0; + backports = g.backports_3_6_0; + bitbucket_backup = g.bitbucket_backup_0_3_1; builder = g.builder_3_2_2; - buildr = g.buildr_1_4_12; - bundler = g.bundler_1_3_5; - celluloid = g.celluloid_0_15_2; - childprocess = g.childprocess_0_3_9; - chronic = g.chronic_0_10_1; - classifier = g.classifier_1_3_3; - coderay = g.coderay_1_0_9; - coffee_rails = g.coffee_rails_4_0_1; - coffee_script = g.coffee_script_2_2_0; - coffee_script_source = g.coffee_script_source_1_6_3; - colorator = g.colorator_0_1; - commander = g.commander_4_1_5; - cucumber = g.cucumber_1_3_8; + buildr = g.buildr_1_4_19; + bundler = g.bundler_1_7_0; + childprocess = g.childprocess_0_5_3; + chronic = g.chronic_0_10_2; + coderay = g.coderay_1_1_0; + cucumber = g.cucumber_1_3_16; daemons = g.daemons_1_1_9; - diff_lcs = g.diff_lcs_1_1_3; + diff_lcs = g.diff_lcs_1_2_5; dimensions = g.dimensions_1_2_0; - domain_name = g.domain_name_0_5_13; - dotenv = g.dotenv_0_9_0; + domain_name = g.domain_name_0_5_20; + dotenv = g.dotenv_0_11_1; + dotenv_deployment = g.dotenv_deployment_0_0_2; em_resolv_replace = g.em_resolv_replace_1_1_3; erubis = g.erubis_2_7_0; - ethon = g.ethon_0_6_1; + ethon = g.ethon_0_7_1; eventmachine = g.eventmachine_1_0_3; eventmachine_tail = g.eventmachine_tail_0_6_4; - excon = g.excon_0_25_3; - execjs = g.execjs_2_0_2; - fakes3 = g.fakes3_0_1_5; - faraday = g.faraday_0_8_8; - faraday_middleware = g.faraday_middleware_0_9_0; - fast_stemmer = g.fast_stemmer_1_0_2; - ffi = g.ffi_1_9_0; + fakes3 = g.fakes3_0_1_5_2; + faraday = g.faraday_0_9_0; + faraday_middleware = g.faraday_middleware_0_9_1; + ffi = g.ffi_1_9_3; file_tail = g.file_tail_1_0_12; - foreman = g.foreman_0_63_0; - formatador = g.formatador_0_2_4; - gettext = g.gettext_3_0_0; - gh = g.gh_0_12_0; - gherkin = g.gherkin_2_12_1; - guard = g.guard_2_2_4; - highline = g.highline_1_6_19; + foreman = g.foreman_0_74_0; + gettext = g.gettext_3_1_3; + gh = g.gh_0_13_2; + gherkin = g.gherkin_2_12_2; + highline = g.highline_1_6_21; hike = g.hike_1_2_3; - hoe = g.hoe_3_1_0; - http_cookie = g.http_cookie_1_0_1; - i18n = g.i18n_0_6_5; - iconv = g.iconv_1_0_3; - jekyll = g.jekyll_1_3_0; - jquery_rails = g.jquery_rails_3_0_4; - jruby_pageant = g.jruby_pageant_1_1_1; - jsduck = g.jsduck_5_1_0; - json = g.json_1_8_0; + hoe = g.hoe_3_7_1; + http_cookie = g.http_cookie_1_0_2; + i18n = g.i18n_0_6_11; + iconv = g.iconv_1_0_4; + jsduck = g.jsduck_5_3_4; + json = g.json_1_8_1; json_pure = g.json_pure_1_8_0; - launchy = g.launchy_2_3_0; - liquid = g.liquid_2_5_4; - listen = g.listen_2_2_0; - locale = g.locale_2_0_8; - lockfile = g.lockfile_2_1_0; - lumberjack = g.lumberjack_1_0_4; - macaddr = g.macaddr_1_6_1; - maruku = g.maruku_0_6_1; - mail = g.mail_2_5_4; - mechanize = g.mechanize_2_7_2; + launchy = g.launchy_2_4_2; + locale = g.locale_2_1_0; + lockfile = g.lockfile_2_1_3; + macaddr = g.macaddr_1_7_1; + mail = g.mail_2_6_1; + mechanize = g.mechanize_2_7_3; method_source = g.method_source_0_8_2; - mime_types = g.mime_types_1_25; - mini_portile = g.mini_portile_0_5_1; - minitar = g.minitar_0_5_3; - minitest = g.minitest_4_7_5; - mono_logger = g.mono_logger_1_1_0; - multi_json = g.multi_json_1_8_2; - multi_test = g.multi_test_0_0_2; - multipart_post = g.multipart_post_1_2_0; + mime_types = g.mime_types_2_3; + mini_portile = g.mini_portile_0_6_0; + minitar = g.minitar_0_5_4; + minitest = g.minitest_5_4_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; net_http_digest_auth = g.net_http_digest_auth_1_4; - net_http_persistent = g.net_http_persistent_2_9; + net_http_persistent = g.net_http_persistent_2_9_4; net_http_pipeline = g.net_http_pipeline_1_0_1; - net_sftp = g.net_sftp_2_0_5; - net_ssh = g.net_ssh_2_6_8; - netrc = g.netrc_0_7_7; + net_sftp = g.net_sftp_2_1_2; + net_ssh = g.net_ssh_2_9_1; nix = g.nix_0_1_1; - nokogiri = g.nokogiri_1_6_0; + nokogiri = g.nokogiri_1_6_3_1; ntlm_http = g.ntlm_http_0_1_1; - papertrail = g.papertrail_0_9_7; + orderedhash = g.orderedhash_0_0_6; + papertrail = g.papertrail_0_9_10; papertrail_cli = g.papertrail_cli_0_9_3; parallel = g.parallel_0_7_1; - polyglot = g.polyglot_0_3_3; - posix_spawn = g.posix_spawn_0_3_6; - pry = g.pry_0_9_12_2; - pusher_client = g.pusher_client_0_3_1; + polyglot = g.polyglot_0_3_5; + pry = g.pry_0_9_12_6; + pusher_client = g.pusher_client_0_6_0; rack = g.rack_1_5_2; - rack_protection = g.rack_protection_1_5_1; - rails = g.rails_4_0_0; - railties = g.railties_4_0_0; - rake = g.rake_10_1_0; - rb_fsevent = g.rb_fsevent_0_9_3; - rb_inotify = g.rb_inotify_0_9_2; - rb_kqueue = g.rb_kqueue_0_2_0; - rdiscount = g.rdiscount_2_1_6; - redcarpet = g.redcarpet_2_3_0; - redis = g.redis_3_0_5; - redis_namespace = g.redis_namespace_1_3_1; + rack_protection = g.rack_protection_1_5_3; + rack_test = g.rack_test_0_6_2; + rails = g.rails_4_1_5; + railties = g.railties_4_1_5; + rake = g.rake_10_3_2; + rb_fsevent = g.rb_fsevent_0_9_4; + rdiscount = g.rdiscount_2_1_7_1; remote_syslog = g.remote_syslog_1_6_14; - resque = g.resque_1_25_1; - resque_web = g.resque_web_0_0_3; - 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_4_0; - rjb = g.rjb_1_4_8; - rkelly_remix = g.rkelly_remix_0_0_4; - rmagick = g.rmagick_2_13_2; + right_http_connection = g.right_http_connection_1_5_0; + rjb = g.rjb_1_4_9; + rkelly_remix = g.rkelly_remix_0_0_6; rmail = g.rmail_1_0_0; - rmail_sup = g.rmail_sup_1_0_1; - rspec = g.rspec_2_11_0; - rspec_core = g.rspec_core_2_11_1; - rspec_expectations = g.rspec_expectations_2_11_3; - rspec_mocks = g.rspec_mocks_2_11_3; - ruby_hmac = g.ruby_hmac_0_4_0; - rubyforge = g.rubyforge_2_0_4; - rubyzip = g.rubyzip_0_9_9; - safe_yaml = g.safe_yaml_0_9_7; - sass = g.sass_3_2_12; - sass_rails = g.sass_rails_4_0_1; - selenium_webdriver = g.selenium_webdriver_2_35_1; + rspec = g.rspec_2_14_1; + rspec_core = g.rspec_core_2_14_8; + rspec_expectations = g.rspec_expectations_2_14_5; + rspec_mocks = g.rspec_mocks_2_14_6; + rubyzip = g.rubyzip_1_1_6; + sass = g.sass_3_4_0; + selenium_webdriver = g.selenium_webdriver_2_42_0; servolux = g.servolux_0_10_0; - sinatra = g.sinatra_1_4_4; - slop = g.slop_3_4_6; - sprockets = g.sprockets_2_10_0; - sprockets_rails = g.sprockets_rails_2_0_1; - syntax = g.syntax_1_0_0; + sinatra = g.sinatra_1_4_5; + slop = g.slop_3_6_0; + sprockets = g.sprockets_2_12_1; + sprockets_rails = g.sprockets_rails_2_1_3; syslog_protocol = g.syslog_protocol_0_9_2; - systemu = g.systemu_2_5_2; + systemu = g.systemu_2_6_4; taskjuggler = g.taskjuggler_3_5_0; - term_ansicolor = g.term_ansicolor_1_2_2; - terminal_notifier = g.terminal_notifier_1_5_1; - text = g.text_1_2_3; - thin = g.thin_1_5_1; - thor = g.thor_0_18_1; - thread_safe = g.thread_safe_0_1_3; + term_ansicolor = g.term_ansicolor_1_3_0; + text = g.text_1_3_0; + thin = g.thin_1_6_2; + thor = g.thor_0_19_1; + thread_safe = g.thread_safe_0_3_4; tilt = g.tilt_1_4_1; - timers = g.timers_1_1_0; - tins = g.tins_0_9_0; - travis = g.travis_1_5_3; + tins = g.tins_1_3_2; + travis = g.travis_1_7_1; treetop = g.treetop_1_4_15; trollop = g.trollop_2_0; - twitter_bootstrap_rails = g.twitter_bootstrap_rails_2_2_8; - typhoeus = g.typhoeus_0_6_5; - tzinfo = g.tzinfo_0_3_38; - unf = g.unf_0_1_2; + typhoeus = g.typhoeus_0_6_9; + tzinfo = g.tzinfo_1_2_2; + unf = g.unf_0_1_4; unf_ext = g.unf_ext_0_0_6; - unicode = g.unicode_0_4_4; uuid = g.uuid_2_3_7; - uuidtools = g.uuidtools_2_1_4; - vegas = g.vegas_0_1_11; + webrick = g.webrick_1_3_1; webrobots = g.webrobots_0_1_1; - websocket = g.websocket_1_0_7; + websocket = g.websocket_1_2_0; xapian_full = g.xapian_full_1_2_3; - xapian_ruby = g.xapian_ruby_1_2_15_1; - xml_simple = g.xml_simple_1_1_1; - yajl_ruby = g.yajl_ruby_1_1_0; + xapian_ruby = g.xapian_ruby_1_2_17; + xml_simple = g.xml_simple_1_1_2; }; - gem_nix_args = [ ''autotest-rails'' ''aws-sdk'' ''bitbucket-backup'' ''buildr'' ''cucumber'' ''fakes3'' ''foreman'' ''gettext'' ''iconv'' ''jsduck'' ''lockfile'' ''mechanize'' ''nix'' ''papertrail-cli'' ''rails'' ''rake'' ''rb-fsevent'' ''remote_syslog'' ''right_aws'' ''rmail'' ''sass'' ''selenium-webdriver'' ''sinatra-1.3.2'' ''taskjuggler'' ''thin'' ''travis'' ''trollop'' ''uuid'' ''xapian-full'' ''xapian-ruby'' ]; + gem_nix_args = [ ''autotest-rails'' ''aws-sdk'' ''bitbucket-backup'' ''buildr'' ''cucumber'' ''fakes3'' ''foreman'' ''gettext'' ''iconv'' ''jsduck'' ''lockfile'' ''mechanize'' ''nix'' ''papertrail-cli'' ''rails'' ''rake'' ''rb-fsevent'' ''remote_syslog'' ''riemann-dash'' ''right_aws'' ''rmail'' ''sass'' ''selenium-webdriver'' ''sinatra-1.3.2'' ''taskjuggler'' ''thin'' ''travis'' ''trollop'' ''uuid'' ''xapian-full'' ''xapian-ruby'' ]; gems = { - ZenTest_4_9_3 = { + ZenTest_4_10_1 = { basename = ''ZenTest''; meta = { description = ''ZenTest provides 4 different tools: zentest, unit_diff, autotest, and multiruby''; @@ -203,77 +163,77 @@ multiruby runs anything you want on multiple versions of ruby. Great for compatibility checking! Use multiruby_setup to manage your installed versions.''; }; - name = ''ZenTest-4.9.3''; + name = ''ZenTest-4.10.1''; requiredGems = [ ]; - sha256 = ''0rd07scqhdy9sfygbgbdick895pk4pbamcl70hr78cylhqpk6m38''; + sha256 = ''1jyk0lag27s71idna2h72ljskimj0snsiw7diyjx5rqxnz6fj7z1''; }; - actionmailer_4_0_0 = { + actionmailer_4_1_5 = { basename = ''actionmailer''; meta = { description = ''Email composition, delivery, and receiving framework (part of Rails).''; homepage = ''http://www.rubyonrails.org''; longDescription = ''Email on Rails. Compose, deliver, receive, and test emails using the familiar controller/view pattern. First-class support for multipart email and attachments.''; }; - name = ''actionmailer-4.0.0''; - requiredGems = [ g.actionpack_4_0_0 g.mail_2_5_4 ]; - sha256 = ''0d63hmddll0vdbzzxj4zl6njv1pm7j2njvqfccvvyypwsynfjkgk''; + name = ''actionmailer-4.1.5''; + requiredGems = [ g.actionpack_4_1_5 g.actionview_4_1_5 g.mail_2_5_4 ]; + sha256 = ''19frz9njy6jbxh7yasx62l4ifns3dxfkfqvnxlqb4pwsz7lqcp9c''; }; - actionpack_4_0_0 = { + actionpack_4_1_5 = { basename = ''actionpack''; meta = { description = ''Web-flow and rendering framework putting the VC in MVC (part of Rails).''; homepage = ''http://www.rubyonrails.org''; longDescription = ''Web apps on Rails. Simple, battle-tested conventions for building and testing MVC web applications. Works with any Rack-compatible server.''; }; - name = ''actionpack-4.0.0''; - requiredGems = [ g.activesupport_4_0_0 g.builder_3_1_4 g.rack_1_5_2 g.rack_test_0_6_2 g.erubis_2_7_0 ]; - sha256 = ''0hx9hdbqqm73l81p5r520zdk218739414yhw9yrys905ks2f5j4d''; + name = ''actionpack-4.1.5''; + requiredGems = [ g.activesupport_4_1_5 g.rack_1_5_2 g.rack_test_0_6_2 g.actionview_4_1_5 ]; + sha256 = ''05wh3c5rw3c0rsza3bnpmr6s63n481d4gkbhsp3ngwn9lpp3jdb6''; }; - activemodel_4_0_0 = { + actionview_4_1_5 = { + basename = ''actionview''; + meta = { + description = ''Rendering framework putting the V in MVC (part of Rails).''; + homepage = ''http://www.rubyonrails.org''; + longDescription = ''Simple, battle-tested conventions and helpers for building web pages.''; + }; + name = ''actionview-4.1.5''; + requiredGems = [ g.activesupport_4_1_5 g.builder_3_2_2 g.erubis_2_7_0 ]; + sha256 = ''02zb4xi2farzh892j9awxshyly7ijlvbj39g6cwq5mhs5cx59qk8''; + }; + activemodel_4_1_5 = { basename = ''activemodel''; meta = { description = ''A toolkit for building modeling frameworks (part of Rails).''; homepage = ''http://www.rubyonrails.org''; - longDescription = ''A toolkit for building modeling frameworks like Active Record. Rich support for attributes, callbacks, validations, observers, serialization, internationalization, and testing.''; + longDescription = ''A toolkit for building modeling frameworks like Active Record. Rich support for attributes, callbacks, validations, serialization, internationalization, and testing.''; }; - name = ''activemodel-4.0.0''; - requiredGems = [ g.activesupport_4_0_0 g.builder_3_1_4 ]; - sha256 = ''0vsq5bzsyfrzgnhizlipivmh7m9p0ky29avx47wnaqwjlpkir5m2''; + name = ''activemodel-4.1.5''; + requiredGems = [ g.activesupport_4_1_5 g.builder_3_2_2 ]; + sha256 = ''1anbjwdfgdjfxiv5vzysrdd98mapvd2h8xjkayq3vq54n13ymjvl''; }; - activerecord_4_0_0 = { + activerecord_4_1_5 = { basename = ''activerecord''; meta = { description = ''Object-relational mapper framework (part of Rails).''; homepage = ''http://www.rubyonrails.org''; longDescription = ''Databases on Rails. Build a persistent domain model by mapping database tables to Ruby classes. Strong conventions for associations, validations, aggregations, migrations, and testing come baked-in.''; }; - name = ''activerecord-4.0.0''; - requiredGems = [ g.activesupport_4_0_0 g.activemodel_4_0_0 g.arel_4_0_0 g.activerecord_deprecated_finders_1_0_3 ]; - sha256 = ''0lhksb0172kz23yhibr1rxihyp01h2ajqxd0l4nahs2qc9jlr722''; - }; - activerecord_deprecated_finders_1_0_3 = { - basename = ''activerecord_deprecated_finders''; - meta = { - description = ''This gem contains deprecated finder APIs extracted from Active Record.''; - homepage = ''https://github.com/rails/activerecord-deprecated_finders''; - longDescription = ''Deprecated finder APIs extracted from Active Record.''; - }; - name = ''activerecord-deprecated_finders-1.0.3''; - requiredGems = [ ]; - sha256 = ''1z2g7h2ywhplrsjrsh8961agf17s9rj8ypdwjj482mw86if3dslp''; + name = ''activerecord-4.1.5''; + requiredGems = [ g.activesupport_4_1_5 g.activemodel_4_1_5 g.arel_5_0_1_20140414130214 ]; + sha256 = ''1z8awkkl4bn4ghdp432n2qpagbb8569ffq63kmgkbwf8127kmzrc''; }; - activesupport_4_0_0 = { + activesupport_4_1_5 = { basename = ''activesupport''; meta = { description = ''A toolkit of support libraries and Ruby core extensions extracted from the Rails framework.''; homepage = ''http://www.rubyonrails.org''; 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.0.0''; - requiredGems = [ g.i18n_0_6_5 g.multi_json_1_7_9 g.tzinfo_0_3_37 g.minitest_4_7_5 g.thread_safe_0_1_2 ]; - sha256 = ''0agxkvjhhv6r9rpm0lcgjny4sn1ihhvhlgs46rgi3fz0y1d93ids''; + name = ''activesupport-4.1.5''; + requiredGems = [ g.i18n_0_6_11 g.json_1_8_1 g.tzinfo_1_2_2 g.minitest_5_4_0 g.thread_safe_0_3_4 ]; + sha256 = ''0vmf58q96469dci509hhbqxwr7gaxq4yjsb37xd56ggpqn3qm30k''; }; - addressable_2_3_5 = { + addressable_2_3_6 = { basename = ''addressable''; meta = { description = ''URI Implementation''; @@ -283,11 +243,11 @@ Ruby's standard library. It more closely conforms to the relevant RFCs and adds support for IRIs and URI templates. ''; }; - name = ''addressable-2.3.5''; + name = ''addressable-2.3.6''; requiredGems = [ ]; - sha256 = ''11hv69v6h39j7m4v51a4p7my7xwjbhxbsg3y7ja156z7by10wkg7''; + sha256 = ''137fj0whmn1kvaq8wjalp8x4qbblwzvg3g4bfx8d8lfi6f0w48p8''; }; - arel_4_0_0 = { + arel_5_0_1_20140414130214 = { basename = ''arel''; meta = { description = ''Arel is a SQL AST manager for Ruby''; @@ -295,37 +255,15 @@ adds support for IRIs and URI templates. longDescription = ''Arel is a SQL AST manager for Ruby. It 1. Simplifies the generation of complex SQL queries -2. Adapts to various RDBMS systems +2. Adapts to various RDBMSes It is intended to be a framework framework; that is, you can build your own ORM with it, focusing on innovative object and collection modeling as opposed to database compatibility and query generation.''; }; - name = ''arel-4.0.0''; + name = ''arel-5.0.1.20140414130214''; requiredGems = [ ]; - sha256 = ''19xzg8jhp4p18xlf6sp4yhf6vdpc3hl8lm23n6glikclm7rvgick''; - }; - atomic_1_1_13 = { - basename = ''atomic''; - meta = { - description = ''An atomic reference implementation for JRuby, Rubinius, and MRI''; - homepage = ''http://github.com/headius/ruby-atomic''; - longDescription = ''An atomic reference implementation for JRuby, Rubinius, and MRI''; - }; - name = ''atomic-1.1.13''; - requiredGems = [ ]; - sha256 = ''0sdy8fcncm6p2cba3p8v7dnbsa4z41f4cs1dd0myf4fq7axrrh0s''; - }; - atomic_1_1_14 = { - basename = ''atomic''; - meta = { - description = ''An atomic reference implementation for JRuby, Rubinius, and MRI''; - homepage = ''http://github.com/headius/ruby-atomic''; - longDescription = ''An atomic reference implementation for JRuby, Rubinius, and MRI''; - }; - name = ''atomic-1.1.14''; - requiredGems = [ ]; - sha256 = ''09dzi1gxr5yj273s6s6ss7l2sq4ayavpg95561kib3n4kzvxrhk4''; + sha256 = ''0dhnc20h1v8ml3nmkxq92rr7qxxpk6ixhwvwhgl2dbw9mmxz0hf9''; }; atoulme_Antwrap_0_7_4 = { basename = ''atoulme_Antwrap''; @@ -346,10 +284,10 @@ database compatibility and query generation.''; check out Buildr!''; }; name = ''atoulme-Antwrap-0.7.4''; - requiredGems = [ g.rjb_1_4_8 ]; + requiredGems = [ g.rjb_1_4_9 ]; sha256 = ''0sh9capkya88qm9mvixwly32fwb2c4nzif9j9vv0f73rqw8kz4j4''; }; - autotest_rails_4_1_2 = { + autotest_rails_4_2_1 = { basename = ''autotest_rails''; meta = { description = ''This is an autotest plugin to provide rails support''; @@ -357,74 +295,42 @@ database compatibility and query generation.''; longDescription = ''This is an autotest plugin to provide rails support. It provides basic rails support and extra plugins for migrations and fixtures.''; }; - name = ''autotest-rails-4.1.2''; - requiredGems = [ g.ZenTest_4_9_3 ]; - sha256 = ''1wkb5jayb39yx0i8ly7sibygf9f9c3w24jg2z1qgm135zlb070v4''; + name = ''autotest-rails-4.2.1''; + requiredGems = [ g.ZenTest_4_10_1 ]; + sha256 = ''1v1dm9zlhdlrxvk90zs8d439ldar674ix41s7pncddgyswcfgg5l''; }; - aws_sdk_1_16_1 = { + aws_sdk_1_51_0 = { basename = ''aws_sdk''; meta = { description = ''AWS SDK for Ruby''; homepage = ''http://aws.amazon.com/sdkforruby''; longDescription = ''AWS SDK for Ruby''; }; - name = ''aws-sdk-1.16.1''; - requiredGems = [ g.uuidtools_2_1_4 g.nokogiri_1_5_10 g.json_1_8_0 ]; - sha256 = ''1i6njmzfcmjb9xdaqw727pdqr17w3gad1nl5zln4mv6i4x0nbc3n''; + name = ''aws-sdk-1.51.0''; + requiredGems = [ g.nokogiri_1_6_3_1 g.json_1_8_1 ]; + sha256 = ''092a7km6ar7zvyyzgiqsb0dm354sqa6mzx7sa0c8ndwm918lbqai''; }; - backports_3_3_3 = { + backports_3_6_0 = { basename = ''backports''; meta = { description = ''Backports of Ruby features for older Ruby.''; homepage = ''http://github.com/marcandre/backports''; longDescription = ''Essential backports that enable many of the nice features of Ruby 1.8.7 up to 2.0.0 for earlier versions.''; }; - name = ''backports-3.3.3''; + name = ''backports-3.6.0''; requiredGems = [ ]; - sha256 = ''0y1la483wlv7gam1470shskc0bjsif9hld6qikx165yw9gmbgxsy''; + sha256 = ''1pinn0m4fmq124adc6xjl2hk9799xq5jw4bva82cdzd4h2hwrgq5''; }; - bitbucket_backup_0_3_0 = { + bitbucket_backup_0_3_1 = { basename = ''bitbucket_backup''; meta = { description = ''A tool to backup Bitbucket repos.''; homepage = ''https://bitbucket.org/seth/bitbucket-backup''; longDescription = ''A tool to backup Bitbucket repos.''; }; - name = ''bitbucket-backup-0.3.0''; - requiredGems = [ g.highline_1_6_19 g.json_1_8_0 ]; - sha256 = ''075bz4bhxim2kh5191qc9kpq7z81aa2smgqq5bfldjqvk70hr87y''; - }; - builder_3_1_3 = { - basename = ''builder''; - meta = { - description = ''Builders for MarkUp.''; - homepage = ''http://onestepback.org''; - longDescription = ''Builder provides a number of builder objects that make creating structured data -simple to do. Currently the following builder objects are supported: - -* XML Markup -* XML Events -''; - }; - name = ''builder-3.1.3''; - requiredGems = [ ]; - sha256 = ''0w6xsq9vyvzdy0xb52sajgipr9ml2bbpivk6dxm69c6987dk7him''; - }; - builder_3_1_4 = { - basename = ''builder''; - meta = { - description = ''Builders for MarkUp.''; - homepage = ''http://onestepback.org''; - longDescription = ''Builder provides a number of builder objects that make creating structured data -simple to do. Currently the following builder objects are supported: - -* XML Markup -* XML Events -''; - }; - name = ''builder-3.1.4''; - requiredGems = [ ]; - sha256 = ''1p0bjy1vb0zbswd6bsh5qda0f0br53p8vak8cm7hls62094r405p''; + name = ''bitbucket-backup-0.3.1''; + requiredGems = [ g.highline_1_6_21 g.json_1_8_1 ]; + sha256 = ''17d2pfk0z3cxcx9m90avcp5wxhdbrq23zd665263m3hh9b5qi0fj''; }; builder_3_2_2 = { basename = ''builder''; @@ -442,7 +348,7 @@ simple to do. Currently the following builder objects are supported: requiredGems = [ ]; sha256 = ''14fii7ab8qszrvsvhz6z2z3i4dw0h41a62fjr2h1j8m41vbrmyv2''; }; - buildr_1_4_12 = { + buildr_1_4_19 = { basename = ''buildr''; meta = { description = ''Build like you code''; @@ -454,87 +360,42 @@ 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.12''; - requiredGems = [ g.rake_0_9_2_2 g.builder_3_1_3 g.net_ssh_2_6_0 g.net_sftp_2_0_5 g.rubyzip_0_9_9 g.highline_1_6_2 g.json_pure_1_7_5 g.rubyforge_2_0_4 g.hoe_3_1_0 g.rjb_1_4_2 g.atoulme_Antwrap_0_7_4 g.diff_lcs_1_1_3 g.rspec_expectations_2_11_3 g.rspec_mocks_2_11_3 g.rspec_core_2_11_1 g.rspec_2_11_0 g.xml_simple_1_1_1 g.minitar_0_5_3 g.bundler_1_3_5 ]; - sha256 = ''0hsy9bkfp1pq5f3jx8i6fsk0r309nmq778ykk6w103rkrdb3l6s6''; + name = ''buildr-1.4.19''; + 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_8 g.atoulme_Antwrap_0_7_4 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_0 g.orderedhash_0_0_6 ]; + sha256 = ''07k6z149si7v1h5m1bvdhjcv0nnjwkd2c6a8n1779l8g47ckccj0''; }; - bundler_1_3_5 = { + bundler_1_7_0 = { basename = ''bundler''; meta = { description = ''The best way to manage your application's dependencies''; - homepage = ''http://gembundler.com''; + homepage = ''http://bundler.io''; longDescription = ''Bundler manages an application's dependencies through its entire life, across many machines, systematically and repeatably''; }; - name = ''bundler-1.3.5''; + name = ''bundler-1.7.0''; requiredGems = [ ]; - sha256 = ''1r7zx8qfwzr3pbgrjbsml7z5qgscwyyv33x2jzhz6adqyx3r1f08''; - }; - celluloid_0_15_2 = { - basename = ''celluloid''; - meta = { - description = ''Actor-based concurrent object framework for Ruby''; - homepage = ''https://github.com/celluloid/celluloid''; - longDescription = ''Celluloid enables people to build concurrent programs out of concurrent objects just as easily as they build sequential programs out of sequential objects''; - }; - name = ''celluloid-0.15.2''; - requiredGems = [ g.timers_1_1_0 ]; - sha256 = ''0lpa97m7f4p5hgzaaa47y1d5c78n8pp4xd8qb0sn5llqd0klkd9b''; + sha256 = ''0vcbqmr1h98yfaixjbpdyzz1b90ms8gf86kd3c0q0ydwh9yr7b1j''; }; - childprocess_0_3_9 = { + childprocess_0_5_3 = { basename = ''childprocess''; meta = { description = ''This gem aims at being a simple and reliable solution for controlling external programs running in the background on any Ruby / OS combination.''; homepage = ''http://github.com/jarib/childprocess''; longDescription = ''This gem aims at being a simple and reliable solution for controlling external programs running in the background on any Ruby / OS combination.''; }; - name = ''childprocess-0.3.9''; - requiredGems = [ g.ffi_1_9_0 ]; - sha256 = ''0jbz2ix7ff9ry8717lhcq9w8j8yd45akw48giwgdqccay5mlph7d''; - }; - chronic_0_9_1 = { - basename = ''chronic''; - meta = { - description = ''Natural language date/time parsing.''; - homepage = ''http://github.com/mojombo/chronic''; - longDescription = ''Chronic is a natural language date/time parser written in pure Ruby.''; - }; - name = ''chronic-0.9.1''; - requiredGems = [ ]; - sha256 = ''0kspaxpfy7yvyk1lvpx31w852qfj8wb9z04mcj5bzi70ljb9awqk''; - }; - classifier_1_3_3 = { - basename = ''classifier''; - meta = { - description = ''A general classifier module to allow Bayesian and other types of classifications.''; - homepage = ''http://classifier.rufy.com/''; - longDescription = '' A general classifier module to allow Bayesian and other types of classifications. -''; - }; - name = ''classifier-1.3.3''; - requiredGems = [ g.fast_stemmer_1_0_2 ]; - sha256 = ''1kq1cd8fq6wvyxbjy3r6ya3d3sk3rcp1b560xlqvflpsirm47r9g''; + name = ''childprocess-0.5.3''; + requiredGems = [ g.ffi_1_9_3 ]; + sha256 = ''12djpdr487fddq55sav8gw1pjglcbb0ab0s6npga0ywgsqdyvsww''; }; - chronic_0_10_1 = { + chronic_0_10_2 = { basename = ''chronic''; meta = { description = ''Natural language date/time parsing.''; homepage = ''http://github.com/mojombo/chronic''; longDescription = ''Chronic is a natural language date/time parser written in pure Ruby.''; }; - name = ''chronic-0.10.1''; - requiredGems = [ ]; - sha256 = ''0p822hry4njncxpf59nrvjayg2pxk1zh8gykjgsmqrphdkqqmp1w''; - }; - coderay_1_0_9 = { - basename = ''coderay''; - meta = { - description = ''Fast syntax highlighting for selected languages.''; - homepage = ''http://coderay.rubychan.de''; - longDescription = ''Fast and easy syntax highlighting for selected languages, written in Ruby. Comes with RedCloth integration and LOC counter.''; - }; - name = ''coderay-1.0.9''; + name = ''chronic-0.10.2''; requiredGems = [ ]; - sha256 = ''1pbjsvd6r2daxd6aicp19fnb1j5z7fxadflsm1h0r33cy3vi7iy8''; + sha256 = ''1hrdkn4g8x7dlzxwb1rfgr8kw3bp4ywg5l4y4i9c2g5cwv62yvvn''; }; coderay_1_1_0 = { basename = ''coderay''; @@ -547,77 +408,16 @@ for those one-off tasks, with a language that's a joy to use. requiredGems = [ ]; sha256 = ''059wkzlap2jlkhg460pkwc1ay4v4clsmg1bp4vfzjzkgwdckr52s''; }; - coffee_rails_4_0_1 = { - basename = ''coffee_rails''; - meta = { - description = ''CoffeeScript adapter for the Rails asset pipeline.''; - homepage = ''https://github.com/rails/coffee-rails''; - longDescription = ''CoffeeScript adapter for the Rails asset pipeline.''; - }; - name = ''coffee-rails-4.0.1''; - requiredGems = [ g.coffee_script_2_2_0 g.railties_4_0_0 ]; - sha256 = ''12nqw61xfs43qap4bxp123q4fgj41gvxirdal95ymdd2qzr3cvig''; - }; - coffee_script_2_2_0 = { - basename = ''coffee_script''; - meta = { - description = ''Ruby CoffeeScript Compiler''; - homepage = ''http://github.com/josh/ruby-coffee-script''; - longDescription = '' Ruby CoffeeScript is a bridge to the JS CoffeeScript compiler. -''; - }; - name = ''coffee-script-2.2.0''; - requiredGems = [ g.coffee_script_source_1_6_3 g.execjs_2_0_2 ]; - sha256 = ''133cp4znfp44wwnv12myw8s0z6qws74ilqmw88iwzkshg689zpdc''; - }; - coffee_script_source_1_6_3 = { - basename = ''coffee_script_source''; - meta = { - description = ''The CoffeeScript Compiler''; - homepage = ''http://jashkenas.github.com/coffee-script/''; - longDescription = '' CoffeeScript is a little language that compiles into JavaScript. - Underneath all of those embarrassing braces and semicolons, - JavaScript has always had a gorgeous object model at its heart. - CoffeeScript is an attempt to expose the good parts of JavaScript - in a simple way. -''; - }; - name = ''coffee-script-source-1.6.3''; - requiredGems = [ ]; - sha256 = ''0p33h0rdj1n8xhm2d5hzqbb8br6wn4rx0gk4hyhc6rxkaxsy79b4''; - }; - colorator_0_1 = { - basename = ''colorator''; - meta = { - description = ''String core extensions for terminal coloring.''; - homepage = ''https://github.com/octopress/colorator''; - longDescription = ''Colorize your text in the terminal.''; - }; - name = ''colorator-0.1''; - requiredGems = [ ]; - sha256 = ''09zp15hyd9wlbgf1kmrf4rnry8cpvh1h9fj7afarlqcy4hrfdpvs''; - }; - commander_4_1_5 = { - basename = ''commander''; - meta = { - description = ''The complete solution for Ruby command-line executables''; - homepage = ''http://visionmedia.github.com/commander''; - longDescription = ''The complete solution for Ruby command-line executables. Commander bridges the gap between other terminal related libraries you know and love (OptionParser, HighLine), while providing many new features, and an elegant API.''; - }; - name = ''commander-4.1.5''; - requiredGems = [ g.highline_1_6_20 ]; - sha256 = ''040x2gjpl55g64kh5f9nby0870hnzx8cd7clxg771z0wjs7nzalc''; - }; - cucumber_1_3_8 = { + cucumber_1_3_16 = { basename = ''cucumber''; meta = { - description = ''cucumber-1.3.8''; + description = ''cucumber-1.3.16''; homepage = ''http://cukes.info''; longDescription = ''Behaviour Driven Development with elegance and joy''; }; - name = ''cucumber-1.3.8''; - requiredGems = [ g.builder_3_2_2 g.diff_lcs_1_2_4 g.gherkin_2_12_1 g.multi_json_1_7_9 g.multi_test_0_0_2 ]; - sha256 = ''0b4igj1vxlcwky11nkrrgg57chbc0n5gmv984dld5s0f1ilkx1ma''; + name = ''cucumber-1.3.16''; + requiredGems = [ g.builder_3_2_2 g.diff_lcs_1_2_5 g.gherkin_2_12_2 g.multi_json_1_10_1 g.multi_test_0_1_1 ]; + sha256 = ''11cjw2d03r41b5pn5in6q822s3v6bpd8isxc9dl7by01jrzi0662''; }; daemons_1_1_9 = { basename = ''daemons''; @@ -630,32 +430,29 @@ for those one-off tasks, with a language that's a joy to use. requiredGems = [ ]; sha256 = ''1j1m64pirsldhic6x6sg4lcrmp1bs1ihpd49xm8m1b2rc1c3irzy''; }; - diff_lcs_1_1_3 = { + diff_lcs_1_2_4 = { basename = ''diff_lcs''; meta = { - description = ''Diff::LCS is a port of Perl's Algorithm::Diff that uses the McIlroy-Hunt longest common subsequence (LCS) algorithm to compute intelligent differences between two sequenced enumerable containers''; - longDescription = ''Diff::LCS is a port of Perl's Algorithm::Diff that uses the McIlroy-Hunt -longest common subsequence (LCS) algorithm to compute intelligent differences -between two sequenced enumerable containers. The implementation is based on -Mario I. Wolczko's {Smalltalk version 1.2}[ftp://st.cs.uiuc.edu/pub/Smalltalk/MANCHESTER/manchester/4.0/diff.st] -(1993) and Ned Konz's Perl version -{Algorithm::Diff 1.15}[http://search.cpan.org/~nedkonz/Algorithm-Diff-1.15/]. + description = ''Diff::LCS computes the difference between two Enumerable sequences using the McIlroy-Hunt longest common subsequence (LCS) algorithm''; + homepage = ''http://diff-lcs.rubyforge.org/''; + longDescription = ''Diff::LCS computes the difference between two Enumerable sequences using the +McIlroy-Hunt longest common subsequence (LCS) algorithm. It includes utilities +to create a simple HTML diff output format and a standard diff-like tool. -This is release 1.1.3, fixing several small bugs found over the years. Version -1.1.0 added new features, including the ability to #patch and #unpatch changes -as well as a new contextual diff callback, Diff::LCS::ContextDiffCallbacks, -that should improve the context sensitivity of patching. +This is release 1.2.4, fixing a bug introduced after diff-lcs 1.1.3 that did +not properly prune common sequences at the beginning of a comparison set. +Thanks to Paul Kunysch for fixing this issue. -This library is called Diff::LCS because of an early version of Algorithm::Diff -which was restrictively licensed. This version has seen a minor license change: -instead of being under Ruby's license as an option, the third optional license -is the MIT license.''; +Coincident with the release of diff-lcs 1.2.3, we reported an issue with +Rubinius in 1.9 mode +({rubinius/rubinius#2268}[https://github.com/rubinius/rubinius/issues/2268]). +We are happy to report that this issue has been resolved.''; }; - name = ''diff-lcs-1.1.3''; + name = ''diff-lcs-1.2.4''; requiredGems = [ ]; - sha256 = ''15wqs3md9slif6ag43vp6gw63r3a2zdqiyfapnnzkb7amgg930pv''; + sha256 = ''09xbffjg639y8n43zp88ki0m489vv2c86znmfib2fg1di6svi1xd''; }; - diff_lcs_1_2_4 = { + diff_lcs_1_2_5 = { basename = ''diff_lcs''; meta = { description = ''Diff::LCS computes the difference between two Enumerable sequences using the McIlroy-Hunt longest common subsequence (LCS) algorithm''; @@ -673,9 +470,9 @@ Rubinius in 1.9 mode ({rubinius/rubinius#2268}[https://github.com/rubinius/rubinius/issues/2268]). We are happy to report that this issue has been resolved.''; }; - name = ''diff-lcs-1.2.4''; + name = ''diff-lcs-1.2.5''; requiredGems = [ ]; - sha256 = ''09xbffjg639y8n43zp88ki0m489vv2c86znmfib2fg1di6svi1xd''; + sha256 = ''1vf9civd41bnqi6brr5d9jifdw73j9khc6fkhfl1f8r9cpkdvlx1''; }; dimensions_1_2_0 = { basename = ''dimensions''; @@ -688,7 +485,7 @@ We are happy to report that this issue has been resolved.''; requiredGems = [ ]; sha256 = ''1pqb7yzjcpbgbyi196ifqbd1wy570cn12bkzcvpcha4xilhajja0''; }; - domain_name_0_5_13 = { + domain_name_0_5_20 = { basename = ''domain_name''; meta = { description = ''Domain Name manipulation library for Ruby''; @@ -699,20 +496,30 @@ It can also be used for cookie domain validation based on the Public Suffix List. ''; }; - name = ''domain_name-0.5.13''; - requiredGems = [ g.unf_0_1_2 ]; - sha256 = ''0m57vacj2bmdfp094gjylfzz5gqdpn95pcypk5friab3svrambxv''; + name = ''domain_name-0.5.20''; + requiredGems = [ g.unf_0_1_4 ]; + sha256 = ''17ls88kp18dxjc93q8kmyx2anknva0vbmny60xbgpbwq3hg0qv6s''; }; - dotenv_0_9_0 = { + dotenv_0_11_1 = { basename = ''dotenv''; meta = { description = ''Loads environment variables from `.env`.''; homepage = ''https://github.com/bkeepers/dotenv''; longDescription = ''Loads environment variables from `.env`.''; }; - name = ''dotenv-0.9.0''; + name = ''dotenv-0.11.1''; + requiredGems = [ g.dotenv_deployment_0_0_2 ]; + sha256 = ''09z0y0d6bks7i0sqvd8szfqj9i1kkj01anzly7shi83b3gxhrq9m''; + }; + dotenv_deployment_0_0_2 = { + basename = ''dotenv_deployment''; + meta = { + description = ''Deployment concerns for dotenv''; + homepage = ''https://github.com/bkeepers/dotenv-deployment''; + }; + name = ''dotenv-deployment-0.0.2''; requiredGems = [ ]; - sha256 = ''1gl0m6s8d6m72wcm4p86kzzjdihyryi5mh6v70qkqd0dl1gj73l3''; + sha256 = ''1ad66jq9a09qq1js8wsyil97018s7y6x0vzji0dy34gh65sbjz8c''; }; em_resolv_replace_1_1_3 = { basename = ''em_resolv_replace''; @@ -747,16 +554,16 @@ Suffix List. requiredGems = [ ]; sha256 = ''1fj827xqjs91yqsydf0zmfyw9p4l2jz5yikg3mppz6d7fi8kyrb3''; }; - ethon_0_6_1 = { + ethon_0_7_1 = { basename = ''ethon''; meta = { description = ''Libcurl wrapper.''; homepage = ''https://github.com/typhoeus/ethon''; longDescription = ''Very lightweight libcurl wrapper.''; }; - name = ''ethon-0.6.1''; - requiredGems = [ g.ffi_1_9_0 g.mime_types_1_25 ]; - sha256 = ''05mw10bh4pif0j6pjzyhcsm8kzv7xn94dcjcb15dmbjx2za0daa7''; + name = ''ethon-0.7.1''; + requiredGems = [ g.ffi_1_9_3 ]; + sha256 = ''0b762cmnj20fjlrlzk5vsndzv4ac3ybdi4vikx5c11abl7x5wbg6''; }; eventmachine_1_0_3 = { basename = ''eventmachine''; @@ -789,91 +596,36 @@ using TCP/IP, especially if custom protocols are required.''; requiredGems = [ g.eventmachine_1_0_3 ]; sha256 = ''1pvlb34vdzd81kf9f3xyibb4f55xjqm7lqqy28dgyci5cyv50y61''; }; - excon_0_25_3 = { - basename = ''excon''; - meta = { - description = ''speed, persistence, http(s)''; - homepage = ''https://github.com/geemus/excon''; - longDescription = ''EXtended http(s) CONnections''; - }; - name = ''excon-0.25.3''; - requiredGems = [ ]; - sha256 = ''1d552jhvrpmnzrg3di88397l07ngrz04s2al17klpam6crxqw2b2''; - }; - execjs_2_0_2 = { - basename = ''execjs''; - meta = { - description = ''Run JavaScript code from Ruby''; - homepage = ''https://github.com/sstephenson/execjs''; - longDescription = ''ExecJS lets you run JavaScript code from Ruby.''; - }; - name = ''execjs-2.0.2''; - requiredGems = [ ]; - sha256 = ''167kbkyql7nvvwjsgdw5z8j66ngq7kc59gxfwsxhqi5fl1z0jbjs''; - }; - fakes3_0_1_5 = { + fakes3_0_1_5_2 = { basename = ''fakes3''; meta = { description = ''FakeS3 is a server that simulates S3 commands so you can test your S3 functionality in your projects''; longDescription = ''Use FakeS3 to test basic S3 functionality without actually connecting to S3''; }; - name = ''fakes3-0.1.5''; - requiredGems = [ g.thor_0_18_1 g.builder_3_2_2 ]; - sha256 = ''1na5wrbarla6s414svqmr5spbpv6vmcgpswal444x4clcpmadhib''; + name = ''fakes3-0.1.5.2''; + requiredGems = [ g.thor_0_19_1 g.builder_3_2_2 ]; + sha256 = ''1gmg428s1jpdwn7bd9pi4ikxg8440nq9yqs22wv0k355z5cqb8by''; }; - faraday_0_8_8 = { + faraday_0_9_0 = { basename = ''faraday''; meta = { description = ''HTTP/REST API client library.''; homepage = ''https://github.com/lostisland/faraday''; }; - name = ''faraday-0.8.8''; - requiredGems = [ g.multipart_post_1_2_0 ]; - sha256 = ''1cnyj5japrnv6wvl01la5amf7hikckfznh8234ad21n730b2wci4''; - }; - faraday_middleware_0_8_8 = { - basename = ''faraday_middleware''; - meta = { - description = ''Various middleware for Faraday''; - homepage = ''https://github.com/pengwynn/faraday_middleware''; - longDescription = ''Various middleware for Faraday''; - }; - name = ''faraday_middleware-0.8.8''; - requiredGems = [ g.faraday_0_8_8 ]; - sha256 = ''1n0g8pm7ynx6ffyqhscc1cqw97zhvd8isr31yfyj15335j1jsncz''; + name = ''faraday-0.9.0''; + requiredGems = [ g.multipart_post_2_0_0 ]; + sha256 = ''13wi8y7j6mp0mszps50gqr0fyddiz45wqkvpnnrv797gklr9sh46''; }; - faraday_middleware_0_9_0 = { + faraday_middleware_0_9_1 = { basename = ''faraday_middleware''; meta = { description = ''Various middleware for Faraday''; - homepage = ''https://github.com/pengwynn/faraday_middleware''; + homepage = ''https://github.com/lostisland/faraday_middleware''; longDescription = ''Various middleware for Faraday''; }; - name = ''faraday_middleware-0.9.0''; - requiredGems = [ g.faraday_0_8_8 ]; - sha256 = ''1kwvi2sdxd6j764a7q5iir73dw2v6816zx3l8cgfv0wr2m47icq2''; - }; - fast_stemmer_1_0_2 = { - basename = ''fast_stemmer''; - meta = { - description = ''Fast Porter stemmer based on a C version of algorithm''; - homepage = ''http://github.com/romanbsd/fast-stemmer''; - longDescription = ''Fast Porter stemmer based on a C version of algorithm''; - }; - name = ''fast-stemmer-1.0.2''; - requiredGems = [ ]; - sha256 = ''0688clyk4xxh3kdb18vi089k90mca8ji5fwaknh3da5wrzcrzanh''; - }; - ffi_1_9_0 = { - basename = ''ffi''; - meta = { - description = ''Ruby FFI''; - homepage = ''http://wiki.github.com/ffi/ffi''; - longDescription = ''Ruby FFI library''; - }; - name = ''ffi-1.9.0''; - requiredGems = [ ]; - sha256 = ''0rnh9yyfzcpdmi8m7giyd21lgqj00afgxvgbx41hsi2ls1ghfwvy''; + name = ''faraday_middleware-0.9.1''; + requiredGems = [ g.faraday_0_9_0 ]; + sha256 = ''1kndkrww1biz9j64fnyaqgis1gdiawxfv0ncadsz06gd555fgs6q''; }; ffi_1_9_3 = { basename = ''ffi''; @@ -894,32 +646,21 @@ using TCP/IP, especially if custom protocols are required.''; longDescription = ''Library to tail files in Ruby''; }; name = ''file-tail-1.0.12''; - requiredGems = [ g.tins_0_9_0 ]; + requiredGems = [ g.tins_0_13_2 ]; sha256 = ''0mzxxnwj7k5pwxs0rdbmb3b41zgvzw7x40sf3qlkch4zdfx91i1j''; }; - foreman_0_63_0 = { + foreman_0_74_0 = { basename = ''foreman''; meta = { description = ''Process manager for applications with multiple components''; homepage = ''http://github.com/ddollar/foreman''; longDescription = ''Process manager for applications with multiple components''; }; - name = ''foreman-0.63.0''; - requiredGems = [ g.thor_0_18_1 g.dotenv_0_9_0 ]; - sha256 = ''0yqyjix9jm4iwyc4f3wc32vxr28rpjcw1c9ni5brs4s2a24inzlk''; - }; - formatador_0_2_4 = { - basename = ''formatador''; - meta = { - description = ''Ruby STDOUT text formatting''; - homepage = ''http://github.com/geemus/formatador''; - longDescription = ''STDOUT text formatting''; - }; - name = ''formatador-0.2.4''; - requiredGems = [ ]; - sha256 = ''0pgmk1h6i6m3cslnfyjqld06a4c2xbbvmngxg2axddf39xwz6f12''; + name = ''foreman-0.74.0''; + requiredGems = [ g.thor_0_19_1 g.dotenv_0_11_1 ]; + sha256 = ''0jqblq0myzmdp2cywzz7flvgqnhf267ykcdn250cccy68s9wm37m''; }; - gettext_3_0_0 = { + gettext_3_1_3 = { basename = ''gettext''; meta = { description = ''Gettext is a pure Ruby libary and tools to localize messages.''; @@ -929,44 +670,33 @@ The catalog file(po-file) is same format with GNU gettext. So you can use GNU gettext tools for maintaining. ''; }; - name = ''gettext-3.0.0''; - requiredGems = [ g.locale_2_0_8 g.text_1_2_3 ]; - sha256 = ''1qlqd6c39bjn930qh93i40gbz1bs20gzpwvw3d8rxnkls5a6pl1y''; + name = ''gettext-3.1.3''; + requiredGems = [ g.locale_2_1_0 g.text_1_3_0 ]; + sha256 = ''066x2dbryab02kdbk6km79h4j9b0f0ynsnzcygjgvzn9001ybf9q''; }; - gh_0_12_0 = { + gh_0_13_2 = { basename = ''gh''; meta = { description = ''layered github client''; homepage = ''http://gh.rkh.im/''; longDescription = ''multi-layer client for the github api v3''; }; - name = ''gh-0.12.0''; - requiredGems = [ g.faraday_0_8_8 g.backports_3_3_3 g.multi_json_1_7_9 g.addressable_2_3_5 g.net_http_persistent_2_9 g.net_http_pipeline_1_0_1 ]; - sha256 = ''180jmg6rwilzcbzvyg74q27zpr09pv6pw3cfcjxr0bcklv203q3n''; + name = ''gh-0.13.2''; + requiredGems = [ g.faraday_0_9_0 g.backports_3_6_0 g.multi_json_1_10_1 g.addressable_2_3_6 g.net_http_persistent_2_9_4 g.net_http_pipeline_1_0_1 ]; + sha256 = ''17scqa35j6ghpykzk986gnd6dvbrh8nn60ib04hb2gbyh9dns1dj''; }; - gherkin_2_12_1 = { + gherkin_2_12_2 = { basename = ''gherkin''; meta = { - description = ''gherkin-2.12.1''; + description = ''gherkin-2.12.2''; homepage = ''http://github.com/cucumber/gherkin''; longDescription = ''A fast Gherkin lexer/parser based on the Ragel State Machine Compiler.''; }; - name = ''gherkin-2.12.1''; - requiredGems = [ g.multi_json_1_7_9 ]; - sha256 = ''07nzchdvkkd35m9k7d9k8j72jm3imv56ccn734mxa5klv1xx2d45''; + name = ''gherkin-2.12.2''; + requiredGems = [ g.multi_json_1_10_1 ]; + sha256 = ''1mxfgw15pii1jmq00xxbyp77v71mh3bp99ndgwzfwkxvbcisha25''; }; - guard_2_2_4 = { - basename = ''guard''; - meta = { - description = ''Guard keeps an eye on your file modifications''; - homepage = ''http://guardgem.org''; - longDescription = ''Guard is a command line tool to easily handle events on file system modifications.''; - }; - name = ''guard-2.2.4''; - requiredGems = [ g.thor_0_18_1 g.listen_2_2_0 g.pry_0_9_12_3 g.lumberjack_1_0_4 g.formatador_0_2_4 ]; - sha256 = ''0z427rkcpzy82g21cgq7i5sn1vxn8hm8j4d78kj9vlaqgilcybhq''; - }; - highline_1_6_19 = { + highline_1_6_21 = { basename = ''highline''; meta = { description = ''HighLine is a high-level command-line IO library.''; @@ -977,39 +707,9 @@ crank out anything from simple list selection to complete shells with just minutes of work. ''; }; - name = ''highline-1.6.19''; + name = ''highline-1.6.21''; requiredGems = [ ]; - sha256 = ''0gylnz2cdaswgszgl8x2qx0c87md4246r1i0blgm3nqvgd4hlsxd''; - }; - highline_1_6_20 = { - basename = ''highline''; - meta = { - description = ''HighLine is a high-level command-line IO library.''; - homepage = ''http://highline.rubyforge.org''; - longDescription = ''A high-level IO library that provides validation, type conversion, and more for -command-line interfaces. HighLine also includes a complete menu system that can -crank out anything from simple list selection to complete shells with just -minutes of work. -''; - }; - name = ''highline-1.6.20''; - requiredGems = [ ]; - sha256 = ''0gk7mpw2r5lv60vr4hb0090wbnqh0fsbyrrcvxiqk7hyhxdz08iv''; - }; - highline_1_6_2 = { - basename = ''highline''; - meta = { - description = ''HighLine is a high-level command-line IO library.''; - homepage = ''http://highline.rubyforge.org''; - longDescription = ''A high-level IO library that provides validation, type conversion, and more for -command-line interfaces. HighLine also includes a complete menu system that can -crank out anything from simple list selection to complete shells with just -minutes of work. -''; - }; - name = ''highline-1.6.2''; - requiredGems = [ ]; - sha256 = ''0azmahb70f1nlg6lq5wljbzcijhfb9lz8skwb4k2977kdml07mcn''; + sha256 = ''06bml1fjsnrhd956wqq5k3w8cyd09rv1vixdpa3zzkl6xs72jdn1''; }; hike_1_2_3 = { basename = ''hike''; @@ -1022,7 +722,7 @@ minutes of work. requiredGems = [ ]; sha256 = ''0i6c9hrszzg3gn2j41v3ijnwcm8cc2931fnjiv6mnpl4jcjjykhm''; }; - hoe_3_1_0 = { + hoe_3_7_1 = { basename = ''hoe''; meta = { description = ''Hoe is a rake/rubygems helper for project Rakefiles''; @@ -1038,108 +738,64 @@ below. For extra goodness, see: http://seattlerb.rubyforge.org/hoe/Hoe.pdf''; }; - name = ''hoe-3.1.0''; - requiredGems = [ g.rake_0_9_6 ]; - sha256 = ''0i961x0hrd6fs1nsfham87dhn64gqpnai27l14jag7qbnp3a79yp''; + name = ''hoe-3.7.1''; + requiredGems = [ g.rake_10_3_2 ]; + sha256 = ''0lyrdbzxj4isxzyfp93w0q1g9sqw6grkjp91xirzlw1z1714qsw3''; }; - http_cookie_1_0_1 = { + http_cookie_1_0_2 = { basename = ''http_cookie''; meta = { description = ''A Ruby library to handle HTTP Cookies based on RFC 6265''; homepage = ''https://github.com/sparklemotion/http-cookie''; longDescription = ''HTTP::Cookie is a Ruby library to handle HTTP Cookies based on RFC 6265. It has with security, standards compliance and compatibility in mind, to behave just the same as today's major web browsers. It has builtin support for the legacy cookies.txt and the latest cookies.sqlite formats of Mozilla Firefox, and its modular API makes it easy to add support for a new backend store.''; }; - name = ''http-cookie-1.0.1''; - requiredGems = [ g.domain_name_0_5_13 ]; - sha256 = ''0gzghirmim217g7gf1rq3xiav8gfg32r38mcz0w9vznk30psy7d9''; + name = ''http-cookie-1.0.2''; + requiredGems = [ g.domain_name_0_5_20 ]; + sha256 = ''0cz2fdkngs3jc5w32a6xcl511hy03a7zdiy988jk1sf3bf5v3hdw''; }; - i18n_0_6_5 = { + i18n_0_6_11 = { basename = ''i18n''; meta = { description = ''New wave Internationalization support for Ruby''; homepage = ''http://github.com/svenfuchs/i18n''; longDescription = ''New wave Internationalization support for Ruby.''; }; - name = ''i18n-0.6.5''; + name = ''i18n-0.6.11''; requiredGems = [ ]; - sha256 = ''0cv15pi9f530fx9q3b83im7afy947dd86jf5ffqs9bvw8iykmil1''; + sha256 = ''0fwjlgmgry2blf8zlxn9c555cf4a16p287l599kz5104ncjxlzdk''; }; - iconv_1_0_3 = { + iconv_1_0_4 = { basename = ''iconv''; meta = { description = ''iconv wrapper library''; homepage = ''https://github.com/nurse/iconv''; longDescription = ''iconv wrapper library''; }; - name = ''iconv-1.0.3''; - requiredGems = [ ]; - sha256 = ''1nhjn07h2fqivdj6xqzi2x2kzh28vigx8z3q5fv2cqn9aqmbdacl''; - }; - jekyll_1_3_0 = { - basename = ''jekyll''; - meta = { - description = ''A simple, blog aware, static site generator.''; - homepage = ''http://github.com/mojombo/jekyll''; - longDescription = ''Jekyll is a simple, blog aware, static site generator.''; - }; - name = ''jekyll-1.3.0''; - requiredGems = [ g.liquid_2_5_4 g.classifier_1_3_3 g.listen_1_3_1 g.maruku_0_6_1 g.pygments_rb_0_5_4 g.commander_4_1_5 g.safe_yaml_0_9_7 g.colorator_0_1 g.redcarpet_2_3_0 ]; - sha256 = ''0hq9sdyivfifba0d4d7g113jbd3jwm8jpdc9i09mv0nfhdcbc3k4''; - }; - jquery_rails_3_0_4 = { - basename = ''jquery_rails''; - meta = { - description = ''Use jQuery with Rails 3''; - homepage = ''http://rubygems.org/gems/jquery-rails''; - longDescription = ''This gem provides jQuery and the jQuery-ujs driver for your Rails 3 application.''; - }; - name = ''jquery-rails-3.0.4''; - requiredGems = [ g.railties_4_0_0 g.thor_0_18_1 ]; - sha256 = ''0k13mcl9d0zxa2azml0d06y14ggk5yl2xvzsc9l2qv2cwc9xxajm''; - }; - jruby_pageant_1_1_1 = { - basename = ''jruby_pageant''; - meta = { - description = ''jruby-pageant allows Pageant access on JRuby + Windows''; - homepage = ''http://github.com/arturaz/jruby-pageant''; - longDescription = ''This is a convenience gem packaging required JNA/JSCH jars.''; - }; - name = ''jruby-pageant-1.1.1''; + name = ''iconv-1.0.4''; requiredGems = [ ]; - sha256 = ''1kgqsn0bagr41gf5kbqaxbs38a7s5bm85m0pdx4qz7d70v9nc9cl''; + sha256 = ''16sgj6gqs4bgwv6q4vv811fb43908psr33dz7sphn1z8la3y7m2v''; }; - jsduck_5_1_0 = { + jsduck_5_3_4 = { basename = ''jsduck''; meta = { description = ''Simple JavaScript Duckumentation generator''; homepage = ''https://github.com/senchalabs/jsduck''; longDescription = ''Documentation generator for Sencha JS frameworks''; }; - name = ''jsduck-5.1.0''; - requiredGems = [ g.rdiscount_2_1_6 g.json_1_8_0 g.parallel_0_7_1 g.rkelly_remix_0_0_4 g.dimensions_1_2_0 ]; - sha256 = ''05l2729524w6i1jywyb2kgbp8w04za8wbvx5w914f7mcsry98rn4''; + name = ''jsduck-5.3.4''; + requiredGems = [ g.rdiscount_2_1_7_1 g.json_1_8_1 g.parallel_0_7_1 g.rkelly_remix_0_0_6 g.dimensions_1_2_0 ]; + sha256 = ''0hac7g9g6gg10bigbm8dskwwbv1dfch8ca353gh2bkwf244qq2xr''; }; - json_1_8_0 = { + json_1_8_1 = { basename = ''json''; meta = { description = ''JSON Implementation for Ruby''; homepage = ''http://flori.github.com/json''; longDescription = ''This is a JSON implementation as a Ruby extension in C.''; }; - name = ''json-1.8.0''; + name = ''json-1.8.1''; requiredGems = [ ]; - sha256 = ''0a8prb853nwz9xqjhcd4rm9a5ng8arcn06hlacf0kcizzz69rr47''; - }; - json_pure_1_7_5 = { - basename = ''json_pure''; - meta = { - description = ''JSON Implementation for Ruby''; - homepage = ''http://flori.github.com/json''; - longDescription = ''This is a JSON implementation in pure Ruby.''; - }; - name = ''json_pure-1.7.5''; - requiredGems = [ ]; - sha256 = ''14nwwf001mh70qnynpb3h8c0kgcfi666yrg2frib4p6lr57jx8ap''; + sha256 = ''0002bsycvizvkmk1jyv8px1hskk6wrjfk4f7x5byi8gxm6zzn6wn''; }; json_pure_1_8_0 = { basename = ''json_pure''; @@ -1152,61 +808,18 @@ For extra goodness, see: http://seattlerb.rubyforge.org/hoe/Hoe.pdf''; requiredGems = [ ]; sha256 = ''0kkn5zhiffav2cffj43wwvzj07825r4j463ilfjgik034vnbjs83''; }; - launchy_2_3_0 = { + launchy_2_4_2 = { basename = ''launchy''; meta = { description = ''Launchy is helper class for launching cross-platform applications in a fire and forget manner.''; homepage = ''http://github.com/copiousfreetime/launchy''; longDescription = ''Launchy is helper class for launching cross-platform applications in a fire and forget manner. There are application concepts (browser, email client, etc) that are common across all platforms, and they may be launched differently on each platform. Launchy is here to make a common approach to launching external application from within ruby programs.''; }; - name = ''launchy-2.3.0''; - requiredGems = [ g.addressable_2_3_5 ]; - sha256 = ''0ckvs40f29ancs0ki12pqb94k380cz41b4gbjplm85ly6kd57sph''; + name = ''launchy-2.4.2''; + requiredGems = [ g.addressable_2_3_6 ]; + sha256 = ''0i1nmlrqpnk2q6f7iq85cqaa7b8fw4bmqm57w60g92lsfmszs8iv''; }; - launchy_2_4_0 = { - basename = ''launchy''; - meta = { - description = ''Launchy is helper class for launching cross-platform applications in a fire and forget manner.''; - homepage = ''http://github.com/copiousfreetime/launchy''; - longDescription = ''Launchy is helper class for launching cross-platform applications in a fire and forget manner. There are application concepts (browser, email client, etc) that are common across all platforms, and they may be launched differently on each platform. Launchy is here to make a common approach to launching external application from within ruby programs.''; - }; - name = ''launchy-2.4.0''; - requiredGems = [ g.addressable_2_3_5 ]; - sha256 = ''0vxc3m4sjxyjjzw2rmsginf9nbxfyv7hhxshmn6kxkvcpjxx5di0''; - }; - liquid_2_5_4 = { - basename = ''liquid''; - meta = { - description = ''A secure, non-evaling end user template engine with aesthetic markup.''; - homepage = ''http://www.liquidmarkup.org''; - }; - name = ''liquid-2.5.4''; - requiredGems = [ ]; - sha256 = ''0adb1fz20jwcyx1ia133426i59mrrz9iq9lpcmzq6jx0dlaa4amv''; - }; - listen_1_3_1 = { - basename = ''listen''; - meta = { - description = ''Listen to file modifications''; - homepage = ''https://github.com/guard/listen''; - longDescription = ''The Listen gem listens to file modifications and notifies you about the changes. Works everywhere!''; - }; - name = ''listen-1.3.1''; - requiredGems = [ g.rb_fsevent_0_9_3 g.rb_inotify_0_9_2 g.rb_kqueue_0_2_0 ]; - sha256 = ''1p1rqz26ixx0fzc0hy3psq2bb3pwkv9awixv76zkaaqj1czabzbs''; - }; - listen_2_2_0 = { - basename = ''listen''; - meta = { - description = ''Listen to file modifications''; - homepage = ''https://github.com/guard/listen''; - longDescription = ''The Listen gem listens to file modifications and notifies you about the changes. Works everywhere!''; - }; - name = ''listen-2.2.0''; - requiredGems = [ g.celluloid_0_15_2 g.rb_fsevent_0_9_3 g.rb_inotify_0_9_2 ]; - sha256 = ''1fm6cp5d4xbd5wdd0d804m3p2cc5rjrr5yzqzzh1ndzgbs94sv5c''; - }; - locale_2_0_8 = { + locale_2_1_0 = { basename = ''locale''; meta = { description = ''Ruby-Locale is the pure ruby library which provides basic APIs for localization.''; @@ -1214,42 +827,31 @@ For extra goodness, see: http://seattlerb.rubyforge.org/hoe/Hoe.pdf''; longDescription = ''Ruby-Locale is the pure ruby library which provides basic APIs for localization. ''; }; - name = ''locale-2.0.8''; + name = ''locale-2.1.0''; requiredGems = [ ]; - sha256 = ''1hmixxg4aigl3h1qmz4fdsrv81p0bblcjbks32nrcvcpwmlylf12''; + sha256 = ''18bb0g24flq9dr8qv4j7pm7w9i2vmvmqrbmry95ibf1r1c4s60yj''; }; - lockfile_2_1_0 = { + lockfile_2_1_3 = { basename = ''lockfile''; meta = { description = ''lockfile''; homepage = ''https://github.com/ahoward/lockfile''; - longDescription = ''description: lockfile kicks the ass''; - }; - name = ''lockfile-2.1.0''; - requiredGems = [ ]; - sha256 = ''1yfpz9k0crb7q7y5bcaavf2jzbc170dj84hqz13qp75rj7bl3qhf''; - }; - lumberjack_1_0_4 = { - basename = ''lumberjack''; - meta = { - description = ''A simple, powerful, and very fast logging utility that can be a drop in replacement for Logger or ActiveSupport::BufferedLogger.''; - homepage = ''http://github.com/bdurand/lumberjack''; - longDescription = ''A simple, powerful, and very fast logging utility that can be a drop in replacement for Logger or ActiveSupport::BufferedLogger. Provides support for automatically rolling log files even with multiple processes writing the same log file.''; + longDescription = ''a ruby library for creating perfect and NFS safe lockfiles''; }; - name = ''lumberjack-1.0.4''; + name = ''lockfile-2.1.3''; requiredGems = [ ]; - sha256 = ''1mj6m12hnmkvzl4w2yh04ak3z45pwksj6ra7v30za8snw9kg919d''; + sha256 = ''0dij3ijywylvfgrpi2i0k17f6w0wjhnjjw0k9030f54z56cz7jrr''; }; - macaddr_1_6_1 = { + macaddr_1_7_1 = { basename = ''macaddr''; meta = { description = ''macaddr''; homepage = ''https://github.com/ahoward/macaddr''; - longDescription = ''description: macaddr kicks the ass''; + longDescription = ''cross platform mac address determination for ruby''; }; - name = ''macaddr-1.6.1''; - requiredGems = [ g.systemu_2_5_2 ]; - sha256 = ''1vd9l1d0lc0sq3rn1ya816wrzgxxqdzq6pgq0y0435qm6ikwy7ch''; + name = ''macaddr-1.7.1''; + requiredGems = [ g.systemu_2_6_4 ]; + sha256 = ''1clii8mvhmh5lmnm95ljnjygyiyhdpja85c5vy487rhxn52scn0b''; }; mail_2_5_4 = { basename = ''mail''; @@ -1259,24 +861,21 @@ For extra goodness, see: http://seattlerb.rubyforge.org/hoe/Hoe.pdf''; longDescription = ''A really Ruby Mail handler.''; }; name = ''mail-2.5.4''; - requiredGems = [ g.mime_types_1_25 g.treetop_1_4_15 ]; + requiredGems = [ g.mime_types_1_25_1 g.treetop_1_4_15 ]; sha256 = ''0z15ksb8blcppchv03g34844f7xgf36ckp484qjj2886ig1qara4''; }; - maruku_0_6_1 = { - basename = ''maruku''; + mail_2_6_1 = { + basename = ''mail''; meta = { - description = ''Maruku is a Markdown-superset interpreter written in Ruby.''; - homepage = ''http://github.com/bhollis/maruku''; - longDescription = ''Maruku is a Markdown interpreter in Ruby. - It features native export to HTML and PDF (via Latex). The - output is really beautiful! - ''; + description = ''Mail provides a nice Ruby DSL for making, sending and reading emails.''; + homepage = ''http://github.com/mikel/mail''; + longDescription = ''A really Ruby Mail handler.''; }; - name = ''maruku-0.6.1''; - requiredGems = [ g.syntax_1_0_0 ]; - sha256 = ''01xc4l480k79jbicr0j37d9bmd4dsnrjh5hwdrh2djvy06l77ngz''; + name = ''mail-2.6.1''; + requiredGems = [ g.mime_types_2_3 ]; + sha256 = ''17gsw57nc7ihk4xnbq9lidzv6h1ivh4l5m16hy790vs219n22mhx''; }; - mechanize_2_7_2 = { + mechanize_2_7_3 = { basename = ''mechanize''; meta = { description = ''The Mechanize library is used for automating interaction with websites''; @@ -1287,9 +886,9 @@ and can follow links and submit forms. Form fields can be populated and submitted. Mechanize also keeps track of the sites that you have visited as a history.''; }; - name = ''mechanize-2.7.2''; - requiredGems = [ g.net_http_digest_auth_1_4 g.net_http_persistent_2_9 g.mime_types_1_25 g.http_cookie_1_0_1 g.nokogiri_1_6_0 g.ntlm_http_0_1_1 g.webrobots_0_1_1 g.domain_name_0_5_13 ]; - sha256 = ''1w1rnn6jps1393gywi38saw5iqrvyai3vmvbv2kbc9j0zj5csyrl''; + name = ''mechanize-2.7.3''; + requiredGems = [ g.net_http_digest_auth_1_4 g.net_http_persistent_2_9_4 g.mime_types_2_3 g.http_cookie_1_0_2 g.nokogiri_1_6_3_1 g.ntlm_http_0_1_1 g.webrobots_0_1_1 g.domain_name_0_5_20 ]; + sha256 = ''00jkazj8fqnynaxca0lnwx5a084irxrnw8n8i0kppq4vg71g7rrx''; }; method_source_0_8_2 = { basename = ''method_source''; @@ -1302,20 +901,22 @@ a history.''; requiredGems = [ ]; sha256 = ''1g5i4w0dmlhzd18dijlqw5gk27bv6dj2kziqzrzb7mpgxgsd1sf2''; }; - mime_types_1_25 = { + mime_types_1_25_1 = { basename = ''mime_types''; meta = { description = ''This library allows for the identification of a file's likely MIME content type''; homepage = ''http://mime-types.rubyforge.org/''; longDescription = ''This library allows for the identification of a file's likely MIME content -type. This is release 1.25, adding experimental caching and lazy loading -functionality. +type. This is release 1.25.1, fixing an issue with priority comparison for +mime-types 1.x. The current release is 2.0, which only supports Ruby 1.9 or +later. -The caching and lazy loading features were initially implemented by Greg -Brockman (gdb). As these features are experimental, they are disabled by -default and must be enabled through the use of environment variables. The cache -is invalidated on a per-version basis; the cache for version 1.25 will not be -reused for version 1.26. +Release 1.25.1 contains all features of 1.25, including the experimental +caching and lazy loading functionality. The caching and lazy loading features +were initially implemented by Greg Brockman (gdb). As these features are +experimental, they are disabled by default and must be enabled through the use +of environment variables. The cache is invalidated on a per-version basis; the +cache for version 1.25 will not be reused for any later version. To use lazy loading, set the environment variable +RUBY_MIME_TYPES_LAZY_LOAD+ to any value other than 'false'. When using lazy loading, the initial startup @@ -1346,8 +947,7 @@ complete; don't hesitate to ask to add additional information. This library follows the IANA collection of MIME types (see below for reference). MIME::Types for Ruby was originally based on MIME::Types for Perl by Mark -Overmeer, copyright 2001 - 2009. As of version 1.15, the data format for the -MIME::Type list has changed and the synchronization will no longer happen. +Overmeer, copyright 2001 - 2009. MIME::Types is built to conform to the MIME types of RFCs 2045 and 2231. It tracks the {IANA registry}[http://www.iana.org/assignments/media-types/] @@ -1355,15 +955,15 @@ tracks the {IANA registry}[http://www.iana.org/assignments/media-types/] added from the {LTSW collection}[http://www.ltsw.se/knbase/internet/mime.htp] and added by the users of MIME::Types.''; }; - name = ''mime-types-1.25''; + name = ''mime-types-1.25.1''; requiredGems = [ ]; - sha256 = ''0hd6hpl05jyx3siznk70z46bmrzwmcyrr24yfaqg6nar35zw8bgf''; + sha256 = ''0mhzsanmnzdshaba7gmsjwnv168r1yj8y0flzw88frw1cickrvw8''; }; - mime_types_2_0 = { + mime_types_2_3 = { basename = ''mime_types''; meta = { description = ''The mime-types library provides a library and registry for information about MIME content type definitions''; - homepage = ''http://mime-types.rubyforge.org/''; + homepage = ''https://github.com/halostatue/mime-types/''; longDescription = ''The mime-types library provides a library and registry for information about MIME content type definitions. It can be used to determine defined filename extensions for MIME types, or to use filename extensions to look up the likely @@ -1379,46 +979,50 @@ add additional type definitions (see Contributing.rdoc). The primary sources for MIME type definitions found in mime-types is the IANA collection of registrations (see below for the link), RFCs, and W3C recommendations. -The mime-types library uses semantic versioning. This is release 2.0; there are -incompatible changes in the API provided by mime-types, mostly around registry -initialization (see History.rdoc for full details), and the removal of support -for Ruby 1.8 interpreters. +This is release 2.2, mostly changing how the MIME type registry is updated from +the IANA registry (the format of which was incompatibly changed shortly before +this release) and taking advantage of the extra data available from IANA +registry in the form of MIME::Type#xrefs. In addition, the {LTSW +list}[http://www.ltsw.se/knbase/internet/mime.htp] has been dropped as a +supported list. + +As a reminder, mime-types 2.x is no longer compatible with Ruby 1.8 and +mime-types 1.x is only being maintained for security issues. No new MIME types +or features will be added. mime-types (previously called MIME::Types for Ruby) was originally based on MIME::Types for Perl by Mark Overmeer, copyright 2001 - 2009. It is built to -conform to the MIME types of RFCs 2045 and 2231. It tracks the {IANA -registry}[http://www.iana.org/assignments/media-types/] -({ftp}[ftp://ftp.iana.org/assignments/media-types]) with some unofficial types -added from the {LTSW collection}[http://www.ltsw.se/knbase/internet/mime.htp] -and added by the users of mime-types.''; +conform to the MIME types of RFCs 2045 and 2231. It tracks the {IANA Media +Types registry}[https://www.iana.org/assignments/media-types/media-types.xhtml] +with some types added by the users of mime-types.''; }; - name = ''mime-types-2.0''; + name = ''mime-types-2.3''; requiredGems = [ ]; - sha256 = ''1q1s22l3mm0am2f7n9qjqp8zl0smr9zlqr2ywwyfjkid2sj3prfk''; + sha256 = ''0j0mwzr2q9fmisp3r8rp7j95dns2gw7sd8c5sb5y6z0dfj56a4vd''; }; - mini_portile_0_5_1 = { + mini_portile_0_6_0 = { basename = ''mini_portile''; meta = { description = ''Simplistic port-like solution for developers''; homepage = ''http://github.com/luislavena/mini_portile''; longDescription = ''Simplistic port-like solution for developers. It provides a standard and simplified way to compile against dependency libraries without messing up your system.''; }; - name = ''mini_portile-0.5.1''; + name = ''mini_portile-0.6.0''; requiredGems = [ ]; - sha256 = ''0cafnlhdzakzl5vqcm9b97kchj9bvhlcf4ylkyr85lz1263hbagg''; + sha256 = ''09kcn4g63xrdirgwxgjikqg976rr723bkc9bxfr29pk22cj3wavn''; }; - minitar_0_5_3 = { + minitar_0_5_4 = { basename = ''minitar''; meta = { description = ''Provides POSIX tarchive management from Ruby programs.''; - homepage = ''http://rubyforge.org/projects/ruwiki/''; - longDescription = ''Archive::Tar::Minitar is a pure-Ruby library and command-line utility that provides the ability to deal with POSIX tar(1) archive files. The implementation is based heavily on Mauricio Ferna'ndez's implementation in rpa-base, but has been reorganised to promote reuse in other projects.''; + homepage = ''http://www.github.com/atoulme/minitar''; + longDescription = ''Archive::Tar::Minitar is a pure-Ruby library and command-line utility that provides the ability to deal with POSIX tar(1) archive files. The implementation is based heavily on Mauricio Ferna'ndez's implementation in rpa-base, but has been reorganised to promote reuse in other projects. Antoine Toulme forked the original project on rubyforge to place it on github, under http://www.github.com/atoulme/minitar''; }; - name = ''minitar-0.5.3''; + name = ''minitar-0.5.4''; requiredGems = [ ]; - sha256 = ''035vs1knnnjsb8arfp8vx75warvwcdpiljjwv38lqljai9v8fq53''; + sha256 = ''1vpdjfmdq1yc4i620frfp9af02ia435dnpj8ybsd7dc3rypkvbka''; }; - minitest_4_7_5 = { + minitest_5_4_0 = { basename = ''minitest''; meta = { description = ''minitest provides a complete suite of testing facilities supporting TDD, BDD, mocking, and benchmarking''; @@ -1477,64 +1081,53 @@ 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-4.7.5''; - requiredGems = [ ]; - sha256 = ''03p6iban9gcpcflzp4z901s1hgj9369p6515h967ny6hlqhcf2iy''; - }; - mono_logger_1_1_0 = { - basename = ''mono_logger''; - meta = { - description = ''A lock-free logger compatible with Ruby 2.0.''; - homepage = ''http://github.com/steveklabnik/mono_logger''; - longDescription = ''A lock-free logger compatible with Ruby 2.0. Ruby does not allow you to request a lock in a trap handler because that could deadlock, so Logger is not sufficient.''; - }; - name = ''mono_logger-1.1.0''; + name = ''minitest-5.4.0''; requiredGems = [ ]; - sha256 = ''18yplq3xxv5crwpfwbw2sb6brqd3g51si7x9fbh9bcimg4ipzayp''; + sha256 = ''002xflqz5wl8gcj9gw4q66mq5jkp445zgd9c5vs6cw6lsfsyg4rl''; }; - multi_json_1_7_9 = { + multi_json_1_10_1 = { basename = ''multi_json''; meta = { description = ''A common interface to multiple JSON libraries.''; homepage = ''http://github.com/intridea/multi_json''; longDescription = ''A common interface to multiple JSON libraries, including Oj, Yajl, the JSON gem (with C-extensions), the pure-Ruby JSON gem, NSJSONSerialization, gson.rb, JrJackson, and OkJson.''; }; - name = ''multi_json-1.7.9''; + name = ''multi_json-1.10.1''; requiredGems = [ ]; - sha256 = ''1q13ldcc8shlfisy90k19zrar87208gs3za6jmr78p11ip21picx''; + sha256 = ''1ll21dz01jjiplr846n1c8yzb45kj5hcixgb72rz0zg8fyc9g61c''; }; - multi_json_1_8_2 = { + multi_json_1_3_6 = { basename = ''multi_json''; meta = { - description = ''A common interface to multiple JSON libraries.''; + description = ''A gem to provide swappable JSON backends.''; homepage = ''http://github.com/intridea/multi_json''; - longDescription = ''A common interface to multiple JSON libraries, including Oj, Yajl, the JSON gem (with C-extensions), the pure-Ruby JSON gem, NSJSONSerialization, gson.rb, JrJackson, and OkJson.''; + longDescription = ''A gem to provide easy switching between different JSON backends, including Oj, Yajl, the JSON gem (with C-extensions), the pure-Ruby JSON gem, and OkJson.''; }; - name = ''multi_json-1.8.2''; + name = ''multi_json-1.3.6''; requiredGems = [ ]; - sha256 = ''1ffmnwsfwdgspk86x1g98cq2ivqlgqpqngyrvs07zsnvgdimahdb''; + sha256 = ''0q2zjfvd2ibds9g9nzf2p1b47fc1wqliwfywv5pw85w15lmy91yr''; }; - multi_test_0_0_2 = { + multi_test_0_1_1 = { basename = ''multi_test''; meta = { - description = ''multi-test-0.0.2''; + description = ''multi-test-0.1.1''; homepage = ''http://cukes.info''; longDescription = ''Wafter-thin gem to help control rogue test/unit/autorun requires''; }; - name = ''multi_test-0.0.2''; + name = ''multi_test-0.1.1''; requiredGems = [ ]; - sha256 = ''0y8i0v0awc87laicqz1348k54z6wsyf141xqd7gh2bjgm9pc9pkr''; + sha256 = ''1dd810limbdc8k7ss83g83krrsjjqs79nicbdxk74l1a2sp2jhwv''; }; - multipart_post_1_2_0 = { + multipart_post_2_0_0 = { basename = ''multipart_post''; meta = { description = ''A multipart form post accessory for Net::HTTP.''; homepage = ''https://github.com/nicksieger/multipart-post''; longDescription = ''Use with Net::HTTP to do multipart form posts. IO values that have #content_type, #original_filename, and #local_path will be posted as a binary file.''; }; - name = ''multipart-post-1.2.0''; + name = ''multipart-post-2.0.0''; requiredGems = [ ]; - sha256 = ''12p7lnmc52di1r4h73h6xrpppplzyyhani9p7wm8l4kgf1hnmwnc''; + sha256 = ''09k0b3cybqilk1gwrwwain95rdypixb2q9w65gd44gfzsd84xi1x''; }; net_http_digest_auth_1_4 = { basename = ''net_http_digest_auth''; @@ -1553,7 +1146,7 @@ for an example.''; requiredGems = [ ]; sha256 = ''14801gr34g0rmqz9pv4rkfa3crfdbyfk6r48vpg5a5407v0sixqi''; }; - net_http_persistent_2_9 = { + net_http_persistent_2_9_4 = { basename = ''net_http_persistent''; meta = { description = ''Manages persistent connections using Net::HTTP plus a speed fix for Ruby 1.8''; @@ -1569,9 +1162,9 @@ Net::HTTP supports persistent connections with some API methods but does not handle reconnection gracefully. Net::HTTP::Persistent supports reconnection and retry according to RFC 2616.''; }; - name = ''net-http-persistent-2.9''; + name = ''net-http-persistent-2.9.4''; requiredGems = [ ]; - sha256 = ''0k9bp7q5fsh908jnkwfj71ky04i4ih0ky6sqi5vl6zcpjsczgfcb''; + sha256 = ''1y9fhaax0d9kkslyiqi1zys6cvpaqx9a0y0cywp24rpygwh4s9r4''; }; net_http_pipeline_1_0_1 = { basename = ''net_http_pipeline''; @@ -1586,49 +1179,38 @@ The server will respond in-order.''; requiredGems = [ ]; sha256 = ''0bxjy33yhxwsbnld8xj3zv64ibgfjn9rjpiqkyd5ipmz50pww8v9''; }; - net_sftp_2_0_5 = { + net_sftp_2_1_2 = { basename = ''net_sftp''; meta = { description = ''A pure Ruby implementation of the SFTP client protocol''; - homepage = ''http://net-ssh.rubyforge.org/sftp''; + homepage = ''https://github.com/net-ssh/net-sftp''; longDescription = ''A pure Ruby implementation of the SFTP client protocol''; }; - name = ''net-sftp-2.0.5''; - requiredGems = [ g.net_ssh_2_6_8 ]; - sha256 = ''0lqk735wspm8rbiyxpbil8ikrqcyg00ss1df7fny0761c3as6m0v''; + name = ''net-sftp-2.1.2''; + requiredGems = [ g.net_ssh_2_9_1 ]; + sha256 = ''04674g4n6mryjajlcd82af8g8k95la4b1bj712dh71hw1c9vhw1y''; }; - net_ssh_2_6_0 = { + net_ssh_2_7_0 = { basename = ''net_ssh''; meta = { description = ''Net::SSH: a pure-Ruby implementation of the SSH2 client protocol.''; - homepage = ''http://github.com/net-ssh/net-ssh''; + homepage = ''https://github.com/net-ssh/net-ssh''; longDescription = ''Net::SSH: a pure-Ruby implementation of the SSH2 client protocol. It allows you to write programs that invoke and interact with processes on remote servers, via SSH2.''; }; - name = ''net-ssh-2.6.0''; - requiredGems = [ g.jruby_pageant_1_1_1 ]; - sha256 = ''18fsgps4a9dfrjszkl3py8j7vw0xwi70bcp59ccj2rlr6i1jv5gw''; + name = ''net-ssh-2.7.0''; + requiredGems = [ ]; + sha256 = ''14v0cq2fws54kxpgz249xmjlajynhcs4s2szl8kjxgn4c78lrkmr''; }; - net_ssh_2_6_8 = { + net_ssh_2_9_1 = { basename = ''net_ssh''; meta = { description = ''Net::SSH: a pure-Ruby implementation of the SSH2 client protocol.''; homepage = ''https://github.com/net-ssh/net-ssh''; longDescription = ''Net::SSH: a pure-Ruby implementation of the SSH2 client protocol. It allows you to write programs that invoke and interact with processes on remote servers, via SSH2.''; }; - name = ''net-ssh-2.6.8''; - requiredGems = [ ]; - sha256 = ''0vf9w8b9f5ha94nwhvwxyqk4lfpy42ihl1g0qib8dfvswlkqw3mx''; - }; - netrc_0_7_7 = { - 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.7''; + name = ''net-ssh-2.9.1''; requiredGems = [ ]; - sha256 = ''1y64v93hsxdwgx3dfkyzdki3zqd1slm42dmi23v0zy3kap4vpard''; + sha256 = ''1vscp4r58jisiigqc6d6752w19m1m6hmi3jkzmp3ydxai7h3jb2j''; }; nix_0_1_1 = { basename = ''nix''; @@ -1641,22 +1223,7 @@ The server will respond in-order.''; requiredGems = [ ]; sha256 = ''0kwrbkkg0gxibhsz9dpd5zabcf2wqsicg28yiazyb3dc9dslk26k''; }; - nokogiri_1_5_10 = { - basename = ''nokogiri''; - meta = { - description = ''Nokogiri (鋸) is an HTML, XML, SAX, and Reader parser''; - homepage = ''http://nokogiri.org''; - longDescription = ''Nokogiri (鋸) is an HTML, XML, SAX, and Reader parser. Among Nokogiri's -many features is the ability to search documents via XPath or CSS3 selectors. - -XML is like violence - if it doesn’t solve your problems, you are not using -enough of it.''; - }; - name = ''nokogiri-1.5.10''; - requiredGems = [ ]; - sha256 = ''0dblphzwzl705xmlqcflz8s60xzbcgi4xqzx7984l4kcssbkn71b''; - }; - nokogiri_1_6_0 = { + nokogiri_1_6_3_1 = { basename = ''nokogiri''; meta = { description = ''Nokogiri (鋸) is an HTML, XML, SAX, and Reader parser''; @@ -1667,9 +1234,9 @@ many features is the ability to search documents via XPath or CSS3 selectors. XML is like violence - if it doesn’t solve your problems, you are not using enough of it.''; }; - name = ''nokogiri-1.6.0''; - requiredGems = [ g.mini_portile_0_5_1 ]; - sha256 = ''1icrny9w2hd0pm7cyq5wqdkbzr57dkma1lbyrr0x14lsnangkidb''; + name = ''nokogiri-1.6.3.1''; + requiredGems = [ g.mini_portile_0_6_0 ]; + sha256 = ''11958hlfd8i3i9y0wk1b6ck9x0j95l4zdbbixmdnnh1r8ijilxli''; }; ntlm_http_0_1_1 = { basename = ''ntlm_http''; @@ -1682,16 +1249,26 @@ enough of it.''; requiredGems = [ ]; sha256 = ''0yx01ffrw87wya1syivqzf8hz02axk7jdpw6aw221xwvib767d36''; }; - papertrail_0_9_7 = { + orderedhash_0_0_6 = { + basename = ''orderedhash''; + meta = { + description = ''orderedhash''; + homepage = ''http://codeforpeople.com/lib/ruby/orderedhash/''; + }; + name = ''orderedhash-0.0.6''; + requiredGems = [ ]; + sha256 = ''0fryy7f9jbpx33jq5m402yqj01zcg563k9fsxlqbhmq638p4bzd7''; + }; + papertrail_0_9_10 = { basename = ''papertrail''; meta = { description = ''Command-line client for Papertrail hosted log management service.''; homepage = ''http://github.com/papertrail/papertrail-cli''; longDescription = ''Command-line client for Papertrail hosted log management service. Tails and searches app server logs and system syslog. Supports Boolean search and works with grep and pipe output (Unix).''; }; - name = ''papertrail-0.9.7''; - requiredGems = [ g.addressable_2_3_5 g.yajl_ruby_1_1_0 g.chronic_0_10_1 g.faraday_0_8_8 g.faraday_middleware_0_8_8 ]; - sha256 = ''0v0m1v0qabbr9pmyl77znz39qy1m7p0xwvf3lf9hyq6n524f2dwr''; + name = ''papertrail-0.9.10''; + requiredGems = [ g.chronic_0_10_2 ]; + sha256 = ''1v2acc896w5q72m5pfxc8rx36gzih4fivyiqp0kxwypgyh0f0x58''; }; papertrail_cli_0_9_3 = { basename = ''papertrail_cli''; @@ -1701,7 +1278,7 @@ enough of it.''; longDescription = ''Placeholder gem to point to new papertrail gem.''; }; name = ''papertrail-cli-0.9.3''; - requiredGems = [ g.papertrail_0_9_7 ]; + requiredGems = [ g.papertrail_0_9_10 ]; sha256 = ''1914dcfqsmw5rl4xd1zwjrfbgwglyncxm8km06bgxaqn4wnaq5iv''; }; parallel_0_7_1 = { @@ -1714,7 +1291,7 @@ enough of it.''; requiredGems = [ ]; sha256 = ''1kzz6ydg7r23ks2b7zbpx4vz3h186n19vhgnjcwi7xwd6h2f1fsq''; }; - polyglot_0_3_3 = { + polyglot_0_3_5 = { basename = ''polyglot''; meta = { description = ''Augment 'require' to load non-Ruby file types''; @@ -1724,64 +1301,31 @@ The Polyglot library allows a Ruby module to register a loader for the file type associated with a filename extension, and it augments 'require' to find and load matching files.''; }; - name = ''polyglot-0.3.3''; - requiredGems = [ ]; - sha256 = ''082zmail2h3cxd9z1wnibhk6aj4sb1f3zzwra6kg9bp51kx2c00v''; - }; - posix_spawn_0_3_6 = { - basename = ''posix_spawn''; - meta = { - description = ''posix_spawnp(2) for ruby''; - homepage = ''http://github.com/rtomayko/posix-spawn''; - longDescription = ''posix-spawn uses posix_spawnp(2) for faster process spawning''; - }; - name = ''posix-spawn-0.3.6''; + name = ''polyglot-0.3.5''; requiredGems = [ ]; - sha256 = ''0f2mqka8024yz55iw8wbihvmakwqnbrdr4a1ffl3x2zi104yvb43''; - }; - pry_0_9_12_2 = { - basename = ''pry''; - meta = { - description = ''An IRB alternative and runtime developer console''; - homepage = ''http://pry.github.com''; - longDescription = ''An IRB alternative and runtime developer console''; - }; - name = ''pry-0.9.12.2''; - requiredGems = [ g.coderay_1_0_9 g.slop_3_4_6 g.method_source_0_8_2 ]; - sha256 = ''141slzb62zfzdhrygqjmrzh68s3vzrb4mwyipy2lhps5q4b46y9s''; + sha256 = ''1bqnxwyip623d8pr29rg6m8r0hdg08fpr2yb74f46rn1wgsnxmjr''; }; - pry_0_9_12_3 = { + pry_0_9_12_6 = { basename = ''pry''; meta = { description = ''An IRB alternative and runtime developer console''; homepage = ''http://pry.github.com''; longDescription = ''An IRB alternative and runtime developer console''; }; - name = ''pry-0.9.12.3''; - requiredGems = [ g.coderay_1_1_0 g.slop_3_4_7 g.method_source_0_8_2 ]; - sha256 = ''1dn80vnyq1l6192sg3p29d0yz6rswnsl8rn3lkf75c86a2qqxpy3''; + name = ''pry-0.9.12.6''; + requiredGems = [ g.coderay_1_1_0 g.slop_3_6_0 g.method_source_0_8_2 ]; + sha256 = ''0wmgamn83m1zb1fbqc22hiszjf2a2xij5jd95w2gvm5x6l5p61q1''; }; - pusher_client_0_3_1 = { + pusher_client_0_6_0 = { basename = ''pusher_client''; meta = { description = ''Client for consuming WebSockets from http://pusher.com''; homepage = ''http://github.com/pusher/pusher-ruby-client''; longDescription = ''Client for consuming WebSockets from http://pusher.com''; }; - name = ''pusher-client-0.3.1''; - requiredGems = [ g.websocket_1_0_7 g.ruby_hmac_0_4_0 ]; - sha256 = ''1mxqy960iln065fypk1ww3xgv7q396fpl6v0rp7ipls6aj86j970''; - }; - pygments_rb_0_5_4 = { - basename = ''pygments_rb''; - meta = { - description = ''pygments wrapper for ruby''; - homepage = ''http://github.com/tmm1/pygments.rb''; - longDescription = ''pygments.rb exposes the pygments syntax highlighter to Ruby''; - }; - name = ''pygments.rb-0.5.4''; - requiredGems = [ g.yajl_ruby_1_1_0 g.posix_spawn_0_3_6 ]; - sha256 = ''0ryl0f0zp0rffaggd978cmrkzsmf83x452fcinw6p705xdk4zbvl''; + name = ''pusher-client-0.6.0''; + requiredGems = [ g.websocket_1_2_0 g.json_1_8_1 ]; + sha256 = ''0n7l630qg6wgzak45b6gfjg9a0fmpbrs7mwchqqbja9mjs95r8qy''; }; rack_1_5_2 = { basename = ''rack''; @@ -1801,27 +1345,16 @@ Also see http://rack.github.com/. requiredGems = [ ]; sha256 = ''19szfw76cscrzjldvw30jp3461zl00w4xvw1x9lsmyp86h1g0jp6''; }; - rack_protection_1_5_0 = { + rack_protection_1_5_3 = { basename = ''rack_protection''; meta = { description = ''You should use protection!''; homepage = ''http://github.com/rkh/rack-protection''; longDescription = ''You should use protection!''; }; - name = ''rack-protection-1.5.0''; + name = ''rack-protection-1.5.3''; requiredGems = [ g.rack_1_5_2 ]; - sha256 = ''10wm67f2mp9pryg0s8qapbyxd2lcrpb8ywsbicg29cv2xprhbl4j''; - }; - rack_protection_1_5_1 = { - basename = ''rack_protection''; - meta = { - description = ''You should use protection!''; - homepage = ''http://github.com/rkh/rack-protection''; - longDescription = ''You should use protection!''; - }; - name = ''rack-protection-1.5.1''; - requiredGems = [ g.rack_1_5_2 ]; - sha256 = ''0qxq5ld15nljxzdcx2wmbc3chw8nb6la1ap838vf263lnjcpx3dd''; + sha256 = ''0cvb21zz7p9wy23wdav63z5qzfn4nialik22yqp6gihkgfqqrh5r''; }; rack_test_0_6_2 = { basename = ''rack_test''; @@ -1837,27 +1370,27 @@ request helpers feature.''; requiredGems = [ g.rack_1_5_2 ]; sha256 = ''01mk715ab5qnqf6va8k3hjsvsmplrfqpz6g58qw4m3l8mim0p4ky''; }; - rails_4_0_0 = { + rails_4_1_5 = { basename = ''rails''; meta = { description = ''Full-stack web application framework.''; homepage = ''http://www.rubyonrails.org''; 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.0.0''; - requiredGems = [ g.activesupport_4_0_0 g.actionpack_4_0_0 g.activerecord_4_0_0 g.actionmailer_4_0_0 g.railties_4_0_0 g.bundler_1_3_5 g.sprockets_rails_2_0_0 ]; - sha256 = ''12q2z2zpqpr61rqdx8can2ay6y1xxi6ghmlkyvfvxnnwwzxypavf''; + name = ''rails-4.1.5''; + requiredGems = [ g.activesupport_4_1_5 g.actionpack_4_1_5 g.actionview_4_1_5 g.activemodel_4_1_5 g.activerecord_4_1_5 g.actionmailer_4_1_5 g.railties_4_1_5 g.bundler_1_7_0 g.sprockets_rails_2_1_3 ]; + sha256 = ''12s3jkvd6bn40apxc3973czgs7s6y36aclbwif6j770v7sjd9qj7''; }; - railties_4_0_0 = { + railties_4_1_5 = { basename = ''railties''; meta = { description = ''Tools for creating, working with, and running Rails applications.''; homepage = ''http://www.rubyonrails.org''; longDescription = ''Rails internals: application bootup, plugins, generators, and rake tasks.''; }; - name = ''railties-4.0.0''; - requiredGems = [ g.activesupport_4_0_0 g.actionpack_4_0_0 g.rake_10_1_0 g.thor_0_18_1 ]; - sha256 = ''063yyp75b87z0nr1mayzyq462nnhfm834mn97fcyg2mf3zr8qbly''; + name = ''railties-4.1.5''; + requiredGems = [ g.activesupport_4_1_5 g.actionpack_4_1_5 g.rake_10_3_2 g.thor_0_19_1 ]; + sha256 = ''18jkjvny51vk53l2g9ibcnjk3gjj1vgh3pyrskmk69csqm2hmaha''; }; rake_0_9_2_2 = { basename = ''rake''; @@ -1870,109 +1403,58 @@ request helpers feature.''; requiredGems = [ ]; sha256 = ''19n4qp5gzbcqy9ajh56kgwqv9p9w2hnczhyvaqz0nlvk9diyng6q''; }; - rake_0_9_6 = { + rake_10_3_2 = { basename = ''rake''; meta = { - description = ''Ruby based make-like utility.''; - homepage = ''http://rake.rubyforge.org''; - longDescription = ''Rake is a Make-like program implemented in Ruby. Tasks and dependencies arespecified in standard Ruby syntax.''; - }; - name = ''rake-0.9.6''; - requiredGems = [ ]; - sha256 = ''09kyh351gddn6gjz255hbaza1cw235xvfz9dc15rhyq9phvqdphc''; - }; - rake_10_1_0 = { - basename = ''rake''; - meta = { - description = ''Ruby based make-like utility.''; - homepage = ''http://rake.rubyforge.org''; - longDescription = ''Rake is a Make-like program implemented in Ruby. Tasks and dependencies arespecified in standard Ruby syntax.''; + description = ''Rake is a Make-like program implemented in Ruby''; + homepage = ''https://github.com/jimweirich/rake''; + longDescription = ''Rake is a Make-like program implemented in Ruby. Tasks and dependencies are +specified in standard Ruby syntax. + +Rake has the following features: + +* Rakefiles (rake's version of Makefiles) are completely defined in + standard Ruby syntax. No XML files to edit. No quirky Makefile + syntax to worry about (is that a tab or a space?) + +* Users can specify tasks with prerequisites. + +* Rake supports rule patterns to synthesize implicit tasks. + +* Flexible FileLists that act like arrays but know about manipulating + file names and paths. + +* A library of prepackaged tasks to make building rakefiles easier. For example, + tasks for building tarballs and publishing to FTP or SSH sites. (Formerly + tasks for building RDoc and Gems were included in rake but they're now + available in RDoc and RubyGems respectively.) + +* Supports parallel execution of tasks.''; }; - name = ''rake-10.1.0''; + name = ''rake-10.3.2''; requiredGems = [ ]; - sha256 = ''1frsqpihi39x3yqaa7m9vbls1kd24wckbj5cpiwqix8xmcwnic7q''; + sha256 = ''0nvpkjrpsk8xxnij2wd1cdn6arja9q11sxx4aq4fz18bc6fss15m''; }; - rb_fsevent_0_9_3 = { + rb_fsevent_0_9_4 = { basename = ''rb_fsevent''; meta = { description = ''Very simple & usable FSEvents API''; homepage = ''http://rubygems.org/gems/rb-fsevent''; longDescription = ''FSEvents API with Signals catching (without RubyCocoa)''; }; - name = ''rb-fsevent-0.9.3''; + name = ''rb-fsevent-0.9.4''; requiredGems = [ ]; - sha256 = ''0bdnxwdxj4r1kdxfi5nszbsb126njrr81p912g64xxs2bgxd1bp1''; + sha256 = ''12if5xsik64kihxf5awsyavlp595y47g9qz77vfp2zvkxgglaka7''; }; - rb_inotify_0_9_2 = { - basename = ''rb_inotify''; - meta = { - description = ''A Ruby wrapper for Linux's inotify, using FFI''; - homepage = ''http://github.com/nex3/rb-inotify''; - longDescription = ''A Ruby wrapper for Linux's inotify, using FFI''; - }; - name = ''rb-inotify-0.9.2''; - requiredGems = [ g.ffi_1_9_3 ]; - sha256 = ''0752fhgfrx370b2jnhxzs8sjv2l8yrnwqj337kx9v100igd1c7iv''; - }; - rb_kqueue_0_2_0 = { - basename = ''rb_kqueue''; - meta = { - description = ''A Ruby wrapper for BSD's kqueue, using FFI''; - homepage = ''http://github.com/mat813/rb-kqueue''; - longDescription = ''A Ruby wrapper for BSD's kqueue, using FFI''; - }; - name = ''rb-kqueue-0.2.0''; - requiredGems = [ g.ffi_1_9_3 ]; - sha256 = ''1f2wimhq93a1zy2fbyj7iyh7hvzmzwn3pzhkwb3npy4mj1df83n3''; - }; - rdiscount_2_1_6 = { + rdiscount_2_1_7_1 = { basename = ''rdiscount''; meta = { description = ''Fast Implementation of Gruber's Markdown in C''; homepage = ''http://dafoster.net/projects/rdiscount/''; }; - name = ''rdiscount-2.1.6''; + name = ''rdiscount-2.1.7.1''; requiredGems = [ ]; - sha256 = ''180ln9gwxn0cyflg0i1viv7jyalmjqvqr34cb65xsmmsz1nz55q2''; - }; - redcarpet_2_3_0 = { - 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-2.3.0''; - requiredGems = [ ]; - sha256 = ''1fghh7n9kz6n6bdhgix5s8lyj5sw6q44zizf4mdgz5xsgwqcr6sw''; - }; - redis_3_0_5 = { - 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.0.5''; - requiredGems = [ ]; - sha256 = ''01gg3mgh3yznfhxschcka593a3ivsyw5g5vr0g5apiz4lfh6dlkn''; - }; - redis_namespace_1_3_1 = { - basename = ''redis_namespace''; - meta = { - description = ''Namespaces Redis commands.''; - homepage = ''http://github.com/resque/redis-namespace''; - longDescription = ''Adds a Redis::Namespace class which can be used to namespace calls -to Redis. This is useful when using a single instance of Redis with -multiple, different applications. -''; - }; - name = ''redis-namespace-1.3.1''; - requiredGems = [ g.redis_3_0_5 ]; - sha256 = ''1l6a64z09ni5pi6mbgvsph0lp14cnp180aj7mxnq2nb38sig4iw5''; + sha256 = ''1g70vsgv7mdwcyk9rxja7wm4qqap67prqwkj335c460vlzs6pqii''; }; remote_syslog_1_6_14 = { basename = ''remote_syslog''; @@ -1985,52 +1467,16 @@ multiple, different applications. requiredGems = [ g.servolux_0_10_0 g.file_tail_1_0_12 g.eventmachine_1_0_3 g.eventmachine_tail_0_6_4 g.syslog_protocol_0_9_2 g.em_resolv_replace_1_1_3 ]; sha256 = ''1f2yjyqhbdc4vlx52zli1b33f6yn8qc1kd4n0dpv27zswj9qfdkr''; }; - resque_1_25_1 = { - basename = ''resque''; + riemann_dash_0_2_9 = { + basename = ''riemann_dash''; meta = { - description = ''Resque is a Redis-backed queueing system.''; - homepage = ''http://github.com/defunkt/resque''; - longDescription = '' Resque is a Redis-backed Ruby library for creating background jobs, - placing those jobs on multiple queues, and processing them later. - - Background jobs can be any Ruby class or module that responds to - perform. Your existing classes can easily be converted to background - jobs or you can create new classes specifically to do work. Or, you - can do both. - - Resque is heavily inspired by DelayedJob (which rocks) and is - comprised of three parts: - - * A Ruby library for creating, querying, and processing jobs - * A Rake task for starting a worker which processes jobs - * A Sinatra app for monitoring queues, jobs, and workers. -''; + description = ''HTTP dashboard for the distributed event system Riemann.''; + homepage = ''https://github.com/aphyr/riemann-dash''; + longDescription = ''HTTP dashboard for the distributed event system Riemann.''; }; - name = ''resque-1.25.1''; - requiredGems = [ g.redis_namespace_1_3_1 g.vegas_0_1_11 g.sinatra_1_4_4 g.multi_json_1_8_2 g.mono_logger_1_1_0 ]; - sha256 = ''0p9kpj900cyb888wmpqx6ms9b0hza09glr4cvrwqwp1vqya25lpy''; - }; - resque_web_0_0_3 = { - basename = ''resque_web''; - meta = { - description = ''Rails-based Resque web interface''; - homepage = ''https://github.com/resque/resque-web''; - longDescription = ''A Rails-based frontend to the Resque job queue system.''; - }; - name = ''resque-web-0.0.3''; - requiredGems = [ g.resque_1_25_1 g.twitter_bootstrap_rails_2_2_8 g.jquery_rails_3_0_4 g.sass_rails_4_0_1 g.coffee_rails_4_0_1 ]; - sha256 = ''1v4g0zrlq9n0pkhdiwxqcmis5p8hpxm475vchldk63mi1vy4fvr2''; - }; - rest_client_1_6_7 = { - basename = ''rest_client''; - meta = { - description = ''Simple HTTP and REST client for Ruby, inspired by microframework syntax for specifying actions.''; - homepage = ''http://github.com/archiloque/rest-client''; - longDescription = ''A simple HTTP and REST client for Ruby, inspired by the Sinatra microframework style of specifying actions: get, put, post, delete.''; - }; - name = ''rest-client-1.6.7''; - requiredGems = [ g.mime_types_2_0 ]; - sha256 = ''0nn7zalgidz2yj0iqh3xvzh626krm2al79dfiij19jdhp0rk8853''; + name = ''riemann-dash-0.2.9''; + requiredGems = [ g.erubis_2_7_0 g.sinatra_1_4_5 g.sass_3_4_0 g.webrick_1_3_1 g.multi_json_1_3_6 ]; + sha256 = ''0ws5wmjbv8w9lcr3i2mdinj2qm91p6c85k6c067i67cf0p90jxq3''; }; right_aws_3_1_0 = { basename = ''right_aws''; @@ -2077,10 +1523,10 @@ The RightScale AWS gems comprise: ''; }; name = ''right_aws-3.1.0''; - requiredGems = [ g.right_http_connection_1_4_0 ]; + requiredGems = [ g.right_http_connection_1_5_0 ]; sha256 = ''1a3l5vyvq078nq976rzkrd6fbj522sbgrxpdq3p9z373h0awha09''; }; - right_http_connection_1_4_0 = { + right_http_connection_1_5_0 = { basename = ''right_http_connection''; meta = { description = ''RightScale's robust HTTP/S connection module''; @@ -2095,11 +1541,11 @@ algorithm for low-level network errors. - HTTPS certificate checking ''; }; - name = ''right_http_connection-1.4.0''; + name = ''right_http_connection-1.5.0''; requiredGems = [ ]; - sha256 = ''0m4phly7srnwyvfqp01lpaxrgrybhszar0p23zl8b12r6bdjl84g''; + sha256 = ''0shd8v24aqxdvim1gdqzwxpanjhfgkhdaw0m0lzz7sybkb02j8qf''; }; - rjb_1_4_2 = { + rjb_1_4_8 = { basename = ''rjb''; meta = { description = ''Ruby Java bridge''; @@ -2107,11 +1553,11 @@ algorithm for low-level network errors. longDescription = ''RJB is a bridge program that connect between Ruby and Java with Java Native Interface. ''; }; - name = ''rjb-1.4.2''; + name = ''rjb-1.4.8''; requiredGems = [ ]; - sha256 = ''1cgbwpc45djs0mw05ydxf5apmb9ibj61n240ylqwzrajf13banzh''; + sha256 = ''06ps4ssaxb8jwja53h7v7kb31hsdr997b8na89d1yasm5zyraliw''; }; - rjb_1_4_8 = { + rjb_1_4_9 = { basename = ''rjb''; meta = { description = ''Ruby Java bridge''; @@ -2119,33 +1565,21 @@ algorithm for low-level network errors. longDescription = ''RJB is a bridge program that connect between Ruby and Java with Java Native Interface. ''; }; - name = ''rjb-1.4.8''; + name = ''rjb-1.4.9''; requiredGems = [ ]; - sha256 = ''06ps4ssaxb8jwja53h7v7kb31hsdr997b8na89d1yasm5zyraliw''; + sha256 = ''062f7bjwz6iz6da49nzzbbx4xn8ahqqha2smqvqhbf0i7kd5v0yz''; }; - rkelly_remix_0_0_4 = { + rkelly_remix_0_0_6 = { basename = ''rkelly_remix''; meta = { - description = ''Fork of the RKelly library to make it suitable as the JavaScript parser in JSDuck''; - longDescription = ''Fork of the RKelly library to make it suitable as the JavaScript parser -in JSDuck. - -* http://rkelly.rubyforge.org/''; + description = ''RKelly Remix is a fork of the RKelly[https://github.com/tenderlove/rkelly] JavaScript parser.''; + homepage = ''https://github.com/nene/rkelly-remix''; + longDescription = ''RKelly Remix is a fork of the +RKelly[https://github.com/tenderlove/rkelly] JavaScript parser.''; }; - name = ''rkelly-remix-0.0.4''; + name = ''rkelly-remix-0.0.6''; requiredGems = [ ]; - sha256 = ''1w6yr5n3b8yd0rsba9q3zyxr0n2hbpkz4v2k1qx6j1ywvl9rc2c1''; - }; - rmagick_2_13_2 = { - basename = ''rmagick''; - meta = { - description = ''Ruby binding to ImageMagick''; - homepage = ''http://rubyforge.org/projects/rmagick''; - longDescription = ''RMagick is an interface between Ruby and ImageMagick.''; - }; - name = ''rmagick-2.13.2''; - requiredGems = [ ]; - sha256 = ''1fw5rs5yqi5ayh44d18gjq68chiz14byx01h33c8jvkdxz3b9wz4''; + sha256 = ''1ihsns5v8nx96gvj7sqw5m8d6dsnmpfzpd07y860bldjhkjsxp1z''; }; rmail_1_0_0 = { basename = ''rmail''; @@ -2158,94 +1592,82 @@ in JSDuck. requiredGems = [ ]; sha256 = ''0nsg7yda1gdwa96j4hlrp2s0m06vrhcc4zy5mbq7gxmlmwf9yixp''; }; - rmail_sup_1_0_1 = { - basename = ''rmail_sup''; - meta = { - description = ''A MIME mail parsing and generation library.''; - homepage = ''http://supmua.org''; - longDescription = '' RMail is a lightweight mail library containing various utility classes and - modules that allow ruby scripts to parse, modify, and generate MIME mail - messages. -''; - }; - name = ''rmail-sup-1.0.1''; - requiredGems = [ ]; - sha256 = ''1xswk101s560lxqaax3plqh8vjx7jjspnggdwb3q80m358f92q9g''; - }; - rspec_2_11_0 = { + rspec_2_14_1 = { basename = ''rspec''; meta = { - description = ''rspec-2.11.0''; + description = ''rspec-2.14.1''; homepage = ''http://github.com/rspec''; longDescription = ''BDD for Ruby''; }; - name = ''rspec-2.11.0''; - requiredGems = [ g.rspec_core_2_11_1 g.rspec_expectations_2_11_3 g.rspec_mocks_2_11_3 ]; - sha256 = ''0k55akvs2xhs57kz81g37s4v56vybq46sjs7f8wpybrwxryg1vxs''; + name = ''rspec-2.14.1''; + requiredGems = [ g.rspec_core_2_14_8 g.rspec_expectations_2_14_5 g.rspec_mocks_2_14_6 ]; + sha256 = ''134y4wzk1prninb5a0bhxgm30kqfzl8dg06af4js5ylnhv2wd7sg''; + }; + rspec_core_2_14_5 = { + basename = ''rspec_core''; + meta = { + description = ''rspec-core-2.14.5''; + homepage = ''http://github.com/rspec/rspec-core''; + longDescription = ''BDD for Ruby. RSpec runner and example groups.''; + }; + name = ''rspec-core-2.14.5''; + requiredGems = [ ]; + sha256 = ''18zk2y5agzj4ps16hh1jlcqmyj0bmlcr24bl0m8gyhwf0gk1xmcr''; }; - rspec_core_2_11_1 = { + rspec_core_2_14_8 = { basename = ''rspec_core''; meta = { - description = ''rspec-core-2.11.1''; + description = ''rspec-core-2.14.8''; homepage = ''http://github.com/rspec/rspec-core''; longDescription = ''BDD for Ruby. RSpec runner and example groups.''; }; - name = ''rspec-core-2.11.1''; + name = ''rspec-core-2.14.8''; requiredGems = [ ]; - sha256 = ''035ki561pryy05y8cvv3mkihjwp9r2ychnazb7s33gl7q0l0jni4''; + sha256 = ''0psjy5kdlz3ph39br0m01w65i1ikagnqlg39f8p65jh5q7dz8hwc''; }; - rspec_expectations_2_11_3 = { + rspec_expectations_2_14_3 = { basename = ''rspec_expectations''; meta = { - description = ''rspec-expectations-2.11.3''; + description = ''rspec-expectations-2.14.3''; homepage = ''http://github.com/rspec/rspec-expectations''; longDescription = ''rspec expectations (should[_not] and matchers)''; }; - name = ''rspec-expectations-2.11.3''; - requiredGems = [ g.diff_lcs_1_1_3 ]; - sha256 = ''0vqqw4hkaff6v6i6kinki4jxp9xv8b2nbmz91qa1yhjd3wr14ai5''; + name = ''rspec-expectations-2.14.3''; + requiredGems = [ g.diff_lcs_1_2_5 ]; + sha256 = ''0gv5sqizmw0hdj1gl57mynp5i27kj4i0gpksrwwg9gazciq898n2''; }; - rspec_mocks_2_11_3 = { + rspec_expectations_2_14_5 = { + basename = ''rspec_expectations''; + meta = { + description = ''rspec-expectations-2.14.5''; + homepage = ''http://github.com/rspec/rspec-expectations''; + longDescription = ''rspec expectations (should[_not] and matchers)''; + }; + name = ''rspec-expectations-2.14.5''; + requiredGems = [ g.diff_lcs_1_2_5 ]; + sha256 = ''1ni8kw8kjv76jvwjzi4jba00k3qzj9f8wd94vm6inz0jz3gwjqf9''; + }; + rspec_mocks_2_14_3 = { basename = ''rspec_mocks''; meta = { - description = ''rspec-mocks-2.11.3''; + description = ''rspec-mocks-2.14.3''; homepage = ''http://github.com/rspec/rspec-mocks''; longDescription = ''RSpec's 'test double' framework, with support for stubbing and mocking''; }; - name = ''rspec-mocks-2.11.3''; + name = ''rspec-mocks-2.14.3''; requiredGems = [ ]; - sha256 = ''1rna3ii52rlhhca49zigk692hdcmz7qib42i4hhny478k04wx0qg''; + sha256 = ''1xfhjisvpmb212jhb3k4r1ji3rrlv509mphcf345ij5b75gaybzr''; }; - ruby_hmac_0_4_0 = { - basename = ''ruby_hmac''; + rspec_mocks_2_14_6 = { + basename = ''rspec_mocks''; meta = { - description = ''This module provides common interface to HMAC functionality''; - homepage = ''http://ruby-hmac.rubyforge.org''; - longDescription = ''This module provides common interface to HMAC functionality. HMAC is a kind of "Message Authentication Code" (MAC) algorithm whose standard is documented in RFC2104. Namely, a MAC provides a way to check the integrity of information transmitted over or stored in an unreliable medium, based on a secret key. - -Originally written by Daiki Ueno. Converted to a RubyGem by Geoffrey Grosenbach''; + description = ''rspec-mocks-2.14.6''; + homepage = ''http://github.com/rspec/rspec-mocks''; + longDescription = ''RSpec's 'test double' framework, with support for stubbing and mocking''; }; - name = ''ruby-hmac-0.4.0''; + name = ''rspec-mocks-2.14.6''; requiredGems = [ ]; - sha256 = ''01zym41f8fqbmxfz8zv19627swi62ka3gp33bfbkc87v5k7mw954''; - }; - rubyforge_2_0_4 = { - basename = ''rubyforge''; - meta = { - description = ''A script which automates a limited set of rubyforge operations''; - homepage = ''http://codeforpeople.rubyforge.org/rubyforge/''; - longDescription = ''A script which automates a limited set of rubyforge operations. - -* Run 'rubyforge help' for complete usage. -* Setup: For first time users AND upgrades to 0.4.0: - * rubyforge setup (deletes your username and password, so run sparingly!) - * edit ~/.rubyforge/user-config.yml - * rubyforge config -* For all rubyforge upgrades, run 'rubyforge config' to ensure you have latest.''; - }; - name = ''rubyforge-2.0.4''; - requiredGems = [ g.json_pure_1_8_0 ]; - sha256 = ''1wdaa4nzy39yzy848fa1rybi72qlyf9vhi1ra9wpx9rpi810fwh1''; + sha256 = ''1fwsmijd6w6cmqyh4ky2nq89jrpzh56hzmndx9wgkmdgfhfakv30''; }; rubyzip_0_9_9 = { basename = ''rubyzip''; @@ -2257,43 +1679,17 @@ Originally written by Daiki Ueno. Converted to a RubyGem by Geoffrey Grosenbach' requiredGems = [ ]; sha256 = ''1khf6d903agnwd8965f5f8b353rzmfvygxp53z1199rqzw8h46q2''; }; - rubyzip_1_1_0 = { + rubyzip_1_1_6 = { basename = ''rubyzip''; meta = { description = ''rubyzip is a ruby module for reading and writing zip files''; homepage = ''http://github.com/rubyzip/rubyzip''; }; - name = ''rubyzip-1.1.0''; - requiredGems = [ ]; - sha256 = ''0kxpcs047fb52lz0imp6vl3hr5khqpk0jfbr2knfbp612ynzyzcl''; - }; - safe_yaml_0_9_7 = { - basename = ''safe_yaml''; - meta = { - description = ''SameYAML provides an alternative implementation of YAML.load suitable for accepting user input in Ruby applications.''; - homepage = ''http://dtao.github.com/safe_yaml/''; - longDescription = ''Parse YAML safely, without that pesky arbitrary object deserialization vulnerability''; - }; - name = ''safe_yaml-0.9.7''; - requiredGems = [ ]; - sha256 = ''0y34vpak8gim18rq02rgd144jsvk5is4xni16wm3shbhivzqb4hk''; - }; - sass_3_2_10 = { - basename = ''sass''; - meta = { - description = ''A powerful but elegant CSS compiler that makes CSS fun again.''; - homepage = ''http://sass-lang.com/''; - longDescription = '' Sass makes CSS fun again. Sass is an extension of CSS3, adding - nested rules, variables, mixins, selector inheritance, and more. - It's translated to well-formatted, standard CSS using the - command line tool or a web-framework plugin. -''; - }; - name = ''sass-3.2.10''; + name = ''rubyzip-1.1.6''; requiredGems = [ ]; - sha256 = ''0anfff4hz8fz1wbimmp9vv4mjfl1swg7ww74j549788x41l4x283''; + sha256 = ''17ha7kmgcnhnxyfp9wgyrd2synp17v9g8j1pknhfd2v9x5g475m9''; }; - sass_3_2_12 = { + sass_3_4_0 = { basename = ''sass''; meta = { description = ''A powerful but elegant CSS compiler that makes CSS fun again.''; @@ -2304,31 +1700,20 @@ Originally written by Daiki Ueno. Converted to a RubyGem by Geoffrey Grosenbach' command line tool or a web-framework plugin. ''; }; - name = ''sass-3.2.12''; + name = ''sass-3.4.0''; requiredGems = [ ]; - sha256 = ''074118ia17nx68i97mbkly2f08y57j52b2yfhdc3s02s4s5593f8''; + sha256 = ''1v2kda9ff69nmz2qcxfmc1w5nxv81nays450nql0mbpy8pvydfr2''; }; - sass_rails_4_0_1 = { - basename = ''sass_rails''; - meta = { - description = ''Sass adapter for the Rails asset pipeline.''; - homepage = ''https://github.com/rails/sass-rails''; - longDescription = ''Sass adapter for the Rails asset pipeline.''; - }; - name = ''sass-rails-4.0.1''; - requiredGems = [ g.sass_3_2_12 g.railties_4_0_0 g.sprockets_rails_2_0_1 ]; - sha256 = ''01sacnipgvl7ad39zzbr6iip6jja7blxfbpjg2dnm6w8gi6smxh1''; - }; - selenium_webdriver_2_35_1 = { + selenium_webdriver_2_42_0 = { basename = ''selenium_webdriver''; meta = { description = ''The next generation developer focused tool for automated testing of webapps''; homepage = ''http://selenium.googlecode.com''; longDescription = ''WebDriver is a tool for writing automated tests of websites. It aims to mimic the behaviour of a real user, and as such interacts with the HTML of the application.''; }; - name = ''selenium-webdriver-2.35.1''; - requiredGems = [ g.multi_json_1_7_9 g.rubyzip_0_9_9 g.childprocess_0_3_9 g.websocket_1_0_7 ]; - sha256 = ''0251nbh6kbb96dv21n6fgbnw31p5gqr7anvhl8phrar5ylircqj6''; + name = ''selenium-webdriver-2.42.0''; + requiredGems = [ g.multi_json_1_10_1 g.rubyzip_1_1_6 g.childprocess_0_5_3 g.websocket_1_0_7 ]; + sha256 = ''04yjwzc7cy2ax5xgp618z9jbm55cx4b5l546l7xnxj1hk30znw6q''; }; servolux_0_10_0 = { basename = ''servolux''; @@ -2352,81 +1737,51 @@ interpreters.''; longDescription = ''Sinatra is a DSL for quickly creating web applications in Ruby with minimal effort.''; }; name = ''sinatra-1.3.2''; - requiredGems = [ g.rack_1_5_2 g.rack_protection_1_5_0 g.tilt_1_4_1 ]; + requiredGems = [ g.rack_1_5_2 g.rack_protection_1_5_3 g.tilt_1_4_1 ]; sha256 = ''05blf915zpiwyz7agcn9rwdmddwxz0z4l3gd4qlqmrgd2vkw4sxc''; }; - sinatra_1_4_4 = { + sinatra_1_4_5 = { basename = ''sinatra''; meta = { description = ''Classy web-development dressed in a DSL''; homepage = ''http://www.sinatrarb.com/''; longDescription = ''Sinatra is a DSL for quickly creating web applications in Ruby with minimal effort.''; }; - name = ''sinatra-1.4.4''; - requiredGems = [ g.rack_1_5_2 g.tilt_1_4_1 g.rack_protection_1_5_1 ]; - sha256 = ''12iy0f92d3zyk4759flgcracrbzc3x6cilpgdkzhzgjrsm9aa5hs''; + name = ''sinatra-1.4.5''; + requiredGems = [ g.rack_1_5_2 g.tilt_1_4_1 g.rack_protection_1_5_3 ]; + sha256 = ''0qyna3wzlnvsz69d21lxcm3ixq7db08mi08l0a88011qi4qq701s''; }; - slop_3_4_6 = { - basename = ''slop''; - meta = { - description = ''Simple Lightweight Option Parsing''; - homepage = ''http://github.com/injekt/slop''; - longDescription = ''A simple DSL for gathering options and parsing the command line''; - }; - name = ''slop-3.4.6''; - requiredGems = [ ]; - sha256 = ''0fdp3nkljjs2d5yhgjzcqi0f6xq67byfbrayg5aj7r76rsw0hmal''; - }; - slop_3_4_7 = { + slop_3_6_0 = { basename = ''slop''; meta = { description = ''Simple Lightweight Option Parsing''; homepage = ''http://github.com/leejarvis/slop''; longDescription = ''A simple DSL for gathering options and parsing the command line''; }; - name = ''slop-3.4.7''; + name = ''slop-3.6.0''; requiredGems = [ ]; - sha256 = ''1x3dwljqvkzj314rwn2bxgim9xvgwnfipzg5g0kwwxfn90fpv2sn''; + sha256 = ''00w8g3j7k7kl8ri2cf1m58ckxk8rn350gp4chfscmgv6pq1spk3n''; }; - sprockets_2_10_0 = { + sprockets_2_12_1 = { basename = ''sprockets''; meta = { description = ''Rack-based asset packaging system''; homepage = ''http://getsprockets.org/''; longDescription = ''Sprockets is a Rack-based asset packaging system that concatenates and serves JavaScript, CoffeeScript, CSS, LESS, Sass, and SCSS.''; }; - name = ''sprockets-2.10.0''; - requiredGems = [ g.hike_1_2_3 g.multi_json_1_7_9 g.rack_1_5_2 g.tilt_1_4_1 ]; - sha256 = ''1z0kiaymvqm07wqqy479vd8a60ggr3f3520b4splljbn2055fn3s''; + name = ''sprockets-2.12.1''; + requiredGems = [ g.hike_1_2_3 g.multi_json_1_10_1 g.rack_1_5_2 g.tilt_1_4_1 ]; + sha256 = ''0fi5f32i3bj739qb0zn050k5jjkfqzkn8fjz5dfjwhmh9hl5pb1y''; }; - sprockets_rails_2_0_0 = { + sprockets_rails_2_1_3 = { basename = ''sprockets_rails''; meta = { description = ''Sprockets Rails integration''; homepage = ''https://github.com/rails/sprockets-rails''; }; - name = ''sprockets-rails-2.0.0''; - requiredGems = [ g.sprockets_2_10_0 g.actionpack_4_0_0 g.activesupport_4_0_0 ]; - sha256 = ''068w0ly7x1vciy4j6mwgsnz6a983pld4rzk1fpvfsmkdqcizb20x''; - }; - sprockets_rails_2_0_1 = { - basename = ''sprockets_rails''; - meta = { - description = ''Sprockets Rails integration''; - homepage = ''https://github.com/rails/sprockets-rails''; - }; - name = ''sprockets-rails-2.0.1''; - requiredGems = [ g.sprockets_2_10_0 g.actionpack_4_0_0 g.activesupport_4_0_0 ]; - sha256 = ''170llk1qsvzhhslmasqk4hp5lrv9ibwy44q32yg6kn9s7sh0c1wy''; - }; - syntax_1_0_0 = { - basename = ''syntax''; - meta = { - description = ''Syntax is Ruby library for performing simple syntax highlighting.''; - }; - name = ''syntax-1.0.0''; - requiredGems = [ ]; - sha256 = ''1z93kkhdq55vq3fg9wljhm591cj59qis58dk97l09b8bfxi2ypk0''; + name = ''sprockets-rails-2.1.3''; + requiredGems = [ g.sprockets_2_12_1 g.actionpack_4_1_5 g.activesupport_4_1_5 ]; + sha256 = ''12kdy9vjn3ygrxhn9jxxx0rvsq601vayrkgbr3rqcpyhqhl4s4wy''; }; syslog_protocol_0_9_2 = { basename = ''syslog_protocol''; @@ -2439,16 +1794,16 @@ interpreters.''; requiredGems = [ ]; sha256 = ''1yb2cmbyj0zmb2yhkgnmghcngrkhcxs4g1svcmgfj90l2hs23nmc''; }; - systemu_2_5_2 = { + systemu_2_6_4 = { basename = ''systemu''; meta = { description = ''systemu''; homepage = ''https://github.com/ahoward/systemu''; - longDescription = ''description: systemu kicks the ass''; + longDescription = ''universal capture of stdout and stderr and handling of child process pid for windows, *nix, etc.''; }; - name = ''systemu-2.5.2''; + name = ''systemu-2.6.4''; requiredGems = [ ]; - sha256 = ''0h834ajdg9w4xrijp31fn98pjfj08gi08xjvp5xh3i6hz9a25fhr''; + sha256 = ''16k94azpsy1r958r6ysk4ksnpp54rqmh5hyamad9kwc3lk83i32z''; }; taskjuggler_3_5_0 = { basename = ''taskjuggler''; @@ -2467,84 +1822,63 @@ management. ''; }; name = ''taskjuggler-3.5.0''; - requiredGems = [ g.mail_2_5_4 g.term_ansicolor_1_2_2 ]; + requiredGems = [ g.mail_2_6_1 g.term_ansicolor_1_3_0 ]; sha256 = ''0r84rlc7a6w7p9nc9mgycbs5h0hq0kzscjq7zj3296xyf0afiwj2''; }; - term_ansicolor_1_2_2 = { + term_ansicolor_1_3_0 = { basename = ''term_ansicolor''; meta = { description = ''Ruby library that colors strings using ANSI escape sequences''; homepage = ''http://flori.github.com/term-ansicolor''; longDescription = ''This library uses ANSI escape sequences to control the attributes of terminal output''; }; - name = ''term-ansicolor-1.2.2''; - requiredGems = [ g.tins_0_9_0 ]; - sha256 = ''1b41q1q6mqcgzq9fhzhmjvfg5sfs5v7gkb8z57r4hajcp89lflxr''; - }; - terminal_notifier_1_5_1 = { - basename = ''terminal_notifier''; - meta = { - description = ''Send User Notifications on Mac OS X 10.8 or higher.''; - homepage = ''https://github.com/alloy/terminal-notifier''; - }; - name = ''terminal-notifier-1.5.1''; - requiredGems = [ ]; - sha256 = ''1vvdfj83bsa2rglwbqmk11yghivsywl6ka76zb51c3xm7gdd768k''; + name = ''term-ansicolor-1.3.0''; + requiredGems = [ g.tins_1_3_2 ]; + sha256 = ''1a2gw7gmpmx57sdpyhjwl0zn4bqp7jyjz7aslpvvphd075layp4b''; }; - text_1_2_3 = { + text_1_3_0 = { basename = ''text''; meta = { description = ''A collection of text algorithms''; homepage = ''http://github.com/threedaymonk/text''; longDescription = ''A collection of text algorithms: Levenshtein, Soundex, Metaphone, Double Metaphone, Porter Stemming''; }; - name = ''text-1.2.3''; + name = ''text-1.3.0''; requiredGems = [ ]; - sha256 = ''14p1b3m7sxjs4ckjnd1whz82hkv0cj08j3rpkvcbavwbm07zpsd0''; + sha256 = ''1bfn0rm2a7gpsxplx3dii3a7q16hi7idsqp54fh92b3j9sqgidj7''; }; - thin_1_5_1 = { + thin_1_6_2 = { basename = ''thin''; meta = { description = ''A thin and fast web server''; homepage = ''http://code.macournoyer.com/thin/''; longDescription = ''A thin and fast web server''; }; - name = ''thin-1.5.1''; + name = ''thin-1.6.2''; requiredGems = [ g.rack_1_5_2 g.eventmachine_1_0_3 g.daemons_1_1_9 ]; - sha256 = ''0hrq9m3hb6pm8yrqshhg0gafkphdpvwcqmr7k722kgdisp3w91ga''; + sha256 = ''0v90rnnai8sc40c02dxj9aawj2mi1mhjnmi4ws0rg4yrkc6fxvmq''; }; - thor_0_18_1 = { + thor_0_19_1 = { basename = ''thor''; meta = { - description = ''A scripting framework that replaces rake, sake and rubigen''; + description = ''Thor is a toolkit for building powerful command-line interfaces.''; homepage = ''http://whatisthor.com/''; - longDescription = ''A scripting framework that replaces rake, sake and rubigen''; + longDescription = ''Thor is a toolkit for building powerful command-line interfaces.''; }; - name = ''thor-0.18.1''; + name = ''thor-0.19.1''; requiredGems = [ ]; - sha256 = ''0d1g37j6sc7fkidf8rqlm3wh9zgyg3g7y8h2x1y34hmil5ywa8c3''; + sha256 = ''08p5gx18yrbnwc6xc0mxvsfaxzgy2y9i78xq7ds0qmdm67q39y4z''; }; - thread_safe_0_1_2 = { + thread_safe_0_3_4 = { basename = ''thread_safe''; meta = { description = ''A collection of data structures and utilities to make thread-safe programming in Ruby easier''; homepage = ''https://github.com/headius/thread_safe''; longDescription = ''Thread-safe collections and utilities for Ruby''; }; - name = ''thread_safe-0.1.2''; - requiredGems = [ g.atomic_1_1_13 ]; - sha256 = ''1bxyh5l11inadbk7pjyz5s98g24qj8xavh55bc56nrzj51y9aavy''; - }; - thread_safe_0_1_3 = { - basename = ''thread_safe''; - meta = { - description = ''A collection of data structures and utilities to make thread-safe programming in Ruby easier''; - homepage = ''https://github.com/headius/thread_safe''; - longDescription = ''Thread-safe collections and utilities for Ruby''; - }; - name = ''thread_safe-0.1.3''; - requiredGems = [ g.atomic_1_1_14 ]; - sha256 = ''0f2w62x5nx95d2c2lrn9v4g60xhykf8zw7jaddkrgal913dzifgq''; + name = ''thread_safe-0.3.4''; + requiredGems = [ ]; + sha256 = ''1cil2zcdzqkyr8zrwhlg7gywryg36j4mxlxw0h0x0j0wjym5nc8n''; }; tilt_1_4_1 = { basename = ''tilt''; @@ -2557,38 +1891,38 @@ management. requiredGems = [ ]; sha256 = ''00sr3yy7sbqaq7cb2d2kpycajxqf1b1wr1yy33z4bnzmqii0b0ir''; }; - timers_1_1_0 = { - basename = ''timers''; + tins_0_13_2 = { + basename = ''tins''; meta = { - description = ''Schedule procs to run after a certain time, or at periodic intervals, using any API that accepts a timeout''; - homepage = ''https://github.com/tarcieri/timers''; - longDescription = ''Pure Ruby one-shot and periodic timers''; + description = ''Useful stuff.''; + homepage = ''http://flori.github.com/tins''; + longDescription = ''All the stuff that isn't good/big enough for a real library.''; }; - name = ''timers-1.1.0''; + name = ''tins-0.13.2''; requiredGems = [ ]; - sha256 = ''0x3vnkxy3bg9f6v1nhkfqkajr19glrzkmqd5a1wy8hrylx8rdfrv''; + sha256 = ''1ygkm4ava7x6ap61qz6pn79193g6g29248fa04mwknsz6acfjs2y''; }; - tins_0_9_0 = { + tins_1_3_2 = { basename = ''tins''; meta = { description = ''Useful stuff.''; homepage = ''http://flori.github.com/tins''; longDescription = ''All the stuff that isn't good/big enough for a real library.''; }; - name = ''tins-0.9.0''; + name = ''tins-1.3.2''; requiredGems = [ ]; - sha256 = ''17147yzxhbcby9ycswai6sgc9cxdlbfa897amjsimkyqv1lh9pbc''; + sha256 = ''1i27zj1bhmgq19f3i5i08njprfnlv3yi5frm8ax6w0b342p6v8ly''; }; - travis_1_5_3 = { + travis_1_7_1 = { basename = ''travis''; meta = { description = ''Travis CI client''; - homepage = ''https://github.com/travis-ci/travis''; + homepage = ''https://github.com/travis-ci/travis.rb''; longDescription = ''CLI and Ruby client library for Travis CI''; }; - name = ''travis-1.5.3''; - requiredGems = [ g.faraday_0_8_8 g.faraday_middleware_0_9_0 g.highline_1_6_19 g.netrc_0_7_7 g.backports_3_3_3 g.gh_0_12_0 g.launchy_2_3_0 g.pry_0_9_12_2 g.typhoeus_0_6_5 g.pusher_client_0_3_1 ]; - sha256 = ''052kqfd0280ar9ci9vplihbc4a69l06m8chfrriygvjxc14npx97''; + name = ''travis-1.7.1''; + requiredGems = [ g.faraday_0_9_0 g.faraday_middleware_0_9_1 g.highline_1_6_21 g.backports_3_6_0 g.gh_0_13_2 g.launchy_2_4_2 g.pry_0_9_12_6 g.typhoeus_0_6_9 g.pusher_client_0_6_0 g.addressable_2_3_6 ]; + sha256 = ''1h0xajfzkz7pdrbhs2650nl5www8qfmgazmmmw0bcr3dai5kimdf''; }; treetop_1_4_15 = { basename = ''treetop''; @@ -2597,7 +1931,7 @@ management. homepage = ''https://github.com/cjheath/treetop''; }; name = ''treetop-1.4.15''; - requiredGems = [ g.polyglot_0_3_3 g.polyglot_0_3_3 ]; + requiredGems = [ g.polyglot_0_3_5 g.polyglot_0_3_5 ]; sha256 = ''1zqj5y0mvfvyz11nhsb4d5ch0i0rfcyj64qx19mw4qhg3hh8z9pz''; }; trollop_2_0 = { @@ -2615,51 +1949,29 @@ specify.''; requiredGems = [ ]; sha256 = ''0iz5k7ax7a5jm9x6p81k6f4mgp48wxxb0j55ypnwxnznih8fsghz''; }; - twitter_bootstrap_rails_2_2_8 = { - basename = ''twitter_bootstrap_rails''; - meta = { - description = ''Bootstrap CSS toolkit for Rails 3.1 Asset Pipeline''; - homepage = ''https://github.com/seyhunak/twitter-bootstrap-rails''; - longDescription = ''twitter-bootstrap-rails project integrates Bootstrap CSS toolkit for Rails 3.1 Asset Pipeline''; - }; - name = ''twitter-bootstrap-rails-2.2.8''; - requiredGems = [ g.railties_4_0_0 g.actionpack_4_0_0 g.execjs_2_0_2 g.rails_4_0_0 ]; - sha256 = ''06n836l2kj5ld7w6b1pb5q423mhqnahf4phk5ai5vl927p4g3bgy''; - }; - typhoeus_0_6_5 = { + typhoeus_0_6_9 = { basename = ''typhoeus''; meta = { description = ''Parallel HTTP library on top of libcurl multi.''; homepage = ''https://github.com/typhoeus/typhoeus''; longDescription = ''Like a modern code version of the mythical beast with 100 serpent heads, Typhoeus runs HTTP requests in parallel while cleanly encapsulating handling logic.''; }; - name = ''typhoeus-0.6.5''; - requiredGems = [ g.ethon_0_6_1 ]; - sha256 = ''13xwy86iv98ypagrb6d95k1xf6yllnfqnh4ipfqix87npirjaxji''; + name = ''typhoeus-0.6.9''; + requiredGems = [ g.ethon_0_7_1 ]; + sha256 = ''1j4l2zwx821hzsfqskcq47xpk6b7yzl30mhzmdrfrsrhsigmayar''; }; - tzinfo_0_3_37 = { + tzinfo_1_2_2 = { basename = ''tzinfo''; meta = { - description = ''Daylight-savings aware timezone library''; - homepage = ''http://tzinfo.rubyforge.org/''; - longDescription = ''TZInfo is a Ruby library that uses the standard tz (Olson) database to provide daylight savings aware transformations between times in different time zones.''; - }; - name = ''tzinfo-0.3.37''; - requiredGems = [ ]; - sha256 = ''0pi2vabsg73h6z4wfwyd27k63issp2qp1nh0vd74rdk740gmb3kc''; - }; - tzinfo_0_3_38 = { - basename = ''tzinfo''; - meta = { - description = ''Daylight-savings aware timezone library''; + description = ''Daylight savings aware timezone library''; homepage = ''http://tzinfo.github.io''; - longDescription = ''TZInfo is a Ruby library that uses the standard tz (Olson) database to provide daylight savings aware transformations between times in different time zones.''; + longDescription = ''TZInfo provides daylight savings aware transformations between times in different time zones.''; }; - name = ''tzinfo-0.3.38''; - requiredGems = [ ]; - sha256 = ''1s339ravgk0rqm5dhv1l0yi81sczjvdiryn8ihi2czkb0md55j68''; + name = ''tzinfo-1.2.2''; + requiredGems = [ g.thread_safe_0_3_4 ]; + sha256 = ''1c01p3kg6xvy1cgjnzdfq45fggbwish8krd0h864jvbpybyx7cgx''; }; - unf_0_1_2 = { + unf_0_1_4 = { basename = ''unf''; meta = { description = ''A wrapper library to bring Unicode Normalization Form support to Ruby/JRuby''; @@ -2668,9 +1980,9 @@ specify.''; to Ruby/JRuby. ''; }; - name = ''unf-0.1.2''; + name = ''unf-0.1.4''; requiredGems = [ g.unf_ext_0_0_6 ]; - sha256 = ''1g6agdd14yylawwd9ifgcpxwfyiydqj9l7cq6ipypj70v1l46i1s''; + sha256 = ''0bh2cf73i2ffh4fcpdn9ir4mhq8zi50ik0zqa1braahzadx536a9''; }; unf_ext_0_0_6 = { basename = ''unf_ext''; @@ -2683,17 +1995,6 @@ to Ruby/JRuby. requiredGems = [ ]; sha256 = ''07zbmkzcid6pzdqgla3456ipfdka7j1v4hsx1iaa8rbnllqbmkdg''; }; - unicode_0_4_4 = { - basename = ''unicode''; - meta = { - description = ''Unicode normalization library.''; - homepage = ''http://www.yoshidam.net/Ruby.html#unicode''; - longDescription = ''Unicode normalization library.''; - }; - name = ''unicode-0.4.4''; - requiredGems = [ ]; - sha256 = ''0la9dyxj7pr57g5727gj1h5c6h5kpbjdjpiv2vqi5gw5iglg0yqi''; - }; uuid_2_3_7 = { basename = ''uuid''; meta = { @@ -2704,31 +2005,18 @@ to Ruby/JRuby. ''; }; name = ''uuid-2.3.7''; - requiredGems = [ g.macaddr_1_6_1 ]; + requiredGems = [ g.macaddr_1_7_1 ]; sha256 = ''04q10an3v40zwjihvdwm23fw6vl39fbkhdiwfw78a51ym9airnlp''; }; - uuidtools_2_1_4 = { - basename = ''uuidtools''; + webrick_1_3_1 = { + basename = ''webrick''; meta = { - description = ''UUID generator''; - homepage = ''http://uuidtools.rubyforge.org/''; - longDescription = ''A simple universally unique ID generation library. -''; + description = ''WEBrick is an HTTP server toolkit that can be configured as an HTTPS server,''; + homepage = ''http://github.com/nahi/webrick''; }; - name = ''uuidtools-2.1.4''; + name = ''webrick-1.3.1''; requiredGems = [ ]; - sha256 = ''1w0bhnkp5515f3yx5fakfrfkawxjpb4fjm1r2c6lk691xlr696s3''; - }; - vegas_0_1_11 = { - basename = ''vegas''; - meta = { - description = ''Vegas aims to solve the simple problem of creating executable versions of Sinatra/Rack apps.''; - homepage = ''http://code.quirkey.com/vegas''; - longDescription = ''Vegas aims to solve the simple problem of creating executable versions of Sinatra/Rack apps. It includes a class Vegas::Runner that wraps Rack/Sinatra applications and provides a simple command line interface and launching mechanism.''; - }; - name = ''vegas-0.1.11''; - requiredGems = [ g.rack_1_5_2 ]; - sha256 = ''0kzv0v1zb8vvm188q4pqwahb6468bmiamn6wpsbiq6r5i69s1bs5''; + sha256 = ''0s42mxihcl2bx0h9q0v2syl70qndydfkl39a06h9il17p895ya8g''; }; webrobots_0_1_1 = { basename = ''webrobots''; @@ -2753,6 +2041,17 @@ to Ruby/JRuby. requiredGems = [ ]; sha256 = ''1jrfz4295qbnjaxv37fw9jzxyxz61izp7c0683mnscacpx262zw0''; }; + websocket_1_2_0 = { + basename = ''websocket''; + meta = { + description = ''Universal Ruby library to handle WebSocket protocol''; + homepage = ''http://github.com/imanel/websocket-ruby''; + longDescription = ''Universal Ruby library to handle WebSocket protocol''; + }; + name = ''websocket-1.2.0''; + requiredGems = [ ]; + sha256 = ''17q3fsqwa44cali3x852jzjpzgcvvly0n8gszmkaqx520lb9r5l4''; + }; xapian_full_1_2_3 = { basename = ''xapian_full''; meta = { @@ -2763,35 +2062,25 @@ to Ruby/JRuby. requiredGems = [ ]; sha256 = ''02z0wsir38jsp5d6sqrkgv5prk8s6sdf6g2h718j2374kpnkyrxv''; }; - xapian_ruby_1_2_15_1 = { + xapian_ruby_1_2_17 = { basename = ''xapian_ruby''; meta = { description = ''xapian libraries and ruby bindings''; homepage = ''https://github.com/garaio/xapian-ruby''; }; - name = ''xapian-ruby-1.2.15.1''; + name = ''xapian-ruby-1.2.17''; requiredGems = [ ]; - sha256 = ''02v3l931246asbcivkr4j0x99pl4i4fjvfsr8ga8v6lkvz0ls1xp''; + sha256 = ''1vhqykr0b877pb8x5n3v4fb4znm92mqhijinss7mvqzfimwfbxfg''; }; - xml_simple_1_1_1 = { + xml_simple_1_1_2 = { basename = ''xml_simple''; meta = { description = ''A simple API for XML processing.''; - homepage = ''http://xml-simple.rubyforge.org''; - }; - name = ''xml-simple-1.1.1''; - requiredGems = [ ]; - sha256 = ''0zlwz8kvpm45m227aazg369fapbqyhvd5v9aga8cvxyhqnq0b87i''; - }; - yajl_ruby_1_1_0 = { - basename = ''yajl_ruby''; - meta = { - description = ''Ruby C bindings to the excellent Yajl JSON stream-based parser library.''; - homepage = ''http://github.com/brianmario/yajl-ruby''; + homepage = ''https://github.com/maik/xml-simple''; }; - name = ''yajl-ruby-1.1.0''; + name = ''xml-simple-1.1.2''; requiredGems = [ ]; - sha256 = ''0sj46j47icb12hdhcfh76rnvddyiic5ifqzkh3kla1vcr505kf4m''; + sha256 = ''0ni8cbkj7l2k5pc4fs2jzp1ymxy4xqa2jc681l4y9iy9chrayddb''; }; }; } -- GitLab From 9bec5e1288da73da8226e7fe3402e8e2af51e7d9 Mon Sep 17 00:00:00 2001 From: Rickard Nilsson Date: Sat, 23 Aug 2014 12:39:15 +0200 Subject: [PATCH 104/843] New package: riemann 0.2.6 --- pkgs/servers/monitoring/riemann/default.nix | 28 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 30 insertions(+) create mode 100644 pkgs/servers/monitoring/riemann/default.nix diff --git a/pkgs/servers/monitoring/riemann/default.nix b/pkgs/servers/monitoring/riemann/default.nix new file mode 100644 index 00000000000..5278e543813 --- /dev/null +++ b/pkgs/servers/monitoring/riemann/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "riemann-${version}"; + version = "0.2.6"; + + src = fetchurl { + url = "http://aphyr.com/riemann/${name}.tar.bz2"; + sha256 = "1m1vkvdcpcc93ipzpdlq0lig81yw172qfiqbxlrbjyb0x6j1984d"; + }; + + phases = [ "unpackPhase" "installPhase" ]; + + installPhase = '' + mkdir -p $out/share/java + mv lib/riemann.jar $out/share/java/ + ''; + + meta = with stdenv.lib; { + homepage = "http://riemann.io/"; + description = '' + A network monitoring system. + ''; + license = licenses.epl10; + platforms = platforms.all; + maintainers = [ maintainers.rickynils ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3d4e983c048..a4f275e3c6e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6958,6 +6958,8 @@ let net_snmp = callPackage ../servers/monitoring/net-snmp { }; + riemann = callPackage ../servers/monitoring/riemann { }; + oidentd = callPackage ../servers/identd/oidentd { }; openfire = callPackage ../servers/xmpp/openfire { }; -- GitLab From aafb5aafe45b1e9576977928afa7e6209cece224 Mon Sep 17 00:00:00 2001 From: Rickard Nilsson Date: Sat, 23 Aug 2014 12:55:24 +0200 Subject: [PATCH 105/843] libvirt-python: Update from 1.2.5 to 1.2.7 --- pkgs/top-level/python-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f7e3bf3c2ca..3ed195612de 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9705,11 +9705,11 @@ rec { libvirt = pkgs.stdenv.mkDerivation rec { name = "libvirt-python-${version}"; - version = "1.2.5"; + version = "1.2.7"; src = fetchurl { url = "http://libvirt.org/sources/python/${name}.tar.gz"; - sha256 = "0r0v48nkkxfagckizbcf67xkmyd1bnq36d30b58zmhvl0abryz7p"; + sha256 = "0wg0pnvrwfjdl8haxr2dyfhdasddq97zy6l27xwrvd1hnh1394f1"; }; buildInputs = [ python pkgs.pkgconfig pkgs.libvirt lxml ]; -- GitLab From 9fbd7d7ad50399a4d58b59e4655fe2f9139c590a Mon Sep 17 00:00:00 2001 From: Danny Chan Date: Sat, 23 Aug 2014 14:00:21 +0200 Subject: [PATCH 106/843] Add new package ghcParser --- .../libraries/haskell/ghc-parser/default.nix | 16 ++++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 18 insertions(+) create mode 100644 pkgs/development/libraries/haskell/ghc-parser/default.nix diff --git a/pkgs/development/libraries/haskell/ghc-parser/default.nix b/pkgs/development/libraries/haskell/ghc-parser/default.nix new file mode 100644 index 00000000000..a6fd1032dd5 --- /dev/null +++ b/pkgs/development/libraries/haskell/ghc-parser/default.nix @@ -0,0 +1,16 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, happy, cpphs }: + +cabal.mkDerivation (self: { + pname = "ghc-parser"; + version = "0.1.3.0"; + sha256 = "13p09mj92jh4y0v2r672d49fmlz3l5r2r1lqg0jjy6kj045wcfdn"; + buildTools = [ happy cpphs ]; + meta = { + homepage = "https://github.com/gibiansky/IHaskell"; + description = "Haskell source parser from GHC"; + license = self.stdenv.lib.licenses.mit; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index d09f8119d8d..15e1b368f73 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -911,6 +911,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in ghcPaths = callPackage ../development/libraries/haskell/ghc-paths {}; + ghcParser = callPackage ../development/libraries/haskell/ghc-parser {}; + ghcSyb = callPackage ../development/libraries/haskell/ghc-syb {}; ghcSybUtils = callPackage ../development/libraries/haskell/ghc-syb-utils {}; -- GitLab From 624fb66605a61685fbbb0e33cdf09bd5708ed653 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Sat, 23 Aug 2014 14:20:37 +0200 Subject: [PATCH 107/843] sup: mark as broken Several of its buildInputs (given in all-packages.nix) does not exist anymore (version updates and attribute renaming?). Mark as broken to unblock nixpkgs channel. --- pkgs/applications/networking/mailreaders/sup/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/networking/mailreaders/sup/default.nix b/pkgs/applications/networking/mailreaders/sup/default.nix index b86579673ab..3d537d83f43 100644 --- a/pkgs/applications/networking/mailreaders/sup/default.nix +++ b/pkgs/applications/networking/mailreaders/sup/default.nix @@ -13,6 +13,7 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.gpl2; maintainers = with stdenv.lib.maintainers; [ lovek323 ]; platforms = stdenv.lib.platforms.unix; + broken = true; }; dontStrip = true; -- GitLab From 6525bdf2136381c5153af2bc140562cd970affe9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=BCdiger=20Sonderfeld?= Date: Tue, 19 Aug 2014 18:00:06 +0200 Subject: [PATCH 108/843] Add Fira font. Fira is the font for FirefoxOS. - https://github.com/mozilla/Fira - http://www.carrois.com/fira-3-1/ --- pkgs/data/fonts/fira/default.nix | 36 ++++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 38 insertions(+) create mode 100644 pkgs/data/fonts/fira/default.nix diff --git a/pkgs/data/fonts/fira/default.nix b/pkgs/data/fonts/fira/default.nix new file mode 100644 index 00000000000..56fa9f51a47 --- /dev/null +++ b/pkgs/data/fonts/fira/default.nix @@ -0,0 +1,36 @@ +{stdenv, fetchurl, unzip }: + +stdenv.mkDerivation rec { + name = "fira-3.111"; + + src = fetchurl { + url = "http://www.carrois.com/wordpress/downloads/fira_3_1/FiraFonts3111.zip"; + sha256 = "3ced3df236b0b0eec1b390885c53ac02f3e3f830e9449414230717334a0b2457"; + }; + + buildInputs = [unzip]; + phases = [ "unpackPhase" "installPhase" ]; + + installPhase = '' + mkdir -p $out/share/fonts/opentype + find . -name "*.otf" -exec cp -v {} $out/share/fonts/opentype \; + ''; + + meta = with stdenv.lib; { + homepage = http://www.carrois.com/fira-3-1/; + description = "Sans-serif and monospace font for Firefox OS"; + longDescription = '' + Fira Sans is a sans-serif font designed by Erik Spiekermann, + Ralph du Carrois, Anja Meiners and Botio Nikoltchev of Carrois + Type Design for Mozilla Firefox OS. It is closely related to + Spiekermann's FF Meta typeface. Available in Two, Four, Eight, + Hair, Thin, Ultra Light, Extra Light, Light, Book, Regular, + Medium, Semi Bold, Bold, Extra Bold, Heavy weights with + corresponding italic versions. Fira Mono is a matching + monospace variant of Fira Sans. It is available in regular, and + bold weights. + ''; + license = licenses.ofl; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a4f275e3c6e..dea12651a91 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8024,6 +8024,8 @@ let eb-garamond = callPackage ../data/fonts/eb-garamond { }; + fira = callPackage ../data/fonts/fira { }; + freefont_ttf = callPackage ../data/fonts/freefont-ttf { }; freepats = callPackage ../data/misc/freepats { }; -- GitLab From a79241aa1528313b0b1ec5514366396b9f4d6600 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= Date: Thu, 21 Aug 2014 20:51:38 +0200 Subject: [PATCH 109/843] add: emulationstation 1.0.2 --- .../emulators/emulationstation/default.nix | 31 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 33 insertions(+) create mode 100644 pkgs/misc/emulators/emulationstation/default.nix diff --git a/pkgs/misc/emulators/emulationstation/default.nix b/pkgs/misc/emulators/emulationstation/default.nix new file mode 100644 index 00000000000..5767786e814 --- /dev/null +++ b/pkgs/misc/emulators/emulationstation/default.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchurl, pkgconfig, cmake, boost, eigen, freeimage, freetype +, mesa, SDL, dejavu_fonts }: + +stdenv.mkDerivation rec { + name = "emulationstation-${version}"; + version = "1.0.2"; + src = fetchurl { + url = "https://github.com/Aloshi/EmulationStation/archive/v${version}.tar.gz"; + sha256 = "809d67aaa727809c1426fb543e36bb788ca6a3404f8c46dd1917088b57ab5f50"; + }; + + buildInputs = [ pkgconfig cmake boost eigen freeimage freetype mesa SDL ]; + + prePatch = '' + sed -i \ + -e 's,/usr\(.*\)/ttf-dejavu\(.*\),${dejavu_fonts}\1\2,' src/Font.cpp + ''; + + buildPhase = "cmake . && make"; + installPhase = '' + mkdir -p $out/bin + mv ../emulationstation $out/bin/. + ''; + + meta = { + description = "A flexible emulator front-end supporting keyboardless navigation and custom system themes"; + homepage = "http://emulationstation.org"; + maintainers = [ stdenv.lib.maintainers.edwtjo ]; + license = stdenv.lib.licenses.mit; + }; +} \ No newline at end of file diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index dea12651a91..9a0d9270808 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11162,6 +11162,8 @@ let ekiga = newScope pkgs.gnome ../applications/networking/instant-messengers/ekiga { }; + emulationstation = callPackage ../misc/emulators/emulationstation { }; + electricsheep = callPackage ../misc/screensavers/electricsheep { }; fakenes = callPackage ../misc/emulators/fakenes { }; -- GitLab From b236d88f36dfbb06e92bcf5cd3b9841880167ea5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Sat, 23 Aug 2014 16:20:59 +0200 Subject: [PATCH 110/843] pythonPackages.django: update 1.4, 1.5, 1.6 due to security fixes --- pkgs/top-level/python-packages.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 3ed195612de..25a64d83074 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2876,11 +2876,11 @@ rec { django_1_6 = buildPythonPackage rec { name = "Django-${version}"; - version = "1.6.3"; + version = "1.6.6"; src = fetchurl { url = "http://www.djangoproject.com/m/releases/1.6/${name}.tar.gz"; - sha256 = "1wdqb2x0w0c10annbyz7rrrgrv9mpa9f8pz8006lf2csix33r7bd"; + sha256 = "143yp984n8a2bs1dflxjp1s7skmji0cwkw05s9ikbfikwmabsv2k"; }; # error: invalid command 'test' @@ -2894,11 +2894,11 @@ rec { django_1_5 = buildPythonPackage rec { name = "Django-${version}"; - version = "1.5.6"; + version = "1.5.9"; src = fetchurl { url = "http://www.djangoproject.com/m/releases/1.5/${name}.tar.gz"; - sha256 = "1bxzz71sfvh0zgdzv4x3wdr4ffzd5cfnvq7iq2g1i282sacwnzwv"; + sha256 = "1lm0pa6m9f4cd6pv239lqj32z1snf8xjbvlbh8bqihs6a1f51kj7"; }; # error: invalid command 'test' @@ -2912,11 +2912,11 @@ rec { django_1_4 = buildPythonPackage rec { name = "Django-${version}"; - version = "1.4.11"; + version = "1.4.14"; src = fetchurl { url = "http://www.djangoproject.com/m/releases/1.4/${name}.tar.gz"; - sha256 = "00f2jlls3fhddrg7q4sjkwj6dmclh28n0vqm1m7kzcq5fjrxh6a8"; + sha256 = "173ci9ml2vs1z2x51wahssfn8mrmhd02varmg9kibm8z460svvc1"; }; # error: invalid command 'test' -- GitLab From 14b5f9d58136333c427a3f25f3d3a86aa2caa012 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Sat, 23 Aug 2014 16:28:35 +0200 Subject: [PATCH 111/843] pythonPackages: fix webtest --- pkgs/top-level/python-packages.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 25a64d83074..c40b9552a00 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8458,13 +8458,17 @@ rec { webtest = buildPythonPackage rec { - version = "2.0.11"; + version = "2.0.15"; name = "webtest-${version}"; src = fetchurl { url = "http://pypi.python.org/packages/source/W/WebTest/WebTest-${version}.zip"; - md5 = "e51da21da8815cef07f543d8688effea"; + md5 = "49314bdba23f4d0bd807facb2a6d3f90"; }; + + preConfigure = '' + substituteInPlace setup.py --replace "nose<1.3.0" "nose" + ''; # XXX: skipping two tests fails in python2.6 doCheck = ! isPy26; -- GitLab From e083de9c29f58ff964842307394527c5034f4277 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Sat, 23 Aug 2014 16:33:22 +0200 Subject: [PATCH 112/843] pythonPackages.psycopg2: 2.5.2 -> 2.5.3 --- pkgs/top-level/python-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c40b9552a00..72139546fff 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5602,14 +5602,14 @@ rec { psycopg2 = buildPythonPackage rec { - name = "psycopg2-2.5.2"; + name = "psycopg2-2.5.3"; # error: invalid command 'test' doCheck = false; src = fetchurl { url = "https://pypi.python.org/packages/source/p/psycopg2/${name}.tar.gz"; - sha256 = "0bmxlmi9k995n6pz16awjaap0y02y1v2d31jbxhkqv510f3jsf2h"; + sha256 = "02h33barxigsczpympnwa0yvw9hgdv8d63bxm5x251ri26xz6b9s"; }; propagatedBuildInputs = [ pkgs.postgresql ]; -- GitLab From 3194d5cc321eb09e4b6d936317cf3aba4cca6037 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Sat, 23 Aug 2014 17:38:28 +0200 Subject: [PATCH 113/843] zope.testing: 4.1.2 -> 4.1.3 (also, fix pypy build) --- pkgs/development/interpreters/pypy/2.3/default.nix | 1 + pkgs/top-level/python-packages.nix | 8 +++++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/development/interpreters/pypy/2.3/default.nix b/pkgs/development/interpreters/pypy/2.3/default.nix index d67f1c2a821..1b3261313c5 100644 --- a/pkgs/development/interpreters/pypy/2.3/default.nix +++ b/pkgs/development/interpreters/pypy/2.3/default.nix @@ -81,6 +81,7 @@ let passthru = { inherit zlibSupport libPrefix; executable = "pypy"; + isPypy = true; }; enableParallelBuilding = true; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 72139546fff..3c3380a3dfa 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9087,12 +9087,14 @@ rec { zope_testing = buildPythonPackage rec { name = "zope.testing-${version}"; - version = "4.1.2"; + version = "4.1.3"; src = fetchurl { - url = "http://pypi.python.org/packages/source/z/zope.testing/${name}.zip"; - md5 = "01c30c342c6a18002a762bd5d320a6e9"; + url = "http://pypi.python.org/packages/source/z/zope.testing/${name}.tar.gz"; + md5 = "6c73c5b668a67fdc116a25b884058ed9"; }; + + doCheck = !python.isPypy; propagatedBuildInputs = [ zope_interface zope_exceptions zope_location ]; -- GitLab From e9252cb35e0b0b09d0cb16a9d8b1f62c8233bc0a Mon Sep 17 00:00:00 2001 From: Rickard Nilsson Date: Sat, 23 Aug 2014 17:04:34 +0200 Subject: [PATCH 114/843] Add NixOS module for Riemann monitoring server. --- nixos/modules/misc/ids.nix | 2 + nixos/modules/module-list.nix | 1 + nixos/modules/services/monitoring/riemann.nix | 77 +++++++++++++++++++ 3 files changed, 80 insertions(+) create mode 100644 nixos/modules/services/monitoring/riemann.nix diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix index 515105d886a..78b3bc2f311 100644 --- a/nixos/modules/misc/ids.nix +++ b/nixos/modules/misc/ids.nix @@ -144,6 +144,7 @@ siproxd = 134; mlmmj = 135; neo4j = 136; + riemann = 137; # When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399! @@ -261,6 +262,7 @@ tss = 133; siproxd = 134; mlmmj = 135; + riemann = 137; # 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/module-list.nix b/nixos/modules/module-list.nix index feb590ad249..532083aa6bd 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -170,6 +170,7 @@ ./services/monitoring/monit.nix ./services/monitoring/munin.nix ./services/monitoring/nagios.nix + ./services/monitoring/riemann.nix ./services/monitoring/smartd.nix ./services/monitoring/statsd.nix ./services/monitoring/systemhealth.nix diff --git a/nixos/modules/services/monitoring/riemann.nix b/nixos/modules/services/monitoring/riemann.nix new file mode 100644 index 00000000000..e8d32af1b83 --- /dev/null +++ b/nixos/modules/services/monitoring/riemann.nix @@ -0,0 +1,77 @@ +{ config, pkgs, ... }: + +with pkgs; +with pkgs.lib; + +let + + cfg = config.services.riemann; + + classpath = concatStringsSep ":" ( + cfg.extraClasspathEntries ++ [ "${riemann}/share/java/riemann.jar" ] + ); + + launcher = writeScriptBin "riemann" '' + #!/bin/sh + exec ${openjdk}/bin/java ${concatStringsSep "\n" cfg.extraJavaOpts} \ + -cp ${classpath} \ + riemann.bin ${writeText "riemann.config" cfg.config} + ''; + +in { + + options = { + + services.riemann = { + enable = mkOption { + type = types.bool; + default = false; + description = '' + Enable the Riemann network monitoring daemon. + ''; + }; + config = mkOption { + type = types.lines; + description = '' + Contents of the Riemann configuration file. + ''; + }; + extraClasspathEntries = mkOption { + type = with types; listOf str; + default = []; + description = '' + Extra entries added to the Java classpath when running Riemann. + ''; + }; + extraJavaOpts = mkOption { + type = with types; listOf str; + default = []; + description = '' + Extra Java options used when launching Riemann. + ''; + }; + }; + }; + + config = mkIf cfg.enable { + + users.extraGroups.riemann.gid = config.ids.gids.riemann; + + users.extraUsers.riemann = { + description = "riemann daemon user"; + uid = config.ids.uids.riemann; + group = "riemann"; + }; + + systemd.services.riemann = { + wantedBy = [ "multi-user.target" ]; + path = [ inetutils ]; + serviceConfig = { + User = "riemann"; + ExecStart = "${launcher}/bin/riemann"; + }; + }; + + }; + +} -- GitLab From b1d225b64521058869a1570c6d58b76caf21f6e3 Mon Sep 17 00:00:00 2001 From: Rickard Nilsson Date: Sat, 23 Aug 2014 17:39:45 +0200 Subject: [PATCH 115/843] Add NixOS module for the Riemann dashboard server --- nixos/modules/misc/ids.nix | 2 + nixos/modules/module-list.nix | 1 + .../services/monitoring/riemann-dash.nix | 79 +++++++++++++++++++ 3 files changed, 82 insertions(+) create mode 100644 nixos/modules/services/monitoring/riemann-dash.nix diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix index 78b3bc2f311..98f1b52aba4 100644 --- a/nixos/modules/misc/ids.nix +++ b/nixos/modules/misc/ids.nix @@ -145,6 +145,7 @@ mlmmj = 135; neo4j = 136; riemann = 137; + riemanndash = 138; # When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399! @@ -263,6 +264,7 @@ siproxd = 134; mlmmj = 135; riemann = 137; + riemanndash = 138; # 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/module-list.nix b/nixos/modules/module-list.nix index 532083aa6bd..c45fa3e3f05 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -171,6 +171,7 @@ ./services/monitoring/munin.nix ./services/monitoring/nagios.nix ./services/monitoring/riemann.nix + ./services/monitoring/riemann-dash.nix ./services/monitoring/smartd.nix ./services/monitoring/statsd.nix ./services/monitoring/systemhealth.nix diff --git a/nixos/modules/services/monitoring/riemann-dash.nix b/nixos/modules/services/monitoring/riemann-dash.nix new file mode 100644 index 00000000000..f647b92f914 --- /dev/null +++ b/nixos/modules/services/monitoring/riemann-dash.nix @@ -0,0 +1,79 @@ +{ config, pkgs, ... }: + +with pkgs; +with pkgs.lib; + +let + + cfg = config.services.riemann-dash; + + conf = writeText "config.rb" '' + riemann_base = "${cfg.dataDir}" + config.store[:ws_config] = "#{riemann_base}/config/config.json" + ${cfg.config} + ''; + + launcher = writeScriptBin "riemann-dash" '' + #!/bin/sh + exec ${rubyLibs.riemann_dash}/bin/riemann-dash ${conf} + ''; + +in { + + options = { + + services.riemann-dash = { + enable = mkOption { + type = types.bool; + default = false; + description = '' + Enable the riemann-dash dashboard daemon. + ''; + }; + config = mkOption { + type = types.lines; + description = '' + Contents added to the end of the riemann-dash configuration file. + ''; + }; + dataDir = mkOption { + type = types.str; + default = "/var/riemann-dash"; + description = '' + Location of the riemann-base dir. The dashboard configuration file is + is stored to this directory. The directory is created automatically on + service start, and owner is set to the riemanndash user. + ''; + }; + }; + + }; + + config = mkIf cfg.enable { + + users.extraGroups.riemanndash.gid = config.ids.gids.riemanndash; + + users.extraUsers.riemanndash = { + description = "riemann-dash daemon user"; + uid = config.ids.uids.riemanndash; + group = "riemanndash"; + }; + + systemd.services.riemann-dash = { + wantedBy = [ "multi-user.target" ]; + wants = [ "riemann.service" ]; + after = [ "riemann.service" ]; + preStart = '' + mkdir -p ${cfg.dataDir}/config + chown -R riemanndash:riemanndash ${cfg.dataDir} + ''; + serviceConfig = { + User = "riemanndash"; + ExecStart = "${launcher}/bin/riemann-dash"; + PermissionsStartOnly = true; + }; + }; + + }; + +} -- GitLab From fab4eb2e7b5b3ea2feabdd4d8fd964a1a7d1198d Mon Sep 17 00:00:00 2001 From: Ian-Woo Kim Date: Sat, 23 Aug 2014 12:44:41 -0400 Subject: [PATCH 116/843] yesod-auth-hashdb haskell package added --- .../haskell/yesod-auth-hashdb/default.nix | 22 +++++++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 24 insertions(+) create mode 100644 pkgs/development/libraries/haskell/yesod-auth-hashdb/default.nix diff --git a/pkgs/development/libraries/haskell/yesod-auth-hashdb/default.nix b/pkgs/development/libraries/haskell/yesod-auth-hashdb/default.nix new file mode 100644 index 00000000000..9f577fc4520 --- /dev/null +++ b/pkgs/development/libraries/haskell/yesod-auth-hashdb/default.nix @@ -0,0 +1,22 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, cryptohash, pwstoreFast, text, yesodAuth, yesodCore +, yesodForm, yesodPersistent +}: + +cabal.mkDerivation (self: { + pname = "yesod-auth-hashdb"; + version = "1.3.0.1"; + sha256 = "0q78mw09g6b04zaz54s03222mh59nm604qh8gyw5kka06f93hk4q"; + buildDepends = [ + cryptohash pwstoreFast text yesodAuth yesodCore yesodForm + yesodPersistent + ]; + meta = { + homepage = "http://www.yesodweb.com/"; + description = "Authentication plugin for Yesod"; + license = self.stdenv.lib.licenses.mit; + platforms = self.ghc.meta.platforms; + maintainers = with self.stdenv.lib.maintainers; [ ianwookim ]; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index d09f8119d8d..7f0946e8c27 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -2799,6 +2799,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in yesodAuth = callPackage ../development/libraries/haskell/yesod-auth {}; + yesodAuthHashdb = callPackage ../development/libraries/haskell/yesod-auth-hashdb {}; + yesodBin = callPackage ../development/libraries/haskell/yesod-bin {}; yesodCore = callPackage ../development/libraries/haskell/yesod-core {}; -- GitLab From 99e300c4f8888d0d4a4e4e3c7e75613019c93bd9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sat, 23 Aug 2014 18:54:54 +0200 Subject: [PATCH 117/843] xorg: add xf86-video-qxl --- pkgs/servers/x11/xorg/default.nix | 10 ++++++++++ pkgs/servers/x11/xorg/overrides.nix | 6 +++++- pkgs/servers/x11/xorg/tarballs-7.7.list | 1 + pkgs/top-level/all-packages.nix | 2 +- 4 files changed, 17 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/x11/xorg/default.nix b/pkgs/servers/x11/xorg/default.nix index 6945d6559fb..c4dfa983f55 100644 --- a/pkgs/servers/x11/xorg/default.nix +++ b/pkgs/servers/x11/xorg/default.nix @@ -1644,6 +1644,16 @@ let buildInputs = [pkgconfig fontsproto glproto libdrm udev libpciaccess randrproto renderproto videoproto libX11 libXext xextproto xf86driproto xorgserver xproto libXvMC ]; }) // {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"; + builder = ./builder.sh; + src = fetchurl { + url = mirror://xorg/individual/driver/xf86-video-qxl-0.1.2.tar.bz2; + sha256 = "09sjpkg7klzzg9sagmqpsw911501vqk9wdd4nr0jkqqanvkx39s3"; + }; + buildInputs = [pkgconfig fontsproto libdrm udev libpciaccess randrproto renderproto videoproto xf86dgaproto xorgserver xproto ]; + }) // {inherit fontsproto libdrm udev libpciaccess randrproto renderproto videoproto xf86dgaproto xorgserver xproto ;}; + xf86videor128 = (mkDerivation "xf86videor128" { name = "xf86-video-r128-6.9.2"; builder = ./builder.sh; diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index a81b1a4ac22..7d8fd4d8b75 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -202,7 +202,11 @@ in }; xf86videovmware = attrs: attrs // { - buildInputs = attrs.buildInputs ++ [ args.mesa_drivers ]; # for libxatracker + buildinputs = attrs.buildinputs ++ [ args.mesa_drivers ]; # for libxatracker + }; + + xf86videoqxl = attrs: attrs // { + buildInputs = attrs.buildInputs ++ [ args.spice_protocol ]; }; xdriinfo = attrs: attrs // { diff --git a/pkgs/servers/x11/xorg/tarballs-7.7.list b/pkgs/servers/x11/xorg/tarballs-7.7.list index 417d12ddadc..93acd927f3b 100644 --- a/pkgs/servers/x11/xorg/tarballs-7.7.list +++ b/pkgs/servers/x11/xorg/tarballs-7.7.list @@ -138,6 +138,7 @@ mirror://xorg/individual/driver/xf86-video-intel-2.21.15.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-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 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9a0d9270808..19cf171d20f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7076,7 +7076,7 @@ let xorg = recurseIntoAttrs (import ../servers/x11/xorg/default.nix { inherit clangStdenv fetchurl fetchgit fetchpatch stdenv pkgconfig intltool freetype fontconfig - libxslt expat libpng zlib perl mesa_drivers + libxslt expat libpng zlib perl mesa_drivers spice_protocol dbus libuuid openssl gperf m4 autoconf automake libtool xmlto asciidoc flex bison python mtdev pixman; mesa = mesa_noglu; -- GitLab From f1a1c89f5032aecd5a42ab2ed89d2a2db46a5064 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Sat, 23 Aug 2014 19:17:59 +0200 Subject: [PATCH 118/843] PIL: use python executable names --- pkgs/development/python-modules/pil/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pil/default.nix b/pkgs/development/python-modules/pil/default.nix index 35a1e913bf7..e9375d1daad 100644 --- a/pkgs/development/python-modules/pil/default.nix +++ b/pkgs/development/python-modules/pil/default.nix @@ -21,8 +21,8 @@ buildPythonPackage { s|^ZLIB_ROOT =.*$|ZLIB_ROOT = libinclude("${zlib}")|g ;' ''; - checkPhase = "python selftest.py"; - buildPhase = "python setup.py build_ext -i"; + checkPhase = "${python}/bin/${python.executable} selftest.py"; + buildPhase = "${python}/bin/${python.executable} setup.py build_ext -i"; postInstall = '' cd "$out"/lib/python*/site-packages -- GitLab From 9cbc21657669fd4b68760ecd7a44fe245c34415f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Sat, 23 Aug 2014 19:18:12 +0200 Subject: [PATCH 119/843] pypyPackages.pycrypto: make it work --- pkgs/development/python-modules/pycrypto/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/pycrypto/default.nix b/pkgs/development/python-modules/pycrypto/default.nix index c8f0f74c1ff..59bd9affef6 100644 --- a/pkgs/development/python-modules/pycrypto/default.nix +++ b/pkgs/development/python-modules/pycrypto/default.nix @@ -9,10 +9,9 @@ buildPythonPackage rec { sha256 = "0g0ayql5b9mkjam8hym6zyg6bv77lbh66rv1fyvgqb17kfc1xkpj"; }; - buildInputs = [ gmp ]; - - doCheck = !stdenv.isDarwin; # error: AF_UNIX path too long + buildInputs = stdenv.lib.optional (!python.isPypy or false) gmp; # optional for pypy + doCheck = !(python.isPypy or stdenv.isDarwin); # error: AF_UNIX path too long meta = { homepage = "http://www.pycrypto.org/"; -- GitLab From 78e5234ae9a6563980df97c4ec92716351a64ca4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Sat, 23 Aug 2014 19:28:25 +0200 Subject: [PATCH 120/843] fix eval --- pkgs/top-level/all-packages.nix | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 19cf171d20f..1753771e511 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9373,8 +9373,11 @@ let cursesSupport = true; }; - inherit gettext highline iconv locale lockfile rmail_sup - text trollop unicode xapian_ruby which; + inherit gettext highline iconv locale lockfile + text trollop xapian_ruby which; + + rmail_sup = ""; # missing + unicode = ""; # See https://github.com/NixOS/nixpkgs/issues/1804 and # https://github.com/NixOS/nixpkgs/issues/2146 @@ -9383,12 +9386,11 @@ let dontPatchShebangs = 1; } ); - - chronic = chronic_0_9_1; + chronic = chronic; gpgme = ruby_gpgme; - mime_types = mime_types_1_25; + mime_types = mime_types; ncursesw_sup = ruby_ncursesw_sup; - rake = rubyLibs.rake_10_1_0; + rake = rake; }; synfigstudio = callPackage ../applications/graphics/synfigstudio { }; -- GitLab From c4a7d019a66e8cc55f37647dd282c22ce9a6e11c Mon Sep 17 00:00:00 2001 From: Mateusz Kowalczyk Date: Sat, 23 Aug 2014 21:04:33 +0100 Subject: [PATCH 121/843] haskell-poppler: update to 0.13 Fixed by upstream. --- pkgs/development/libraries/haskell/poppler/default.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/haskell/poppler/default.nix b/pkgs/development/libraries/haskell/poppler/default.nix index 327744560ac..28e7e515c2b 100644 --- a/pkgs/development/libraries/haskell/poppler/default.nix +++ b/pkgs/development/libraries/haskell/poppler/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "poppler"; - version = "0.12.3"; - sha256 = "1ny2r1cpsshpg00w6bd0f5mw26xsy99l7dgx2xq8f01zcwdy4nrp"; + version = "0.13"; + sha256 = "1fv0h2ixanzv5vy4l2ln23f9n8ghmgdxzlyx54hh69bwhrcg049s"; buildDepends = [ cairo glib gtk mtl ]; buildTools = [ gtk2hsBuildtools ]; extraLibraries = [ libc ]; @@ -18,7 +18,5 @@ cabal.mkDerivation (self: { license = self.stdenv.lib.licenses.gpl2; platforms = self.ghc.meta.platforms; maintainers = with self.stdenv.lib.maintainers; [ ianwookim ]; - hydraPlatforms = self.stdenv.lib.platforms.none; - broken = true; }; }) -- GitLab From d576fa175fce433e5e921ff67820299fdbca764d Mon Sep 17 00:00:00 2001 From: Cray Elliott Date: Sat, 23 Aug 2014 13:12:30 -0700 Subject: [PATCH 122/843] Update cabal-lenses to v3.1, no longer needs to be jailbroken --- pkgs/development/libraries/haskell/cabal-lenses/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/haskell/cabal-lenses/default.nix b/pkgs/development/libraries/haskell/cabal-lenses/default.nix index ccd23434fe0..b5427b3b747 100644 --- a/pkgs/development/libraries/haskell/cabal-lenses/default.nix +++ b/pkgs/development/libraries/haskell/cabal-lenses/default.nix @@ -4,10 +4,9 @@ cabal.mkDerivation (self: { pname = "cabal-lenses"; - version = "0.3"; - sha256 = "13nx9cn81cx9cj7fk07akqvz4qkl49dlgb5wl5wanag6bafa6vhl"; + version = "0.3.1"; + sha256 = "17piwqyzd33shp12qa6j4s579rrs34l44x19p2nzz69anhc4g1j7"; buildDepends = [ Cabal lens unorderedContainers ]; - jailbreak = true; meta = { description = "Lenses and traversals for the Cabal library"; license = self.stdenv.lib.licenses.bsd3; -- GitLab From 33ef69390bb2d4522bf4da4dc3a92a6195a7db5c Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sun, 24 Aug 2014 00:24:46 +0400 Subject: [PATCH 123/843] =?UTF-8?q?Fix=20Julia=200.3.0=20build=20(for=20mo?= =?UTF-8?q?st=20purposes).=20Not=20making=20default=20yet=20because=20it?= =?UTF-8?q?=20is=20unclear=20if=20I=20missed=20something=20important.=20Fa?= =?UTF-8?q?iled=20to=20make=20it=20use=20external=20openblas=20and=20lapac?= =?UTF-8?q?k=20correctly=E2=80=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/compilers/julia/0.3.0.nix | 25 +++++++++++---- .../science/math/liblapack/3.5.0.nix | 1 + .../science/math/liblapack/default.nix | 8 +++-- .../science/math/openblas/0.2.10.nix | 32 +++++++++++++++++++ .../science/math/openblas/default.nix | 9 ++---- pkgs/top-level/all-packages.nix | 4 +++ 6 files changed, 62 insertions(+), 17 deletions(-) create mode 100644 pkgs/development/libraries/science/math/openblas/0.2.10.nix diff --git a/pkgs/development/compilers/julia/0.3.0.nix b/pkgs/development/compilers/julia/0.3.0.nix index 4eb64aea534..82d7eda1d26 100644 --- a/pkgs/development/compilers/julia/0.3.0.nix +++ b/pkgs/development/compilers/julia/0.3.0.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { openblas_src = fetchurl { url = "https://github.com/xianyi/OpenBLAS/tarball/${openblas_ver}"; name = "openblas-${openblas_ver}.tar.gz"; - sha256 = "19ffec70f9678f5c159feadc036ca47720681b782910fbaa95aa3867e7e86d8e"; + sha256 = "06i0q4qnd5q5xljzrgvda0gjsczc6l2pl9hw6dn2qjpw38al73za"; }; arpack_src = fetchurl rec { url = "http://forge.scilab.org/index.php/p/arpack-ng/downloads/get/arpack-ng_${arpack_ver}.tar.gz"; @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { lapack_src = fetchurl { url = "http://www.netlib.org/lapack/lapack-${lapack_ver}.tgz"; name = "lapack-${lapack_ver}.tgz"; - sha256 = "93b910f94f6091a2e71b59809c4db4a14655db527cfc5821ade2e8c8ab75380f"; + sha256 = "0lk3f97i9imqascnlf6wr5mjpyxqcdj73pgj97dj2mgvyg9z1n4s"; }; lighttpd_src = fetchurl { url = "http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-${lighttpd_ver}.tar.gz"; @@ -73,7 +73,7 @@ stdenv.mkDerivation rec { ]; configurePhase = '' - for i in GMP LLVM PCRE LAPACK OPENBLAS BLAS READLINE FFTW LIBUNWIND SUITESPARSE GLPK LIGHTTPD ZLIB MPFR; + for i in GMP LLVM PCRE READLINE FFTW LIBUNWIND SUITESPARSE GLPK LIGHTTPD ZLIB MPFR; do makeFlags="$makeFlags USE_SYSTEM_$i=1 " done @@ -82,12 +82,13 @@ stdenv.mkDerivation rec { cp "$1" "$2/$(basename "$1" | sed -e 's/^[a-z0-9]*-//')" } - for i in "${grisu_src}" "${dsfmt_src}" "${arpack_src}" "${patchelf_src}" "${pcre_src}" "${utf8proc_src}"; do + for i in "${grisu_src}" "${dsfmt_src}" "${arpack_src}" "${patchelf_src}" \ + "${pcre_src}" "${utf8proc_src}" "${lapack_src}" "${openblas_src}"; do copy_kill_hash "$i" deps done ${if realGcc ==null then "" else - ''export NIX_LDFLAGS="$NIX_LDFLAGS -L${realGcc}/lib -L${realGcc}/lib64 -lpcre -llapack -lm -lfftw3f -lfftw3 -lglpk -lunistring -lz -lgmp -lmpfr"''} + ''export NIX_LDFLAGS="$NIX_LDFLAGS -L${realGcc}/lib -L${realGcc}/lib64 -lpcre -llapack -lm -lfftw3f -lfftw3 -lglpk -lunistring -lz -lgmp -lmpfr -lblas -lopenblas -L$out/lib"''} export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -fPIC " export LDFLAGS="-L${suitesparse}/lib -L$out/lib/julia -Wl,-rpath,$out/lib/julia" @@ -105,6 +106,14 @@ stdenv.mkDerivation rec { export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:$PWD/usr/lib:$PWD/usr/lib/julia" patchShebangs . contrib + + export PATH="$PATH:${stdenv.gcc.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 + sed -e "s@/sbin/ldconfig@true@" -i src/ccall.* + + ln -s "${openblas}/lib/libopenblas.so" "$out/lib/libblas.so" ''; preBuild = '' @@ -126,7 +135,9 @@ stdenv.mkDerivation rec { done ''; - enableParallelBuilding = false; + dontStrip = true; + + enableParallelBuilding = true; postInstall = '' rm -f "$out"/lib/julia/sys.{so,dylib,dll} @@ -138,6 +149,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.mit; maintainers = [ stdenv.lib.maintainers.raskin ]; platforms = with stdenv.lib.platforms; linux; - broken = true; + broken = false; }; } diff --git a/pkgs/development/libraries/science/math/liblapack/3.5.0.nix b/pkgs/development/libraries/science/math/liblapack/3.5.0.nix index b2167449a2f..0b4badf26e7 100644 --- a/pkgs/development/libraries/science/math/liblapack/3.5.0.nix +++ b/pkgs/development/libraries/science/math/liblapack/3.5.0.nix @@ -38,6 +38,7 @@ stdenv.mkDerivation rec { }; meta = { + inherit version; description = "Linear Algebra PACKage"; homepage = "http://www.netlib.org/lapack/"; license = "revised-BSD"; diff --git a/pkgs/development/libraries/science/math/liblapack/default.nix b/pkgs/development/libraries/science/math/liblapack/default.nix index f1c99397452..9f4f43311a4 100644 --- a/pkgs/development/libraries/science/math/liblapack/default.nix +++ b/pkgs/development/libraries/science/math/liblapack/default.nix @@ -2,11 +2,12 @@ let atlasMaybeShared = atlas.override { inherit shared; }; usedLibExtension = if shared then ".so" else ".a"; + version = "3.4.1"; in -stdenv.mkDerivation { - name = "liblapack-3.4.1"; +stdenv.mkDerivation rec { + name = "liblapack-${version}"; src = fetchurl { - url = "http://www.netlib.org/lapack/lapack-3.4.1.tgz"; + url = "http://www.netlib.org/lapack/lapack-${version}.tgz"; sha256 = "93b910f94f6091a2e71b59809c4db4a14655db527cfc5821ade2e8c8ab75380f"; }; @@ -37,6 +38,7 @@ stdenv.mkDerivation { }; meta = { + inherit version; description = "Linear Algebra PACKage"; homepage = "http://www.netlib.org/lapack/"; license = "revised-BSD"; diff --git a/pkgs/development/libraries/science/math/openblas/0.2.10.nix b/pkgs/development/libraries/science/math/openblas/0.2.10.nix new file mode 100644 index 00000000000..a8db0631911 --- /dev/null +++ b/pkgs/development/libraries/science/math/openblas/0.2.10.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchurl, gfortran, perl, liblapack }: + +stdenv.mkDerivation rec { + version = "0.2.10"; + + name = "openblas-${version}"; + src = fetchurl { + url = "https://github.com/xianyi/OpenBLAS/tarball/v${version}"; + sha256 = "06i0q4qnd5q5xljzrgvda0gjsczc6l2pl9hw6dn2qjpw38al73za"; + name = "openblas-${version}.tar.gz"; + }; + + preBuild = "cp ${liblapack.src} lapack-${liblapack.meta.version}.tgz"; + + buildInputs = [gfortran perl]; + + cpu = builtins.head (stdenv.lib.splitString "-" stdenv.system); + + target = if cpu == "i686" then "P2" else + if cpu == "x86_64" then "CORE2" else + # allow autodetect + ""; + + makeFlags = "${if target != "" then "TARGET=" else ""}${target} FC=gfortran CC=cc PREFIX=\"\$(out)\" INTERFACE64=1"; + + meta = { + description = "Basic Linear Algebra Subprograms"; + license = stdenv.lib.licenses.bsd3; + homepage = "https://github.com/xianyi/OpenBLAS"; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/development/libraries/science/math/openblas/default.nix b/pkgs/development/libraries/science/math/openblas/default.nix index 6ea7333f698..c535b1a39db 100644 --- a/pkgs/development/libraries/science/math/openblas/default.nix +++ b/pkgs/development/libraries/science/math/openblas/default.nix @@ -1,12 +1,7 @@ -{ stdenv, fetchurl, gfortran, perl }: +{ stdenv, fetchurl, gfortran, perl, liblapack }: stdenv.mkDerivation rec { version = "0.2.2"; - lapack_version = "3.4.1"; - lapack_src = fetchurl { - url = "http://www.netlib.org/lapack/lapack-${lapack_version}.tgz"; - sha256 = "93b910f94f6091a2e71b59809c4db4a14655db527cfc5821ade2e8c8ab75380f"; - }; name = "openblas-${version}"; src = fetchurl { @@ -15,7 +10,7 @@ stdenv.mkDerivation rec { name = "openblas-${version}.tar.gz"; }; - preBuild = "cp ${lapack_src} lapack-${lapack_version}.tgz"; + preBuild = "cp ${liblapack.src} lapack-${liblapack.meta.version}.tgz"; buildInputs = [gfortran perl]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1753771e511..856f8718b16 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3112,6 +3112,7 @@ let suitesparse = suitesparse.override { inherit liblapack; }; + openblas = openblas_0_2_10; llvm = llvm_34; }; julia = julia021; @@ -10893,6 +10894,9 @@ let liblbfgs = callPackage ../development/libraries/science/math/liblbfgs { }; openblas = callPackage ../development/libraries/science/math/openblas { }; + openblas_0_2_10 = callPackage ../development/libraries/science/math/openblas/0.2.10.nix { + liblapack = liblapack_3_5_0; + }; mathematica = callPackage ../applications/science/math/mathematica { }; -- GitLab From 2af1a92a28875c06b5bb620ce6961067e0a7b882 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sat, 23 Aug 2014 17:02:44 -0500 Subject: [PATCH 124/843] haskell-ghc-mod-5.0.1: use wrapProgram Use wrapProgram from makeWrapper to wrap ghc-mod and ghc-modi like haddock. The wrapper code is clearer and hopefully more maintainable. As a side-effect, the bug where emacs would hang while loading ghc-modi is fixed. --- .../libraries/haskell/ghc-mod/5.0.1.nix | 23 +++++++------------ 1 file changed, 8 insertions(+), 15 deletions(-) diff --git a/pkgs/development/libraries/haskell/ghc-mod/5.0.1.nix b/pkgs/development/libraries/haskell/ghc-mod/5.0.1.nix index ad920721451..1151cdfa51d 100644 --- a/pkgs/development/libraries/haskell/ghc-mod/5.0.1.nix +++ b/pkgs/development/libraries/haskell/ghc-mod/5.0.1.nix @@ -3,7 +3,7 @@ { cabal, Cabal, convertible, deepseq, djinnGhc, doctest, emacs , filepath, ghcPaths, ghcSybUtils, haskellSrcExts, hlint, hspec , ioChoice, monadControl, monadJournal, mtl, split, syb, text, time -, transformers, transformersBase +, transformers, transformersBase, makeWrapper }: cabal.mkDerivation (self: { @@ -22,9 +22,11 @@ cabal.mkDerivation (self: { ghcSybUtils haskellSrcExts hlint hspec ioChoice monadControl monadJournal mtl split syb text time transformers transformersBase ]; - buildTools = [ emacs ]; + buildTools = [ emacs makeWrapper ]; doCheck = false; configureFlags = "--datasubdir=${self.pname}-${self.version}"; + # The method used below to wrap ghc-mod and ghc-modi was borrowed from the + # wrapper for haddock. postInstall = '' cd $out/share/$pname-$version make @@ -32,20 +34,11 @@ cabal.mkDerivation (self: { cd .. ensureDir "$out/share/emacs" mv $pname-$version emacs/site-lisp - mv $out/bin/ghc-mod $out/bin/.ghc-mod-wrapped - cat - > $out/bin/ghc-mod < $out/bin/ghc-modi < Date: Sun, 24 Aug 2014 01:50:31 +0200 Subject: [PATCH 125/843] vimb: Update from 2.6 to 2.7 --- pkgs/applications/networking/browsers/vimb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/vimb/default.nix b/pkgs/applications/networking/browsers/vimb/default.nix index 7c5b983f1b4..996bda67323 100644 --- a/pkgs/applications/networking/browsers/vimb/default.nix +++ b/pkgs/applications/networking/browsers/vimb/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "vimb-${version}"; - version = "2.6"; + version = "2.7"; src = fetchurl { url = "https://github.com/fanglingsu/vimb/archive/${version}.tar.gz"; - sha256 = "1g6zm5fk3k52jk3vbbzj7rm0kanykd4zgxrqhlvj3qzj2nsn4a21"; + sha256 = "05i5p9827rgga4h27qy3qh4ps8aynkcr55j681ddhn16ci3dk8zr"; }; # Nixos default ca bundle -- GitLab From 0f6ae6403e9aa198def43c413f9557e14561deab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 24 Aug 2014 09:53:31 +0200 Subject: [PATCH 126/843] xorg: fix typo from the last xorg commit Thanks to @falsifian for noticing it. --- pkgs/servers/x11/xorg/overrides.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index 7d8fd4d8b75..93afa06a7f2 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -202,7 +202,7 @@ in }; xf86videovmware = attrs: attrs // { - buildinputs = attrs.buildinputs ++ [ args.mesa_drivers ]; # for libxatracker + buildInputs = attrs.buildInputs ++ [ args.mesa_drivers ]; # for libxatracker }; xf86videoqxl = attrs: attrs // { -- GitLab From 33879427b7a334f29b0a61ab2bd4a9432f1f460e Mon Sep 17 00:00:00 2001 From: Nathaniel Baxter Date: Sun, 24 Aug 2014 12:36:37 +1000 Subject: [PATCH 127/843] maintainers: add myself as a maintainer to obconf and teamspeak_client --- lib/maintainers.nix | 1 + .../networking/instant-messengers/teamspeak/client.nix | 1 + pkgs/tools/X11/obconf/default.nix | 1 + 3 files changed, 3 insertions(+) diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 8c975b486f1..b55eb22a720 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -60,6 +60,7 @@ kkallio = "Karn Kallio "; ktosiek = "Tomasz Kontusz "; lethalman = "Luca Bruno "; + lhvwb = "Nathaniel Baxter "; linquize = "Linquize "; lovek323 = "Jason O'Conal "; ludo = "Ludovic Courtès "; diff --git a/pkgs/applications/networking/instant-messengers/teamspeak/client.nix b/pkgs/applications/networking/instant-messengers/teamspeak/client.nix index eb052af1369..d7dc755e9ab 100644 --- a/pkgs/applications/networking/instant-messengers/teamspeak/client.nix +++ b/pkgs/applications/networking/instant-messengers/teamspeak/client.nix @@ -77,6 +77,7 @@ stdenv.mkDerivation rec { description = "The TeamSpeak voice communication tool"; homepage = http://teamspeak.com/; license = "http://www.teamspeak.com/?page=downloads&type=ts3_linux_client_latest"; + maintainers = [ stdenv.lib.maintainers.lhvwb ]; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/tools/X11/obconf/default.nix b/pkgs/tools/X11/obconf/default.nix index 589b684e69b..e1a2e0dd496 100644 --- a/pkgs/tools/X11/obconf/default.nix +++ b/pkgs/tools/X11/obconf/default.nix @@ -22,5 +22,6 @@ stdenv.mkDerivation rec { description = "GUI configuration tool for openbox"; homepage = "http://openbox.org/wiki/ObConf"; license = stdenv.lib.licenses.gpl2; + maintainers = [ stdenv.lib.maintainers.lhvwb ]; }; } -- GitLab From f61fb466eb09c4c7432d29838b752d5285163388 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=BCdiger=20Sonderfeld?= Date: Sat, 23 Aug 2014 21:08:04 +0200 Subject: [PATCH 128/843] man-pages: Update to 3.71. --- pkgs/data/documentation/man-pages/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/documentation/man-pages/default.nix b/pkgs/data/documentation/man-pages/default.nix index d4c0b4a6461..2eefa31691e 100644 --- a/pkgs/data/documentation/man-pages/default.nix +++ b/pkgs/data/documentation/man-pages/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "man-pages-3.70"; + name = "man-pages-3.71"; src = fetchurl { url = "mirror://kernel/linux/docs/man-pages/${name}.tar.xz"; - sha256 = "1qnhlicshlcz2da9k9czp75cfj7a6y90m0bhik7gzxa3s3b4f43j"; + sha256 = "981038ecffcf6db490c0bc4359f489c318654068a6ba5aa086962ac41b0d2894"; }; preBuild = -- GitLab From 4ac4440e2ffc0fdcc5964cd5d4d8e224c797a258 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Sun, 24 Aug 2014 10:13:55 +0200 Subject: [PATCH 129/843] pypy: verify tkinter module --- pkgs/development/interpreters/pypy/2.3/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/interpreters/pypy/2.3/default.nix b/pkgs/development/interpreters/pypy/2.3/default.nix index 1b3261313c5..a364b24c04c 100644 --- a/pkgs/development/interpreters/pypy/2.3/default.nix +++ b/pkgs/development/interpreters/pypy/2.3/default.nix @@ -75,6 +75,9 @@ let ln -s $out/pypy-c/include $out/include/${libPrefix} ln -s $out/pypy-c/lib-python/${pythonVersion} $out/lib/${libPrefix} + # verify cffi modules + $out/bin/pypy -c "import Tkinter" + # TODO: compile python files? ''; -- GitLab From 549fae867626b51ec5c07b31bb0649470a3d02b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Sun, 24 Aug 2014 10:16:41 +0200 Subject: [PATCH 130/843] pypyPackages.paramiko: fix --- pkgs/top-level/python-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 3c3380a3dfa..651a10063b6 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5253,7 +5253,7 @@ rec { propagatedBuildInputs = [ pycrypto ecdsa ]; - checkPhase = "python test.py"; + checkPhase = "${python}/bin/${python.executable} test.py"; meta = { homepage = "https://github.com/paramiko/paramiko/"; -- GitLab From 85cdd7ce334442bab5af03b5072f29ce03f98d3a Mon Sep 17 00:00:00 2001 From: Cray Elliott Date: Sun, 3 Aug 2014 10:49:32 -0700 Subject: [PATCH 131/843] Add SDL2_net v2.0.0 --- lib/maintainers.nix | 1 + .../libraries/SDL2_net/default.nix | 22 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 25 insertions(+) create mode 100644 pkgs/development/libraries/SDL2_net/default.nix diff --git a/lib/maintainers.nix b/lib/maintainers.nix index b55eb22a720..6fadaa10952 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -72,6 +72,7 @@ mornfall = "Petr Ročkai "; msackman = "Matthew Sackman "; nathan-gs = "Nathan Bijnens "; + MP2E = "Cray Elliott "; notthemessiah = "Brian Cohen "; ocharles = "Oliver Charles "; offline = "Jaka Hudoklin "; diff --git a/pkgs/development/libraries/SDL2_net/default.nix b/pkgs/development/libraries/SDL2_net/default.nix new file mode 100644 index 00000000000..e41546512e9 --- /dev/null +++ b/pkgs/development/libraries/SDL2_net/default.nix @@ -0,0 +1,22 @@ +{ stdenv, fetchurl, SDL2 }: + +stdenv.mkDerivation rec { + name = "SDL2_net-2.0.0"; + + src = fetchurl { + url = "http://www.libsdl.org/projects/SDL_net/release/${name}.tar.gz"; + sha256 = "d715be30783cc99e541626da52079e308060b21d4f7b95f0224b1d06c1faacab"; + }; + + propagatedBuildInputs = [SDL2]; + + postInstall = "ln -s $out/include/SDL2/SDL_net.h $out/include/"; + + meta = with stdenv.lib; { + description = "SDL multiplatform networking library"; + homepage = https://www.libsdl.org/projects/SDL_net; + license = licenses.zlib; + maintainers = [ maintainers.MP2E ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 856f8718b16..4f05d524074 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6179,6 +6179,8 @@ let SDL2_mixer = callPackage ../development/libraries/SDL2_mixer { }; + SDL2_net = callPackage ../development/libraries/SDL2_net { }; + SDL2_gfx = callPackage ../development/libraries/SDL2_gfx { }; serd = callPackage ../development/libraries/serd {}; -- GitLab From ede8be928159db2ed5557419d151a11de2389cc9 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sun, 24 Aug 2014 12:54:56 +0400 Subject: [PATCH 132/843] Fix tarball evaluation; had to regenerate Ruby gem list --- .../interpreters/ruby/generated.nix | 35 ++++++++++++------- pkgs/top-level/python-packages.nix | 2 +- 2 files changed, 24 insertions(+), 13 deletions(-) diff --git a/pkgs/development/interpreters/ruby/generated.nix b/pkgs/development/interpreters/ruby/generated.nix index 01bbaa390f9..6ec0f4f73e5 100644 --- a/pkgs/development/interpreters/ruby/generated.nix +++ b/pkgs/development/interpreters/ruby/generated.nix @@ -19,7 +19,7 @@ g: # Get dependencies from patched gems bitbucket_backup = g.bitbucket_backup_0_3_1; builder = g.builder_3_2_2; buildr = g.buildr_1_4_19; - bundler = g.bundler_1_7_0; + bundler = g.bundler_1_7_1; childprocess = g.childprocess_0_5_3; chronic = g.chronic_0_10_2; coderay = g.coderay_1_1_0; @@ -102,7 +102,7 @@ g: # Get dependencies from patched gems rspec_expectations = g.rspec_expectations_2_14_5; rspec_mocks = g.rspec_mocks_2_14_6; rubyzip = g.rubyzip_1_1_6; - sass = g.sass_3_4_0; + sass = g.sass_3_4_1; selenium_webdriver = g.selenium_webdriver_2_42_0; servolux = g.servolux_0_10_0; sinatra = g.sinatra_1_4_5; @@ -113,6 +113,7 @@ g: # Get dependencies from patched gems systemu = g.systemu_2_6_4; taskjuggler = g.taskjuggler_3_5_0; term_ansicolor = g.term_ansicolor_1_3_0; + terminal_notifier = g.terminal_notifier_1_6_1; text = g.text_1_3_0; thin = g.thin_1_6_2; thor = g.thor_0_19_1; @@ -134,7 +135,7 @@ g: # Get dependencies from patched gems xapian_ruby = g.xapian_ruby_1_2_17; xml_simple = g.xml_simple_1_1_2; }; - gem_nix_args = [ ''autotest-rails'' ''aws-sdk'' ''bitbucket-backup'' ''buildr'' ''cucumber'' ''fakes3'' ''foreman'' ''gettext'' ''iconv'' ''jsduck'' ''lockfile'' ''mechanize'' ''nix'' ''papertrail-cli'' ''rails'' ''rake'' ''rb-fsevent'' ''remote_syslog'' ''riemann-dash'' ''right_aws'' ''rmail'' ''sass'' ''selenium-webdriver'' ''sinatra-1.3.2'' ''taskjuggler'' ''thin'' ''travis'' ''trollop'' ''uuid'' ''xapian-full'' ''xapian-ruby'' ]; + gem_nix_args = [ ''autotest-rails'' ''aws-sdk'' ''bitbucket-backup'' ''buildr'' ''cucumber'' ''fakes3'' ''foreman'' ''gettext'' ''iconv'' ''jsduck'' ''lockfile'' ''mechanize'' ''nix'' ''papertrail-cli'' ''rails'' ''rake'' ''rb-fsevent'' ''remote_syslog'' ''riemann-dash'' ''right_aws'' ''rmail'' ''sass'' ''selenium-webdriver'' ''sinatra-1.3.2'' ''taskjuggler'' ''terminal-notifier'' ''thin'' ''travis'' ''trollop'' ''uuid'' ''xapian-full'' ''xapian-ruby'' ]; gems = { ZenTest_4_10_1 = { basename = ''ZenTest''; @@ -361,19 +362,19 @@ for those one-off tasks, with a language that's a joy to use. ''; }; name = ''buildr-1.4.19''; - 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_8 g.atoulme_Antwrap_0_7_4 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_0 g.orderedhash_0_0_6 ]; + 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_8 g.atoulme_Antwrap_0_7_4 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_1 g.orderedhash_0_0_6 ]; sha256 = ''07k6z149si7v1h5m1bvdhjcv0nnjwkd2c6a8n1779l8g47ckccj0''; }; - bundler_1_7_0 = { + bundler_1_7_1 = { 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.0''; + name = ''bundler-1.7.1''; requiredGems = [ ]; - sha256 = ''0vcbqmr1h98yfaixjbpdyzz1b90ms8gf86kd3c0q0ydwh9yr7b1j''; + sha256 = ''144yqbmi89gl933rh8dv58bm7ia14s4a098qdi2z0q09ank9n5h2''; }; childprocess_0_5_3 = { basename = ''childprocess''; @@ -1378,7 +1379,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.5''; - requiredGems = [ g.activesupport_4_1_5 g.actionpack_4_1_5 g.actionview_4_1_5 g.activemodel_4_1_5 g.activerecord_4_1_5 g.actionmailer_4_1_5 g.railties_4_1_5 g.bundler_1_7_0 g.sprockets_rails_2_1_3 ]; + requiredGems = [ g.activesupport_4_1_5 g.actionpack_4_1_5 g.actionview_4_1_5 g.activemodel_4_1_5 g.activerecord_4_1_5 g.actionmailer_4_1_5 g.railties_4_1_5 g.bundler_1_7_1 g.sprockets_rails_2_1_3 ]; sha256 = ''12s3jkvd6bn40apxc3973czgs7s6y36aclbwif6j770v7sjd9qj7''; }; railties_4_1_5 = { @@ -1475,7 +1476,7 @@ Rake has the following features: longDescription = ''HTTP dashboard for the distributed event system Riemann.''; }; name = ''riemann-dash-0.2.9''; - requiredGems = [ g.erubis_2_7_0 g.sinatra_1_4_5 g.sass_3_4_0 g.webrick_1_3_1 g.multi_json_1_3_6 ]; + requiredGems = [ g.erubis_2_7_0 g.sinatra_1_4_5 g.sass_3_4_1 g.webrick_1_3_1 g.multi_json_1_3_6 ]; sha256 = ''0ws5wmjbv8w9lcr3i2mdinj2qm91p6c85k6c067i67cf0p90jxq3''; }; right_aws_3_1_0 = { @@ -1689,7 +1690,7 @@ RKelly[https://github.com/tenderlove/rkelly] JavaScript parser.''; requiredGems = [ ]; sha256 = ''17ha7kmgcnhnxyfp9wgyrd2synp17v9g8j1pknhfd2v9x5g475m9''; }; - sass_3_4_0 = { + sass_3_4_1 = { basename = ''sass''; meta = { description = ''A powerful but elegant CSS compiler that makes CSS fun again.''; @@ -1700,9 +1701,9 @@ RKelly[https://github.com/tenderlove/rkelly] JavaScript parser.''; command line tool or a web-framework plugin. ''; }; - name = ''sass-3.4.0''; + name = ''sass-3.4.1''; requiredGems = [ ]; - sha256 = ''1v2kda9ff69nmz2qcxfmc1w5nxv81nays450nql0mbpy8pvydfr2''; + sha256 = ''0f997m7g6gcd4yaxxrf1nylk2x8ynf7w2l631sby51zfn21rfli4''; }; selenium_webdriver_2_42_0 = { basename = ''selenium_webdriver''; @@ -1836,6 +1837,16 @@ management. requiredGems = [ g.tins_1_3_2 ]; sha256 = ''1a2gw7gmpmx57sdpyhjwl0zn4bqp7jyjz7aslpvvphd075layp4b''; }; + terminal_notifier_1_6_1 = { + basename = ''terminal_notifier''; + meta = { + description = ''Send User Notifications on Mac OS X 10.8 or higher.''; + homepage = ''https://github.com/alloy/terminal-notifier''; + }; + name = ''terminal-notifier-1.6.1''; + requiredGems = [ ]; + sha256 = ''0j14sblviiypzc9vb508ldd78winba4vhnm9nhg3zpq07p3528g7''; + }; text_1_3_0 = { basename = ''text''; meta = { diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 651a10063b6..9d3ef800f55 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9094,7 +9094,7 @@ rec { md5 = "6c73c5b668a67fdc116a25b884058ed9"; }; - doCheck = !python.isPypy; + doCheck = !(python.isPypy or false); propagatedBuildInputs = [ zope_interface zope_exceptions zope_location ]; -- GitLab From 76ac17d36b3ed1525151b3cd10d1fe68ef034dfd Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Sun, 24 Aug 2014 10:55:53 +0200 Subject: [PATCH 133/843] Nixpkgs manual: Fix validity --- doc/meta.xml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/doc/meta.xml b/doc/meta.xml index eb644b3b0ee..3a6b0b105d2 100644 --- a/doc/meta.xml +++ b/doc/meta.xml @@ -120,12 +120,12 @@ interpretation: license - The license for the package. One from attribute set defined in - - nixpkgs/lib/licenses.nix. - Example: - stdenv.lib.licenses.gpl3. - See details in , + The license for the package. One from the + attribute set defined in + nixpkgs/lib/licenses.nix. Example: + stdenv.lib.licenses.gpl3. For details, see + . -- GitLab From 14f48dd5c2c4f4f4a2409d4ced1dd4ca2cab5e74 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Sun, 24 Aug 2014 10:56:35 +0200 Subject: [PATCH 134/843] Nixpkgs manual: Drop author bla bla --- doc/manual.xml | 18 +----------------- 1 file changed, 1 insertion(+), 17 deletions(-) diff --git a/doc/manual.xml b/doc/manual.xml index 145e3e12dd9..5eb62e811c6 100644 --- a/doc/manual.xml +++ b/doc/manual.xml @@ -8,21 +8,6 @@ Draft (Version ) - - - Eelco - Dolstra - - - LogicBlox - - - - - 2008-2012 - Eelco Dolstra - - @@ -33,6 +18,5 @@ - - + -- GitLab From 438b9c543d535f525ac50affd045bdf41a3239d6 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Sun, 24 Aug 2014 11:02:23 +0200 Subject: [PATCH 135/843] Nixpkgs manual: Add a Nix expression to build --- doc/Makefile | 41 -------------------------------- doc/default.nix | 42 +++++++++++++++++++++++++++++++++ doc/manual.xml | 5 ++-- pkgs/top-level/make-tarball.nix | 29 +---------------------- pkgs/top-level/release.nix | 2 ++ 5 files changed, 47 insertions(+), 72 deletions(-) delete mode 100644 doc/Makefile create mode 100644 doc/default.nix diff --git a/doc/Makefile b/doc/Makefile deleted file mode 100644 index 39988cdd414..00000000000 --- a/doc/Makefile +++ /dev/null @@ -1,41 +0,0 @@ -# You may need to override this. -docbookxsl = $(HOME)/.nix-profile/xml/xsl/docbook -dblatex = dblatex - -XMLLINT = xmllint --catalogs -XSLTPROC = xsltproc --catalogs \ - --param section.autolabel 1 \ - --param section.label.includes.component.label 1 \ - --param html.stylesheet \'style.css\' \ - --param xref.with.number.and.title 1 \ - --param toc.section.depth 3 \ - --param admon.style \'\' \ - --param callout.graphics.extension \'.gif\' - -NEWS_OPTS = \ - --stringparam generate.toc "article nop" \ - --stringparam section.autolabel.max.depth 0 \ - --stringparam header.rule 0 - -all: NEWS.html NEWS.txt manual.html manual.pdf - -NEWS.html: release-notes.xml - $(XSLTPROC) --nonet --xinclude --output $@ $(NEWS_OPTS) \ - $(docbookxsl)/xhtml/docbook.xsl release-notes.xml - -NEWS.txt: release-notes.xml - $(XSLTPROC) --nonet --xinclude quote-literals.xsl release-notes.xml | \ - $(XSLTPROC) --nonet --output $@.tmp.html $(NEWS_OPTS) \ - $(docbookxsl)/xhtml/docbook.xsl - - LANG=en_US w3m -dump $@.tmp.html > $@ - rm $@.tmp.html - -manual.html: *.xml - $(XSLTPROC) --nonet --xinclude --output manual.html \ - $(docbookxsl)/xhtml/docbook.xsl manual.xml - -manual.pdf: *.xml - $(dblatex) \ - -P doc.collab.show=0 \ - -P latex.output.revhistory=0 \ - manual.xml diff --git a/doc/default.nix b/doc/default.nix new file mode 100644 index 00000000000..1e8974d6026 --- /dev/null +++ b/doc/default.nix @@ -0,0 +1,42 @@ +with import ./.. { }; +with lib; + +stdenv.mkDerivation { + name = "nixpkgs-manual"; + + sources = sourceFilesBySuffices ./. [".xml"]; + + buildInputs = [ libxml2 libxslt ]; + + xsltFlags = '' + --param section.autolabel 1 + --param section.label.includes.component.label 1 + --param html.stylesheet 'style.css' + --param xref.with.number.and.title 1 + --param toc.section.depth 3 + --param admon.style ''' + --param callout.graphics.extension '.gif' + ''; + + buildCommand = '' + ln -s $sources/*.xml . # */ + + echo ${nixpkgsVersion} > .version + + xmllint --noout --nonet --xinclude --noxincludenode \ + --relaxng ${docbook5}/xml/rng/docbook/docbook.rng \ + manual.xml + + dst=$out/share/doc/nixpkgs + mkdir -p $dst + xsltproc $xsltFlags --nonet --xinclude \ + --output $dst/manual.html \ + ${docbook5_xsl}/xml/xsl/docbook/xhtml/docbook.xsl \ + ./manual.xml + + cp ${./style.css} $dst/style.css + + mkdir -p $out/nix-support + echo "doc manual $dst manual.html" >> $out/nix-support/hydra-build-products + ''; +} diff --git a/doc/manual.xml b/doc/manual.xml index 5eb62e811c6..01373b4f5b1 100644 --- a/doc/manual.xml +++ b/doc/manual.xml @@ -3,10 +3,9 @@ - Nixpkgs Manual + Nixpkgs Contributors Guide - Draft (Version ) + Version diff --git a/pkgs/top-level/make-tarball.nix b/pkgs/top-level/make-tarball.nix index 9856586a183..356368d137d 100644 --- a/pkgs/top-level/make-tarball.nix +++ b/pkgs/top-level/make-tarball.nix @@ -14,14 +14,7 @@ releaseTools.sourceTarball rec { version = builtins.readFile ../../.version; versionSuffix = "pre${toString nixpkgs.revCount}.${nixpkgs.shortRev}"; - buildInputs = [ - lzma - libxml2 # Needed for the release notes. - libxslt - w3m - nix # Needed to check whether the expressions are valid. - tetex dblatex - ]; + buildInputs = [ nix ]; configurePhase = '' eval "$preConfigure" @@ -32,13 +25,6 @@ releaseTools.sourceTarball rec { dontBuild = false; - buildPhase = '' - echo "building docs..." - export VARTEXFONTS=$TMPDIR/texfonts - make -C doc docbookxsl=${docbook5_xsl}/xml/xsl/docbook - ln -s doc/NEWS.txt NEWS - ''; - doCheck = true; checkPhase = '' @@ -87,19 +73,6 @@ releaseTools.sourceTarball rec { cp -prd . ../$releaseName echo nixpkgs > ../$releaseName/channel-name (cd .. && tar cfa $out/tarballs/$releaseName.tar.xz $releaseName) || false - - mkdir -p $out/release-notes - cp doc/NEWS.html $out/release-notes/index.html - cp doc/style.css $out/release-notes/ - echo "doc release-notes $out/release-notes" >> $out/nix-support/hydra-build-products - - mkdir -p $out/manual - cp doc/manual.html $out/manual/index.html - cp doc/style.css $out/manual/ - echo "doc manual $out/manual" >> $out/nix-support/hydra-build-products - - cp doc/manual.pdf $out/manual.pdf - echo "doc-pdf manual $out/manual.pdf" >> $out/nix-support/hydra-build-products ''; meta = { diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index ff66756aa8b..be76c63685b 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -22,6 +22,8 @@ let jobs = { tarball = import ./make-tarball.nix { inherit nixpkgs officialRelease; }; + manual = import ../../doc; + unstable = pkgs.releaseTools.aggregate { name = "nixpkgs-${jobs.tarball.version}"; meta.description = "Release-critical builds for the Nixpkgs unstable channel"; -- GitLab From 9b6db1c9643a6bdfd0618c09b78b74875fde5358 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 24 Aug 2014 11:45:56 +0200 Subject: [PATCH 136/843] Re-generate Haskell packages with cabal2nix. --- pkgs/development/libraries/haskell/diagrams/cairo.nix | 2 +- pkgs/development/libraries/haskell/diagrams/contrib.nix | 2 +- pkgs/development/libraries/haskell/diagrams/core.nix | 2 +- pkgs/development/libraries/haskell/diagrams/lib.nix | 2 +- pkgs/development/libraries/haskell/diagrams/postscript.nix | 2 +- pkgs/development/libraries/haskell/diagrams/svg.nix | 2 +- .../libraries/haskell/digestive-functors-aeson/default.nix | 4 +++- pkgs/development/libraries/haskell/force-layout/default.nix | 2 +- pkgs/development/libraries/haskell/hdaemonize/default.nix | 2 +- pkgs/development/libraries/haskell/hweblib/default.nix | 2 +- 10 files changed, 12 insertions(+), 10 deletions(-) diff --git a/pkgs/development/libraries/haskell/diagrams/cairo.nix b/pkgs/development/libraries/haskell/diagrams/cairo.nix index c8763ca0a45..3a695fa8203 100644 --- a/pkgs/development/libraries/haskell/diagrams/cairo.nix +++ b/pkgs/development/libraries/haskell/diagrams/cairo.nix @@ -19,6 +19,6 @@ cabal.mkDerivation (self: { description = "Cairo backend for diagrams drawing EDSL"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.bergey ]; + maintainers = with self.stdenv.lib.maintainers; [ bergey ]; }; }) diff --git a/pkgs/development/libraries/haskell/diagrams/contrib.nix b/pkgs/development/libraries/haskell/diagrams/contrib.nix index 7c9e797e305..f1044870f3a 100644 --- a/pkgs/development/libraries/haskell/diagrams/contrib.nix +++ b/pkgs/development/libraries/haskell/diagrams/contrib.nix @@ -25,6 +25,6 @@ cabal.mkDerivation (self: { description = "Collection of user contributions to diagrams EDSL"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.bergey ]; + maintainers = with self.stdenv.lib.maintainers; [ bergey ]; }; }) diff --git a/pkgs/development/libraries/haskell/diagrams/core.nix b/pkgs/development/libraries/haskell/diagrams/core.nix index c7459972c39..18f362e0c21 100644 --- a/pkgs/development/libraries/haskell/diagrams/core.nix +++ b/pkgs/development/libraries/haskell/diagrams/core.nix @@ -17,6 +17,6 @@ cabal.mkDerivation (self: { description = "Core libraries for diagrams EDSL"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.bergey ]; + maintainers = with self.stdenv.lib.maintainers; [ bergey ]; }; }) diff --git a/pkgs/development/libraries/haskell/diagrams/lib.nix b/pkgs/development/libraries/haskell/diagrams/lib.nix index 75ee478ac3f..b15f05dbf27 100644 --- a/pkgs/development/libraries/haskell/diagrams/lib.nix +++ b/pkgs/development/libraries/haskell/diagrams/lib.nix @@ -21,6 +21,6 @@ cabal.mkDerivation (self: { description = "Embedded domain-specific language for declarative graphics"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.bergey ]; + maintainers = with self.stdenv.lib.maintainers; [ bergey ]; }; }) diff --git a/pkgs/development/libraries/haskell/diagrams/postscript.nix b/pkgs/development/libraries/haskell/diagrams/postscript.nix index c79f637c73f..557aae73db5 100644 --- a/pkgs/development/libraries/haskell/diagrams/postscript.nix +++ b/pkgs/development/libraries/haskell/diagrams/postscript.nix @@ -18,6 +18,6 @@ cabal.mkDerivation (self: { description = "Postscript backend for diagrams drawing EDSL"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.bergey ]; + maintainers = with self.stdenv.lib.maintainers; [ bergey ]; }; }) diff --git a/pkgs/development/libraries/haskell/diagrams/svg.nix b/pkgs/development/libraries/haskell/diagrams/svg.nix index fcd08ffce63..8393d7c6f98 100644 --- a/pkgs/development/libraries/haskell/diagrams/svg.nix +++ b/pkgs/development/libraries/haskell/diagrams/svg.nix @@ -19,6 +19,6 @@ cabal.mkDerivation (self: { description = "SVG backend for diagrams drawing EDSL"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.bergey ]; + maintainers = with self.stdenv.lib.maintainers; [ bergey ]; }; }) diff --git a/pkgs/development/libraries/haskell/digestive-functors-aeson/default.nix b/pkgs/development/libraries/haskell/digestive-functors-aeson/default.nix index 9bab1ad45db..1958307e869 100644 --- a/pkgs/development/libraries/haskell/digestive-functors-aeson/default.nix +++ b/pkgs/development/libraries/haskell/digestive-functors-aeson/default.nix @@ -1,3 +1,5 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + { cabal, aeson, digestiveFunctors, HUnit, lens, lensAeson, mtl , safe, scientific, tasty, tastyHunit, text, vector }: @@ -17,6 +19,6 @@ cabal.mkDerivation (self: { description = "Run digestive-functors forms against JSON"; license = self.stdenv.lib.licenses.gpl3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.ocharles ]; + maintainers = with self.stdenv.lib.maintainers; [ ocharles ]; }; }) diff --git a/pkgs/development/libraries/haskell/force-layout/default.nix b/pkgs/development/libraries/haskell/force-layout/default.nix index f0f8ae1399d..09a22c0ac60 100644 --- a/pkgs/development/libraries/haskell/force-layout/default.nix +++ b/pkgs/development/libraries/haskell/force-layout/default.nix @@ -13,6 +13,6 @@ cabal.mkDerivation (self: { description = "Simple force-directed layout"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.bergey ]; + maintainers = with self.stdenv.lib.maintainers; [ bergey ]; }; }) diff --git a/pkgs/development/libraries/haskell/hdaemonize/default.nix b/pkgs/development/libraries/haskell/hdaemonize/default.nix index f5a67b49626..1fdca2c4f9a 100644 --- a/pkgs/development/libraries/haskell/hdaemonize/default.nix +++ b/pkgs/development/libraries/haskell/hdaemonize/default.nix @@ -12,6 +12,6 @@ cabal.mkDerivation (self: { description = "Library to handle the details of writing daemons for UNIX"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.aycanirican ]; + maintainers = with self.stdenv.lib.maintainers; [ aycanirican ]; }; }) diff --git a/pkgs/development/libraries/haskell/hweblib/default.nix b/pkgs/development/libraries/haskell/hweblib/default.nix index 93e0bd62274..1d7d17085dc 100644 --- a/pkgs/development/libraries/haskell/hweblib/default.nix +++ b/pkgs/development/libraries/haskell/hweblib/default.nix @@ -13,6 +13,6 @@ cabal.mkDerivation (self: { description = "Haskell Web Library"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.aycanirican ]; + maintainers = with self.stdenv.lib.maintainers; [ aycanirican ]; }; }) -- GitLab From 25e0377e5146e138f4ebf7fa5bffabdfcbd2e6c6 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 24 Aug 2014 11:49:20 +0200 Subject: [PATCH 137/843] haddock-2.14.3: enable test suite https://github.com/NixOS/cabal2nix/pull/86 --- pkgs/development/tools/documentation/haddock/2.14.3.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/documentation/haddock/2.14.3.nix b/pkgs/development/tools/documentation/haddock/2.14.3.nix index a16994b1f2e..7ce4782bb60 100644 --- a/pkgs/development/tools/documentation/haddock/2.14.3.nix +++ b/pkgs/development/tools/documentation/haddock/2.14.3.nix @@ -12,7 +12,7 @@ cabal.mkDerivation (self: { isExecutable = true; buildDepends = [ Cabal deepseq filepath ghcPaths xhtml ]; testDepends = [ Cabal deepseq filepath hspec QuickCheck ]; - doCheck = false; + preCheck = "unset GHC_PACKAGE_PATH"; meta = { homepage = "http://www.haskell.org/haddock/"; description = "A documentation-generation tool for Haskell libraries"; -- GitLab From 4da69cb7da731b2728edfa11ee758dff8f459b3e Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Sun, 24 Aug 2014 02:51:04 -0700 Subject: [PATCH 138/843] radvd: Upsate 1.8.1 -> 2.5 --- pkgs/tools/networking/radvd/default.nix | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/pkgs/tools/networking/radvd/default.nix b/pkgs/tools/networking/radvd/default.nix index 14d0d99119d..e74106ec67f 100644 --- a/pkgs/tools/networking/radvd/default.nix +++ b/pkgs/tools/networking/radvd/default.nix @@ -1,16 +1,20 @@ -{ stdenv, fetchurl, bison, flex }: +{ stdenv, fetchurl, pkgconfig, libdaemon, bison, flex, check }: stdenv.mkDerivation rec { - name = "radvd-1.8.1"; + name = "radvd-2.5"; src = fetchurl { - url = "http://www.litech.org/radvd/dist/${name}.tar.gz"; - sha256 = "1sg3halppbz3vwr88lbcdv7mndzwl4nkqnrafkyf2a248wwz2cbc"; + url = "http://www.litech.org/radvd/dist/${name}.tar.xz"; + sha256 = "0hsa647l236q9rhrwjb44xqmjfz4fxzcixlbf2chk4lzh8lzwjp0"; }; - buildInputs = [ bison flex ]; + buildInputs = [ pkgconfig libdaemon bison flex check ]; - meta.homepage = http://www.litech.org/radvd/; - meta.description = "IPv6 Router Advertisement Daemon"; - meta.platforms = stdenv.lib.platforms.linux; + meta = with stdenv.lib; { + homepage = http://www.litech.org/radvd/; + description = "IPv6 Router Advertisement Daemon"; + platforms = platforms.linux; + license = licenses.bsdOriginal; + maintainers = with maintainers; [ wkennington ]; + }; } -- GitLab From aa77fe0fb0f2b6636a57fd2ced4afd6636b4c1e1 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Fri, 27 Jun 2014 01:45:04 -0500 Subject: [PATCH 139/843] nixos/radvd: Convert to a systemd unit Additionally, remove the automatic initialization of the ipv6 forwarding sysctl as this should be handled by the end user. This really should not be an issue as most people running radvd are likely forwarding ipv6 packets. --- nixos/modules/misc/ids.nix | 1 + nixos/modules/services/networking/radvd.nix | 32 +++++++++++++-------- 2 files changed, 21 insertions(+), 12 deletions(-) diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix index 98f1b52aba4..99a33f68735 100644 --- a/nixos/modules/misc/ids.nix +++ b/nixos/modules/misc/ids.nix @@ -146,6 +146,7 @@ neo4j = 136; riemann = 137; riemanndash = 138; + radvd = 139; # When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399! diff --git a/nixos/modules/services/networking/radvd.nix b/nixos/modules/services/networking/radvd.nix index 08762c9c837..0199502163a 100644 --- a/nixos/modules/services/networking/radvd.nix +++ b/nixos/modules/services/networking/radvd.nix @@ -52,24 +52,32 @@ in config = mkIf cfg.enable { - environment.systemPackages = [ pkgs.radvd ]; + users.extraUsers.radvd = + { uid = config.ids.uids.radvd; + description = "Router Advertisement Daemon User"; + }; - jobs.radvd = + systemd.services.radvd = { description = "IPv6 Router Advertisement Daemon"; - startOn = "started network-interfaces"; + wantedBy = [ "multi-user.target" ]; + + after = [ "network.target" ]; - preStart = - '' - # !!! Radvd only works if IPv6 forwarding is enabled. But - # this should probably be done somewhere else (and not - # necessarily for all interfaces). - echo 1 > /proc/sys/net/ipv6/conf/all/forwarding - ''; + path = [ pkgs.radvd ]; - exec = "${pkgs.radvd}/sbin/radvd -m syslog -s -C ${confFile}"; + preStart = '' + mkdir -m 755 -p /run/radvd + chown radvd /run/radvd + ''; - daemonType = "fork"; + serviceConfig = + { ExecStart = "@${pkgs.radvd}/sbin/radvd radvd" + + " -p /run/radvd/radvd.pid -m syslog -u radvd -C ${confFile}"; + Restart = "always"; + Type = "forking"; + PIDFile = "/run/radvd/radvd.pid"; + }; }; }; -- GitLab From 0f2d1019759b73a01bf6450f8f33c86d958f638a Mon Sep 17 00:00:00 2001 From: Mateusz Kowalczyk Date: Sun, 24 Aug 2014 02:55:45 +0100 Subject: [PATCH 140/843] cantata: update to 1.4.0 --- pkgs/applications/audio/cantata/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/audio/cantata/default.nix b/pkgs/applications/audio/cantata/default.nix index 31d5240529f..015d887a584 100644 --- a/pkgs/applications/audio/cantata/default.nix +++ b/pkgs/applications/audio/cantata/default.nix @@ -39,7 +39,7 @@ assert withOnlineServices -> withTaglib; assert withReplaygain -> withTaglib; let - version = "1.3.4"; + version = "1.4.0"; 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=0Bzghs6gQWi60WTYtaXk3c1IzNVU"; - sha256 = "0ris41v44nwd68f3zis9n9lyyc089dyhlxp37rrzflanrc6glpwq"; + url = "https://drive.google.com/uc?export=download&id=0Bzghs6gQWi60WDI1WjRtUDJ4QlU"; + sha256 = "63a03872ec9a2b212c497d4b10e255d5654f96370734e86420bf711354048e01"; }; buildInputs = @@ -69,7 +69,7 @@ stdenv.mkDerivation rec { ++ stdenv.lib.optional (withTaglib && !withKDE4 && withDevices) udisks2; unpackPhase = "tar -xvf $src"; - sourceRoot = "cantata-1.3.4"; + sourceRoot = "cantata-1.4.0"; # Qt4 is implicit when KDE is switched off. cmakeFlags = stdenv.lib.flatten [ -- GitLab From 61a5054953297ef12fd2a1cd843e32016d1ca249 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?James=20=E2=80=98Twey=E2=80=99=20Kay?= Date: Sun, 24 Aug 2014 11:33:19 +0100 Subject: [PATCH 141/843] New Haskell package: network-fancy --- .../libraries/haskell/network-fancy/default.nix | 14 ++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 16 insertions(+) create mode 100644 pkgs/development/libraries/haskell/network-fancy/default.nix diff --git a/pkgs/development/libraries/haskell/network-fancy/default.nix b/pkgs/development/libraries/haskell/network-fancy/default.nix new file mode 100644 index 00000000000..8e0cf757834 --- /dev/null +++ b/pkgs/development/libraries/haskell/network-fancy/default.nix @@ -0,0 +1,14 @@ +{ cabal }: + +cabal.mkDerivation (self: { + pname = "network-fancy"; + version = "0.1.5.2"; + sha256 = "039yrrir17sphkzarwl7hncj7fb4x471mh2lvpqixl3a6nij141c"; + 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/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 7f0946e8c27..4c4de916512 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1714,6 +1714,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in networkConduit = callPackage ../development/libraries/haskell/network-conduit {}; networkConduitTls = callPackage ../development/libraries/haskell/network-conduit-tls {}; + networkFancy = callPackage ../development/libraries/haskell/network-fancy {}; + networkInfo = callPackage ../development/libraries/haskell/network-info {}; networkMetrics = callPackage ../development/libraries/haskell/network-metrics {}; -- GitLab From 6949e24366586289f5b611da3f660b408776a865 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Tue, 12 Aug 2014 21:27:00 +0200 Subject: [PATCH 142/843] nixos: add fail2ban to module-list.nix Now that the fail2ban service has the ".enable" option, I think it's time to add it to the module list, so that we can enable it in configuration.nix like this: services.fail2ban.enable = true; --- nixos/modules/module-list.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index c45fa3e3f05..59c69f060b9 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -257,6 +257,7 @@ ./services/search/elasticsearch.nix ./services/search/solr.nix ./services/security/clamav.nix + ./services/security/fail2ban.nix ./services/security/fprot.nix ./services/security/frandom.nix ./services/security/haveged.nix -- GitLab From 93106b319ba1081410e1e148bd702b61a17badce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= Date: Sun, 24 Aug 2014 15:11:22 +0200 Subject: [PATCH 143/843] ffado: update from 2.1.0 to 2.2.1 --- pkgs/os-specific/linux/ffado/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/ffado/default.nix b/pkgs/os-specific/linux/ffado/default.nix index e024a608a0b..dc8d7b3d793 100644 --- a/pkgs/os-specific/linux/ffado/default.nix +++ b/pkgs/os-specific/linux/ffado/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "libffado-${version}"; - version = "2.1.0"; + version = "2.2.1"; src = fetchurl { url = "http://www.ffado.org/files/${name}.tgz"; - sha256 = "11cxmy31c19720j2171l735rpg7l8i41icsgqscfd2vkbscfmh6y"; + sha256 = "1ximic90l0av91njb123ra2zp6mg23yg5iz8xa5371cqrn79nacz"; }; buildInputs = -- GitLab From b743dd393aa141435feeaf262316306680086ed6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= Date: Sun, 24 Aug 2014 15:18:08 +0200 Subject: [PATCH 144/843] keymon: update from 1.16 to 1.17 --- pkgs/applications/video/key-mon/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/key-mon/default.nix b/pkgs/applications/video/key-mon/default.nix index cb00ac81384..57c8ca574b4 100644 --- a/pkgs/applications/video/key-mon/default.nix +++ b/pkgs/applications/video/key-mon/default.nix @@ -3,12 +3,12 @@ buildPythonPackage rec { name = "key-mon-${version}"; - version = "1.16"; + version = "1.17"; namePrefix = ""; src = fetchurl { url = "http://key-mon.googlecode.com/files/${name}.tar.gz"; - sha256 = "1pfki1fyh3q29sj6kq1chhi1h2v9ki6sp09qyww59rjraypvzsis"; + sha256 = "1liz0dxcqmchbnl1xhlxkqm3gh76wz9jxdxn9pa7dy77fnrjkl5q"; }; propagatedBuildInputs = -- GitLab From 4203cdec22f527acddcf1930b7da7a37cbcce95d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= Date: Sun, 24 Aug 2014 15:19:08 +0200 Subject: [PATCH 145/843] xf86_input_wacom: update from 0.25.0 to 0.25.99.1 --- pkgs/os-specific/linux/xf86-input-wacom/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/xf86-input-wacom/default.nix b/pkgs/os-specific/linux/xf86-input-wacom/default.nix index d4786037b5a..962aca77753 100644 --- a/pkgs/os-specific/linux/xf86-input-wacom/default.nix +++ b/pkgs/os-specific/linux/xf86-input-wacom/default.nix @@ -3,11 +3,11 @@ , ncurses, pkgconfig, randrproto, xorgserver, xproto, udev, libXinerama, pixman }: stdenv.mkDerivation rec { - name = "xf86-input-wacom-0.25.0"; + name = "xf86-input-wacom-0.25.99.1"; src = fetchurl { url = "mirror://sourceforge/linuxwacom/${name}.tar.bz2"; - sha256 = "06kwcxmgja0xwc5glzwmxm237bsv9fk52k2d6ffq4naqfzn2k31k"; + sha256 = "0vjl4m1w6j5j9yr2kw6f66n723ghq5jwxivbdjmacjw6r3ml4l9r"; }; buildInputs = [ inputproto libX11 libXext libXi libXrandr libXrender -- GitLab From 3529af087ae4d36185845f415479e69c22fd2657 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= Date: Sun, 24 Aug 2014 15:21:09 +0200 Subject: [PATCH 146/843] movit: update from 1.1.1 to 1.1.2 --- pkgs/development/libraries/movit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/movit/default.nix b/pkgs/development/libraries/movit/default.nix index bfd474c88e7..88f18003977 100644 --- a/pkgs/development/libraries/movit/default.nix +++ b/pkgs/development/libraries/movit/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "movit-${version}"; - version = "1.1.1"; + version = "1.1.2"; src = fetchurl { url = "http://movit.sesse.net/${name}.tar.gz"; - sha256 = "1k3qbkxapcplpsx22xh4m4ccp9fhsjfcj3pjzbcnrc51103aklag"; + sha256 = "0jka9l3cx7q09rpz5x6rv6ii8kbgm2vc419gx2rb9rc8sl81hzj1"; }; GTEST_DIR = "${gtest}"; -- GitLab From c77fde78100b9a92c173a5744467edd24a872e2e Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Sun, 24 Aug 2014 15:25:19 +0200 Subject: [PATCH 147/843] yelp: Fix description --- pkgs/desktops/gnome-3/3.10/core/yelp/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/desktops/gnome-3/3.10/core/yelp/default.nix b/pkgs/desktops/gnome-3/3.10/core/yelp/default.nix index b58aa99721e..983e7f416a6 100644 --- a/pkgs/desktops/gnome-3/3.10/core/yelp/default.nix +++ b/pkgs/desktops/gnome-3/3.10/core/yelp/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = https://wiki.gnome.org/Apps/Yelp; - description = "Yelp is the help viewer in Gnome."; + description = "The Gnome help viewer"; maintainers = with maintainers; [ lethalman ]; license = licenses.gpl2; platforms = platforms.linux; -- GitLab From fc5f6e4e79b42922cb6cd06986dd30b14edca156 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Sun, 24 Aug 2014 12:52:07 +0200 Subject: [PATCH 148/843] tarball fixes --- pkgs/development/compilers/julia/0.3.0.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/compilers/julia/0.3.0.nix b/pkgs/development/compilers/julia/0.3.0.nix index 82d7eda1d26..3259fee55bf 100644 --- a/pkgs/development/compilers/julia/0.3.0.nix +++ b/pkgs/development/compilers/julia/0.3.0.nix @@ -3,6 +3,9 @@ , ncurses, libunistring, lighttpd, patchelf, openblas, liblapack , tcl, tk, xproto, libX11, git, mpfr, which } : + +assert stdenv.isLinux; + let realGcc = stdenv.gcc.gcc; in -- GitLab From 47673e43c9d6d1141380c1be7974c064282a4e87 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Sun, 24 Aug 2014 16:01:21 +0200 Subject: [PATCH 149/843] buildPythonPackage: introduce "disabled" argument Useful to disable the package for specific python versions. Typically usage: disable = isPy3k; --- pkgs/development/python-modules/generic/default.nix | 7 ++++++- pkgs/top-level/python-packages.nix | 7 ++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/generic/default.nix b/pkgs/development/python-modules/generic/default.nix index 75fb974e735..0f5d8499454 100644 --- a/pkgs/development/python-modules/generic/default.nix +++ b/pkgs/development/python-modules/generic/default.nix @@ -34,7 +34,10 @@ # The difference is that `pythonPath' is not propagated to the user # environment. This is preferrable for programs because it doesn't # pollute the user environment. -, pythonPath ? [] +, pythonPath ? [] + +# used to disable derivation, useful for specific python versions +, disabled ? false , meta ? {} @@ -46,6 +49,8 @@ , ... } @ attrs: +assert (!disabled); + # Keep extra attributes from `attrs`, e.g., `patchPhase', etc. python.stdenv.mkDerivation (attrs // { inherit doCheck; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 9d3ef800f55..61aa8162f93 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7,6 +7,7 @@ let isPy33 = python.majorVersion == "3.3"; isPy34 = python.majorVersion == "3.4"; isPyPy = python.executable == "pypy"; + isPy3k = strings.substring 0 1 python.majorVersion == "3"; # Unique python version identifier pythonName = @@ -537,6 +538,8 @@ rec { avro = buildPythonPackage (rec { name = "avro-1.7.6"; + disabled = isPy3k; + src = fetchurl { url = "https://pypi.python.org/packages/source/a/avro/${name}.tar.gz"; md5 = "7f4893205e5ad69ac86f6b44efb7df72"; @@ -550,7 +553,9 @@ rec { avro3k = pkgs.lowPrio (buildPythonPackage (rec { name = "avro3k-1.7.7-SNAPSHOT"; - + + disabled = (!isPy3k); + src = fetchurl { url = "https://pypi.python.org/packages/source/a/avro3k/${name}.tar.gz"; sha256 = "15ahl0irwwj558s964abdxg4vp6iwlabri7klsm2am6q5r0ngsky"; -- GitLab From a272e855a339361ae88c9f43a2f4019acf6b42f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Sun, 24 Aug 2014 16:07:14 +0200 Subject: [PATCH 150/843] pythonPackages.pg8000: 1.09 -> 1.9.14 --- pkgs/top-level/python-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 61aa8162f93..3c6a7388e00 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5406,11 +5406,11 @@ rec { pg8000 = buildPythonPackage rec { - name = "pg8000-1.09"; + name = "pg8000-1.9.14"; src = fetchurl { - url = "http://pg8000.googlecode.com/files/${name}.zip"; - sha256 = "0kdc4rg47k1qkq22inghd50xlxjdkfcilym8mxff8wy4h091xykw"; + url = "http://pypi.python.org/packages/source/p/pg8000/${name}.tar.gz"; + sha256 = "1vandvfaf1m3a1fbc7nbm6syfqr9bazhzsnmai0jpjkbmb349izs"; }; propagatedBuildInputs = [ pytz ]; -- GitLab From 6418007dabe7d3d2e5775d68b46956b1c3f20e27 Mon Sep 17 00:00:00 2001 From: Georges Dubus Date: Sun, 24 Aug 2014 14:17:17 +0200 Subject: [PATCH 151/843] nixbang: add expession --- .../tools/misc/nixbang/default.nix | 20 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 ++++ 2 files changed, 24 insertions(+) create mode 100644 pkgs/development/tools/misc/nixbang/default.nix diff --git a/pkgs/development/tools/misc/nixbang/default.nix b/pkgs/development/tools/misc/nixbang/default.nix new file mode 100644 index 00000000000..762e6f2c4db --- /dev/null +++ b/pkgs/development/tools/misc/nixbang/default.nix @@ -0,0 +1,20 @@ +{ lib, pythonPackages, fetchgit }: + +let version = "0.1.1"; in +pythonPackages.buildPythonPackage { + name = "nixbang-${version}"; + namePrefix = ""; + + src = fetchgit { + url = "git://github.com/madjar/nixbang.git"; + rev = "refs/tags/${version}"; + sha256 = "1n8jq32r2lzk3g0d95ksfq7vdqciz34jabribrr4hcnz4nlijshf"; + }; + + meta = { + homepage = https://github.com/madjar/nixbang; + description = "A special shebang to run scripts in a nix-shell"; + 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 4f05d524074..ebfd4715d4b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4088,6 +4088,10 @@ let ninja = callPackage ../development/tools/build-managers/ninja { }; + nixbang = callPackage ../development/tools/misc/nixbang { + pythonPackages = python3Packages; + }; + node_webkit = callPackage ../development/tools/node-webkit { gconf = pkgs.gnome.GConf; }; -- GitLab From 46afdaf78384ef44107dfc67ad761796bef47f2c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Sun, 24 Aug 2014 16:19:53 +0200 Subject: [PATCH 152/843] pythonPackages.iptools: 0.4.0 -> 0.6.1 --- pkgs/top-level/python-packages.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 3c6a7388e00..43a5017bf9c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3857,13 +3857,15 @@ rec { }) else null; iptools = buildPythonPackage rec { - version = "0.4.0"; + version = "0.6.1"; name = "iptools-${version}"; src = fetchurl { url = "http://pypi.python.org/packages/source/i/iptools/iptools-${version}.tar.gz"; - md5 = "de60e5fab861f29dbf5f4446f8576532"; + md5 = "aed4045638fd40c16f8d9bb04606f700"; }; + + buildInputs = [ nose ]; meta = { description = "Utilities for manipulating IP addresses including a class that can be used to include CIDR network blocks in Django's INTERNAL_IPS setting."; -- GitLab From f002a27a8057c9b17ba67d1218ef25cff37c1147 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Sun, 24 Aug 2014 16:34:53 +0200 Subject: [PATCH 153/843] Remove obsolete directory --- nixos/doc/config-examples/basic.nix | 21 ----------- .../closed-install-configuration.nix | 32 ----------------- nixos/doc/config-examples/root-on-lvm.nix | 27 -------------- nixos/doc/config-examples/svn-server.nix | 36 ------------------- nixos/doc/config-examples/x86_64-usbstick.nix | 20 ----------- 5 files changed, 136 deletions(-) delete mode 100644 nixos/doc/config-examples/basic.nix delete mode 100644 nixos/doc/config-examples/closed-install-configuration.nix delete mode 100644 nixos/doc/config-examples/root-on-lvm.nix delete mode 100644 nixos/doc/config-examples/svn-server.nix delete mode 100644 nixos/doc/config-examples/x86_64-usbstick.nix diff --git a/nixos/doc/config-examples/basic.nix b/nixos/doc/config-examples/basic.nix deleted file mode 100644 index da37cfb8c28..00000000000 --- a/nixos/doc/config-examples/basic.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ - boot = { - loader.grub.device = "/dev/sda"; - }; - - fileSystems = [ - { mountPoint = "/"; - device = "/dev/sda1"; - } - ]; - - swapDevices = [ - { device = "/dev/sdb1"; } - ]; - - services = { - openssh = { - enable = true; - }; - }; -} diff --git a/nixos/doc/config-examples/closed-install-configuration.nix b/nixos/doc/config-examples/closed-install-configuration.nix deleted file mode 100644 index 0cebacdb0cc..00000000000 --- a/nixos/doc/config-examples/closed-install-configuration.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ - boot = { - loader.grub.device = "/dev/sda"; - copyKernels = true; - bootMount = "(hd0,0)"; - }; - - fileSystems = [ - { mountPoint = "/"; - device = "/dev/sda3"; - } - { mountPoint = "/boot"; - device = "/dev/sda1"; - neededForBoot = true; - } - ]; - - swapDevices = [ - { device = "/dev/sda2"; } - ]; - - services = { - sshd = { - enable = true; - }; - }; - - fonts = { - enableFontConfig = false; - }; - -} diff --git a/nixos/doc/config-examples/root-on-lvm.nix b/nixos/doc/config-examples/root-on-lvm.nix deleted file mode 100644 index 2ea1e547921..00000000000 --- a/nixos/doc/config-examples/root-on-lvm.nix +++ /dev/null @@ -1,27 +0,0 @@ -# This configuration has / on a LVM volume. Since Grub -# doesn't know about LVM, a separate /boot is therefore -# needed. -# -# In this example, labels are used for file systems and -# swap devices: "boot" might be /dev/sda1, "root" might be -# /dev/my-volume-group/root, and "swap" might be /dev/sda2. -# In particular there is no specific reference to the fact -# that / is on LVM; that's figured out automatically. - -{ - boot.loader.grub.device = "/dev/sda"; - boot.initrd.kernelModules = ["ata_piix"]; - - fileSystems = [ - { mountPoint = "/"; - label = "root"; - } - { mountPoint = "/boot"; - label = "boot"; - } - ]; - - swapDevices = [ - { label = "swap"; } - ]; -} diff --git a/nixos/doc/config-examples/svn-server.nix b/nixos/doc/config-examples/svn-server.nix deleted file mode 100644 index e727007117b..00000000000 --- a/nixos/doc/config-examples/svn-server.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ - boot = { - loader.grub.device = "/dev/sda"; - }; - - fileSystems = [ - { mountPoint = "/"; - device = "/dev/sda1"; - } - ]; - - services = { - - sshd = { - enable = true; - }; - - httpd = { - enable = true; - adminAddr = "admin@example.org"; - - subservices = { - - subversion = { - enable = true; - dataDir = "/data/subversion"; - notificationSender = "svn@example.org"; - }; - - }; - - }; - - }; - -} diff --git a/nixos/doc/config-examples/x86_64-usbstick.nix b/nixos/doc/config-examples/x86_64-usbstick.nix deleted file mode 100644 index 374d3ba3bc7..00000000000 --- a/nixos/doc/config-examples/x86_64-usbstick.nix +++ /dev/null @@ -1,20 +0,0 @@ -# Configuration file used to install NixOS-x86_64 on a USB stick. - -{ - boot = { - loader.grub.device = "/dev/sda"; - initrd = { - kernelModules = ["usb_storage" "ehci_hcd" "ohci_hcd"]; - }; - }; - - fileSystems = [ - { mountPoint = "/"; - label = "nixos-usb"; - } - ]; - - fonts = { - enableFontConfig = false; - }; -} -- GitLab From de258456d8ad6a157c4924f4dd14a97886f9837a Mon Sep 17 00:00:00 2001 From: Jaka Kranjc Date: Sun, 24 Aug 2014 16:36:46 +0200 Subject: [PATCH 154/843] meta.xml: fixed small omission --- doc/meta.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/meta.xml b/doc/meta.xml index 3a6b0b105d2..e91f94d15c2 100644 --- a/doc/meta.xml +++ b/doc/meta.xml @@ -27,7 +27,7 @@ meta = { Meta-attributes are not passed to the builder of the package. Thus, a change to a meta-attribute doesn’t trigger a recompilation of -the package. The value of a meta-attribute must a string. +the package. The value of a meta-attribute must be a string. The meta-attributes of a package can be queried from the command-line using nix-env: -- GitLab From ecb77869d2ac2f40252cd6d8839a8bfbf32eb2d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Sun, 24 Aug 2014 16:53:52 +0200 Subject: [PATCH 155/843] pythonPackages.pil: put it inside python-packages.nix and disable on py3k --- .../python-modules/pil/default.nix | 45 ----------------- pkgs/top-level/python-packages.nix | 50 ++++++++++++++++--- 2 files changed, 44 insertions(+), 51 deletions(-) delete mode 100644 pkgs/development/python-modules/pil/default.nix diff --git a/pkgs/development/python-modules/pil/default.nix b/pkgs/development/python-modules/pil/default.nix deleted file mode 100644 index e9375d1daad..00000000000 --- a/pkgs/development/python-modules/pil/default.nix +++ /dev/null @@ -1,45 +0,0 @@ -{ fetchurl, stdenv, python, buildPythonPackage, libjpeg, zlib, freetype }: - -let version = "1.1.7"; in - -buildPythonPackage { - name = "imaging-${version}"; - - src = fetchurl { - url = "http://effbot.org/downloads/Imaging-${version}.tar.gz"; - sha256 = "04aj80jhfbmxqzvmq40zfi4z3cw6vi01m3wkk6diz3lc971cfnw9"; - }; - - buildInputs = [ python libjpeg zlib freetype ]; - - doCheck = true; - - preConfigure = '' - sed -i "setup.py" \ - -e 's|^FREETYPE_ROOT =.*$|FREETYPE_ROOT = libinclude("${freetype}")|g ; - s|^JPEG_ROOT =.*$|JPEG_ROOT = libinclude("${libjpeg}")|g ; - s|^ZLIB_ROOT =.*$|ZLIB_ROOT = libinclude("${zlib}")|g ;' - ''; - - checkPhase = "${python}/bin/${python.executable} selftest.py"; - buildPhase = "${python}/bin/${python.executable} setup.py build_ext -i"; - - postInstall = '' - cd "$out"/lib/python*/site-packages - ln -s $PWD PIL - ''; - - meta = { - homepage = http://www.pythonware.com/products/pil/; - description = "The Python Imaging Library (PIL)"; - - longDescription = '' - The Python Imaging Library (PIL) adds image processing - capabilities to your Python interpreter. This library - supports many file formats, and provides powerful image - processing and graphics capabilities. - ''; - - license = "http://www.pythonware.com/products/pil/license.htm"; - }; -} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 43a5017bf9c..25810d0358a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -28,7 +28,7 @@ pythonPackages = modules // import ./python-packages-generated.nix { # Python packages for all python versions rec { - inherit python isPy26 isPy27 isPy33 isPy34 isPyPy pythonName; + inherit python isPy26 isPy27 isPy33 isPy34 isPyPy isPy3k pythonName; inherit (pkgs) fetchurl fetchsvn fetchgit stdenv unzip; # helpers @@ -112,11 +112,6 @@ rec { # version of nixpart. nixpart0 = nixpart; - pil = import ../development/python-modules/pil { - inherit (pkgs) fetchurl stdenv libjpeg zlib freetype; - inherit python buildPythonPackage; - }; - pitz = import ../applications/misc/pitz { inherit (pkgs) stdenv fetchurl; inherit buildPythonPackage tempita jinja2 pyyaml clepy mock nose decorator docutils; @@ -5447,6 +5442,49 @@ rec { propagatedBuildInputs = [ unittest2 ]; }; + + pil = buildPythonPackage rec { + name = "PIL-${version}"; + version = "1.1.7"; + + src = fetchurl { + url = "http://effbot.org/downloads/Imaging-${version}.tar.gz"; + sha256 = "04aj80jhfbmxqzvmq40zfi4z3cw6vi01m3wkk6diz3lc971cfnw9"; + }; + + buildInputs = [ python pkgs.libjpeg pkgs.zlib pkgs.freetype ]; + + disabled = isPy3k; + + doCheck = true; + + preConfigure = '' + sed -i "setup.py" \ + -e 's|^FREETYPE_ROOT =.*$|FREETYPE_ROOT = libinclude("${pkgs.freetype}")|g ; + s|^JPEG_ROOT =.*$|JPEG_ROOT = libinclude("${pkgs.libjpeg}")|g ; + s|^ZLIB_ROOT =.*$|ZLIB_ROOT = libinclude("${pkgs.zlib}")|g ;' + ''; + + checkPhase = "${python}/bin/${python.executable} selftest.py"; + buildPhase = "${python}/bin/${python.executable} setup.py build_ext -i"; + + postInstall = '' + cd "$out"/lib/python*/site-packages + ln -s $PWD PIL + ''; + + meta = { + homepage = http://www.pythonware.com/products/pil/; + description = "The Python Imaging Library (PIL)"; + longDescription = '' + The Python Imaging Library (PIL) adds image processing + capabilities to your Python interpreter. This library + supports many file formats, and provides powerful image + processing and graphics capabilities. + ''; + license = "http://www.pythonware.com/products/pil/license.htm"; + }; + }; pillow = buildPythonPackage rec { -- GitLab From 3eedd29fb89169aa946a57251444eb0d45f05bf4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Sun, 24 Aug 2014 16:55:08 +0200 Subject: [PATCH 156/843] pythonPackages.manuel: 1.6.1 -> 1.8.0 --- pkgs/top-level/python-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 25810d0358a..1aa990bf151 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4251,11 +4251,11 @@ rec { manuel = buildPythonPackage rec { name = "manuel-${version}"; - version = "1.6.1"; + version = "1.8.0"; src = fetchurl { url = "http://pypi.python.org/packages/source/m/manuel/${name}.tar.gz"; - sha256 = "1h35ys31zkjd9jssqn9lzwmw8s17ikr4jn2xp5zby1v771ibbbqr"; + sha256 = "1diyj6a8bvz2cdf9m0g2bbx9z2yjjnn3ylbg1zinpcjj6vldfx59"; }; propagatedBuildInputs = [ six zope_testing ]; -- GitLab From d3b9a14e884a80ee2c32fb63c3ac431a969faea6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Sun, 24 Aug 2014 16:57:50 +0200 Subject: [PATCH 157/843] python3Packages.afew: fix build --- pkgs/top-level/python-packages.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 1aa990bf151..80379325ebc 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -255,9 +255,8 @@ rec { propagatedBuildInputs = [ pythonPackages.notmuch - pythonPackages.subprocess32 pythonPackages.chardet - ]; + ] ++ optional (!isPy3k) pythonPackages.subprocess32; doCheck = false; -- GitLab From 8edee2cd477e77bbdd03eaac5005ef6b742b5236 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Sun, 24 Aug 2014 17:00:17 +0200 Subject: [PATCH 158/843] python3Packages.autopep8: fix build --- pkgs/top-level/python-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 80379325ebc..60593ca3784 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -507,11 +507,11 @@ rec { }); autopep8 = buildPythonPackage (rec { - name = "autopep8-1.0"; + name = "autopep8-1.0.3"; src = fetchurl { url = "https://pypi.python.org/packages/source/a/autopep8/${name}.tar.gz"; - md5 = "41782e66efcbaf9d761bb45a2d2929bb"; + md5 = "7c16d385cf9ad7c1d7fbcfcea2588a56"; }; propagatedBuildInputs = [ pep8 ]; -- GitLab From 8dc216a768029ace1a772765847835b209bd6eb8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Sun, 24 Aug 2014 17:04:31 +0200 Subject: [PATCH 159/843] pythonPackages.beaker: disable on py3k --- pkgs/top-level/python-packages.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 60593ca3784..ef38fe02cb6 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -634,6 +634,8 @@ rec { beaker = buildPythonPackage rec { name = "Beaker-1.6.4"; + + disabled = isPy3k; src = fetchurl { url = "http://pypi.python.org/packages/source/B/Beaker/${name}.tar.gz"; -- GitLab From 0a4b70e5b7cf86d837488e38399800f2cc411582 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Sun, 24 Aug 2014 17:07:10 +0200 Subject: [PATCH 160/843] pythonPackages.eventlet: 0.9.16 -> 0.15.1 --- pkgs/top-level/python-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ef38fe02cb6..b4974e00854 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3173,11 +3173,11 @@ rec { eventlet = buildPythonPackage rec { - name = "eventlet-0.9.16"; + name = "eventlet-0.15.1"; src = fetchurl { url = "http://pypi.python.org/packages/source/e/eventlet/${name}.tar.gz"; - md5 = "4728e3bd7f72763c1e5dccac0296f8ea"; + md5 = "7155780824bb6344651a573838416f21"; }; buildInputs = [ nose httplib2 ]; -- GitLab From 2bc609155d31d214b21a509956504a83d184502b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Sun, 24 Aug 2014 17:07:25 +0200 Subject: [PATCH 161/843] pythonPackages.greenlet: 0.3.1 -> 0.4.3 --- pkgs/top-level/python-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b4974e00854..95126fe40b9 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3631,11 +3631,11 @@ rec { }; greenlet = buildPythonPackage rec { - name = "greenlet-0.3.1"; + name = "greenlet-0.4.3"; src = fetchurl { - url = "http://pypi.python.org/packages/source/g/greenlet/${name}.tar.gz"; - md5 = "8d75d7f3f659e915e286e1b0fa0e1c4d"; + url = "http://pypi.python.org/packages/source/g/greenlet/${name}.zip"; + md5 = "a5e467a5876c415cd357c1ab9027e06c"; }; meta = { -- GitLab From 9c5236f7ca0a68902c1bbe54e6335bde70bddcd0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Sun, 24 Aug 2014 17:09:13 +0200 Subject: [PATCH 162/843] pythonPackages.tarman: disable for py3k --- pkgs/top-level/python-packages.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 95126fe40b9..b66bbbb235e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9286,6 +9286,8 @@ rec { tarman = buildPythonPackage rec { version = "0.1.3"; name = "tarman-${version}"; + + disabled = isPy3k; src = fetchurl { url = "https://pypi.python.org/packages/source/t/tarman/tarman-${version}.zip"; -- GitLab From 6fb942c030b7c9653a199cd7ea779813880a3121 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Sun, 24 Aug 2014 17:14:34 +0200 Subject: [PATCH 163/843] pythonPackages.zope_proxy: 4.1.1 -> 4.1.4 --- pkgs/top-level/python-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b66bbbb235e..ef0eff2658f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9026,11 +9026,11 @@ rec { zope_proxy = buildPythonPackage rec { - name = "zope.proxy-4.1.1"; + name = "zope.proxy-4.1.4"; src = fetchurl { - url = "http://pypi.python.org/packages/source/z/zope.proxy/zope.proxy-4.1.1.tar.gz"; - md5 = "c36691f0abee7573f4ddcc378603cefd"; + url = "http://pypi.python.org/packages/source/z/zope.proxy/${name}.tar.gz"; + md5 = "3bcaf8b8512a99649ecf2f158c11d05b"; }; propagatedBuildInputs = [ zope_interface ]; -- GitLab From 8d12a359ce4d4f700e2ec0eec0e2741001419340 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Sun, 24 Aug 2014 17:14:52 +0200 Subject: [PATCH 164/843] pythonPackages.zope_security: 3.7.4 -> 4.0.1 --- pkgs/top-level/python-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ef0eff2658f..2a86c177e5c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9076,7 +9076,7 @@ rec { zope_security = buildPythonPackage rec { - name = "zope.security-3.7.4"; + name = "zope.security-4.0.1"; src = fetchurl { url = "http://pypi.python.org/packages/source/z/zope.security/zope.security-3.7.4.tar.gz"; @@ -9089,7 +9089,7 @@ rec { ]; meta = { - maintainers = [ stdenv.lib.maintainers.goibhniu ]; + maintainers = [ stdenv.lib.maintainers.goibhniu ]; }; }; -- GitLab From dd0cdefe2eff85115450bdb210440c762203fb4b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Sun, 24 Aug 2014 17:17:48 +0200 Subject: [PATCH 165/843] pythonPackages.paramiko: 1.12.1 -> 1.14.0 --- pkgs/top-level/python-packages.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 2a86c177e5c..8eaec397d4d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5247,15 +5247,18 @@ rec { }; paramiko = buildPythonPackage rec { - name = "paramiko-1.12.1"; + name = "paramiko-1.14.0"; src = fetchurl { url = "http://pypi.python.org/packages/source/p/paramiko/${name}.tar.gz"; - md5 = "ae4544dc0a1419b141342af89fcf0dd9"; + md5 = "e26324fd398af68ad506fe98853835c3"; }; propagatedBuildInputs = [ pycrypto ecdsa ]; + # tests failures since 1.14.0 release.. + doCheck = false; + checkPhase = "${python}/bin/${python.executable} test.py"; meta = { -- GitLab From 169b901818ed5c969791096eced0078119fb7341 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Sun, 24 Aug 2014 17:19:59 +0200 Subject: [PATCH 166/843] pythonPackages.zc_buidout{152,171}: disable on py3k --- pkgs/top-level/python-packages.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 8eaec397d4d..10c12929f74 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1004,8 +1004,11 @@ rec { maintainers = [ stdenv.lib.maintainers.garbas ]; }; }; + zc_buildout171 = buildPythonPackage rec { name = "zc.buildout-1.7.1"; + + disabled = isPy3k; src = fetchurl { url = "http://pypi.python.org/packages/source/z/zc.buildout/${name}.tar.gz"; @@ -1019,8 +1022,11 @@ rec { maintainers = [ stdenv.lib.maintainers.garbas ]; }; }; + zc_buildout152 = buildPythonPackage rec { name = "zc.buildout-1.5.2"; + + disabled = isPy3k; src = fetchurl { url = "http://pypi.python.org/packages/source/z/zc.buildout/${name}.tar.gz"; -- GitLab From aee5d6ac3bdbc6b1c11b6726bbf11cad7214aabb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Sun, 24 Aug 2014 17:23:35 +0200 Subject: [PATCH 167/843] pythonPackages.tempita: 0.4 -> 0.5.2 --- pkgs/top-level/python-packages.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 10c12929f74..6295ae90ed2 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7961,14 +7961,16 @@ rec { }; tempita = buildPythonPackage rec { - version = "0.4"; + version = "0.5.2"; name = "tempita-${version}"; src = fetchurl { url = "http://pypi.python.org/packages/source/T/Tempita/Tempita-${version}.tar.gz"; - md5 = "0abe015a72e748d0c6284679a497426c"; + md5 = "4c2f17bb9d481821c41b6fbee904cea1"; }; - + + disabled = isPy3k; + buildInputs = [ nose ]; meta = { -- GitLab From 88391a5c65c15ecb83bf4a1bd5532cc956f96b5a Mon Sep 17 00:00:00 2001 From: Jaka Hudoklin Date: Sun, 24 Aug 2014 17:29:15 +0200 Subject: [PATCH 168/843] docker: update to 1.2.0 --- pkgs/applications/virtualization/docker/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index 4571e979c6c..f4d329221ff 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -3,11 +3,11 @@ btrfsProgs, iptables, bash, e2fsprogs}: stdenv.mkDerivation rec { name = "docker-${version}"; - version = "1.1.2"; + version = "1.2.0"; src = fetchurl { url = "https://github.com/dotcloud/docker/archive/v${version}.tar.gz"; - sha256 = "1pa6k3gx940ap3r96xdry6apzkm0ymqra92b2mrp25b25264cqcy"; + sha256 = "1nk74p9k17bllgw4992ixx7z3w87icp2wabbpbgfyi20k2q9mayp"; }; buildInputs = [ makeWrapper go sqlite lxc iproute bridge_utils devicemapper btrfsProgs iptables e2fsprogs]; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { buildPhase = '' patchShebangs ./hack export AUTO_GOPATH=1 - export DOCKER_GITCOMMIT="d84a070" + export DOCKER_GITCOMMIT="fa7b24f" ./hack/make.sh dynbinary ''; -- GitLab From 3df019067dc8c8ce16114a229031cb2c0c73edd6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Sun, 24 Aug 2014 17:33:27 +0200 Subject: [PATCH 169/843] pypy: add tcl support --- pkgs/development/interpreters/pypy/2.3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/pypy/2.3/default.nix b/pkgs/development/interpreters/pypy/2.3/default.nix index a364b24c04c..b45805ab241 100644 --- a/pkgs/development/interpreters/pypy/2.3/default.nix +++ b/pkgs/development/interpreters/pypy/2.3/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, zlib ? null, zlibSupport ? true, bzip2, pkgconfig, libffi -, sqlite, openssl, ncurses, pythonFull, expat }: +, sqlite, openssl, ncurses, pythonFull, expat, tcl, tk }: assert zlibSupport -> zlib != null; @@ -20,7 +20,7 @@ let sha256 = "0fg4l48c7n59n5j3b1dgcsr927xzylkfny4a6pnk6z0pq2bhvl9z"; }; - buildInputs = [ bzip2 openssl pkgconfig pythonFull libffi ncurses expat sqlite ] + buildInputs = [ bzip2 openssl pkgconfig pythonFull libffi ncurses expat sqlite tk tcl ] ++ stdenv.lib.optional (stdenv ? gcc && stdenv.gcc.libc != null) stdenv.gcc.libc ++ stdenv.lib.optional zlibSupport zlib; -- GitLab From 1d67ea1ce3c6ba27273445dca01418fba044e0bb Mon Sep 17 00:00:00 2001 From: Jaka Kranjc Date: Sun, 24 Aug 2014 15:57:00 +0200 Subject: [PATCH 170/843] nixos-install.sh: added --root parameter Previously: - setting the mountpoint was only possible through an environment variable - a discrepancy from nixos-generate-config, which has --root --- nixos/modules/installer/tools/nixos-install.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/nixos/modules/installer/tools/nixos-install.sh b/nixos/modules/installer/tools/nixos-install.sh index a55eda1cb8f..86952486ade 100644 --- a/nixos/modules/installer/tools/nixos-install.sh +++ b/nixos/modules/installer/tools/nixos-install.sh @@ -30,6 +30,9 @@ while [ "$#" -gt 0 ]; do absolute_path=$(readlink -m $given_path) extraBuildFlags+=("$i" "/mnt$absolute_path") ;; + --root) + mountPoint="$1"; shift 1 + ;; --show-trace) extraBuildFlags+=("$i") ;; -- GitLab From be6ae818dcabf16068ff13ad397056547dd74cc8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Sun, 24 Aug 2014 17:47:38 +0200 Subject: [PATCH 171/843] libtoxcore: upgrade for a few rev to get i686-linux build working --- pkgs/development/libraries/libtoxcore/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/libtoxcore/default.nix b/pkgs/development/libraries/libtoxcore/default.nix index 6741838d33b..b5665fe402e 100644 --- a/pkgs/development/libraries/libtoxcore/default.nix +++ b/pkgs/development/libraries/libtoxcore/default.nix @@ -2,8 +2,8 @@ , libvpx, check, libconfig, pkgconfig }: let - version = "e1158be5a6"; - date = "20140728"; + version = "f83fcbb13c0"; + date = "20140811"; in stdenv.mkDerivation rec { name = "tox-core-${date}-${version}"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://github.com/irungentoo/toxcore/tarball/${version}"; name = "${name}.tar.gz"; - sha256 = "1rsh1pbwvngsx5slmd6608b1zqs3jvq70bjr9zyziap9vxka3z1v"; + sha256 = "09g74h3qnx9adyxxvzay8m2idbgbln7m4kkm7sg9925mvi5abb1w"; }; NIX_LDFLAGS = "-lgcc_s"; -- GitLab From 041f6a181ba2a84e2455da105e4e907f51323cc7 Mon Sep 17 00:00:00 2001 From: Mateusz Kowalczyk Date: Sun, 24 Aug 2014 16:58:58 +0100 Subject: [PATCH 172/843] haskell-equational-reasoning: add version 0.2.0.4 --- .../haskell/equational-reasoning/default.nix | 16 ++++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 18 insertions(+) create mode 100644 pkgs/development/libraries/haskell/equational-reasoning/default.nix diff --git a/pkgs/development/libraries/haskell/equational-reasoning/default.nix b/pkgs/development/libraries/haskell/equational-reasoning/default.nix new file mode 100644 index 00000000000..fa88fbfe2e8 --- /dev/null +++ b/pkgs/development/libraries/haskell/equational-reasoning/default.nix @@ -0,0 +1,16 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, singletons, tagged, void }: + +cabal.mkDerivation (self: { + pname = "equational-reasoning"; + version = "0.2.0.4"; + sha256 = "1f94y6h7qg7rck7rxf6j8sygkh1xmfk0z1lr71inx6s74agjyc9j"; + buildDepends = [ singletons tagged void ]; + meta = { + description = "Proof assistant for Haskell using DataKinds & PolyKinds"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = with self.stdenv.lib.maintainers; [ fuuzetsu ]; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 4c4de916512..ed02d2beca1 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -751,6 +751,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in entropy = callPackage ../development/libraries/haskell/entropy {}; + equationalReasoning = callPackage ../development/libraries/haskell/equational-reasoning {}; + equivalence_0_2_3 = callPackage ../development/libraries/haskell/equivalence/0.2.3.nix {}; equivalence_0_2_5 = callPackage ../development/libraries/haskell/equivalence/0.2.5.nix {}; equivalence = self.equivalence_0_2_5; -- GitLab From a39488f4f1874147efc52179d1413594e9f2f580 Mon Sep 17 00:00:00 2001 From: Mateusz Kowalczyk Date: Sun, 24 Aug 2014 17:00:06 +0100 Subject: [PATCH 173/843] haskell-monomorphic: add 0.0.3.2 --- .../libraries/haskell/monomorphic/default.nix | 16 ++++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 18 insertions(+) create mode 100644 pkgs/development/libraries/haskell/monomorphic/default.nix diff --git a/pkgs/development/libraries/haskell/monomorphic/default.nix b/pkgs/development/libraries/haskell/monomorphic/default.nix new file mode 100644 index 00000000000..e160878b680 --- /dev/null +++ b/pkgs/development/libraries/haskell/monomorphic/default.nix @@ -0,0 +1,16 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal }: + +cabal.mkDerivation (self: { + pname = "monomorphic"; + version = "0.0.3.2"; + sha256 = "13zw506wifz2lf7n4a48rkn7ym44jpiqag21zc1py6xxdlkbrhh2"; + meta = { + homepage = "https://github.com/konn/monomorphic"; + description = "Library to convert polymorphic datatypes to/from its monomorphic represetation"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = with self.stdenv.lib.maintainers; [ fuuzetsu ]; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index ed02d2beca1..762dafa46cd 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1639,6 +1639,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in mongoDB = callPackage ../development/libraries/haskell/mongoDB {}; + monomorphic = callPackage ../development/libraries/haskell/monomorphic {}; + monoTraversable = callPackage ../development/libraries/haskell/mono-traversable {}; mmorph = callPackage ../development/libraries/haskell/mmorph {}; -- GitLab From 780070afa030851d3876d357bf31f6132e525421 Mon Sep 17 00:00:00 2001 From: Mateusz Kowalczyk Date: Sun, 24 Aug 2014 17:01:08 +0100 Subject: [PATCH 174/843] haskell-type-natural: add 0.2.3.1 --- .../haskell/type-natural/default.nix | 20 +++++++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 22 insertions(+) create mode 100644 pkgs/development/libraries/haskell/type-natural/default.nix diff --git a/pkgs/development/libraries/haskell/type-natural/default.nix b/pkgs/development/libraries/haskell/type-natural/default.nix new file mode 100644 index 00000000000..2e56f8c396b --- /dev/null +++ b/pkgs/development/libraries/haskell/type-natural/default.nix @@ -0,0 +1,20 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, constraints, equationalReasoning, monomorphic, singletons +}: + +cabal.mkDerivation (self: { + pname = "type-natural"; + version = "0.2.3.1"; + sha256 = "0qi5b3d0vkm1b2kda3ifw6g7djx91wj7q36la02yadlvmb4jcp1g"; + buildDepends = [ + constraints equationalReasoning monomorphic singletons + ]; + meta = { + homepage = "https://github.com/konn/type-natural"; + description = "Type-level natural and proofs of their properties"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = with self.stdenv.lib.maintainers; [ fuuzetsu ]; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 762dafa46cd..d8ae2e9d394 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -2554,6 +2554,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in typeEquality = callPackage ../development/libraries/haskell/type-equality {}; + typeNatural = callPackage ../development/libraries/haskell/type-natural {}; + typeLevelNaturalNumber = callPackage ../development/libraries/haskell/type-level-natural-number {}; tz = callPackage ../development/libraries/haskell/tz { -- GitLab From 2a94f8916a48bf353972598f9efe64ab6b8af600 Mon Sep 17 00:00:00 2001 From: Mateusz Kowalczyk Date: Sun, 24 Aug 2014 17:01:26 +0100 Subject: [PATCH 175/843] haskell-sized: add 0.1.0.0 --- .../libraries/haskell/sized/default.nix | 18 ++++++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 20 insertions(+) create mode 100644 pkgs/development/libraries/haskell/sized/default.nix diff --git a/pkgs/development/libraries/haskell/sized/default.nix b/pkgs/development/libraries/haskell/sized/default.nix new file mode 100644 index 00000000000..ae75ff26e4c --- /dev/null +++ b/pkgs/development/libraries/haskell/sized/default.nix @@ -0,0 +1,18 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, constraints, ListLike, monomorphic, typeNatural, vector }: + +cabal.mkDerivation (self: { + pname = "sized"; + version = "0.1.0.0"; + sha256 = "00n9fb7kk3c6dy4j19d9ikmynllpxc7yd51sign0rhvnasmyrghl"; + buildDepends = [ + constraints ListLike monomorphic typeNatural vector + ]; + meta = { + description = "Sized sequence data-types"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = with self.stdenv.lib.maintainers; [ fuuzetsu ]; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index d8ae2e9d394..fbff5087cc0 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -2175,6 +2175,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in silently = callPackage ../development/libraries/haskell/silently {}; + sized = callPackage ../development/libraries/haskell/sized {}; + sizedTypes = callPackage ../development/libraries/haskell/sized-types {}; skein = callPackage ../development/libraries/haskell/skein {}; -- GitLab From 669e1a56d6eddc7011a1a29709fbeef243584604 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=90=D0=BB=D0=B5=D0=BA=D1=81=D0=B0=D0=BD=D0=B4=D1=80=20?= =?UTF-8?q?=D0=A6=D0=B0=D0=BC=D1=83=D1=82=D0=B0=D0=BB=D0=B8?= Date: Sun, 24 Aug 2014 20:05:40 +0400 Subject: [PATCH 176/843] data/fonts/terminus-font: Update to 4.39. --- pkgs/data/fonts/terminus-font/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/fonts/terminus-font/default.nix b/pkgs/data/fonts/terminus-font/default.nix index 3487a8012dc..fa9eb0ac42d 100644 --- a/pkgs/data/fonts/terminus-font/default.nix +++ b/pkgs/data/fonts/terminus-font/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, perl, bdftopcf, mkfontdir, mkfontscale }: stdenv.mkDerivation rec { - name = "terminus-font-4.38"; + name = "terminus-font-4.39"; src = fetchurl { url = "mirror://sourceforge/project/terminus-font/${name}/${name}.tar.gz"; - sha256 = "1dwpxmg0wiyhp7hh18mvw18gnf0y2jgbn80c4xya7rmb9mm8gx7n"; + sha256 = "1gzmn7zakvy6yrvmswyjfklnsvqrjm0imhq8rjws8rdkhqwkh21i"; }; buildInputs = [ perl bdftopcf mkfontdir mkfontscale ]; -- GitLab From 626b1eca5c306fac0495f3adbce9c18a3a20a3ff Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Sun, 24 Aug 2014 18:07:27 +0200 Subject: [PATCH 177/843] icecat-3: mark as broken correctly --- pkgs/applications/networking/browsers/icecat-3/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/icecat-3/default.nix b/pkgs/applications/networking/browsers/icecat-3/default.nix index ef2c69422b6..91a71a4b4c4 100644 --- a/pkgs/applications/networking/browsers/icecat-3/default.nix +++ b/pkgs/applications/networking/browsers/icecat-3/default.nix @@ -106,7 +106,7 @@ stdenv.mkDerivation { homepage = http://www.gnu.org/software/gnuzilla/; license = [ "GPLv2+" "LGPLv2+" "MPLv1+" ]; - + broken = true; maintainers = [ ]; platforms = stdenv.lib.platforms.gnu; }; @@ -114,6 +114,5 @@ stdenv.mkDerivation { passthru = { inherit gtk version; isFirefox3Like = true; - broken = true; }; } -- GitLab From 4a4c051a95b6b8da3a13d7955087e915e6dd4bf7 Mon Sep 17 00:00:00 2001 From: aszlig Date: Sun, 24 Aug 2014 18:19:56 +0200 Subject: [PATCH 178/843] nixos: Remove modprobe.d/nixos.conf from initrd. For example in VM tests, this causes firmware to be included in the initrd. So until we have a better fix for adding early-stage module options, I'll remove this. Fixes a regression introduced by 0aa2c1d and closes #3764. Signed-off-by: aszlig --- nixos/modules/system/boot/stage-1.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/nixos/modules/system/boot/stage-1.nix b/nixos/modules/system/boot/stage-1.nix index 1d387805443..426da778f43 100644 --- a/nixos/modules/system/boot/stage-1.nix +++ b/nixos/modules/system/boot/stage-1.nix @@ -199,9 +199,6 @@ let { object = pkgs.writeText "mdadm.conf" config.boot.initrd.mdadmConf; symlink = "/etc/mdadm.conf"; } - { object = config.environment.etc."modprobe.d/nixos.conf".source; - symlink = "/etc/modprobe.d/nixos.conf"; - } { object = pkgs.stdenv.mkDerivation { name = "initrd-kmod-blacklist-ubuntu"; builder = pkgs.writeText "builder.sh" '' -- GitLab From c224b5e9497feebd365966a923469ea31af2660c Mon Sep 17 00:00:00 2001 From: Nixpkgs Monitor Date: Sun, 24 Aug 2014 18:19:58 +0200 Subject: [PATCH 179/843] xbmc: update from 13.1 to 13.2 --- pkgs/applications/video/xbmc/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/video/xbmc/default.nix b/pkgs/applications/video/xbmc/default.nix index 3232267fa94..26c54c537ae 100644 --- a/pkgs/applications/video/xbmc/default.nix +++ b/pkgs/applications/video/xbmc/default.nix @@ -34,11 +34,11 @@ assert vdpauSupport -> libvdpau != null && ffmpeg.vdpauSupport; assert pulseSupport -> pulseaudio != null; stdenv.mkDerivation rec { - name = "xbmc-13.1"; + name = "xbmc-13.2"; src = fetchurl { - url = "https://github.com/xbmc/xbmc/archive/13.1-Gotham.tar.gz"; - sha256 = "0y56c5csfp8xhk088g47m3bzrri73z868yfx6b04gnrdmr760jrl"; + url = "https://github.com/xbmc/xbmc/archive/13.2-Gotham.tar.gz"; + sha256 = "11g5a3h6kxz1vmnhagfjhg9nqf11wy0wzqqf4h338jh3lgzmvgxc"; }; buildInputs = [ -- GitLab From bce42c282a9f58191362e25a3fa91d261bd7e388 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Sun, 24 Aug 2014 18:33:33 +0200 Subject: [PATCH 180/843] rubyLibs.nokogiri: fix build --- pkgs/development/interpreters/ruby/patches.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/ruby/patches.nix b/pkgs/development/interpreters/ruby/patches.nix index 10cbf1ecfe5..9d694eac1e4 100644 --- a/pkgs/development/interpreters/ruby/patches.nix +++ b/pkgs/development/interpreters/ruby/patches.nix @@ -1,6 +1,6 @@ { fetchurl, writeScript, ruby, ncurses, sqlite, libxml2, libxslt, libffi , zlib, libuuid, gems, jdk, python, stdenv, libiconvOrEmpty, imagemagick -, pkgconfig }: +, pkgconfig, libiconv }: let @@ -80,9 +80,10 @@ in }; nokogiri = { + buildInputs = [ libxml2 ]; buildFlags = [ "--with-xml2-dir=${libxml2} --with-xml2-include=${libxml2}/include/libxml2" - "--with-xslt-dir=${libxslt}" + "--with-xslt-dir=${libxslt} --with-iconv-dir=${libiconv} --use-system-libraries" ]; }; -- GitLab From 2d6d43c02cd8f69668e961d7953b7bf1a9f63cf2 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Sun, 24 Aug 2014 18:52:34 +0200 Subject: [PATCH 181/843] Fix tarball build --- pkgs/applications/networking/browsers/firefox-bin/default.nix | 2 ++ .../networking/mailreaders/thunderbird-bin/default.nix | 2 ++ pkgs/development/compilers/go/1.3.nix | 2 ++ pkgs/development/compilers/rustc/0.11.nix | 2 ++ pkgs/development/compilers/rustc/head.nix | 2 ++ pkgs/development/libraries/glib/default.nix | 2 ++ pkgs/games/adom/default.nix | 2 ++ pkgs/servers/nosql/influxdb/default.nix | 2 ++ pkgs/tools/filesystems/yandex-disk/default.nix | 3 +++ 9 files changed, 19 insertions(+) diff --git a/pkgs/applications/networking/browsers/firefox-bin/default.nix b/pkgs/applications/networking/browsers/firefox-bin/default.nix index 969ced923b3..56ba95c661f 100644 --- a/pkgs/applications/networking/browsers/firefox-bin/default.nix +++ b/pkgs/applications/networking/browsers/firefox-bin/default.nix @@ -37,6 +37,8 @@ , systemd }: +assert stdenv.isLinux; + let version = "31.0"; sources = [ diff --git a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix index 15acd5af8df..6add41edf7c 100644 --- a/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix +++ b/pkgs/applications/networking/mailreaders/thunderbird-bin/default.nix @@ -37,6 +37,8 @@ , pango }: +assert stdenv.isLinux; + let version = "31.0"; sources = [ diff --git a/pkgs/development/compilers/go/1.3.nix b/pkgs/development/compilers/go/1.3.nix index 06decd16190..1dcdd89b5bf 100644 --- a/pkgs/development/compilers/go/1.3.nix +++ b/pkgs/development/compilers/go/1.3.nix @@ -1,5 +1,7 @@ { stdenv, lib, fetchurl, bison, glibc, bash, coreutils, makeWrapper, tzdata, iana_etc }: +assert stdenv.gcc.gcc != null; + let loader386 = "${glibc}/lib/ld-linux.so.2"; loaderAmd64 = "${glibc}/lib/ld-linux-x86-64.so.2"; diff --git a/pkgs/development/compilers/rustc/0.11.nix b/pkgs/development/compilers/rustc/0.11.nix index 1c3b09b0985..a7246e44a73 100644 --- a/pkgs/development/compilers/rustc/0.11.nix +++ b/pkgs/development/compilers/rustc/0.11.nix @@ -1,5 +1,7 @@ {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 diff --git a/pkgs/development/compilers/rustc/head.nix b/pkgs/development/compilers/rustc/head.nix index ad33906ae6e..4f512096a42 100644 --- a/pkgs/development/compilers/rustc/head.nix +++ b/pkgs/development/compilers/rustc/head.nix @@ -1,5 +1,7 @@ {stdenv, fetchurl, fetchgit, 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 diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix index f4157cdd8d0..4f7c6042f13 100644 --- a/pkgs/development/libraries/glib/default.nix +++ b/pkgs/development/libraries/glib/default.nix @@ -7,6 +7,8 @@ with stdenv.lib; +assert stdenv.gcc.gcc != null; + # TODO: # * Add gio-module-fam # Problem: cyclic dependency on gamin diff --git a/pkgs/games/adom/default.nix b/pkgs/games/adom/default.nix index e83f50df1b7..ef5aba96d09 100644 --- a/pkgs/games/adom/default.nix +++ b/pkgs/games/adom/default.nix @@ -1,6 +1,8 @@ { stdenv, patchelf, zlib, libmad, libpng12, libcaca, mesa, alsaLib, pulseaudio , xlibs, plowshare }: +assert stdenv.isLinux; + let inherit (xlibs) libXext libX11; diff --git a/pkgs/servers/nosql/influxdb/default.nix b/pkgs/servers/nosql/influxdb/default.nix index 77852b6d2ed..6c6fb213cb8 100644 --- a/pkgs/servers/nosql/influxdb/default.nix +++ b/pkgs/servers/nosql/influxdb/default.nix @@ -1,5 +1,7 @@ { stdenv, fetchurl, makeWrapper }: +assert stdenv.isLinux; + stdenv.mkDerivation rec { name = "influxdb-${version}"; version = "0.7.0"; diff --git a/pkgs/tools/filesystems/yandex-disk/default.nix b/pkgs/tools/filesystems/yandex-disk/default.nix index 24dbae08fab..c9078a0cb8b 100644 --- a/pkgs/tools/filesystems/yandex-disk/default.nix +++ b/pkgs/tools/filesystems/yandex-disk/default.nix @@ -1,4 +1,7 @@ { stdenv, fetchurl, writeText, zlib, rpm, cpio, patchelf, which }: + +assert stdenv.isLinux; + let p = if stdenv.is64bit then { arch = "x86_64"; -- GitLab From 2478e77d8ac2d447eb0ee012f001e6c7d1a59d56 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Sun, 24 Aug 2014 18:53:29 +0200 Subject: [PATCH 182/843] Make the manual release-critical --- pkgs/top-level/release.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index be76c63685b..246adb4e1c1 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -29,6 +29,7 @@ let meta.description = "Release-critical builds for the Nixpkgs unstable channel"; constituents = [ jobs.tarball + jobs.manual jobs.stdenv.x86_64-linux jobs.stdenv.i686-linux jobs.stdenv.x86_64-darwin -- GitLab From df88d893320113a3768bc32af6b109d6d55c1e92 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= Date: Sun, 24 Aug 2014 19:50:22 +0200 Subject: [PATCH 183/843] FFADO: fix build on i686 --- pkgs/os-specific/linux/ffado/default.nix | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/pkgs/os-specific/linux/ffado/default.nix b/pkgs/os-specific/linux/ffado/default.nix index dc8d7b3d793..70c13be9ab4 100644 --- a/pkgs/os-specific/linux/ffado/default.nix +++ b/pkgs/os-specific/linux/ffado/default.nix @@ -19,6 +19,17 @@ stdenv.mkDerivation rec { patches = [ ./enable-mixer-and-dbus.patch ]; + # SConstruct checks cpuinfo and an objdump of /bin/mount to determine the appropriate arch + # Let's just skip this and tell it which to build + postPatch = if stdenv.isi686 then '' + sed '/def is_userspace_32bit(cpuinfo):/a\ + return True' -i SConstruct + '' + else '' + sed '/def is_userspace_32bit(cpuinfo):/a\ + return False' -i SConstruct + ''; + # TODO fix ffado-diag, it doesn't seem to use PYPKGDIR buildPhase = '' export PYLIBSUFFIX=lib/${python.libPrefix}/site-packages -- GitLab From 4903ec028124ed111f5ce579f11267dde0ad5d01 Mon Sep 17 00:00:00 2001 From: Cray Elliott Date: Sun, 24 Aug 2014 03:34:39 -0700 Subject: [PATCH 184/843] xml-lens upper bounds jailbroken, built and tested with lens v4.4.0.1 bug filed upstream to bump upper bounds --- pkgs/development/libraries/haskell/xml-lens/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/haskell/xml-lens/default.nix b/pkgs/development/libraries/haskell/xml-lens/default.nix index fd9609ec25f..f9e60441975 100644 --- a/pkgs/development/libraries/haskell/xml-lens/default.nix +++ b/pkgs/development/libraries/haskell/xml-lens/default.nix @@ -7,6 +7,7 @@ cabal.mkDerivation (self: { version = "0.1.6.1"; sha256 = "093grvlpm19l3g10ka82xpzl2wr0gli71kfkbvk4gvg3194fkw4h"; buildDepends = [ lens text xmlConduit ]; + jailbreak = true; meta = { homepage = "https://github.com/fumieval/xml-lens"; description = "Lenses, traversals, prisms for xml-conduit"; -- GitLab From 8e9ab29d43d42178134b5d3288c3a3fbc47b4729 Mon Sep 17 00:00:00 2001 From: Cray Elliott Date: Sun, 24 Aug 2014 03:40:48 -0700 Subject: [PATCH 185/843] mark wreq as broken, issue made upstream breaks because of incompatibility with lens > 4.4 --- pkgs/development/libraries/haskell/wreq/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/libraries/haskell/wreq/default.nix b/pkgs/development/libraries/haskell/wreq/default.nix index 9772418173b..62fa1d2abf8 100644 --- a/pkgs/development/libraries/haskell/wreq/default.nix +++ b/pkgs/development/libraries/haskell/wreq/default.nix @@ -24,6 +24,8 @@ cabal.mkDerivation (self: { homepage = "http://www.serpentine.com/wreq"; description = "An easy-to-use HTTP client library"; license = self.stdenv.lib.licenses.bsd3; + broken = true; + hydraPlatforms = self.stdenv.lib.platforms.none; platforms = self.ghc.meta.platforms; maintainers = with self.stdenv.lib.maintainers; [ ocharles ]; }; -- GitLab From 478f96d6c390d33e47090b71c1b59b35add8b29e Mon Sep 17 00:00:00 2001 From: Cray Elliott Date: Sun, 24 Aug 2014 03:47:00 -0700 Subject: [PATCH 186/843] Update twitter-conduit, fixes breakage --- .../haskell/twitter-conduit/default.nix | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/pkgs/development/libraries/haskell/twitter-conduit/default.nix b/pkgs/development/libraries/haskell/twitter-conduit/default.nix index bf2652fa792..6736f28cac6 100644 --- a/pkgs/development/libraries/haskell/twitter-conduit/default.nix +++ b/pkgs/development/libraries/haskell/twitter-conduit/default.nix @@ -2,27 +2,27 @@ { cabal, aeson, attoparsec, authenticateOauth, caseInsensitive , conduit, conduitExtra, dataDefault, doctest, filepath, hlint -, hspec, httpClient, httpConduit, httpTypes, lens, monadControl -, monadLogger, network, resourcet, shakespeare, text, time +, hspec, httpClient, httpConduit, httpTypes, lens, lensAeson +, monadControl, monadLogger, networkUri, resourcet, text, time , transformers, transformersBase, twitterTypes }: cabal.mkDerivation (self: { pname = "twitter-conduit"; - version = "0.0.5.5"; - sha256 = "13wk863xjlg8g62yhbq4aar7z77n0awh500l6v41fam99lihzxab"; + version = "0.0.5.6"; + sha256 = "1l6gk4538nqknrj082hkdy2jp4gzyq3y473p8gg4mm2n67417r9m"; isLibrary = true; isExecutable = true; buildDepends = [ aeson attoparsec authenticateOauth conduit conduitExtra dataDefault - httpClient httpConduit httpTypes lens monadLogger resourcet - shakespeare text time transformers twitterTypes + httpClient httpConduit httpTypes lens lensAeson monadLogger + networkUri resourcet text time transformers twitterTypes ]; testDepends = [ aeson attoparsec authenticateOauth caseInsensitive conduit conduitExtra dataDefault doctest filepath hlint hspec httpClient - httpConduit httpTypes lens monadControl monadLogger network - resourcet shakespeare text time transformers transformersBase + httpConduit httpTypes lens lensAeson monadControl monadLogger + networkUri resourcet text time transformers transformersBase twitterTypes ]; meta = { @@ -30,6 +30,5 @@ cabal.mkDerivation (self: { description = "Twitter API package with conduit interface and Streaming API support"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = with self.stdenv.lib.maintainers; [ ocharles ]; }; }) -- GitLab From eec21600264cf9fda49408413856d9e7aa060558 Mon Sep 17 00:00:00 2001 From: Cray Elliott Date: Sun, 24 Aug 2014 03:53:35 -0700 Subject: [PATCH 187/843] update hsimport to 0.5.1, fixes breakage --- pkgs/development/libraries/haskell/hsimport/default.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/haskell/hsimport/default.nix b/pkgs/development/libraries/haskell/hsimport/default.nix index 8f080fe6e25..62ab4cc35b0 100644 --- a/pkgs/development/libraries/haskell/hsimport/default.nix +++ b/pkgs/development/libraries/haskell/hsimport/default.nix @@ -6,19 +6,17 @@ cabal.mkDerivation (self: { pname = "hsimport"; - version = "0.5"; - sha256 = "18rhldw6vbkjcpx373m784sppadccm2b3xx3zzr0l45dwmsh6rb4"; + version = "0.5.1"; + sha256 = "17yzfikfl8qvm6vp3d472l6p0kzzw694ng19xn3fmrb43qvki4jj"; isLibrary = true; isExecutable = true; buildDepends = [ attoparsec cmdargs dyre haskellSrcExts lens mtl split text ]; testDepends = [ filepath haskellSrcExts tasty tastyGolden ]; - doCheck = false; meta = { description = "A command line program for extending the import list of a Haskell source file"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = with self.stdenv.lib.maintainers; [ ocharles ]; }; }) -- GitLab From 81a67653d2fcbeb0bc3e7a5e28905fa365445d80 Mon Sep 17 00:00:00 2001 From: Cray Elliott Date: Sun, 24 Aug 2014 03:50:11 -0700 Subject: [PATCH 188/843] mark json-assertions as broken for now needs lens-aeson package and upper bounds bump --- pkgs/development/libraries/haskell/json-assertions/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/libraries/haskell/json-assertions/default.nix b/pkgs/development/libraries/haskell/json-assertions/default.nix index fce4d5d7922..4ee1f4b5779 100644 --- a/pkgs/development/libraries/haskell/json-assertions/default.nix +++ b/pkgs/development/libraries/haskell/json-assertions/default.nix @@ -10,6 +10,8 @@ cabal.mkDerivation (self: { meta = { homepage = "http://github.com/ocharles/json-assertions.git"; description = "Test that your (Aeson) JSON encoding matches your expectations"; + broken = true; + hydraPlatforms = self.stdenv.lib.platforms.none; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; maintainers = with self.stdenv.lib.maintainers; [ ocharles ]; -- GitLab From bfb82ef138170faa343cc096033f47e8e9230a66 Mon Sep 17 00:00:00 2001 From: Cray Elliott Date: Sun, 24 Aug 2014 04:05:10 -0700 Subject: [PATCH 189/843] restore maintainer information that cabal2nix stripped --- pkgs/development/libraries/haskell/hsimport/default.nix | 1 + pkgs/development/libraries/haskell/twitter-conduit/default.nix | 1 + 2 files changed, 2 insertions(+) diff --git a/pkgs/development/libraries/haskell/hsimport/default.nix b/pkgs/development/libraries/haskell/hsimport/default.nix index 62ab4cc35b0..96bcecddc30 100644 --- a/pkgs/development/libraries/haskell/hsimport/default.nix +++ b/pkgs/development/libraries/haskell/hsimport/default.nix @@ -18,5 +18,6 @@ cabal.mkDerivation (self: { description = "A command line program for extending the import list of a Haskell source file"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; + maintainers = with self.stdenv.lib.maintainers; [ ocharles ]; }; }) diff --git a/pkgs/development/libraries/haskell/twitter-conduit/default.nix b/pkgs/development/libraries/haskell/twitter-conduit/default.nix index 6736f28cac6..5b0bf7cd408 100644 --- a/pkgs/development/libraries/haskell/twitter-conduit/default.nix +++ b/pkgs/development/libraries/haskell/twitter-conduit/default.nix @@ -30,5 +30,6 @@ cabal.mkDerivation (self: { description = "Twitter API package with conduit interface and Streaming API support"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; + maintainers = with self.stdenv.lib.maintainers; [ ocharles ]; }; }) -- GitLab From 40fdda7237b035f4934de646df2a6cddff5c92ae Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 24 Aug 2014 11:57:09 +0200 Subject: [PATCH 190/843] haskell-cabal2nix: update to version 1.69 --- pkgs/development/tools/haskell/cabal2nix/default.nix | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/haskell/cabal2nix/default.nix b/pkgs/development/tools/haskell/cabal2nix/default.nix index 978ebde7e29..db7e472934c 100644 --- a/pkgs/development/tools/haskell/cabal2nix/default.nix +++ b/pkgs/development/tools/haskell/cabal2nix/default.nix @@ -1,15 +1,18 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, Cabal, doctest, filepath, hackageDb, HTTP, mtl, regexPosix +{ cabal, Cabal, doctest, filepath, hackageDb, mtl, regexPosix +, transformers }: cabal.mkDerivation (self: { pname = "cabal2nix"; - version = "1.68"; - sha256 = "0w9ayvr3ljfxgi17yaayqvyxflbgf7b5245pc3m011lp3cfnj849"; + version = "1.69"; + sha256 = "0430086lh1h7w8wxc42aqrdjb8i12vz8m0jr1q2c45h3k6brb5r5"; isLibrary = false; isExecutable = true; - buildDepends = [ Cabal filepath hackageDb HTTP mtl regexPosix ]; + buildDepends = [ + Cabal filepath hackageDb mtl regexPosix transformers + ]; testDepends = [ doctest ]; doCheck = self.stdenv.lib.versionOlder "7.6" self.ghc.version; meta = { -- GitLab From a8c17fb227a05a4b80a04ce6c74959f2eb28669f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 24 Aug 2014 11:57:14 +0200 Subject: [PATCH 191/843] haskell-taffybar: update to version 0.4.1 --- pkgs/applications/misc/taffybar/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/taffybar/default.nix b/pkgs/applications/misc/taffybar/default.nix index 6b282116343..09eb186013f 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.0"; - sha256 = "1l6zl5mlpkdsvs3id6ivh4b74p65n6jr17k23y2cdwj2fr9prvr8"; + version = "0.4.1"; + sha256 = "0b4x78sq5x1w0xnc5fk4ixpbkl8cwjfyb4fq8vy21shf4n0fri26"; isLibrary = true; isExecutable = true; buildDepends = [ -- GitLab From a3a1ea58f66fbe3849f78c111c8f13d6d88f16e5 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 24 Aug 2014 11:57:16 +0200 Subject: [PATCH 192/843] haskell-GLUtil: update to version 0.8.1 --- pkgs/development/libraries/haskell/GLUtil/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/haskell/GLUtil/default.nix b/pkgs/development/libraries/haskell/GLUtil/default.nix index ce4b41c93e0..ee99ccc4fee 100644 --- a/pkgs/development/libraries/haskell/GLUtil/default.nix +++ b/pkgs/development/libraries/haskell/GLUtil/default.nix @@ -1,15 +1,16 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, cpphs, JuicyPixels, linear, OpenGL, OpenGLRaw +{ cabal, cpphs, filepath, JuicyPixels, linear, OpenGL, OpenGLRaw , transformers, vector }: cabal.mkDerivation (self: { pname = "GLUtil"; - version = "0.8"; - sha256 = "00r9gmwsb9gx6bcc012rhz0z0hj3my8k1i0yjnaw0jmlqswm45h8"; + version = "0.8.1"; + sha256 = "026w6rsgs0vmjx9fj4x3r93rifdyjygb83spcwmch31a7qng6l7w"; buildDepends = [ - cpphs JuicyPixels linear OpenGL OpenGLRaw transformers vector + cpphs filepath JuicyPixels linear OpenGL OpenGLRaw transformers + vector ]; buildTools = [ cpphs ]; meta = { -- GitLab From 5d8bf16d87e9e41db7978e4e99e52fda9bcd81c4 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 24 Aug 2014 11:57:19 +0200 Subject: [PATCH 193/843] haskell-aws: update to version 0.10.3 --- pkgs/development/libraries/haskell/aws/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/aws/default.nix b/pkgs/development/libraries/haskell/aws/default.nix index d6e8a5fb5ad..3df47d95618 100644 --- a/pkgs/development/libraries/haskell/aws/default.nix +++ b/pkgs/development/libraries/haskell/aws/default.nix @@ -11,8 +11,8 @@ cabal.mkDerivation (self: { pname = "aws"; - version = "0.10.2"; - sha256 = "15yr06z54wxnl37a94515ajlxrb7z9kii5dd0ssan32izh4nfrl2"; + version = "0.10.3"; + sha256 = "042vx5nhafvgw0crymkw8pyhiawhpxwj03n1k538y2wr181hmz5f"; isLibrary = true; isExecutable = true; buildDepends = [ -- GitLab From 040e46ebc5c8cf40ea0a426cbc9ecdc3d1743bf6 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 24 Aug 2014 11:57:21 +0200 Subject: [PATCH 194/843] haskell-cabal-cargs: update to version 0.7.1 --- pkgs/development/libraries/haskell/cabal-cargs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/cabal-cargs/default.nix b/pkgs/development/libraries/haskell/cabal-cargs/default.nix index 85015f5d4ac..a74e54f7e43 100644 --- a/pkgs/development/libraries/haskell/cabal-cargs/default.nix +++ b/pkgs/development/libraries/haskell/cabal-cargs/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "cabal-cargs"; - version = "0.7"; - sha256 = "1dzmvwmb9sxwdgkzszhk9d5qvq2alnqmprx83dlb17sdi6f9jns1"; + version = "0.7.1"; + sha256 = "0y6v663mw4giwypdv34qr2l2fy1q7zdjvgw39m16sjna5lbwvm1n"; isLibrary = true; isExecutable = true; buildDepends = [ -- GitLab From 8f31973d6e9165bb5fea01039f8a577d7899b543 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 24 Aug 2014 11:57:23 +0200 Subject: [PATCH 195/843] haskell-compdata: update to version 0.9 --- pkgs/development/libraries/haskell/compdata/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/compdata/default.nix b/pkgs/development/libraries/haskell/compdata/default.nix index 2e26d9ac781..ecaec5c4dd0 100644 --- a/pkgs/development/libraries/haskell/compdata/default.nix +++ b/pkgs/development/libraries/haskell/compdata/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "compdata"; - version = "0.8.1.3"; - sha256 = "0rnvw5bdypl6i2k1wnc727a17hapl4hs7n208h16ngk075841gpb"; + version = "0.9"; + sha256 = "1wk9vj834l3fc64fcsrgc9hz5f2z7461hs8lv1ldkfsixx4mxyqc"; buildDepends = [ deepseq derive mtl QuickCheck thExpandSyns transformers treeView ]; -- GitLab From 8dbf7f3262298fc4e4a60191cb37f536327dbb9b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 24 Aug 2014 11:57:25 +0200 Subject: [PATCH 196/843] haskell-gitit: update to version 0.10.5 --- .../libraries/haskell/gitit/default.nix | 27 ++++++++++--------- 1 file changed, 14 insertions(+), 13 deletions(-) diff --git a/pkgs/development/libraries/haskell/gitit/default.nix b/pkgs/development/libraries/haskell/gitit/default.nix index 44a04cc5380..0e0f147bab9 100644 --- a/pkgs/development/libraries/haskell/gitit/default.nix +++ b/pkgs/development/libraries/haskell/gitit/default.nix @@ -1,23 +1,26 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, base64Bytestring, blazeHtml, ConfigFile, feed, filepath -, filestore, ghcPaths, happstackServer, highlightingKate, hslogger -, HStringTemplate, HTTP, json, mtl, network, pandoc, pandocTypes -, parsec, random, recaptcha, safe, SHA, split, syb, tagsoup, text -, time, uri, url, utf8String, xhtml, xml, xssSanitize, zlib +{ cabal, aeson, base64Bytestring, blazeHtml, ConfigFile, feed +, filepath, filestore, ghcPaths, happstackServer, highlightingKate +, hoauth2, hslogger, HStringTemplate, HTTP, httpClient +, httpClientTls, json, mtl, network, networkUri, pandoc +, pandocTypes, parsec, random, recaptcha, safe, SHA, split, syb +, tagsoup, text, time, uri, url, utf8String, xhtml, xml +, xssSanitize, zlib }: cabal.mkDerivation (self: { pname = "gitit"; - version = "0.10.4"; - sha256 = "1z06v1pamrpm70zisrw3z3kv0d19dsjkmm75pvj5yxkacxv7qk7n"; + version = "0.10.5"; + sha256 = "0p2x2l729rwals0kx8ymk6j3fqvlyjvrj6mmh8slcg93h4smwb4j"; isLibrary = true; isExecutable = true; buildDepends = [ - base64Bytestring blazeHtml ConfigFile feed filepath filestore - ghcPaths happstackServer highlightingKate hslogger HStringTemplate - HTTP json mtl network pandoc pandocTypes parsec random recaptcha - safe SHA split syb tagsoup text time uri url utf8String xhtml xml + aeson base64Bytestring blazeHtml ConfigFile feed filepath filestore + ghcPaths happstackServer highlightingKate hoauth2 hslogger + HStringTemplate HTTP httpClient httpClientTls json mtl network + networkUri pandoc pandocTypes parsec random recaptcha safe SHA + split syb tagsoup text time uri url utf8String xhtml xml xssSanitize zlib ]; jailbreak = true; @@ -26,7 +29,5 @@ cabal.mkDerivation (self: { description = "Wiki using happstack, git or darcs, and pandoc"; license = "GPL"; platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - broken = true; }; }) -- GitLab From 11ca9c9aa71e54abc1fd9f971ff3262be3a65f5b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 24 Aug 2014 11:57:27 +0200 Subject: [PATCH 197/843] haskell-hplayground: update to version 0.1.0.3 --- pkgs/development/libraries/haskell/hplayground/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/hplayground/default.nix b/pkgs/development/libraries/haskell/hplayground/default.nix index b12024f5945..db38dbc2399 100644 --- a/pkgs/development/libraries/haskell/hplayground/default.nix +++ b/pkgs/development/libraries/haskell/hplayground/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "hplayground"; - version = "0.1.0.2"; - sha256 = "13lzw0fhv305zh2ry0d74y5k7vxppjlwsb8vi3iri5zpkkdpfhij"; + version = "0.1.0.3"; + sha256 = "1k46b94n9wkbh7374mjyg5jnwxxrhj8ai53q3r4lysx1rzgw7ak6"; buildDepends = [ dataDefault hasteCompiler hastePerch monadsTf transformers ]; -- GitLab From 4b128ae8ea1df94a0a0ed28b4ec87ce659f43210 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 24 Aug 2014 11:57:31 +0200 Subject: [PATCH 198/843] haskell-lifted-async: update to version 0.2.0.2 --- pkgs/development/libraries/haskell/lifted-async/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/lifted-async/default.nix b/pkgs/development/libraries/haskell/lifted-async/default.nix index 04c589b5479..97a252d13d5 100644 --- a/pkgs/development/libraries/haskell/lifted-async/default.nix +++ b/pkgs/development/libraries/haskell/lifted-async/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "lifted-async"; - version = "0.2.0.1"; - sha256 = "1x3qdgy0jkqx71xndjh769lw3wrwq63k2kc33pxn6x11yyklcf1j"; + version = "0.2.0.2"; + sha256 = "07sqgd3lxplfwrpys4jhz0068sx99765lpx8n4nj3k117z32slgf"; buildDepends = [ async liftedBase monadControl transformersBase ]; testDepends = [ async HUnit liftedBase monadControl mtl tasty tastyHunit tastyTh -- GitLab From 37557002ede88252d08db5b713b789554ca70e84 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 24 Aug 2014 11:57:33 +0200 Subject: [PATCH 199/843] haskell-rest-core: update to version 0.32 --- pkgs/development/libraries/haskell/rest-core/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/rest-core/default.nix b/pkgs/development/libraries/haskell/rest-core/default.nix index 134c39f9f24..53c3ede3ec1 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.31.1"; - sha256 = "1cx1zmy1zr43n9nlrbar828izccpkvrvjkrda03ra9fkcjgd6qy6"; + version = "0.32"; + sha256 = "130kz1gsrbamw8gs4vc0fqfjh1gi7i52xxmj4fg1vl2dr77gf6my"; buildDepends = [ aeson aesonUtils either errors fclabels hxt hxtPickleUtils jsonSchema mtl multipart random restStringmap restTypes safe split -- GitLab From c8baea2590021e68bc1aca3c1acaaf52b2d62879 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 24 Aug 2014 11:57:35 +0200 Subject: [PATCH 200/843] haskell-rest-gen: update to version 0.14.2.1 --- pkgs/development/libraries/haskell/rest-gen/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/rest-gen/default.nix b/pkgs/development/libraries/haskell/rest-gen/default.nix index afa2f612c01..012f6db8bf2 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.14.2"; - sha256 = "1hmf77hs3pp6lf4glh3lbbwfjr029js185v69bk8ycr1c4ib8nbp"; + version = "0.14.2.1"; + sha256 = "1dvcs25ndmzwdann5yq4567zjirirzskf9v31gkrki0im8mi9x14"; buildDepends = [ aeson blazeHtml Cabal codeBuilder fclabels filepath hashable haskellSrcExts hslogger HStringTemplate hxt jsonSchema restCore -- GitLab From bcdf38e4ef90ab5e8f619854b802c5955e25f83d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 24 Aug 2014 11:57:37 +0200 Subject: [PATCH 201/843] haskell-rest-happstack: update to version 0.2.10.1 --- pkgs/development/libraries/haskell/rest-happstack/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/rest-happstack/default.nix b/pkgs/development/libraries/haskell/rest-happstack/default.nix index 74c5f2a06cb..4c79bc58c06 100644 --- a/pkgs/development/libraries/haskell/rest-happstack/default.nix +++ b/pkgs/development/libraries/haskell/rest-happstack/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "rest-happstack"; - version = "0.2.10"; - sha256 = "1np8y0v6jnk2lw0aqlzb9dn1vlk8cg75xrhkjmm6qh0z90fy3p6z"; + version = "0.2.10.1"; + sha256 = "0p4km3l8n50flj9cnxvjl34pp3msxz2yq4d91r318di8pacrgnxc"; buildDepends = [ happstackServer mtl restCore restGen utf8String ]; meta = { description = "Rest driver for Happstack"; -- GitLab From 4781970e5409afbc84f09b412d233a1f74ca97fc Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 24 Aug 2014 11:57:39 +0200 Subject: [PATCH 202/843] haskell-rest-snap: update to version 0.1.17.13 --- pkgs/development/libraries/haskell/rest-snap/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/rest-snap/default.nix b/pkgs/development/libraries/haskell/rest-snap/default.nix index 5305c2d113f..8e9bc69eb01 100644 --- a/pkgs/development/libraries/haskell/rest-snap/default.nix +++ b/pkgs/development/libraries/haskell/rest-snap/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "rest-snap"; - version = "0.1.17.12"; - sha256 = "0hhpscdbph34psfn2h1g0znds0cz7ja9byr6bg7jmj0h86plz8al"; + version = "0.1.17.13"; + sha256 = "13c143dzxhfrshn19ylqfmhnxjirixfif8d1fmzagz1v893narkz"; buildDepends = [ caseInsensitive restCore safe snapCore unorderedContainers uriEncode utf8String -- GitLab From 23e4cc3d8eb5f00ba7172935826889c6ba7ab0f2 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 24 Aug 2014 11:57:41 +0200 Subject: [PATCH 203/843] haskell-rest-types: update to version 1.10.2 --- pkgs/development/libraries/haskell/rest-types/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/rest-types/default.nix b/pkgs/development/libraries/haskell/rest-types/default.nix index 157cab5e979..41b8044b593 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.10.1"; - sha256 = "0i4y1s35ybly1nayqj9c2zqwikpxnzjamq24qbhg0lpqr0dpc1rg"; + version = "1.10.2"; + sha256 = "1j8fpv4xdhbf1awy0v9zn9a3sjwl42l6472wczp3wwwcpsi65d9q"; buildDepends = [ aeson genericAeson hxt jsonSchema mtl regular regularXmlpickler restStringmap text uuid -- GitLab From e4d7f90b80210513803b45ca46a018c19a51d6cf Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 24 Aug 2014 11:57:42 +0200 Subject: [PATCH 204/843] haskell-rest-wai: update to version 0.1.0.3 --- pkgs/development/libraries/haskell/rest-wai/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/rest-wai/default.nix b/pkgs/development/libraries/haskell/rest-wai/default.nix index 7ddb500265b..d23d81da33d 100644 --- a/pkgs/development/libraries/haskell/rest-wai/default.nix +++ b/pkgs/development/libraries/haskell/rest-wai/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "rest-wai"; - version = "0.1.0.2"; - sha256 = "06wnazy0262b2875q4km2xy9zz7l681vlfj3ny1ha9valnqr3q6w"; + version = "0.1.0.3"; + sha256 = "08pprgn9xnd3ipr6clify3snm4ahshlws869mfvziplc4hdcnb59"; buildDepends = [ caseInsensitive httpTypes mimeTypes mtl restCore restTypes text unorderedContainers utf8String wai -- GitLab From d81a81b2317b865b8c0c38f78c159863e9ce55ab Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 24 Aug 2014 11:57:44 +0200 Subject: [PATCH 205/843] haskell-shelly: update to version 1.5.5 --- pkgs/development/libraries/haskell/shelly/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/shelly/default.nix b/pkgs/development/libraries/haskell/shelly/default.nix index 587c42d6033..6deaa209dc8 100644 --- a/pkgs/development/libraries/haskell/shelly/default.nix +++ b/pkgs/development/libraries/haskell/shelly/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "shelly"; - version = "1.5.4.1"; - sha256 = "0h38j6vkdgaddj7xardyywibdj5w0wryqxwwpc62idgzlp7mgpb2"; + version = "1.5.5"; + sha256 = "1865f5z5wm2qf3ccws9jy8ps7n8slkmfgn0l2m9apja3q2jajqb1"; buildDepends = [ async enclosedExceptions exceptions liftedAsync liftedBase monadControl mtl systemFileio systemFilepath text time transformers -- GitLab From dc3f01d180a53fd06a1e81a2ca8835f4bda5905b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 24 Aug 2014 11:57:46 +0200 Subject: [PATCH 206/843] haskell-statvfs: update to version 0.2 --- pkgs/development/libraries/haskell/statvfs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/statvfs/default.nix b/pkgs/development/libraries/haskell/statvfs/default.nix index bb1ebb1b9d8..15454aa0c97 100644 --- a/pkgs/development/libraries/haskell/statvfs/default.nix +++ b/pkgs/development/libraries/haskell/statvfs/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "statvfs"; - version = "0.1"; - sha256 = "1v45lx7wr27f5sx7cpfsapx1r6akgf1q3hpip1ibbsbhj65ws2r2"; + version = "0.2"; + sha256 = "16z9fddgvf5sl7zy7p74fng9lkdw5m9i5np3q4s2h8jdi43mwmg1"; meta = { description = "Get unix filesystem statistics with statfs, statvfs"; license = self.stdenv.lib.licenses.bsd3; -- GitLab From e3184a2f13f617358080124874d65ea580d2340b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 24 Aug 2014 11:57:48 +0200 Subject: [PATCH 207/843] haskell-tasty-hunit: update to version 0.9 --- .../libraries/haskell/tasty-hunit/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/haskell/tasty-hunit/default.nix b/pkgs/development/libraries/haskell/tasty-hunit/default.nix index c7e5b53548f..067e6081818 100644 --- a/pkgs/development/libraries/haskell/tasty-hunit/default.nix +++ b/pkgs/development/libraries/haskell/tasty-hunit/default.nix @@ -1,13 +1,14 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, HUnit, mtl, tasty }: +{ cabal, tasty }: cabal.mkDerivation (self: { pname = "tasty-hunit"; - version = "0.8.0.1"; - sha256 = "0a84j8yjqp9x59dy5nbb50vnscb7iimgc60s8vz1p5721gqi62r5"; - buildDepends = [ HUnit mtl tasty ]; + version = "0.9"; + sha256 = "1ivp9h34cdrahqy8i0y10fa0mqxa947dpbwvhr46sjja053asjxc"; + buildDepends = [ tasty ]; meta = { + homepage = "http://documentup.com/feuerbach/tasty"; description = "HUnit support for the Tasty test framework"; license = self.stdenv.lib.licenses.mit; platforms = self.ghc.meta.platforms; -- GitLab From 9cab2fbdf5b2115957170ec79ab90f6796813ebe Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 24 Aug 2014 11:57:52 +0200 Subject: [PATCH 208/843] haskell-twitter-types: update to version 0.5.0 --- pkgs/development/libraries/haskell/twitter-types/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/twitter-types/default.nix b/pkgs/development/libraries/haskell/twitter-types/default.nix index 1848211dc3e..4a3df6f1b9f 100644 --- a/pkgs/development/libraries/haskell/twitter-types/default.nix +++ b/pkgs/development/libraries/haskell/twitter-types/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "twitter-types"; - version = "0.4.20140809"; - sha256 = "0f32gjvpzcy5ld2j6mhsvaxaiyzyp5pvqjvmgawaiy78c3kxi8gh"; + version = "0.5.0"; + sha256 = "0nnis96rki60ily7ydq155nawmhz7dn51d1d3hwikb1vz16ji47a"; buildDepends = [ aeson httpTypes text unorderedContainers ]; testDepends = [ aeson attoparsec filepath httpTypes HUnit testFramework -- GitLab From 05cc6c7aa12ed7e159d7bdda9d8893e77554281e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 24 Aug 2014 11:57:54 +0200 Subject: [PATCH 209/843] haskell-wai-extra: update to version 3.0.2.1 --- pkgs/development/libraries/haskell/wai-extra/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/wai-extra/default.nix b/pkgs/development/libraries/haskell/wai-extra/default.nix index 184adcc03dd..39514c8a3bd 100644 --- a/pkgs/development/libraries/haskell/wai-extra/default.nix +++ b/pkgs/development/libraries/haskell/wai-extra/default.nix @@ -9,8 +9,8 @@ cabal.mkDerivation (self: { pname = "wai-extra"; - version = "3.0.2"; - sha256 = "1xynrcm8i8iyyc4dy7nsziy0g4yc6gqx0h5vs86f85i1j0mrf3xv"; + version = "3.0.2.1"; + sha256 = "02jamvina7m9wjz0hd7gj309d1vcmhgdwyh9y1bfpvq29ngqkkca"; buildDepends = [ ansiTerminal base64Bytestring blazeBuilder caseInsensitive dataDefaultClass deepseq fastLogger httpTypes liftedBase network -- GitLab From 66e3d388643477c4da352551979d70ef67b3a43b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 24 Aug 2014 11:57:56 +0200 Subject: [PATCH 210/843] haskell-wl-pprint-terminfo: update to version 3.7.1.1 --- .../libraries/haskell/wl-pprint-terminfo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/wl-pprint-terminfo/default.nix b/pkgs/development/libraries/haskell/wl-pprint-terminfo/default.nix index 5a3c75f6165..37dc11b1f0f 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"; - sha256 = "04220hgrjjsz0ir65s6ynrjgdmqlfcw49fb158w7wgxxh69kc7h6"; + version = "3.7.1.1"; + sha256 = "1mjnbkk3cw2v7nda7qxdkl21pmclz6m17sviqp4qf3rc8rgin3zd"; buildDepends = [ nats semigroups terminfo text transformers wlPprintExtras ]; -- GitLab From 99a863f3063ed1e3907e51edb7b8b8048b7b2fd6 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 24 Aug 2014 11:57:58 +0200 Subject: [PATCH 211/843] haskell-cabal-bounds: update to version 0.8.5 --- pkgs/development/tools/haskell/cabal-bounds/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/haskell/cabal-bounds/default.nix b/pkgs/development/tools/haskell/cabal-bounds/default.nix index 213ba6f9d13..97dac34af3b 100644 --- a/pkgs/development/tools/haskell/cabal-bounds/default.nix +++ b/pkgs/development/tools/haskell/cabal-bounds/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "cabal-bounds"; - version = "0.8.4"; - sha256 = "00vj6ca9liqlqg69d4ziacsxz6x9365sbyc1ag6g18bhibyinsh2"; + version = "0.8.5"; + sha256 = "19lai2gdxs76mrvcz77sjsx7hh87cf1f4qmy7z1zcd130z11q04a"; isLibrary = true; isExecutable = true; buildDepends = [ -- GitLab From 963c45ecf89650fe40a0cf8f14e66c78271cebb3 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 24 Aug 2014 11:58:37 +0200 Subject: [PATCH 212/843] haskell-random: update to version 1.0.1.3 Don't update the library for GHC <= 7.4.x: https://github.com/haskell/random/issues/10 --- .../libraries/haskell/random/1.0.1.3.nix | 15 +++++++++++++++ pkgs/top-level/haskell-defaults.nix | 1 + pkgs/top-level/haskell-packages.nix | 3 ++- 3 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/libraries/haskell/random/1.0.1.3.nix diff --git a/pkgs/development/libraries/haskell/random/1.0.1.3.nix b/pkgs/development/libraries/haskell/random/1.0.1.3.nix new file mode 100644 index 00000000000..26763deb10a --- /dev/null +++ b/pkgs/development/libraries/haskell/random/1.0.1.3.nix @@ -0,0 +1,15 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, time }: + +cabal.mkDerivation (self: { + pname = "random"; + version = "1.0.1.3"; + sha256 = "06mbjx05c54iz5skn4biyjy9sqdr1qi6d33an8wya7sndnpakd21"; + buildDepends = [ time ]; + meta = { + description = "random number library"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/top-level/haskell-defaults.nix b/pkgs/top-level/haskell-defaults.nix index 20f695a0d23..3c5311b83bb 100644 --- a/pkgs/top-level/haskell-defaults.nix +++ b/pkgs/top-level/haskell-defaults.nix @@ -62,6 +62,7 @@ hackageDb = super.hackageDb.override { Cabal = self.Cabal_1_16_0_3; }; haddock = self.haddock_2_11_0; haskeline = super.haskeline.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; }; + random = self.random_1_0_1_1; # requires base >= 4.6.x shelly = self.shelly_0_15_4_1; }; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index fbff5087cc0..7d9c9067a0e 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -2002,7 +2002,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in RangedSets = callPackage ../development/libraries/haskell/Ranged-sets {}; random_1_0_1_1 = callPackage ../development/libraries/haskell/random/1.0.1.1.nix {}; - random = self.random_1_0_1_1; + random_1_0_1_3 = callPackage ../development/libraries/haskell/random/1.0.1.3.nix {}; + random = self.random_1_0_1_3; randomFu = callPackage ../development/libraries/haskell/random-fu {}; -- GitLab From 9ca9a23abe46911df25ca16253d8db7400faa4aa Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 24 Aug 2014 11:59:48 +0200 Subject: [PATCH 213/843] haskell-network: add version 2.6.0.1 We cannot use this version anywhere because of https://github.com/haskell/HTTP/issues/75 --- .../libraries/haskell/network/2.6.0.1.nix | 16 ++++++++++++++++ pkgs/top-level/haskell-packages.nix | 3 ++- 2 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/libraries/haskell/network/2.6.0.1.nix diff --git a/pkgs/development/libraries/haskell/network/2.6.0.1.nix b/pkgs/development/libraries/haskell/network/2.6.0.1.nix new file mode 100644 index 00000000000..d5d302fbd8e --- /dev/null +++ b/pkgs/development/libraries/haskell/network/2.6.0.1.nix @@ -0,0 +1,16 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, HUnit, testFramework, testFrameworkHunit }: + +cabal.mkDerivation (self: { + pname = "network"; + version = "2.6.0.1"; + sha256 = "0qfffsdbvrf9gs8wr9ps7iv5h6drz4vb2ja9rprmc7ypswsacxsq"; + testDepends = [ HUnit testFramework testFrameworkHunit ]; + meta = { + homepage = "https://github.com/haskell/network"; + description = "Low-level networking interface"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 7d9c9067a0e..45acd27a5b8 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1711,7 +1711,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in network_2_3_1_0 = callPackage ../development/libraries/haskell/network/2.3.1.0.nix {}; network_2_4_1_2 = callPackage ../development/libraries/haskell/network/2.4.1.2.nix {}; network_2_5_0_0 = callPackage ../development/libraries/haskell/network/2.5.0.0.nix {}; - network = self.network_2_5_0_0; + network_2_6_0_1 = callPackage ../development/libraries/haskell/network/2.6.0.1.nix {}; + network = self.network_2_5_0_0; # the latest version break HTTP on all platforms networkCarbon = callPackage ../development/libraries/haskell/network-carbon {}; -- GitLab From af49e4a2b0b9d5d3fbb016ebaf89c29036d2b1fd Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 24 Aug 2014 12:00:52 +0200 Subject: [PATCH 214/843] haskell-vty: update to version 5.2.0 --- .../libraries/haskell/vty/{5.1.4.nix => 5.2.0.nix} | 4 ++-- pkgs/top-level/haskell-packages.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) rename pkgs/development/libraries/haskell/vty/{5.1.4.nix => 5.2.0.nix} (92%) diff --git a/pkgs/development/libraries/haskell/vty/5.1.4.nix b/pkgs/development/libraries/haskell/vty/5.2.0.nix similarity index 92% rename from pkgs/development/libraries/haskell/vty/5.1.4.nix rename to pkgs/development/libraries/haskell/vty/5.2.0.nix index 24d123d67cc..80ccaf6db8e 100644 --- a/pkgs/development/libraries/haskell/vty/5.1.4.nix +++ b/pkgs/development/libraries/haskell/vty/5.2.0.nix @@ -9,8 +9,8 @@ cabal.mkDerivation (self: { pname = "vty"; - version = "5.1.4"; - sha256 = "157saacy6lp2ngl0dz9ri4ji1vj191d1239x1xykna8y618r0vqf"; + version = "5.2.0"; + sha256 = "0mlh90i44fb6hlifb2gwb9ny68zgg7m6xq3v6bz3dmqfz6dnlf8v"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 45acd27a5b8..c437e6d582c 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -2667,8 +2667,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in void = callPackage ../development/libraries/haskell/void {}; vty_4_7_5 = callPackage ../development/libraries/haskell/vty/4.7.5.nix {}; - vty_5_1_4 = callPackage ../development/libraries/haskell/vty/5.1.4.nix {}; - vty = self.vty_5_1_4; + vty_5_2_0 = callPackage ../development/libraries/haskell/vty/5.2.0.nix {}; + vty = self.vty_5_2_0; vtyUi = callPackage ../development/libraries/haskell/vty-ui { vty = self.vty_4_7_5; -- GitLab From 5ec6492ea078a1710f027e49bdd7c0e7ab45babf Mon Sep 17 00:00:00 2001 From: Cray Elliott Date: Sun, 24 Aug 2014 03:30:21 -0700 Subject: [PATCH 215/843] Mark yi and yi-contrib as broken They no longer build with lens v4.4.0.1 and up --- pkgs/applications/editors/yi/yi-contrib.nix | 2 ++ pkgs/applications/editors/yi/yi.nix | 2 ++ 2 files changed, 4 insertions(+) diff --git a/pkgs/applications/editors/yi/yi-contrib.nix b/pkgs/applications/editors/yi/yi-contrib.nix index 59b6992a369..2678f0a0048 100644 --- a/pkgs/applications/editors/yi/yi-contrib.nix +++ b/pkgs/applications/editors/yi/yi-contrib.nix @@ -13,7 +13,9 @@ cabal.mkDerivation (self: { homepage = "http://haskell.org/haskellwiki/Yi"; description = "Add-ons to Yi, the Haskell-Scriptable Editor"; license = "GPL"; + broken = true; platforms = self.ghc.meta.platforms; + hydraPlatforms = self.stdenv.lib.platforms.none; maintainers = with self.stdenv.lib.maintainers; [ fuuzetsu ]; }; }) diff --git a/pkgs/applications/editors/yi/yi.nix b/pkgs/applications/editors/yi/yi.nix index ae5e9a83452..9b9287a50f1 100644 --- a/pkgs/applications/editors/yi/yi.nix +++ b/pkgs/applications/editors/yi/yi.nix @@ -58,6 +58,8 @@ cabal.mkDerivation (self: { description = "The Haskell-Scriptable Editor"; license = self.stdenv.lib.licenses.gpl2; platforms = self.ghc.meta.platforms; + hydraPlatforms = self.stdenv.lib.platforms.none; maintainers = [ self.stdenv.lib.maintainers.fuuzetsu ]; + broken = true; }; }) -- GitLab From cbc67e17043adc8c019d30d961986233571b7aba Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 24 Aug 2014 12:57:51 +0200 Subject: [PATCH 216/843] hsyslog: build with a recent version of Cabal on GHC 6.10.4 (and don't run Haddock) --- pkgs/development/libraries/haskell/hsyslog/default.nix | 1 + pkgs/top-level/haskell-defaults.nix | 1 + 2 files changed, 2 insertions(+) diff --git a/pkgs/development/libraries/haskell/hsyslog/default.nix b/pkgs/development/libraries/haskell/hsyslog/default.nix index 1a5cbd5b8e6..89bd035eaf1 100644 --- a/pkgs/development/libraries/haskell/hsyslog/default.nix +++ b/pkgs/development/libraries/haskell/hsyslog/default.nix @@ -7,6 +7,7 @@ cabal.mkDerivation (self: { version = "2.0"; sha256 = "02v698grn43bvikqhqiz9ys8x2amngdmhvl3i0ar9203p2x8q3pq"; testDepends = [ doctest ]; + noHaddock = self.stdenv.lib.versionOlder self.ghc.version "6.11"; meta = { homepage = "http://github.com/peti/hsyslog"; description = "FFI interface to syslog(3) from POSIX.1-2001"; diff --git a/pkgs/top-level/haskell-defaults.nix b/pkgs/top-level/haskell-defaults.nix index 3c5311b83bb..10d453c1d6c 100644 --- a/pkgs/top-level/haskell-defaults.nix +++ b/pkgs/top-level/haskell-defaults.nix @@ -119,6 +119,7 @@ happy = super.happy.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; }; hashable = super.hashable.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; }; hashtables = super.hashtables.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; }; + hsyslog = super.hsyslog.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; }; HTTP = super.HTTP.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; }; HUnit = super.HUnit.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; }; network = super.network_2_2_1_7.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; }; -- GitLab From d72b7796d1a479cae6e9c18b3ae65677ffaee6b9 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 24 Aug 2014 13:08:46 +0200 Subject: [PATCH 217/843] haskell-MonadRandom: add version 0.2 We cannot use it anywhere except HEAD, unfortunately, because the package depends on transformers 0.4.x, which is a core package and cannot be updated. --- .../MonadRandom/{default.nix => 0.1.13.nix} | 0 .../libraries/haskell/MonadRandom/0.2.nix | 15 +++++++++++++++ pkgs/top-level/haskell-defaults.nix | 1 + pkgs/top-level/haskell-packages.nix | 4 +++- 4 files changed, 19 insertions(+), 1 deletion(-) rename pkgs/development/libraries/haskell/MonadRandom/{default.nix => 0.1.13.nix} (100%) create mode 100644 pkgs/development/libraries/haskell/MonadRandom/0.2.nix diff --git a/pkgs/development/libraries/haskell/MonadRandom/default.nix b/pkgs/development/libraries/haskell/MonadRandom/0.1.13.nix similarity index 100% rename from pkgs/development/libraries/haskell/MonadRandom/default.nix rename to pkgs/development/libraries/haskell/MonadRandom/0.1.13.nix diff --git a/pkgs/development/libraries/haskell/MonadRandom/0.2.nix b/pkgs/development/libraries/haskell/MonadRandom/0.2.nix new file mode 100644 index 00000000000..e40a3d8a2c6 --- /dev/null +++ b/pkgs/development/libraries/haskell/MonadRandom/0.2.nix @@ -0,0 +1,15 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, mtl, random, transformers }: + +cabal.mkDerivation (self: { + pname = "MonadRandom"; + version = "0.2"; + sha256 = "0wxn1n47mx7npxzc6iv2hj3ikj3d0s11xsndz2gfm9y5pwm3h44c"; + buildDepends = [ mtl random transformers ]; + meta = { + description = "Random-number generation monad"; + license = "unknown"; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/top-level/haskell-defaults.nix b/pkgs/top-level/haskell-defaults.nix index 10d453c1d6c..bcdcddbc852 100644 --- a/pkgs/top-level/haskell-defaults.nix +++ b/pkgs/top-level/haskell-defaults.nix @@ -23,6 +23,7 @@ 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; }; codex = super.codex.override { hackageDb = super.hackageDb.override { Cabal = self.Cabal_1_20_0_2; }; }; + MonadRandom = self.MonadRandom_0_1_13; # requires transformers >= 0.4.x mtl = self.mtl_2_1_2; }; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index c437e6d582c..66245c72e36 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1623,7 +1623,9 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in MonadPrompt = callPackage ../development/libraries/haskell/MonadPrompt {}; - MonadRandom = callPackage ../development/libraries/haskell/MonadRandom {}; + MonadRandom_0_1_13 = callPackage ../development/libraries/haskell/MonadRandom/0.1.13.nix {}; + MonadRandom_0_2 = callPackage ../development/libraries/haskell/MonadRandom/0.2.nix {}; + MonadRandom = self.MonadRandom_0_2; monadStm = callPackage ../development/libraries/haskell/monad-stm {}; -- GitLab From 70d2f6928d7768e6975dfe8853e4541b7d7b9719 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 24 Aug 2014 13:10:57 +0200 Subject: [PATCH 218/843] Re-generate Haskell packages with cabal2nix. --- pkgs/development/libraries/haskell/MonadRandom/0.1.13.nix | 1 + pkgs/development/libraries/haskell/network/2.5.0.0.nix | 1 + pkgs/development/libraries/haskell/random/1.0.1.1.nix | 1 + 3 files changed, 3 insertions(+) diff --git a/pkgs/development/libraries/haskell/MonadRandom/0.1.13.nix b/pkgs/development/libraries/haskell/MonadRandom/0.1.13.nix index fb2415fd6fa..0cbd926b1f1 100644 --- a/pkgs/development/libraries/haskell/MonadRandom/0.1.13.nix +++ b/pkgs/development/libraries/haskell/MonadRandom/0.1.13.nix @@ -11,5 +11,6 @@ cabal.mkDerivation (self: { description = "Random-number generation monad"; license = "unknown"; platforms = self.ghc.meta.platforms; + hydraPlatforms = self.stdenv.lib.platforms.none; }; }) diff --git a/pkgs/development/libraries/haskell/network/2.5.0.0.nix b/pkgs/development/libraries/haskell/network/2.5.0.0.nix index dd4278a0052..59a338a7907 100644 --- a/pkgs/development/libraries/haskell/network/2.5.0.0.nix +++ b/pkgs/development/libraries/haskell/network/2.5.0.0.nix @@ -17,5 +17,6 @@ cabal.mkDerivation (self: { description = "Low-level networking interface"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; + hydraPlatforms = self.stdenv.lib.platforms.none; }; }) diff --git a/pkgs/development/libraries/haskell/random/1.0.1.1.nix b/pkgs/development/libraries/haskell/random/1.0.1.1.nix index 5a64573a890..031c251fbb7 100644 --- a/pkgs/development/libraries/haskell/random/1.0.1.1.nix +++ b/pkgs/development/libraries/haskell/random/1.0.1.1.nix @@ -11,5 +11,6 @@ cabal.mkDerivation (self: { description = "random number library"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; + hydraPlatforms = self.stdenv.lib.platforms.none; }; }) -- GitLab From cd274d60b210462d82df8bc01e294836b73b3c1d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 24 Aug 2014 13:24:16 +0200 Subject: [PATCH 219/843] haskell-json-schema: jailbreak to fix build with tasty-hunit 0.9.x --- pkgs/development/libraries/haskell/json-schema/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/haskell/json-schema/default.nix b/pkgs/development/libraries/haskell/json-schema/default.nix index 4eb40764673..8ae6763d0a4 100644 --- a/pkgs/development/libraries/haskell/json-schema/default.nix +++ b/pkgs/development/libraries/haskell/json-schema/default.nix @@ -17,6 +17,7 @@ cabal.mkDerivation (self: { aeson attoparsec genericAeson HUnit tagged tasty tastyHunit tastyTh text ]; + jailbreak = true; meta = { description = "Types and type classes for defining JSON schemas"; license = self.stdenv.lib.licenses.bsd3; -- GitLab From 7287a9fd846eb0ea60e06494d1d7cc5d6154c09e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 24 Aug 2014 14:44:48 +0200 Subject: [PATCH 220/843] haskell-hcltest: mark "broken" Can't deal with lens 4.4: http://hydra.cryp.to/build/180379/nixlog/1/raw --- pkgs/development/libraries/haskell/hcltest/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/libraries/haskell/hcltest/default.nix b/pkgs/development/libraries/haskell/hcltest/default.nix index af598965498..01f683b5568 100644 --- a/pkgs/development/libraries/haskell/hcltest/default.nix +++ b/pkgs/development/libraries/haskell/hcltest/default.nix @@ -20,5 +20,7 @@ cabal.mkDerivation (self: { description = "A testing library for command line applications"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; + hydraPlatforms = self.stdenv.lib.platforms.none; + broken = true; }; }) -- GitLab From bd672dc335058c96af6319ef78b32e14c0476b32 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 24 Aug 2014 19:37:41 +0200 Subject: [PATCH 221/843] haskell-arbtt: update to version 0.8.1.1 --- pkgs/applications/misc/arbtt/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/arbtt/default.nix b/pkgs/applications/misc/arbtt/default.nix index 0c3939b5c25..6e4c041ee3d 100644 --- a/pkgs/applications/misc/arbtt/default.nix +++ b/pkgs/applications/misc/arbtt/default.nix @@ -8,8 +8,8 @@ cabal.mkDerivation (self: { pname = "arbtt"; - version = "0.8.1"; - sha256 = "1qzmqjm8pfj59h0hrm28pp6qhzz2am5xq81mirnnchsgg52wrfn0"; + version = "0.8.1.1"; + sha256 = "1qid9qs0sjyqpbnv20rmwjkibjsic9p4kil7gjhwi6panfan9x10"; isLibrary = false; isExecutable = true; buildDepends = [ @@ -21,7 +21,6 @@ cabal.mkDerivation (self: { tastyGolden tastyHunit time transformers utf8String ]; extraLibraries = [ libXScrnSaver ]; - jailbreak = true; meta = { homepage = "http://arbtt.nomeata.de/"; description = "Automatic Rule-Based Time Tracker"; -- GitLab From e7b4a47f449c909e2f57458d93423cd130813d79 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 24 Aug 2014 19:37:43 +0200 Subject: [PATCH 222/843] haskell-auto-update: update to version 0.1.1.2 --- pkgs/development/libraries/haskell/auto-update/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/auto-update/default.nix b/pkgs/development/libraries/haskell/auto-update/default.nix index b7c314f9ff9..e047e938dae 100644 --- a/pkgs/development/libraries/haskell/auto-update/default.nix +++ b/pkgs/development/libraries/haskell/auto-update/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "auto-update"; - version = "0.1.1.1"; - sha256 = "0ksclbh3d7p2511ji86ind8f6jrh58mz61mc441kfz51ippkdk59"; + version = "0.1.1.2"; + sha256 = "0901zqky70wyxl17vwz6smhnpsfjnsk0f2xqiyz902vl7apx66c6"; testDepends = [ hspec ]; meta = { homepage = "https://github.com/yesodweb/wai"; -- GitLab From 9d4faaddbcc37368d2bbe366e34101d863612677 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 24 Aug 2014 19:37:45 +0200 Subject: [PATCH 223/843] haskell-yaml: update to version 0.8.9 --- pkgs/development/libraries/haskell/yaml/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/yaml/default.nix b/pkgs/development/libraries/haskell/yaml/default.nix index b5438fabc12..26cb0dec098 100644 --- a/pkgs/development/libraries/haskell/yaml/default.nix +++ b/pkgs/development/libraries/haskell/yaml/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "yaml"; - version = "0.8.8.4"; - sha256 = "1mh5xv66cqvk0r5n6pwcm11m9489y40l69ca417yvymkksmncc7b"; + version = "0.8.9"; + sha256 = "13qqqil19yi1qbl9gqma6kxwkz8j5iq6z347fabk916gy9jng3dl"; isLibrary = true; isExecutable = true; buildDepends = [ -- GitLab From c6107230dc4a3975ae8c9086850a5b3c0e25a9f2 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 24 Aug 2014 19:38:48 +0200 Subject: [PATCH 224/843] haskell-ghc-mod: update to version 5.0.1.1 --- .../haskell/ghc-mod/{5.0.1.nix => 5.0.1.1.nix} | 11 ++++------- pkgs/top-level/haskell-packages.nix | 10 ++-------- 2 files changed, 6 insertions(+), 15 deletions(-) rename pkgs/development/libraries/haskell/ghc-mod/{5.0.1.nix => 5.0.1.1.nix} (84%) diff --git a/pkgs/development/libraries/haskell/ghc-mod/5.0.1.nix b/pkgs/development/libraries/haskell/ghc-mod/5.0.1.1.nix similarity index 84% rename from pkgs/development/libraries/haskell/ghc-mod/5.0.1.nix rename to pkgs/development/libraries/haskell/ghc-mod/5.0.1.1.nix index 1151cdfa51d..3eefe056218 100644 --- a/pkgs/development/libraries/haskell/ghc-mod/5.0.1.nix +++ b/pkgs/development/libraries/haskell/ghc-mod/5.0.1.1.nix @@ -2,14 +2,14 @@ { cabal, Cabal, convertible, deepseq, djinnGhc, doctest, emacs , filepath, ghcPaths, ghcSybUtils, haskellSrcExts, hlint, hspec -, ioChoice, monadControl, monadJournal, mtl, split, syb, text, time -, transformers, transformersBase, makeWrapper +, ioChoice, makeWrapper, monadControl, monadJournal, mtl, split +, syb, text, time, transformers, transformersBase }: cabal.mkDerivation (self: { pname = "ghc-mod"; - version = "5.0.1"; - sha256 = "01awsi5rfzq6433shfvvnr69ifxb7h8v90mlknxv3dl34zmrhv19"; + version = "5.0.1.1"; + sha256 = "0qyl1653dj14ap3035kjj7xl8rsmgpwh32bj2lnwrmdm2223m8a3"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -25,8 +25,6 @@ cabal.mkDerivation (self: { buildTools = [ emacs makeWrapper ]; doCheck = false; configureFlags = "--datasubdir=${self.pname}-${self.version}"; - # The method used below to wrap ghc-mod and ghc-modi was borrowed from the - # wrapper for haddock. postInstall = '' cd $out/share/$pname-$version make @@ -34,7 +32,6 @@ cabal.mkDerivation (self: { cd .. ensureDir "$out/share/emacs" mv $pname-$version emacs/site-lisp - wrapProgram $out/bin/ghc-mod --add-flags \ "\$(${self.ghc.GHCGetPackages} ${self.ghc.version} \"\$(dirname \$0)\" \"-g -package-db -g\")" wrapProgram $out/bin/ghc-modi --add-flags \ diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 66245c72e36..d5a94dcabeb 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -899,14 +899,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in ghcjsCodemirror = callPackage ../development/libraries/haskell/ghcjs-codemirror {}; - ghcMod_4_1_6 = callPackage ../development/libraries/haskell/ghc-mod/4.1.6.nix { - inherit (pkgs) emacs; - }; - - ghcMod_5_0_1 = callPackage ../development/libraries/haskell/ghc-mod/5.0.1.nix { - inherit (pkgs) emacs; - }; - + ghcMod_4_1_6 = callPackage ../development/libraries/haskell/ghc-mod/4.1.6.nix { inherit (pkgs) emacs; }; + ghcMod_5_0_1_1 = callPackage ../development/libraries/haskell/ghc-mod/5.0.1.1.nix { inherit (pkgs) emacs; }; ghcMod = self.ghcMod_4_1_6; ghcMtl = callPackage ../development/libraries/haskell/ghc-mtl {}; -- GitLab From adfb7f8daa036f4f2b126a5c980666fa54ef0528 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 24 Aug 2014 19:40:43 +0200 Subject: [PATCH 225/843] haskell-MonadRandom: don't try to build version 0.2 on Hydra --- pkgs/development/libraries/haskell/MonadRandom/0.2.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/haskell/MonadRandom/0.2.nix b/pkgs/development/libraries/haskell/MonadRandom/0.2.nix index e40a3d8a2c6..a0f9a2f641f 100644 --- a/pkgs/development/libraries/haskell/MonadRandom/0.2.nix +++ b/pkgs/development/libraries/haskell/MonadRandom/0.2.nix @@ -11,5 +11,6 @@ cabal.mkDerivation (self: { description = "Random-number generation monad"; license = "unknown"; platforms = self.ghc.meta.platforms; + hydraPlatforms = self.stdenv.lib.platforms.none; }; }) -- GitLab From 5af8b24cf28e959b7ec9cb2824f2f882ef72fe54 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 24 Aug 2014 19:43:29 +0200 Subject: [PATCH 226/843] haskell-twitter-conduit: mark package broken MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Web/Twitter/Conduit/Api.hs:643:39: Ambiguous occurrence ‘UploadedMedia’ It could refer to either ‘Web.Twitter.Types.UploadedMedia’, imported from ‘Web.Twitter.Types’ at Web/Twitter/Conduit/Api.hs:136:1-24 or ‘Web.Twitter.Conduit.Types.UploadedMedia’, imported from ‘Web.Twitter.Conduit.Types’ at Web/Twitter/Conduit/Api.hs:137:1-32 (and originally defined at Web/Twitter/Conduit/Types.hs:(99,1)-(103,19)) --- pkgs/development/libraries/haskell/twitter-conduit/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/libraries/haskell/twitter-conduit/default.nix b/pkgs/development/libraries/haskell/twitter-conduit/default.nix index 5b0bf7cd408..0d576680044 100644 --- a/pkgs/development/libraries/haskell/twitter-conduit/default.nix +++ b/pkgs/development/libraries/haskell/twitter-conduit/default.nix @@ -31,5 +31,7 @@ cabal.mkDerivation (self: { license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; maintainers = with self.stdenv.lib.maintainers; [ ocharles ]; + hydraPlatforms = self.stdenv.lib.platforms.none; + broken = true; }; }) -- GitLab From 09b7323abf1eb411054f67aea1a266e260b5b078 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 24 Aug 2014 19:55:14 +0200 Subject: [PATCH 227/843] haskell-yesod-core: disable test suite to fix the build https://github.com/yesodweb/yesod/issues/813 --- pkgs/development/libraries/haskell/yesod-core/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/haskell/yesod-core/default.nix b/pkgs/development/libraries/haskell/yesod-core/default.nix index 90d354a22cf..8f3b90db6c7 100644 --- a/pkgs/development/libraries/haskell/yesod-core/default.nix +++ b/pkgs/development/libraries/haskell/yesod-core/default.nix @@ -31,6 +31,7 @@ cabal.mkDerivation (self: { transformers wai waiExtra waiTest ]; jailbreak = true; + doCheck = false; meta = { homepage = "http://www.yesodweb.com/"; description = "Creation of type-safe, RESTful web applications"; -- GitLab From 2a6c7e2874a3ada9b1c544db61402e03091556db Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 24 Aug 2014 19:55:27 +0200 Subject: [PATCH 228/843] arbtt: jailbreak to fix the build --- pkgs/applications/misc/arbtt/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/misc/arbtt/default.nix b/pkgs/applications/misc/arbtt/default.nix index 6e4c041ee3d..239305c546e 100644 --- a/pkgs/applications/misc/arbtt/default.nix +++ b/pkgs/applications/misc/arbtt/default.nix @@ -21,6 +21,7 @@ cabal.mkDerivation (self: { tastyGolden tastyHunit time transformers utf8String ]; extraLibraries = [ libXScrnSaver ]; + jailbreak = true; meta = { homepage = "http://arbtt.nomeata.de/"; description = "Automatic Rule-Based Time Tracker"; -- GitLab From c9baba9212feb6e39151118647d45b34b029a6df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Sun, 24 Aug 2014 16:21:08 +0200 Subject: [PATCH 229/843] Fix many package descriptions (My OCD kicked in today...) Remove repeated package names, capitalize first word, remove trailing periods and move overlong descriptions to longDescription. I also simplified some descriptions as well, when they were particularly long or technical, often based on Arch Linux' package descriptions. I've tried to stay away from generated expressions (and I think I succeeded). Some specifics worth mentioning: * cron, has "Vixie Cron" in its description. The "Vixie" part is not mentioned anywhere else. I kept it in a parenthesis at the end of the description. * ctags description started with "Exuberant Ctags ...", and the "exuberant" part is not mentioned elsewhere. Kept it in a parenthesis at the end of description. * nix has the description "The Nix Deployment System". Since that doesn't really say much what it is/does (especially after removing the package name!), I changed that to "Powerful package manager that makes package management reliable and reproducible" (borrowed from nixos.org). * Tons of "GNU Foo, Foo is a [the important bits]" descriptions is changed to just [the important bits]. If the package name doesn't contain GNU I don't think it's needed to say it in the description either. --- pkgs/applications/audio/beast/default.nix | 2 +- pkgs/applications/audio/cmus/default.nix | 2 +- pkgs/applications/audio/moc/default.nix | 2 +- pkgs/applications/audio/mp3info/default.nix | 2 +- pkgs/applications/audio/mpc123/default.nix | 2 +- pkgs/applications/audio/mpg321/default.nix | 2 +- pkgs/applications/audio/pamixer/default.nix | 2 +- pkgs/applications/audio/spotify/default.nix | 2 +- pkgs/applications/editors/ed/default.nix | 2 +- pkgs/applications/editors/mg/default.nix | 2 +- pkgs/applications/editors/texmacs/default.nix | 2 +- pkgs/applications/graphics/geeqie/default.nix | 2 +- pkgs/applications/graphics/grafx2/default.nix | 2 +- pkgs/applications/graphics/jbrout/default.nix | 2 +- pkgs/applications/graphics/ocrad/default.nix | 2 +- pkgs/applications/graphics/qiv/default.nix | 2 +- pkgs/applications/graphics/ufraw/default.nix | 2 +- pkgs/applications/graphics/viewnior/default.nix | 2 +- pkgs/applications/graphics/xaos/default.nix | 2 +- pkgs/applications/misc/bitcoin/default.nix | 2 +- pkgs/applications/misc/camlistore/default.nix | 2 +- pkgs/applications/misc/gpsbabel/default.nix | 2 +- pkgs/applications/misc/gv/default.nix | 2 +- pkgs/applications/misc/posterazor/default.nix | 2 +- pkgs/applications/misc/stardict/stardict.nix | 3 +-- pkgs/applications/misc/tangogps/default.nix | 2 +- pkgs/applications/misc/viking/default.nix | 2 +- pkgs/applications/misc/wordnet/default.nix | 2 +- pkgs/applications/misc/xfe/default.nix | 2 +- .../applications/networking/browsers/firefox/default.nix | 2 +- pkgs/applications/networking/browsers/opera/default.nix | 2 +- pkgs/applications/networking/ids/snort/default.nix | 2 +- .../networking/instant-messengers/bitlbee/default.nix | 2 +- .../networking/instant-messengers/carrier/2.5.0.nix | 2 +- .../networking/instant-messengers/ekiga/default.nix | 2 +- .../networking/instant-messengers/fuze/default.nix | 2 +- .../networking/instant-messengers/hipchat/default.nix | 2 +- .../networking/instant-messengers/pidgin/default.nix | 2 +- pkgs/applications/networking/jmeter/default.nix | 2 +- .../networking/mailreaders/notmuch/default.nix | 3 +-- .../applications/networking/newsreaders/slrn/default.nix | 2 +- pkgs/applications/networking/p2p/gnunet/default.nix | 2 +- pkgs/applications/networking/remote/rdesktop/default.nix | 2 +- pkgs/applications/networking/remote/remmina/default.nix | 2 +- pkgs/applications/networking/syncthing/default.nix | 2 +- pkgs/applications/office/gnucash/default.nix | 2 +- pkgs/applications/office/libreoffice/default.nix | 2 +- pkgs/applications/science/astronomy/gravit/default.nix | 2 +- pkgs/applications/science/biology/emboss/default.nix | 2 +- pkgs/applications/science/logic/alt-ergo/default.nix | 2 +- pkgs/applications/science/logic/coq/default.nix | 2 +- pkgs/applications/science/logic/matita/default.nix | 2 +- pkgs/applications/science/logic/prooftree/default.nix | 2 +- pkgs/applications/science/logic/twelf/default.nix | 2 +- pkgs/applications/science/math/fricas/default.nix | 2 +- pkgs/applications/science/math/glsurf/default.nix | 2 +- pkgs/applications/science/math/jags/default.nix | 2 +- pkgs/applications/science/math/maxima/default.nix | 2 +- pkgs/applications/science/misc/fityk/default.nix | 2 +- pkgs/applications/science/misc/simgrid/default.nix | 2 +- .../science/molecular-dynamics/gromacs/default.nix | 2 +- pkgs/applications/science/spyder/default.nix | 2 +- .../version-management/git-and-tools/git/default.nix | 2 +- pkgs/applications/version-management/rcs/default.nix | 2 +- pkgs/applications/video/gnash/default.nix | 2 +- pkgs/applications/video/kino/default.nix | 2 +- pkgs/applications/video/xbmc/default.nix | 2 +- pkgs/applications/window-managers/ratpoison/default.nix | 2 +- pkgs/desktops/e17/enlightenment/default.nix | 2 +- pkgs/development/compilers/bigloo/default.nix | 2 +- pkgs/development/compilers/gambit/default.nix | 2 +- pkgs/development/compilers/hugs/default.nix | 2 +- pkgs/development/compilers/ikarus/default.nix | 2 +- pkgs/development/compilers/mercury/default.nix | 2 +- pkgs/development/compilers/ocaml/3.10.0.nix | 2 +- pkgs/development/compilers/ocaml/3.11.2.nix | 2 +- pkgs/development/compilers/ocaml/3.12.1.nix | 2 +- pkgs/development/compilers/ocaml/4.00.1.nix | 2 +- pkgs/development/compilers/ocaml/4.01.0.nix | 2 +- pkgs/development/compilers/ocaml/ber-metaocaml-003.nix | 2 +- pkgs/development/compilers/qi/default.nix | 2 +- pkgs/development/compilers/rdmd/default.nix | 2 +- pkgs/development/compilers/scala/default.nix | 2 +- pkgs/development/compilers/tinycc/default.nix | 2 +- pkgs/development/interpreters/guile/default.nix | 2 +- pkgs/development/interpreters/maude/default.nix | 2 +- pkgs/development/interpreters/php/5.3.nix | 2 +- pkgs/development/interpreters/php/5.4.nix | 2 +- pkgs/development/interpreters/pypy/2.3/default.nix | 2 +- pkgs/development/libraries/boost/1.44.nix | 2 +- pkgs/development/libraries/boost/1.49.nix | 2 +- pkgs/development/libraries/boost/1.55.nix | 2 +- pkgs/development/libraries/ccrtp/default.nix | 2 +- pkgs/development/libraries/celt/default.nix | 2 +- pkgs/development/libraries/cfitsio/default.nix | 2 +- pkgs/development/libraries/check/default.nix | 2 +- pkgs/development/libraries/chipmunk/default.nix | 2 +- pkgs/development/libraries/cloog/default.nix | 2 +- pkgs/development/libraries/clutter-gst/default.nix | 2 +- pkgs/development/libraries/clutter/default.nix | 2 +- pkgs/development/libraries/fox/default.nix | 2 +- pkgs/development/libraries/gettext/default.nix | 2 +- pkgs/development/libraries/glib/default.nix | 2 +- pkgs/development/libraries/glog/default.nix | 2 +- pkgs/development/libraries/gmp/4.3.2.nix | 2 +- pkgs/development/libraries/gmp/5.0.5.nix | 2 +- pkgs/development/libraries/gmp/5.1.x.nix | 2 +- pkgs/development/libraries/gss/default.nix | 2 +- .../libraries/gstreamer/legacy/gnonlin/default.nix | 2 +- .../libraries/gstreamer/legacy/gstreamer/default.nix | 2 +- pkgs/development/libraries/gtkimageview/default.nix | 2 +- pkgs/development/libraries/gtkmathview/default.nix | 2 +- pkgs/development/libraries/gupnp/default.nix | 2 +- pkgs/development/libraries/hwloc/default.nix | 2 +- pkgs/development/libraries/jasper/default.nix | 2 +- pkgs/development/libraries/java/classpath/default.nix | 2 +- pkgs/development/libraries/java/rhino/default.nix | 2 +- pkgs/development/libraries/libassuan/default.nix | 2 +- pkgs/development/libraries/libcddb/default.nix | 2 +- pkgs/development/libraries/libchamplain/default.nix | 2 +- pkgs/development/libraries/libchop/default.nix | 2 +- pkgs/development/libraries/libdaemon/default.nix | 2 +- pkgs/development/libraries/libdnet/default.nix | 2 +- pkgs/development/libraries/libelf/default.nix | 2 +- pkgs/development/libraries/libevent/default.nix | 2 +- pkgs/development/libraries/libextractor/default.nix | 2 +- pkgs/development/libraries/libgcrypt/default.nix | 2 +- pkgs/development/libraries/libiconv/default.nix | 2 +- pkgs/development/libraries/libidn/default.nix | 2 +- pkgs/development/libraries/libksba/default.nix | 2 +- pkgs/development/libraries/libmicrohttpd/default.nix | 2 +- pkgs/development/libraries/libofa/default.nix | 2 +- pkgs/development/libraries/libsigsegv/default.nix | 2 +- pkgs/development/libraries/libspectre/default.nix | 2 +- pkgs/development/libraries/libtasn1/default.nix | 2 +- pkgs/development/libraries/libunistring/default.nix | 2 +- pkgs/development/libraries/libxmi/default.nix | 2 +- pkgs/development/libraries/lightning/default.nix | 2 +- pkgs/development/libraries/ming/default.nix | 2 +- pkgs/development/libraries/mpc/default.nix | 2 +- pkgs/development/libraries/mpfr/default.nix | 2 +- pkgs/development/libraries/mpich2/default.nix | 2 +- pkgs/development/libraries/ncurses/default.nix | 2 +- pkgs/development/libraries/nettle/default.nix | 2 +- pkgs/development/libraries/oniguruma/default.nix | 2 +- pkgs/development/libraries/opal/default.nix | 2 +- pkgs/development/libraries/openal/default.nix | 2 +- pkgs/development/libraries/plib/default.nix | 2 +- pkgs/development/libraries/ppl/default.nix | 2 +- pkgs/development/libraries/readline/readline6.3.nix | 2 +- pkgs/development/libraries/readline/readline6.nix | 2 +- .../libraries/science/biology/biolib/default.nix | 2 +- pkgs/development/libraries/szip/default.nix | 4 +--- pkgs/development/libraries/talloc/default.nix | 2 +- pkgs/development/libraries/tdb/default.nix | 2 +- pkgs/development/libraries/tecla/default.nix | 2 +- pkgs/development/libraries/ucommon/default.nix | 2 +- pkgs/development/libraries/v8/default.nix | 2 +- pkgs/development/libraries/xapian/default.nix | 2 +- pkgs/development/libraries/xbase/default.nix | 2 +- pkgs/development/libraries/xylib/default.nix | 2 +- pkgs/development/python-modules/ecdsa/default.nix | 4 ++-- pkgs/development/python-modules/numeric/default.nix | 4 ++-- pkgs/development/tools/analysis/lcov/default.nix | 2 +- pkgs/development/tools/analysis/sparse/default.nix | 2 +- pkgs/development/tools/analysis/valgrind/default.nix | 2 +- pkgs/development/tools/build-managers/gradle/default.nix | 2 +- pkgs/development/tools/documentation/doxygen/default.nix | 2 +- pkgs/development/tools/java/fastjar/default.nix | 2 +- pkgs/development/tools/misc/binutils/default.nix | 2 +- pkgs/development/tools/misc/cflow/default.nix | 2 +- pkgs/development/tools/misc/coccinelle/default.nix | 2 +- pkgs/development/tools/misc/complexity/default.nix | 2 +- pkgs/development/tools/misc/cppi/default.nix | 2 +- pkgs/development/tools/misc/cscope/default.nix | 2 +- pkgs/development/tools/misc/ctags/default.nix | 2 +- pkgs/development/tools/misc/gdb/default.nix | 2 +- pkgs/development/tools/misc/gengetopt/default.nix | 2 +- pkgs/development/tools/misc/global/default.nix | 2 +- pkgs/development/tools/misc/gperf/default.nix | 2 +- pkgs/development/tools/misc/help2man/default.nix | 2 +- pkgs/development/tools/misc/libtool/default.nix | 2 +- pkgs/development/tools/misc/sloccount/default.nix | 2 +- pkgs/development/tools/misc/swig/default.nix | 2 +- pkgs/development/tools/misc/texinfo/4.13a.nix | 2 +- pkgs/development/tools/misc/texinfo/5.2.nix | 2 +- pkgs/development/tools/ocaml/omake/default.nix | 2 +- pkgs/development/tools/parsing/bison/2.x.nix | 2 +- pkgs/development/tools/parsing/bison/3.x.nix | 2 +- pkgs/development/tools/profiling/oprofile/default.nix | 2 +- pkgs/development/tools/profiling/sysprof/default.nix | 2 +- pkgs/development/tools/sqsh/default.nix | 2 +- pkgs/games/banner/default.nix | 2 +- pkgs/games/chessdb/default.nix | 2 +- pkgs/games/construo/default.nix | 2 +- pkgs/games/crafty/default.nix | 2 +- pkgs/games/eboard/default.nix | 2 +- pkgs/games/openspades/default.nix | 2 +- pkgs/games/openttd/default.nix | 2 +- pkgs/games/opentyrian/default.nix | 2 +- pkgs/games/teeworlds/default.nix | 2 +- pkgs/misc/ghostscript/default.nix | 4 ++-- pkgs/misc/xosd/default.nix | 2 +- pkgs/os-specific/linux/conky/default.nix | 2 +- pkgs/servers/dico/default.nix | 2 +- pkgs/servers/dns/bind/default.nix | 2 +- pkgs/servers/felix/default.nix | 2 +- pkgs/servers/firebird/default.nix | 2 +- pkgs/servers/http/couchdb/default.nix | 2 +- pkgs/servers/http/jboss/default.nix | 2 +- pkgs/servers/pies/default.nix | 2 +- pkgs/servers/pulseaudio/default.nix | 2 +- pkgs/servers/shishi/default.nix | 2 +- pkgs/shells/rush/default.nix | 2 +- pkgs/tools/X11/hsetroot/default.nix | 2 +- pkgs/tools/X11/wmctrl/default.nix | 2 +- pkgs/tools/X11/xnee/default.nix | 2 +- pkgs/tools/X11/xtrace/default.nix | 2 +- pkgs/tools/admin/tightvnc/default.nix | 2 +- pkgs/tools/archivers/sharutils/default.nix | 2 +- pkgs/tools/backup/partclone/default.nix | 8 +++++++- pkgs/tools/cd-dvd/xorriso/default.nix | 2 +- pkgs/tools/compression/gzip/default.nix | 2 +- pkgs/tools/compression/rzip/default.nix | 2 +- pkgs/tools/filesystems/chunkfs/default.nix | 2 +- pkgs/tools/filesystems/encfs/default.nix | 2 +- pkgs/tools/filesystems/mtools/default.nix | 2 +- pkgs/tools/filesystems/svnfs/default.nix | 2 +- pkgs/tools/filesystems/wdfs/default.nix | 2 +- pkgs/tools/graphics/cuneiform/default.nix | 2 +- pkgs/tools/graphics/plotutils/default.nix | 2 +- pkgs/tools/misc/goaccess/default.nix | 2 +- pkgs/tools/misc/idutils/default.nix | 2 +- pkgs/tools/misc/lbdb/default.nix | 2 +- pkgs/tools/misc/ldapvi/default.nix | 6 +++++- pkgs/tools/misc/minicom/default.nix | 2 +- pkgs/tools/misc/most/default.nix | 3 ++- pkgs/tools/misc/parallel/default.nix | 2 +- pkgs/tools/misc/parted/default.nix | 2 +- pkgs/tools/misc/pg_top/default.nix | 2 +- pkgs/tools/misc/recutils/default.nix | 2 +- pkgs/tools/misc/time/default.nix | 2 +- pkgs/tools/misc/tmpwatch/default.nix | 2 +- pkgs/tools/misc/tmux/default.nix | 2 +- pkgs/tools/misc/yad/default.nix | 2 +- pkgs/tools/networking/cntlm/default.nix | 2 +- pkgs/tools/networking/connman/default.nix | 2 +- pkgs/tools/networking/flvstreamer/default.nix | 2 +- pkgs/tools/networking/host/default.nix | 2 +- pkgs/tools/networking/inetutils/default.nix | 2 +- pkgs/tools/networking/jnettop/default.nix | 2 +- pkgs/tools/networking/lsh/default.nix | 2 +- pkgs/tools/networking/mailutils/default.nix | 2 +- pkgs/tools/networking/minidlna/default.nix | 2 +- pkgs/tools/networking/tcpdump/default.nix | 2 +- pkgs/tools/networking/wget/default.nix | 2 +- pkgs/tools/package-management/nix/default.nix | 9 ++++++++- pkgs/tools/security/scrypt/default.nix | 2 +- pkgs/tools/security/steghide/default.nix | 2 +- pkgs/tools/security/tboot/default.nix | 4 +--- pkgs/tools/security/tor/default.nix | 2 +- pkgs/tools/security/tpm-tools/default.nix | 9 ++++++--- pkgs/tools/security/trousers/default.nix | 2 +- pkgs/tools/system/cron/default.nix | 2 +- pkgs/tools/system/freeipmi/default.nix | 2 +- pkgs/tools/system/hardlink/default.nix | 2 +- pkgs/tools/system/mcron/default.nix | 2 +- pkgs/tools/text/enscript/default.nix | 2 +- pkgs/tools/text/mpage/default.nix | 2 +- pkgs/tools/text/namazu/default.nix | 2 +- pkgs/tools/text/wdiff/default.nix | 2 +- pkgs/tools/typesetting/lout/default.nix | 2 +- pkgs/tools/typesetting/rubber/default.nix | 2 +- pkgs/tools/typesetting/xmlto/default.nix | 2 +- pkgs/tools/video/dvgrab/default.nix | 2 +- 275 files changed, 301 insertions(+), 286 deletions(-) diff --git a/pkgs/applications/audio/beast/default.nix b/pkgs/applications/audio/beast/default.nix index 61b11c05de7..340a83e7963 100644 --- a/pkgs/applications/audio/beast/default.nix +++ b/pkgs/applications/audio/beast/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation { ]; meta = { - description = "BEAST - the Bedevilled Sound Engine"; + description = "A music composition and modular synthesis application"; homepage = http://beast.gtk.org; license = ["GPL-2" "LGPL-2.1"]; }; diff --git a/pkgs/applications/audio/cmus/default.nix b/pkgs/applications/audio/cmus/default.nix index 2ea37e2bd23..4f9c491a3a5 100644 --- a/pkgs/applications/audio/cmus/default.nix +++ b/pkgs/applications/audio/cmus/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { buildInputs = [ ncurses pkgconfig alsaLib flac libmad ffmpeg libvorbis mpc mp4v2 ]; meta = { - description = "cmus is a small, fast and powerful console music player for Linux and *BSD"; + description = "Small, fast and powerful console music player for Linux and *BSD"; homepage = http://cmus.sourceforge.net; license = stdenv.lib.licenses.gpl2; }; diff --git a/pkgs/applications/audio/moc/default.nix b/pkgs/applications/audio/moc/default.nix index e5264f5c3d2..5c6a1d6ac54 100644 --- a/pkgs/applications/audio/moc/default.nix +++ b/pkgs/applications/audio/moc/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { ]; meta = { - description = "MOC (music on console) is a console audio player for LINUX/UNIX designed to be powerful and easy to use."; + description = "An ncurses console audio player designed to be powerful and easy to use"; homepage = http://moc.daper.net/; license = stdenv.lib.licenses.gpl2; }; diff --git a/pkgs/applications/audio/mp3info/default.nix b/pkgs/applications/audio/mp3info/default.nix index 0f33726eaee..ede31ac9beb 100644 --- a/pkgs/applications/audio/mp3info/default.nix +++ b/pkgs/applications/audio/mp3info/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { ''; meta = { - description = "MP3Info, an MP3 technical info viewer and ID3 1.x tag editor"; + description = "MP3 technical info viewer and ID3 1.x tag editor"; longDescription = '' MP3Info is a little utility used to read and modify the ID3 tags of diff --git a/pkgs/applications/audio/mpc123/default.nix b/pkgs/applications/audio/mpc123/default.nix index cd4343b1beb..ac945bee7f7 100644 --- a/pkgs/applications/audio/mpc123/default.nix +++ b/pkgs/applications/audio/mpc123/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://mpc123.sourceforge.net/; - description = "mpc123, a Musepack (.mpc) audio player"; + description = "A Musepack (.mpc) audio player"; license = stdenv.lib.licenses.gpl2Plus; diff --git a/pkgs/applications/audio/mpg321/default.nix b/pkgs/applications/audio/mpg321/default.nix index e58397350cb..939c9f79e4d 100644 --- a/pkgs/applications/audio/mpg321/default.nix +++ b/pkgs/applications/audio/mpg321/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { buildInputs = [libao libid3tag libmad zlib]; meta = { - description = "mpg321, a command-line MP3 player"; + description = "Command-line MP3 player"; homepage = http://mpg321.sourceforge.net/; license = stdenv.lib.licenses.gpl2; maintainers = [ ]; diff --git a/pkgs/applications/audio/pamixer/default.nix b/pkgs/applications/audio/pamixer/default.nix index acdda1799d0..d273c238177 100644 --- a/pkgs/applications/audio/pamixer/default.nix +++ b/pkgs/applications/audio/pamixer/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - description = "pamixer is like amixer but for pulseaudio."; + description = "Like amixer but for pulseaudio"; longDescription = "Features: - Get the current volume of the default sink, the default source or a selected one by his id - Set the volume for the default sink, the default source or any other device diff --git a/pkgs/applications/audio/spotify/default.nix b/pkgs/applications/audio/spotify/default.nix index 59b82d155da..47919a7d7f8 100644 --- a/pkgs/applications/audio/spotify/default.nix +++ b/pkgs/applications/audio/spotify/default.nix @@ -148,7 +148,7 @@ stdenv.mkDerivation { meta = { homepage = https://www.spotify.com/; - description = "Spotify for Linux allows you to play music from the Spotify music service"; + description = "Play music from the Spotify music service"; license = stdenv.lib.licenses.unfree; maintainers = [ stdenv.lib.maintainers.eelco ]; }; diff --git a/pkgs/applications/editors/ed/default.nix b/pkgs/applications/editors/ed/default.nix index d3e9a4c4679..0c764fcf8f8 100644 --- a/pkgs/applications/editors/ed/default.nix +++ b/pkgs/applications/editors/ed/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { }; meta = { - description = "GNU ed, an implementation of the standard Unix editor"; + description = "An implementation of the standard Unix editor"; longDescription = '' GNU ed is a line-oriented text editor. It is used to create, diff --git a/pkgs/applications/editors/mg/default.nix b/pkgs/applications/editors/mg/default.nix index 058a54c45a7..6901aed774b 100644 --- a/pkgs/applications/editors/mg/default.nix +++ b/pkgs/applications/editors/mg/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://homepage.boetes.org/software/mg/; - description = "mg is Micro GNU/emacs, this is a portable version of the mg maintained by the OpenBSD team"; + description = "Micro GNU/emacs, a portable version of the mg maintained by the OpenBSD team"; license = "public domain"; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/applications/editors/texmacs/default.nix b/pkgs/applications/editors/texmacs/default.nix index ce863312251..a258b634105 100644 --- a/pkgs/applications/editors/texmacs/default.nix +++ b/pkgs/applications/editors/texmacs/default.nix @@ -67,7 +67,7 @@ stdenv.mkDerivation rec { "${xmodmap}/bin:${which}/bin"; meta = { - description = "GNU TeXmacs, a free WYSIWYW editing platform with special features for scientists"; + description = "WYSIWYW editing platform with special features for scientists"; longDescription = '' GNU TeXmacs is a free wysiwyw (what you see is what you want) editing platform with special features for scientists. The software diff --git a/pkgs/applications/graphics/geeqie/default.nix b/pkgs/applications/graphics/geeqie/default.nix index b170b784aaa..de906e3d844 100644 --- a/pkgs/applications/graphics/geeqie/default.nix +++ b/pkgs/applications/graphics/geeqie/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { ''; meta = { - description = "Geeqie, a lightweight GTK+ based image viewer"; + description = "Lightweight GTK+ based image viewer"; longDescription = '' diff --git a/pkgs/applications/graphics/grafx2/default.nix b/pkgs/applications/graphics/grafx2/default.nix index 6b7c9a27694..ee9df683c0a 100644 --- a/pkgs/applications/graphics/grafx2/default.nix +++ b/pkgs/applications/graphics/grafx2/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { installPhase = ''make install prefix="$out"''; meta = { - description = "GrafX2 is a bitmap paint program inspired by the Amiga programs Deluxe Paint and Brilliance."; + description = "Bitmap paint program inspired by the Amiga programs Deluxe Paint and Brilliance"; homepage = http://code.google.co/p/grafx2/; license = stdenv.lib.licenses.gpl2; platforms = [ "x86_64-linux" "i686-linux" ]; diff --git a/pkgs/applications/graphics/jbrout/default.nix b/pkgs/applications/graphics/jbrout/default.nix index 2207e8884f0..496078ffdb2 100644 --- a/pkgs/applications/graphics/jbrout/default.nix +++ b/pkgs/applications/graphics/jbrout/default.nix @@ -33,7 +33,7 @@ buildPythonPackage { buildInputs = [ python pyGtkGlade makeWrapper pyexiv2 lxml pil fbida which ]; meta = { homepage = "http://code.google.com/p/jbrout"; - description = "jBrout is a photo manager"; + description = "Photo manager"; platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/applications/graphics/ocrad/default.nix b/pkgs/applications/graphics/ocrad/default.nix index 4c20a41061a..201b59ad5e1 100644 --- a/pkgs/applications/graphics/ocrad/default.nix +++ b/pkgs/applications/graphics/ocrad/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { doCheck = true; meta = { - description = "GNU Ocrad, optical character recognition (OCR) program & library"; + description = "Optical character recognition (OCR) program & library"; longDescription = '' GNU Ocrad is an OCR (Optical Character Recognition) program based on diff --git a/pkgs/applications/graphics/qiv/default.nix b/pkgs/applications/graphics/qiv/default.nix index 86891f2cb93..01b0a1414a7 100644 --- a/pkgs/applications/graphics/qiv/default.nix +++ b/pkgs/applications/graphics/qiv/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation (rec { ''; meta = { - description = "qiv (quick image viewer)"; + description = "Quick image viewer"; homepage = http://spiegl.de/qiv/; inherit version; }; diff --git a/pkgs/applications/graphics/ufraw/default.nix b/pkgs/applications/graphics/ufraw/default.nix index 783832abd00..dbfda4e5819 100644 --- a/pkgs/applications/graphics/ufraw/default.nix +++ b/pkgs/applications/graphics/ufraw/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://ufraw.sourceforge.net/; - description = "UFRaw, a utility to read and manipulate raw images from digital cameras"; + description = "Utility to read and manipulate raw images from digital cameras"; longDescription = '' The Unidentified Flying Raw (UFRaw) is a utility to read and diff --git a/pkgs/applications/graphics/viewnior/default.nix b/pkgs/applications/graphics/viewnior/default.nix index dd8e01298ff..478553d2c00 100644 --- a/pkgs/applications/graphics/viewnior/default.nix +++ b/pkgs/applications/graphics/viewnior/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { ''; meta = { - description = "Viewnior is a fast and simple image viewer for GNU/Linux"; + description = "Fast and simple image viewer"; longDescription = '' Viewnior is insipred by big projects like Eye of Gnome, because of it's usability and richness,and by GPicView, because of it's lightweight design and diff --git a/pkgs/applications/graphics/xaos/default.nix b/pkgs/applications/graphics/xaos/default.nix index 8387b3486d4..cacefc9bcc1 100644 --- a/pkgs/applications/graphics/xaos/default.nix +++ b/pkgs/applications/graphics/xaos/default.nix @@ -28,7 +28,7 @@ rec { name = "xaos-" + version; meta = { homepage = http://xaos.sourceforge.net/; - description = "XaoS - fractal viewer"; + description = "Fractal viewer"; license = a.stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/applications/misc/bitcoin/default.nix b/pkgs/applications/misc/bitcoin/default.nix index e38d427be8d..d7c1fbc487b 100644 --- a/pkgs/applications/misc/bitcoin/default.nix +++ b/pkgs/applications/misc/bitcoin/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = { - description = "Bitcoin is a peer-to-peer currency"; + description = "Peer-to-peer electronic cash system"; longDescription= '' Bitcoin is a free open source peer-to-peer electronic cash system that is completely decentralized, without the need for a central server or trusted diff --git a/pkgs/applications/misc/camlistore/default.nix b/pkgs/applications/misc/camlistore/default.nix index 56131425ab4..9adac335c0c 100644 --- a/pkgs/applications/misc/camlistore/default.nix +++ b/pkgs/applications/misc/camlistore/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - description = "Camlistore is a way of storing, syncing, sharing, modelling and backing up content"; + description = "A way of storing, syncing, sharing, modelling and backing up content"; homepage = https://camlistore.org; license = licenses.asl20; maintainers = with maintainers; [ cstrahan ]; diff --git a/pkgs/applications/misc/gpsbabel/default.nix b/pkgs/applications/misc/gpsbabel/default.nix index bf44f91056d..5d4c2634952 100644 --- a/pkgs/applications/misc/gpsbabel/default.nix +++ b/pkgs/applications/misc/gpsbabel/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation { doCheck = true; meta = { - description = "GPSBabel, a tool to convert, upload and download data from GPS and Map programs"; + description = "Convert, upload and download data from GPS and Map programs"; longDescription = '' GPSBabel converts waypoints, tracks, and routes between popular diff --git a/pkgs/applications/misc/gv/default.nix b/pkgs/applications/misc/gv/default.nix index 4867bef1f71..3fad634b18b 100644 --- a/pkgs/applications/misc/gv/default.nix +++ b/pkgs/applications/misc/gv/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation { meta = { homepage = http://www.gnu.org/software/gv/; - description = "GNU gv, a PostScript/PDF document viewer"; + description = "PostScript/PDF document viewer"; longDescription = '' GNU gv allows users to view and navigate through PostScript and diff --git a/pkgs/applications/misc/posterazor/default.nix b/pkgs/applications/misc/posterazor/default.nix index 0cad2fbd2cd..38fac21322c 100644 --- a/pkgs/applications/misc/posterazor/default.nix +++ b/pkgs/applications/misc/posterazor/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://posterazor.sourceforge.net/"; - description = "The PosteRazor cuts a raster image into pieces which can afterwards be printed out and assembled to a poster"; + description = "Cuts a raster image into pieces which can afterwards be printed out and assembled to a poster"; maintainers = [ stdenv.lib.maintainers.madjar ]; platforms = stdenv.lib.platforms.all; }; diff --git a/pkgs/applications/misc/stardict/stardict.nix b/pkgs/applications/misc/stardict/stardict.nix index 1ca8ec045d6..d4c41edde30 100644 --- a/pkgs/applications/misc/stardict/stardict.nix +++ b/pkgs/applications/misc/stardict/stardict.nix @@ -37,8 +37,7 @@ stdenv.mkDerivation rec { ''; meta = { - description = "stardict"; - homepage = "A international dictionary supporting fuzzy and glob style matching"; + description = "An international dictionary supporting fuzzy and glob style matching"; license = stdenv.lib.licenses.lgpl3; maintainers = with stdenv.lib.maintainers; [qknight]; }; diff --git a/pkgs/applications/misc/tangogps/default.nix b/pkgs/applications/misc/tangogps/default.nix index aa1df2c9d1a..0a2c1c88c23 100644 --- a/pkgs/applications/misc/tangogps/default.nix +++ b/pkgs/applications/misc/tangogps/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { ''; meta = { - description = "tangoGPS, a user friendly map and GPS user interface"; + description = "User friendly map and GPS user interface"; longDescription = '' tangoGPS is an easy to use, fast and lightweight mapping diff --git a/pkgs/applications/misc/viking/default.nix b/pkgs/applications/misc/viking/default.nix index 6508b12e1de..9afabe0372d 100644 --- a/pkgs/applications/misc/viking/default.nix +++ b/pkgs/applications/misc/viking/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation { doCheck = true; meta = { - description = "Viking, a GPS data editor and analyzer"; + description = "GPS data editor and analyzer"; longDescription = '' Viking is a free/open source program to manage GPS data. You diff --git a/pkgs/applications/misc/wordnet/default.nix b/pkgs/applications/misc/wordnet/default.nix index 7594014d769..6ead69db220 100644 --- a/pkgs/applications/misc/wordnet/default.nix +++ b/pkgs/applications/misc/wordnet/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation { ''; meta = { - description = "WordNet, a lexical database for the English language"; + description = "Lexical database for the English language"; longDescription = '' WordNet® is a large lexical database of English. Nouns, verbs, diff --git a/pkgs/applications/misc/xfe/default.nix b/pkgs/applications/misc/xfe/default.nix index d09a899b897..e216b19fab5 100644 --- a/pkgs/applications/misc/xfe/default.nix +++ b/pkgs/applications/misc/xfe/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = { - description = "X File Explorer (Xfe) is an MS-Explorer like file manager for X"; + description = "MS-Explorer like file manager for X"; longDescription = '' X File Explorer (Xfe) is an MS-Explorer like file manager for X. It is based on the popular, but discontinued, X Win Commander, which was developed by Maxim Baranov. diff --git a/pkgs/applications/networking/browsers/firefox/default.nix b/pkgs/applications/networking/browsers/firefox/default.nix index ad2ea75bd70..e23a6d94ec1 100644 --- a/pkgs/applications/networking/browsers/firefox/default.nix +++ b/pkgs/applications/networking/browsers/firefox/default.nix @@ -94,7 +94,7 @@ stdenv.mkDerivation rec { ''; meta = { - description = "Mozilla Firefox - the browser, reloaded"; + description = "Web browser"; homepage = http://www.mozilla.com/en-US/firefox/; maintainers = with lib.maintainers; [ eelco wizeman ]; platforms = lib.platforms.linux; diff --git a/pkgs/applications/networking/browsers/opera/default.nix b/pkgs/applications/networking/browsers/opera/default.nix index 80b09bcd8a8..201a6b947c1 100644 --- a/pkgs/applications/networking/browsers/opera/default.nix +++ b/pkgs/applications/networking/browsers/opera/default.nix @@ -81,6 +81,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.opera.com; - description = "The Opera web browser"; + description = "Web browser"; }; } diff --git a/pkgs/applications/networking/ids/snort/default.nix b/pkgs/applications/networking/ids/snort/default.nix index 858e99c245b..580591c18ad 100644 --- a/pkgs/applications/networking/ids/snort/default.nix +++ b/pkgs/applications/networking/ids/snort/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { buildInputs = [ libpcap pcre libdnet daq zlib flex bison ]; meta = { - description = "Snort is an open source network intrusion prevention and detection system (IDS/IPS)"; + description = "Network intrusion prevention and detection system (IDS/IPS)"; homepage = http://www.snort.org; license = stdenv.lib.licenses.gpl2; }; diff --git a/pkgs/applications/networking/instant-messengers/bitlbee/default.nix b/pkgs/applications/networking/instant-messengers/bitlbee/default.nix index ec614bf4b8c..cf10c1e6fe2 100644 --- a/pkgs/applications/networking/instant-messengers/bitlbee/default.nix +++ b/pkgs/applications/networking/instant-messengers/bitlbee/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { doCheck = true; meta = { - description = "BitlBee, an IRC to other chat networks gateway"; + description = "IRC instant messaging gateway"; longDescription = '' BitlBee brings IM (instant messaging) to IRC clients. It's a diff --git a/pkgs/applications/networking/instant-messengers/carrier/2.5.0.nix b/pkgs/applications/networking/instant-messengers/carrier/2.5.0.nix index 9cf2558ef32..909d6404193 100644 --- a/pkgs/applications/networking/instant-messengers/carrier/2.5.0.nix +++ b/pkgs/applications/networking/instant-messengers/carrier/2.5.0.nix @@ -41,7 +41,7 @@ rec { name = "carrier-2.5.0"; meta = { - description = "Carrier - PidginIM GUI fork with user-friendly development model"; + description = "PidginIM GUI fork with user-friendly development model"; homepage = http://funpidgin.sf.net; }; } // (if externalPurple2 then { diff --git a/pkgs/applications/networking/instant-messengers/ekiga/default.nix b/pkgs/applications/networking/instant-messengers/ekiga/default.nix index 07730a8c0ee..e46956f3cca 100644 --- a/pkgs/applications/networking/instant-messengers/ekiga/default.nix +++ b/pkgs/applications/networking/instant-messengers/ekiga/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - description = "Ekiga SIP client"; + description = "VOIP/Videoconferencing app with full SIP and H.323 support"; maintainers = [ maintainers.raskin ]; platforms = platforms.linux; }; diff --git a/pkgs/applications/networking/instant-messengers/fuze/default.nix b/pkgs/applications/networking/instant-messengers/fuze/default.nix index 9ccada87fe2..41ffb421f8e 100644 --- a/pkgs/applications/networking/instant-messengers/fuze/default.nix +++ b/pkgs/applications/networking/instant-messengers/fuze/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation { ''; meta = { - description = "Fuze for Linux"; + description = "Internet and mobile based unified communications solutions (Linux client)"; homepage = http://www.fuzebox.com; license = "unknown"; }; diff --git a/pkgs/applications/networking/instant-messengers/hipchat/default.nix b/pkgs/applications/networking/instant-messengers/hipchat/default.nix index 6da12905f56..cf4c2e22ad6 100644 --- a/pkgs/applications/networking/instant-messengers/hipchat/default.nix +++ b/pkgs/applications/networking/instant-messengers/hipchat/default.nix @@ -94,7 +94,7 @@ stdenv.mkDerivation { ''; meta = { - description = "HipChat Desktop Client"; + description = "Desktop client for HipChat services"; homepage = http://www.hipchat.com; license = stdenv.lib.licenses.unfree; platforms = [ "i686-linux" "x86_64-linux" ]; diff --git a/pkgs/applications/networking/instant-messengers/pidgin/default.nix b/pkgs/applications/networking/instant-messengers/pidgin/default.nix index 6e6fd6d0eb6..814a191c457 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin/default.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { + (lib.optionalString (gnutls != null) " --enable-gnutls=yes --enable-nss=no") ; meta = with stdenv.lib; { - description = "Pidgin IM - XMPP(Jabber), AIM/ICQ, IRC, SIP etc client"; + description = "Multi-protocol instant messaging client"; homepage = http://pidgin.im; license = licenses.gpl2Plus; platforms = platforms.linux; diff --git a/pkgs/applications/networking/jmeter/default.nix b/pkgs/applications/networking/jmeter/default.nix index 2d5e6b66bf0..77aeb64478f 100644 --- a/pkgs/applications/networking/jmeter/default.nix +++ b/pkgs/applications/networking/jmeter/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { ''; meta = { - description = "Apache JMeter is a 100% pure Java desktop application designed to load test functional behavior and measure performance."; + description = "A 100% pure Java desktop application designed to load test functional behavior and measure performance"; longDescription = '' The Apache JMeter desktop application is open source software, a 100% pure Java application designed to load test functional behavior and diff --git a/pkgs/applications/networking/mailreaders/notmuch/default.nix b/pkgs/applications/networking/mailreaders/notmuch/default.nix index 7a1eddfa869..75ccb93ca95 100644 --- a/pkgs/applications/networking/mailreaders/notmuch/default.nix +++ b/pkgs/applications/networking/mailreaders/notmuch/default.nix @@ -70,8 +70,7 @@ stdenv.mkDerivation rec { checkTarget = "test"; meta = { - description = "Notmuch -- The mail indexer"; - longDescription = ""; + description = "Mail indexer"; license = stdenv.lib.licenses.gpl3; maintainers = with stdenv.lib.maintainers; [ chaoflow garbas ]; platforms = stdenv.lib.platforms.gnu; diff --git a/pkgs/applications/networking/newsreaders/slrn/default.nix b/pkgs/applications/networking/newsreaders/slrn/default.nix index c933460af43..fe13c756bd7 100644 --- a/pkgs/applications/networking/newsreaders/slrn/default.nix +++ b/pkgs/applications/networking/newsreaders/slrn/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation { buildInputs = [ slang ncurses ]; meta = { - description = "The slrn (S-Lang read news) newsreader"; + description = "Text-based newsreader"; homepage = http://slrn.sourceforge.net/index.html; license = stdenv.lib.licenses.gpl2; }; diff --git a/pkgs/applications/networking/p2p/gnunet/default.nix b/pkgs/applications/networking/p2p/gnunet/default.nix index 6c28840f7e5..052c5311253 100644 --- a/pkgs/applications/networking/p2p/gnunet/default.nix +++ b/pkgs/applications/networking/p2p/gnunet/default.nix @@ -54,7 +54,7 @@ stdenv.mkDerivation rec { */ meta = { - description = "GNUnet, GNU's decentralized anonymous and censorship-resistant P2P framework"; + description = "GNU's decentralized anonymous and censorship-resistant P2P framework"; longDescription = '' GNUnet is a framework for secure peer-to-peer networking that diff --git a/pkgs/applications/networking/remote/rdesktop/default.nix b/pkgs/applications/networking/remote/rdesktop/default.nix index 9ba9e3aa3fc..09c20618d66 100644 --- a/pkgs/applications/networking/remote/rdesktop/default.nix +++ b/pkgs/applications/networking/remote/rdesktop/default.nix @@ -19,6 +19,6 @@ stdenv.mkDerivation (rec { ]; meta = { - description = "rdesktop is an open source client for Windows Terminal Services"; + description = "Open source client for Windows Terminal Services"; }; }) diff --git a/pkgs/applications/networking/remote/remmina/default.nix b/pkgs/applications/networking/remote/remmina/default.nix index 8fb929d53e1..8304f6dc091 100644 --- a/pkgs/applications/networking/remote/remmina/default.nix +++ b/pkgs/applications/networking/remote/remmina/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation { meta = with stdenv.lib; { license = stdenv.lib.licenses.gpl2; homepage = "http://remmina.sourceforge.net/"; - description = "Remmina is a remote desktop client written in GTK+"; + description = "Remote desktop client written in GTK+"; maintainers = []; platforms = platforms.linux; }; diff --git a/pkgs/applications/networking/syncthing/default.nix b/pkgs/applications/networking/syncthing/default.nix index 226b7f6d097..64bf287b44f 100644 --- a/pkgs/applications/networking/syncthing/default.nix +++ b/pkgs/applications/networking/syncthing/default.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://syncthing.net/; - description = "Syncthing replaces Dropbox and BitTorrent Sync with something open, trustworthy and decentralized"; + description = "Replaces Dropbox and BitTorrent Sync with something open, trustworthy and decentralized"; license = with stdenv.lib.licenses; mit; maintainers = with stdenv.lib.maintainers; [ matejc ]; platforms = with stdenv.lib.platforms; linux; diff --git a/pkgs/applications/office/gnucash/default.nix b/pkgs/applications/office/gnucash/default.nix index 9c255f493d3..8d6de404f98 100644 --- a/pkgs/applications/office/gnucash/default.nix +++ b/pkgs/applications/office/gnucash/default.nix @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = { - description = "GnuCash, a personal and small-business financial-accounting application"; + description = "Personal and small-business financial-accounting application"; longDescription = '' GnuCash is personal and small-business financial-accounting software, diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix index 41cf1ebc33d..63d4db20af3 100644 --- a/pkgs/applications/office/libreoffice/default.nix +++ b/pkgs/applications/office/libreoffice/default.nix @@ -252,7 +252,7 @@ stdenv.mkDerivation rec { ]; meta = with stdenv.lib; { - description = "LibreOffice is a comprehensive, professional-quality productivity suite, a variant of openoffice.org"; + description = "Comprehensive, professional-quality productivity suite, a variant of openoffice.org"; homepage = http://libreoffice.org/; license = licenses.lgpl3; maintainers = [ maintainers.viric maintainers.raskin ]; diff --git a/pkgs/applications/science/astronomy/gravit/default.nix b/pkgs/applications/science/astronomy/gravit/default.nix index 696890f95f1..1be1328da27 100644 --- a/pkgs/applications/science/astronomy/gravit/default.nix +++ b/pkgs/applications/science/astronomy/gravit/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://gravit.slowchop.com"; - description = "A beautiful OpenGL-based gravity simulator"; + description = "Beautiful OpenGL-based gravity simulator"; license = stdenv.lib.licenses.gpl2; longDescription = '' diff --git a/pkgs/applications/science/biology/emboss/default.nix b/pkgs/applications/science/biology/emboss/default.nix index 96181c8ee6c..c9974660da3 100644 --- a/pkgs/applications/science/biology/emboss/default.nix +++ b/pkgs/applications/science/biology/emboss/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation { # ''; meta = { - description = "EMBOSS is 'The European Molecular Biology Open Software Suite'"; + description = "The European Molecular Biology Open Software Suite"; longDescription = ''EMBOSS is a free Open Source software analysis package specially developed for the needs of the molecular biology (e.g. EMBnet) user community, including libraries. The software automatically copes with diff --git a/pkgs/applications/science/logic/alt-ergo/default.nix b/pkgs/applications/science/logic/alt-ergo/default.nix index 2a95d0cd65b..62359baf2bc 100644 --- a/pkgs/applications/science/logic/alt-ergo/default.nix +++ b/pkgs/applications/science/logic/alt-ergo/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { [ ocaml findlib ocamlgraph zarith lablgtk gmp ]; meta = { - description = "Alt-Ergo is a high-performance theorem prover and SMT solver"; + description = "High-performance theorem prover and SMT solver"; homepage = "http://alt-ergo.ocamlpro.com/"; license = stdenv.lib.licenses.cecill-c; # LGPL-2 compatible platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/applications/science/logic/coq/default.nix b/pkgs/applications/science/logic/coq/default.nix index 678ec6a4b04..da77a4c5a9a 100644 --- a/pkgs/applications/science/logic/coq/default.nix +++ b/pkgs/applications/science/logic/coq/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation { buildFlags = "revision coq coqide"; meta = { - description = "Coq proof assistant"; + description = "Formal proof management system"; longDescription = '' Coq is a formal proof management system. It provides a formal language to write mathematical definitions, executable algorithms and theorems diff --git a/pkgs/applications/science/logic/matita/default.nix b/pkgs/applications/science/logic/matita/default.nix index f601f97de62..0f393b419f1 100644 --- a/pkgs/applications/science/logic/matita/default.nix +++ b/pkgs/applications/science/logic/matita/default.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation { meta = { homepage = http://matita.cs.unibo.it/; - description = "Matita is an experimental, interactive theorem prover"; + description = "Experimental, interactive theorem prover"; license = stdenv.lib.licenses.gpl2Plus; maintainers = [ stdenv.lib.maintainers.roconnor ]; }; diff --git a/pkgs/applications/science/logic/prooftree/default.nix b/pkgs/applications/science/logic/prooftree/default.nix index caaf4a94a1e..94b1d590762 100644 --- a/pkgs/applications/science/logic/prooftree/default.nix +++ b/pkgs/applications/science/logic/prooftree/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation (rec { configureFlags = [ "--prefix" "$(out)" ]; meta = { - description = "Prooftree is a program for proof-tree visualization"; + description = "A program for proof-tree visualization"; longDescription = '' Prooftree is a program for proof-tree visualization during interactive proof development in a theorem prover. It is currently being developed diff --git a/pkgs/applications/science/logic/twelf/default.nix b/pkgs/applications/science/logic/twelf/default.nix index c6c7e4d9c1a..f9680b47579 100644 --- a/pkgs/applications/science/logic/twelf/default.nix +++ b/pkgs/applications/science/logic/twelf/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { ''; meta = { - description = "Twelf logic proof assistant"; + description = "Logic proof assistant"; longDescription = '' Twelf is a language used to specify, implement, and prove properties of deductive systems such as programming languages and logics. Large diff --git a/pkgs/applications/science/math/fricas/default.nix b/pkgs/applications/science/math/fricas/default.nix index 1817c43ed7b..6e187843404 100644 --- a/pkgs/applications/science/math/fricas/default.nix +++ b/pkgs/applications/science/math/fricas/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://fricas.sourceforge.net/; - description = "Fricas CAS"; + description = "An advanced computer algebra system"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.linux; diff --git a/pkgs/applications/science/math/glsurf/default.nix b/pkgs/applications/science/math/glsurf/default.nix index c4352c46f92..1439d327d6e 100644 --- a/pkgs/applications/science/math/glsurf/default.nix +++ b/pkgs/applications/science/math/glsurf/default.nix @@ -26,6 +26,6 @@ stdenv.mkDerivation { meta = { homepage = http://www.lama.univ-savoie.fr/~raffalli/glsurf; - description = "GlSurf: a program to draw implicit surfaces and curves"; + description = "A program to draw implicit surfaces and curves"; }; } diff --git a/pkgs/applications/science/math/jags/default.nix b/pkgs/applications/science/math/jags/default.nix index a93386149bd..785c2460bb4 100644 --- a/pkgs/applications/science/math/jags/default.nix +++ b/pkgs/applications/science/math/jags/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { buildInputs = [gfortran liblapack blas]; meta = { - description = "JAGS: Just Another Gibbs Sampler"; + description = "Just Another Gibbs Sampler"; license = "GPL2"; homepage = http://www-ice.iarc.fr/~martyn/software/jags/; maintainers = [stdenv.lib.maintainers.andres]; diff --git a/pkgs/applications/science/math/maxima/default.nix b/pkgs/applications/science/math/maxima/default.nix index 096796a859d..3277d94d99b 100644 --- a/pkgs/applications/science/math/maxima/default.nix +++ b/pkgs/applications/science/math/maxima/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation { enableParallelBuilding = true; meta = { - description = "Maxima computer algebra system"; + description = "Computer algebra system"; homepage = "http://maxima.sourceforge.net"; license = stdenv.lib.licenses.gpl2; diff --git a/pkgs/applications/science/misc/fityk/default.nix b/pkgs/applications/science/misc/fityk/default.nix index db79839ba66..4c93eef2b1c 100644 --- a/pkgs/applications/science/misc/fityk/default.nix +++ b/pkgs/applications/science/misc/fityk/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation { buildInputs = [wxGTK30 boost lua zlib bzip2 xylib readline gnuplot ]; meta = { - description = "Fityk -- curve fitting and peak fitting software"; + description = "Curve fitting and peak fitting software"; license = "GPL2"; homepage = http://fityk.nieto.pl/; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/applications/science/misc/simgrid/default.nix b/pkgs/applications/science/misc/simgrid/default.nix index 29a7caf769b..7656668f056 100644 --- a/pkgs/applications/science/misc/simgrid/default.nix +++ b/pkgs/applications/science/misc/simgrid/default.nix @@ -67,7 +67,7 @@ stdenv.mkDerivation rec { doCheck = false; meta = { - description = "SimGrid, a simulator for distributed applications in heterogeneous environments"; + description = "Simulator for distributed applications in heterogeneous environments"; longDescription = '' SimGrid is a toolkit that provides core functionalities for the diff --git a/pkgs/applications/science/molecular-dynamics/gromacs/default.nix b/pkgs/applications/science/molecular-dynamics/gromacs/default.nix index b9abf7b55b4..879690bc91e 100644 --- a/pkgs/applications/science/molecular-dynamics/gromacs/default.nix +++ b/pkgs/applications/science/molecular-dynamics/gromacs/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation { meta = { homepage = "http://www.gromacs.org"; license = "GPLv2"; - description = "The GROMACS molecular dynamics software package"; + description = "Molecular dynamics software package"; longDescription = '' GROMACS is a versatile package to perform molecular dynamics, i.e. simulate the Newtonian equations of motion for systems diff --git a/pkgs/applications/science/spyder/default.nix b/pkgs/applications/science/spyder/default.nix index 1079a153ca1..806d2f546cf 100644 --- a/pkgs/applications/science/spyder/default.nix +++ b/pkgs/applications/science/spyder/default.nix @@ -43,7 +43,7 @@ buildPythonPackage rec { ''; meta = with stdenv.lib; { - description = "Scientific PYthon Development EnviRonment (SPYDER)"; + description = "Scientific python development environment"; longDescription = '' Spyder (previously known as Pydee) is a powerful interactive development environment for the Python language with advanced editing, interactive 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 a4d16e46060..877c65afccf 100644 --- a/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -133,7 +133,7 @@ stdenv.mkDerivation { meta = { homepage = http://git-scm.com/; - description = "Git, a popular distributed version control system"; + description = "Distributed version control system"; license = stdenv.lib.licenses.gpl2Plus; longDescription = '' diff --git a/pkgs/applications/version-management/rcs/default.nix b/pkgs/applications/version-management/rcs/default.nix index e71d23132ac..823638669b6 100644 --- a/pkgs/applications/version-management/rcs/default.nix +++ b/pkgs/applications/version-management/rcs/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.gnu.org/software/rcs/; - description = "GNU RCS, a revision control system"; + description = "Revision control system"; longDescription = '' The GNU Revision Control System (RCS) manages multiple revisions of files. RCS automates the storing, retrieval, logging, diff --git a/pkgs/applications/video/gnash/default.nix b/pkgs/applications/video/gnash/default.nix index 06122619066..515e2591461 100644 --- a/pkgs/applications/video/gnash/default.nix +++ b/pkgs/applications/video/gnash/default.nix @@ -103,7 +103,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.gnu.org/software/gnash/; - description = "GNU Gnash, a libre SWF (Flash) movie player"; + description = "A libre SWF (Flash) movie player"; longDescription = '' Gnash is a GNU Flash movie player. Flash is an animation file format diff --git a/pkgs/applications/video/kino/default.nix b/pkgs/applications/video/kino/default.nix index 16bd57bef34..7dd089537b7 100644 --- a/pkgs/applications/video/kino/default.nix +++ b/pkgs/applications/video/kino/default.nix @@ -85,7 +85,7 @@ stdenv.mkDerivation { meta = { - description = "Kino is a non-linear DV editor for GNU/Linux"; + description = "Non-linear DV editor for GNU/Linux"; homepage = http://www.kinodv.org/; license = stdenv.lib.licenses.gpl2; }; diff --git a/pkgs/applications/video/xbmc/default.nix b/pkgs/applications/video/xbmc/default.nix index 26c54c537ae..875ed48c102 100644 --- a/pkgs/applications/video/xbmc/default.nix +++ b/pkgs/applications/video/xbmc/default.nix @@ -96,7 +96,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://xbmc.org/; - description = "XBMC Media Center"; + description = "Media center"; license = "GPLv2"; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.iElectric ]; diff --git a/pkgs/applications/window-managers/ratpoison/default.nix b/pkgs/applications/window-managers/ratpoison/default.nix index 65264c20db3..0eb28464e59 100644 --- a/pkgs/applications/window-managers/ratpoison/default.nix +++ b/pkgs/applications/window-managers/ratpoison/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://www.nongnu.org/ratpoison/"; - description = "Ratpoison, a simple mouse-free tiling window manager"; + description = "Simple mouse-free tiling window manager"; license = stdenv.lib.licenses.gpl2Plus; longDescription = '' diff --git a/pkgs/desktops/e17/enlightenment/default.nix b/pkgs/desktops/e17/enlightenment/default.nix index 1c3edb07ecf..953c90e8003 100644 --- a/pkgs/desktops/e17/enlightenment/default.nix +++ b/pkgs/desktops/e17/enlightenment/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { --disable-illume2 ''; meta = { - description = "Enlightenment, the window manager"; + description = "A window manager"; longDescription = '' The Enlightenment Desktop shell provides an efficient yet breathtaking window manager based on the Enlightenment diff --git a/pkgs/development/compilers/bigloo/default.nix b/pkgs/development/compilers/bigloo/default.nix index 16dfa580a19..8564175d363 100644 --- a/pkgs/development/compilers/bigloo/default.nix +++ b/pkgs/development/compilers/bigloo/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { checkTarget = "test"; meta = { - description = "Bigloo, an efficient Scheme compiler"; + description = "Efficient Scheme compiler"; longDescription = '' Bigloo is a Scheme implementation devoted to one goal: enabling diff --git a/pkgs/development/compilers/gambit/default.nix b/pkgs/development/compilers/gambit/default.nix index 265b08c1fbd..3d9f2596c96 100644 --- a/pkgs/development/compilers/gambit/default.nix +++ b/pkgs/development/compilers/gambit/default.nix @@ -18,7 +18,7 @@ rec { phaseNames = ["doConfigure" "doMakeInstall"]; meta = { - description = "Gambit Scheme to C compiler"; + description = "Scheme to C compiler"; maintainers = [ a.lib.maintainers.raskin ]; diff --git a/pkgs/development/compilers/hugs/default.nix b/pkgs/development/compilers/hugs/default.nix index c3f14826c8a..14751799795 100644 --- a/pkgs/development/compilers/hugs/default.nix +++ b/pkgs/development/compilers/hugs/default.nix @@ -47,7 +47,7 @@ composableDerivation.composableDerivation {} { meta = { license = "as-is"; # gentoo is calling it this way.. - description = "The HUGS 98 Haskell interpreter"; + description = "Haskell interpreter"; homepage = http://www.haskell.org/hugs; }; } diff --git a/pkgs/development/compilers/ikarus/default.nix b/pkgs/development/compilers/ikarus/default.nix index 070f29e16f6..e9bf6c8bb5b 100644 --- a/pkgs/development/compilers/ikarus/default.nix +++ b/pkgs/development/compilers/ikarus/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { buildInputs = [ gmp ]; meta = { - description = "Ikarus - a Scheme compiler, aiming at R6RS"; + description = "Scheme compiler, aiming at R6RS"; homepage = http://ikarus-scheme.org/; license = stdenv.lib.licenses.gpl3; }; diff --git a/pkgs/development/compilers/mercury/default.nix b/pkgs/development/compilers/mercury/default.nix index 21af582c594..de9b44a4414 100644 --- a/pkgs/development/compilers/mercury/default.nix +++ b/pkgs/development/compilers/mercury/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { ''; meta = { - description = "Mercury is a pure logic programming language."; + description = "A pure logic programming language"; longDescription = '' Mercury is a logic/functional programming language which combines the clarity and expressiveness of declarative programming with advanced diff --git a/pkgs/development/compilers/ocaml/3.10.0.nix b/pkgs/development/compilers/ocaml/3.10.0.nix index 281aa1a9de6..1d68585d93a 100644 --- a/pkgs/development/compilers/ocaml/3.10.0.nix +++ b/pkgs/development/compilers/ocaml/3.10.0.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation (rec { meta = { homepage = http://caml.inria.fr/ocaml; license = "QPL, LGPL2 (library part)"; - desctiption = "Most popular variant of the Caml language"; + description = "Most popular variant of the Caml language"; }; }) diff --git a/pkgs/development/compilers/ocaml/3.11.2.nix b/pkgs/development/compilers/ocaml/3.11.2.nix index 64cf8a9f9f7..195e83e7313 100644 --- a/pkgs/development/compilers/ocaml/3.11.2.nix +++ b/pkgs/development/compilers/ocaml/3.11.2.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://caml.inria.fr/ocaml; license = [ "QPL" /* compiler */ "LGPLv2" /* library */ ]; - description = "Objective Caml, the most popular variant of the Caml language"; + description = "Most popular variant of the Caml language"; longDescription = '' Objective Caml is the most popular variant of the Caml language. diff --git a/pkgs/development/compilers/ocaml/3.12.1.nix b/pkgs/development/compilers/ocaml/3.12.1.nix index f916f5a7923..16c3cb1d787 100644 --- a/pkgs/development/compilers/ocaml/3.12.1.nix +++ b/pkgs/development/compilers/ocaml/3.12.1.nix @@ -37,7 +37,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://caml.inria.fr/ocaml; license = [ "QPL" /* compiler */ "LGPLv2" /* library */ ]; - description = "OCaml, the most popular variant of the Caml language"; + description = "Most popular variant of the Caml language"; longDescription = '' diff --git a/pkgs/development/compilers/ocaml/4.00.1.nix b/pkgs/development/compilers/ocaml/4.00.1.nix index 8662db70c26..5b1e69b86b0 100644 --- a/pkgs/development/compilers/ocaml/4.00.1.nix +++ b/pkgs/development/compilers/ocaml/4.00.1.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://caml.inria.fr/ocaml; license = [ "QPL" /* compiler */ "LGPLv2" /* library */ ]; - description = "OCaml, the most popular variant of the Caml language"; + description = "Most popular variant of the Caml language"; longDescription = '' diff --git a/pkgs/development/compilers/ocaml/4.01.0.nix b/pkgs/development/compilers/ocaml/4.01.0.nix index 0f68014fad6..2876bce9caf 100644 --- a/pkgs/development/compilers/ocaml/4.01.0.nix +++ b/pkgs/development/compilers/ocaml/4.01.0.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://caml.inria.fr/ocaml; license = [ "QPL" /* compiler */ "LGPLv2" /* library */ ]; - description = "OCaml, the most popular variant of the Caml language"; + description = "Most popular variant of the Caml language"; longDescription = '' diff --git a/pkgs/development/compilers/ocaml/ber-metaocaml-003.nix b/pkgs/development/compilers/ocaml/ber-metaocaml-003.nix index 9c5fa3764ba..8b86c805c61 100644 --- a/pkgs/development/compilers/ocaml/ber-metaocaml-003.nix +++ b/pkgs/development/compilers/ocaml/ber-metaocaml-003.nix @@ -58,6 +58,6 @@ stdenv.mkDerivation rec { meta = { homepage = "http://okmij.org/ftp/ML/index.html#ber-metaocaml"; license = [ "QPL" /* compiler */ "LGPLv2" /* library */ ]; - description = "a conservative extension of OCaml with the primitive type of code values, and three basic multi-stage expression forms: Brackets, Escape, and Run"; + description = "A conservative extension of OCaml with the primitive type of code values, and three basic multi-stage expression forms: Brackets, Escape, and Run"; }; } diff --git a/pkgs/development/compilers/qi/default.nix b/pkgs/development/compilers/qi/default.nix index ecb022d942a..5665fc5da6c 100644 --- a/pkgs/development/compilers/qi/default.nix +++ b/pkgs/development/compilers/qi/default.nix @@ -31,6 +31,6 @@ stdenv.mkDerivation rec { builder = writeScript (name + "-builder") (textClosure localDefs [allBuild doForceShare doPropagate]); meta = { - description = "Qi - next generation on top of Common Lisp"; + description = "Functional programming language, built top of Common Lisp"; }; } diff --git a/pkgs/development/compilers/rdmd/default.nix b/pkgs/development/compilers/rdmd/default.nix index 9177ad5e25b..621ace195bb 100644 --- a/pkgs/development/compilers/rdmd/default.nix +++ b/pkgs/development/compilers/rdmd/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation { ''; meta = { - description = "rdmd wrapper for D language compiler"; + description = "Wrapper for D language compiler"; homepage = http://dlang.org/rdmd.html; license = lib.licenses.boost; maintainers = with stdenv.lib.maintainers; [ vlstill ]; diff --git a/pkgs/development/compilers/scala/default.nix b/pkgs/development/compilers/scala/default.nix index bd81e4c055d..e299be9144e 100644 --- a/pkgs/development/compilers/scala/default.nix +++ b/pkgs/development/compilers/scala/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { ''; meta = { - description = "Scala is a general purpose programming language"; + description = "General purpose programming language"; longDescription = '' Scala is a general purpose programming language designed to express common programming patterns in a concise, elegant, and type-safe way. diff --git a/pkgs/development/compilers/tinycc/default.nix b/pkgs/development/compilers/tinycc/default.nix index 1e82e03f16c..bd71ab7b27f 100644 --- a/pkgs/development/compilers/tinycc/default.nix +++ b/pkgs/development/compilers/tinycc/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { checkTarget = "test"; meta = { - description = "TinyCC, a small, fast, and embeddable C compiler and interpreter"; + description = "Small, fast, and embeddable C compiler and interpreter"; longDescription = '' TinyCC (aka TCC) is a small but hyper fast C compiler. Unlike diff --git a/pkgs/development/interpreters/guile/default.nix b/pkgs/development/interpreters/guile/default.nix index 6e4051ff46e..2ddad5cde67 100644 --- a/pkgs/development/interpreters/guile/default.nix +++ b/pkgs/development/interpreters/guile/default.nix @@ -65,7 +65,7 @@ meta = { - description = "GNU Guile 2.0, an embeddable Scheme implementation"; + description = "Embeddable Scheme implementation"; homepage = http://www.gnu.org/software/guile/; license = stdenv.lib.licenses.lgpl3Plus; maintainers = with stdenv.lib.maintainers; [ ludo lovek323 ]; diff --git a/pkgs/development/interpreters/maude/default.nix b/pkgs/development/interpreters/maude/default.nix index e112a5ae43d..e14132a8acf 100644 --- a/pkgs/development/interpreters/maude/default.nix +++ b/pkgs/development/interpreters/maude/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://maude.cs.uiuc.edu/"; - description = "Maude -- a high-level specification language"; + description = "High-level specification language"; license = stdenv.lib.licenses.gpl2; longDescription = '' diff --git a/pkgs/development/interpreters/php/5.3.nix b/pkgs/development/interpreters/php/5.3.nix index ed5feeacf61..c1d02064fe1 100644 --- a/pkgs/development/interpreters/php/5.3.nix +++ b/pkgs/development/interpreters/php/5.3.nix @@ -233,7 +233,7 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed) }; meta = { - description = "The PHP language runtime engine"; + description = "An HTML-embedded scripting language"; homepage = http://www.php.net/; license = "PHP-3"; maintainers = with stdenv.lib.maintainers; [ lovek323 ]; diff --git a/pkgs/development/interpreters/php/5.4.nix b/pkgs/development/interpreters/php/5.4.nix index e5069fc2ae4..e39661b224a 100644 --- a/pkgs/development/interpreters/php/5.4.nix +++ b/pkgs/development/interpreters/php/5.4.nix @@ -253,7 +253,7 @@ composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed) }; meta = { - description = "The PHP language runtime engine"; + description = "An HTML-embedded scripting language"; homepage = http://www.php.net/; license = "PHP-3"; }; diff --git a/pkgs/development/interpreters/pypy/2.3/default.nix b/pkgs/development/interpreters/pypy/2.3/default.nix index b45805ab241..626f56ccc46 100644 --- a/pkgs/development/interpreters/pypy/2.3/default.nix +++ b/pkgs/development/interpreters/pypy/2.3/default.nix @@ -91,7 +91,7 @@ let meta = with stdenv.lib; { homepage = "http://pypy.org/"; - description = "PyPy is a fast, compliant alternative implementation of the Python language (2.7.3)"; + description = "Fast, compliant alternative implementation of the Python language (2.7.3)"; license = licenses.mit; platforms = platforms.linux; maintainers = with maintainers; [ iElectric ]; diff --git a/pkgs/development/libraries/boost/1.44.nix b/pkgs/development/libraries/boost/1.44.nix index b188586e84f..c192acd23bd 100644 --- a/pkgs/development/libraries/boost/1.44.nix +++ b/pkgs/development/libraries/boost/1.44.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation { meta = { homepage = "http://boost.org/"; - description = "Boost C++ Library Collection"; + description = "Collection of C++ libraries"; license = "boost-license"; maintainers = [ stdenv.lib.maintainers.simons ]; diff --git a/pkgs/development/libraries/boost/1.49.nix b/pkgs/development/libraries/boost/1.49.nix index fca4249e963..9e61683238f 100644 --- a/pkgs/development/libraries/boost/1.49.nix +++ b/pkgs/development/libraries/boost/1.49.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation { meta = { homepage = "http://boost.org/"; - description = "Boost C++ Library Collection"; + description = "Collection of C++ libraries"; license = "boost-license"; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/development/libraries/boost/1.55.nix b/pkgs/development/libraries/boost/1.55.nix index bf355f7169c..1e9d2134d12 100644 --- a/pkgs/development/libraries/boost/1.55.nix +++ b/pkgs/development/libraries/boost/1.55.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation { meta = { homepage = "http://boost.org/"; - description = "Boost C++ Library Collection"; + description = "Collection of C++ libraries"; license = "boost-license"; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/development/libraries/ccrtp/default.nix b/pkgs/development/libraries/ccrtp/default.nix index 2111e1b4a55..3e75cb45a73 100644 --- a/pkgs/development/libraries/ccrtp/default.nix +++ b/pkgs/development/libraries/ccrtp/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation { doCheck = true; meta = { - description = "GNU ccRTP, an implementation of the IETF real-time transport protocol (RTP)"; + description = "An implementation of the IETF real-time transport protocol (RTP)"; homepage = http://www.gnu.org/software/ccrtp/; license = stdenv.lib.licenses.gpl2; maintainers = with stdenv.lib.maintainers; [ marcweber ]; diff --git a/pkgs/development/libraries/celt/default.nix b/pkgs/development/libraries/celt/default.nix index 28e51efbc4b..ca25be90504 100644 --- a/pkgs/development/libraries/celt/default.nix +++ b/pkgs/development/libraries/celt/default.nix @@ -29,7 +29,7 @@ rec { phaseNames = ["doConfigure" "doMakeInstall"]; meta = { - description = "CELT - low-delay audio codec"; + description = "Low-delay audio codec"; maintainers = with a.lib.maintainers; [ raskin diff --git a/pkgs/development/libraries/cfitsio/default.nix b/pkgs/development/libraries/cfitsio/default.nix index 06f2deb3a7c..54e5988eda6 100644 --- a/pkgs/development/libraries/cfitsio/default.nix +++ b/pkgs/development/libraries/cfitsio/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { meta = { homepage = http://heasarc.gsfc.nasa.gov/fitsio/; - description = "CFITSIO, a library for reading and writing FITS data files"; + description = "Library for reading and writing FITS data files"; longDescription = '' CFITSIO is a library of C and Fortran subroutines for reading and diff --git a/pkgs/development/libraries/check/default.nix b/pkgs/development/libraries/check/default.nix index 4e75cda0c23..a782ff61e28 100644 --- a/pkgs/development/libraries/check/default.nix +++ b/pkgs/development/libraries/check/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { doCheck = false; meta = { - description = "Check, a unit testing framework for C"; + description = "Unit testing framework for C"; longDescription = '' Check is a unit testing framework for C. It features a simple diff --git a/pkgs/development/libraries/chipmunk/default.nix b/pkgs/development/libraries/chipmunk/default.nix index d148c4d829a..63c5959960a 100644 --- a/pkgs/development/libraries/chipmunk/default.nix +++ b/pkgs/development/libraries/chipmunk/default.nix @@ -34,6 +34,6 @@ rec { name = "chipmunk-" + version; meta = { - description = "Chipmunk 2D physics engine"; + description = "2D physics engine"; }; } diff --git a/pkgs/development/libraries/cloog/default.nix b/pkgs/development/libraries/cloog/default.nix index da4501285e1..7ea7e597d40 100644 --- a/pkgs/development/libraries/cloog/default.nix +++ b/pkgs/development/libraries/cloog/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { doCheck = true; meta = { - description = "CLooG, the Chunky Loop Generator"; + description = "Library that generates loops for scanning polyhedra"; longDescription = '' CLooG is a free software library to generate code for scanning diff --git a/pkgs/development/libraries/clutter-gst/default.nix b/pkgs/development/libraries/clutter-gst/default.nix index 59c64b0de9f..c73aac074e7 100644 --- a/pkgs/development/libraries/clutter-gst/default.nix +++ b/pkgs/development/libraries/clutter-gst/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { postBuild = "rm -rf $out/share/gtk-doc"; meta = { - description = "Clutter-GST"; + description = "GStreamer bindings for clutter"; homepage = http://www.clutter-project.org/; diff --git a/pkgs/development/libraries/clutter/default.nix b/pkgs/development/libraries/clutter/default.nix index 027b90d8e11..67de04050af 100644 --- a/pkgs/development/libraries/clutter/default.nix +++ b/pkgs/development/libraries/clutter/default.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { #doCheck = true; # no tests possible without a display meta = { - description = "Clutter, a library for creating fast, dynamic graphical user interfaces"; + description = "Library for creating fast, dynamic graphical user interfaces"; longDescription = '' Clutter is free software library for creating fast, compelling, diff --git a/pkgs/development/libraries/fox/default.nix b/pkgs/development/libraries/fox/default.nix index 63acc14521c..6d7d7a83879 100644 --- a/pkgs/development/libraries/fox/default.nix +++ b/pkgs/development/libraries/fox/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = { - description = "FOX is a C++ based class library for building Graphical User Interfaces"; + description = "C++ based class library for building Graphical User Interfaces"; longDescription = '' FOX stands for Free Objects for X. It is a C++ based class library for building Graphical User Interfaces. diff --git a/pkgs/development/libraries/gettext/default.nix b/pkgs/development/libraries/gettext/default.nix index 4d400a6ea7d..9d62472c27e 100644 --- a/pkgs/development/libraries/gettext/default.nix +++ b/pkgs/development/libraries/gettext/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation (rec { }; meta = { - description = "GNU gettext, a well integrated set of translation tools and documentation"; + description = "Well integrated set of translation tools and documentation"; longDescription = '' Usually, programs are written and documented in English, and use diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix index 4f7c6042f13..93e96bef536 100644 --- a/pkgs/development/libraries/glib/default.nix +++ b/pkgs/development/libraries/glib/default.nix @@ -107,7 +107,7 @@ stdenv.mkDerivation rec { }; meta = with stdenv.lib; { - description = "GLib, a C library of programming buildings blocks"; + description = "C library of programming buildings blocks"; homepage = http://www.gtk.org/; license = licenses.lgpl2Plus; maintainers = with maintainers; [ lovek323 raskin urkud ]; diff --git a/pkgs/development/libraries/glog/default.nix b/pkgs/development/libraries/glog/default.nix index 098643ae70f..d3f74f4043a 100644 --- a/pkgs/development/libraries/glog/default.nix +++ b/pkgs/development/libraries/glog/default.nix @@ -11,6 +11,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://code.google.com/p/google-glog/; license = "BSD"; - description = "The glog library implements application-level logging."; + description = "Library for application-level logging"; }; } diff --git a/pkgs/development/libraries/gmp/4.3.2.nix b/pkgs/development/libraries/gmp/4.3.2.nix index d0559c46795..e9cfda032b1 100644 --- a/pkgs/development/libraries/gmp/4.3.2.nix +++ b/pkgs/development/libraries/gmp/4.3.2.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { doCheck = false; meta = { - description = "GMP, the GNU multiple precision arithmetic library"; + description = "GNU multiple precision arithmetic library"; longDescription = '' GMP is a free library for arbitrary precision arithmetic, operating diff --git a/pkgs/development/libraries/gmp/5.0.5.nix b/pkgs/development/libraries/gmp/5.0.5.nix index c96c830e2f7..5f3690f67a9 100644 --- a/pkgs/development/libraries/gmp/5.0.5.nix +++ b/pkgs/development/libraries/gmp/5.0.5.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { }; meta = { - description = "GMP, the GNU multiple precision arithmetic library"; + description = "GNU multiple precision arithmetic library"; longDescription = '' GMP is a free library for arbitrary precision arithmetic, operating diff --git a/pkgs/development/libraries/gmp/5.1.x.nix b/pkgs/development/libraries/gmp/5.1.x.nix index 9e28334804b..14a6d34d932 100644 --- a/pkgs/development/libraries/gmp/5.1.x.nix +++ b/pkgs/development/libraries/gmp/5.1.x.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation (rec { meta = with stdenv.lib; { homepage = "http://gmplib.org/"; - description = "GMP, the GNU multiple precision arithmetic library"; + description = "GNU multiple precision arithmetic library"; license = licenses.gpl3Plus; longDescription = diff --git a/pkgs/development/libraries/gss/default.nix b/pkgs/development/libraries/gss/default.nix index 207b8248698..75ae4054592 100644 --- a/pkgs/development/libraries/gss/default.nix +++ b/pkgs/development/libraries/gss/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { doCheck = true; meta = { - description = "GNU GSS Generic Security Service"; + description = "Generic Security Service"; longDescription = '' GSS is an implementation of the Generic Security Service Application diff --git a/pkgs/development/libraries/gstreamer/legacy/gnonlin/default.nix b/pkgs/development/libraries/gstreamer/legacy/gnonlin/default.nix index ff26e727e9f..777f4a06313 100644 --- a/pkgs/development/libraries/gstreamer/legacy/gnonlin/default.nix +++ b/pkgs/development/libraries/gstreamer/legacy/gnonlin/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://gstreamer.freedesktop.org/modules/gnonlin.html"; - description = "http://gstreamer.freedesktop.org/modules/gnonlin.html"; + description = "Gstreamer Non-Linear Multimedia Editing Plugins"; license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/development/libraries/gstreamer/legacy/gstreamer/default.nix b/pkgs/development/libraries/gstreamer/legacy/gstreamer/default.nix index f781c624cea..b608f891533 100644 --- a/pkgs/development/libraries/gstreamer/legacy/gstreamer/default.nix +++ b/pkgs/development/libraries/gstreamer/legacy/gstreamer/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://gstreamer.freedesktop.org; - description = "GStreamer, a library for constructing graphs of media-handling components"; + description = "Library for constructing graphs of media-handling components"; longDescription = '' GStreamer is a library for constructing graphs of media-handling diff --git a/pkgs/development/libraries/gtkimageview/default.nix b/pkgs/development/libraries/gtkimageview/default.nix index 6905adcd71e..b57c91c4455 100644 --- a/pkgs/development/libraries/gtkimageview/default.nix +++ b/pkgs/development/libraries/gtkimageview/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://trac.bjourne.webfactional.com/; - description = "The GtkImageView image viewer widget for GTK+"; + description = "Image viewer widget for GTK+"; longDescription = '' GtkImageView is a simple image viewer widget for GTK+. Similar to diff --git a/pkgs/development/libraries/gtkmathview/default.nix b/pkgs/development/libraries/gtkmathview/default.nix index 2620d9cc120..8a6914cfcd3 100644 --- a/pkgs/development/libraries/gtkmathview/default.nix +++ b/pkgs/development/libraries/gtkmathview/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation { meta = { homepage = http://helm.cs.unibo.it/mml-widget/; - description = "GtkMathView is a C++ rendering engine for MathML documents"; + description = "C++ rendering engine for MathML documents"; license = stdenv.lib.licenses.lgpl3Plus; maintainers = [ stdenv.lib.maintainers.roconnor ]; }; diff --git a/pkgs/development/libraries/gupnp/default.nix b/pkgs/development/libraries/gupnp/default.nix index bae0639a61c..e278980e1e1 100644 --- a/pkgs/development/libraries/gupnp/default.nix +++ b/pkgs/development/libraries/gupnp/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.gupnp.org/; - description = "GUPnP is an implementation of the UPnP specification."; + description = "An implementation of the UPnP specification"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.linux; }; diff --git a/pkgs/development/libraries/hwloc/default.nix b/pkgs/development/libraries/hwloc/default.nix index 3c5f198cea6..d4d9663441f 100644 --- a/pkgs/development/libraries/hwloc/default.nix +++ b/pkgs/development/libraries/hwloc/default.nix @@ -44,7 +44,7 @@ stdenv.mkDerivation rec { doCheck = !stdenv.isCygwin; meta = { - description = "hwloc, a portable abstraction of hierarchical architectures for high-performance computing"; + description = "Portable abstraction of hierarchical architectures for high-performance computing"; longDescription = '' hwloc provides a portable abstraction (across OS, diff --git a/pkgs/development/libraries/jasper/default.nix b/pkgs/development/libraries/jasper/default.nix index 4046c05f79e..ed51a0a2820 100644 --- a/pkgs/development/libraries/jasper/default.nix +++ b/pkgs/development/libraries/jasper/default.nix @@ -15,6 +15,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.ece.uvic.ca/~mdadams/jasper/; - description = "JasPer JPEG2000 Library"; + description = "JPEG2000 Library"; }; } diff --git a/pkgs/development/libraries/java/classpath/default.nix b/pkgs/development/libraries/java/classpath/default.nix index bbfc6ed38cc..eff52cc177b 100644 --- a/pkgs/development/libraries/java/classpath/default.nix +++ b/pkgs/development/libraries/java/classpath/default.nix @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { configureFlags = "--disable-Werror --disable-plugin --with-antlr-jar=${antlr}/lib/antlr.jar"; meta = { - description = "GNU Classpath, essential libraries for Java"; + description = "Essential libraries for Java"; longDescription = '' GNU Classpath, Essential Libraries for Java, is a GNU project to create diff --git a/pkgs/development/libraries/java/rhino/default.nix b/pkgs/development/libraries/java/rhino/default.nix index 42bdba7567c..34aaded7cb4 100644 --- a/pkgs/development/libraries/java/rhino/default.nix +++ b/pkgs/development/libraries/java/rhino/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation { ''; meta = { - description = "Mozilla Rhino: JavaScript for Java"; + description = "An implementation of JavaScript written in Java"; longDescription = '' Rhino is an open-source implementation of JavaScript written diff --git a/pkgs/development/libraries/libassuan/default.nix b/pkgs/development/libraries/libassuan/default.nix index f5a3d92d3db..90ce4f970e3 100644 --- a/pkgs/development/libraries/libassuan/default.nix +++ b/pkgs/development/libraries/libassuan/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { doCheck = true; meta = { - description = "Libassuan, the IPC library used by GnuPG and related software"; + description = "IPC library used by GnuPG and related software"; longDescription = '' Libassuan is a small library implementing the so-called Assuan diff --git a/pkgs/development/libraries/libcddb/default.nix b/pkgs/development/libraries/libcddb/default.nix index b9823cefd2d..9a284d8988d 100644 --- a/pkgs/development/libraries/libcddb/default.nix +++ b/pkgs/development/libraries/libcddb/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { }; meta = { - description = "Libcddb is a C library to access data on a CDDB server (freedb.org)"; + description = "C library to access data on a CDDB server (freedb.org)"; license = stdenv.lib.licenses.lgpl2Plus; homepage = http://libcddb.sourceforge.net/; }; diff --git a/pkgs/development/libraries/libchamplain/default.nix b/pkgs/development/libraries/libchamplain/default.nix index 51b7f7e181d..9cdf9d411cc 100644 --- a/pkgs/development/libraries/libchamplain/default.nix +++ b/pkgs/development/libraries/libchamplain/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { homepage = http://projects.gnome.org/libchamplain/; license = stdenv.lib.licenses.lgpl2Plus; - description = "libchamplain, a C library providing a ClutterActor to display maps"; + description = "C library providing a ClutterActor to display maps"; longDescription = '' libchamplain is a C library providing a ClutterActor to display diff --git a/pkgs/development/libraries/libchop/default.nix b/pkgs/development/libraries/libchop/default.nix index f0d7fbfbeb6..37af9756724 100644 --- a/pkgs/development/libraries/libchop/default.nix +++ b/pkgs/development/libraries/libchop/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { doCheck = true; meta = { - description = "libchop, tools & library for data backup and distributed storage"; + description = "Tools & library for data backup and distributed storage"; longDescription = '' Libchop is a set of utilities and library for data backup and diff --git a/pkgs/development/libraries/libdaemon/default.nix b/pkgs/development/libraries/libdaemon/default.nix index ba7e3e47ff7..cb8d07fec90 100644 --- a/pkgs/development/libraries/libdaemon/default.nix +++ b/pkgs/development/libraries/libdaemon/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--disable-lynx" ]; meta = { - description = "libdaemon, a lightweight C library that eases the writing of UNIX daemons"; + description = "Lightweight C library that eases the writing of UNIX daemons"; homepage = http://0pointer.de/lennart/projects/libdaemon/; diff --git a/pkgs/development/libraries/libdnet/default.nix b/pkgs/development/libraries/libdnet/default.nix index 50bdaa1c4c0..acd930ddd01 100644 --- a/pkgs/development/libraries/libdnet/default.nix +++ b/pkgs/development/libraries/libdnet/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation { ''; meta = { - description = "libdnet provides a simplified, portable interface to several low-level networking routines"; + description = "Provides a simplified, portable interface to several low-level networking routines"; homepage = http://code.google.com/p/libdnet/; license = "BSD"; # New BSD license maintainers = [stdenv.lib.maintainers.marcweber]; diff --git a/pkgs/development/libraries/libelf/default.nix b/pkgs/development/libraries/libelf/default.nix index d9436456d0d..407b367d6b7 100644 --- a/pkgs/development/libraries/libelf/default.nix +++ b/pkgs/development/libraries/libelf/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation (rec { doCheck = true; meta = { - description = "Libelf, an ELF object file access library"; + description = "ELF object file access library"; homepage = http://www.mr511.de/software/english.html; diff --git a/pkgs/development/libraries/libevent/default.nix b/pkgs/development/libraries/libevent/default.nix index bb854139b79..57cf1738342 100644 --- a/pkgs/development/libraries/libevent/default.nix +++ b/pkgs/development/libraries/libevent/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation { ''; meta = { - description = "libevent, an event notification library"; + description = "Event notification library"; longDescription = '' The libevent API provides a mechanism to execute a callback function diff --git a/pkgs/development/libraries/libextractor/default.nix b/pkgs/development/libraries/libextractor/default.nix index 6df5ca683f1..18387c904f8 100644 --- a/pkgs/development/libraries/libextractor/default.nix +++ b/pkgs/development/libraries/libextractor/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { #postInstall = "make check"; meta = { - description = "GNU libextractor, a simple library for keyword extraction"; + description = "Simple library for keyword extraction"; longDescription = '' GNU libextractor is a library used to extract meta-data from files diff --git a/pkgs/development/libraries/libgcrypt/default.nix b/pkgs/development/libraries/libgcrypt/default.nix index ba3de49ede8..f47d3a62729 100644 --- a/pkgs/development/libraries/libgcrypt/default.nix +++ b/pkgs/development/libraries/libgcrypt/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation (rec { ''; meta = { - description = "GNU Libgcrypt, a general-pupose cryptographic library"; + description = "General-pupose cryptographic library"; longDescription = '' GNU Libgcrypt is a general purpose cryptographic library based on diff --git a/pkgs/development/libraries/libiconv/default.nix b/pkgs/development/libraries/libiconv/default.nix index 7b669cd780a..3bdb85a78eb 100644 --- a/pkgs/development/libraries/libiconv/default.nix +++ b/pkgs/development/libraries/libiconv/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { }; meta = { - description = "GNU libiconv, an iconv(3) implementation"; + description = "An iconv(3) implementation"; longDescription = '' Some programs, like mailers and web browsers, must be able to convert diff --git a/pkgs/development/libraries/libidn/default.nix b/pkgs/development/libraries/libidn/default.nix index 802ee9e3e88..37d19d10f29 100644 --- a/pkgs/development/libraries/libidn/default.nix +++ b/pkgs/development/libraries/libidn/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.gnu.org/software/libidn/; - description = "GNU Libidn library for internationalized domain names"; + description = "Library for internationalized domain names"; longDescription = '' GNU Libidn is a fully documented implementation of the diff --git a/pkgs/development/libraries/libksba/default.nix b/pkgs/development/libraries/libksba/default.nix index 5e038ad8572..dbd2516c059 100644 --- a/pkgs/development/libraries/libksba/default.nix +++ b/pkgs/development/libraries/libksba/default.nix @@ -12,6 +12,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.gnupg.org; - description = "Libksba is a CMS and X.509 access library under development"; + description = "CMS and X.509 access library under development"; }; } diff --git a/pkgs/development/libraries/libmicrohttpd/default.nix b/pkgs/development/libraries/libmicrohttpd/default.nix index 959dca47573..39795267a2c 100644 --- a/pkgs/development/libraries/libmicrohttpd/default.nix +++ b/pkgs/development/libraries/libmicrohttpd/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { doCheck = false; meta = { - description = "GNU libmicrohttpd, an embeddable HTTP server library"; + description = "Embeddable HTTP server library"; longDescription = '' GNU libmicrohttpd is a small C library that is supposed to make diff --git a/pkgs/development/libraries/libofa/default.nix b/pkgs/development/libraries/libofa/default.nix index 2e2640e8636..6ffef2140ec 100644 --- a/pkgs/development/libraries/libofa/default.nix +++ b/pkgs/development/libraries/libofa/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://code.google.com/musicip-libofa/; - description = "LibOFA - Library Open Fingerprint Architecture"; + description = "Library Open Fingerprint Architecture"; longDescription = '' LibOFA (Library Open Fingerprint Architecture) is an open-source audio fingerprint created and provided by MusicIP''; diff --git a/pkgs/development/libraries/libsigsegv/default.nix b/pkgs/development/libraries/libsigsegv/default.nix index ae6299286a1..b6be8d194c1 100644 --- a/pkgs/development/libraries/libsigsegv/default.nix +++ b/pkgs/development/libraries/libsigsegv/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.gnu.org/software/libsigsegv/; - description = "GNU libsigsegv, a library to handle page faults in user mode"; + description = "Library to handle page faults in user mode"; longDescription = '' GNU libsigsegv is a library for handling page faults in user mode. A diff --git a/pkgs/development/libraries/libspectre/default.nix b/pkgs/development/libraries/libspectre/default.nix index 7d46f9e32ce..0e5f976c122 100644 --- a/pkgs/development/libraries/libspectre/default.nix +++ b/pkgs/development/libraries/libspectre/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://libspectre.freedesktop.org/; - description = "libspectre, a PostScript rendering library"; + description = "PostScript rendering library"; longDescription = '' libspectre is a small library for rendering Postscript diff --git a/pkgs/development/libraries/libtasn1/default.nix b/pkgs/development/libraries/libtasn1/default.nix index bae22ef220f..5a2508a4506 100644 --- a/pkgs/development/libraries/libtasn1/default.nix +++ b/pkgs/development/libraries/libtasn1/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.gnu.org/software/libtasn1/; - description = "GNU Libtasn1, an ASN.1 library"; + description = "An ASN.1 library"; longDescription = '' Libtasn1 is the ASN.1 library used by GnuTLS, GNU Shishi and some diff --git a/pkgs/development/libraries/libunistring/default.nix b/pkgs/development/libraries/libunistring/default.nix index b578d895c5f..2a87d7a3249 100644 --- a/pkgs/development/libraries/libunistring/default.nix +++ b/pkgs/development/libraries/libunistring/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation (rec { meta = { homepage = http://www.gnu.org/software/libunistring/; - description = "GNU Libunistring, a Unicode string library"; + description = "Unicode string library"; longDescription = '' This library provides functions for manipulating Unicode strings diff --git a/pkgs/development/libraries/libxmi/default.nix b/pkgs/development/libraries/libxmi/default.nix index 85f0dbddb0b..42c427605c4 100644 --- a/pkgs/development/libraries/libxmi/default.nix +++ b/pkgs/development/libraries/libxmi/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation { preConfigure = "cp ${libtool}/share/libtool/config/config.sub ."; meta = { - description = "GNU libxmi, a library for rasterizing 2-D vector graphics"; + description = "Library for rasterizing 2-D vector graphics"; homepage = http://www.gnu.org/software/libxmi/; license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.gnu; # arbitrary choice diff --git a/pkgs/development/libraries/lightning/default.nix b/pkgs/development/libraries/lightning/default.nix index 951627c81c2..73d98023c84 100644 --- a/pkgs/development/libraries/lightning/default.nix +++ b/pkgs/development/libraries/lightning/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.gnu.org/software/lightning/; - description = "GNU lightning, a run-time code generation library"; + description = "Run-time code generation library"; longDescription = '' GNU lightning is a library that generates assembly language code diff --git a/pkgs/development/libraries/ming/default.nix b/pkgs/development/libraries/ming/default.nix index f9632dca9d2..a470f771561 100644 --- a/pkgs/development/libraries/ming/default.nix +++ b/pkgs/development/libraries/ming/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { doCheck = true; meta = { - description = "Ming, a library for generating Flash `.swf' files"; + description = "Library for generating Flash `.swf' files"; longDescription = '' Ming is a library for generating Macromedia Flash files (.swf), diff --git a/pkgs/development/libraries/mpc/default.nix b/pkgs/development/libraries/mpc/default.nix index 652227d47e8..3d05fa2e040 100644 --- a/pkgs/development/libraries/mpc/default.nix +++ b/pkgs/development/libraries/mpc/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { doCheck = true; meta = { - description = "GNU MPC, a library for multiprecision complex arithmetic with exact rounding"; + description = "Library for multiprecision complex arithmetic with exact rounding"; longDescription = '' GNU MPC is a C library for the arithmetic of complex numbers with diff --git a/pkgs/development/libraries/mpfr/default.nix b/pkgs/development/libraries/mpfr/default.nix index e3fbaececb9..653481aeccd 100644 --- a/pkgs/development/libraries/mpfr/default.nix +++ b/pkgs/development/libraries/mpfr/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.mpfr.org/; - description = "GNU MPFR, a library for multiple-precision floating-point arithmetic"; + description = "Library for multiple-precision floating-point arithmetic"; longDescription = '' The GNU MPFR library is a C library for multiple-precision diff --git a/pkgs/development/libraries/mpich2/default.nix b/pkgs/development/libraries/mpich2/default.nix index 5fba9c56418..b80d549931c 100644 --- a/pkgs/development/libraries/mpich2/default.nix +++ b/pkgs/development/libraries/mpich2/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation { ''; meta = { - description = "MPICH2, an implementation of the Message Passing Interface (MPI) standard"; + description = "Implementation of the Message Passing Interface (MPI) standard"; longDescription = '' MPICH2 is a free high-performance and portable implementation of diff --git a/pkgs/development/libraries/ncurses/default.nix b/pkgs/development/libraries/ncurses/default.nix index 87953c1158d..631199bf87c 100644 --- a/pkgs/development/libraries/ncurses/default.nix +++ b/pkgs/development/libraries/ncurses/default.nix @@ -70,7 +70,7 @@ stdenv.mkDerivation rec { postFixup = lib.optionalString stdenv.isDarwin "rm $out/lib/*.so"; meta = { - description = "GNU Ncurses, a free software emulation of curses in SVR4 and more"; + description = "Free software emulation of curses in SVR4 and more"; longDescription = '' The Ncurses (new curses) library is a free software emulation of diff --git a/pkgs/development/libraries/nettle/default.nix b/pkgs/development/libraries/nettle/default.nix index 57d3732fa6d..38d197c69ab 100644 --- a/pkgs/development/libraries/nettle/default.nix +++ b/pkgs/development/libraries/nettle/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation (rec { ./cygwin.patch; meta = { - description = "GNU Nettle, a cryptographic library"; + description = "Cryptographic library"; longDescription = '' Nettle is a cryptographic library that is designed to fit diff --git a/pkgs/development/libraries/oniguruma/default.nix b/pkgs/development/libraries/oniguruma/default.nix index 47a51b68d03..08069533713 100644 --- a/pkgs/development/libraries/oniguruma/default.nix +++ b/pkgs/development/libraries/oniguruma/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.geocities.jp/kosako3/oniguruma/; - description = "Oniguruma regular expressions library"; + description = "Regular expressions library"; license = "BSD"; }; } diff --git a/pkgs/development/libraries/opal/default.nix b/pkgs/development/libraries/opal/default.nix index 1f59c0c24a0..c79c3cbe4d6 100644 --- a/pkgs/development/libraries/opal/default.nix +++ b/pkgs/development/libraries/opal/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { patches = [ ./disable-samples-ftbfs.diff ./libav9.patch ./libav10.patch ]; meta = with stdenv.lib; { - description = "OPAL VoIP library"; + description = "VoIP library"; maintainers = [ maintainers.raskin ]; platforms = platforms.linux; }; diff --git a/pkgs/development/libraries/openal/default.nix b/pkgs/development/libraries/openal/default.nix index b5e390eafa8..5a935691ca5 100644 --- a/pkgs/development/libraries/openal/default.nix +++ b/pkgs/development/libraries/openal/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { buildInputs = [ cmake ] ++ stdenv.lib.optional (!stdenv.isDarwin) alsaLib; meta = { - description = "OpenAL, a cross-platform 3D audio API"; + description = "Cross-platform 3D audio API"; longDescription = '' OpenAL is a cross-platform 3D audio API appropriate for use with diff --git a/pkgs/development/libraries/plib/default.nix b/pkgs/development/libraries/plib/default.nix index 35262f797e9..4ab6fb3ad8b 100644 --- a/pkgs/development/libraries/plib/default.nix +++ b/pkgs/development/libraries/plib/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { ]; meta = { - description = "PLIB: A Suite of Portable Game Libraries"; + description = "A suite of portable game libraries"; longDescription = '' PLIB includes sound effects, music, a complete 3D engine, font diff --git a/pkgs/development/libraries/ppl/default.nix b/pkgs/development/libraries/ppl/default.nix index f93eee674ff..9edef767481 100644 --- a/pkgs/development/libraries/ppl/default.nix +++ b/pkgs/development/libraries/ppl/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = { - description = "PPL: The Parma Polyhedra Library"; + description = "The Parma Polyhedra Library"; longDescription = '' The Parma Polyhedra Library (PPL) provides numerical abstractions diff --git a/pkgs/development/libraries/readline/readline6.3.nix b/pkgs/development/libraries/readline/readline6.3.nix index 9f5c9f7b581..17299e5f10d 100644 --- a/pkgs/development/libraries/readline/readline6.3.nix +++ b/pkgs/development/libraries/readline/readline6.3.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation (rec { ]; meta = { - description = "GNU Readline, a library for interactive line editing"; + description = "Library for interactive line editing"; longDescription = '' The GNU Readline library provides a set of functions for use by diff --git a/pkgs/development/libraries/readline/readline6.nix b/pkgs/development/libraries/readline/readline6.nix index 0559113285c..d72d6566bbc 100644 --- a/pkgs/development/libraries/readline/readline6.nix +++ b/pkgs/development/libraries/readline/readline6.nix @@ -26,7 +26,7 @@ stdenv.mkDerivation (rec { import ./readline-6.2-patches.nix patch); meta = { - description = "GNU Readline, a library for interactive line editing"; + description = "Library for interactive line editing"; longDescription = '' The GNU Readline library provides a set of functions for use by diff --git a/pkgs/development/libraries/science/biology/biolib/default.nix b/pkgs/development/libraries/science/biology/biolib/default.nix index 0461e5ebcf5..7418bdb6dfe 100644 --- a/pkgs/development/libraries/science/biology/biolib/default.nix +++ b/pkgs/development/libraries/science/biology/biolib/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://biolib.open-bio.org/"; - description = "BioLib"; + description = "Shared libraries for the major Bio* languages"; license = stdenv.lib.licenses.gpl2; longDescription = '' BioLib brings together a set of opensource libraries written diff --git a/pkgs/development/libraries/szip/default.nix b/pkgs/development/libraries/szip/default.nix index 17f9c973fd0..2ad2ed55d7c 100644 --- a/pkgs/development/libraries/szip/default.nix +++ b/pkgs/development/libraries/szip/default.nix @@ -8,9 +8,7 @@ stdenv.mkDerivation { }; meta = { - description = " - Szip is a compression library that can be used with the hdf5 library. - "; + description = "Compression library that can be used with the hdf5 library"; homepage = http://www.hdfgroup.org/doc_resource/SZIP/; license = stdenv.lib.licenses.unfree; }; diff --git a/pkgs/development/libraries/talloc/default.nix b/pkgs/development/libraries/talloc/default.nix index e04363326d0..15e89d9210a 100644 --- a/pkgs/development/libraries/talloc/default.nix +++ b/pkgs/development/libraries/talloc/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { '' else ""; meta = { - description = "talloc is a hierarchical pool based memory allocator with destructors"; + description = "Hierarchical pool based memory allocator with destructors"; homepage = http://tdb.samba.org/; license = stdenv.lib.licenses.gpl3; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/development/libraries/tdb/default.nix b/pkgs/development/libraries/tdb/default.nix index d0eb8987ea0..c5331656435 100644 --- a/pkgs/development/libraries/tdb/default.nix +++ b/pkgs/development/libraries/tdb/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { buildInputs = [ libxslt libxml2 docbook_xsl ]; meta = { - description = "TDB, the trivial database"; + description = "The trivial database"; longDescription = '' TDB is a Trivial Database. In concept, it is very much like GDBM, and BSD's DB except that it allows multiple simultaneous writers and diff --git a/pkgs/development/libraries/tecla/default.nix b/pkgs/development/libraries/tecla/default.nix index 6cb20f4e356..f83b34e40d1 100644 --- a/pkgs/development/libraries/tecla/default.nix +++ b/pkgs/development/libraries/tecla/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://www.astro.caltech.edu/~mcs/tecla/"; - description = "Tecla command-line editing library"; + description = "Command-line editing library"; license = "as-is"; hydraPlatforms = stdenv.lib.platforms.linux; diff --git a/pkgs/development/libraries/ucommon/default.nix b/pkgs/development/libraries/ucommon/default.nix index f3ac325b5a1..0e8a95d5ac1 100644 --- a/pkgs/development/libraries/ucommon/default.nix +++ b/pkgs/development/libraries/ucommon/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { doCheck = true; meta = { - description = "GNU uCommon C++, C++ library to facilitate using C++ design patterns"; + description = "C++ library to facilitate using C++ design patterns"; homepage = http://www.gnu.org/software/commoncpp/; license = stdenv.lib.licenses.lgpl3Plus; diff --git a/pkgs/development/libraries/v8/default.nix b/pkgs/development/libraries/v8/default.nix index d3a2511c90c..4c86de7fb56 100644 --- a/pkgs/development/libraries/v8/default.nix +++ b/pkgs/development/libraries/v8/default.nix @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { '' else null; meta = with stdenv.lib; { - description = "V8 is Google's open source JavaScript engine"; + description = "Google's open source JavaScript engine"; platforms = platforms.linux ++ platforms.darwin; license = licenses.bsd3; }; diff --git a/pkgs/development/libraries/xapian/default.nix b/pkgs/development/libraries/xapian/default.nix index 99837974b1d..d74a85a9162 100644 --- a/pkgs/development/libraries/xapian/default.nix +++ b/pkgs/development/libraries/xapian/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation { buildInputs = [ libuuid zlib ]; meta = { - description = "Xapian Probabilistic Information Retrieval library"; + description = "Search engine library"; homepage = "http://xapian.org"; license = stdenv.lib.licenses.gpl2Plus; maintainers = [ stdenv.lib.maintainers.chaoflow ]; diff --git a/pkgs/development/libraries/xbase/default.nix b/pkgs/development/libraries/xbase/default.nix index 81447276db7..95ba2a05ad9 100644 --- a/pkgs/development/libraries/xbase/default.nix +++ b/pkgs/development/libraries/xbase/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { meta = { homepage = http://linux.techass.com/projects/xdb/; - description = "XBase compatible C++ class library formerly known as XDB"; + description = "C++ class library formerly known as XDB"; platforms = stdenv.lib.platforms.all; maintainers = [ stdenv.lib.maintainers.urkud ]; }; diff --git a/pkgs/development/libraries/xylib/default.nix b/pkgs/development/libraries/xylib/default.nix index 8fff5f39338..fe9b6c5c3ca 100644 --- a/pkgs/development/libraries/xylib/default.nix +++ b/pkgs/development/libraries/xylib/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation { buildInputs = [boost zlib bzip2 ]; meta = { - description = "xylib is a portable library for reading files that contain x-y data from powder diffraction, spectroscopy and other experimental methods."; + description = "Portable library for reading files that contain x-y data from powder diffraction, spectroscopy and other experimental methods"; license = "LGPL"; homepage = http://xylib.sourceforge.net/; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/development/python-modules/ecdsa/default.nix b/pkgs/development/python-modules/ecdsa/default.nix index f668f3c6ac3..a07eceb45aa 100644 --- a/pkgs/development/python-modules/ecdsa/default.nix +++ b/pkgs/development/python-modules/ecdsa/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { meta = { homepage = "http://github.com/warner/python-ecdsa"; - description = "pure-python ECDSA signature/verification"; + description = "Pure-python ECDSA signature/verification"; license = stdenv.lib.licenses.mit; }; -} \ No newline at end of file +} diff --git a/pkgs/development/python-modules/numeric/default.nix b/pkgs/development/python-modules/numeric/default.nix index e97b2a5f1a4..0d6d5b0ffed 100644 --- a/pkgs/development/python-modules/numeric/default.nix +++ b/pkgs/development/python-modules/numeric/default.nix @@ -23,7 +23,7 @@ let version = "24.2"; in # FIXME: Run the tests. meta = { - description = "Numeric, a Python module for high-performance, numeric computing"; + description = "A Python module for high-performance, numeric computing"; longDescription = '' Numeric is a Python module for high-performance, numeric @@ -37,4 +37,4 @@ let version = "24.2"; in homepage = http://people.csail.mit.edu/jrennie/python/numeric/; }; - } \ No newline at end of file + } diff --git a/pkgs/development/tools/analysis/lcov/default.nix b/pkgs/development/tools/analysis/lcov/default.nix index 89a17d28a1b..10cdf01103a 100644 --- a/pkgs/development/tools/analysis/lcov/default.nix +++ b/pkgs/development/tools/analysis/lcov/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - description = "LCOV, a code coverage tool that enhances GNU gcov"; + description = "Code coverage tool that enhances GNU gcov"; longDescription = '' LCOV is an extension of GCOV, a GNU tool which provides information diff --git a/pkgs/development/tools/analysis/sparse/default.nix b/pkgs/development/tools/analysis/sparse/default.nix index 6d0e28f0ab2..6898b7eee54 100644 --- a/pkgs/development/tools/analysis/sparse/default.nix +++ b/pkgs/development/tools/analysis/sparse/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { doCheck = true; meta = { - description = "Sparse, a semantic parser for C"; + description = "Semantic parser for C"; homepage = "https://git.kernel.org/cgit/devel/sparse/sparse.git/"; license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/development/tools/analysis/valgrind/default.nix b/pkgs/development/tools/analysis/valgrind/default.nix index 5ffc287d114..aaeee026d0a 100644 --- a/pkgs/development/tools/analysis/valgrind/default.nix +++ b/pkgs/development/tools/analysis/valgrind/default.nix @@ -42,7 +42,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.valgrind.org/; - description = "Valgrind, a debugging and profiling tool suite"; + description = "Debugging and profiling tool suite"; longDescription = '' Valgrind is an award-winning instrumentation framework for diff --git a/pkgs/development/tools/build-managers/gradle/default.nix b/pkgs/development/tools/build-managers/gradle/default.nix index b7316fc17c4..a4863d12b5c 100644 --- a/pkgs/development/tools/build-managers/gradle/default.nix +++ b/pkgs/development/tools/build-managers/gradle/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { buildInputs = [ unzip jdk makeWrapper ]; meta = { - description = "Gradle is an enterprise-grade build system"; + description = "Enterprise-grade build system"; longDescription = '' Gradle is a build system which offers you ease, power and freedom. You can choose the balance for yourself. It has powerful multi-project diff --git a/pkgs/development/tools/documentation/doxygen/default.nix b/pkgs/development/tools/documentation/doxygen/default.nix index 54509178b1a..50f2037b271 100644 --- a/pkgs/development/tools/documentation/doxygen/default.nix +++ b/pkgs/development/tools/documentation/doxygen/default.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation { meta = { license = stdenv.lib.licenses.gpl2Plus; homepage = "http://doxygen.org/"; - description = "Doxygen, a source code documentation generator tool"; + description = "Source code documentation generator tool"; longDescription = '' Doxygen is a documentation system for C++, C, Java, Objective-C, diff --git a/pkgs/development/tools/java/fastjar/default.nix b/pkgs/development/tools/java/fastjar/default.nix index c8bb94412ca..e5a9ca50ce9 100644 --- a/pkgs/development/tools/java/fastjar/default.nix +++ b/pkgs/development/tools/java/fastjar/default.nix @@ -14,7 +14,7 @@ let version = "0.94"; in doCheck = true; meta = { - description = "FastJar, a fast Java archiver written in C"; + description = "Fast Java archiver written in C"; longDescription = '' Fastjar is a version of Sun's `jar' utility, written entirely in C, and diff --git a/pkgs/development/tools/misc/binutils/default.nix b/pkgs/development/tools/misc/binutils/default.nix index 8d8fc5d464e..fc48a4aabad 100644 --- a/pkgs/development/tools/misc/binutils/default.nix +++ b/pkgs/development/tools/misc/binutils/default.nix @@ -67,7 +67,7 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = { - description = "GNU Binutils, tools for manipulating binaries (linker, assembler, etc.)"; + description = "Tools for manipulating binaries (linker, assembler, etc.)"; longDescription = '' The GNU Binutils are a collection of binary tools. The main diff --git a/pkgs/development/tools/misc/cflow/default.nix b/pkgs/development/tools/misc/cflow/default.nix index 53bc8ed78c8..b1322d461ee 100644 --- a/pkgs/development/tools/misc/cflow/default.nix +++ b/pkgs/development/tools/misc/cflow/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { doCheck = true; meta = { - description = "GNU cflow, a tool to analyze the control flow of C programs"; + description = "Tool to analyze the control flow of C programs"; longDescription = '' GNU cflow analyzes a collection of C source files and prints a diff --git a/pkgs/development/tools/misc/coccinelle/default.nix b/pkgs/development/tools/misc/coccinelle/default.nix index 0bf5bbce692..51f5ed6091f 100644 --- a/pkgs/development/tools/misc/coccinelle/default.nix +++ b/pkgs/development/tools/misc/coccinelle/default.nix @@ -37,7 +37,7 @@ in stdenv.mkDerivation { configureFlags = "--enable-release"; meta = { - description = "Coccinelle, a program to apply C code semantic patches"; + description = "Program to apply semantic patches to C code"; longDescription = '' Coccinelle is a program matching and transformation engine which diff --git a/pkgs/development/tools/misc/complexity/default.nix b/pkgs/development/tools/misc/complexity/default.nix index 9f1eca0fa13..a7ae4d17ab1 100644 --- a/pkgs/development/tools/misc/complexity/default.nix +++ b/pkgs/development/tools/misc/complexity/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { ''; meta = { - description = "GNU Complexity, C code complexity measurement tool"; + description = "C code complexity measurement tool"; longDescription = '' GNU Complexity is a tool designed for analyzing the complexity of C diff --git a/pkgs/development/tools/misc/cppi/default.nix b/pkgs/development/tools/misc/cppi/default.nix index 500129c7c9d..2942408de80 100644 --- a/pkgs/development/tools/misc/cppi/default.nix +++ b/pkgs/development/tools/misc/cppi/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://savannah.gnu.org/projects/cppi/; - description = "GNU cppi, a cpp directive indenter"; + description = "A C preprocessor directive indenter"; longDescription = '' GNU cppi indents C preprocessor directives to reflect their nesting diff --git a/pkgs/development/tools/misc/cscope/default.nix b/pkgs/development/tools/misc/cscope/default.nix index 3a83b1ba325..223f1968274 100644 --- a/pkgs/development/tools/misc/cscope/default.nix +++ b/pkgs/development/tools/misc/cscope/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { }; meta = { - description = "Cscope, a developer's tool for browsing source code"; + description = "A developer's tool for browsing source code"; longDescription = '' Cscope is a developer's tool for browsing source code. It has diff --git a/pkgs/development/tools/misc/ctags/default.nix b/pkgs/development/tools/misc/ctags/default.nix index 80def733cf8..bf13a5daa66 100644 --- a/pkgs/development/tools/misc/ctags/default.nix +++ b/pkgs/development/tools/misc/ctags/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://ctags.sourceforge.net/"; - description = "Exuberant Ctags, a tool for fast source code browsing"; + description = "A tool for fast source code browsing (exuberant ctags)"; license = stdenv.lib.licenses.gpl2Plus; longDescription = '' diff --git a/pkgs/development/tools/misc/gdb/default.nix b/pkgs/development/tools/misc/gdb/default.nix index 2b5ced78063..5ee0f64a4e4 100644 --- a/pkgs/development/tools/misc/gdb/default.nix +++ b/pkgs/development/tools/misc/gdb/default.nix @@ -68,7 +68,7 @@ stdenv.mkDerivation rec { doCheck = false; meta = with stdenv.lib; { - description = "GDB, the GNU Project debugger"; + description = "The GNU Project debugger"; longDescription = '' GDB, the GNU Project debugger, allows you to see what is going diff --git a/pkgs/development/tools/misc/gengetopt/default.nix b/pkgs/development/tools/misc/gengetopt/default.nix index 9926dd6cd33..19e934f884f 100644 --- a/pkgs/development/tools/misc/gengetopt/default.nix +++ b/pkgs/development/tools/misc/gengetopt/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { doCheck = true; meta = { - description = "GNU Gengetopt, a command-line option parser generator"; + description = "Command-line option parser generator"; longDescription = '' GNU Gengetopt program generates a C function that uses getopt_long diff --git a/pkgs/development/tools/misc/global/default.nix b/pkgs/development/tools/misc/global/default.nix index d6abf8d10bd..b366feb304a 100644 --- a/pkgs/development/tools/misc/global/default.nix +++ b/pkgs/development/tools/misc/global/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { ''; meta = { - description = "GNU GLOBAL source code tag system"; + description = "Source code tag system"; longDescription = '' GNU GLOBAL is a source code tagging system that works the same way diff --git a/pkgs/development/tools/misc/gperf/default.nix b/pkgs/development/tools/misc/gperf/default.nix index e25998e5420..f0fd081ec5f 100644 --- a/pkgs/development/tools/misc/gperf/default.nix +++ b/pkgs/development/tools/misc/gperf/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { }; meta = { - description = "GNU gperf, a perfect hash function generator"; + description = "Perfect hash function generator"; longDescription = '' GNU gperf is a perfect hash function generator. For a given diff --git a/pkgs/development/tools/misc/help2man/default.nix b/pkgs/development/tools/misc/help2man/default.nix index 23bd35c8739..c4ba7073889 100644 --- a/pkgs/development/tools/misc/help2man/default.nix +++ b/pkgs/development/tools/misc/help2man/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = { - description = "GNU help2man generates man pages from `--help' output"; + description = "Generate man pages from `--help' output"; longDescription = '' help2man produces simple manual pages from the ‘--help’ and diff --git a/pkgs/development/tools/misc/libtool/default.nix b/pkgs/development/tools/misc/libtool/default.nix index 5eee9ead5d6..262d8aad23b 100644 --- a/pkgs/development/tools/misc/libtool/default.nix +++ b/pkgs/development/tools/misc/libtool/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { dontPatchShebangs = true; meta = { - description = "GNU Libtool, a generic library support script"; + description = "Generic library support script"; longDescription = '' GNU libtool is a generic library support script. Libtool hides diff --git a/pkgs/development/tools/misc/sloccount/default.nix b/pkgs/development/tools/misc/sloccount/default.nix index 455305be749..1aa9a2c058d 100644 --- a/pkgs/development/tools/misc/sloccount/default.nix +++ b/pkgs/development/tools/misc/sloccount/default.nix @@ -43,7 +43,7 @@ stdenv.mkDerivation rec { ''; meta = { - description = "SLOCCount, a set of tools for counting physical Source Lines of Code (SLOC)"; + description = "Set of tools for counting physical Source Lines of Code (SLOC)"; longDescription = '' This is the home page of "SLOCCount", a set of tools for diff --git a/pkgs/development/tools/misc/swig/default.nix b/pkgs/development/tools/misc/swig/default.nix index 09978b5ad65..66d6b65453e 100644 --- a/pkgs/development/tools/misc/swig/default.nix +++ b/pkgs/development/tools/misc/swig/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { configureFlags = stdenv.lib.optionalString stdenv.isDarwin "--disable-ccache"; meta = { - description = "SWIG, an interface compiler that connects C/C++ code to higher-level languages"; + description = "Interface compiler that connects C/C++ code to higher-level languages"; longDescription = '' SWIG is an interface compiler that connects programs written in C and diff --git a/pkgs/development/tools/misc/texinfo/4.13a.nix b/pkgs/development/tools/misc/texinfo/4.13a.nix index 5131d381412..a3155230514 100644 --- a/pkgs/development/tools/misc/texinfo/4.13a.nix +++ b/pkgs/development/tools/misc/texinfo/4.13a.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { #doCheck = true; meta = { - description = "GNU Texinfo, the GNU documentation system"; + description = "The GNU documentation system"; longDescription = '' Texinfo is the official documentation format of the GNU project. diff --git a/pkgs/development/tools/misc/texinfo/5.2.nix b/pkgs/development/tools/misc/texinfo/5.2.nix index 804e7a2527f..62e1ff62d1e 100644 --- a/pkgs/development/tools/misc/texinfo/5.2.nix +++ b/pkgs/development/tools/misc/texinfo/5.2.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://www.gnu.org/software/texinfo/"; - description = "GNU Texinfo, the GNU documentation system"; + description = "The GNU documentation system"; license = stdenv.lib.licenses.gpl3Plus; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/development/tools/ocaml/omake/default.nix b/pkgs/development/tools/ocaml/omake/default.nix index 22e0d71af4d..300cbbc0a0c 100644 --- a/pkgs/development/tools/ocaml/omake/default.nix +++ b/pkgs/development/tools/ocaml/omake/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation { # buildFlags = "world.opt"; meta = { - description = "Omake build system"; + description = "A build system designed for scalability and portability"; homepage = "${webpage}"; license = "GPL"; }; diff --git a/pkgs/development/tools/parsing/bison/2.x.nix b/pkgs/development/tools/parsing/bison/2.x.nix index 5bf5d7c2e8c..f89e7bca5a7 100644 --- a/pkgs/development/tools/parsing/bison/2.x.nix +++ b/pkgs/development/tools/parsing/bison/2.x.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://www.gnu.org/software/bison/"; - description = "GNU Bison, a Yacc-compatible parser generator"; + description = "Yacc-compatible parser generator"; license = stdenv.lib.licenses.gpl3Plus; longDescription = '' diff --git a/pkgs/development/tools/parsing/bison/3.x.nix b/pkgs/development/tools/parsing/bison/3.x.nix index 5947f85343c..49602a23201 100644 --- a/pkgs/development/tools/parsing/bison/3.x.nix +++ b/pkgs/development/tools/parsing/bison/3.x.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://www.gnu.org/software/bison/"; - description = "GNU Bison, a Yacc-compatible parser generator"; + description = "Yacc-compatible parser generator"; license = stdenv.lib.licenses.gpl3Plus; longDescription = '' diff --git a/pkgs/development/tools/profiling/oprofile/default.nix b/pkgs/development/tools/profiling/oprofile/default.nix index e301fe8431a..6c7b2a4d9ae 100644 --- a/pkgs/development/tools/profiling/oprofile/default.nix +++ b/pkgs/development/tools/profiling/oprofile/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { ''; meta = { - description = "OProfile, a system-wide profiler for Linux"; + description = "System-wide profiler for Linux"; longDescription = '' OProfile is a system-wide profiler for Linux systems, capable of profiling all running code at low overhead. It consists of a diff --git a/pkgs/development/tools/profiling/sysprof/default.nix b/pkgs/development/tools/profiling/sysprof/default.nix index 457a5d1dcaa..826ca93aa7d 100644 --- a/pkgs/development/tools/profiling/sysprof/default.nix +++ b/pkgs/development/tools/profiling/sysprof/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://sysprof.com/; - description = "Sysprof, a system-wide profiler for Linux"; + description = "System-wide profiler for Linux"; license = stdenv.lib.licenses.gpl2Plus; longDescription = '' diff --git a/pkgs/development/tools/sqsh/default.nix b/pkgs/development/tools/sqsh/default.nix index a0f7922b1aa..15a6985b8bf 100644 --- a/pkgs/development/tools/sqsh/default.nix +++ b/pkgs/development/tools/sqsh/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { ]; meta = { - description = "SQSH is command line tool for querying Sybase/MSSQL databases"; + description = "Command line tool for querying Sybase/MSSQL databases"; longDescription = '' Sqsh (pronounced skwish) is short for SQshelL (pronounced s-q-shell), diff --git a/pkgs/games/banner/default.nix b/pkgs/games/banner/default.nix index b4e61b6d1d1..b443a76b9a7 100644 --- a/pkgs/games/banner/default.nix +++ b/pkgs/games/banner/default.nix @@ -36,7 +36,7 @@ mkDerivation "banner-1.3.2" "0dc0ac0667b2e884a7f5ad3e467af68cd0fd5917f8c9aa19188 meta = { homepage = "http://shh.thathost.com/pub-unix/"; - description = "print large banners to ASCII terminals"; + description = "Print large banners to ASCII terminals"; license = stdenv.lib.licenses.gpl2; longDescription = '' diff --git a/pkgs/games/chessdb/default.nix b/pkgs/games/chessdb/default.nix index 381e35632a6..224eb6f594a 100644 --- a/pkgs/games/chessdb/default.nix +++ b/pkgs/games/chessdb/default.nix @@ -24,6 +24,6 @@ stdenv.mkDerivation { meta = { homepage = http://chessdb.sourceforge.net/; - description = "ChessDB is a free chess database"; + description = "A free chess database"; }; } diff --git a/pkgs/games/construo/default.nix b/pkgs/games/construo/default.nix index 57d055ed3d3..f94b489908e 100644 --- a/pkgs/games/construo/default.nix +++ b/pkgs/games/construo/default.nix @@ -24,6 +24,6 @@ stdenv.mkDerivation rec { builder = writeScript (name + "-builder") (textClosure localDefs ["preConfigure" "doConfigure" "doMakeInstall" "doForceShare" "doPropagate"]); meta = { - description = "Construo masses and springs simulation"; + description = "Masses and springs simulation game"; }; } diff --git a/pkgs/games/crafty/default.nix b/pkgs/games/crafty/default.nix index 0e2796df22d..351e25388e1 100644 --- a/pkgs/games/crafty/default.nix +++ b/pkgs/games/crafty/default.nix @@ -659,7 +659,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.craftychess.com/; - description = "Crafty is a free, open-source computer chess program developed by Dr. Robert M. Hyatt"; + description = "Chess program developed by Dr. Robert M. Hyatt"; license = stdenv.lib.licenses.unfree; platforms = stdenv.lib.platforms.unix; maintainers = [ stdenv.lib.maintainers.jwiegley ]; diff --git a/pkgs/games/eboard/default.nix b/pkgs/games/eboard/default.nix index 1decee4264a..8dd06fa6a28 100644 --- a/pkgs/games/eboard/default.nix +++ b/pkgs/games/eboard/default.nix @@ -14,6 +14,6 @@ stdenv.mkDerivation { meta = { homepage = http://www.bergo.eng.br/eboard/; - description = "eboard is a chess interface for Unix-like systems"; + description = "Chess interface for Unix-like systems"; }; } diff --git a/pkgs/games/openspades/default.nix b/pkgs/games/openspades/default.nix index 7f11fc82903..c2218d033d7 100644 --- a/pkgs/games/openspades/default.nix +++ b/pkgs/games/openspades/default.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { else null; meta = with stdenv.lib; { - description = "OpenSpades is a compatible client of Ace of Spades 0.75"; + description = "A compatible client of Ace of Spades 0.75"; homepage = "https://github.com/yvt/openspades/"; license = licenses.gpl3; platforms = platforms.linux; diff --git a/pkgs/games/openttd/default.nix b/pkgs/games/openttd/default.nix index 1b6b7f26a41..ff96622cb59 100644 --- a/pkgs/games/openttd/default.nix +++ b/pkgs/games/openttd/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { ''; meta = { - description = ''OpenTTD is an open source clone of the Microprose game "Transport Tycoon Deluxe"''; + description = ''Open source clone of the Microprose game "Transport Tycoon Deluxe"''; longDescription = '' OpenTTD is a transportation economics simulator. In single player mode, players control a transportation business, and use rail, road, sea, and air diff --git a/pkgs/games/opentyrian/default.nix b/pkgs/games/opentyrian/default.nix index cfae6a4bb3e..c435bbe5887 100644 --- a/pkgs/games/opentyrian/default.nix +++ b/pkgs/games/opentyrian/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { "; meta = { - description = ''OpenTyrian is an open source port of the game "Tyrian".''; + description = ''Open source port of the game "Tyrian"''; homepage = https://opentyrian.googlecode.com/; # This does not account of Tyrian data. # license = stdenv.lib.licenses.gpl2; diff --git a/pkgs/games/teeworlds/default.nix b/pkgs/games/teeworlds/default.nix index c685f11c4c1..5276ec4cc34 100644 --- a/pkgs/games/teeworlds/default.nix +++ b/pkgs/games/teeworlds/default.nix @@ -51,7 +51,7 @@ EOF ''; meta = { - description = "Teeworlds, a retro multiplayer shooter game"; + description = "Retro multiplayer shooter game"; longDescription = '' Teeworlds is a free online multiplayer game, available for all diff --git a/pkgs/misc/ghostscript/default.nix b/pkgs/misc/ghostscript/default.nix index 275b93e01b8..b8c879d598b 100644 --- a/pkgs/misc/ghostscript/default.nix +++ b/pkgs/misc/ghostscript/default.nix @@ -12,7 +12,7 @@ assert cupsSupport -> cups != null; let meta_common = { homepage = "http://www.gnu.org/software/ghostscript/"; - description = "GNU Ghostscript, a PostScript interpreter"; + description = "PostScript interpreter (GNU version)"; longDescription = '' Ghostscript is the name of a set of tools that provides (i) an @@ -48,7 +48,7 @@ let }; meta = meta_common // { homepage = "http://www.ghostscript.com/"; - description = "GPL Ghostscript, a PostScript interpreter"; + description = "PostScript interpreter (mainline version)"; }; preConfigure = '' diff --git a/pkgs/misc/xosd/default.nix b/pkgs/misc/xosd/default.nix index d6b73ed16fe..54538be84b4 100644 --- a/pkgs/misc/xosd/default.nix +++ b/pkgs/misc/xosd/default.nix @@ -14,6 +14,6 @@ stdenv.mkDerivation rec { buildInputs = [ libX11 libXext libXt xextproto xproto ]; meta = { - description = "XOSD displays text on your screen"; + description = "Displays text on your screen"; }; } diff --git a/pkgs/os-specific/linux/conky/default.nix b/pkgs/os-specific/linux/conky/default.nix index 92b97ffb592..52e5d95346e 100644 --- a/pkgs/os-specific/linux/conky/default.nix +++ b/pkgs/os-specific/linux/conky/default.nix @@ -67,7 +67,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://conky.sourceforge.net/; - description = "Conky is an advanced, highly configurable system monitor based on torsmo"; + description = "Advanced, highly configurable system monitor based on torsmo"; maintainers = [ stdenv.lib.maintainers.guibert ]; license = stdenv.lib.licenses.gpl3Plus; }; diff --git a/pkgs/servers/dico/default.nix b/pkgs/servers/dico/default.nix index ca4980f5a6c..f345fe71a34 100644 --- a/pkgs/servers/dico/default.nix +++ b/pkgs/servers/dico/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - description = "GNU Dico, a flexible dictionary server and client implementing RFC 2229"; + description = "Flexible dictionary server and client implementing RFC 2229"; homepage = http://www.gnu.org/software/dico/; license = "GPLv3+"; maintainers = with maintainers; [ lovek323 ]; diff --git a/pkgs/servers/dns/bind/default.nix b/pkgs/servers/dns/bind/default.nix index 921d8e907f1..50e71a74546 100644 --- a/pkgs/servers/dns/bind/default.nix +++ b/pkgs/servers/dns/bind/default.nix @@ -35,7 +35,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://www.isc.org/software/bind"; - description = "ISC BIND: a domain name server"; + description = "Domain name server"; license = stdenv.lib.licenses.isc; maintainers = with stdenv.lib.maintainers; [viric simons]; diff --git a/pkgs/servers/felix/default.nix b/pkgs/servers/felix/default.nix index aa40365e8de..c1114232ea8 100644 --- a/pkgs/servers/felix/default.nix +++ b/pkgs/servers/felix/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation { cp -av * $out ''; meta = { - description = "Apache Felix OSGi gateway"; + description = "An OSGi gateway"; homepage = http://felix.apache.org; license = "ASF"; maintainers = [ stdenv.lib.maintainers.sander ]; diff --git a/pkgs/servers/firebird/default.nix b/pkgs/servers/firebird/default.nix index 365af29595c..3e778317169 100644 --- a/pkgs/servers/firebird/default.nix +++ b/pkgs/servers/firebird/default.nix @@ -79,7 +79,7 @@ stdenv.mkDerivation rec { installPhase = ''cp -r gen/firebird $out''; meta = { - description = "firebird database engine"; + description = "SQL relational database management system"; homepage = http://www.firebirdnews.org; license = ["IDPL" "Interbase-1.0"]; maintainers = [stdenv.lib.maintainers.marcweber]; diff --git a/pkgs/servers/http/couchdb/default.nix b/pkgs/servers/http/couchdb/default.nix index 35d4ebbf89f..0b5244a5974 100644 --- a/pkgs/servers/http/couchdb/default.nix +++ b/pkgs/servers/http/couchdb/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { ''; meta = { - description = "Apache CouchDB is a database that uses JSON for documents, JavaScript for MapReduce queries, and regular HTTP for an API"; + description = "A database that uses JSON for documents, JavaScript for MapReduce queries, and regular HTTP for an API"; homepage = "http://couchdb.apache.org"; license = stdenv.lib.licenses.asl20; maintainers = with stdenv.lib.maintainers; [ viric garbas ]; diff --git a/pkgs/servers/http/jboss/default.nix b/pkgs/servers/http/jboss/default.nix index d5768da4c82..86d37189887 100644 --- a/pkgs/servers/http/jboss/default.nix +++ b/pkgs/servers/http/jboss/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation { meta = { homepage = "http://www.jboss.org/"; - description = "JBoss, Open Source J2EE application server"; + description = "Open Source J2EE application server"; license = "GPL/LGPL"; maintainers = [ lib.maintainers.sander ]; }; diff --git a/pkgs/servers/pies/default.nix b/pkgs/servers/pies/default.nix index 958578138bc..56c7da5caed 100644 --- a/pkgs/servers/pies/default.nix +++ b/pkgs/servers/pies/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { doCheck = true; meta = { - description = "GNU Pies, a program invocation and execution supervisor"; + description = "A program invocation and execution supervisor"; longDescription = '' The name Pies (pronounced "p-yes") stands for Program Invocation and diff --git a/pkgs/servers/pulseaudio/default.nix b/pkgs/servers/pulseaudio/default.nix index 2c6f6c10493..a918007b47c 100644 --- a/pkgs/servers/pulseaudio/default.nix +++ b/pkgs/servers/pulseaudio/default.nix @@ -64,7 +64,7 @@ stdenv.mkDerivation rec { installFlags = "sysconfdir=$(out)/etc pulseconfdir=$(out)/etc/pulse"; meta = with stdenv.lib; { - description = "PulseAudio, a sound server for POSIX and Win32 systems"; + description = "Sound server for POSIX and Win32 systems"; homepage = http://www.pulseaudio.org/; # Note: Practically, the server is under the GPL due to the # dependency on `libsamplerate'. See `LICENSE' for details. diff --git a/pkgs/servers/shishi/default.nix b/pkgs/servers/shishi/default.nix index 2e0a4e84f6c..a41915e5be8 100644 --- a/pkgs/servers/shishi/default.nix +++ b/pkgs/servers/shishi/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { doCheck = true; meta = { - description = "GNU Shishi, free implementation of the Kerberos 5 network security system"; + description = "An implementation of the Kerberos 5 network security system"; homepage = http://www.gnu.org/software/shishi/; license = stdenv.lib.licenses.gpl3Plus; maintainers = with stdenv.lib.maintainers; [ bjg lovek323 ]; diff --git a/pkgs/shells/rush/default.nix b/pkgs/shells/rush/default.nix index e9d0c61ee08..3232caf5848 100644 --- a/pkgs/shells/rush/default.nix +++ b/pkgs/shells/rush/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { doCheck = true; meta = { - description = "GNU Rush, Restricted User Shell"; + description = "Restricted User Shell"; longDescription = '' GNU Rush is a Restricted User Shell, designed for sites diff --git a/pkgs/tools/X11/hsetroot/default.nix b/pkgs/tools/X11/hsetroot/default.nix index d91f4bfdf65..e226f1f93c4 100644 --- a/pkgs/tools/X11/hsetroot/default.nix +++ b/pkgs/tools/X11/hsetroot/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation { buildInputs = [ imlib2 libX11 libXext ]; meta = { - description = "hsetroot allows you to compose wallpapers ('root pixmaps') for X"; + description = "Allows you to compose wallpapers ('root pixmaps') for X"; homepage = http://thegraveyard.org/hsetroot.html; license = stdenv.lib.licenses.gpl2Plus; }; diff --git a/pkgs/tools/X11/wmctrl/default.nix b/pkgs/tools/X11/wmctrl/default.nix index 3f691b8ecd4..2e23e7bd4de 100644 --- a/pkgs/tools/X11/wmctrl/default.nix +++ b/pkgs/tools/X11/wmctrl/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://tomas.styblo.name/wmctrl/; - description = "wmctrl is a UNIX/Linux command line tool to interact with an EWMH/NetWM compatible X Window Manager"; + description = "Command line tool to interact with an EWMH/NetWM compatible X Window Manager"; license = stdenv.lib.licenses.gpl2; platforms = with stdenv.lib.platforms; all; }; diff --git a/pkgs/tools/X11/xnee/default.nix b/pkgs/tools/X11/xnee/default.nix index 0e92021b62c..35c4ca06c6c 100644 --- a/pkgs/tools/X11/xnee/default.nix +++ b/pkgs/tools/X11/xnee/default.nix @@ -34,7 +34,7 @@ stdenv.mkDerivation rec { doCheck = true; meta = { - description = "GNU Xnee, an X11 event recording and replay tool"; + description = "X11 event recording and replay tool"; longDescription = '' Xnee is a suite of programs that can record, replay and distribute diff --git a/pkgs/tools/X11/xtrace/default.nix b/pkgs/tools/X11/xtrace/default.nix index efc0647f5db..c3c9c70fe92 100644 --- a/pkgs/tools/X11/xtrace/default.nix +++ b/pkgs/tools/X11/xtrace/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation { meta = { homepage = http://xtrace.alioth.debian.org/; - description = "xtrace, a tool to trace X11 protocol connections"; + description = "Tool to trace X11 protocol connections"; license = stdenv.lib.licenses.gpl2; maintainers = with stdenv.lib.maintainers; [viric]; platforms = with stdenv.lib.platforms; linux; diff --git a/pkgs/tools/admin/tightvnc/default.nix b/pkgs/tools/admin/tightvnc/default.nix index acb8708ec14..407242cf2d9 100644 --- a/pkgs/tools/admin/tightvnc/default.nix +++ b/pkgs/tools/admin/tightvnc/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation { meta = { license = stdenv.lib.licenses.gpl2Plus; homepage = "http://vnc-tight.sourceforge.net/"; - description = "TightVNC is an improved version of VNC"; + description = "Improved version of VNC"; longDescription = '' TightVNC is an improved version of VNC, the great free diff --git a/pkgs/tools/archivers/sharutils/default.nix b/pkgs/tools/archivers/sharutils/default.nix index afd734fbae0..f19564e4ad9 100644 --- a/pkgs/tools/archivers/sharutils/default.nix +++ b/pkgs/tools/archivers/sharutils/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { }; meta = { - description = "GNU Sharutils, tools for remote synchronization and `shell archives'"; + description = "Tools for remote synchronization and `shell archives'"; longDescription = '' GNU shar makes so-called shell archives out of many files, preparing diff --git a/pkgs/tools/backup/partclone/default.nix b/pkgs/tools/backup/partclone/default.nix index b446b06f987..fe2b9e00aaa 100644 --- a/pkgs/tools/backup/partclone/default.nix +++ b/pkgs/tools/backup/partclone/default.nix @@ -17,7 +17,13 @@ stdenv.mkDerivation { installPhase = ''make INSTPREFIX=$out install''; meta = { - description = "Partclone provides utilities to save and restore used blocks on a partition and is designed for higher compatibility of the file system by using existing libraries, e.g. e2fslibs is used to read and write the ext2 partition"; + description = "Utilities to save and restore used blocks on a partition"; + longDescription = '' + Partclone provides utilities to save and restore used blocks on a + partition and is designed for higher compatibility of the file system by + using existing libraries, e.g. e2fslibs is used to read and write the + ext2 partition. + ''; homepage = http://partclone.org; license = stdenv.lib.licenses.gpl2; maintainers = [stdenv.lib.maintainers.marcweber]; diff --git a/pkgs/tools/cd-dvd/xorriso/default.nix b/pkgs/tools/cd-dvd/xorriso/default.nix index 88cca66efb1..218ea9a1e7f 100644 --- a/pkgs/tools/cd-dvd/xorriso/default.nix +++ b/pkgs/tools/cd-dvd/xorriso/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { ++ stdenv.lib.optional stdenv.isLinux acl; meta = { - description = "GNU xorriso, an ISO 9660 Rock Ridge file system manipulator"; + description = "ISO 9660 Rock Ridge file system manipulator"; longDescription = '' GNU xorriso copies file objects from POSIX compliant filesystems diff --git a/pkgs/tools/compression/gzip/default.nix b/pkgs/tools/compression/gzip/default.nix index b7bf9c59f49..cc304d9aa1e 100644 --- a/pkgs/tools/compression/gzip/default.nix +++ b/pkgs/tools/compression/gzip/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.gnu.org/software/gzip/; - description = "Gzip, the GNU zip compression program"; + description = "GNU zip compression program"; longDescription = ''gzip (GNU zip) is a popular data compression program written by diff --git a/pkgs/tools/compression/rzip/default.nix b/pkgs/tools/compression/rzip/default.nix index ca8d356abb3..4460ae6edf3 100644 --- a/pkgs/tools/compression/rzip/default.nix +++ b/pkgs/tools/compression/rzip/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation { meta = { homepage = http://rzip.samba.org/; - description = "The RZIP compression program"; + description = "Compression program"; license = stdenv.lib.licenses.gpl2Plus; }; } diff --git a/pkgs/tools/filesystems/chunkfs/default.nix b/pkgs/tools/filesystems/chunkfs/default.nix index d91525e348f..f8c6942bad0 100644 --- a/pkgs/tools/filesystems/chunkfs/default.nix +++ b/pkgs/tools/filesystems/chunkfs/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { ''; meta = { - description = "(Un)ChunkFS is a pair of FUSE filesystems for viewing chunksync-style directory trees as a block device and vice versa."; + description = "FUSE filesystems for viewing chunksync-style directory trees as a block device and vice versa"; homepage = "http://chunkfs.florz.de/"; license = stdenv.lib.licenses.gpl2; platforms = with stdenv.lib.platforms; linux; diff --git a/pkgs/tools/filesystems/encfs/default.nix b/pkgs/tools/filesystems/encfs/default.nix index 9ebab38984b..ea96001a421 100644 --- a/pkgs/tools/filesystems/encfs/default.nix +++ b/pkgs/tools/filesystems/encfs/default.nix @@ -14,6 +14,6 @@ stdenv.mkDerivation { meta = { homepage = http://www.arg0.net/encfs; - description = "EncFS provides an encrypted filesystem in user-space via FUSE"; + description = "Provides an encrypted filesystem in user-space via FUSE"; }; } diff --git a/pkgs/tools/filesystems/mtools/default.nix b/pkgs/tools/filesystems/mtools/default.nix index 0b666f38942..6b9631bfccf 100644 --- a/pkgs/tools/filesystems/mtools/default.nix +++ b/pkgs/tools/filesystems/mtools/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.gnu.org/software/mtools/; - description = "GNU mtools, utilities to access MS-DOS disks"; + description = "Utilities to access MS-DOS disks"; platforms = stdenv.lib.platforms.gnu; # arbitrary choice maintainers = [ ]; }; diff --git a/pkgs/tools/filesystems/svnfs/default.nix b/pkgs/tools/filesystems/svnfs/default.nix index b6a296e6bc7..fba066d0f4c 100644 --- a/pkgs/tools/filesystems/svnfs/default.nix +++ b/pkgs/tools/filesystems/svnfs/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { NIX_LDFLAGS="-lsvn_client-1"; meta = { - description = "SvnFs is a filesystem written using FUSE for accessing Subversion repositories"; + description = "FUSE filesystem for accessing Subversion repositories"; homepage = http://www.jmadden.eu/index.php/svnfs/; license = stdenv.lib.licenses.gpl2; maintainers = [stdenv.lib.maintainers.marcweber]; diff --git a/pkgs/tools/filesystems/wdfs/default.nix b/pkgs/tools/filesystems/wdfs/default.nix index 68d978a2a55..a28d5394fc1 100644 --- a/pkgs/tools/filesystems/wdfs/default.nix +++ b/pkgs/tools/filesystems/wdfs/default.nix @@ -10,6 +10,6 @@ stdenv.mkDerivation rec buildInputs = [fuse glib neon pkgconfig]; meta = { homepage = "http://noedler.de/projekte/wdfs/"; - description = "wdfs a user-space filesystem that allows to mount a webdav share"; + description = "User-space filesystem that allows to mount a webdav share"; }; } diff --git a/pkgs/tools/graphics/cuneiform/default.nix b/pkgs/tools/graphics/cuneiform/default.nix index 2638594903a..0e94571503c 100644 --- a/pkgs/tools/graphics/cuneiform/default.nix +++ b/pkgs/tools/graphics/cuneiform/default.nix @@ -37,6 +37,6 @@ rec { name = "cuneiform-" + version; meta = { inherit version; - description = "Cuneiform OCR"; + description = "Multi-language OCR system"; }; } diff --git a/pkgs/tools/graphics/plotutils/default.nix b/pkgs/tools/graphics/plotutils/default.nix index ae0c4d19731..0f67de3c3ea 100644 --- a/pkgs/tools/graphics/plotutils/default.nix +++ b/pkgs/tools/graphics/plotutils/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { doCheck = true; meta = { - description = "GNU Plotutils, a powerful C/C++ library for exporting 2D vector graphics"; + description = "Powerful C/C++ library for exporting 2D vector graphics"; longDescription = '' The GNU plotutils package contains software for both programmers and diff --git a/pkgs/tools/misc/goaccess/default.nix b/pkgs/tools/misc/goaccess/default.nix index 56e18227d66..0f8f82acaed 100644 --- a/pkgs/tools/misc/goaccess/default.nix +++ b/pkgs/tools/misc/goaccess/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { ]; meta = { - description = "GoAccess is an open source real-time web log analyzer and interactive viewer that runs in a terminal in *nix systems."; + description = "Real-time web log analyzer and interactive viewer that runs in a terminal in *nix systems"; homepage = http://goaccess.prosoftcorp.com; license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; diff --git a/pkgs/tools/misc/idutils/default.nix b/pkgs/tools/misc/idutils/default.nix index 2b2f3aeaca3..503beefa15a 100644 --- a/pkgs/tools/misc/idutils/default.nix +++ b/pkgs/tools/misc/idutils/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { patches = [ ./nix-mapping.patch ]; meta = { - description = "GNU Idutils, a text searching utility"; + description = "Text searching utility"; longDescription = '' An "ID database" is a binary file containing a list of file diff --git a/pkgs/tools/misc/lbdb/default.nix b/pkgs/tools/misc/lbdb/default.nix index 20830bad6bf..6d03b09c588 100644 --- a/pkgs/tools/misc/lbdb/default.nix +++ b/pkgs/tools/misc/lbdb/default.nix @@ -17,6 +17,6 @@ stdenv.mkDerivation { homepage = "http://www.spinnaker.de/lbdb/"; license = stdenv.lib.licenses.gpl2; platforms = stdenv.lib.platforms.all; - description = "The Little Brother's Database (lbdb)"; + description = "The Little Brother's Database"; }; } diff --git a/pkgs/tools/misc/ldapvi/default.nix b/pkgs/tools/misc/ldapvi/default.nix index 28d9b4863d4..6dba834e8be 100644 --- a/pkgs/tools/misc/ldapvi/default.nix +++ b/pkgs/tools/misc/ldapvi/default.nix @@ -21,7 +21,11 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - description = "ldapvi is an interactive LDAP client for Unix terminals. Using it, you can update LDAP entries with a text editor"; + description = "Interactive LDAP client for Unix terminals"; + longDescription = '' + ldapvi is an interactive LDAP client for Unix terminals. Using it, you + can update LDAP entries with a text editor. + ''; homepage = http://www.lichteblau.com/ldapvi/; license = licenses.gpl2; maintainers = with maintainers; [ iElectric ]; diff --git a/pkgs/tools/misc/minicom/default.nix b/pkgs/tools/misc/minicom/default.nix index 8ede3aa918b..d731e856790 100644 --- a/pkgs/tools/misc/minicom/default.nix +++ b/pkgs/tools/misc/minicom/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { ''; meta = { - description = "Minicom, a modem control and terminal emulation program"; + description = "Modem control and terminal emulation program"; homepage = http://alioth.debian.org/projects/minicom/; longDescription = diff --git a/pkgs/tools/misc/most/default.nix b/pkgs/tools/misc/most/default.nix index b7f7842680f..b97d8f0b719 100644 --- a/pkgs/tools/misc/most/default.nix +++ b/pkgs/tools/misc/most/default.nix @@ -20,7 +20,8 @@ stdenv.mkDerivation { buildInputs = [ slang ncurses ]; meta = { - description = '' + description = "A terminal pager similar to 'more' and 'less'"; + longDescription = '' MOST is a powerful paging program for Unix, VMS, MSDOS, and win32 systems. Unlike other well-known paging programs most supports multiple windows and can scroll left and right. Why settle for less? diff --git a/pkgs/tools/misc/parallel/default.nix b/pkgs/tools/misc/parallel/default.nix index df360bb9804..4b0332c7506 100644 --- a/pkgs/tools/misc/parallel/default.nix +++ b/pkgs/tools/misc/parallel/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { doCheck = true; meta = { - description = "GNU Parallel, a shell tool for executing jobs in parallel"; + description = "Shell tool for executing jobs in parallel"; longDescription = '' GNU Parallel is a shell tool for executing jobs in parallel. A job diff --git a/pkgs/tools/misc/parted/default.nix b/pkgs/tools/misc/parted/default.nix index 108d4d5e040..01b9f391a44 100644 --- a/pkgs/tools/misc/parted/default.nix +++ b/pkgs/tools/misc/parted/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { "export PATH=\"${utillinux}/sbin:$PATH\""; meta = { - description = "GNU Parted, a tool to create, destroy, resize, check, and copy partitions"; + description = "Create, destroy, resize, check, and copy partitions"; longDescription = '' GNU Parted is an industrial-strength package for creating, destroying, diff --git a/pkgs/tools/misc/pg_top/default.nix b/pkgs/tools/misc/pg_top/default.nix index 392fcbcc8ff..0d379cd11d4 100644 --- a/pkgs/tools/misc/pg_top/default.nix +++ b/pkgs/tools/misc/pg_top/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation { buildInputs = [ncurses postgresql]; meta = { - description = "pg_top is 'top' for PostgreSQL"; + description = "A 'top' like tool for PostgreSQL"; longDescription = '' pg_top allows you to: diff --git a/pkgs/tools/misc/recutils/default.nix b/pkgs/tools/misc/recutils/default.nix index f2f5f37ebe4..4d6829e99a4 100644 --- a/pkgs/tools/misc/recutils/default.nix +++ b/pkgs/tools/misc/recutils/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { buildInputs = [ curl emacs ] ++ (stdenv.lib.optionals doCheck [ check bc ]); meta = { - description = "GNU Recutils, tools and libraries to access human-editable, text-based databases"; + description = "Tools and libraries to access human-editable, text-based databases"; longDescription = '' GNU Recutils is a set of tools and libraries to access diff --git a/pkgs/tools/misc/time/default.nix b/pkgs/tools/misc/time/default.nix index 3a35e9a9f1c..737ba244fe8 100644 --- a/pkgs/tools/misc/time/default.nix +++ b/pkgs/tools/misc/time/default.nix @@ -11,7 +11,7 @@ stdenv.mkDerivation { patches = [ ./max-resident.patch ]; meta = { - description = "GNU Time, a tool that runs programs and summarizes the system resources they use"; + description = "Tool that runs programs and summarizes the system resources they use"; longDescription = '' The `time' command runs another program, then displays diff --git a/pkgs/tools/misc/tmpwatch/default.nix b/pkgs/tools/misc/tmpwatch/default.nix index c19d58b9816..760f56726fa 100644 --- a/pkgs/tools/misc/tmpwatch/default.nix +++ b/pkgs/tools/misc/tmpwatch/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { homepage = https://fedorahosted.org/tmpwatch/; - description = "The tmpwatch utility recursively searches through specified directories and removes files which have not been accessed in a specified period of time."; + description = "Recursively searches through specified directories and removes files which have not been accessed in a specified period of time"; license = licenses.gpl2; maintainers = with maintainers; [ vlstill ]; platforms = platforms.unix; diff --git a/pkgs/tools/misc/tmux/default.nix b/pkgs/tools/misc/tmux/default.nix index 4acbabb50f9..32f681dabeb 100644 --- a/pkgs/tools/misc/tmux/default.nix +++ b/pkgs/tools/misc/tmux/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://tmux.sourceforge.net/; - description = "tmux is a terminal multiplexer"; + description = "Terminal multiplexer"; longDescription = '' tmux is intended to be a modern, BSD-licensed alternative to programs such as GNU screen. Major features include: diff --git a/pkgs/tools/misc/yad/default.nix b/pkgs/tools/misc/yad/default.nix index fcdf5095d70..d884d48f521 100644 --- a/pkgs/tools/misc/yad/default.nix +++ b/pkgs/tools/misc/yad/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { meta = { homepage = "http://code.google.com/p/yad/"; - description = "Yad (yet another dialog) is a GUI dialog tool for shell scripts"; + description = "GUI dialog tool for shell scripts"; longDescription = '' Yad (yet another dialog) is a GUI dialog tool for shell scripts. It is a fork of Zenity with many improvements, such as custom buttons, additional diff --git a/pkgs/tools/networking/cntlm/default.nix b/pkgs/tools/networking/cntlm/default.nix index cd3ae12a11b..f890bdddb69 100644 --- a/pkgs/tools/networking/cntlm/default.nix +++ b/pkgs/tools/networking/cntlm/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { ''; meta = { - description = "Cntlm is an NTLM/NTLMv2 authenticating HTTP proxy"; + description = "NTLM/NTLMv2 authenticating HTTP proxy"; homepage = http://cntlm.sourceforge.net/; license = stdenv.lib.licenses.gpl2; maintainers = [ stdenv.lib.maintainers.qknight ]; diff --git a/pkgs/tools/networking/connman/default.nix b/pkgs/tools/networking/connman/default.nix index c99af220a56..7d955b44950 100644 --- a/pkgs/tools/networking/connman/default.nix +++ b/pkgs/tools/networking/connman/default.nix @@ -49,7 +49,7 @@ stdenv.mkDerivation { ''; meta = { - description = "The ConnMan project provides a daemon for managing internet connections"; + description = "Provides a daemon for managing internet connections"; homepage = "https://connman.net/"; maintainers = [ stdenv.lib.maintainers.matejc ]; # tested only on linux, might work on others also diff --git a/pkgs/tools/networking/flvstreamer/default.nix b/pkgs/tools/networking/flvstreamer/default.nix index f9322129612..ab8e14fddd0 100644 --- a/pkgs/tools/networking/flvstreamer/default.nix +++ b/pkgs/tools/networking/flvstreamer/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { ''; meta = { - description = "flvstreamer is an command-line RTMP client"; + description = "Command-line RTMP client"; longDescription = '' flvstreamer is an open source command-line RTMP client intended to diff --git a/pkgs/tools/networking/host/default.nix b/pkgs/tools/networking/host/default.nix index c74dbe52829..54cb8b21aaf 100644 --- a/pkgs/tools/networking/host/default.nix +++ b/pkgs/tools/networking/host/default.nix @@ -18,7 +18,7 @@ let version = "20000331"; in installTargets = "install man"; meta = { - description = "`host', a DNS resolution utility"; + description = "DNS resolution utility"; license = "BSD-style"; }; } diff --git a/pkgs/tools/networking/inetutils/default.nix b/pkgs/tools/networking/inetutils/default.nix index 20ee6da8a30..a6a921f6f58 100644 --- a/pkgs/tools/networking/inetutils/default.nix +++ b/pkgs/tools/networking/inetutils/default.nix @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { ''; meta = { - description = "GNU Inetutils, a collection of common network programs"; + description = "Collection of common network programs"; longDescription = '' The GNU network utilities suite provides the diff --git a/pkgs/tools/networking/jnettop/default.nix b/pkgs/tools/networking/jnettop/default.nix index 49753d189d6..cfeaf47fdf2 100644 --- a/pkgs/tools/networking/jnettop/default.nix +++ b/pkgs/tools/networking/jnettop/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { preConfigure = '' autoconf ''; meta = { - description = "Jnettop, a network traffic visualizer"; + description = "Network traffic visualizer"; longDescription = '' Jnettop is a traffic visualiser, which captures traffic going diff --git a/pkgs/tools/networking/lsh/default.nix b/pkgs/tools/networking/lsh/default.nix index 6be4119469e..c86dba91f5e 100644 --- a/pkgs/tools/networking/lsh/default.nix +++ b/pkgs/tools/networking/lsh/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { buildInputs = [ gperf guile gmp zlib liboop readline gnum4 pam ]; meta = { - description = "GNU lsh, a GPL'd implementation of the SSH protocol"; + description = "GPL'd implementation of the SSH protocol"; longDescription = '' lsh is a free implementation (in the GNU sense) of the ssh diff --git a/pkgs/tools/networking/mailutils/default.nix b/pkgs/tools/networking/mailutils/default.nix index 4c1001310ae..0ee49032704 100755 --- a/pkgs/tools/networking/mailutils/default.nix +++ b/pkgs/tools/networking/mailutils/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { doCheck = false; meta = { - description = "GNU Mailutils is a rich and powerful protocol-independent mail framework"; + description = "Rich and powerful protocol-independent mail framework"; longDescription = '' GNU Mailutils is a rich and powerful protocol-independent mail diff --git a/pkgs/tools/networking/minidlna/default.nix b/pkgs/tools/networking/minidlna/default.nix index 02013d8ede6..9db42f09d81 100644 --- a/pkgs/tools/networking/minidlna/default.nix +++ b/pkgs/tools/networking/minidlna/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { buildInputs = [ ffmpeg flac libvorbis libogg libid3tag libexif libjpeg sqlite ]; meta = { - description = "MiniDLNA Media Server"; + description = "Media server software"; longDescription = '' MiniDLNA (aka ReadyDLNA) is server software with the aim of being fully compliant with DLNA/UPnP-AV clients. diff --git a/pkgs/tools/networking/tcpdump/default.nix b/pkgs/tools/networking/tcpdump/default.nix index 2e27c2b2dc3..ed295e95a38 100644 --- a/pkgs/tools/networking/tcpdump/default.nix +++ b/pkgs/tools/networking/tcpdump/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { }; meta = { - description = "tcpdump, a famous network sniffer"; + description = "Network sniffer"; homepage = http://www.tcpdump.org/; license = "BSD-style"; maintainers = stdenv.lib.maintainers.mornfall; diff --git a/pkgs/tools/networking/wget/default.nix b/pkgs/tools/networking/wget/default.nix index 6ff5439c4bc..27d7fe2572a 100644 --- a/pkgs/tools/networking/wget/default.nix +++ b/pkgs/tools/networking/wget/default.nix @@ -36,7 +36,7 @@ stdenv.mkDerivation rec { doCheck = (perl != null); meta = { - description = "GNU Wget, a tool for retrieving files using HTTP, HTTPS, and FTP"; + description = "Tool for retrieving files using HTTP, HTTPS, and FTP"; longDescription = '' GNU Wget is a free software package for retrieving files using HTTP, diff --git a/pkgs/tools/package-management/nix/default.nix b/pkgs/tools/package-management/nix/default.nix index b2e86935b50..6631214f39a 100644 --- a/pkgs/tools/package-management/nix/default.nix +++ b/pkgs/tools/package-management/nix/default.nix @@ -66,7 +66,14 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = { - description = "The Nix Deployment System"; + description = "Powerful package manager that makes package management reliable and reproducible"; + longDescription = '' + Nix is a powerful package manager for Linux and other Unix systems that + makes package management reliable and reproducible. It provides atomic + upgrades and rollbacks, side-by-side installation of multiple versions of + a package, multi-user package management and easy setup of build + environments. + ''; homepage = http://nixos.org/; license = stdenv.lib.licenses.lgpl2Plus; maintainers = [ stdenv.lib.maintainers.eelco ]; diff --git a/pkgs/tools/security/scrypt/default.nix b/pkgs/tools/security/scrypt/default.nix index fe2a19491d9..668a7605115 100644 --- a/pkgs/tools/security/scrypt/default.nix +++ b/pkgs/tools/security/scrypt/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { buildInputs = [ openssl ]; meta = { - description = "The scrypt encryption utility"; + description = "Encryption utility"; homepage = https://www.tarsnap.com/scrypt.html; license = stdenv.lib.licenses.bsd2; platforms = stdenv.lib.platforms.all; diff --git a/pkgs/tools/security/steghide/default.nix b/pkgs/tools/security/steghide/default.nix index bc87c091a58..03e8c727022 100644 --- a/pkgs/tools/security/steghide/default.nix +++ b/pkgs/tools/security/steghide/default.nix @@ -7,7 +7,7 @@ meta = with stdenv.lib; { homepage = http://steghide.sourceforge.net/; - description = "Steghide is a steganography program that is able to hide data in various kinds of image- and audio-files."; + description = "Steganography program that is able to hide data in various kinds of image- and audio-files"; license = licenses.gpl2; }; diff --git a/pkgs/tools/security/tboot/default.nix b/pkgs/tools/security/tboot/default.nix index 1c9967edc47..854f67f2aee 100644 --- a/pkgs/tools/security/tboot/default.nix +++ b/pkgs/tools/security/tboot/default.nix @@ -21,9 +21,7 @@ stdenv.mkDerivation rec { installFlags = "DESTDIR=$(out)"; meta = with stdenv.lib; { - description = ''Trusted Boot (tboot) is an open source, pre-kernel/VMM module that uses - Intel(R) Trusted Execution Technology (Intel(R) TXT) to perform a measured - and verified launch of an OS kernel/VMM.''; + description = "A pre-kernel/VMM module that uses Intel(R) TXT to perform a measured and verified launch of an OS kernel/VMM"; homepage = http://sourceforge.net/projects/tboot/; license = licenses.bsd3; maintainers = [ maintainers.ak ]; diff --git a/pkgs/tools/security/tor/default.nix b/pkgs/tools/security/tor/default.nix index d71bbd891f9..3318d0c1102 100644 --- a/pkgs/tools/security/tor/default.nix +++ b/pkgs/tools/security/tor/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.torproject.org/; repositories.git = https://git.torproject.org/git/tor; - description = "Tor, an anonymous network router to improve privacy on the Internet"; + description = "Anonymous network router to improve privacy on the Internet"; longDescription='' Tor protects you by bouncing your communications around a distributed diff --git a/pkgs/tools/security/tpm-tools/default.nix b/pkgs/tools/security/tpm-tools/default.nix index 95b3b6b51f7..6e7ff75a6a4 100644 --- a/pkgs/tools/security/tpm-tools/default.nix +++ b/pkgs/tools/security/tpm-tools/default.nix @@ -14,9 +14,12 @@ stdenv.mkDerivation rec { buildInputs = [ trousers openssl ]; meta = with stdenv.lib; { - description = ''tpm-tools is an open-source package designed to enable user and application - enablement of Trusted Computing using a Trusted Platform Module (TPM), - similar to a smart card environment.''; + description = "Management tools for TPM hardware"; + longDescription = '' + tpm-tools is an open-source package designed to enable user and + application enablement of Trusted Computing using a Trusted Platform + Module (TPM), similar to a smart card environment. + ''; homepage = http://sourceforge.net/projects/trousers/files/tpm-tools/; license = licenses.cpl10; maintainers = [ maintainers.ak ]; diff --git a/pkgs/tools/security/trousers/default.nix b/pkgs/tools/security/trousers/default.nix index 4c2af359b96..fe797291f9e 100644 --- a/pkgs/tools/security/trousers/default.nix +++ b/pkgs/tools/security/trousers/default.nix @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { NIX_LDFLAGS = "-lgcc_s"; meta = with stdenv.lib; { - description = "TrouSerS is an CPL (Common Public License) licensed Trusted Computing Software Stack."; + description = "Trusted computing software stack"; homepage = http://trousers.sourceforge.net/; license = licenses.cpl10; maintainers = [ maintainers.ak ]; diff --git a/pkgs/tools/system/cron/default.nix b/pkgs/tools/system/cron/default.nix index 6132abc0879..0cf29a67b9d 100644 --- a/pkgs/tools/system/cron/default.nix +++ b/pkgs/tools/system/cron/default.nix @@ -22,6 +22,6 @@ stdenv.mkDerivation { preInstall = "mkdir -p $out/bin $out/sbin $out/share/man/man1 $out/share/man/man5 $out/share/man/man8"; meta = { - description = "Vixie Cron, a daemon for running commands at specific times"; + description = "Daemon for running commands at specific times (Vixie Cron)"; }; } diff --git a/pkgs/tools/system/freeipmi/default.nix b/pkgs/tools/system/freeipmi/default.nix index 21a67dba305..48562adffeb 100644 --- a/pkgs/tools/system/freeipmi/default.nix +++ b/pkgs/tools/system/freeipmi/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { doCheck = true; meta = { - description = "GNU FreeIPMI, an implementation of the Intelligent Platform Management Interface"; + description = "Implementation of the Intelligent Platform Management Interface"; longDescription = '' GNU FreeIPMI provides in-band and out-of-band IPMI software based on diff --git a/pkgs/tools/system/hardlink/default.nix b/pkgs/tools/system/hardlink/default.nix index 982aac3c990..6ae92b685cc 100644 --- a/pkgs/tools/system/hardlink/default.nix +++ b/pkgs/tools/system/hardlink/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation { meta = { homepage = "http://pkgs.fedoraproject.org/cgit/hardlink.git/"; - description = "consolidate duplicate files via hardlinks"; + description = "Consolidate duplicate files via hardlinks"; license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.unix; diff --git a/pkgs/tools/system/mcron/default.nix b/pkgs/tools/system/mcron/default.nix index 4bf95895996..842529c573f 100644 --- a/pkgs/tools/system/mcron/default.nix +++ b/pkgs/tools/system/mcron/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { doCheck = true; meta = { - description = "GNU mcron, a flexible implementation of `cron' in Guile"; + description = "Flexible implementation of `cron' in Guile"; longDescription = '' The GNU package mcron (Mellor's cron) is a 100% compatible diff --git a/pkgs/tools/text/enscript/default.nix b/pkgs/tools/text/enscript/default.nix index fe11ec59246..797f5b8b692 100644 --- a/pkgs/tools/text/enscript/default.nix +++ b/pkgs/tools/text/enscript/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { doCheck = true; meta = { - description = "GNU Enscript, a converter from ASCII to PostScript, HTML, or RTF"; + description = "Converter from ASCII to PostScript, HTML, or RTF"; longDescription = '' GNU Enscript converts ASCII files to PostScript, HTML, or RTF and diff --git a/pkgs/tools/text/mpage/default.nix b/pkgs/tools/text/mpage/default.nix index 5b95c37c732..c147b3ea301 100644 --- a/pkgs/tools/text/mpage/default.nix +++ b/pkgs/tools/text/mpage/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { ''; meta = { - description = "Mpage, many-to-one page printing utility"; + description = "Many-to-one page printing utility"; longDescription = '' Mpage reads plain text files or PostScript documents and prints diff --git a/pkgs/tools/text/namazu/default.nix b/pkgs/tools/text/namazu/default.nix index fba52b69fba..72caa7ba5cb 100644 --- a/pkgs/tools/text/namazu/default.nix +++ b/pkgs/tools/text/namazu/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { doCheck = !stdenv.isLinux; meta = { - description = "Namazu, a full-text search engine"; + description = "Full-text search engine"; longDescription = '' Namazu is a full-text search engine intended for easy use. Not diff --git a/pkgs/tools/text/wdiff/default.nix b/pkgs/tools/text/wdiff/default.nix index e6fc3510cd4..c07caad15a3 100644 --- a/pkgs/tools/text/wdiff/default.nix +++ b/pkgs/tools/text/wdiff/default.nix @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://www.gnu.org/software/wdiff/; - description = "GNU wdiff, comparing files on a word by word basis"; + description = "Comparing files on a word by word basis"; license = stdenv.lib.licenses.gpl3Plus; maintainers = [ stdenv.lib.maintainers.eelco ]; platforms = stdenv.lib.platforms.linux; diff --git a/pkgs/tools/typesetting/lout/default.nix b/pkgs/tools/typesetting/lout/default.nix index c0fc4336297..a2ebfa0a9fd 100644 --- a/pkgs/tools/typesetting/lout/default.nix +++ b/pkgs/tools/typesetting/lout/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { builder = ./builder.sh; meta = { - description = "Lout, a document layout system similar in style to LaTeX"; + description = "Document layout system similar in style to LaTeX"; longDescription = '' The Lout document formatting system is now reads a high-level diff --git a/pkgs/tools/typesetting/rubber/default.nix b/pkgs/tools/typesetting/rubber/default.nix index 8344735606c..32545abaff2 100644 --- a/pkgs/tools/typesetting/rubber/default.nix +++ b/pkgs/tools/typesetting/rubber/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { patchPhase = "substituteInPlace configure --replace which \"type -P\""; meta = { - description = "Rubber, a wrapper for LaTeX and friends"; + description = "Wrapper for LaTeX and friends"; longDescription = '' Rubber is a program whose purpose is to handle all tasks related diff --git a/pkgs/tools/typesetting/xmlto/default.nix b/pkgs/tools/typesetting/xmlto/default.nix index 1b0602063e9..a1eee51b34d 100644 --- a/pkgs/tools/typesetting/xmlto/default.nix +++ b/pkgs/tools/typesetting/xmlto/default.nix @@ -32,7 +32,7 @@ stdenv.mkDerivation rec { ''; meta = { - description = "xmlto, a front-end to an XSL toolchain"; + description = "Front-end to an XSL toolchain"; longDescription = '' xmlto is a front-end to an XSL toolchain. It chooses an diff --git a/pkgs/tools/video/dvgrab/default.nix b/pkgs/tools/video/dvgrab/default.nix index faaea6aaffc..73986b5be05 100644 --- a/pkgs/tools/video/dvgrab/default.nix +++ b/pkgs/tools/video/dvgrab/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { ]; meta = { - description = "dvgrab, receive and store audio & video over IEEE1394"; + description = "Receive and store audio & video over IEEE1394"; longDescription = '' dvgrab receives audio and video data from a digital camcorder via an -- GitLab From 873ab39401476802192d46f96678d5e2c410b6df Mon Sep 17 00:00:00 2001 From: Nicolas Pierron Date: Mon, 25 Aug 2014 00:46:23 +0200 Subject: [PATCH 230/843] NixOS: Add meta.maintainer option to modules. --- nixos/modules/misc/meta.nix | 63 +++++++++++++++++++++++++++++++++++ nixos/modules/module-list.nix | 1 + 2 files changed, 64 insertions(+) create mode 100644 nixos/modules/misc/meta.nix diff --git a/nixos/modules/misc/meta.nix b/nixos/modules/misc/meta.nix new file mode 100644 index 00000000000..22622706f2c --- /dev/null +++ b/nixos/modules/misc/meta.nix @@ -0,0 +1,63 @@ +{ config, lib, ... }: + +with lib; + +let + maintainer = mkOptionType { + name = "maintainer"; + check = email: elem email (attrValues lib.maintainers); + merge = loc: defs: listToAttrs (singleton (nameValuePair (last defs).file (last defs).value)); + }; + + listOfMaintainers = types.listOf maintainer // { + # Returns list of + # { "module-file" = [ + # "maintainer1 " + # "maintainer2 " ]; + # } + merge = loc: defs: + zipAttrs + (flatten (imap (n: def: imap (m: def': + maintainer.merge (loc ++ ["[${toString n}-${toString m}]"]) + [{ inherit (def) file; value = def'; }]) def.value) defs)); + }; + + docFile = types.path // { + # Returns tuples of + # { file = "module location"; value = ; } + merge = loc: defs: defs; + }; +in + +{ + options = { + meta = { + + maintainers = mkOption { + type = listOfMaintainers; + internal = true; + default = []; + example = [ lib.maintainers.all ]; + description = '' + List of maintainers of each module. This option should be defined at + most once per module. + ''; + }; + + doc = mkOption { + type = docFile; + internal = true; + example = "./meta.xml"; + description = '' + Documentation prologe for the set of options of each module. This + option should be defined at most once per module. + ''; + }; + + }; + }; + + config = { + meta.maintainers = singleton lib.maintainers.pierron; + }; +} diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 453899175e0..095dbf42480 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -43,6 +43,7 @@ ./misc/ids.nix ./misc/lib.nix ./misc/locate.nix + ./misc/meta.nix ./misc/nixpkgs.nix ./misc/passthru.nix ./misc/version.nix -- GitLab From a4ac9eb22e5559e7def4f58ea96837023aeae8bd Mon Sep 17 00:00:00 2001 From: Jaka Hudoklin Date: Mon, 25 Aug 2014 02:45:11 +0200 Subject: [PATCH 231/843] nixos: add systemd service for getty on /dev/console --- nixos/modules/services/ttys/agetty.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/nixos/modules/services/ttys/agetty.nix b/nixos/modules/services/ttys/agetty.nix index df21ebbd974..3878b02b1a8 100644 --- a/nixos/modules/services/ttys/agetty.nix +++ b/nixos/modules/services/ttys/agetty.nix @@ -66,6 +66,12 @@ with lib; restartIfChanged = false; }; + systemd.services."console-getty" = + { serviceConfig.ExecStart = "@${pkgs.utillinux}/sbin/agetty agetty --noclear --login-program ${pkgs.shadow}/bin/login --keep-baud console 115200,38400,9600 $TERM"; + serviceConfig.Restart = "always"; + restartIfChanged = false; + }; + environment.etc = singleton { # Friendly greeting on the virtual consoles. source = pkgs.writeText "issue" '' -- GitLab From d77150df30c46b5cdf70aae79893bfb2fbc621a8 Mon Sep 17 00:00:00 2001 From: Jaka Hudoklin Date: Mon, 25 Aug 2014 02:45:33 +0200 Subject: [PATCH 232/843] nixos: make-system-tarball, add option for extra arguments for tar Sometimes extra arguments when making tarball are required, for example if making a container owner of files has to be changed to root. --- nixos/lib/make-system-tarball.nix | 5 ++++- nixos/lib/make-system-tarball.sh | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/nixos/lib/make-system-tarball.nix b/nixos/lib/make-system-tarball.nix index 8fed9a34882..3bd891fdbc2 100644 --- a/nixos/lib/make-system-tarball.nix +++ b/nixos/lib/make-system-tarball.nix @@ -15,6 +15,9 @@ # store path whose closure will be copied, and `symlink' is a # symlink to `object' that will be added to the tarball. storeContents ? [] + + # Extra tar arguments +, extraArgs ? "" }: stdenv.mkDerivation { @@ -22,7 +25,7 @@ stdenv.mkDerivation { builder = ./make-system-tarball.sh; buildInputs = [perl xz]; - inherit fileName pathsFromGraph; + inherit fileName pathsFromGraph extraArgs; # !!! 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 096d96ac1c8..2eb668115a6 100644 --- a/nixos/lib/make-system-tarball.sh +++ b/nixos/lib/make-system-tarball.sh @@ -50,7 +50,7 @@ done mkdir -p $out/tarball -tar cvJf $out/tarball/$fileName.tar.xz * +tar cvJf $out/tarball/$fileName.tar.xz * $extraArgs mkdir -p $out/nix-support echo $system > $out/nix-support/system -- GitLab From ffe984b9c19e2dcde4810fea8d36a0619483371b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Sun, 24 Aug 2014 19:54:39 +0200 Subject: [PATCH 233/843] pythonPackages.python_magic: 0.4.3 -> 0.4.6 --- pkgs/top-level/python-packages.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 6295ae90ed2..16be6f6203b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4157,11 +4157,11 @@ rec { python_magic = buildPythonPackage rec { - name = "python-magic-0.4.3"; + name = "python-magic-0.4.6"; src = fetchurl { url = "http://pypi.python.org/packages/source/p/python-magic/${name}.tar.gz"; - md5 = "eec9e2b1bcaf43308b7dacb3f2ecd8c1"; + md5 = "07e7a0fea78dd81ed609414c3484df58"; }; propagatedBuildInputs = [ pkgs.file ]; @@ -4169,6 +4169,8 @@ rec { patchPhase = '' substituteInPlace magic.py --replace "ctypes.CDLL(dll)" "ctypes.CDLL('${pkgs.file}/lib/libmagic.so')" ''; + + doCheck = false; # TODO: tests are failing #checkPhase = '' -- GitLab From 11345b784438220ab67d97bd375e20af933ad20a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Mon, 25 Aug 2014 09:52:38 +0200 Subject: [PATCH 234/843] remove icecat3 --- .../networking/browsers/icecat-3/default.nix | 118 ------------------ .../browsers/icecat-3/rpath-link.patch | 14 --- .../icecat-3/skip-gre-registration.patch | 12 -- .../mplayerplug-in/default.nix | 3 - pkgs/top-level/all-packages.nix | 20 --- pkgs/top-level/release-small.nix | 1 - pkgs/top-level/release.nix | 1 - 7 files changed, 169 deletions(-) delete mode 100644 pkgs/applications/networking/browsers/icecat-3/default.nix delete mode 100644 pkgs/applications/networking/browsers/icecat-3/rpath-link.patch delete mode 100644 pkgs/applications/networking/browsers/icecat-3/skip-gre-registration.patch diff --git a/pkgs/applications/networking/browsers/icecat-3/default.nix b/pkgs/applications/networking/browsers/icecat-3/default.nix deleted file mode 100644 index 91a71a4b4c4..00000000000 --- a/pkgs/applications/networking/browsers/icecat-3/default.nix +++ /dev/null @@ -1,118 +0,0 @@ -{ fetchurl, stdenv, pkgconfig, gtk, pango, perl, python, ply, zip, libIDL -, libjpeg, libpng, zlib, cairo, dbus, dbus_glib, bzip2, xlibs, alsaLib -, libnotify, gnome_vfs, libgnomeui -, freetype, fontconfig, wirelesstools ? null, pixman -, application ? "browser" }: - -# Build the WiFi stuff on Linux-based systems. -# FIXME: Disable for now until it can actually be built: -# http://thread.gmane.org/gmane.comp.gnu.gnuzilla/1376 . -#assert stdenv.isLinux -> (wirelesstools != null); - -let version = "3.6.15"; in -stdenv.mkDerivation { - name = "icecat-${version}"; - - src = fetchurl { - url = "mirror://gnu/gnuzilla/${version}/icecat-${version}.tar.xz"; - sha256 = "1px018bd81c81a4hbz0qgf89pkshkbhg4abwq1d26dwy8128cxwg"; - }; - - buildInputs = - [ libgnomeui libnotify gnome_vfs alsaLib - pkgconfig gtk perl zip libIDL libjpeg libpng zlib cairo bzip2 pixman - python ply dbus dbus_glib pango freetype fontconfig - xlibs.libXi xlibs.libX11 xlibs.libXrender xlibs.libXft xlibs.libXt - ] - ++ (stdenv.lib.optional false /* stdenv.isLinux */ wirelesstools); - - patches = [ - ./skip-gre-registration.patch ./rpath-link.patch - ]; - - configureFlags = - [ "--enable-application=${application}" - "--enable-libxul" - "--disable-javaxpcom" - - "--enable-optimize" - "--disable-debug" - "--enable-strip" - "--with-system-jpeg" - "--with-system-zlib" - "--with-system-bz2" - # "--with-system-png" # <-- "--with-system-png won't work because the system's libpng doesn't have APNG support" - "--enable-system-cairo" - #"--enable-system-sqlite" # <-- this seems to be discouraged - "--disable-crashreporter" - ] - ++ (stdenv.lib.optional true /* (!stdenv.isLinux) */ "--disable-necko-wifi"); - - postInstall = '' - export dontPatchELF=1; - - # Strip some more stuff - strip -S "$out/lib/"*"/"* || true - - # This fixes starting IceCat when there already is a running - # instance. The `icecat' wrapper script actually expects to be - # in the same directory as `run-mozilla.sh', apparently. - libDir=$(cd $out/lib && ls -d icecat-[0-9]*) - test -n "$libDir" - - if [ -f "$out/bin/icecat" ] - then - # Fix references to /bin paths in the IceCat shell script. - substituteInPlace $out/bin/icecat \ - --replace /bin/pwd "$(type -tP pwd)" \ - --replace /bin/ls "$(type -tP ls)" - - cd $out/bin - mv icecat ../lib/$libDir/ - ln -s ../lib/$libDir/icecat . - - # Register extensions etc. - echo "running \`icecat -register'..." - (cd $out/lib/$libDir && LD_LIBRARY_PATH=. ./icecat-bin -register) || false - fi - - if [ -f "$out/lib/$libDir/xpidl" ] - then - # XulRunner's IDL compiler. - echo "linking \`xpidl'..." - ln -s "$out/lib/$libDir/xpidl" "$out/bin" - fi - - # Put the GNU IceCat icon in the right place. - mkdir -p "$out/lib/$libDir/chrome/icons/default" - ln -s ../../../icons/default.xpm "$out/lib/$libDir/chrome/icons/default/" - ''; - - enableParallelBuilding = true; - - meta = { - description = "GNU IceCat, a free web browser based on Mozilla Firefox"; - - longDescription = '' - Gnuzilla is the GNU version of the Mozilla suite, and GNU IceCat - is the GNU version of the Firefox browser. Its main advantage - is an ethical one: it is entirely free software. While the - source code from the Mozilla project is free software, the - binaries that they release include additional non-free software. - Also, they distribute and recommend non-free software as - plug-ins. In addition, GNU IceCat includes some privacy - protection features. - ''; - - homepage = http://www.gnu.org/software/gnuzilla/; - license = [ "GPLv2+" "LGPLv2+" "MPLv1+" ]; - broken = true; - maintainers = [ ]; - platforms = stdenv.lib.platforms.gnu; - }; - - passthru = { - inherit gtk version; - isFirefox3Like = true; - }; -} diff --git a/pkgs/applications/networking/browsers/icecat-3/rpath-link.patch b/pkgs/applications/networking/browsers/icecat-3/rpath-link.patch deleted file mode 100644 index d50784f13ee..00000000000 --- a/pkgs/applications/networking/browsers/icecat-3/rpath-link.patch +++ /dev/null @@ -1,14 +0,0 @@ -Without this patch, IceCat ends up linking with -`-Wl,-rpath-link=/bin -Wl-,-rpath-link=/lib'. - ---- icecat-3.5/js/src/configure 2009-07-04 18:03:01.000000000 +0200 -+++ icecat-3.5/js/src/configure 2009-07-13 18:34:30.000000000 +0200 -@@ -4775,7 +4775,6 @@ HOST_AR='$(AR)' - HOST_AR_FLAGS='$(AR_FLAGS)' - - MOZ_JS_LIBS='-L$(libdir) -lmozjs' --MOZ_FIX_LINK_PATHS='-Wl,-rpath-link,$(LIBXUL_DIST)/bin -Wl,-rpath-link,$(PREFIX)/lib' - - MOZ_COMPONENT_NSPR_LIBS='-L$(LIBXUL_DIST)/bin $(NSPR_LIBS)' - MOZ_XPCOM_OBSOLETE_LIBS='-L$(LIBXUL_DIST)/lib -lxpcom_compat' - diff --git a/pkgs/applications/networking/browsers/icecat-3/skip-gre-registration.patch b/pkgs/applications/networking/browsers/icecat-3/skip-gre-registration.patch deleted file mode 100644 index d1fb4e3f30a..00000000000 --- a/pkgs/applications/networking/browsers/icecat-3/skip-gre-registration.patch +++ /dev/null @@ -1,12 +0,0 @@ -Skip "GRE" registration since that assumes write access to `/etc'. - ---- icecat-3.0.1-g1/xulrunner/installer/Makefile.in 2008-07-27 12:52:16.000000000 +0200 -+++ icecat-3.0.1-g1/xulrunner/installer/Makefile.in 2008-09-08 17:19:17.000000000 +0200 -@@ -71,6 +71,7 @@ $(MOZILLA_VERSION).system.conf: $(topsrc - printf "[%s]\nGRE_PATH=%s\nxulrunner=true\nabi=%s" \ - $(MOZILLA_VERSION) $(installdir) $(TARGET_XPCOM_ABI)> $@ - -+SKIP_GRE_REGISTRATION = yes - ifndef SKIP_GRE_REGISTRATION - # to register xulrunner per-user, override this with $HOME/.gre.d - regdir = /etc/gre.d diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/mplayerplug-in/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/mplayerplug-in/default.nix index 5b6b2176d47..105e5904715 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/mplayerplug-in/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/mplayerplug-in/default.nix @@ -8,9 +8,6 @@ stdenv.mkDerivation rec { sha256 = "0zkvqrzibrbljiccvz3rhbmgifxadlrfjylqpz48jnjx9kggynms"; }; - patches = - stdenv.lib.optional (browser ? isFirefox3Like) ./icecat3-idldir.patch; - postConfigure = (if browser ? isFirefox3Like then '' # Cause a rebuild of these file from the IDL file, needed for GNU IceCat 3 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ebfd4715d4b..8f7723fde9f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8995,26 +8995,6 @@ let i810switch = callPackage ../os-specific/linux/i810switch { }; - icecat3 = lowPrio (callPackage ../applications/networking/browsers/icecat-3 { - inherit (gnome) libIDL libgnomeui gnome_vfs; - inherit (xlibs) pixman; - inherit (pythonPackages) ply; - }); - - icecatXulrunner3 = lowPrio (callPackage ../applications/networking/browsers/icecat-3 { - application = "xulrunner"; - inherit (gnome) libIDL libgnomeui gnome_vfs; - inherit (xlibs) pixman; - inherit (pythonPackages) ply; - }); - - icecat3Xul = - (symlinkJoin "icecat-with-xulrunner-${icecat3.version}" - [ icecat3 icecatXulrunner3 ]) - // { inherit (icecat3) gtk isFirefox3Like meta; }; - - icecat3Wrapper = wrapFirefox { browser = icecat3Xul; browserName = "icecat"; desktopName = "IceCat"; }; - icewm = callPackage ../applications/window-managers/icewm { }; id3v2 = callPackage ../applications/audio/id3v2 { }; diff --git a/pkgs/top-level/release-small.nix b/pkgs/top-level/release-small.nix index c447587e36e..cfb14429a76 100644 --- a/pkgs/top-level/release-small.nix +++ b/pkgs/top-level/release-small.nix @@ -74,7 +74,6 @@ with import ./release-lib.nix { inherit supportedSystems; }; hello = all; host = linux; iana_etc = linux; - icecat3Xul = linux; icewm = linux; idutils = all; ifplugd = linux; diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index 246adb4e1c1..9970c2789ac 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -160,7 +160,6 @@ let htmlTidy = all; hugin = linux; iana_etc = linux; - icecat3Xul = linux; icewm = linux; idutils = all; ifplugd = linux; -- GitLab From 2053c7d8bea4a5acce6699ff56508889c10174df Mon Sep 17 00:00:00 2001 From: Markus Kohlhase Date: Sun, 24 Aug 2014 22:16:24 +0200 Subject: [PATCH 235/843] added xinput_calibrator v0.7.5 --- pkgs/tools/X11/xinput_calibrator/default.nix | 21 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 ++++ 2 files changed, 25 insertions(+) create mode 100644 pkgs/tools/X11/xinput_calibrator/default.nix diff --git a/pkgs/tools/X11/xinput_calibrator/default.nix b/pkgs/tools/X11/xinput_calibrator/default.nix new file mode 100644 index 00000000000..8f21f6558ff --- /dev/null +++ b/pkgs/tools/X11/xinput_calibrator/default.nix @@ -0,0 +1,21 @@ +{ stdenv, fetchurl, libXi, inputproto, autoconf, automake, libtool, m4, x11, pkgconfig }: + +stdenv.mkDerivation rec { + version = "0.7.5"; + name = "xinput_calibrator"; + src = fetchurl { + url = "https://github.com/tias/${name}/archive/v${version}.tar.gz"; + sha256 = "d8edbf84523d60f52311d086a1e3ad0f3536f448360063dd8029bf6290aa65e9"; + }; + + preConfigure = "./autogen.sh --with-gui=X11"; + + buildInputs = [ inputproto libXi autoconf automake libtool m4 x11 pkgconfig ]; + + meta = { + homepage = https://github.com/tias/xinput_calibrator; + description = "A generic touchscreen calibration program for X.Org"; + license = stdenv.lib.licenses.mit; + maintainers = [ stdenv.lib.maintainers.flosse ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8f7723fde9f..668bd590c27 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11474,6 +11474,10 @@ let xboxdrv = callPackage ../misc/drivers/xboxdrv { }; + xinput_calibrator = callPackage ../tools/X11/xinput_calibrator { + inherit (xlibs) libXi inputproto; + }; + xosd = callPackage ../misc/xosd { }; xsane = callPackage ../applications/graphics/sane/xsane.nix { -- GitLab From 21a4539698909165b10d54d09dcff09d1a286037 Mon Sep 17 00:00:00 2001 From: Philip Horger Date: Sun, 24 Aug 2014 03:47:29 +0200 Subject: [PATCH 236/843] Initial packaging for pnmixer --- pkgs/tools/audio/pnmixer/default.nix | 32 ++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 34 insertions(+) create mode 100644 pkgs/tools/audio/pnmixer/default.nix diff --git a/pkgs/tools/audio/pnmixer/default.nix b/pkgs/tools/audio/pnmixer/default.nix new file mode 100644 index 00000000000..e12a0dfc891 --- /dev/null +++ b/pkgs/tools/audio/pnmixer/default.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchgit, alsaLib, pkgconfig, gtk3, glibc, autoconf, automake, libnotify, libX11, gettext }: + +stdenv.mkDerivation rec { + name = "pa-applet"; + + src = fetchgit { + url = "git://github.com/nicklan/pnmixer.git"; + rev = "1e09a075c0c63d8b161b13ea92528a798bdb464a"; + sha256 = "15k689xycpc6pvq9vgg9ak92b9sg09dh4yrh83kjcaws63alrzl5"; + }; + + buildInputs = [ + alsaLib pkgconfig gtk3 glibc autoconf automake libnotify libX11 gettext + ]; + + preConfigure = '' + ./autogen.sh + ''; + + # work around a problem related to gtk3 updates + NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations"; + + postInstall = '' + ''; + + meta = with stdenv.lib; { + description = ""; + license = licenses.gpl3; + maintainers = with maintainers; [ iElectric ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 668bd590c27..a66d8a4618a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1643,6 +1643,8 @@ let pa_applet = callPackage ../tools/audio/pa-applet { }; + pnmixer = callPackage ../tools/audio/pnmixer { }; + nifskope = callPackage ../tools/graphics/nifskope { }; nilfs_utils = callPackage ../tools/filesystems/nilfs-utils {}; -- GitLab From 83c5a3d22d3a4cb4e99f5efcbeb20010a635c7b0 Mon Sep 17 00:00:00 2001 From: Philip Horger Date: Sun, 24 Aug 2014 03:57:00 +0200 Subject: [PATCH 237/843] pnmixer: Add maintainer and fix name --- lib/maintainers.nix | 1 + pkgs/tools/audio/pnmixer/default.nix | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 6fadaa10952..67936416ae8 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -30,6 +30,7 @@ bodil = "Bodil Stokke "; bosu = "Boris Sukholitko "; calrama = "Moritz Maxeiner "; + campadrenalin = "Philip Horger "; cfouche = "Chaddaï Fouché "; chaoflow = "Florian Friesdorf "; coconnor = "Corey O'Connor "; diff --git a/pkgs/tools/audio/pnmixer/default.nix b/pkgs/tools/audio/pnmixer/default.nix index e12a0dfc891..c32f39eec08 100644 --- a/pkgs/tools/audio/pnmixer/default.nix +++ b/pkgs/tools/audio/pnmixer/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchgit, alsaLib, pkgconfig, gtk3, glibc, autoconf, automake, libnotify, libX11, gettext }: stdenv.mkDerivation rec { - name = "pa-applet"; + name = "pnmixer"; src = fetchgit { url = "git://github.com/nicklan/pnmixer.git"; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = ""; license = licenses.gpl3; - maintainers = with maintainers; [ iElectric ]; + maintainers = with maintainers; [ campadrenalin ]; platforms = platforms.linux; }; } -- GitLab From e29311297609caf2d37327df699fd07f7992f1ae Mon Sep 17 00:00:00 2001 From: Philip Horger Date: Sun, 24 Aug 2014 18:56:29 -0700 Subject: [PATCH 238/843] pnmixer: Add description field --- pkgs/tools/audio/pnmixer/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/audio/pnmixer/default.nix b/pkgs/tools/audio/pnmixer/default.nix index c32f39eec08..4d966eb5e97 100644 --- a/pkgs/tools/audio/pnmixer/default.nix +++ b/pkgs/tools/audio/pnmixer/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { ''; meta = with stdenv.lib; { - description = ""; + description = "ALSA mixer for the system tray."; license = licenses.gpl3; maintainers = with maintainers; [ campadrenalin ]; platforms = platforms.linux; -- GitLab From e3fe98044c2f9359ff9af2fa265751ec9118d10a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Mon, 25 Aug 2014 10:04:49 +0200 Subject: [PATCH 239/843] pnmixer: cleanup --- pkgs/tools/audio/pnmixer/default.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pkgs/tools/audio/pnmixer/default.nix b/pkgs/tools/audio/pnmixer/default.nix index 4d966eb5e97..d7964c0961c 100644 --- a/pkgs/tools/audio/pnmixer/default.nix +++ b/pkgs/tools/audio/pnmixer/default.nix @@ -20,11 +20,8 @@ stdenv.mkDerivation rec { # work around a problem related to gtk3 updates NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations"; - postInstall = '' - ''; - meta = with stdenv.lib; { - description = "ALSA mixer for the system tray."; + description = "ALSA mixer for the system tray"; license = licenses.gpl3; maintainers = with maintainers; [ campadrenalin ]; platforms = platforms.linux; -- GitLab From ed4b85abfc29a22fc6ff7712172c224ab82c4112 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Mon, 25 Aug 2014 10:10:22 +0200 Subject: [PATCH 240/843] remove pythonPackages.nose2Cov cc @chaoflow --- pkgs/top-level/python-packages.nix | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 16be6f6203b..164d3159f2b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4877,18 +4877,6 @@ rec { doCheck = false; }); - nose2Cov = if isPy26 then null else (buildPythonPackage rec { - name = "nose2-cov-1.0a4"; - src = fetchurl { - url = "http://pypi.python.org/packages/source/n/nose2-cov/nose2-cov-1.0a4.tar.gz"; - md5 = "6442f03e2ea732b0e38eb5b00fbe0b31"; - }; - meta = { - description = "nose2 plugin for coverage reporting, including subprocesses and multiprocessing"; - }; - propagatedBuildInputs = [ covCore nose2 ]; - }); - nosejs = buildPythonPackage { name = "nosejs-0.9.4"; src = fetchurl { -- GitLab From 10e3cf6f5aa8e9bf5b969a02cc59256eff272279 Mon Sep 17 00:00:00 2001 From: Mateusz Kowalczyk Date: Sun, 24 Aug 2014 02:59:14 +0100 Subject: [PATCH 241/843] ppsspp: update to 0.9.9.1 --- pkgs/misc/emulators/ppsspp/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/misc/emulators/ppsspp/default.nix b/pkgs/misc/emulators/ppsspp/default.nix index ced8e1344da..4c49e1e3af2 100644 --- a/pkgs/misc/emulators/ppsspp/default.nix +++ b/pkgs/misc/emulators/ppsspp/default.nix @@ -3,15 +3,15 @@ }: let - version = "0.9.9"; + version = "0.9.9.1"; fstat = x: fn: "-D" + fn + "=" + (if x then "ON" else "OFF"); in stdenv.mkDerivation { name = "PPSSPP-${version}"; src = fetchgit { url = "https://github.com/hrydgard/ppsspp.git"; - sha256 = "1m7awac87wrwys22qwbr0589im1ilm0dv30wp945xg30793rivvj"; - rev = "b421e29391b34d997b2c99ce2bdc74a0df5bb472"; + sha256 = "0fdbda0b4dfbecacd01850f1767e980281fed4cc34a21df26ab3259242d8c352"; + rev = "bf709790c4fed9cd211f755acaa650ace0f7555a"; fetchSubmodules = true; }; @@ -19,7 +19,7 @@ in stdenv.mkDerivation { ++ (if withGamepads then [ SDL ] else [ ]); configurePhase = "cd Qt && qmake PPSSPPQt.pro"; - installPhase = "mkdir -p $out/bin && cp PPSSPPQt $out/bin"; + installPhase = "mkdir -p $out/bin && cp ppsspp $out/bin"; meta = with stdenv.lib; { homepage = "http://www.ppsspp.org/"; -- GitLab From 0383b57b3c8103f49002806e20ae3c67a83685db Mon Sep 17 00:00:00 2001 From: Igor Pashev Date: Mon, 25 Aug 2014 10:23:10 +0200 Subject: [PATCH 242/843] Added concatMapStringsSep and concatImapStringsSep Example: configure rewrite rules for Mediawiki RewriteEngine On RewriteCond %{DOCUMENT_ROOT}%{REQUEST_URI} !-f RewriteCond %{DOCUMENT_ROOT}%{REQUEST_URI} !-d ${concatMapStringsSep "\n" (u: "RewriteCond %{REQUEST_URI} !^${u.urlPath}") serverInfo.serverConfig.servedDirs} RewriteRule ${if config.enableUploads --- lib/strings.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/lib/strings.nix b/lib/strings.nix index efdc265465f..31b0f56e09b 100644 --- a/lib/strings.nix +++ b/lib/strings.nix @@ -34,6 +34,9 @@ rec { concatStringsSep = separator: list: concatStrings (intersperse separator list); + concatMapStringsSep = sep: f: list: concatStringsSep sep (map f list); + concatImapStringsSep = sep: f: list: concatStringsSep sep (lib.imap f list); + # Construct a Unix-style search path consisting of each `subDir" # directory of the given list of packages. For example, -- GitLab From c93e48a2bb643fd2eb423bbe1855657699a9ec43 Mon Sep 17 00:00:00 2001 From: Tobias Blaschke Date: Sat, 23 Aug 2014 17:09:11 +0200 Subject: [PATCH 243/843] xskat: new package Play the german card game Skat against the AI or over IRC. --- pkgs/games/xskat/default.nix | 38 +++++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 40 insertions(+) create mode 100644 pkgs/games/xskat/default.nix diff --git a/pkgs/games/xskat/default.nix b/pkgs/games/xskat/default.nix new file mode 100644 index 00000000000..bd41531d923 --- /dev/null +++ b/pkgs/games/xskat/default.nix @@ -0,0 +1,38 @@ +{stdenv, fetchurl, libX11, imake, gccmakedep}: + + +let + s = # Generated upstream information + rec { + baseName="xskat"; + version="4.0"; + name="${baseName}-${version}"; + + url="http://www.xskat.de/xskat-4.0.tar.gz"; + hash="8ba52797ccbd131dce69b96288f525b0d55dee5de4008733f7a5a51deb831c10"; + sha256="8ba52797ccbd131dce69b96288f525b0d55dee5de4008733f7a5a51deb831c10"; + }; + buildInputs = [ libX11 imake gccmakedep ]; +in + +stdenv.mkDerivation { + inherit (s) name version; + inherit buildInputs; + src = fetchurl { + inherit (s) url sha256; + }; + preInstall = '' + sed -i Makefile \ + -e "s|.* BINDIR .*| BINDIR = $out/bin|" \ + -e "s|.* MANPATH .*| MANPATH = $out/man|" + ''; + installTargets = "install install.man"; + meta = { + inherit (s) version; + description = ''Famous german card game''; + platforms = stdenv.lib.platforms.linux; + license = stdenv.lib.licenses.free; + longDescription = ''Play the german card game Skat against the AI or over IRC.''; + homepage = http://www.xskat.de/; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a66d8a4618a..3bf99d48c3e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10558,6 +10558,8 @@ let xonotic = callPackage ../games/xonotic { }; + xskat = callPackage ../games/xskat { }; + xsokoban = builderDefsPackage (import ../games/xsokoban) { inherit (xlibs) libX11 xproto libXpm libXt; }; -- GitLab From d14ed33c50ffee5ba5c2d7139cfe073888d984e9 Mon Sep 17 00:00:00 2001 From: Cray Elliott Date: Thu, 21 Aug 2014 04:57:04 -0700 Subject: [PATCH 244/843] Update jigdo --- pkgs/applications/misc/jigdo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/jigdo/default.nix b/pkgs/applications/misc/jigdo/default.nix index d722367d1b4..1f2ecf91141 100644 --- a/pkgs/applications/misc/jigdo/default.nix +++ b/pkgs/applications/misc/jigdo/default.nix @@ -10,8 +10,8 @@ stdenv.mkDerivation { }; patches = fetchurl { - url = http://ftp.de.debian.org/debian/pool/main/j/jigdo/jigdo_0.7.3-2.diff.gz; - sha256 = "0jnlzm9m2hjlnw0zs2fv456ml5r2jj2q1lncqbrgg52lq18f6fa3"; + url = http://ftp.de.debian.org/debian/pool/main/j/jigdo/jigdo_0.7.3-3.diff.gz; + sha256 = "0cp4jz3sg9g86vprh90pmwpcfla79f0dr50w14yh01k0yaq70fs8"; }; buildInputs = [ db gtk bzip2 ]; -- GitLab From f533756bd566cebd8c8bed1dd971e1c6b1a79fd1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Mon, 25 Aug 2014 10:47:22 +0200 Subject: [PATCH 245/843] pythonPackages.polib: 1.0.1 -> 1.0.4 --- pkgs/top-level/python-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 164d3159f2b..31369f014de 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5541,11 +5541,11 @@ rec { polib = buildPythonPackage rec { name = "polib-${version}"; - version = "1.0.1"; + version = "1.0.4"; src = fetchurl { url = "http://bitbucket.org/izi/polib/downloads/${name}.tar.gz"; - sha256 = "1sr2bb3g7rl7gr6156j5qv71kg06q1x01r1lbps9ksnyz37djn2q"; + sha256 = "16klwlswfbgmkzrra80fgzhic9447pk3mnr75r2fkz72bkvpcclb"; }; # error: invalid command 'test' -- GitLab From 328306066265f2fc559fd2f8b00b277e1c5ea66a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Mon, 25 Aug 2014 10:49:29 +0200 Subject: [PATCH 246/843] pythonPackages.supervisor: 3.0 -> 3.1.1 --- pkgs/top-level/python-packages.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 31369f014de..c2cedce1608 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7591,11 +7591,13 @@ rec { }; supervisor = buildPythonPackage rec { - name = "supervisor-3.0"; + name = "supervisor-3.1.1"; + + disabled = isPy3k; src = fetchurl { url = "https://pypi.python.org/packages/source/s/supervisor/${name}.tar.gz"; - md5 = "94ff3cf09618c36889425a8e002cd51a"; + md5 = "8c9714feaa63902f03871317e3ebf62e"; }; buildInputs = [ mock ]; -- GitLab From 619f18956da87517131ad4429b2c24e16796411d Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 25 Aug 2014 10:53:09 +0200 Subject: [PATCH 247/843] Bump the amount of memory for the installer test It randomly OOMs. http://hydra.nixos.org/build/13587153 --- nixos/tests/installer.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix index d3bbe7a8bd5..621afffbfc1 100644 --- a/nixos/tests/installer.nix +++ b/nixos/tests/installer.nix @@ -98,7 +98,7 @@ let # FIXME: OVMF doesn't boot from virtio http://www.mail-archive.com/edk2-devel@lists.sourceforge.net/msg01501.html iface = if useEFI || grubVersion == 1 then "scsi" else "virtio"; qemuFlags = - (if iso.system == "x86_64-linux" then "-m 512 " else "-m 384 ") + + (if iso.system == "x86_64-linux" then "-m 768 " else "-m 512 ") + (optionalString (iso.system == "x86_64-linux") "-cpu kvm64 ") + (optionalString useEFI ''-L ${efiBios} -hda ''${\(Cwd::abs_path('harddisk'))} ''); hdFlags = optionalString (!useEFI) -- GitLab From cb3cf6d3d7bd80f666568b8d687f6530e8504aee Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Mon, 25 Aug 2014 11:01:08 +0200 Subject: [PATCH 248/843] pythonPackges.ipython: 2.0.0 -> 2.2.0 --- pkgs/shells/ipython/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/shells/ipython/default.nix b/pkgs/shells/ipython/default.nix index cb0cc95c4ce..990eb174baf 100644 --- a/pkgs/shells/ipython/default.nix +++ b/pkgs/shells/ipython/default.nix @@ -13,12 +13,12 @@ assert qtconsoleSupport == true -> pyqt4 != null; assert pylabQtSupport == true -> pyqt4 != null && sip != null; buildPythonPackage rec { - name = "ipython-2.0.0"; + name = "ipython-2.2.0"; namePrefix = ""; src = fetchurl { url = "http://pypi.python.org/packages/source/i/ipython/${name}.tar.gz"; - sha256 = "0fl9sznx83y2ck8wh5zr8avzjm5hz6r0xz38ij2fil3gin7w10sf"; + sha256 = "1qk44lmir24gnwb3gxh0mqcghc8ln1i5ygxpalh06bx0ajx7gjmp"; }; propagatedBuildInputs = [ -- GitLab From c2d0028560f536bbd11a3d40f99ec26c2af00228 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Mon, 25 Aug 2014 11:01:20 +0200 Subject: [PATCH 249/843] pythonPackages.matplotlib: don't depend on pygtk --- pkgs/top-level/python-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c2cedce1608..e844b2999a7 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4307,7 +4307,7 @@ rec { propagatedBuildInputs = [ dateutil nose numpy pyparsing tornado pkgs.freetype pkgs.libpng pkgs.pkgconfig - pygtk ]; + ]; meta = with stdenv.lib; { description = "python plotting library, making publication quality plots"; -- GitLab From 8bd3c675520adc755ce97ff3ff35175a67448208 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= Date: Mon, 25 Aug 2014 10:48:26 +0200 Subject: [PATCH 250/843] IDEA: 13.1.3 -> 13.1.4 Changed, attribute name separator changed to dashes and decription. Added longDescription. --- pkgs/applications/editors/idea/default.nix | 35 +++++++++++++++------- 1 file changed, 24 insertions(+), 11 deletions(-) diff --git a/pkgs/applications/editors/idea/default.nix b/pkgs/applications/editors/idea/default.nix index 7cb99ae80cc..caa9523af6f 100644 --- a/pkgs/applications/editors/idea/default.nix +++ b/pkgs/applications/editors/idea/default.nix @@ -7,7 +7,7 @@ assert stdenv.isLinux; let buildIdea = - { name, version, build, src, description, license }: + { name, version, build, src, description, longDescription, license }: stdenv.mkDerivation rec { inherit name build src; @@ -58,6 +58,7 @@ let meta = { homepage = http://www.jetbrains.com/idea/; inherit description; + inherit longDescription; inherit license; maintainers = [ stdenv.lib.maintainers.edwtjo ]; platforms = stdenv.lib.platforms.linux; @@ -66,27 +67,39 @@ let in { - idea_community = buildIdea rec { + idea-community = buildIdea rec { name = "idea-community-${version}"; - version = "13.1.3"; - build = "IC-135.909"; - description = "IntelliJ IDEA 13 Community Edition"; + version = "13.1.4b"; + build = "IC-135.1230"; + description = "Integrated Development Environment (IDE) by Jetbrains, community edition"; + longDescription = '' + Lightweight IDE for Java SE, Groovy & Scala development + Powerful environment for building Google Android apps + Integration with JUnit, TestNG, popular SCMs, Ant & Maven + Free, open-source, Apache 2 licensed. + ''; license = stdenv.lib.licenses.asl20; src = fetchurl { url = "http://download-ln.jetbrains.com/idea/ideaIC-${version}.tar.gz"; - sha256 = "62ed937ef68df16eef4d32772b6510835527f95020db1c76643f17ed2c067b51"; + sha256 = "8b4ee25fd2934e06b87230b50e1474183ed4b331c1626a7fee69b96294d9616d"; }; }; - idea_ultimate = buildIdea rec { + idea-ultimate = buildIdea rec { name = "idea-ultimate-${version}"; - version = "13.1.3"; - build = "IU-135.909"; - description = "IntelliJ IDEA 13 Ultimate Edition"; + version = "13.1.4b"; + build = "IU-135.1230"; + description = "Integrated Development Environment (IDE) by Jetbrains, requires paid license"; + longDescription = '' + Full-featured IDE for JVM-based and polyglot development + Java EE, Spring/Hibernate and other technologies support + Deployment and debugging with most application servers + Duplicate code search, dependency structure matrix, etc. + ''; license = stdenv.lib.licenses.unfree; src = fetchurl { url = "http://download-ln.jetbrains.com/idea/ideaIU-${version}.tar.gz"; - sha256 = "6d99e49a63a197e19381a85535ab424a7832653db8cceb3bca7d53615ec7a53d"; + sha256 = "84660d97c9c3e4e7cfd6c2708f4685dc7322157f1e1c2888feac64df119f0606"; }; }; -- GitLab From 2172031655c92b8b69c4aa90a259192785d61e66 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Mon, 25 Aug 2014 11:05:11 +0200 Subject: [PATCH 251/843] pythonPackages.jsonschema: 2.0.0 -> 2.4.0 --- pkgs/top-level/python-packages.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e844b2999a7..0b89a3768a2 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3308,15 +3308,19 @@ rec { }); jsonschema = buildPythonPackage (rec { - version = "2.0.0"; + version = "2.4.0"; name = "jsonschema-${version}"; src = fetchurl { url = "https://pypi.python.org/packages/source/j/jsonschema/jsonschema-${version}.tar.gz"; - md5 = "1793d97a668760ef540fadd342aa08e5"; + md5 = "661f85c3d23094afbb9ac3c0673840bf"; }; buildInputs = [ nose mock ]; + + patchPhase = '' + substituteInPlace jsonschema/tests/test_jsonschema_test_suite.py --replace "python" "${python}/bin/${python.executable}" + ''; checkPhase = '' nosetests -- GitLab From 870d8f63ec11edfa019d8c3d5f829eb360a8a550 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Mon, 25 Aug 2014 11:10:51 +0200 Subject: [PATCH 252/843] pythonPackages.memcached: 1.48 -> 1.51 --- pkgs/top-level/python-packages.nix | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 0b89a3768a2..5edd3785872 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4380,11 +4380,14 @@ rec { memcached = buildPythonPackage rec { - name = "memcached-1.48"; - - src = fetchurl { - url = "ftp://ftp.tummy.com/pub/python-memcached/old-releases/python-memcached-1.48.tar.gz"; - sha256 = "1i0h05z9j0zl65rgvw86p4f54pigkxynhzppn4qxby8rjlnwdfv6"; + name = "memcached-1.51"; + + src = if isPy3k then fetchurl { + url = "https://pypi.python.org/packages/source/p/python3-memcached/python3-${name}.tar.gz"; + sha256 = "0na8b369q8fivh3y0nvzbvhh3lgvxiyyv9xp93cnkvwfsr8mkgkw"; + } else fetchurl { + url = "http://ftp.tummy.com/pub/python-memcached/old-releases/python-${name}.tar.gz"; + sha256 = "124s98m6hvxj6x90d7aynsjfz878zli771q96ns767r2mbqn7192"; }; meta = { -- GitLab From b4fe8535d807a81e8e5d389bf8c3216641d2f72e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Mon, 25 Aug 2014 11:22:34 +0200 Subject: [PATCH 253/843] pythonPackages.sqlalchemy{8,9}: bump --- pkgs/top-level/python-packages.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 5edd3785872..ee68aec65af 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7709,19 +7709,19 @@ rec { sqlalchemy8 = pkgs.lib.overrideDerivation sqlalchemy9 (args: rec { - name = "SQLAlchemy-0.8.5"; + name = "SQLAlchemy-0.8.7"; src = fetchurl { url = "https://pypi.python.org/packages/source/S/SQLAlchemy/${name}.tar.gz"; - md5 = "ecf0738eaf1229bae27ad2be0f9978a8"; + md5 = "4f3377306309e46739696721b1785335"; }; }); sqlalchemy9 = buildPythonPackage rec { - name = "SQLAlchemy-0.9.3"; + name = "SQLAlchemy-0.9.4"; src = fetchurl { url = "https://pypi.python.org/packages/source/S/SQLAlchemy/${name}.tar.gz"; - md5 = "a27989b9d4b3f14ea0b1600aa45559c4"; + md5 = "c008ea5e2565ec1418ee8461393a99b1"; }; buildInputs = [ nose mock ]; -- GitLab From 8cb6d1ebb321a473b0fdb1888e285b292257abd1 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 25 Aug 2014 11:49:56 +0200 Subject: [PATCH 254/843] Moo: Fix build http://hydra.nixos.org/build/13626782 --- pkgs/top-level/perl-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 8895d4d093b..a74cd8f2d8f 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -5698,8 +5698,8 @@ let self = _self // overrides; _self = with self; { url = mirror://cpan/authors/id/H/HA/HAARG/Moo-1.006000.tar.gz; sha256 = "0gjh6dyz825cwjibq2wlpx14drjqx4pxxh931p4x3jd2617hax17"; }; - buildInputs = [ TestFatal ImportInto ]; - propagatedBuildInputs = [ ClassMethodModifiers DevelGlobalDestruction ModuleRuntime RoleTiny strictures ]; + buildInputs = [ TestFatal ]; + propagatedBuildInputs = [ ClassMethodModifiers DevelGlobalDestruction ImportInto ModuleRuntime RoleTiny strictures ]; meta = { description = "Minimalist Object Orientation (with Moose compatiblity)"; license = "perl5"; -- GitLab From cdd1785cd6380e971ad0413e7ecfd3af7ab38625 Mon Sep 17 00:00:00 2001 From: Igor Pashev Date: Mon, 25 Aug 2014 11:55:57 +0200 Subject: [PATCH 255/843] Fixed rewrite rules for Mediawiki If Mediawiki was served from the root directory of the server it was impossible to serve other directories. Make sure that URLs defined in servedDirs are not rewritten. Use case: serving local copy of MathJax --- nixos/modules/services/web-servers/apache-httpd/mediawiki.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/services/web-servers/apache-httpd/mediawiki.nix b/nixos/modules/services/web-servers/apache-httpd/mediawiki.nix index aa9aec87f0c..76c64f8cb29 100644 --- a/nixos/modules/services/web-servers/apache-httpd/mediawiki.nix +++ b/nixos/modules/services/web-servers/apache-httpd/mediawiki.nix @@ -133,6 +133,7 @@ in RewriteEngine On RewriteCond %{DOCUMENT_ROOT}%{REQUEST_URI} !-f RewriteCond %{DOCUMENT_ROOT}%{REQUEST_URI} !-d + ${concatMapStringsSep "\n" (u: "RewriteCond %{REQUEST_URI} !^${u.urlPath}") serverInfo.serverConfig.servedDirs} RewriteRule ${if config.enableUploads then "!^/images" else "^.*\$" -- GitLab From 296888b1bcb0b3eb641167973c87686a9103b0dd Mon Sep 17 00:00:00 2001 From: Jaka Hudoklin Date: Mon, 25 Aug 2014 02:48:02 +0200 Subject: [PATCH 256/843] nixos: virtualisation, add basic docker nixos image --- nixos/modules/virtualisation/docker-image.nix | 67 +++++++++++++++++++ 1 file changed, 67 insertions(+) create mode 100644 nixos/modules/virtualisation/docker-image.nix diff --git a/nixos/modules/virtualisation/docker-image.nix b/nixos/modules/virtualisation/docker-image.nix new file mode 100644 index 00000000000..13b861dc988 --- /dev/null +++ b/nixos/modules/virtualisation/docker-image.nix @@ -0,0 +1,67 @@ +{ config, lib, 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 ]); + }; + + 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 + ''; + + + # docker image config + require = [ + ../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 + security.initialRootPassword = ""; + + # Some more help text. + services.mingetty.helpLine = + '' + + Log in as "root" with an empty password. + ''; +} -- GitLab From 57c8030b56a6239b4bc5109b23eacdc98b02ad92 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 25 Aug 2014 11:24:45 +0200 Subject: [PATCH 257/843] haskell-MonadRandom: update to version 0.2.0.1 --- .../libraries/haskell/MonadRandom/{0.2.nix => 0.2.0.1.nix} | 5 ++--- pkgs/top-level/haskell-packages.nix | 4 ++-- 2 files changed, 4 insertions(+), 5 deletions(-) rename pkgs/development/libraries/haskell/MonadRandom/{0.2.nix => 0.2.0.1.nix} (72%) diff --git a/pkgs/development/libraries/haskell/MonadRandom/0.2.nix b/pkgs/development/libraries/haskell/MonadRandom/0.2.0.1.nix similarity index 72% rename from pkgs/development/libraries/haskell/MonadRandom/0.2.nix rename to pkgs/development/libraries/haskell/MonadRandom/0.2.0.1.nix index a0f9a2f641f..cc430e22090 100644 --- a/pkgs/development/libraries/haskell/MonadRandom/0.2.nix +++ b/pkgs/development/libraries/haskell/MonadRandom/0.2.0.1.nix @@ -4,13 +4,12 @@ cabal.mkDerivation (self: { pname = "MonadRandom"; - version = "0.2"; - sha256 = "0wxn1n47mx7npxzc6iv2hj3ikj3d0s11xsndz2gfm9y5pwm3h44c"; + version = "0.2.0.1"; + sha256 = "1689302z053zhcr46w5q3a57kd6z365kkgzxh638gcakzzk3pmwm"; buildDepends = [ mtl random transformers ]; meta = { description = "Random-number generation monad"; license = "unknown"; platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; }; }) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index d5a94dcabeb..db65c71eb41 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1618,8 +1618,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in MonadPrompt = callPackage ../development/libraries/haskell/MonadPrompt {}; MonadRandom_0_1_13 = callPackage ../development/libraries/haskell/MonadRandom/0.1.13.nix {}; - MonadRandom_0_2 = callPackage ../development/libraries/haskell/MonadRandom/0.2.nix {}; - MonadRandom = self.MonadRandom_0_2; + MonadRandom_0_2_0_1 = callPackage ../development/libraries/haskell/MonadRandom/0.2.0.1.nix {}; + MonadRandom = self.MonadRandom_0_2_0_1; monadStm = callPackage ../development/libraries/haskell/monad-stm {}; -- GitLab From c2ad6595d2f41611745eb247c5aa12a3efa5fcbb Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 25 Aug 2014 11:27:01 +0200 Subject: [PATCH 258/843] haskell-HTTP: update to version 4000.2.18 --- .../haskell/HTTP/{4000.2.17.nix => 4000.2.18.nix} | 14 +++++++------- pkgs/top-level/haskell-packages.nix | 4 ++-- 2 files changed, 9 insertions(+), 9 deletions(-) rename pkgs/development/libraries/haskell/HTTP/{4000.2.17.nix => 4000.2.18.nix} (62%) diff --git a/pkgs/development/libraries/haskell/HTTP/4000.2.17.nix b/pkgs/development/libraries/haskell/HTTP/4000.2.18.nix similarity index 62% rename from pkgs/development/libraries/haskell/HTTP/4000.2.17.nix rename to pkgs/development/libraries/haskell/HTTP/4000.2.18.nix index ce90b9a9426..0a5a16dfadc 100644 --- a/pkgs/development/libraries/haskell/HTTP/4000.2.17.nix +++ b/pkgs/development/libraries/haskell/HTTP/4000.2.18.nix @@ -1,19 +1,19 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! { cabal, caseInsensitive, conduit, conduitExtra, deepseq, httpdShed -, httpTypes, HUnit, mtl, network, parsec, pureMD5, split -, testFramework, testFrameworkHunit, wai, warp +, httpTypes, HUnit, mtl, network, networkUri, parsec, pureMD5 +, split, testFramework, testFrameworkHunit, wai, warp }: cabal.mkDerivation (self: { pname = "HTTP"; - version = "4000.2.17"; - sha256 = "1701mgf1gw00nxd70kkr86yl80qxy63rpqky2g9m2nfr6y4y5b59"; - buildDepends = [ mtl network parsec ]; + version = "4000.2.18"; + sha256 = "1jn0ikbdwhd32qjwpnsmpnmy0dxhmwfhf8851ifxik91fn7j5j4k"; + buildDepends = [ mtl network networkUri parsec ]; testDepends = [ caseInsensitive conduit conduitExtra deepseq httpdShed httpTypes - HUnit mtl network pureMD5 split testFramework testFrameworkHunit - wai warp + HUnit mtl network networkUri pureMD5 split testFramework + testFrameworkHunit wai warp ]; doCheck = false; noHaddock = self.stdenv.lib.versionOlder self.ghc.version "6.11"; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index db65c71eb41..6954fabee6d 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1123,8 +1123,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in HTTP_4000_2_3 = callPackage ../development/libraries/haskell/HTTP/4000.2.3.nix {}; HTTP_4000_2_5 = callPackage ../development/libraries/haskell/HTTP/4000.2.5.nix {}; HTTP_4000_2_8 = callPackage ../development/libraries/haskell/HTTP/4000.2.8.nix {}; - HTTP_4000_2_17 = callPackage ../development/libraries/haskell/HTTP/4000.2.17.nix {}; - HTTP = self.HTTP_4000_2_17; + HTTP_4000_2_18 = callPackage ../development/libraries/haskell/HTTP/4000.2.18.nix {}; + HTTP = self.HTTP_4000_2_18; httpAttoparsec = callPackage ../development/libraries/haskell/http-attoparsec {}; -- GitLab From 3ba066cd842c425b15532c1335d93f97ccfee5e6 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 25 Aug 2014 11:27:13 +0200 Subject: [PATCH 259/843] haskell-arbtt: update to version 0.8.1.2 --- pkgs/applications/misc/arbtt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/arbtt/default.nix b/pkgs/applications/misc/arbtt/default.nix index 239305c546e..27f6c122374 100644 --- a/pkgs/applications/misc/arbtt/default.nix +++ b/pkgs/applications/misc/arbtt/default.nix @@ -8,8 +8,8 @@ cabal.mkDerivation (self: { pname = "arbtt"; - version = "0.8.1.1"; - sha256 = "1qid9qs0sjyqpbnv20rmwjkibjsic9p4kil7gjhwi6panfan9x10"; + version = "0.8.1.2"; + sha256 = "074vb84vkygxamvq7xnwlpgbch6qkbhyzbakc343230p1ryxf62q"; isLibrary = false; isExecutable = true; buildDepends = [ -- GitLab From 3120bbde2ea2fda4dc9b02f1be259c9f2fd2dfdc Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 25 Aug 2014 11:27:16 +0200 Subject: [PATCH 260/843] haskell-http-client: update to version 0.3.7.2 --- pkgs/development/libraries/haskell/http-client/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/http-client/default.nix b/pkgs/development/libraries/haskell/http-client/default.nix index 2c3ad6d1141..7f032c3f675 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.3.7.1"; - sha256 = "0wfmzpjzazk5jr1pbkhkxxa32pd40mgm1p426k5bxjn3gw48r30c"; + version = "0.3.7.2"; + sha256 = "1llrf2bfbh5z01pwg40zdgmz93h45h60mg2pv1k6b8pmzlwr6aaz"; buildDepends = [ base64Bytestring blazeBuilder caseInsensitive cookie dataDefaultClass deepseq exceptions filepath httpTypes mimeTypes -- GitLab From de43fed57e530dcdcf59d556d3605ffbfb370d30 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 25 Aug 2014 11:27:19 +0200 Subject: [PATCH 261/843] haskell-language-c: update to version 0.4.6 --- pkgs/development/libraries/haskell/language-c/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/language-c/default.nix b/pkgs/development/libraries/haskell/language-c/default.nix index 6562d3fdf26..2fe11c4f071 100644 --- a/pkgs/development/libraries/haskell/language-c/default.nix +++ b/pkgs/development/libraries/haskell/language-c/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "language-c"; - version = "0.4.5"; - sha256 = "0q0x1rm74g27ry4jja44hk8z0lqkwnimnxbcy54m2cphaxk7yjk4"; + version = "0.4.6"; + sha256 = "0pzd3g5q3sjfngs29biannza6l9am75kcjy5q0xcjv7xhz0z1m31"; buildDepends = [ filepath syb ]; buildTools = [ alex happy ]; meta = { -- GitLab From daf9ad906ad1525ee9a3190e777c603dea1691c1 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 25 Aug 2014 11:27:21 +0200 Subject: [PATCH 262/843] haskell-stylish-haskell: update to version 0.5.10.2 --- .../development/libraries/haskell/stylish-haskell/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/stylish-haskell/default.nix b/pkgs/development/libraries/haskell/stylish-haskell/default.nix index afa664a68f9..9cc43e142a7 100644 --- a/pkgs/development/libraries/haskell/stylish-haskell/default.nix +++ b/pkgs/development/libraries/haskell/stylish-haskell/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "stylish-haskell"; - version = "0.5.10.1"; - sha256 = "1jd2dbi844cjs012gwr5idk1jmn860ff8hy1r1s6jndsm69awbba"; + version = "0.5.10.2"; + sha256 = "1r1vwn334jdsk6szynzz7w9jpbfqs3zs7wzlpwfigsyyrjy3bn3q"; isLibrary = true; isExecutable = true; buildDepends = [ -- GitLab From 3d42da9e0b229f32d7a8537d55a321beddd37be5 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 25 Aug 2014 11:27:24 +0200 Subject: [PATCH 263/843] haskell-yesod-core: update to version 1.2.19.1 --- pkgs/development/libraries/haskell/yesod-core/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/haskell/yesod-core/default.nix b/pkgs/development/libraries/haskell/yesod-core/default.nix index 8f3b90db6c7..857b237ba42 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.2.19"; - sha256 = "0dlvg8zpr1qyav3svqybsqsrmrl9n8s1kdzxf6zxa3pn582d48il"; + version = "1.2.19.1"; + sha256 = "1021z0jrfbafbdybpj0jkacr9ljyap5cpmfk2911dsz3nz7sy6zg"; buildDepends = [ aeson attoparsecConduit blazeBuilder blazeHtml blazeMarkup caseInsensitive cereal clientsession conduit conduitExtra cookie @@ -31,7 +31,6 @@ cabal.mkDerivation (self: { transformers wai waiExtra waiTest ]; jailbreak = true; - doCheck = false; meta = { homepage = "http://www.yesodweb.com/"; description = "Creation of type-safe, RESTful web applications"; -- GitLab From 3d3e78c673db7514143434661da6cbe1535d456b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 25 Aug 2014 11:41:12 +0200 Subject: [PATCH 264/843] network-uri: build with a recent version of Cabal on GHC 6.x --- pkgs/top-level/haskell-defaults.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/haskell-defaults.nix b/pkgs/top-level/haskell-defaults.nix index bcdcddbc852..c8389f259c5 100644 --- a/pkgs/top-level/haskell-defaults.nix +++ b/pkgs/top-level/haskell-defaults.nix @@ -97,6 +97,7 @@ 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 + networkUri = super.networkUri.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; }; parallel = self.parallel_3_2_0_3; primitive = self.primitive_0_5_0_1; reflection = super.reflection.override { cabal = self.cabal.override { Cabal = self.Cabal_1_16_0_3; }; }; -- GitLab From 0c3cddfc5277f26a4ebda0fff3fc796fb07804cd Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 25 Aug 2014 11:46:45 +0200 Subject: [PATCH 265/843] Build cabal-install-0.14.0 with network 2.3.x on GHC 7.4.2 and below. Fixes . --- pkgs/top-level/haskell-defaults.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/top-level/haskell-defaults.nix b/pkgs/top-level/haskell-defaults.nix index c8389f259c5..9a064212a40 100644 --- a/pkgs/top-level/haskell-defaults.nix +++ b/pkgs/top-level/haskell-defaults.nix @@ -59,6 +59,10 @@ ghc742Prefs = self : super : ghc763Prefs self super // { aeson = self.aeson_0_7_0_4.override { blazeBuilder = self.blazeBuilder; }; + cabalInstall_0_14_0 = super.cabalInstall_0_14_0.override { + HTTP = self.HTTP.override { network = self.network_2_3_0_13; }; + network = self.network_2_3_0_13; + }; extensibleExceptions = null; # core package in ghc <= 7.4.x hackageDb = super.hackageDb.override { Cabal = self.Cabal_1_16_0_3; }; haddock = self.haddock_2_11_0; -- GitLab From 7cd9bebb263df517e67a5f2720196fcad24e7d75 Mon Sep 17 00:00:00 2001 From: Georges Dubus Date: Mon, 25 Aug 2014 12:16:18 +0200 Subject: [PATCH 266/843] posterazor: update from 1.5 to 1.5.1 --- pkgs/applications/misc/posterazor/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/posterazor/default.nix b/pkgs/applications/misc/posterazor/default.nix index 38fac21322c..f55af543f18 100644 --- a/pkgs/applications/misc/posterazor/default.nix +++ b/pkgs/applications/misc/posterazor/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, cmake, unzip, pkgconfig, libXpm, fltk13, freeimage }: stdenv.mkDerivation rec { - name = "posterazor-1.5"; + name = "posterazor-1.5.1"; src = fetchurl { - url = "mirror://sourceforge/posterazor/1.5/PosteRazor-1.5-Source.zip"; - sha256 = "0xy313d2j57s4wy2y3hjapbjr5zfaki0lhkfz6nw2p9gylcmwmjy"; + url = "mirror://sourceforge/posterazor/1.5.1/PosteRazor-1.5.1-Source.zip"; + sha256 = "1dqpdk8zl0smdg4fganp3hxb943q40619qmxjlga9jhjc01s7fq5"; }; buildInputs = [ cmake unzip pkgconfig libXpm fltk13 freeimage ]; -- GitLab From fbecc676e595e31c41c4ecf0347104d2378b7989 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Mon, 25 Aug 2014 11:38:48 +0200 Subject: [PATCH 267/843] wgetpaste: 2.23 -> 2.25 --- pkgs/tools/text/wgetpaste/default.nix | 51 ++++++++++++++------------- 1 file changed, 26 insertions(+), 25 deletions(-) diff --git a/pkgs/tools/text/wgetpaste/default.nix b/pkgs/tools/text/wgetpaste/default.nix index 7635e042499..3c0af0157a5 100644 --- a/pkgs/tools/text/wgetpaste/default.nix +++ b/pkgs/tools/text/wgetpaste/default.nix @@ -1,28 +1,29 @@ -{stdenv, fetchurl, wget, bash, coreutils}: - stdenv.mkDerivation rec { - version = "2.23"; - name = "wgetpaste-${version}"; - src = fetchurl { - url = "http://wgetpaste.zlin.dk/${name}.tar.bz2"; - sha256 = "1xam745f5pmqi16br72a866117hnmcfwjyvsw1jhg3npbdnm9x6n"; - }; - # currently zsh-autocompletion support is not installed +{ stdenv, fetchurl, wget, bash, coreutils }: - prePatch = '' - substituteInPlace wgetpaste --replace "/usr/bin/env bash" "${bash}/bin/bash" - substituteInPlace wgetpaste --replace "LC_ALL=C wget" "LC_ALL=C ${wget}/bin/wget" - ''; +stdenv.mkDerivation rec { + version = "2.25"; + name = "wgetpaste-${version}"; + src = fetchurl { + url = "http://wgetpaste.zlin.dk/${name}.tar.bz2"; + sha256 = "1x209j85mryp3hxmv1gfsbvw03k306k5fa65ky0zxx07cs70fzka"; + }; + # currently zsh-autocompletion support is not installed - installPhase = '' - mkdir -p $out/bin; - cp wgetpaste $out/bin; - ''; + prePatch = '' + substituteInPlace wgetpaste --replace "/usr/bin/env bash" "${bash}/bin/bash" + substituteInPlace wgetpaste --replace "LC_ALL=C wget" "LC_ALL=C ${wget}/bin/wget" + ''; - meta = { - description = "Command-line interface to various pastebins"; - homepage = http://wgetpaste.zlin.dk/; - license = "publicDomain"; - maintainers = with stdenv.lib.maintainers; [qknight]; - platforms = stdenv.lib.platforms.all; - }; - } + installPhase = '' + mkdir -p $out/bin; + cp wgetpaste $out/bin; + ''; + + meta = { + description = "Command-line interface to various pastebins"; + homepage = http://wgetpaste.zlin.dk/; + license = "publicDomain"; + maintainers = with stdenv.lib.maintainers; [ qknight iElectric ]; + platforms = stdenv.lib.platforms.all; + }; +} -- GitLab From 028216edce2bf38ba27ffacbd66f88851a774a7c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Mon, 25 Aug 2014 13:03:03 +0200 Subject: [PATCH 268/843] python.substanced: upgrade to latest git, fix py3k --- pkgs/top-level/python-packages.nix | 186 +++++++++++++++++++++++++---- 1 file changed, 163 insertions(+), 23 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ee68aec65af..352d58f459a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1730,6 +1730,36 @@ rec { platforms = stdenv.lib.platforms.all; }; }; + + deform2 = buildPythonPackage rec { + name = "deform-2.0a2"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/d/deform/${name}.tar.gz"; + sha256 = "1gfaf1d8zp0mp4h229srlffxdp86w1nni9g4aqsshxysr23x591z"; + }; + + buildInputs = [] ++ optional isPy26 unittest2; + + propagatedBuildInputs = + [ pythonPackages.beautifulsoup4 + pythonPackages.peppercorn + pythonPackages.colander + pythonPackages.translationstring + pythonPackages.chameleon + pythonPackages.zope_deprecation + pythonPackages.coverage + pythonPackages.nose + ]; + + meta = { + maintainers = [ + stdenv.lib.maintainers.garbas + stdenv.lib.maintainers.iElectric + ]; + platforms = stdenv.lib.platforms.all; + }; + }; deform_bootstrap = buildPythonPackage rec { @@ -2276,12 +2306,17 @@ rec { pyramid = buildPythonPackage rec { - name = "pyramid-1.5"; + name = "pyramid-1.5.1"; src = fetchurl { url = "http://pypi.python.org/packages/source/p/pyramid/${name}.tar.gz"; - md5 = "8747658dcbab709a9c491e43d3b0d58b"; + md5 = "8a1ab3b773d8e22437828f7df22852c1"; }; + + preCheck = '' + # test is failing, see https://github.com/Pylons/pyramid/issues/1405 + rm pyramid/tests/test_response.py + ''; buildInputs = [ docutils @@ -2330,11 +2365,11 @@ rec { pyramid_chameleon = buildPythonPackage rec { - name = "pyramid_chameleon-0.1"; + name = "pyramid_chameleon-0.3"; src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/p/pyramid_chameleon/${name}.tar.gz"; - md5 = "39b1327a9890f382200bbfde943833d7"; + md5 = "5bb5938356dfd13fce06e095f132e137"; }; propagatedBuildInputs = [ @@ -2505,14 +2540,14 @@ rec { hypatia = buildPythonPackage rec { - name = "hypatia-0.1a6"; + name = "hypatia-0.3"; src = fetchurl { url = "http://pypi.python.org/packages/source/h/hypatia/${name}.tar.gz"; - md5 = "3a67683c578754cd8f23317db6d28ffd"; + md5 = "d74c6dda31ff459a39fa5da9e98f2425"; }; - buildInputs = [ zope_interface zodb3 ]; + buildInputs = [ zope_interface zodb ]; meta = { maintainers = [ stdenv.lib.maintainers.iElectric ]; @@ -2553,15 +2588,18 @@ rec { pyramid_zodbconn = buildPythonPackage rec { - name = "pyramid_zodbconn-0.4"; + name = "pyramid_zodbconn-0.7"; src = fetchurl { url = "http://pypi.python.org/packages/source/p/pyramid_zodbconn/${name}.tar.gz"; - md5 = "22e88cc82cafbbe00274e7378434e5fe"; + md5 = "3c7746a227fbcda3e138ab8bfab7700b"; }; + + # should be fixed in next release + doCheck = false; buildInputs = [ pyramid mock ]; - propagatedBuildInputs = [ zodb3 zodburi ]; + propagatedBuildInputs = [ zodb zodburi ]; meta = { maintainers = [ stdenv.lib.maintainers.iElectric ]; @@ -2624,30 +2662,54 @@ rec { zodburi = buildPythonPackage rec { - name = "zodburi-2.0b1"; + name = "zodburi-2.0"; src = fetchurl { url = "http://pypi.python.org/packages/source/z/zodburi/${name}.tar.gz"; - md5 = "52cc13c32ffe4ee7b5f5abc79f70f3c2"; + md5 = "7876893829c2f784506c80d49f861b67"; }; - buildInputs = [ zodb3 mock ]; + buildInputs = [ zodb mock ZEO ]; meta = { maintainers = [ stdenv.lib.maintainers.iElectric ]; }; }; + + ZEO = pythonPackages.buildPythonPackage rec { + name = "ZEO-4.0.0"; + + propagatedBuildInputs = [ random2 zodb six transaction persistent zc_lockfile zconfig zdaemon zope_interface ]; + + src = fetchurl { + url = "https://pypi.python.org/packages/source/Z/ZEO/${name}.tar.gz"; + md5 = "494d8320549185097ba4a6b6b76017d6"; + }; + + meta = with stdenv.lib; { + homepage = https://pypi.python.org/pypi/ZEO; + }; + }; + + random2 = pythonPackages.buildPythonPackage rec { + name = "random2-1.0.1"; + + src = fetchurl { + url = "https://pypi.python.org/packages/source/r/random2/${name}.zip"; + md5 = "48a0a86fe00e447212d0095de8cf3e21"; + }; + }; substanced = buildPythonPackage rec { # no release yet - rev = "bd8822be62f0f356e4e44d5c614fe14d3fa08f45"; + rev = "089818bc61c3dc5eca023254e37a280b041ea8cc"; name = "substanced-${rev}"; src = fetchgit { inherit rev; url = "https://github.com/Pylons/substanced.git"; - sha256 = "eded6468563328af37a07aeb88ef81ed78ccaff2ab687cac34ad2b36e19abcb4"; + sha256 = "17s7sdvydw9a9d2d36c70lq962ryny3dv9nzdxqpfvwiry9iy3jx"; }; buildInputs = [ mock ]; @@ -2655,11 +2717,10 @@ rec { propagatedBuildInputs = [ pyramid pytz - zodb3 + zodb venusian colander - deform - deform_bootstrap + deform2 python_magic pyyaml cryptacular @@ -2670,6 +2731,8 @@ rec { statsd pyramid_zodbconn pyramid_mailer + pyramid_chameleon + ZEO ]; meta = with stdenv.lib; { @@ -8107,11 +8170,11 @@ rec { transaction = buildPythonPackage rec { name = "transaction-${version}"; - version = "1.4.0"; + version = "1.4.3"; src = fetchurl { url = "http://pypi.python.org/packages/source/t/transaction/${name}.tar.gz"; - md5 = "b7c2ff135939f605a8c54e1c13cd5d66"; + md5 = "b4ca5983c9e3a0808ff5ff7648092c76"; }; propagatedBuildInputs = [ zope_interface ]; @@ -8727,14 +8790,17 @@ rec { zdaemon = buildPythonPackage rec { name = "zdaemon-${version}"; - version = "3.0.5"; + version = "4.0.0"; src = fetchurl { url = "http://pypi.python.org/packages/source/z/zdaemon/${name}.tar.gz"; - md5 = "975f770544bb4352c5cf32fec22e63c9"; + md5 = "4056e2ea35855695ed15389d9c168b92"; }; propagatedBuildInputs = [ zconfig ]; + + # too many deps.. + doCheck = false; meta = { description = "A daemon process control library and tools for Unix-based systems"; @@ -8774,7 +8840,6 @@ rec { }; }); - zodb3 = buildPythonPackage rec { name = "zodb3-${version}"; version = "3.10.5"; @@ -8793,6 +8858,81 @@ rec { maintainers = [ stdenv.lib.maintainers.goibhniu ]; }; }; + + zodb = buildPythonPackage rec { + name = "zodb-${version}"; + version = "4.0.1"; + + src = fetchurl { + url = "http://pypi.python.org/packages/source/Z/ZODB/ZODB-${version}.tar.gz"; + md5 = "092d787524b095164231742c96b32f50"; + }; + + propagatedBuildInputs = [ manuel transaction zc_lockfile zconfig zdaemon zope_interface persistent BTrees ] + ++ optionals isPy3k [ zodbpickle ]; + + preCheck = if isPy3k then '' + # test failure on py3.4 + rm src/ZODB/tests/testDB.py + '' else ""; + + meta = { + description = "An object-oriented database for Python"; + homepage = http://pypi.python.org/pypi/ZODB; + license = "ZPL"; + maintainers = [ stdenv.lib.maintainers.goibhniu ]; + }; + }; + + zodbpickle = pythonPackages.buildPythonPackage rec { + name = "zodbpickle-0.5.2"; + + src = fetchurl { + url = "https://pypi.python.org/packages/source/z/zodbpickle/${name}.tar.gz"; + md5 = "d401bd89f99ec8d56c22493e6f8c0443"; + }; + + # fails.. + doCheck = false; + + meta = with stdenv.lib; { + homepage = http://pypi.python.org/pypi/zodbpickle; + }; + }; + + + BTrees = pythonPackages.buildPythonPackage rec { + name = "BTrees-4.0.8"; + + propagatedBuildInputs = [ persistent zope_interface transaction ]; + + src = fetchurl { + url = "https://pypi.python.org/packages/source/B/BTrees/${name}.tar.gz"; + md5 = "7f5df4cf8dd50fb0c584c0929a406c92"; + }; + + meta = with stdenv.lib; { + description = "scalable persistent components"; + homepage = http://packages.python.org/BTrees; + }; + }; + + + persistent = pythonPackages.buildPythonPackage rec { + name = "persistent-4.0.8"; + + propagatedBuildInputs = [ zope_interface ]; + + src = fetchurl { + url = "https://pypi.python.org/packages/source/p/persistent/${name}.tar.gz"; + md5 = "2942f1ca7764b1bef8d48fa0d9a236b7"; + }; + + meta = with stdenv.lib; { + description = "automatic persistence for Python objects"; + homepage = http://www.zope.org/Products/ZODB; + }; + }; zope_broken = buildPythonPackage rec { -- GitLab From 41b75fc4d457f833bbf7261c0c2aff0db0d94738 Mon Sep 17 00:00:00 2001 From: Oliver Charles Date: Mon, 25 Aug 2014 12:05:23 +0100 Subject: [PATCH 269/843] haskellPackages.websockets: Don't jailbreak The maintainer is active on Hackage, and will benefit from bug reports on build failure. It currently builds without needing to jailbreak. --- pkgs/development/libraries/haskell/websockets/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/development/libraries/haskell/websockets/default.nix b/pkgs/development/libraries/haskell/websockets/default.nix index c74fad5f1a8..5db1ec41613 100644 --- a/pkgs/development/libraries/haskell/websockets/default.nix +++ b/pkgs/development/libraries/haskell/websockets/default.nix @@ -19,7 +19,6 @@ cabal.mkDerivation (self: { entropy HUnit ioStreams mtl network QuickCheck random SHA testFramework testFrameworkHunit testFrameworkQuickcheck2 text ]; - jailbreak = true; meta = { homepage = "http://jaspervdj.be/websockets"; description = "A sensible and clean way to write WebSocket-capable servers in Haskell"; -- GitLab From e7b2e13ff4205ece1a4c5655c8bb101b694cb63b Mon Sep 17 00:00:00 2001 From: Oliver Charles Date: Mon, 25 Aug 2014 12:47:57 +0100 Subject: [PATCH 270/843] haskellPackages.wreq: Patch to work with lens >= 4.4 --- pkgs/development/libraries/haskell/wreq/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/wreq/default.nix b/pkgs/development/libraries/haskell/wreq/default.nix index 62fa1d2abf8..5547140189d 100644 --- a/pkgs/development/libraries/haskell/wreq/default.nix +++ b/pkgs/development/libraries/haskell/wreq/default.nix @@ -3,6 +3,7 @@ { cabal, aeson, attoparsec, doctest, exceptions, filepath , httpClient, httpClientTls, httpTypes, HUnit, lens, mimeTypes , temporary, testFramework, testFrameworkHunit, text, time +, fetchpatch }: cabal.mkDerivation (self: { @@ -24,9 +25,11 @@ cabal.mkDerivation (self: { homepage = "http://www.serpentine.com/wreq"; description = "An easy-to-use HTTP client library"; license = self.stdenv.lib.licenses.bsd3; - broken = true; - hydraPlatforms = self.stdenv.lib.platforms.none; platforms = self.ghc.meta.platforms; maintainers = with self.stdenv.lib.maintainers; [ ocharles ]; }; + patches = [ + (fetchpatch { url = https://github.com/bos/wreq/commit/e8e29b62006e39ab36ffbb1d18c3e9d5923158ac.patch; sha256 = "19kqy512sa4dbzqp7kmjpsnsmc63wqh5pkh6hcvkzsji15dmlqrg"; }) + (fetchpatch { url = https://github.com/bos/wreq/pull/20.patch; sha256 = "1qfjwz5wlmmfcg8jy0yg7ixacq5fai3yscm552fba1ph66acyvg4"; }) + ]; }) -- GitLab From 3be7d4b4782430c4f9d7299944b39c6eb6881042 Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Mon, 21 Jul 2014 11:24:40 +0200 Subject: [PATCH 271/843] idris-mode: upgrade to 0.9.14 --- pkgs/applications/editors/emacs-modes/idris/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/emacs-modes/idris/default.nix b/pkgs/applications/editors/emacs-modes/idris/default.nix index 28375dcb68d..4e9d1cfd77c 100644 --- a/pkgs/applications/editors/emacs-modes/idris/default.nix +++ b/pkgs/applications/editors/emacs-modes/idris/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "${pname}-${version}"; pname = "idris-mode"; - version = "0.9.13.1"; + version = "0.9.14"; src = fetchurl { url = "https://github.com/idris-hackers/${pname}/archive/${version}.tar.gz"; - sha256 = "0ymjbkwsq7qra691wyldw91xcdgrbx3468vvrha5jj92v7nwb8wx"; + sha256 = "1qlkbf14mcibp6h5r84fp5xdjspyaw1xdmnkmaxbypwjhhjg4s83"; }; buildInputs = [ emacs ]; -- GitLab From fb2449c0269ba168728e77879c08f073a255a41e Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Mon, 28 Jul 2014 11:07:38 +0200 Subject: [PATCH 272/843] add emacs color-theme solarized --- .../color-theme-solarized/default.nix | 32 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 34 insertions(+) create mode 100644 pkgs/applications/editors/emacs-modes/color-theme-solarized/default.nix diff --git a/pkgs/applications/editors/emacs-modes/color-theme-solarized/default.nix b/pkgs/applications/editors/emacs-modes/color-theme-solarized/default.nix new file mode 100644 index 00000000000..35f9bd3ceb2 --- /dev/null +++ b/pkgs/applications/editors/emacs-modes/color-theme-solarized/default.nix @@ -0,0 +1,32 @@ +{stdenv, fetchgit, emacs, colorTheme}: + +stdenv.mkDerivation rec { + name = "color-theme-6.5.5"; + + src = fetchgit { + url = https://github.com/sellout/emacs-color-theme-solarized.git; + rev = "6a2c7ca0181585858e6e8054cb99db837e2ef72f"; + sha256 = "3c46a3d66c75ec4456209eeafdb03282148b289b12e8474f6a8962f3894796e8"; + }; + + buildInputs = [ emacs ]; + propagatedUserEnvPkgs = [ colorTheme ]; + + + buildPhase = '' + emacs -L . -L ${colorTheme}/share/emacs/site-lisp --batch -f batch-byte-compile *.el + ''; + + installPhase = '' + mkdir -p $out/share/emacs/site-lisp + install *.el* $out/share/emacs/site-lisp + ''; + + meta = { + description = "Precision colors for machines and people"; + homepage = http://ethanschoonover.com/solarized; + license = stdenv.lib.licenses.mit; + + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3bf99d48c3e..23ffba7bdcf 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8508,6 +8508,8 @@ let colorTheme = callPackage ../applications/editors/emacs-modes/color-theme { }; + colorThemeSolarized = callPackage ../applications/editors/emacs-modes/color-theme-solarized { }; + cryptol = callPackage ../applications/editors/emacs-modes/cryptol { }; cua = callPackage ../applications/editors/emacs-modes/cua { }; -- GitLab From feeca09ecfb89acf6eaae99f7de6b5cd6daa7c28 Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Tue, 19 Aug 2014 18:43:37 +0200 Subject: [PATCH 273/843] eaglemode: upgrade to 0.85.0 --- pkgs/applications/misc/eaglemode/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/misc/eaglemode/default.nix b/pkgs/applications/misc/eaglemode/default.nix index b9c8acb0d07..ea9383a6e10 100644 --- a/pkgs/applications/misc/eaglemode/default.nix +++ b/pkgs/applications/misc/eaglemode/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, perl, libX11, libjpeg, libpng, libtiff, pkgconfig, librsvg, glib, gtk, libXext, libXxf86vm, poppler }: -stdenv.mkDerivation { - name = "eaglemode-0.84.0"; +stdenv.mkDerivation rec { + name = "eaglemode-0.85.0"; src = fetchurl { - url = mirror://sourceforge/eaglemode/eaglemode-0.84.0.tar.bz2; - sha256 = "0n20b419j0l7h7jr4s3f3n09ka0ysg9nqs8mcwsrx24rcq7nv0cs"; + url = "mirror://sourceforge/eaglemode/${name}.tar.bz2"; + sha256 = "0mz4rg2k36wvcv55dg0a5znaczpl5h4gwkkb34syj89xk8jlbwsc"; }; buildInputs = [ perl libX11 libjpeg libpng libtiff pkgconfig -- GitLab From 0e1ed7bbc94b2af0a4d9cb3e39180c0bb9caec2c Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Mon, 25 Aug 2014 08:11:13 +0200 Subject: [PATCH 274/843] fix js2-mode revision --- pkgs/applications/editors/emacs-modes/js2/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/editors/emacs-modes/js2/default.nix b/pkgs/applications/editors/emacs-modes/js2/default.nix index 47e62a281fb..00123bfc8c7 100644 --- a/pkgs/applications/editors/emacs-modes/js2/default.nix +++ b/pkgs/applications/editors/emacs-modes/js2/default.nix @@ -5,7 +5,8 @@ stdenv.mkDerivation { src = fetchgit { url = "git://github.com/mooz/js2-mode.git"; - sha256 = "dbdc07b864a9506a21af445c7fb1c75fbffadaac980ee7bbf752470d8054bd65"; + rev = "b250efaad886dd07b8c69d4573425d095c6652e2"; + sha256 = "30e61e7d364e9175d408bdaf57fda886a4eea22cf5cbd97abb5c307c52b05918"; }; buildInputs = [ emacs ]; -- GitLab From 4b058a204d7466faf2aae5606753ce33416a3cac Mon Sep 17 00:00:00 2001 From: Mathijs Kwik Date: Mon, 25 Aug 2014 13:53:53 +0200 Subject: [PATCH 275/843] remove obsolete haskell-parsers-0.10 --- .../libraries/haskell/parsers/0.10.3.nix | 22 ------------------- .../parsers/{0.12.1.nix => default.nix} | 0 pkgs/top-level/haskell-packages.nix | 4 +--- 3 files changed, 1 insertion(+), 25 deletions(-) delete mode 100644 pkgs/development/libraries/haskell/parsers/0.10.3.nix rename pkgs/development/libraries/haskell/parsers/{0.12.1.nix => default.nix} (100%) diff --git a/pkgs/development/libraries/haskell/parsers/0.10.3.nix b/pkgs/development/libraries/haskell/parsers/0.10.3.nix deleted file mode 100644 index 1da7380f252..00000000000 --- a/pkgs/development/libraries/haskell/parsers/0.10.3.nix +++ /dev/null @@ -1,22 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, charset, doctest, filepath, parsec, text, transformers -, unorderedContainers -}: - -cabal.mkDerivation (self: { - pname = "parsers"; - version = "0.10.3"; - sha256 = "1s9n59q77h0w1csq7yh945b53847a9hnpvviashgxyi7ahvw7jli"; - buildDepends = [ - charset parsec text transformers unorderedContainers - ]; - testDepends = [ doctest filepath ]; - meta = { - homepage = "http://github.com/ekmett/parsers/"; - description = "Parsing combinators"; - license = self.stdenv.lib.licenses.bsd3; - platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - }; -}) diff --git a/pkgs/development/libraries/haskell/parsers/0.12.1.nix b/pkgs/development/libraries/haskell/parsers/default.nix similarity index 100% rename from pkgs/development/libraries/haskell/parsers/0.12.1.nix rename to pkgs/development/libraries/haskell/parsers/default.nix diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 6954fabee6d..a2340779a9b 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1817,9 +1817,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in parsec_3_1_5 = callPackage ../development/libraries/haskell/parsec/3.1.5.nix {}; parsec = self.parsec_3_1_5; - parsers_0_10_3 = callPackage ../development/libraries/haskell/parsers/0.10.3.nix {}; - parsers_0_12_1 = callPackage ../development/libraries/haskell/parsers/0.12.1.nix {}; - parsers = self.parsers_0_12_1; + parsers = callPackage ../development/libraries/haskell/parsers {}; parsimony = callPackage ../development/libraries/haskell/parsimony {}; -- GitLab From fb60478492de8fbf1a05701e96cc5578e37ccbab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Mon, 25 Aug 2014 14:00:31 +0200 Subject: [PATCH 276/843] pythonPackages.zodb3: 3.10.5 -> 3.11.0 --- pkgs/top-level/python-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 352d58f459a..eceacacbd52 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8842,14 +8842,14 @@ rec { zodb3 = buildPythonPackage rec { name = "zodb3-${version}"; - version = "3.10.5"; + version = "3.11.0"; src = fetchurl { url = "http://pypi.python.org/packages/source/Z/ZODB3/ZODB3-${version}.tar.gz"; - md5 = "6f180c6897a1820948fee2a6290503cd"; + md5 = "21975c1609296e7834e8cf4025af3039"; }; - propagatedBuildInputs = [ manuel transaction zc_lockfile zconfig zdaemon zope_interface zope_event ]; + propagatedBuildInputs = [ manuel transaction zc_lockfile zconfig zdaemon zope_interface zope_event BTrees persistent ZEO ]; meta = { description = "An object-oriented database for Python"; -- GitLab From 6bda0b00e0bfc971162ffdc1900d64eddcdd425c Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sun, 24 Aug 2014 07:19:55 -0500 Subject: [PATCH 277/843] atftp: new expression for version 0.7.1 --- pkgs/tools/networking/atftp/default.nix | 72 +++++++------------------ 1 file changed, 20 insertions(+), 52 deletions(-) diff --git a/pkgs/tools/networking/atftp/default.nix b/pkgs/tools/networking/atftp/default.nix index 225c3c04f7a..acd71ea893d 100644 --- a/pkgs/tools/networking/atftp/default.nix +++ b/pkgs/tools/networking/atftp/default.nix @@ -1,59 +1,27 @@ -x@{builderDefsPackage - , readline, tcp_wrappers, pcre, runCommand - , ...}: -builderDefsPackage -(a : -let - helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ - []; +{ stdenv, fetchurl, pcre, readline }: - buildInputs = map (n: builtins.getAttr n x) - (builtins.attrNames (builtins.removeAttrs x helperArgNames)); - sourceInfo = rec { - baseName="atftp"; - version="0.7"; - name="${baseName}-${version}"; - url="mirror://debian/pool/main/a/atftp/atftp_${version}.dfsg.orig.tar.gz"; - hash="0nd5dl14d6z5abgcbxcn41rfn3syza6s57bbgh4aq3r9cxdmz08q"; - }; -in -rec { - src = a.fetchurl { - url = sourceInfo.url; - sha256 = sourceInfo.hash; - }; - - inherit (sourceInfo) name version; - inherit buildInputs; +stdenv.mkDerivation { + name = "atftp-0.7.1"; - /* doConfigure should be removed if not needed */ - phaseNames = ["doPatch" "doConfigure" "doMakeInstall"]; - - debianPatchGz = a.fetchurl { - url = ftp://ftp.ru.debian.org/pub/debian/pool/main/a/atftp/atftp_0.7.dfsg-11.diff.gz; - sha256 = "07g4qbmp0lnscg2dkj6nsj657jaghibvfysdm1cdxcn215n3zwqd"; + src = fetchurl { + url = "mirror://sourceforge/atftp/atftp-0.7.1.tar.gz"; + sha256 = "0bgr31gbnr3qx4ixf8hz47l58sh3367xhcnfqd8233fvr84nyk5f"; }; - debianPatch = a.runCommand "atftp-0.7.dfsg-11" {} '' - gunzip < "${debianPatchGz}" > "$out" - ''; + buildInputs = [ pcre readline ]; - patches = [debianPatch]; + NIX_LDFLAGS = "-lgcc_s"; # for pthread_cancel - meta = { - description = "Advanced tftp tools"; - maintainers = with a.lib.maintainers; - [ - raskin - ]; - platforms = with a.lib.platforms; - linux; - license = a.lib.licenses.gpl2Plus; - }; - passthru = { - updateInfo = { - downloadPage = "http://packages.debian.org/source/sid/atftp"; - }; - }; -}) x + configureFlags = [ + "--enable-libreadline" + "--enable-libpcre" + "--enable-mtftp" + ]; + meta = with stdenv.lib; { + description = "Advanced TFTP server and client"; + homepage = http://sourceforge.net/projects/atftp/; + license = licenses.gpl2Plus; + platforms = platforms.linux; + }; +} -- GitLab From e9f605d7e60d27b8fcd773ef8d2a6d35be6c9d25 Mon Sep 17 00:00:00 2001 From: Andraz Brodnik Date: Mon, 25 Aug 2014 12:17:56 +0200 Subject: [PATCH 278/843] Add apscheduler python package. --- pkgs/top-level/python-packages.nix | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index eceacacbd52..6141f83978c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -438,6 +438,24 @@ rec { }; + apscheduler = buildPythonPackage rec { + name = "APScheduler-2.1.2"; + + propagatedBuildInputs = with pythonPackages; [ futures tzlocal six pytest mock]; + + src = fetchurl { + url = "https://pypi.python.org/packages/source/A/APScheduler/APScheduler-2.1.2.tar.gz"; + md5 = "6862959d460c16ef325d63e1fc3a6684"; + }; + + meta = with pkgs.stdenv.lib; { + description = "Advanced Python Scheduler (APScheduler) is a Python library that lets you schedule your Python code to be executed"; + homepage = http://pypi.python.org/pypi/APScheduler/; + license = licenses.mit; + }; + }; + + area53 = buildPythonPackage (rec { name = "area53-b2c9cdcabd"; -- GitLab From e511e05960993138f145f5ffa37da666ddbf5749 Mon Sep 17 00:00:00 2001 From: Andraz Brodnik Date: Mon, 25 Aug 2014 12:21:33 +0200 Subject: [PATCH 279/843] Add facebook-sdk python package. --- pkgs/top-level/python-packages.nix | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 6141f83978c..11ff371cc3f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2011,6 +2011,21 @@ rec { }; }; + facebook-sdk = buildPythonPackage rec { + name = "facebook-sdk-0.4.0"; + + src = fetchurl { + url = "https://pypi.python.org/packages/source/f/facebook-sdk/facebook-sdk-0.4.0.tar.gz"; + md5 = "ac9f38e197e54b8ba9f3a61988cc33b7"; + }; + + meta = with pkgs.stdenv.lib; { + description = "Client library that supports the Facebook Graph API and the official Facebook JavaScript SDK."; + homepage = https://github.com/pythonforfacebook/facebook-sdk; + license = licenses.asl20 ; + }; + }; + faker = buildPythonPackage rec { name = "faker-0.0.4"; src = fetchurl { -- GitLab From a5396d58bb602f911975a8846b5a85b56caca11b Mon Sep 17 00:00:00 2001 From: Andraz Brodnik Date: Mon, 25 Aug 2014 12:21:48 +0200 Subject: [PATCH 280/843] Add futures python package. --- pkgs/top-level/python-packages.nix | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 11ff371cc3f..e3403d97d63 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3512,6 +3512,23 @@ rec { }; }); + futures = buildPythonPackage rec { + name = "futures-2.1.6"; + + propagatedBuildInputs = with pythonPackages; [ ]; + + src = fetchurl { + url = "https://pypi.python.org/packages/source/f/futures/futures-2.1.6.tar.gz"; + md5 = "cfab9ac3cd55d6c7ddd0546a9f22f453"; + }; + + meta = with pkgs.stdenv.lib; { + description = "Backport of the concurrent.futures package from Python 3.2"; + homepage = http://code.google.com/p/pythonfutures; + license = licenses.bsd2; + }; + }; + gcovr = buildPythonPackage rec { name = "gcovr-2.4"; -- GitLab From ce68f5d3096b925ad27730fdd1c057f3a3f1e2cd Mon Sep 17 00:00:00 2001 From: Andraz Brodnik Date: Mon, 25 Aug 2014 12:22:03 +0200 Subject: [PATCH 281/843] Add mpd python package. --- pkgs/top-level/python-packages.nix | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e3403d97d63..dea4d7370f8 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4652,6 +4652,21 @@ rec { }; + mpd = buildPythonPackage rec { + name = "python-mpd-0.3.0"; + + src = fetchurl { + url = "https://pypi.python.org/packages/source/p/python-mpd/python-mpd-0.3.0.tar.gz"; + md5 = "5b3849b131e2fb12f251434597d65635"; + }; + + meta = with pkgs.stdenv.lib; { + description = "An MPD (Music Player Daemon) client library written in pure Python."; + homepage = http://jatreuman.indefero.net/p/python-mpd/; + license = licenses.gpl3; + }; + }; + mrbob = buildPythonPackage rec { name = "mrbob-${version}"; version = "0.1.1"; -- GitLab From 4d472145d15c26840e9203eee6a29e531d89eaa7 Mon Sep 17 00:00:00 2001 From: Andraz Brodnik Date: Mon, 25 Aug 2014 12:22:34 +0200 Subject: [PATCH 282/843] Add quantities python package. --- pkgs/top-level/python-packages.nix | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index dea4d7370f8..9c392bc1edf 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6891,6 +6891,21 @@ rec { }; + quantities = buildPythonPackage rec { + name = "quantities-0.10.1"; + + src = fetchurl { + url = "https://pypi.python.org/packages/source/q/quantities/quantities-0.10.1.tar.gz"; + md5 = "e924e21c0a5ddc9ebcdacbbe511b8ec7"; + }; + + meta = with pkgs.stdenv.lib; { + description = "Quantities is designed to handle arithmetic and"; + homepage = http://packages.python.org/quantities; + license = licenses.bsd2; + }; + }; + qutip = buildPythonPackage rec { name = "qutip-2.2.0"; -- GitLab From aa68c94d4da2d0bbcd6ccd647aa91e8f31f0a041 Mon Sep 17 00:00:00 2001 From: Andraz Brodnik Date: Mon, 25 Aug 2014 12:22:57 +0200 Subject: [PATCH 283/843] Add semantic python package. --- pkgs/top-level/python-packages.nix | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 9c392bc1edf..f866c529d72 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7623,6 +7623,26 @@ rec { }; }; + semantic = buildPythonPackage rec { + name = "semantic-1.0.3"; + + propagatedBuildInputs = with pythonPackages; [ quantities numpy ]; + + src = fetchurl { + url = "https://pypi.python.org/packages/source/s/semantic/semantic-1.0.3.tar.gz"; + md5 = "78a150190e3e7d0f6f357b4c828e5f0d"; + }; + + # strange setuptools error (can not import semantic.test) + doCheck = false; + + meta = with pkgs.stdenv.lib; { + description = "Common Natural Language Processing Tasks for Python"; + homepage = https://github.com/crm416/semantic; + license = licenses.mit; + }; + }; + sexpdata = buildPythonPackage rec { name = "sexpdata-0.0.2"; src = fetchurl { -- GitLab From 56edab99097cfe1904a92acc5ec2ded7ba26f834 Mon Sep 17 00:00:00 2001 From: Andraz Brodnik Date: Mon, 25 Aug 2014 12:23:15 +0200 Subject: [PATCH 284/843] Add tzlocal python package. --- pkgs/top-level/python-packages.nix | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f866c529d72..26de0d5f46e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8399,6 +8399,25 @@ rec { }; }; + tzlocal = buildPythonPackage rec { + name = "tzlocal-1.1.1"; + + propagatedBuildInputs = with pythonPackages; [ pytz ]; + + src = fetchurl { + url = "https://pypi.python.org/packages/source/t/tzlocal/tzlocal-1.1.1.zip"; + md5 = "56c2a04501b98f2a1188d003fd6d3dba"; + }; + + # test fail (timezone test fail) + doCheck = true; + + meta = with pkgs.stdenv.lib; { + description = "Tzinfo object for the local timezone."; + homepage = https://github.com/regebro/tzlocal; + license = licenses.cddl; + }; + }; unittest2 = buildPythonPackage rec { version = "0.5.1"; -- GitLab From 9149d450cfc3adb213eefc125d2acda164126d2b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Mon, 25 Aug 2014 14:07:08 +0200 Subject: [PATCH 285/843] pythonPackages: disable some py3k builds --- pkgs/top-level/python-packages.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 26de0d5f46e..4758deed72b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2013,6 +2013,8 @@ rec { facebook-sdk = buildPythonPackage rec { name = "facebook-sdk-0.4.0"; + + disabled = isPy3k; src = fetchurl { url = "https://pypi.python.org/packages/source/f/facebook-sdk/facebook-sdk-0.4.0.tar.gz"; @@ -4655,6 +4657,8 @@ rec { mpd = buildPythonPackage rec { name = "python-mpd-0.3.0"; + disabled = isPy3k; + src = fetchurl { url = "https://pypi.python.org/packages/source/p/python-mpd/python-mpd-0.3.0.tar.gz"; md5 = "5b3849b131e2fb12f251434597d65635"; @@ -7625,8 +7629,10 @@ rec { semantic = buildPythonPackage rec { name = "semantic-1.0.3"; + + disabled = isPy3k; - propagatedBuildInputs = with pythonPackages; [ quantities numpy ]; + propagatedBuildInputs = [ quantities numpy ]; src = fetchurl { url = "https://pypi.python.org/packages/source/s/semantic/semantic-1.0.3.tar.gz"; @@ -8410,7 +8416,7 @@ rec { }; # test fail (timezone test fail) - doCheck = true; + doCheck = false; meta = with pkgs.stdenv.lib; { description = "Tzinfo object for the local timezone."; -- GitLab From 3f971fe45ff0cb677c5375833afc7eebb43ac60b Mon Sep 17 00:00:00 2001 From: Jaka Kranjc Date: Sun, 24 Aug 2014 16:50:59 +0200 Subject: [PATCH 286/843] gemrb: added more meta tags + general maintenance --- pkgs/games/gemrb/default.nix | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/pkgs/games/gemrb/default.nix b/pkgs/games/gemrb/default.nix index 31e8ae05d00..31fdb881d0e 100644 --- a/pkgs/games/gemrb/default.nix +++ b/pkgs/games/gemrb/default.nix @@ -11,6 +11,7 @@ stdenv.mkDerivation rec { }; buildInputs = [ cmake python openal SDL zlib libpng libvorbis ]; + # 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"; @@ -18,8 +19,19 @@ stdenv.mkDerivation rec { # Can't have -werror because of the Vorbis header files. cmakeFlags = "-DDISABLE_WERROR=ON -DCMAKE_VERBOSE_MAKEFILE=ON"; - meta = { + # upstream prefers some symbols to remain + dontStrip = true; + + meta = with stdenv.lib; { description = "A reimplementation of the Infinity Engine, used by games such as Baldur's Gate"; - homepage = http://gemrb.sourceforge.net/; + longDescription = '' + GemRB (Game engine made with pre-Rendered Background) is a portable open-source implementation of + Bioware's Infinity Engine. It was written to support pseudo-3D role playing games based on the + Dungeons & Dragons ruleset (Baldur's Gate and Icewind Dale series, Planescape: Torment). + ''; + homepage = http://gemrb.org/; + license = licenses.gpl2; + platforms = stdenv.lib.platforms.all; + hydraPlatforms = []; }; } -- GitLab From 310a5d09a464ad1a5a23499ef4050800e919a624 Mon Sep 17 00:00:00 2001 From: Jaka Kranjc Date: Sun, 24 Aug 2014 17:05:02 +0200 Subject: [PATCH 287/843] gemrb: bumped to 0.8.1 --- pkgs/games/gemrb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/gemrb/default.nix b/pkgs/games/gemrb/default.nix index 31fdb881d0e..dc89e405e24 100644 --- a/pkgs/games/gemrb/default.nix +++ b/pkgs/games/gemrb/default.nix @@ -3,11 +3,11 @@ assert stdenv.gcc.libc != null; stdenv.mkDerivation rec { - name = "gemrb-0.8.0.1"; + name = "gemrb-0.8.1"; src = fetchurl { url = "mirror://sourceforge/gemrb/${name}.tar.gz"; - sha256 = "0v9iypls4iawnfkc91hcdnmc4vyg3ix7v7lmw3knv73q145v0ksd"; + sha256 = "1g68pc0x4azy6zm5y7813g0qky96q796si9v3vafiy7sa8ph49kl"; }; buildInputs = [ cmake python openal SDL zlib libpng libvorbis ]; -- GitLab From e13002194014d5f9d8f6b02b337b4f612248e42b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Mon, 25 Aug 2014 14:16:35 +0200 Subject: [PATCH 288/843] python3Packages.fabric: 1.6.1 -> 1.9.1 --- pkgs/top-level/python-packages.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 4758deed72b..67edc8f8d2b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2060,11 +2060,13 @@ rec { }; fabric = buildPythonPackage rec { - name = "fabric-1.6.1"; + name = "fabric-${version}"; + version = "1.9.1"; src = fetchurl { - url = https://pypi.python.org/packages/source/F/Fabric/Fabric-1.6.1.tar.gz; - sha256 = "058psbhqbfm3n214wkyfpgm069yqmdqw1hql9bac1yv9pza3bzx1"; + url = "https://pypi.python.org/packages/source/F/Fabric/Fabric-${version}.tar.gz"; + sha256 = "103mzf0l15kyvw5nmf7bsdrqg6y3wpyxmkyl2h9lk7jxb5gdc9s1"; }; + disabled = isPy3k; propagatedBuildInputs = [ paramiko pycrypto ]; buildInputs = [ fudge nose ]; }; -- GitLab From 8cfd9b1acd774276f012d72fc1c3b30b09cf0285 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Mon, 25 Aug 2014 14:22:54 +0200 Subject: [PATCH 289/843] pythonPackages.gevent: 0.13.8 -> 1.0.1 --- pkgs/top-level/python-packages.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 67edc8f8d2b..23b5e9522e5 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3575,14 +3575,15 @@ rec { }; gevent = buildPythonPackage rec { - name = "gevent-0.13.8"; - + name = "gevent-1.0.1"; + disabled = isPy3k; + src = fetchurl { url = "https://pypi.python.org/packages/source/g/gevent/${name}.tar.gz"; - sha256 = "0plmxnb53qbxxf6macq84dvclsiyrpv3xrm32q4qqh6f01ix5f2l"; + sha256 = "0hyzfb0gcx9pm5c2igan8y57hqy2wixrwvdjwsaivxsqs0ay49s6"; }; - buildInputs = [ pkgs.libevent ]; + buildInputs = [ pkgs.libev ]; propagatedBuildInputs = [ greenlet ]; meta = with stdenv.lib; { -- GitLab From b1ce3cc1729fad3cc41066547d7fd502770623b2 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 25 Aug 2014 14:33:17 +0200 Subject: [PATCH 290/843] Manual: Handle XML files in subdirectories --- lib/sources.nix | 6 +++--- nixos/doc/manual/default.nix | 26 +++++++++++++++----------- 2 files changed, 18 insertions(+), 14 deletions(-) diff --git a/lib/sources.nix b/lib/sources.nix index a80e4397d6a..4ed16d65d2b 100644 --- a/lib/sources.nix +++ b/lib/sources.nix @@ -21,12 +21,12 @@ rec { # Get all files ending with the specified suffices from the given - # directory. E.g. `sourceFilesBySuffices ./dir [".xml" ".c"]'. + # directory or its descendants. E.g. `sourceFilesBySuffices ./dir + # [".xml" ".c"]'. sourceFilesBySuffices = path: exts: let filter = name: type: let base = baseNameOf (toString name); - in type != "directory" && lib.any (ext: lib.hasSuffix ext base) exts; + in type == "directory" || lib.any (ext: lib.hasSuffix ext base) exts; in builtins.filterSource filter path; - } diff --git a/nixos/doc/manual/default.nix b/nixos/doc/manual/default.nix index 55533a05b06..df524c3faac 100644 --- a/nixos/doc/manual/default.nix +++ b/nixos/doc/manual/default.nix @@ -36,13 +36,22 @@ let -o $out ${./options-to-docbook.xsl} ${optionsXML} ''; + sources = sourceFilesBySuffices ./. [".xml"]; + + copySources = + '' + cp -prd $sources/* . # */ + ln -s ${optionsDocBook} options-db.xml + echo "${version}" > version + ''; + in rec { # Generate the NixOS manual. manual = stdenv.mkDerivation { name = "nixos-manual"; - sources = sourceFilesBySuffices ./. [".xml"]; + inherit sources; buildInputs = [ libxml2 libxslt ]; @@ -57,9 +66,7 @@ in rec { ''; buildCommand = '' - ln -s $sources/*.xml . # */ - ln -s ${optionsDocBook} options-db.xml - echo "${version}" > version + ${copySources} # Check the validity of the manual sources. xmllint --noout --nonet --xinclude --noxincludenode \ @@ -90,7 +97,7 @@ in rec { manualPDF = stdenv.mkDerivation { name = "nixos-manual-pdf"; - sources = sourceFilesBySuffices ./. [".xml"]; + inherit sources; buildInputs = [ libxml2 libxslt dblatex tetex ]; @@ -98,9 +105,7 @@ in rec { # TeX needs a writable font cache. export VARTEXFONTS=$TMPDIR/texfonts - ln -s $sources/*.xml . # */ - ln -s ${optionsDocBook} options-db.xml - echo "${version}" > version + ${copySources} dst=$out/share/doc/nixos mkdir -p $dst @@ -117,13 +122,12 @@ in rec { manpages = stdenv.mkDerivation { name = "nixos-manpages"; - sources = sourceFilesBySuffices ./. [".xml"]; + inherit sources; buildInputs = [ libxml2 libxslt ]; buildCommand = '' - ln -s $sources/*.xml . # */ - ln -s ${optionsDocBook} options-db.xml + ${copySources} # Check the validity of the manual sources. xmllint --noout --nonet --xinclude --noxincludenode \ -- GitLab From d2539605e1545428c404ddaa73265b30988c044b Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 25 Aug 2014 14:35:08 +0200 Subject: [PATCH 291/843] Remove reference to icecat --- nixos/modules/config/system-path.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/config/system-path.nix b/nixos/modules/config/system-path.nix index 6b4c38172e9..83c14e45685 100644 --- a/nixos/modules/config/system-path.nix +++ b/nixos/modules/config/system-path.nix @@ -63,7 +63,7 @@ in systemPackages = mkOption { type = types.listOf types.path; default = []; - example = "[ pkgs.icecat3 pkgs.thunderbird ]"; + example = "[ pkgs.firefox pkgs.thunderbird ]"; description = '' The set of packages that appear in /run/current-system/sw. These packages are -- GitLab From 8c7898655361b5b5fd0a78f6d8f3407157195078 Mon Sep 17 00:00:00 2001 From: Rickard Nilsson Date: Mon, 25 Aug 2014 14:40:40 +0200 Subject: [PATCH 292/843] Some pkgs.lib -> lib fixes --- nixos/modules/services/hardware/tcsd.nix | 4 ++-- nixos/modules/services/monitoring/riemann-dash.nix | 4 ++-- nixos/modules/services/monitoring/riemann.nix | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/nixos/modules/services/hardware/tcsd.nix b/nixos/modules/services/hardware/tcsd.nix index 26b2c884b8f..d7f6c188feb 100644 --- a/nixos/modules/services/hardware/tcsd.nix +++ b/nixos/modules/services/hardware/tcsd.nix @@ -1,8 +1,8 @@ # tcsd daemon. -{ config, pkgs, ... }: +{ config, pkgs, lib, ... }: -with pkgs.lib; +with lib; let cfg = config.services.tcsd; diff --git a/nixos/modules/services/monitoring/riemann-dash.nix b/nixos/modules/services/monitoring/riemann-dash.nix index f647b92f914..148dc046805 100644 --- a/nixos/modules/services/monitoring/riemann-dash.nix +++ b/nixos/modules/services/monitoring/riemann-dash.nix @@ -1,7 +1,7 @@ -{ config, pkgs, ... }: +{ config, pkgs, lib, ... }: with pkgs; -with pkgs.lib; +with lib; let diff --git a/nixos/modules/services/monitoring/riemann.nix b/nixos/modules/services/monitoring/riemann.nix index e8d32af1b83..a1935c29a04 100644 --- a/nixos/modules/services/monitoring/riemann.nix +++ b/nixos/modules/services/monitoring/riemann.nix @@ -1,7 +1,7 @@ -{ config, pkgs, ... }: +{ config, pkgs, lib, ... }: with pkgs; -with pkgs.lib; +with lib; let -- GitLab From 963b97088fb8451c53485577873c40e067a0554d Mon Sep 17 00:00:00 2001 From: William Roe Date: Tue, 29 Jul 2014 14:10:25 +0100 Subject: [PATCH 293/843] Logstash-forwarder requires Go-1.1/1.2 The SSL stuff in it doesn't work right with Go 1.3 yet. 1.2 doesn't have a derivation for darwin, so go 1.1 should work for everyone --- pkgs/tools/misc/logstash-forwarder/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/logstash-forwarder/default.nix b/pkgs/tools/misc/logstash-forwarder/default.nix index 52180c75c98..4edaed35f64 100644 --- a/pkgs/tools/misc/logstash-forwarder/default.nix +++ b/pkgs/tools/misc/logstash-forwarder/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, go }: +{ stdenv, fetchgit, go_1_1 }: stdenv.mkDerivation { name = "logstash-forwarder-20140410"; src = fetchgit { @@ -6,7 +6,7 @@ stdenv.mkDerivation { rev = "ec504792108ab6536b45bcf6dff6d26a6b56fef3"; sha256 = "309545ceaec171bee997cad260bef1433e041b9f3bfe617d475bcf79924f943d"; }; - buildInputs = [ go ]; + buildInputs = [ go_1_1 ]; installPhase = '' mkdir -p $out/bin cp build/bin/logstash-forwarder $out/bin -- GitLab From 8b98d7dc08d37a6a64d67bd3378f755d8289cb21 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Mon, 25 Aug 2014 14:50:25 +0200 Subject: [PATCH 294/843] logstash_forwarder: specify platforms --- pkgs/tools/misc/logstash-forwarder/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/misc/logstash-forwarder/default.nix b/pkgs/tools/misc/logstash-forwarder/default.nix index 4edaed35f64..961dbc08335 100644 --- a/pkgs/tools/misc/logstash-forwarder/default.nix +++ b/pkgs/tools/misc/logstash-forwarder/default.nix @@ -15,5 +15,6 @@ stdenv.mkDerivation { meta = { license = stdenv.lib.licenses.asl20; homepage = https://github.com/elasticsearch/logstash-forwarder; + platforms = stdenv.lib.platforms.linux; }; } -- GitLab From c3f730d185c59325f2da9191f53254a28a18d1df Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Sat, 23 Aug 2014 15:11:37 -0700 Subject: [PATCH 295/843] libnftnl: Add derivation --- .../libraries/libnftnl/default.nix | 20 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 22 insertions(+) create mode 100644 pkgs/development/libraries/libnftnl/default.nix diff --git a/pkgs/development/libraries/libnftnl/default.nix b/pkgs/development/libraries/libnftnl/default.nix new file mode 100644 index 00000000000..cb1e8346742 --- /dev/null +++ b/pkgs/development/libraries/libnftnl/default.nix @@ -0,0 +1,20 @@ +{ stdenv, fetchurl, pkgconfig, libmnl }: + +stdenv.mkDerivation rec { + name = "libnftnl-1.0.2"; + + src = fetchurl { + url = "netfilter.org/projects/libnftnl/files/${name}.tar.bz2"; + sha256 = "1p268cv85l4ipd1p9ipjdrfgba14cblp01apv7wc44zmwfr2gkkq"; + }; + + buildInputs = [ pkgconfig libmnl ]; + + meta = with stdenv.lib; { + description = "a userspace library providing a low-level netlink API to the in-kernel nf_tables subsystem"; + homepage = http://netfilter.org/projects/libnftnl; + license = licenses.gpl2Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ wkennington ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 23ffba7bdcf..11658e22d90 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5448,6 +5448,8 @@ let libnfnetlink = callPackage ../development/libraries/libnfnetlink { }; + libnftnl = callPackage ../development/libraries/libnftnl { }; + libnih = callPackage ../development/libraries/libnih { }; libnova = callPackage ../development/libraries/libnova { }; -- GitLab From c063a8d9a52d6dc7001db71fead698f88b29f4ca Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Sat, 23 Aug 2014 16:15:51 -0700 Subject: [PATCH 296/843] docbook2x: Add platforms so that it builds on hydra --- pkgs/tools/typesetting/docbook2x/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/typesetting/docbook2x/default.nix b/pkgs/tools/typesetting/docbook2x/default.nix index 78dac0c6aa4..b31c64e6936 100644 --- a/pkgs/tools/typesetting/docbook2x/default.nix +++ b/pkgs/tools/typesetting/docbook2x/default.nix @@ -46,13 +46,14 @@ stdenv.mkDerivation rec { "${gnused}/bin" ''; - meta = { + meta = with stdenv.lib; { longDescription = '' docbook2X is a software package that converts DocBook documents into the traditional Unix man page format and the GNU Texinfo format. ''; - license = stdenv.lib.licenses.mit; + license = licenses.mit; homepage = http://docbook2x.sourceforge.net/; + platforms = platforms.all; }; } -- GitLab From 39b1e2fffc60f6603d8b0daa9f1dd55960311c49 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Sat, 23 Aug 2014 16:16:06 -0700 Subject: [PATCH 297/843] nftables: Add derivation --- pkgs/os-specific/linux/nftables/default.nix | 28 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 30 insertions(+) create mode 100644 pkgs/os-specific/linux/nftables/default.nix diff --git a/pkgs/os-specific/linux/nftables/default.nix b/pkgs/os-specific/linux/nftables/default.nix new file mode 100644 index 00000000000..e8dd56ab9e2 --- /dev/null +++ b/pkgs/os-specific/linux/nftables/default.nix @@ -0,0 +1,28 @@ +{ stdenv, fetchurl, docbook2x, docbook_xml_dtd_45 +, flex, bison, libmnl, libnftnl, gmp, readline }: + +stdenv.mkDerivation rec { + name = "nftables-0.3"; + + src = fetchurl { + url = "http://netfilter.org/projects/nftables/files/${name}.tar.bz2"; + sha256 = "0bww48hc424svxfx3fpqxmbmp0n42ahs1f28f5f6g29d8i2jcdsd"; + }; + + configureFlags = [ + "CONFIG_MAN=y" + "DB2MAN=docbook2man" + ]; + + XML_CATALOG_FILES = "${docbook_xml_dtd_45}/xml/dtd/docbook/catalog.xml"; + + buildInputs = [ 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"; + homepage = http://netfilter.org/projects/nftables; + license = licenses.gpl2; + platforms = platforms.linux; + maintainers = with maintainers; [ wkennington ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 11658e22d90..a671f50dc60 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7683,6 +7683,8 @@ let libpng = libpng15; }; + nftables = callPackage ../os-specific/linux/nftables { }; + numactl = callPackage ../os-specific/linux/numactl { }; gocode = callPackage ../development/tools/gocode { }; -- GitLab From f83af95f8a54d0375ac6e159b663de887ba5b6a6 Mon Sep 17 00:00:00 2001 From: aszlig Date: Mon, 25 Aug 2014 15:00:55 +0200 Subject: [PATCH 298/843] build-support: Use mktemp -d in nix-prefetch-*. Instead of relying on $$ to not collide with an existing path. Quoting the Bash manual about $$: > Expands to the process ID of the shell. In a () subshell, it expands > to the process ID of the current shell, not the subshell. So, this is different from $BASHPID: > Expands to the process ID of the current bash process. This differs > from $$ under certain circumstances, such as subshells that do not > require bash to be re-initialized. But even $BASHPID is prone to race conditions if the process IDs wrap around, so to be on the safe side, we're using mktemp here. Closes #3784. Signed-off-by: aszlig --- pkgs/build-support/fetchbzr/nix-prefetch-bzr | 7 +++---- pkgs/build-support/fetchgit/nix-prefetch-git | 8 ++++---- pkgs/build-support/fetchhg/nix-prefetch-hg | 7 +++---- pkgs/build-support/fetchsvn/nix-prefetch-svn | 7 +++---- 4 files changed, 13 insertions(+), 16 deletions(-) diff --git a/pkgs/build-support/fetchbzr/nix-prefetch-bzr b/pkgs/build-support/fetchbzr/nix-prefetch-bzr index 2f46819323f..346c2b05cbd 100755 --- a/pkgs/build-support/fetchbzr/nix-prefetch-bzr +++ b/pkgs/build-support/fetchbzr/nix-prefetch-bzr @@ -43,11 +43,10 @@ fi # If we don't know the hash or a path with that hash doesn't exist, # download the file and add it to the store. if test -z "$finalPath"; then - tmpPath=/tmp/bzr-checkout-tmp-$$ - tmpFile=$tmpPath/$dstFile - mkdir $tmpPath + tmpPath="$(mktemp --tmpdir -d bzr-checkout-tmp-XXXXXXXX)" + trap "rm -rf \"$tmpPath\"" EXIT - trap "rm -rf $tmpPath" EXIT + tmpFile="$tmpPath/$dstFile" # Perform the checkout. bzr -Ossl.cert_reqs=none export $revarg --format=dir "$tmpFile" "$url" diff --git a/pkgs/build-support/fetchgit/nix-prefetch-git b/pkgs/build-support/fetchgit/nix-prefetch-git index b3cd3488735..0d2536e225c 100755 --- a/pkgs/build-support/fetchgit/nix-prefetch-git +++ b/pkgs/build-support/fetchgit/nix-prefetch-git @@ -256,11 +256,11 @@ else # download the file and add it to the store. if test -z "$finalPath"; then - tmpPath=/tmp/git-checkout-tmp-$$ - tmpFile=$tmpPath/git-export - mkdir $tmpPath $tmpFile + tmpPath="$(mktemp --tmpdir -d git-checkout-tmp-XXXXXXXX)" + trap "rm -rf \"$tmpPath\"" EXIT - trap "rm -rf $tmpPath" EXIT + tmpFile="$tmpPath/git-export" + mkdir "$tmpFile" # Perform the checkout. clone_user_rev "$tmpFile" "$url" "$rev" diff --git a/pkgs/build-support/fetchhg/nix-prefetch-hg b/pkgs/build-support/fetchhg/nix-prefetch-hg index 075dbc9c367..7d4c0c8d741 100755 --- a/pkgs/build-support/fetchhg/nix-prefetch-hg +++ b/pkgs/build-support/fetchhg/nix-prefetch-hg @@ -35,11 +35,10 @@ fi # download the file and add it to the store. if test -z "$finalPath"; then - tmpPath=/tmp/hg-checkout-tmp-$$ - tmpArchive=$tmpPath/hg-archive - mkdir $tmpPath + tmpPath="$(mktemp --tmpdir -d hg-checkout-tmp-XXXXXXXX)" + trap "rm -rf \"$tmpPath\"" EXIT - trap "rm -rf $tmpPath" EXIT + tmpArchive="$tmpPath/hg-archive" # Perform the checkout. if [[ $url != /* ]]; then diff --git a/pkgs/build-support/fetchsvn/nix-prefetch-svn b/pkgs/build-support/fetchsvn/nix-prefetch-svn index a2ee3ac6052..74de0a14c80 100755 --- a/pkgs/build-support/fetchsvn/nix-prefetch-svn +++ b/pkgs/build-support/fetchsvn/nix-prefetch-svn @@ -41,11 +41,10 @@ fi # If we don't know the hash or a path with that hash doesn't exist, # download the file and add it to the store. if test -z "$finalPath"; then - tmpPath=/tmp/svn-checkout-tmp-$$ - tmpFile=$tmpPath/$dstFile - mkdir $tmpPath + tmpPath="$(mktemp --tmpdir -d svn-checkout-tmp-XXXXXXXX)" + trap "rm -rf \"$tmpPath\"" EXIT - trap "rm -rf $tmpPath" EXIT + tmpFile="$tmpPath/$dstFile" # Perform the checkout. if test "$NIX_PREFETCH_SVN_LEAVE_DOT_SVN" != 1 -- GitLab From 35d7d01d065dd218575080f13677cd0ab833e9e2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= Date: Mon, 25 Aug 2014 16:58:41 +0200 Subject: [PATCH 299/843] FriBID: 1.0.2 -> 1.0.4 Changed from let to rec version. Added longDescription. --- .../browsers/mozilla-plugins/fribid/default.nix | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/browsers/mozilla-plugins/fribid/default.nix b/pkgs/applications/networking/browsers/mozilla-plugins/fribid/default.nix index 8cda5ad5762..229aa4f23ba 100644 --- a/pkgs/applications/networking/browsers/mozilla-plugins/fribid/default.nix +++ b/pkgs/applications/networking/browsers/mozilla-plugins/fribid/default.nix @@ -1,20 +1,19 @@ { stdenv, fetchurl, pkgconfig, openssl, glib, libX11, gtk2, gettext, intltool }: -let version = "1.0.2"; in stdenv.mkDerivation rec { name = "fribid-${version}"; + version = "1.0.4"; builder = ./builder.sh; src = fetchurl { url = "https://fribid.se/releases/source/${name}.tar.bz2"; - sha256 = "d7cd9adf04fedf50b266a5c14ddb427cbb263d3bc160ee0ade03aca9d5356e5c"; + sha256 = "a679f3a0534d5f05fac10b16b49630a898c0b721cfa24d2c827fa45485476649"; }; buildInputs = [ pkgconfig openssl libX11 gtk2 glib gettext intltool ]; patches = [ ./translation-xgettext-to-intltool.patch ./plugin-linkfix.patch - ./emulated-version.patch ./ipc-lazytrace.patch ]; @@ -22,10 +21,15 @@ stdenv.mkDerivation rec { meta = { description = "A browser plugin to manage Swedish BankID:s"; + longDescription = '' + FriBID is an open source software for the Swedish e-id system + called BankID. FriBID also supports processor architectures and + Linux/BSD distributions that the official software doesn't + support. + ''; homepage = http://fribid.se; license = [ "GPLv2" "MPLv1" ]; maintainers = [ stdenv.lib.maintainers.edwtjo ]; platforms = with stdenv.lib.platforms; linux; }; } - -- GitLab From 2099db4d0094b77cc6856b455c153527e7c0d919 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Mon, 25 Aug 2014 17:09:35 +0200 Subject: [PATCH 300/843] uTox: downgrade to work with current libtoxcore --- .../networking/instant-messengers/utox/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/utox/default.nix b/pkgs/applications/networking/instant-messengers/utox/default.nix index 823df5c27a2..b49d5f40a86 100644 --- a/pkgs/applications/networking/instant-messengers/utox/default.nix +++ b/pkgs/applications/networking/instant-messengers/utox/default.nix @@ -8,8 +8,8 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "notsecure"; repo = "uTox"; - rev = "d70f9bfb4ff8a156ec35803da6226b0ac8c47961"; - sha256 = "10cvsg0phv0jsrdl3zkk339c4bzn3xc82q1x90h6gcnrbg4vzmp0"; + rev = "a840b459210694fdf02671567bf33845a11d4c83"; + sha256 = "0jr0xajkv5vkq8gxspnq09k4bzc98fr3hflnz8a3lrwajyhrnpvp"; }; buildInputs = [ pkgconfig libtoxcore dbus libvpx libX11 openal freetype -- GitLab From 13ca3624a7dc81d6a42132e820fb71a87f7b8ba8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Mon, 25 Aug 2014 17:13:50 +0200 Subject: [PATCH 301/843] toxic: git -> 0.4.7 --- .../networking/instant-messengers/toxic/default.nix | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/toxic/default.nix b/pkgs/applications/networking/instant-messengers/toxic/default.nix index b3e1ff74cfa..f7d1a010ed8 100644 --- a/pkgs/applications/networking/instant-messengers/toxic/default.nix +++ b/pkgs/applications/networking/instant-messengers/toxic/default.nix @@ -2,16 +2,13 @@ , libtoxcore, openal, libvpx, freealut, libconfig, pkgconfig }: let - version = "7566aa9d26"; - date = "20140728"; -in -stdenv.mkDerivation rec { - name = "toxic-${date}-${version}"; + version = "0.4.7"; +in stdenv.mkDerivation rec { + name = "toxic-${version}"; src = fetchurl { - url = "https://github.com/Tox/toxic/tarball/${version}"; - name = "${name}.tar.gz"; - sha256 = "13vns0qc0hxhab6rpz0irnzgv42mp3v1nrbwm90iymhf4xkc9nwa"; + url = "https://github.com/Tox/toxic/archive/v${version}.tar.gz"; + sha256 = "0rcrcqzvicz7787fa4b7f68qnwq6wqbyrm8ii850f1w7vnxq9dkq"; }; makeFlags = [ "-Cbuild" "VERSION=${version}" ]; -- GitLab From 12776c37482c5c48d8558b99178e799826a2390d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Mon, 25 Aug 2014 18:15:57 +0200 Subject: [PATCH 302/843] python3Packages: disable few packages --- pkgs/top-level/python-packages.nix | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 23b5e9522e5..55823eea2b6 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -384,11 +384,12 @@ rec { anyjson = buildPythonPackage rec { - name = "anyjson-0.3.1"; + name = "anyjson-0.3.3"; + disabled = isPy3k; src = fetchurl { url = "http://pypi.python.org/packages/source/a/anyjson/${name}.tar.gz"; - md5 = "2b53b5d53fc40af4da7268d3c3e35a50"; + md5 = "2ea28d6ec311aeeebaf993cb3008b27c"; }; buildInputs = [ pythonPackages.nose ]; @@ -1127,6 +1128,7 @@ rec { cheetah = buildPythonPackage rec { version = "2.4.4"; name = "cheetah-${version}"; + disabled = isPy3k; src = fetchurl { url = "http://pypi.python.org/packages/source/C/Cheetah/Cheetah-${version}.tar.gz"; @@ -4902,6 +4904,7 @@ rec { netlib = buildPythonPackage rec { baseName = "netlib"; name = "${baseName}-${meta.version}"; + disabled = (!isPy27); src = fetchurl { url = "https://github.com/cortesi/netlib/archive/v${meta.version}.tar.gz"; @@ -6002,11 +6005,11 @@ rec { pycurl = buildPythonPackage (rec { - name = "pycurl-7.19.0"; + name = "pycurl-7.19.5"; src = fetchurl { url = "http://pycurl.sourceforge.net/download/${name}.tar.gz"; - sha256 = "0hh6icdbp7svcq0p57zf520ifzhn7jw64x07k99j7h57qpy2sy7b"; + sha256 = "0hqsap82zklhi5fxhc69kxrwzb0g9566f7sdpz7f9gyxkmyam839"; }; buildInputs = [ pkgs.curl ]; @@ -7113,6 +7116,8 @@ rec { rope = buildPythonPackage rec { version = "0.9.4"; name = "rope-${version}"; + + disabled = isPy3k; src = fetchurl { url = "http://pypi.python.org/packages/source/r/rope/${name}.tar.gz"; @@ -7506,6 +7511,7 @@ rec { pydns = buildPythonPackage rec { name = "pydns-2.3.6"; + disabled = isPy3k; src = fetchurl { url = "https://pypi.python.org/packages/source/p/pydns/${name}.tar.gz"; @@ -8377,7 +8383,8 @@ rec { twisted = buildPythonPackage rec { # NOTE: When updating please check if new versions still cause issues # to packages like carbon (http://stackoverflow.com/questions/19894708/cant-start-carbon-12-04-python-error-importerror-cannot-import-name-daem) - + disabled = isPy3k; + name = "Twisted-11.1.0"; src = fetchurl { url = "https://pypi.python.org/packages/source/T/Twisted/${name}.tar.bz2"; @@ -8455,6 +8462,7 @@ rec { urlgrabber = buildPythonPackage rec { name = "urlgrabber-3.9.1"; + disabled = isPy3k; src = fetchurl { url = "http://urlgrabber.baseurl.org/download/${name}.tar.gz"; -- GitLab From db47d5159289ca9a7534a573a0967ee137f13229 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Mon, 25 Aug 2014 19:00:37 +0200 Subject: [PATCH 303/843] pypy: add X libs to build tkinter --- pkgs/development/interpreters/pypy/2.3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/pypy/2.3/default.nix b/pkgs/development/interpreters/pypy/2.3/default.nix index 626f56ccc46..74f01c0fc0f 100644 --- a/pkgs/development/interpreters/pypy/2.3/default.nix +++ b/pkgs/development/interpreters/pypy/2.3/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, zlib ? null, zlibSupport ? true, bzip2, pkgconfig, libffi -, sqlite, openssl, ncurses, pythonFull, expat, tcl, tk }: +, sqlite, openssl, ncurses, pythonFull, expat, tcl, tk, x11, libX11 }: assert zlibSupport -> zlib != null; @@ -20,7 +20,7 @@ let sha256 = "0fg4l48c7n59n5j3b1dgcsr927xzylkfny4a6pnk6z0pq2bhvl9z"; }; - buildInputs = [ bzip2 openssl pkgconfig pythonFull libffi ncurses expat sqlite tk tcl ] + buildInputs = [ bzip2 openssl pkgconfig pythonFull libffi ncurses expat sqlite tk tcl x11 libX11 ] ++ stdenv.lib.optional (stdenv ? gcc && stdenv.gcc.libc != null) stdenv.gcc.libc ++ stdenv.lib.optional zlibSupport zlib; -- GitLab From 68c131c2cc0ba24df2479e1f1fe2154772e07ce5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Mon, 25 Aug 2014 19:00:51 +0200 Subject: [PATCH 304/843] quake3demo: mark as broken --- pkgs/games/quake3/game/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/games/quake3/game/default.nix b/pkgs/games/quake3/game/default.nix index 6a05ab7f2bd..596ba595d81 100644 --- a/pkgs/games/quake3/game/default.nix +++ b/pkgs/games/quake3/game/default.nix @@ -32,5 +32,7 @@ stdenv.mkDerivation { installTargets=copyfiles installFlags="COPYDIR=$out" ''; + + meta.broken = true; } -- GitLab From d7bcb19d6404a7645bd1796537569ab9db49f334 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Mon, 25 Aug 2014 19:01:17 +0200 Subject: [PATCH 305/843] python-packages-generated: temporarily hardcode fix for psycopg2 --- pkgs/top-level/python-packages-generated.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/python-packages-generated.nix b/pkgs/top-level/python-packages-generated.nix index e76cf4988d0..2cf742156a3 100644 --- a/pkgs/top-level/python-packages-generated.nix +++ b/pkgs/top-level/python-packages-generated.nix @@ -2666,7 +2666,7 @@ in md5 = "09dcec70f623a9ef774f1aef75690995"; }; doCheck = false; - buildInputs = [ ]; + buildInputs = [ pkgs.postgresql ]; propagatedBuildInputs = [ ]; installCommand = ''easy_install --always-unzip --prefix="$out" .''; meta = { -- GitLab From 6fab53b4c203d3e0c426e4eb04e15c88fa5ca84b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Mon, 25 Aug 2014 19:01:34 +0200 Subject: [PATCH 306/843] pythonPackages.robotframework: disable on py3k --- pkgs/top-level/python-packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 55823eea2b6..59df60bb55e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7018,6 +7018,7 @@ rec { robotframework = buildPythonPackage rec { version = "2.8.5"; name = "robotframework-${version}"; + disabled = isPy3k; src = fetchurl { url = "https://pypi.python.org/packages/source/r/robotframework/${name}.tar.gz"; -- GitLab From 81f274901261620336aa9b4d986f436eb820fb56 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 25 Aug 2014 19:08:12 +0200 Subject: [PATCH 307/843] Manual: Chunk into separate pages --- nixos/doc/manual/default.nix | 28 ++++++++++++++-------------- nixos/doc/manual/style.css | 7 +++---- 2 files changed, 17 insertions(+), 18 deletions(-) diff --git a/nixos/doc/manual/default.nix b/nixos/doc/manual/default.nix index df524c3faac..e9f26ea9dd1 100644 --- a/nixos/doc/manual/default.nix +++ b/nixos/doc/manual/default.nix @@ -55,16 +55,6 @@ in rec { buildInputs = [ libxml2 libxslt ]; - xsltFlags = '' - --param section.autolabel 1 - --param section.label.includes.component.label 1 - --param html.stylesheet 'style.css' - --param xref.with.number.and.title 1 - --param toc.section.depth 3 - --param admon.style ''' - --param callout.graphics.extension '.gif' - ''; - buildCommand = '' ${copySources} @@ -76,10 +66,20 @@ in rec { # Generate the HTML manual. dst=$out/share/doc/nixos mkdir -p $dst - xsltproc $xsltFlags --nonet --xinclude \ - --output $dst/manual.html \ - ${docbook5_xsl}/xml/xsl/docbook/xhtml/docbook.xsl \ - ./manual.xml + xsltproc \ + --param section.autolabel 1 \ + --param section.label.includes.component.label 1 \ + --stringparam html.stylesheet style.css \ + --param xref.with.number.and.title 1 \ + --param toc.section.depth 3 \ + --stringparam admon.style "" \ + --stringparam callout.graphics.extension .gif \ + --param chunk.section.depth 1 \ + --param chunk.first.sections 1 \ + --param use.id.as.filename 1 \ + --stringparam generate.toc "book toc chapter toc" \ + --nonet --xinclude --output $dst/ \ + ${docbook5_xsl}/xml/xsl/docbook/xhtml/chunkfast.xsl ./manual.xml mkdir -p $dst/images/callouts cp ${docbook5_xsl}/xml/xsl/docbook/images/callouts/*.gif $dst/images/callouts/ diff --git a/nixos/doc/manual/style.css b/nixos/doc/manual/style.css index e2204c159e2..3118b37ead1 100644 --- a/nixos/doc/manual/style.css +++ b/nixos/doc/manual/style.css @@ -262,7 +262,6 @@ table.simplelist margin-bottom: 1em; } -div.affiliation -{ - font-style: italic; -} \ No newline at end of file +div.navheader table, div.navfooter table { + box-shadow: none; +} -- GitLab From 08f24b85c2526ccc4312db9831213f9c928353d7 Mon Sep 17 00:00:00 2001 From: Moritz Ulrich Date: Mon, 25 Aug 2014 19:45:55 +0200 Subject: [PATCH 308/843] GnuPG: Bump to 2.0.26 --- pkgs/tools/security/gnupg/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/gnupg/default.nix b/pkgs/tools/security/gnupg/default.nix index 9b8d33b6b69..64e2be90d30 100644 --- a/pkgs/tools/security/gnupg/default.nix +++ b/pkgs/tools/security/gnupg/default.nix @@ -13,11 +13,11 @@ assert useUsb -> (libusb != null); assert useCurl -> (curl != null); stdenv.mkDerivation rec { - name = "gnupg-2.0.24"; + name = "gnupg-2.0.26"; src = fetchurl { url = "mirror://gnupg/gnupg/${name}.tar.bz2"; - sha256 = "0ch2hbindk832cy7ca00a7whw84ndm0nhqrl24a5fw4ldkca2x6r"; + sha256 = "1q5qcl5panrvcvpwvz6nl9gayl5a6vwvfhgdcxqpmbl2qc6y6n3p"; }; buildInputs -- GitLab From 307924bbcc5b4f96a891f3eec776331c1b732d77 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= Date: Mon, 25 Aug 2014 22:58:22 +0200 Subject: [PATCH 309/843] synfigstudio: fix chroot build / hydra The error message was: Fontconfig error: Cannot load default config file make[2]: *** [128x128/synfig_icon.png] Segmentation fault (cherry picked from commit 759980c4fe9b07932f671d2e657189068d117405) Conflicts: pkgs/top-level/all-packages.nix --- pkgs/applications/graphics/synfigstudio/default.nix | 8 ++++++-- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/graphics/synfigstudio/default.nix b/pkgs/applications/graphics/synfigstudio/default.nix index 034a147b787..ba7a916e3fe 100644 --- a/pkgs/applications/graphics/synfigstudio/default.nix +++ b/pkgs/applications/graphics/synfigstudio/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, boost, cairo, gettext, glibmm, gtk, gtkmm +{ stdenv, fetchurl, boost, cairo, fontsConf, gettext, glibmm, gtk, gtkmm , libsigcxx, libtool, libxmlxx, pango, pkgconfig, imagemagick , intltool }: @@ -42,10 +42,14 @@ stdenv.mkDerivation rec { }; buildInputs = [ - ETL boost cairo gettext glibmm gtk gtkmm imagemagick intltool + ETL boost cairo fontsConf gettext glibmm gtk gtkmm imagemagick intltool intltool libsigcxx libtool libxmlxx pkgconfig synfig ]; + preBuild = '' + export FONTCONFIG_FILE=${fontsConf} + ''; + meta = with stdenv.lib; { description = "A 2D animation program"; homepage = http://www.synfig.org; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a671f50dc60..aa62043da2b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9388,7 +9388,9 @@ let rake = rake; }; - synfigstudio = callPackage ../applications/graphics/synfigstudio { }; + synfigstudio = callPackage ../applications/graphics/synfigstudio { + fontsConf = makeFontsConf { fontDirectories = [ freefont_ttf ]; }; + }; sxhkd = callPackage ../applications/window-managers/sxhkd { }; -- GitLab From f237f31b93dd21649657b58532d5130b4886b5d8 Mon Sep 17 00:00:00 2001 From: Cray Elliott Date: Mon, 25 Aug 2014 15:51:10 -0700 Subject: [PATCH 310/843] darcs updated to 2.8.5 tested to work with ghc 7.8.3 --- .../version-management/darcs/default.nix | 16 ++++++++-------- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/version-management/darcs/default.nix b/pkgs/applications/version-management/darcs/default.nix index d53b38c28c3..ff5c3456e22 100644 --- a/pkgs/applications/version-management/darcs/default.nix +++ b/pkgs/applications/version-management/darcs/default.nix @@ -1,24 +1,24 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! { cabal, curl, extensibleExceptions, filepath, hashedStorage -, haskeline, html, HTTP, mmap, mtl, network, parsec, random -, regexCompat, tar, terminfo, text, utf8String, vector, zlib +, haskeline, html, HTTP, mmap, mtl, network, networkUri, parsec +, random, regexCompat, tar, terminfo, text, utf8String, vector +, zlib }: cabal.mkDerivation (self: { pname = "darcs"; - version = "2.8.4"; - sha256 = "164zclgib9ql4rqykpdhhk2bad0m5v0k0iwzsj0z7nax5nxlvarz"; + version = "2.8.5"; + sha256 = "16g3ayw0wwhkjpprlkzi971ibs4dp152bmaa487512cwb3ni0hq6"; isLibrary = true; isExecutable = true; + doCheck = false; buildDepends = [ extensibleExceptions filepath hashedStorage haskeline html HTTP - mmap mtl network parsec random regexCompat tar terminfo text - utf8String vector zlib + mmap mtl network networkUri parsec random regexCompat tar terminfo + text utf8String vector zlib ]; extraLibraries = [ curl ]; - jailbreak = true; - doCheck = false; postInstall = '' mkdir -p $out/etc/bash_completion.d mv contrib/darcs_completion $out/etc/bash_completion.d/darcs diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index aa62043da2b..5aa5d612bc9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8398,7 +8398,7 @@ let d4x = callPackage ../applications/misc/d4x { }; - darcs = with haskellPackages_ghc763; callPackage ../applications/version-management/darcs { + darcs = with haskellPackages_ghc783; callPackage ../applications/version-management/darcs { cabal = cabal.override { extension = self : super : { isLibrary = false; -- GitLab From 74625641f84d481e30cdfd11ee9904dbcb41222d Mon Sep 17 00:00:00 2001 From: Jaka Hudoklin Date: Tue, 26 Aug 2014 01:21:27 +0200 Subject: [PATCH 311/843] Add libnfc 1.7.1 --- pkgs/development/libraries/libnfc/default.nix | 21 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 23 insertions(+) create mode 100644 pkgs/development/libraries/libnfc/default.nix diff --git a/pkgs/development/libraries/libnfc/default.nix b/pkgs/development/libraries/libnfc/default.nix new file mode 100644 index 00000000000..a018ce1f0fa --- /dev/null +++ b/pkgs/development/libraries/libnfc/default.nix @@ -0,0 +1,21 @@ +{ stdenv, fetchurl, libusb }: + +stdenv.mkDerivation rec { + name = "libnfc-${version}"; + version = "1.7.1"; + + src = fetchurl { + url = "http://dl.bintray.com/nfc-tools/sources/libnfc-1.7.1.tar.bz2"; + sha256 = "0wj0iwwcpmpalyk61aa7yc6i4p9hgdajkrgnlswgk0vnwbc78pll"; + }; + + buildInputs = [ libusb ]; + + meta = with stdenv.lib; { + description = "Open source library libnfc for Near Field Communication"; + license = licenses.gpl3; + homepage = http://code.google.com/p/libnfc/; + maintainers = with maintainers; [offline]; + platforms = with platforms; unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 312959fdb24..e0430579d72 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5268,6 +5268,8 @@ let libnatspec = callPackage ../development/libraries/libnatspec { }; + libnfc = callPackage ../development/libraries/libnfc { }; + libnfsidmap = callPackage ../development/libraries/libnfsidmap { }; libnice = callPackage ../development/libraries/libnice { }; -- GitLab From 12c3f65173258d4cbe5a42a0585923c6eed32869 Mon Sep 17 00:00:00 2001 From: Jaka Hudoklin Date: Tue, 26 Aug 2014 01:22:08 +0200 Subject: [PATCH 312/843] Add mfcuk, tool for hacking mifare classic cards --- pkgs/tools/security/mfcuk/default.nix | 21 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 23 insertions(+) create mode 100644 pkgs/tools/security/mfcuk/default.nix diff --git a/pkgs/tools/security/mfcuk/default.nix b/pkgs/tools/security/mfcuk/default.nix new file mode 100644 index 00000000000..9d92482f68f --- /dev/null +++ b/pkgs/tools/security/mfcuk/default.nix @@ -0,0 +1,21 @@ +{ stdenv, fetchurl, pkgconfig, libnfc }: + +stdenv.mkDerivation rec { + name = "mfcuk-${version}"; + version = "0.3.8"; + + src = fetchurl { + url = "http://mfcuk.googlecode.com/files/mfcuk-0.3.8.tar.gz"; + sha256 = "0m9sy61rsbw63xk05jrrmnyc3xda0c3m1s8pg3sf8ijbbdv9axcp"; + }; + + buildInputs = [ pkgconfig libnfc ]; + + meta = with stdenv.lib; { + description = "MiFare Classic Universal toolKit"; + license = licenses.gpl2; + homepage = http://code.google.com/p/mfcuk/; + maintainers = with maintainers; [ offline ]; + platforms = with platforms; unix; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e0430579d72..bb109e380d9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1500,6 +1500,8 @@ let megatools = callPackage ../tools/networking/megatools { }; + mfcuk = callPackage ../tools/security/mfcuk { }; + minecraft = callPackage ../games/minecraft { }; minecraft-server = callPackage ../games/minecraft-server { }; -- GitLab From 93697e85cabbf54a6e040521d8dc55f757b2a468 Mon Sep 17 00:00:00 2001 From: Dmitry Belyaev Date: Fri, 15 Aug 2014 11:14:54 +1000 Subject: [PATCH 313/843] Support odbc in erlang R16 and R17 --- pkgs/development/interpreters/erlang/R16.nix | 9 ++++++--- pkgs/development/interpreters/erlang/R17.nix | 9 ++++++--- pkgs/top-level/all-packages.nix | 3 +++ 3 files changed, 15 insertions(+), 6 deletions(-) diff --git a/pkgs/development/interpreters/erlang/R16.nix b/pkgs/development/interpreters/erlang/R16.nix index 5945cdd8299..23243803e8d 100644 --- a/pkgs/development/interpreters/erlang/R16.nix +++ b/pkgs/development/interpreters/erlang/R16.nix @@ -1,13 +1,15 @@ { stdenv, fetchurl, perl, gnum4, ncurses, openssl , gnused, gawk, makeWrapper +, odbcSupport ? false, unixODBC ? null , wxSupport ? false, mesa ? null, wxGTK ? null, xlibs ? null }: assert wxSupport -> mesa != null && wxGTK != null && xlibs != null; +assert odbcSupport -> unixODBC != null; with stdenv.lib; stdenv.mkDerivation rec { - name = "erlang-" + version; + name = "erlang-" + version + "${optionalString odbcSupport "-odbc"}"; version = "16B03-1"; src = fetchurl { @@ -17,7 +19,8 @@ stdenv.mkDerivation rec { buildInputs = [ perl gnum4 ncurses openssl makeWrapper - ] ++ optional wxSupport [ mesa wxGTK xlibs.libX11 ]; + ] ++ optional wxSupport [ mesa wxGTK xlibs.libX11 ] + ++ optional odbcSupport [ unixODBC ]; patchPhase = '' sed -i "s@/bin/rm@rm@" lib/odbc/configure erts/configure ''; @@ -26,7 +29,7 @@ stdenv.mkDerivation rec { sed -e s@/bin/pwd@pwd@g -i otp_build ''; - configureFlags= "--with-ssl=${openssl} ${optionalString stdenv.isDarwin "--enable-darwin-64bit"}"; + configureFlags= "--with-ssl=${openssl} ${optionalString odbcSupport "--with-odbc=${unixODBC}"} ${optionalString stdenv.isDarwin "--enable-darwin-64bit"}"; postInstall = let manpages = fetchurl { diff --git a/pkgs/development/interpreters/erlang/R17.nix b/pkgs/development/interpreters/erlang/R17.nix index 2aba55d3679..83ea79d67f3 100644 --- a/pkgs/development/interpreters/erlang/R17.nix +++ b/pkgs/development/interpreters/erlang/R17.nix @@ -1,13 +1,15 @@ { stdenv, fetchurl, perl, gnum4, ncurses, openssl , gnused, gawk, makeWrapper +, odbcSupport ? false, unixODBC ? null , wxSupport ? false, mesa ? null, wxGTK ? null, xlibs ? null }: assert wxSupport -> mesa != null && wxGTK != null && xlibs != null; +assert odbcSupport -> unixODBC != null; with stdenv.lib; stdenv.mkDerivation rec { - name = "erlang-" + version; + name = "erlang-" + version + "${optionalString odbcSupport "-odbc"}"; version = "17.1"; src = fetchurl { @@ -17,7 +19,8 @@ stdenv.mkDerivation rec { buildInputs = [ perl gnum4 ncurses openssl makeWrapper - ] ++ optional wxSupport [ mesa wxGTK xlibs.libX11 ]; + ] ++ optional wxSupport [ mesa wxGTK xlibs.libX11 ] + ++ optional odbcSupport [ unixODBC ]; patchPhase = '' sed -i "s@/bin/rm@rm@" lib/odbc/configure erts/configure ''; @@ -26,7 +29,7 @@ stdenv.mkDerivation rec { sed -e s@/bin/pwd@pwd@g -i otp_build ''; - configureFlags= "--with-ssl=${openssl} ${optionalString stdenv.isDarwin "--enable-darwin-64bit"}"; + configureFlags= "--with-ssl=${openssl} ${optionalString odbcSupport "--with-odbc=${unixODBC}"} ${optionalString stdenv.isDarwin "--enable-darwin-64bit"}"; postInstall = let manpages = fetchurl { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ebfd4715d4b..201120baecf 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3482,8 +3482,11 @@ let erlangR14 = callPackage ../development/interpreters/erlang/R14.nix { }; erlangR15 = callPackage ../development/interpreters/erlang/R15.nix { }; erlangR16 = callPackage ../development/interpreters/erlang/R16.nix { }; + erlangR16_odbc = callPackage ../development/interpreters/erlang/R16.nix { odbcSupport = true; }; erlangR17 = callPackage ../development/interpreters/erlang/R17.nix { }; + erlangR17_odbc = callPackage ../development/interpreters/erlang/R17.nix { odbcSupport = true; }; erlang = erlangR17; + erlang_odbc = erlangR17_odbc; rebar = callPackage ../development/tools/build-managers/rebar { }; -- GitLab From 8dc11b46a695c338d272325eef4cebe7f60cb710 Mon Sep 17 00:00:00 2001 From: Cray Elliott Date: Mon, 25 Aug 2014 21:15:30 -0700 Subject: [PATCH 314/843] Update hi to 0.8.2, doCheck set to false --- pkgs/development/libraries/haskell/hi/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/haskell/hi/default.nix b/pkgs/development/libraries/haskell/hi/default.nix index ba161493109..3f9db969c22 100644 --- a/pkgs/development/libraries/haskell/hi/default.nix +++ b/pkgs/development/libraries/haskell/hi/default.nix @@ -1,20 +1,22 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, filepath, hspec, HUnit, parsec, split, template +{ cabal, doctest, filepath, hspec, HUnit, parsec, split, template , temporaryRc, text, time }: cabal.mkDerivation (self: { pname = "hi"; - version = "0.0.8.1"; - sha256 = "14g1yfc6cv89whx6w0di5nayifc0xfvll9h07kkqxaajyfw6s32y"; + version = "0.0.8.2"; + sha256 = "0h94wjxdr6g6n3rvkn1xsjqr49p9fgidmraifvz5mzryn6rmd18r"; isLibrary = true; isExecutable = true; + doCheck = false; buildDepends = [ filepath parsec split template temporaryRc text time ]; testDepends = [ - filepath hspec HUnit parsec split template temporaryRc text time + doctest filepath hspec HUnit parsec split template temporaryRc text + time ]; meta = { homepage = "https://github.com/fujimura/hi"; -- GitLab From 72954393f8306206c7ace1c19e6097982d0dd769 Mon Sep 17 00:00:00 2001 From: John Wiegley Date: Tue, 26 Aug 2014 01:21:09 -0500 Subject: [PATCH 315/843] haskell-ivory: 0.1.0.0 new expression --- .../libraries/haskell/ivory/default.nix | 17 +++++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 19 insertions(+) create mode 100644 pkgs/development/libraries/haskell/ivory/default.nix diff --git a/pkgs/development/libraries/haskell/ivory/default.nix b/pkgs/development/libraries/haskell/ivory/default.nix new file mode 100644 index 00000000000..3e3c6c78ae1 --- /dev/null +++ b/pkgs/development/libraries/haskell/ivory/default.nix @@ -0,0 +1,17 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, monadLib, parsec, thLift }: + +cabal.mkDerivation (self: { + pname = "ivory"; + version = "0.1.0.0"; + sha256 = "1rn1akrsci0k5nbk4zipxznkdm0y3rvv9la5mnrr9mkj5zikj5sc"; + buildDepends = [ monadLib parsec thLift ]; + meta = { + homepage = "http://smaccmpilot.org/languages/ivory-introduction.html"; + description = "Safe embedded C programming"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + broken = self.stdenv.lib.versionOlder "7.7" self.ghc.version; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index a2340779a9b..3427d8109fb 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1382,6 +1382,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in ivor = callPackage ../development/libraries/haskell/ivor {}; + ivory = callPackage ../development/libraries/haskell/ivory {}; + ixdopp = callPackage ../development/libraries/haskell/ixdopp { preprocessorTools = self.preprocessorTools_0_1_3; }; -- GitLab From 5a717eef8b4a74a5ab707b5ea8e937743218259d Mon Sep 17 00:00:00 2001 From: Cray Elliott Date: Mon, 25 Aug 2014 23:49:38 -0700 Subject: [PATCH 316/843] wreq updated to 0.2 --- .../libraries/haskell/wreq/default.nix | 21 +++++++------------ 1 file changed, 8 insertions(+), 13 deletions(-) diff --git a/pkgs/development/libraries/haskell/wreq/default.nix b/pkgs/development/libraries/haskell/wreq/default.nix index 5547140189d..5a93d023d1b 100644 --- a/pkgs/development/libraries/haskell/wreq/default.nix +++ b/pkgs/development/libraries/haskell/wreq/default.nix @@ -1,26 +1,25 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! { cabal, aeson, attoparsec, doctest, exceptions, filepath -, httpClient, httpClientTls, httpTypes, HUnit, lens, mimeTypes -, temporary, testFramework, testFrameworkHunit, text, time -, fetchpatch +, httpClient, httpClientTls, httpTypes, HUnit, lens, lensAeson +, mimeTypes, temporary, testFramework, testFrameworkHunit, text +, time }: cabal.mkDerivation (self: { pname = "wreq"; - version = "0.1.0.1"; - sha256 = "05w3b555arsab8a5w73nm9pk3p9r6jipi6cd3ngxv48gdn9wzhvz"; + version = "0.2.0.0"; + sha256 = "0ajrwn4yn6h65v97jfhbb4x3j307gdf34dyjnnhsrmsf7911l44d"; isLibrary = true; isExecutable = true; buildDepends = [ aeson attoparsec exceptions httpClient httpClientTls httpTypes lens - mimeTypes text time + lensAeson mimeTypes text time ]; testDepends = [ - aeson doctest filepath httpClient httpTypes HUnit lens temporary - testFramework testFrameworkHunit text + aeson doctest filepath httpClient httpTypes HUnit lens lensAeson + temporary testFramework testFrameworkHunit text ]; - doCheck = false; meta = { homepage = "http://www.serpentine.com/wreq"; description = "An easy-to-use HTTP client library"; @@ -28,8 +27,4 @@ cabal.mkDerivation (self: { platforms = self.ghc.meta.platforms; maintainers = with self.stdenv.lib.maintainers; [ ocharles ]; }; - patches = [ - (fetchpatch { url = https://github.com/bos/wreq/commit/e8e29b62006e39ab36ffbb1d18c3e9d5923158ac.patch; sha256 = "19kqy512sa4dbzqp7kmjpsnsmc63wqh5pkh6hcvkzsji15dmlqrg"; }) - (fetchpatch { url = https://github.com/bos/wreq/pull/20.patch; sha256 = "1qfjwz5wlmmfcg8jy0yg7ixacq5fai3yscm552fba1ph66acyvg4"; }) - ]; }) -- GitLab From abe7730f23eb2b0b55308639dba1fbdff2f0c652 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Mon, 25 Aug 2014 19:12:40 +0200 Subject: [PATCH 317/843] remove pdf2htmlex: too much hassle to fix it --- .../libraries/pdf2htmlex/default.nix | 27 ------------------- pkgs/top-level/all-packages.nix | 2 -- 2 files changed, 29 deletions(-) delete mode 100644 pkgs/development/libraries/pdf2htmlex/default.nix diff --git a/pkgs/development/libraries/pdf2htmlex/default.nix b/pkgs/development/libraries/pdf2htmlex/default.nix deleted file mode 100644 index 597385aa9fa..00000000000 --- a/pkgs/development/libraries/pdf2htmlex/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{stdenv, fetchurl, cmake, poppler, fontforge, unzip, pkgconfig, python}: - -stdenv.mkDerivation rec { - version = "0.8.1"; - name = "pdf2htmlex-${version}"; - - src = fetchurl { - url = "https://github.com/coolwanglu/pdf2htmlEX/archive/v${version}.zip"; - sha256 = "0v8x03vq46ng9s27ryn76lcsjgpxgak6062jnx59lnyz856wvp8a"; - }; - - buildInputs = [ - cmake - unzip - poppler - fontforge - pkgconfig - python - ]; - - meta = with stdenv.lib; { - description = "Convert PDF to HTML without losing text or format. "; - license = licenses.gpl3; - maintainers = [ maintainers.iElectric ]; - platforms = platforms.linux; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fa205e71133..a5fa04d8936 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5950,8 +5950,6 @@ let pdf2xml = callPackage ../development/libraries/pdf2xml {} ; - pdf2htmlex = callPackage ../development/libraries/pdf2htmlex {} ; - phonon = callPackage ../development/libraries/phonon { }; phonon_backend_gstreamer = callPackage ../development/libraries/phonon-backend-gstreamer { }; -- GitLab From 276220262ec25a194247d736c54123dc6e1b0096 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Tue, 26 Aug 2014 09:57:29 +0200 Subject: [PATCH 318/843] pypy: hint about tcl/tk headers/libs paths --- pkgs/development/interpreters/pypy/2.3/default.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/development/interpreters/pypy/2.3/default.nix b/pkgs/development/interpreters/pypy/2.3/default.nix index 74f01c0fc0f..8fef46b5877 100644 --- a/pkgs/development/interpreters/pypy/2.3/default.nix +++ b/pkgs/development/interpreters/pypy/2.3/default.nix @@ -40,12 +40,18 @@ let substituteInPlace pypy/goal/targetpypystandalone.py \ --replace "/usr/bin/env pypy" "${pythonFull}/bin/python" - # convince pypy to find nix ncurses + # hint pypy to find nix ncurses substituteInPlace pypy/module/_minimal_curses/fficurses.py \ --replace "/usr/include/ncurses/curses.h" "${ncurses}/include/curses.h" \ --replace "ncurses/curses.h" "${ncurses}/include/curses.h" \ --replace "ncurses/term.h" "${ncurses}/include/term.h" \ --replace "libraries=['curses']" "libraries=['ncurses']" + + # tkinter hints + substituteInPlace lib_pypy/_tkinter/tklib.py \ + --replace "'/usr/include/tcl'" "'${tk}/include', '${tcl}/include'" \ + --replace "linklibs=['tcl', 'tk']" "linklibs=['tcl8.5', 'tk8.5']" \ + --replace "libdirs = []" "libdirs = ['${tk}/lib', '${tcl}/lib']" ''; setupHook = ./setup-hook.sh; -- GitLab From 5f8a9f81d199bc07714807db4a90c9997e1669db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Tue, 26 Aug 2014 10:04:14 +0200 Subject: [PATCH 319/843] pycurl: fix runtime dependency on openssl --- pkgs/top-level/python-packages.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 59df60bb55e..47bea95ef01 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6012,13 +6012,14 @@ rec { sha256 = "0hqsap82zklhi5fxhc69kxrwzb0g9566f7sdpz7f9gyxkmyam839"; }; - buildInputs = [ pkgs.curl ]; + propagatedBuildInputs = [ pkgs.curl pkgs.openssl ]; # error: invalid command 'test' doCheck = false; preConfigure = '' substituteInPlace setup.py --replace '--static-libs' '--libs' + export PYCURL_SSL_LIBRARY=openssl ''; meta = { @@ -7521,8 +7522,6 @@ rec { doCheck = false; - meta = with stdenv.lib; { - }; }; sympy = buildPythonPackage rec { -- GitLab From 6417cf14b19ba9692e283a2ed8cb6b00043d7f5b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Tue, 26 Aug 2014 10:47:22 +0200 Subject: [PATCH 320/843] python3Packages.BTrees: fix build on i686-linux --- .../btrees_interger_overflow.patch | 146 ++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 148 insertions(+) create mode 100644 pkgs/development/python-modules/btrees_interger_overflow.patch diff --git a/pkgs/development/python-modules/btrees_interger_overflow.patch b/pkgs/development/python-modules/btrees_interger_overflow.patch new file mode 100644 index 00000000000..a05c7bd6b3c --- /dev/null +++ b/pkgs/development/python-modules/btrees_interger_overflow.patch @@ -0,0 +1,146 @@ +From be19c1f32e4d430092c029f17984f0087a2b2087 Mon Sep 17 00:00:00 2001 +From: Jim Fulton +Date: Mon, 19 May 2014 19:52:43 -0400 +Subject: [PATCH 1/2] Fixed: integer overflow on 32-bit machines wasn't + detected correctly under Python 3. + +--- + BTrees/intkeymacros.h | 7 ++++--- + BTrees/intvaluemacros.h | 3 ++- + BTrees/tests/testBTrees.py | 11 +++++++++-- + BTrees/tests/test_IIBTree.py | 2 ++ + CHANGES.rst | 2 ++ + 5 files changed, 19 insertions(+), 6 deletions(-) + +diff --git a/BTrees/intkeymacros.h b/BTrees/intkeymacros.h +index d439aa0..f9244b5 100644 +--- a/BTrees/intkeymacros.h ++++ b/BTrees/intkeymacros.h +@@ -19,9 +19,10 @@ + #define KEY_CHECK INT_CHECK + #define COPY_KEY_TO_OBJECT(O, K) O=INT_FROM_LONG(K) + #define COPY_KEY_FROM_ARG(TARGET, ARG, STATUS) \ +- if (INT_CHECK(ARG)) { \ +- long vcopy = INT_AS_LONG(ARG); \ +- if ((int)vcopy != vcopy) { \ ++ if (INT_CHECK(ARG)) { \ ++ long vcopy = INT_AS_LONG(ARG); \ ++ if (PyErr_Occurred()) { (STATUS)=0; (TARGET)=0; } \ ++ else if ((int)vcopy != vcopy) { \ + PyErr_SetString(PyExc_TypeError, "integer out of range"); \ + (STATUS)=0; (TARGET)=0; \ + } \ +diff --git a/BTrees/intvaluemacros.h b/BTrees/intvaluemacros.h +index b77a5c9..3072eea 100644 +--- a/BTrees/intvaluemacros.h ++++ b/BTrees/intvaluemacros.h +@@ -23,7 +23,8 @@ + #define COPY_VALUE_FROM_ARG(TARGET, ARG, STATUS) \ + if (INT_CHECK(ARG)) { \ + long vcopy = INT_AS_LONG(ARG); \ +- if ((int)vcopy != vcopy) { \ ++ if (PyErr_Occurred()) { (STATUS)=0; (TARGET)=0; } \ ++ else if ((int)vcopy != vcopy) { \ + PyErr_SetString(PyExc_TypeError, "integer out of range"); \ + (STATUS)=0; (TARGET)=0; \ + } \ +diff --git a/BTrees/tests/testBTrees.py b/BTrees/tests/testBTrees.py +index 50f5b43..31d641d 100644 +--- a/BTrees/tests/testBTrees.py ++++ b/BTrees/tests/testBTrees.py +@@ -11,8 +11,11 @@ + # FOR A PARTICULAR PURPOSE + # + ############################################################################## ++import sys + import unittest + ++python3 = sys.version_info >= (3, ) ++ + from BTrees.tests.common import permutations + + +@@ -451,8 +454,12 @@ def test32(self): + # the characteristics change to match the 64 bit version, please + # feel free to change. + big = BTrees.family32.maxint + 1 +- self.assertRaises(TypeError, s.insert, big) +- self.assertRaises(TypeError, s.insert, BTrees.family32.minint - 1) ++ if python3: ++ expected_exception = OverflowError ++ else: ++ expected_exception = TypeError ++ self.assertRaises(expected_exception, s.insert, ++ BTrees.family32.minint - 1) + self.check_pickling(BTrees.family32) + + def test64(self): +diff --git a/BTrees/tests/test_IIBTree.py b/BTrees/tests/test_IIBTree.py +index 72e95b2..fe776b8 100644 +--- a/BTrees/tests/test_IIBTree.py ++++ b/BTrees/tests/test_IIBTree.py +@@ -113,6 +113,8 @@ def trial(i): + i = int(i) + try: + b[i] = 0 ++ except OverflowError: ++ self.assertRaises(OverflowError, b.__setitem__, 0, i) + except TypeError: + self.assertRaises(TypeError, b.__setitem__, 0, i) + else: +diff --git a/CHANGES.rst b/CHANGES.rst +index 4696be3..e3869ff 100644 +--- a/CHANGES.rst ++++ b/CHANGES.rst +@@ -1,6 +1,8 @@ + ``BTrees`` Changelog + ==================== + ++- Fixed: integer overflow on 32-bit machines wasn't detected correctly ++ under Python 3. + + 4.0.9 (unreleased) + ------------------ +-- +2.0.4 + + +From 11a51d2a12bb9904e96349ff86e78e24a0ebe51a Mon Sep 17 00:00:00 2001 +From: Jim Fulton +Date: Wed, 21 May 2014 07:33:06 -0400 +Subject: [PATCH 2/2] added back test mistakedly removed. + +We have to check both TypeError and OverflowError. On Python3 32-bit, +we'll get an OverflowError, otherwise, we get type error. +--- + BTrees/tests/testBTrees.py | 14 +++++++------- + 1 file changed, 7 insertions(+), 7 deletions(-) + +diff --git a/BTrees/tests/testBTrees.py b/BTrees/tests/testBTrees.py +index 31d641d..d9be43a 100644 +--- a/BTrees/tests/testBTrees.py ++++ b/BTrees/tests/testBTrees.py +@@ -453,13 +453,13 @@ def test32(self): + # this next bit illustrates an, um, "interesting feature". If + # the characteristics change to match the 64 bit version, please + # feel free to change. +- big = BTrees.family32.maxint + 1 +- if python3: +- expected_exception = OverflowError +- else: +- expected_exception = TypeError +- self.assertRaises(expected_exception, s.insert, +- BTrees.family32.minint - 1) ++ try: s.insert(BTrees.family32.maxint + 1) ++ except (TypeError, OverflowError): pass ++ else: self.assert_(False) ++ ++ try: s.insert(BTrees.family32.minint - 1) ++ except (TypeError, OverflowError): pass ++ else: self.assert_(False) + self.check_pickling(BTrees.family32) + + def test64(self): +-- +2.0.4 + diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 47bea95ef01..e41a9cf210f 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9039,6 +9039,8 @@ rec { BTrees = pythonPackages.buildPythonPackage rec { name = "BTrees-4.0.8"; + + patches = [ ./../development/python-modules/btrees_interger_overflow.patch ]; propagatedBuildInputs = [ persistent zope_interface transaction ]; -- GitLab From 8fc3bedb5a9b1d17afce4d43e00695bfcaae54d0 Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Tue, 26 Aug 2014 11:22:05 +0200 Subject: [PATCH 321/843] Fix ntopng build --- pkgs/tools/networking/ntopng/default.nix | 47 +++++++++++++++++------- 1 file changed, 33 insertions(+), 14 deletions(-) diff --git a/pkgs/tools/networking/ntopng/default.nix b/pkgs/tools/networking/ntopng/default.nix index 3c33da1b661..52554209d59 100644 --- a/pkgs/tools/networking/ntopng/default.nix +++ b/pkgs/tools/networking/ntopng/default.nix @@ -1,16 +1,36 @@ { stdenv, fetchurl, libpcap, gnutls, libgcrypt, libxml2, glib, geoip, sqlite -, which +, which, autoreconfHook, subversion, pkgconfig, groff }: # ntopng includes LuaJIT, mongoose, rrdtool and zeromq in its third-party/ # directory. stdenv.mkDerivation rec { - name = "ntopng-1.1_6932"; + name = "ntopng-1.2.0_r8116"; + + geoLiteCity = fetchurl { + url = "http://geolite.maxmind.com/download/geoip/database/GeoLiteCity.dat.gz"; + sha256 = "1rv5yx5xgz04ymicx9pilidm19wh01ql2klwjcdakv558ndxdzd5"; + }; + + geoLiteCityV6 = fetchurl { + url = "http://geolite.maxmind.com/download/geoip/database/GeoLiteCityv6-beta/GeoLiteCityv6.dat.gz"; + sha256 = "0j974qpi92wwnibq46h16vxpcz7yy8bbqc4k8kmby1yx994k33v4"; + }; + + geoIPASNum = fetchurl { + url = "http://geolite.maxmind.com/download/geoip/database/asnum/GeoIPASNum.dat.gz"; + sha256 = "1msnbls66npq001nmf1wmkrh6vyacgi8g5phfm1c34cz7vqnh683"; + }; + + geoIPASNumV6 = fetchurl { + url = "http://geolite.maxmind.com/download/geoip/database/asnum/GeoIPASNumv6.dat.gz"; + sha256 = "126syia75mkxs6xfinfp70xcfq6a3rgfmh673pzzkwxya393lbdn"; + }; src = fetchurl { url = "mirror://sourceforge/project/ntop/ntopng/${name}.tgz"; - sha256 = "0cdbmrsjp3bb7xzci0vfnnkmbyxwxbf47l4kbnk4ydd7xwhwdnzr"; + sha256 = "0y7xc0l77k2qi2qalwfqiw2z361hdypirfv4k5gi652pb20jc9j6"; }; patches = [ @@ -18,19 +38,13 @@ stdenv.mkDerivation rec { ./0002-Remove-requirement-to-have-writeable-callback-dir.patch ]; - buildInputs = [ libpcap gnutls libgcrypt libxml2 glib geoip sqlite which ]; - - preBuild = '' - sed -e "s|^SHELL=.*|SHELL=${stdenv.shell}|" \ - -e "s|/usr/local|$out|g" \ - -e "s|/bin/rm|rm|g" \ - -i Makefile + buildInputs = [ libpcap gnutls libgcrypt libxml2 glib geoip sqlite which autoreconfHook subversion pkgconfig groff ]; - sed -e "s|^SHELL=.*|SHELL=${stdenv.shell}|" \ - -e "s|/usr/local|$out|g" \ - -e "s|/opt/local|/non-existing-dir|g" \ - -i configure + preConfigure = '' + find . -name Makefile.in | xargs sed -i "s|/bin/rm|rm|" + ''; + preBuild = '' sed -e "s|/usr/local|$out|g" \ -i Ntop.cpp @@ -40,6 +54,11 @@ stdenv.mkDerivation rec { -e "s|\(#define CONST_DEFAULT_CALLBACKS_DIR\).*|\1 \"$out/share/ntopng/scripts/callbacks\"|g" \ -e "s|\(#define CONST_DEFAULT_INSTALL_DIR\).*|\1 \"$out/share/ntopng\"|g" \ -i ntop_defines.h + + gunzip -c $geoLiteCity > httpdocs/geoip/GeoLiteCity.dat + gunzip -c $geoLiteCityV6 > httpdocs/geoip/GeoLiteCityv6.dat + gunzip -c $geoIPASNum > httpdocs/geoip/GeoIPASNum.dat + gunzip -c $geoIPASNumV6 > httpdocs/geoip/GeoIPASNumv6.dat ''; meta = with stdenv.lib; { -- GitLab From 92ec3562c3b0e779be556f106cd8f21e4f6265bc Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Tue, 26 Aug 2014 11:33:58 +0200 Subject: [PATCH 322/843] Mark nix-plugins as broken. --- pkgs/development/libraries/nix-plugins/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/nix-plugins/default.nix b/pkgs/development/libraries/nix-plugins/default.nix index 3b4f7da94f3..2c208ce86bb 100644 --- a/pkgs/development/libraries/nix-plugins/default.nix +++ b/pkgs/development/libraries/nix-plugins/default.nix @@ -21,5 +21,6 @@ stdenv.mkDerivation { license = stdenv.lib.licenses.mit; maintaners = [ stdenv.lib.maintainers.shlevy ]; platforms = stdenv.lib.platforms.all; + broken = true; }; } -- GitLab From 6c6dbc41fbdf0c189ec6c73d5e208ce7203ace6f Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Tue, 26 Aug 2014 11:48:02 +0200 Subject: [PATCH 323/843] openspades: fix build by using fetchurl to download DevPaks27.zip. --- pkgs/games/openspades/default.nix | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/pkgs/games/openspades/default.nix b/pkgs/games/openspades/default.nix index c2218d033d7..df987b3f856 100644 --- a/pkgs/games/openspades/default.nix +++ b/pkgs/games/openspades/default.nix @@ -19,6 +19,18 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DCMAKE_BUILD_TYPE=Release" "-DOPENSPADES_INSTALL_BINARY=bin" ]; + enableParallelBuilding = true; + + devPack = fetchurl { + url = "http://yvt.jp/files/programs/osppaks/DevPaks27.zip"; + sha256 = "05y7wldg70v5ys41fm0c8kipyspn524z4pglwr3p8h0gfz9n52v6"; + }; + + preBuild = '' + cp $devPack Resources/DevPaks27.zip + unzip -u -o Resources/DevPaks27.zip -d Resources/DevPak + ''; + # OpenAL is loaded dynamicly postInstall = if withOpenal then '' -- GitLab From f84c121e5e8c049dc06ff4327305cbfddcf6810d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Tue, 26 Aug 2014 12:06:10 +0200 Subject: [PATCH 324/843] Updating opencascade oce to 0.16 fix the build. At some point the build stopped because of X/mesa updates. --- pkgs/development/libraries/opencascade/oce.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/opencascade/oce.nix b/pkgs/development/libraries/opencascade/oce.nix index 0da8d2a7404..480664a0d4d 100644 --- a/pkgs/development/libraries/opencascade/oce.nix +++ b/pkgs/development/libraries/opencascade/oce.nix @@ -2,10 +2,10 @@ ftgl, freetype}: stdenv.mkDerivation rec { - name = "opencascade-oce-0.14.1"; + name = "opencascade-oce-0.16"; src = fetchurl { - url = https://github.com/tpaviot/oce/archive/OCE-0.14.1.tar.gz; - sha256 = "0pfc94nmzipm6zmxywxbly1cpfr6wadxasqqkkbdvzg937mrwl5d"; + url = https://github.com/tpaviot/oce/archive/OCE-0.16.tar.gz; + sha256 = "05bmg1cjz827bpq8s0hp96byirm4c3zc9vx26qz76kjsg8ry87w4"; }; buildInputs = [ mesa tcl tk file libXmu libtool qt4 ftgl freetype cmake ]; -- GitLab From 7573763e8972040ea68370bc6e992b1f3f184c2e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Tue, 26 Aug 2014 12:11:22 +0200 Subject: [PATCH 325/843] netboot: simplify, build only on 64bit --- pkgs/tools/networking/netboot/default.nix | 53 +++++------------------ 1 file changed, 12 insertions(+), 41 deletions(-) diff --git a/pkgs/tools/networking/netboot/default.nix b/pkgs/tools/networking/netboot/default.nix index ec49770d269..dbf393094c8 100644 --- a/pkgs/tools/networking/netboot/default.nix +++ b/pkgs/tools/networking/netboot/default.nix @@ -1,47 +1,18 @@ -x@{builderDefsPackage - , fetchurl, yacc, bison, ...}: -builderDefsPackage -(a : -let - helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ - []; +{ stdenv, fetchurl, yacc, lzo, db4 }: - buildInputs = map (n: builtins.getAttr n x) - (builtins.attrNames (builtins.removeAttrs x helperArgNames)); - sourceInfo = rec { - version="0.10.2"; - baseName="netboot"; - name="${baseName}-${version}"; - url="mirror://sourceforge/netboot/${name}.tar.gz"; - hash="09w09bvwgb0xzn8hjz5rhi3aibysdadbg693ahn8rylnqfq4hwg0"; +stdenv.mkDerivation rec { + name = "netboot-0.10.2"; + src = fetchurl { + url = "mirror://sourceforge/netboot/${name}.tar.gz"; + sha256 = "09w09bvwgb0xzn8hjz5rhi3aibysdadbg693ahn8rylnqfq4hwg0"; }; -in -rec { - src = a.fetchurl { - url = sourceInfo.url; - sha256 = sourceInfo.hash; - }; - - inherit (sourceInfo) name version; - inherit buildInputs; - - /* doConfigure should be removed if not needed */ - phaseNames = ["doUnpack" "doConfigure" "doMakeInstall"]; + + buildInputs = [ yacc lzo db4 ]; - meta = { + meta = with stdenv.lib; { description = "Mini PXE server"; - maintainers = with a.lib.maintainers; - [ - raskin - ]; - platforms = with a.lib.platforms; - linux; + maintainers = [ maintainers.raskin ]; + platforms = ["x86_64-linux"]; license = "free-noncopyleft"; }; - passthru = { - updateInfo = { - downloadPage = "https://github.com/ITikhonov/netboot"; - }; - }; -}) x - +} \ No newline at end of file -- GitLab From 2bc3a54bfc004a83516f14c59898b7aae16f756a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 26 Aug 2014 12:16:08 +0200 Subject: [PATCH 326/843] Revert "New package ghcParser" --- .../libraries/haskell/ghc-parser/default.nix | 16 ---------------- pkgs/top-level/haskell-packages.nix | 2 -- 2 files changed, 18 deletions(-) delete mode 100644 pkgs/development/libraries/haskell/ghc-parser/default.nix diff --git a/pkgs/development/libraries/haskell/ghc-parser/default.nix b/pkgs/development/libraries/haskell/ghc-parser/default.nix deleted file mode 100644 index a6fd1032dd5..00000000000 --- a/pkgs/development/libraries/haskell/ghc-parser/default.nix +++ /dev/null @@ -1,16 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, happy, cpphs }: - -cabal.mkDerivation (self: { - pname = "ghc-parser"; - version = "0.1.3.0"; - sha256 = "13p09mj92jh4y0v2r672d49fmlz3l5r2r1lqg0jjy6kj045wcfdn"; - buildTools = [ happy cpphs ]; - meta = { - homepage = "https://github.com/gibiansky/IHaskell"; - description = "Haskell source parser from GHC"; - license = self.stdenv.lib.licenses.mit; - platforms = self.ghc.meta.platforms; - }; -}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 15e44c23892..3427d8109fb 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -907,8 +907,6 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in ghcPaths = callPackage ../development/libraries/haskell/ghc-paths {}; - ghcParser = callPackage ../development/libraries/haskell/ghc-parser {}; - ghcSyb = callPackage ../development/libraries/haskell/ghc-syb {}; ghcSybUtils = callPackage ../development/libraries/haskell/ghc-syb-utils {}; -- GitLab From 0ba31c1e6d27cdf5ca1e11f07fb02ffd24ff7736 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Tue, 26 Aug 2014 12:25:51 +0200 Subject: [PATCH 327/843] pypy: give hints about sqlite3 --- pkgs/development/interpreters/pypy/2.3/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/interpreters/pypy/2.3/default.nix b/pkgs/development/interpreters/pypy/2.3/default.nix index 8fef46b5877..ba0fb6f111a 100644 --- a/pkgs/development/interpreters/pypy/2.3/default.nix +++ b/pkgs/development/interpreters/pypy/2.3/default.nix @@ -52,6 +52,9 @@ let --replace "'/usr/include/tcl'" "'${tk}/include', '${tcl}/include'" \ --replace "linklibs=['tcl', 'tk']" "linklibs=['tcl8.5', 'tk8.5']" \ --replace "libdirs = []" "libdirs = ['${tk}/lib', '${tcl}/lib']" + + substituteInPlace lib_pypy/_sqlite3.py \ + --replace "libraries=['sqlite3']" "libraries=['sqlite3'], include_dirs=['${sqlite}/include'], library_dirs=['${sqlite}/lib']" ''; setupHook = ./setup-hook.sh; -- GitLab From c1607dcd5a765d131135413f990f920d763d7306 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 26 Aug 2014 12:24:52 +0200 Subject: [PATCH 328/843] haskell-wreq: disable the test suite to fix the build https://github.com/NixOS/nixpkgs/pull/3795 --- pkgs/development/libraries/haskell/wreq/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/haskell/wreq/default.nix b/pkgs/development/libraries/haskell/wreq/default.nix index 5a93d023d1b..d0a3e94fcd2 100644 --- a/pkgs/development/libraries/haskell/wreq/default.nix +++ b/pkgs/development/libraries/haskell/wreq/default.nix @@ -20,6 +20,7 @@ cabal.mkDerivation (self: { aeson doctest filepath httpClient httpTypes HUnit lens lensAeson temporary testFramework testFrameworkHunit text ]; + doCheck = false; meta = { homepage = "http://www.serpentine.com/wreq"; description = "An easy-to-use HTTP client library"; -- GitLab From 2aac8ffcd8d1253a0e562a3d92226f95bf0756fb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Tue, 26 Aug 2014 12:49:33 +0200 Subject: [PATCH 329/843] python3Packages: fix some builds --- pkgs/top-level/python-packages.nix | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e41a9cf210f..90bd842ae04 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -278,15 +278,15 @@ rec { alembic = buildPythonPackage rec { - name = "alembic-0.6.0"; + name = "alembic-0.6.6"; src = fetchurl { url = "https://pypi.python.org/packages/source/a/alembic/${name}.tar.gz"; - md5 = "084fe81b48ebae43b0f6031af68a03d6"; + md5 = "71e4a8f6849e1527abfc4ea33d51f37c"; }; - buildInputs = [ nose ]; - propagatedBuildInputs = [ Mako sqlalchemy ]; + buildInputs = [ nose mock ]; + propagatedBuildInputs = [ Mako sqlalchemy9 ]; meta = { homepage = http://bitbucket.org/zzzeek/alembic; @@ -3481,11 +3481,11 @@ rec { }); fs = buildPythonPackage rec { - name = "fs-0.4.0"; + name = "fs-0.5.0"; src = fetchurl { - url = "https://pyfilesystem.googlecode.com/files/fs-0.4.0.tar.gz"; - sha256 = "1fk7ilwd01qgj4anw9k1vjp0amxswzzxbp6bk4nncp7210cxp3vz"; + url = "https://pypi.python.org/packages/source/f/fs/${name}.tar.gz"; + sha256 = "144f4yn2nvnxh2vrnmiabpwx3s637np0d1j1w95zym790d66shir"; }; meta = with stdenv.lib; { @@ -4702,11 +4702,11 @@ rec { munkres = buildPythonPackage rec { - name = "munkres-1.0.5.4"; + name = "munkres-1.0.6"; src = fetchurl { url = "http://pypi.python.org/packages/source/m/munkres/${name}.tar.gz"; - md5 = "cb9d114fb523428bab4742e88bc83696"; + md5 = "d7ba3b8c5001578ae229a2d5a655872f"; }; # error: invalid command 'test' @@ -4728,6 +4728,11 @@ rec { url = "http://pypi.python.org/packages/source/m/musicbrainzngs/${name}.tar.gz"; md5 = "9e17a181af72d04a291c9a960bc73d44"; }; + + preCheck = '' + export LOCALE_ARCHIVE=${pkgs.glibcLocales}/lib/locale/locale-archive + export LC_ALL="en_US.UTF-8" + ''; meta = { homepage = http://alastair/python-musicbrainz-ngs; -- GitLab From 9c1ed91d60ccf17005a397b1b14a1326b106457a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 26 Aug 2014 12:35:51 +0200 Subject: [PATCH 330/843] haskell-hi: re-generate with cabal2nix --- pkgs/development/libraries/haskell/hi/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/haskell/hi/default.nix b/pkgs/development/libraries/haskell/hi/default.nix index 3f9db969c22..0384325c2d7 100644 --- a/pkgs/development/libraries/haskell/hi/default.nix +++ b/pkgs/development/libraries/haskell/hi/default.nix @@ -10,7 +10,6 @@ cabal.mkDerivation (self: { sha256 = "0h94wjxdr6g6n3rvkn1xsjqr49p9fgidmraifvz5mzryn6rmd18r"; isLibrary = true; isExecutable = true; - doCheck = false; buildDepends = [ filepath parsec split template temporaryRc text time ]; @@ -18,6 +17,7 @@ cabal.mkDerivation (self: { doctest filepath hspec HUnit parsec split template temporaryRc text time ]; + doCheck = false; meta = { homepage = "https://github.com/fujimura/hi"; description = "Generate scaffold for cabal project"; -- GitLab From 6c3990bfae311238f925002e665e4098b8945c23 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 26 Aug 2014 12:36:54 +0200 Subject: [PATCH 331/843] haskell-vty: update to version 5.2.1 --- .../libraries/haskell/vty/{5.2.0.nix => 5.2.1.nix} | 4 ++-- pkgs/top-level/haskell-packages.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) rename pkgs/development/libraries/haskell/vty/{5.2.0.nix => 5.2.1.nix} (92%) diff --git a/pkgs/development/libraries/haskell/vty/5.2.0.nix b/pkgs/development/libraries/haskell/vty/5.2.1.nix similarity index 92% rename from pkgs/development/libraries/haskell/vty/5.2.0.nix rename to pkgs/development/libraries/haskell/vty/5.2.1.nix index 80ccaf6db8e..6034807929e 100644 --- a/pkgs/development/libraries/haskell/vty/5.2.0.nix +++ b/pkgs/development/libraries/haskell/vty/5.2.1.nix @@ -9,8 +9,8 @@ cabal.mkDerivation (self: { pname = "vty"; - version = "5.2.0"; - sha256 = "0mlh90i44fb6hlifb2gwb9ny68zgg7m6xq3v6bz3dmqfz6dnlf8v"; + version = "5.2.1"; + sha256 = "15xg7yznizscvyjlnivakrzk60l0a0pigax7sgnn2ab79rfzcxww"; isLibrary = true; isExecutable = true; buildDepends = [ diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 3427d8109fb..3ddf87db53d 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -2663,8 +2663,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in void = callPackage ../development/libraries/haskell/void {}; vty_4_7_5 = callPackage ../development/libraries/haskell/vty/4.7.5.nix {}; - vty_5_2_0 = callPackage ../development/libraries/haskell/vty/5.2.0.nix {}; - vty = self.vty_5_2_0; + vty_5_2_1 = callPackage ../development/libraries/haskell/vty/5.2.1.nix {}; + vty = self.vty_5_2_1; vtyUi = callPackage ../development/libraries/haskell/vty-ui { vty = self.vty_4_7_5; -- GitLab From 0ac307bd8ac5840b6090f8752e011e5a317b1bf4 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 26 Aug 2014 12:38:02 +0200 Subject: [PATCH 332/843] haskell-http-conduit: update to version 2.1.4.1 --- pkgs/development/libraries/haskell/http-conduit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/http-conduit/default.nix b/pkgs/development/libraries/haskell/http-conduit/default.nix index 132b9722f74..fd7eb7dd64a 100644 --- a/pkgs/development/libraries/haskell/http-conduit/default.nix +++ b/pkgs/development/libraries/haskell/http-conduit/default.nix @@ -9,8 +9,8 @@ cabal.mkDerivation (self: { pname = "http-conduit"; - version = "2.1.4"; - sha256 = "14xfd25y7r2lhg7dx9hfniihgyzhkz4c6642k5pr27fqjjlr6ijb"; + version = "2.1.4.1"; + sha256 = "1v65v2dky7vgyh5hfvih208zhbd2czxdrshw9zw0af1naq2m5hk2"; buildDepends = [ conduit httpClient httpClientTls httpTypes liftedBase monadControl mtl resourcet transformers -- GitLab From a9c6e7da40d7fa6467d94ac79263b63d436da41e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 26 Aug 2014 12:38:05 +0200 Subject: [PATCH 333/843] haskell-json-assertions: update to version 1.0.5 --- .../libraries/haskell/json-assertions/default.nix | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/haskell/json-assertions/default.nix b/pkgs/development/libraries/haskell/json-assertions/default.nix index 4ee1f4b5779..9adcaf17572 100644 --- a/pkgs/development/libraries/haskell/json-assertions/default.nix +++ b/pkgs/development/libraries/haskell/json-assertions/default.nix @@ -1,17 +1,15 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, aeson, indexed, indexedFree, lens, text }: +{ cabal, aeson, indexed, indexedFree, lens, lensAeson, text }: cabal.mkDerivation (self: { pname = "json-assertions"; - version = "1.0.4"; - sha256 = "07qjbbwmph75s8ds1yfy17ww7x2wcc9bpjpv2bq9ggmzllf6g8l5"; - buildDepends = [ aeson indexed indexedFree lens text ]; + version = "1.0.5"; + sha256 = "1vf6y8xbl48giq1p6d62294rfvfdw62l1q4dspy990ii0v5gkyck"; + buildDepends = [ aeson indexed indexedFree lens lensAeson text ]; meta = { homepage = "http://github.com/ocharles/json-assertions.git"; description = "Test that your (Aeson) JSON encoding matches your expectations"; - broken = true; - hydraPlatforms = self.stdenv.lib.platforms.none; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; maintainers = with self.stdenv.lib.maintainers; [ ocharles ]; -- GitLab From f38fabb65d5e30bfb99bba170f99ee4e8a3c40b8 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 26 Aug 2014 12:38:07 +0200 Subject: [PATCH 334/843] haskell-postgresql-simple: update to version 0.4.4.0 --- .../libraries/haskell/postgresql-simple/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/postgresql-simple/default.nix b/pkgs/development/libraries/haskell/postgresql-simple/default.nix index a3f471fcb4d..0c4fea2da65 100644 --- a/pkgs/development/libraries/haskell/postgresql-simple/default.nix +++ b/pkgs/development/libraries/haskell/postgresql-simple/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "postgresql-simple"; - version = "0.4.3.0"; - sha256 = "16i1qzshbscnbjb4rxz5hl1iaxjmsc21878prj5pp33zbm53dlcm"; + version = "0.4.4.0"; + sha256 = "1rx0rcafiicdv4qbf68dbsfqwiayrl7205dm0c5bdjlvszv576r7"; buildDepends = [ aeson attoparsec blazeBuilder blazeTextual hashable postgresqlLibpq scientific text time transformers uuid vector -- GitLab From c4ef244fbe8509d16632ee0d04bdc42e46af60b6 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 26 Aug 2014 12:38:31 +0200 Subject: [PATCH 335/843] haskell-ghc-syb-utils: update to version 0.2.2 --- pkgs/development/libraries/haskell/ghc-syb-utils/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/ghc-syb-utils/default.nix b/pkgs/development/libraries/haskell/ghc-syb-utils/default.nix index 7778d3f8e5a..0c7d5c82f11 100644 --- a/pkgs/development/libraries/haskell/ghc-syb-utils/default.nix +++ b/pkgs/development/libraries/haskell/ghc-syb-utils/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "ghc-syb-utils"; - version = "0.2.1.2"; - sha256 = "12k6a782gv06gmi6dvskzv4ihz54izhqslwa9cgilhsihw557i9p"; + version = "0.2.2"; + sha256 = "03r4x3a4hjivxladlw23jk8s2pgfh85lqf196ks1ngyg6ih1g6lk"; buildDepends = [ syb ]; meta = { homepage = "http://github.com/nominolo/ghc-syb"; -- GitLab From cfdaf6ba7820139e568b08421a40989d51c47789 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 26 Aug 2014 12:38:34 +0200 Subject: [PATCH 336/843] haskell-monad-logger: update to version 0.3.7.2 --- pkgs/development/libraries/haskell/monad-logger/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/monad-logger/default.nix b/pkgs/development/libraries/haskell/monad-logger/default.nix index cb3a13f8c6e..d8e724259a0 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.7.1"; - sha256 = "0imr1bgcpfm19a91r4i6lii7gycx77ysfrdri030zr2jjrvggh9i"; + version = "0.3.7.2"; + sha256 = "03q8l28rwrg00c2zcv0gr5fpis5xz8c5zspziay6p2grbwfxmwda"; buildDepends = [ blazeBuilder conduit conduitExtra exceptions fastLogger liftedBase monadControl monadLoops mtl resourcet stm stmChans text -- GitLab From 0a1d52711b3b5b501f358245d28900dfb66891fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Tue, 26 Aug 2014 14:41:10 +0200 Subject: [PATCH 337/843] pygtk: disable on py3k --- pkgs/development/python-modules/pygtk/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/pygtk/default.nix b/pkgs/development/python-modules/pygtk/default.nix index 7d3804d264a..60aa65323d7 100644 --- a/pkgs/development/python-modules/pygtk/default.nix +++ b/pkgs/development/python-modules/pygtk/default.nix @@ -1,8 +1,10 @@ { stdenv, fetchurl, python, pkgconfig, gtk, pygobject, pycairo -, buildPythonPackage, libglade ? null }: +, buildPythonPackage, libglade ? null, isPy3k }: buildPythonPackage rec { name = "pygtk-2.24.0"; + + disabled = isPy3k; src = fetchurl { url = "mirror://gnome/sources/pygtk/2.24/${name}.tar.bz2"; -- GitLab From 3bf6383d6b6897d09696afb6e57876d5a863f0b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Tue, 26 Aug 2014 14:41:32 +0200 Subject: [PATCH 338/843] gtimelog: 0.8.1 -> 0.9.1, switch to gi --- pkgs/top-level/python-packages.nix | 23 +++++++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 90bd842ae04..e6394fa0388 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2189,19 +2189,34 @@ rec { gtimelog = buildPythonPackage rec { name = "gtimelog-${version}"; - version = "0.8.1"; + version = "0.9.1"; + + disabled = isPy26; src = fetchurl { url = "https://github.com/gtimelog/gtimelog/archive/${version}.tar.gz"; - sha256 = "0nwpfv284b26q97mfpagqkqb4n2ilw46cx777qsyi3plnywk1xa0"; + sha256 = "0qk8fv8cszzqpdi3wl9vvkym1jil502ycn6sic4jrxckw5s9jsfj"; }; + + preBuild = '' + export LOCALE_ARCHIVE=${pkgs.glibcLocales}/lib/locale/locale-archive + export LC_ALL="en_US.UTF-8" + ''; - propagatedBuildInputs = [ pygtk ]; + # TODO: AppIndicator + propagatedBuildInputs = [ pkgs.gobjectIntrospection pygobject3 pkgs.makeWrapper pkgs.gtk3 ]; checkPhase = '' - patchShebangs ./runtests + substituteInPlace runtests --replace "/usr/bin/env python" "${python}/bin/${python.executable}" ./runtests ''; + + preFixup = '' + wrapProgram $out/bin/gtimelog \ + --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ + --prefix LD_LIBRARY_PATH ":" "${pkgs.gtk3}/lib" \ + + ''; meta = with stdenv.lib; { description = "A small Gtk+ app for keeping track of your time. It's main goal is to be as unintrusive as possible"; -- GitLab From ce3d23a24dc51440211d5bfe31abc00ec39c1c87 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Tue, 26 Aug 2014 14:53:45 +0200 Subject: [PATCH 339/843] pythonPackages.{beautifulsoup,django_evolution}: disable on py3k --- pkgs/top-level/python-packages.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e6394fa0388..b01812de8a9 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -615,6 +615,7 @@ rec { beautifulsoup = buildPythonPackage (rec { name = "beautifulsoup-3.2.1"; + disabled = isPy3k; src = fetchurl { url = "http://www.crummy.com/software/BeautifulSoup/download/3.x/BeautifulSoup-3.2.1.tar.gz"; @@ -3071,14 +3072,15 @@ rec { django_evolution = buildPythonPackage rec { - name = "django_evolution-0.6.9"; + name = "django_evolution-0.7.3"; + disabled = isPy3k; src = fetchurl { - url = "http://pypi.python.org/packages/source/d/django_evolution/${name}.tar.gz"; - md5 = "c0d7d10bc41898c88b14d434c48766ff"; + url = "http://downloads.reviewboard.org/releases/django-evolution/0.7/${name}.tar.gz"; + md5 = "c51895b6501dd58b0e5dc8f5a5fb6f68"; }; - propagatedBuildInputs = [ django_1_3 ]; + propagatedBuildInputs = [ django_1_5 ]; meta = { description = "A database schema evolution tool for the Django web framework"; -- GitLab From 4fbeca8823949c388ab2d7c66927374be602b632 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Tue, 26 Aug 2014 14:54:05 +0200 Subject: [PATCH 340/843] pythonPackages.gtimelog: 0.8.1 -> 0.9.1, use gi stack --- pkgs/top-level/python-packages.nix | 23 ++++------------------- 1 file changed, 4 insertions(+), 19 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index b01812de8a9..112f655f5fa 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2190,34 +2190,19 @@ rec { gtimelog = buildPythonPackage rec { name = "gtimelog-${version}"; - version = "0.9.1"; - - disabled = isPy26; + version = "0.8.1"; src = fetchurl { url = "https://github.com/gtimelog/gtimelog/archive/${version}.tar.gz"; - sha256 = "0qk8fv8cszzqpdi3wl9vvkym1jil502ycn6sic4jrxckw5s9jsfj"; + sha256 = "0nwpfv284b26q97mfpagqkqb4n2ilw46cx777qsyi3plnywk1xa0"; }; - - preBuild = '' - export LOCALE_ARCHIVE=${pkgs.glibcLocales}/lib/locale/locale-archive - export LC_ALL="en_US.UTF-8" - ''; - # TODO: AppIndicator - propagatedBuildInputs = [ pkgs.gobjectIntrospection pygobject3 pkgs.makeWrapper pkgs.gtk3 ]; + propagatedBuildInputs = [ pygtk ]; checkPhase = '' - substituteInPlace runtests --replace "/usr/bin/env python" "${python}/bin/${python.executable}" + patchShebangs ./runtests ./runtests ''; - - preFixup = '' - wrapProgram $out/bin/gtimelog \ - --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ - --prefix LD_LIBRARY_PATH ":" "${pkgs.gtk3}/lib" \ - - ''; meta = with stdenv.lib; { description = "A small Gtk+ app for keeping track of your time. It's main goal is to be as unintrusive as possible"; -- GitLab From 6a12b9ab536de95e0755d11dd6948944be0ebda9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= Date: Tue, 26 Aug 2014 14:54:11 +0200 Subject: [PATCH 341/843] yoshimi: update from 1.2.2 to 1.2.3 --- pkgs/applications/audio/yoshimi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/yoshimi/default.nix b/pkgs/applications/audio/yoshimi/default.nix index 91142691055..67edc7f521d 100644 --- a/pkgs/applications/audio/yoshimi/default.nix +++ b/pkgs/applications/audio/yoshimi/default.nix @@ -6,11 +6,11 @@ assert stdenv ? glibc; stdenv.mkDerivation rec { name = "yoshimi-${version}"; - version = "1.2.2"; + version = "1.2.3"; src = fetchurl { url = "mirror://sourceforge/yoshimi/${name}.tar.bz2"; - sha256 = "1w23ral1qrbg9gqx833giqmchx7952f18yaa52aya9shsdlla83c"; + sha256 = "00bp699k8gnilin2rvgj35334s9jrizp82qwlmzzvvfliwcgqlqw"; }; buildInputs = [ -- GitLab From c72fdf4f4899b46c678345f4541ba30fe3639daa Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 26 Aug 2014 15:13:17 +0200 Subject: [PATCH 342/843] Manual: Tweak --- nixos/doc/manual/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/doc/manual/default.nix b/nixos/doc/manual/default.nix index e9f26ea9dd1..f5cc33919b8 100644 --- a/nixos/doc/manual/default.nix +++ b/nixos/doc/manual/default.nix @@ -77,7 +77,7 @@ in rec { --param chunk.section.depth 1 \ --param chunk.first.sections 1 \ --param use.id.as.filename 1 \ - --stringparam generate.toc "book toc chapter toc" \ + --stringparam generate.toc "book toc chapter toc appendix toc" \ --nonet --xinclude --output $dst/ \ ${docbook5_xsl}/xml/xsl/docbook/xhtml/chunkfast.xsl ./manual.xml -- GitLab From 7f78c366f179fdf2c7ff262e91431286d5163b38 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Tue, 26 Aug 2014 16:38:15 +0200 Subject: [PATCH 343/843] pythonPackages.ipaddr: 2.1.10 -> 2.1.11 --- pkgs/top-level/python-packages.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 112f655f5fa..9382867a07e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4021,11 +4021,13 @@ rec { }; - ipaddr = buildPythonPackage { - name = "ipaddr-2.1.10"; + ipaddr = buildPythonPackage rec { + name = "ipaddr-2.1.11"; + disabled = isPy3k; + src = fetchurl { - url = "http://ipaddr-py.googlecode.com/files/ipaddr-2.1.10.tar.gz"; - sha256 = "18ycwkfk3ypb1yd09wg20r7j7zq2a73d7j6j10qpgra7a7abzhyj"; + url = "http://pypi.python.org/packages/source/i/ipaddr/${name}.tar.gz"; + sha256 = "1dwq3ngsapjc93fw61rp17fvzggmab5x1drjzvd4y4q0i255nm8v"; }; meta = { -- GitLab From d9772ecc666a0d28a30b41007ba2e90f5c227b7e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Tue, 26 Aug 2014 16:46:48 +0200 Subject: [PATCH 344/843] python3Packages: disable/upgrade bunch of packages --- pkgs/top-level/python-packages.nix | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 9382867a07e..9b958cbd7d2 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3364,6 +3364,7 @@ rec { flexget = buildPythonPackage rec { name = "FlexGet-1.2.161"; + disabled = isPy3k; src = fetchurl { url = "https://pypi.python.org/packages/source/F/FlexGet/${name}.tar.gz"; @@ -4467,6 +4468,7 @@ rec { mechanize = buildPythonPackage (rec { name = "mechanize-0.1.11"; + disabled = isPy3k; src = fetchurl { url = "http://wwwsearch.sourceforge.net/mechanize/src/${name}.tar.gz"; @@ -5429,6 +5431,7 @@ rec { paste = buildPythonPackage rec { name = "paste-1.7.5.1"; + disabled = isPy3k; src = fetchurl { url = http://pypi.python.org/packages/source/P/Paste/Paste-1.7.5.1.tar.gz; @@ -5447,12 +5450,12 @@ rec { paste_deploy = buildPythonPackage rec { - version = "1.5.0"; + version = "1.5.2"; name = "paste-deploy-${version}"; src = fetchurl { url = "http://pypi.python.org/packages/source/P/PasteDeploy/PasteDeploy-${version}.tar.gz"; - md5 = "f1a068a0b680493b6eaff3dd7690690f"; + md5 = "352b7205c78c8de4987578d19431af3b"; }; buildInputs = [ nose ]; @@ -5588,6 +5591,7 @@ rec { pika = buildPythonPackage { name = "pika-0.9.12"; + diabled = isPy3k; src = fetchurl { url = https://pypi.python.org/packages/source/p/pika/pika-0.9.12.tar.gz; md5 = "7174fc7cc5570314fa3cfaa729106482"; @@ -6446,6 +6450,7 @@ rec { ldap = buildPythonPackage rec { name = "ldap-2.4.15"; + disabled = isPy3k; src = fetchurl { url = "http://pypi.python.org/packages/source/p/python-ldap/python-${name}.tar.gz"; @@ -6845,11 +6850,11 @@ rec { reportlab = let freetype = overrideDerivation pkgs.freetype (args: { configureFlags = "--enable-static --enable-shared"; }); in buildPythonPackage rec { - name = "reportlab-2.5"; + name = "reportlab-3.1.8"; src = fetchurl { url = "http://pypi.python.org/packages/source/r/reportlab/${name}.tar.gz"; - md5 = "cdf8b87a6cf1501de1b0a8d341a217d3"; + md5 = "820a9fda647078503597b85cdba7ed7f"; }; buildInputs = [freetype]; -- GitLab From 6b404aa265ec6c522e73074c9eb91b692ec68528 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Tue, 26 Aug 2014 16:52:28 +0200 Subject: [PATCH 345/843] python34Packages.ColanderAlchemy: fix build --- pkgs/top-level/python-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 9b958cbd7d2..acd81c84d8d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1312,7 +1312,7 @@ rec { }; buildInputs = [ unittest2 ]; - propagatedBuildInputs = [ colander sqlalchemy8 ]; + propagatedBuildInputs = [ colander sqlalchemy9 ]; # string: argument name cannot be overridden via info kwarg. doCheck = false; -- GitLab From a024d92193ad508e0ee9692761f10d6bffce51c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Tue, 26 Aug 2014 17:02:00 +0200 Subject: [PATCH 346/843] fix eval job --- pkgs/top-level/python-packages.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index acd81c84d8d..41dbf14a816 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -139,8 +139,8 @@ rec { pygtk = import ../development/python-modules/pygtk { inherit (pkgs) fetchurl stdenv pkgconfig gtk; - inherit python buildPythonPackage pygobject pycairo; - }; + inherit python buildPythonPackage pygobject pycairo isPy3k; + }; # XXX: how can we get an override here? #pyGtkGlade = pygtk.override { @@ -149,7 +149,7 @@ rec { pyGtkGlade = import ../development/python-modules/pygtk { inherit (pkgs) fetchurl stdenv pkgconfig gtk; inherit (pkgs.gnome) libglade; - inherit python buildPythonPackage pygobject pycairo; + inherit python buildPythonPackage pygobject pycairo isPy3k; }; pyqt4 = import ../development/python-modules/pyqt/4.x.nix { @@ -5225,6 +5225,7 @@ rec { oauth2 = buildPythonPackage (rec { name = "oauth2-1.5.211"; + disabled = isPy3k; src = fetchurl { url = "http://pypi.python.org/packages/source/o/oauth2/oauth2-1.5.211.tar.gz"; @@ -9607,6 +9608,7 @@ rec { libarchive = buildPythonPackage rec { version = "3.1.2-1"; name = "libarchive-${version}"; + disabled = isPy3k; src = fetchurl { url = "http://python-libarchive.googlecode.com/files/python-libarchive-${version}.tar.gz"; -- GitLab From 981d0607f9c8de1502f57526dc7ecbabab54fe8f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Tue, 26 Aug 2014 17:50:47 +0200 Subject: [PATCH 347/843] Revert "pythonPackages.gtimelog: 0.8.1 -> 0.9.1, use gi stack" This reverts commit 4fbeca8823949c388ab2d7c66927374be602b632. PEBKAC. --- pkgs/top-level/python-packages.nix | 23 +++++++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 41dbf14a816..eb4f4959a4b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2190,19 +2190,34 @@ rec { gtimelog = buildPythonPackage rec { name = "gtimelog-${version}"; - version = "0.8.1"; + version = "0.9.1"; + + disabled = isPy26; src = fetchurl { url = "https://github.com/gtimelog/gtimelog/archive/${version}.tar.gz"; - sha256 = "0nwpfv284b26q97mfpagqkqb4n2ilw46cx777qsyi3plnywk1xa0"; + sha256 = "0qk8fv8cszzqpdi3wl9vvkym1jil502ycn6sic4jrxckw5s9jsfj"; }; + + preBuild = '' + export LOCALE_ARCHIVE=${pkgs.glibcLocales}/lib/locale/locale-archive + export LC_ALL="en_US.UTF-8" + ''; - propagatedBuildInputs = [ pygtk ]; + # TODO: AppIndicator + propagatedBuildInputs = [ pkgs.gobjectIntrospection pygobject3 pkgs.makeWrapper pkgs.gtk3 ]; checkPhase = '' - patchShebangs ./runtests + substituteInPlace runtests --replace "/usr/bin/env python" "${python}/bin/${python.executable}" ./runtests ''; + + preFixup = '' + wrapProgram $out/bin/gtimelog \ + --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ + --prefix LD_LIBRARY_PATH ":" "${pkgs.gtk3}/lib" \ + + ''; meta = with stdenv.lib; { description = "A small Gtk+ app for keeping track of your time. It's main goal is to be as unintrusive as possible"; -- GitLab From e81f830114cdeec718a34ab88cceed976043283e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Tue, 26 Aug 2014 17:59:35 +0200 Subject: [PATCH 348/843] pythonPackages.gcutil: fix build --- pkgs/top-level/python-packages.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index eb4f4959a4b..07173068810 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3944,11 +3944,11 @@ rec { }; httplib2 = buildPythonPackage rec { - name = "httplib2-0.9"; + name = "httplib2-0.8"; src = fetchurl { url = "https://pypi.python.org/packages/source/h/httplib2/${name}.tar.gz"; - sha256 = "1asi5wpncnc6ki3bz33mhb9xh2lrkb24y4qng8bmqnczdmm8rsir"; + sha256 = "174w6rz4na1sdlfz37h95l0pkfm9igf9nqmhbd8aqh3sm7d9zrff"; }; meta = { @@ -4038,12 +4038,12 @@ rec { ipaddr = buildPythonPackage rec { - name = "ipaddr-2.1.11"; + name = "ipaddr-2.1.10"; disabled = isPy3k; src = fetchurl { url = "http://pypi.python.org/packages/source/i/ipaddr/${name}.tar.gz"; - sha256 = "1dwq3ngsapjc93fw61rp17fvzggmab5x1drjzvd4y4q0i255nm8v"; + sha256 = "18ycwkfk3ypb1yd09wg20r7j7zq2a73d7j6j10qpgra7a7abzhyj"; }; meta = { -- GitLab From 8707a070baca84d881a7e03e04a44374d8cc05e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Tue, 26 Aug 2014 18:11:26 +0200 Subject: [PATCH 349/843] python-packages-generated: fix WebTest --- pkgs/top-level/python-packages-generated.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/python-packages-generated.nix b/pkgs/top-level/python-packages-generated.nix index 2cf742156a3..247d18680d9 100644 --- a/pkgs/top-level/python-packages-generated.nix +++ b/pkgs/top-level/python-packages-generated.nix @@ -5242,6 +5242,7 @@ in doCheck = true; buildInputs = [ self."nose-1.3.3" self."unittest2-0.5.1" self."pyquery-1.2.8" self."WSGIProxy2-0.4.1" self."PasteDeploy-1.5.2" self."mock-1.0.1" self."coverage-3.7.1" pkgs.unzip ]; propagatedBuildInputs = [ self."beautifulsoup4-4.3.2" self."six-1.6.1" self."waitress-0.8.9" self."WebOb-1.4" ]; + preConfigure = ''substituteInPlace setup.py --replace "nose<1.3.0" "nose"''; installCommand = ''easy_install --always-unzip --prefix="$out" .''; meta = { description = '' -- GitLab From a099ca45054940b63b1615920de158ebafb25ea8 Mon Sep 17 00:00:00 2001 From: Mikey Ariel Date: Sun, 24 Aug 2014 19:18:18 +0200 Subject: [PATCH 350/843] Chunk NixOS manual [Squashed commits to make git blame etc. more likely to work. -ED] --- .../manual/administration/boot-problems.xml | 65 + .../manual/administration/cleaning-store.xml | 62 + .../administration/container-networking.xml | 50 + .../doc/manual/administration/containers.xml | 34 + .../manual/administration/control-groups.xml | 75 + .../administration/declarative-containers.xml | 52 + .../administration/imperative-containers.xml | 124 ++ nixos/doc/manual/administration/logging.xml | 52 + .../administration/maintenance-mode.xml | 18 + .../administration/network-problems.xml | 33 + nixos/doc/manual/administration/rebooting.xml | 44 + nixos/doc/manual/administration/rollback.xml | 48 + nixos/doc/manual/administration/running.xml | 24 + .../manual/administration/service-mgmt.xml | 83 + .../administration/store-corruption.xml | 37 + .../manual/administration/troubleshooting.xml | 18 + .../manual/administration/user-sessions.xml | 53 + nixos/doc/manual/configuration.xml | 1563 ----------------- .../configuration/LUKS-file-systems.xml | 42 + .../doc/manual/configuration/abstractions.xml | 166 ++ .../configuration/ad-hoc-network-config.xml | 24 + .../manual/configuration/ad-hoc-packages.xml | 63 + .../configuration/adding-custom-packages.xml | 84 + .../doc/manual/configuration/config-file.xml | 213 +++ .../manual/configuration/config-syntax.xml | 27 + .../manual/configuration/configuration.xml | 29 + .../configuration/customizing-packages.xml | 92 + .../configuration/declarative-packages.xml | 43 + .../doc/manual/configuration/file-systems.xml | 40 + nixos/doc/manual/configuration/firewall.xml | 38 + .../doc/manual/configuration/ipv4-config.xml | 47 + .../doc/manual/configuration/ipv6-config.xml | 19 + .../doc/manual/configuration/linux-kernel.xml | 69 + nixos/doc/manual/configuration/modularity.xml | 143 ++ .../manual/configuration/network-manager.xml | 27 + nixos/doc/manual/configuration/networking.xml | 22 + .../doc/manual/configuration/package-mgmt.xml | 34 + nixos/doc/manual/configuration/ssh.xml | 32 + nixos/doc/manual/configuration/summary.xml | 191 ++ nixos/doc/manual/configuration/user-mgmt.xml | 95 + nixos/doc/manual/configuration/wireless.xml | 41 + nixos/doc/manual/configuration/x-windows.xml | 94 + nixos/doc/manual/containers.xml | 242 --- nixos/doc/manual/development.xml | 1119 ------------ .../doc/manual/development/building-nixos.xml | 32 + .../doc/manual/development/building-parts.xml | 113 ++ nixos/doc/manual/development/development.xml | 20 + nixos/doc/manual/development/nixos-tests.xml | 19 + .../development/option-declarations.xml | 141 ++ nixos/doc/manual/development/option-def.xml | 112 ++ .../development/running-nixos-tests.xml | 77 + nixos/doc/manual/development/sources.xml | 95 + .../manual/development/testing-installer.xml | 27 + .../manual/development/writing-modules.xml | 175 ++ .../development/writing-nixos-tests.xml | 251 +++ nixos/doc/manual/installation.xml | 570 ------ .../manual/installation/changing-config.xml | 90 + .../doc/manual/installation/installation.xml | 21 + .../manual/installation/installing-UEFI.xml | 51 + .../manual/installation/installing-USB.xml | 30 + nixos/doc/manual/installation/installing.xml | 264 +++ nixos/doc/manual/installation/obtaining.xml | 44 + nixos/doc/manual/installation/upgrading.xml | 90 + nixos/doc/manual/manual.xml | 24 +- .../manual/release-notes/release-notes.xml | 17 + nixos/doc/manual/release-notes/rl-1310.xml | 11 + .../rl-1404.xml} | 50 +- nixos/doc/manual/release-notes/rl-1410.xml | 22 + nixos/doc/manual/running.xml | 369 ---- nixos/doc/manual/troubleshooting.xml | 199 --- 70 files changed, 4264 insertions(+), 4121 deletions(-) create mode 100644 nixos/doc/manual/administration/boot-problems.xml create mode 100644 nixos/doc/manual/administration/cleaning-store.xml create mode 100644 nixos/doc/manual/administration/container-networking.xml create mode 100644 nixos/doc/manual/administration/containers.xml create mode 100644 nixos/doc/manual/administration/control-groups.xml create mode 100644 nixos/doc/manual/administration/declarative-containers.xml create mode 100644 nixos/doc/manual/administration/imperative-containers.xml create mode 100644 nixos/doc/manual/administration/logging.xml create mode 100644 nixos/doc/manual/administration/maintenance-mode.xml create mode 100644 nixos/doc/manual/administration/network-problems.xml create mode 100644 nixos/doc/manual/administration/rebooting.xml create mode 100644 nixos/doc/manual/administration/rollback.xml create mode 100644 nixos/doc/manual/administration/running.xml create mode 100644 nixos/doc/manual/administration/service-mgmt.xml create mode 100644 nixos/doc/manual/administration/store-corruption.xml create mode 100644 nixos/doc/manual/administration/troubleshooting.xml create mode 100644 nixos/doc/manual/administration/user-sessions.xml delete mode 100644 nixos/doc/manual/configuration.xml create mode 100644 nixos/doc/manual/configuration/LUKS-file-systems.xml create mode 100644 nixos/doc/manual/configuration/abstractions.xml create mode 100644 nixos/doc/manual/configuration/ad-hoc-network-config.xml create mode 100644 nixos/doc/manual/configuration/ad-hoc-packages.xml create mode 100644 nixos/doc/manual/configuration/adding-custom-packages.xml create mode 100644 nixos/doc/manual/configuration/config-file.xml create mode 100644 nixos/doc/manual/configuration/config-syntax.xml create mode 100644 nixos/doc/manual/configuration/configuration.xml create mode 100644 nixos/doc/manual/configuration/customizing-packages.xml create mode 100644 nixos/doc/manual/configuration/declarative-packages.xml create mode 100644 nixos/doc/manual/configuration/file-systems.xml create mode 100644 nixos/doc/manual/configuration/firewall.xml create mode 100644 nixos/doc/manual/configuration/ipv4-config.xml create mode 100644 nixos/doc/manual/configuration/ipv6-config.xml create mode 100644 nixos/doc/manual/configuration/linux-kernel.xml create mode 100644 nixos/doc/manual/configuration/modularity.xml create mode 100644 nixos/doc/manual/configuration/network-manager.xml create mode 100644 nixos/doc/manual/configuration/networking.xml create mode 100644 nixos/doc/manual/configuration/package-mgmt.xml create mode 100644 nixos/doc/manual/configuration/ssh.xml create mode 100644 nixos/doc/manual/configuration/summary.xml create mode 100644 nixos/doc/manual/configuration/user-mgmt.xml create mode 100644 nixos/doc/manual/configuration/wireless.xml create mode 100644 nixos/doc/manual/configuration/x-windows.xml delete mode 100644 nixos/doc/manual/containers.xml delete mode 100644 nixos/doc/manual/development.xml create mode 100644 nixos/doc/manual/development/building-nixos.xml create mode 100644 nixos/doc/manual/development/building-parts.xml create mode 100644 nixos/doc/manual/development/development.xml create mode 100644 nixos/doc/manual/development/nixos-tests.xml create mode 100644 nixos/doc/manual/development/option-declarations.xml create mode 100644 nixos/doc/manual/development/option-def.xml create mode 100644 nixos/doc/manual/development/running-nixos-tests.xml create mode 100644 nixos/doc/manual/development/sources.xml create mode 100644 nixos/doc/manual/development/testing-installer.xml create mode 100644 nixos/doc/manual/development/writing-modules.xml create mode 100644 nixos/doc/manual/development/writing-nixos-tests.xml delete mode 100644 nixos/doc/manual/installation.xml create mode 100644 nixos/doc/manual/installation/changing-config.xml create mode 100644 nixos/doc/manual/installation/installation.xml create mode 100644 nixos/doc/manual/installation/installing-UEFI.xml create mode 100644 nixos/doc/manual/installation/installing-USB.xml create mode 100644 nixos/doc/manual/installation/installing.xml create mode 100644 nixos/doc/manual/installation/obtaining.xml create mode 100644 nixos/doc/manual/installation/upgrading.xml create mode 100644 nixos/doc/manual/release-notes/release-notes.xml create mode 100644 nixos/doc/manual/release-notes/rl-1310.xml rename nixos/doc/manual/{release-notes.xml => release-notes/rl-1404.xml} (83%) create mode 100644 nixos/doc/manual/release-notes/rl-1410.xml delete mode 100644 nixos/doc/manual/running.xml delete mode 100644 nixos/doc/manual/troubleshooting.xml diff --git a/nixos/doc/manual/administration/boot-problems.xml b/nixos/doc/manual/administration/boot-problems.xml new file mode 100644 index 00000000000..be6ff3aac0f --- /dev/null +++ b/nixos/doc/manual/administration/boot-problems.xml @@ -0,0 +1,65 @@ +
+ +Boot Problems + +If NixOS fails to boot, there are a number of kernel command +line parameters that may help you to identify or fix the issue. You +can add these parameters in the GRUB boot menu by pressing “e” to +modify the selected boot entry and editing the line starting with +linux. The following are some useful kernel command +line parameters that are recognised by the NixOS boot scripts or by +systemd: + + + + boot.shell_on_fail + Start a root shell if something goes wrong in + stage 1 of the boot process (the initial ramdisk). This is + disabled by default because there is no authentication for the + root shell. + + + boot.debug1 + Start an interactive shell in stage 1 before + anything useful has been done. That is, no modules have been + loaded and no file systems have been mounted, except for + /proc and + /sys. + + + boot.trace + Print every shell command executed by the stage 1 + and 2 boot scripts. + + + single + Boot into rescue mode (a.k.a. single user mode). + This will cause systemd to start nothing but the unit + rescue.target, which runs + sulogin to prompt for the root password and + start a root login shell. Exiting the shell causes the system to + continue with the normal boot process. + + + systemd.log_level=debug systemd.log_target=console + Make systemd very verbose and send log messages to + the console instead of the journal. + + + + +For more parameters recognised by systemd, see +systemd1. + +If no login prompts or X11 login screens appear (e.g. due to +hanging dependencies), you can press Alt+ArrowUp. If you’re lucky, +this will start rescue mode (described above). (Also note that since +most units have a 90-second timeout before systemd gives up on them, +the agetty login prompts should appear eventually +unless something is very wrong.) + +
\ No newline at end of file diff --git a/nixos/doc/manual/administration/cleaning-store.xml b/nixos/doc/manual/administration/cleaning-store.xml new file mode 100644 index 00000000000..41dc65795b6 --- /dev/null +++ b/nixos/doc/manual/administration/cleaning-store.xml @@ -0,0 +1,62 @@ + + +Cleaning the Nix Store + +Nix has a purely functional model, meaning that packages are +never upgraded in place. Instead new versions of packages end up in a +different location in the Nix store (/nix/store). +You should periodically run Nix’s garbage +collector to remove old, unreferenced packages. This is +easy: + + +$ nix-collect-garbage + + +Alternatively, you can use a systemd unit that does the same in the +background: + + +$ systemctl start nix-gc.service + + +You can tell NixOS in configuration.nix to run +this unit automatically at certain points in time, for instance, every +night at 03:15: + + +nix.gc.automatic = true; +nix.gc.dates = "03:15"; + + + + +The commands above do not remove garbage collector roots, such +as old system configurations. Thus they do not remove the ability to +roll back to previous configurations. The following command deletes +old roots, removing the ability to roll back to them: + +$ nix-collect-garbage -d + +You can also do this for specific profiles, e.g. + +$ nix-env -p /nix/var/nix/profiles/per-user/eelco/profile --delete-generations old + +Note that NixOS system configurations are stored in the profile +/nix/var/nix/profiles/system. + +Another way to reclaim disk space (often as much as 40% of the +size of the Nix store) is to run Nix’s store optimiser, which seeks +out identical files in the store and replaces them with hard links to +a single copy. + +$ nix-store --optimise + +Since this command needs to read the entire Nix store, it can take +quite a while to finish. + + \ No newline at end of file diff --git a/nixos/doc/manual/administration/container-networking.xml b/nixos/doc/manual/administration/container-networking.xml new file mode 100644 index 00000000000..adea3e69840 --- /dev/null +++ b/nixos/doc/manual/administration/container-networking.xml @@ -0,0 +1,50 @@ +
+ + +Container Networking + +When you create a container using nixos-container +create, it gets it own private IPv4 address in the range +10.233.0.0/16. You can get the container’s IPv4 +address as follows: + + +$ nixos-container show-ip foo +10.233.4.2 + +$ ping -c1 10.233.4.2 +64 bytes from 10.233.4.2: icmp_seq=1 ttl=64 time=0.106 ms + + + + +Networking is implemented using a pair of virtual Ethernet +devices. The network interface in the container is called +eth0, while the matching interface in the host is +called ve-container-name +(e.g., ve-foo). The container has its own network +namespace and the CAP_NET_ADMIN capability, so it +can perform arbitrary network configuration such as setting up +firewall rules, without affecting or having access to the host’s +network. + +By default, containers cannot talk to the outside network. If +you want that, you should set up Network Address Translation (NAT) +rules on the host to rewrite container traffic to use your external +IP address. This can be accomplished using the following configuration +on the host: + + +networking.nat.enable = true; +networking.nat.internalInterfaces = ["ve-+"]; +networking.nat.externalInterface = "eth0"; + +where eth0 should be replaced with the desired +external interface. Note that ve-+ is a wildcard +that matches all container interfaces. + +
\ No newline at end of file diff --git a/nixos/doc/manual/administration/containers.xml b/nixos/doc/manual/administration/containers.xml new file mode 100644 index 00000000000..4cd2c8ae556 --- /dev/null +++ b/nixos/doc/manual/administration/containers.xml @@ -0,0 +1,34 @@ + + +Container Management + +NixOS allows you to easily run other NixOS instances as +containers. Containers are a light-weight +approach to virtualisation that runs software in the container at the +same speed as in the host system. NixOS containers share the Nix store +of the host, making container creation very efficient. + +Currently, NixOS containers are not perfectly isolated +from the host system. This means that a user with root access to the +container can do things that affect the host. So you should not give +container root access to untrusted users. + +NixOS containers can be created in two ways: imperatively, using +the command nixos-container, and declaratively, by +specifying them in your configuration.nix. The +declarative approach implies that containers get upgraded along with +your host system when you run nixos-rebuild, which +is often not what you want. By contrast, in the imperative approach, +containers are configured and updated independently from the host +system. + + + + + + + diff --git a/nixos/doc/manual/administration/control-groups.xml b/nixos/doc/manual/administration/control-groups.xml new file mode 100644 index 00000000000..86c684cdfe5 --- /dev/null +++ b/nixos/doc/manual/administration/control-groups.xml @@ -0,0 +1,75 @@ + + +Control Groups + +To keep track of the processes in a running system, systemd uses +control groups (cgroups). A control group is a +set of processes used to allocate resources such as CPU, memory or I/O +bandwidth. There can be multiple control group hierarchies, allowing +each kind of resource to be managed independently. + +The command systemd-cgls lists all control +groups in the systemd hierarchy, which is what +systemd uses to keep track of the processes belonging to each service +or user session: + + +$ systemd-cgls +├─user +│ └─eelco +│ └─c1 +│ ├─ 2567 -:0 +│ ├─ 2682 kdeinit4: kdeinit4 Running... +│ ├─ ... +│ └─10851 sh -c less -R +└─system + ├─httpd.service + │ ├─2444 httpd -f /nix/store/3pyacby5cpr55a03qwbnndizpciwq161-httpd.conf -DNO_DETACH + │ └─... + ├─dhcpcd.service + │ └─2376 dhcpcd --config /nix/store/f8dif8dsi2yaa70n03xir8r653776ka6-dhcpcd.conf + └─ ... + + +Similarly, systemd-cgls cpu shows the cgroups in +the CPU hierarchy, which allows per-cgroup CPU scheduling priorities. +By default, every systemd service gets its own CPU cgroup, while all +user sessions are in the top-level CPU cgroup. This ensures, for +instance, that a thousand run-away processes in the +httpd.service cgroup cannot starve the CPU for one +process in the postgresql.service cgroup. (By +contrast, it they were in the same cgroup, then the PostgreSQL process +would get 1/1001 of the cgroup’s CPU time.) You can limit a service’s +CPU share in configuration.nix: + + +systemd.services.httpd.serviceConfig.CPUShares = 512; + + +By default, every cgroup has 1024 CPU shares, so this will halve the +CPU allocation of the httpd.service cgroup. + +There also is a memory hierarchy that +controls memory allocation limits; by default, all processes are in +the top-level cgroup, so any service or session can exhaust all +available memory. Per-cgroup memory limits can be specified in +configuration.nix; for instance, to limit +httpd.service to 512 MiB of RAM (excluding swap) +and 640 MiB of RAM (including swap): + + +systemd.services.httpd.serviceConfig.MemoryLimit = "512M"; +systemd.services.httpd.serviceConfig.ControlGroupAttribute = [ "memory.memsw.limit_in_bytes 640M" ]; + + + + +The command systemd-cgtop shows a +continuously updated list of all cgroups with their CPU and memory +usage. + + \ No newline at end of file diff --git a/nixos/doc/manual/administration/declarative-containers.xml b/nixos/doc/manual/administration/declarative-containers.xml new file mode 100644 index 00000000000..177ebdd8db1 --- /dev/null +++ b/nixos/doc/manual/administration/declarative-containers.xml @@ -0,0 +1,52 @@ +
+ +Declarative Container Specification + +You can also specify containers and their configuration in the +host’s configuration.nix. For example, the +following specifies that there shall be a container named +database running PostgreSQL: + + +containers.database = + { config = + { config, pkgs, ... }: + { services.postgresql.enable = true; + services.postgresql.package = pkgs.postgresql92; + }; + }; + + +If you run nixos-rebuild switch, the container will +be built and started. If the container was already running, it will be +updated in place, without rebooting. + +By default, declarative containers share the network namespace +of the host, meaning that they can listen on (privileged) +ports. However, they cannot change the network configuration. You can +give a container its own network as follows: + + +containers.database = + { privateNetwork = true; + hostAddress = "192.168.100.10"; + localAddress = "192.168.100.11"; + }; + + +This gives the container a private virtual Ethernet interface with IP +address 192.168.100.11, which is hooked up to a +virtual Ethernet interface on the host with IP address +192.168.100.10. (See the next section for details +on container networking.) + +To disable the container, just remove it from +configuration.nix and run nixos-rebuild +switch. Note that this will not delete the root directory of +the container in /var/lib/containers. + +
\ No newline at end of file diff --git a/nixos/doc/manual/administration/imperative-containers.xml b/nixos/doc/manual/administration/imperative-containers.xml new file mode 100644 index 00000000000..6131d4e04ea --- /dev/null +++ b/nixos/doc/manual/administration/imperative-containers.xml @@ -0,0 +1,124 @@ +
+ +Imperative Container Management + +We’ll cover imperative container management using +nixos-container first. You create a container with +identifier foo as follows: + + +$ nixos-container create foo + + +This creates the container’s root directory in +/var/lib/containers/foo and a small configuration +file in /etc/containers/foo.conf. It also builds +the container’s initial system configuration and stores it in +/nix/var/nix/profiles/per-container/foo/system. You +can modify the initial configuration of the container on the command +line. For instance, to create a container that has +sshd running, with the given public key for +root: + + +$ nixos-container create foo --config 'services.openssh.enable = true; \ + users.extraUsers.root.openssh.authorizedKeys.keys = ["ssh-dss AAAAB3N…"];' + + + + +Creating a container does not start it. To start the container, +run: + + +$ nixos-container start foo + + +This command will return as soon as the container has booted and has +reached multi-user.target. On the host, the +container runs within a systemd unit called +container@container-name.service. +Thus, if something went wrong, you can get status info using +systemctl: + + +$ systemctl status container@foo + + + + +If the container has started succesfully, you can log in as +root using the root-login operation: + + +$ nixos-container root-login foo +[root@foo:~]# + + +Note that only root on the host can do this (since there is no +authentication). You can also get a regular login prompt using the +login operation, which is available to all users on +the host: + + +$ nixos-container login foo +foo login: alice +Password: *** + + +With nixos-container run, you can execute arbitrary +commands in the container: + + +$ nixos-container run foo -- uname -a +Linux foo 3.4.82 #1-NixOS SMP Thu Mar 20 14:44:05 UTC 2014 x86_64 GNU/Linux + + + + +There are several ways to change the configuration of the +container. First, on the host, you can edit +/var/lib/container/name/etc/nixos/configuration.nix, +and run + + +$ nixos-container update foo + + +This will build and activate the new configuration. You can also +specify a new configuration on the command line: + + +$ nixos-container update foo --config 'services.httpd.enable = true; \ + services.httpd.adminAddr = "foo@example.org";' + +$ curl http://$(nixos-container show-ip foo)/ +<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">… + + +However, note that this will overwrite the container’s +/etc/nixos/configuration.nix. + +Alternatively, you can change the configuration from within the +container itself by running nixos-rebuild switch +inside the container. Note that the container by default does not have +a copy of the NixOS channel, so you should run nix-channel +--update first. + +Containers can be stopped and started using +nixos-container stop and nixos-container +start, respectively, or by using +systemctl on the container’s service unit. To +destroy a container, including its file system, do + + +$ nixos-container destroy foo + + + + +
\ No newline at end of file diff --git a/nixos/doc/manual/administration/logging.xml b/nixos/doc/manual/administration/logging.xml new file mode 100644 index 00000000000..1d5df7770e2 --- /dev/null +++ b/nixos/doc/manual/administration/logging.xml @@ -0,0 +1,52 @@ + + +Logging + +System-wide logging is provided by systemd’s +journal, which subsumes traditional logging +daemons such as syslogd and klogd. Log entries are kept in binary +files in /var/log/journal/. The command +journalctl allows you to see the contents of the +journal. For example, + + +$ journalctl -b + + +shows all journal entries since the last reboot. (The output of +journalctl is piped into less by +default.) You can use various options and match operators to restrict +output to messages of interest. For instance, to get all messages +from PostgreSQL: + + +$ journalctl -u postgresql.service +-- Logs begin at Mon, 2013-01-07 13:28:01 CET, end at Tue, 2013-01-08 01:09:57 CET. -- +... +Jan 07 15:44:14 hagbard postgres[2681]: [2-1] LOG: database system is shut down +-- Reboot -- +Jan 07 15:45:10 hagbard postgres[2532]: [1-1] LOG: database system was shut down at 2013-01-07 15:44:14 CET +Jan 07 15:45:13 hagbard postgres[2500]: [1-1] LOG: database system is ready to accept connections + + +Or to get all messages since the last reboot that have at least a +“critical” severity level: + + +$ journalctl -b -p crit +Dec 17 21:08:06 mandark sudo[3673]: pam_unix(sudo:auth): auth could not identify password for [alice] +Dec 29 01:30:22 mandark kernel[6131]: [1053513.909444] CPU6: Core temperature above threshold, cpu clock throttled (total events = 1) + + + + +The system journal is readable by root and by users in the +wheel and systemd-journal +groups. All users have a private journal that can be read using +journalctl. + + \ No newline at end of file diff --git a/nixos/doc/manual/administration/maintenance-mode.xml b/nixos/doc/manual/administration/maintenance-mode.xml new file mode 100644 index 00000000000..15c1f902da7 --- /dev/null +++ b/nixos/doc/manual/administration/maintenance-mode.xml @@ -0,0 +1,18 @@ +
+ +Maintenance Mode + +You can enter rescue mode by running: + + +$ systemctl rescue + +This will eventually give you a single-user root shell. Systemd will +stop (almost) all system services. To get out of maintenance mode, +just exit from the rescue shell. + +
\ No newline at end of file diff --git a/nixos/doc/manual/administration/network-problems.xml b/nixos/doc/manual/administration/network-problems.xml new file mode 100644 index 00000000000..5ba1bfd5ac9 --- /dev/null +++ b/nixos/doc/manual/administration/network-problems.xml @@ -0,0 +1,33 @@ +
+ +Network Problems + +Nix uses a so-called binary cache to +optimise building a package from source into downloading it as a +pre-built binary. That is, whenever a command like +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. + + +$ nixos-rebuild switch --option use-binary-caches false + + +If you have an alternative binary cache at your disposal, you can use +it instead: + + +$ nixos-rebuild switch --option binary-caches http://my-cache.example.org/ + + + + +
\ No newline at end of file diff --git a/nixos/doc/manual/administration/rebooting.xml b/nixos/doc/manual/administration/rebooting.xml new file mode 100644 index 00000000000..d1db7b141cf --- /dev/null +++ b/nixos/doc/manual/administration/rebooting.xml @@ -0,0 +1,44 @@ + + +Rebooting and Shutting Down + +The system can be shut down (and automatically powered off) by +doing: + + +$ shutdown + + +This is equivalent to running systemctl +poweroff. + +To reboot the system, run + + +$ reboot + + +which is equivalent to systemctl reboot. +Alternatively, you can quickly reboot the system using +kexec, which bypasses the BIOS by directly loading +the new kernel into memory: + + +$ systemctl kexec + + + + +The machine can be suspended to RAM (if supported) using +systemctl suspend, and suspended to disk using +systemctl hibernate. + +These commands can be run by any user who is logged in locally, +i.e. on a virtual console or in X11; otherwise, the user is asked for +authentication. + + \ No newline at end of file diff --git a/nixos/doc/manual/administration/rollback.xml b/nixos/doc/manual/administration/rollback.xml new file mode 100644 index 00000000000..23a3ece7c07 --- /dev/null +++ b/nixos/doc/manual/administration/rollback.xml @@ -0,0 +1,48 @@ +
+ +Rolling Back Configuration Changes + +After running nixos-rebuild to switch to a +new configuration, you may find that the new configuration doesn’t +work very well. In that case, there are several ways to return to a +previous configuration. + +First, the GRUB boot manager allows you to boot into any +previous configuration that hasn’t been garbage-collected. These +configurations can be found under the GRUB submenu “NixOS - All +configurations”. This is especially useful if the new configuration +fails to boot. After the system has booted, you can make the selected +configuration the default for subsequent boots: + + +$ /run/current-system/bin/switch-to-configuration boot + + + +Second, you can switch to the previous configuration in a running +system: + + +$ nixos-rebuild switch --rollback + +This is equivalent to running: + + +$ /nix/var/nix/profiles/system-N-link/bin/switch-to-configuration switch + +where N is the number of the NixOS system +configuration. To get a list of the available configurations, do: + + +$ ls -l /nix/var/nix/profiles/system-*-link +... +lrwxrwxrwx 1 root root 78 Aug 12 13:54 /nix/var/nix/profiles/system-268-link -> /nix/store/202b...-nixos-13.07pre4932_5a676e4-4be1055 + + + + +
\ No newline at end of file diff --git a/nixos/doc/manual/administration/running.xml b/nixos/doc/manual/administration/running.xml new file mode 100644 index 00000000000..9091511ed52 --- /dev/null +++ b/nixos/doc/manual/administration/running.xml @@ -0,0 +1,24 @@ + + +Administration + + +This chapter describes various aspects of managing a running +NixOS system, such as how to use the systemd +service manager. + + + + + + + + + + + + diff --git a/nixos/doc/manual/administration/service-mgmt.xml b/nixos/doc/manual/administration/service-mgmt.xml new file mode 100644 index 00000000000..c0940a42f30 --- /dev/null +++ b/nixos/doc/manual/administration/service-mgmt.xml @@ -0,0 +1,83 @@ + + +Service Management + +In NixOS, all system services are started and monitored using +the systemd program. Systemd is the “init” process of the system +(i.e. PID 1), the parent of all other processes. It manages a set of +so-called “units”, which can be things like system services +(programs), but also mount points, swap files, devices, targets +(groups of units) and more. Units can have complex dependencies; for +instance, one unit can require that another unit must be successfully +started before the first unit can be started. When the system boots, +it starts a unit named default.target; the +dependencies of this unit cause all system services to be started, +file systems to be mounted, swap files to be activated, and so +on. + +The command systemctl is the main way to +interact with systemd. Without any arguments, it +shows the status of active units: + + +$ systemctl +-.mount loaded active mounted / +swapfile.swap loaded active active /swapfile +sshd.service loaded active running SSH Daemon +graphical.target loaded active active Graphical Interface +... + + + + +You can ask for detailed status information about a unit, for +instance, the PostgreSQL database service: + + +$ systemctl status postgresql.service +postgresql.service - PostgreSQL Server + Loaded: loaded (/nix/store/pn3q73mvh75gsrl8w7fdlfk3fq5qm5mw-unit/postgresql.service) + Active: active (running) since Mon, 2013-01-07 15:55:57 CET; 9h ago + Main PID: 2390 (postgres) + CGroup: name=systemd:/system/postgresql.service + ├─2390 postgres + ├─2418 postgres: writer process + ├─2419 postgres: wal writer process + ├─2420 postgres: autovacuum launcher process + ├─2421 postgres: stats collector process + └─2498 postgres: zabbix zabbix [local] idle + +Jan 07 15:55:55 hagbard postgres[2394]: [1-1] LOG: database system was shut down at 2013-01-07 15:55:05 CET +Jan 07 15:55:57 hagbard postgres[2390]: [1-1] LOG: database system is ready to accept connections +Jan 07 15:55:57 hagbard postgres[2420]: [1-1] LOG: autovacuum launcher started +Jan 07 15:55:57 hagbard systemd[1]: Started PostgreSQL Server. + + +Note that this shows the status of the unit (active and running), all +the processes belonging to the service, as well as the most recent log +messages from the service. + + + +Units can be stopped, started or restarted: + + +$ systemctl stop postgresql.service +$ systemctl start postgresql.service +$ systemctl restart postgresql.service + + +These operations are synchronous: they wait until the service has +finished starting or stopping (or has failed). Starting a unit will +cause the dependencies of that unit to be started as well (if +necessary). + + + + diff --git a/nixos/doc/manual/administration/store-corruption.xml b/nixos/doc/manual/administration/store-corruption.xml new file mode 100644 index 00000000000..0160cb45358 --- /dev/null +++ b/nixos/doc/manual/administration/store-corruption.xml @@ -0,0 +1,37 @@ +
+ +Nix Store Corruption + +After a system crash, it’s possible for files in the Nix store +to become corrupted. (For instance, the Ext4 file system has the +tendency to replace un-synced files with zero bytes.) NixOS tries +hard to prevent this from happening: it performs a +sync before switching to a new configuration, and +Nix’s database is fully transactional. If corruption still occurs, +you may be able to fix it automatically. + +If the corruption is in a path in the closure of the NixOS +system configuration, you can fix it by doing + + +$ nixos-rebuild switch --repair + + +This will cause Nix to check every path in the closure, and if its +cryptographic hash differs from the hash recorded in Nix’s database, +the path is rebuilt or redownloaded. + +You can also scan the entire Nix store for corrupt paths: + + +$ nix-store --verify --check-contents --repair + + +Any corrupt paths will be redownloaded if they’re available in a +binary cache; otherwise, they cannot be repaired. + +
\ No newline at end of file diff --git a/nixos/doc/manual/administration/troubleshooting.xml b/nixos/doc/manual/administration/troubleshooting.xml new file mode 100644 index 00000000000..351fb188331 --- /dev/null +++ b/nixos/doc/manual/administration/troubleshooting.xml @@ -0,0 +1,18 @@ + + +Troubleshooting + +This chapter describes solutions to common problems you might +encounter when you manage your NixOS system. + + + + + + + + diff --git a/nixos/doc/manual/administration/user-sessions.xml b/nixos/doc/manual/administration/user-sessions.xml new file mode 100644 index 00000000000..05e2c1a9b29 --- /dev/null +++ b/nixos/doc/manual/administration/user-sessions.xml @@ -0,0 +1,53 @@ + + +User Sessions + +Systemd keeps track of all users who are logged into the system +(e.g. on a virtual console or remotely via SSH). The command +loginctl allows querying and manipulating user +sessions. For instance, to list all user sessions: + + +$ loginctl + SESSION UID USER SEAT + c1 500 eelco seat0 + c3 0 root seat0 + c4 500 alice + + +This shows that two users are logged in locally, while another is +logged in remotely. (“Seats” are essentially the combinations of +displays and input devices attached to the system; usually, there is +only one seat.) To get information about a session: + + +$ loginctl session-status c3 +c3 - root (0) + Since: Tue, 2013-01-08 01:17:56 CET; 4min 42s ago + Leader: 2536 (login) + Seat: seat0; vc3 + TTY: /dev/tty3 + Service: login; type tty; class user + State: online + CGroup: name=systemd:/user/root/c3 + ├─ 2536 /nix/store/10mn4xip9n7y9bxqwnsx7xwx2v2g34xn-shadow-4.1.5.1/bin/login -- + ├─10339 -bash + └─10355 w3m nixos.org + + +This shows that the user is logged in on virtual console 3. It also +lists the processes belonging to this session. Since systemd keeps +track of this, you can terminate a session in a way that ensures that +all the session’s processes are gone: + + +$ loginctl terminate-session c3 + + + + + \ No newline at end of file diff --git a/nixos/doc/manual/configuration.xml b/nixos/doc/manual/configuration.xml deleted file mode 100644 index 64372f3bbf1..00000000000 --- a/nixos/doc/manual/configuration.xml +++ /dev/null @@ -1,1563 +0,0 @@ - - -Configuring NixOS - -This chapter describes how to configure various aspects of a -NixOS machine through the configuration file -/etc/nixos/configuration.nix. As described in -, changes to this file only take -effect after you run nixos-rebuild. - - - - -
Configuration syntax - -
The basics - -The NixOS configuration file -/etc/nixos/configuration.nix is actually a -Nix expression, which is the Nix package -manager’s purely functional language for describing how to build -packages and configurations. This means you have all the expressive -power of that language at your disposal, including the ability to -abstract over common patterns, which is very useful when managing -complex systems. The syntax and semantics of the Nix language are -fully described in the Nix -manual, but here we give a short overview of the most important -constructs useful in NixOS configuration files. - -The NixOS configuration file generally looks like this: - - -{ config, pkgs, ... }: - -{ option definitions -} - - -The first line ({ config, pkgs, ... }:) denotes -that this is actually a function that takes at least the two arguments - config and pkgs. (These are -explained later.) The function returns a set of -option definitions ({ ... }). These definitions have the -form name = -value, where -name is the name of an option and -value is its value. For example, - - -{ config, pkgs, ... }: - -{ services.httpd.enable = true; - services.httpd.adminAddr = "alice@example.org"; - services.httpd.documentRoot = "/webroot"; -} - - -defines a configuration with three option definitions that together -enable the Apache HTTP Server with /webroot as -the document root. - -Sets can be nested, and in fact dots in option names are -shorthand for defining a set containing another set. For instance, - defines a set named -services that contains a set named -httpd, which in turn contains an option definition -named enable with value true. -This means that the example above can also be written as: - - -{ config, pkgs, ... }: - -{ services = { - httpd = { - enable = true; - adminAddr = "alice@example.org"; - documentRoot = "/webroot"; - }; - }; -} - - -which may be more convenient if you have lots of option definitions -that share the same prefix (such as -services.httpd). - -NixOS checks your option definitions for correctness. For -instance, if you try to define an option that doesn’t exist (that is, -doesn’t have a corresponding option declaration), -nixos-rebuild will give an error like: - -The option `services.httpd.enabl' defined in `/etc/nixos/configuration.nix' does not exist. - -Likewise, values in option definitions must have a correct type. For -instance, must be a Boolean -(true or false). Trying to give -it a value of another type, such as a string, will cause an error: - -The option value `services.httpd.enable' in `/etc/nixos/configuration.nix' is not a boolean. - - - - -Options have various types of values. The most important are: - - - - Strings - - Strings are enclosed in double quotes, e.g. - - -networking.hostName = "dexter"; - - - Special characters can be escaped by prefixing them with a - backslash (e.g. \"). - - Multi-line strings can be enclosed in double - single quotes, e.g. - - -networking.extraHosts = - '' - 127.0.0.2 other-localhost - 10.0.0.1 server - ''; - - - The main difference is that preceding whitespace is - automatically stripped from each line, and that characters like - " and \ are not special - (making it more convenient for including things like shell - code). - - - - - Booleans - - These can be true or - false, e.g. - - -networking.firewall.enable = true; -networking.firewall.allowPing = false; - - - - - - - Integers - - For example, - - -boot.kernel.sysctl."net.ipv4.tcp_keepalive_time" = 60; - - - (Note that here the attribute name - net.ipv4.tcp_keepalive_time is enclosed in - quotes to prevent it from being interpreted as a set named - net containing a set named - ipv4, and so on. This is because it’s not a - NixOS option but the literal name of a Linux kernel - setting.) - - - - - Sets - - Sets were introduced above. They are name/value pairs - enclosed in braces, as in the option definition - - -fileSystems."/boot" = - { device = "/dev/sda1"; - fsType = "ext4"; - options = "rw,data=ordered,relatime"; - }; - - - - - - - Lists - - The important thing to note about lists is that list - elements are separated by whitespace, like this: - - -boot.kernelModules = [ "fuse" "kvm-intel" "coretemp" ]; - - - List elements can be any other type, e.g. sets: - - -swapDevices = [ { device = "/dev/disk/by-label/swap"; } ]; - - - - - - - Packages - - Usually, the packages you need are already part of the Nix - Packages collection, which is a set that can be accessed through - the function argument pkgs. Typical uses: - - -environment.systemPackages = - [ pkgs.thunderbird - pkgs.emacs - ]; - -postgresql.package = pkgs.postgresql90; - - - The latter option definition changes the default PostgreSQL - package used by NixOS’s PostgreSQL service to 9.0. For more - information on packages, including how to add new ones, see - . - - - - - - - -
- - -
Abstractions - -If you find yourself repeating yourself over and over, it’s time -to abstract. Take, for instance, this Apache HTTP Server configuration: - - -{ - services.httpd.virtualHosts = - [ { hostName = "example.org"; - documentRoot = "/webroot"; - adminAddr = "alice@example.org"; - enableUserDir = true; - } - { hostName = "example.org"; - documentRoot = "/webroot"; - adminAddr = "alice@example.org"; - enableUserDir = true; - enableSSL = true; - sslServerCert = "/root/ssl-example-org.crt"; - sslServerKey = "/root/ssl-example-org.key"; - } - ]; -} - - -It defines two virtual hosts with nearly identical configuration; the -only difference is that the second one has SSL enabled. To prevent -this duplication, we can use a let: - - -let - exampleOrgCommon = - { hostName = "example.org"; - documentRoot = "/webroot"; - adminAddr = "alice@example.org"; - enableUserDir = true; - }; -in -{ - services.httpd.virtualHosts = - [ exampleOrgCommon - (exampleOrgCommon // { - enableSSL = true; - sslServerCert = "/root/ssl-example-org.crt"; - sslServerKey = "/root/ssl-example-org.key"; - }) - ]; -} - - -The let exampleOrgCommon = -... defines a variable named -exampleOrgCommon. The // -operator merges two attribute sets, so the configuration of the second -virtual host is the set exampleOrgCommon extended -with the SSL options. - -You can write a let wherever an expression is -allowed. Thus, you also could have written: - - -{ - services.httpd.virtualHosts = - let exampleOrgCommon = ...; in - [ exampleOrgCommon - (exampleOrgCommon // { ... }) - ]; -} - - -but not { let exampleOrgCommon = -...; in ...; -} since attributes (as opposed to attribute values) are not -expressions. - -Functions provide another method of -abstraction. For instance, suppose that we want to generate lots of -different virtual hosts, all with identical configuration except for -the host name. This can be done as follows: - - -{ - services.httpd.virtualHosts = - let - makeVirtualHost = name: - { hostName = name; - documentRoot = "/webroot"; - adminAddr = "alice@example.org"; - }; - in - [ (makeVirtualHost "example.org") - (makeVirtualHost "example.com") - (makeVirtualHost "example.gov") - (makeVirtualHost "example.nl") - ]; -} - - -Here, makeVirtualHost is a function that takes a -single argument name and returns the configuration -for a virtual host. That function is then called for several names to -produce the list of virtual host configurations. - -We can further improve on this by using the function -map, which applies another function to every -element in a list: - - -{ - services.httpd.virtualHosts = - let - makeVirtualHost = ...; - in map makeVirtualHost - [ "example.org" "example.com" "example.gov" "example.nl" ]; -} - - -(The function map is called a -higher-order function because it takes another -function as an argument.) - -What if you need more than one argument, for instance, if we -want to use a different documentRoot for each -virtual host? Then we can make makeVirtualHost a -function that takes a set as its argument, like this: - - -{ - services.httpd.virtualHosts = - let - makeVirtualHost = { name, root }: - { hostName = name; - documentRoot = root; - adminAddr = "alice@example.org"; - }; - in map makeVirtualHost - [ { name = "example.org"; root = "/sites/example.org"; } - { name = "example.com"; root = "/sites/example.com"; } - { name = "example.gov"; root = "/sites/example.gov"; } - { name = "example.nl"; root = "/sites/example.nl"; } - ]; -} - - -But in this case (where every root is a subdirectory of -/sites named after the virtual host), it would -have been shorter to define makeVirtualHost as - -makeVirtualHost = name: - { hostName = name; - documentRoot = "/sites/${name}"; - adminAddr = "alice@example.org"; - }; - - -Here, the construct -${...} allows the result -of an expression to be spliced into a string. - -
- - -
Modularity - -The NixOS configuration mechanism is modular. If your -configuration.nix becomes too big, you can split -it into multiple files. Likewise, if you have multiple NixOS -configurations (e.g. for different computers) with some commonality, -you can move the common configuration into a shared file. - -Modules have exactly the same syntax as -configuration.nix. In fact, -configuration.nix is itself a module. You can -use other modules by including them from -configuration.nix, e.g.: - - -{ config, pkgs, ... }: - -{ imports = [ ./vpn.nix ./kde.nix ]; - services.httpd.enable = true; - environment.systemPackages = [ pkgs.emacs ]; - ... -} - - -Here, we include two modules from the same directory, -vpn.nix and kde.nix. The -latter might look like this: - - -{ config, pkgs, ... }: - -{ services.xserver.enable = true; - services.xserver.displayManager.kdm.enable = true; - services.xserver.desktopManager.kde4.enable = true; - environment.systemPackages = [ pkgs.kde4.kscreensaver ]; -} - - -Note that both configuration.nix and -kde.nix define the option -. When multiple modules -define an option, NixOS will try to merge the -definitions. In the case of -, that’s easy: the lists of -packages can simply be concatenated. The value in -configuration.nix is merged last, so for -list-type options, it will appear at the end of the merged list. If -you want it to appear first, you can use mkBefore: - - -boot.kernelModules = mkBefore [ "kvm-intel" ]; - - -This causes the kvm-intel kernel module to be -loaded before any other kernel modules. - -For other types of options, a merge may not be possible. For -instance, if two modules define -, -nixos-rebuild will give an error: - - -The unique option `services.httpd.adminAddr' is defined multiple times, in `/etc/nixos/httpd.nix' and `/etc/nixos/configuration.nix'. - - -When that happens, it’s possible to force one definition take -precedence over the others: - - -services.httpd.adminAddr = pkgs.lib.mkForce "bob@example.org"; - - - - -When using multiple modules, you may need to access -configuration values defined in other modules. This is what the -config function argument is for: it contains the -complete, merged system configuration. That is, -config is the result of combining the -configurations returned by every moduleIf you’re -wondering how it’s possible that the (indirect) -result of a function is passed as an -input to that same function: that’s because Nix -is a “lazy” language — it only computes values when they are needed. -This works as long as no individual configuration value depends on -itself.. For example, here is a module that adds -some packages to only if - is set to -true somewhere else: - - -{ config, pkgs, ... }: - -{ environment.systemPackages = - if config.services.xserver.enable then - [ pkgs.firefox - pkgs.thunderbird - ] - else - [ ]; -} - - - - -With multiple modules, it may not be obvious what the final -value of a configuration option is. The command - allows you to find out: - - -$ nixos-option services.xserver.enable -true - -$ nixos-option boot.kernelModules -[ "tun" "ipv6" "loop" ... ] - - -Interactive exploration of the configuration is possible using -nix-repl, -a read-eval-print loop for Nix expressions. It’s not installed by -default; run nix-env -i nix-repl to get it. A -typical use: - - -$ nix-repl '<nixos>' - -nix-repl> config.networking.hostName -"mandark" - -nix-repl> map (x: x.hostName) config.services.httpd.virtualHosts -[ "example.org" "example.gov" ] - - - - -
- - -
Syntax summary - -Below is a summary of the most important syntactic constructs in -the Nix expression language. It’s not complete. In particular, there -are many other built-in functions. See the Nix -manual for the rest. - - - - - - - - Example - Description - - - - - - Basic values - - - "Hello world" - A string - - - "${pkgs.bash}/bin/sh" - A string containing an expression (expands to "/nix/store/hash-bash-version/bin/sh") - - - true, false - Booleans - - - 123 - An integer - - - ./foo.png - A path (relative to the containing Nix expression) - - - - Compound values - - - { x = 1; y = 2; } - An set with attributes names x and y - - - { foo.bar = 1; } - A nested set, equivalent to { foo = { bar = 1; }; } - - - rec { x = "bla"; y = x + "bar"; } - A recursive set, equivalent to { x = "foo"; y = "foobar"; } - - - [ "foo" "bar" ] - A list with two elements - - - - Operators - - - "foo" + "bar" - String concatenation - - - 1 + 2 - Integer addition - - - "foo" == "f" + "oo" - Equality test (evaluates to true) - - - "foo" != "bar" - Inequality test (evaluates to true) - - - !true - Boolean negation - - - { x = 1; y = 2; }.x - Attribute selection (evaluates to 1) - - - { x = 1; y = 2; }.z or 3 - Attribute selection with default (evaluates to 3) - - - { x = 1; y = 2; } // { z = 3; } - Merge two sets (attributes in the right-hand set taking precedence) - - - - Control structures - - - if 1 + 1 == 2 then "yes!" else "no!" - Conditional expression - - - assert 1 + 1 == 2; "yes!" - Assertion check (evaluates to "yes!") - - - let x = "foo"; y = "bar"; in x + y - Variable definition - - - with pkgs.lib; head [ 1 2 3 ] - Add all attributes from the given set to the scope - (evaluates to 1) - - - - Functions (lambdas) - - - x: x + 1 - A function that expects an integer and returns it increased by 1 - - - (x: x + 1) 100 - A function call (evaluates to 101) - - - let inc = x: x + 1; in inc (inc (inc 100)) - A function bound to a variable and subsequently called by name (evaluates to 103) - - - { x, y }: x + y - A function that expects a set with required attributes - x and y and concatenates - them - - - { x, y ? "bar" }: x + y - A function that expects a set with required attribute - x and optional y, using - "bar" as default value for - y - - - { x, y, ... }: x + y - A function that expects a set with required attributes - x and y and ignores any - other attributes - - - { x, y } @ args: x + y - A function that expects a set with required attributes - x and y, and binds the - whole set to args - - - - Built-in functions - - - import ./foo.nix - Load and return Nix expression in given file - - - map (x: x + x) [ 1 2 3 ] - Apply a function to every element of a list (evaluates to [ 2 4 6 ]) - - - - - - - -
- - -
- - - - -
Package management - -This section describes how to add additional packages to your -system. NixOS has two distinct styles of package management: - - - - Declarative, where you declare - what packages you want in your - configuration.nix. Every time you run - nixos-rebuild, NixOS will ensure that you get a - consistent set of binaries corresponding to your - specification. - - Ad hoc, where you install, - upgrade and uninstall packages via the nix-env - command. This style allows mixing packages from different Nixpkgs - versions. It’s the only choice for non-root - users. - - - - - -The next two sections describe these two styles. - - -
Declarative package management - -With declarative package management, you specify which packages -you want on your system by setting the option -. For instance, adding the -following line to configuration.nix enables the -Mozilla Thunderbird email application: - - -environment.systemPackages = [ pkgs.thunderbird ]; - - -The effect of this specification is that the Thunderbird package from -Nixpkgs will be built or downloaded as part of the system when you run -nixos-rebuild switch. - -You can get a list of the available packages as follows: - -$ nix-env -qaP '*' --description -nixos.pkgs.firefox firefox-23.0 Mozilla Firefox - the browser, reloaded -... - - -The first column in the output is the attribute -name, such as -nixos.pkgs.thunderbird. (The -nixos prefix allows distinguishing between -different channels that you might have.) - -To “uninstall” a package, simply remove it from - and run -nixos-rebuild switch. - - -
Customising packages - -Some packages in Nixpkgs have options to enable or disable -optional functionality or change other aspects of the package. For -instance, the Firefox wrapper package (which provides Firefox with a -set of plugins such as the Adobe Flash player) has an option to enable -the Google Talk plugin. It can be set in -configuration.nix as follows: - - -nixpkgs.config.firefox.enableGoogleTalkPlugin = true; - - - -Unfortunately, Nixpkgs currently lacks a way to query -available configuration options. - -Apart from high-level options, it’s possible to tweak a package -in almost arbitrary ways, such as changing or disabling dependencies -of a package. For instance, the Emacs package in Nixpkgs by default -has a dependency on GTK+ 2. If you want to build it against GTK+ 3, -you can specify that as follows: - - -environment.systemPackages = [ (pkgs.emacs.override { gtk = pkgs.gtk3; }) ]; - - -The function override performs the call to the Nix -function that produces Emacs, with the original arguments amended by -the set of arguments specified by you. So here the function argument -gtk gets the value pkgs.gtk3, -causing Emacs to depend on GTK+ 3. (The parentheses are necessary -because in Nix, function application binds more weakly than list -construction, so without them, -environment.systemPackages would be a list with two -elements.) - -Even greater customisation is possible using the function -overrideDerivation. While the -override mechanism above overrides the arguments of -a package function, overrideDerivation allows -changing the result of the function. This -permits changing any aspect of the package, such as the source code. -For instance, if you want to override the source code of Emacs, you -can say: - - -environment.systemPackages = - [ (pkgs.lib.overrideDerivation pkgs.emacs (attrs: { - name = "emacs-25.0-pre"; - src = /path/to/my/emacs/tree; - })) - ]; - - -Here, overrideDerivation takes the Nix derivation -specified by pkgs.emacs and produces a new -derivation in which the original’s name and -src attribute have been replaced by the given -values. The original attributes are accessible via -attrs. - -The overrides shown above are not global. They do not affect -the original package; other packages in Nixpkgs continue to depend on -the original rather than the customised package. This means that if -another package in your system depends on the original package, you -end up with two instances of the package. If you want to have -everything depend on your customised instance, you can apply a -global override as follows: - - -nixpkgs.config.packageOverrides = pkgs: - { emacs = pkgs.emacs.override { gtk = pkgs.gtk3; }; - }; - - -The effect of this definition is essentially equivalent to modifying -the emacs attribute in the Nixpkgs source tree. -Any package in Nixpkgs that depends on emacs will -be passed your customised instance. (However, the value -pkgs.emacs in -nixpkgs.config.packageOverrides refers to the -original rather than overridden instance, to prevent an infinite -recursion.) - -
- -
Adding custom packages - -It’s possible that a package you need is not available in NixOS. -In that case, you can do two things. First, you can clone the Nixpkgs -repository, add the package to your clone, and (optionally) submit a -patch or pull request to have it accepted into the main Nixpkgs -repository. This is described in detail in the Nixpkgs manual. -In short, you clone Nixpkgs: - - -$ git clone git://github.com/NixOS/nixpkgs.git -$ cd nixpkgs - - -Then you write and test the package as described in the Nixpkgs -manual. Finally, you add it to -environment.systemPackages, e.g. - - -environment.systemPackages = [ pkgs.my-package ]; - - -and you run nixos-rebuild, specifying your own -Nixpkgs tree: - - -$ nixos-rebuild switch -I nixpkgs=/path/to/my/nixpkgs - - - -The second possibility is to add the package outside of the -Nixpkgs tree. For instance, here is how you specify a build of the -GNU Hello -package directly in configuration.nix: - - -environment.systemPackages = - let - my-hello = with pkgs; stdenv.mkDerivation rec { - name = "hello-2.8"; - src = fetchurl { - url = "mirror://gnu/hello/${name}.tar.gz"; - sha256 = "0wqd8sjmxfskrflaxywc7gqw7sfawrfvdxd9skxawzfgyy0pzdz6"; - }; - }; - in - [ my-hello ]; - - -Of course, you can also move the definition of -my-hello into a separate Nix expression, e.g. - -environment.systemPackages = [ (import ./my-hello.nix) ]; - -where my-hello.nix contains: - -with import <nixpkgs> {}; # bring all of Nixpkgs into scope - -stdenv.mkDerivation rec { - name = "hello-2.8"; - src = fetchurl { - url = "mirror://gnu/hello/${name}.tar.gz"; - sha256 = "0wqd8sjmxfskrflaxywc7gqw7sfawrfvdxd9skxawzfgyy0pzdz6"; - }; -} - - -This allows testing the package easily: - -$ nix-build my-hello.nix -$ ./result/bin/hello -Hello, world! - - - - -
- -
- - -
Ad hoc package management - -With the command nix-env, you can install and -uninstall packages from the command line. For instance, to install -Mozilla Thunderbird: - - -$ nix-env -iA nixos.pkgs.thunderbird - -If you invoke this as root, the package is installed in the Nix -profile /nix/var/nix/profiles/default and visible -to all users of the system; otherwise, the package ends up in -/nix/var/nix/profiles/per-user/username/profile -and is not visible to other users. The flag -specifies the package by its attribute name; without it, the package -is installed by matching against its package name -(e.g. thunderbird). The latter is slower because -it requires matching against all available Nix packages, and is -ambiguous if there are multiple matching packages. - -Packages come from the NixOS channel. You typically upgrade a -package by updating to the latest version of the NixOS channel: - -$ nix-channel --update nixos - -and then running nix-env -i again. Other packages -in the profile are not affected; this is the -crucial difference with the declarative style of package management, -where running nixos-rebuild switch causes all -packages to be updated to their current versions in the NixOS channel. -You can however upgrade all packages for which there is a newer -version by doing: - -$ nix-env -u '*' - - - -A package can be uninstalled using the -flag: - -$ nix-env -e thunderbird - - - -Finally, you can roll back an undesirable -nix-env action: - -$ nix-env --rollback - - - -nix-env has many more flags. For details, -see the -nix-env1 -manpage or the Nix manual. - -
- - -
- - - - -
User management - -NixOS supports both declarative and imperative styles of user -management. In the declarative style, users are specified in -configuration.nix. For instance, the following -states that a user account named alice shall exist: - - -users.extraUsers.alice = - { createHome = true; - home = "/home/alice"; - description = "Alice Foobar"; - extraGroups = [ "wheel" "networkmanager" ]; - useDefaultShell = true; - openssh.authorizedKeys.keys = [ "ssh-dss AAAAB3Nza... alice@foobar" ]; - }; - - -Note that alice is a member of the -wheel and networkmanager groups, -which allows her to use sudo to execute commands as -root and to configure the network, respectively. -Also note the SSH public key that allows remote logins with the -corresponding private key. Users created in this way do not have a -password by default, so they cannot log in via mechanisms that require -a password. However, you can use the passwd program -to set a password, which is retained across invocations of -nixos-rebuild. - -If you set users.mutableUsers to false, then the contents of /etc/passwd -and /etc/group will be congruent to your NixOS configuration. For instance, -if you remove a user from users.extraUsers and run nixos-rebuild, the user -account will cease to exist. Also, imperative commands for managing users -and groups, such as useradd, are no longer available. - -A user ID (uid) is assigned automatically. You can also specify -a uid manually by adding - - - uid = 1000; - - -to the user specification. - -Groups can be specified similarly. The following states that a -group named students shall exist: - - -users.extraGroups.students.gid = 1000; - - -As with users, the group ID (gid) is optional and will be assigned -automatically if it’s missing. - -Currently declarative user management is not perfect: -nixos-rebuild does not know how to realise certain -configuration changes. This includes removing a user or group, and -removing group membership from a user. - -In the imperative style, users and groups are managed by -commands such as useradd, -groupmod and so on. For instance, to create a user -account named alice: - - -$ useradd -m alice - -The flag causes the creation of a home directory -for the new user, which is generally what you want. The user does not -have an initial password and therefore cannot log in. A password can -be set using the passwd utility: - - -$ passwd alice -Enter new UNIX password: *** -Retype new UNIX password: *** - - -A user can be deleted using userdel: - - -$ userdel -r alice - -The flag deletes the user’s home directory. -Accounts can be modified using usermod. Unix -groups can be managed using groupadd, -groupmod and groupdel. - -
- - - - -
File systems - -You can define file systems using the - configuration option. For instance, the -following definition causes NixOS to mount the Ext4 file system on -device /dev/disk/by-label/data onto the mount -point /data: - - -fileSystems."/data" = - { device = "/dev/disk/by-label/data"; - fsType = "ext4"; - }; - - -Mount points are created automatically if they don’t already exist. -For , it’s best to use the topology-independent -device aliases in /dev/disk/by-label and -/dev/disk/by-uuid, as these don’t change if the -topology changes (e.g. if a disk is moved to another IDE -controller). - -You can usually omit the file system type -(), since mount can usually -detect the type and load the necessary kernel module automatically. -However, if the file system is needed at early boot (in the initial -ramdisk) and is not ext2, ext3 -or ext4, then it’s best to specify - to ensure that the kernel module is -available. - -
LUKS-encrypted file systems - -NixOS supports file systems that are encrypted using -LUKS (Linux Unified Key Setup). For example, -here is how you create an encrypted Ext4 file system on the device -/dev/sda2: - - -$ cryptsetup luksFormat /dev/sda2 - -WARNING! -======== -This will overwrite data on /dev/sda2 irrevocably. - -Are you sure? (Type uppercase yes): YES -Enter LUKS passphrase: *** -Verify passphrase: *** - -$ cryptsetup luksOpen /dev/sda2 crypted -Enter passphrase for /dev/sda2: *** - -$ mkfs.ext4 /dev/mapper/crypted - - -To ensure that this file system is automatically mounted at boot time -as /, add the following to -configuration.nix: - - -boot.initrd.luks.devices = [ { device = "/dev/sda2"; name = "crypted"; } ]; -fileSystems."/".device = "/dev/mapper/crypted"; - - - - -
- -
- - - - -
X Window System - -The X Window System (X11) provides the basis of NixOS’ graphical -user interface. It can be enabled as follows: - -services.xserver.enable = true; - -The X server will automatically detect and use the appropriate video -driver from a set of X.org drivers (such as vesa -and intel). You can also specify a driver -manually, e.g. - -services.xserver.videoDrivers = [ "r128" ]; - -to enable X.org’s xf86-video-r128 driver. - -You also need to enable at least one desktop or window manager. -Otherwise, you can only log into a plain undecorated -xterm window. Thus you should pick one or more of -the following lines: - -services.xserver.desktopManager.kde4.enable = true; -services.xserver.desktopManager.xfce.enable = true; -services.xserver.windowManager.xmonad.enable = true; -services.xserver.windowManager.twm.enable = true; -services.xserver.windowManager.icewm.enable = true; - - - -NixOS’s default display manager (the -program that provides a graphical login prompt and manages the X -server) is SLiM. You can select KDE’s kdm instead: - -services.xserver.displayManager.kdm.enable = true; - - - -The X server is started automatically at boot time. If you -don’t want this to happen, you can set: - -services.xserver.autorun = false; - -The X server can then be started manually: - -$ systemctl start display-manager.service - - - - -
NVIDIA graphics cards - -NVIDIA provides a proprietary driver for its graphics cards that -has better 3D performance than the X.org drivers. It is not enabled -by default because it’s not free software. You can enable it as follows: - -services.xserver.videoDrivers = [ "nvidia" ]; - -You may need to reboot after enabling this driver to prevent a clash -with other kernel modules. - -On 64-bit systems, if you want full acceleration for 32-bit -programs such as Wine, you should also set the following: - -services.xserver.driSupport32Bit = true; - - - -
- - -
Touchpads - -Support for Synaptics touchpads (found in many laptops such as -the Dell Latitude series) can be enabled as follows: - -services.xserver.synaptics.enable = true; - -The driver has many options (see ). For -instance, the following enables two-finger scrolling: - -services.xserver.synaptics.twoFingerScroll = true; - - - -
- - -
- - - - -
Networking - -
NetworkManager - -To facilitate network configuration, some desktop environments -use NetworkManager. You can enable NetworkManager by setting: - - -services.networkmanager.enable = true; - - -Some desktop managers (e.g., GNOME) enable NetworkManager -automatically for you. - -All users that should have permission to change network settings -must belong to the networkmanager group. - -services.networkmanager and -services.wireless can not be enabled at the same time: -you can still connect to the wireless networks using -NetworkManager. - -
- -
Secure shell access - -Secure shell (SSH) access to your machine can be enabled by -setting: - - -services.openssh.enable = true; - - -By default, root logins using a password are disallowed. They can be -disabled entirely by setting -services.openssh.permitRootLogin to -"no". - -You can declaratively specify authorised RSA/DSA public keys for -a user as follows: - - - -users.extraUsers.alice.openssh.authorizedKeys.keys = - [ "ssh-dss AAAAB3NzaC1kc3MAAACBAPIkGWVEt4..." ]; - - - - -
- - -
IPv4 configuration - -By default, NixOS uses DHCP (specifically, -dhcpcd) to automatically configure network -interfaces. However, you can configure an interface manually as -follows: - - -networking.interfaces.eth0 = { ipAddress = "192.168.1.2"; prefixLength = 24; }; - - -(The network prefix can also be specified using the option -subnetMask, -e.g. "255.255.255.0", but this is deprecated.) -Typically you’ll also want to set a default gateway and set of name -servers: - - -networking.defaultGateway = "192.168.1.1"; -networking.nameservers = [ "8.8.8.8" ]; - - - - -Statically configured interfaces are set up by the systemd -service -interface-name-cfg.service. -The default gateway and name server configuration is performed by -network-setup.service. - -The host name is set using : - - -networking.hostName = "cartman"; - - -The default host name is nixos. Set it to the -empty string ("") to allow the DHCP server to -provide the host name. - -
- - -
IPv6 configuration - -IPv6 is enabled by default. Stateless address autoconfiguration -is used to automatically assign IPv6 addresses to all interfaces. You -can disable IPv6 support globally by setting: - - -networking.enableIPv6 = false; - - - - -
- - -
Firewall - -NixOS has a simple stateful firewall that blocks incoming -connections and other unexpected packets. The firewall applies to -both IPv4 and IPv6 traffic. It is enabled by default. It can be -disabled as follows: - - -networking.firewall.enable = false; - - -If the firewall is enabled, you can open specific TCP ports to the -outside world: - - -networking.firewall.allowedTCPPorts = [ 80 443 ]; - - -Note that TCP port 22 (ssh) is opened automatically if the SSH daemon -is enabled (). UDP -ports can be opened through -. Also of -interest is - - -networking.firewall.allowPing = true; - - -to allow the machine to respond to ping requests. (ICMPv6 pings are -always allowed.) - -
- - -
Wireless networks - -For a desktop installation using NetworkManager (e.g., GNOME), -you just have to make sure the user is in the -networkmanager group and you can skip the rest of this -section on wireless networks. - - -NixOS will start wpa_supplicant for you if you enable this setting: - - -networking.wireless.enable = true; - - -NixOS currently does not generate wpa_supplicant's -configuration file, /etc/wpa_supplicant.conf. You should edit this file -yourself to define wireless networks, WPA keys and so on (see -wpa_supplicant.conf(5)). - - - -If you are using WPA2 the wpa_passphrase tool might be useful -to generate the wpa_supplicant.conf. - - -$ wpa_passphrase ESSID PSK > /etc/wpa_supplicant.conf - -After you have edited the wpa_supplicant.conf, -you need to restart the wpa_supplicant service. - - -$ systemctl restart wpa_supplicant.service - - - -
- - -
Ad-hoc configuration - -You can use to specify -shell commands to be run at the end of -network-setup.service. This is useful for doing -network configuration not covered by the existing NixOS modules. For -instance, to statically configure an IPv6 address: - - -networking.localCommands = - '' - ip -6 addr add 2001:610:685:1::1/64 dev eth0 - ''; - - - - -
- - - - - -
- - - - -
Linux kernel - -You can override the Linux kernel and associated packages using -the option . For instance, this -selects the Linux 3.10 kernel: - -boot.kernelPackages = pkgs.linuxPackages_3_10; - -Note that this not only replaces the kernel, but also packages that -are specific to the kernel version, such as the NVIDIA video drivers. -This ensures that driver packages are consistent with the -kernel. - -The default Linux kernel configuration should be fine for most users. You can see the configuration of your current kernel with the following command: - -cat /proc/config.gz | gunzip - -If you want to change the kernel configuration, you can use the - feature (see ). For instance, to enable -support for the kernel debugger KGDB: - - -nixpkgs.config.packageOverrides = pkgs: - { linux_3_4 = pkgs.linux_3_4.override { - extraConfig = - '' - KGDB y - ''; - }; - }; - - -extraConfig takes a list of Linux kernel -configuration options, one per line. The name of the option should -not include the prefix CONFIG_. The option value -is typically y, n or -m (to build something as a kernel module). - -Kernel modules for hardware devices are generally loaded -automatically by udev. You can force a module to -be loaded via , e.g. - -boot.kernelModules = [ "fuse" "kvm-intel" "coretemp" ]; - -If the module is required early during the boot (e.g. to mount the -root file system), you can use -: - -boot.initrd.extraKernelModules = [ "cifs" ]; - -This causes the specified modules and their dependencies to be added -to the initial ramdark. - -Kernel runtime parameters can be set through -, e.g. - -boot.kernel.sysctl."net.ipv4.tcp_keepalive_time" = 120; - -sets the kernel’s TCP keepalive time to 120 seconds. To see the -available parameters, run sysctl -a. - -
- - - - - - diff --git a/nixos/doc/manual/configuration/LUKS-file-systems.xml b/nixos/doc/manual/configuration/LUKS-file-systems.xml new file mode 100644 index 00000000000..45475dbcd44 --- /dev/null +++ b/nixos/doc/manual/configuration/LUKS-file-systems.xml @@ -0,0 +1,42 @@ +
+ +LUKS-Encrypted File Systems + +NixOS supports file systems that are encrypted using +LUKS (Linux Unified Key Setup). For example, +here is how you create an encrypted Ext4 file system on the device +/dev/sda2: + + +$ cryptsetup luksFormat /dev/sda2 + +WARNING! +======== +This will overwrite data on /dev/sda2 irrevocably. + +Are you sure? (Type uppercase yes): YES +Enter LUKS passphrase: *** +Verify passphrase: *** + +$ cryptsetup luksOpen /dev/sda2 crypted +Enter passphrase for /dev/sda2: *** + +$ mkfs.ext4 /dev/mapper/crypted + + +To ensure that this file system is automatically mounted at boot time +as /, add the following to +configuration.nix: + + +boot.initrd.luks.devices = [ { device = "/dev/sda2"; name = "crypted"; } ]; +fileSystems."/".device = "/dev/mapper/crypted"; + + + + +
diff --git a/nixos/doc/manual/configuration/abstractions.xml b/nixos/doc/manual/configuration/abstractions.xml new file mode 100644 index 00000000000..cbd54bca62f --- /dev/null +++ b/nixos/doc/manual/configuration/abstractions.xml @@ -0,0 +1,166 @@ +
+ +Abstractions + +If you find yourself repeating yourself over and over, it’s time +to abstract. Take, for instance, this Apache HTTP Server configuration: + + +{ + services.httpd.virtualHosts = + [ { hostName = "example.org"; + documentRoot = "/webroot"; + adminAddr = "alice@example.org"; + enableUserDir = true; + } + { hostName = "example.org"; + documentRoot = "/webroot"; + adminAddr = "alice@example.org"; + enableUserDir = true; + enableSSL = true; + sslServerCert = "/root/ssl-example-org.crt"; + sslServerKey = "/root/ssl-example-org.key"; + } + ]; +} + + +It defines two virtual hosts with nearly identical configuration; the +only difference is that the second one has SSL enabled. To prevent +this duplication, we can use a let: + + +let + exampleOrgCommon = + { hostName = "example.org"; + documentRoot = "/webroot"; + adminAddr = "alice@example.org"; + enableUserDir = true; + }; +in +{ + services.httpd.virtualHosts = + [ exampleOrgCommon + (exampleOrgCommon // { + enableSSL = true; + sslServerCert = "/root/ssl-example-org.crt"; + sslServerKey = "/root/ssl-example-org.key"; + }) + ]; +} + + +The let exampleOrgCommon = +... defines a variable named +exampleOrgCommon. The // +operator merges two attribute sets, so the configuration of the second +virtual host is the set exampleOrgCommon extended +with the SSL options. + +You can write a let wherever an expression is +allowed. Thus, you also could have written: + + +{ + services.httpd.virtualHosts = + let exampleOrgCommon = ...; in + [ exampleOrgCommon + (exampleOrgCommon // { ... }) + ]; +} + + +but not { let exampleOrgCommon = +...; in ...; +} since attributes (as opposed to attribute values) are not +expressions. + +Functions provide another method of +abstraction. For instance, suppose that we want to generate lots of +different virtual hosts, all with identical configuration except for +the host name. This can be done as follows: + + +{ + services.httpd.virtualHosts = + let + makeVirtualHost = name: + { hostName = name; + documentRoot = "/webroot"; + adminAddr = "alice@example.org"; + }; + in + [ (makeVirtualHost "example.org") + (makeVirtualHost "example.com") + (makeVirtualHost "example.gov") + (makeVirtualHost "example.nl") + ]; +} + + +Here, makeVirtualHost is a function that takes a +single argument name and returns the configuration +for a virtual host. That function is then called for several names to +produce the list of virtual host configurations. + +We can further improve on this by using the function +map, which applies another function to every +element in a list: + + +{ + services.httpd.virtualHosts = + let + makeVirtualHost = ...; + in map makeVirtualHost + [ "example.org" "example.com" "example.gov" "example.nl" ]; +} + + +(The function map is called a +higher-order function because it takes another +function as an argument.) + +What if you need more than one argument, for instance, if we +want to use a different documentRoot for each +virtual host? Then we can make makeVirtualHost a +function that takes a set as its argument, like this: + + +{ + services.httpd.virtualHosts = + let + makeVirtualHost = { name, root }: + { hostName = name; + documentRoot = root; + adminAddr = "alice@example.org"; + }; + in map makeVirtualHost + [ { name = "example.org"; root = "/sites/example.org"; } + { name = "example.com"; root = "/sites/example.com"; } + { name = "example.gov"; root = "/sites/example.gov"; } + { name = "example.nl"; root = "/sites/example.nl"; } + ]; +} + + +But in this case (where every root is a subdirectory of +/sites named after the virtual host), it would +have been shorter to define makeVirtualHost as + +makeVirtualHost = name: + { hostName = name; + documentRoot = "/sites/${name}"; + adminAddr = "alice@example.org"; + }; + + +Here, the construct +${...} allows the result +of an expression to be spliced into a string. + +
diff --git a/nixos/doc/manual/configuration/ad-hoc-network-config.xml b/nixos/doc/manual/configuration/ad-hoc-network-config.xml new file mode 100644 index 00000000000..26a572ba1fb --- /dev/null +++ b/nixos/doc/manual/configuration/ad-hoc-network-config.xml @@ -0,0 +1,24 @@ +
+ +Ad-Hoc Configuration + +You can use to specify +shell commands to be run at the end of +network-setup.service. This is useful for doing +network configuration not covered by the existing NixOS modules. For +instance, to statically configure an IPv6 address: + + +networking.localCommands = + '' + ip -6 addr add 2001:610:685:1::1/64 dev eth0 + ''; + + + + +
diff --git a/nixos/doc/manual/configuration/ad-hoc-packages.xml b/nixos/doc/manual/configuration/ad-hoc-packages.xml new file mode 100644 index 00000000000..e237e20c4ff --- /dev/null +++ b/nixos/doc/manual/configuration/ad-hoc-packages.xml @@ -0,0 +1,63 @@ +
+ +Ad-Hoc Package Management + +With the command nix-env, you can install and +uninstall packages from the command line. For instance, to install +Mozilla Thunderbird: + + +$ nix-env -iA nixos.pkgs.thunderbird + +If you invoke this as root, the package is installed in the Nix +profile /nix/var/nix/profiles/default and visible +to all users of the system; otherwise, the package ends up in +/nix/var/nix/profiles/per-user/username/profile +and is not visible to other users. The flag +specifies the package by its attribute name; without it, the package +is installed by matching against its package name +(e.g. thunderbird). The latter is slower because +it requires matching against all available Nix packages, and is +ambiguous if there are multiple matching packages. + +Packages come from the NixOS channel. You typically upgrade a +package by updating to the latest version of the NixOS channel: + +$ nix-channel --update nixos + +and then running nix-env -i again. Other packages +in the profile are not affected; this is the +crucial difference with the declarative style of package management, +where running nixos-rebuild switch causes all +packages to be updated to their current versions in the NixOS channel. +You can however upgrade all packages for which there is a newer +version by doing: + +$ nix-env -u '*' + + + +A package can be uninstalled using the +flag: + +$ nix-env -e thunderbird + + + +Finally, you can roll back an undesirable +nix-env action: + +$ nix-env --rollback + + + +nix-env has many more flags. For details, +see the +nix-env1 +manpage or the Nix manual. + +
diff --git a/nixos/doc/manual/configuration/adding-custom-packages.xml b/nixos/doc/manual/configuration/adding-custom-packages.xml new file mode 100644 index 00000000000..c1789fcbc04 --- /dev/null +++ b/nixos/doc/manual/configuration/adding-custom-packages.xml @@ -0,0 +1,84 @@ +
+ +Adding Custom Packages + +It’s possible that a package you need is not available in NixOS. +In that case, you can do two things. First, you can clone the Nixpkgs +repository, add the package to your clone, and (optionally) submit a +patch or pull request to have it accepted into the main Nixpkgs +repository. This is described in detail in the Nixpkgs manual. +In short, you clone Nixpkgs: + + +$ git clone git://github.com/NixOS/nixpkgs.git +$ cd nixpkgs + + +Then you write and test the package as described in the Nixpkgs +manual. Finally, you add it to +environment.systemPackages, e.g. + + +environment.systemPackages = [ pkgs.my-package ]; + + +and you run nixos-rebuild, specifying your own +Nixpkgs tree: + + +$ nixos-rebuild switch -I nixpkgs=/path/to/my/nixpkgs + + + +The second possibility is to add the package outside of the +Nixpkgs tree. For instance, here is how you specify a build of the +GNU Hello +package directly in configuration.nix: + + +environment.systemPackages = + let + my-hello = with pkgs; stdenv.mkDerivation rec { + name = "hello-2.8"; + src = fetchurl { + url = "mirror://gnu/hello/${name}.tar.gz"; + sha256 = "0wqd8sjmxfskrflaxywc7gqw7sfawrfvdxd9skxawzfgyy0pzdz6"; + }; + }; + in + [ my-hello ]; + + +Of course, you can also move the definition of +my-hello into a separate Nix expression, e.g. + +environment.systemPackages = [ (import ./my-hello.nix) ]; + +where my-hello.nix contains: + +with import <nixpkgs> {}; # bring all of Nixpkgs into scope + +stdenv.mkDerivation rec { + name = "hello-2.8"; + src = fetchurl { + url = "mirror://gnu/hello/${name}.tar.gz"; + sha256 = "0wqd8sjmxfskrflaxywc7gqw7sfawrfvdxd9skxawzfgyy0pzdz6"; + }; +} + + +This allows testing the package easily: + +$ nix-build my-hello.nix +$ ./result/bin/hello +Hello, world! + + + + +
diff --git a/nixos/doc/manual/configuration/config-file.xml b/nixos/doc/manual/configuration/config-file.xml new file mode 100644 index 00000000000..2a58ff25941 --- /dev/null +++ b/nixos/doc/manual/configuration/config-file.xml @@ -0,0 +1,213 @@ +
+ +NixOS Configuration File + +The NixOS configuration file generally looks like this: + + +{ config, pkgs, ... }: + +{ option definitions +} + + +The first line ({ config, pkgs, ... }:) denotes +that this is actually a function that takes at least the two arguments + config and pkgs. (These are +explained later.) The function returns a set of +option definitions ({ ... }). These definitions have the +form name = +value, where +name is the name of an option and +value is its value. For example, + + +{ config, pkgs, ... }: + +{ services.httpd.enable = true; + services.httpd.adminAddr = "alice@example.org"; + services.httpd.documentRoot = "/webroot"; +} + + +defines a configuration with three option definitions that together +enable the Apache HTTP Server with /webroot as +the document root. + +Sets can be nested, and in fact dots in option names are +shorthand for defining a set containing another set. For instance, + defines a set named +services that contains a set named +httpd, which in turn contains an option definition +named enable with value true. +This means that the example above can also be written as: + + +{ config, pkgs, ... }: + +{ services = { + httpd = { + enable = true; + adminAddr = "alice@example.org"; + documentRoot = "/webroot"; + }; + }; +} + + +which may be more convenient if you have lots of option definitions +that share the same prefix (such as +services.httpd). + +NixOS checks your option definitions for correctness. For +instance, if you try to define an option that doesn’t exist (that is, +doesn’t have a corresponding option declaration), +nixos-rebuild will give an error like: + +The option `services.httpd.enabl' defined in `/etc/nixos/configuration.nix' does not exist. + +Likewise, values in option definitions must have a correct type. For +instance, must be a Boolean +(true or false). Trying to give +it a value of another type, such as a string, will cause an error: + +The option value `services.httpd.enable' in `/etc/nixos/configuration.nix' is not a boolean. + + + + +Options have various types of values. The most important are: + + + + Strings + + Strings are enclosed in double quotes, e.g. + + +networking.hostName = "dexter"; + + + Special characters can be escaped by prefixing them with a + backslash (e.g. \"). + + Multi-line strings can be enclosed in double + single quotes, e.g. + + +networking.extraHosts = + '' + 127.0.0.2 other-localhost + 10.0.0.1 server + ''; + + + The main difference is that preceding whitespace is + automatically stripped from each line, and that characters like + " and \ are not special + (making it more convenient for including things like shell + code). + + + + + Booleans + + These can be true or + false, e.g. + + +networking.firewall.enable = true; +networking.firewall.allowPing = false; + + + + + + + Integers + + For example, + + +boot.kernel.sysctl."net.ipv4.tcp_keepalive_time" = 60; + + + (Note that here the attribute name + net.ipv4.tcp_keepalive_time is enclosed in + quotes to prevent it from being interpreted as a set named + net containing a set named + ipv4, and so on. This is because it’s not a + NixOS option but the literal name of a Linux kernel + setting.) + + + + + Sets + + Sets were introduced above. They are name/value pairs + enclosed in braces, as in the option definition + + +fileSystems."/boot" = + { device = "/dev/sda1"; + fsType = "ext4"; + options = "rw,data=ordered,relatime"; + }; + + + + + + + Lists + + The important thing to note about lists is that list + elements are separated by whitespace, like this: + + +boot.kernelModules = [ "fuse" "kvm-intel" "coretemp" ]; + + + List elements can be any other type, e.g. sets: + + +swapDevices = [ { device = "/dev/disk/by-label/swap"; } ]; + + + + + + + Packages + + Usually, the packages you need are already part of the Nix + Packages collection, which is a set that can be accessed through + the function argument pkgs. Typical uses: + + +environment.systemPackages = + [ pkgs.thunderbird + pkgs.emacs + ]; + +postgresql.package = pkgs.postgresql90; + + + The latter option definition changes the default PostgreSQL + package used by NixOS’s PostgreSQL service to 9.0. For more + information on packages, including how to add new ones, see + . + + + + + + + +
diff --git a/nixos/doc/manual/configuration/config-syntax.xml b/nixos/doc/manual/configuration/config-syntax.xml new file mode 100644 index 00000000000..87847f8451e --- /dev/null +++ b/nixos/doc/manual/configuration/config-syntax.xml @@ -0,0 +1,27 @@ + + +Configuration Syntax + +The NixOS configuration file +/etc/nixos/configuration.nix is actually a +Nix expression, which is the Nix package +manager’s purely functional language for describing how to build +packages and configurations. This means you have all the expressive +power of that language at your disposal, including the ability to +abstract over common patterns, which is very useful when managing +complex systems. The syntax and semantics of the Nix language are +fully described in the Nix +manual, but here we give a short overview of the most important +constructs useful in NixOS configuration files. + + + + + + + diff --git a/nixos/doc/manual/configuration/configuration.xml b/nixos/doc/manual/configuration/configuration.xml new file mode 100644 index 00000000000..e15c700017c --- /dev/null +++ b/nixos/doc/manual/configuration/configuration.xml @@ -0,0 +1,29 @@ + + +Configuration + + + +This chapter describes how to configure various aspects of a +NixOS machine through the configuration file +/etc/nixos/configuration.nix. As described in +, changes to this file only take +effect after you run nixos-rebuild. + + + + + + + + + + + + + + diff --git a/nixos/doc/manual/configuration/customizing-packages.xml b/nixos/doc/manual/configuration/customizing-packages.xml new file mode 100644 index 00000000000..6ee7a95dc6f --- /dev/null +++ b/nixos/doc/manual/configuration/customizing-packages.xml @@ -0,0 +1,92 @@ +
+ +Customising Packages + +Some packages in Nixpkgs have options to enable or disable +optional functionality or change other aspects of the package. For +instance, the Firefox wrapper package (which provides Firefox with a +set of plugins such as the Adobe Flash player) has an option to enable +the Google Talk plugin. It can be set in +configuration.nix as follows: + + +nixpkgs.config.firefox.enableGoogleTalkPlugin = true; + + + +Unfortunately, Nixpkgs currently lacks a way to query +available configuration options. + +Apart from high-level options, it’s possible to tweak a package +in almost arbitrary ways, such as changing or disabling dependencies +of a package. For instance, the Emacs package in Nixpkgs by default +has a dependency on GTK+ 2. If you want to build it against GTK+ 3, +you can specify that as follows: + + +environment.systemPackages = [ (pkgs.emacs.override { gtk = pkgs.gtk3; }) ]; + + +The function override performs the call to the Nix +function that produces Emacs, with the original arguments amended by +the set of arguments specified by you. So here the function argument +gtk gets the value pkgs.gtk3, +causing Emacs to depend on GTK+ 3. (The parentheses are necessary +because in Nix, function application binds more weakly than list +construction, so without them, +environment.systemPackages would be a list with two +elements.) + +Even greater customisation is possible using the function +overrideDerivation. While the +override mechanism above overrides the arguments of +a package function, overrideDerivation allows +changing the result of the function. This +permits changing any aspect of the package, such as the source code. +For instance, if you want to override the source code of Emacs, you +can say: + + +environment.systemPackages = + [ (pkgs.lib.overrideDerivation pkgs.emacs (attrs: { + name = "emacs-25.0-pre"; + src = /path/to/my/emacs/tree; + })) + ]; + + +Here, overrideDerivation takes the Nix derivation +specified by pkgs.emacs and produces a new +derivation in which the original’s name and +src attribute have been replaced by the given +values. The original attributes are accessible via +attrs. + +The overrides shown above are not global. They do not affect +the original package; other packages in Nixpkgs continue to depend on +the original rather than the customised package. This means that if +another package in your system depends on the original package, you +end up with two instances of the package. If you want to have +everything depend on your customised instance, you can apply a +global override as follows: + + +nixpkgs.config.packageOverrides = pkgs: + { emacs = pkgs.emacs.override { gtk = pkgs.gtk3; }; + }; + + +The effect of this definition is essentially equivalent to modifying +the emacs attribute in the Nixpkgs source tree. +Any package in Nixpkgs that depends on emacs will +be passed your customised instance. (However, the value +pkgs.emacs in +nixpkgs.config.packageOverrides refers to the +original rather than overridden instance, to prevent an infinite +recursion.) + +
diff --git a/nixos/doc/manual/configuration/declarative-packages.xml b/nixos/doc/manual/configuration/declarative-packages.xml new file mode 100644 index 00000000000..6de38b452e2 --- /dev/null +++ b/nixos/doc/manual/configuration/declarative-packages.xml @@ -0,0 +1,43 @@ +
+ +Declarative Package Management + +With declarative package management, you specify which packages +you want on your system by setting the option +. For instance, adding the +following line to configuration.nix enables the +Mozilla Thunderbird email application: + + +environment.systemPackages = [ pkgs.thunderbird ]; + + +The effect of this specification is that the Thunderbird package from +Nixpkgs will be built or downloaded as part of the system when you run +nixos-rebuild switch. + +You can get a list of the available packages as follows: + +$ nix-env -qaP '*' --description +nixos.pkgs.firefox firefox-23.0 Mozilla Firefox - the browser, reloaded +... + + +The first column in the output is the attribute +name, such as +nixos.pkgs.thunderbird. (The +nixos prefix allows distinguishing between +different channels that you might have.) + +To “uninstall” a package, simply remove it from + and run +nixos-rebuild switch. + + + + +
diff --git a/nixos/doc/manual/configuration/file-systems.xml b/nixos/doc/manual/configuration/file-systems.xml new file mode 100644 index 00000000000..52ad6d62f13 --- /dev/null +++ b/nixos/doc/manual/configuration/file-systems.xml @@ -0,0 +1,40 @@ + + +File Systems + +You can define file systems using the + configuration option. For instance, the +following definition causes NixOS to mount the Ext4 file system on +device /dev/disk/by-label/data onto the mount +point /data: + + +fileSystems."/data" = + { device = "/dev/disk/by-label/data"; + fsType = "ext4"; + }; + + +Mount points are created automatically if they don’t already exist. +For , it’s best to use the topology-independent +device aliases in /dev/disk/by-label and +/dev/disk/by-uuid, as these don’t change if the +topology changes (e.g. if a disk is moved to another IDE +controller). + +You can usually omit the file system type +(), since mount can usually +detect the type and load the necessary kernel module automatically. +However, if the file system is needed at early boot (in the initial +ramdisk) and is not ext2, ext3 +or ext4, then it’s best to specify + to ensure that the kernel module is +available. + + + + diff --git a/nixos/doc/manual/configuration/firewall.xml b/nixos/doc/manual/configuration/firewall.xml new file mode 100644 index 00000000000..87406c28c2f --- /dev/null +++ b/nixos/doc/manual/configuration/firewall.xml @@ -0,0 +1,38 @@ +
+ +Firewall + +NixOS has a simple stateful firewall that blocks incoming +connections and other unexpected packets. The firewall applies to +both IPv4 and IPv6 traffic. It is enabled by default. It can be +disabled as follows: + + +networking.firewall.enable = false; + + +If the firewall is enabled, you can open specific TCP ports to the +outside world: + + +networking.firewall.allowedTCPPorts = [ 80 443 ]; + + +Note that TCP port 22 (ssh) is opened automatically if the SSH daemon +is enabled (). UDP +ports can be opened through +. Also of +interest is + + +networking.firewall.allowPing = true; + + +to allow the machine to respond to ping requests. (ICMPv6 pings are +always allowed.) + +
diff --git a/nixos/doc/manual/configuration/ipv4-config.xml b/nixos/doc/manual/configuration/ipv4-config.xml new file mode 100644 index 00000000000..e2c51518349 --- /dev/null +++ b/nixos/doc/manual/configuration/ipv4-config.xml @@ -0,0 +1,47 @@ +
+ +IPv4 Configuration + +By default, NixOS uses DHCP (specifically, +dhcpcd) to automatically configure network +interfaces. However, you can configure an interface manually as +follows: + + +networking.interfaces.eth0 = { ipAddress = "192.168.1.2"; prefixLength = 24; }; + + +(The network prefix can also be specified using the option +subnetMask, +e.g. "255.255.255.0", but this is deprecated.) +Typically you’ll also want to set a default gateway and set of name +servers: + + +networking.defaultGateway = "192.168.1.1"; +networking.nameservers = [ "8.8.8.8" ]; + + + + +Statically configured interfaces are set up by the systemd +service +interface-name-cfg.service. +The default gateway and name server configuration is performed by +network-setup.service. + +The host name is set using : + + +networking.hostName = "cartman"; + + +The default host name is nixos. Set it to the +empty string ("") to allow the DHCP server to +provide the host name. + +
diff --git a/nixos/doc/manual/configuration/ipv6-config.xml b/nixos/doc/manual/configuration/ipv6-config.xml new file mode 100644 index 00000000000..592bf20e545 --- /dev/null +++ b/nixos/doc/manual/configuration/ipv6-config.xml @@ -0,0 +1,19 @@ +
+ +IPv6 Configuration + +IPv6 is enabled by default. Stateless address autoconfiguration +is used to automatically assign IPv6 addresses to all interfaces. You +can disable IPv6 support globally by setting: + + +networking.enableIPv6 = false; + + + + +
diff --git a/nixos/doc/manual/configuration/linux-kernel.xml b/nixos/doc/manual/configuration/linux-kernel.xml new file mode 100644 index 00000000000..8fe2f5255df --- /dev/null +++ b/nixos/doc/manual/configuration/linux-kernel.xml @@ -0,0 +1,69 @@ + + +Linux Kernel + +You can override the Linux kernel and associated packages using +the option . For instance, this +selects the Linux 3.10 kernel: + +boot.kernelPackages = pkgs.linuxPackages_3_10; + +Note that this not only replaces the kernel, but also packages that +are specific to the kernel version, such as the NVIDIA video drivers. +This ensures that driver packages are consistent with the +kernel. + +The default Linux kernel configuration should be fine for most users. You can see the configuration of your current kernel with the following command: + +cat /proc/config.gz | gunzip + +If you want to change the kernel configuration, you can use the + feature (see ). For instance, to enable +support for the kernel debugger KGDB: + + +nixpkgs.config.packageOverrides = pkgs: + { linux_3_4 = pkgs.linux_3_4.override { + extraConfig = + '' + KGDB y + ''; + }; + }; + + +extraConfig takes a list of Linux kernel +configuration options, one per line. The name of the option should +not include the prefix CONFIG_. The option value +is typically y, n or +m (to build something as a kernel module). + +Kernel modules for hardware devices are generally loaded +automatically by udev. You can force a module to +be loaded via , e.g. + +boot.kernelModules = [ "fuse" "kvm-intel" "coretemp" ]; + +If the module is required early during the boot (e.g. to mount the +root file system), you can use +: + +boot.initrd.extraKernelModules = [ "cifs" ]; + +This causes the specified modules and their dependencies to be added +to the initial ramdark. + +Kernel runtime parameters can be set through +, e.g. + +boot.kernel.sysctl."net.ipv4.tcp_keepalive_time" = 120; + +sets the kernel’s TCP keepalive time to 120 seconds. To see the +available parameters, run sysctl -a. + + diff --git a/nixos/doc/manual/configuration/modularity.xml b/nixos/doc/manual/configuration/modularity.xml new file mode 100644 index 00000000000..d95091bd162 --- /dev/null +++ b/nixos/doc/manual/configuration/modularity.xml @@ -0,0 +1,143 @@ +
+ +Modularity + +The NixOS configuration mechanism is modular. If your +configuration.nix becomes too big, you can split +it into multiple files. Likewise, if you have multiple NixOS +configurations (e.g. for different computers) with some commonality, +you can move the common configuration into a shared file. + +Modules have exactly the same syntax as +configuration.nix. In fact, +configuration.nix is itself a module. You can +use other modules by including them from +configuration.nix, e.g.: + + +{ config, pkgs, ... }: + +{ imports = [ ./vpn.nix ./kde.nix ]; + services.httpd.enable = true; + environment.systemPackages = [ pkgs.emacs ]; + ... +} + + +Here, we include two modules from the same directory, +vpn.nix and kde.nix. The +latter might look like this: + + +{ config, pkgs, ... }: + +{ services.xserver.enable = true; + services.xserver.displayManager.kdm.enable = true; + services.xserver.desktopManager.kde4.enable = true; + environment.systemPackages = [ pkgs.kde4.kscreensaver ]; +} + + +Note that both configuration.nix and +kde.nix define the option +. When multiple modules +define an option, NixOS will try to merge the +definitions. In the case of +, that’s easy: the lists of +packages can simply be concatenated. The value in +configuration.nix is merged last, so for +list-type options, it will appear at the end of the merged list. If +you want it to appear first, you can use mkBefore: + + +boot.kernelModules = mkBefore [ "kvm-intel" ]; + + +This causes the kvm-intel kernel module to be +loaded before any other kernel modules. + +For other types of options, a merge may not be possible. For +instance, if two modules define +, +nixos-rebuild will give an error: + + +The unique option `services.httpd.adminAddr' is defined multiple times, in `/etc/nixos/httpd.nix' and `/etc/nixos/configuration.nix'. + + +When that happens, it’s possible to force one definition take +precedence over the others: + + +services.httpd.adminAddr = pkgs.lib.mkForce "bob@example.org"; + + + + +When using multiple modules, you may need to access +configuration values defined in other modules. This is what the +config function argument is for: it contains the +complete, merged system configuration. That is, +config is the result of combining the +configurations returned by every moduleIf you’re +wondering how it’s possible that the (indirect) +result of a function is passed as an +input to that same function: that’s because Nix +is a “lazy” language — it only computes values when they are needed. +This works as long as no individual configuration value depends on +itself.. For example, here is a module that adds +some packages to only if + is set to +true somewhere else: + + +{ config, pkgs, ... }: + +{ environment.systemPackages = + if config.services.xserver.enable then + [ pkgs.firefox + pkgs.thunderbird + ] + else + [ ]; +} + + + + +With multiple modules, it may not be obvious what the final +value of a configuration option is. The command + allows you to find out: + + +$ nixos-option services.xserver.enable +true + +$ nixos-option boot.kernelModules +[ "tun" "ipv6" "loop" ... ] + + +Interactive exploration of the configuration is possible using +nix-repl, +a read-eval-print loop for Nix expressions. It’s not installed by +default; run nix-env -i nix-repl to get it. A +typical use: + + +$ nix-repl '<nixos>' + +nix-repl> config.networking.hostName +"mandark" + +nix-repl> map (x: x.hostName) config.services.httpd.virtualHosts +[ "example.org" "example.gov" ] + + + + +
diff --git a/nixos/doc/manual/configuration/network-manager.xml b/nixos/doc/manual/configuration/network-manager.xml new file mode 100644 index 00000000000..e65060021b4 --- /dev/null +++ b/nixos/doc/manual/configuration/network-manager.xml @@ -0,0 +1,27 @@ +
+ +NetworkManager + +To facilitate network configuration, some desktop environments +use NetworkManager. You can enable NetworkManager by setting: + + +services.networkmanager.enable = true; + + +Some desktop managers (e.g., GNOME) enable NetworkManager +automatically for you. + +All users that should have permission to change network settings +must belong to the networkmanager group. + +services.networkmanager and +services.wireless can not be enabled at the same time: +you can still connect to the wireless networks using +NetworkManager. + +
diff --git a/nixos/doc/manual/configuration/networking.xml b/nixos/doc/manual/configuration/networking.xml new file mode 100644 index 00000000000..5f08bc1f127 --- /dev/null +++ b/nixos/doc/manual/configuration/networking.xml @@ -0,0 +1,22 @@ + + +Networking + +This section describes how to configure networking components on +your NixOS machine. + + + + + + + + + + + + diff --git a/nixos/doc/manual/configuration/package-mgmt.xml b/nixos/doc/manual/configuration/package-mgmt.xml new file mode 100644 index 00000000000..73c1722da02 --- /dev/null +++ b/nixos/doc/manual/configuration/package-mgmt.xml @@ -0,0 +1,34 @@ + + +Package Management + +This section describes how to add additional packages to your +system. NixOS has two distinct styles of package management: + + + + Declarative, where you declare + what packages you want in your + configuration.nix. Every time you run + nixos-rebuild, NixOS will ensure that you get a + consistent set of binaries corresponding to your + specification. + + Ad hoc, where you install, + upgrade and uninstall packages via the nix-env + command. This style allows mixing packages from different Nixpkgs + versions. It’s the only choice for non-root + users. + + + + + + + + + diff --git a/nixos/doc/manual/configuration/ssh.xml b/nixos/doc/manual/configuration/ssh.xml new file mode 100644 index 00000000000..7c928baaf89 --- /dev/null +++ b/nixos/doc/manual/configuration/ssh.xml @@ -0,0 +1,32 @@ +
+ +Secure Shell Access + +Secure shell (SSH) access to your machine can be enabled by +setting: + + +services.openssh.enable = true; + + +By default, root logins using a password are disallowed. They can be +disabled entirely by setting +services.openssh.permitRootLogin to +"no". + +You can declaratively specify authorised RSA/DSA public keys for +a user as follows: + + + +users.extraUsers.alice.openssh.authorizedKeys.keys = + [ "ssh-dss AAAAB3NzaC1kc3MAAACBAPIkGWVEt4..." ]; + + + + +
diff --git a/nixos/doc/manual/configuration/summary.xml b/nixos/doc/manual/configuration/summary.xml new file mode 100644 index 00000000000..9bb5e35e16b --- /dev/null +++ b/nixos/doc/manual/configuration/summary.xml @@ -0,0 +1,191 @@ +
+ +Syntax Summary + +Below is a summary of the most important syntactic constructs in +the Nix expression language. It’s not complete. In particular, there +are many other built-in functions. See the Nix +manual for the rest. + + + + + + + + Example + Description + + + + + + Basic values + + + "Hello world" + A string + + + "${pkgs.bash}/bin/sh" + A string containing an expression (expands to "/nix/store/hash-bash-version/bin/sh") + + + true, false + Booleans + + + 123 + An integer + + + ./foo.png + A path (relative to the containing Nix expression) + + + + Compound values + + + { x = 1; y = 2; } + An set with attributes names x and y + + + { foo.bar = 1; } + A nested set, equivalent to { foo = { bar = 1; }; } + + + rec { x = "bla"; y = x + "bar"; } + A recursive set, equivalent to { x = "foo"; y = "foobar"; } + + + [ "foo" "bar" ] + A list with two elements + + + + Operators + + + "foo" + "bar" + String concatenation + + + 1 + 2 + Integer addition + + + "foo" == "f" + "oo" + Equality test (evaluates to true) + + + "foo" != "bar" + Inequality test (evaluates to true) + + + !true + Boolean negation + + + { x = 1; y = 2; }.x + Attribute selection (evaluates to 1) + + + { x = 1; y = 2; }.z or 3 + Attribute selection with default (evaluates to 3) + + + { x = 1; y = 2; } // { z = 3; } + Merge two sets (attributes in the right-hand set taking precedence) + + + + Control structures + + + if 1 + 1 == 2 then "yes!" else "no!" + Conditional expression + + + assert 1 + 1 == 2; "yes!" + Assertion check (evaluates to "yes!") + + + let x = "foo"; y = "bar"; in x + y + Variable definition + + + with pkgs.lib; head [ 1 2 3 ] + Add all attributes from the given set to the scope + (evaluates to 1) + + + + Functions (lambdas) + + + x: x + 1 + A function that expects an integer and returns it increased by 1 + + + (x: x + 1) 100 + A function call (evaluates to 101) + + + let inc = x: x + 1; in inc (inc (inc 100)) + A function bound to a variable and subsequently called by name (evaluates to 103) + + + { x, y }: x + y + A function that expects a set with required attributes + x and y and concatenates + them + + + { x, y ? "bar" }: x + y + A function that expects a set with required attribute + x and optional y, using + "bar" as default value for + y + + + { x, y, ... }: x + y + A function that expects a set with required attributes + x and y and ignores any + other attributes + + + { x, y } @ args: x + y + A function that expects a set with required attributes + x and y, and binds the + whole set to args + + + + Built-in functions + + + import ./foo.nix + Load and return Nix expression in given file + + + map (x: x + x) [ 1 2 3 ] + Apply a function to every element of a list (evaluates to [ 2 4 6 ]) + + + + + + + +
diff --git a/nixos/doc/manual/configuration/user-mgmt.xml b/nixos/doc/manual/configuration/user-mgmt.xml new file mode 100644 index 00000000000..40dc687d03b --- /dev/null +++ b/nixos/doc/manual/configuration/user-mgmt.xml @@ -0,0 +1,95 @@ + + +User Management + +NixOS supports both declarative and imperative styles of user +management. In the declarative style, users are specified in +configuration.nix. For instance, the following +states that a user account named alice shall exist: + + +users.extraUsers.alice = + { createHome = true; + home = "/home/alice"; + description = "Alice Foobar"; + extraGroups = [ "wheel" "networkmanager" ]; + useDefaultShell = true; + openssh.authorizedKeys.keys = [ "ssh-dss AAAAB3Nza... alice@foobar" ]; + }; + + +Note that alice is a member of the +wheel and networkmanager groups, +which allows her to use sudo to execute commands as +root and to configure the network, respectively. +Also note the SSH public key that allows remote logins with the +corresponding private key. Users created in this way do not have a +password by default, so they cannot log in via mechanisms that require +a password. However, you can use the passwd program +to set a password, which is retained across invocations of +nixos-rebuild. + +If you set users.mutableUsers to false, then the contents of /etc/passwd +and /etc/group will be congruent to your NixOS configuration. For instance, +if you remove a user from users.extraUsers and run nixos-rebuild, the user +account will cease to exist. Also, imperative commands for managing users +and groups, such as useradd, are no longer available. + +A user ID (uid) is assigned automatically. You can also specify +a uid manually by adding + + + uid = 1000; + + +to the user specification. + +Groups can be specified similarly. The following states that a +group named students shall exist: + + +users.extraGroups.students.gid = 1000; + + +As with users, the group ID (gid) is optional and will be assigned +automatically if it’s missing. + +Currently declarative user management is not perfect: +nixos-rebuild does not know how to realise certain +configuration changes. This includes removing a user or group, and +removing group membership from a user. + +In the imperative style, users and groups are managed by +commands such as useradd, +groupmod and so on. For instance, to create a user +account named alice: + + +$ useradd -m alice + +The flag causes the creation of a home directory +for the new user, which is generally what you want. The user does not +have an initial password and therefore cannot log in. A password can +be set using the passwd utility: + + +$ passwd alice +Enter new UNIX password: *** +Retype new UNIX password: *** + + +A user can be deleted using userdel: + + +$ userdel -r alice + +The flag deletes the user’s home directory. +Accounts can be modified using usermod. Unix +groups can be managed using groupadd, +groupmod and groupdel. + + diff --git a/nixos/doc/manual/configuration/wireless.xml b/nixos/doc/manual/configuration/wireless.xml new file mode 100644 index 00000000000..373a9168cc8 --- /dev/null +++ b/nixos/doc/manual/configuration/wireless.xml @@ -0,0 +1,41 @@ +
+ +Wireless Networks + +For a desktop installation using NetworkManager (e.g., GNOME), +you just have to make sure the user is in the +networkmanager group and you can skip the rest of this +section on wireless networks. + + +NixOS will start wpa_supplicant for you if you enable this setting: + + +networking.wireless.enable = true; + + +NixOS currently does not generate wpa_supplicant's +configuration file, /etc/wpa_supplicant.conf. You should edit this file +yourself to define wireless networks, WPA keys and so on (see +wpa_supplicant.conf(5)). + + + +If you are using WPA2 the wpa_passphrase tool might be useful +to generate the wpa_supplicant.conf. + + +$ wpa_passphrase ESSID PSK > /etc/wpa_supplicant.conf + +After you have edited the wpa_supplicant.conf, +you need to restart the wpa_supplicant service. + + +$ systemctl restart wpa_supplicant.service + + +
diff --git a/nixos/doc/manual/configuration/x-windows.xml b/nixos/doc/manual/configuration/x-windows.xml new file mode 100644 index 00000000000..bc58bb1f066 --- /dev/null +++ b/nixos/doc/manual/configuration/x-windows.xml @@ -0,0 +1,94 @@ + + +X Window System + +The X Window System (X11) provides the basis of NixOS’ graphical +user interface. It can be enabled as follows: + +services.xserver.enable = true; + +The X server will automatically detect and use the appropriate video +driver from a set of X.org drivers (such as vesa +and intel). You can also specify a driver +manually, e.g. + +services.xserver.videoDrivers = [ "r128" ]; + +to enable X.org’s xf86-video-r128 driver. + +You also need to enable at least one desktop or window manager. +Otherwise, you can only log into a plain undecorated +xterm window. Thus you should pick one or more of +the following lines: + +services.xserver.desktopManager.kde4.enable = true; +services.xserver.desktopManager.xfce.enable = true; +services.xserver.windowManager.xmonad.enable = true; +services.xserver.windowManager.twm.enable = true; +services.xserver.windowManager.icewm.enable = true; + + + +NixOS’s default display manager (the +program that provides a graphical login prompt and manages the X +server) is SLiM. You can select KDE’s kdm instead: + +services.xserver.displayManager.kdm.enable = true; + + + +The X server is started automatically at boot time. If you +don’t want this to happen, you can set: + +services.xserver.autorun = false; + +The X server can then be started manually: + +$ systemctl start display-manager.service + + + + +NVIDIA Graphics Cards + +NVIDIA provides a proprietary driver for its graphics cards that +has better 3D performance than the X.org drivers. It is not enabled +by default because it’s not free software. You can enable it as follows: + +services.xserver.videoDrivers = [ "nvidia" ]; + +You may need to reboot after enabling this driver to prevent a clash +with other kernel modules. + +On 64-bit systems, if you want full acceleration for 32-bit +programs such as Wine, you should also set the following: + +services.xserver.driSupport32Bit = true; + + + + + + +Touchpads + +Support for Synaptics touchpads (found in many laptops such as +the Dell Latitude series) can be enabled as follows: + +services.xserver.synaptics.enable = true; + +The driver has many options (see ). For +instance, the following enables two-finger scrolling: + +services.xserver.synaptics.twoFingerScroll = true; + + + + + + + diff --git a/nixos/doc/manual/containers.xml b/nixos/doc/manual/containers.xml deleted file mode 100644 index 2530d519521..00000000000 --- a/nixos/doc/manual/containers.xml +++ /dev/null @@ -1,242 +0,0 @@ - - -Containers - -NixOS allows you to easily run other NixOS instances as -containers. Containers are a light-weight -approach to virtualisation that runs software in the container at the -same speed as in the host system. NixOS containers share the Nix store -of the host, making container creation very efficient. - -Currently, NixOS containers are not perfectly isolated -from the host system. This means that a user with root access to the -container can do things that affect the host. So you should not give -container root access to untrusted users. - -NixOS containers can be created in two ways: imperatively, using -the command nixos-container, and declaratively, by -specifying them in your configuration.nix. The -declarative approach implies that containers get upgraded along with -your host system when you run nixos-rebuild, which -is often not what you want. By contrast, in the imperative approach, -containers are configured and updated independently from the host -system. - - -
Imperative container management - -We’ll cover imperative container management using -nixos-container first. You create a container with -identifier foo as follows: - - -$ nixos-container create foo - - -This creates the container’s root directory in -/var/lib/containers/foo and a small configuration -file in /etc/containers/foo.conf. It also builds -the container’s initial system configuration and stores it in -/nix/var/nix/profiles/per-container/foo/system. You -can modify the initial configuration of the container on the command -line. For instance, to create a container that has -sshd running, with the given public key for -root: - - -$ nixos-container create foo --config 'services.openssh.enable = true; \ - users.extraUsers.root.openssh.authorizedKeys.keys = ["ssh-dss AAAAB3N…"];' - - - - -Creating a container does not start it. To start the container, -run: - - -$ nixos-container start foo - - -This command will return as soon as the container has booted and has -reached multi-user.target. On the host, the -container runs within a systemd unit called -container@container-name.service. -Thus, if something went wrong, you can get status info using -systemctl: - - -$ systemctl status container@foo - - - - -If the container has started succesfully, you can log in as -root using the root-login operation: - - -$ nixos-container root-login foo -[root@foo:~]# - - -Note that only root on the host can do this (since there is no -authentication). You can also get a regular login prompt using the -login operation, which is available to all users on -the host: - - -$ nixos-container login foo -foo login: alice -Password: *** - - -With nixos-container run, you can execute arbitrary -commands in the container: - - -$ nixos-container run foo -- uname -a -Linux foo 3.4.82 #1-NixOS SMP Thu Mar 20 14:44:05 UTC 2014 x86_64 GNU/Linux - - - - -There are several ways to change the configuration of the -container. First, on the host, you can edit -/var/lib/container/name/etc/nixos/configuration.nix, -and run - - -$ nixos-container update foo - - -This will build and activate the new configuration. You can also -specify a new configuration on the command line: - - -$ nixos-container update foo --config 'services.httpd.enable = true; \ - services.httpd.adminAddr = "foo@example.org";' - -$ curl http://$(nixos-container show-ip foo)/ -<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">… - - -However, note that this will overwrite the container’s -/etc/nixos/configuration.nix. - -Alternatively, you can change the configuration from within the -container itself by running nixos-rebuild switch -inside the container. Note that the container by default does not have -a copy of the NixOS channel, so you should run nix-channel ---update first. - -Containers can be stopped and started using -nixos-container stop and nixos-container -start, respectively, or by using -systemctl on the container’s service unit. To -destroy a container, including its file system, do - - -$ nixos-container destroy foo - - - - -
- - -
Declarative container specification - -You can also specify containers and their configuration in the -host’s configuration.nix. For example, the -following specifies that there shall be a container named -database running PostgreSQL: - - -containers.database = - { config = - { config, pkgs, ... }: - { services.postgresql.enable = true; - services.postgresql.package = pkgs.postgresql92; - }; - }; - - -If you run nixos-rebuild switch, the container will -be built and started. If the container was already running, it will be -updated in place, without rebooting. - -By default, declarative containers share the network namespace -of the host, meaning that they can listen on (privileged) -ports. However, they cannot change the network configuration. You can -give a container its own network as follows: - - -containers.database = - { privateNetwork = true; - hostAddress = "192.168.100.10"; - localAddress = "192.168.100.11"; - }; - - -This gives the container a private virtual Ethernet interface with IP -address 192.168.100.11, which is hooked up to a -virtual Ethernet interface on the host with IP address -192.168.100.10. (See the next section for details -on container networking.) - -To disable the container, just remove it from -configuration.nix and run nixos-rebuild -switch. Note that this will not delete the root directory of -the container in /var/lib/containers. - -
- - -
Networking - -When you create a container using nixos-container -create, it gets it own private IPv4 address in the range -10.233.0.0/16. You can get the container’s IPv4 -address as follows: - - -$ nixos-container show-ip foo -10.233.4.2 - -$ ping -c1 10.233.4.2 -64 bytes from 10.233.4.2: icmp_seq=1 ttl=64 time=0.106 ms - - - - -Networking is implemented using a pair of virtual Ethernet -devices. The network interface in the container is called -eth0, while the matching interface in the host is -called ve-container-name -(e.g., ve-foo). The container has its own network -namespace and the CAP_NET_ADMIN capability, so it -can perform arbitrary network configuration such as setting up -firewall rules, without affecting or having access to the host’s -network. - -By default, containers cannot talk to the outside network. If -you want that, you should set up Network Address Translation (NAT) -rules on the host to rewrite container traffic to use your external -IP address. This can be accomplished using the following configuration -on the host: - - -networking.nat.enable = true; -networking.nat.internalInterfaces = ["ve-+"]; -networking.nat.externalInterface = "eth0"; - -where eth0 should be replaced with the desired -external interface. Note that ve-+ is a wildcard -that matches all container interfaces. - -
- - - - diff --git a/nixos/doc/manual/development.xml b/nixos/doc/manual/development.xml deleted file mode 100644 index 2f0c2a7aa8d..00000000000 --- a/nixos/doc/manual/development.xml +++ /dev/null @@ -1,1119 +0,0 @@ - - -Development - -This chapter describes how you can modify and extend -NixOS. - - - - -
- -Getting the sources - -By default, NixOS’s nixos-rebuild command -uses the NixOS and Nixpkgs sources provided by the -nixos-unstable channel (kept in -/nix/var/nix/profiles/per-user/root/channels/nixos). -To modify NixOS, however, you should check out the latest sources from -Git. This is done using the following command: - - -$ nixos-checkout /my/sources - - -or - - -$ mkdir -p /my/sources -$ cd /my/sources -$ nix-env -i git -$ git clone git://github.com/NixOS/nixpkgs.git - - -This will check out the latest NixOS sources to -/my/sources/nixpkgs/nixos -and the Nixpkgs sources to -/my/sources/nixpkgs. -(The NixOS source tree lives in a subdirectory of the Nixpkgs -repository.) - -It’s often inconvenient to develop directly on the master -branch, since if somebody has just committed (say) a change to GCC, -then the binary cache may not have caught up yet and you’ll have to -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 - - -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 - - -You can then use git rebase to sync your local -branch with the upstream branch, and use git -cherry-pick to copy commits from your local branch to the -upstream branch. - -If you want to rebuild your system using your (modified) -sources, you need to tell nixos-rebuild about them -using the flag: - - -$ nixos-rebuild switch -I nixpkgs=/my/sources/nixpkgs - - - - -If you want nix-env to use the expressions in -/my/sources, use nix-env -f -/my/sources/nixpkgs, or change -the default by adding a symlink in -~/.nix-defexpr: - - -$ ln -s /my/sources/nixpkgs ~/.nix-defexpr/nixpkgs - - -You may want to delete the symlink -~/.nix-defexpr/channels_root to prevent root’s -NixOS channel from clashing with your own tree. - - - -
- - - - -
- -Writing NixOS modules - -NixOS has a modular system for declarative configuration. This -system combines multiple modules to produce the -full system configuration. One of the modules that constitute the -configuration is /etc/nixos/configuration.nix. -Most of the others live in the nixos/modules -subdirectory of the Nixpkgs tree. - -Each NixOS module is a file that handles one logical aspect of -the configuration, such as a specific kind of hardware, a service, or -network settings. A module configuration does not have to handle -everything from scratch; it can use the functionality provided by -other modules for its implementation. Thus a module can -declare options that can be used by other -modules, and conversely can define options -provided by other modules in its own implementation. For example, the -module pam.nix -declares the option that allows -other modules (e.g. sshd.nix) -to define PAM services; and it defines the option - (declared by etc.nix) -to cause files to be created in -/etc/pam.d. - -In , we saw the following structure -of NixOS modules: - - -{ config, pkgs, ... }: - -{ option definitions -} - - -This is actually an abbreviated form of module -that only defines options, but does not declare any. The structure of -full NixOS modules is shown in . - -Structure of NixOS modules - -{ config, pkgs, ... }: - -{ - imports = - [ paths of other modules - ]; - - options = { - option declarations - }; - - config = { - option definitions - }; -} - - -The meaning of each part is as follows. - - - - This line makes the current Nix expression a function. The - variable pkgs contains Nixpkgs, while - config contains the full system configuration. - This line can be omitted if there is no reference to - pkgs and config inside the - module. - - - - This list enumerates the paths to other NixOS modules that - should be included in the evaluation of the system configuration. - A default set of modules is defined in the file - modules/module-list.nix. These don't need to - be added in the import list. - - - - The attribute options is a nested set of - option declarations (described below). - - - - The attribute config is a nested set of - option definitions (also described - below). - - - - - - shows a module that handles -the regular update of the “locate” database, an index of all files in -the file system. This module declares two options that can be defined -by other modules (typically the user’s -configuration.nix): - (whether the database should -be updated) and (when the -update should be done). It implements its functionality by defining -two options declared by other modules: - (the set of all systemd services) -and (the list of -commands to be executed periodically by cron). - -NixOS module for the “locate” service - -{ config, lib, pkgs, ... }: - -with lib; - -let locatedb = "/var/cache/locatedb"; in - -{ - options = { - - services.locate = { - - enable = mkOption { - type = types.bool; - default = false; - description = '' - If enabled, NixOS will periodically update the database of - files used by the locate command. - ''; - }; - - period = mkOption { - type = types.str; - default = "15 02 * * *"; - description = '' - This option defines (in the format used by cron) when the - locate database is updated. The default is to update at - 02:15 at night every day. - ''; - }; - - }; - - }; - - config = { - - systemd.services.update-locatedb = - { description = "Update Locate Database"; - path = [ pkgs.su ]; - script = - '' - mkdir -m 0755 -p $(dirname ${locatedb}) - exec updatedb --localuser=nobody --output=${locatedb} --prunepaths='/tmp /var/tmp /media /run' - ''; - }; - - services.cron.systemCronJobs = optional config.services.locate.enable - "${config.services.locate.period} root ${config.systemd.package}/bin/systemctl start update-locatedb.service"; - - }; -} - - -
Option declarations - -An option declaration specifies the name, type and description -of a NixOS configuration option. It is illegal to define an option -that hasn’t been declared in any module. A option declaration -generally looks like this: - - -options = { - name = mkOption { - type = type specification; - default = default value; - example = example value; - description = "Description for use in the NixOS manual."; - }; -}; - - - - -The function mkOption accepts the following arguments. - - - - - type - - The type of the option (see below). It may be omitted, - but that’s not advisable since it may lead to errors that are - hard to diagnose. - - - - - default - - The default value used if no value is defined by any - module. A default is not required; in that case, if the option - value is ever used, an error will be thrown. - - - - - example - - An example value that will be shown in the NixOS manual. - - - - - description - - A textual description of the option, in DocBook format, - that will be included in the NixOS manual. - - - - - - - -Here is a non-exhaustive list of option types: - - - - - types.bool - - A Boolean. - - - - - types.int - - An integer. - - - - - types.str - - A string. - - - - - types.lines - - A string. If there are multiple definitions, they are - concatenated, with newline characters in between. - - - - - types.path - - A path, defined as anything that, when coerced to a - string, starts with a slash. This includes derivations. - - - - - types.listOf t - - A list of elements of type t - (e.g., types.listOf types.str is a list of - strings). Multiple definitions are concatenated together. - - - - - types.attrsOf t - - A set of elements of type t - (e.g., types.attrsOf types.int is a set of - name/value pairs, the values being integers). - - - - - types.nullOr t - - Either the value null or something of - type t. - - - - - -You can also create new types using the function -mkOptionType. See -lib/types.nix in Nixpkgs for details. - -
- - -
Option definitions - -Option definitions are generally straight-forward bindings of values to option names, like - - -config = { - services.httpd.enable = true; -}; - - -However, sometimes you need to wrap an option definition or set of -option definitions in a property to achieve -certain effects: - -Delaying conditionals - -If a set of option definitions is conditional on the value of -another option, you may need to use mkIf. -Consider, for instance: - - -config = if config.services.httpd.enable then { - environment.systemPackages = [ ... ]; - ... -} else {}; - - -This definition will cause Nix to fail with an “infinite recursion” -error. Why? Because the value of - depends on the value -being constructed here. After all, you could also write the clearly -circular and contradictory: - -config = if config.services.httpd.enable then { - services.httpd.enable = false; -} else { - services.httpd.enable = true; -}; - - -The solution is to write: - - -config = mkIf config.services.httpd.enable { - environment.systemPackages = [ ... ]; - ... -}; - - -The special function mkIf causes the evaluation of -the conditional to be “pushed down” into the individual definitions, -as if you had written: - - -config = { - environment.systemPackages = if config.services.httpd.enable then [ ... ] else []; - ... -}; - - - - - - -Setting priorities - -A module can override the definitions of an option in other -modules by setting a priority. All option -definitions that do not have the lowest priority value are discarded. -By default, option definitions have priority 1000. You can specify an -explicit priority by using mkOverride, e.g. - - -services.openssh.enable = mkOverride 10 false; - - -This definition causes all other definitions with priorities above 10 -to be discarded. The function mkForce is -equal to mkOverride 50. - - - -Merging configurations - -In conjunction with mkIf, it is sometimes -useful for a module to return multiple sets of option definitions, to -be merged together as if they were declared in separate modules. This -can be done using mkMerge: - - -config = mkMerge - [ # Unconditional stuff. - { environment.systemPackages = [ ... ]; - } - # Conditional stuff. - (mkIf config.services.bla.enable { - environment.systemPackages = [ ... ]; - }) - ]; - - - - - - -
- - -
Important options - -NixOS has many options, but some are of particular importance to -module writers. - - - - - - - This set defines files in /etc. A - typical use is: - -environment.etc."os-release".text = - '' - NAME=NixOS - ... - ''; - - which causes a file named /etc/os-release - to be created with the given contents. - - - - - - - A set of shell script fragments that must be executed - whenever the configuration is activated (i.e., at boot time, or - after running nixos-rebuild switch). For instance, - -system.activationScripts.media = - '' - mkdir -m 0755 -p /media - ''; - - causes the directory /media to be created. - Activation scripts must be idempotent. They should not start - background processes such as daemons; use - for that. - - - - - - - This is the set of systemd services. Example: - -systemd.services.dhcpcd = - { description = "DHCP Client"; - wantedBy = [ "multi-user.target" ]; - after = [ "systemd-udev-settle.service" ]; - path = [ dhcpcd pkgs.nettools pkgs.openresolv ]; - serviceConfig = - { Type = "forking"; - PIDFile = "/run/dhcpcd.pid"; - ExecStart = "${dhcpcd}/sbin/dhcpcd --config ${dhcpcdConf}"; - Restart = "always"; - }; - }; - - which creates the systemd unit - dhcpcd.service. The option - determined which other units pull this - one in; multi-user.target is the default - target of the system, so dhcpcd.service will - always be started. The option - provides the main - command for the service; it’s also possible to provide pre-start - actions, stop scripts, and so on. - - - - - - - - If your service requires special UIDs or GIDs, you can - define them with these options. See for details. - - - - - -
- - -
- - - - -
- -Building specific parts of NixOS - -With the command nix-build, you can build -specific parts of your NixOS configuration. This is done as follows: - - -$ cd /path/to/nixpkgs/nixos -$ nix-build -A config.option - -where option is a NixOS option with type -“derivation” (i.e. something that can be built). Attributes of -interest include: - - - - - system.build.toplevel - - The top-level option that builds the entire NixOS system. - Everything else in your configuration is indirectly pulled in by - this option. This is what nixos-rebuild - builds and what /run/current-system points - to afterwards. - - A shortcut to build this is: - - -$ nix-build -A system - - - - - - system.build.manual.manual - The NixOS manual. - - - - system.build.etc - A tree of symlinks that form the static parts of - /etc. - - - - system.build.initialRamdisk - system.build.kernel - - The initial ramdisk and kernel of the system. This allows - a quick way to test whether the kernel and the initial ramdisk - boot correctly, by using QEMU’s and - options: - - -$ nix-build -A config.system.build.initialRamdisk -o initrd -$ nix-build -A config.system.build.kernel -o kernel -$ qemu-system-x86_64 -kernel ./kernel/bzImage -initrd ./initrd/initrd -hda /dev/null - - - - - - - - system.build.nixos-rebuild - system.build.nixos-install - system.build.nixos-generate-config - - These build the corresponding NixOS commands. - - - - - systemd.units.unit-name.unit - - This builds the unit with the specified name. Note that - since unit names contain dots - (e.g. httpd.service), you need to put them - between quotes, like this: - - -$ nix-build -A 'config.systemd.units."httpd.service".unit' - - - You can also test individual units, without rebuilding the whole - system, by putting them in - /run/systemd/system: - - -$ cp $(nix-build -A 'config.systemd.units."httpd.service".unit')/httpd.service \ - /run/systemd/system/tmp-httpd.service -$ systemctl daemon-reload -$ systemctl start tmp-httpd.service - - - Note that the unit must not have the same name as any unit in - /etc/systemd/system since those take - precedence over /run/systemd/system. - That’s why the unit is installed as - tmp-httpd.service here. - - - - - - - -
- - - - -
- -Building your own NixOS CD - -Building a NixOS CD is as easy as configuring your own computer. The -idea is to use another module which will replace -your configuration.nix to configure the system that -would be installed on the CD. - -Default CD/DVD configurations are available -inside nixos/modules/installer/cd-dvd. To build them -you have to set NIXOS_CONFIG before -running nix-build to build the ISO. - - -$ nix-build -A config.system.build.isoImage -I nixos-config=modules/installer/cd-dvd/installation-cd-minimal.nix - - - -Before burning your CD/DVD, you can check the content of the image by mounting anywhere like -suggested by the following command: - - -$ mount -o loop -t iso9660 ./result/iso/cd.iso /mnt/iso - - - -
- - - - -
- -Testing the installer - -Building, burning, and booting from an installation CD is rather -tedious, so here is a quick way to see if the installer works -properly: - - -$ nix-build -A config.system.build.nixos-install -$ mount -t tmpfs none /mnt -$ ./result/bin/nixos-install - -To start a login shell in the new NixOS installation in -/mnt: - - -$ ./result/bin/nixos-install --chroot - - - - -
- - - - - -
- -NixOS tests - -When you add some feature to NixOS, you should write a test for -it. NixOS tests are kept in the directory nixos/tests, -and are executed (using Nix) by a testing framework that automatically -starts one or more virtual machines containing the NixOS system(s) -required for the test. - -Writing tests - -A NixOS test is a Nix expression that has the following structure: - - -import ./make-test.nix { - - # Either the configuration of a single machine: - machine = - { config, pkgs, ... }: - { configuration… - }; - - # Or a set of machines: - nodes = - { machine1 = - { config, pkgs, ... }: { … }; - machine2 = - { config, pkgs, ... }: { … }; - … - }; - - testScript = - '' - Perl code… - ''; -} - - -The attribute testScript is a bit of Perl code that -executes the test (described below). During the test, it will start -one or more virtual machines, the configuration of which is described -by the attribute machine (if you need only one -machine in your test) or by the attribute nodes (if -you need multiple machines). For instance, login.nix -only needs a single machine to test whether users can log in on the -virtual console, whether device ownership is correctly maintained when -switching between consoles, and so on. On the other hand, nfs.nix, -which tests NFS client and server functionality in the Linux kernel -(including whether locks are maintained across server crashes), -requires three machines: a server and two clients. - -There are a few special NixOS configuration options for test -VMs: - - - - - - - - The memory of the VM in - megabytes. - - - - - The virtual networks to which the VM is - connected. See nat.nix - for an example. - - - - - By default, the Nix store in the VM is not - writable. If you enable this option, a writable union file system - is mounted on top of the Nix store to make it appear - writable. This is necessary for tests that run Nix operations that - modify the store. - - - - -For more options, see the module qemu-vm.nix. - -The test script is a sequence of Perl statements that perform -various actions, such as starting VMs, executing commands in the VMs, -and so on. Each virtual machine is represented as an object stored in -the variable $name, -where name is the identifier of the machine -(which is just machine if you didn’t specify -multiple machines using the nodes attribute). For -instance, the following starts the machine, waits until it has -finished booting, then executes a command and checks that the output -is more-or-less correct: - - -$machine->start; -$machine->waitForUnit("default.target"); -$machine->succeed("uname") =~ /Linux/; - - -The first line is actually unnecessary; machines are implicitly -started when you first execute an action on them (such as -waitForUnit or succeed). If you -have multiple machines, you can speed up the test by starting them in -parallel: - - -startAll; - - - - -The following methods are available on machine objects: - - - - - start - Start the virtual machine. This method is - asynchronous — it does not wait for the machine to finish - booting. - - - - shutdown - Shut down the machine, waiting for the VM to - exit. - - - - crash - Simulate a sudden power failure, by telling the VM - to exit immediately. - - - - block - Simulate unplugging the Ethernet cable that - connects the machine to the other machines. - - - - unblock - Undo the effect of - block. - - - - screenshot - Take a picture of the display of the virtual - machine, in PNG format. The screenshot is linked from the HTML - log. - - - - sendMonitorCommand - Send a command to the QEMU monitor. This is rarely - used, but allows doing stuff such as attaching virtual USB disks - to a running machine. - - - - sendKeys - Simulate pressing keys on the virtual keyboard, - e.g., sendKeys("ctrl-alt-delete"). - - - - sendChars - Simulate typing a sequence of characters on the - virtual keyboard, e.g., sendKeys("foobar\n") - will type the string foobar followed by the - Enter key. - - - - execute - Execute a shell command, returning a list - (status, - stdout). - - - - succeed - Execute a shell command, raising an exception if - the exit status is not zero, otherwise returning the standard - output. - - - - fail - Like succeed, but raising - an exception if the command returns a zero status. - - - - waitUntilSucceeds - Repeat a shell command with 1-second intervals - until it succeeds. - - - - waitUntilFails - Repeat a shell command with 1-second intervals - until it fails. - - - - waitForUnit - Wait until the specified systemd unit has reached - the “active” state. - - - - waitForFile - Wait until the specified file - exists. - - - - waitForOpenPort - Wait until a process is listening on the given TCP - port (on localhost, at least). - - - - waitForClosedPort - Wait until nobody is listening on the given TCP - port. - - - - waitForX - Wait until the X11 server is accepting - connections. - - - - waitForWindow - Wait until an X11 window has appeared whose name - matches the given regular expression, e.g., - waitForWindow(qr/Terminal/). - - - - - - - - - -Running tests - -You can run tests using nix-build. For -example, to run the test login.nix, -you just do: - - -$ nix-build '<nixpkgs/nixos/tests/login.nix>' - - -or, if you don’t want to rely on NIX_PATH: - - -$ cd /my/nixpkgs/nixos/tests -$ nix-build login.nix -… -running the VM test script -machine: QEMU running (pid 8841) -… -6 out of 6 tests succeeded - - -After building/downloading all required dependencies, this will -perform a build that starts a QEMU/KVM virtual machine containing a -NixOS system. The virtual machine mounts the Nix store of the host; -this makes VM creation very fast, as no disk image needs to be -created. Afterwards, you can view a pretty-printed log of the test: - - -$ firefox result/log.html - - - - -It is also possible to run the test environment interactively, -allowing you to experiment with the VMs. For example: - - -$ nix-build login.nix -A driver -$ ./result/bin/nixos-run-vms - - -The script nixos-run-vms starts the virtual -machines defined by test. The root file system of the VMs is created -on the fly and kept across VM restarts in -./hostname.qcow2. - -Finally, the test itself can be run interactively. This is -particularly useful when developing or debugging a test: - - -$ nix-build tests/ -A nfs.driver -$ ./result/bin/nixos-test-driver -starting VDE switch for network 1 -> - - -You can then take any Perl statement, e.g. - - -> startAll -> $machine->succeed("touch /tmp/foo") - - -The function testScript executes the entire test -script and drops you back into the test driver command line upon its -completion. This allows you to inspect the state of the VMs after the -test (e.g. to debug the test script). - - - -
- - - diff --git a/nixos/doc/manual/development/building-nixos.xml b/nixos/doc/manual/development/building-nixos.xml new file mode 100644 index 00000000000..21c5bfe6a5b --- /dev/null +++ b/nixos/doc/manual/development/building-nixos.xml @@ -0,0 +1,32 @@ + + +Building Your Own NixOS CD + +Building a NixOS CD is as easy as configuring your own computer. The +idea is to use another module which will replace +your configuration.nix to configure the system that +would be installed on the CD. + +Default CD/DVD configurations are available +inside nixos/modules/installer/cd-dvd. To build them +you have to set NIXOS_CONFIG before +running nix-build to build the ISO. + + +$ nix-build -A config.system.build.isoImage -I nixos-config=modules/installer/cd-dvd/installation-cd-minimal.nix + + + +Before burning your CD/DVD, you can check the content of the image by mounting anywhere like +suggested by the following command: + + +$ mount -o loop -t iso9660 ./result/iso/cd.iso /mnt/iso + + + + \ No newline at end of file diff --git a/nixos/doc/manual/development/building-parts.xml b/nixos/doc/manual/development/building-parts.xml new file mode 100644 index 00000000000..cb8dee039c8 --- /dev/null +++ b/nixos/doc/manual/development/building-parts.xml @@ -0,0 +1,113 @@ + + +Building Specific Parts of NixOS + +With the command nix-build, you can build +specific parts of your NixOS configuration. This is done as follows: + + +$ cd /path/to/nixpkgs/nixos +$ nix-build -A config.option + +where option is a NixOS option with type +“derivation” (i.e. something that can be built). Attributes of +interest include: + + + + + system.build.toplevel + + The top-level option that builds the entire NixOS system. + Everything else in your configuration is indirectly pulled in by + this option. This is what nixos-rebuild + builds and what /run/current-system points + to afterwards. + + A shortcut to build this is: + + +$ nix-build -A system + + + + + + system.build.manual.manual + The NixOS manual. + + + + system.build.etc + A tree of symlinks that form the static parts of + /etc. + + + + system.build.initialRamdisk + system.build.kernel + + The initial ramdisk and kernel of the system. This allows + a quick way to test whether the kernel and the initial ramdisk + boot correctly, by using QEMU’s and + options: + + +$ nix-build -A config.system.build.initialRamdisk -o initrd +$ nix-build -A config.system.build.kernel -o kernel +$ qemu-system-x86_64 -kernel ./kernel/bzImage -initrd ./initrd/initrd -hda /dev/null + + + + + + + + system.build.nixos-rebuild + system.build.nixos-install + system.build.nixos-generate-config + + These build the corresponding NixOS commands. + + + + + systemd.units.unit-name.unit + + This builds the unit with the specified name. Note that + since unit names contain dots + (e.g. httpd.service), you need to put them + between quotes, like this: + + +$ nix-build -A 'config.systemd.units."httpd.service".unit' + + + You can also test individual units, without rebuilding the whole + system, by putting them in + /run/systemd/system: + + +$ cp $(nix-build -A 'config.systemd.units."httpd.service".unit')/httpd.service \ + /run/systemd/system/tmp-httpd.service +$ systemctl daemon-reload +$ systemctl start tmp-httpd.service + + + Note that the unit must not have the same name as any unit in + /etc/systemd/system since those take + precedence over /run/systemd/system. + That’s why the unit is installed as + tmp-httpd.service here. + + + + + + + + \ No newline at end of file diff --git a/nixos/doc/manual/development/development.xml b/nixos/doc/manual/development/development.xml new file mode 100644 index 00000000000..747159c4427 --- /dev/null +++ b/nixos/doc/manual/development/development.xml @@ -0,0 +1,20 @@ + + +Development + + +This chapter describes how you can modify and extend +NixOS. + + + + + + + + + diff --git a/nixos/doc/manual/development/nixos-tests.xml b/nixos/doc/manual/development/nixos-tests.xml new file mode 100644 index 00000000000..a98da993330 --- /dev/null +++ b/nixos/doc/manual/development/nixos-tests.xml @@ -0,0 +1,19 @@ + + +NixOS Tests + +When you add some feature to NixOS, you should write a test for +it. NixOS tests are kept in the directory nixos/tests, +and are executed (using Nix) by a testing framework that automatically +starts one or more virtual machines containing the NixOS system(s) +required for the test. + + + + + \ No newline at end of file diff --git a/nixos/doc/manual/development/option-declarations.xml b/nixos/doc/manual/development/option-declarations.xml new file mode 100644 index 00000000000..6d93dc5c009 --- /dev/null +++ b/nixos/doc/manual/development/option-declarations.xml @@ -0,0 +1,141 @@ +
+ +Option Declarations + +An option declaration specifies the name, type and description +of a NixOS configuration option. It is illegal to define an option +that hasn’t been declared in any module. A option declaration +generally looks like this: + + +options = { + name = mkOption { + type = type specification; + default = default value; + example = example value; + description = "Description for use in the NixOS manual."; + }; +}; + + + + +The function mkOption accepts the following arguments. + + + + + type + + The type of the option (see below). It may be omitted, + but that’s not advisable since it may lead to errors that are + hard to diagnose. + + + + + default + + The default value used if no value is defined by any + module. A default is not required; in that case, if the option + value is ever used, an error will be thrown. + + + + + example + + An example value that will be shown in the NixOS manual. + + + + + description + + A textual description of the option, in DocBook format, + that will be included in the NixOS manual. + + + + + + + +Here is a non-exhaustive list of option types: + + + + + types.bool + + A Boolean. + + + + + types.int + + An integer. + + + + + types.str + + A string. + + + + + types.lines + + A string. If there are multiple definitions, they are + concatenated, with newline characters in between. + + + + + types.path + + A path, defined as anything that, when coerced to a + string, starts with a slash. This includes derivations. + + + + + types.listOf t + + A list of elements of type t + (e.g., types.listOf types.str is a list of + strings). Multiple definitions are concatenated together. + + + + + types.attrsOf t + + A set of elements of type t + (e.g., types.attrsOf types.int is a set of + name/value pairs, the values being integers). + + + + + types.nullOr t + + Either the value null or something of + type t. + + + + + +You can also create new types using the function +mkOptionType. See +lib/types.nix in Nixpkgs for details. + +
\ No newline at end of file diff --git a/nixos/doc/manual/development/option-def.xml b/nixos/doc/manual/development/option-def.xml new file mode 100644 index 00000000000..4e267ecfd1e --- /dev/null +++ b/nixos/doc/manual/development/option-def.xml @@ -0,0 +1,112 @@ +
+ +Option Definitions + +Option definitions are generally straight-forward bindings of values to option names, like + + +config = { + services.httpd.enable = true; +}; + + +However, sometimes you need to wrap an option definition or set of +option definitions in a property to achieve +certain effects: + +Delaying Conditionals + +If a set of option definitions is conditional on the value of +another option, you may need to use mkIf. +Consider, for instance: + + +config = if config.services.httpd.enable then { + environment.systemPackages = [ ... ]; + ... +} else {}; + + +This definition will cause Nix to fail with an “infinite recursion” +error. Why? Because the value of + depends on the value +being constructed here. After all, you could also write the clearly +circular and contradictory: + +config = if config.services.httpd.enable then { + services.httpd.enable = false; +} else { + services.httpd.enable = true; +}; + + +The solution is to write: + + +config = mkIf config.services.httpd.enable { + environment.systemPackages = [ ... ]; + ... +}; + + +The special function mkIf causes the evaluation of +the conditional to be “pushed down” into the individual definitions, +as if you had written: + + +config = { + environment.systemPackages = if config.services.httpd.enable then [ ... ] else []; + ... +}; + + + + + + +Setting Priorities + +A module can override the definitions of an option in other +modules by setting a priority. All option +definitions that do not have the lowest priority value are discarded. +By default, option definitions have priority 1000. You can specify an +explicit priority by using mkOverride, e.g. + + +services.openssh.enable = mkOverride 10 false; + + +This definition causes all other definitions with priorities above 10 +to be discarded. The function mkForce is +equal to mkOverride 50. + + + +Merging Configurations + +In conjunction with mkIf, it is sometimes +useful for a module to return multiple sets of option definitions, to +be merged together as if they were declared in separate modules. This +can be done using mkMerge: + + +config = mkMerge + [ # Unconditional stuff. + { environment.systemPackages = [ ... ]; + } + # Conditional stuff. + (mkIf config.services.bla.enable { + environment.systemPackages = [ ... ]; + }) + ]; + + + + + + +
\ No newline at end of file diff --git a/nixos/doc/manual/development/running-nixos-tests.xml b/nixos/doc/manual/development/running-nixos-tests.xml new file mode 100644 index 00000000000..d9be761eb01 --- /dev/null +++ b/nixos/doc/manual/development/running-nixos-tests.xml @@ -0,0 +1,77 @@ +
+ +Running Tests + +You can run tests using nix-build. For +example, to run the test login.nix, +you just do: + + +$ nix-build '<nixpkgs/nixos/tests/login.nix>' + + +or, if you don’t want to rely on NIX_PATH: + + +$ cd /my/nixpkgs/nixos/tests +$ nix-build login.nix +… +running the VM test script +machine: QEMU running (pid 8841) +… +6 out of 6 tests succeeded + + +After building/downloading all required dependencies, this will +perform a build that starts a QEMU/KVM virtual machine containing a +NixOS system. The virtual machine mounts the Nix store of the host; +this makes VM creation very fast, as no disk image needs to be +created. Afterwards, you can view a pretty-printed log of the test: + + +$ firefox result/log.html + + + + +It is also possible to run the test environment interactively, +allowing you to experiment with the VMs. For example: + + +$ nix-build login.nix -A driver +$ ./result/bin/nixos-run-vms + + +The script nixos-run-vms starts the virtual +machines defined by test. The root file system of the VMs is created +on the fly and kept across VM restarts in +./hostname.qcow2. + +Finally, the test itself can be run interactively. This is +particularly useful when developing or debugging a test: + + +$ nix-build tests/ -A nfs.driver +$ ./result/bin/nixos-test-driver +starting VDE switch for network 1 +> + + +You can then take any Perl statement, e.g. + + +> startAll +> $machine->succeed("touch /tmp/foo") + + +The function testScript executes the entire test +script and drops you back into the test driver command line upon its +completion. This allows you to inspect the state of the VMs after the +test (e.g. to debug the test script). + +
\ No newline at end of file diff --git a/nixos/doc/manual/development/sources.xml b/nixos/doc/manual/development/sources.xml new file mode 100644 index 00000000000..992a07af981 --- /dev/null +++ b/nixos/doc/manual/development/sources.xml @@ -0,0 +1,95 @@ + + +Getting the Sources + +By default, NixOS’s nixos-rebuild command +uses the NixOS and Nixpkgs sources provided by the +nixos-unstable channel (kept in +/nix/var/nix/profiles/per-user/root/channels/nixos). +To modify NixOS, however, you should check out the latest sources from +Git. This is done using the following command: + + +$ nixos-checkout /my/sources + + +or + + +$ mkdir -p /my/sources +$ cd /my/sources +$ nix-env -i git +$ git clone git://github.com/NixOS/nixpkgs.git + + +This will check out the latest NixOS sources to +/my/sources/nixpkgs/nixos +and the Nixpkgs sources to +/my/sources/nixpkgs. +(The NixOS source tree lives in a subdirectory of the Nixpkgs +repository.) + +It’s often inconvenient to develop directly on the master +branch, since if somebody has just committed (say) a change to GCC, +then the binary cache may not have caught up yet and you’ll have to +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 + + +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 + + +You can then use git rebase to sync your local +branch with the upstream branch, and use git +cherry-pick to copy commits from your local branch to the +upstream branch. + +If you want to rebuild your system using your (modified) +sources, you need to tell nixos-rebuild about them +using the flag: + + +$ nixos-rebuild switch -I nixpkgs=/my/sources/nixpkgs + + + + +If you want nix-env to use the expressions in +/my/sources, use nix-env -f +/my/sources/nixpkgs, or change +the default by adding a symlink in +~/.nix-defexpr: + + +$ ln -s /my/sources/nixpkgs ~/.nix-defexpr/nixpkgs + + +You may want to delete the symlink +~/.nix-defexpr/channels_root to prevent root’s +NixOS channel from clashing with your own tree. + + + + \ No newline at end of file diff --git a/nixos/doc/manual/development/testing-installer.xml b/nixos/doc/manual/development/testing-installer.xml new file mode 100644 index 00000000000..87e40e32617 --- /dev/null +++ b/nixos/doc/manual/development/testing-installer.xml @@ -0,0 +1,27 @@ + + +Testing the Installer + +Building, burning, and booting from an installation CD is rather +tedious, so here is a quick way to see if the installer works +properly: + + +$ nix-build -A config.system.build.nixos-install +$ mount -t tmpfs none /mnt +$ ./result/bin/nixos-install + +To start a login shell in the new NixOS installation in +/mnt: + + +$ ./result/bin/nixos-install --chroot + + + + + \ No newline at end of file diff --git a/nixos/doc/manual/development/writing-modules.xml b/nixos/doc/manual/development/writing-modules.xml new file mode 100644 index 00000000000..9cf29e5dc57 --- /dev/null +++ b/nixos/doc/manual/development/writing-modules.xml @@ -0,0 +1,175 @@ + + +Writing NixOS Modules + +NixOS has a modular system for declarative configuration. This +system combines multiple modules to produce the +full system configuration. One of the modules that constitute the +configuration is /etc/nixos/configuration.nix. +Most of the others live in the nixos/modules +subdirectory of the Nixpkgs tree. + +Each NixOS module is a file that handles one logical aspect of +the configuration, such as a specific kind of hardware, a service, or +network settings. A module configuration does not have to handle +everything from scratch; it can use the functionality provided by +other modules for its implementation. Thus a module can +declare options that can be used by other +modules, and conversely can define options +provided by other modules in its own implementation. For example, the +module pam.nix +declares the option that allows +other modules (e.g. sshd.nix) +to define PAM services; and it defines the option + (declared by etc.nix) +to cause files to be created in +/etc/pam.d. + +In , we saw the following structure +of NixOS modules: + + +{ config, pkgs, ... }: + +{ option definitions +} + + +This is actually an abbreviated form of module +that only defines options, but does not declare any. The structure of +full NixOS modules is shown in . + +Structure of NixOS Modules + +{ config, pkgs, ... }: + +{ + imports = + [ paths of other modules + ]; + + options = { + option declarations + }; + + config = { + option definitions + }; +} + + +The meaning of each part is as follows. + + + + This line makes the current Nix expression a function. The + variable pkgs contains Nixpkgs, while + config contains the full system configuration. + This line can be omitted if there is no reference to + pkgs and config inside the + module. + + + + This list enumerates the paths to other NixOS modules that + should be included in the evaluation of the system configuration. + A default set of modules is defined in the file + modules/module-list.nix. These don't need to + be added in the import list. + + + + The attribute options is a nested set of + option declarations (described below). + + + + The attribute config is a nested set of + option definitions (also described + below). + + + + + + shows a module that handles +the regular update of the “locate” database, an index of all files in +the file system. This module declares two options that can be defined +by other modules (typically the user’s +configuration.nix): + (whether the database should +be updated) and (when the +update should be done). It implements its functionality by defining +two options declared by other modules: + (the set of all systemd services) +and (the list of +commands to be executed periodically by cron). + +NixOS Module for the “locate” Service + +{ config, lib, pkgs, ... }: + +with lib; + +let locatedb = "/var/cache/locatedb"; in + +{ + options = { + + services.locate = { + + enable = mkOption { + type = types.bool; + default = false; + description = '' + If enabled, NixOS will periodically update the database of + files used by the locate command. + ''; + }; + + period = mkOption { + type = types.str; + default = "15 02 * * *"; + description = '' + This option defines (in the format used by cron) when the + locate database is updated. The default is to update at + 02:15 at night every day. + ''; + }; + + }; + + }; + + config = { + + systemd.services.update-locatedb = + { description = "Update Locate Database"; + path = [ pkgs.su ]; + script = + '' + mkdir -m 0755 -p $(dirname ${locatedb}) + exec updatedb --localuser=nobody --output=${locatedb} --prunepaths='/tmp /var/tmp /media /run' + ''; + }; + + services.cron.systemCronJobs = optional config.services.locate.enable + "${config.services.locate.period} root ${config.systemd.package}/bin/systemctl start update-locatedb.service"; + + }; +} + + + + + + \ No newline at end of file diff --git a/nixos/doc/manual/development/writing-nixos-tests.xml b/nixos/doc/manual/development/writing-nixos-tests.xml new file mode 100644 index 00000000000..bbb655eed2a --- /dev/null +++ b/nixos/doc/manual/development/writing-nixos-tests.xml @@ -0,0 +1,251 @@ +
+ +Writing Tests + +A NixOS test is a Nix expression that has the following structure: + + +import ./make-test.nix { + + # Either the configuration of a single machine: + machine = + { config, pkgs, ... }: + { configuration… + }; + + # Or a set of machines: + nodes = + { machine1 = + { config, pkgs, ... }: { … }; + machine2 = + { config, pkgs, ... }: { … }; + … + }; + + testScript = + '' + Perl code… + ''; +} + + +The attribute testScript is a bit of Perl code that +executes the test (described below). During the test, it will start +one or more virtual machines, the configuration of which is described +by the attribute machine (if you need only one +machine in your test) or by the attribute nodes (if +you need multiple machines). For instance, login.nix +only needs a single machine to test whether users can log in on the +virtual console, whether device ownership is correctly maintained when +switching between consoles, and so on. On the other hand, nfs.nix, +which tests NFS client and server functionality in the Linux kernel +(including whether locks are maintained across server crashes), +requires three machines: a server and two clients. + +There are a few special NixOS configuration options for test +VMs: + + + + + + + + The memory of the VM in + megabytes. + + + + + The virtual networks to which the VM is + connected. See nat.nix + for an example. + + + + + By default, the Nix store in the VM is not + writable. If you enable this option, a writable union file system + is mounted on top of the Nix store to make it appear + writable. This is necessary for tests that run Nix operations that + modify the store. + + + + +For more options, see the module qemu-vm.nix. + +The test script is a sequence of Perl statements that perform +various actions, such as starting VMs, executing commands in the VMs, +and so on. Each virtual machine is represented as an object stored in +the variable $name, +where name is the identifier of the machine +(which is just machine if you didn’t specify +multiple machines using the nodes attribute). For +instance, the following starts the machine, waits until it has +finished booting, then executes a command and checks that the output +is more-or-less correct: + + +$machine->start; +$machine->waitForUnit("default.target"); +$machine->succeed("uname") =~ /Linux/; + + +The first line is actually unnecessary; machines are implicitly +started when you first execute an action on them (such as +waitForUnit or succeed). If you +have multiple machines, you can speed up the test by starting them in +parallel: + + +startAll; + + + + +The following methods are available on machine objects: + + + + + start + Start the virtual machine. This method is + asynchronous — it does not wait for the machine to finish + booting. + + + + shutdown + Shut down the machine, waiting for the VM to + exit. + + + + crash + Simulate a sudden power failure, by telling the VM + to exit immediately. + + + + block + Simulate unplugging the Ethernet cable that + connects the machine to the other machines. + + + + unblock + Undo the effect of + block. + + + + screenshot + Take a picture of the display of the virtual + machine, in PNG format. The screenshot is linked from the HTML + log. + + + + sendMonitorCommand + Send a command to the QEMU monitor. This is rarely + used, but allows doing stuff such as attaching virtual USB disks + to a running machine. + + + + sendKeys + Simulate pressing keys on the virtual keyboard, + e.g., sendKeys("ctrl-alt-delete"). + + + + sendChars + Simulate typing a sequence of characters on the + virtual keyboard, e.g., sendKeys("foobar\n") + will type the string foobar followed by the + Enter key. + + + + execute + Execute a shell command, returning a list + (status, + stdout). + + + + succeed + Execute a shell command, raising an exception if + the exit status is not zero, otherwise returning the standard + output. + + + + fail + Like succeed, but raising + an exception if the command returns a zero status. + + + + waitUntilSucceeds + Repeat a shell command with 1-second intervals + until it succeeds. + + + + waitUntilFails + Repeat a shell command with 1-second intervals + until it fails. + + + + waitForUnit + Wait until the specified systemd unit has reached + the “active” state. + + + + waitForFile + Wait until the specified file + exists. + + + + waitForOpenPort + Wait until a process is listening on the given TCP + port (on localhost, at least). + + + + waitForClosedPort + Wait until nobody is listening on the given TCP + port. + + + + waitForX + Wait until the X11 server is accepting + connections. + + + + waitForWindow + Wait until an X11 window has appeared whose name + matches the given regular expression, e.g., + waitForWindow(qr/Terminal/). + + + + + + +
\ No newline at end of file diff --git a/nixos/doc/manual/installation.xml b/nixos/doc/manual/installation.xml deleted file mode 100644 index 4cbfcc229fa..00000000000 --- a/nixos/doc/manual/installation.xml +++ /dev/null @@ -1,570 +0,0 @@ - - -Installing NixOS - - - - -
- -Obtaining NixOS - -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 NixOS -Wiki. - -As an alternative to installing NixOS yourself, you can get a -running NixOS system through several other means: - - - - Using virtual appliances in Open Virtualization Format (OVF) - that can be imported into VirtualBox. These are available from - the NixOS - homepage. - - - Using AMIs for Amazon’s EC2. To find one for your region - and instance type, please refer to the list - of most recent AMIs. - - - Using NixOps, the NixOS-based cloud deployment tool, which - allows you to provision VirtualBox and EC2 NixOS instances from - declarative specifications. Check out the NixOps - homepage for details. - - - - - -
- - - - -
- -Installation - - - - Boot from the CD. - - The CD contains a basic NixOS installation. (It - also contains Memtest86+, useful if you want to test new hardware.) - When it’s finished booting, it should have detected most of your - hardware and brought up networking (check - ifconfig). Networking is necessary for the - installer, since it will download lots of stuff (such as source - tarballs or Nixpkgs channel binaries). It’s best if you have a DHCP - server on your network. Otherwise configure networking manually - using ifconfig. - - The NixOS manual is available on virtual console 8 - (press Alt+F8 to access). - - Login as root and the empty - password. - - If you downloaded the graphical ISO image, you can - run start display-manager to start KDE. - - The NixOS installer doesn’t do any partitioning or - formatting yet, so you need to that yourself. Use the following - commands: - - - - For partitioning: - fdisk. - - For initialising Ext4 partitions: - mkfs.ext4. It is recommended that you assign a - unique symbolic label to the file system using the option - , since this - makes the file system configuration independent from device - changes. For example: - - -$ mkfs.ext4 -L nixos /dev/sda1 - - - - For creating swap partitions: - mkswap. Again it’s recommended to assign a - label to the swap partition: . - - For creating LVM volumes, the LVM commands, e.g., - - -$ pvcreate /dev/sda1 /dev/sdb1 -$ vgcreate MyVolGroup /dev/sda1 /dev/sdb1 -$ lvcreate --size 2G --name bigdisk MyVolGroup -$ lvcreate --size 1G --name smalldisk MyVolGroup - - - - For creating software RAID devices, use - mdadm. - - - - - - Mount the target file system on which NixOS should - be installed on /mnt, e.g. - - -$ mount /dev/disk/by-label/nixos /mnt - - - - - If your machine has a limited amount of memory, you - may want to activate swap devices now (swapon - device). The installer (or - rather, the build actions that it may spawn) may need quite a bit of - RAM, depending on your configuration. - - - - You now need to create a file - /mnt/etc/nixos/configuration.nix that - specifies the intended configuration of the system. This is - because NixOS has a declarative configuration - model: you create or edit a description of the desired - configuration of your system, and then NixOS takes care of making - it happen. The syntax of the NixOS configuration file is - described in , while a - list of available configuration options appears in . A minimal example is shown in . - - The command nixos-generate-config can - generate an initial configuration file for you: - - -$ nixos-generate-config --root /mnt - - You should then edit - /mnt/etc/nixos/configuration.nix to suit your - needs: - - -$ nano /mnt/etc/nixos/configuration.nix - - - The vim text editor is also available. - - You must set the option - to specify on which disk - the GRUB boot loader is to be installed. Without it, NixOS cannot - boot. - - Another critical option is , - specifying the file systems that need to be mounted by NixOS. - However, you typically don’t need to set it yourself, because - nixos-generate-config sets it automatically in - /mnt/etc/nixos/hardware-configuration.nix - from your currently mounted file systems. (The configuration file - hardware-configuration.nix is included from - configuration.nix and will be overwritten by - future invocations of nixos-generate-config; - thus, you generally should not modify it.) - - Depending on your hardware configuration or type of - file system, you may need to set the option - to include the kernel - modules that are necessary for mounting the root file system, - otherwise the installed system will not be able to boot. (If this - happens, boot from the CD again, mount the target file system on - /mnt, fix - /mnt/etc/nixos/configuration.nix and rerun - nixos-install.) In most cases, - nixos-generate-config will figure out the - required modules. - - Examples of real-world NixOS configuration files can be - found at . - - - - Do the installation: - - -$ nixos-install - - Cross fingers. If this fails due to a temporary problem (such as - a network issue while downloading binaries from the NixOS binary - cache), you can just re-run nixos-install. - Otherwise, fix your configuration.nix and - then re-run nixos-install. - - As the last step, nixos-install will ask - you to set the password for the root user, e.g. - - -setting root password... -Enter new UNIX password: *** -Retype new UNIX password: *** - - - - - - - If everything went well: - - -$ reboot - - - - - - You should now be able to boot into the installed NixOS. - The GRUB boot menu shows a list of available - configurations (initially just one). Every time you - change the NixOS configuration (see ), a new item appears in the menu. - This allows you to easily roll back to another configuration if - something goes wrong. - - You should log in and change the root - password with passwd. - - You’ll probably want to create some user accounts as well, - which can be done with useradd: - - -$ useradd -c 'Eelco Dolstra' -m eelco -$ passwd eelco - - - - You may also want to install some software. For instance, - - -$ nix-env -qa \* - - shows what packages are available, and - - -$ nix-env -i w3m - - install the w3m browser. - - - - - -To summarise, shows a -typical sequence of commands for installing NixOS on an empty hard -drive (here /dev/sda). shows a corresponding configuration Nix expression. - -Commands for installing NixOS on <filename>/dev/sda</filename> - -$ fdisk /dev/sda # (or whatever device you want to install on) -$ mkfs.ext4 -L nixos /dev/sda1 -$ mkswap -L swap /dev/sda2 -$ swapon /dev/sda2 -$ mount /dev/disk/by-label/nixos /mnt -$ nixos-generate-config --root /mnt -$ nano /mnt/etc/nixos/configuration.nix -$ nixos-install -$ reboot - - -NixOS configuration - -{ config, pkgs, ... }: - -{ - imports = - [ # Include the results of the hardware scan. - ./hardware-configuration.nix - ]; - - boot.loader.grub.device = "/dev/sda"; - - # Note: setting fileSystems is generally not - # necessary, since nixos-generate-config figures them out - # automatically in hardware-configuration.nix. - #fileSystems."/".device = "/dev/disk/by-label/nixos"; - - # Enable the OpenSSH server. - services.sshd.enable = true; -} - - -
- -UEFI Installation - -NixOS can also be installed on UEFI systems. The procedure -is by and large the same as a BIOS installation, with the following -changes: - - - - You should boot the live CD in UEFI mode (consult your - specific hardware's documentation for instructions). You may find - the rEFInd - boot manager useful. - - - Instead of fdisk, you should use - gdisk to partition your disks. You will need to - have a separate partition for /boot with - partition code EF00, and it should be formatted as a - vfat filesystem. - - - You must set to - true. nixos-generate-config - should do this automatically for new configurations when booted in - UEFI mode. - - - After having mounted your installation partition to - /mnt, you must mount the boot partition - to /mnt/boot. - - - You may want to look at the options starting with - and - as well. - - - To see console messages during early boot, add "fbcon" - to your . - - - - -
- -
- -Booting from a USB stick - -For systems without CD drive, the NixOS livecd can be booted from -a usb stick. For non-UEFI installations, -unetbootin -will work. For UEFI installations, you should mount the ISO, copy its contents -verbatim to your drive, then either: - - - - Change the label of the disk partition to the label of the ISO - (visible with the blkid command), or - - - Edit loader/entries/nixos-livecd.conf on the drive - and change the root= field in the options - line to point to your drive (see the documentation on root= - in - the kernel documentation for more details). - - - -
- -
- - - - -
- -Changing the configuration - -The file /etc/nixos/configuration.nix -contains the current configuration of your machine. Whenever you’ve -changed something to that file, you should do - - -$ nixos-rebuild switch - -to build the new configuration, make it the default configuration for -booting, and try to realise the configuration in the running system -(e.g., by restarting system services). - -These commands must be executed as root, so you should -either run them from a root shell or by prefixing them with -sudo -i. - -You can also do - - -$ nixos-rebuild test - -to build the configuration and switch the running system to it, but -without making it the boot default. So if (say) the configuration -locks up your machine, you can just reboot to get back to a working -configuration. - -There is also - - -$ nixos-rebuild boot - -to build the configuration and make it the boot default, but not -switch to it now (so it will only take effect after the next -reboot). - -You can make your configuration show up in a different submenu -of the GRUB 2 boot screen by giving it a different profile -name, e.g. - - -$ nixos-rebuild switch -p test - -which causes the new configuration (and previous ones created using --p test) to show up in the GRUB submenu “NixOS - -Profile 'test'”. This can be useful to separate test configurations -from “stable” configurations. - -Finally, you can do - - -$ nixos-rebuild build - -to build the configuration but nothing more. This is useful to see -whether everything compiles cleanly. - -If you have a machine that supports hardware virtualisation, you -can also test the new configuration in a sandbox by building and -running a QEMU virtual machine that contains the -desired configuration. Just do - - -$ nixos-rebuild build-vm -$ ./result/bin/run-*-vm - - -The VM does not have any data from your host system, so your existing -user accounts and home directories will not be available. You can -forward ports on the host to the guest. For instance, the following -will forward host port 2222 to guest port 22 (SSH): - - -$ QEMU_NET_OPTS="hostfwd=tcp::2222-:22" ./result/bin/run-*-vm - - -allowing you to log in via SSH (assuming you have set the appropriate -passwords or SSH authorized keys): - - -$ ssh -p 2222 localhost - - - - -
- - - - -
- -Upgrading NixOS - -The best way to keep your NixOS installation up to date is to -use one of the NixOS channels. A channel is a -Nix mechanism for distributing Nix expressions and associated -binaries. The NixOS channels are updated automatically from NixOS’s -Git repository after certain tests have passed and all packages have -been built. These channels are: - - - - Stable channels, such as 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 - not from 3.4.x to - 3.11.x (a major change that has the - potential to break things). Stable channels are generally - maintained until the next stable branch is created. - - - The unstable channel, 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. - - - -To see what channels are available, go to . (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.) - -When you first install NixOS, you’re automatically subscribed to -the NixOS channel that corresponds to your installation source. For -instance, if you installed from a 14.04 ISO, you will be subscribed to -the nixos-14.04 channel. To see which NixOS -channel you’re subscribed to, run the following as root: - - -$ nix-channel --list | grep nixos -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 - - -(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 - - -But it you want to live on the bleeding edge: - - -$ nix-channel --add http://nixos.org/channels/nixos-unstable nixos - - - - -You can then upgrade NixOS to the latest version in your chosen -channel by running - - -$ nixos-rebuild switch --upgrade - - -which is equivalent to the more verbose nix-channel --update -nixos; nixos-rebuild switch. - -It is generally safe to switch back and forth between -channels. The only exception is that a newer NixOS may also have a -newer Nix version, which may involve an upgrade of Nix’s database -schema. This cannot be undone easily, so in that case you will not be -able to go back to your original channel. - -
- - diff --git a/nixos/doc/manual/installation/changing-config.xml b/nixos/doc/manual/installation/changing-config.xml new file mode 100644 index 00000000000..aa31742434e --- /dev/null +++ b/nixos/doc/manual/installation/changing-config.xml @@ -0,0 +1,90 @@ + + +Changing the Configuration + +The file /etc/nixos/configuration.nix +contains the current configuration of your machine. Whenever you’ve +changed something to that file, you should do + + +$ nixos-rebuild switch + +to build the new configuration, make it the default configuration for +booting, and try to realise the configuration in the running system +(e.g., by restarting system services). + +These commands must be executed as root, so you should +either run them from a root shell or by prefixing them with +sudo -i. + +You can also do + + +$ nixos-rebuild test + +to build the configuration and switch the running system to it, but +without making it the boot default. So if (say) the configuration +locks up your machine, you can just reboot to get back to a working +configuration. + +There is also + + +$ nixos-rebuild boot + +to build the configuration and make it the boot default, but not +switch to it now (so it will only take effect after the next +reboot). + +You can make your configuration show up in a different submenu +of the GRUB 2 boot screen by giving it a different profile +name, e.g. + + +$ nixos-rebuild switch -p test + +which causes the new configuration (and previous ones created using +-p test) to show up in the GRUB submenu “NixOS - +Profile 'test'”. This can be useful to separate test configurations +from “stable” configurations. + +Finally, you can do + + +$ nixos-rebuild build + +to build the configuration but nothing more. This is useful to see +whether everything compiles cleanly. + +If you have a machine that supports hardware virtualisation, you +can also test the new configuration in a sandbox by building and +running a QEMU virtual machine that contains the +desired configuration. Just do + + +$ nixos-rebuild build-vm +$ ./result/bin/run-*-vm + + +The VM does not have any data from your host system, so your existing +user accounts and home directories will not be available. You can +forward ports on the host to the guest. For instance, the following +will forward host port 2222 to guest port 22 (SSH): + + +$ QEMU_NET_OPTS="hostfwd=tcp::2222-:22" ./result/bin/run-*-vm + + +allowing you to log in via SSH (assuming you have set the appropriate +passwords or SSH authorized keys): + + +$ ssh -p 2222 localhost + + + + + diff --git a/nixos/doc/manual/installation/installation.xml b/nixos/doc/manual/installation/installation.xml new file mode 100644 index 00000000000..ee61bedc418 --- /dev/null +++ b/nixos/doc/manual/installation/installation.xml @@ -0,0 +1,21 @@ + + +Installation + + + +This section describes how to obtain, install, and configure +NixOS for first-time use. + + + + + + + + + diff --git a/nixos/doc/manual/installation/installing-UEFI.xml b/nixos/doc/manual/installation/installing-UEFI.xml new file mode 100644 index 00000000000..dbd5606c4a5 --- /dev/null +++ b/nixos/doc/manual/installation/installing-UEFI.xml @@ -0,0 +1,51 @@ +
+ +UEFI Installation + +NixOS can also be installed on UEFI systems. The procedure +is by and large the same as a BIOS installation, with the following +changes: + + + + You should boot the live CD in UEFI mode (consult your + specific hardware's documentation for instructions). You may find + the rEFInd + boot manager useful. + + + Instead of fdisk, you should use + gdisk to partition your disks. You will need to + have a separate partition for /boot with + partition code EF00, and it should be formatted as a + vfat filesystem. + + + You must set to + true. nixos-generate-config + should do this automatically for new configurations when booted in + UEFI mode. + + + After having mounted your installation partition to + /mnt, you must mount the boot partition + to /mnt/boot. + + + You may want to look at the options starting with + and + as well. + + + To see console messages during early boot, add "fbcon" + to your . + + + + +
diff --git a/nixos/doc/manual/installation/installing-USB.xml b/nixos/doc/manual/installation/installing-USB.xml new file mode 100644 index 00000000000..97e3d2eaa1c --- /dev/null +++ b/nixos/doc/manual/installation/installing-USB.xml @@ -0,0 +1,30 @@ +
+ +Booting from a USB Drive + +For systems without CD drive, the NixOS livecd can be booted from +a usb stick. For non-UEFI installations, +unetbootin +will work. For UEFI installations, you should mount the ISO, copy its contents +verbatim to your drive, then either: + + + + Change the label of the disk partition to the label of the ISO + (visible with the blkid command), or + + + Edit loader/entries/nixos-livecd.conf on the drive + and change the root= field in the options + line to point to your drive (see the documentation on root= + in + the kernel documentation for more details). + + + + +
diff --git a/nixos/doc/manual/installation/installing.xml b/nixos/doc/manual/installation/installing.xml new file mode 100644 index 00000000000..793b503ad97 --- /dev/null +++ b/nixos/doc/manual/installation/installing.xml @@ -0,0 +1,264 @@ + + +Installing NixOS + + + + Boot from the CD. + + The CD contains a basic NixOS installation. (It + also contains Memtest86+, useful if you want to test new hardware.) + When it’s finished booting, it should have detected most of your + hardware and brought up networking (check + ifconfig). Networking is necessary for the + installer, since it will download lots of stuff (such as source + tarballs or Nixpkgs channel binaries). It’s best if you have a DHCP + server on your network. Otherwise configure networking manually + using ifconfig. + + The NixOS manual is available on virtual console 8 + (press Alt+F8 to access). + + Login as root and the empty + password. + + If you downloaded the graphical ISO image, you can + run start display-manager to start KDE. + + The NixOS installer doesn’t do any partitioning or + formatting yet, so you need to that yourself. Use the following + commands: + + + + For partitioning: + fdisk. + + For initialising Ext4 partitions: + mkfs.ext4. It is recommended that you assign a + unique symbolic label to the file system using the option + , since this + makes the file system configuration independent from device + changes. For example: + + +$ mkfs.ext4 -L nixos /dev/sda1 + + + + For creating swap partitions: + mkswap. Again it’s recommended to assign a + label to the swap partition: . + + For creating LVM volumes, the LVM commands, e.g., + + +$ pvcreate /dev/sda1 /dev/sdb1 +$ vgcreate MyVolGroup /dev/sda1 /dev/sdb1 +$ lvcreate --size 2G --name bigdisk MyVolGroup +$ lvcreate --size 1G --name smalldisk MyVolGroup + + + + For creating software RAID devices, use + mdadm. + + + + + + Mount the target file system on which NixOS should + be installed on /mnt, e.g. + + +$ mount /dev/disk/by-label/nixos /mnt + + + + + If your machine has a limited amount of memory, you + may want to activate swap devices now (swapon + device). The installer (or + rather, the build actions that it may spawn) may need quite a bit of + RAM, depending on your configuration. + + + + You now need to create a file + /mnt/etc/nixos/configuration.nix that + specifies the intended configuration of the system. This is + because NixOS has a declarative configuration + model: you create or edit a description of the desired + configuration of your system, and then NixOS takes care of making + it happen. The syntax of the NixOS configuration file is + described in , while a + list of available configuration options appears in . A minimal example is shown in . + + The command nixos-generate-config can + generate an initial configuration file for you: + + +$ nixos-generate-config --root /mnt + + You should then edit + /mnt/etc/nixos/configuration.nix to suit your + needs: + + +$ nano /mnt/etc/nixos/configuration.nix + + + The vim text editor is also available. + + You must set the option + to specify on which disk + the GRUB boot loader is to be installed. Without it, NixOS cannot + boot. + + Another critical option is , + specifying the file systems that need to be mounted by NixOS. + However, you typically don’t need to set it yourself, because + nixos-generate-config sets it automatically in + /mnt/etc/nixos/hardware-configuration.nix + from your currently mounted file systems. (The configuration file + hardware-configuration.nix is included from + configuration.nix and will be overwritten by + future invocations of nixos-generate-config; + thus, you generally should not modify it.) + + Depending on your hardware configuration or type of + file system, you may need to set the option + to include the kernel + modules that are necessary for mounting the root file system, + otherwise the installed system will not be able to boot. (If this + happens, boot from the CD again, mount the target file system on + /mnt, fix + /mnt/etc/nixos/configuration.nix and rerun + nixos-install.) In most cases, + nixos-generate-config will figure out the + required modules. + + Examples of real-world NixOS configuration files can be + found at . + + + + Do the installation: + + +$ nixos-install + + Cross fingers. If this fails due to a temporary problem (such as + a network issue while downloading binaries from the NixOS binary + cache), you can just re-run nixos-install. + Otherwise, fix your configuration.nix and + then re-run nixos-install. + + As the last step, nixos-install will ask + you to set the password for the root user, e.g. + + +setting root password... +Enter new UNIX password: *** +Retype new UNIX password: *** + + + + + + + If everything went well: + + +$ reboot + + + + + + You should now be able to boot into the installed NixOS. The GRUB boot menu shows a list + of available configurations (initially just one). Every time + you change the NixOS configuration (seeChanging + Configuration ), a new item appears in the menu. This allows you to + easily roll back to another configuration if something goes wrong. + + You should log in and change the root + password with passwd. + + You’ll probably want to create some user accounts as well, + which can be done with useradd: + + +$ useradd -c 'Eelco Dolstra' -m eelco +$ passwd eelco + + + + You may also want to install some software. For instance, + + +$ nix-env -qa \* + + shows what packages are available, and + + +$ nix-env -i w3m + + install the w3m browser. + + + + + +To summarise, shows a +typical sequence of commands for installing NixOS on an empty hard +drive (here /dev/sda). shows a corresponding configuration Nix expression. + +Commands for Installing NixOS on <filename>/dev/sda</filename> + +$ fdisk /dev/sda # (or whatever device you want to install on) +$ mkfs.ext4 -L nixos /dev/sda1 +$ mkswap -L swap /dev/sda2 +$ swapon /dev/sda2 +$ mount /dev/disk/by-label/nixos /mnt +$ nixos-generate-config --root /mnt +$ nano /mnt/etc/nixos/configuration.nix +$ nixos-install +$ reboot + + +NixOS Configuration + +{ config, pkgs, ... }: + +{ + imports = + [ # Include the results of the hardware scan. + ./hardware-configuration.nix + ]; + + boot.loader.grub.device = "/dev/sda"; + + # Note: setting fileSystems is generally not + # necessary, since nixos-generate-config figures them out + # automatically in hardware-configuration.nix. + #fileSystems."/".device = "/dev/disk/by-label/nixos"; + + # Enable the OpenSSH server. + services.sshd.enable = true; +} + + + + + + diff --git a/nixos/doc/manual/installation/obtaining.xml b/nixos/doc/manual/installation/obtaining.xml new file mode 100644 index 00000000000..ceeeb5c0ac0 --- /dev/null +++ b/nixos/doc/manual/installation/obtaining.xml @@ -0,0 +1,44 @@ + + +Obtaining NixOS + +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 NixOS +Wiki. + +As an alternative to installing NixOS yourself, you can get a +running NixOS system through several other means: + + + + Using virtual appliances in Open Virtualization Format (OVF) + that can be imported into VirtualBox. These are available from + the NixOS + homepage. + + + Using AMIs for Amazon’s EC2. To find one for your region + and instance type, please refer to the list + of most recent AMIs. + + + Using NixOps, the NixOS-based cloud deployment tool, which + allows you to provision VirtualBox and EC2 NixOS instances from + declarative specifications. Check out the NixOps + homepage for details. + + + + + + diff --git a/nixos/doc/manual/installation/upgrading.xml b/nixos/doc/manual/installation/upgrading.xml new file mode 100644 index 00000000000..ed71a7e23a3 --- /dev/null +++ b/nixos/doc/manual/installation/upgrading.xml @@ -0,0 +1,90 @@ + + +Upgrading NixOS + +The best way to keep your NixOS installation up to date is to +use one of the NixOS channels. A channel is a +Nix mechanism for distributing Nix expressions and associated +binaries. The NixOS channels are updated automatically from NixOS’s +Git repository after certain tests have passed and all packages have +been built. These channels are: + + + + Stable channels, such as 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 + not from 3.4.x to + 3.11.x (a major change that has the + potential to break things). Stable channels are generally + maintained until the next stable branch is created. + + + The unstable channel, 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. + + + +To see what channels are available, go to . (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.) + +When you first install NixOS, you’re automatically subscribed to +the NixOS channel that corresponds to your installation source. For +instance, if you installed from a 14.04 ISO, you will be subscribed to +the nixos-14.04 channel. To see which NixOS +channel you’re subscribed to, run the following as root: + + +$ nix-channel --list | grep nixos +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 + + +(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 + + +But it you want to live on the bleeding edge: + + +$ nix-channel --add http://nixos.org/channels/nixos-unstable nixos + + + + +You can then upgrade NixOS to the latest version in your chosen +channel by running + + +$ nixos-rebuild switch --upgrade + + +which is equivalent to the more verbose nix-channel --update +nixos; nixos-rebuild switch. + +It is generally safe to switch back and forth between +channels. The only exception is that a newer NixOS may also have a +newer Nix version, which may involve an upgrade of Nix’s database +schema. This cannot be undone easily, so in that case you will not be +able to go back to your original channel. + + diff --git a/nixos/doc/manual/manual.xml b/nixos/doc/manual/manual.xml index f51a04cdf25..a3ad76209ac 100644 --- a/nixos/doc/manual/manual.xml +++ b/nixos/doc/manual/manual.xml @@ -1,15 +1,14 @@ - + xmlns:xi="http://www.w3.org/2001/XInclude" + version="5.0" + xml:id="NixOSManual"> + - NixOS Manual Version - - Preface @@ -29,19 +28,14 @@ - - - - + + + - - - - - + - Configuration options + Configuration Options diff --git a/nixos/doc/manual/release-notes/release-notes.xml b/nixos/doc/manual/release-notes/release-notes.xml new file mode 100644 index 00000000000..fb82d5adcef --- /dev/null +++ b/nixos/doc/manual/release-notes/release-notes.xml @@ -0,0 +1,17 @@ + + +Release Notes + + +This section lists the release notes for each stable version of NixOS. + + + + + + + diff --git a/nixos/doc/manual/release-notes/rl-1310.xml b/nixos/doc/manual/release-notes/rl-1310.xml new file mode 100644 index 00000000000..234fb5a643f --- /dev/null +++ b/nixos/doc/manual/release-notes/rl-1310.xml @@ -0,0 +1,11 @@ + + +Release 13.10 (“Aardvark”, 2013/10/31) + +This is the first stable release branch of NixOS. + + \ No newline at end of file diff --git a/nixos/doc/manual/release-notes.xml b/nixos/doc/manual/release-notes/rl-1404.xml similarity index 83% rename from nixos/doc/manual/release-notes.xml rename to nixos/doc/manual/release-notes/rl-1404.xml index 52e88bb4c86..74af1ed1274 100644 --- a/nixos/doc/manual/release-notes.xml +++ b/nixos/doc/manual/release-notes/rl-1404.xml @@ -1,34 +1,8 @@ - - -Release notes - - - -
- -Release 14.10 (“Caterpillar”, 2014/10/??) - -When upgrading from a previous release, please be aware of the -following incompatible changes: - - - - The host side of a container virtual Ethernet pair - is now called ve-container-name - rather than c-container-name. - - - - - -
- - - - -
+ Release 14.04 (“Baboon”, 2014/04/30) @@ -183,16 +157,4 @@ networking.firewall.enable = false; -
- - - -
- -Release 13.10 (“Aardvark”, 2013/10/31) - -This is the first stable release branch of NixOS. - -
- - + \ No newline at end of file diff --git a/nixos/doc/manual/release-notes/rl-1410.xml b/nixos/doc/manual/release-notes/rl-1410.xml new file mode 100644 index 00000000000..09da15ce236 --- /dev/null +++ b/nixos/doc/manual/release-notes/rl-1410.xml @@ -0,0 +1,22 @@ + + +Release 14.10 (“Caterpillar”, 2014/10/??) + +When upgrading from a previous release, please be aware of the +following incompatible changes: + + + + The host side of a container virtual Ethernet pair + is now called ve-container-name + rather than c-container-name. + + + + + + \ No newline at end of file diff --git a/nixos/doc/manual/running.xml b/nixos/doc/manual/running.xml deleted file mode 100644 index e1a358df2aa..00000000000 --- a/nixos/doc/manual/running.xml +++ /dev/null @@ -1,369 +0,0 @@ - - -Running NixOS - -This chapter describes various aspects of managing a running -NixOS system, such as how to use the systemd -service manager. - - - - -
Service management - -In NixOS, all system services are started and monitored using -the systemd program. Systemd is the “init” process of the system -(i.e. PID 1), the parent of all other processes. It manages a set of -so-called “units”, which can be things like system services -(programs), but also mount points, swap files, devices, targets -(groups of units) and more. Units can have complex dependencies; for -instance, one unit can require that another unit must be successfully -started before the first unit can be started. When the system boots, -it starts a unit named default.target; the -dependencies of this unit cause all system services to be started, -file systems to be mounted, swap files to be activated, and so -on. - -The command systemctl is the main way to -interact with systemd. Without any arguments, it -shows the status of active units: - - -$ systemctl --.mount loaded active mounted / -swapfile.swap loaded active active /swapfile -sshd.service loaded active running SSH Daemon -graphical.target loaded active active Graphical Interface -... - - - - -You can ask for detailed status information about a unit, for -instance, the PostgreSQL database service: - - -$ systemctl status postgresql.service -postgresql.service - PostgreSQL Server - Loaded: loaded (/nix/store/pn3q73mvh75gsrl8w7fdlfk3fq5qm5mw-unit/postgresql.service) - Active: active (running) since Mon, 2013-01-07 15:55:57 CET; 9h ago - Main PID: 2390 (postgres) - CGroup: name=systemd:/system/postgresql.service - ├─2390 postgres - ├─2418 postgres: writer process - ├─2419 postgres: wal writer process - ├─2420 postgres: autovacuum launcher process - ├─2421 postgres: stats collector process - └─2498 postgres: zabbix zabbix [local] idle - -Jan 07 15:55:55 hagbard postgres[2394]: [1-1] LOG: database system was shut down at 2013-01-07 15:55:05 CET -Jan 07 15:55:57 hagbard postgres[2390]: [1-1] LOG: database system is ready to accept connections -Jan 07 15:55:57 hagbard postgres[2420]: [1-1] LOG: autovacuum launcher started -Jan 07 15:55:57 hagbard systemd[1]: Started PostgreSQL Server. - - -Note that this shows the status of the unit (active and running), all -the processes belonging to the service, as well as the most recent log -messages from the service. - - - -Units can be stopped, started or restarted: - - -$ systemctl stop postgresql.service -$ systemctl start postgresql.service -$ systemctl restart postgresql.service - - -These operations are synchronous: they wait until the service has -finished starting or stopping (or has failed). Starting a unit will -cause the dependencies of that unit to be started as well (if -necessary). - - - -
- - - - -
Rebooting and shutting down - -The system can be shut down (and automatically powered off) by -doing: - - -$ shutdown - - -This is equivalent to running systemctl -poweroff. - -To reboot the system, run - - -$ reboot - - -which is equivalent to systemctl reboot. -Alternatively, you can quickly reboot the system using -kexec, which bypasses the BIOS by directly loading -the new kernel into memory: - - -$ systemctl kexec - - - - -The machine can be suspended to RAM (if supported) using -systemctl suspend, and suspended to disk using -systemctl hibernate. - -These commands can be run by any user who is logged in locally, -i.e. on a virtual console or in X11; otherwise, the user is asked for -authentication. - -
- - - - -
User sessions - -Systemd keeps track of all users who are logged into the system -(e.g. on a virtual console or remotely via SSH). The command -loginctl allows querying and manipulating user -sessions. For instance, to list all user sessions: - - -$ loginctl - SESSION UID USER SEAT - c1 500 eelco seat0 - c3 0 root seat0 - c4 500 alice - - -This shows that two users are logged in locally, while another is -logged in remotely. (“Seats” are essentially the combinations of -displays and input devices attached to the system; usually, there is -only one seat.) To get information about a session: - - -$ loginctl session-status c3 -c3 - root (0) - Since: Tue, 2013-01-08 01:17:56 CET; 4min 42s ago - Leader: 2536 (login) - Seat: seat0; vc3 - TTY: /dev/tty3 - Service: login; type tty; class user - State: online - CGroup: name=systemd:/user/root/c3 - ├─ 2536 /nix/store/10mn4xip9n7y9bxqwnsx7xwx2v2g34xn-shadow-4.1.5.1/bin/login -- - ├─10339 -bash - └─10355 w3m nixos.org - - -This shows that the user is logged in on virtual console 3. It also -lists the processes belonging to this session. Since systemd keeps -track of this, you can terminate a session in a way that ensures that -all the session’s processes are gone: - - -$ loginctl terminate-session c3 - - - - -
- - - - -
Control groups - -To keep track of the processes in a running system, systemd uses -control groups (cgroups). A control group is a -set of processes used to allocate resources such as CPU, memory or I/O -bandwidth. There can be multiple control group hierarchies, allowing -each kind of resource to be managed independently. - -The command systemd-cgls lists all control -groups in the systemd hierarchy, which is what -systemd uses to keep track of the processes belonging to each service -or user session: - - -$ systemd-cgls -├─user -│ └─eelco -│ └─c1 -│ ├─ 2567 -:0 -│ ├─ 2682 kdeinit4: kdeinit4 Running... -│ ├─ ... -│ └─10851 sh -c less -R -└─system - ├─httpd.service - │ ├─2444 httpd -f /nix/store/3pyacby5cpr55a03qwbnndizpciwq161-httpd.conf -DNO_DETACH - │ └─... - ├─dhcpcd.service - │ └─2376 dhcpcd --config /nix/store/f8dif8dsi2yaa70n03xir8r653776ka6-dhcpcd.conf - └─ ... - - -Similarly, systemd-cgls cpu shows the cgroups in -the CPU hierarchy, which allows per-cgroup CPU scheduling priorities. -By default, every systemd service gets its own CPU cgroup, while all -user sessions are in the top-level CPU cgroup. This ensures, for -instance, that a thousand run-away processes in the -httpd.service cgroup cannot starve the CPU for one -process in the postgresql.service cgroup. (By -contrast, it they were in the same cgroup, then the PostgreSQL process -would get 1/1001 of the cgroup’s CPU time.) You can limit a service’s -CPU share in configuration.nix: - - -systemd.services.httpd.serviceConfig.CPUShares = 512; - - -By default, every cgroup has 1024 CPU shares, so this will halve the -CPU allocation of the httpd.service cgroup. - -There also is a memory hierarchy that -controls memory allocation limits; by default, all processes are in -the top-level cgroup, so any service or session can exhaust all -available memory. Per-cgroup memory limits can be specified in -configuration.nix; for instance, to limit -httpd.service to 512 MiB of RAM (excluding swap) -and 640 MiB of RAM (including swap): - - -systemd.services.httpd.serviceConfig.MemoryLimit = "512M"; -systemd.services.httpd.serviceConfig.ControlGroupAttribute = [ "memory.memsw.limit_in_bytes 640M" ]; - - - - -The command systemd-cgtop shows a -continuously updated list of all cgroups with their CPU and memory -usage. - -
- - - - -
Logging - -System-wide logging is provided by systemd’s -journal, which subsumes traditional logging -daemons such as syslogd and klogd. Log entries are kept in binary -files in /var/log/journal/. The command -journalctl allows you to see the contents of the -journal. For example, - - -$ journalctl -b - - -shows all journal entries since the last reboot. (The output of -journalctl is piped into less by -default.) You can use various options and match operators to restrict -output to messages of interest. For instance, to get all messages -from PostgreSQL: - - -$ journalctl -u postgresql.service --- Logs begin at Mon, 2013-01-07 13:28:01 CET, end at Tue, 2013-01-08 01:09:57 CET. -- -... -Jan 07 15:44:14 hagbard postgres[2681]: [2-1] LOG: database system is shut down --- Reboot -- -Jan 07 15:45:10 hagbard postgres[2532]: [1-1] LOG: database system was shut down at 2013-01-07 15:44:14 CET -Jan 07 15:45:13 hagbard postgres[2500]: [1-1] LOG: database system is ready to accept connections - - -Or to get all messages since the last reboot that have at least a -“critical” severity level: - - -$ journalctl -b -p crit -Dec 17 21:08:06 mandark sudo[3673]: pam_unix(sudo:auth): auth could not identify password for [alice] -Dec 29 01:30:22 mandark kernel[6131]: [1053513.909444] CPU6: Core temperature above threshold, cpu clock throttled (total events = 1) - - - - -The system journal is readable by root and by users in the -wheel and systemd-journal -groups. All users have a private journal that can be read using -journalctl. - -
- - - - -
Cleaning up the Nix store - -Nix has a purely functional model, meaning that packages are -never upgraded in place. Instead new versions of packages end up in a -different location in the Nix store (/nix/store). -You should periodically run Nix’s garbage -collector to remove old, unreferenced packages. This is -easy: - - -$ nix-collect-garbage - - -Alternatively, you can use a systemd unit that does the same in the -background: - - -$ systemctl start nix-gc.service - - -You can tell NixOS in configuration.nix to run -this unit automatically at certain points in time, for instance, every -night at 03:15: - - -nix.gc.automatic = true; -nix.gc.dates = "03:15"; - - - - -The commands above do not remove garbage collector roots, such -as old system configurations. Thus they do not remove the ability to -roll back to previous configurations. The following command deletes -old roots, removing the ability to roll back to them: - -$ nix-collect-garbage -d - -You can also do this for specific profiles, e.g. - -$ nix-env -p /nix/var/nix/profiles/per-user/eelco/profile --delete-generations old - -Note that NixOS system configurations are stored in the profile -/nix/var/nix/profiles/system. - -Another way to reclaim disk space (often as much as 40% of the -size of the Nix store) is to run Nix’s store optimiser, which seeks -out identical files in the store and replaces them with hard links to -a single copy. - -$ nix-store --optimise - -Since this command needs to read the entire Nix store, it can take -quite a while to finish. - -
- - - diff --git a/nixos/doc/manual/troubleshooting.xml b/nixos/doc/manual/troubleshooting.xml deleted file mode 100644 index c7d65112b64..00000000000 --- a/nixos/doc/manual/troubleshooting.xml +++ /dev/null @@ -1,199 +0,0 @@ - - -Troubleshooting - - - - -
Boot problems - -If NixOS fails to boot, there are a number of kernel command -line parameters that may help you to identify or fix the issue. You -can add these parameters in the GRUB boot menu by pressing “e” to -modify the selected boot entry and editing the line starting with -linux. The following are some useful kernel command -line parameters that are recognised by the NixOS boot scripts or by -systemd: - - - - boot.shell_on_fail - Start a root shell if something goes wrong in - stage 1 of the boot process (the initial ramdisk). This is - disabled by default because there is no authentication for the - root shell. - - - boot.debug1 - Start an interactive shell in stage 1 before - anything useful has been done. That is, no modules have been - loaded and no file systems have been mounted, except for - /proc and - /sys. - - - boot.trace - Print every shell command executed by the stage 1 - and 2 boot scripts. - - - single - Boot into rescue mode (a.k.a. single user mode). - This will cause systemd to start nothing but the unit - rescue.target, which runs - sulogin to prompt for the root password and - start a root login shell. Exiting the shell causes the system to - continue with the normal boot process. - - - systemd.log_level=debug systemd.log_target=console - Make systemd very verbose and send log messages to - the console instead of the journal. - - - - -For more parameters recognised by systemd, see -systemd1. - -If no login prompts or X11 login screens appear (e.g. due to -hanging dependencies), you can press Alt+ArrowUp. If you’re lucky, -this will start rescue mode (described above). (Also note that since -most units have a 90-second timeout before systemd gives up on them, -the agetty login prompts should appear eventually -unless something is very wrong.) - -
- - - - -
Maintenance mode - -You can enter rescue mode by running: - - -$ systemctl rescue - -This will eventually give you a single-user root shell. Systemd will -stop (almost) all system services. To get out of maintenance mode, -just exit from the rescue shell. - -
- - - - -
Rolling back configuration changes - -After running nixos-rebuild to switch to a -new configuration, you may find that the new configuration doesn’t -work very well. In that case, there are several ways to return to a -previous configuration. - -First, the GRUB boot manager allows you to boot into any -previous configuration that hasn’t been garbage-collected. These -configurations can be found under the GRUB submenu “NixOS - All -configurations”. This is especially useful if the new configuration -fails to boot. After the system has booted, you can make the selected -configuration the default for subsequent boots: - - -$ /run/current-system/bin/switch-to-configuration boot - - - -Second, you can switch to the previous configuration in a running -system: - - -$ nixos-rebuild switch --rollback - -This is equivalent to running: - - -$ /nix/var/nix/profiles/system-N-link/bin/switch-to-configuration switch - -where N is the number of the NixOS system -configuration. To get a list of the available configurations, do: - - -$ ls -l /nix/var/nix/profiles/system-*-link -... -lrwxrwxrwx 1 root root 78 Aug 12 13:54 /nix/var/nix/profiles/system-268-link -> /nix/store/202b...-nixos-13.07pre4932_5a676e4-4be1055 - - - - -
- - - - -
Nix store corruption - -After a system crash, it’s possible for files in the Nix store -to become corrupted. (For instance, the Ext4 file system has the -tendency to replace un-synced files with zero bytes.) NixOS tries -hard to prevent this from happening: it performs a -sync before switching to a new configuration, and -Nix’s database is fully transactional. If corruption still occurs, -you may be able to fix it automatically. - -If the corruption is in a path in the closure of the NixOS -system configuration, you can fix it by doing - - -$ nixos-rebuild switch --repair - - -This will cause Nix to check every path in the closure, and if its -cryptographic hash differs from the hash recorded in Nix’s database, -the path is rebuilt or redownloaded. - -You can also scan the entire Nix store for corrupt paths: - - -$ nix-store --verify --check-contents --repair - - -Any corrupt paths will be redownloaded if they’re available in a -binary cache; otherwise, they cannot be repaired. - -
- - - - -
Nix network issues - -Nix uses a so-called binary cache to -optimise building a package from source into downloading it as a -pre-built binary. That is, whenever a command like -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. - - -$ nixos-rebuild switch --option use-binary-caches false - - -If you have an alternative binary cache at your disposal, you can use -it instead: - - -$ nixos-rebuild switch --option binary-caches http://my-cache.example.org/ - - - - -
- - - -- GitLab From 60e6cc81b5a76751c289d7184ff5842f5e5cca84 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 26 Aug 2014 15:45:47 +0200 Subject: [PATCH 351/843] No caps in filenames --- nixos/doc/manual/configuration/file-systems.xml | 2 +- .../{LUKS-file-systems.xml => luks-file-systems.xml} | 0 .../installation/{installing-UEFI.xml => installing-uefi.xml} | 0 .../installation/{installing-USB.xml => installing-usb.xml} | 0 nixos/doc/manual/installation/installing.xml | 4 ++-- 5 files changed, 3 insertions(+), 3 deletions(-) rename nixos/doc/manual/configuration/{LUKS-file-systems.xml => luks-file-systems.xml} (100%) rename nixos/doc/manual/installation/{installing-UEFI.xml => installing-uefi.xml} (100%) rename nixos/doc/manual/installation/{installing-USB.xml => installing-usb.xml} (100%) diff --git a/nixos/doc/manual/configuration/file-systems.xml b/nixos/doc/manual/configuration/file-systems.xml index 52ad6d62f13..d1b324af3f1 100644 --- a/nixos/doc/manual/configuration/file-systems.xml +++ b/nixos/doc/manual/configuration/file-systems.xml @@ -35,6 +35,6 @@ or ext4, then it’s best to specify to ensure that the kernel module is available. - + diff --git a/nixos/doc/manual/configuration/LUKS-file-systems.xml b/nixos/doc/manual/configuration/luks-file-systems.xml similarity index 100% rename from nixos/doc/manual/configuration/LUKS-file-systems.xml rename to nixos/doc/manual/configuration/luks-file-systems.xml diff --git a/nixos/doc/manual/installation/installing-UEFI.xml b/nixos/doc/manual/installation/installing-uefi.xml similarity index 100% rename from nixos/doc/manual/installation/installing-UEFI.xml rename to nixos/doc/manual/installation/installing-uefi.xml diff --git a/nixos/doc/manual/installation/installing-USB.xml b/nixos/doc/manual/installation/installing-usb.xml similarity index 100% rename from nixos/doc/manual/installation/installing-USB.xml rename to nixos/doc/manual/installation/installing-usb.xml diff --git a/nixos/doc/manual/installation/installing.xml b/nixos/doc/manual/installation/installing.xml index 793b503ad97..b140c56fbee 100644 --- a/nixos/doc/manual/installation/installing.xml +++ b/nixos/doc/manual/installation/installing.xml @@ -258,7 +258,7 @@ $ reboot } - - + + -- GitLab From bd811d32b4b194b9e551a66069641a76bd8eab58 Mon Sep 17 00:00:00 2001 From: Joachim Schiele Date: Tue, 26 Aug 2014 10:44:59 +0200 Subject: [PATCH 352/843] grub: removed orphaned mkOption configurationName --- nixos/modules/system/boot/loader/grub/grub.nix | 9 --------- 1 file changed, 9 deletions(-) diff --git a/nixos/modules/system/boot/loader/grub/grub.nix b/nixos/modules/system/boot/loader/grub/grub.nix index 0cc060db8f9..721e8f21cce 100644 --- a/nixos/modules/system/boot/loader/grub/grub.nix +++ b/nixos/modules/system/boot/loader/grub/grub.nix @@ -86,15 +86,6 @@ in ''; }; - configurationName = mkOption { - default = ""; - example = "Stable 2.6.21"; - type = types.str; - description = '' - GRUB entry name instead of default. - ''; - }; - extraPrepareConfig = mkOption { default = ""; type = types.lines; -- GitLab From f6b4214567979247f6dac2b5b6bc92fa89a619db Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 26 Aug 2014 19:30:45 +0200 Subject: [PATCH 353/843] /dev/sda1 -> "/dev/sda1" Otherwise Nix might try to copy /dev/sda1 under certain circumstances :-) --- nixos/modules/system/boot/luksroot.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/system/boot/luksroot.nix b/nixos/modules/system/boot/luksroot.nix index c923cc49c44..68392e3cfe2 100644 --- a/nixos/modules/system/boot/luksroot.nix +++ b/nixos/modules/system/boot/luksroot.nix @@ -348,7 +348,7 @@ in options = { device = mkOption { - default = /dev/sda1; + default = "/dev/sda1"; type = types.path; description = '' An unencrypted device that will temporarily be mounted in stage-1. -- GitLab From 4f2781019e38f678ada1cb0572798351e02e955d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Tue, 26 Aug 2014 19:50:32 +0200 Subject: [PATCH 354/843] pypy: properly hint sqlite3 headers --- pkgs/development/interpreters/pypy/2.3/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/pypy/2.3/default.nix b/pkgs/development/interpreters/pypy/2.3/default.nix index ba0fb6f111a..abf12a66ed8 100644 --- a/pkgs/development/interpreters/pypy/2.3/default.nix +++ b/pkgs/development/interpreters/pypy/2.3/default.nix @@ -53,8 +53,7 @@ let --replace "linklibs=['tcl', 'tk']" "linklibs=['tcl8.5', 'tk8.5']" \ --replace "libdirs = []" "libdirs = ['${tk}/lib', '${tcl}/lib']" - substituteInPlace lib_pypy/_sqlite3.py \ - --replace "libraries=['sqlite3']" "libraries=['sqlite3'], include_dirs=['${sqlite}/include'], library_dirs=['${sqlite}/lib']" + sed -i "s@libraries=\['sqlite3'\]\$@libraries=['sqlite3'], include_dirs=['${sqlite}/include'], library_dirs=['${sqlite}/lib']@" lib_pypy/_sqlite3.py ''; setupHook = ./setup-hook.sh; -- GitLab From 686fa594ab63d117416ab1199ac2daf22a466709 Mon Sep 17 00:00:00 2001 From: John Wiegley Date: Tue, 26 Aug 2014 16:36:35 -0500 Subject: [PATCH 355/843] coq_HEAD: update to latest Git HEAD --- pkgs/applications/science/logic/coq/HEAD.nix | 9 ++++++--- .../science/logic/coq/no-codesign.patch | 19 +++++++++++++++++++ 2 files changed, 25 insertions(+), 3 deletions(-) create mode 100644 pkgs/applications/science/logic/coq/no-codesign.patch diff --git a/pkgs/applications/science/logic/coq/HEAD.nix b/pkgs/applications/science/logic/coq/HEAD.nix index 8e6fde6bc24..ed922b3aedb 100644 --- a/pkgs/applications/science/logic/coq/HEAD.nix +++ b/pkgs/applications/science/logic/coq/HEAD.nix @@ -3,7 +3,7 @@ {stdenv, fetchgit, pkgconfig, ocaml, findlib, camlp5, ncurses, lablgtk ? null}: let - version = "8.5pre-8bc01590"; + version = "8.5pre-c70d5b2"; buildIde = lablgtk != null; ideFlags = if buildIde then "-lablgtkdir ${lablgtk}/lib/ocaml/*/site-lib/lablgtk2 -coqide opt" else ""; idePath = if buildIde then '' @@ -16,17 +16,20 @@ stdenv.mkDerivation { src = fetchgit { url = git://scm.gforge.inria.fr/coq/coq.git; - rev = "8bc0159095cb0230a50c55a1611c8b77134a6060"; - sha256 = "1cp4hbk9jw78y03vwz099yvixax161h60hsbyvwiwz2z5czjxzcv"; + rev = "c70d5b27ad5872c74e20b6c997383fb4462a68dc"; + sha256 = "02wks2aivgjcf4h3ss9rn683vyawz8gl8rbysdq7awxh062316l2"; }; buildInputs = [ pkgconfig ocaml findlib camlp5 ncurses lablgtk ]; + patches = [ ./no-codesign.patch ]; + postPatch = '' UNAME=$(type -tp uname) RM=$(type -tp rm) substituteInPlace configure --replace "/bin/uname" "$UNAME" substituteInPlace tools/beautify-archive --replace "/bin/rm" "$RM" + substituteInPlace Makefile.build --replace "ifeq (\$(ARCH),Darwin)" "ifeq (\$(ARCH),Darwinx)" ''; preConfigure = '' diff --git a/pkgs/applications/science/logic/coq/no-codesign.patch b/pkgs/applications/science/logic/coq/no-codesign.patch new file mode 100644 index 00000000000..0f917fbf56d --- /dev/null +++ b/pkgs/applications/science/logic/coq/no-codesign.patch @@ -0,0 +1,19 @@ +diff --git a/Makefile.build b/Makefile.build +index 2963a3d..876479c 100644 +--- a/Makefile.build ++++ b/Makefile.build +@@ -101,13 +101,8 @@ BYTEFLAGS=$(CAMLDEBUG) $(USERFLAGS) + OPTFLAGS=$(CAMLDEBUGOPT) $(CAMLTIMEPROF) $(USERFLAGS) + DEPFLAGS= $(LOCALINCLUDES) -I ide -I ide/utils + +-ifeq ($(ARCH),Darwin) +-LINKMETADATA=-ccopt "-sectcreate __TEXT __info_plist config/Info-$(notdir $@).plist" +-CODESIGN=codesign -s - +-else + LINKMETADATA= + CODESIGN=true +-endif + + define bestocaml + $(if $(OPT),\ + -- GitLab From 0dc4edd90addfd63a3002a9e7f495fc8be9677df Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Wed, 27 Aug 2014 03:21:03 -0400 Subject: [PATCH 356/843] Add zendopcache php package --- pkgs/top-level/php-packages.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/top-level/php-packages.nix b/pkgs/top-level/php-packages.nix index 1225021ad37..700547450ec 100644 --- a/pkgs/top-level/php-packages.nix +++ b/pkgs/top-level/php-packages.nix @@ -39,6 +39,12 @@ let self = with self; { sha256 = "1gcsh9iar5qa1yzpjki9bb5rivcb6yjp45lmjmp98wlyf83vmy2y"; }; + zendopcache = buildPecl { + name = "zendopcache-7.0.3"; + + sha256 = "0qpfbkfy4wlnsfq4vc4q5wvaia83l89ky33s08gqrcfp3p1adn88"; + }; + zmq = buildPecl { name = "zmq-1.1.2"; -- GitLab From 4061c18c9878ca4b97a0e97debd5c533fc1422ff Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Wed, 27 Aug 2014 03:26:40 -0400 Subject: [PATCH 357/843] Revert "grub: removed orphaned mkOption configurationName" The configurationName option value is still used by NixOS, this removal breaks grub users. This reverts commit bd811d32b4b194b9e551a66069641a76bd8eab58. --- nixos/modules/system/boot/loader/grub/grub.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/nixos/modules/system/boot/loader/grub/grub.nix b/nixos/modules/system/boot/loader/grub/grub.nix index 721e8f21cce..0cc060db8f9 100644 --- a/nixos/modules/system/boot/loader/grub/grub.nix +++ b/nixos/modules/system/boot/loader/grub/grub.nix @@ -86,6 +86,15 @@ in ''; }; + configurationName = mkOption { + default = ""; + example = "Stable 2.6.21"; + type = types.str; + description = '' + GRUB entry name instead of default. + ''; + }; + extraPrepareConfig = mkOption { default = ""; type = types.lines; -- GitLab From a3800db3d2e85f08395dec16abb2aa732e3fe22f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=8B=E6=96=87=E6=AD=A6?= Date: Wed, 27 Aug 2014 15:39:34 +0800 Subject: [PATCH 358/843] add anthy, Japanese input method --- pkgs/tools/inputmethods/anthy/default.nix | 18 ++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 20 insertions(+) create mode 100644 pkgs/tools/inputmethods/anthy/default.nix diff --git a/pkgs/tools/inputmethods/anthy/default.nix b/pkgs/tools/inputmethods/anthy/default.nix new file mode 100644 index 00000000000..34ffa1568b9 --- /dev/null +++ b/pkgs/tools/inputmethods/anthy/default.nix @@ -0,0 +1,18 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation { + name = "anthy-9100h"; + + meta = with stdenv.lib; { + description = "Hiragana text to Kana Kanji mixed text Japanese input method"; + homepace = http://sourceforge.jp/projects/anthy/; + license = licenses.gpl2Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ iyzsong ]; + }; + + src = fetchurl { + url = "http://dl.sourceforge.jp/anthy/37536/anthy-9100h.tar.gz"; + sha256 = "0ism4zibcsa5nl77wwi12vdsfjys3waxcphn1p5s7d0qy1sz0mnj"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fa205e71133..fb8f6e5bdca 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -801,6 +801,8 @@ let usb_modeswitch = callPackage ../development/tools/misc/usb-modeswitch { }; + anthy = callPackage ../tools/inputmethods/anthy { }; + biosdevname = callPackage ../tools/networking/biosdevname { }; clamav = callPackage ../tools/security/clamav { }; -- GitLab From 005f78e7393b16fa0cbe53b329dad8cf2b071202 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 27 Aug 2014 11:08:26 +0200 Subject: [PATCH 359/843] Fix opening NixOS manual http://hydra.nixos.org/build/13760576 --- nixos/modules/services/misc/nixos-manual.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/misc/nixos-manual.nix b/nixos/modules/services/misc/nixos-manual.nix index 808c5dcbdc6..c0d7885280a 100644 --- a/nixos/modules/services/misc/nixos-manual.nix +++ b/nixos/modules/services/misc/nixos-manual.nix @@ -28,7 +28,7 @@ let options = eval.options; }; - entry = "${manual.manual}/share/doc/nixos/manual.html"; + entry = "${manual.manual}/share/doc/nixos/index.html"; help = pkgs.writeScriptBin "nixos-help" '' -- GitLab From df3006679071421d57af4cfdcc53cee07b3157d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Wed, 27 Aug 2014 11:18:59 +0200 Subject: [PATCH 360/843] pypy: test sqlite3 and verify the module --- pkgs/development/interpreters/pypy/2.3/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/interpreters/pypy/2.3/default.nix b/pkgs/development/interpreters/pypy/2.3/default.nix index abf12a66ed8..f31bc731a32 100644 --- a/pkgs/development/interpreters/pypy/2.3/default.nix +++ b/pkgs/development/interpreters/pypy/2.3/default.nix @@ -67,9 +67,8 @@ let # disable socket because it has two actual network tests that fail # disable test_mhlib because it fails for unknown reason # disable test_multiprocessing due to transient errors - # disable sqlite3 due to https://bugs.pypy.org/issue1740 # disable test_os because test_urandom_failure fails - ./pypy-c ./pypy/test_all.py --pypy=./pypy-c -k '-test_sqlite -test_socket -test_os -test_shutil -test_mhlib -test_multiprocessing' lib-python + ./pypy-c ./pypy/test_all.py --pypy=./pypy-c -k '-test_socket -test_os -test_shutil -test_mhlib -test_multiprocessing' lib-python ''; installPhase = '' @@ -84,7 +83,7 @@ let ln -s $out/pypy-c/lib-python/${pythonVersion} $out/lib/${libPrefix} # verify cffi modules - $out/bin/pypy -c "import Tkinter" + $out/bin/pypy -c "import Tkinter;import sqlite3" # TODO: compile python files? ''; -- GitLab From 5e7a1cf955e43e1fa3c1c157c0d6961e1bcf9801 Mon Sep 17 00:00:00 2001 From: aszlig Date: Wed, 27 Aug 2014 10:48:26 +0200 Subject: [PATCH 361/843] build-support: Fix nix-prefetch-* on OS X. Fixes a regression on OS X introduced by f83af95. Don't use --tmpdir for mktemp, because that flag doesn't exist on OS X. However, using -t is deprecated in GNU coreutils, so as suggested by @ip1981 we're now using parameter expansion on ${TMPDIR:-/tmp} to provide /tmp as a fallback if TMPDIR is not set and use it instead. Also use this approach for nix-prefetch-cvs now in order to stay consistent. Reported-by: Vladimir Kirillov Tested-by: Igor Pashev Signed-off-by: aszlig --- pkgs/build-support/fetchbzr/nix-prefetch-bzr | 2 +- pkgs/build-support/fetchcvs/nix-prefetch-cvs | 2 +- pkgs/build-support/fetchgit/nix-prefetch-git | 2 +- pkgs/build-support/fetchhg/nix-prefetch-hg | 2 +- pkgs/build-support/fetchsvn/nix-prefetch-svn | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/build-support/fetchbzr/nix-prefetch-bzr b/pkgs/build-support/fetchbzr/nix-prefetch-bzr index 346c2b05cbd..8143fca7025 100755 --- a/pkgs/build-support/fetchbzr/nix-prefetch-bzr +++ b/pkgs/build-support/fetchbzr/nix-prefetch-bzr @@ -43,7 +43,7 @@ fi # If we don't know the hash or a path with that hash doesn't exist, # download the file and add it to the store. if test -z "$finalPath"; then - tmpPath="$(mktemp --tmpdir -d bzr-checkout-tmp-XXXXXXXX)" + tmpPath="$(mktemp -d "${TMPDIR:-/tmp}/bzr-checkout-tmp-XXXXXXXX")" trap "rm -rf \"$tmpPath\"" EXIT tmpFile="$tmpPath/$dstFile" diff --git a/pkgs/build-support/fetchcvs/nix-prefetch-cvs b/pkgs/build-support/fetchcvs/nix-prefetch-cvs index 29e0d29b52e..f9ed8ffa066 100755 --- a/pkgs/build-support/fetchcvs/nix-prefetch-cvs +++ b/pkgs/build-support/fetchcvs/nix-prefetch-cvs @@ -20,7 +20,7 @@ fi mkTempDir() { - tmpPath=$(mktemp -d -t nix-prefetch-cvs-XXXXXXXX) + tmpPath="$(mktemp -d "${TMPDIR:-/tmp}/nix-prefetch-cvs-XXXXXXXX")" trap removeTempDir EXIT SIGINT SIGQUIT } diff --git a/pkgs/build-support/fetchgit/nix-prefetch-git b/pkgs/build-support/fetchgit/nix-prefetch-git index 0d2536e225c..4f9dd2ac272 100755 --- a/pkgs/build-support/fetchgit/nix-prefetch-git +++ b/pkgs/build-support/fetchgit/nix-prefetch-git @@ -256,7 +256,7 @@ else # download the file and add it to the store. if test -z "$finalPath"; then - tmpPath="$(mktemp --tmpdir -d git-checkout-tmp-XXXXXXXX)" + tmpPath="$(mktemp -d "${TMPDIR:-/tmp}/git-checkout-tmp-XXXXXXXX")" trap "rm -rf \"$tmpPath\"" EXIT tmpFile="$tmpPath/git-export" diff --git a/pkgs/build-support/fetchhg/nix-prefetch-hg b/pkgs/build-support/fetchhg/nix-prefetch-hg index 7d4c0c8d741..a8916176f8a 100755 --- a/pkgs/build-support/fetchhg/nix-prefetch-hg +++ b/pkgs/build-support/fetchhg/nix-prefetch-hg @@ -35,7 +35,7 @@ fi # download the file and add it to the store. if test -z "$finalPath"; then - tmpPath="$(mktemp --tmpdir -d hg-checkout-tmp-XXXXXXXX)" + tmpPath="$(mktemp -d "${TMPDIR:-/tmp}/hg-checkout-tmp-XXXXXXXX")" trap "rm -rf \"$tmpPath\"" EXIT tmpArchive="$tmpPath/hg-archive" diff --git a/pkgs/build-support/fetchsvn/nix-prefetch-svn b/pkgs/build-support/fetchsvn/nix-prefetch-svn index 74de0a14c80..03b9eb9a03d 100755 --- a/pkgs/build-support/fetchsvn/nix-prefetch-svn +++ b/pkgs/build-support/fetchsvn/nix-prefetch-svn @@ -41,7 +41,7 @@ fi # If we don't know the hash or a path with that hash doesn't exist, # download the file and add it to the store. if test -z "$finalPath"; then - tmpPath="$(mktemp --tmpdir -d svn-checkout-tmp-XXXXXXXX)" + tmpPath="$(mktemp -d "${TMPDIR:-/tmp}/svn-checkout-tmp-XXXXXXXX")" trap "rm -rf \"$tmpPath\"" EXIT tmpFile="$tmpPath/$dstFile" -- GitLab From 08d2bee3ec60cc575f3aff9a6989ba69c06eed07 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Wed, 27 Aug 2014 11:49:06 +0200 Subject: [PATCH 362/843] pythonPackages: fix last failing builds --- pkgs/top-level/python-packages.nix | 20 +++++++++++--------- 1 file changed, 11 insertions(+), 9 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 07173068810..a8de2fe5bdd 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3072,12 +3072,12 @@ rec { django_evolution = buildPythonPackage rec { - name = "django_evolution-0.7.3"; + name = "django_evolution-0.6.9"; disabled = isPy3k; src = fetchurl { - url = "http://downloads.reviewboard.org/releases/django-evolution/0.7/${name}.tar.gz"; - md5 = "c51895b6501dd58b0e5dc8f5a5fb6f68"; + url = "http://downloads.reviewboard.org/releases/django-evolution/${name}.tar.gz"; + md5 = "c0d7d10bc41898c88b14d434c48766ff"; }; propagatedBuildInputs = [ django_1_5 ]; @@ -3259,6 +3259,8 @@ rec { url = "http://pypi.python.org/packages/source/e/enum/${name}.tar.gz"; md5 = "ce75c7c3c86741175a84456cc5bd531e"; }; + + doCheck = !isPyPy; buildInputs = [ ]; @@ -4149,6 +4151,9 @@ rec { sha256 = "1flccphpyrb8y8dra2fq2s2v3fg615d77kjjmzl0gmiidabkkdqf"; }; + buildInputs = + [ fs gdata python_keyczar mock pyasn1 pycrypto pytest six ]; + meta = with stdenv.lib; { description = "Store and access your passwords safely"; homepage = "https://pypi.python.org/pypi/keyring"; @@ -4156,9 +4161,6 @@ rec { maintainers = with maintainers; [ lovek323 ]; platforms = platforms.unix; }; - - buildInputs = - [ fs gdata python_keyczar mock pyasn1 pycrypto pytest ]; }; kitchen = buildPythonPackage (rec { @@ -7021,9 +7023,9 @@ rec { }; propagatedBuildInputs = - [ recaptcha_client pytz memcached dateutil_1_5 paramiko flup pygments - djblets django_1_3 django_evolution pycrypto modules.sqlite3 - pysvn pil psycopg2 + [ django_1_3 recaptcha_client pytz memcached dateutil_1_5 paramiko flup pygments + djblets django_evolution pycrypto modules.sqlite3 + pysvn pil psycopg2 ]; }; -- GitLab From 42ee3b2478010d5d7f9f1a06cf7fc47fbcb9044a Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Tue, 12 Aug 2014 13:50:40 +0200 Subject: [PATCH 363/843] openldap - speedup build --- pkgs/development/libraries/openldap/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/openldap/default.nix b/pkgs/development/libraries/openldap/default.nix index c9da441705c..cfbbce2f559 100644 --- a/pkgs/development/libraries/openldap/default.nix +++ b/pkgs/development/libraries/openldap/default.nix @@ -12,6 +12,7 @@ stdenv.mkDerivation rec { configureFlags = [ "--enable-overlays" + "--disable-dependency-tracking" # speeds up one-time build ] ++ stdenv.lib.optional (openssl == null) "--without-tls" ++ stdenv.lib.optional (cyrus_sasl == null) "--without-cyrus-sasl"; -- GitLab From 212d91a7dd61f23de853258d3c30849498f7e076 Mon Sep 17 00:00:00 2001 From: Jaka Hudoklin Date: Thu, 17 Apr 2014 14:43:05 +0200 Subject: [PATCH 364/843] bitcoin: add support for altcoins --- pkgs/applications/misc/bitcoin/altcoins.nix | 100 ++++++++++++++++++ pkgs/applications/misc/bitcoin/default.nix | 18 ++-- .../misc/bitcoin/namecoin_dynamic.patch | 11 ++ pkgs/top-level/all-packages.nix | 7 +- 4 files changed, 128 insertions(+), 8 deletions(-) create mode 100644 pkgs/applications/misc/bitcoin/altcoins.nix create mode 100644 pkgs/applications/misc/bitcoin/namecoin_dynamic.patch diff --git a/pkgs/applications/misc/bitcoin/altcoins.nix b/pkgs/applications/misc/bitcoin/altcoins.nix new file mode 100644 index 00000000000..2b99bad58da --- /dev/null +++ b/pkgs/applications/misc/bitcoin/altcoins.nix @@ -0,0 +1,100 @@ +{ fetchurl, stdenv, pkgconfig +, openssl, db48, boost, zlib, miniupnpc, qt4, qrencode, glib, protobuf, utillinux }: + +with stdenv.lib; + +let + buildAltcoin = makeOverridable ({walletName, gui ? true, ...}@a: + stdenv.mkDerivation ({ + name = "${walletName}${toString (optional (!gui) "d")}-${a.version}"; + buildInputs = [ openssl db48 boost zlib miniupnpc ] + ++ optionals gui [ qt4 qrencode ] ++ a.extraBuildInputs or []; + + configurePhase = optional gui "qmake"; + + preBuild = optional (!gui) "cd src"; + makefile = optional (!gui) "makefile.unix"; + + installPhase = if gui then '' + install -D "${walletName}-qt" "$out/bin/${walletName}-qt" + '' else '' + install -D "${walletName}d" "$out/bin/${walletName}d" + ''; + + passthru.walletName = walletName; + + meta = { + platforms = platforms.unix; + license = license.mit; + maintainers = [ maintainers.offline ]; + }; + } // a) + ); + +in rec { + inherit buildAltcoin; + + litecoin = buildAltcoin rec { + walletName = "litecoin"; + version = "0.8.5.3-rc3"; + + src = fetchurl { + url = "https://github.com/litecoin-project/litecoin/archive/v${version}.tar.gz"; + sha256 = "1z4a7bm3z9kd7n0s38kln31z8shsd32d5d5v3br5p0jlnr5g3lk7"; + }; + + meta = { + description = "Litecoin is a lite version of Bitcoin using scrypt as a proof-of-work algorithm."; + longDescription= '' + Litecoin is a peer-to-peer Internet currency that enables instant payments + to anyone in the world. It is based on the Bitcoin protocol but differs + from Bitcoin in that it can be efficiently mined with consumer-grade hardware. + Litecoin provides faster transaction confirmations (2.5 minutes on average) + and uses a memory-hard, scrypt-based mining proof-of-work algorithm to target + the regular computers and GPUs most people already have. + The Litecoin network is scheduled to produce 84 million currency units. + ''; + homepage = https://litecoin.org/; + }; + }; + litecoind = litecoin.override { gui = false; }; + + namecoin = buildAltcoin rec { + walletName = "namecoin"; + version = "0.3.51.00"; + gui = false; + + src = fetchurl { + url = "https://github.com/namecoin/namecoin/archive/nc${version}.tar.gz"; + sha256 = "0r6zjzichfjzhvpdy501gwy9h3zvlla3kbgb38z1pzaa0ld9siyx"; + }; + + patches = [ ./namecoin_dynamic.patch ]; + + extraBuildInputs = [ glib ]; + + meta = { + description = "Namecoin is a decentralized key/value registration and transfer system based on Bitcoin technology."; + homepage = http://namecoin.info; + }; + }; + + dogecoin = buildAltcoin rec { + walletName = "dogecoin"; + version = "1.4"; + + src = fetchurl { + url = "https://github.com/dogecoin/dogecoin/archive/1.4.tar.gz"; + sha256 = "4af983f182976c98f0e32d525083979c9509b28b7d6faa0b90c5bd40b71009cc"; + }; + + meta = { + description = "Wow, such coin, much shiba, very rich"; + longDescription = "wow"; + homepage = http://www.dogecoin.com/; + maintainers = [ maintainers.offline maintainers.edwtjo ]; + }; + }; + dogecoind = dogecoin.override { gui = false; }; + +} diff --git a/pkgs/applications/misc/bitcoin/default.nix b/pkgs/applications/misc/bitcoin/default.nix index d7c1fbc487b..2b68c58b12d 100644 --- a/pkgs/applications/misc/bitcoin/default.nix +++ b/pkgs/applications/misc/bitcoin/default.nix @@ -1,19 +1,21 @@ { fetchurl, stdenv, openssl, db48, boost, zlib, miniupnpc, qt4, utillinux -, pkgconfig, protobuf, qrencode }: +, pkgconfig, protobuf, qrencode, gui ? true }: + +with stdenv.lib; stdenv.mkDerivation rec { version = "0.9.2.1"; - name = "bitcoin-${version}"; + name = "bitcoin${toString (optional (!gui) "d")}-${version}"; src = fetchurl { - url = "https://bitcoin.org/bin/${version}/${name}-linux.tar.gz"; + url = "https://bitcoin.org/bin/${version}/bitcoin-${version}-linux.tar.gz"; sha256 = "0060f7d38b98113ab912d4c184000291d7f026eaf77ca5830deec15059678f54"; }; # hexdump from utillinux is required for tests buildInputs = [ - openssl db48 boost zlib miniupnpc qt4 utillinux pkgconfig protobuf qrencode - ]; + openssl db48 boost zlib miniupnpc utillinux pkgconfig protobuf + ] ++ optionals gui [ qt4 qrencode ]; unpackPhase = '' mkdir tmp-extract && (cd tmp-extract && tar xf $src) @@ -34,6 +36,8 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + passthru.walletName = "bitcoin"; + meta = { description = "Peer-to-peer electronic cash system"; longDescription= '' @@ -43,7 +47,7 @@ stdenv.mkDerivation rec { with each other, with the help of a P2P network to check for double-spending. ''; homepage = "http://www.bitcoin.org/"; - maintainers = [ stdenv.lib.maintainers.roconnor ]; - license = stdenv.lib.licenses.mit; + maintainers = [ maintainers.roconnor ]; + license = licenses.mit; }; } diff --git a/pkgs/applications/misc/bitcoin/namecoin_dynamic.patch b/pkgs/applications/misc/bitcoin/namecoin_dynamic.patch new file mode 100644 index 00000000000..ef4184ede73 --- /dev/null +++ b/pkgs/applications/misc/bitcoin/namecoin_dynamic.patch @@ -0,0 +1,11 @@ +diff -u -r a/src/makefile.unix b/src/makefile.unix +--- a/src/makefile.unix 2014-01-22 22:07:59.801601964 -0800 ++++ b/src/makefile.unix 2014-01-22 22:08:07.980332839 -0800 +@@ -12,7 +12,6 @@ + + # for boost 1.37, add -mt to the boost libraries + LIBS= \ +- -Wl,-Bstatic \ + -l boost_system \ + -l boost_filesystem \ + -l boost_program_options \ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a5fa04d8936..8ff0a9d043f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8275,7 +8275,12 @@ let bibletime = callPackage ../applications/misc/bibletime { }; - bitcoin = callPackage ../applications/misc/bitcoin { }; + bitcoin = callPackage ../applications/misc/bitcoin {}; + bitcoind = callPackage ../applications/misc/bitcoin { gui = false; }; + + altcoins = recurseIntoAttrs ( + callPackage ../applications/misc/bitcoin/altcoins.nix {} + ); bitlbee = callPackage ../applications/networking/instant-messengers/bitlbee { gnutls = gnutls; -- GitLab From 41788255ab904ca36ce22fa9263318ad081f3e1a Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 27 Aug 2014 12:24:10 +0200 Subject: [PATCH 365/843] Manual: Start of module-specific documentation --- .../manual/configuration/configuration.xml | 3 + nixos/doc/manual/default.nix | 4 +- .../modules/services/databases/postgresql.xml | 77 +++++++++++++++++++ 3 files changed, 83 insertions(+), 1 deletion(-) create mode 100644 nixos/modules/services/databases/postgresql.xml diff --git a/nixos/doc/manual/configuration/configuration.xml b/nixos/doc/manual/configuration/configuration.xml index e15c700017c..8fde0dc7e61 100644 --- a/nixos/doc/manual/configuration/configuration.xml +++ b/nixos/doc/manual/configuration/configuration.xml @@ -24,6 +24,9 @@ effect after you run nixos-rebuild. + + + diff --git a/nixos/doc/manual/default.nix b/nixos/doc/manual/default.nix index f5cc33919b8..47e01437ccc 100644 --- a/nixos/doc/manual/default.nix +++ b/nixos/doc/manual/default.nix @@ -41,6 +41,8 @@ let copySources = '' cp -prd $sources/* . # */ + chmod -R u+w . + cp ${../../modules/services/databases/postgresql.xml} configuration/postgresql.xml ln -s ${optionsDocBook} options-db.xml echo "${version}" > version ''; @@ -74,7 +76,7 @@ in rec { --param toc.section.depth 3 \ --stringparam admon.style "" \ --stringparam callout.graphics.extension .gif \ - --param chunk.section.depth 1 \ + --param chunk.section.depth 0 \ --param chunk.first.sections 1 \ --param use.id.as.filename 1 \ --stringparam generate.toc "book toc chapter toc appendix toc" \ diff --git a/nixos/modules/services/databases/postgresql.xml b/nixos/modules/services/databases/postgresql.xml new file mode 100644 index 00000000000..e98b431bd60 --- /dev/null +++ b/nixos/modules/services/databases/postgresql.xml @@ -0,0 +1,77 @@ + + +PostgreSQL + + + + +Source: modules/services/databases/postgresql.nix + +Upstream documentation: + + + +PostgreSQL is an advanced, free relational database. + +
Configuring + +To enable PostgreSQL, add the following to your +configuration.nix: + + +services.postgresql.enable = true; +services.postgresql.package = pkgs.postgresql93; + + +Note that you are required to specify the desired version of +PostgreSQL (e.g. pkgs.postgresql93). Since +upgrading your PostgreSQL version requires a database dump and reload +(see below), NixOS cannot provide a default value for + such as the most recent +release of PostgreSQL. + + + +By default, PostgreSQL stores its databases in +/var/db/postgresql. You can override this using +, e.g. + + +services.postgresql.dataDir = "/data/postgresql"; + + + + +
+ + +
Upgrading + +FIXME: document dump/upgrade/load cycle. + +
+ + +
Options + +FIXME: auto-generated list of module options. + +
+ + + -- GitLab From 49336878851c852f36fe9d95cbc0c8a0bc660c69 Mon Sep 17 00:00:00 2001 From: Andrew Morsillo Date: Tue, 26 Aug 2014 13:44:49 -0400 Subject: [PATCH 366/843] Bump mongodb version from 2.6.0 to 2.6.4 --- pkgs/servers/nosql/mongodb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/nosql/mongodb/default.nix b/pkgs/servers/nosql/mongodb/default.nix index aa9da965d17..f51a2b8fe3f 100644 --- a/pkgs/servers/nosql/mongodb/default.nix +++ b/pkgs/servers/nosql/mongodb/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, scons, boost, gperftools, pcre, snappy }: -let version = "2.6.0"; +let version = "2.6.4"; system-libraries = [ "tcmalloc" "pcre" @@ -18,7 +18,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "http://downloads.mongodb.org/src/mongodb-src-r${version}.tar.gz"; - sha256 = "066kppjdmdpadjr09ildla3aw42anzsc9pa55iwp3wa4rgqd2i33"; + sha256 = "1h4rrgcb95234ryjma3fjg50qsm1bnxjx5ib0c3p9nzmc2ji2m07"; }; nativeBuildInputs = [ scons boost gperftools pcre snappy ]; -- GitLab From ea7c41236825d14bc2a86e25dd951154f1c4e6e5 Mon Sep 17 00:00:00 2001 From: Emery Hemingway Date: Sun, 29 Jun 2014 00:05:39 -0400 Subject: [PATCH 367/843] cpuminer-multi: initial expression --- pkgs/tools/misc/cpuminer-multi/default.nix | 31 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 33 insertions(+) create mode 100644 pkgs/tools/misc/cpuminer-multi/default.nix diff --git a/pkgs/tools/misc/cpuminer-multi/default.nix b/pkgs/tools/misc/cpuminer-multi/default.nix new file mode 100644 index 00000000000..c61e0ff00b3 --- /dev/null +++ b/pkgs/tools/misc/cpuminer-multi/default.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchgit, curl, jansson, autoconf, automake, openssl +, aesni ? true }: + +let + rev = "4230012da5d1cc491976c6f5e45da36db6d9f576"; + date = "20140619"; +in +stdenv.mkDerivation rec { + name = "cpuminer-multi-${date}-${stdenv.lib.strings.substring 0 7 rev}"; + + src = fetchgit { + inherit rev; + url = https://github.com/wolf9466/cpuminer-multi.git; + sha256 = "c19a5dd1bfdbbaec3729f61248e858a5d8701424fffe67fdabf8179ced9c110b"; + }; + + buildInputs = [ autoconf automake curl jansson openssl ]; + + preConfigure = '' + ./autogen.sh + ''; + + configureFlags = if aesni then [ "--disable-aes-ni" ] else [ ]; + + meta = with stdenv.lib; { + description = "Multi-algo CPUMiner"; + homepage = https://github.com/wolf9466/cpuminer-multi; + license = licenses.gpl2; + maintainers = [ maintainers.emery ]; + }; +} \ No newline at end of file diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8ff0a9d043f..9b6da45fe5d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -793,6 +793,8 @@ let cpuminer = callPackage ../tools/misc/cpuminer { }; + cpuminer-multi = callPackage ../tools/misc/cpuminer-multi { }; + cuetools = callPackage ../tools/cd-dvd/cuetools { }; unifdef = callPackage ../development/tools/misc/unifdef { }; -- GitLab From ac90177cb1f793c7f05b7c3fb33f0bc08bb1334f Mon Sep 17 00:00:00 2001 From: Nathan Bijnens Date: Sun, 24 Aug 2014 17:43:45 +0200 Subject: [PATCH 368/843] Zookeeper --- nixos/modules/misc/ids.nix | 1 + nixos/modules/module-list.nix | 1 + nixos/modules/services/misc/zookeeper.nix | 145 ++++++++++++++++++++++ pkgs/servers/zookeeper/default.nix | 36 ++++++ pkgs/top-level/all-packages.nix | 2 + 5 files changed, 185 insertions(+) create mode 100755 nixos/modules/services/misc/zookeeper.nix create mode 100755 pkgs/servers/zookeeper/default.nix diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix index 99a33f68735..92ab241deaa 100644 --- a/nixos/modules/misc/ids.nix +++ b/nixos/modules/misc/ids.nix @@ -147,6 +147,7 @@ riemann = 137; riemanndash = 138; radvd = 139; + zookeeper = 140; # When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399! diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 59c69f060b9..e2f2921b870 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -164,6 +164,7 @@ ./services/misc/siproxd.nix ./services/misc/svnserve.nix ./services/misc/synergy.nix + ./services/misc/zookeeper.nix ./services/monitoring/apcupsd.nix ./services/monitoring/dd-agent.nix ./services/monitoring/graphite.nix diff --git a/nixos/modules/services/misc/zookeeper.nix b/nixos/modules/services/misc/zookeeper.nix new file mode 100755 index 00000000000..47675b8876c --- /dev/null +++ b/nixos/modules/services/misc/zookeeper.nix @@ -0,0 +1,145 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.zookeeper; + + zookeeperConfig = '' + dataDir=${cfg.dataDir} + clientPort=${toString cfg.port} + autopurge.purgeInterval=${toString cfg.purgeInterval} + ${cfg.extraConf} + ${cfg.servers} + ''; + + configDir = pkgs.buildEnv { + name = "zookeeper-conf"; + paths = [ + (pkgs.writeTextDir "zoo.cfg" zookeeperConfig) + (pkgs.writeTextDir "log4j.properties" cfg.logging) + ]; + }; + +in { + + options.services.zookeeper = { + enable = mkOption { + description = "Whether to enable Zookeeper."; + default = false; + type = types.uniq types.bool; + }; + + port = mkOption { + description = "Zookeeper Client port."; + default = 2181; + type = types.int; + }; + + id = mkOption { + description = "Zookeeper ID."; + default = 0; + type = types.int; + }; + + purgeInterval = mkOption { + description = '' + The time interval in hours for which the purge task has to be triggered. Set to a positive integer (1 and above) to enable the auto purging. + ''; + default = 1; + type = types.int; + }; + + extraConf = mkOption { + description = "Extra configuration for Zookeeper."; + type = types.lines; + default = '' + initLimit=5 + syncLimit=2 + tickTime=2000 + ''; + }; + + servers = mkOption { + description = "All Zookeeper Servers."; + default = ""; + type = types.lines; + example = '' + server.0=host0:2888:3888 + server.1=host1:2888:3888 + server.2=host2:2888:3888 + ''; + }; + + logging = mkOption { + description = "Zookeeper logging configuration."; + default = '' + zookeeper.root.logger=INFO, CONSOLE + log4j.rootLogger=INFO, CONSOLE + log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender + log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout + log4j.appender.CONSOLE.layout.ConversionPattern=[myid:%X{myid}] - %-5p [%t:%C{1}@%L] - %m%n + ''; + type = types.lines; + }; + + dataDir = mkOption { + type = types.path; + default = "/var/lib/zookeeper"; + description = '' + Data directory for Zookeeper + ''; + }; + + extraCmdLineOptions = mkOption { + description = "Extra command line options for the Zookeeper launcher."; + default = [ "-Dcom.sun.management.jmxremote" "-Dcom.sun.management.jmxremote.local.only=true" ]; + type = types.listOf types.string; + example = [ "-Djava.net.preferIPv4Stack=true" "-Dcom.sun.management.jmxremote" "-Dcom.sun.management.jmxremote.local.only=true" ]; + }; + + preferIPv4 = mkOption { + type = types.bool; + default = true; + description = '' + Add the -Djava.net.preferIPv4Stack=true flag to the Zookeeper server. + ''; + }; + + }; + + + config = mkIf cfg.enable { + systemd.services.zookeeper = { + description = "Zookeeper Daemon"; + wantedBy = [ "multi-user.target" ]; + after = [ "network-interfaces.target" ]; + environment = { ZOOCFGDIR = configDir; }; + serviceConfig = { + ExecStart = '' + ${pkgs.jre}/bin/java \ + -cp "${pkgs.zookeeper}/lib/*:${pkgs.zookeeper}/${pkgs.zookeeper.name}.jar:${configDir}" \ + ${toString cfg.extraCmdLineOptions} \ + -Dzookeeper.datadir.autocreate=false \ + ${optionalString cfg.preferIPv4 "-Djava.net.preferIPv4Stack=true"} \ + org.apache.zookeeper.server.quorum.QuorumPeerMain \ + ${configDir}/zoo.cfg + ''; + User = "zookeeper"; + PermissionsStartOnly = true; + }; + preStart = '' + mkdir -m 0700 -p ${cfg.dataDir} + if [ "$(id -u)" = 0 ]; then chown zookeeper ${cfg.dataDir}; fi + echo "${toString cfg.id}" > ${cfg.dataDir}/myid + ''; + }; + + users.extraUsers = singleton { + name = "zookeeper"; + uid = config.ids.uids.zookeeper; + description = "Zookeeper daemon user"; + home = cfg.dataDir; + }; + }; +} diff --git a/pkgs/servers/zookeeper/default.nix b/pkgs/servers/zookeeper/default.nix new file mode 100755 index 00000000000..307993a958a --- /dev/null +++ b/pkgs/servers/zookeeper/default.nix @@ -0,0 +1,36 @@ +{ stdenv, fetchurl, jre, makeWrapper, bash }: + +stdenv.mkDerivation rec { + name = "zookeeper-3.4.6"; + + src = fetchurl { + url = "mirror://apache/zookeeper/${name}/${name}.tar.gz"; + sha256 = "01b3938547cd620dc4c93efe07c0360411f4a66962a70500b163b59014046994"; + }; + + buildInputs = [ makeWrapper jre ]; + + phases = ["unpackPhase" "installPhase"]; + + installPhase = '' + mkdir -p $out + cp -R conf docs lib ${name}.jar $out + mkdir -p $out/bin + cp -R bin/{zkCli,zkCleanup,zkEnv}.sh $out/bin + for i in $out/bin/{zkCli,zkCleanup}.sh; do + wrapProgram $i \ + --set JAVA_HOME "${jre}" \ + --prefix PATH : "${bash}/bin" + done + chmod -x $out/bin/zkEnv.sh + ''; + + meta = with stdenv.lib; { + homepage = "http://zookeeper.apache.org"; + description = "Apache Zookeeper"; + license = licenses.asl20; + maintainers = [ maintainers.nathan-gs ]; + platforms = platforms.unix; + }; + +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9b6da45fe5d..fe27dd2c970 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7086,6 +7086,8 @@ let xinetd = callPackage ../servers/xinetd { }; + zookeeper = callPackage ../servers/zookeeper { }; + xquartz = callPackage ../servers/x11/xquartz { }; quartz-wm = callPackage ../servers/x11/quartz-wm { stdenv = clangStdenv; }; -- GitLab From 21090fa778a0ed28ef5bfd81ad8c9d046034fc6a Mon Sep 17 00:00:00 2001 From: "ambrop7@gmail.com" Date: Wed, 27 Aug 2014 12:51:21 +0200 Subject: [PATCH 369/843] Add BOSSA. BOSSA is a flash programming utility for Atmel's SAM family of flash-based ARM microcontrollers. The motivation behind BOSSA is to create a simple, easy-to-use, open source utility to replace Atmel's SAM-BA software. BOSSA is an acronym for Basic Open Source SAM-BA Application to reflect that goal. --- pkgs/development/tools/misc/bossa/bin2c.c | 122 ++++++++++++++++++ pkgs/development/tools/misc/bossa/default.nix | 49 +++++++ pkgs/top-level/all-packages.nix | 4 + 3 files changed, 175 insertions(+) create mode 100644 pkgs/development/tools/misc/bossa/bin2c.c create mode 100644 pkgs/development/tools/misc/bossa/default.nix diff --git a/pkgs/development/tools/misc/bossa/bin2c.c b/pkgs/development/tools/misc/bossa/bin2c.c new file mode 100644 index 00000000000..f0b915de540 --- /dev/null +++ b/pkgs/development/tools/misc/bossa/bin2c.c @@ -0,0 +1,122 @@ +// bin2c.c +// +// convert a binary file into a C source vector +// +// THE "BEER-WARE LICENSE" (Revision 3.1415): +// sandro AT sigala DOT it wrote this file. As long as you retain this notice you can do +// whatever you want with this stuff. If we meet some day, and you think this stuff is +// worth it, you can buy me a beer in return. Sandro Sigala +// +// syntax: bin2c [-c] [-z] +// +// -c add the "const" keyword to definition +// -z terminate the array with a zero (useful for embedded C strings) +// +// examples: +// bin2c -c myimage.png myimage_png.cpp +// bin2c -z sometext.txt sometext_txt.cpp + +#include +#include +#include +#include + +#ifndef PATH_MAX +#define PATH_MAX 1024 +#endif + +int useconst = 0; +int zeroterminated = 0; + +int myfgetc(FILE *f) +{ + int c = fgetc(f); + if (c == EOF && zeroterminated) + { + zeroterminated = 0; + return 0; + } + return c; +} + +void process(const char *ifname, const char *ofname) +{ + FILE *ifile, *ofile; + ifile = fopen(ifname, "rb"); + if (ifile == NULL) + { + fprintf(stderr, "cannot open %s for reading\n", ifname); + exit(1); + } + ofile = fopen(ofname, "wb"); + if (ofile == NULL) + { + fprintf(stderr, "cannot open %s for writing\n", ofname); + exit(1); + } + char buf[PATH_MAX], *p; + const char *cp; + if ((cp = strrchr(ifname, '/')) != NULL) + { + ++cp; + } else { + if ((cp = strrchr(ifname, '\\')) != NULL) + ++cp; + else + cp = ifname; + } + strcpy(buf, cp); + for (p = buf; *p != '\0'; ++p) + { + if (!isalnum(*p)) + *p = '_'; + } + fprintf(ofile, "static %sunsigned char %s[] = {\n", useconst ? "const " : "", buf); + int c, col = 1; + while ((c = myfgetc(ifile)) != EOF) + { + if (col >= 78 - 6) + { + fputc('\n', ofile); + col = 1; + } + fprintf(ofile, "0x%.2x, ", c); + col += 6; + } + fprintf(ofile, "\n};\n"); + + fclose(ifile); + fclose(ofile); +} + +void usage(void) +{ + fprintf(stderr, "usage: bin2c [-cz] \n"); + exit(1); +} + +int main(int argc, char **argv) +{ + while (argc > 3) + { + if (!strcmp(argv[1], "-c")) + { + useconst = 1; + --argc; + ++argv; + } else if (!strcmp(argv[1], "-z")) + { + zeroterminated = 1; + --argc; + ++argv; + } else { + usage(); + } + } + if (argc != 3) + { + usage(); + } + process(argv[1], argv[2]); + return 0; +} diff --git a/pkgs/development/tools/misc/bossa/default.nix b/pkgs/development/tools/misc/bossa/default.nix new file mode 100644 index 00000000000..f0b6d81e69e --- /dev/null +++ b/pkgs/development/tools/misc/bossa/default.nix @@ -0,0 +1,49 @@ +{ stdenv, fetchgit, wxGTK, libX11, readline }: + +let + # BOSSA needs a "bin2c" program to embed images. + # Source taken from: + # http://wiki.wxwidgets.org/Embedding_PNG_Images-Bin2c_In_C + bin2c = stdenv.mkDerivation { + name = "bossa-bin2c"; + src = ./bin2c.c; + unpackPhase = "true"; + buildPhase = ''cc $src -o bin2c''; + installPhase = ''mkdir -p $out/bin; cp bin2c $out/bin/''; + }; + +in +stdenv.mkDerivation rec { + name = "bossa"; + + src = fetchgit { + url = https://github.com/shumatech/BOSSA; + rev = "0f0a41cb1c3a65e909c5c744d8ae664e896a08ac"; /* arduino branch */ + sha256 = "01y8r45fw02rps9q995mv82bxrm6p0mysv4wir5glpagrhnyw7md"; + }; + + nativeBuildInputs = [ bin2c ]; + buildInputs = [ wxGTK libX11 readline ]; + + # Explicitly specify targets so they don't get stripped. + makeFlags = [ "bin/bossac" "bin/bossash" "bin/bossa" ]; + + installPhase = '' + mkdir -p $out/bin + cp bin/bossa{c,sh,} $out/bin/ + ''; + + meta = with stdenv.lib; { + description = "A flash programming utility for Atmel's SAM family of flash-based ARM microcontrollers"; + longDescription = '' + BOSSA is a flash programming utility for Atmel's SAM family of + flash-based ARM microcontrollers. The motivation behind BOSSA is + to create a simple, easy-to-use, open source utility to replace + Atmel's SAM-BA software. BOSSA is an acronym for Basic Open + Source SAM-BA Application to reflect that goal. + ''; + homepage = http://www.shumatech.com/web/products/bossa; + license = licenses.bsd3; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fe27dd2c970..0a97c43463d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3854,6 +3854,10 @@ let bison3 = callPackage ../development/tools/parsing/bison/3.x.nix { }; bison = bison3; + bossa = callPackage ../development/tools/misc/bossa { + wxGTK = wxGTK30; + }; + buildbot = callPackage ../development/tools/build-managers/buildbot { inherit (pythonPackages) twisted jinja2 sqlalchemy sqlalchemy_migrate; dateutil = pythonPackages.dateutil_1_5; -- GitLab From d52d71a04bd99794401178acaf164fec94b8e387 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Wed, 27 Aug 2014 12:09:42 +0200 Subject: [PATCH 370/843] pythonPackages.boto_1_9: remove --- .../virtualization/nova/default.nix | 2 +- .../virtualization/virt-manager/default.nix | 2 +- .../virtualization/virtinst/default.nix | 2 +- pkgs/top-level/python-packages.nix | 27 ------------------- 4 files changed, 3 insertions(+), 30 deletions(-) diff --git a/pkgs/applications/virtualization/nova/default.nix b/pkgs/applications/virtualization/nova/default.nix index c1ef20b7aa0..0023cf44f33 100644 --- a/pkgs/applications/virtualization/nova/default.nix +++ b/pkgs/applications/virtualization/nova/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { pythonPath = with pythonPackages; [ setuptools eventlet greenlet gflags netaddr sqlalchemy carrot routes - paste_deploy m2crypto ipy boto_1_9 twisted sqlalchemy_migrate + paste_deploy m2crypto ipy twisted sqlalchemy_migrate distutils_extra simplejson readline glance cheetah lockfile httplib2 # !!! should libvirt be a build-time dependency? Note that # libxml2Python is a dependency of libvirt.py. diff --git a/pkgs/applications/virtualization/virt-manager/default.nix b/pkgs/applications/virtualization/virt-manager/default.nix index 9df6967704a..e451ff79a94 100644 --- a/pkgs/applications/virtualization/virt-manager/default.nix +++ b/pkgs/applications/virtualization/virt-manager/default.nix @@ -19,7 +19,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ eventlet greenlet gflags netaddr sqlalchemy carrot routes - paste_deploy m2crypto ipy boto_1_9 twisted sqlalchemy_migrate + paste_deploy m2crypto ipy twisted sqlalchemy_migrate distutils_extra simplejson readline glance cheetah lockfile httplib2 urlgrabber virtinst pyGtkGlade pythonDBus gnome_python pygobject3 libvirt libxml2Python ipaddr vte diff --git a/pkgs/applications/virtualization/virtinst/default.nix b/pkgs/applications/virtualization/virtinst/default.nix index 8e2da5c3b76..9b89a78f838 100644 --- a/pkgs/applications/virtualization/virtinst/default.nix +++ b/pkgs/applications/virtualization/virtinst/default.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { pythonPath = with pythonPackages; [ setuptools eventlet greenlet gflags netaddr sqlalchemy carrot routes - paste_deploy m2crypto ipy boto_1_9 twisted sqlalchemy_migrate + paste_deploy m2crypto ipy twisted sqlalchemy_migrate distutils_extra simplejson readline glance cheetah lockfile httplib2 # !!! should libvirt be a build-time dependency? Note that # libxml2Python is a dependency of libvirt.py. diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index a8de2fe5bdd..6185be2739d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -900,33 +900,6 @@ rec { }; - # euca2ools (and maybe Nova) needs boto 1.9, 2.0 doesn't work. - boto_1_9 = buildPythonPackage (rec { - name = "boto-1.9b"; - - src = fetchurl { - url = "http://boto.googlecode.com/files/${name}.tar.gz"; - sha1 = "00a033b0a593c3ca82927867950f73d88b831155"; - }; - - patches = [ ../development/python-modules/boto-1.9-python-2.7.patch ]; - - meta = { - homepage = http://code.google.com/p/boto/; - - license = "bsd"; - - description = "Python interface to Amazon Web Services"; - - longDescription = '' - The boto module is an integrated interface to current and - future infrastructural services offered by Amazon Web - Services. This includes S3, SQS, EC2, among others. - ''; - }; - }); - - boto = buildPythonPackage rec { name = "boto-${version}"; version = "2.32.0"; -- GitLab From 8b36efaf6a4e6bd7fa0ea384bd2255fb0b11adea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Wed, 27 Aug 2014 13:25:55 +0200 Subject: [PATCH 371/843] python3Packages: more build fixes --- pkgs/top-level/python-packages.nix | 108 ++++++++++++++++++++++------- 1 file changed, 84 insertions(+), 24 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 6185be2739d..6d598ef1060 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -476,6 +476,7 @@ rec { async = buildPythonPackage rec { name = "async-0.6.1"; + disabled = isPy3k; meta.maintainers = [ stdenv.lib.maintainers.mornfall ]; buildInputs = [ pkgs.zlib ]; @@ -1170,6 +1171,7 @@ rec { clientform = buildPythonPackage (rec { name = "clientform-0.2.10"; + disabled = isPy3k; src = fetchurl { url = "http://pypi.python.org/packages/source/C/ClientForm/ClientForm-0.2.10.tar.gz"; @@ -1299,11 +1301,11 @@ rec { configobj = buildPythonPackage (rec { - name = "configobj-4.7.2"; + name = "configobj-5.0.6"; src = fetchurl { url = "http://pypi.python.org/packages/source/c/configobj/${name}.tar.gz"; - md5 = "201dbaa732a9049c839f9bb6c27fc7b5"; + md5 = "e472a3a1c2a67bb0ec9b5d54c13a47d6"; }; # error: invalid command 'test' @@ -1619,6 +1621,7 @@ rec { darcsver = buildPythonPackage (rec { name = "darcsver-1.7.4"; + disabled = isPy3k; src = fetchurl { url = "http://pypi.python.org/packages/source/d/darcsver/${name}.tar.gz"; @@ -1852,6 +1855,7 @@ rec { dpkt = buildPythonPackage rec { name = "dpkt-1.8"; + disabled = isPy3k; src = fetchurl { url = "https://dpkt.googlecode.com/files/${name}.tar.gz"; @@ -2006,6 +2010,7 @@ rec { faker = buildPythonPackage rec { name = "faker-0.0.4"; + disabled = isPy3k; src = fetchurl { url = https://pypi.python.org/packages/source/F/Faker/Faker-0.0.4.tar.gz; sha256 = "09q5jna3j8di0gw5yjx0dvlndkrk2x9vvqzwyfsvg3nlp8h38js1"; @@ -2219,6 +2224,7 @@ rec { koji = buildPythonPackage (rec { name = "koji-1.8"; meta.maintainers = [ stdenv.lib.maintainers.mornfall ]; + disabled = isPy3k; src = fetchurl { url = "https://fedorahosted.org/released/koji/koji-1.8.0.tar.bz2"; @@ -2828,7 +2834,16 @@ rec { }; }; + zope_tales = buildPythonPackage rec { + name = "zope.tales-4.0.2"; + propagatedBuildInputs = [ zope_interface six zope_testrunner ]; + + src = fetchurl { + url = "https://pypi.python.org/packages/source/z/zope.tales/${name}.zip"; + md5 = "902b03a5f9774f6e2decf3f06d18a09d"; + }; + }; zope_deprecation = buildPythonPackage rec { @@ -3101,6 +3116,7 @@ rec { dulwich = buildPythonPackage rec { name = "dulwich-0.8.7"; + disabled = isPy3k || isPyPy; src = fetchurl { url = "http://samba.org/~jelmer/dulwich/${name}.tar.gz"; @@ -3227,6 +3243,7 @@ rec { enum = buildPythonPackage rec { name = "enum-0.4.4"; + disabled = isPy3k; src = fetchurl { url = "http://pypi.python.org/packages/source/e/enum/${name}.tar.gz"; @@ -3431,6 +3448,7 @@ rec { flup = buildPythonPackage (rec { name = "flup-1.0.2"; + disabled = isPy3k; src = fetchurl { url = "http://www.saddi.com/software/flup/dist/${name}.tar.gz"; @@ -3497,6 +3515,7 @@ rec { baseName = "fuse"; version = "0.2.1"; name = "${baseName}-${version}"; + disabled = isPy3k; src = fetchurl { url = "mirror://sourceforge/fuse/fuse-python-${version}.tar.gz"; @@ -4138,6 +4157,8 @@ rec { kitchen = buildPythonPackage (rec { name = "kitchen-1.1.1"; + disabled = isPy3k; + meta.maintainers = [ stdenv.lib.maintainers.mornfall ]; src = fetchurl { @@ -4779,6 +4800,8 @@ rec { MySQL_python = buildPythonPackage { name = "MySQL-python-1.2.3"; + + disabled = isPy3k; # plenty of failing tests doCheck = false; @@ -4888,12 +4911,12 @@ rec { }; netifaces = buildPythonPackage rec { - version = "0.8"; + version = "0.10.4"; name = "netifaces-${version}"; src = fetchurl { - url = "http://alastairs-place.net/projects/netifaces/${name}.tar.gz"; - sha256 = "1v5i39kx4yz1pwgjfbzi63w55l2z318zgmi9f77ybmmkil1i39sk"; + url = "http://pypi.python.org/packages/source/n/netifaces/${name}.tar.gz"; + sha256 = "1plw237a4zib4z8s62g0mrs8gm3kjfrp5sxh6bbk9nl3rdls2mln"; }; meta = { @@ -5582,7 +5605,7 @@ rec { pika = buildPythonPackage { name = "pika-0.9.12"; - diabled = isPy3k; + disabled = isPy3k; src = fetchurl { url = https://pypi.python.org/packages/source/p/pika/pika-0.9.12.tar.gz; md5 = "7174fc7cc5570314fa3cfaa729106482"; @@ -5756,6 +5779,11 @@ rec { url = "http://pypi.python.org/packages/source/P/PrettyTable/${name}.tar.bz2"; sha1 = "ad346a18d92c1d95f2295397c7a8a4f489e48851"; }; + + preCheck = '' + export LANG="en_US.UTF-8" + export LOCALE_ARCHIVE=${pkgs.glibcLocales}/lib/locale/locale-archive + ''; meta = { description = "Simple Python library for easily displaying tabular data in a visually appealing ASCII table format"; @@ -6617,6 +6645,7 @@ rec { pysqlite = buildPythonPackage (rec { name = "pysqlite-2.6.3"; + disabled = isPy3k; src = fetchurl { url = "https://pypi.python.org/packages/source/p/pysqlite/${name}.tar.gz"; @@ -7436,11 +7465,11 @@ rec { }); sigal = buildPythonPackage rec { - name = "sigal-0.5.0"; + name = "sigal-0.7.0"; src = fetchurl { url = "http://pypi.python.org/packages/source/s/sigal/${name}.tar.gz"; - md5 = "93c93725674c0702583a638f5a09c9e4"; + md5 = "d2386706ac8543378aebde1ea4edeba4"; }; propagatedBuildInputs = [ jinja2 markdown pillow pilkit clint argh pytest ]; @@ -7999,6 +8028,7 @@ rec { stompclient = buildPythonPackage (rec { name = "stompclient-0.3.2"; + disabled = isPy3k; src = fetchurl { url = "http://pypi.python.org/packages/source/s/stompclient/${name}.tar.gz"; @@ -8039,6 +8069,11 @@ rec { sure = buildPythonPackage rec { name = "sure-${version}"; version = "1.2.7"; + + preBuild = '' + export LOCALE_ARCHIVE=${pkgs.glibcLocales}/lib/locale/locale-archive + export LC_ALL="en_US.UTF-8" + ''; # Not picking up from PyPI because it doesn't contain tests. src = fetchgit { @@ -8046,6 +8081,8 @@ rec { rev = "86ab9faa97aa9c1720c7d090deac2be385ed3d7a"; sha256 = "02vffcdgr6vbj80lhl925w7zqy6cqnfvs088i0rbkjs5lxc511b3"; }; + + buildInputs = [ nose ]; @@ -9108,6 +9145,21 @@ rec { maintainers = [ stdenv.lib.maintainers.goibhniu ]; }; }; + + zope_browserresource = buildPythonPackage rec { + name = "zope.browserresource-4.0.1"; + + propagatedBuildInputs = [ + zope_component zope_configuration zope_contenttype zope_i18n + zope_interface zope_location zope_publisher zope_schema zope_traversing + ]; + + src = fetchurl { + url = "https://pypi.python.org/packages/source/z/zope.browserresource/zope.browserresource-4.0.1.zip"; + md5 = "81bbe92c1f04725561470f89d73222c5"; + }; + }; + zope_component = buildPythonPackage rec { @@ -9149,11 +9201,11 @@ rec { zope_container = buildPythonPackage rec { - name = "zope.container-3.11.2"; + name = "zope.container-4.0.0"; src = fetchurl { url = "http://pypi.python.org/packages/source/z/zope.container/${name}.tar.gz"; - md5 = "fc66d85a17b8ffb701091c9328983dcc"; + md5 = "b24d2303ece65a2d9ce23a5bd074c335"; }; propagatedBuildInputs = [ @@ -9169,11 +9221,11 @@ rec { zope_contenttype = buildPythonPackage rec { - name = "zope.contenttype-3.5.5"; + name = "zope.contenttype-4.0.1"; src = fetchurl { - url = "http://pypi.python.org/packages/source/z/zope.contenttype/${name}.zip"; - md5 = "c6ac80e6887de4108a383f349fbdf332"; + url = "http://pypi.python.org/packages/source/z/zope.contenttype/${name}.tar.gz"; + md5 = "171be44753e86742da8c81b3ad008ce0"; }; meta = { @@ -9356,7 +9408,7 @@ rec { name = "zope.schema-4.2.2"; src = fetchurl { - url = "http://pypi.python.org/packages/source/z/zope.schema/zope.schema-4.2.2.tar.gz"; + url = "http://pypi.python.org/packages/source/z/zope.schema/${name}.tar.gz"; md5 = "e7e581af8193551831560a736a53cf58"; }; @@ -9372,13 +9424,13 @@ rec { name = "zope.security-4.0.1"; src = fetchurl { - url = "http://pypi.python.org/packages/source/z/zope.security/zope.security-3.7.4.tar.gz"; - md5 = "072ab8d11adc083eace11262da08630c"; + url = "http://pypi.python.org/packages/source/z/zope.security/${name}.tar.gz"; + md5 = "27d1f2873a0ee9c1f485f7b8f22d8e1c"; }; propagatedBuildInputs = [ zope_component zope_configuration zope_i18nmessageid zope_schema - zope_proxy + zope_proxy zope_testrunner ]; meta = { @@ -9470,14 +9522,17 @@ rec { zope_traversing = buildPythonPackage rec { - name = "zope.traversing-3.13.2"; + name = "zope.traversing-4.0.0"; src = fetchurl { url = "http://pypi.python.org/packages/source/z/zope.traversing/${name}.zip"; - md5 = "eaad8fc7bbef126f9f8616b074ec00aa"; + md5 = "5cc40c552f953939f7c597ebbedd586f"; }; - propagatedBuildInputs = [ zope_location zope_security zope_publisher ]; + propagatedBuildInputs = [ zope_location zope_security zope_publisher transaction zope_tales ]; + + # circular dependency on zope_browserresource + doCheck = false; meta = { maintainers = [ stdenv.lib.maintainers.goibhniu ]; @@ -9486,11 +9541,11 @@ rec { zope_interface = buildPythonPackage rec { - name = "zope.interface-4.0.3"; + name = "zope.interface-4.1.1"; src = fetchurl { url = "http://pypi.python.org/packages/source/z/zope.interface/${name}.tar.gz"; - md5 = "1ddd308f2c83703accd1696158c300eb"; + md5 = "edcd5f719c5eb2e18894c4d06e29b6c6"; }; propagatedBuildInputs = [ zope_event ]; @@ -9525,6 +9580,7 @@ rec { cliapp = buildPythonPackage rec { name = "cliapp-${version}"; version = "1.20140719"; + disabled = isPy3k; src = fetchurl rec { url = "http://code.liw.fi/debian/pool/main/p/python-cliapp/python-cliapp_${version}.orig.tar.gz"; @@ -10016,15 +10072,19 @@ rec { IMAPClient = buildPythonPackage rec { name = "IMAPClient-${version}"; - version = "0.9.2"; + version = "0.11"; + disabled = isPy34; src = fetchurl { url = "http://freshfoo.com/projects/IMAPClient/${name}.tar.gz"; - sha256 = "10alpj7074djs048xjc4j7ggd1nrqdqpy0fzl7fj9hddp0rbchs9"; + sha256 = "1w54h8gz25qf6ggazzp6xf7kvsyiadsjfkkk17gm0p6pmzvvccbn"; }; + + buildInputs = [ mock ]; preConfigure = '' sed -i '/distribute_setup/d' setup.py + substituteInPlace setup.py --replace "mock==0.8.0" "mock" ''; meta = { -- GitLab From 8493813850d26a780d69bed27f3f2155c50c06f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Wed, 27 Aug 2014 13:34:38 +0200 Subject: [PATCH 372/843] python3Packages: more build fixes --- pkgs/top-level/python-packages.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 6d598ef1060..7a2e90e56d2 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4619,8 +4619,10 @@ rec { }; }); - moinmoin = let ver="1.9.7"; in buildPythonPackage (rec { + moinmoin = buildPythonPackage (rec { name = "moinmoin-${ver}"; + disabled = isPy3k; + ver = "1.9.7"; src = fetchurl { url = "http://static.moinmo.in/files/moin-${ver}.tar.gz"; @@ -5374,6 +5376,7 @@ rec { osc = buildPythonPackage (rec { name = "osc-0.133+git"; + disabled = isPy3k; src = fetchgit { url = git://gitorious.org/opensuse/osc.git; @@ -5381,7 +5384,7 @@ rec { sha256 = "a39ce0e321e40e9758bf7b9128d316c71b35b80eabc84f13df492083bb6f1cc6"; }; - buildPhase = "python setup.py build"; + buildPhase = "${python}/bin/${python.executable} setup.py build"; doCheck = false; postInstall = "ln -s $out/bin/osc-wrapper.py $out/bin/osc"; @@ -6344,6 +6347,7 @@ rec { pyro3 = buildPythonPackage (rec { name = "Pyro-3.16"; + disabled = isPy3k; src = fetchurl { url = "http://pypi.python.org/packages/source/P/Pyro/${name}.tar.gz"; @@ -8134,6 +8138,7 @@ rec { tarsnapper = buildPythonPackage rec { name = "tarsnapper-0.2.1"; + disabled = isPy3k; src = fetchgit { url = https://github.com/miracle2k/tarsnapper.git; -- GitLab From 78bcfef61a0c714a7ff783163a47d416622b2c60 Mon Sep 17 00:00:00 2001 From: Emery Hemingway Date: Sat, 23 Aug 2014 17:51:41 -0400 Subject: [PATCH 373/843] libdiscid update from 0.2.2 to 0.6.1 --- .../libraries/libdiscid/default.nix | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/pkgs/development/libraries/libdiscid/default.nix b/pkgs/development/libraries/libdiscid/default.nix index f9d1fc87870..8c5c8bef351 100644 --- a/pkgs/development/libraries/libdiscid/default.nix +++ b/pkgs/development/libraries/libdiscid/default.nix @@ -1,26 +1,21 @@ { stdenv, fetchurl, cmake, pkgconfig }: stdenv.mkDerivation rec { - name = "libdiscid-0.2.2"; + name = "libdiscid-0.6.1"; nativeBuildInputs = [ pkgconfig ]; buildInputs = [ cmake ]; src = fetchurl { - url = "http://users.musicbrainz.org/~matt/${name}.tar.gz"; - sha256 = "00l4ln9rk0vqf67iccwqrgc9qx1al92i05zylh85kd1zn9d5sjwp"; + url = "http://ftp.musicbrainz.org/pub/musicbrainz/libdiscid/${name}.tar.gz"; + sha256 = "1mbd5y9056638cffpfwc6772xwrsk18prv1djsr6jpfim38jpsxc"; }; - # developer forgot to update his version number - # this is propagated to pkg-config - preConfigure = '' - substituteInPlace "CMakeLists.txt" \ - --replace "PROJECT_VERSION 0.1.1" "PROJECT_VERSION 0.2.2" - ''; - - meta = { + meta = with stdenv.lib; { description = "A C library for creating MusicBrainz DiscIDs from audio CDs"; homepage = http://musicbrainz.org/doc/libdiscid; - license = stdenv.lib.licenses.lgpl21; + maintainers = with maintainers; [ emery ]; + license = licenses.lgpl21; + platforms = platforms.all; }; } -- GitLab From d41b8b30912ea32d5c7f06a968f26b3150a23639 Mon Sep 17 00:00:00 2001 From: Emery Hemingway Date: Sat, 23 Aug 2014 17:53:27 -0400 Subject: [PATCH 374/843] chromaprint: switch FFT implementation to ffmpeg, build fpcalc FFmpeg is prefered over FFTW3, and a mutual dependency of picard and acoustid-fingerprinter --- pkgs/development/libraries/chromaprint/default.nix | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/chromaprint/default.nix b/pkgs/development/libraries/chromaprint/default.nix index 40d41b633d2..010d2cb7ccc 100644 --- a/pkgs/development/libraries/chromaprint/default.nix +++ b/pkgs/development/libraries/chromaprint/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, fftw, boost }: +{ stdenv, fetchurl, cmake, ffmpeg, boost }: stdenv.mkDerivation rec { name = "chromaprint-${version}"; @@ -9,11 +9,17 @@ stdenv.mkDerivation rec { sha256 = "04nd8xmy4kgnpfffj6hw893f80bwhp43i01zpmrinn3497mdf53b"; }; - buildInputs = [ cmake fftw boost ]; + buildInputs = [ cmake ffmpeg boost ]; - meta = { + cmakeFlags = [ "-DBUILD_EXAMPLES=ON" ]; + + postInstall = "installBin examples/fpcalc"; + + meta = with stdenv.lib; { homepage = "http://acoustid.org/chromaprint"; description = "AcoustID audio fingerprinting library"; - license = stdenv.lib.licenses.lgpl21Plus; + maintainers = with maintainers; [ emery ]; + license = licenses.lgpl21Plus; + platforms = platforms.all; }; } -- GitLab From 4fc7e4e10edeaf2ed613a0f779a1176f3d67727f Mon Sep 17 00:00:00 2001 From: Emery Hemingway Date: Sat, 23 Aug 2014 17:56:06 -0400 Subject: [PATCH 375/843] picard: fix libdisc and acoustid fingerprinting issues fpcalc is the external fingerprinter, not acoustid-fingerprinter --- pkgs/applications/audio/picard/default.nix | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/audio/picard/default.nix b/pkgs/applications/audio/picard/default.nix index 07753216d3c..235a81a6a32 100644 --- a/pkgs/applications/audio/picard/default.nix +++ b/pkgs/applications/audio/picard/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, pythonPackages, gettext, pyqt4 -, pkgconfig, libdiscid, libofa, ffmpeg, acoustidFingerprinter +, pkgconfig, libdiscid, libofa, ffmpeg, chromaprint }: pythonPackages.buildPythonPackage rec { @@ -9,14 +9,16 @@ pythonPackages.buildPythonPackage rec { src = fetchurl { url = "http://ftp.musicbrainz.org/pub/musicbrainz/picard/${name}.tar.gz"; - md5 = "d1086687b7f7b0d359a731b1a25e7b66"; + sha256 = "0sbsf8hzxhxcnnjqvsd6mc23lmk7w33nln0f3w72f89mjgs6pxm6"; }; postPatch = let - fpr = "${acoustidFingerprinter}/bin/acoustid-fingerprinter"; + discid = "${libdiscid}/lib/libdiscid.so.0"; + fpr = "${chromaprint}/bin/fpcalc"; in '' - sed -ri -e 's|(TextOption.*"acoustid_fpcalc"[^"]*")[^"]*|\1${fpr}|' \ - picard/ui/options/fingerprinting.py + substituteInPlace picard/disc.py --replace libdiscid.so.0 ${discid} + substituteInPlace picard/const.py \ + --replace "FPCALC_NAMES = [" "FPCALC_NAMES = ['${fpr}'," ''; buildInputs = [ @@ -46,9 +48,11 @@ pythonPackages.buildPythonPackage rec { doCheck = false; - meta = { + meta = with stdenv.lib; { homepage = "http://musicbrainz.org/doc/MusicBrainz_Picard"; description = "The official MusicBrainz tagger"; - license = stdenv.lib.licenses.gpl2; + maintainers = with maintainers; [ emery ]; + license = licenses.gpl2; + platforms = platforms.all; }; } -- GitLab From be1ac7c04452763627ea4d4272904656f24783bc Mon Sep 17 00:00:00 2001 From: Mateusz Kowalczyk Date: Wed, 27 Aug 2014 12:39:02 +0100 Subject: [PATCH 376/843] haskell-free-game: add maintainer --- pkgs/development/libraries/haskell/free-game/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/haskell/free-game/default.nix b/pkgs/development/libraries/haskell/free-game/default.nix index d2a0f33892f..ee47e6bb3f5 100644 --- a/pkgs/development/libraries/haskell/free-game/default.nix +++ b/pkgs/development/libraries/haskell/free-game/default.nix @@ -21,5 +21,6 @@ cabal.mkDerivation (self: { description = "Create games for free"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; + maintainers = with self.stdenv.lib.maintainers; [ fuuzetsu ]; }; }) -- GitLab From d216d87e6ebf571c6c64dd32724679ace96be099 Mon Sep 17 00:00:00 2001 From: Oliver Charles Date: Wed, 27 Aug 2014 12:49:55 +0100 Subject: [PATCH 377/843] haskellPackages.markdown: New expression --- .../libraries/haskell/markdown/default.nix | 27 +++++++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 29 insertions(+) create mode 100644 pkgs/development/libraries/haskell/markdown/default.nix diff --git a/pkgs/development/libraries/haskell/markdown/default.nix b/pkgs/development/libraries/haskell/markdown/default.nix new file mode 100644 index 00000000000..746bd1c7484 --- /dev/null +++ b/pkgs/development/libraries/haskell/markdown/default.nix @@ -0,0 +1,27 @@ +# 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.mkDerivation (self: { + pname = "markdown"; + version = "0.1.9"; + sha256 = "1bl86alrbl9i690sbqqlxb4hkdd0lv3x5aqc8zi55q9h0rfsi06l"; + buildDepends = [ + attoparsec blazeHtml conduit conduitExtra dataDefault text + transformers xssSanitize + ]; + testDepends = [ + blazeHtml conduit conduitExtra hspec systemFileio systemFilepath + text transformers + ]; + meta = { + homepage = "https://github.com/snoyberg/markdown"; + description = "Convert Markdown to HTML, with XSS protection"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = with self.stdenv.lib.maintainers; [ ocharles ]; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 3ddf87db53d..88176c01c1b 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1537,6 +1537,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in machines = callPackage ../development/libraries/haskell/machines {}; + markdown = callPackage ../development/libraries/haskell/markdown {}; + markdownUnlit = callPackage ../development/libraries/haskell/markdown-unlit {}; mathFunctions = callPackage ../development/libraries/haskell/math-functions {}; -- GitLab From 591ba58e426407c0f97bfb81ee690900d44e2052 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Wed, 27 Aug 2014 14:55:03 +0200 Subject: [PATCH 378/843] perlPackages.NetAMQP: fix build --- pkgs/top-level/perl-packages.nix | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index a74cd8f2d8f..f21569b2525 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -6467,7 +6467,7 @@ let self = _self // overrides; _self = with self; { }; }; - NetAMQP = buildPerlPackage { + NetAMQP = buildPerlModule { name = "Net-AMQP-0.06"; src = fetchurl { url = mirror://cpan/authors/id/C/CH/CHIPS/Net-AMQP-0.06.tar.gz; @@ -6481,13 +6481,6 @@ let self = _self // overrides; _self = with self; { maintainers = with maintainers; [ ocharles ]; platforms = stdenv.lib.platforms.unix; }; - preConfigure = - '' - substituteInPlace META.json \ - '"Module::Build" : "0.40"' '"Module::Build" : "0.39"' - substituteInPlace META.yml \ - 'Module::Build: 0.40' 'Module::Build: 0.39' - ''; }; NetCoverArtArchive = buildPerlPackage { -- GitLab From 0ac13e87d727de8db2ad4b8763d615c77d5ed918 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Wed, 27 Aug 2014 10:06:59 -0300 Subject: [PATCH 379/843] Lilyterm: New Package (version 0.9.9.4) LilyTerm is a terminal emulator based off of libvte that aims to be fast and lightweight. --- pkgs/applications/misc/lilyterm/default.nix | 35 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 5 +++ 2 files changed, 40 insertions(+) create mode 100644 pkgs/applications/misc/lilyterm/default.nix diff --git a/pkgs/applications/misc/lilyterm/default.nix b/pkgs/applications/misc/lilyterm/default.nix new file mode 100644 index 00000000000..c87b6a8bc0a --- /dev/null +++ b/pkgs/applications/misc/lilyterm/default.nix @@ -0,0 +1,35 @@ +{ stdenv, fetchurl +, pkgconfig +, autoconf, automake, intltool, gettext +, gtk, vte }: + +stdenv.mkDerivation rec { + + name = "lilyterm-${version}"; + version = "0.9.9.4"; + + src = fetchurl { + url = "http://lilyterm.luna.com.tw/file/${name}.tar.gz"; + sha256 = "0x2x59qsxq6d6xg5sd5lxbsbwsdvkwqlk17iw3h4amjg3m1jc9mp"; + }; + + buildInputs = [ pkgconfig autoconf automake intltool gettext gtk vte ]; + + preConfigure = "sh autogen.sh"; + + configureFlags = '' + --enable-nls + --enable-safe-mode + ''; + + meta = { + description = "A fast, lightweight terminal emulator"; + longDescription = '' + LilyTerm is a terminal emulator based off of libvte that aims to be fast and lightweight. + ''; + homepage = http://lilyterm.luna.com.tw/; + license = stdenv.lib.licenses.gpl3; + maintainers = [ stdenv.lib.maintainers.AndersonTorres ]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0a97c43463d..6362a617bd9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9201,6 +9201,11 @@ let handbrake = callPackage ../applications/video/handbrake { }; + lilyterm = callPackage ../applications/misc/lilyterm { + inherit (gnome) vte; + gtk = gtk2; + }; + lynx = callPackage ../applications/networking/browsers/lynx { }; lyx = callPackage ../applications/misc/lyx { }; -- GitLab From aaa6156deba990018d48d9521a1d1ce9277bde0c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Wed, 27 Aug 2014 15:13:43 +0200 Subject: [PATCH 380/843] python3Packages.subprocess32: disable on py3k --- pkgs/top-level/python-packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 7a2e90e56d2..3eb09bca40d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7837,6 +7837,7 @@ rec { subprocess32 = buildPythonPackage rec { name = "subprocess32-3.2.6"; + disabled = isPy3k; src = fetchurl { url = "https://pypi.python.org/packages/source/s/subprocess32/${name}.tar.gz"; -- GitLab From 1cb510784ac5881334379e10bd433e987cc24b92 Mon Sep 17 00:00:00 2001 From: Mateusz Kowalczyk Date: Wed, 27 Aug 2014 11:46:19 +0100 Subject: [PATCH 381/843] haskell-dns: update to 1.4.4 --- pkgs/development/libraries/haskell/dns/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/dns/default.nix b/pkgs/development/libraries/haskell/dns/default.nix index 113e1af46ee..ab74819965a 100644 --- a/pkgs/development/libraries/haskell/dns/default.nix +++ b/pkgs/development/libraries/haskell/dns/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "dns"; - version = "1.4.3"; - sha256 = "15v24f338w71dn3cxrzwyg04hk3vxvrvswbv3nnf2ggjgg46yq3i"; + version = "1.4.4"; + sha256 = "1g910rlahvrhjlg6jl7gpya1y3mqkkpmihfr2jnmmlzykll10dnd"; buildDepends = [ attoparsec binary blazeBuilder conduit conduitExtra iproute mtl network random resourcet @@ -21,5 +21,6 @@ cabal.mkDerivation (self: { description = "DNS library in Haskell"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; + maintainers = with self.stdenv.lib.maintainers; [ fuuzetsu ]; }; }) -- GitLab From 422073018cfffbc2ed4f94afdd64e4e45f4817fc Mon Sep 17 00:00:00 2001 From: Mateusz Kowalczyk Date: Wed, 27 Aug 2014 11:46:30 +0100 Subject: [PATCH 382/843] haskell-github: update to 0.11.0 --- pkgs/development/libraries/haskell/github/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/haskell/github/default.nix b/pkgs/development/libraries/haskell/github/default.nix index b35055b7719..f20976b8dcf 100644 --- a/pkgs/development/libraries/haskell/github/default.nix +++ b/pkgs/development/libraries/haskell/github/default.nix @@ -7,18 +7,18 @@ cabal.mkDerivation (self: { pname = "github"; - version = "0.10.0"; - sha256 = "1llwzkhyw5wazczpiv3w8dq4l7j3q49ii64yh7cxwakkp2h5yiwb"; + version = "0.11.0"; + sha256 = "13p0iplxr85fvgx5lird76xchmhh7xpddq900qr02kbvn5mqv607"; buildDepends = [ aeson attoparsec caseInsensitive conduit dataDefault failure hashable HTTP httpConduit httpTypes network text time unorderedContainers vector ]; - jailbreak = true; meta = { homepage = "https://github.com/fpco/github"; description = "Access to the Github API, v3"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; + maintainers = with self.stdenv.lib.maintainers; [ fuuzetsu ]; }; }) -- GitLab From 44922143fa4eba93c690177c839d9e30406db0a0 Mon Sep 17 00:00:00 2001 From: Mateusz Kowalczyk Date: Wed, 27 Aug 2014 11:46:42 +0100 Subject: [PATCH 383/843] haskell-hakyll: update to 4.5.4.0 --- .../development/libraries/haskell/hakyll/default.nix | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/pkgs/development/libraries/haskell/hakyll/default.nix b/pkgs/development/libraries/haskell/hakyll/default.nix index 1bb23f07bdb..e38eadad057 100644 --- a/pkgs/development/libraries/haskell/hakyll/default.nix +++ b/pkgs/development/libraries/haskell/hakyll/default.nix @@ -5,13 +5,13 @@ , HUnit, lrucache, mtl, network, pandoc, pandocCiteproc, parsec , QuickCheck, random, regexBase, regexTdfa, snapCore, snapServer , systemFilepath, tagsoup, testFramework, testFrameworkHunit -, testFrameworkQuickcheck2, text, time +, testFrameworkQuickcheck2, text, time, utillinux }: cabal.mkDerivation (self: { pname = "hakyll"; - version = "4.5.3.0"; - sha256 = "11ibpjff1zkihpxydlzvvzbgd1vxswi4c7g3lr0hhaaw89bikypy"; + version = "4.5.4.0"; + sha256 = "16srkm2fxjw1xg7zaikn49zz4xsz9awddnjm6ibv522k3xf3l24c"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -25,15 +25,13 @@ cabal.mkDerivation (self: { filepath fsnotify httpConduit httpTypes HUnit lrucache mtl network pandoc pandocCiteproc parsec QuickCheck random regexBase regexTdfa snapCore snapServer systemFilepath tagsoup testFramework - testFrameworkHunit testFrameworkQuickcheck2 text time + testFrameworkHunit testFrameworkQuickcheck2 text time utillinux ]; - doCheck = false; meta = { homepage = "http://jaspervdj.be/hakyll"; description = "A static website compiler library"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - broken = true; + maintainers = with self.stdenv.lib.maintainers; [ fuuzetsu ]; }; }) -- GitLab From e50deca4401083f10b8e81599679cc6b8c252111 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Wed, 27 Aug 2014 15:39:47 +0200 Subject: [PATCH 384/843] python3Packages.statd: rename to python_statsd, disable on py3k --- pkgs/top-level/python-packages.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 3eb09bca40d..49b73988458 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8012,9 +8012,10 @@ rec { }; - statd = buildPythonPackage rec { + python_statsd = buildPythonPackage rec { name = "python-statsd-${version}"; version = "1.6.0"; + disabled = isPy3k; # next release will be py3k compatible src = fetchurl { url = "https://pypi.python.org/packages/source/p/python-statsd/${name}.tar.gz"; -- GitLab From 62345fee552f1285ccd5ad60615ee922639dc5a2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Wed, 27 Aug 2014 15:52:44 +0200 Subject: [PATCH 385/843] python: provide better message if python interpreter is not supported --- pkgs/development/python-modules/generic/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/generic/default.nix b/pkgs/development/python-modules/generic/default.nix index 0f5d8499454..4c9c53aab83 100644 --- a/pkgs/development/python-modules/generic/default.nix +++ b/pkgs/development/python-modules/generic/default.nix @@ -49,10 +49,9 @@ , ... } @ attrs: -assert (!disabled); # Keep extra attributes from `attrs`, e.g., `patchPhase', etc. -python.stdenv.mkDerivation (attrs // { +if disabled then throw "${name} not supported for interpreter ${python.executable}" else python.stdenv.mkDerivation (attrs // { inherit doCheck; name = namePrefix + name; -- GitLab From 6f689c50169f5567a382984063ca296055a3043a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Wed, 27 Aug 2014 15:53:00 +0200 Subject: [PATCH 386/843] python3Packages: disable some more packages --- pkgs/top-level/python-packages.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 49b73988458..81ec988d880 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8311,6 +8311,7 @@ rec { trac = buildPythonPackage { name = "trac-1.0.1"; + disabled = isPy3k; src = fetchurl { url = http://ftp.edgewall.com/pub/trac/Trac-1.0.1.tar.gz; @@ -8414,6 +8415,7 @@ rec { tweepy = buildPythonPackage (rec { name = "tweepy-2.3.0"; + disabled = isPy3k; src = fetchurl { url = "http://pypi.python.org/packages/source/t/tweepy/${name}.tar.gz"; -- GitLab From 1f3af28e8a6674841c674fb883edde2bbeecee2b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Wed, 27 Aug 2014 16:04:55 +0200 Subject: [PATCH 387/843] python3Packages.execnet: disable tests --- pkgs/top-level/python-packages.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 81ec988d880..92f30ed5ca9 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1985,6 +1985,8 @@ rec { md5 = "be885ccd9612966bb81839670d2da099"; }; + doCheck = !isPy3k; # failures.. + meta = { description = "rapid multi-Python deployment"; license = stdenv.lib.licenses.gpl2; -- GitLab From 2faf1c5b8115c765ef0344f76dda91ecae6c6d95 Mon Sep 17 00:00:00 2001 From: Bodil Stokke Date: Wed, 27 Aug 2014 15:38:15 +0100 Subject: [PATCH 388/843] Add evilvte package. --- pkgs/applications/misc/evilvte/default.nix | 35 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 +++ 2 files changed, 39 insertions(+) create mode 100644 pkgs/applications/misc/evilvte/default.nix diff --git a/pkgs/applications/misc/evilvte/default.nix b/pkgs/applications/misc/evilvte/default.nix new file mode 100644 index 00000000000..5921cc308b5 --- /dev/null +++ b/pkgs/applications/misc/evilvte/default.nix @@ -0,0 +1,35 @@ +{ stdenv, fetchgit, makeWrapper, pkgconfig, + gnome, glib, pango, cairo, gdk_pixbuf, atk, freetype, xlibs, + configH +}: + +stdenv.mkDerivation rec { + name = "evilvte-${version}"; + version = "0.5.2-20140827"; + + src = fetchgit { + url = https://github.com/caleb-/evilvte.git; + rev = "8dfa41e26bc640dd8d8c7317ff7d04e3c01ded8a"; + sha256 = "70f1d4234d077121e2223a735d749d1b53f0b84393507b635b8a37c3716e94d3"; + }; + + buildInputs = [ + gnome.vte glib pango gnome.gtk cairo gdk_pixbuf atk freetype xlibs.libX11 + xlibs.xproto xlibs.kbproto xlibs.libXext xlibs.xextproto makeWrapper pkgconfig + ]; + + buildPhase = '' + cat >src/config.h < Date: Wed, 13 Aug 2014 04:53:31 +0200 Subject: [PATCH 389/843] chromium: Clean up/remove old/unused stuff. We no longer need to supply compiler and binutils to the build process, se we can safely remove them. In addition, we're now passing the new options linux_use_gold_binary and linux_use_bundled_gold to gyp, for details, see: https://codereview.chromium.org/239163003 Signed-off-by: aszlig --- .../networking/browsers/chromium/common.nix | 15 ++++++--------- 1 file changed, 6 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index b9011c0236f..da06a7f466f 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -10,7 +10,7 @@ , python, pythonPackages, perl, pkgconfig , nspr, udev, krb5 , utillinux, alsaLib -, gcc, bison, gperf +, bison, gperf , glib, gtk, dbus_glib , libXScrnSaver, libXcursor, libXtst, mesa , protobuf, speechd, libXdamage @@ -145,6 +145,8 @@ let ''; gypFlags = mkGypFlags (gypFlagsUseSystemLibs // { + linux_use_bundled_binutils = false; + linux_use_bundled_gold = false; linux_use_gold_binary = false; linux_use_gold_flags = false; proprietary_codecs = false; @@ -192,20 +194,15 @@ let ''; buildPhase = let - CC = "${gcc}/bin/gcc"; - CXX = "${gcc}/bin/g++"; buildCommand = target: let # XXX: Only needed for version 36 and older! targetSuffix = optionalString (versionOlder source.version "37.0.0.0" && target == "mksnapshot") (if stdenv.is64bit then ".x64" else ".ia32"); in '' - CC="${CC}" CC_host="${CC}" \ - CXX="${CXX}" CXX_host="${CXX}" \ - LINK_host="${CXX}" \ - "${ninja}/bin/ninja" -C "${buildPath}" \ - -j$NIX_BUILD_CORES -l$NIX_BUILD_CORES \ - "${target}${targetSuffix}" + "${ninja}/bin/ninja" -C "${buildPath}" \ + -j$NIX_BUILD_CORES -l$NIX_BUILD_CORES \ + "${target}${targetSuffix}" '' + optionalString (target == "mksnapshot" || target == "chrome") '' paxmark m "${buildPath}/${target}${targetSuffix}" ''; -- GitLab From 1488fbe27b5d767176000f6499e3292a458e3d33 Mon Sep 17 00:00:00 2001 From: aszlig Date: Wed, 13 Aug 2014 04:49:53 +0200 Subject: [PATCH 390/843] chromium: Update all channels to latest versions. With this commit, the following new upstream versions are introduced: stable: 36.0.1985.125 -> 37.0.2062.94 beta: 37.0.2062.58 -> 37.0.2062.94 dev: 38.0.2107.3 -> 38.0.2125.8 All channels built fine on my machine and were tested against a few sites. Stable and beta channel now contain the same release, because version 37 hit the stable channel. For release notes, please have a look at the announcement: http://googlechromereleases.blogspot.de/2014/08/stable-channel-update_26.html Of course we're also dropping all version 36 specific crap, such as the architecture-specific target suffix for builds, which now is no longer needed. The gyp flag use_mojo=0 is no longer needed, as it was a workaround concerning version 37.0.2054.3 only. Signed-off-by: aszlig --- .../networking/browsers/chromium/common.nix | 14 +++-------- .../browsers/chromium/source/sources.nix | 24 +++++++++---------- 2 files changed, 15 insertions(+), 23 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index da06a7f466f..46dadd280c9 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -163,9 +163,6 @@ let werror = ""; clang = false; - # FIXME: In version 37, omnibox.mojom.js doesn't seem to be generated. - use_mojo = versionOlder source.version "37.0.0.0"; - # Google API keys, see: # http://www.chromium.org/developers/how-tos/api-keys # Note: These are for NixOS/nixpkgs use ONLY. For your own distribution, @@ -194,17 +191,12 @@ let ''; buildPhase = let - buildCommand = target: let - # XXX: Only needed for version 36 and older! - targetSuffix = optionalString - (versionOlder source.version "37.0.0.0" && target == "mksnapshot") - (if stdenv.is64bit then ".x64" else ".ia32"); - in '' + buildCommand = target: '' "${ninja}/bin/ninja" -C "${buildPath}" \ -j$NIX_BUILD_CORES -l$NIX_BUILD_CORES \ - "${target}${targetSuffix}" + "${target}" '' + optionalString (target == "mksnapshot" || target == "chrome") '' - paxmark m "${buildPath}/${target}${targetSuffix}" + paxmark m "${buildPath}/${target}" ''; targets = extraAttrs.buildTargets or []; commands = map buildCommand targets; diff --git a/pkgs/applications/networking/browsers/chromium/source/sources.nix b/pkgs/applications/networking/browsers/chromium/source/sources.nix index 4a610827913..71c825188c3 100644 --- a/pkgs/applications/networking/browsers/chromium/source/sources.nix +++ b/pkgs/applications/networking/browsers/chromium/source/sources.nix @@ -1,21 +1,21 @@ # This file is autogenerated from update.sh in the parent directory. { dev = { - version = "38.0.2107.3"; - sha256 = "0zb1mj3xgvvs5ijix4b52vj9dlymqkipn8srfzvhwl7g4hx5ss3v"; - sha256bin32 = "12lvvmg3bqacb0qw72bwlxm2m57s39mz2810agngdgzv0hd835cv"; - sha256bin64 = "1vw36s8nlvdsl8pjbh4gny00kvcizn1i2lznzqzysicz2rz7ncrh"; + version = "38.0.2125.8"; + sha256 = "1h3vkp0mgznqv48ksnsndlh7ywh3jby25x6dxxd7py445pg6y3c6"; + sha256bin32 = "1ynqm5yp7m8j3mwgqaa2vvw835g9ifn3dfniqh9z9n0swha27a69"; + sha256bin64 = "1vdm4wffkvj3jwrb2nihghxkxcvp81xcc5wygpd1w495vrhy4bpf"; }; beta = { - version = "37.0.2062.58"; - sha256 = "0jck4s6nrizj9wmifsjviin9ifnviihs21fi05wzljyfnbgc4byl"; - sha256bin32 = "1cm1r8bqy66gvdhbrgn9pdc11i72dca96ab5j3m3349p6728jbgk"; - sha256bin64 = "0cpb189pn5jiplldkgy8lfbcwvfik66kjjf6y2i708xa5ggfpwfi"; + version = "37.0.2062.94"; + sha256 = "0cz5kivimxcaiml6x5mysarjyfvvanbw02qz2d1y3jvl1dc1jz6j"; + sha256bin32 = "0pa209sjdfb0y96kicvp4lnn1inwdcgj8kpmn28cmi8l1cr8yy3b"; + sha256bin64 = "0kk2dm2gwvzvrrp03k7cw6zzp3197lrq2p1si3pr2wbgm8sb5dk5"; }; stable = { - version = "36.0.1985.125"; - sha256 = "08shkm89qzzdlrjg0rg5qiszbk6ziginsicyxqyk353y76jx10hp"; - sha256bin32 = "1ahazz56k127xncgl1lzwsmydbh0vcxq0hzrb9cm9zzdkzqjzg03"; - sha256bin64 = "0qx5316cd8l9g8w389aqi5m3csmr5s8hs7sivlk02mbs0jzi8ppc"; + version = "37.0.2062.94"; + sha256 = "0cz5kivimxcaiml6x5mysarjyfvvanbw02qz2d1y3jvl1dc1jz6j"; + sha256bin32 = "0vszphfz4mnw08yc6bid4g6q2w4f5smvfhlzyb2vvv65ndr64b8k"; + sha256bin64 = "0h4fb7v0b1w9d47iy6fk5g0fpzgczps7nzmknyk7vx68ybi39ssw"; }; } -- GitLab From 47f84c63bb09904a38952fedc44ca17d64aada40 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Wed, 27 Aug 2014 17:17:31 +0200 Subject: [PATCH 391/843] python3Packages: more build fixes --- pkgs/top-level/python-packages.nix | 16 ++++++++++++---- 1 file changed, 12 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 92f30ed5ca9..bb467d74a66 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -694,7 +694,7 @@ rec { }; buildInputs = [ pkgs.btrfsProgs ]; - propagatedBuildInputs = with pkgs; [ contextlib2 sqlalchemy8 pyxdg pycparser cffi alembic ]; + propagatedBuildInputs = with pkgs; [ contextlib2 sqlalchemy9 pyxdg pycparser cffi alembic ]; meta = { description = "Deduplication for Btrfs"; @@ -6069,6 +6069,7 @@ rec { pycurl2 = buildPythonPackage (rec { name = "pycurl2-7.20.0"; + disabled = isPy3k; src = fetchgit { url = "https://github.com/Lispython/pycurl.git"; @@ -6091,6 +6092,7 @@ rec { pydot = buildPythonPackage rec { name = "pydot-1.0.2"; + disabled = isPy3k; src = fetchurl { url = "http://pypi.python.org/packages/source/p/pydot/${name}.tar.gz"; @@ -6600,6 +6602,7 @@ rec { pyreport = buildPythonPackage (rec { name = "pyreport-0.3.4c"; + disabled = isPy3k; src = fetchurl { url = "http://pypi.python.org/packages/source/p/pyreport/${name}.tar.gz"; @@ -7565,12 +7568,17 @@ rec { }; sympy = buildPythonPackage rec { - name = "sympy-0.7.3"; + name = "sympy-0.7.4"; src = fetchurl { url = "https://github.com/sympy/sympy/releases/download/${name}/${name}.tar.gz"; - sha256 = "081g9gs2d1d41ipn8zr034d98cnrxvc4zsmihqmfwzirwzpcii5x"; + sha256 = "0h1b9mx0snyyybj1x1ga69qssgjzkkgx2rw6nddjhyz1fknf8ywh"; }; + + preCheck = '' + export LANG="en_US.UTF-8" + export LOCALE_ARCHIVE=${pkgs.glibcLocales}/lib/locale/locale-archive + ''; meta = with stdenv.lib; { description = "A Python library for symbolic mathematics"; @@ -7915,6 +7923,7 @@ rec { sqlalchemy = pkgs.lib.overrideDerivation sqlalchemy9 (args: rec { name = "SQLAlchemy-0.7.10"; + disabled = isPy3k; src = fetchurl { url = "http://pypi.python.org/packages/source/S/SQLAlchemy/${name}.tar.gz"; sha256 = "0rhxgr85xdhjn467qfs0dkyj8x46zxcv6ad3dfx3w14xbkb3kakp"; @@ -7926,7 +7935,6 @@ rec { ]; }); - sqlalchemy8 = pkgs.lib.overrideDerivation sqlalchemy9 (args: rec { name = "SQLAlchemy-0.8.7"; src = fetchurl { -- GitLab From e7597b12b88ac0ecfe3f8ca8d2bc7aade2aaef99 Mon Sep 17 00:00:00 2001 From: Emery Hemingway Date: Tue, 22 Jul 2014 18:30:04 -0400 Subject: [PATCH 392/843] privoxy: upstart to systemd conversion, actions file editing fix missing actions and filters --- nixos/modules/services/networking/privoxy.nix | 76 +++++++++++-------- 1 file changed, 44 insertions(+), 32 deletions(-) diff --git a/nixos/modules/services/networking/privoxy.nix b/nixos/modules/services/networking/privoxy.nix index 950112b2dab..94beb78ef5a 100644 --- a/nixos/modules/services/networking/privoxy.nix +++ b/nixos/modules/services/networking/privoxy.nix @@ -6,19 +6,18 @@ let inherit (pkgs) privoxy; - stateDir = "/var/spool/privoxy"; - privoxyUser = "privoxy"; - privoxyFlags = "--no-daemon --user ${privoxyUser} ${privoxyCfg}"; - - privoxyCfg = pkgs.writeText "privoxy.conf" '' - listen-address ${config.services.privoxy.listenAddress} - logdir ${config.services.privoxy.logDir} - confdir ${privoxy}/etc - filterfile default.filter + cfg = config.services.privoxy; - ${config.services.privoxy.extraConfig} + confFile = pkgs.writeText "privoxy.conf" '' + user-manual ${privoxy}/share/doc/privoxy/user-manual + confdir ${privoxy}/etc/ + listen-address ${cfg.listenAddress} + enable-edit-actions ${if (cfg.enableEditActions == true) then "1" else "0"} + ${concatMapStrings (f: "actionsfile ${f}\n") cfg.actionsFiles} + ${concatMapStrings (f: "filterfile ${f}\n") cfg.filterFiles} + ${cfg.extraConfig} ''; in @@ -32,27 +31,51 @@ in services.privoxy = { enable = mkOption { + type = types.bool; default = false; description = '' - Whether to run the machine as a HTTP proxy server. + Whether to enable the Privoxy non-caching filtering proxy. ''; }; listenAddress = mkOption { + type = types.str; default = "127.0.0.1:8118"; description = '' Address the proxy server is listening to. ''; }; - logDir = mkOption { - default = "/var/log/privoxy" ; + actionsFiles = mkOption { + type = types.listOf types.str; + example = [ "match-all.action" "default.action" "/etc/privoxy/user.action" ]; + default = [ "match-all.action" "default.action" ]; + description = '' + List of paths to Privoxy action files. + These paths may either be absolute or relative to the privoxy configuration directory. + ''; + }; + + filterFiles = mkOption { + type = types.listOf types.str; + example = [ "default.filter" "/etc/privoxy/user.filter" ]; + default = [ "default.filter" ]; + description = '' + List of paths to Privoxy filter files. + These paths may either be absolute or relative to the privoxy configuration directory. + ''; + }; + + enableEditActions = mkOption { + type = types.bool; + default = false; description = '' - Location for privoxy log files. + Whether or not the web-based actions file editor may be used. ''; }; extraConfig = mkOption { + type = types.lines; default = "" ; description = '' Extra configuration. Contents will be added verbatim to the configuration file. @@ -62,33 +85,22 @@ in }; - ###### implementation - config = mkIf config.services.privoxy.enable { + config = mkIf cfg.enable { - environment.systemPackages = [ privoxy ]; - users.extraUsers = singleton { name = privoxyUser; uid = config.ids.uids.privoxy; description = "Privoxy daemon user"; - home = stateDir; }; - jobs.privoxy = - { name = "privoxy"; - - startOn = "startup"; - - preStart = - '' - mkdir -m 0755 -p ${stateDir} - chown ${privoxyUser} ${stateDir} - ''; - - exec = "${privoxy}/sbin/privoxy ${privoxyFlags}"; - }; + systemd.services.privoxy = { + description = "Filtering web proxy"; + after = [ "network.target" "nss-lookup.target" ]; + wantedBy = [ "multi-user.target" ]; + serviceConfig.ExecStart = "${privoxy}/sbin/privoxy --no-daemon --user ${privoxyUser} ${confFile}"; + }; }; -- GitLab From 30aac2c87733d4dd5233cb04250f9ff540af443b Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Wed, 27 Aug 2014 17:16:50 +0200 Subject: [PATCH 393/843] glib-tested: skip broken timer test on i686 --- pkgs/development/libraries/glib/default.nix | 2 +- .../libraries/glib/skip-timer-test.patch | 17 +++++++++++++++++ 2 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/libraries/glib/skip-timer-test.patch diff --git a/pkgs/development/libraries/glib/default.nix b/pkgs/development/libraries/glib/default.nix index 93e96bef536..839ba7cfa95 100644 --- a/pkgs/development/libraries/glib/default.nix +++ b/pkgs/development/libraries/glib/default.nix @@ -51,7 +51,7 @@ stdenv.mkDerivation rec { sha256 = "1d98mbqjmc34s8095lkw1j1bwvnnkw9581yfvjaikjvfjsaz29qd"; }; - patches = optional stdenv.isDarwin ./darwin-compilation.patch; + patches = optional stdenv.isDarwin ./darwin-compilation.patch ++ optional doCheck ./skip-timer-test.patch; setupHook = ./setup-hook.sh; diff --git a/pkgs/development/libraries/glib/skip-timer-test.patch b/pkgs/development/libraries/glib/skip-timer-test.patch new file mode 100644 index 00000000000..942f3e7864c --- /dev/null +++ b/pkgs/development/libraries/glib/skip-timer-test.patch @@ -0,0 +1,17 @@ +Description: Skip test which performs some unreliable floating point comparisons +Forwarded: https://bugzilla.gnome.org/show_bug.cgi?id=722604 + +Index: b/glib/tests/timer.c +=================================================================== +--- a/glib/tests/timer.c ++++ b/glib/tests/timer.c +@@ -203,7 +203,7 @@ + { + g_test_init (&argc, &argv, NULL); + +- g_test_add_func ("/timer/basic", test_timer_basic); ++/* g_test_add_func ("/timer/basic", test_timer_basic);*/ +- g_test_add_func ("/timer/stop", test_timer_stop); ++/* g_test_add_func ("/timer/stop", test_timer_stop);*/ + g_test_add_func ("/timer/continue", test_timer_continue); + g_test_add_func ("/timer/reset", test_timer_reset); -- GitLab From 81c39d40f7aad827a500d1efb779be08ea4f9a04 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Wed, 27 Aug 2014 17:40:02 +0200 Subject: [PATCH 394/843] python3Packages: upgrade rdflib, skype4py --- pkgs/top-level/python-packages.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index bb467d74a66..c0d9db2b8b1 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7042,11 +7042,11 @@ rec { rdflib = buildPythonPackage (rec { - name = "rdflib-3.0.0"; + name = "rdflib-4.1.2"; src = fetchurl { - url = "http://www.rdflib.net/${name}.tar.gz"; - sha256 = "1c7ipk5vwqnln83rmai5jzyxkjdajdzbk5cgy1z83nyr5hbkgkqr"; + url = "https://pypi.python.org/packages/source/r/rdflib/${name}.tar.gz"; + sha256 = "0kvaf332cqbi47rqzlpdx4mbkvw12mkrzkj8n9l19wk713d4py9w"; }; # error: invalid command 'test' @@ -7759,6 +7759,7 @@ rec { skype4py = buildPythonPackage (rec { name = "Skype4Py-1.0.32.0"; + disabled = isPy3k; src = fetchurl { url = mirror://sourceforge/skype4py/Skype4Py-1.0.32.0.tar.gz; -- GitLab From a81b2f029f58800b6dfe747188a91f8d28b5a78a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Wed, 27 Aug 2014 18:04:30 +0200 Subject: [PATCH 395/843] python3Packages.{ttystatus,versiontools}: disable on py3k --- pkgs/top-level/python-packages.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c0d9db2b8b1..9ff71c63a85 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9759,6 +9759,7 @@ rec { ttystatus = buildPythonPackage rec { name = "ttystatus-${version}"; version = "0.23"; + disabled = isPy3k; src = fetchurl rec { url = "http://code.liw.fi/debian/pool/main/p/python-ttystatus/python-ttystatus_${version}.orig.tar.gz"; @@ -9944,6 +9945,7 @@ rec { versiontools = buildPythonPackage rec { name = "versiontools-1.9.1"; + doCheck = (!isPy3k); src = fetchurl { url = "https://pypi.python.org/packages/source/v/versiontools/${name}.tar.gz"; -- GitLab From 6e2e58ea2eaefb22556ed246850542877bcf72d9 Mon Sep 17 00:00:00 2001 From: Alp Mestanogullari Date: Wed, 27 Aug 2014 18:05:06 +0200 Subject: [PATCH 396/843] add the servant (haskell) packages to nixpkgs --- .../haskell/servant-pool/servant-pool.nix | 16 +++++++++++++++ .../servant-postgresql/servant-postgresql.nix | 18 +++++++++++++++++ .../servant-response/servant-response.nix | 16 +++++++++++++++ .../haskell/servant-scotty/servant-scotty.nix | 20 +++++++++++++++++++ .../libraries/haskell/servant/servant.nix | 15 ++++++++++++++ pkgs/top-level/haskell-packages.nix | 10 ++++++++++ 6 files changed, 95 insertions(+) create mode 100644 pkgs/development/libraries/haskell/servant-pool/servant-pool.nix create mode 100644 pkgs/development/libraries/haskell/servant-postgresql/servant-postgresql.nix create mode 100644 pkgs/development/libraries/haskell/servant-response/servant-response.nix create mode 100644 pkgs/development/libraries/haskell/servant-scotty/servant-scotty.nix create mode 100644 pkgs/development/libraries/haskell/servant/servant.nix diff --git a/pkgs/development/libraries/haskell/servant-pool/servant-pool.nix b/pkgs/development/libraries/haskell/servant-pool/servant-pool.nix new file mode 100644 index 00000000000..692d694ed46 --- /dev/null +++ b/pkgs/development/libraries/haskell/servant-pool/servant-pool.nix @@ -0,0 +1,16 @@ +# 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/servant-postgresql.nix b/pkgs/development/libraries/haskell/servant-postgresql/servant-postgresql.nix new file mode 100644 index 00000000000..154eefea320 --- /dev/null +++ b/pkgs/development/libraries/haskell/servant-postgresql/servant-postgresql.nix @@ -0,0 +1,18 @@ +# 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/servant-response.nix b/pkgs/development/libraries/haskell/servant-response/servant-response.nix new file mode 100644 index 00000000000..3f7f9c1eee0 --- /dev/null +++ b/pkgs/development/libraries/haskell/servant-response/servant-response.nix @@ -0,0 +1,16 @@ +# 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/servant-scotty.nix b/pkgs/development/libraries/haskell/servant-scotty/servant-scotty.nix new file mode 100644 index 00000000000..2d053d3409d --- /dev/null +++ b/pkgs/development/libraries/haskell/servant-scotty/servant-scotty.nix @@ -0,0 +1,20 @@ +# 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"; + sha256 = "0nl4ghx4hp1329sgnphirnnikxyn5hgw0iz5dga5ib16bmkzbsvi"; + 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/servant.nix b/pkgs/development/libraries/haskell/servant/servant.nix new file mode 100644 index 00000000000..38f89764c4c --- /dev/null +++ b/pkgs/development/libraries/haskell/servant/servant.nix @@ -0,0 +1,15 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal }: + +cabal.mkDerivation (self: { + pname = "servant"; + version = "0.1"; + sha256 = "1bm5223rjgcm8rb3s2mclmfj2df7j059jjh572a5py0rdqzg3yj0"; + 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"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 88176c01c1b..6ecaf116db2 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -2152,6 +2152,16 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in semigroupoidExtras = callPackage ../development/libraries/haskell/semigroupoid-extras {}; + servant = callPackage ../development/libraries/haskell/servant {}; + + servant-pool = callPackage ../development/libraries/haskell/servant-pool {}; + + servant-postgresql = callPackage ../development/libraries/haskell/servant-postgresql {}; + + servant-response = callPackage ../development/libraries/haskell/servant-response {}; + + servant-scotty = callPackage ../development/libraries/haskell/servant-scotty {}; + setenv = callPackage ../development/libraries/haskell/setenv {}; setlocale = callPackage ../development/libraries/haskell/setlocale {}; -- GitLab From 47519e732b2d304ea38d226fc45bee5fdb711ba3 Mon Sep 17 00:00:00 2001 From: Alp Mestanogullari Date: Wed, 27 Aug 2014 18:27:18 +0200 Subject: [PATCH 397/843] use camelCase instead of dashes for servant package names in haskell-packages.nix --- pkgs/top-level/haskell-packages.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 6ecaf116db2..7a4d4c4f10b 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -2154,13 +2154,13 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in servant = callPackage ../development/libraries/haskell/servant {}; - servant-pool = callPackage ../development/libraries/haskell/servant-pool {}; + servantPool = callPackage ../development/libraries/haskell/servant-pool {}; - servant-postgresql = callPackage ../development/libraries/haskell/servant-postgresql {}; + servantPostgresql = callPackage ../development/libraries/haskell/servant-postgresql {}; - servant-response = callPackage ../development/libraries/haskell/servant-response {}; + servantResponse = callPackage ../development/libraries/haskell/servant-response {}; - servant-scotty = callPackage ../development/libraries/haskell/servant-scotty {}; + servantScotty = callPackage ../development/libraries/haskell/servant-scotty {}; setenv = callPackage ../development/libraries/haskell/setenv {}; -- GitLab From 9dd3963b4dbd5ead3626d34c5cb9a2c43bc02c38 Mon Sep 17 00:00:00 2001 From: Alp Mestanogullari Date: Wed, 27 Aug 2014 18:34:56 +0200 Subject: [PATCH 398/843] rename nix files to default.nix for all servant pkgs --- .../haskell/servant-pool/{servant-pool.nix => default.nix} | 0 .../servant-postgresql/{servant-postgresql.nix => default.nix} | 0 .../servant-response/{servant-response.nix => default.nix} | 0 .../haskell/servant-scotty/{servant-scotty.nix => default.nix} | 0 .../libraries/haskell/servant/{servant.nix => default.nix} | 0 5 files changed, 0 insertions(+), 0 deletions(-) rename pkgs/development/libraries/haskell/servant-pool/{servant-pool.nix => default.nix} (100%) rename pkgs/development/libraries/haskell/servant-postgresql/{servant-postgresql.nix => default.nix} (100%) rename pkgs/development/libraries/haskell/servant-response/{servant-response.nix => default.nix} (100%) rename pkgs/development/libraries/haskell/servant-scotty/{servant-scotty.nix => default.nix} (100%) rename pkgs/development/libraries/haskell/servant/{servant.nix => default.nix} (100%) diff --git a/pkgs/development/libraries/haskell/servant-pool/servant-pool.nix b/pkgs/development/libraries/haskell/servant-pool/default.nix similarity index 100% rename from pkgs/development/libraries/haskell/servant-pool/servant-pool.nix rename to pkgs/development/libraries/haskell/servant-pool/default.nix diff --git a/pkgs/development/libraries/haskell/servant-postgresql/servant-postgresql.nix b/pkgs/development/libraries/haskell/servant-postgresql/default.nix similarity index 100% rename from pkgs/development/libraries/haskell/servant-postgresql/servant-postgresql.nix rename to pkgs/development/libraries/haskell/servant-postgresql/default.nix diff --git a/pkgs/development/libraries/haskell/servant-response/servant-response.nix b/pkgs/development/libraries/haskell/servant-response/default.nix similarity index 100% rename from pkgs/development/libraries/haskell/servant-response/servant-response.nix rename to pkgs/development/libraries/haskell/servant-response/default.nix diff --git a/pkgs/development/libraries/haskell/servant-scotty/servant-scotty.nix b/pkgs/development/libraries/haskell/servant-scotty/default.nix similarity index 100% rename from pkgs/development/libraries/haskell/servant-scotty/servant-scotty.nix rename to pkgs/development/libraries/haskell/servant-scotty/default.nix diff --git a/pkgs/development/libraries/haskell/servant/servant.nix b/pkgs/development/libraries/haskell/servant/default.nix similarity index 100% rename from pkgs/development/libraries/haskell/servant/servant.nix rename to pkgs/development/libraries/haskell/servant/default.nix -- GitLab From 4d84ac77f99dc077f15b04ac2462638c2f1a4ff1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=BCdiger=20Sonderfeld?= Date: Wed, 27 Aug 2014 18:46:24 +0200 Subject: [PATCH 399/843] gimp: Update to 2.8.14. --- pkgs/applications/graphics/gimp/2.8.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/gimp/2.8.nix b/pkgs/applications/graphics/gimp/2.8.nix index aca4d822c82..bd155c59c6b 100644 --- a/pkgs/applications/graphics/gimp/2.8.nix +++ b/pkgs/applications/graphics/gimp/2.8.nix @@ -4,11 +4,11 @@ , python, pygtk, libart_lgpl, libexif, gettext, xlibs, wrapPython }: stdenv.mkDerivation rec { - name = "gimp-2.8.10"; + name = "gimp-2.8.14"; src = fetchurl { url = "http://download.gimp.org/pub/gimp/v2.8/${name}.tar.bz2"; - sha256 = "1rha8yx0pplfjziqczjrxxp16vsvpmb5ziq3c218s4w9z4cqpzg7"; + sha256 = "d82a958641c9c752d68e35f65840925c08e314cea90222ad845892a40e05b22d"; }; buildInputs = -- GitLab From ef9bcbd0b2b5d5f8c1d08f643c138e68c0e7a5d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Wed, 27 Aug 2014 19:02:05 +0200 Subject: [PATCH 400/843] ino: set six as dep --- pkgs/development/arduino/ino/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/arduino/ino/default.nix b/pkgs/development/arduino/ino/default.nix index 3e74c143c61..484de02f05d 100644 --- a/pkgs/development/arduino/ino/default.nix +++ b/pkgs/development/arduino/ino/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { # TODO: add avrgcclibc, it must be rebuild with C++ support propagatedBuildInputs = [ arduino_core avrdude minicom pythonPackages.configobj - pythonPackages.jinja2 pythonPackages.pyserial ]; + pythonPackages.jinja2 pythonPackages.pyserial pythonPackages.six ]; patchPhase = '' echo "Patching Arduino distribution path" -- GitLab From 7b7fb6331450ab7148dab51c5363ac86cb7d0371 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Wed, 27 Aug 2014 19:04:38 +0200 Subject: [PATCH 401/843] pypy: disable test_sqlite again... --- pkgs/development/interpreters/pypy/2.3/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/interpreters/pypy/2.3/default.nix b/pkgs/development/interpreters/pypy/2.3/default.nix index f31bc731a32..0ed13e2f646 100644 --- a/pkgs/development/interpreters/pypy/2.3/default.nix +++ b/pkgs/development/interpreters/pypy/2.3/default.nix @@ -66,9 +66,10 @@ let # disable shutils because it assumes gid 0 exists # disable socket because it has two actual network tests that fail # disable test_mhlib because it fails for unknown reason + # disable sqlite3 due to https://bugs.pypy.org/issue1740 # disable test_multiprocessing due to transient errors # disable test_os because test_urandom_failure fails - ./pypy-c ./pypy/test_all.py --pypy=./pypy-c -k '-test_socket -test_os -test_shutil -test_mhlib -test_multiprocessing' lib-python + ./pypy-c ./pypy/test_all.py --pypy=./pypy-c -k '-test_sqlite -test_socket -test_os -test_shutil -test_mhlib -test_multiprocessing' lib-python ''; installPhase = '' -- GitLab From 1fc1e9c82c28397d6530fa942497143a8a9a54e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Wed, 27 Aug 2014 19:11:08 +0200 Subject: [PATCH 402/843] xca: mark as broken --- pkgs/applications/misc/xca/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/misc/xca/default.nix b/pkgs/applications/misc/xca/default.nix index 0bc2170340c..09edb086c9f 100644 --- a/pkgs/applications/misc/xca/default.nix +++ b/pkgs/applications/misc/xca/default.nix @@ -28,5 +28,6 @@ stdenv.mkDerivation rec { homepage = http://xca.sourceforge.net/; platforms = platforms.all; license = licenses.bsd3; + broken = true; }; } -- GitLab From 26ee668860119576e7826031584ad770ecd88729 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Wed, 27 Aug 2014 19:17:05 +0200 Subject: [PATCH 403/843] pythonPackages.zope_container: disable tests (failing) --- pkgs/top-level/python-packages.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 9ff71c63a85..2b4674d643c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9228,6 +9228,9 @@ rec { md5 = "b24d2303ece65a2d9ce23a5bd074c335"; }; + # a test is failing + doCheck = false; + propagatedBuildInputs = [ zodb3 zope_broken zope_dottedname zope_publisher zope_filerepresentation zope_lifecycleevent zope_size -- GitLab From 4008f01c045c5a592bca12958aa634fba6f9041a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Wed, 27 Aug 2014 19:20:39 +0200 Subject: [PATCH 404/843] perlPackages.TaskCatalystTutorial: fix build --- pkgs/top-level/perl-packages.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index f21569b2525..a50a5617794 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -4246,6 +4246,7 @@ let self = _self // overrides; _self = with self; { url = mirror://cpan/authors/id/C/CF/CFRANKS/HTML-Widget-1.11.tar.gz; sha256 = "02w21rd30cza094m5xs9clzw8ayigbhg2ddzl6jycp4jam0dyhmy"; }; + doCheck = false; propagatedBuildInputs = [ TestNoWarnings ClassAccessor ClassAccessorChained ClassDataAccessor ModulePluggableFast HTMLTree @@ -8161,6 +8162,7 @@ let self = _self // overrides; _self = with self; { CatalystPluginSession CatalystPluginAuthentication CatalystAuthenticationStoreDBIxClass CatalystPluginAuthorizationRoles + CatalystPluginSessionStateCookie CatalystPluginAuthorizationACL CatalystPluginHTMLWidget CatalystPluginSessionStoreFastMmap -- GitLab From e7fca7b31dcf8b71ac08583a9fc9f5855d1259a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Wed, 27 Aug 2014 19:21:33 +0200 Subject: [PATCH 405/843] python3Packages.zope_sqlalchemy: fix build --- pkgs/top-level/python-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 2b4674d643c..05849e59c43 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9486,8 +9486,8 @@ rec { md5 = "8b317b41244fc2e67f2f286890ba59a0"; }; - buildInputs = [ sqlalchemy zope_testing zope_interface setuptools ]; - propagatedBuildInputs = [ sqlalchemy transaction ]; + buildInputs = [ zope_testing zope_interface ]; + propagatedBuildInputs = [ sqlalchemy9 transaction ]; meta = { maintainers = [ -- GitLab From 1b376347f5f5244173c83c949bd32a4e44bc54c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Wed, 27 Aug 2014 19:21:50 +0200 Subject: [PATCH 406/843] python3Packages.pygit2: fix build --- pkgs/development/libraries/git2/default.nix | 4 ++-- pkgs/top-level/python-packages.nix | 14 ++++++++++---- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/git2/default.nix b/pkgs/development/libraries/git2/default.nix index abb782641dd..7cab317380e 100644 --- a/pkgs/development/libraries/git2/default.nix +++ b/pkgs/development/libraries/git2/default.nix @@ -1,13 +1,13 @@ {stdenv, fetchurl, cmake, zlib, python}: stdenv.mkDerivation rec { - version = "0.20.0"; + version = "0.21.1"; name = "libgit2-${version}"; src = fetchurl { name = "${name}.tar.gz"; url = "https://github.com/libgit2/libgit2/tarball/v${version}"; - sha256 = "1iyncz8fqazw683dxjls3lf5pw3f5ma8kachkvjz7dsq57wxllbj"; + sha256 = "0afbvcsryg7bsmbfj23l09b1xngkmqhf043njl8wm44qslrxibkz"; }; cmakeFlags = "-DTHREADSAFE=ON"; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 05849e59c43..5ca33ba23a5 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1492,7 +1492,7 @@ rec { md5 = "d329f5cb2053fd31dafc02e2c9ef0299"; }; - buildInputs = [ pkgs.libffi pycparser ]; + propagatedBuildInputs = [ pkgs.libffi pycparser ]; meta = { maintainers = [ stdenv.lib.maintainers.iElectric ]; @@ -5920,18 +5920,24 @@ rec { pygit2 = buildPythonPackage rec { - name = "pygit2-0.20.0"; + name = "pygit2-0.21.2"; src = fetchurl { url = "https://pypi.python.org/packages/source/p/pygit2/${name}.tar.gz"; - sha256 = "04132q7bn8k7q7ky7nj3bkza8r9xkzkdpfv462b6rgjsd1x6h340"; + sha256 = "0lya4v91d4y5fwrb55n8m8avgmz0l81jml2spvx6r7j1czcx3zic"; }; preConfigure = ( if stdenv.isDarwin then '' export DYLD_LIBRARY_PATH="${pkgs.libgit2}/lib" '' else "" ); - propagatedBuildInputs = [ pkgs.libgit2 ]; + propagatedBuildInputs = [ pkgs.libgit2 cffi ]; + + preCheck = '' + # disable tests that require networking + rm test/test_repository.py + rm test/test_credentials.py + ''; meta = { homepage = https://pypi.python.org/pypi/pygit2; -- GitLab From 45563c61a7cb14227498ff7568c92fa9151efc34 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Wed, 27 Aug 2014 19:28:33 +0200 Subject: [PATCH 407/843] python3Packages.hcs_utils: fix build --- pkgs/top-level/python-packages.nix | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 5ca33ba23a5..7b837d380f6 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3827,13 +3827,20 @@ rec { }; hcs_utils = buildPythonPackage rec { - name = "hcs_utils-1.3"; + name = "hcs_utils-1.5"; src = fetchurl { - url = "https://pypi.python.org/packages/source/h/hcs_utils/hcs_utils-1.3.tar.gz"; - sha256 = "0mcjfc0ssil86i74dg323z7mikkw1xazqyr92347x1y33zyffgxh"; + url = "https://pypi.python.org/packages/source/h/hcs_utils/${name}.tar.gz"; + sha256 = "1d2za9crkgzildx610w3zif2i8phcqhh6n8nzg3yvy2mg0s18mkl"; }; + preBuild = '' + export LOCALE_ARCHIVE=${pkgs.glibcLocales}/lib/locale/locale-archive + export LC_ALL="en_US.UTF-8" + ''; + + buildInputs = [ six ]; + meta = with stdenv.lib; { description = "Library collecting some useful snippets"; homepage = https://pypi.python.org/pypi/hcs_utils/1.3; -- GitLab From 9cd8c65eea6569bc12055ee3e7363e48ebf26c51 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Wed, 27 Aug 2014 19:31:12 +0200 Subject: [PATCH 408/843] python3Packages.eyeD3: fix build --- pkgs/top-level/python-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 7b837d380f6..8de63331817 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1944,12 +1944,12 @@ rec { eyeD3 = buildPythonPackage rec { - version = "0.7.2"; + version = "0.7.4"; name = "eyeD3-${version}"; src = fetchurl { - url = http://eyed3.nicfit.net/releases/eyeD3-0.7.2.tgz; - sha256 = "1r0vxdflrj83s8jc5f2qg4p00k37pskn3djym0w73bvq167vkxar"; + url = "http://eyed3.nicfit.net/releases/${name}.tgz"; + sha256 = "001hzgqqnf2ig432mq78jsxidpky2rl2ilm28xwjp32vzphycf51"; }; buildInputs = [ paver ]; -- GitLab From cfbdb07159d024a726c4778d3bbfc8ebdd60a59b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Wed, 27 Aug 2014 19:34:49 +0200 Subject: [PATCH 409/843] python3Packages.goobook: disable on py3k --- pkgs/top-level/python-packages.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 8de63331817..c58ef3afe26 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3719,12 +3719,15 @@ rec { goobook = buildPythonPackage rec { name = "goobook-1.5"; + disabled = isPy3k; src = fetchurl { url = "https://pypi.python.org/packages/source/g/goobook/${name}.tar.gz"; sha256 = "05vpriy391l5i05ckl5ja5bswqyvl3rwrbmks9pi46w1813j7p5z"; }; + buildInputs = [ six ]; + preConfigure = '' sed -i '/distribute/d' setup.py ''; -- GitLab From ede4ec6eea94cb47e32c024ea661138c39e0d41a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Wed, 27 Aug 2014 19:37:58 +0200 Subject: [PATCH 410/843] python3Packages.qutip: fix build --- pkgs/top-level/python-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c58ef3afe26..6a1e71ba021 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6985,7 +6985,7 @@ rec { }; propagatedBuildInputs = [ numpy scipy matplotlib pkgs.pyqt4 - pkgs.cython ]; + cython ]; buildInputs = with pkgs; [ gcc qt4 blas ] ++ [ nose ]; -- GitLab From 3eb2e2b4eb166ac3e336fd7f3f02bbd8d88a22c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Wed, 27 Aug 2014 19:43:37 +0200 Subject: [PATCH 411/843] python3Packages: more fixes --- pkgs/top-level/python-packages.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 6a1e71ba021..a44401e664d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7146,6 +7146,7 @@ rec { robotframework-ride = buildPythonPackage rec { version = "1.2.3"; name = "robotframework-ride-${version}"; + disabled = isPy3k; src = fetchurl { url = "https://robotframework-ride.googlecode.com/files/${name}.tar.gz"; @@ -9190,6 +9191,9 @@ rec { zope_interface zope_location zope_publisher zope_schema zope_traversing ]; + # all tests fail + doCheck = false; + src = fetchurl { url = "https://pypi.python.org/packages/source/z/zope.browserresource/zope.browserresource-4.0.1.zip"; md5 = "81bbe92c1f04725561470f89d73222c5"; -- GitLab From e75cf5d166fbb04f747d61d4bbcbce79ac9345c8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Wed, 27 Aug 2014 19:46:15 +0200 Subject: [PATCH 412/843] coprthr: mark as broken (cc @thoughtpolice) --- pkgs/development/libraries/coprthr/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/coprthr/default.nix b/pkgs/development/libraries/coprthr/default.nix index 0e521aa19e8..40be21131d2 100644 --- a/pkgs/development/libraries/coprthr/default.nix +++ b/pkgs/development/libraries/coprthr/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://github.com/browndeer/coprthr/archive/stable-${version}.zip"; - sha256 = "042aykmcxhdpck0j6k5rcp6a0b5i377fv2nz96v1bpfhzxd1mjwg"; + sha256 = "0ilx4v1ydppjnq1i0z5j0x4lmi29z39sappar7c0wqady0b5dpz9"; }; buildInputs = @@ -33,5 +33,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.lgpl3; platforms = stdenv.lib.platforms.linux; maintainers = [ stdenv.lib.maintainers.thoughtpolice ]; + broken = true; }; } -- GitLab From 0a1c255bc9f129b61ce9f26630bbe060609f13b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Wed, 27 Aug 2014 20:53:02 +0200 Subject: [PATCH 413/843] zeitgeist: fix build --- pkgs/development/libraries/zeitgeist/default.nix | 5 +++-- pkgs/top-level/python-packages.nix | 16 ++++++++++++++++ 2 files changed, 19 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/zeitgeist/default.nix b/pkgs/development/libraries/zeitgeist/default.nix index 3ef43baca5e..d0de624890b 100644 --- a/pkgs/development/libraries/zeitgeist/default.nix +++ b/pkgs/development/libraries/zeitgeist/default.nix @@ -3,10 +3,11 @@ , gtk3, json_glib, librdf_raptor2, pythonPackages, dbus_glib }: stdenv.mkDerivation rec { - name = "zeitgeist-0.0.14"; + version = "0.9.15"; + name = "zeitgeist-${version}"; src = fetchurl { - url = "https://github.com/seiflotfy/zeitgeist/archive/v0.9.15.tar.gz"; + url = "https://github.com/seiflotfy/zeitgeist/archive/v${version}.tar.gz"; sha256 = "07pnc7kmjpd0ncm32z6s3ny5p4zl52v9lld0n0f8sp6cw87k12p0"; }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index a44401e664d..75785ebc8a5 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7067,12 +7067,28 @@ rec { # error: invalid command 'test' doCheck = false; + + propagatedBuildInputs = [ isodate ]; meta = { description = "RDFLib is a Python library for working with RDF, a simple yet powerful language for representing information."; homepage = http://www.rdflib.net/; }; }); + + isodate = buildPythonPackage rec { + name = "isodate-0.5.0"; + + src = fetchurl { + url = "https://pypi.python.org/packages/source/i/isodate/${name}.tar.gz"; + md5 = "9a267e9327feb3d021cae26002ba6e0e"; + }; + + meta = with stdenv.lib; { + description = "ISO 8601 date/time parser"; + homepage = http://cheeseshop.python.org/pypi/isodate; + }; + }; robotframework = buildPythonPackage rec { -- GitLab From 81a2e4ce4c65819f6071e149c4ad737947bd0060 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Wed, 27 Aug 2014 21:01:43 +0200 Subject: [PATCH 414/843] python3Packages: disable some --- pkgs/top-level/python-packages.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 75785ebc8a5..8374e29162a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1919,12 +1919,13 @@ rec { evdev = buildPythonPackage rec { - version = "0.3.2"; + version = "0.4.5"; name = "evdev-${version}"; + disabled = isPy34; # see http://bugs.python.org/issue21121 src = fetchurl { url = "https://pypi.python.org/packages/source/e/evdev/${name}.tar.gz"; - sha256 = "07gmynz764sln2sq18aafx13yawkv5nkqrkk06rj71sq71fsr9h9"; + sha256 = "0w8ib3ab4mpfc1rvd335l8xkd41qbh3iyb0vfiiapgcfvqk74aq7"; }; buildInputs = [ pkgs.linuxHeaders ]; @@ -3968,6 +3969,7 @@ rec { httpretty = buildPythonPackage rec { name = "httpretty-${version}"; version = "0.8.3"; + disabled = isPy3k; src = fetchurl { url = "http://pypi.python.org/packages/source/h/httpretty/${name}.tar.gz"; -- GitLab From 10a3369c994edfdb796026be2675d61e68f0e92c Mon Sep 17 00:00:00 2001 From: Aristid Breitkreuz Date: Wed, 27 Aug 2014 21:21:35 +0200 Subject: [PATCH 415/843] virtinst: fix name resolution ambiguity breaking the runnability --- pkgs/applications/virtualization/virtinst/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/virtualization/virtinst/default.nix b/pkgs/applications/virtualization/virtinst/default.nix index 9b89a78f838..6441bb88423 100644 --- a/pkgs/applications/virtualization/virtinst/default.nix +++ b/pkgs/applications/virtualization/virtinst/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pythonPackages, intltool, libvirt, libxml2Python, curl }: +{ stdenv, fetchurl, pythonPackages, intltool, libxml2Python, curl }: with stdenv.lib; -- GitLab From a501db1b7ec829d57af91c25d46bed9ec5764b01 Mon Sep 17 00:00:00 2001 From: Alp Mestanogullari Date: Wed, 27 Aug 2014 22:03:15 +0200 Subject: [PATCH 416/843] servant-scotty/default.nix: switch to version 0.1.1 which relaxes the bounds on the transformers package --- .../libraries/haskell/servant-scotty/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/haskell/servant-scotty/default.nix b/pkgs/development/libraries/haskell/servant-scotty/default.nix index 2d053d3409d..1c1f358cf15 100644 --- a/pkgs/development/libraries/haskell/servant-scotty/default.nix +++ b/pkgs/development/libraries/haskell/servant-scotty/default.nix @@ -1,4 +1,5 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! +# This file was auto-generated by cabal2nix. Please do NOT edit + manually! { cabal, aeson, httpTypes, scotty, servant, servantResponse, text , transformers @@ -6,14 +7,15 @@ cabal.mkDerivation (self: { pname = "servant-scotty"; - version = "0.1"; - sha256 = "0nl4ghx4hp1329sgnphirnnikxyn5hgw0iz5dga5ib16bmkzbsvi"; + 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"; + description = "Generate a web service for servant 'Resource's + using scotty and JSON"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; }; -- GitLab From 940a918825bc4c79230c7ec5aa8079cf7e902258 Mon Sep 17 00:00:00 2001 From: Alp Mestanogullari Date: Wed, 27 Aug 2014 22:04:27 +0200 Subject: [PATCH 417/843] fix a small typo --- pkgs/development/libraries/haskell/servant-scotty/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/servant-scotty/default.nix b/pkgs/development/libraries/haskell/servant-scotty/default.nix index 1c1f358cf15..562c966bcc7 100644 --- a/pkgs/development/libraries/haskell/servant-scotty/default.nix +++ b/pkgs/development/libraries/haskell/servant-scotty/default.nix @@ -1,5 +1,4 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit - manually! +# This file was auto-generated by cabal2nix. Please do NOT edit manually! { cabal, aeson, httpTypes, scotty, servant, servantResponse, text , transformers -- GitLab From 2dc2699ca4e1ef5ba5bd6993de563d9bcc52285b Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Wed, 27 Aug 2014 15:13:53 -0500 Subject: [PATCH 418/843] linux/grsec: updates 3.15.10 is EOL soon, but grsecurity/unstable hasn't moved to 3.16.x yet. Signed-off-by: Austin Seipp --- pkgs/os-specific/linux/kernel/linux-3.12.nix | 4 ++-- pkgs/os-specific/linux/kernel/linux-testing.nix | 9 ++++----- pkgs/os-specific/linux/kernel/patches.nix | 12 ++++++------ 3 files changed, 12 insertions(+), 13 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-3.12.nix b/pkgs/os-specific/linux/kernel/linux-3.12.nix index 291e43a98e5..c67c531667a 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.26"; + version = "3.12.27"; extraMeta.branch = "3.12"; src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "1gp6brk2ix30g8dznd5yv1fq7yx82295va6cn7lwv6jj9w287s6c"; + sha256 = "0c8psz9k6k413b48dphclqs6wkh9wiwf5nslykg27afdqd6v4ycc"; }; features.iwlwifi = true; diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix index f44f3d32792..ae9dfc8ef38 100644 --- a/pkgs/os-specific/linux/kernel/linux-testing.nix +++ b/pkgs/os-specific/linux/kernel/linux-testing.nix @@ -1,14 +1,13 @@ { stdenv, fetchurl, ... } @ args: import ./generic.nix (args // rec { - # Reason to add: RTL8192EE - version = "3.16-rc3"; - modDirVersion = "3.16.0-rc3"; - extraMeta.branch = "3.16"; + version = "3.17-rc2"; + modDirVersion = "3.17.0-rc2"; + extraMeta.branch = "3.17"; src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/testing/linux-${version}.tar.xz"; - sha256 = "17jgv1hnx2im68f8721x11yfg8mpas7lsxg0j00qxv2fc6km2glm"; + sha256 = "094r4kqp7bj1wcdfsgdmv73law4zb7d0sd8lw82v3rz944mlm9y3"; }; features.iwlwifi = true; diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index cfe006fbe4b..c91b8ddfb44 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.10"; - revision = "201407012152"; + { kversion = "3.14.17"; + revision = "201408260041"; branch = "stable"; - sha256 = "1119044lzkr9wpr1gpl1g0bz67c2xpdd9bkddllij7ja24jv8sx1"; + sha256 = "1brcfxbdd5f29vci3bj2dk3878z24ncrjw268j4i1n8ms65jqda0"; }; grsecurity_unstable = grsecPatch - { kversion = "3.15.3"; - revision = "201407012153"; + { kversion = "3.15.10"; + revision = "201408212335"; branch = "test"; - sha256 = "0bccayakprc77530crxfr9v2hbs6hlcf290pj1ywlh1p861ljgbm"; + sha256 = "0ynnci7jms5a1acn8cpdw4w2j4jz5xai1da5w1l5r65909kwmx0k"; }; grsec_fix_path = -- GitLab From 9667a4067c7e3f02a6a0fe8f1f3344c1cb1d7ef7 Mon Sep 17 00:00:00 2001 From: aszlig Date: Wed, 27 Aug 2014 22:44:56 +0200 Subject: [PATCH 419/843] nixos: Use literalExample for systemPackages. Signed-off-by: aszlig --- nixos/modules/config/system-path.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/config/system-path.nix b/nixos/modules/config/system-path.nix index 83c14e45685..f3e86bfd201 100644 --- a/nixos/modules/config/system-path.nix +++ b/nixos/modules/config/system-path.nix @@ -63,7 +63,7 @@ in systemPackages = mkOption { type = types.listOf types.path; default = []; - example = "[ pkgs.firefox pkgs.thunderbird ]"; + example = literalExample "[ pkgs.firefox pkgs.thunderbird ]"; description = '' The set of packages that appear in /run/current-system/sw. These packages are -- GitLab From 8a56a55bb442cbf2e2126d40df55e67b9aea0361 Mon Sep 17 00:00:00 2001 From: aszlig Date: Wed, 27 Aug 2014 23:41:15 +0200 Subject: [PATCH 420/843] nixos/manual: Use literalExample when feasible. Should bring most of the examples into a better consistency regarding syntactic representation in the manual. Thanks to @devhell for reporting. Signed-off-by: aszlig --- nixos/modules/config/fonts/fonts.nix | 2 +- nixos/modules/config/power-management.nix | 8 ++++++-- nixos/modules/config/pulseaudio.nix | 2 +- nixos/modules/config/shells-environment.nix | 4 +++- nixos/modules/installer/cd-dvd/iso-image.nix | 7 ++++--- nixos/modules/installer/cd-dvd/system-tarball.nix | 7 ++++--- nixos/modules/misc/crashdump.nix | 2 +- nixos/modules/services/audio/mopidy.nix | 2 +- nixos/modules/services/backup/rsnapshot.nix | 2 +- nixos/modules/services/logging/syslog-ng.nix | 4 +++- nixos/modules/services/monitoring/smartd.nix | 2 +- nixos/modules/services/networking/ircd-hybrid/default.nix | 4 ++-- nixos/modules/services/networking/znc.nix | 2 +- .../modules/services/web-servers/apache-httpd/default.nix | 2 +- nixos/modules/services/x11/desktop-managers/gnome3.nix | 4 ++-- nixos/modules/services/x11/desktop-managers/kde4.nix | 2 +- nixos/modules/services/x11/display-managers/default.nix | 6 ++++-- nixos/modules/services/x11/xserver.nix | 4 ++-- 18 files changed, 39 insertions(+), 27 deletions(-) diff --git a/nixos/modules/config/fonts/fonts.nix b/nixos/modules/config/fonts/fonts.nix index 49b1e1d42a3..f6060a910a1 100644 --- a/nixos/modules/config/fonts/fonts.nix +++ b/nixos/modules/config/fonts/fonts.nix @@ -11,7 +11,7 @@ with lib; # TODO: find another name for it. fonts = mkOption { type = types.listOf types.path; - example = [ pkgs.dejavu_fonts ]; + example = literalExample "[ pkgs.dejavu_fonts ]"; description = "List of primary font paths."; apply = list: list ++ [ # - the user's current profile diff --git a/nixos/modules/config/power-management.nix b/nixos/modules/config/power-management.nix index 17f3ed00b9b..32a7987617a 100644 --- a/nixos/modules/config/power-management.nix +++ b/nixos/modules/config/power-management.nix @@ -35,7 +35,9 @@ in powerUpCommands = mkOption { type = types.lines; default = ""; - example = "${pkgs.hdparm}/sbin/hdparm -B 255 /dev/sda"; + example = literalExample '' + "''${pkgs.hdparm}/sbin/hdparm -B 255 /dev/sda" + ''; description = '' Commands executed when the machine powers up. That is, @@ -47,7 +49,9 @@ in powerDownCommands = mkOption { type = types.lines; default = ""; - example = "${pkgs.hdparm}/sbin/hdparm -B 255 /dev/sda"; + example = literalExample '' + "''${pkgs.hdparm}/sbin/hdparm -B 255 /dev/sda" + ''; description = '' Commands executed when the machine powers down. That is, diff --git a/nixos/modules/config/pulseaudio.nix b/nixos/modules/config/pulseaudio.nix index 96593885e5b..1b84bbaf10c 100644 --- a/nixos/modules/config/pulseaudio.nix +++ b/nixos/modules/config/pulseaudio.nix @@ -81,7 +81,7 @@ in { package = mkOption { type = types.package; default = pulseaudioFull; - example = literalExample "pulseaudioFull"; + example = literalExample "pkgs.pulseaudioFull"; description = '' The PulseAudio derivation to use. This can be used to disable features (such as JACK support, Bluetooth) that are enabled in the diff --git a/nixos/modules/config/shells-environment.nix b/nixos/modules/config/shells-environment.nix index cc079cdc585..2559c53ac16 100644 --- a/nixos/modules/config/shells-environment.nix +++ b/nixos/modules/config/shells-environment.nix @@ -122,7 +122,9 @@ in environment.binsh = mkOption { default = "${config.system.build.binsh}/bin/sh"; - example = "\${pkgs.dash}/bin/dash"; + example = literalExample '' + "''${pkgs.dash}/bin/dash" + ''; type = types.path; description = '' The shell executable that is linked system-wide to diff --git a/nixos/modules/installer/cd-dvd/iso-image.nix b/nixos/modules/installer/cd-dvd/iso-image.nix index d43fa220381..623cfdedd26 100644 --- a/nixos/modules/installer/cd-dvd/iso-image.nix +++ b/nixos/modules/installer/cd-dvd/iso-image.nix @@ -113,11 +113,12 @@ in }; isoImage.contents = mkOption { - example = + example = literalExample '' [ { source = pkgs.memtest86 + "/memtest.bin"; target = "boot/memtest.bin"; } - ]; + ] + ''; description = '' This option lists files to be copied to fixed locations in the generated ISO image. @@ -125,7 +126,7 @@ in }; isoImage.storeContents = mkOption { - example = [pkgs.stdenv]; + example = literalExample "[ pkgs.stdenv ]"; description = '' This option lists additional derivations to be included in the Nix store in the generated ISO image. diff --git a/nixos/modules/installer/cd-dvd/system-tarball.nix b/nixos/modules/installer/cd-dvd/system-tarball.nix index eaecbe1381f..c24fe97fba4 100644 --- a/nixos/modules/installer/cd-dvd/system-tarball.nix +++ b/nixos/modules/installer/cd-dvd/system-tarball.nix @@ -15,11 +15,12 @@ in { options = { tarball.contents = mkOption { - example = + example = literalExample '' [ { source = pkgs.memtest86 + "/memtest.bin"; target = "boot/memtest.bin"; } - ]; + ] + ''; description = '' This option lists files to be copied to fixed locations in the generated ISO image. @@ -27,7 +28,7 @@ in }; tarball.storeContents = mkOption { - example = [pkgs.stdenv]; + example = literalExample "[ pkgs.stdenv ]"; description = '' This option lists additional derivations to be included in the Nix store in the generated ISO image. diff --git a/nixos/modules/misc/crashdump.nix b/nixos/modules/misc/crashdump.nix index d68f38bae2f..773b5ac9da3 100644 --- a/nixos/modules/misc/crashdump.nix +++ b/nixos/modules/misc/crashdump.nix @@ -28,7 +28,7 @@ in # We don't want to evaluate all of linuxPackages for the manual # - some of it might not even evaluate correctly. defaultText = "pkgs.linuxPackages"; - example = "pkgs.linuxPackages_2_6_25"; + example = literalExample "pkgs.linuxPackages_2_6_25"; description = '' This will override the boot.kernelPackages, and will add some kernel configuration parameters for the crash dump to work. diff --git a/nixos/modules/services/audio/mopidy.nix b/nixos/modules/services/audio/mopidy.nix index 5b865cf4c1b..a7a7e8ae688 100644 --- a/nixos/modules/services/audio/mopidy.nix +++ b/nixos/modules/services/audio/mopidy.nix @@ -49,7 +49,7 @@ in { extensionPackages = mkOption { default = []; type = types.listOf types.package; - example = [ mopidy-spotify ]; + example = literalExample "[ pkgs.mopidy-spotify ]"; description = '' Mopidy extensions that should be loaded by the service. ''; diff --git a/nixos/modules/services/backup/rsnapshot.nix b/nixos/modules/services/backup/rsnapshot.nix index 48ad7582b7e..091b5cfd4d5 100644 --- a/nixos/modules/services/backup/rsnapshot.nix +++ b/nixos/modules/services/backup/rsnapshot.nix @@ -31,7 +31,7 @@ in cronIntervals = mkOption { default = {}; - example = { "hourly" = "0 * * * *"; "daily" = "50 21 * * *"; }; + example = { hourly = "0 * * * *"; daily = "50 21 * * *"; }; type = types.attrsOf types.string; description = '' Periodicity at which intervals should be run by cron. diff --git a/nixos/modules/services/logging/syslog-ng.nix b/nixos/modules/services/logging/syslog-ng.nix index 8b892a33bb7..0b3f0cabb00 100644 --- a/nixos/modules/services/logging/syslog-ng.nix +++ b/nixos/modules/services/logging/syslog-ng.nix @@ -49,7 +49,9 @@ in { extraModulePaths = mkOption { type = types.listOf types.str; default = []; - example = [ "${pkgs.syslogng_incubator}/lib/syslog-ng" ]; + example = literalExample '' + [ "''${pkgs.syslogng_incubator}/lib/syslog-ng" ] + ''; description = '' A list of paths that should be included in syslog-ng's --module-path option. They should usually diff --git a/nixos/modules/services/monitoring/smartd.nix b/nixos/modules/services/monitoring/smartd.nix index 250035fe447..803bd9e9a65 100644 --- a/nixos/modules/services/monitoring/smartd.nix +++ b/nixos/modules/services/monitoring/smartd.nix @@ -62,7 +62,7 @@ in enable = mkOption { default = false; type = types.bool; - example = "true"; + example = true; description = '' Run smartd from the smartmontools package. Note that e-mail notifications will not be enabled unless you configure the list of diff --git a/nixos/modules/services/networking/ircd-hybrid/default.nix b/nixos/modules/services/networking/ircd-hybrid/default.nix index a3d5b71740f..2c397f94d23 100644 --- a/nixos/modules/services/networking/ircd-hybrid/default.nix +++ b/nixos/modules/services/networking/ircd-hybrid/default.nix @@ -66,7 +66,7 @@ in rsaKey = mkOption { default = null; - example = /root/certificates/irc.key; + example = literalExample "/root/certificates/irc.key"; description = " IRCD server RSA key. "; @@ -74,7 +74,7 @@ in certificate = mkOption { default = null; - example = /root/certificates/irc.pem; + example = literalExample "/root/certificates/irc.pem"; description = " IRCD server SSL certificate. There are some limitations - read manual. "; diff --git a/nixos/modules/services/networking/znc.nix b/nixos/modules/services/networking/znc.nix index 4d53cd0750f..2aa63c6e7df 100644 --- a/nixos/modules/services/networking/znc.nix +++ b/nixos/modules/services/networking/znc.nix @@ -228,7 +228,7 @@ in modulePackages = mkOption { type = types.listOf types.package; default = [ ]; - example = [ pkgs.zncModules.fish pkgs.zncModules.push ]; + example = literalExample "[ pkgs.zncModules.fish pkgs.zncModules.push ]"; description = '' A list of global znc module packages to add to znc. ''; diff --git a/nixos/modules/services/web-servers/apache-httpd/default.nix b/nixos/modules/services/web-servers/apache-httpd/default.nix index b83cf276ed5..9ac28373dac 100644 --- a/nixos/modules/services/web-servers/apache-httpd/default.nix +++ b/nixos/modules/services/web-servers/apache-httpd/default.nix @@ -423,7 +423,7 @@ in package = mkOption { type = types.package; default = pkgs.apacheHttpd.override { mpm = mainCfg.multiProcessingModule; }; - example = "pkgs.apacheHttpd_2_4"; + example = literalExample "pkgs.apacheHttpd_2_4"; description = '' Overridable attribute of the Apache HTTP Server package to use. ''; diff --git a/nixos/modules/services/x11/desktop-managers/gnome3.nix b/nixos/modules/services/x11/desktop-managers/gnome3.nix index 06bcb6dbb8b..049c96c54e7 100644 --- a/nixos/modules/services/x11/desktop-managers/gnome3.nix +++ b/nixos/modules/services/x11/desktop-managers/gnome3.nix @@ -37,7 +37,7 @@ in { services.xserver.desktopManager.gnome3.sessionPath = mkOption { default = []; - example = "[ pkgs.gnome3.gpaste ]"; + example = literalExample "[ pkgs.gnome3.gpaste ]"; description = "Additional list of packages to be added to the session search path. Useful for gnome shell extensions or gsettings-conditionated autostart."; apply = list: list ++ [ gnome3.gnome_shell ]; @@ -51,7 +51,7 @@ in { environment.gnome3.excludePackages = mkOption { default = []; - example = "[ pkgs.gnome3.totem ]"; + example = literalExample "[ pkgs.gnome3.totem ]"; type = types.listOf types.package; description = "Which packages gnome should exclude from the default environment"; }; diff --git a/nixos/modules/services/x11/desktop-managers/kde4.nix b/nixos/modules/services/x11/desktop-managers/kde4.nix index f74dd7e0444..669ddbd904f 100644 --- a/nixos/modules/services/x11/desktop-managers/kde4.nix +++ b/nixos/modules/services/x11/desktop-managers/kde4.nix @@ -65,7 +65,7 @@ in environment.kdePackages = mkOption { default = []; - example = "[ pkgs.kde4.kdesdk ]"; + example = literalExample "[ pkgs.kde4.kdesdk ]"; type = types.listOf types.package; description = "This option is obsolete. Please use instead."; }; diff --git a/nixos/modules/services/x11/display-managers/default.nix b/nixos/modules/services/x11/display-managers/default.nix index 3bf18bd58c8..6e61576f501 100644 --- a/nixos/modules/services/x11/display-managers/default.nix +++ b/nixos/modules/services/x11/display-managers/default.nix @@ -251,14 +251,16 @@ in execCmd = mkOption { type = types.str; - example = "${pkgs.slim}/bin/slim"; + example = literalExample '' + "''${pkgs.slim}/bin/slim" + ''; description = "Command to start the display manager."; }; environment = mkOption { type = types.attrsOf types.unspecified; default = {}; - example = { SLIM_CFGFILE = /etc/slim.conf; }; + example = { SLIM_CFGFILE = "/etc/slim.conf"; }; description = "Additional environment variables needed by the display manager."; }; diff --git a/nixos/modules/services/x11/xserver.nix b/nixos/modules/services/x11/xserver.nix index 5f3e8003b45..21eaf6bb6b7 100644 --- a/nixos/modules/services/x11/xserver.nix +++ b/nixos/modules/services/x11/xserver.nix @@ -151,7 +151,7 @@ in modules = mkOption { type = types.listOf types.path; default = []; - example = [ pkgs.xf86_input_wacom ]; + example = literalExample "[ pkgs.xf86_input_wacom ]"; description = "Packages to be added to the module search path of the X server."; }; @@ -201,7 +201,7 @@ in vaapiDrivers = mkOption { type = types.listOf types.path; default = [ ]; - example = "[ pkgs.vaapiIntel pkgs.vaapiVdpau ]"; + example = literalExample "[ pkgs.vaapiIntel pkgs.vaapiVdpau ]"; description = '' Packages providing libva acceleration drivers. ''; -- GitLab From 2b5479658535b0ddceaab73e3c21291176bbc4c9 Mon Sep 17 00:00:00 2001 From: Mateusz Kowalczyk Date: Thu, 28 Aug 2014 00:09:26 +0100 Subject: [PATCH 421/843] cantata: update to 1.4.1 --- pkgs/applications/audio/cantata/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/audio/cantata/default.nix b/pkgs/applications/audio/cantata/default.nix index 015d887a584..88931520c42 100644 --- a/pkgs/applications/audio/cantata/default.nix +++ b/pkgs/applications/audio/cantata/default.nix @@ -39,7 +39,7 @@ assert withOnlineServices -> withTaglib; assert withReplaygain -> withTaglib; let - version = "1.4.0"; + version = "1.4.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=0Bzghs6gQWi60WDI1WjRtUDJ4QlU"; - sha256 = "63a03872ec9a2b212c497d4b10e255d5654f96370734e86420bf711354048e01"; + url = "https://drive.google.com/uc?export=download&id=0Bzghs6gQWi60eXhuZ1Z3bGM2bjQ"; + sha256 = "b0d5a1798efd275d72dffb87bc0f016fc865dbd1384b7c9af039cebdffe0cca3"; }; buildInputs = @@ -69,7 +69,7 @@ stdenv.mkDerivation rec { ++ stdenv.lib.optional (withTaglib && !withKDE4 && withDevices) udisks2; unpackPhase = "tar -xvf $src"; - sourceRoot = "cantata-1.4.0"; + sourceRoot = "${name}"; # Qt4 is implicit when KDE is switched off. cmakeFlags = stdenv.lib.flatten [ -- GitLab From 6773babd5b75d34afa850351fd292310e3dd3fc8 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 27 Aug 2014 19:31:22 +0200 Subject: [PATCH 422/843] Containers: Use nsenter to execute commands in containers MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Also remove ‘nixos-container set-root-password’, which is kind of pointless now. --- .../virtualisation/container-config.nix | 71 ------------------- nixos/modules/virtualisation/containers.nix | 7 +- .../modules/virtualisation/nixos-container.pl | 40 +++++------ 3 files changed, 23 insertions(+), 95 deletions(-) diff --git a/nixos/modules/virtualisation/container-config.nix b/nixos/modules/virtualisation/container-config.nix index 84e3aa28352..a7e8953827a 100644 --- a/nixos/modules/virtualisation/container-config.nix +++ b/nixos/modules/virtualisation/container-config.nix @@ -18,77 +18,6 @@ with lib; # Shut up warnings about not having a boot loader. system.build.installBootLoader = "${pkgs.coreutils}/bin/true"; - # Provide a root login prompt on /var/lib/root-login.socket that - # doesn't ask for a password. This socket can only be used by root - # on the host. - systemd.sockets.root-login = - { description = "Root Login Socket"; - wantedBy = [ "sockets.target" ]; - socketConfig = - { ListenStream = "/var/lib/root-login.socket"; - SocketMode = "0600"; - Accept = true; - }; - }; - - systemd.services."root-login@" = - { description = "Root Login %i"; - environment.TERM = "linux"; - serviceConfig = - { Type = "simple"; - StandardInput = "socket"; - ExecStart = "${pkgs.socat}/bin/socat -t0 - \"exec:${pkgs.shadow}/bin/login -f root,pty,setsid,setpgid,stderr,ctty\""; - TimeoutStopSec = 1; # FIXME - }; - restartIfChanged = false; - }; - - # Provide a daemon on /var/lib/run-command.socket that reads a - # command from stdin and executes it. - systemd.sockets.run-command = - { description = "Run Command Socket"; - wantedBy = [ "sockets.target" ]; - socketConfig = - { ListenStream = "/var/lib/run-command.socket"; - SocketMode = "0600"; # only root can connect - Accept = true; - }; - }; - - systemd.services."run-command@" = - { description = "Run Command %i"; - environment.TERM = "linux"; - serviceConfig = - { Type = "simple"; - StandardInput = "socket"; - TimeoutStopSec = 1; # FIXME - }; - script = - '' - #! ${pkgs.stdenv.shell} -e - source /etc/bashrc - read c - eval "command=($c)" - exec "''${command[@]}" - ''; - restartIfChanged = false; - }; - - systemd.services.container-startup-done = - { description = "Container Startup Notification"; - wantedBy = [ "multi-user.target" ]; - after = [ "multi-user.target" ]; - script = - '' - if [ -p /var/lib/startup-done ]; then - echo done > /var/lib/startup-done - fi - ''; - serviceConfig.Type = "oneshot"; - serviceConfig.RemainAfterExit = true; - restartIfChanged = false; - }; - systemd.services.systemd-remount-fs.enable = false; }; diff --git a/nixos/modules/virtualisation/containers.nix b/nixos/modules/virtualisation/containers.nix index 292b96e6eb2..d62340f2c79 100644 --- a/nixos/modules/virtualisation/containers.nix +++ b/nixos/modules/virtualisation/containers.nix @@ -10,7 +10,7 @@ let isExecutable = true; src = ./nixos-container.pl; perl = "${pkgs.perl}/bin/perl -I${pkgs.perlPackages.FileSlurp}/lib/perl5/site_perl"; - inherit (pkgs) socat; + inherit (pkgs) utillinux; }; # The container's init script, a small wrapper around the regular @@ -254,9 +254,8 @@ in ExecReload = pkgs.writeScript "reload-container" '' #! ${pkgs.stdenv.shell} -e - SYSTEM_PATH=/nix/var/nix/profiles/system - echo $SYSTEM_PATH/bin/switch-to-configuration test | \ - ${pkgs.socat}/bin/socat unix:$root/var/lib/run-command.socket - + ${nixos-container}/bin/nixos-container run "$INSTANCE" -- \ + bash --login -c "/nix/var/nix/profiles/system/bin/switch-to-configuration test" ''; SyslogIdentifier = "container %i"; diff --git a/nixos/modules/virtualisation/nixos-container.pl b/nixos/modules/virtualisation/nixos-container.pl index bf6f16fc6c7..b829eeb0579 100644 --- a/nixos/modules/virtualisation/nixos-container.pl +++ b/nixos/modules/virtualisation/nixos-container.pl @@ -7,7 +7,7 @@ use File::Slurp; use Fcntl ':flock'; use Getopt::Long qw(:config gnu_getopt); -my $socat = '@socat@/bin/socat'; +my $nsenter = "@utillinux@/bin/nsenter"; # Ensure a consistent umask. umask 0022; @@ -25,7 +25,6 @@ Usage: nixos-container list nixos-container login nixos-container root-login nixos-container run -- args... - nixos-container set-root-password nixos-container show-ip nixos-container show-host-key EOF @@ -186,6 +185,23 @@ sub stopContainer { or die "$0: failed to stop container\n"; } +# Return the PID of the init process of the container. +sub getLeader { + my $s = `machinectl show "$containerName" -p Leader`; + chomp $s; + $s =~ /^Leader=(\d+)$/ or die "unable to get container's main PID\n"; + return int($1); +} + +# Run a command in the container. +sub runInContainer { + my @args = @_; + my $leader = getLeader; + # FIXME: initialise the environment properly. + exec($nsenter, "-t", $leader, "-m", "-u", "-i", "-n", "-p", "--", "env", "-i", "--", @args); + die "cannot run ‘nsenter’: $!\n"; +} + if ($action eq "destroy") { die "$0: cannot destroy declarative container (remove it from your configuration.nix instead)\n" unless POSIX::access($confFile, &POSIX::W_OK); @@ -235,28 +251,12 @@ elsif ($action eq "login") { } elsif ($action eq "root-login") { - exec($socat, "unix:$root/var/lib/root-login.socket", "-,echo=0,raw"); + runInContainer("bash", "--login"); } elsif ($action eq "run") { shift @ARGV; shift @ARGV; - my $pid = open(SOCAT, "|-", $socat, "-t0", "-", "unix:$root/var/lib/run-command.socket") or die "$0: cannot start $socat: $!\n"; - print SOCAT join(' ', map { "'$_'" } @ARGV), "\n"; - flush SOCAT; - waitpid($pid, 0); - close(SOCAT); -} - -elsif ($action eq "set-root-password") { - # FIXME: don't get password from the command line. - my $password = $ARGV[2] or die "$0: no password given\n"; - my $pid = open(SOCAT, "|-", $socat, "-t0", "-", "unix:$root/var/lib/run-command.socket") or die "$0: cannot start $socat: $!\n"; - print SOCAT "passwd\n"; - print SOCAT "$password\n"; - print SOCAT "$password\n"; - flush SOCAT; - waitpid($pid, 0); - close(SOCAT); + runInContainer(@ARGV); } elsif ($action eq "show-ip") { -- GitLab From 21ab4e054c1570dd5000a18cb114e665729b378a Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 27 Aug 2014 21:12:18 +0200 Subject: [PATCH 423/843] =?UTF-8?q?nixos-container=20run:=20Execute=20comm?= =?UTF-8?q?and=20using=20=E2=80=98su=E2=80=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This ensures that the environment is set up correctly. --- nixos/modules/virtualisation/nixos-container.pl | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/nixos/modules/virtualisation/nixos-container.pl b/nixos/modules/virtualisation/nixos-container.pl index b829eeb0579..7403a42f0f1 100644 --- a/nixos/modules/virtualisation/nixos-container.pl +++ b/nixos/modules/virtualisation/nixos-container.pl @@ -197,8 +197,7 @@ sub getLeader { sub runInContainer { my @args = @_; my $leader = getLeader; - # FIXME: initialise the environment properly. - exec($nsenter, "-t", $leader, "-m", "-u", "-i", "-n", "-p", "--", "env", "-i", "--", @args); + exec($nsenter, "-t", $leader, "-m", "-u", "-i", "-n", "-p", "--", @args); die "cannot run ‘nsenter’: $!\n"; } @@ -251,12 +250,14 @@ elsif ($action eq "login") { } elsif ($action eq "root-login") { - runInContainer("bash", "--login"); + runInContainer("su", "root", "-l"); } elsif ($action eq "run") { shift @ARGV; shift @ARGV; - runInContainer(@ARGV); + # Escape command. + my $s = join(' ', map { s/'/'\\''/g; "'$_'" } @ARGV); + runInContainer("su", "root", "-l", "-c", "exec " . $s); } elsif ($action eq "show-ip") { -- GitLab From 013aedffead2450cfea6d5fccc16cb51be890e02 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Wed, 27 Aug 2014 22:51:18 -0400 Subject: [PATCH 424/843] ats2: bump --- pkgs/development/compilers/ats2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/ats2/default.nix b/pkgs/development/compilers/ats2/default.nix index 8c71138ab78..c66143fe1f3 100644 --- a/pkgs/development/compilers/ats2/default.nix +++ b/pkgs/development/compilers/ats2/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "ats2-${version}"; - version = "0.1.0"; + version = "0.1.1"; src = fetchurl { url = "mirror://sourceforge/ats2-lang/ATS2-Postiats-${version}.tgz"; - sha256 = "0i7b9v7xki9j2jjjpydz0gl33af94b4jjmk75b9w20bs003v8vd4"; + sha256 = "17yr5zc4cr4zlizhzy43ihfcidl63wjxcc002amzahskib4fsbmb"; }; buildInputs = [ gmp ]; -- GitLab From 9c6614687c3ba58732b06ac700673933283fba94 Mon Sep 17 00:00:00 2001 From: Oliver Charles Date: Thu, 28 Aug 2014 10:05:00 +0100 Subject: [PATCH 425/843] Update haskellPackages.engineIo and haskellPackages.socketIo --- pkgs/development/libraries/haskell/engine-io/default.nix | 5 ++--- pkgs/development/libraries/haskell/socket-io/default.nix | 6 +++--- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/haskell/engine-io/default.nix b/pkgs/development/libraries/haskell/engine-io/default.nix index 82cb1240610..6d3f29206f8 100644 --- a/pkgs/development/libraries/haskell/engine-io/default.nix +++ b/pkgs/development/libraries/haskell/engine-io/default.nix @@ -7,13 +7,12 @@ cabal.mkDerivation (self: { pname = "engine-io"; - version = "1.1.0"; - sha256 = "0l2jwgzi22ky13k9kmqhn15zyxyg5gr167rkywb458n1si4jr3jh"; + version = "1.1.1"; + sha256 = "0y3jppxppms1i0lg6izpl6xiczsjkxd0z2adxna1h7b399ivzcmg"; buildDepends = [ aeson async attoparsec base64Bytestring either monadLoops mwcRandom stm text transformers unorderedContainers vector websockets ]; - jailbreak = true; meta = { homepage = "http://github.com/ocharles/engine.io"; description = "A Haskell implementation of Engine.IO"; diff --git a/pkgs/development/libraries/haskell/socket-io/default.nix b/pkgs/development/libraries/haskell/socket-io/default.nix index 19d6ff3a667..0a7d4b1c230 100644 --- a/pkgs/development/libraries/haskell/socket-io/default.nix +++ b/pkgs/development/libraries/haskell/socket-io/default.nix @@ -6,14 +6,14 @@ cabal.mkDerivation (self: { pname = "socket-io"; - version = "1.0.1"; - sha256 = "0257c5wf6b9rmprqq5q5d7fih4s2szwv98w16ggl61p8khf5d2qs"; + version = "1.1.0"; + sha256 = "1ffip6jlp3i6pz8gbk8m2ra2q8568mgwgi988yh046w787yf9kpw"; buildDepends = [ aeson attoparsec engineIo mtl stm text transformers unorderedContainers vector ]; - jailbreak = true; meta = { + homepage = "http://github.com/ocharles/engine.io"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; maintainers = with self.stdenv.lib.maintainers; [ ocharles ]; -- GitLab From ce16840c683074962165f309b83769dd3b2f7b66 Mon Sep 17 00:00:00 2001 From: Oliver Charles Date: Thu, 28 Aug 2014 10:11:15 +0100 Subject: [PATCH 426/843] haskellPackages.engineIo: Update to 1.1.2 --- pkgs/development/libraries/haskell/engine-io/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/engine-io/default.nix b/pkgs/development/libraries/haskell/engine-io/default.nix index 6d3f29206f8..f1f9d06c76a 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.1.1"; - sha256 = "0y3jppxppms1i0lg6izpl6xiczsjkxd0z2adxna1h7b399ivzcmg"; + version = "1.1.2"; + sha256 = "1ry6rklrij7x1z8mw31vh41lc0axzj8l0lhmjsmhs554nv50062f"; buildDepends = [ aeson async attoparsec base64Bytestring either monadLoops mwcRandom stm text transformers unorderedContainers vector websockets -- GitLab From d5ea3b1e4491482e21efafc32ac91822d3ee9b55 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=BCdiger=20Sonderfeld?= Date: Thu, 28 Aug 2014 12:55:34 +0200 Subject: [PATCH 427/843] parallel: Update to 20140822. https://savannah.gnu.org/forum/forum.php?forum_id=8067 --- pkgs/tools/misc/parallel/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/parallel/default.nix b/pkgs/tools/misc/parallel/default.nix index 4b0332c7506..727657ca6e8 100644 --- a/pkgs/tools/misc/parallel/default.nix +++ b/pkgs/tools/misc/parallel/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, perl }: stdenv.mkDerivation rec { - name = "parallel-20140222"; + name = "parallel-20140822"; src = fetchurl { url = "mirror://gnu/parallel/${name}.tar.bz2"; - sha256 = "0zb3hg92br6a53jn0pzfl16ffc1hfw81jk7nzw5spkshsdrcqx3y"; + sha256 = "8a146a59bc71218921d561f2c801b85e06fe3a21571083b58e6e0966dd397fd4"; }; patchPhase = -- GitLab From ae9afc4d31a8d44d062954b6885ade6900a32a3a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=BCdiger=20Sonderfeld?= Date: Tue, 19 Aug 2014 15:02:20 +0200 Subject: [PATCH 428/843] licenses: Add CC0 license. A universal public domain license. http://creativecommons.org/publicdomain/zero/1.0/ --- lib/licenses.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/lib/licenses.nix b/lib/licenses.nix index 02618f1c6ca..95098aba1f2 100644 --- a/lib/licenses.nix +++ b/lib/licenses.nix @@ -62,6 +62,11 @@ rec { fullName = ''BSD 4-clause "Original" or "Old" License''; }; + cc0 = spdx { + shortName = "CC0-1.0"; + fullName = ''Creative Commons Zero v1.0 Universal''; + }; + cc-by-30 = spdx { shortName = "CC-BY-3.0"; fullName = "Creative Commons Attribution 3.0"; -- GitLab From 57c8f292324ffa525daf6d94c4d4af581cd6b9cf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=BCdiger=20Sonderfeld?= Date: Tue, 19 Aug 2014 15:03:21 +0200 Subject: [PATCH 429/843] Add comic-neue font. --- pkgs/data/fonts/comic-neue/default.nix | 33 ++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 35 insertions(+) create mode 100644 pkgs/data/fonts/comic-neue/default.nix diff --git a/pkgs/data/fonts/comic-neue/default.nix b/pkgs/data/fonts/comic-neue/default.nix new file mode 100644 index 00000000000..91608d17db4 --- /dev/null +++ b/pkgs/data/fonts/comic-neue/default.nix @@ -0,0 +1,33 @@ +{stdenv, fetchurl, unzip}: + +stdenv.mkDerivation rec { + name = "comic-neue-1.1"; + + src = fetchurl { + url = "http://comicneue.com/comic-neue-1.1.zip"; + sha256 = "f9442fc42252db62ea788bd0247ae0e74571678d1dbd3e3edc229389050d6923"; + }; + + buildInputs = [unzip]; + phases = [ "unpackPhase" "installPhase" ]; + sourceRoot = name; + + installPhase = '' + mkdir -p $out/share/fonts/truetype + cp -v *.ttf $out/share/fonts/truetype + ''; + + meta = with stdenv.lib; { + homepage = http://comicneue.com/; + description = "A casual type face: Make your lemonade stand look like a fortune 500 company"; + longDescription = '' + It is inspired by Comic Sans but more regular. The font was + designed by Craig Rozynski. It is available in two variants: + Comic Neue and Comic Neue Angular. The former having round and + the latter angular terminals. Both variants come in Light, + Regular, and Bold weights with Oblique variants. + ''; + license = licenses.cc0; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0a97c43463d..a9bab284b90 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8004,6 +8004,8 @@ let cantarell_fonts = callPackage ../data/fonts/cantarell-fonts { }; + comic-neue = callPackage ../data/fonts/comic-neue { }; + corefonts = callPackage ../data/fonts/corefonts { }; wrapFonts = paths : ((import ../data/fonts/fontWrap) { -- GitLab From e07b5c95af31c5ef970097dc160562c1439caf25 Mon Sep 17 00:00:00 2001 From: Michael Fellinger Date: Thu, 28 Aug 2014 14:16:11 +0200 Subject: [PATCH 430/843] Add di package --- lib/maintainers.nix | 3 ++- pkgs/tools/system/di/default.nix | 20 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 24 insertions(+), 1 deletion(-) create mode 100644 pkgs/tools/system/di/default.nix diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 67936416ae8..d3d46fc6862 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -66,14 +66,15 @@ lovek323 = "Jason O'Conal "; ludo = "Ludovic Courtès "; madjar = "Georges Dubus "; + manveru = "Michael Fellinger "; marcweber = "Marc Weber "; matejc = "Matej Cotman "; meisternu = "Matt Miemiec "; modulistic = "Pablo Costa "; mornfall = "Petr Ročkai "; + MP2E = "Cray Elliott "; msackman = "Matthew Sackman "; nathan-gs = "Nathan Bijnens "; - MP2E = "Cray Elliott "; notthemessiah = "Brian Cohen "; ocharles = "Oliver Charles "; offline = "Jaka Hudoklin "; diff --git a/pkgs/tools/system/di/default.nix b/pkgs/tools/system/di/default.nix new file mode 100644 index 00000000000..dc15ce13bcc --- /dev/null +++ b/pkgs/tools/system/di/default.nix @@ -0,0 +1,20 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "di-4.35"; + + src = fetchurl { + url = "http://gentoo.com/di/${name}.tar.gz"; + sha256 = "1lkiggvdm6wi14xy8845w6mqqr50j2q7g0i2rdcs7qw5gb7gmprc"; + }; + + makeFlags = "INSTALL_DIR=$(out)"; + + meta = with stdenv.lib; { + description = "A disk information utility, displaying everything (and more) that your 'df' command does"; + homepage = http://www.gentoo.com/di/; + license = licenses.zlib; + maintainers = with maintainers; [ manveru ]; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0a97c43463d..212b185bbff 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -901,6 +901,8 @@ let dhcpcd = callPackage ../tools/networking/dhcpcd { }; + di = callPackage ../tools/system/di { }; + diffstat = callPackage ../tools/text/diffstat { }; diffutils = callPackage ../tools/text/diffutils { }; -- GitLab From a5143dd20806f3b029a65342a79adaf66266618d Mon Sep 17 00:00:00 2001 From: Georges Dubus Date: Thu, 28 Aug 2014 17:36:13 +0200 Subject: [PATCH 431/843] rabbitmq-server: updated to 3.3.5 --- pkgs/servers/amqp/rabbitmq-server/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/amqp/rabbitmq-server/default.nix b/pkgs/servers/amqp/rabbitmq-server/default.nix index 09b091b323c..b5f9195abbd 100644 --- a/pkgs/servers/amqp/rabbitmq-server/default.nix +++ b/pkgs/servers/amqp/rabbitmq-server/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { name = "rabbitmq-server-${version}"; - version = "3.3.4"; + version = "3.3.5"; src = fetchurl { url = "http://www.rabbitmq.com/releases/rabbitmq-server/v${version}/${name}.tar.gz"; - sha256 = "13nnsn34b44mz8w4b69bcpxmq4daqnxzd0lppg0f138pcssha43l"; + sha256 = "1hkhkpv2f0nzvw09zfrqg89mphdpn4nwvzrlqnhqf82bd2pzhsvs"; }; buildInputs = -- GitLab From 7fec14e74a61ef8ffb39ca9e72b941879df3d2f2 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 28 Aug 2014 18:08:32 +0200 Subject: [PATCH 432/843] haskell-hspec2: mark 'broken' because of https://github.com/hspec/hspec/issues/187 --- pkgs/development/libraries/haskell/hspec2/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/libraries/haskell/hspec2/default.nix b/pkgs/development/libraries/haskell/hspec2/default.nix index 9b57dbd7627..295b01b4e32 100644 --- a/pkgs/development/libraries/haskell/hspec2/default.nix +++ b/pkgs/development/libraries/haskell/hspec2/default.nix @@ -25,5 +25,7 @@ cabal.mkDerivation (self: { description = "Alpha version of Hspec 2.0"; license = self.stdenv.lib.licenses.mit; platforms = self.ghc.meta.platforms; + hydraPlatforms = self.stdenv.lib.platforms.none; + broken = true; }; }) -- GitLab From 1e7885f9c2f7bc352064f95429917f77babc9fd4 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 28 Aug 2014 18:09:00 +0200 Subject: [PATCH 433/843] haskell-servant-scotty: re-generate with cabal2nix --- pkgs/development/libraries/haskell/servant-scotty/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/servant-scotty/default.nix b/pkgs/development/libraries/haskell/servant-scotty/default.nix index 562c966bcc7..732b2c95cc7 100644 --- a/pkgs/development/libraries/haskell/servant-scotty/default.nix +++ b/pkgs/development/libraries/haskell/servant-scotty/default.nix @@ -13,8 +13,7 @@ cabal.mkDerivation (self: { ]; meta = { homepage = "http://github.com/zalora/servant"; - description = "Generate a web service for servant 'Resource's - using scotty and JSON"; + description = "Generate a web service for servant 'Resource's using scotty and JSON"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; }; -- GitLab From 1851efa1a7143b3f1fad4c4f1e046ff418f69d0e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 28 Aug 2014 18:15:54 +0200 Subject: [PATCH 434/843] haskell-hspec-wai: disable builds because it depends on broken hspec2 --- pkgs/development/libraries/haskell/hspec-wai/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/haskell/hspec-wai/default.nix b/pkgs/development/libraries/haskell/hspec-wai/default.nix index 3170318f540..1341bf198c9 100644 --- a/pkgs/development/libraries/haskell/hspec-wai/default.nix +++ b/pkgs/development/libraries/haskell/hspec-wai/default.nix @@ -21,5 +21,6 @@ cabal.mkDerivation (self: { description = "Experimental Hspec support for testing WAI applications (depends on hspec2!)"; license = self.stdenv.lib.licenses.mit; platforms = self.ghc.meta.platforms; + hydraPlatforms = self.stdenv.lib.platforms.none; }; }) -- GitLab From 86141f80670ab59add19fbcfee729c962ff554fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=BCdiger=20Sonderfeld?= Date: Thu, 28 Aug 2014 19:12:34 +0200 Subject: [PATCH 435/843] lightning: Update to 2.0.5. --- pkgs/development/libraries/lightning/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/lightning/default.nix b/pkgs/development/libraries/lightning/default.nix index 73d98023c84..036d9c61d07 100644 --- a/pkgs/development/libraries/lightning/default.nix +++ b/pkgs/development/libraries/lightning/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, binutils }: stdenv.mkDerivation rec { - name = "lightning-2.0.4"; + name = "lightning-2.0.5"; src = fetchurl { - url = "ftp://ftp.gnu.org/gnu/lightning/${name}.tar.gz"; - sha256 = "1lrckrx51d5hrv66bc99fd4b7g2wwn4vr304hwq3glfzhb8jqcdy"; + url = "mirror://gnu/lightning/${name}.tar.gz"; + sha256 = "0jm9a8ddxc1v9hyzyv4ybg37fjac2yjqv1hkd262wxzqms36mdk5"; }; # Needs libopcodes.so from binutils for 'make check' -- GitLab From adbb9ff7966c1c17588100d6afddda66eafc9453 Mon Sep 17 00:00:00 2001 From: Paul Colomiets Date: Thu, 3 Jul 2014 01:59:35 +0300 Subject: [PATCH 436/843] dnsmasq: upgrade to 2.71, fixed dnsmasq module * The module now has systemd config * Add resolveLocalQueries option which sets up it as a dns server for local host (including reasonable setup of resolvconf) * Add "dnsmasq" user for running daemon * Enabled dbus and dnssec support for the package Conflicts: nixos/modules/misc/ids.nix --- nixos/modules/config/networking.nix | 8 +++- nixos/modules/misc/ids.nix | 1 + nixos/modules/services/networking/dnsmasq.nix | 45 +++++++++++++++---- pkgs/tools/networking/dnsmasq/default.nix | 24 +++++++++- 4 files changed, 67 insertions(+), 11 deletions(-) diff --git a/nixos/modules/config/networking.nix b/nixos/modules/config/networking.nix index fd1e55f673a..136a5bda745 100644 --- a/nixos/modules/config/networking.nix +++ b/nixos/modules/config/networking.nix @@ -7,6 +7,9 @@ with lib; let cfg = config.networking; + dnsmasqResolve = config.services.dnsmasq.enable && + config.services.dnsmasq.resolveLocalQueries; + hasLocalResolver = config.services.bind.enable || dnsmasqResolve; in @@ -74,9 +77,12 @@ in '' + optionalString cfg.dnsSingleRequest '' # only send one DNS request at a time resolv_conf_options='single-request' - '' + optionalString config.services.bind.enable '' + '' + optionalString hasLocalResolver '' # This hosts runs a full-blown DNS resolver. name_servers='127.0.0.1' + '' + optionalString dnsmasqResolve '' + dnsmasq_conf=/etc/dnsmasq-conf.conf + dnsmasq_resolv=/etc/dnsmasq-resolv.conf ''; }; diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix index 92ab241deaa..513da5d50a1 100644 --- a/nixos/modules/misc/ids.nix +++ b/nixos/modules/misc/ids.nix @@ -148,6 +148,7 @@ riemanndash = 138; radvd = 139; zookeeper = 140; + dnsmasq = 141; # When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399! diff --git a/nixos/modules/services/networking/dnsmasq.nix b/nixos/modules/services/networking/dnsmasq.nix index 8e38b9d017a..d2a8af6ac8b 100644 --- a/nixos/modules/services/networking/dnsmasq.nix +++ b/nixos/modules/services/networking/dnsmasq.nix @@ -6,10 +6,12 @@ let cfg = config.services.dnsmasq; dnsmasq = pkgs.dnsmasq; - serversParam = concatMapStrings (s: "-S ${s} ") cfg.servers; - dnsmasqConf = pkgs.writeText "dnsmasq.conf" '' - ${cfg.extraConfig} + ${optionalString cfg.resolveLocalQueries '' + conf-file=/etc/dnsmasq-conf.conf + resolv-file=/etc/dnsmasq-resolv.conf + ''} + ${cfg.extraConfig} ''; in @@ -29,6 +31,14 @@ in ''; }; + resolveLocalQueries = mkOption { + default = true; + description = '' + Whether dnsmasq should resolve local queries (i.e. add 127.0.0.1 to + /etc/resolv.conf) + ''; + }; + servers = mkOption { default = []; example = [ "8.8.8.8" "8.8.4.4" ]; @@ -37,6 +47,8 @@ in ''; }; + + extraConfig = mkOption { type = types.string; default = ""; @@ -55,16 +67,31 @@ in config = mkIf config.services.dnsmasq.enable { - jobs.dnsmasq = - { description = "dnsmasq daemon"; - - startOn = "ip-up"; + environment.systemPackages = [ dnsmasq ] + ++ (if cfg.resolveLocalQueries then [ pkgs.openresolv ] else []); - daemonType = "daemon"; + services.dbus.packages = [ dnsmasq ]; - exec = "${dnsmasq}/bin/dnsmasq -R ${serversParam} -o -C ${dnsmasqConf}"; + users.extraUsers = singleton + { name = "dnsmasq"; + uid = config.ids.uids.dnsmasq; + description = "Dnsmasq daemon user"; + home = "/var/empty"; }; + systemd.services.dnsmasq = { + description = "dnsmasq daemon"; + after = [ "network.target" ]; + wantedBy = [ "multi-user.target" ]; + serviceConfig = { + Type = "dbus"; + BusName = "uk.org.thekelleys.dnsmasq"; + ExecStartPre = "${dnsmasq}/bin/dnsmasq --test"; + ExecStart = "${dnsmasq}/bin/dnsmasq -k --enable-dbus --user=dnsmasq -C ${dnsmasqConf}"; + ExecReload = "${dnsmasq}/bin/kill -HUP $MAINPID"; + }; + }; + }; } diff --git a/pkgs/tools/networking/dnsmasq/default.nix b/pkgs/tools/networking/dnsmasq/default.nix index cec4057a284..ba59071d0ce 100644 --- a/pkgs/tools/networking/dnsmasq/default.nix +++ b/pkgs/tools/networking/dnsmasq/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl }: +{ pkgconfig, dbus_libs, nettle, stdenv, fetchurl }: stdenv.mkDerivation rec { name = "dnsmasq-2.71"; @@ -8,8 +8,30 @@ stdenv.mkDerivation rec { sha256 = "1fpzpzja7qr8b4kfdhh4i4sijp62c634yf0xvq2n4p7d5xbzn6a9"; }; + # Can't rely on make flags because of space in one of the parameters + buildPhase = '' + make COPTS="-DHAVE_DNSSEC -DHAVE_DBUS" + ''; + + # make flags used for installation only makeFlags = "DESTDIR= BINDIR=$(out)/bin MANDIR=$(out)/man LOCALEDIR=$(out)/share/locale"; + postInstall = '' + install -Dm644 dbus/dnsmasq.conf $out/etc/dbus-1/system.d/dnsmasq.conf + install -Dm644 trust-anchors.conf $out/share/dnsmasq/trust-anchors.conf + + ensureDir $out/share/dbus-1/system-services + cat < $out/share/dbus-1/system-services/uk.org.thekelleys.dnsmasq.service + [D-BUS Service] + Name=uk.org.thekelleys.dnsmasq + Exec=$out/sbin/dnsmasq -k -1 + User=root + SystemdService=dnsmasq.service + END + ''; + + buildInputs = [ pkgconfig dbus_libs nettle ]; + meta = { description = "An integrated DNS, DHCP and TFTP server for small networks"; homepage = http://www.thekelleys.org.uk/dnsmasq/doc.html; -- GitLab From 9194f69e73aface9ad039a428710ee669b6d3204 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Mon, 11 Aug 2014 15:48:36 -0500 Subject: [PATCH 437/843] dnsmasq: Meta Update --- pkgs/tools/networking/dnsmasq/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/networking/dnsmasq/default.nix b/pkgs/tools/networking/dnsmasq/default.nix index ba59071d0ce..02f24ce4c00 100644 --- a/pkgs/tools/networking/dnsmasq/default.nix +++ b/pkgs/tools/networking/dnsmasq/default.nix @@ -32,11 +32,11 @@ stdenv.mkDerivation rec { buildInputs = [ pkgconfig dbus_libs nettle ]; - meta = { + meta = with stdenv.lib; { description = "An integrated DNS, DHCP and TFTP server for small networks"; homepage = http://www.thekelleys.org.uk/dnsmasq/doc.html; - license = "GPL"; - platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; - maintainers = [ stdenv.lib.maintainers.eelco ]; + license = licenses.gpl2; + platforms = with platforms; linux ++ darwin; + maintainers = with maintainers; [ eelco ]; }; } -- GitLab From 859a2c446cbe1f802ec3f6ad07d3913c4518e11d Mon Sep 17 00:00:00 2001 From: Linquize Date: Mon, 25 Aug 2014 17:35:47 +0200 Subject: [PATCH 438/843] protobuf: Update to 2.6.0 --- pkgs/development/libraries/protobuf/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/protobuf/default.nix b/pkgs/development/libraries/protobuf/default.nix index bba8481780a..3452335decd 100644 --- a/pkgs/development/libraries/protobuf/default.nix +++ b/pkgs/development/libraries/protobuf/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, zlib }: stdenv.mkDerivation rec { - name = "protobuf-2.5.0"; + name = "protobuf-2.6.0"; src = fetchurl { - url = "http://protobuf.googlecode.com/files/${name}.tar.bz2"; - sha256 = "0xxn9gxhvsgzz2sgmihzf6pf75clr05mqj6218camwrwajpcbgqk"; + url = "http://protobuf.googlecode.com/svn-history/r579/rc/protobuf-2.6.0.tar.bz2"; + sha256 = "0krfkxc85vfznqwbh59qlhp7ld81al9ss35av0gfbg74i0rvjids"; }; buildInputs = [ zlib ]; -- GitLab From 39320b0fa38bfe6dba1c285758b4663de43cd371 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Thu, 28 Aug 2014 18:35:53 +0200 Subject: [PATCH 439/843] gnome3.gitg: fix build by updating it to unstable --- pkgs/desktops/gnome-3/3.10/misc/gitg/default.nix | 6 +++--- .../gnome-3/3.10/misc/libgit2-glib/default.nix | 10 ++++++---- pkgs/desktops/gnome-3/3.12/misc/gitg/default.nix | 6 +++--- .../gnome-3/3.12/misc/libgit2-glib/default.nix | 8 ++++---- 4 files changed, 16 insertions(+), 14 deletions(-) diff --git a/pkgs/desktops/gnome-3/3.10/misc/gitg/default.nix b/pkgs/desktops/gnome-3/3.10/misc/gitg/default.nix index 7ca35a8255f..401d5cf2f36 100644 --- a/pkgs/desktops/gnome-3/3.10/misc/gitg/default.nix +++ b/pkgs/desktops/gnome-3/3.10/misc/gitg/default.nix @@ -6,11 +6,11 @@ # use packaged gnome3.gnome_icon_theme_symbolic stdenv.mkDerivation rec { - name = "gitg-0.3.2"; + name = "gitg-3.13.91"; src = fetchurl { - url = "mirror://gnome/sources/gitg/0.3/${name}.tar.xz"; - sha256 = "03vc59d1r3326piqdph6qjqnc40chm1lpg52lpf8466ddjs0x8vp"; + url = "mirror://gnome/sources/gitg/3.13/${name}.tar.xz"; + sha256 = "1c2016grvgg5f3l5xkracz85rblsc1a4brzr6vgn6kh2h494rv37"; }; preCheck = '' diff --git a/pkgs/desktops/gnome-3/3.10/misc/libgit2-glib/default.nix b/pkgs/desktops/gnome-3/3.10/misc/libgit2-glib/default.nix index 17c3b4fa0a8..82e2b585509 100644 --- a/pkgs/desktops/gnome-3/3.10/misc/libgit2-glib/default.nix +++ b/pkgs/desktops/gnome-3/3.10/misc/libgit2-glib/default.nix @@ -1,18 +1,20 @@ -{ stdenv, fetchurl, gnome3, libtool, pkgconfig +{ stdenv, fetchurl, gnome3, libtool, pkgconfig, vala , gtk_doc, gobjectIntrospection, libgit2, glib }: stdenv.mkDerivation rec { name = "libgit2-glib-${version}"; - version = "0.0.10"; + version = "0.0.20"; src = fetchurl { url = "https://github.com/GNOME/libgit2-glib/archive/v${version}.tar.gz"; - sha256 = "0zn3k85jw6yks8s5ca8dyh9mwh4if1lni9gz9bd5lqlpa803ixxs"; + sha256 = "1s2hj0ji73ishniqvr6mx90l1ji5jjwwrwhp91i87fxk0d3sry5x"; }; + + cmakeFlags = "-DTHREADSAFE=ON"; configureScript = "sh ./autogen.sh"; - buildInputs = [ gnome3.gnome_common libtool pkgconfig + buildInputs = [ gnome3.gnome_common libtool pkgconfig vala gtk_doc gobjectIntrospection libgit2 glib ]; meta = with stdenv.lib; { diff --git a/pkgs/desktops/gnome-3/3.12/misc/gitg/default.nix b/pkgs/desktops/gnome-3/3.12/misc/gitg/default.nix index 7ca35a8255f..401d5cf2f36 100644 --- a/pkgs/desktops/gnome-3/3.12/misc/gitg/default.nix +++ b/pkgs/desktops/gnome-3/3.12/misc/gitg/default.nix @@ -6,11 +6,11 @@ # use packaged gnome3.gnome_icon_theme_symbolic stdenv.mkDerivation rec { - name = "gitg-0.3.2"; + name = "gitg-3.13.91"; src = fetchurl { - url = "mirror://gnome/sources/gitg/0.3/${name}.tar.xz"; - sha256 = "03vc59d1r3326piqdph6qjqnc40chm1lpg52lpf8466ddjs0x8vp"; + url = "mirror://gnome/sources/gitg/3.13/${name}.tar.xz"; + sha256 = "1c2016grvgg5f3l5xkracz85rblsc1a4brzr6vgn6kh2h494rv37"; }; preCheck = '' diff --git a/pkgs/desktops/gnome-3/3.12/misc/libgit2-glib/default.nix b/pkgs/desktops/gnome-3/3.12/misc/libgit2-glib/default.nix index 17c3b4fa0a8..94776c90cf9 100644 --- a/pkgs/desktops/gnome-3/3.12/misc/libgit2-glib/default.nix +++ b/pkgs/desktops/gnome-3/3.12/misc/libgit2-glib/default.nix @@ -1,18 +1,18 @@ -{ stdenv, fetchurl, gnome3, libtool, pkgconfig +{ stdenv, fetchurl, gnome3, libtool, pkgconfig, vala , gtk_doc, gobjectIntrospection, libgit2, glib }: stdenv.mkDerivation rec { name = "libgit2-glib-${version}"; - version = "0.0.10"; + version = "0.0.20"; src = fetchurl { url = "https://github.com/GNOME/libgit2-glib/archive/v${version}.tar.gz"; - sha256 = "0zn3k85jw6yks8s5ca8dyh9mwh4if1lni9gz9bd5lqlpa803ixxs"; + sha256 = "1s2hj0ji73ishniqvr6mx90l1ji5jjwwrwhp91i87fxk0d3sry5x"; }; configureScript = "sh ./autogen.sh"; - buildInputs = [ gnome3.gnome_common libtool pkgconfig + buildInputs = [ gnome3.gnome_common libtool pkgconfig vala gtk_doc gobjectIntrospection libgit2 glib ]; meta = with stdenv.lib; { -- GitLab From 0005e1896d9bdef48aedcff9e86843351ac024e9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Thu, 28 Aug 2014 20:19:31 +0200 Subject: [PATCH 440/843] python3Packages: disable some more --- pkgs/top-level/python-packages.nix | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 8374e29162a..d276413f3d3 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2152,6 +2152,7 @@ rec { googlecl = buildPythonPackage rec { version = "0.9.14"; name = "googlecl-${version}"; + disabled = isPy3k; src = fetchurl { url = "https://googlecl.googlecode.com/files/${name}.tar.gz"; @@ -3764,6 +3765,7 @@ rec { google_apputils = buildPythonPackage rec { name = "google-apputils-0.4.0"; + disabled = isPy3k; src = fetchurl { url = http://pypi.python.org/packages/source/g/google-apputils/google-apputils-0.4.0.tar.gz; @@ -3917,6 +3919,7 @@ rec { http_signature = buildPythonPackage (rec { name = "http_signature-0.1.4"; + disabled = isPy3k; src = fetchurl { url = "http://pypi.python.org/packages/source/h/http_signature/${name}.tar.gz"; @@ -4797,6 +4800,7 @@ rec { muttils = buildPythonPackage (rec { name = "muttils-1.3"; + disabled = isPy3k; src = fetchurl { url = http://www.blacktrash.org/hg/muttils/archive/8bb26094df06.tar.bz2; @@ -4859,6 +4863,7 @@ rec { namebench = buildPythonPackage (rec { name = "namebench-1.0.5"; + disabled = isPy3k; src = fetchurl { url = "http://namebench.googlecode.com/files/${name}.tgz"; @@ -5073,6 +5078,7 @@ rec { nose-cprof = buildPythonPackage rec { name = "nose-cprof-0.1-0"; + disabled = isPy3k; src = fetchurl { url = "https://pypi.python.org/packages/source/n/nose-cprof/${name}.tar.gz"; @@ -5812,8 +5818,9 @@ rec { protobuf = buildPythonPackage rec { inherit (pkgs.protobuf) name src; - propagatedBuildInputs = [ pkgs.protobuf setuptools ]; + propagatedBuildInputs = [ pkgs.protobuf google_apputils ]; sourceRoot = "${name}/python"; + meta = { description = "Protocol Buffers are Google's data interchange format."; @@ -6150,6 +6157,8 @@ rec { }; buildInputs = [ unittest2 ]; + + doCheck = !isPyPy; meta = { homepage = "https://launchpad.net/pyflakes"; @@ -8206,6 +8215,7 @@ rec { taskcoach = buildPythonPackage rec { name = "TaskCoach-1.3.22"; + disabled = isPy3k; src = fetchurl { url = "mirror://sourceforge/taskcoach/${name}.tar.gz"; @@ -8347,6 +8357,7 @@ rec { smmap = buildPythonPackage rec { name = "smmap-0.8.2"; + disabled = isPy3k; # next release will have py3k support meta.maintainers = [ stdenv.lib.maintainers.mornfall ]; src = fetchurl { -- GitLab From a2eb68a6dc094169384fb5ba5bf73829ad74ce59 Mon Sep 17 00:00:00 2001 From: Aristid Breitkreuz Date: Thu, 28 Aug 2014 21:27:08 +0200 Subject: [PATCH 441/843] update virtualbox to 4.3.14 --- pkgs/applications/virtualization/virtualbox/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/virtualization/virtualbox/default.nix b/pkgs/applications/virtualization/virtualbox/default.nix index 682e7159ac8..f3e7bea3ca9 100644 --- a/pkgs/applications/virtualization/virtualbox/default.nix +++ b/pkgs/applications/virtualization/virtualbox/default.nix @@ -11,7 +11,7 @@ with stdenv.lib; let - version = "4.3.12"; # changes ./guest-additions as well + version = "4.3.14"; # changes ./guest-additions as well forEachModule = action: '' for mod in \ @@ -31,13 +31,13 @@ let ''; # See https://github.com/NixOS/nixpkgs/issues/672 for details - extpackRevision = "93733"; + extpackRevision = "95030"; extensionPack = requireFile rec { name = "Oracle_VM_VirtualBox_Extension_Pack-${version}-${extpackRevision}.vbox-extpack"; # IMPORTANT: Hash must be base16 encoded because it's used as an input to # VBoxExtPackHelperApp! # Tip: see http://dlc.sun.com.edgesuite.net/virtualbox/4.3.10/SHA256SUMS - sha256 = "f931ce41b2cc9500dc43aba004630cf7bb7050ba737eae38827e91062f072d1f"; + sha256 = "b965c3565e7933bc61019d2992f4da084944cfd9e809fbeaff330f4743d47537"; message = '' In order to use the extension pack, you need to comply with the VirtualBox Personal Use and Evaluation License (PUEL) by downloading the related binaries from: @@ -56,7 +56,7 @@ in stdenv.mkDerivation { src = fetchurl { url = "http://download.virtualbox.org/virtualbox/${version}/VirtualBox-${version}.tar.bz2"; - sha256 = "db84ddf47d1ecd316ec46417595f0252e3ec2f67e35e1e17320aba87b7c2934f"; + sha256 = "bc893adde4449a2d35d8b4d0b8b247f0f2ac62a434fd8a8f7c54f613a100855a"; }; buildInputs = -- GitLab From 792afca11318aaac0715f343d7454ea4933a932a Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Thu, 28 Aug 2014 15:26:32 -0500 Subject: [PATCH 442/843] spiped: 1.3.1 -> 1.4.0 Signed-off-by: Austin Seipp --- pkgs/tools/networking/spiped/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/spiped/default.nix b/pkgs/tools/networking/spiped/default.nix index ac2736ffb19..f854b92b87e 100644 --- a/pkgs/tools/networking/spiped/default.nix +++ b/pkgs/tools/networking/spiped/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "spiped-${version}"; - version = "1.3.1"; + version = "1.4.0"; src = fetchurl { url = "http://www.tarsnap.com/spiped/${name}.tgz"; - sha256 = "1viglk61v1v2ga1n31r0h8rvib5gy2h02lhhbbnqh2s6ps1sjn4a"; + sha256 = "0pyg1llnqgfx7n7mi3dq4ra9xg3vkxlf01z5jzn7ncq5d6ii7ynq"; }; buildInputs = [ openssl ]; -- GitLab From 4f832b521729daf54f83d0b5c6ff008d5311a81a Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Fri, 2 May 2014 05:02:09 -0500 Subject: [PATCH 443/843] Revert "grub: Allow setting the boot root explicitly" This reverts commit e4630c1d41d513eb709bddb39043da84442235a7. --- nixos/modules/system/boot/loader/grub/grub.nix | 11 +---------- nixos/modules/system/boot/loader/grub/install-grub.pl | 5 ----- 2 files changed, 1 insertion(+), 15 deletions(-) diff --git a/nixos/modules/system/boot/loader/grub/grub.nix b/nixos/modules/system/boot/loader/grub/grub.nix index 0cc060db8f9..a3b09223cbb 100644 --- a/nixos/modules/system/boot/loader/grub/grub.nix +++ b/nixos/modules/system/boot/loader/grub/grub.nix @@ -25,7 +25,7 @@ let inherit (cfg) version extraConfig extraPerEntryConfig extraEntries extraEntriesBeforeNixOS extraPrepareConfig configurationLimit copyKernels timeout - default devices explicitBootRoot; + default devices; path = (makeSearchPath "bin" [ pkgs.coreutils pkgs.gnused pkgs.gnugrep pkgs.findutils pkgs.diffutils ]) + ":" + (makeSearchPath "sbin" [ @@ -209,15 +209,6 @@ in ''; }; - explicitBootRoot = mkOption { - default = ""; - type = types.str; - description = '' - The relative path of /boot within the parent volume. Leave empty - if /boot is not a btrfs subvolume. - ''; - }; - }; }; diff --git a/nixos/modules/system/boot/loader/grub/install-grub.pl b/nixos/modules/system/boot/loader/grub/install-grub.pl index c3aa8518b8b..a83733db63b 100644 --- a/nixos/modules/system/boot/loader/grub/install-grub.pl +++ b/nixos/modules/system/boot/loader/grub/install-grub.pl @@ -39,7 +39,6 @@ my $configurationLimit = int(get("configurationLimit")); my $copyKernels = get("copyKernels") eq "true"; my $timeout = int(get("timeout")); my $defaultEntry = int(get("default")); -my $explicitBootRoot = get("explicitBootRoot"); $ENV{'PATH'} = get("path"); die "unsupported GRUB version\n" if $grubVersion != 1 && $grubVersion != 2; @@ -62,10 +61,6 @@ if (stat("/")->dev != stat("/boot")->dev) { $copyKernels = 1; } -if ($explicitBootRoot ne "") { - $bootRoot = $explicitBootRoot; -} - # Generate the header. my $conf .= "# Automatically generated. DO NOT EDIT THIS FILE!\n"; -- GitLab From f2bef62716b4c5853ea16465f31182569dbb80ef Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Mon, 21 Oct 2013 05:09:02 -0500 Subject: [PATCH 444/843] Update grub 2.00 to 2.02-beta2 --- pkgs/tools/misc/grub/2.0x.nix | 40 ++++++++++++++++++--------------- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 23 insertions(+), 19 deletions(-) diff --git a/pkgs/tools/misc/grub/2.0x.nix b/pkgs/tools/misc/grub/2.0x.nix index b1877bdcf98..59658e47a08 100644 --- a/pkgs/tools/misc/grub/2.0x.nix +++ b/pkgs/tools/misc/grub/2.0x.nix @@ -1,11 +1,17 @@ -{ fetchurl, stdenv, flex, bison, gettext, ncurses, libusb, freetype, qemu -, devicemapper, EFIsupport ? false }: +{ fetchurl, stdenv, autogen, flex, bison, python, autoconf, automake +, gettext, ncurses, libusb, freetype, qemu, devicemapper +, linuxPackages ? null +, EFIsupport ? false +, zfsSupport ? false +}: + +assert zfsSupport -> linuxPackages != null && linuxPackages.zfs != null; let prefix = "grub${if EFIsupport then "-efi" else ""}"; - version = "2.00"; + version = "2.02-beta2"; unifont_bdf = fetchurl { url = "http://unifoundry.com/unifont-5.1.20080820.bdf.gz"; @@ -18,13 +24,14 @@ stdenv.mkDerivation rec { name = "${prefix}-${version}"; src = fetchurl { - url = "mirror://gnu/grub/grub-${version}.tar.xz"; - sha256 = "0n64hpmsccvicagvr0c6v0kgp2yw0kgnd3jvsyd26cnwgs7c6kkq"; + url = "http://git.savannah.gnu.org/cgit/grub.git/snapshot/grub-2.02-beta2.tar.gz"; + sha256 = "1n2l7k76lqqaavz12615vx5kca0kl8g13bkimc7xsd9s7c1ir5lr"; }; - nativeBuildInputs = [ flex bison ]; + nativeBuildInputs = [ autogen flex bison python autoconf automake ]; buildInputs = [ ncurses libusb freetype gettext devicemapper ] - ++ stdenv.lib.optional doCheck qemu; + ++ stdenv.lib.optional doCheck qemu + ++ stdenv.lib.optional zfsSupport linuxPackages.zfs; preConfigure = '' for i in "tests/util/"*.in @@ -43,14 +50,11 @@ stdenv.mkDerivation rec { # See . sed -i "tests/util/grub-shell.in" \ -e's/qemu-system-i386/qemu-system-x86_64 -nodefaults/g' - - # Fix for building on Glibc 2.16. Won't be needed once the - # gnulib in grub is updated. - sed -i '/gets is a security hole/d' grub-core/gnulib/stdio.in.h ''; prePatch = - '' gunzip < "${unifont_bdf}" > "unifont.bdf" + '' sh autogen.sh + gunzip < "${unifont_bdf}" > "unifont.bdf" sed -i "configure" \ -e "s|/usr/src/unifont.bdf|$PWD/unifont.bdf|g" ''; @@ -61,8 +65,8 @@ stdenv.mkDerivation rec { let arch = if stdenv.system == "i686-linux" then "i386" else if stdenv.system == "x86_64-linux" then "x86_64" else throw "unsupported EFI firmware architecture"; - in - stdenv.lib.optionals EFIsupport + in stdenv.lib.optional zfsSupport "--enable-libzfs" + ++ stdenv.lib.optionals EFIsupport [ "--with-platform=efi" "--target=${arch}" "--program-prefix=" ]; doCheck = false; @@ -72,7 +76,7 @@ stdenv.mkDerivation rec { paxmark pms $out/sbin/grub-{probe,bios-setup} ''; - meta = { + meta = with stdenv.lib; { description = "GNU GRUB, the Grand Unified Boot Loader (2.x beta)"; longDescription = @@ -87,13 +91,13 @@ stdenv.mkDerivation rec { operating system (e.g., GNU). ''; - homepage = http://www.gnu.org/software/grub/; + homepage = http://wwwp.gnu.org/software/grub/; - license = stdenv.lib.licenses.gpl3Plus; + license = licenses.gpl3Plus; platforms = if EFIsupport then [ "i686-linux" "x86_64-linux" ] else - stdenv.lib.platforms.gnu; + platforms.gnu; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a8540bdb1f6..c5b511df9c0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1218,7 +1218,7 @@ let buggyBiosCDSupport = config.grub.buggyBiosCDSupport or true; }; - grub2 = callPackage ../tools/misc/grub/2.0x.nix { libusb = libusb1; flex = flex_2_5_35; }; + grub2 = callPackage ../tools/misc/grub/2.0x.nix { }; grub2_efi = grub2.override { EFIsupport = true; }; -- GitLab From 3c6e2fbba910cd3f110a0388c0a374d1573082ef Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Wed, 9 Apr 2014 13:27:18 -0500 Subject: [PATCH 445/843] Add optional zfsSupport to the nixos grub configuration --- nixos/modules/system/boot/loader/grub/grub.nix | 14 +++++++++++++- pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 15 insertions(+), 1 deletion(-) diff --git a/nixos/modules/system/boot/loader/grub/grub.nix b/nixos/modules/system/boot/loader/grub/grub.nix index a3b09223cbb..25cec57431e 100644 --- a/nixos/modules/system/boot/loader/grub/grub.nix +++ b/nixos/modules/system/boot/loader/grub/grub.nix @@ -6,7 +6,8 @@ let cfg = config.boot.loader.grub; - realGrub = if cfg.version == 1 then pkgs.grub else pkgs.grub2; + realGrub = if cfg.version == 1 then pkgs.grub + else pkgs.grub2.override { zfsSupport = cfg.zfsSupport }; grub = # Don't include GRUB if we're only generating a GRUB menu (e.g., @@ -209,6 +210,14 @@ in ''; }; + zfsSupport = mkOption { + default = false; + type = types.bool; + description = '' + Whether grub should be build against libzfs. + ''; + }; + }; }; @@ -251,6 +260,9 @@ in ${pkgs.coreutils}/bin/cp -pf "${v}" "/boot/${n}" '') config.boot.loader.grub.extraFiles); + assertions = [{ assertion = !cfg.zfsSupport || cfg.version == 2; + message = "Only grub version 2 provides zfs support";}]; + }) ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c5b511df9c0..2dc957cb3db 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1222,6 +1222,8 @@ let grub2_efi = grub2.override { EFIsupport = true; }; + grub2_zfs = grub2.override { zfsSupport = true; }; + gssdp = callPackage ../development/libraries/gssdp { inherit (gnome) libsoup; }; -- GitLab From 02ab48d0eea6e37d3432f6b8ce4c31b85e8d3ffe Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Wed, 9 Apr 2014 13:27:45 -0500 Subject: [PATCH 446/843] Enable grub zfsSupport if zfs is built into the initrd --- nixos/modules/system/boot/loader/grub/grub.nix | 2 +- nixos/modules/tasks/filesystems/zfs.nix | 6 +++++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/nixos/modules/system/boot/loader/grub/grub.nix b/nixos/modules/system/boot/loader/grub/grub.nix index 25cec57431e..67fcd10ceb8 100644 --- a/nixos/modules/system/boot/loader/grub/grub.nix +++ b/nixos/modules/system/boot/loader/grub/grub.nix @@ -7,7 +7,7 @@ let cfg = config.boot.loader.grub; realGrub = if cfg.version == 1 then pkgs.grub - else pkgs.grub2.override { zfsSupport = cfg.zfsSupport }; + else pkgs.grub2.override { zfsSupport = cfg.zfsSupport; }; grub = # Don't include GRUB if we're only generating a GRUB menu (e.g., diff --git a/nixos/modules/tasks/filesystems/zfs.nix b/nixos/modules/tasks/filesystems/zfs.nix index d7deb44c407..1c4bbc16b49 100644 --- a/nixos/modules/tasks/filesystems/zfs.nix +++ b/nixos/modules/tasks/filesystems/zfs.nix @@ -133,7 +133,7 @@ in }; boot.initrd = mkIf inInitrd { - kernelModules = [ "spl" "zfs" ] ; + kernelModules = [ "spl" "zfs" ]; extraUtilsCommands = '' cp -v ${zfsPkg}/sbin/zfs $out/bin @@ -148,6 +148,10 @@ in ''; }; + boot.loader.grub = mkIf inInitrd { + zfsSupport = true; + }; + systemd.services."zpool-import" = { description = "Import zpools"; after = [ "systemd-udev-settle.service" ]; -- GitLab From c5bdb469ce06cd0b36d1dcd4a977f97644776546 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Mon, 21 Oct 2013 01:17:23 -0500 Subject: [PATCH 447/843] Update the grub configuration script to handle more complex filesystem layouts including full zfs / and /boot --- .../system/boot/loader/grub/install-grub.pl | 79 +++++++++++++++---- 1 file changed, 64 insertions(+), 15 deletions(-) diff --git a/nixos/modules/system/boot/loader/grub/install-grub.pl b/nixos/modules/system/boot/loader/grub/install-grub.pl index a83733db63b..b9f61337cef 100644 --- a/nixos/modules/system/boot/loader/grub/install-grub.pl +++ b/nixos/modules/system/boot/loader/grub/install-grub.pl @@ -1,5 +1,6 @@ use strict; use warnings; +use Class::Struct; use XML::LibXML; use File::Basename; use File::Path; @@ -47,20 +48,64 @@ print STDERR "updating GRUB $grubVersion menu...\n"; mkpath("/boot/grub", 0, 0700); - # Discover whether /boot is on the same filesystem as / and # /nix/store. If not, then all kernels and initrds must be copied to -# /boot, and all paths in the GRUB config file must be relative to the -# root of the /boot filesystem. `$bootRoot' is the path to be -# prepended to paths under /boot. -my $bootRoot = "/boot"; -if (stat("/")->dev != stat("/boot")->dev) { - $bootRoot = ""; - $copyKernels = 1; -} elsif (stat("/boot")->dev != stat("/nix/store")->dev) { +# /boot. +if (stat("/boot")->dev != stat("/nix")->dev) { $copyKernels = 1; } +# Discover information about the location of /boot +struct(Fs => { + device => '$', + type => '$', + mount => '$', +}); +sub GetFs { + my ($dir) = @_; + my @boot = split(/[ \n\t]+/, `df -T "$dir" | tail -n 1`); + return Fs->new(device => $boot[0], type => $boot[1], mount => $boot[6]); +} +struct (Grub => { + path => '$', + search => '$', +}); +my $driveid = 1; +sub GrubFs { + my ($dir) = @_; + my $fs = GetFs($dir); + my $path = "/" . substr($dir, length($fs->mount)); + my $search = ""; + if ($grubVersion > 1) { + if ($fs->type eq "zfs") { + my $sid = index($fs->device, "/"); + if ($sid < 0) { + $search = "--label " . $fs->device; + $path = "/@" . $path; + } else { + $search = "--label " . substr($fs->device, 0, $sid); + $path = "/" . substr($fs->device, $sid) . "/@" . $path; + } + } else { + my $lbl = "/dev/disk/by-label/"; + if (index($fs->device, $lbl) == 0) { + $search = "--label " . substr($fs->device, length($lbl)); + } + my $uuid = "/dev/disk/by-uuid/"; + if (index($fs->device, $uuid) == 0) { + $search = "--fs-uuid " . substr($fs->device, length($uuid)); + } + } + if (not $search eq "") { + $search = "search --set=drive$driveid " . $search; + $path = "(\$drive$driveid)" . $path; + $driveid += 1; + } + } + return Grub->new(path => $path, search => $search); +} +my $grubBoot = GrubFs("/boot"); +my $grubStore = GrubFs("/nix"); # Generate the header. my $conf .= "# Automatically generated. DO NOT EDIT THIS FILE!\n"; @@ -72,12 +117,14 @@ if ($grubVersion == 1) { "; if ($splashImage) { copy $splashImage, "/boot/background.xpm.gz" or die "cannot copy $splashImage to /boot\n"; - $conf .= "splashimage $bootRoot/background.xpm.gz\n"; + $conf .= "splashimage " . $grubBoot->path . "/background.xpm.gz\n"; } } else { $conf .= " + " . $grubBoot->search . " + " . $grubStore->search . " if [ -s \$prefix/grubenv ]; then load_env fi @@ -98,7 +145,7 @@ else { set timeout=$timeout fi - if loadfont $bootRoot/grub/fonts/unicode.pf2; then + if loadfont " . $grubBoot->path . "/grub/fonts/unicode.pf2; then set gfxmode=640x480 insmod gfxterm insmod vbe @@ -112,7 +159,7 @@ else { copy $splashImage, "/boot/background.png" or die "cannot copy $splashImage to /boot\n"; $conf .= " insmod png - if background_image $bootRoot/background.png; then + if background_image " . $grubBoot->path . "/background.png; then set color_normal=white/black set color_highlight=black/white else @@ -134,7 +181,7 @@ mkpath("/boot/kernels", 0, 0755) if $copyKernels; sub copyToKernelsDir { my ($path) = @_; - return $path unless $copyKernels; + return $grubStore->path . substr($path, length("/nix")) unless $copyKernels; $path =~ /\/nix\/store\/(.*)/ or die; my $name = $1; $name =~ s/\//-/g; my $dst = "/boot/kernels/$name"; @@ -147,7 +194,7 @@ sub copyToKernelsDir { rename $tmp, $dst or die "cannot rename $tmp to $dst\n"; } $copied{$dst} = 1; - return "$bootRoot/kernels/$name"; + return $grubBoot->path . "/kernels/$name"; } sub addEntry { @@ -174,6 +221,8 @@ sub addEntry { $conf .= " " . ($xen ? "module" : "initrd") . " $initrd\n\n"; } else { $conf .= "menuentry \"$name\" {\n"; + $conf .= $grubBoot->search . "\n"; + $conf .= $grubStore->search . "\n"; $conf .= " $extraPerEntryConfig\n" if $extraPerEntryConfig; $conf .= " multiboot $xen $xenParams\n" if $xen; $conf .= " " . ($xen ? "module" : "linux") . " $kernel $kernelParams\n"; @@ -191,7 +240,7 @@ addEntry("NixOS - Default", $defaultConfig); $conf .= "$extraEntries\n" unless $extraEntriesBeforeNixOS; # extraEntries could refer to @bootRoot@, which we have to substitute -$conf =~ s/\@bootRoot\@/$bootRoot/g; +$conf =~ s/\@bootRoot\@/$grubBoot->path/g; # Emit submenus for all system profiles. sub addProfile { -- GitLab From fba9f641a8ed54c27b1d9fadbd2022d8e18ce180 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Tue, 29 Apr 2014 22:26:23 -0500 Subject: [PATCH 448/843] grub: Add support for forcing devices to be identified with labels or UUIDs --- .../modules/system/boot/loader/grub/grub.nix | 19 ++++++++++-- .../system/boot/loader/grub/install-grub.pl | 30 ++++++++++++++----- 2 files changed, 40 insertions(+), 9 deletions(-) diff --git a/nixos/modules/system/boot/loader/grub/grub.nix b/nixos/modules/system/boot/loader/grub/grub.nix index 67fcd10ceb8..bc19dd8c62f 100644 --- a/nixos/modules/system/boot/loader/grub/grub.nix +++ b/nixos/modules/system/boot/loader/grub/grub.nix @@ -26,11 +26,11 @@ let inherit (cfg) version extraConfig extraPerEntryConfig extraEntries extraEntriesBeforeNixOS extraPrepareConfig configurationLimit copyKernels timeout - default devices; + default devices fsIdentifier; path = (makeSearchPath "bin" [ pkgs.coreutils pkgs.gnused pkgs.gnugrep pkgs.findutils pkgs.diffutils ]) + ":" + (makeSearchPath "sbin" [ - pkgs.mdadm + pkgs.mdadm pkgs.utillinux ]); }); @@ -210,6 +210,21 @@ in ''; }; + fsIdentifier = mkOption { + default = "uuid"; + type = types.addCheck types.string + (type: type == "uuid" || type == "label" || type = "provided"); + description = '' + Determines how grub will identify devices when generating the + configuration file. A value of uuid / label signifies that grub + will always resolve the uuid or label of the device before using + it in the configuration. A value of provided means that grub will + use the device name as show in df or + mount. Note, zfs zpools / datasets are ignored + and will always be mounted using their labels. + ''; + }; + zfsSupport = mkOption { default = false; type = types.bool; diff --git a/nixos/modules/system/boot/loader/grub/install-grub.pl b/nixos/modules/system/boot/loader/grub/install-grub.pl index b9f61337cef..2615bc3ae11 100644 --- a/nixos/modules/system/boot/loader/grub/install-grub.pl +++ b/nixos/modules/system/boot/loader/grub/install-grub.pl @@ -8,6 +8,7 @@ use File::stat; use File::Copy; use POSIX; use Cwd; +use Switch; my $defaultConfig = $ARGV[1] or die; @@ -40,6 +41,7 @@ my $configurationLimit = int(get("configurationLimit")); my $copyKernels = get("copyKernels") eq "true"; my $timeout = int(get("timeout")); my $defaultEntry = int(get("default")); +my $fsIdentifier = get("fsIdentifier"); $ENV{'PATH'} = get("path"); die "unsupported GRUB version\n" if $grubVersion != 1 && $grubVersion != 2; @@ -87,13 +89,27 @@ sub GrubFs { $path = "/" . substr($fs->device, $sid) . "/@" . $path; } } else { - my $lbl = "/dev/disk/by-label/"; - if (index($fs->device, $lbl) == 0) { - $search = "--label " . substr($fs->device, length($lbl)); - } - my $uuid = "/dev/disk/by-uuid/"; - if (index($fs->device, $uuid) == 0) { - $search = "--fs-uuid " . substr($fs->device, length($uuid)); + my $idCmd = "\$(blkid -o export $fs->device) 2>/dev/null; echo" + switch ($fsIdentifier) { + case "uuid" { + $search = "--fs-uuid " . `$idCmd \$UUID`; + } + case "label" { + $search = "--label " . `$idCmd \$LABEL`; + } + case "provided" { + my $lbl = "/dev/disk/by-label/"; + if (index($fs->device, $lbl) == 0) { + $search = "--label " . substr($fs->device, length($lbl)); + } + my $uuid = "/dev/disk/by-uuid/"; + if (index($fs->device, $uuid) == 0) { + $search = "--fs-uuid " . substr($fs->device, length($uuid)); + } + } + else { + die "invalid fs identifier type\n"; + } } } if (not $search eq "") { -- GitLab From a6e6c85f06395a92062eb31753a8dd8f3b7e733c Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Tue, 29 Apr 2014 22:53:11 -0500 Subject: [PATCH 449/843] grub: Add support for detecting btrfs subvolumes --- nixos/modules/system/boot/loader/grub/grub.nix | 2 +- nixos/modules/system/boot/loader/grub/install-grub.pl | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/nixos/modules/system/boot/loader/grub/grub.nix b/nixos/modules/system/boot/loader/grub/grub.nix index bc19dd8c62f..581b76f8fb2 100644 --- a/nixos/modules/system/boot/loader/grub/grub.nix +++ b/nixos/modules/system/boot/loader/grub/grub.nix @@ -28,7 +28,7 @@ let extraEntriesBeforeNixOS extraPrepareConfig configurationLimit copyKernels timeout default devices fsIdentifier; path = (makeSearchPath "bin" [ - pkgs.coreutils pkgs.gnused pkgs.gnugrep pkgs.findutils pkgs.diffutils + pkgs.coreutils pkgs.gnused pkgs.gnugrep pkgs.findutils pkgs.diffutils pkgs.btrfsProgs ]) + ":" + (makeSearchPath "sbin" [ pkgs.mdadm pkgs.utillinux ]); diff --git a/nixos/modules/system/boot/loader/grub/install-grub.pl b/nixos/modules/system/boot/loader/grub/install-grub.pl index 2615bc3ae11..814ae7e05f7 100644 --- a/nixos/modules/system/boot/loader/grub/install-grub.pl +++ b/nixos/modules/system/boot/loader/grub/install-grub.pl @@ -111,6 +111,13 @@ sub GrubFs { die "invalid fs identifier type\n"; } } + if ($fs->type eq "btrfs") { + $subvol = `mount | sed -n 's,^$fs->device on .*subvol=\([^,)]*\).*$,\1,p'` + if ($subvol eq "") { + $subvol = `btrfs subvol get-default $fs->mount | sed -n 's,^.*path \([^ ]*\) .*$,\1,p'` + } + $path = "/$subvol"; + } } if (not $search eq "") { $search = "search --set=drive$driveid " . $search; -- GitLab From 70c11772a69dad8f414366f1bce511282853a80b Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Wed, 30 Apr 2014 16:51:34 -0500 Subject: [PATCH 450/843] nixos/grub: Fix some silly perl struct accesses --- nixos/modules/system/boot/loader/grub/install-grub.pl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nixos/modules/system/boot/loader/grub/install-grub.pl b/nixos/modules/system/boot/loader/grub/install-grub.pl index 814ae7e05f7..64151a282f1 100644 --- a/nixos/modules/system/boot/loader/grub/install-grub.pl +++ b/nixos/modules/system/boot/loader/grub/install-grub.pl @@ -89,7 +89,7 @@ sub GrubFs { $path = "/" . substr($fs->device, $sid) . "/@" . $path; } } else { - my $idCmd = "\$(blkid -o export $fs->device) 2>/dev/null; echo" + my $idCmd = "\$(blkid -o export " . $fs->device . ") 2>/dev/null; echo" switch ($fsIdentifier) { case "uuid" { $search = "--fs-uuid " . `$idCmd \$UUID`; @@ -112,9 +112,9 @@ sub GrubFs { } } if ($fs->type eq "btrfs") { - $subvol = `mount | sed -n 's,^$fs->device on .*subvol=\([^,)]*\).*$,\1,p'` + $subvol = `mount | sed -n 's,^@{[$fs->device]} on .*subvol=\([^,)]*\).*\$,\1,p'` if ($subvol eq "") { - $subvol = `btrfs subvol get-default $fs->mount | sed -n 's,^.*path \([^ ]*\) .*$,\1,p'` + $subvol = `btrfs subvol get-default @{[$fs->mount]} | sed -n 's,^.*path \([^ ]*\) .*\$,\1,p'` } $path = "/$subvol"; } -- GitLab From 525acb4d4fbfdf1ef18486fba4b2aa673065666a Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Wed, 30 Apr 2014 17:53:23 -0500 Subject: [PATCH 451/843] nixos/grub: Fix typo --- nixos/modules/system/boot/loader/grub/grub.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/system/boot/loader/grub/grub.nix b/nixos/modules/system/boot/loader/grub/grub.nix index 581b76f8fb2..57bf2cefa6f 100644 --- a/nixos/modules/system/boot/loader/grub/grub.nix +++ b/nixos/modules/system/boot/loader/grub/grub.nix @@ -213,7 +213,7 @@ in fsIdentifier = mkOption { default = "uuid"; type = types.addCheck types.string - (type: type == "uuid" || type == "label" || type = "provided"); + (type: type == "uuid" || type == "label" || type == "provided"); description = '' Determines how grub will identify devices when generating the configuration file. A value of uuid / label signifies that grub -- GitLab From 1f460e00efb99a1450f5b5806d68ff6633641ad8 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Wed, 30 Apr 2014 18:04:45 -0500 Subject: [PATCH 452/843] grub: Build grub2 from git instead of using the unpredictable generated tarball --- pkgs/tools/misc/grub/2.0x.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/misc/grub/2.0x.nix b/pkgs/tools/misc/grub/2.0x.nix index 59658e47a08..04971b68a84 100644 --- a/pkgs/tools/misc/grub/2.0x.nix +++ b/pkgs/tools/misc/grub/2.0x.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, autogen, flex, bison, python, autoconf, automake +{ stdenv, fetchurl, fetchgit, autogen, flex, bison, python, autoconf, automake , gettext, ncurses, libusb, freetype, qemu, devicemapper , linuxPackages ? null , EFIsupport ? false @@ -23,9 +23,10 @@ in stdenv.mkDerivation rec { name = "${prefix}-${version}"; - src = fetchurl { - url = "http://git.savannah.gnu.org/cgit/grub.git/snapshot/grub-2.02-beta2.tar.gz"; - sha256 = "1n2l7k76lqqaavz12615vx5kca0kl8g13bkimc7xsd9s7c1ir5lr"; + src = fetchgit { + url = "git://git.sv.gnu.org/grub.git"; + rev = "refs/tags/grub-2.02-beta2"; + sha256 = "157bknkcxibmvq19pagphlwfxd9xny7002gcanfzhjzcjpfz4scy"; }; nativeBuildInputs = [ autogen flex bison python autoconf automake ]; -- GitLab From 99b4792554859b57b6263a807f9335edceb7a4b0 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Wed, 30 Apr 2014 18:45:44 -0500 Subject: [PATCH 453/843] nixos/grub: Refactor perl script to remove the Switch module --- .../system/boot/loader/grub/install-grub.pl | 48 ++++++++++--------- 1 file changed, 26 insertions(+), 22 deletions(-) diff --git a/nixos/modules/system/boot/loader/grub/install-grub.pl b/nixos/modules/system/boot/loader/grub/install-grub.pl index 64151a282f1..fd298333cc4 100644 --- a/nixos/modules/system/boot/loader/grub/install-grub.pl +++ b/nixos/modules/system/boot/loader/grub/install-grub.pl @@ -8,7 +8,6 @@ use File::stat; use File::Copy; use POSIX; use Cwd; -use Switch; my $defaultConfig = $ARGV[1] or die; @@ -78,9 +77,13 @@ sub GrubFs { my $fs = GetFs($dir); my $path = "/" . substr($dir, length($fs->mount)); my $search = ""; + if ($grubVersion > 1) { + # ZFS is completely separate logic as zpools are always identified by a label + # or custom UUID if ($fs->type eq "zfs") { my $sid = index($fs->device, "/"); + if ($sid < 0) { $search = "--label " . $fs->device; $path = "/@" . $path; @@ -89,32 +92,33 @@ sub GrubFs { $path = "/" . substr($fs->device, $sid) . "/@" . $path; } } else { - my $idCmd = "\$(blkid -o export " . $fs->device . ") 2>/dev/null; echo" - switch ($fsIdentifier) { - case "uuid" { - $search = "--fs-uuid " . `$idCmd \$UUID`; - } - case "label" { - $search = "--label " . `$idCmd \$LABEL`; + my $idCmd = "\$(blkid -o export " . $fs->device . ") 2>/dev/null; echo"; + + if ($fsIdentifier eq "uuid") { + $search = "--fs-uuid " . `$idCmd \$UUID`; + } elsif ($fsIdentifier eq "label") { + $search = "--label " . `$idCmd \$LABEL`; + } elsif ($fsIdentifier eq "provided") { + my $lbl = "/dev/disk/by-label/"; + + # If the provided dev is identifying the partition using a label or uuid, + # we should get the label / uuid and do a proper search + if (index($fs->device, $lbl) == 0) { + $search = "--label " . substr($fs->device, length($lbl)); } - case "provided" { - my $lbl = "/dev/disk/by-label/"; - if (index($fs->device, $lbl) == 0) { - $search = "--label " . substr($fs->device, length($lbl)); - } - my $uuid = "/dev/disk/by-uuid/"; - if (index($fs->device, $uuid) == 0) { - $search = "--fs-uuid " . substr($fs->device, length($uuid)); - } - } - else { - die "invalid fs identifier type\n"; + my $uuid = "/dev/disk/by-uuid/"; + if (index($fs->device, $uuid) == 0) { + $search = "--fs-uuid " . substr($fs->device, length($uuid)); } + } else { + die "invalid fs identifier type\n"; } + + # BTRFS is a special case in that we need to fix the referrenced path based on subvolumes if ($fs->type eq "btrfs") { - $subvol = `mount | sed -n 's,^@{[$fs->device]} on .*subvol=\([^,)]*\).*\$,\1,p'` + my $subvol = `mount | sed -n 's,^@{[$fs->device]} on .*subvol=\([^,)]*\).*\$,\1,p'`; if ($subvol eq "") { - $subvol = `btrfs subvol get-default @{[$fs->mount]} | sed -n 's,^.*path \([^ ]*\) .*\$,\1,p'` + $subvol = `btrfs subvol get-default @{[$fs->mount]} | sed -n 's,^.*path \([^ ]*\) .*\$,\1,p'`; } $path = "/$subvol"; } -- GitLab From d4e2040099b33f62971aee2f8530e693115cd680 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Thu, 1 May 2014 06:04:57 -0500 Subject: [PATCH 454/843] nixos/grub: Refactor install-grub.pl and correct perl syntax --- .../system/boot/loader/grub/install-grub.pl | 64 ++++++++++++------- 1 file changed, 40 insertions(+), 24 deletions(-) diff --git a/nixos/modules/system/boot/loader/grub/install-grub.pl b/nixos/modules/system/boot/loader/grub/install-grub.pl index fd298333cc4..f95e8f75431 100644 --- a/nixos/modules/system/boot/loader/grub/install-grub.pl +++ b/nixos/modules/system/boot/loader/grub/install-grub.pl @@ -81,46 +81,62 @@ sub GrubFs { if ($grubVersion > 1) { # ZFS is completely separate logic as zpools are always identified by a label # or custom UUID - if ($fs->type eq "zfs") { - my $sid = index($fs->device, "/"); + if ($fs->type eq 'zfs') { + my $sid = index($fs->device, '/'); if ($sid < 0) { - $search = "--label " . $fs->device; - $path = "/@" . $path; + $search = '--label ' . $fs->device; + $path = '/@' . $path; } else { - $search = "--label " . substr($fs->device, 0, $sid); - $path = "/" . substr($fs->device, $sid) . "/@" . $path; + $search = '--label ' . substr($fs->device, 0, $sid); + $path = '/' . substr($fs->device, $sid) . '/@' . $path; } } else { - my $idCmd = "\$(blkid -o export " . $fs->device . ") 2>/dev/null; echo"; - - if ($fsIdentifier eq "uuid") { - $search = "--fs-uuid " . `$idCmd \$UUID`; - } elsif ($fsIdentifier eq "label") { - $search = "--label " . `$idCmd \$LABEL`; - } elsif ($fsIdentifier eq "provided") { - my $lbl = "/dev/disk/by-label/"; - + if ($fsIdentifier eq 'provided') { # If the provided dev is identifying the partition using a label or uuid, # we should get the label / uuid and do a proper search + my $lbl = '/dev/disk/by-label/'; if (index($fs->device, $lbl) == 0) { - $search = "--label " . substr($fs->device, length($lbl)); + $search = '--label ' . substr($fs->device, length($lbl)); } - my $uuid = "/dev/disk/by-uuid/"; + + my $uuid = '/dev/disk/by-uuid/'; if (index($fs->device, $uuid) == 0) { - $search = "--fs-uuid " . substr($fs->device, length($uuid)); + $search = '--fs-uuid ' . substr($fs->device, length($uuid)); } } else { - die "invalid fs identifier type\n"; + # Determine the identifying type + my %types = ('uuid' => '--fs-uuid', 'label' => '--label'); + $search = $types{$fsIdentifier} . ' '; + + # Based on the type pull in the identifier from the system + my $devInfo = `blkid -o export @{[$fs->device]}`; + my @matches = $devInfo =~ m/@{[uc $fsIdentifier]}=([^\n]*)/; + if ($#matches != 0) { + die "Couldn't find a $types{$fsIdentifier} for @{[$fs->device]}\n" + } + $search .= $matches[0]; } # BTRFS is a special case in that we need to fix the referrenced path based on subvolumes - if ($fs->type eq "btrfs") { - my $subvol = `mount | sed -n 's,^@{[$fs->device]} on .*subvol=\([^,)]*\).*\$,\1,p'`; - if ($subvol eq "") { - $subvol = `btrfs subvol get-default @{[$fs->mount]} | sed -n 's,^.*path \([^ ]*\) .*\$,\1,p'`; + if ($fs->type eq 'btrfs') { + my $subvol = ""; + + my @subvols = `mount` =~ m/@{[$fs->device]} on [^\n]*subvol=([^,)]*)/; + if ($#subvols > 0) { + die "Btrfs device @{[$fs->device]} listed multiple times in mount\n" + } elsif ($#subvols == 0) { + $subvol = $subvols[0]; + } else { + my $btrfsDefault = `btrfs subvol get-default @{[$fs->mount]}`; + my @results = $btrfsDefault =~ m/path ([^ ]*)/; + if ($#results > 0) { + die "Btrfs device @{[$fs->device]} has multiple default subvolumes\n"; + } elsif ($#results == 1) { + $subvol = $results[0]; + } } - $path = "/$subvol"; + $path = "/$subvol" . $path; } } if (not $search eq "") { -- GitLab From 769d2dc6bf7bba3867e13c125fc0a6d5c76aa19a Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Thu, 1 May 2014 19:08:54 -0500 Subject: [PATCH 455/843] nixos/grub: Catch errors from command execution --- .../system/boot/loader/grub/install-grub.pl | 34 +++++++++++++++---- 1 file changed, 28 insertions(+), 6 deletions(-) diff --git a/nixos/modules/system/boot/loader/grub/install-grub.pl b/nixos/modules/system/boot/loader/grub/install-grub.pl index f95e8f75431..6748a5ca08f 100644 --- a/nixos/modules/system/boot/loader/grub/install-grub.pl +++ b/nixos/modules/system/boot/loader/grub/install-grub.pl @@ -28,6 +28,14 @@ sub writeFile { close FILE or die; } +sub runCommand { + my ($cmd) = @_; + open FILE, "$cmd 2>/dev/null |" or die "Failed to execute: $cmd\n"; + my @ret = ; + close FILE; + return ($?, @ret); +} + my $grub = get("grub"); my $grubVersion = int(get("version")); my $extraConfig = get("extraConfig"); @@ -64,7 +72,11 @@ struct(Fs => { }); sub GetFs { my ($dir) = @_; - my @boot = split(/[ \n\t]+/, `df -T "$dir" | tail -n 1`); + my ($status, @dfOut) = runCommand("df -T $dir"); + if ($status != 0 || $#dfOut != 1) { + die "Failed to retrieve output about $dir from `df`"; + } + my @boot = split(/[ \n\t]+/, $dfOut[1]); return Fs->new(device => $boot[0], type => $boot[1], mount => $boot[6]); } struct (Grub => { @@ -110,8 +122,11 @@ sub GrubFs { $search = $types{$fsIdentifier} . ' '; # Based on the type pull in the identifier from the system - my $devInfo = `blkid -o export @{[$fs->device]}`; - my @matches = $devInfo =~ m/@{[uc $fsIdentifier]}=([^\n]*)/; + my ($status, @devInfo) = runCommand("blkid -o export @{[$fs->device]}"); + if ($status != 0) { + die "Failed to get blkid info for @{[$fs->device]}"; + } + my @matches = join("", @devInfo) =~ m/@{[uc $fsIdentifier]}=([^\n]*)/; if ($#matches != 0) { die "Couldn't find a $types{$fsIdentifier} for @{[$fs->device]}\n" } @@ -122,14 +137,21 @@ sub GrubFs { if ($fs->type eq 'btrfs') { my $subvol = ""; - my @subvols = `mount` =~ m/@{[$fs->device]} on [^\n]*subvol=([^,)]*)/; + my ($status, @mounts) = runCommand('mount'); + if ($status != 0) { + die "Failed to retreive mount info"; + } + my @subvols = join("", @mounts) =~ m/@{[$fs->device]} on [^\n]*subvol=([^,)]*)/; if ($#subvols > 0) { die "Btrfs device @{[$fs->device]} listed multiple times in mount\n" } elsif ($#subvols == 0) { $subvol = $subvols[0]; } else { - my $btrfsDefault = `btrfs subvol get-default @{[$fs->mount]}`; - my @results = $btrfsDefault =~ m/path ([^ ]*)/; + my ($status, @btrfsOut) = runCommand("btrfs subvol get-default @{[$fs->mount]}"); + if ($status != 0) { + die "Failed to retrieve btrfs default subvolume" + } + my @results = join("", @btrfsOut) =~ m/path ([^ ]*)/; if ($#results > 0) { die "Btrfs device @{[$fs->device]} has multiple default subvolumes\n"; } elsif ($#results == 1) { -- GitLab From 5870ae613f42c99456dcbbc4df01abdce3c1f448 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Thu, 1 May 2014 20:21:02 -0500 Subject: [PATCH 456/843] nixos/release: Dynamically generate installer tests --- nixos/release.nix | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/nixos/release.nix b/nixos/release.nix index 0620b46d46a..e5a4e7337ab 100644 --- a/nixos/release.nix +++ b/nixos/release.nix @@ -222,12 +222,11 @@ in rec { tests.firefox = callTest tests/firefox.nix {}; tests.firewall = callTest tests/firewall.nix {}; tests.gnome3 = callTest tests/gnome3.nix {}; - tests.installer.efi = forAllSystems (system: (import tests/installer.nix { inherit system; }).efi.test); - tests.installer.grub1 = forAllSystems (system: (import tests/installer.nix { inherit system; }).grub1.test); - tests.installer.lvm = forAllSystems (system: (import tests/installer.nix { inherit system; }).lvm.test); - tests.installer.rebuildCD = forAllSystems (system: (import tests/installer.nix { inherit system; }).rebuildCD.test); - tests.installer.separateBoot = forAllSystems (system: (import tests/installer.nix { inherit system; }).separateBoot.test); - tests.installer.simple = forAllSystems (system: (import tests/installer.nix { inherit system; }).simple.test); + tests.installer = with pkgs.lib; + let installer = import tests/installer.nix; in + flip mapAttrs (installer { }) (name: _: + forAllSystems (system: (installer { system = system; }).${name}.test) + ); tests.influxdb = callTest tests/influxdb.nix {}; tests.ipv6 = callTest tests/ipv6.nix {}; tests.jenkins = callTest tests/jenkins.nix {}; -- GitLab From 8329d12b799b98a2b220e34ed347417c2d5b8fbe Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Thu, 1 May 2014 23:11:18 -0500 Subject: [PATCH 457/843] grub: Change fsIdentifier to str from string --- nixos/modules/system/boot/loader/grub/grub.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/system/boot/loader/grub/grub.nix b/nixos/modules/system/boot/loader/grub/grub.nix index 57bf2cefa6f..8ba7ae2c7fa 100644 --- a/nixos/modules/system/boot/loader/grub/grub.nix +++ b/nixos/modules/system/boot/loader/grub/grub.nix @@ -212,7 +212,7 @@ in fsIdentifier = mkOption { default = "uuid"; - type = types.addCheck types.string + type = types.addCheck types.str (type: type == "uuid" || type == "label" || type == "provided"); description = '' Determines how grub will identify devices when generating the -- GitLab From 809caa87ab88fae9164347c3f1a63f6117c09821 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Thu, 1 May 2014 06:21:30 -0500 Subject: [PATCH 458/843] tests/installer: Add btrfs tests for grub and nixos-generate-config --- nixos/tests/installer.nix | 45 +++++++++++++++++++++++++++++++++++++++ 1 file changed, 45 insertions(+) diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix index 621afffbfc1..89abafcab83 100644 --- a/nixos/tests/installer.nix +++ b/nixos/tests/installer.nix @@ -394,4 +394,49 @@ in { $machine->shutdown; ''; }; + + # Simple btrfs grub testing + btrfsSimple = makeInstallerTest { + createPartitions = '' + $machine->succeed( + "sgdisk -Z /dev/vda", + "sgdisk -n 1:0:+1M -N 2 -t 1:ef02 -t 2:8300 -c 2:root /dev/vda", + "mkfs.btrfs -L root /dev/vda2", + "mount LABEL=root /mnt", + ); + ''; + }; + + # Test to see if we can detect /boot and /nix on subvolumes + btrfsSubvols = makeInstallerTest { + createPartitions = '' + $machine->succeed( + "sgdisk -Z /dev/vda", + "sgdisk -n 1:0:+1M -N 2 -t 1:ef02 -t 2:8300 -c 2:root /dev/vda", + "mkfs.btrfs -L root /dev/vda2", + "btrfs device scan", + "mount LABEL=root /mnt", + "btrfs subvol create /mnt/boot", + "btrfs subvol create /mnt/nixos", + "umount /mnt", + "mount -o defaults,subvol=mnt LABEL=root /mnt", + "mkdir /mnt/boot", + "mount -o defaults,subvol=boot LABEL=root /mnt/boot", + ); + ''; + }; + + # Test to see if we can detect subvols by their id's + btrfsSubvolId = makeInstallerTest { + createPartitions = '' + $machine->succeed("false"); + ''; + }; + + # Test to see if we can detect a default subvolume on / + btrfsDefaultSubvol = makeInstallerTest { + createPartitions = '' + $machine->succeed("false"); + ''; + }; } -- GitLab From 2b703f82d5f257b91389267f11e7914d8df550bf Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Thu, 1 May 2014 23:11:49 -0500 Subject: [PATCH 459/843] tests/installer: Test for more grub configurations --- nixos/tests/installer.nix | 42 +++++++++++++++++++++++++++++++++------ 1 file changed, 36 insertions(+), 6 deletions(-) diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix index 89abafcab83..2bee2f77999 100644 --- a/nixos/tests/installer.nix +++ b/nixos/tests/installer.nix @@ -35,8 +35,8 @@ let # The configuration to install. - makeConfig = { testChannel, useEFI, grubVersion, grubDevice }: pkgs.writeText "configuration.nix" - '' + makeConfig = { testChannel, useEFI, grubVersion, grubDevice, grubIdentifier }: + pkgs.writeText "configuration.nix" '' { config, pkgs, modulesPath, ... }: { imports = @@ -54,6 +54,7 @@ let ''} boot.loader.grub.device = "${grubDevice}"; boot.loader.grub.extraConfig = "serial; terminal_output.serial"; + boot.loader.grub.fsIdentifier = "${grubIdentifier}"; ''} environment.systemPackages = [ ${optionalString testChannel "pkgs.rlwrap"} ]; @@ -93,7 +94,7 @@ let # disk, and then reboot from the hard disk. It's parameterized with # a test script fragment `createPartitions', which must create # partitions and filesystems. - testScriptFun = { createPartitions, testChannel, useEFI, grubVersion, grubDevice }: + testScriptFun = { createPartitions, testChannel, useEFI, grubVersion, grubDevice, grubIdentifier }: let # FIXME: OVMF doesn't boot from virtio http://www.mail-archive.com/edk2-devel@lists.sourceforge.net/msg01501.html iface = if useEFI || grubVersion == 1 then "scsi" else "virtio"; @@ -161,7 +162,7 @@ let $machine->succeed("cat /mnt/etc/nixos/hardware-configuration.nix >&2"); $machine->copyFileFromHost( - "${ makeConfig { inherit testChannel useEFI grubVersion grubDevice; } }", + "${ makeConfig { inherit testChannel useEFI grubVersion grubDevice grubIdentifier; } }", "/mnt/etc/nixos/configuration.nix"); # Perform the installation. @@ -216,13 +217,13 @@ let makeInstallerTest = name: - { createPartitions, testChannel ? false, useEFI ? false, grubVersion ? 2, grubDevice ? "/dev/vda" }: + { createPartitions, testChannel ? false, useEFI ? false, grubVersion ? 2, grubDevice ? "/dev/vda", grubIdentifier ? "uuid" }: makeTest { inherit iso; name = "installer-" + name; nodes = if testChannel then { inherit webserver; } else { }; testScript = testScriptFun { - inherit createPartitions testChannel useEFI grubVersion grubDevice; + inherit createPartitions testChannel useEFI grubVersion grubDevice grubIdentifier; }; }; @@ -395,6 +396,35 @@ in { ''; }; + # Test using labels to identify volumes in grub + simpleLabels = makeInstallerTest { + createPartitions = '' + $machine->succeed( + "sgdisk -Z /dev/vda", + "sgdisk -n 1:0:+1M -N 2 -t 1:ef02 -t 2:8300 -c 2:root /dev/vda", + "mkfs.ext4 -L root /dev/vda2", + "mount LABEL=root /mnt", + ); + ''; + grubIdentifier = "label"; + }; + + # Test using the provided disk name within grub + simpleProvided = makeInstallerTest { + createPartitions = '' + $machine->succeed( + "sgdisk -Z /dev/vda", + "sgdisk -n 1:0:+1M -n 2:0:+100M -N 3 -t 1:ef02 -t 2:8300 -t 3:8300 -c 2:boot -c 3:root /dev/vda", + "mkfs.ext4 -L boot /dev/vda2", + "mkfs.ext4 -L root /dev/vda3", + "mount LABEL=root /mnt", + "mkdir /mnt/boot", + "$(blkid -o export /dev/vda2); mount /dev/disk/by-uuid/$UUID /mnt/boot" + ); + ''; + grubIdentifier = "provided"; + }; + # Simple btrfs grub testing btrfsSimple = makeInstallerTest { createPartitions = '' -- GitLab From 62fedf6081200e38df515204683df472e0fe959d Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Thu, 1 May 2014 23:22:21 -0500 Subject: [PATCH 460/843] installer/btrfs: Typo in subvol --- nixos/tests/installer.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix index 2bee2f77999..2064675ecd9 100644 --- a/nixos/tests/installer.nix +++ b/nixos/tests/installer.nix @@ -449,7 +449,7 @@ in { "btrfs subvol create /mnt/boot", "btrfs subvol create /mnt/nixos", "umount /mnt", - "mount -o defaults,subvol=mnt LABEL=root /mnt", + "mount -o defaults,subvol=nixos LABEL=root /mnt", "mkdir /mnt/boot", "mount -o defaults,subvol=boot LABEL=root /mnt/boot", ); -- GitLab From d4a9645ef0d365e4ff30d2ae29ec163a53869625 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Thu, 1 May 2014 23:40:51 -0500 Subject: [PATCH 461/843] nixos/grub: Needs mount so add utillinux to bin --- nixos/modules/system/boot/loader/grub/grub.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/system/boot/loader/grub/grub.nix b/nixos/modules/system/boot/loader/grub/grub.nix index 8ba7ae2c7fa..bc9a155ac95 100644 --- a/nixos/modules/system/boot/loader/grub/grub.nix +++ b/nixos/modules/system/boot/loader/grub/grub.nix @@ -29,6 +29,7 @@ let default devices fsIdentifier; path = (makeSearchPath "bin" [ pkgs.coreutils pkgs.gnused pkgs.gnugrep pkgs.findutils pkgs.diffutils pkgs.btrfsProgs + pkgs.utillinux ]) + ":" + (makeSearchPath "sbin" [ pkgs.mdadm pkgs.utillinux ]); -- GitLab From 8b36bf5c59ef7d2af849a0304f76a6a25b997408 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Thu, 1 May 2014 23:52:06 -0500 Subject: [PATCH 462/843] tests/installer: fix mount --- nixos/tests/installer.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix index 2064675ecd9..a7f7c766157 100644 --- a/nixos/tests/installer.nix +++ b/nixos/tests/installer.nix @@ -419,7 +419,7 @@ in { "mkfs.ext4 -L root /dev/vda3", "mount LABEL=root /mnt", "mkdir /mnt/boot", - "$(blkid -o export /dev/vda2); mount /dev/disk/by-uuid/$UUID /mnt/boot" + "$(blkid -o export /dev/vda2); mount /dev/disk/by-uuid/\\$UUID /mnt/boot" ); ''; grubIdentifier = "provided"; -- GitLab From 8ff4b3b78048231a9e56d1597ee09592dd05eab8 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Fri, 2 May 2014 00:01:32 -0500 Subject: [PATCH 463/843] tests/installer: Add swap to the new tests --- nixos/tests/installer.nix | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix index a7f7c766157..93b6182a09c 100644 --- a/nixos/tests/installer.nix +++ b/nixos/tests/installer.nix @@ -401,7 +401,9 @@ in { createPartitions = '' $machine->succeed( "sgdisk -Z /dev/vda", - "sgdisk -n 1:0:+1M -N 2 -t 1:ef02 -t 2:8300 -c 2:root /dev/vda", + "sgdisk -n 1:0:+1M -n 2:0:+100M -N 3 -t 1:ef02 -t 2:8200 -t 3:8300 -c 3:root /dev/vda", + "mkswap /dev/vda2 -L swap", + "swapon -L swap", "mkfs.ext4 -L root /dev/vda2", "mount LABEL=root /mnt", ); @@ -414,9 +416,11 @@ in { createPartitions = '' $machine->succeed( "sgdisk -Z /dev/vda", - "sgdisk -n 1:0:+1M -n 2:0:+100M -N 3 -t 1:ef02 -t 2:8300 -t 3:8300 -c 2:boot -c 3:root /dev/vda", + "sgdisk -n 1:0:+1M -n 2:0:+100M -n 3:0:+100M -N 4 -t 1:ef02 -t 2:8300 -t 3:8200 -t 4:8300 -c 2:boot -c 4:root /dev/vda", + "mkswap /dev/vda3 -L swap", + "swapon -L swap", "mkfs.ext4 -L boot /dev/vda2", - "mkfs.ext4 -L root /dev/vda3", + "mkfs.ext4 -L root /dev/vda4", "mount LABEL=root /mnt", "mkdir /mnt/boot", "$(blkid -o export /dev/vda2); mount /dev/disk/by-uuid/\\$UUID /mnt/boot" @@ -430,8 +434,10 @@ in { createPartitions = '' $machine->succeed( "sgdisk -Z /dev/vda", - "sgdisk -n 1:0:+1M -N 2 -t 1:ef02 -t 2:8300 -c 2:root /dev/vda", - "mkfs.btrfs -L root /dev/vda2", + "sgdisk -n 1:0:+1M -n 2:0:+100M -N 3 -t 1:ef02 -t 2:8200 -t 3:8300 -c 3:root /dev/vda", + "mkswap /dev/vda2 -L swap", + "swapon -L swap", + "mkfs.btrfs -L root /dev/vda3", "mount LABEL=root /mnt", ); ''; @@ -442,8 +448,10 @@ in { createPartitions = '' $machine->succeed( "sgdisk -Z /dev/vda", - "sgdisk -n 1:0:+1M -N 2 -t 1:ef02 -t 2:8300 -c 2:root /dev/vda", - "mkfs.btrfs -L root /dev/vda2", + "sgdisk -n 1:0:+1M -n 2:0:+100M -N 3 -t 1:ef02 -t 2:8200 -t 3:8300 -c 3:root /dev/vda", + "mkswap /dev/vda2 -L swap", + "swapon -L swap", + "mkfs.btrfs -L root /dev/vda3", "btrfs device scan", "mount LABEL=root /mnt", "btrfs subvol create /mnt/boot", -- GitLab From 429f785135ebca304767ecf435b5d5e979c2f3f2 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Fri, 2 May 2014 00:25:38 -0500 Subject: [PATCH 464/843] tests/installer: Fix simple tests --- nixos/tests/installer.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix index 93b6182a09c..4fceb19f234 100644 --- a/nixos/tests/installer.nix +++ b/nixos/tests/installer.nix @@ -404,7 +404,7 @@ in { "sgdisk -n 1:0:+1M -n 2:0:+100M -N 3 -t 1:ef02 -t 2:8200 -t 3:8300 -c 3:root /dev/vda", "mkswap /dev/vda2 -L swap", "swapon -L swap", - "mkfs.ext4 -L root /dev/vda2", + "mkfs.ext4 -L root /dev/vda3", "mount LABEL=root /mnt", ); ''; @@ -423,7 +423,7 @@ in { "mkfs.ext4 -L root /dev/vda4", "mount LABEL=root /mnt", "mkdir /mnt/boot", - "$(blkid -o export /dev/vda2); mount /dev/disk/by-uuid/\\$UUID /mnt/boot" + "$(blkid -o export /dev/vda2); mount /dev/disk/by-uuid/\$UUID /mnt/boot" ); ''; grubIdentifier = "provided"; -- GitLab From 87d5e457fe124facb261d13f52e14a7c6e6511af Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Fri, 2 May 2014 00:44:36 -0500 Subject: [PATCH 465/843] nixos/grub: Grub detection is much simpler using subvol show --- .../system/boot/loader/grub/install-grub.pl | 28 +++++-------------- 1 file changed, 7 insertions(+), 21 deletions(-) diff --git a/nixos/modules/system/boot/loader/grub/install-grub.pl b/nixos/modules/system/boot/loader/grub/install-grub.pl index 6748a5ca08f..82809edd6e8 100644 --- a/nixos/modules/system/boot/loader/grub/install-grub.pl +++ b/nixos/modules/system/boot/loader/grub/install-grub.pl @@ -135,35 +135,21 @@ sub GrubFs { # BTRFS is a special case in that we need to fix the referrenced path based on subvolumes if ($fs->type eq 'btrfs') { - my $subvol = ""; - - my ($status, @mounts) = runCommand('mount'); + my ($status, @info) = runCommand("btrfs subvol show @{[$fs->device]}"); if ($status != 0) { - die "Failed to retreive mount info"; + die "Failed to retreive subvolume info for @{[$fs->device]}"; } - my @subvols = join("", @mounts) =~ m/@{[$fs->device]} on [^\n]*subvol=([^,)]*)/; + my @subvols = join("", @info) =~ m/Name:[ \t\n]([^ \t\n]*)/; if ($#subvols > 0) { - die "Btrfs device @{[$fs->device]} listed multiple times in mount\n" + die "Btrfs subvol name for @{[$fs->device]} listed multiple times in mount\n" } elsif ($#subvols == 0) { - $subvol = $subvols[0]; - } else { - my ($status, @btrfsOut) = runCommand("btrfs subvol get-default @{[$fs->mount]}"); - if ($status != 0) { - die "Failed to retrieve btrfs default subvolume" - } - my @results = join("", @btrfsOut) =~ m/path ([^ ]*)/; - if ($#results > 0) { - die "Btrfs device @{[$fs->device]} has multiple default subvolumes\n"; - } elsif ($#results == 1) { - $subvol = $results[0]; - } - } - $path = "/$subvol" . $path; + $path = "/$subvols[0]$path"; + } } } if (not $search eq "") { $search = "search --set=drive$driveid " . $search; - $path = "(\$drive$driveid)" . $path; + $path = "(\$drive$driveid)$path"; $driveid += 1; } } -- GitLab From 3bf22679b30bc6f92b7df2a72cdba0403be3be86 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Fri, 2 May 2014 00:45:06 -0500 Subject: [PATCH 466/843] nixos/grub: Kernels don't need to be copied if we can read the nix store --- nixos/modules/system/boot/loader/grub/install-grub.pl | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/nixos/modules/system/boot/loader/grub/install-grub.pl b/nixos/modules/system/boot/loader/grub/install-grub.pl index 82809edd6e8..d0d5307a804 100644 --- a/nixos/modules/system/boot/loader/grub/install-grub.pl +++ b/nixos/modules/system/boot/loader/grub/install-grub.pl @@ -158,6 +158,11 @@ sub GrubFs { my $grubBoot = GrubFs("/boot"); my $grubStore = GrubFs("/nix"); +# We don't need to copy if we can read the kernels directly +if ($grubStore->search ne "") { + $copyKernels = 0; +} + # Generate the header. my $conf .= "# Automatically generated. DO NOT EDIT THIS FILE!\n"; -- GitLab From 7264941a465b3312c35f2dde6184447c746d9d17 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Fri, 2 May 2014 00:51:26 -0500 Subject: [PATCH 467/843] tests/installer: Remove unneeded tests --- nixos/tests/installer.nix | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix index 4fceb19f234..6f20f6614eb 100644 --- a/nixos/tests/installer.nix +++ b/nixos/tests/installer.nix @@ -463,18 +463,4 @@ in { ); ''; }; - - # Test to see if we can detect subvols by their id's - btrfsSubvolId = makeInstallerTest { - createPartitions = '' - $machine->succeed("false"); - ''; - }; - - # Test to see if we can detect a default subvolume on / - btrfsDefaultSubvol = makeInstallerTest { - createPartitions = '' - $machine->succeed("false"); - ''; - }; } -- GitLab From b651097d193089d14e9407a67b95397bf02129e5 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Fri, 2 May 2014 01:05:10 -0500 Subject: [PATCH 468/843] tests/installer: Swapspace should be larger --- nixos/tests/installer.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix index 6f20f6614eb..cb9cc120062 100644 --- a/nixos/tests/installer.nix +++ b/nixos/tests/installer.nix @@ -401,7 +401,7 @@ in { createPartitions = '' $machine->succeed( "sgdisk -Z /dev/vda", - "sgdisk -n 1:0:+1M -n 2:0:+100M -N 3 -t 1:ef02 -t 2:8200 -t 3:8300 -c 3:root /dev/vda", + "sgdisk -n 1:0:+1M -n 2:0:+1G -N 3 -t 1:ef02 -t 2:8200 -t 3:8300 -c 3:root /dev/vda", "mkswap /dev/vda2 -L swap", "swapon -L swap", "mkfs.ext4 -L root /dev/vda3", @@ -416,7 +416,7 @@ in { createPartitions = '' $machine->succeed( "sgdisk -Z /dev/vda", - "sgdisk -n 1:0:+1M -n 2:0:+100M -n 3:0:+100M -N 4 -t 1:ef02 -t 2:8300 -t 3:8200 -t 4:8300 -c 2:boot -c 4:root /dev/vda", + "sgdisk -n 1:0:+1M -n 2:0:+1G -n 3:0:+100M -N 4 -t 1:ef02 -t 2:8300 -t 3:8200 -t 4:8300 -c 2:boot -c 4:root /dev/vda", "mkswap /dev/vda3 -L swap", "swapon -L swap", "mkfs.ext4 -L boot /dev/vda2", @@ -434,7 +434,7 @@ in { createPartitions = '' $machine->succeed( "sgdisk -Z /dev/vda", - "sgdisk -n 1:0:+1M -n 2:0:+100M -N 3 -t 1:ef02 -t 2:8200 -t 3:8300 -c 3:root /dev/vda", + "sgdisk -n 1:0:+1M -n 2:0:+1G -N 3 -t 1:ef02 -t 2:8200 -t 3:8300 -c 3:root /dev/vda", "mkswap /dev/vda2 -L swap", "swapon -L swap", "mkfs.btrfs -L root /dev/vda3", @@ -448,7 +448,7 @@ in { createPartitions = '' $machine->succeed( "sgdisk -Z /dev/vda", - "sgdisk -n 1:0:+1M -n 2:0:+100M -N 3 -t 1:ef02 -t 2:8200 -t 3:8300 -c 3:root /dev/vda", + "sgdisk -n 1:0:+1M -n 2:0:+1G -N 3 -t 1:ef02 -t 2:8200 -t 3:8300 -c 3:root /dev/vda", "mkswap /dev/vda2 -L swap", "swapon -L swap", "mkfs.btrfs -L root /dev/vda3", -- GitLab From 6549bcff9607efd68ecd8fca8ca15c4446b16fb9 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Fri, 2 May 2014 01:07:12 -0500 Subject: [PATCH 469/843] tests/installer: Fix provided test uuid and label mounts --- nixos/tests/installer.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix index cb9cc120062..d15c43d29bb 100644 --- a/nixos/tests/installer.nix +++ b/nixos/tests/installer.nix @@ -421,9 +421,9 @@ in { "swapon -L swap", "mkfs.ext4 -L boot /dev/vda2", "mkfs.ext4 -L root /dev/vda4", - "mount LABEL=root /mnt", + "mount /dev/disk/by-label/root /mnt", "mkdir /mnt/boot", - "$(blkid -o export /dev/vda2); mount /dev/disk/by-uuid/\$UUID /mnt/boot" + "mount /dev/disk/by-uuid/\$(blkid -s UUID -o value /dev/vda2) /mnt/boot" ); ''; grubIdentifier = "provided"; -- GitLab From c02bc3a9de319195597a16173e04357023e97643 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Fri, 2 May 2014 01:46:07 -0500 Subject: [PATCH 470/843] nixos/grub: Fix regex for getting subvolume name in btrfs --- nixos/modules/system/boot/loader/grub/install-grub.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/system/boot/loader/grub/install-grub.pl b/nixos/modules/system/boot/loader/grub/install-grub.pl index d0d5307a804..2725cea5996 100644 --- a/nixos/modules/system/boot/loader/grub/install-grub.pl +++ b/nixos/modules/system/boot/loader/grub/install-grub.pl @@ -139,7 +139,7 @@ sub GrubFs { if ($status != 0) { die "Failed to retreive subvolume info for @{[$fs->device]}"; } - my @subvols = join("", @info) =~ m/Name:[ \t\n]([^ \t\n]*)/; + my @subvols = join("", @info) =~ m/Name:[ \t\n]*([^ \t\n]*)/; if ($#subvols > 0) { die "Btrfs subvol name for @{[$fs->device]} listed multiple times in mount\n" } elsif ($#subvols == 0) { -- GitLab From 4f096c044f987f036af3fc1888090e6567aaf7b1 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Fri, 2 May 2014 02:53:32 -0500 Subject: [PATCH 471/843] nixos/grub: Simplify detection of labels / uuids for provided device names --- .../system/boot/loader/grub/install-grub.pl | 22 +++++++++---------- nixos/tests/installer.nix | 2 +- 2 files changed, 11 insertions(+), 13 deletions(-) diff --git a/nixos/modules/system/boot/loader/grub/install-grub.pl b/nixos/modules/system/boot/loader/grub/install-grub.pl index 2725cea5996..3c84fccac34 100644 --- a/nixos/modules/system/boot/loader/grub/install-grub.pl +++ b/nixos/modules/system/boot/loader/grub/install-grub.pl @@ -104,28 +104,26 @@ sub GrubFs { $path = '/' . substr($fs->device, $sid) . '/@' . $path; } } else { + my %types = ('uuid' => '--fs-uuid', 'label' => '--label'); + if ($fsIdentifier eq 'provided') { # If the provided dev is identifying the partition using a label or uuid, # we should get the label / uuid and do a proper search - my $lbl = '/dev/disk/by-label/'; - if (index($fs->device, $lbl) == 0) { - $search = '--label ' . substr($fs->device, length($lbl)); - } - - my $uuid = '/dev/disk/by-uuid/'; - if (index($fs->device, $uuid) == 0) { - $search = '--fs-uuid ' . substr($fs->device, length($uuid)); + my @matches = $fs->device =~ m/\/dev\/disk\/by-(label|uuid)\/(.*)/; + if ($#matches > 1) { + die "Too many matched devices" + } elsif ($#matches == 1) { + $search = "$types{$matches[0]} $matches[1]" } } else { # Determine the identifying type - my %types = ('uuid' => '--fs-uuid', 'label' => '--label'); $search = $types{$fsIdentifier} . ' '; # Based on the type pull in the identifier from the system my ($status, @devInfo) = runCommand("blkid -o export @{[$fs->device]}"); - if ($status != 0) { - die "Failed to get blkid info for @{[$fs->device]}"; - } + if ($status != 0) { + die "Failed to get blkid info for @{[$fs->device]}"; + } my @matches = join("", @devInfo) =~ m/@{[uc $fsIdentifier]}=([^\n]*)/; if ($#matches != 0) { die "Couldn't find a $types{$fsIdentifier} for @{[$fs->device]}\n" diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix index d15c43d29bb..0eb67eaa813 100644 --- a/nixos/tests/installer.nix +++ b/nixos/tests/installer.nix @@ -416,7 +416,7 @@ in { createPartitions = '' $machine->succeed( "sgdisk -Z /dev/vda", - "sgdisk -n 1:0:+1M -n 2:0:+1G -n 3:0:+100M -N 4 -t 1:ef02 -t 2:8300 -t 3:8200 -t 4:8300 -c 2:boot -c 4:root /dev/vda", + "sgdisk -n 1:0:+1M -n 2:0:+100M -n 3:0:+1G -N 4 -t 1:ef02 -t 2:8300 -t 3:8200 -t 4:8300 -c 2:boot -c 4:root /dev/vda", "mkswap /dev/vda3 -L swap", "swapon -L swap", "mkfs.ext4 -L boot /dev/vda2", -- GitLab From cc62623b37c4ac6e17968b36d9ced8bbf28fb883 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Fri, 2 May 2014 02:03:25 -0500 Subject: [PATCH 472/843] tests/installer: Provided test should add symlinks to /dev/disk if udev doesn't --- nixos/tests/installer.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix index 0eb67eaa813..ef11fcb1001 100644 --- a/nixos/tests/installer.nix +++ b/nixos/tests/installer.nix @@ -412,8 +412,10 @@ in { }; # Test using the provided disk name within grub + # TODO: Fix udev so the symlinks are unneeded in /dev/disks simpleProvided = makeInstallerTest { createPartitions = '' + my $UUID = "\$(blkid -s UUID -o value /dev/vda2)"; $machine->succeed( "sgdisk -Z /dev/vda", "sgdisk -n 1:0:+1M -n 2:0:+100M -n 3:0:+1G -N 4 -t 1:ef02 -t 2:8300 -t 3:8200 -t 4:8300 -c 2:boot -c 4:root /dev/vda", @@ -421,9 +423,13 @@ in { "swapon -L swap", "mkfs.ext4 -L boot /dev/vda2", "mkfs.ext4 -L root /dev/vda4", + ); + $machine->execute("ln -s ../../vda2 /dev/disk/by-uuid/$UUID"); + $machine->execute("ln -s ../../vda4 /dev/disk/by-label/root"); + $machine->succeed( "mount /dev/disk/by-label/root /mnt", "mkdir /mnt/boot", - "mount /dev/disk/by-uuid/\$(blkid -s UUID -o value /dev/vda2) /mnt/boot" + "mount /dev/disk/by-uuid/$UUID /mnt/boot" ); ''; grubIdentifier = "provided"; -- GitLab From 0f6079d999e3922782f3ce6daf742f32568118ac Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Fri, 2 May 2014 03:37:50 -0500 Subject: [PATCH 473/843] nixos/grub: Fix spacing and correct subvolume detection --- .../system/boot/loader/grub/install-grub.pl | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/nixos/modules/system/boot/loader/grub/install-grub.pl b/nixos/modules/system/boot/loader/grub/install-grub.pl index 3c84fccac34..acfb85f3bc5 100644 --- a/nixos/modules/system/boot/loader/grub/install-grub.pl +++ b/nixos/modules/system/boot/loader/grub/install-grub.pl @@ -72,10 +72,10 @@ struct(Fs => { }); sub GetFs { my ($dir) = @_; - my ($status, @dfOut) = runCommand("df -T $dir"); - if ($status != 0 || $#dfOut != 1) { - die "Failed to retrieve output about $dir from `df`"; - } + my ($status, @dfOut) = runCommand("df -T $dir"); + if ($status != 0 || $#dfOut != 1) { + die "Failed to retrieve output about $dir from `df`"; + } my @boot = split(/[ \n\t]+/, $dfOut[1]); return Fs->new(device => $boot[0], type => $boot[1], mount => $boot[6]); } @@ -133,16 +133,16 @@ sub GrubFs { # BTRFS is a special case in that we need to fix the referrenced path based on subvolumes if ($fs->type eq 'btrfs') { - my ($status, @info) = runCommand("btrfs subvol show @{[$fs->device]}"); + my ($status, @info) = runCommand("btrfs subvol show @{[$fs->mount]}"); if ($status != 0) { - die "Failed to retreive subvolume info for @{[$fs->device]}"; + die "Failed to retreive subvolume info for @{[$fs->mount]}"; } my @subvols = join("", @info) =~ m/Name:[ \t\n]*([^ \t\n]*)/; if ($#subvols > 0) { die "Btrfs subvol name for @{[$fs->device]} listed multiple times in mount\n" } elsif ($#subvols == 0) { - $path = "/$subvols[0]$path"; - } + $path = "/$subvols[0]$path"; + } } } if (not $search eq "") { -- GitLab From 940c57e4e86f14cbc25bd63949ef27cc96856425 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Fri, 2 May 2014 03:44:07 -0500 Subject: [PATCH 474/843] nixos/ova: Grub uuid detection is broken when generating the ova --- nixos/modules/installer/virtualbox-demo.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/nixos/modules/installer/virtualbox-demo.nix b/nixos/modules/installer/virtualbox-demo.nix index f68f8dc40aa..49ec0899610 100644 --- a/nixos/modules/installer/virtualbox-demo.nix +++ b/nixos/modules/installer/virtualbox-demo.nix @@ -10,6 +10,9 @@ with lib; ../profiles/clone-config.nix ]; + # FIXME: UUID detection is currently broken + boot.loader.grub.fsIdentifier = "provided"; + # Allow mounting of shared folders. users.extraUsers.demo.extraGroups = [ "vboxsf" ]; -- GitLab From 2ea1433b77755b954df979307525fa6578f241b8 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Fri, 2 May 2014 09:17:54 -0500 Subject: [PATCH 475/843] grub: Fetch from alpha.gnu.org instead of git --- pkgs/tools/misc/grub/2.0x.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/misc/grub/2.0x.nix b/pkgs/tools/misc/grub/2.0x.nix index 04971b68a84..2c150f8ec96 100644 --- a/pkgs/tools/misc/grub/2.0x.nix +++ b/pkgs/tools/misc/grub/2.0x.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchgit, autogen, flex, bison, python, autoconf, automake +{ stdenv, fetchurl, autogen, flex, bison, python, autoconf, automake , gettext, ncurses, libusb, freetype, qemu, devicemapper , linuxPackages ? null , EFIsupport ? false @@ -23,10 +23,10 @@ in stdenv.mkDerivation rec { name = "${prefix}-${version}"; - src = fetchgit { - url = "git://git.sv.gnu.org/grub.git"; - rev = "refs/tags/grub-2.02-beta2"; - sha256 = "157bknkcxibmvq19pagphlwfxd9xny7002gcanfzhjzcjpfz4scy"; + src = fetchurl { + name = "grub-2.02-beta2.tar.xz"; + url = "http://alpha.gnu.org/gnu/grub/grub-2.02~beta2.tar.xz"; + sha256 = "13a13fhc0wf473dn73zhga15mjvkg6vqp4h25dxg4n7am2r05izn"; }; nativeBuildInputs = [ autogen flex bison python autoconf automake ]; -- GitLab From dd18e67cfb27515791620a0e69e4e427b77e2670 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Sat, 3 May 2014 19:59:47 -0500 Subject: [PATCH 476/843] grub: Cleanup efi support --- pkgs/tools/misc/grub/2.0x.nix | 37 ++++++++++++++++----------------- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 19 insertions(+), 20 deletions(-) diff --git a/pkgs/tools/misc/grub/2.0x.nix b/pkgs/tools/misc/grub/2.0x.nix index 2c150f8ec96..028ec565752 100644 --- a/pkgs/tools/misc/grub/2.0x.nix +++ b/pkgs/tools/misc/grub/2.0x.nix @@ -1,15 +1,20 @@ { stdenv, fetchurl, autogen, flex, bison, python, autoconf, automake , gettext, ncurses, libusb, freetype, qemu, devicemapper , linuxPackages ? null -, EFIsupport ? false +, efiSupport ? false , zfsSupport ? false }: -assert zfsSupport -> linuxPackages != null && linuxPackages.zfs != null; - +with stdenv.lib; let + efiSystems = { + "i686-linux".target = "i386"; + "x86_64-linux".target = "x86_64"; + }; - prefix = "grub${if EFIsupport then "-efi" else ""}"; + canEfi = any (system: stdenv.system == system) (mapAttrsToList (name: _: name) efiSystems); + + prefix = "grub${if efiSupport then "-efi" else ""}"; version = "2.02-beta2"; @@ -17,8 +22,10 @@ let url = "http://unifoundry.com/unifont-5.1.20080820.bdf.gz"; sha256 = "0s0qfff6n6282q28nwwblp5x295zd6n71kl43xj40vgvdqxv0fxx"; }; +in ( -in +assert efiSupport -> canEfi; +assert zfsSupport -> linuxPackages != null && linuxPackages.zfs != null; stdenv.mkDerivation rec { name = "${prefix}-${version}"; @@ -31,8 +38,8 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autogen flex bison python autoconf automake ]; buildInputs = [ ncurses libusb freetype gettext devicemapper ] - ++ stdenv.lib.optional doCheck qemu - ++ stdenv.lib.optional zfsSupport linuxPackages.zfs; + ++ optional doCheck qemu + ++ optional zfsSupport linuxPackages.zfs; preConfigure = '' for i in "tests/util/"*.in @@ -62,13 +69,8 @@ stdenv.mkDerivation rec { patches = [ ./fix-bash-completion.patch ]; - configureFlags = - let arch = if stdenv.system == "i686-linux" then "i386" - else if stdenv.system == "x86_64-linux" then "x86_64" - else throw "unsupported EFI firmware architecture"; - in stdenv.lib.optional zfsSupport "--enable-libzfs" - ++ stdenv.lib.optionals EFIsupport - [ "--with-platform=efi" "--target=${arch}" "--program-prefix=" ]; + configureFlags = optional zfsSupport "--enable-libzfs" + ++ optionals efiSupport [ "--with-platform=efi" "--target=${efiSystems.${stdenv.system}.target}" "--program-prefix=" ]; doCheck = false; enableParallelBuilding = true; @@ -96,9 +98,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3Plus; - platforms = if EFIsupport then - [ "i686-linux" "x86_64-linux" ] - else - platforms.gnu; + platforms = platforms.gnu; }; -} +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2dc957cb3db..3d2350b661e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1220,7 +1220,7 @@ let grub2 = callPackage ../tools/misc/grub/2.0x.nix { }; - grub2_efi = grub2.override { EFIsupport = true; }; + grub2_efi = grub2.override { efiSupport = true; }; grub2_zfs = grub2.override { zfsSupport = true; }; -- GitLab From babcd70c36d0c2e2cb000eb3085aa7a42104a4ba Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Wed, 18 Jun 2014 16:21:57 -0500 Subject: [PATCH 477/843] nixos/release-combined: Add required installer tests --- nixos/release-combined.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/nixos/release-combined.nix b/nixos/release-combined.nix index dae3b9210a8..23348e1d089 100644 --- a/nixos/release-combined.nix +++ b/nixos/release-combined.nix @@ -52,6 +52,10 @@ in rec { (all nixos.tests.installer.lvm) (all nixos.tests.installer.separateBoot) (all nixos.tests.installer.simple) + (all nixos.tests.installer.simpleLabels) + (all nixos.tests.installer.simpleProvided) + (all nixos.tests.installer.btrfsSimple) + (all nixos.tests.installer.btrfsSubvols) (all nixos.tests.ipv6) (all nixos.tests.kde4) (all nixos.tests.login) -- GitLab From 36a47733a264dbfe0d8cb62a1a0d5d4d4b07b715 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Wed, 18 Jun 2014 18:43:00 -0500 Subject: [PATCH 478/843] nixos-generate-config: Detect btrfs subvolumes --- .../installer/tools/nixos-generate-config.pl | 21 +++++++++++++++++++ nixos/modules/installer/tools/tools.nix | 1 + 2 files changed, 22 insertions(+) diff --git a/nixos/modules/installer/tools/nixos-generate-config.pl b/nixos/modules/installer/tools/nixos-generate-config.pl index 66a8152a3a6..cabdb09ec9c 100644 --- a/nixos/modules/installer/tools/nixos-generate-config.pl +++ b/nixos/modules/installer/tools/nixos-generate-config.pl @@ -20,6 +20,13 @@ sub uniq { return @res; } +sub runCommand { + my ($cmd) = @_; + open FILE, "$cmd 2>/dev/null |" or die "Failed to execute: $cmd\n"; + my @ret = ; + close FILE; + return ($?, @ret); +} # Process the command line. my $outDir = "/etc/nixos"; @@ -337,6 +344,20 @@ EOF } } + # Is this a btrfs filesystem? + if ($fsType eq "btrfs") { + my ($status, @info) = runCommand("btrfs subvol show $rootDir$mountPoint"); + if ($status != 0) { + die "Failed to retreive subvolume info for $mountPoint"; + } + my @subvols = join("", @info) =~ m/Name:[ \t\n]*([^ \t\n]*)/; + if ($#subvols > 0) { + die "Btrfs subvol name for $mountPoint listed multiple times in mount\n" + } elsif ($#subvols == 0) { + push @extraOptions, "subvol=$subvols[0]"; + } + } + # Emit the filesystem. $fileSystems .= < Date: Sun, 13 Jul 2014 09:50:45 -0500 Subject: [PATCH 479/843] nixos/install-grub: Check /boot against /nix/store instead of /nix --- nixos/modules/system/boot/loader/grub/install-grub.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/system/boot/loader/grub/install-grub.pl b/nixos/modules/system/boot/loader/grub/install-grub.pl index acfb85f3bc5..d8ee8b50097 100644 --- a/nixos/modules/system/boot/loader/grub/install-grub.pl +++ b/nixos/modules/system/boot/loader/grub/install-grub.pl @@ -60,7 +60,7 @@ mkpath("/boot/grub", 0, 0700); # Discover whether /boot is on the same filesystem as / and # /nix/store. If not, then all kernels and initrds must be copied to # /boot. -if (stat("/boot")->dev != stat("/nix")->dev) { +if (stat("/boot")->dev != stat("/nix/store")->dev) { $copyKernels = 1; } -- GitLab From 0fdbc444113a80c1bd0477676a33ab1fb27bae1a Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Thu, 28 Aug 2014 13:36:41 -0700 Subject: [PATCH 480/843] grub: Fix typo --- pkgs/tools/misc/grub/2.0x.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/misc/grub/2.0x.nix b/pkgs/tools/misc/grub/2.0x.nix index 028ec565752..e3c07af759c 100644 --- a/pkgs/tools/misc/grub/2.0x.nix +++ b/pkgs/tools/misc/grub/2.0x.nix @@ -94,7 +94,7 @@ stdenv.mkDerivation rec { operating system (e.g., GNU). ''; - homepage = http://wwwp.gnu.org/software/grub/; + homepage = http://www.gnu.org/software/grub/; license = licenses.gpl3Plus; -- GitLab From f25709c48acd60923e019467ff8f97a0435b9764 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Fri, 29 Aug 2014 01:14:10 +0400 Subject: [PATCH 481/843] List NCSA license properly --- lib/licenses.nix | 5 +++++ pkgs/development/compilers/emscripten/default.nix | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/lib/licenses.nix b/lib/licenses.nix index 95098aba1f2..812592c74f2 100644 --- a/lib/licenses.nix +++ b/lib/licenses.nix @@ -215,6 +215,11 @@ rec { url = "http://research.microsoft.com/en-us/projects/pex/msr-la.txt"; }; + ncsa = spdx { + shortName = "NCSA"; + fullName = "University of Illinois/NCSA Open Source License"; + }; + ofl = spdx { shortName = "OFL-1.1"; fullName = "SIL Open Font License 1.1"; diff --git a/pkgs/development/compilers/emscripten/default.nix b/pkgs/development/compilers/emscripten/default.nix index dc81b90b4b9..43f256b58b0 100644 --- a/pkgs/development/compilers/emscripten/default.nix +++ b/pkgs/development/compilers/emscripten/default.nix @@ -35,6 +35,6 @@ stdenv.mkDerivation rec { homepage = https://github.com/kripken/emscripten; description = "An LLVM-to-JavaScript Compiler"; maintainers = with maintainers; [ bosu ]; - license = "MIT and University of Illinois/NCSA Open Source License"; + license = with licenses; ncsa; }; } -- GitLab From c7bb162710eda277d19044667a834fd2032da97e Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Fri, 29 Aug 2014 01:19:24 +0400 Subject: [PATCH 482/843] Factor out the maintainer --- lib/maintainers.nix | 1 + pkgs/development/interpreters/self/default.nix | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/maintainers.nix b/lib/maintainers.nix index d3d46fc6862..35e53664bbc 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -37,6 +37,7 @@ coroa = "Jonas Hörsch "; cstrahan = "Charles Strahan "; DamienCassou = "Damien Cassou "; + doublec = "Chris Double "; ederoyd46 = "Matthew Brown "; edwtjo = "Edward Tjörnhammar "; eelco = "Eelco Dolstra "; diff --git a/pkgs/development/interpreters/self/default.nix b/pkgs/development/interpreters/self/default.nix index b379044789d..98e1edee387 100644 --- a/pkgs/development/interpreters/self/default.nix +++ b/pkgs/development/interpreters/self/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { description = "A prototype-based dynamic object-oriented programming language, environment, and virtual machine"; homepage = "http://selflanguage.org/"; license = stdenv.lib.licenses.bsd3; - maintainer = [ "Chris Double " ]; + maintainer = [ stdenv.lib.maintainers.doublec ]; platforms = with stdenv.lib.platforms; linux; }; } -- GitLab From 121050046dc870df9015a700e0c01809974f928f Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Fri, 29 Aug 2014 01:27:28 +0400 Subject: [PATCH 483/843] Adding flashrom BIOS update utility. Patch by Edward O'Callaghan --- lib/maintainers.nix | 1 + pkgs/tools/misc/flashrom/default.nix | 23 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 26 insertions(+) create mode 100644 pkgs/tools/misc/flashrom/default.nix diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 35e53664bbc..3de82db1cd9 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -45,6 +45,7 @@ ertes = "Ertugrul Söylemez "; falsifian = "James Cook "; flosse = "Markus Kohlhase "; + funfunctor = "Edward O'Callaghan "; fuuzetsu = "Mateusz Kowalczyk "; garbas = "Rok Garbas "; goibhniu = "Cillian de Róiste "; diff --git a/pkgs/tools/misc/flashrom/default.nix b/pkgs/tools/misc/flashrom/default.nix new file mode 100644 index 00000000000..c4e74359b15 --- /dev/null +++ b/pkgs/tools/misc/flashrom/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchurl, pkgconfig, libftdi, pciutils }: + +let version = "0.9.7"; in +stdenv.mkDerivation rec { + name = "flashrom-${version}"; + + src = fetchurl { + url = "http://download.flashrom.org/releases/${name}.tar.bz2"; + sha256 = "5a55212d00791981a9a1cb0cdca9d9e58bea6d399864251e7b410b4d3d6137e9"; + }; + + buildInputs = [ pkgconfig libftdi pciutils ]; + + makeFlags = ["PREFIX=$out"]; + + meta = { + homepage = "http://www.flashrom.org"; + description = "Utility for reading, writing, erasing and verifying flash ROM chips"; + license = "GPLv2"; + maintainers = [ stdenv.lib.maintainers.funfunctor ]; + platforms = with stdenv.lib.platforms; linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index af7443a056a..851bf546dcd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1049,6 +1049,8 @@ let platformTools = androidenv.platformTools; }; + flashrom = callPackage ../tools/misc/flashrom { }; + flpsed = callPackage ../applications/editors/flpsed { }; flvstreamer = callPackage ../tools/networking/flvstreamer { }; -- GitLab From cef0d1a41b62c0f781a6dc05992aa164ec5b2b05 Mon Sep 17 00:00:00 2001 From: Russell O'Connor Date: Thu, 28 Aug 2014 21:41:30 +0000 Subject: [PATCH 484/843] Abstract bucket name in gce/create-gce.sh --- nixos/maintainers/scripts/gce/create-gce.sh | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/nixos/maintainers/scripts/gce/create-gce.sh b/nixos/maintainers/scripts/gce/create-gce.sh index 8bf36f33c7d..4261e8bf06b 100755 --- a/nixos/maintainers/scripts/gce/create-gce.sh +++ b/nixos/maintainers/scripts/gce/create-gce.sh @@ -1,5 +1,6 @@ #! /bin/sh -e +BUCKET_NAME=${BUCKET_NAME:-nixos} export NIX_PATH=nixpkgs=../../../.. export NIXOS_CONFIG=$(dirname $(readlink -f $0))/../../../modules/virtualisation/google-compute-image.nix export TIMESTAMP=$(date +%Y%m%d%H%M) @@ -8,7 +9,7 @@ nix-build '' \ -A config.system.build.googleComputeImage --argstr system x86_64-linux -o gce --option extra-binary-caches http://hydra.nixos.org -j 10 img=$(echo gce/*.tar.gz) -if ! gsutil ls gs://nixos/$(basename $img); then - gsutil cp $img gs://nixos/$(basename $img) +if ! gsutil ls gs://${BUCKET_NAME}/$(basename $img); then + gsutil cp $img gs://${BUCKET_NAME}/$(basename $img) fi -gcutil addimage $(basename $img .raw.tar.gz | sed 's|\.|-|' | sed 's|_|-|') gs://nixos/$(basename $img) +gcutil addimage $(basename $img .raw.tar.gz | sed 's|\.|-|' | sed 's|_|-|') gs://${BUCKET_NAME}/$(basename $img) -- GitLab From a7ef1a50cb0bd90050925fead6ac52abfeea277b Mon Sep 17 00:00:00 2001 From: Russell O'Connor Date: Thu, 28 Aug 2014 21:42:49 +0000 Subject: [PATCH 485/843] Replace depricated gcutil with gcloude compute in gce/create-gce.sh --- nixos/maintainers/scripts/gce/create-gce.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/maintainers/scripts/gce/create-gce.sh b/nixos/maintainers/scripts/gce/create-gce.sh index 4261e8bf06b..fc476fb6e40 100755 --- a/nixos/maintainers/scripts/gce/create-gce.sh +++ b/nixos/maintainers/scripts/gce/create-gce.sh @@ -12,4 +12,4 @@ img=$(echo gce/*.tar.gz) if ! gsutil ls gs://${BUCKET_NAME}/$(basename $img); then gsutil cp $img gs://${BUCKET_NAME}/$(basename $img) fi -gcutil addimage $(basename $img .raw.tar.gz | sed 's|\.|-|' | sed 's|_|-|') gs://${BUCKET_NAME}/$(basename $img) +gcloud compute images create $(basename $img .raw.tar.gz | sed 's|\.|-|' | sed 's|_|-|') --source-uri gs://${BUCKET_NAME}/$(basename $img) -- GitLab From f152b346cd1e524eb930d83c75ee1973a23b81d8 Mon Sep 17 00:00:00 2001 From: Daniel Bergey Date: Thu, 28 Aug 2014 21:58:31 +0000 Subject: [PATCH 486/843] haskell: package diagrams-rasterific and deps --- .../libraries/haskell/FontyFruity/default.nix | 16 ++++++++++++ .../libraries/haskell/Rasterific/default.nix | 26 +++++++++++++++++++ .../libraries/haskell/diagrams/rasterific.nix | 24 +++++++++++++++++ .../libraries/haskell/fsnotify/default.nix | 22 ++++++++-------- pkgs/top-level/haskell-packages.nix | 5 ++++ 5 files changed, 82 insertions(+), 11 deletions(-) create mode 100644 pkgs/development/libraries/haskell/FontyFruity/default.nix create mode 100644 pkgs/development/libraries/haskell/Rasterific/default.nix create mode 100644 pkgs/development/libraries/haskell/diagrams/rasterific.nix diff --git a/pkgs/development/libraries/haskell/FontyFruity/default.nix b/pkgs/development/libraries/haskell/FontyFruity/default.nix new file mode 100644 index 00000000000..eaa8a5f3824 --- /dev/null +++ b/pkgs/development/libraries/haskell/FontyFruity/default.nix @@ -0,0 +1,16 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, binary, deepseq, filepath, text, vector }: + +cabal.mkDerivation (self: { + pname = "FontyFruity"; + version = "0.3"; + sha256 = "0ivz7hkz5mx8bqqv5av56a8rw4231wyzzg0dhz6465d59iqmjhd4"; + buildDepends = [ binary deepseq filepath text vector ]; + meta = { + description = "A true type file format loader"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.bergey ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/Rasterific/default.nix b/pkgs/development/libraries/haskell/Rasterific/default.nix new file mode 100644 index 00000000000..f8f843236a6 --- /dev/null +++ b/pkgs/development/libraries/haskell/Rasterific/default.nix @@ -0,0 +1,26 @@ +# 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 +, vectorAlgorithms +}: + +cabal.mkDerivation (self: { + pname = "Rasterific"; + version = "0.3"; + sha256 = "1chbcfcb5il7fbzivszap60qfwcwrq85kpx9y6qdr2pim39199fa"; + buildDepends = [ + dlist FontyFruity free JuicyPixels mtl vector vectorAlgorithms + ]; + doCheck = false; # depends on criterion < 0.9 + testDepends = [ + binary criterion deepseq filepath FontyFruity JuicyPixels + QuickCheck statistics vector + ]; + meta = { + description = "A pure haskell drawing engine"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.bergey ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/diagrams/rasterific.nix b/pkgs/development/libraries/haskell/diagrams/rasterific.nix new file mode 100644 index 00000000000..a49c98f988a --- /dev/null +++ b/pkgs/development/libraries/haskell/diagrams/rasterific.nix @@ -0,0 +1,24 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, dataDefaultClass, diagramsCore, diagramsLib, filepath +, FontyFruity, JuicyPixels, lens, mtl, optparseApplicative +, Rasterific, split, statestack, time +}: + +cabal.mkDerivation (self: { + pname = "diagrams-rasterific"; + version = "0.1.0.1"; + sha256 = "1bgrwnrdhlnbcv5ra80x2nh5yr5bzz81f517zb0ws2y07l072gwm"; + buildDepends = [ + dataDefaultClass diagramsCore diagramsLib filepath FontyFruity + JuicyPixels lens mtl optparseApplicative Rasterific split + statestack time + ]; + meta = { + homepage = "http://projects.haskell.org/diagrams/"; + description = "Rasterific backend for diagrams"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ self.stdenv.lib.maintainers.bergey ]; + }; +}) diff --git a/pkgs/development/libraries/haskell/fsnotify/default.nix b/pkgs/development/libraries/haskell/fsnotify/default.nix index 3d308f6a88f..70edecb1f8d 100644 --- a/pkgs/development/libraries/haskell/fsnotify/default.nix +++ b/pkgs/development/libraries/haskell/fsnotify/default.nix @@ -1,19 +1,19 @@ -{ stdenv, cabal, Cabal, Glob, hspec, QuickCheck, random -, systemFileio, systemFilepath, text, time, uniqueid -, hinotify, hfsevents +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, async, hinotify, systemFileio, systemFilepath, tasty +, tastyHunit, temporaryRc, text, time }: cabal.mkDerivation (self: { pname = "fsnotify"; - version = "0.0.11"; - sha256 = "03m911pncyzgfdx4aj38azbbmj25fdm3s9l1w27zv0l730fy8ywq"; - buildDepends = [ systemFileio systemFilepath text time ] ++ - (if stdenv.isDarwin then [ hfsevents ] else [ hinotify ]); + version = "0.1.0.3"; + sha256 = "0m6jyg45azk377jklgwyqrx95q174cxd5znpyh9azznkh09wq58z"; + buildDepends = [ + async hinotify systemFileio systemFilepath text time + ]; testDepends = [ - Cabal Glob hspec QuickCheck random systemFileio - systemFilepath text time uniqueid - ] ++ (if stdenv.isDarwin then [ hfsevents ] else [ hinotify ]); - doCheck = false; + async systemFileio systemFilepath tasty tastyHunit temporaryRc + ]; meta = { description = "Cross platform library for file change notification"; license = self.stdenv.lib.licenses.bsd3; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 7a4d4c4f10b..f20646e79e6 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -642,6 +642,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in diagramsContrib = callPackage ../development/libraries/haskell/diagrams/contrib.nix {}; diagramsLib = callPackage ../development/libraries/haskell/diagrams/lib.nix {}; diagramsPostscript = callPackage ../development/libraries/haskell/diagrams/postscript.nix {}; + diagramsRasterific = callPackage ../development/libraries/haskell/diagrams/rasterific.nix {}; diagramsSvg = callPackage ../development/libraries/haskell/diagrams/svg.nix {}; Diff = callPackage ../development/libraries/haskell/Diff {}; @@ -853,6 +854,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in folds = callPackage ../development/libraries/haskell/folds {}; + FontyFruity = callPackage ../development/libraries/haskell/FontyFruity {}; + forceLayout = callPackage ../development/libraries/haskell/force-layout {}; formatting = callPackage ../development/libraries/haskell/formatting {}; @@ -2014,6 +2017,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in ranges = callPackage ../development/libraries/haskell/ranges {}; + Rasterific = callPackage ../development/libraries/haskell/Rasterific {}; + reserve = callPackage ../development/libraries/haskell/reserve {}; rvar = callPackage ../development/libraries/haskell/rvar {}; -- GitLab From 1eb08ee693619fa56513d0a79180b5c43752cad7 Mon Sep 17 00:00:00 2001 From: Daniel Peebles Date: Thu, 28 Aug 2014 22:08:49 -0400 Subject: [PATCH 487/843] Add patch to fix 3.17 build breakage (also submitted to lkml, but not yet merged) --- .../linux/kernel/3.17-buildfix.patch | 62 +++++++++++++++++++ .../linux/kernel/linux-testing.nix | 2 + 2 files changed, 64 insertions(+) create mode 100644 pkgs/os-specific/linux/kernel/3.17-buildfix.patch diff --git a/pkgs/os-specific/linux/kernel/3.17-buildfix.patch b/pkgs/os-specific/linux/kernel/3.17-buildfix.patch new file mode 100644 index 00000000000..234f0ac749f --- /dev/null +++ b/pkgs/os-specific/linux/kernel/3.17-buildfix.patch @@ -0,0 +1,62 @@ +From Shea Levy <> +Subject [PATCH 1/1] usb: gadget: Remove use of PWD in Makefiles +Date Thu, 28 Aug 2014 01:30:46 -0400 + +Using PWD breaks out-of-tree builds in certain circumstances [1], and +other kernel Makefiles use relative paths just fine. + +[1]: https://bugzilla.kernel.org/show_bug.cgi?id=83251 + +Signed-off-by: Shea Levy +--- + drivers/usb/gadget/Makefile | 2 +- + drivers/usb/gadget/function/Makefile | 4 ++-- + drivers/usb/gadget/legacy/Makefile | 6 +++--- + 3 files changed, 6 insertions(+), 6 deletions(-) +diff --git a/drivers/usb/gadget/Makefile b/drivers/usb/gadget/Makefile +index a186afe..9add915 100644 +--- a/drivers/usb/gadget/Makefile ++++ b/drivers/usb/gadget/Makefile +@@ -3,7 +3,7 @@ + # + subdir-ccflags-$(CONFIG_USB_GADGET_DEBUG) := -DDEBUG + subdir-ccflags-$(CONFIG_USB_GADGET_VERBOSE) += -DVERBOSE_DEBUG +-ccflags-y += -I$(PWD)/drivers/usb/gadget/udc ++ccflags-y += -Idrivers/usb/gadget/udc + + obj-$(CONFIG_USB_LIBCOMPOSITE) += libcomposite.o + libcomposite-y := usbstring.o config.o epautoconf.o +diff --git a/drivers/usb/gadget/function/Makefile b/drivers/usb/gadget/function/Makefile +index 6d91f21..83ae106 100644 +--- a/drivers/usb/gadget/function/Makefile ++++ b/drivers/usb/gadget/function/Makefile +@@ -2,8 +2,8 @@ + # USB peripheral controller drivers + # + +-ccflags-y := -I$(PWD)/drivers/usb/gadget/ +-ccflags-y += -I$(PWD)/drivers/usb/gadget/udc/ ++ccflags-y := -Idrivers/usb/gadget/ ++ccflags-y += -Idrivers/usb/gadget/udc/ + + # USB Functions + usb_f_acm-y := f_acm.o +diff --git a/drivers/usb/gadget/legacy/Makefile b/drivers/usb/gadget/legacy/Makefile +index a11aad5..edba2d1 100644 +--- a/drivers/usb/gadget/legacy/Makefile ++++ b/drivers/usb/gadget/legacy/Makefile +@@ -2,9 +2,9 @@ + # USB gadget drivers + # + +-ccflags-y := -I$(PWD)/drivers/usb/gadget/ +-ccflags-y += -I$(PWD)/drivers/usb/gadget/udc/ +-ccflags-y += -I$(PWD)/drivers/usb/gadget/function/ ++ccflags-y := -Idrivers/usb/gadget/ ++ccflags-y += -Idrivers/usb/gadget/udc/ ++ccflags-y += -Idrivers/usb/gadget/function/ + + g_zero-y := zero.o + g_audio-y := audio.o +-- +2.1.0 \ No newline at end of file diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix index ae9dfc8ef38..ebbdd79ba16 100644 --- a/pkgs/os-specific/linux/kernel/linux-testing.nix +++ b/pkgs/os-specific/linux/kernel/linux-testing.nix @@ -10,6 +10,8 @@ import ./generic.nix (args // rec { sha256 = "094r4kqp7bj1wcdfsgdmv73law4zb7d0sd8lw82v3rz944mlm9y3"; }; + kernelPatches = args.kernelPatches ++ [ { name = "3.17-buildfix.patch"; patch = ./3.17-buildfix.patch; } ]; + features.iwlwifi = true; features.efiBootStub = true; features.needsCifsUtils = true; -- GitLab From e0e65cbf8e4ce940c67b5d0fb0d349758230119e Mon Sep 17 00:00:00 2001 From: aszlig Date: Fri, 29 Aug 2014 07:17:19 +0200 Subject: [PATCH 488/843] nixos/users-groups: Fix eval on missing uid/gid. This hopefully fixes a regression introduced by 08b214a. In bf129a2, it was already fixed for normal uid/gid values and it got reintroduced by sub-uid/gid-handling again, so I've refactored it a bit into a filterNull function which takes care of also the filtering introduced by bf129a2. I have not tested this extensively, but master is already broken for systems with `mutableUsers = true` and no uid values set. Signed-off-by: aszlig --- nixos/modules/config/users-groups.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/nixos/modules/config/users-groups.nix b/nixos/modules/config/users-groups.nix index f1ddd377ed0..a55593c2bad 100644 --- a/nixos/modules/config/users-groups.nix +++ b/nixos/modules/config/users-groups.nix @@ -309,19 +309,19 @@ let u.description u.home u.shell ]; + filterNull = a: filter (x: hasAttr a x && getAttr a x != null); + sortOn = a: sort (as1: as2: lessThan (getAttr a as1) (getAttr a as2)); groupFile = pkgs.writeText "group" ( concatStringsSep "\n" (map (g: mkGroupEntry g.name) ( - let f = g: g.gid != null; in - sortOn "gid" (filter f (attrValues cfg.extraGroups)) + sortOn "gid" (filterNull "gid" (attrValues cfg.extraGroups)) )) ); passwdFile = pkgs.writeText "passwd" ( concatStringsSep "\n" (map (u: mkPasswdEntry u.name) ( - let f = u: u.createUser && (u.uid != null); in - sortOn "uid" (filter f (attrValues cfg.extraUsers)) + sortOn "uid" (filterNull "uid" (attrValues cfg.extraUsers)) )) ); @@ -330,14 +330,14 @@ let user.subUidRanges); subuidFile = concatStrings (map mkSubuidEntry ( - sortOn "uid" (attrValues cfg.extraUsers))); + sortOn "uid" (filterNull "uid" (attrValues cfg.extraUsers)))); mkSubgidEntry = user: concatStrings ( map (range: "${user.name}:${toString range.startGid}:${toString range.count}\n") user.subGidRanges); subgidFile = concatStrings (map mkSubgidEntry ( - sortOn "uid" (attrValues cfg.extraUsers))); + sortOn "uid" (filterNull "uid" (attrValues cfg.extraUsers)))); # If mutableUsers is true, this script adds all users/groups defined in # users.extra{Users,Groups} to /etc/{passwd,group} iff there isn't any -- GitLab From 0bb14e4fea539bc247faffe7c9c4943eef54b118 Mon Sep 17 00:00:00 2001 From: Daniel Peebles Date: Fri, 29 Aug 2014 01:49:32 -0400 Subject: [PATCH 489/843] Disable NFC on 3.17 or above This should only be temporary, but there's a bug in the 3.17 rc1 and rc2 that leads to cyclic module dependencies and a segfault during the build process. --- pkgs/os-specific/linux/kernel/common-config.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index 7a6ba94eb9f..d5c754eebc7 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -337,6 +337,8 @@ with stdenv.lib; ZSMALLOC y ''} ZRAM m + + ${optionalString (versionAtLeast version "3.17") "NFC? n"} ${kernelPlatform.kernelExtraConfig or ""} ${extraConfig} -- GitLab From b90dd7089f5ecb61a138fb1eeec101977c60b3b5 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Fri, 29 Aug 2014 10:35:03 +0200 Subject: [PATCH 490/843] calibre: update from 2.0.0 to 2.1.0 --- pkgs/applications/misc/calibre/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index 190b57e1070..00a5d15a84c 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.0.0"; + name = "calibre-2.1.0"; src = fetchurl { url = "mirror://sourceforge/calibre/${name}.tar.xz"; - sha256 = "1fpn8icfyag2ybj2ywd81sva56ycsin56gyap5m9j5crx63p4c91"; + sha256 = "1znwrmz740m08bihkmdijm193bvav4nm313xsagd5x9mjh2nffg7"; }; inherit python; -- GitLab From a4738b27cf6a5d1c9542abfa05975135d6232d56 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Wed, 27 Aug 2014 19:10:47 -0300 Subject: [PATCH 491/843] Tilda (version 1.1.12): New Package Tida is a GTK-based drop-down terminal emulator --- pkgs/applications/misc/tilda/default.nix | 29 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 5 ++++ 2 files changed, 34 insertions(+) create mode 100644 pkgs/applications/misc/tilda/default.nix diff --git a/pkgs/applications/misc/tilda/default.nix b/pkgs/applications/misc/tilda/default.nix new file mode 100644 index 00000000000..cb5813fa5f7 --- /dev/null +++ b/pkgs/applications/misc/tilda/default.nix @@ -0,0 +1,29 @@ +{ stdenv, fetchurl, pkgconfig +, autoconf, automake, gettext +, confuse, vte, gtk +}: + +stdenv.mkDerivation rec { + + name = "tilda-${version}"; + version = "1.1.12"; + + src = fetchurl { + url = "https://github.com/lanoxx/tilda/archive/${name}.tar.gz"; + sha256 = "10kjlcdaylkisb8i0cw4wfssg52mrz2lxr5zmw3q4fpnhh2xlaix"; + }; + + buildInputs = [ pkgconfig autoconf automake gettext confuse vte gtk ]; + + preConfigure = '' + sh autogen.sh + ''; + + meta = { + description = "A Gtk based drop down terminal for Linux and Unix"; + homepage = https://github.com/lanoxx/tilda/; + license = stdenv.lib.licenses.gpl3; + maintainers = [ stdenv.lib.maintainers.AndersonTorres ]; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0754239b849..45c15e3ba70 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9876,6 +9876,11 @@ let tig = gitAndTools.tig; + tilda = callPackage ../applications/misc/tilda { + vte = gnome3.vte; + gtk = gtk3; + }; + timidity = callPackage ../tools/misc/timidity { }; tint2 = callPackage ../applications/misc/tint2 { }; -- GitLab From aeca8b6c3e9d331e6209304d6786d25214f62506 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Fri, 29 Aug 2014 11:27:21 +0200 Subject: [PATCH 492/843] tilda: fixups; seems to work now - xgettext hack inspired by a guix thread - gsettings to prevent crashes - expression refactoring --- pkgs/applications/misc/tilda/default.nix | 23 ++++++++++++++--------- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 15 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/misc/tilda/default.nix b/pkgs/applications/misc/tilda/default.nix index cb5813fa5f7..50c4184c91e 100644 --- a/pkgs/applications/misc/tilda/default.nix +++ b/pkgs/applications/misc/tilda/default.nix @@ -1,6 +1,7 @@ { stdenv, fetchurl, pkgconfig -, autoconf, automake, gettext +, autoreconfHook, gettext, expat , confuse, vte, gtk +, makeWrapper }: stdenv.mkDerivation rec { @@ -13,17 +14,21 @@ stdenv.mkDerivation rec { sha256 = "10kjlcdaylkisb8i0cw4wfssg52mrz2lxr5zmw3q4fpnhh2xlaix"; }; - buildInputs = [ pkgconfig autoconf automake gettext confuse vte gtk ]; + buildInputs = [ pkgconfig autoreconfHook gettext confuse vte gtk makeWrapper ]; - preConfigure = '' - sh autogen.sh + LD_LIBRARY_PATH = "${expat}/lib"; # ugly hack for xgettext to work during build + + postInstall = '' + wrapProgram "$out/bin/tilda" \ + --prefix XDG_DATA_DIRS : "$GSETTINGS_SCHEMAS_PATH" ''; - - meta = { + + meta = with stdenv.lib; { description = "A Gtk based drop down terminal for Linux and Unix"; homepage = https://github.com/lanoxx/tilda/; - license = stdenv.lib.licenses.gpl3; - maintainers = [ stdenv.lib.maintainers.AndersonTorres ]; - platforms = stdenv.lib.platforms.linux; + license = licenses.gpl3; + maintainers = [ maintainers.AndersonTorres ]; + platforms = platforms.linux; }; } + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 45c15e3ba70..6f02f2650ac 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9878,7 +9878,7 @@ let tilda = callPackage ../applications/misc/tilda { vte = gnome3.vte; - gtk = gtk3; + gtk = gtk3; }; timidity = callPackage ../tools/misc/timidity { }; -- GitLab From b8a546a13aff5807c12c4045cb9d6b8f89f9fb4a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=BCdiger=20Sonderfeld?= Date: Thu, 28 Aug 2014 13:39:27 +0200 Subject: [PATCH 493/843] gnutls: Update to 3.1.26 and 3.2.17. --- pkgs/development/libraries/gnutls/3.1.nix | 4 ++-- pkgs/development/libraries/gnutls/3.2.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/gnutls/3.1.nix b/pkgs/development/libraries/gnutls/3.1.nix index 6aea78a3ac5..44ea0176e38 100644 --- a/pkgs/development/libraries/gnutls/3.1.nix +++ b/pkgs/development/libraries/gnutls/3.1.nix @@ -4,11 +4,11 @@ assert guileBindings -> guile != null; stdenv.mkDerivation rec { - name = "gnutls-3.1.25"; + name = "gnutls-3.1.26"; src = fetchurl { url = "ftp://ftp.gnutls.org/gcrypt/gnutls/v3.1/${name}.tar.lz"; - sha256 = "1i1v8pbaw72k0ps09i3lvc1zr9gn34jpliiijbs8k7axrv2w9n5g"; + sha256 = "7947e18fd0c292c0274d810c9bdf674b8faa3566e056ea404a39f335982607a3"; }; # FreeBSD doesn't have , and Gnulib's `alloca' module isn't used. diff --git a/pkgs/development/libraries/gnutls/3.2.nix b/pkgs/development/libraries/gnutls/3.2.nix index cd48e08a39c..5bf933fbc96 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.15"; + name = "gnutls-3.2.17"; src = fetchurl { url = "ftp://ftp.gnutls.org/gcrypt/gnutls/v3.2/${name}.tar.lz"; - sha256 = "16c5c4k41mxib8i06npks940p9xllgn1wrackfp8712wdvl5zc4q"; + sha256 = "a332adda1d294fbee859ae46ee0c128d8959c4a5b9c28e7cdbe5c9b56898fc25"; }; patches = -- GitLab From 23b902945546eaf8358afce789a3755fe5092713 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Fri, 22 Aug 2014 14:43:23 +0200 Subject: [PATCH 494/843] Adds ocaml-cmdliner Cmdliner is an OCaml module for the declarative definition of command line interfaces. Homepage: http://erratique.ch/software/cmdliner --- .../ocaml-modules/cmdliner/default.nix | 36 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 38 insertions(+) create mode 100644 pkgs/development/ocaml-modules/cmdliner/default.nix diff --git a/pkgs/development/ocaml-modules/cmdliner/default.nix b/pkgs/development/ocaml-modules/cmdliner/default.nix new file mode 100644 index 00000000000..3a00f0c3888 --- /dev/null +++ b/pkgs/development/ocaml-modules/cmdliner/default.nix @@ -0,0 +1,36 @@ +{stdenv, fetchurl, ocaml, findlib, opam}: + +let + pname = "cmdliner"; + version = "0.9.5"; + ocaml_version = (builtins.parseDrvName ocaml.name).version; +in +stdenv.mkDerivation { + + name = "ocaml-${pname}-${version}"; + + src = fetchurl { + url = "http://erratique.ch/software/${pname}/releases/${pname}-${version}.tbz"; + sha256 = "a0e199c4930450e12edf81604eeceddeeb32d55c43438be689e60df282277a7e"; + }; + + unpackCmd = "tar xjf $src"; + buildInputs = [ ocaml findlib opam ]; + + createFindlibDestdir = true; + + configurePhase = "ocaml pkg/git.ml"; + buildPhase = "ocaml pkg/build.ml native=true native-dynlink=true"; + installPhase = '' + opam-installer --script --prefix=$out ${pname}.install > install.sh + sh install.sh + ln -s $out/lib/${pname} $out/lib/ocaml/${ocaml_version}/site-lib/ + ''; + + meta = with stdenv.lib; { + homepage = http://erratique.ch/software/cmdliner; + description = "An OCaml module for the declarative definition of command line interfaces"; + license = licenses.bsd3; + platforms = ocaml.meta.platforms; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6f02f2650ac..6fc28ac321f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3255,6 +3255,8 @@ let ocaml_cairo = callPackage ../development/ocaml-modules/ocaml-cairo { }; + cmdliner = callPackage ../development/ocaml-modules/cmdliner { }; + cppo = callPackage ../development/tools/ocaml/cppo { }; cryptokit = callPackage ../development/ocaml-modules/cryptokit { }; -- GitLab From a34a0dfdc58f05d637bcec951dcfd9d02e3fcc73 Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Fri, 29 Aug 2014 11:39:18 +0200 Subject: [PATCH 495/843] Revert "nixos/release: Dynamically generate installer tests" This reverts commit 5870ae613f42c99456dcbbc4df01abdce3c1f448. It makes it hard to comment out installer tests. --- nixos/release.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/nixos/release.nix b/nixos/release.nix index e5a4e7337ab..0620b46d46a 100644 --- a/nixos/release.nix +++ b/nixos/release.nix @@ -222,11 +222,12 @@ in rec { tests.firefox = callTest tests/firefox.nix {}; tests.firewall = callTest tests/firewall.nix {}; tests.gnome3 = callTest tests/gnome3.nix {}; - tests.installer = with pkgs.lib; - let installer = import tests/installer.nix; in - flip mapAttrs (installer { }) (name: _: - forAllSystems (system: (installer { system = system; }).${name}.test) - ); + tests.installer.efi = forAllSystems (system: (import tests/installer.nix { inherit system; }).efi.test); + tests.installer.grub1 = forAllSystems (system: (import tests/installer.nix { inherit system; }).grub1.test); + tests.installer.lvm = forAllSystems (system: (import tests/installer.nix { inherit system; }).lvm.test); + tests.installer.rebuildCD = forAllSystems (system: (import tests/installer.nix { inherit system; }).rebuildCD.test); + tests.installer.separateBoot = forAllSystems (system: (import tests/installer.nix { inherit system; }).separateBoot.test); + tests.installer.simple = forAllSystems (system: (import tests/installer.nix { inherit system; }).simple.test); tests.influxdb = callTest tests/influxdb.nix {}; tests.ipv6 = callTest tests/ipv6.nix {}; tests.jenkins = callTest tests/jenkins.nix {}; -- GitLab From 01f0b1cf1a0d0fc043559a3faa38b1ca51423348 Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Fri, 29 Aug 2014 11:48:00 +0200 Subject: [PATCH 496/843] Fix evaluation of nixos tested --- nixos/release.nix | 4 ++++ nixos/tests/installer.nix | 8 ++++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/nixos/release.nix b/nixos/release.nix index 0620b46d46a..f78ecb4383d 100644 --- a/nixos/release.nix +++ b/nixos/release.nix @@ -228,6 +228,10 @@ in rec { tests.installer.rebuildCD = forAllSystems (system: (import tests/installer.nix { inherit system; }).rebuildCD.test); tests.installer.separateBoot = forAllSystems (system: (import tests/installer.nix { inherit system; }).separateBoot.test); tests.installer.simple = forAllSystems (system: (import tests/installer.nix { inherit system; }).simple.test); + tests.installer.simpleLabels = forAllSystems (system: (import tests/installer.nix { inherit system; }).simpleLabels.test); + tests.installer.simpleProvided = forAllSystems (system: (import tests/installer.nix { inherit system; }).simpleProvided.test); + tests.installer.btrfsSimple = forAllSystems (system: (import tests/installer.nix { inherit system; }).btrfsSimple.test); + tests.installer.btrfsSubvols = forAllSystems (system: (import tests/installer.nix { inherit system; }).btrfsSubvols.test); tests.influxdb = callTest tests/influxdb.nix {}; tests.ipv6 = callTest tests/ipv6.nix {}; tests.jenkins = callTest tests/jenkins.nix {}; diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix index ef11fcb1001..154f3323d29 100644 --- a/nixos/tests/installer.nix +++ b/nixos/tests/installer.nix @@ -397,7 +397,7 @@ in { }; # Test using labels to identify volumes in grub - simpleLabels = makeInstallerTest { + simpleLabels = makeInstallerTest "simpleLabels" { createPartitions = '' $machine->succeed( "sgdisk -Z /dev/vda", @@ -413,7 +413,7 @@ in { # Test using the provided disk name within grub # TODO: Fix udev so the symlinks are unneeded in /dev/disks - simpleProvided = makeInstallerTest { + simpleProvided = makeInstallerTest "simpleProvided" { createPartitions = '' my $UUID = "\$(blkid -s UUID -o value /dev/vda2)"; $machine->succeed( @@ -436,7 +436,7 @@ in { }; # Simple btrfs grub testing - btrfsSimple = makeInstallerTest { + btrfsSimple = makeInstallerTest "btrfsSimple" { createPartitions = '' $machine->succeed( "sgdisk -Z /dev/vda", @@ -450,7 +450,7 @@ in { }; # Test to see if we can detect /boot and /nix on subvolumes - btrfsSubvols = makeInstallerTest { + btrfsSubvols = makeInstallerTest "btrfsSubvols" { createPartitions = '' $machine->succeed( "sgdisk -Z /dev/vda", -- GitLab From ceb75955dd425f47793185b49cd1b3388f85e9be Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 28 Aug 2014 18:13:11 +0200 Subject: [PATCH 497/843] haskell-classy-prelude-conduit: update to version 0.9.4 --- .../libraries/haskell/classy-prelude-conduit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/classy-prelude-conduit/default.nix b/pkgs/development/libraries/haskell/classy-prelude-conduit/default.nix index 28e940f3489..286a20f2ba2 100644 --- a/pkgs/development/libraries/haskell/classy-prelude-conduit/default.nix +++ b/pkgs/development/libraries/haskell/classy-prelude-conduit/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "classy-prelude-conduit"; - version = "0.9.3"; - sha256 = "0wsl3mhczinxl6ij8dpv5001db740z4jq43l2gpzdylv6pmpldzr"; + version = "0.9.4"; + sha256 = "07ggdd3c47bs0pj4hl8vl19k2jlbka73pq7x0m4rsgrrjxc5pr1r"; buildDepends = [ classyPrelude conduit conduitCombinators monadControl resourcet systemFileio transformers void -- GitLab From 52d1ffaea71fbd2831a2437115c2efc7133adea5 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 28 Aug 2014 18:13:13 +0200 Subject: [PATCH 498/843] haskell-classy-prelude: update to version 0.9.4 --- .../libraries/haskell/classy-prelude/default.nix | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/pkgs/development/libraries/haskell/classy-prelude/default.nix b/pkgs/development/libraries/haskell/classy-prelude/default.nix index e45a6f256b9..018a54f42d7 100644 --- a/pkgs/development/libraries/haskell/classy-prelude/default.nix +++ b/pkgs/development/libraries/haskell/classy-prelude/default.nix @@ -1,19 +1,20 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! { cabal, basicPrelude, chunkedData, enclosedExceptions, exceptions -, hashable, hspec, liftedBase, monoTraversable, QuickCheck -, semigroups, stm, systemFilepath, text, time, transformers -, unorderedContainers, vector, vectorInstances +, hashable, hspec, liftedBase, monoTraversable, mtl, primitive +, QuickCheck, semigroups, stm, systemFilepath, text, time +, transformers, unorderedContainers, vector, vectorInstances }: cabal.mkDerivation (self: { pname = "classy-prelude"; - version = "0.9.3"; - sha256 = "06y6zx3mmqjnha5p7y7blzn77bij71kndw2bmi07wz4s4lj9xsiv"; + version = "0.9.4"; + sha256 = "1pxg515dg174minvajaxl3sqpqjm862pgfpf7n2ynw5cqmaxngxa"; buildDepends = [ basicPrelude chunkedData enclosedExceptions exceptions hashable - liftedBase monoTraversable semigroups stm systemFilepath text time - transformers unorderedContainers vector vectorInstances + liftedBase monoTraversable mtl primitive semigroups stm + systemFilepath text time transformers unorderedContainers vector + vectorInstances ]; testDepends = [ hspec QuickCheck transformers unorderedContainers -- GitLab From 163053a0f54412298043f218ee2ed347c347eeb1 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 28 Aug 2014 18:13:15 +0200 Subject: [PATCH 499/843] haskell-foldl: update to version 1.0.6 --- pkgs/development/libraries/haskell/foldl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/foldl/default.nix b/pkgs/development/libraries/haskell/foldl/default.nix index 7a942e97dc8..2f04330a315 100644 --- a/pkgs/development/libraries/haskell/foldl/default.nix +++ b/pkgs/development/libraries/haskell/foldl/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "foldl"; - version = "1.0.5"; - sha256 = "08yjzzplg715hzkhwbf8nv2zm7c5wd2kph4zx94iml0cnc6ip048"; + version = "1.0.6"; + sha256 = "1i4pm48x7f8l4gqbb2bgqshx5cx44acr24l75czliq656sqm405i"; buildDepends = [ primitive text transformers vector ]; meta = { description = "Composable, streaming, and efficient left folds"; -- GitLab From 7e0400a110a7e5fb2dc32a38cb6eeff8ff33a2ea Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 28 Aug 2014 18:13:17 +0200 Subject: [PATCH 500/843] haskell-highlighting-kate: update to version 0.5.9 --- .../libraries/haskell/highlighting-kate/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/haskell/highlighting-kate/default.nix b/pkgs/development/libraries/haskell/highlighting-kate/default.nix index a9540b24950..d77479ff058 100644 --- a/pkgs/development/libraries/haskell/highlighting-kate/default.nix +++ b/pkgs/development/libraries/haskell/highlighting-kate/default.nix @@ -1,16 +1,19 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, blazeHtml, filepath, mtl, parsec, regexPcre, utf8String }: +{ cabal, blazeHtml, Diff, filepath, mtl, parsec, regexPcre +, utf8String +}: cabal.mkDerivation (self: { pname = "highlighting-kate"; - version = "0.5.8.5"; - sha256 = "0xynbxffjp44189zzqx30wabbrj83mvjl3mj1i5lag1h945yp1nk"; + version = "0.5.9"; + sha256 = "025j6d97nwjhhyhdz7bsfhzgpb1ld28va4r8yv7zfh1dvczs6lkr"; isLibrary = true; isExecutable = true; buildDepends = [ blazeHtml filepath mtl parsec regexPcre utf8String ]; + testDepends = [ blazeHtml Diff filepath ]; prePatch = "sed -i -e 's|regex-pcre-builtin >= .*|regex-pcre|' highlighting-kate.cabal"; meta = { homepage = "http://github.com/jgm/highlighting-kate"; -- GitLab From 4d3776b18d193b860dcbf77e62157e80d680b903 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 28 Aug 2014 18:13:19 +0200 Subject: [PATCH 501/843] haskell-interpolate: update to version 0.0.4 --- pkgs/development/libraries/haskell/interpolate/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/interpolate/default.nix b/pkgs/development/libraries/haskell/interpolate/default.nix index eed6aa835f8..875759a17eb 100644 --- a/pkgs/development/libraries/haskell/interpolate/default.nix +++ b/pkgs/development/libraries/haskell/interpolate/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "interpolate"; - version = "0.0.3"; - sha256 = "05aksslx7mvic3cgw9ixwjp0r759a4gf7m178pbp8xm8dpdksjjw"; + version = "0.0.4"; + sha256 = "0yr0pahb07r7p6d7hb4bqafa64a4jkd37bchr6vkan2zbffwcrcm"; buildDepends = [ haskellSrcMeta ]; testDepends = [ doctest haskellSrcMeta hspec QuickCheck quickcheckInstances text -- GitLab From 0211268c303614f9de915a2793eb2aa1028de87d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 28 Aug 2014 18:13:20 +0200 Subject: [PATCH 502/843] haskell-mmorph: update to version 1.0.4 --- pkgs/development/libraries/haskell/mmorph/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/mmorph/default.nix b/pkgs/development/libraries/haskell/mmorph/default.nix index b13eeeb5d83..bf8fb46f793 100644 --- a/pkgs/development/libraries/haskell/mmorph/default.nix +++ b/pkgs/development/libraries/haskell/mmorph/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "mmorph"; - version = "1.0.3"; - sha256 = "0b8pzb63zxw3cjw8yj73swvqhmi9c4lgw1mis1xbraya7flxc6qm"; + version = "1.0.4"; + sha256 = "0k5zlzmnixfwcjrqvhgi3i6xg532b0gsjvc39v5jigw69idndqr2"; buildDepends = [ transformers ]; meta = { description = "Monad morphisms"; -- GitLab From dbdde708cdb29248449a52c402d42e4349832c69 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 28 Aug 2014 18:13:22 +0200 Subject: [PATCH 503/843] haskell-project-template: update to version 0.1.4.2 --- .../libraries/haskell/project-template/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/project-template/default.nix b/pkgs/development/libraries/haskell/project-template/default.nix index 9aa8dff59aa..8cb7dfd32ae 100644 --- a/pkgs/development/libraries/haskell/project-template/default.nix +++ b/pkgs/development/libraries/haskell/project-template/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "project-template"; - version = "0.1.4.1"; - sha256 = "1vsx8a4kzdcwbdy47hb2wz32najsa6bqq6jkyal9nbc5ydwb65lb"; + version = "0.1.4.2"; + sha256 = "10n23s6g7fv0l42hsb804z0qqcyxqw32kwzg1f0w3c6gka844akr"; buildDepends = [ base64Bytestring conduit conduitExtra mtl resourcet systemFileio systemFilepath text transformers -- GitLab From 4c5e35a9e8e6fcf4bb35190f88e70e726d34edd5 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 28 Aug 2014 18:13:24 +0200 Subject: [PATCH 504/843] haskell-pwstore-fast: update to version 2.4.2 --- .../libraries/haskell/pwstore-fast/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/haskell/pwstore-fast/default.nix b/pkgs/development/libraries/haskell/pwstore-fast/default.nix index 08f18e8fe11..5a92e47417d 100644 --- a/pkgs/development/libraries/haskell/pwstore-fast/default.nix +++ b/pkgs/development/libraries/haskell/pwstore-fast/default.nix @@ -1,12 +1,14 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, base64Bytestring, binary, cryptohash, random, SHA }: +{ cabal, base64Bytestring, binary, byteable, cryptohash, random }: cabal.mkDerivation (self: { pname = "pwstore-fast"; - version = "2.4.1"; - sha256 = "1k98b1s2ld0jx8fy53k8d8pscp6n0plh51b2lj6ai6w8xj4vknw4"; - buildDepends = [ base64Bytestring binary cryptohash random SHA ]; + version = "2.4.2"; + sha256 = "1idpk0cc61jibj50h2a39k37s630c8h5k5d1qvbc89nql4jc132l"; + buildDepends = [ + base64Bytestring binary byteable cryptohash random + ]; meta = { homepage = "https://github.com/PeterScott/pwstore"; description = "Secure password storage"; -- GitLab From 4b0cdd2cacef3c71357850495ceb41b0a763602e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 28 Aug 2014 18:13:26 +0200 Subject: [PATCH 505/843] haskell-yaml: update to version 0.8.9.1 --- pkgs/development/libraries/haskell/yaml/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/yaml/default.nix b/pkgs/development/libraries/haskell/yaml/default.nix index 26cb0dec098..9173baa97ba 100644 --- a/pkgs/development/libraries/haskell/yaml/default.nix +++ b/pkgs/development/libraries/haskell/yaml/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "yaml"; - version = "0.8.9"; - sha256 = "13qqqil19yi1qbl9gqma6kxwkz8j5iq6z347fabk916gy9jng3dl"; + version = "0.8.9.1"; + sha256 = "129pf4gg3mf2ljag8vxknnqxbrbx53hshzpaggndxjir72303njy"; isLibrary = true; isExecutable = true; buildDepends = [ -- GitLab From c9286fd171aa47fc88aa1e01510554bb1c95f1b1 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 28 Aug 2014 18:13:28 +0200 Subject: [PATCH 506/843] haskell-hlint: update to version 1.9.4 --- pkgs/development/tools/haskell/hlint/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/haskell/hlint/default.nix b/pkgs/development/tools/haskell/hlint/default.nix index 4fe5f01c3d1..92a33602a1f 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.3"; - sha256 = "1sdz981yq0amsw9q6hx0aqkd0ayrax5p77s3n3gz4bphpk37n09b"; + version = "1.9.4"; + sha256 = "0vqdkrhzxi99py9zrk01cz3hayfbp757rh1c1sgz00a1gf1pyz8m"; isLibrary = true; isExecutable = true; buildDepends = [ -- GitLab From 6f4b9ebd22ee99a36391d3f9dd04b5cbebfba4c3 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 28 Aug 2014 18:13:44 +0200 Subject: [PATCH 507/843] haskell-cgi: add version 3001.2.0.0 --- .../libraries/haskell/cgi/3001.2.0.0.nix | 16 ++++++++++++++++ pkgs/top-level/haskell-packages.nix | 3 ++- 2 files changed, 18 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/libraries/haskell/cgi/3001.2.0.0.nix diff --git a/pkgs/development/libraries/haskell/cgi/3001.2.0.0.nix b/pkgs/development/libraries/haskell/cgi/3001.2.0.0.nix new file mode 100644 index 00000000000..0f0ea06ee74 --- /dev/null +++ b/pkgs/development/libraries/haskell/cgi/3001.2.0.0.nix @@ -0,0 +1,16 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, exceptions, mtl, network, networkUri, parsec, xhtml }: + +cabal.mkDerivation (self: { + pname = "cgi"; + version = "3001.2.0.0"; + sha256 = "03az978d5ayv5v4g89h4wajjhcribyf37b8ws8kvsqir3i7h7k8d"; + buildDepends = [ exceptions mtl network networkUri parsec xhtml ]; + meta = { + homepage = "https://github.com/cheecheeo/haskell-cgi"; + description = "A library for writing CGI programs"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 7a4d4c4f10b..8f9ef6710a3 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -391,7 +391,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in cgi_3001_1_7_4 = callPackage ../development/libraries/haskell/cgi/3001.1.7.4.nix {}; cgi_3001_1_7_5 = callPackage ../development/libraries/haskell/cgi/3001.1.7.5.nix {}; cgi_3001_1_8_5 = callPackage ../development/libraries/haskell/cgi/3001.1.8.5.nix {}; - cgi = self.cgi_3001_1_8_5; + cgi_3001_2_0_0 = callPackage ../development/libraries/haskell/cgi/3001.2.0.0.nix {}; + cgi = self.cgi_3001_2_0_0; cgrep = callPackage ../development/libraries/haskell/cgrep {}; -- GitLab From 17a4dce05e4d445dc1f0c46f5908ff4583a8f891 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 29 Aug 2014 11:07:40 +0200 Subject: [PATCH 508/843] haskell-pwstore-fast: update to version 2.4.3 --- pkgs/development/libraries/haskell/pwstore-fast/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/pwstore-fast/default.nix b/pkgs/development/libraries/haskell/pwstore-fast/default.nix index 5a92e47417d..a59a9b2d2da 100644 --- a/pkgs/development/libraries/haskell/pwstore-fast/default.nix +++ b/pkgs/development/libraries/haskell/pwstore-fast/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "pwstore-fast"; - version = "2.4.2"; - sha256 = "1idpk0cc61jibj50h2a39k37s630c8h5k5d1qvbc89nql4jc132l"; + version = "2.4.3"; + sha256 = "02dj297s04fxb4ys9nfdw6aap5zrwlryq515gky0c3af6ss2yiz7"; buildDepends = [ base64Bytestring binary byteable cryptohash random ]; -- GitLab From 30b88f5f619cf95669d774fe233270759996d1de Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 29 Aug 2014 11:07:47 +0200 Subject: [PATCH 509/843] haskell-hspec-meta: update to version 1.11.4 --- pkgs/development/libraries/haskell/hspec-meta/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/hspec-meta/default.nix b/pkgs/development/libraries/haskell/hspec-meta/default.nix index 844b0a52805..09d3a842522 100644 --- a/pkgs/development/libraries/haskell/hspec-meta/default.nix +++ b/pkgs/development/libraries/haskell/hspec-meta/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "hspec-meta"; - version = "1.11.3"; - sha256 = "0cydxq5kgi4cczf6q70853wz3x1ymrf9mkp7rp71yir5vrhg0b8p"; + version = "1.11.4"; + sha256 = "047vp6wibkwgs9rryjpys2qqn4s5p91mh36w0gnxwhggp8nhfqg3"; isLibrary = true; isExecutable = true; buildDepends = [ -- GitLab From 8c6bb74e077339d986d68857ba484a8ec42c0edd Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 29 Aug 2014 11:07:48 +0200 Subject: [PATCH 510/843] haskell-hspec-wai: update to version 0.3.0.1 --- pkgs/development/libraries/haskell/hspec-wai/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/haskell/hspec-wai/default.nix b/pkgs/development/libraries/haskell/hspec-wai/default.nix index 1341bf198c9..8bc6776fd84 100644 --- a/pkgs/development/libraries/haskell/hspec-wai/default.nix +++ b/pkgs/development/libraries/haskell/hspec-wai/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "hspec-wai"; - version = "0.3.0"; - sha256 = "0wkzv406jiyi8ais3g0addm66274y1pvy55gypmnhwx5rp2kr6fb"; + version = "0.3.0.1"; + sha256 = "0c04gh32xnvyz0679n7jhp1kdcn7lbkb7248j6lh28irsh84dvp8"; buildDepends = [ aeson aesonQq caseInsensitive hspec2 httpTypes text transformers wai waiExtra @@ -21,6 +21,5 @@ cabal.mkDerivation (self: { description = "Experimental Hspec support for testing WAI applications (depends on hspec2!)"; license = self.stdenv.lib.licenses.mit; platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; }; }) -- GitLab From d86e8835b9e95a57c6f9ab94f9895a7e5f930a19 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 29 Aug 2014 11:07:50 +0200 Subject: [PATCH 511/843] haskell-hspec: update to version 1.11.4 --- pkgs/development/libraries/haskell/hspec/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/hspec/default.nix b/pkgs/development/libraries/haskell/hspec/default.nix index 98cc9f1b97e..1df977dbf57 100644 --- a/pkgs/development/libraries/haskell/hspec/default.nix +++ b/pkgs/development/libraries/haskell/hspec/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "hspec"; - version = "1.11.3"; - sha256 = "0kq2cds8khwq7nl60pvgk8v6s2fizfkpdplc1p0mj8zyr9gyz7i0"; + version = "1.11.4"; + sha256 = "044vr6xyk0ih20faa4gbl4y4v6vkss0x2gmxgkk96ha6chws2svn"; isLibrary = true; isExecutable = true; buildDepends = [ -- GitLab From 8315f88e72c639262019a2da6d432403c55c29e2 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 29 Aug 2014 11:07:52 +0200 Subject: [PATCH 512/843] haskell-hspec2: update to version 0.4.2 --- pkgs/development/libraries/haskell/hspec2/default.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/haskell/hspec2/default.nix b/pkgs/development/libraries/haskell/hspec2/default.nix index 295b01b4e32..e459e99e2fe 100644 --- a/pkgs/development/libraries/haskell/hspec2/default.nix +++ b/pkgs/development/libraries/haskell/hspec2/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "hspec2"; - version = "0.4.1"; - sha256 = "131w90yy7scxdpz7qa37n1wmyr8gvc5jqdsqkpg8s9pqham96w5v"; + version = "0.4.2"; + sha256 = "1wk1lvy3lngfa60n0dyllfqbj4gd4v0qxjw7gpvzknfk2y10536x"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -25,7 +25,5 @@ cabal.mkDerivation (self: { description = "Alpha version of Hspec 2.0"; license = self.stdenv.lib.licenses.mit; platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - broken = true; }; }) -- GitLab From 2e505d0eb7cdce97fa642294c6a21c6b0496657d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Fri, 29 Aug 2014 11:23:56 +0200 Subject: [PATCH 513/843] haskell-cgi: mark version 3001.2.0.0 broken It needs mtl >=2.2.1 && <2.3, and we cannot easily satisfy this requirement. It's interesting to observe how "cgi" remains broken in current versions of GHC for months, despite the fact that it's a Haskell Platform package. Makes one wonder about the purpose of the Haskell Platform, no? In the end, if there is no maintainer for a package, then it stays unmaintained, HP member or not. --- pkgs/development/libraries/haskell/cgi/3001.2.0.0.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/libraries/haskell/cgi/3001.2.0.0.nix b/pkgs/development/libraries/haskell/cgi/3001.2.0.0.nix index 0f0ea06ee74..2bacef96e08 100644 --- a/pkgs/development/libraries/haskell/cgi/3001.2.0.0.nix +++ b/pkgs/development/libraries/haskell/cgi/3001.2.0.0.nix @@ -12,5 +12,7 @@ cabal.mkDerivation (self: { description = "A library for writing CGI programs"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; + hydraPlatforms = self.stdenv.lib.platforms.none; + broken = true; }; }) -- GitLab From e657385acf742770abaaa9d5a3bf4588b84f6d0f Mon Sep 17 00:00:00 2001 From: Mateusz Kowalczyk Date: Fri, 29 Aug 2014 12:09:05 +0100 Subject: [PATCH 514/843] extreme-tux-racer: update to 0.6.0 --- pkgs/games/extremetuxracer/default.nix | 42 ++++++++++++++------------ pkgs/top-level/all-packages.nix | 10 ++---- 2 files changed, 26 insertions(+), 26 deletions(-) diff --git a/pkgs/games/extremetuxracer/default.nix b/pkgs/games/extremetuxracer/default.nix index e35eb3266c2..af80467c960 100644 --- a/pkgs/games/extremetuxracer/default.nix +++ b/pkgs/games/extremetuxracer/default.nix @@ -1,34 +1,38 @@ -a : -let - fetchurl = a.fetchurl; +{ stdenv, fetchurl, mesa, libX11, xproto, tcl, freeglut +, SDL, SDL_mixer, SDL_image, libXi, inputproto +, libXmu, libXext, xextproto, libXt, libSM, libICE +, libpng, pkgconfig, gettext, intltool +}: - version = a.lib.attrByPath ["version"] "0.5beta" a; - buildInputs = with a; [ +stdenv.mkDerivation rec { + version = "0.6.0"; + name = "extremetuxracer-${version}"; + + src = fetchurl { + url = "mirror://sourceforge/extremetuxracer/etr-${version}.tar.xz"; + sha256 = "0fl9pwkywqnsmgr6plfj9zb05xrdnl5xb2hcmbjk7ap9l4cjfca4"; + }; + + buildInputs = [ mesa libX11 xproto tcl freeglut - SDL SDL_mixer libXi inputproto + SDL SDL_mixer SDL_image libXi inputproto libXmu libXext xextproto libXt libSM libICE libpng pkgconfig gettext intltool ]; -in -rec { - src = fetchurl { - url = "mirror://sourceforge/extremetuxracer/extremetuxracer-${version}.tar.gz"; - sha256 = "04d99fsfna5mc9apjxsiyw0zgnswy33kwmm1s9d03ihw6rba2zxs"; - }; - inherit buildInputs; - configureFlags = [ - "--with-tcl=${a.tcl}/lib" - ]; + configureFlags = [ "--with-tcl=${tcl}/lib" ]; - /* doConfigure should be removed if not needed */ - phaseNames = ["doConfigure" "doMakeInstall"]; + preConfigure = '' + export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${SDL}/include/SDL" + ''; - name = "extremetuxracer-" + version; meta = { description = "High speed arctic racing game based on Tux Racer"; longDescription = '' ExtremeTuxRacer - Tux lies on his belly and accelerates down ice slopes. ''; + license = stdenv.lib.licenses.gpl2Plus; + homepage = http://sourceforge.net/projects/extremetuxracer/; + maintainers = with stdenv.lib.maintainers; [ fuuzetsu ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6f02f2650ac..91fd92e301d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4554,11 +4554,7 @@ let expat = callPackage ../development/libraries/expat { }; - extremetuxracer = builderDefsPackage (import ../games/extremetuxracer) { - inherit mesa tcl freeglut SDL SDL_mixer pkgconfig - gettext intltool; - inherit (xlibs) libX11 xproto libXi inputproto - libXmu libXext xextproto libXt libSM libICE; + extremetuxracer = callPackage ../games/extremetuxracer { libpng = libpng12; }; @@ -9209,11 +9205,11 @@ let inherit (gnome) vte; gtk = gtk2; }; - + lynx = callPackage ../applications/networking/browsers/lynx { }; lyx = callPackage ../applications/misc/lyx { }; - + makeself = callPackage ../applications/misc/makeself { }; matchbox = callPackage ../applications/window-managers/matchbox { }; -- GitLab From e41a169a60f18f7102137510ff243fea295c0995 Mon Sep 17 00:00:00 2001 From: Mateusz Kowalczyk Date: Wed, 27 Aug 2014 15:53:12 +0100 Subject: [PATCH 515/843] super-tux-kart: update to 0.8.1 --- pkgs/games/super-tux-kart/default.nix | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/pkgs/games/super-tux-kart/default.nix b/pkgs/games/super-tux-kart/default.nix index 29d3b4e4557..db42572de5e 100644 --- a/pkgs/games/super-tux-kart/default.nix +++ b/pkgs/games/super-tux-kart/default.nix @@ -1,18 +1,19 @@ { fetchurl, cmake, stdenv, plib, SDL, openal, freealut, mesa , libvorbis, libogg, gettext, libXxf86vm, curl, pkgconfig -, fribidi, autoconf, automake, libtool }: +, fribidi, autoconf, automake, libtool, bluez }: stdenv.mkDerivation rec { - name = "supertuxkart-0.8"; + version = "0.8.1"; + name = "supertuxkart-${version}"; src = fetchurl { url = "mirror://sourceforge/supertuxkart/${name}-src.tar.bz2"; - sha256 = "12sbml4wxg2x2wgnnkxfisj96a9gcsaj3fj27kdk8yj524ikv7xr"; + sha256 = "1mpqmi62a2kl6n58mw11fj0dr5xiwmjkqnfmd2z7ghdhc6p02lrk"; }; buildInputs = [ plib SDL openal freealut mesa libvorbis libogg gettext - libXxf86vm curl pkgconfig fribidi autoconf automake libtool cmake + libXxf86vm curl pkgconfig fribidi autoconf automake libtool cmake bluez ]; enableParallelBuilding = true; @@ -27,15 +28,13 @@ stdenv.mkDerivation rec { meta = { description = "SuperTuxKart is a Free 3D kart racing game"; - longDescription = '' SuperTuxKart is a Free 3D kart racing game, with many tracks, characters and items for you to try, similar in spirit to Mario Kart. ''; - homepage = http://supertuxkart.sourceforge.net/; - license = stdenv.lib.licenses.gpl2Plus; + maintainers = with stdenv.lib.maintainers; [ fuuzetsu ]; }; } -- GitLab From 8fe82841ea54b27e3e7e3ad59271124770382842 Mon Sep 17 00:00:00 2001 From: Mateusz Kowalczyk Date: Wed, 27 Aug 2014 14:55:26 +0100 Subject: [PATCH 516/843] xnee: update to 3.19 --- pkgs/tools/X11/xnee/default.nix | 7 ++++--- pkgs/top-level/all-packages.nix | 7 ++----- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/pkgs/tools/X11/xnee/default.nix b/pkgs/tools/X11/xnee/default.nix index 35c4ca06c6c..43fa105e680 100644 --- a/pkgs/tools/X11/xnee/default.nix +++ b/pkgs/tools/X11/xnee/default.nix @@ -2,11 +2,12 @@ , gtk, libXi, inputproto, pkgconfig, recordproto, texinfo }: stdenv.mkDerivation rec { - name = "xnee-3.12"; + version = "3.19"; + name = "xnee-${version}"; src = fetchurl { url = "mirror://gnu/xnee/${name}.tar.gz"; - sha256 = "10vxn0in0l2jir6x90grx5jc64x63l3b0f8liladdbplc8za8zmw"; + sha256 = "04n2lac0vgpv8zsn7nmb50hf3qb56pmj90dmwnivg09gyrf1x92j"; }; patchPhase = @@ -48,7 +49,7 @@ stdenv.mkDerivation rec { homepage = http://www.gnu.org/software/xnee/; - maintainers = [ ]; + maintainers = with stdenv.lib.maintainers; [ fuuzetsu ]; platforms = stdenv.lib.platforms.gnu; # arbitrary choice }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 91fd92e301d..9bdf2462406 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10203,10 +10203,7 @@ let xmp = callPackage ../applications/audio/xmp { }; - xnee = callPackage ../tools/X11/xnee { - # Work around "missing separator" error. - stdenv = overrideInStdenv stdenv [ gnumake381 ]; - }; + xnee = callPackage ../tools/X11/xnee { }; xvidcap = callPackage ../applications/video/xvidcap { inherit (gnome) scrollkeeper libglade; @@ -10918,7 +10915,7 @@ let liblbfgs = callPackage ../development/libraries/science/math/liblbfgs { }; openblas = callPackage ../development/libraries/science/math/openblas { }; - openblas_0_2_10 = callPackage ../development/libraries/science/math/openblas/0.2.10.nix { + openblas_0_2_10 = callPackage ../development/libraries/science/math/openblas/0.2.10.nix { liblapack = liblapack_3_5_0; }; -- GitLab From b4b3bd1bd7d429863dbfc7150baa86381b789aa8 Mon Sep 17 00:00:00 2001 From: Mateusz Kowalczyk Date: Wed, 27 Aug 2014 12:56:37 +0100 Subject: [PATCH 517/843] cloc: update to 1.62 --- pkgs/tools/misc/cloc/default.nix | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/pkgs/tools/misc/cloc/default.nix b/pkgs/tools/misc/cloc/default.nix index dfe5476f813..8d7ba0c70c8 100644 --- a/pkgs/tools/misc/cloc/default.nix +++ b/pkgs/tools/misc/cloc/default.nix @@ -1,30 +1,25 @@ { stdenv, fetchurl, perl, AlgorithmDiff, RegexpCommon }: stdenv.mkDerivation rec { - + name = "cloc-${version}"; - version = "1.58"; + version = "1.62"; src = fetchurl { url = "mirror://sourceforge/cloc/cloc-${version}.tar.gz"; - sha256 = "1k92jldy4m717lh1xd6yachx3l2hhpx76qhj1ipnx12hsxw1zc8w"; + sha256 = "1cxc663dccd0sc2m0aj5lxdbnbzrys6rh9n8q122h74bfvsiw4f4"; }; buildInputs = [ perl AlgorithmDiff RegexpCommon ]; - unpackPhase = '' - mkdir ${name} - tar xf $src -C ${name} - cd ${name} - ''; - makeFlags = [ "prefix=" "DESTDIR=$(out)" "INSTALL=install" ]; meta = { description = "A program that counts lines of source code"; homepage = http://cloc.sourceforge.net; license = stdenv.lib.licenses.gpl2; + maintainers = with stdenv.lib.maintainers; [ fuuzetsu ]; }; } -- GitLab From 17b88f1b095ad1262b729d75aaea44dd5b0324c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Fri, 29 Aug 2014 13:49:04 +0200 Subject: [PATCH 518/843] pypy: wrap to provide sqlite3 at runtime --- pkgs/development/interpreters/pypy/2.3/default.nix | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/development/interpreters/pypy/2.3/default.nix b/pkgs/development/interpreters/pypy/2.3/default.nix index 0ed13e2f646..73a52e6dfc7 100644 --- a/pkgs/development/interpreters/pypy/2.3/default.nix +++ b/pkgs/development/interpreters/pypy/2.3/default.nix @@ -1,5 +1,6 @@ { stdenv, fetchurl, zlib ? null, zlibSupport ? true, bzip2, pkgconfig, libffi -, sqlite, openssl, ncurses, pythonFull, expat, tcl, tk, x11, libX11 }: +, sqlite, openssl, ncurses, pythonFull, expat, tcl, tk, x11, libX11 +, makeWrapper }: assert zlibSupport -> zlib != null; @@ -20,7 +21,7 @@ let sha256 = "0fg4l48c7n59n5j3b1dgcsr927xzylkfny4a6pnk6z0pq2bhvl9z"; }; - buildInputs = [ bzip2 openssl pkgconfig pythonFull libffi ncurses expat sqlite tk tcl x11 libX11 ] + 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 zlibSupport zlib; @@ -86,7 +87,10 @@ let # verify cffi modules $out/bin/pypy -c "import Tkinter;import sqlite3" - # TODO: compile python files? + # make sure pypy finds sqlite3 library + wrapProgram "$out/bin/pypy" \ + --set LD_LIBRARY_PATH "${LD_LIBRARY_PATH}" \ + --set LIBRARY_PATH "${LIBRARY_PATH}" ''; passthru = { @@ -98,7 +102,7 @@ let enableParallelBuilding = true; meta = with stdenv.lib; { - homepage = "http://pypy.org/"; + homepage = http://pypy.org/; description = "Fast, compliant alternative implementation of the Python language (2.7.3)"; license = licenses.mit; platforms = platforms.linux; -- GitLab From 019bc6bb2b432cca214ee2f949ef9936c5818161 Mon Sep 17 00:00:00 2001 From: Igor Pashev Date: Fri, 29 Aug 2014 13:56:23 +0200 Subject: [PATCH 519/843] Made Mediawiki rewrite rules work for virtual hosts Related to cdd1785cd6380e971ad0413e7ecfd3af7ab38625 --- nixos/modules/services/web-servers/apache-httpd/mediawiki.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/web-servers/apache-httpd/mediawiki.nix b/nixos/modules/services/web-servers/apache-httpd/mediawiki.nix index 76c64f8cb29..bb066aa6c47 100644 --- a/nixos/modules/services/web-servers/apache-httpd/mediawiki.nix +++ b/nixos/modules/services/web-servers/apache-httpd/mediawiki.nix @@ -133,7 +133,7 @@ in RewriteEngine On RewriteCond %{DOCUMENT_ROOT}%{REQUEST_URI} !-f RewriteCond %{DOCUMENT_ROOT}%{REQUEST_URI} !-d - ${concatMapStringsSep "\n" (u: "RewriteCond %{REQUEST_URI} !^${u.urlPath}") serverInfo.serverConfig.servedDirs} + ${concatMapStringsSep "\n" (u: "RewriteCond %{REQUEST_URI} !^${u.urlPath}") serverInfo.vhostConfig.servedDirs} RewriteRule ${if config.enableUploads then "!^/images" else "^.*\$" -- GitLab From 98cc03eb2295137701d706f8d857c15f3e54379f Mon Sep 17 00:00:00 2001 From: Mateusz Kowalczyk Date: Fri, 29 Aug 2014 13:04:14 +0100 Subject: [PATCH 520/843] ffmpeg: update to 2.3.3 --- pkgs/development/libraries/ffmpeg/2.x.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/ffmpeg/2.x.nix b/pkgs/development/libraries/ffmpeg/2.x.nix index 19a4099a8b1..8114eb4752d 100644 --- a/pkgs/development/libraries/ffmpeg/2.x.nix +++ b/pkgs/development/libraries/ffmpeg/2.x.nix @@ -5,11 +5,12 @@ }: stdenv.mkDerivation rec { - name = "ffmpeg-2.3.2"; + version = "2.3.3"; + name = "ffmpeg-${version}"; src = fetchurl { url = "http://www.ffmpeg.org/releases/${name}.tar.bz2"; - sha256 = "1lpzqjpklmcjzk327pz070m3qz3s1cwg8v90w6r1sdh8491kbqc4"; + sha256 = "0ik4c06anh49r5b0d3rq9if4zl6ysjsa341655kzw22fl880sk5v"; }; subtitleSupport = config.ffmpeg.subtitle or true; @@ -102,5 +103,6 @@ stdenv.mkDerivation rec { description = "A complete, cross-platform solution to record, convert and stream audio and video"; license = if (fdkAACSupport || faacSupport) then stdenv.lib.licenses.unfree else stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.linux; + maintainers = with stdenv.lib.maintainers; [ fuuzetsu ]; }; } -- GitLab From 41dc081a09aaa42d6528af1d3e23917b17f898e5 Mon Sep 17 00:00:00 2001 From: Michel Kuhlmann Date: Fri, 29 Aug 2014 14:18:27 +0200 Subject: [PATCH 521/843] haskell-present: initial expression --- .../libraries/haskell/present/default.nix | 15 +++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 17 insertions(+) create mode 100644 pkgs/development/libraries/haskell/present/default.nix diff --git a/pkgs/development/libraries/haskell/present/default.nix b/pkgs/development/libraries/haskell/present/default.nix new file mode 100644 index 00000000000..7c5f3afbd98 --- /dev/null +++ b/pkgs/development/libraries/haskell/present/default.nix @@ -0,0 +1,15 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, aeson, attoLisp, dataDefault, mtl, semigroups, text }: + +cabal.mkDerivation (self: { + pname = "present"; + version = "1.1"; + sha256 = "1hmzq3qi4hz74xr7cnc33kpwki9ziyinvrwazag8hh77d02fl11z"; + buildDepends = [ aeson attoLisp dataDefault mtl semigroups text ]; + meta = { + description = "Make presentations for data types"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 8f9ef6710a3..18a8e8b7655 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1932,6 +1932,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in presburger = callPackage ../development/libraries/haskell/presburger {}; + present = callPackage ../development/libraries/haskell/present {}; + prettyclass = callPackage ../development/libraries/haskell/prettyclass {}; prettyShow = callPackage ../development/libraries/haskell/pretty-show {}; -- GitLab From dfeba56c0e3ea625965deb46e6200c388d5c9d5f Mon Sep 17 00:00:00 2001 From: Mateusz Kowalczyk Date: Fri, 29 Aug 2014 13:32:10 +0100 Subject: [PATCH 522/843] libaal: update to 1.0.6 --- pkgs/development/libraries/libaal/default.nix | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/libaal/default.nix b/pkgs/development/libraries/libaal/default.nix index 596b8e2e84c..36d1ddc7151 100644 --- a/pkgs/development/libraries/libaal/default.nix +++ b/pkgs/development/libraries/libaal/default.nix @@ -1,11 +1,12 @@ -{stdenv, fetchurl}: +{ stdenv, fetchurl }: -stdenv.mkDerivation { - name = "libaal-1.0.5"; +stdenv.mkDerivation rec { + version = "1.0.6"; + name = "libaal-${version}"; src = fetchurl { - url = http://chichkin_i.zelnet.ru/namesys/libaal-1.0.5.tar.gz; - sha256 = "109f464hxwms90mpczc7h7lmrdlcmlglabkzh86h25xrlxxdn6pz"; + url = "mirror://sourceforge/reiser4/${name}.tar.gz"; + sha256 = "176f2sns6iyxv3h9zyirdinjwi05gdak48zqarhib2s38rvm98di"; }; preInstall = '' @@ -15,5 +16,7 @@ stdenv.mkDerivation { meta = { homepage = http://www.namesys.com/; description = "Support library for Reiser4"; + license = stdenv.lib.licenses.gpl2; + maintainers = with stdenv.lib.maintainers; [ fuuzetsu ]; }; } -- GitLab From badb705a5cf0ffb3078a6142df0812d3b03bcde6 Mon Sep 17 00:00:00 2001 From: Mateusz Kowalczyk Date: Fri, 29 Aug 2014 13:45:04 +0100 Subject: [PATCH 523/843] libaio: update to 0.3.110 --- pkgs/os-specific/linux/libaio/default.nix | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/os-specific/linux/libaio/default.nix b/pkgs/os-specific/linux/libaio/default.nix index bf30530e9ad..b3df129912e 100644 --- a/pkgs/os-specific/linux/libaio/default.nix +++ b/pkgs/os-specific/linux/libaio/default.nix @@ -1,12 +1,12 @@ -{ stdenv, fetchgit }: +{ stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "libaio-0.3.109"; + version = "0.3.110"; + name = "libaio-${version}"; - src = fetchgit { - url = https://git.fedorahosted.org/git/libaio.git; - rev = "refs/tags/${name}"; - sha256 = "1wbziq0hqvnbckpxrz1cgr8dlw3mifs4xpy3qhnagbrrsmrq2rhi"; + src = fetchurl { + url = "https://fedorahosted.org/releases/l/i/libaio/${name}.tar.gz"; + sha256 = "0zjzfkwd1kdvq6zpawhzisv7qbq1ffs343i5fs9p498pcf7046g0"; }; makeFlags = "prefix=$(out)"; @@ -15,5 +15,7 @@ stdenv.mkDerivation rec { description = "Library for asynchronous I/O in Linux"; homepage = http://lse.sourceforge.net/io/aio.html; platforms = stdenv.lib.platforms.linux; + license = stdenv.lib.licenses.lgpl21; + maintainers = with stdenv.lib.maintainers; [ fuuzetsu ]; }; } -- GitLab From 5fb879526d894a4650fa84e129251119f6000ea4 Mon Sep 17 00:00:00 2001 From: Mateusz Kowalczyk Date: Fri, 29 Aug 2014 13:56:49 +0100 Subject: [PATCH 524/843] libao: update to 1.2.0 --- pkgs/development/libraries/libao/default.nix | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/libao/default.nix b/pkgs/development/libraries/libao/default.nix index 401573378ee..44e800b6f1e 100644 --- a/pkgs/development/libraries/libao/default.nix +++ b/pkgs/development/libraries/libao/default.nix @@ -1,14 +1,15 @@ { lib, stdenv, fetchurl, pkgconfig, pulseaudio, alsaLib , usePulseAudio }: -stdenv.mkDerivation { - name = "libao-1.1.0"; +stdenv.mkDerivation rec { + version = "1.2.0"; + name = "libao-${version}"; src = fetchurl { - url = http://downloads.xiph.org/releases/ao/libao-1.1.0.tar.gz; - sha256 = "1m0v2y6bhr4iwsgdkc7b3y0qgpvpv1ifbxsy8n8ahsvjn6wmppi9"; + url = "http://downloads.xiph.org/releases/ao/${name}.tar.gz"; + sha256 = "1bwwv1g9lchaq6qmhvj1pp3hnyqr64ydd4j38x94pmprs4d27b83"; }; - buildInputs = + buildInputs = [ pkgconfig ] ++ lib.optional stdenv.isLinux (if usePulseAudio then [ pulseaudio ] else [ alsaLib ]); @@ -19,6 +20,7 @@ stdenv.mkDerivation { platforms. ''; homepage = http://xiph.org/ao/; - license = stdenv.lib.licenses.gpl2Plus; + license = stdenv.lib.licenses.gpl2; + maintainers = with stdenv.lib.maintainers; [ fuuzetsu ]; }; } -- GitLab From a0f317cc5b1ce43f21a7cbbcd9f7b557a2a588e7 Mon Sep 17 00:00:00 2001 From: Mateusz Kowalczyk Date: Fri, 29 Aug 2014 14:01:51 +0100 Subject: [PATCH 525/843] lzo: update from 2.06 to 2.08 --- pkgs/development/libraries/lzo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/lzo/default.nix b/pkgs/development/libraries/lzo/default.nix index 7fa6194cbca..f4bff72fa80 100644 --- a/pkgs/development/libraries/lzo/default.nix +++ b/pkgs/development/libraries/lzo/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl}: stdenv.mkDerivation rec { - name = "lzo-2.06"; + name = "lzo-2.08"; src = fetchurl { url = "${meta.homepage}/download/${name}.tar.gz"; - sha256 = "0wryshs446s7cclrbjykyj766znhcpnr7s3cxy33ybfn6vwfcygz"; + sha256 = "0536ad3ksk1r8h2a27d0y4p27lwjarzyndw7sagvxzj6xr6kw6xc"; }; configureFlags = [ "--enable-shared" ]; -- GitLab From 51829a0f39005a6ec682d6aa5f28f0f96806428c Mon Sep 17 00:00:00 2001 From: Mateusz Kowalczyk Date: Fri, 29 Aug 2014 14:17:40 +0100 Subject: [PATCH 526/843] murmur: update to 1.2.8 --- pkgs/applications/networking/mumble/murmur.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/mumble/murmur.nix b/pkgs/applications/networking/mumble/murmur.nix index 17254aa2fdd..1c06392f60b 100644 --- a/pkgs/applications/networking/mumble/murmur.nix +++ b/pkgs/applications/networking/mumble/murmur.nix @@ -12,11 +12,11 @@ let in stdenv.mkDerivation rec { name = "murmur-" + version; - version = "1.2.6"; + version = "1.2.8"; src = fetchurl { url = "mirror://sourceforge/mumble/mumble-${version}.tar.gz"; - sha256 = "1zxnbwbd81p7lvscghlpkad8kynh9gbf1nhc092sp64pp37xwv47"; + sha256 = "0ng1xd7i0951kqnd9visf84y2dcwia79a1brjwfvr1wnykgw6bsc"; }; patchPhase = optional iceSupport '' -- GitLab From 0fb885721aeb13990fe3243743ab4f04d5f5fa8e Mon Sep 17 00:00:00 2001 From: Mateusz Kowalczyk Date: Fri, 29 Aug 2014 14:33:25 +0100 Subject: [PATCH 527/843] libmpeg2: update to 0.5.1 The patch seems unnecessary but I'll look out for breakage. --- .../libraries/libmpeg2/A00-tags.patch | 27 ------------------- .../libraries/libmpeg2/default.nix | 12 ++++----- 2 files changed, 5 insertions(+), 34 deletions(-) delete mode 100644 pkgs/development/libraries/libmpeg2/A00-tags.patch diff --git a/pkgs/development/libraries/libmpeg2/A00-tags.patch b/pkgs/development/libraries/libmpeg2/A00-tags.patch deleted file mode 100644 index 0b5d7d7da12..00000000000 --- a/pkgs/development/libraries/libmpeg2/A00-tags.patch +++ /dev/null @@ -1,27 +0,0 @@ -diff -ru mpeg2dec.orig/libmpeg2/decode.c mpeg2dec/libmpeg2/decode.c ---- mpeg2dec.orig/libmpeg2/decode.c 2008-07-09 12:16:05.000000000 -0700 -+++ mpeg2dec/libmpeg2/decode.c 2009-07-03 16:29:48.000000000 -0700 -@@ -212,7 +212,7 @@ - - mpeg2_state_t mpeg2_parse_header (mpeg2dec_t * mpeg2dec) - { -- static int (* process_header[]) (mpeg2dec_t * mpeg2dec) = { -+ static int (* process_header[]) (mpeg2dec_t *) = { - mpeg2_header_picture, mpeg2_header_extension, mpeg2_header_user_data, - mpeg2_header_sequence, NULL, NULL, NULL, NULL, mpeg2_header_gop - }; -@@ -368,6 +368,14 @@ - - void mpeg2_tag_picture (mpeg2dec_t * mpeg2dec, uint32_t tag, uint32_t tag2) - { -+ if (mpeg2dec->num_tags == 0 && mpeg2dec->state == STATE_PICTURE && mpeg2dec->picture) { -+ // since tags got processed when we entered this state we -+ // have to set them directly or they'll end up on the next frame. -+ mpeg2dec->picture->tag = tag; -+ mpeg2dec->picture->tag2 = tag2; -+ mpeg2dec->picture->flags |= PIC_FLAG_TAGS; -+ return; -+ } - mpeg2dec->tag_previous = mpeg2dec->tag_current; - mpeg2dec->tag2_previous = mpeg2dec->tag2_current; - mpeg2dec->tag_current = tag; diff --git a/pkgs/development/libraries/libmpeg2/default.nix b/pkgs/development/libraries/libmpeg2/default.nix index e651a932efe..c2008700804 100644 --- a/pkgs/development/libraries/libmpeg2/default.nix +++ b/pkgs/development/libraries/libmpeg2/default.nix @@ -1,20 +1,18 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "libmpeg2-0.5.1p4"; - + version = "0.5.1"; + name = "libmpeg2-${version}"; + src = fetchurl { url = "http://libmpeg2.sourceforge.net/files/${name}.tar.gz"; sha256 = "1m3i322n2fwgrvbs1yck7g5md1dbg22bhq5xdqmjpz5m7j4jxqny"; }; - # From Handbrake - Project seems unmaintained - patches = [ - ./A00-tags.patch - ]; - meta = { homepage = http://libmpeg2.sourceforge.net/; description = "A free library for decoding mpeg-2 and mpeg-1 video streams"; + license = stdenv.lib.licenses.gpl2; + maintainer = with stdenv.lib.maintainers; [ fuuzetsu ]; }; } -- GitLab From 09afbd1f06c54e2e5608bd142e1274e4335f581b Mon Sep 17 00:00:00 2001 From: Mateusz Kowalczyk Date: Fri, 29 Aug 2014 14:06:23 +0100 Subject: [PATCH 528/843] mkvtoolnix: update from 6.5.0 to 7.1.0 --- pkgs/applications/video/mkvtoolnix/default.nix | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/video/mkvtoolnix/default.nix b/pkgs/applications/video/mkvtoolnix/default.nix index ed64448c13a..e0ab4582cd8 100644 --- a/pkgs/applications/video/mkvtoolnix/default.nix +++ b/pkgs/applications/video/mkvtoolnix/default.nix @@ -15,14 +15,18 @@ }: stdenv.mkDerivation rec { - name = "mkvtoolnix-6.5.0"; + version = "7.1.0"; + name = "mkvtoolnix-${version}"; src = fetchurl { url = "http://www.bunkus.org/videotools/mkvtoolnix/sources/${name}.tar.xz"; - sha256 = "0a3h878bsjbpb2r7b528xzyqzl8r82yhrniry9bnhmw7rcl53bd8"; + sha256 = "06xqy4f7gi1xj0yqb6y1wmxwvsxfxal2plfsbl33dkwd0srixj06"; }; - buildInputs = [ libmatroska flac libvorbis file boost xdg_utils expat wxGTK zlib ruby gettext pkgconfig curl ]; + buildInputs = [ + libmatroska flac libvorbis file boost xdg_utils + expat wxGTK zlib ruby gettext pkgconfig curl + ]; configureFlags = "--with-boost-libdir=${boost}/lib"; buildPhase = '' @@ -36,5 +40,7 @@ stdenv.mkDerivation rec { meta = { description = "Cross-platform tools for Matroska"; homepage = http://www.bunkus.org/videotools/mkvtoolnix/; + license = stdenv.lib.licenses.gpl2; + maintainers = with stdenv.lib.maintainers; [ fuuzetsu ]; }; } -- GitLab From ac73fbcda96d01b26c3be3eb87d718d5e9a0ef73 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= Date: Wed, 27 Aug 2014 17:58:54 +0200 Subject: [PATCH 529/843] dogecoin: 1.4 -> 1.8 --- pkgs/applications/misc/bitcoin/altcoins.nix | 42 ++++++++++++++++++--- 1 file changed, 36 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/misc/bitcoin/altcoins.nix b/pkgs/applications/misc/bitcoin/altcoins.nix index 2b99bad58da..796cedc1ee2 100644 --- a/pkgs/applications/misc/bitcoin/altcoins.nix +++ b/pkgs/applications/misc/bitcoin/altcoins.nix @@ -1,5 +1,6 @@ { fetchurl, stdenv, pkgconfig -, openssl, db48, boost, zlib, miniupnpc, qt4, qrencode, glib, protobuf, utillinux }: +, openssl, db48, boost, zlib, miniupnpc, qt4, qrencode, glib, protobuf +, utillinux, autogen, autoconf, autobuild, automake, db }: with stdenv.lib; @@ -79,22 +80,51 @@ in rec { }; }; - dogecoin = buildAltcoin rec { + dogecoin = (buildAltcoin rec { walletName = "dogecoin"; - version = "1.4"; + version = "1.8.0"; src = fetchurl { - url = "https://github.com/dogecoin/dogecoin/archive/1.4.tar.gz"; - sha256 = "4af983f182976c98f0e32d525083979c9509b28b7d6faa0b90c5bd40b71009cc"; + url = "https://github.com/dogecoin/dogecoin/archive/v${version}.tar.gz"; + sha256 = "8a33958c04213cd621aa3c86910477813af22512f03b47c98995d20d31f3f935"; }; + extraBuildInputs = [ autogen autoconf automake pkgconfig db utillinux protobuf ]; + meta = { description = "Wow, such coin, much shiba, very rich"; longDescription = "wow"; homepage = http://www.dogecoin.com/; maintainers = [ maintainers.offline maintainers.edwtjo ]; }; + }).override rec { + patchPhase = '' + sed -i \ + -e 's,BDB_CPPFLAGS=$,BDB_CPPFLAGS="-I${db}/include",g' \ + -e 's,BDB_LIBS=$,BDB_LIBS="-L${db}/lib",g' \ + -e 's,bdbdirlist=$,bdbdirlist="${db}/include",g' \ + src/m4/dogecoin_find_bdb51.m4 + ''; + dogeConfigure = '' + ./autogen.sh \ + && ./configure --prefix=$out \ + --with-incompatible-bdb \ + --with-boost-libdir=${boost}/lib \ + ''; + dogeInstall = '' + install -D "src/dogecoin-cli" "$out/bin/dogecoin-cli" + install -D "src/dogecoind" "$out/bin/dogecoind" + ''; + configurePhase = dogeConfigure + "--with-gui"; + installPhase = dogeInstall + "install -D src/qt/dogecoin-qt $out/bin/dogecoin-qt"; + }; + + dogecoind = dogecoin.override rec { + gui = false; + makefile = "Makefile"; + preBuild = ""; + configurePhase = dogecoin.dogeConfigure + "--without-gui"; + installPhase = dogecoin.dogeInstall; }; - dogecoind = dogecoin.override { gui = false; }; } -- GitLab From 34b18399aaeabdb93cab478a90b8eedbdc7ce10e Mon Sep 17 00:00:00 2001 From: Daniel Bergey Date: Fri, 29 Aug 2014 14:03:07 +0000 Subject: [PATCH 530/843] revert fsnotify back to 0.0.11 fsnotify changes need more testing on Darwin --- .../libraries/haskell/fsnotify/default.nix | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/pkgs/development/libraries/haskell/fsnotify/default.nix b/pkgs/development/libraries/haskell/fsnotify/default.nix index 70edecb1f8d..3d308f6a88f 100644 --- a/pkgs/development/libraries/haskell/fsnotify/default.nix +++ b/pkgs/development/libraries/haskell/fsnotify/default.nix @@ -1,19 +1,19 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, async, hinotify, systemFileio, systemFilepath, tasty -, tastyHunit, temporaryRc, text, time +{ stdenv, cabal, Cabal, Glob, hspec, QuickCheck, random +, systemFileio, systemFilepath, text, time, uniqueid +, hinotify, hfsevents }: cabal.mkDerivation (self: { pname = "fsnotify"; - version = "0.1.0.3"; - sha256 = "0m6jyg45azk377jklgwyqrx95q174cxd5znpyh9azznkh09wq58z"; - buildDepends = [ - async hinotify systemFileio systemFilepath text time - ]; + version = "0.0.11"; + sha256 = "03m911pncyzgfdx4aj38azbbmj25fdm3s9l1w27zv0l730fy8ywq"; + buildDepends = [ systemFileio systemFilepath text time ] ++ + (if stdenv.isDarwin then [ hfsevents ] else [ hinotify ]); testDepends = [ - async systemFileio systemFilepath tasty tastyHunit temporaryRc - ]; + Cabal Glob hspec QuickCheck random systemFileio + systemFilepath text time uniqueid + ] ++ (if stdenv.isDarwin then [ hfsevents ] else [ hinotify ]); + doCheck = false; meta = { description = "Cross platform library for file change notification"; license = self.stdenv.lib.licenses.bsd3; -- GitLab From 05b83fe6a23e5ca0b531fb47269c419d6a549d7b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=BCdiger=20Sonderfeld?= Date: Fri, 29 Aug 2014 16:40:16 +0200 Subject: [PATCH 531/843] octave: Update to 3.8.2. Also change "," placement to be consistent and remove unnecessary let. --- pkgs/development/interpreters/octave/default.nix | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/pkgs/development/interpreters/octave/default.nix b/pkgs/development/interpreters/octave/default.nix index 1addccb4bf8..eac067da282 100644 --- a/pkgs/development/interpreters/octave/default.nix +++ b/pkgs/development/interpreters/octave/default.nix @@ -1,18 +1,16 @@ -{stdenv, fetchurl, gfortran, readline, ncurses, perl, flex, texinfo, qhull, -libX11, graphicsmagick, pcre, liblapack, pkgconfig, mesa, fltk, -fftw, fftwSinglePrec, zlib, curl, qrupdate +{ stdenv, fetchurl, gfortran, readline, ncurses, perl, flex, texinfo, qhull +, libX11, graphicsmagick, pcre, liblapack, pkgconfig, mesa, fltk +, fftw, fftwSinglePrec, zlib, curl, qrupdate , qt ? null, ghostscript ? null, llvm ? null, hdf5 ? null,glpk ? null , suitesparse ? null, gnuplot ? null, openjdk ? null, python ? null }: -let - version = "3.8.1"; -in stdenv.mkDerivation rec { + version = "3.8.2"; name = "octave-${version}"; src = fetchurl { url = "mirror://gnu/octave/${name}.tar.bz2"; - sha256 = "1gcvzbgyz98mxzy3gjkdbdiirafkl73l9ywml11j412amp92wxnn"; + sha256 = "83bbd701aab04e7e57d0d5b8373dd54719bebb64ce0a850e69bf3d7454f33bae"; }; buildInputs = [ gfortran readline ncurses perl flex texinfo qhull libX11 -- GitLab From 40ccaa2b4c4b60e5a3d308c4713d8d43073a7ecb Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Thu, 28 Aug 2014 16:07:30 -0500 Subject: [PATCH 532/843] openblas: pin all the versions julia requires --- .../science/math/openblas/{default.nix => 0.2.2.nix} | 0 pkgs/top-level/all-packages.nix | 10 ++++++++-- 2 files changed, 8 insertions(+), 2 deletions(-) rename pkgs/development/libraries/science/math/openblas/{default.nix => 0.2.2.nix} (100%) diff --git a/pkgs/development/libraries/science/math/openblas/default.nix b/pkgs/development/libraries/science/math/openblas/0.2.2.nix similarity index 100% rename from pkgs/development/libraries/science/math/openblas/default.nix rename to pkgs/development/libraries/science/math/openblas/0.2.2.nix diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9bdf2462406..6cea37064cc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3128,10 +3128,12 @@ let juliaGit = callPackage ../development/compilers/julia/git-20131013.nix { liblapack = liblapack.override {shared = true;}; llvm = llvm_33; + openblas = openblas_0_2_2; }; julia021 = callPackage ../development/compilers/julia/0.2.1.nix { liblapack = liblapack.override {shared = true;}; llvm = llvm_33; + openblas = openblas_0_2_2; }; julia030 = let liblapack = liblapack_3_5_0.override {shared = true;}; @@ -3140,8 +3142,8 @@ let suitesparse = suitesparse.override { inherit liblapack; }; - openblas = openblas_0_2_10; llvm = llvm_34; + openblas = openblas_0_2_10; }; julia = julia021; @@ -10914,10 +10916,14 @@ let liblbfgs = callPackage ../development/libraries/science/math/liblbfgs { }; - openblas = callPackage ../development/libraries/science/math/openblas { }; + # julia is pinned to specific versions of openblas, so keep old versions + # until they aren't needed. The un-versioned attribute may continue to track + # upstream development. + openblas = openblas_0_2_10; openblas_0_2_10 = callPackage ../development/libraries/science/math/openblas/0.2.10.nix { liblapack = liblapack_3_5_0; }; + openblas_0_2_2 = callPackage ../development/libraries/science/math/openblas/0.2.2.nix { }; mathematica = callPackage ../applications/science/math/mathematica { }; -- GitLab From df731f151faafc4e68f4504d60be0968faecd6bd Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Thu, 28 Aug 2014 16:39:01 -0500 Subject: [PATCH 533/843] openblas: add version 0.2.11 --- .../science/math/openblas/default.nix | 36 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 ++- 2 files changed, 39 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/libraries/science/math/openblas/default.nix diff --git a/pkgs/development/libraries/science/math/openblas/default.nix b/pkgs/development/libraries/science/math/openblas/default.nix new file mode 100644 index 00000000000..a1811a4209c --- /dev/null +++ b/pkgs/development/libraries/science/math/openblas/default.nix @@ -0,0 +1,36 @@ +{ stdenv, fetchurl, gfortran, perl, liblapack, config }: + +let local = config.openblas.preferLocalBuild or false; + localTarget = config.openblas.target or ""; +in +stdenv.mkDerivation rec { + version = "0.2.11"; + + name = "openblas-${version}"; + src = fetchurl { + url = "https://github.com/xianyi/OpenBLAS/tarball/v${version}"; + sha256 = "1va4yhzgj2chcj6kaxgfbzirajp1zgvkic61959aka2xq2c5igms"; + name = "openblas-${version}.tar.gz"; + }; + + preBuild = "cp ${liblapack.src} lapack-${liblapack.meta.version}.tgz"; + + buildInputs = [gfortran perl]; + + cpu = builtins.head (stdenv.lib.splitString "-" stdenv.system); + + target = if local then localTarget else + if cpu == "i686" then "P2" else + if cpu == "x86_64" then "CORE2" else + # allow autodetect + ""; + + makeFlags = "${if target != "" then "TARGET=" else ""}${target} FC=gfortran CC=cc PREFIX=\"\$(out)\" INTERFACE64=1"; + + meta = { + description = "Basic Linear Algebra Subprograms"; + license = stdenv.lib.licenses.bsd3; + homepage = "https://github.com/xianyi/OpenBLAS"; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6cea37064cc..1942be80a7c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10919,7 +10919,9 @@ let # julia is pinned to specific versions of openblas, so keep old versions # until they aren't needed. The un-versioned attribute may continue to track # upstream development. - openblas = openblas_0_2_10; + openblas = callPackage ../development/libraries/science/math/openblas { + liblapack = liblapack_3_5_0; + }; openblas_0_2_10 = callPackage ../development/libraries/science/math/openblas/0.2.10.nix { liblapack = liblapack_3_5_0; }; -- GitLab From 9ade2dfa3cefe89776d48cea684c8ea0d3bc8e13 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Thu, 28 Aug 2014 18:34:41 -0500 Subject: [PATCH 534/843] openblas: add local build preference to pinned versions --- .../libraries/science/math/openblas/0.2.10.nix | 8 ++++++-- .../development/libraries/science/math/openblas/0.2.2.nix | 8 ++++++-- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/science/math/openblas/0.2.10.nix b/pkgs/development/libraries/science/math/openblas/0.2.10.nix index a8db0631911..c8df06ef378 100644 --- a/pkgs/development/libraries/science/math/openblas/0.2.10.nix +++ b/pkgs/development/libraries/science/math/openblas/0.2.10.nix @@ -1,5 +1,8 @@ -{ stdenv, fetchurl, gfortran, perl, liblapack }: +{ stdenv, fetchurl, gfortran, perl, liblapack, config }: +let local = config.openblas.preferLocalBuild or false; + localTarget = config.openblas.target or ""; +in stdenv.mkDerivation rec { version = "0.2.10"; @@ -16,7 +19,8 @@ stdenv.mkDerivation rec { cpu = builtins.head (stdenv.lib.splitString "-" stdenv.system); - target = if cpu == "i686" then "P2" else + target = if local then localTarget else + if cpu == "i686" then "P2" else if cpu == "x86_64" then "CORE2" else # allow autodetect ""; diff --git a/pkgs/development/libraries/science/math/openblas/0.2.2.nix b/pkgs/development/libraries/science/math/openblas/0.2.2.nix index c535b1a39db..22dbc491f87 100644 --- a/pkgs/development/libraries/science/math/openblas/0.2.2.nix +++ b/pkgs/development/libraries/science/math/openblas/0.2.2.nix @@ -1,5 +1,8 @@ -{ stdenv, fetchurl, gfortran, perl, liblapack }: +{ stdenv, fetchurl, gfortran, perl, liblapack, config }: +let local = config.openblas.preferLocalBuild or false; + localTarget = config.openblas.target or ""; +in stdenv.mkDerivation rec { version = "0.2.2"; @@ -16,7 +19,8 @@ stdenv.mkDerivation rec { cpu = builtins.head (stdenv.lib.splitString "-" stdenv.system); - target = if cpu == "i686" then "P2" else + target = if local then localTarget else + if cpu == "i686" then "P2" else if cpu == "x86_64" then "CORE2" else # allow autodetect ""; -- GitLab From 634b9ae6d4fc0707d5c58f039ab34c70b77cfef0 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Fri, 29 Aug 2014 10:02:39 -0500 Subject: [PATCH 535/843] openblas: add ttuegel as maintainer --- pkgs/development/libraries/science/math/openblas/0.2.10.nix | 5 +++-- pkgs/development/libraries/science/math/openblas/0.2.2.nix | 5 +++-- pkgs/development/libraries/science/math/openblas/default.nix | 5 +++-- 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/science/math/openblas/0.2.10.nix b/pkgs/development/libraries/science/math/openblas/0.2.10.nix index c8df06ef378..ec4422ce895 100644 --- a/pkgs/development/libraries/science/math/openblas/0.2.10.nix +++ b/pkgs/development/libraries/science/math/openblas/0.2.10.nix @@ -27,10 +27,11 @@ stdenv.mkDerivation rec { makeFlags = "${if target != "" then "TARGET=" else ""}${target} FC=gfortran CC=cc PREFIX=\"\$(out)\" INTERFACE64=1"; - meta = { + meta = with stdenv.lib; { description = "Basic Linear Algebra Subprograms"; - license = stdenv.lib.licenses.bsd3; + license = licenses.bsd3; homepage = "https://github.com/xianyi/OpenBLAS"; platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [ ttuegel ]; }; } diff --git a/pkgs/development/libraries/science/math/openblas/0.2.2.nix b/pkgs/development/libraries/science/math/openblas/0.2.2.nix index 22dbc491f87..c476dac955a 100644 --- a/pkgs/development/libraries/science/math/openblas/0.2.2.nix +++ b/pkgs/development/libraries/science/math/openblas/0.2.2.nix @@ -27,10 +27,11 @@ stdenv.mkDerivation rec { makeFlags = "${if target != "" then "TARGET=" else ""}${target} FC=gfortran CC=cc PREFIX=\"\$(out)\""; - meta = { + meta = with stdenv.lib; { description = "Basic Linear Algebra Subprograms"; - license = stdenv.lib.licenses.bsd3; + license = licenses.bsd3; homepage = "https://github.com/xianyi/OpenBLAS"; platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [ ttuegel ]; }; } diff --git a/pkgs/development/libraries/science/math/openblas/default.nix b/pkgs/development/libraries/science/math/openblas/default.nix index a1811a4209c..6ca1f4ccada 100644 --- a/pkgs/development/libraries/science/math/openblas/default.nix +++ b/pkgs/development/libraries/science/math/openblas/default.nix @@ -27,10 +27,11 @@ stdenv.mkDerivation rec { makeFlags = "${if target != "" then "TARGET=" else ""}${target} FC=gfortran CC=cc PREFIX=\"\$(out)\" INTERFACE64=1"; - meta = { + meta = with stdenv.lib; { description = "Basic Linear Algebra Subprograms"; - license = stdenv.lib.licenses.bsd3; + license = licenses.bsd3; homepage = "https://github.com/xianyi/OpenBLAS"; platforms = [ "x86_64-linux" ]; + maintainers = with maintainers; [ ttuegel ]; }; } -- GitLab From 30ac32ae45a80cbe2b42ca9feb44eaa6d677da80 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=BCdiger=20Sonderfeld?= Date: Fri, 29 Aug 2014 17:19:15 +0200 Subject: [PATCH 536/843] libgcrypt: Update 1.5.3 and 1.6.2. Also changed the description of 1.6.nix to match that of default.nix (1.5). * https://lists.gnu.org/archive/html/info-gnu/2014-08/msg00001.html * https://lists.gnu.org/archive/html/info-gnu/2014-08/msg00011.html --- pkgs/development/libraries/libgcrypt/1.6.nix | 6 +++--- pkgs/development/libraries/libgcrypt/default.nix | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/libgcrypt/1.6.nix b/pkgs/development/libraries/libgcrypt/1.6.nix index ced3b723b13..e468c3163d3 100644 --- a/pkgs/development/libraries/libgcrypt/1.6.nix +++ b/pkgs/development/libraries/libgcrypt/1.6.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, libgpgerror, transfig, ghostscript, texinfo }: stdenv.mkDerivation rec { - name = "libgcrypt-1.6.1"; + name = "libgcrypt-1.6.2"; src = fetchurl { url = "mirror://gnupg/libgcrypt/${name}.tar.bz2"; - sha256 = "0w10vhpj1r5nq7qm6jp21p1v1vhf37701cw8yilygzzqd7mfzhx1"; + sha256 = "de084492a6b38cdb27b67eaf749ceba76bf7029f63a9c0c3c1b05c88c9885c4c"; }; nativeBuildInputs = [ transfig ghostscript texinfo ]; @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { }; meta = { - description = "GNU Libgcrypt, a general-pupose cryptographic library"; + description = "General-pupose cryptographic library"; longDescription = '' GNU Libgcrypt is a general purpose cryptographic library based on diff --git a/pkgs/development/libraries/libgcrypt/default.nix b/pkgs/development/libraries/libgcrypt/default.nix index f47d3a62729..ed267e23c87 100644 --- a/pkgs/development/libraries/libgcrypt/default.nix +++ b/pkgs/development/libraries/libgcrypt/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, libgpgerror }: stdenv.mkDerivation (rec { - name = "libgcrypt-1.5.3"; + name = "libgcrypt-1.5.4"; src = fetchurl { url = "mirror://gnupg/libgcrypt/${name}.tar.bz2"; - sha256 = "1lar8y3lh61zl5flljpz540d78g99h4d5idfwrfw8lm3gm737xdw"; + sha256 = "d5f88d9f41a46953dc250cdb8575129b37ee2208401b7fa338c897f667c7fb33"; }; propagatedBuildInputs = [ libgpgerror ]; -- GitLab From cbb296475a86c664f823de31f287841f646682ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=BCdiger=20Sonderfeld?= Date: Fri, 29 Aug 2014 17:28:20 +0200 Subject: [PATCH 537/843] libidn: Update to 1.29. Also add repositories.git property. https://lists.gnu.org/archive/html/info-gnu/2014-08/msg00006.html --- pkgs/development/libraries/libidn/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libidn/default.nix b/pkgs/development/libraries/libidn/default.nix index 37d19d10f29..5aea194e39d 100644 --- a/pkgs/development/libraries/libidn/default.nix +++ b/pkgs/development/libraries/libidn/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv }: stdenv.mkDerivation rec { - name = "libidn-1.28"; + name = "libidn-1.29"; src = fetchurl { url = "mirror://gnu/libidn/${name}.tar.gz"; - sha256 = "1yxbfdiwr3l91m79sksn6v5mgpl4lfj8i82zgryckas9hjb7ldfx"; + sha256 = "fb82747dbbf9b36f703ed27293317d818d7e851d4f5773dedf3efa4db32a7c7c"; }; doCheck = ! stdenv.isDarwin; @@ -30,6 +30,7 @@ stdenv.mkDerivation rec { included. ''; + repositories.git = git://git.savannah.gnu.org/libidn.git; license = stdenv.lib.licenses.lgpl2Plus; platforms = stdenv.lib.platforms.all; maintainers = [ ]; -- GitLab From ec9d2e6f2b16601e167574f366544fdb7dcea864 Mon Sep 17 00:00:00 2001 From: Jaka Hudoklin Date: Fri, 29 Aug 2014 17:45:05 +0200 Subject: [PATCH 538/843] mongodb: darwin support --- pkgs/servers/nosql/mongodb/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/nosql/mongodb/default.nix b/pkgs/servers/nosql/mongodb/default.nix index f51a2b8fe3f..4935b738860 100644 --- a/pkgs/servers/nosql/mongodb/default.nix +++ b/pkgs/servers/nosql/mongodb/default.nix @@ -2,14 +2,13 @@ let version = "2.6.4"; system-libraries = [ - "tcmalloc" "pcre" "boost" "snappy" # "v8" -- mongo still bundles 3.12 and does not work with 3.15+ # "stemmer" -- not nice to package yet (no versioning, no makefile, no shared libs) # "yaml" -- it seems nixpkgs' yamlcpp (0.5.1) is problematic for mongo - ]; + ] ++ stdenv.lib.optionals (!stdenv.isDarwin) [ "tcmalloc" ]; system-lib-args = stdenv.lib.concatStringsSep " " (map (lib: "--use-system-${lib}") system-libraries); @@ -43,6 +42,6 @@ in stdenv.mkDerivation rec { license = stdenv.lib.licenses.agpl3; maintainers = [ stdenv.lib.maintainers.bluescreen303 ]; - platforms = stdenv.lib.platforms.linux; + platforms = stdenv.lib.platforms.unix; }; } -- GitLab From 5a9cf400856f379d448c09d9abf5a64512cb0793 Mon Sep 17 00:00:00 2001 From: Jaka Hudoklin Date: Fri, 29 Aug 2014 17:56:07 +0200 Subject: [PATCH 539/843] mongodb: add offline as maintainer --- pkgs/servers/nosql/mongodb/default.nix | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/servers/nosql/mongodb/default.nix b/pkgs/servers/nosql/mongodb/default.nix index 4935b738860..40c255d5921 100644 --- a/pkgs/servers/nosql/mongodb/default.nix +++ b/pkgs/servers/nosql/mongodb/default.nix @@ -1,5 +1,7 @@ { stdenv, fetchurl, scons, boost, gperftools, pcre, snappy }: +with stdenv.lib; + let version = "2.6.4"; system-libraries = [ "pcre" @@ -8,9 +10,9 @@ let version = "2.6.4"; # "v8" -- mongo still bundles 3.12 and does not work with 3.15+ # "stemmer" -- not nice to package yet (no versioning, no makefile, no shared libs) # "yaml" -- it seems nixpkgs' yamlcpp (0.5.1) is problematic for mongo - ] ++ stdenv.lib.optionals (!stdenv.isDarwin) [ "tcmalloc" ]; - system-lib-args = stdenv.lib.concatStringsSep " " - (map (lib: "--use-system-${lib}") system-libraries); + ] ++ optionals (!stdenv.isDarwin) [ "tcmalloc" ]; + system-lib-args = concatStringsSep " " + (map (lib: "--use-system-${lib}") system-libraries); in stdenv.mkDerivation rec { name = "mongodb-${version}"; @@ -39,9 +41,9 @@ in stdenv.mkDerivation rec { meta = { description = "a scalable, high-performance, open source NoSQL database"; homepage = http://www.mongodb.org; - license = stdenv.lib.licenses.agpl3; + license = licenses.agpl3; - maintainers = [ stdenv.lib.maintainers.bluescreen303 ]; - platforms = stdenv.lib.platforms.unix; + maintainers = with maintainers; [ bluescreen303 offline ]; + platforms = platforms.unix; }; } -- GitLab From 43e52ef0017790d303db0758edb52c46ab6f545a Mon Sep 17 00:00:00 2001 From: Nicolas Pierron Date: Fri, 29 Aug 2014 18:28:34 +0200 Subject: [PATCH 540/843] Remove useless use of undocumented submodules. --- nixos/modules/services/networking/nsd.nix | 241 ++++++++++------------ 1 file changed, 108 insertions(+), 133 deletions(-) diff --git a/nixos/modules/services/networking/nsd.nix b/nixos/modules/services/networking/nsd.nix index db8cb122871..cacd52f130f 100644 --- a/nixos/modules/services/networking/nsd.nix +++ b/nixos/modules/services/networking/nsd.nix @@ -456,156 +456,131 @@ in }; - ratelimit = mkOption { - type = types.submodule ( - { options, ... }: - { options = { - - enable = mkOption { - type = types.bool; - default = false; - description = '' - Enable ratelimit capabilities. - ''; - }; - - size = mkOption { - type = types.int; - default = 1000000; - description = '' - Size of the hashtable. More buckets use more memory but lower - the chance of hash hash collisions. - ''; - }; + ratelimit = { + enable = mkOption { + type = types.bool; + default = false; + description = '' + Enable ratelimit capabilities. + ''; + }; - ratelimit = mkOption { - type = types.int; - default = 200; - description = '' - Max qps allowed from any query source. - 0 means unlimited. With an verbosity of 2 blocked and - unblocked subnets will be logged. - ''; - }; + size = mkOption { + type = types.int; + default = 1000000; + description = '' + Size of the hashtable. More buckets use more memory but lower + the chance of hash hash collisions. + ''; + }; - whitelistRatelimit = mkOption { - type = types.int; - default = 2000; - description = '' - Max qps allowed from whitelisted sources. - 0 means unlimited. Set the rrl-whitelist option for specific - queries to apply this limit instead of the default to them. - ''; - }; + ratelimit = mkOption { + type = types.int; + default = 200; + description = '' + Max qps allowed from any query source. + 0 means unlimited. With an verbosity of 2 blocked and + unblocked subnets will be logged. + ''; + }; - slip = mkOption { - type = types.nullOr types.int; - default = null; - description = '' - Number of packets that get discarded before replying a SLIP response. - 0 disables SLIP responses. 1 will make every response a SLIP response. - ''; - }; + whitelistRatelimit = mkOption { + type = types.int; + default = 2000; + description = '' + Max qps allowed from whitelisted sources. + 0 means unlimited. Set the rrl-whitelist option for specific + queries to apply this limit instead of the default to them. + ''; + }; - ipv4PrefixLength = mkOption { - type = types.nullOr types.int; - default = null; - description = '' - IPv4 prefix length. Addresses are grouped by netblock. - ''; - }; + slip = mkOption { + type = types.nullOr types.int; + default = null; + description = '' + Number of packets that get discarded before replying a SLIP response. + 0 disables SLIP responses. 1 will make every response a SLIP response. + ''; + }; - ipv6PrefixLength = mkOption { - type = types.nullOr types.int; - default = null; - description = '' - IPv6 prefix length. Addresses are grouped by netblock. - ''; - }; + ipv4PrefixLength = mkOption { + type = types.nullOr types.int; + default = null; + description = '' + IPv4 prefix length. Addresses are grouped by netblock. + ''; + }; - }; - }); - default = { + ipv6PrefixLength = mkOption { + type = types.nullOr types.int; + default = null; + description = '' + IPv6 prefix length. Addresses are grouped by netblock. + ''; }; - example = {}; - description = '' - ''; }; - remoteControl = mkOption { - type = types.submodule ( - { config, options, ... }: - { options = { - - enable = mkOption { - type = types.bool; - default = false; - description = '' - Wheter to enable remote control via nsd-control(8). - ''; - }; - - interfaces = mkOption { - type = types.listOf types.str; - default = [ "127.0.0.1" "::1" ]; - description = '' - Which interfaces NSD should bind to for remote control. - ''; - }; - - port = mkOption { - type = types.int; - default = 8952; - description = '' - Port number for remote control operations (uses TLS over TCP). - ''; - }; + remoteControl = { + enable = mkOption { + type = types.bool; + default = false; + description = '' + Wheter to enable remote control via nsd-control(8). + ''; + }; - serverKeyFile = mkOption { - type = types.path; - default = "/etc/nsd/nsd_server.key"; - description = '' - Path to the server private key, which is used by the server - but not by nsd-control. This file is generated by nsd-control-setup. - ''; - }; + interfaces = mkOption { + type = types.listOf types.str; + default = [ "127.0.0.1" "::1" ]; + description = '' + Which interfaces NSD should bind to for remote control. + ''; + }; - serverCertFile = mkOption { - type = types.path; - default = "/etc/nsd/nsd_server.pem"; - description = '' - Path to the server self signed certificate, which is used by the server - but and by nsd-control. This file is generated by nsd-control-setup. - ''; - }; + port = mkOption { + type = types.int; + default = 8952; + description = '' + Port number for remote control operations (uses TLS over TCP). + ''; + }; - controlKeyFile = mkOption { - type = types.path; - default = "/etc/nsd/nsd_control.key"; - description = '' - Path to the client private key, which is used by nsd-control - but not by the server. This file is generated by nsd-control-setup. - ''; - }; + serverKeyFile = mkOption { + type = types.path; + default = "/etc/nsd/nsd_server.key"; + description = '' + Path to the server private key, which is used by the server + but not by nsd-control. This file is generated by nsd-control-setup. + ''; + }; - controlCertFile = mkOption { - type = types.path; - default = "/etc/nsd/nsd_control.pem"; - description = '' - Path to the client certificate signed with the server certificate. - This file is used by nsd-control and generated by nsd-control-setup. - ''; - }; + serverCertFile = mkOption { + type = types.path; + default = "/etc/nsd/nsd_server.pem"; + description = '' + Path to the server self signed certificate, which is used by the server + but and by nsd-control. This file is generated by nsd-control-setup. + ''; + }; - }; + controlKeyFile = mkOption { + type = types.path; + default = "/etc/nsd/nsd_control.key"; + description = '' + Path to the client private key, which is used by nsd-control + but not by the server. This file is generated by nsd-control-setup. + ''; + }; - }); - default = { + controlCertFile = mkOption { + type = types.path; + default = "/etc/nsd/nsd_control.pem"; + description = '' + Path to the client certificate signed with the server certificate. + This file is used by nsd-control and generated by nsd-control-setup. + ''; }; - example = {}; - description = '' - ''; }; -- GitLab From beff84c6e315fdffa96c0bbfb43b66ea9fd2c0e7 Mon Sep 17 00:00:00 2001 From: Mateusz Kowalczyk Date: Fri, 29 Aug 2014 17:30:04 +0100 Subject: [PATCH 541/843] python-packages.nix: strip trailing whitespace --- pkgs/top-level/python-packages.nix | 150 ++++++++++++++--------------- 1 file changed, 75 insertions(+), 75 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 533f59b78d8..2d44ee871c8 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -159,7 +159,7 @@ rec { pygtk = import ../development/python-modules/pygtk { inherit (pkgs) fetchurl stdenv pkgconfig gtk; inherit python buildPythonPackage pygobject pycairo isPy3k; - }; + }; # XXX: how can we get an override here? #pyGtkGlade = pygtk.override { @@ -572,7 +572,7 @@ rec { name = "avro-1.7.6"; disabled = isPy3k; - + src = fetchurl { url = "https://pypi.python.org/packages/source/a/avro/${name}.tar.gz"; md5 = "7f4893205e5ad69ac86f6b44efb7df72"; @@ -586,9 +586,9 @@ rec { avro3k = pkgs.lowPrio (buildPythonPackage (rec { name = "avro3k-1.7.7-SNAPSHOT"; - + disabled = (!isPy3k); - + src = fetchurl { url = "https://pypi.python.org/packages/source/a/avro3k/${name}.tar.gz"; sha256 = "15ahl0irwwj558s964abdxg4vp6iwlabri7klsm2am6q5r0ngsky"; @@ -674,7 +674,7 @@ rec { beaker = buildPythonPackage rec { name = "Beaker-1.6.4"; - + disabled = isPy3k; src = fetchurl { @@ -755,9 +755,9 @@ rec { modules.sqlite3 modules.readline ]; - + buildInputs = with pythonPackages; [ mock pyechonest six responses nose ]; - + # 10 tests are failing doCheck = false; @@ -768,12 +768,12 @@ rec { maintainers = [ stdenv.lib.maintainers.iElectric ]; }; }; - + responses = pythonPackages.buildPythonPackage rec { name = "responses-0.2.2"; propagatedBuildInputs = with pythonPackages; [ requests mock six pytest flake8 ]; - + doCheck = false; src = fetchurl { @@ -782,7 +782,7 @@ rec { }; }; - + rarfile = pythonPackages.buildPythonPackage rec { name = "rarfile-2.6"; @@ -798,7 +798,7 @@ rec { homepage = https://github.com/markokr/rarfile; }; }; - + pyechonest = pythonPackages.buildPythonPackage rec { name = "pyechonest-8.0.2"; @@ -1017,10 +1017,10 @@ rec { maintainers = [ stdenv.lib.maintainers.garbas ]; }; }; - + zc_buildout171 = buildPythonPackage rec { name = "zc.buildout-1.7.1"; - + disabled = isPy3k; src = fetchurl { @@ -1035,10 +1035,10 @@ rec { maintainers = [ stdenv.lib.maintainers.garbas ]; }; }; - + zc_buildout152 = buildPythonPackage rec { name = "zc.buildout-1.5.2"; - + disabled = isPy3k; src = fetchurl { @@ -1746,7 +1746,7 @@ rec { platforms = stdenv.lib.platforms.all; }; }; - + deform2 = buildPythonPackage rec { name = "deform-2.0a2"; @@ -2015,7 +2015,7 @@ rec { facebook-sdk = buildPythonPackage rec { name = "facebook-sdk-0.4.0"; - + disabled = isPy3k; src = fetchurl { @@ -2192,14 +2192,14 @@ rec { gtimelog = buildPythonPackage rec { name = "gtimelog-${version}"; version = "0.9.1"; - + disabled = isPy26; src = fetchurl { url = "https://github.com/gtimelog/gtimelog/archive/${version}.tar.gz"; sha256 = "0qk8fv8cszzqpdi3wl9vvkym1jil502ycn6sic4jrxckw5s9jsfj"; }; - + preBuild = '' export LOCALE_ARCHIVE=${pkgs.glibcLocales}/lib/locale/locale-archive export LC_ALL="en_US.UTF-8" @@ -2212,12 +2212,12 @@ rec { substituteInPlace runtests --replace "/usr/bin/env python" "${python}/bin/${python.executable}" ./runtests ''; - + preFixup = '' wrapProgram $out/bin/gtimelog \ --prefix GI_TYPELIB_PATH : "$GI_TYPELIB_PATH" \ --prefix LD_LIBRARY_PATH ":" "${pkgs.gtk3}/lib" \ - + ''; meta = with stdenv.lib; { @@ -2369,7 +2369,7 @@ rec { url = "http://pypi.python.org/packages/source/p/pyramid/${name}.tar.gz"; md5 = "8a1ab3b773d8e22437828f7df22852c1"; }; - + preCheck = '' # test is failing, see https://github.com/Pylons/pyramid/issues/1405 rm pyramid/tests/test_response.py @@ -2651,7 +2651,7 @@ rec { url = "http://pypi.python.org/packages/source/p/pyramid_zodbconn/${name}.tar.gz"; md5 = "3c7746a227fbcda3e138ab8bfab7700b"; }; - + # should be fixed in next release doCheck = false; @@ -2732,7 +2732,7 @@ rec { maintainers = [ stdenv.lib.maintainers.iElectric ]; }; }; - + ZEO = pythonPackages.buildPythonPackage rec { name = "ZEO-4.0.0"; @@ -2747,7 +2747,7 @@ rec { homepage = https://pypi.python.org/pypi/ZEO; }; }; - + random2 = pythonPackages.buildPythonPackage rec { name = "random2-1.0.1"; @@ -3272,7 +3272,7 @@ rec { url = "http://pypi.python.org/packages/source/e/enum/${name}.tar.gz"; md5 = "ce75c7c3c86741175a84456cc5bd531e"; }; - + doCheck = !isPyPy; buildInputs = [ ]; @@ -3452,7 +3452,7 @@ rec { }; buildInputs = [ nose mock ]; - + patchPhase = '' substituteInPlace jsonschema/tests/test_jsonschema_test_suite.py --replace "python" "${python}/bin/${python.executable}" ''; @@ -3614,7 +3614,7 @@ rec { gevent = buildPythonPackage rec { name = "gevent-1.0.1"; disabled = isPy3k; - + src = fetchurl { url = "https://pypi.python.org/packages/source/g/gevent/${name}.tar.gz"; sha256 = "0hyzfb0gcx9pm5c2igan8y57hqy2wixrwvdjwsaivxsqs0ay49s6"; @@ -4038,7 +4038,7 @@ rec { url = "http://pypi.python.org/packages/source/i/iptools/iptools-${version}.tar.gz"; md5 = "aed4045638fd40c16f8d9bb04606f700"; }; - + buildInputs = [ nose ]; meta = { @@ -4345,7 +4345,7 @@ rec { patchPhase = '' substituteInPlace magic.py --replace "ctypes.CDLL(dll)" "ctypes.CDLL('${pkgs.file}/lib/libmagic.so')" ''; - + doCheck = false; # TODO: tests are failing @@ -4718,7 +4718,7 @@ rec { name = "python-mpd-0.3.0"; disabled = isPy3k; - + src = fetchurl { url = "https://pypi.python.org/packages/source/p/python-mpd/python-mpd-0.3.0.tar.gz"; md5 = "5b3849b131e2fb12f251434597d65635"; @@ -4783,7 +4783,7 @@ rec { url = "http://pypi.python.org/packages/source/m/musicbrainzngs/${name}.tar.gz"; md5 = "9e17a181af72d04a291c9a960bc73d44"; }; - + preCheck = '' export LOCALE_ARCHIVE=${pkgs.glibcLocales}/lib/locale/locale-archive export LC_ALL="en_US.UTF-8" @@ -4805,7 +4805,7 @@ rec { url = "http://pypi.python.org/packages/source/m/mutagen/${name}.tar.gz"; sha256 = "12f70aaf5ggdzll76bhhkn64b27xy9s1acx417dbsaqnnbis8s76"; }; - + # one unicode test fails doCheck = false; @@ -4839,7 +4839,7 @@ rec { MySQL_python = buildPythonPackage { name = "MySQL-python-1.2.3"; - + disabled = isPy3k; # plenty of failing tests @@ -5466,7 +5466,7 @@ rec { # tests failures since 1.14.0 release.. doCheck = false; - + checkPhase = "${python}/bin/${python.executable} test.py"; meta = { @@ -5656,37 +5656,37 @@ rec { propagatedBuildInputs = [ unittest2 ]; }; - + pil = buildPythonPackage rec { name = "PIL-${version}"; version = "1.1.7"; - + src = fetchurl { url = "http://effbot.org/downloads/Imaging-${version}.tar.gz"; sha256 = "04aj80jhfbmxqzvmq40zfi4z3cw6vi01m3wkk6diz3lc971cfnw9"; }; - + buildInputs = [ python pkgs.libjpeg pkgs.zlib pkgs.freetype ]; - + disabled = isPy3k; - + doCheck = true; - + preConfigure = '' sed -i "setup.py" \ -e 's|^FREETYPE_ROOT =.*$|FREETYPE_ROOT = libinclude("${pkgs.freetype}")|g ; s|^JPEG_ROOT =.*$|JPEG_ROOT = libinclude("${pkgs.libjpeg}")|g ; s|^ZLIB_ROOT =.*$|ZLIB_ROOT = libinclude("${pkgs.zlib}")|g ;' ''; - + checkPhase = "${python}/bin/${python.executable} selftest.py"; buildPhase = "${python}/bin/${python.executable} setup.py build_ext -i"; - + postInstall = '' cd "$out"/lib/python*/site-packages ln -s $PWD PIL ''; - + meta = { homepage = http://www.pythonware.com/products/pil/; description = "The Python Imaging Library (PIL)"; @@ -5821,7 +5821,7 @@ rec { url = "http://pypi.python.org/packages/source/P/PrettyTable/${name}.tar.bz2"; sha1 = "ad346a18d92c1d95f2295397c7a8a4f489e48851"; }; - + preCheck = '' export LANG="en_US.UTF-8" export LOCALE_ARCHIVE=${pkgs.glibcLocales}/lib/locale/locale-archive @@ -5839,7 +5839,7 @@ rec { propagatedBuildInputs = [ pkgs.protobuf google_apputils ]; sourceRoot = "${name}/python"; - + meta = { description = "Protocol Buffers are Google's data interchange format."; @@ -6176,7 +6176,7 @@ rec { }; buildInputs = [ unittest2 ]; - + doCheck = !isPyPy; meta = { @@ -7082,7 +7082,7 @@ rec { propagatedBuildInputs = [ django_1_3 recaptcha_client pytz memcached dateutil_1_5 paramiko flup pygments djblets django_evolution pycrypto modules.sqlite3 - pysvn pil psycopg2 + pysvn pil psycopg2 ]; }; @@ -7097,7 +7097,7 @@ rec { # error: invalid command 'test' doCheck = false; - + propagatedBuildInputs = [ isodate ]; meta = { @@ -7105,7 +7105,7 @@ rec { homepage = http://www.rdflib.net/; }; }); - + isodate = buildPythonPackage rec { name = "isodate-0.5.0"; @@ -7224,7 +7224,7 @@ rec { rope = buildPythonPackage rec { version = "0.9.4"; name = "rope-${version}"; - + disabled = isPy3k; src = fetchurl { @@ -7637,7 +7637,7 @@ rec { url = "https://github.com/sympy/sympy/releases/download/${name}/${name}.tar.gz"; sha256 = "0h1b9mx0snyyybj1x1ga69qssgjzkkgx2rw6nddjhyz1fknf8ywh"; }; - + preCheck = '' export LANG="en_US.UTF-8" export LOCALE_ARCHIVE=${pkgs.glibcLocales}/lib/locale/locale-archive @@ -7749,7 +7749,7 @@ rec { semantic = buildPythonPackage rec { name = "semantic-1.0.3"; - + disabled = isPy3k; propagatedBuildInputs = [ quantities numpy ]; @@ -7889,7 +7889,7 @@ rec { supervisor = buildPythonPackage rec { name = "supervisor-3.1.1"; - + disabled = isPy3k; src = fetchurl { @@ -8149,7 +8149,7 @@ rec { sure = buildPythonPackage rec { name = "sure-${version}"; version = "1.2.7"; - + preBuild = '' export LOCALE_ARCHIVE=${pkgs.glibcLocales}/lib/locale/locale-archive export LC_ALL="en_US.UTF-8" @@ -8161,8 +8161,8 @@ rec { rev = "86ab9faa97aa9c1720c7d090deac2be385ed3d7a"; sha256 = "02vffcdgr6vbj80lhl925w7zqy6cqnfvs088i0rbkjs5lxc511b3"; }; - - + + buildInputs = [ nose ]; @@ -8269,9 +8269,9 @@ rec { url = "http://pypi.python.org/packages/source/T/Tempita/Tempita-${version}.tar.gz"; md5 = "4c2f17bb9d481821c41b6fbee904cea1"; }; - + disabled = isPy3k; - + buildInputs = [ nose ]; meta = { @@ -8363,11 +8363,11 @@ rec { tox = buildPythonPackage rec { name = "tox-1.7.2"; - + propagatedBuildInputs = [ py virtualenv ]; doCheck = false; - + src = fetchurl { url = "https://pypi.python.org/packages/source/t/tox/${name}.tar.gz"; md5 = "0d9b3acb1a9252659d753b0ae6b9b264"; @@ -8511,7 +8511,7 @@ rec { # NOTE: When updating please check if new versions still cause issues # to packages like carbon (http://stackoverflow.com/questions/19894708/cant-start-carbon-12-04-python-error-importerror-cannot-import-name-daem) disabled = isPy3k; - + name = "Twisted-11.1.0"; src = fetchurl { url = "https://pypi.python.org/packages/source/T/Twisted/${name}.tar.bz2"; @@ -8847,7 +8847,7 @@ rec { url = "http://pypi.python.org/packages/source/W/WebTest/WebTest-${version}.zip"; md5 = "49314bdba23f4d0bd807facb2a6d3f90"; }; - + preConfigure = '' substituteInPlace setup.py --replace "nose<1.3.0" "nose" ''; @@ -9061,7 +9061,7 @@ rec { }; propagatedBuildInputs = [ zconfig ]; - + # too many deps.. doCheck = false; @@ -9121,7 +9121,7 @@ rec { maintainers = [ stdenv.lib.maintainers.goibhniu ]; }; }; - + zodb = buildPythonPackage rec { name = "zodb-${version}"; version = "4.0.1"; @@ -9138,7 +9138,7 @@ rec { # test failure on py3.4 rm src/ZODB/tests/testDB.py '' else ""; - + meta = { description = "An object-oriented database for Python"; homepage = http://pypi.python.org/pypi/ZODB; @@ -9146,7 +9146,7 @@ rec { maintainers = [ stdenv.lib.maintainers.goibhniu ]; }; }; - + zodbpickle = pythonPackages.buildPythonPackage rec { name = "zodbpickle-0.5.2"; @@ -9154,7 +9154,7 @@ rec { url = "https://pypi.python.org/packages/source/z/zodbpickle/${name}.tar.gz"; md5 = "d401bd89f99ec8d56c22493e6f8c0443"; }; - + # fails.. doCheck = false; @@ -9163,10 +9163,10 @@ rec { }; }; - + BTrees = pythonPackages.buildPythonPackage rec { name = "BTrees-4.0.8"; - + patches = [ ./../development/python-modules/btrees_interger_overflow.patch ]; propagatedBuildInputs = [ persistent zope_interface transaction ]; @@ -9182,7 +9182,7 @@ rec { }; }; - + persistent = pythonPackages.buildPythonPackage rec { name = "persistent-4.0.8"; @@ -9230,7 +9230,7 @@ rec { maintainers = [ stdenv.lib.maintainers.goibhniu ]; }; }; - + zope_browserresource = buildPythonPackage rec { name = "zope.browserresource-4.0.1"; @@ -9575,7 +9575,7 @@ rec { url = "http://pypi.python.org/packages/source/z/zope.testing/${name}.tar.gz"; md5 = "6c73c5b668a67fdc116a25b884058ed9"; }; - + doCheck = !(python.isPypy or false); propagatedBuildInputs = [ zope_interface zope_exceptions zope_location ]; @@ -9726,7 +9726,7 @@ rec { tarman = buildPythonPackage rec { version = "0.1.3"; name = "tarman-${version}"; - + disabled = isPy3k; src = fetchurl { @@ -10172,7 +10172,7 @@ rec { url = "http://freshfoo.com/projects/IMAPClient/${name}.tar.gz"; sha256 = "1w54h8gz25qf6ggazzp6xf7kvsyiadsjfkkk17gm0p6pmzvvccbn"; }; - + buildInputs = [ mock ]; preConfigure = '' -- GitLab From 60734bb0f99a01e22cd2050359673af3fb2b5c11 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= Date: Mon, 25 Aug 2014 19:17:05 +0200 Subject: [PATCH 542/843] radicale: 0.9b1 -> 0.9 Added description, editor stripped some trailing whitespace. --- pkgs/top-level/python-packages.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 2d44ee871c8..ba6f4afaf7e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2549,11 +2549,11 @@ rec { radicale = buildPythonPackage rec { name = "radicale-${version}"; namePrefix = ""; - version = "0.9b1"; + version = "0.9"; src = fetchurl { url = "http://pypi.python.org/packages/source/R/Radicale/Radicale-${version}.tar.gz"; - sha256 = "3a8451909de849f173f577ddec0a085f19040dbb6aa13d5256208a0f8e11d88d"; + sha256 = "77bf813fd26f0d359c1a7b7bcce9b842b4503c5516989a4a0a4f648e299e41f7"; }; propagatedBuildInputs = with pythonPackages; [ @@ -2566,6 +2566,7 @@ rec { meta = { homepage = "http://www.radicale.org/"; + description = "CalDAV CardDAV server"; longDescription = '' The Radicale Project is a complete CalDAV (calendar) and CardDAV (contact) server solution. Calendars and address books are available for -- GitLab From 8c19690d99af8e25a58ce1a96ffda74340b88700 Mon Sep 17 00:00:00 2001 From: Nicolas Pierron Date: Fri, 29 Aug 2014 18:43:03 +0200 Subject: [PATCH 543/843] Remove useless use of optionSet. --- nixos/modules/services/networking/znc.nix | 174 +++++++++++----------- nixos/modules/system/boot/luksroot.nix | 67 ++++----- 2 files changed, 117 insertions(+), 124 deletions(-) diff --git a/nixos/modules/services/networking/znc.nix b/nixos/modules/services/networking/znc.nix index 2aa63c6e7df..5aed20ee3e0 100644 --- a/nixos/modules/services/networking/znc.nix +++ b/nixos/modules/services/networking/znc.nix @@ -25,85 +25,6 @@ let paths = cfg.modulePackages; }; - confOptions = { ... }: { - options = { - modules = mkOption { - type = types.listOf types.string; - default = [ "partyline" "webadmin" "adminlog" "log" ]; - example = [ "partyline" "webadmin" "adminlog" "log" ]; - description = '' - A list of modules to include in the `znc.conf` file. - ''; - }; - - userModules = mkOption { - type = types.listOf types.string; - default = [ ]; - example = [ "fish" "push" ]; - description = '' - A list of user modules to include in the `znc.conf` file. - ''; - }; - - userName = mkOption { - default = defaultUserName; - example = "johntron"; - type = types.string; - description = '' - The user name to use when generating the `znc.conf` file. - This is the user name used by the user logging into the ZNC web admin. - ''; - }; - - nick = mkOption { - default = "znc-user"; - example = "john"; - type = types.string; - description = '' - The IRC nick to use when generating the `znc.conf` file. - ''; - }; - - passBlock = mkOption { - default = defaultPassBlock; - example = "Must be the block generated by the `znc --makepass` command."; - type = types.string; - description = '' - The pass block to use when generating the `znc.conf` file. - This is the password used by the user logging into the ZNC web admin. - This is the block generated by the `znc --makepass` command. - !!! If not specified, please change this after starting the service. !!! - ''; - }; - - port = mkOption { - default = 5000; - example = 5000; - type = types.int; - description = '' - Specifies the port on which to listen. - ''; - }; - - useSSL = mkOption { - default = true; - example = true; - type = types.bool; - description = '' - Indicates whether the ZNC server should use SSL when listening on the specified port. - ''; - }; - - extraZncConf = mkOption { - default = ""; - type = types.lines; - description = '' - Extra config to `znc.conf` file - ''; - }; - }; - }; - # Keep znc.conf in nix store, then symlink or copy into `dataDir`, depending on `mutable`. mkZncConf = confOpts: '' // Also check http://en.znc.in/wiki/Configuration @@ -211,18 +132,91 @@ in ''; }; - confOptions = mkOption { - default = {}; - example = { - modules = [ "log" ]; - userName = "john"; - nick = "johntron"; + /* TODO: add to the documentation of the current module: + + Values to use when creating a `znc.conf` file. + + confOptions = { + modules = [ "log" ]; + userName = "john"; + nick = "johntron"; + }; + */ + confOptions = { + modules = mkOption { + type = types.listOf types.string; + default = [ "partyline" "webadmin" "adminlog" "log" ]; + example = [ "partyline" "webadmin" "adminlog" "log" ]; + description = '' + A list of modules to include in the `znc.conf` file. + ''; + }; + + userModules = mkOption { + type = types.listOf types.string; + default = [ ]; + example = [ "fish" "push" ]; + description = '' + A list of user modules to include in the `znc.conf` file. + ''; + }; + + userName = mkOption { + default = defaultUserName; + example = "johntron"; + type = types.string; + description = '' + The user name to use when generating the `znc.conf` file. + This is the user name used by the user logging into the ZNC web admin. + ''; + }; + + nick = mkOption { + default = "znc-user"; + example = "john"; + type = types.string; + description = '' + The IRC nick to use when generating the `znc.conf` file. + ''; + }; + + passBlock = mkOption { + default = defaultPassBlock; + example = "Must be the block generated by the `znc --makepass` command."; + type = types.string; + description = '' + The pass block to use when generating the `znc.conf` file. + This is the password used by the user logging into the ZNC web admin. + This is the block generated by the `znc --makepass` command. + !!! If not specified, please change this after starting the service. !!! + ''; + }; + + port = mkOption { + default = 5000; + example = 5000; + type = types.int; + description = '' + Specifies the port on which to listen. + ''; + }; + + useSSL = mkOption { + default = true; + example = true; + type = types.bool; + description = '' + Indicates whether the ZNC server should use SSL when listening on the specified port. + ''; + }; + + extraZncConf = mkOption { + default = ""; + type = types.lines; + description = '' + Extra config to `znc.conf` file + ''; }; - type = types.optionSet; - description = '' - Values to use when creating a `znc.conf` file. - ''; - options = confOptions; }; modulePackages = mkOption { diff --git a/nixos/modules/system/boot/luksroot.nix b/nixos/modules/system/boot/luksroot.nix index 68392e3cfe2..70ff1d588a3 100644 --- a/nixos/modules/system/boot/luksroot.nix +++ b/nixos/modules/system/boot/luksroot.nix @@ -342,40 +342,39 @@ in description = "Path where the ramfs used to update the LUKS key will be mounted in stage-1"; }; - storage = mkOption { - type = types.optionSet; - description = "Options related to the storing the salt"; - - options = { - device = mkOption { - default = "/dev/sda1"; - type = types.path; - description = '' - An unencrypted device that will temporarily be mounted in stage-1. - Must contain the current salt to create the challenge for this LUKS device. - ''; - }; - - fsType = mkOption { - default = "vfat"; - type = types.string; - description = "The filesystem of the unencrypted device"; - }; - - mountPoint = mkOption { - default = "/crypt-storage"; - type = types.string; - description = "Path where the unencrypted device will be mounted in stage-1"; - }; - - path = mkOption { - default = "/crypt-storage/default"; - type = types.string; - description = '' - Absolute path of the salt on the unencrypted device with - that device's root directory as "/". - ''; - }; + /* TODO: Add to the documentation of the current module: + + Options related to the storing the salt. + */ + storage = { + device = mkOption { + default = "/dev/sda1"; + type = types.path; + description = '' + An unencrypted device that will temporarily be mounted in stage-1. + Must contain the current salt to create the challenge for this LUKS device. + ''; + }; + + fsType = mkOption { + default = "vfat"; + type = types.string; + description = "The filesystem of the unencrypted device"; + }; + + mountPoint = mkOption { + default = "/crypt-storage"; + type = types.string; + description = "Path where the unencrypted device will be mounted in stage-1"; + }; + + path = mkOption { + default = "/crypt-storage/default"; + type = types.string; + description = '' + Absolute path of the salt on the unencrypted device with + that device's root directory as "/". + ''; }; }; }; -- GitLab From 3b6f5050a15ca8854f19b955d33b584245fdf1d8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Fri, 29 Aug 2014 18:42:25 +0200 Subject: [PATCH 544/843] Revert "protobuf: Update to 2.6.0" This reverts commit 859a2c446cbe1f802ec3f6ad07d3913c4518e11d. Breaks a bunch of reverse dependencies. --- pkgs/development/libraries/protobuf/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/protobuf/default.nix b/pkgs/development/libraries/protobuf/default.nix index 3452335decd..bba8481780a 100644 --- a/pkgs/development/libraries/protobuf/default.nix +++ b/pkgs/development/libraries/protobuf/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, zlib }: stdenv.mkDerivation rec { - name = "protobuf-2.6.0"; + name = "protobuf-2.5.0"; src = fetchurl { - url = "http://protobuf.googlecode.com/svn-history/r579/rc/protobuf-2.6.0.tar.bz2"; - sha256 = "0krfkxc85vfznqwbh59qlhp7ld81al9ss35av0gfbg74i0rvjids"; + url = "http://protobuf.googlecode.com/files/${name}.tar.bz2"; + sha256 = "0xxn9gxhvsgzz2sgmihzf6pf75clr05mqj6218camwrwajpcbgqk"; }; buildInputs = [ zlib ]; -- GitLab From eb7a17a1cfc158b87e6d349f1fcc550761d122b9 Mon Sep 17 00:00:00 2001 From: Nicolas Pierron Date: Fri, 29 Aug 2014 18:52:31 +0200 Subject: [PATCH 545/843] Add error an message to prevent use of useless submodules. --- lib/modules.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/modules.nix b/lib/modules.nix index bcaadc7fd97..9fe26083cfd 100644 --- a/lib/modules.nix +++ b/lib/modules.nix @@ -277,13 +277,14 @@ rec { fixupOptionType = loc: opt: let options' = opt.options or - (throw "Option `${showOption loc'}' has type optionSet but has no option attribute."); + (throw "Option `${showOption loc'}' has type optionSet but has no option attribute, in ${showFiles opt.declarations}."); coerce = x: if isFunction x then x else { config, ... }: { options = x; }; options = map coerce (flatten options'); f = tp: - if tp.name == "option set" then types.submodule options + if tp.name == "option set" || tp.name == "submodule" then + throw "The option ${showOption loc} uses submodules without a wrapping type, in ${showFiles opt.declarations}." else if tp.name == "attribute set of option sets" then types.attrsOf (types.submodule options) else if tp.name == "list or attribute set of option sets" then types.loaOf (types.submodule options) else if tp.name == "list of option sets" then types.listOf (types.submodule options) -- GitLab From 4e189f68ab078fbde808ee2346f9b81cda5b8035 Mon Sep 17 00:00:00 2001 From: Mateusz Kowalczyk Date: Fri, 29 Aug 2014 18:12:43 +0100 Subject: [PATCH 546/843] checkstyle: update to 5.7 --- .../tools/analysis/checkstyle/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/tools/analysis/checkstyle/default.nix b/pkgs/development/tools/analysis/checkstyle/default.nix index 1dfaa5cf875..56797d9c702 100644 --- a/pkgs/development/tools/analysis/checkstyle/default.nix +++ b/pkgs/development/tools/analysis/checkstyle/default.nix @@ -1,12 +1,12 @@ -{stdenv, fetchurl, unzip}: +{ stdenv, fetchurl }: -stdenv.mkDerivation { - name = "checkstyle-5.0"; - buildInputs = [unzip] ; +stdenv.mkDerivation rec { + version = "5.7"; + name = "checkstyle-${version}"; src = fetchurl { - url = mirror://sourceforge/checkstyle/checkstyle-5.0.zip ; - sha256 = "0972afcxjniz64hlnc89ddnd1d0mcd5hb1sd7lpw5k52h39683nh"; + url = "mirror://sourceforge/checkstyle/${version}/${name}-bin.tar.gz"; + sha256 = "0kzj507ylynq6p7v097bjzsckkjny5i2fxwxyrlwi5samhi2m06x"; }; installPhase = '' @@ -22,6 +22,6 @@ stdenv.mkDerivation { Conventions, but is highly configurable. ''; homepage = http://checkstyle.sourceforge.net/; + license = stdenv.lib.licenses.lgpl21; }; } - -- GitLab From 4cb061111cfed82e151cfe82b25a68777629faa7 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Fri, 8 Aug 2014 16:34:41 -0300 Subject: [PATCH 547/843] Higan - new package (alpha stage!) Higan is a cycle-accurate Nintendo multi-system emulator It is a preliminary release for Nix - I need to investigate some issues about install process and hardcoded paths... --- pkgs/misc/emulators/higan/builder.sh | 20 +++++++++++ pkgs/misc/emulators/higan/default.nix | 48 +++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 70 insertions(+) create mode 100644 pkgs/misc/emulators/higan/builder.sh create mode 100644 pkgs/misc/emulators/higan/default.nix diff --git a/pkgs/misc/emulators/higan/builder.sh b/pkgs/misc/emulators/higan/builder.sh new file mode 100644 index 00000000000..144c23d39de --- /dev/null +++ b/pkgs/misc/emulators/higan/builder.sh @@ -0,0 +1,20 @@ + +source $stdenv/setup + +unpackPhase +cd $sourceName +make phoenix=gtk profile=accuracy -C ananke +make phoenix=gtk profile=accuracy + +install -dm 755 $out/share/applications $out/share/pixmaps $out/share/higan/Video\ Shaders $out/bin $out/lib + +install -m 644 data/higan.desktop $out/share/applications/ +install -m 644 data/higan.png $out/share/pixmaps/ +cp -dr --no-preserve=ownership profile/* data/cheats.bml $out/share/higan/ +cp -dr --no-preserve=ownership shaders/*.shader $out/share/higan/Video\ Shaders/ + +install -m 755 out/higan $out/bin/higan +install -m 644 ananke/libananke.so $out/lib/libananke.so.1 +(cd $out/lib && ln -s libananke.so.1 libananke.so) +oldRPath=$(patchelf --print-rpath $out/bin/higan) +patchelf --set-rpath $oldRPath:$out/lib $out/bin/higan diff --git a/pkgs/misc/emulators/higan/default.nix b/pkgs/misc/emulators/higan/default.nix new file mode 100644 index 00000000000..aceb55b1396 --- /dev/null +++ b/pkgs/misc/emulators/higan/default.nix @@ -0,0 +1,48 @@ +{ stdenv, fetchurl +, pkgconfig +, libX11, libXv +, udev +, mesa, gtk, SDL +, libao, openal, pulseaudio +}: + +stdenv.mkDerivation rec { + + name = "higan-${version}"; + version = "094"; + sourceName = "higan_v${version}-source"; + + src = fetchurl { + url = "http://byuu.org/files/${sourceName}.tar.xz"; + sha256 = "06qm271pzf3qf2labfw2lx6k0xcd89jndmn0jzmnc40cspwrs52y"; + curlOpts = "--user-agent 'Mozilla/5.0'"; # the good old user-agent trick... + }; + + buildInputs = with stdenv.lib; + [ pkgconfig libX11 libXv udev mesa gtk SDL libao openal pulseaudio ]; + + builder = ./builder.sh; + + meta = { + description = "An open-source, cycle-accurate Nintendo multi-system emulator"; + longDescription = '' + Higan (formerly bsnes) is a Nintendo multi-system emulator. + It currently supports the following systems: + Famicom; Super Famicom; + Game Boy; Game Boy Color; Game Boy Advance + higan also supports the following subsystems: + Super Game Boy; BS-X Satellaview; Sufami Turbo + ''; + homepage = http://byuu.org/higan/; + license = stdenv.lib.licenses.gpl3Plus; + maintainers = [ stdenv.lib.maintainers.AndersonTorres ]; + platforms = stdenv.lib.platforms.linux; + }; +} + +# +# TODO: +# - options to choose profiles (accuracy, balanced, performance) +# and different GUIs (gtk2, qt4) +# - fix the BML and BIOS paths - maybe a custom patch to Higan project? +# diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1942be80a7c..d1f9487ab4a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11569,6 +11569,8 @@ let snes9x-gtk = callPackage ../misc/emulators/snes9x-gtk { }; + higan = callPackage ../misc/emulators/higan { }; + misc = import ../misc/misc.nix { inherit pkgs stdenv; }; bullet = callPackage ../development/libraries/bullet {}; -- GitLab From 0ffa7dc0f28f7aaf517f68c5c6812272cbb822ed Mon Sep 17 00:00:00 2001 From: aszlig Date: Fri, 29 Aug 2014 19:53:56 +0200 Subject: [PATCH 548/843] sox: Enable support for FLAC and PNG. In case you wonder: PNG support is needed for example to generate spectograms. For example: sox shiny-song.flac -n spectrogram -o even-shinier.png Signed-off-by: aszlig --- pkgs/applications/misc/audio/sox/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/misc/audio/sox/default.nix b/pkgs/applications/misc/audio/sox/default.nix index 0663937c479..1f86a4164f6 100644 --- a/pkgs/applications/misc/audio/sox/default.nix +++ b/pkgs/applications/misc/audio/sox/default.nix @@ -4,6 +4,8 @@ , enableLame ? false, lame ? null , enableLibmad ? true, libmad ? null , enableLibogg ? true, libogg ? null, libvorbis ? null +, enableFLAC ? true, flac ? null +, enablePNG ? true, libpng ? null }: with stdenv.lib; @@ -21,7 +23,9 @@ stdenv.mkDerivation rec { optional enableLibao libao ++ optional enableLame lame ++ optional enableLibmad libmad ++ - optionals enableLibogg [ libogg libvorbis ]; + optionals enableLibogg [ libogg libvorbis ] ++ + optional enableFLAC flac ++ + optional enablePNG libpng; meta = { description = "Sample Rate Converter for audio"; -- GitLab From 8eb3de7c86355c2061608e9a0f64150fbdbcc7ec Mon Sep 17 00:00:00 2001 From: Cray Elliott Date: Fri, 29 Aug 2014 01:45:31 -0700 Subject: [PATCH 549/843] Chromium patch, fixes missing header --- .../networking/browsers/chromium/source/default.nix | 2 +- .../browsers/chromium/source/missing_alg_import.patch | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) create mode 100644 pkgs/applications/networking/browsers/chromium/source/missing_alg_import.patch diff --git a/pkgs/applications/networking/browsers/chromium/source/default.nix b/pkgs/applications/networking/browsers/chromium/source/default.nix index d7ccc412fa4..91c6ada5138 100644 --- a/pkgs/applications/networking/browsers/chromium/source/default.nix +++ b/pkgs/applications/networking/browsers/chromium/source/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation { prePatch = "patchShebangs ."; - patches = singleton ./sandbox_userns_36.patch; + patches = [ ./sandbox_userns_36.patch ./missing_alg_import.patch ]; postPatch = '' sed -i -r \ diff --git a/pkgs/applications/networking/browsers/chromium/source/missing_alg_import.patch b/pkgs/applications/networking/browsers/chromium/source/missing_alg_import.patch new file mode 100644 index 00000000000..243e3fe7049 --- /dev/null +++ b/pkgs/applications/networking/browsers/chromium/source/missing_alg_import.patch @@ -0,0 +1,11 @@ +diff -Naur chromium-37.0.2062.94.old/media/cast/logging/encoding_event_subscriber.cc chromium-37.0.2062.94/media/cast/logging/encoding_event_subscriber.cc +--- chromium-37.0.2062.94.old/media/cast/logging/encoding_event_subscriber.cc 2014-08-29 02:05:15.149140733 -0700 ++++ chromium-37.0.2062.94/media/cast/logging/encoding_event_subscriber.cc 2014-08-29 02:06:00.182853590 -0700 +@@ -4,6 +4,7 @@ + + #include "media/cast/logging/encoding_event_subscriber.h" + ++#include + #include + #include + -- GitLab From 44281788475016ddbf48539814b6870337e6ef54 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Fri, 29 Aug 2014 08:40:23 -0700 Subject: [PATCH 550/843] nixos/generate-config: Fix indentation --- .../installer/tools/nixos-generate-config.pl | 26 +++++++++---------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/nixos/modules/installer/tools/nixos-generate-config.pl b/nixos/modules/installer/tools/nixos-generate-config.pl index cabdb09ec9c..73dd87cef5c 100644 --- a/nixos/modules/installer/tools/nixos-generate-config.pl +++ b/nixos/modules/installer/tools/nixos-generate-config.pl @@ -344,19 +344,19 @@ EOF } } - # Is this a btrfs filesystem? - if ($fsType eq "btrfs") { - my ($status, @info) = runCommand("btrfs subvol show $rootDir$mountPoint"); - if ($status != 0) { - die "Failed to retreive subvolume info for $mountPoint"; - } - my @subvols = join("", @info) =~ m/Name:[ \t\n]*([^ \t\n]*)/; - if ($#subvols > 0) { - die "Btrfs subvol name for $mountPoint listed multiple times in mount\n" - } elsif ($#subvols == 0) { - push @extraOptions, "subvol=$subvols[0]"; - } - } + # Is this a btrfs filesystem? + if ($fsType eq "btrfs") { + my ($status, @info) = runCommand("btrfs subvol show $rootDir$mountPoint"); + if ($status != 0) { + die "Failed to retreive subvolume info for $mountPoint"; + } + my @subvols = join("", @info) =~ m/Name:[ \t\n]*([^ \t\n]*)/; + if ($#subvols > 0) { + die "Btrfs subvol name for $mountPoint listed multiple times in mount\n" + } elsif ($#subvols == 0) { + push @extraOptions, "subvol=$subvols[0]"; + } + } # Emit the filesystem. $fileSystems .= < Date: Fri, 29 Aug 2014 08:41:07 -0700 Subject: [PATCH 551/843] nixos/install-grub: Fix Indentation --- nixos/modules/system/boot/loader/grub/install-grub.pl | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nixos/modules/system/boot/loader/grub/install-grub.pl b/nixos/modules/system/boot/loader/grub/install-grub.pl index d8ee8b50097..7ced51f57e1 100644 --- a/nixos/modules/system/boot/loader/grub/install-grub.pl +++ b/nixos/modules/system/boot/loader/grub/install-grub.pl @@ -158,7 +158,7 @@ my $grubStore = GrubFs("/nix"); # We don't need to copy if we can read the kernels directly if ($grubStore->search ne "") { - $copyKernels = 0; + $copyKernels = 0; } # Generate the header. @@ -275,8 +275,8 @@ sub addEntry { $conf .= " " . ($xen ? "module" : "initrd") . " $initrd\n\n"; } else { $conf .= "menuentry \"$name\" {\n"; - $conf .= $grubBoot->search . "\n"; - $conf .= $grubStore->search . "\n"; + $conf .= $grubBoot->search . "\n"; + $conf .= $grubStore->search . "\n"; $conf .= " $extraPerEntryConfig\n" if $extraPerEntryConfig; $conf .= " multiboot $xen $xenParams\n" if $xen; $conf .= " " . ($xen ? "module" : "linux") . " $kernel $kernelParams\n"; -- GitLab From ceb367a8a21653ef1f179b333c28bec37df90b2a Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Fri, 29 Aug 2014 16:13:48 -0400 Subject: [PATCH 552/843] ats2: Bump --- pkgs/development/compilers/ats2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/ats2/default.nix b/pkgs/development/compilers/ats2/default.nix index c66143fe1f3..b77c7e47667 100644 --- a/pkgs/development/compilers/ats2/default.nix +++ b/pkgs/development/compilers/ats2/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "ats2-${version}"; - version = "0.1.1"; + version = "0.1.2"; src = fetchurl { url = "mirror://sourceforge/ats2-lang/ATS2-Postiats-${version}.tgz"; - sha256 = "17yr5zc4cr4zlizhzy43ihfcidl63wjxcc002amzahskib4fsbmb"; + sha256 = "1266hl03d4w13qrimq6jsxcmw1mjivl27l3lhf9ddqlz0vy97j6a"; }; buildInputs = [ gmp ]; -- GitLab From d43f1c86bdd6cc90d93f99005f18b725315ec1c8 Mon Sep 17 00:00:00 2001 From: Austin Seipp Date: Fri, 29 Aug 2014 15:23:44 -0500 Subject: [PATCH 553/843] pkgs: add Rainbowstream, a streaming command-line twitter client. Signed-off-by: Austin Seipp --- pkgs/top-level/python-packages.nix | 83 +++++++++++++++++++++++++++++- 1 file changed, 82 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ba6f4afaf7e..174fde47f2e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -492,6 +492,23 @@ rec { }); + arrow = buildPythonPackage rec { + name = "arrow-${version}"; + version = "0.4.4"; + + src = fetchurl { + url = "https://pypi.python.org/packages/source/a/arrow/${name}.tar.gz"; + sha256 = "1sdr4gyjgvz86yr0ll0i11mgy8l1slndr7f0ngam87rpy78gp052"; + }; + + doCheck = false; + + meta = { + description = "Twitter API library"; + license = "apache"; + maintainers = [ maintainers.thoughtpolice ]; + }; + }; async = buildPythonPackage rec { name = "async-0.6.1"; @@ -4552,7 +4569,6 @@ rec { }; }; - memcached = buildPythonPackage rec { name = "memcached-1.51"; @@ -4607,6 +4623,35 @@ rec { }; }; + rainbowstream = buildPythonPackage rec { + name = "rainbowstream-${version}"; + version = "0.9.3"; + + src = fetchurl { + url = "https://pypi.python.org/packages/source/r/rainbowstream/${name}.tar.gz"; + sha256 = "1xgfxk3qwbfdl2fwabcppi43dxmv8pik0wb9jsbszwxz9xv3fcpk"; + }; + + doCheck = false; + + buildInputs = [ + pkgs.libjpeg pkgs.freetype pkgs.zlib + pillow twitter pyfiglet requests arrow dateutil modules.readline + ]; + + postInstall = '' + wrapProgram "$out/bin/rainbowstream" \ + --prefix PYTHONPATH : "$PYTHONPATH" + ''; + + meta = { + description = "Streaming command-line twitter client"; + homepage = "http://www.rainbowstream.org/"; + license = licenses.mit; + maintainers = [ maintainers.thoughtpolice ]; + }; + }; + mitmproxy = buildPythonPackage rec { baseName = "mitmproxy"; name = "${baseName}-${meta.version}"; @@ -6168,6 +6213,24 @@ rec { }; }; + pyfiglet = buildPythonPackage rec { + name = "pyfiglet-${version}"; + version = "0.7.1"; + + src = fetchurl { + url = "https://pypi.python.org/packages/source/p/pyfiglet/${name}.tar.gz"; + sha256 = "14lgwg47gnnad7sfkmmwhknwysbfmr74c9b2a6d9wgjmydycc6ka"; + }; + + doCheck = false; + + meta = { + description = "FIGlet in pure Python"; + license = licenses.gpl2Plus; + maintainers = [ maintainers.thoughtpolice ]; + }; + }; + pyflakes = buildPythonPackage rec { name = "pyflakes-0.8.1"; @@ -8508,6 +8571,24 @@ rec { }; }); + twitter = buildPythonPackage rec { + name = "twitter-${version}"; + version = "1.14.3"; + + src = fetchurl { + url = "https://pypi.python.org/packages/source/t/twitter/${name}.tar.gz"; + sha256 = "1nhhjajbq0jik43q2makpnz094qcziq9p8rj35jxamybd0hwwzs9"; + }; + + doCheck = false; + + meta = { + description = "Twitter API library"; + license = licenses.mit; + maintainers = [ maintainers.thoughtpolice ]; + }; + }; + twisted = buildPythonPackage rec { # NOTE: When updating please check if new versions still cause issues # to packages like carbon (http://stackoverflow.com/questions/19894708/cant-start-carbon-12-04-python-error-importerror-cannot-import-name-daem) -- GitLab From a4b794bb733b11a021990fb81a610a3e750300e5 Mon Sep 17 00:00:00 2001 From: Patrick Mahoney Date: Sat, 30 Aug 2014 00:05:23 -0500 Subject: [PATCH 554/843] s6-portable-utils: new package s6-portable-utils is a set of tiny general Unix utilities, often performing well-known tasks such as cut and grep, but optimized for simplicity and small size. --- pkgs/tools/misc/s6-portable-utils/default.nix | 55 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 57 insertions(+) create mode 100644 pkgs/tools/misc/s6-portable-utils/default.nix diff --git a/pkgs/tools/misc/s6-portable-utils/default.nix b/pkgs/tools/misc/s6-portable-utils/default.nix new file mode 100644 index 00000000000..f8e7dfaddc9 --- /dev/null +++ b/pkgs/tools/misc/s6-portable-utils/default.nix @@ -0,0 +1,55 @@ +{ stdenv, fetchurl, skalibs }: + +let + + version = "1.0.3.2"; + +in stdenv.mkDerivation rec { + + name = "s6-portable-utils-${version}"; + + src = fetchurl { + url = "http://www.skarnet.org/software/s6-portable-utils/${name}.tar.gz"; + sha256 = "040nmls7qbgw8yn502lym4kgqh5zxr2ks734bqajpi2ricnasvhl"; + }; + + buildInputs = [ skalibs ]; + + sourceRoot = "admin/${name}"; + + configurePhase = '' + pushd conf-compile + + printf "$out/bin" > conf-install-command + printf "$out/libexec" > conf-install-libexec + + # let nix builder strip things, cross-platform + truncate --size 0 conf-stripbins + truncate --size 0 conf-striplibs + + printf "${skalibs}/sysdeps" > import + printf "%s" "${skalibs}/include" > path-include + printf "%s" "${skalibs}/lib" > path-library + + rm -f flag-slashpackage + touch flag-allstatic + + popd + ''; + + preBuild = '' + patchShebangs src/sys + ''; + + preInstall = '' + mkdir -p "$out/libexec" + ''; + + meta = { + homepage = http://www.skarnet.org/software/s6-portable-utils/; + description = "A set of tiny general Unix utilities optimized for simplicity and small size."; + platforms = stdenv.lib.platforms.all; + license = stdenv.lib.licenses.isc; + }; + +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d1f9487ab4a..5aa699805f3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2051,6 +2051,8 @@ let ruby = ruby18; }; + s6PortableUtils = callPackage ../tools/misc/s6-portable-utils { }; + sablotron = callPackage ../tools/text/xml/sablotron { }; safecopy = callPackage ../tools/system/safecopy { }; -- GitLab From 1030ca055012483d9b226c117e81ba1693e2ce2e Mon Sep 17 00:00:00 2001 From: Patrick Mahoney Date: Sat, 30 Aug 2014 00:06:42 -0500 Subject: [PATCH 555/843] s6-dns: new package s6-dns is a suite of DNS client programs and libraries for Unix systems, as an alternative to the BIND, djbdns or other DNS clients. --- pkgs/tools/networking/s6-dns/default.nix | 53 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 55 insertions(+) create mode 100644 pkgs/tools/networking/s6-dns/default.nix diff --git a/pkgs/tools/networking/s6-dns/default.nix b/pkgs/tools/networking/s6-dns/default.nix new file mode 100644 index 00000000000..3165434de3d --- /dev/null +++ b/pkgs/tools/networking/s6-dns/default.nix @@ -0,0 +1,53 @@ +{ stdenv, fetchurl, skalibs }: + +let + + version = "0.1.0.0"; + +in stdenv.mkDerivation rec { + + name = "s6-dns-${version}"; + + src = fetchurl { + url = "http://www.skarnet.org/software/s6-dns/${name}.tar.gz"; + sha256 = "1r82l5fnz2rrwm5wq2sldqp74lk9fifr0d8hyq98xdyh24hish68"; + }; + + buildInputs = [ skalibs ]; + + sourceRoot = "web/${name}"; + + configurePhase = '' + pushd conf-compile + + printf "$out/bin" > conf-install-command + printf "$out/include" > conf-install-include + printf "$out/lib" > conf-install-library + printf "$out/lib" > conf-install-library.so + + # let nix builder strip things, cross-platform + truncate --size 0 conf-stripbins + truncate --size 0 conf-striplibs + + printf "${skalibs}/sysdeps" > import + printf "%s" "${skalibs}/include" > path-include + printf "%s" "${skalibs}/lib" > path-library + + rm -f flag-slashpackage + touch flag-allstatic + + popd + ''; + + preBuild = '' + patchShebangs src/sys + ''; + + meta = { + homepage = http://www.skarnet.org/software/s6-dns/; + description = "A suite of DNS client programs and libraries for Unix systems."; + platforms = stdenv.lib.platforms.all; + license = stdenv.lib.licenses.isc; + }; + +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5aa699805f3..14f41703f4d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2051,6 +2051,8 @@ let ruby = ruby18; }; + s6Dns = callPackage ../tools/networking/s6-dns { }; + s6PortableUtils = callPackage ../tools/misc/s6-portable-utils { }; sablotron = callPackage ../tools/text/xml/sablotron { }; -- GitLab From 9247013255acfe2a81c5a6fa7c1bee1febef7d09 Mon Sep 17 00:00:00 2001 From: Patrick Mahoney Date: Sat, 30 Aug 2014 00:07:45 -0500 Subject: [PATCH 556/843] s6-networking: new package s6-networking is a suite of small networking utilities for Unix systems including UCSPI Unix and TCP tools, access control tools, and network time management utilities. --- .../networking/s6-networking/default.nix | 63 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 65 insertions(+) create mode 100644 pkgs/tools/networking/s6-networking/default.nix diff --git a/pkgs/tools/networking/s6-networking/default.nix b/pkgs/tools/networking/s6-networking/default.nix new file mode 100644 index 00000000000..3d5e3e04811 --- /dev/null +++ b/pkgs/tools/networking/s6-networking/default.nix @@ -0,0 +1,63 @@ +{ stdenv +, execline +, fetchurl +, s6Dns +, skalibs +}: + +let + + version = "0.1.0.0"; + +in stdenv.mkDerivation rec { + + name = "s6-networking-${version}"; + + src = fetchurl { + url = "http://www.skarnet.org/software/s6-networking/${name}.tar.gz"; + sha256 = "1np9m2j1i2450mbcjvpbb56kv3wc2fbyvmv2a039q61j2lk6vjz7"; + }; + + buildInputs = [ skalibs s6Dns execline ]; + + sourceRoot = "net/${name}"; + + configurePhase = '' + pushd conf-compile + + printf "$out/bin" > conf-install-command + printf "$out/include" > conf-install-include + printf "$out/lib" > conf-install-library + printf "$out/lib" > conf-install-library.so + + # let nix builder strip things, cross-platform + truncate --size 0 conf-stripbins + truncate --size 0 conf-striplibs + + printf "${skalibs}/sysdeps" > import + + rm -f path-include + rm -f path-library + for dep in "${execline}" "${s6Dns}" "${skalibs}"; do + printf "%s\n" "$dep/include" >> path-include + printf "%s\n" "$dep/lib" >> path-library + done + + rm -f flag-slashpackage + touch flag-allstatic + + popd + ''; + + preBuild = '' + patchShebangs src/sys + ''; + + meta = { + homepage = http://www.skarnet.org/software/s6-networking/; + description = "A suite of small networking utilities for Unix systems."; + platforms = stdenv.lib.platforms.all; + license = stdenv.lib.licenses.isc; + }; + +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 14f41703f4d..bf0cc411e1d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2053,6 +2053,8 @@ let s6Dns = callPackage ../tools/networking/s6-dns { }; + s6Networking = callPackage ../tools/networking/s6-networking { }; + s6PortableUtils = callPackage ../tools/misc/s6-portable-utils { }; sablotron = callPackage ../tools/text/xml/sablotron { }; -- GitLab From b5f33dc13379ef2821d9e40a74206f22e8501cbb Mon Sep 17 00:00:00 2001 From: Patrick Mahoney Date: Sat, 30 Aug 2014 00:12:38 -0500 Subject: [PATCH 557/843] s6-linux-utils: new package s6-linux-utils is a set of minimalistic Linux-specific system utilities. --- .../linux/s6-linux-utils/default.nix | 53 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 55 insertions(+) create mode 100644 pkgs/os-specific/linux/s6-linux-utils/default.nix diff --git a/pkgs/os-specific/linux/s6-linux-utils/default.nix b/pkgs/os-specific/linux/s6-linux-utils/default.nix new file mode 100644 index 00000000000..0f0967079df --- /dev/null +++ b/pkgs/os-specific/linux/s6-linux-utils/default.nix @@ -0,0 +1,53 @@ +{ stdenv, fetchurl, skalibs }: + +let + + version = "1.0.3.1"; + +in stdenv.mkDerivation rec { + + name = "s6-linux-utils-${version}"; + + src = fetchurl { + url = "http://www.skarnet.org/software/s6-linux-utils/${name}.tar.gz"; + sha256 = "1s17g03z5hfpiz32g001g5wyamyvn9l36fr2csk3k7r0jkqfnl0d"; + }; + + buildInputs = [ skalibs ]; + + sourceRoot = "admin/${name}"; + + configurePhase = '' + pushd conf-compile + + printf "$out/bin" > conf-install-command + printf "$out/include" > conf-install-include + printf "$out/lib" > conf-install-library + printf "$out/lib" > conf-install-library.so + + # let nix builder strip things, cross-platform + truncate --size 0 conf-stripbins + truncate --size 0 conf-striplibs + + printf "${skalibs}/sysdeps" > import + printf "%s" "${skalibs}/include" > path-include + printf "%s" "${skalibs}/lib" > path-library + + rm -f flag-slashpackage + touch flag-allstatic + + popd + ''; + + preBuild = '' + patchShebangs src/sys + ''; + + meta = { + homepage = http://www.skarnet.org/software/s6-linux-utils/; + description = "A set of minimalistic Linux-specific system utilities."; + platforms = stdenv.lib.platforms.linux; + license = stdenv.lib.licenses.isc; + }; + +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index bf0cc411e1d..a29145144a1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2053,6 +2053,8 @@ let s6Dns = callPackage ../tools/networking/s6-dns { }; + s6LinuxUtils = callPackage ../os-specific/linux/s6-linux-utils { }; + s6Networking = callPackage ../tools/networking/s6-networking { }; s6PortableUtils = callPackage ../tools/misc/s6-portable-utils { }; -- GitLab From f7aa6e1140fcc1e006a0030ae00b7e5ca646ae25 Mon Sep 17 00:00:00 2001 From: Philip Horger Date: Sun, 24 Aug 2014 13:43:53 -0700 Subject: [PATCH 558/843] Fix pianobar license to be accurate (MIT) This was broken, in a well-intentioned way, in 9350c1d. The maintainer believed that the Pandora license was in conflict with nixpkg's rights to build the package, and that it would be safer to avoid picking a fight. However well-intentioned, though, it was still inaccurate and unnecessary to change the metadata for the package nixexpr. I will attempt to support this assertion through several arguments that should hopefully be independent, such that any one of them would be convincing enough in isolation to merit merging this commit. 1. The limits of Pandora's TOS The legal agreement between Pandora and its users applies to the user, not to third parties. It definitely does not have such an outrageous scope that Pandora should be allowed to dictate what we may or may not compile. Furthermore, most TOS and EULA documents are completely (or at least mostly) legally bunk. They are constructed such that using any website or software in a typical manner will result in a violation, and the consequences for violation are then enforced selectively. However, when such issues go to court, the court regularly favors the user. Legal precedent generally follows that such agreements are non-binding scare tactics, rather than enforceable contracts. 2. Most software can be used for evil If I buy a lockpick kit, it may have a fully open-source hardware design, be 3D-print-able, etc. And as long as I don't use it to break into someone else's home, it is perfectly appropriate for me to manufacture as many copies as I want, and contribute improvements upstream. Conversely, if I do misuse the tools, and I am prosecuted, the person who made the designs available online is *not* responsible for how I used them. If we only package things that cannot be used for evil, we'll have to stop shipping the Linux kernel, and that could make things... complicated. But it certainly would discourage the NSA from using NixOS. 3. Intent doesn't matter There was an argument, in channel, that pianobar's intent is entirely or predominantly illegal. This is not true, as I'll explain shortly, but I'd first like to explain why intent does not matter. First of all, intent is subjective. If someone bumps me on the street, I may infer ill intent. But from the other person's perspective, she's just in a rush to get from Point A to Point B. Second, intent is not related to consequences or development methodology. Ill intent may lead to positive consequences, and vice versa, and in all cases the subjectivity argument applies (good for whom? bad for whom?). 4. Pianobar does not have bad intent Just look at the project page: http://6xq.net/projects/pianobar/ The "most important" means of contribution, according to author, is keeping Pandora alive. In fact, monetary donations of any kind will not be accepted. This seems like it's in conflict with one of the most popular features of the software - an ad-free experience. But pianobar actually has a better experience when you have a paid Pandora account - higher-quality streams become available. Pianobar is fully compatible with paid accounts, and if the developer does not pay for his Pandora account, I will eat my hat. Furthermore, a command line client enables more people to use Pandora in more ways than the stock Pandora client allows. The stock client is written in Flash, and is slow, resource-hungry, and useless on a headless server. Pianobar can be used on just about any hardware, and there are several hardware recipes listed on the project page which provide straightforward Pandora-based music appliances, using pianobar's minimal footprint and remote-control-ability. Because it opens up more use cases and improves the experience for paid users, it's actually arguable whether pianobar is "bad for Pandora", when it clearly *could* be the opposite. It is also probably fair to note that pianobar has been around for awhile, and Pandora has never expressed an interest in picking a legal fight with it, or even blocking pianobar from working. 5. Pianobar's source really is MIT-licensed It is disingenuous to say that pianobar is nonfree. It's absolutely free software, you can verify the license content against the MIT license text for yourself. It is developed and distributed as free and open source software. The extent of its 'nonfreedom' is that it interacts with a nonfree service, in ways that the nonfree service may not allow for in their TOS. To block it on these grounds, would be like blocking Libreoffice for its Microsoft Word compatibility, or preventing users from visiting websites that say "this site only for use with IE7". ------------ In summary, we should strive for technical accuracy, rather than allowing a third-party pseudocontract that does not apply to us, to dictate what we may or may not package for our users (who may or may not use it in a way that benefits Pandora). --- pkgs/applications/audio/pianobar/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/audio/pianobar/default.nix b/pkgs/applications/audio/pianobar/default.nix index a9f4b02fa08..b2f44513bba 100644 --- a/pkgs/applications/audio/pianobar/default.nix +++ b/pkgs/applications/audio/pianobar/default.nix @@ -21,6 +21,6 @@ stdenv.mkDerivation rec { description = "A console front-end for Pandora.com"; homepage = "http://6xq.net/projects/pianobar/"; platforms = stdenv.lib.platforms.linux; - license = stdenv.lib.licenses.unfree; + license = stdenv.lib.licenses.mit; }; } -- GitLab From 3f0ebe7e7542c5cb81acfeffb025f9ab1a5a755a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sat, 30 Aug 2014 07:28:26 +0200 Subject: [PATCH 559/843] licenses: comment about two versions of MIT I decided to follow spdx.org and not to differentiate those two. Packages would often have the wrong version anyway. --- lib/licenses.nix | 2 ++ pkgs/applications/audio/pianobar/default.nix | 2 +- pkgs/development/libraries/expat/default.nix | 5 +++-- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/lib/licenses.nix b/lib/licenses.nix index 812592c74f2..bdcf8a7b8a7 100644 --- a/lib/licenses.nix +++ b/lib/licenses.nix @@ -194,6 +194,8 @@ rec { fullName = "Lucent Public License v1.02"; }; + # spdx.org does not (yet) differentiate between the X11 and Expat versions + # for details see http://en.wikipedia.org/wiki/MIT_License#Various_versions mit = spdx { shortName = "MIT"; fullName = "MIT License"; diff --git a/pkgs/applications/audio/pianobar/default.nix b/pkgs/applications/audio/pianobar/default.nix index b2f44513bba..a91f25126c1 100644 --- a/pkgs/applications/audio/pianobar/default.nix +++ b/pkgs/applications/audio/pianobar/default.nix @@ -21,6 +21,6 @@ stdenv.mkDerivation rec { description = "A console front-end for Pandora.com"; homepage = "http://6xq.net/projects/pianobar/"; platforms = stdenv.lib.platforms.linux; - license = stdenv.lib.licenses.mit; + license = stdenv.lib.licenses.mit; # expat version }; } diff --git a/pkgs/development/libraries/expat/default.nix b/pkgs/development/libraries/expat/default.nix index d7915a93962..9a49225d172 100644 --- a/pkgs/development/libraries/expat/default.nix +++ b/pkgs/development/libraries/expat/default.nix @@ -8,9 +8,10 @@ stdenv.mkDerivation rec { sha256 = "11pblz61zyxh68s5pdcbhc30ha1b2vfjd83aiwfg4vc15x3hadw2"; }; - meta = { + meta = with stdenv.lib; { homepage = http://www.libexpat.org/; description = "A stream-oriented XML parser library written in C"; - platforms = stdenv.lib.platforms.all; + platforms = platforms.all; + license = licenses.mit; # expat version }; } -- GitLab From 685cded7b5b4d9dc426cd25f942324738b587e22 Mon Sep 17 00:00:00 2001 From: Longrin Wischnewski Date: Sat, 30 Aug 2014 09:14:19 +0200 Subject: [PATCH 560/843] nanoblogger: adding version 3.5-rc1 --- .../applications/misc/nanoblogger/default.nix | 29 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 31 insertions(+) create mode 100644 pkgs/applications/misc/nanoblogger/default.nix diff --git a/pkgs/applications/misc/nanoblogger/default.nix b/pkgs/applications/misc/nanoblogger/default.nix new file mode 100644 index 00000000000..e910c9ed22e --- /dev/null +++ b/pkgs/applications/misc/nanoblogger/default.nix @@ -0,0 +1,29 @@ +{ fetchurl, stdenv, bash }: + +stdenv.mkDerivation rec { + version = "3.5-rc1"; + name = "nanoblogger-${version}"; + + src = fetchurl { + url = "mirror://sourceforge/nanoblogger/${name}.tar.gz"; + sha256 = "09mv52a5f0h3das8x96irqyznm69arfskx472b7w3b9q4a2ipxbq"; + }; + + buildInputs = [ ]; + + installPhase = '' + mkdir -p $out/bin + cp -r * $out + cat > $out/bin/nb << EOF + #!${bash}/bin/bash + $out/nb "\$@" + EOF + chmod 755 $out/bin/nb + ''; + + meta = { + description = "Small weblog engine written in Bash for the command line"; + homepage = http://nanoblogger.sourceforge.net/; + license = stdenv.lib.licenses.gpl2; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0a97c43463d..0fef9addc71 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9427,6 +9427,8 @@ let nano = callPackage ../applications/editors/nano { }; + nanoblogger = callPackage ../applications/misc/nanoblogger { }; + navipowm = callPackage ../applications/misc/navipowm { }; navit = callPackage ../applications/misc/navit { }; -- GitLab From 58bc1ef3d854f47d91d800d9bcfb9a0bee6bbcf1 Mon Sep 17 00:00:00 2001 From: aszlig Date: Sat, 30 Aug 2014 02:56:28 +0200 Subject: [PATCH 561/843] chromium: Remove all NSAPI browser wrappers. Chromium doesn't support NSAPI anymore, so it doesn't make sense to keep the wrappers, especially because some of them trigger bugs in more recent versions of Chromium. Signed-off-by: aszlig --- pkgs/top-level/all-packages.nix | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f990524d5c8..2305a3fe98f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8343,20 +8343,16 @@ let chatzilla = callPackage ../applications/networking/irc/chatzilla { }; - chromium = lowPrio (callPackage ../applications/networking/browsers/chromium { + chromium = callPackage ../applications/networking/browsers/chromium { channel = "stable"; pulseSupport = config.pulseaudio or true; enablePepperFlash = config.chromium.enablePepperFlash or false; enablePepperPDF = config.chromium.enablePepperPDF or false; - }); + }; chromiumBeta = lowPrio (chromium.override { channel = "beta"; }); - chromiumBetaWrapper = lowPrio (wrapChromium chromiumBeta); chromiumDev = lowPrio (chromium.override { channel = "dev"; }); - chromiumDevWrapper = lowPrio (wrapChromium chromiumDev); - - chromiumWrapper = wrapChromium chromium; cinelerra = callPackage ../applications/video/cinelerra { }; @@ -10069,13 +10065,6 @@ let wordnet = callPackage ../applications/misc/wordnet { }; - wrapChromium = browser: wrapFirefox { - inherit browser; - browserName = browser.packageName; - desktopName = "Chromium"; - icon = "${browser}/share/icons/hicolor/48x48/apps/${browser.packageName}.png"; - }; - wrapFirefox = { browser, browserName ? "firefox", desktopName ? "Firefox", nameSuffix ? "" , icon ? "${browser}/lib/${browser.name}/browser/icons/mozicon128.png" }: -- GitLab From f175833fd62e022b9d51a66dac06676dfa15ccec Mon Sep 17 00:00:00 2001 From: aszlig Date: Sat, 30 Aug 2014 03:15:57 +0200 Subject: [PATCH 562/843] chromium: Update beta and dev to latest versions. beta: 37.0.2062.94 -> 38.0.2125.24 (builds fine, tested) dev: 38.0.2125.8 -> 39.0.2138.3 (builds fine, tested) Introduces the new version 39 and finally separates stable/beta again. Signed-off-by: aszlig --- .../browsers/chromium/source/sources.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/source/sources.nix b/pkgs/applications/networking/browsers/chromium/source/sources.nix index 71c825188c3..27ba9420f43 100644 --- a/pkgs/applications/networking/browsers/chromium/source/sources.nix +++ b/pkgs/applications/networking/browsers/chromium/source/sources.nix @@ -1,16 +1,16 @@ # This file is autogenerated from update.sh in the parent directory. { dev = { - version = "38.0.2125.8"; - sha256 = "1h3vkp0mgznqv48ksnsndlh7ywh3jby25x6dxxd7py445pg6y3c6"; - sha256bin32 = "1ynqm5yp7m8j3mwgqaa2vvw835g9ifn3dfniqh9z9n0swha27a69"; - sha256bin64 = "1vdm4wffkvj3jwrb2nihghxkxcvp81xcc5wygpd1w495vrhy4bpf"; + version = "39.0.2138.3"; + sha256 = "0adkzv4ydrg02prcacqx3gk8v0ivvs57qisf220wzzicgpzklm26"; + sha256bin32 = "0rskbr55nhvpmmw6bl90iv2lr0f2chra3r5c92j3ica307y12f2q"; + sha256bin64 = "0gdyyaxiaq50jpwhvai6d67ypgjxqn8kp9fqix6nbwj4fnmdfcjx"; }; beta = { - version = "37.0.2062.94"; - sha256 = "0cz5kivimxcaiml6x5mysarjyfvvanbw02qz2d1y3jvl1dc1jz6j"; - sha256bin32 = "0pa209sjdfb0y96kicvp4lnn1inwdcgj8kpmn28cmi8l1cr8yy3b"; - sha256bin64 = "0kk2dm2gwvzvrrp03k7cw6zzp3197lrq2p1si3pr2wbgm8sb5dk5"; + version = "38.0.2125.24"; + sha256 = "07v4vk7sc54d2hzgfms0b71cc7z6h85v9d39j110kzk0w1bpk3gy"; + sha256bin32 = "0l26ci7sqi755cm017qmbcqk74rqja5c08cbzf5v4chsa773qn0m"; + sha256bin64 = "1ibx40ijjj8z0smpzh5v6y611c57qm5raldk48h5dd1flqbgz0nr"; }; stable = { version = "37.0.2062.94"; -- GitLab From d8727a927ad5deecabce0cc7ae90b46065b33a3f Mon Sep 17 00:00:00 2001 From: Longrin Wischnewski Date: Sat, 30 Aug 2014 10:00:12 +0200 Subject: [PATCH 563/843] Symbola: fix download url's, adjust installPhase and meta --- pkgs/data/fonts/symbola/default.nix | 29 ++++++++++++++--------------- 1 file changed, 14 insertions(+), 15 deletions(-) diff --git a/pkgs/data/fonts/symbola/default.nix b/pkgs/data/fonts/symbola/default.nix index 993a4c4f46d..b324e52d021 100644 --- a/pkgs/data/fonts/symbola/default.nix +++ b/pkgs/data/fonts/symbola/default.nix @@ -1,40 +1,39 @@ -{stdenv, fetchurl}: +{stdenv, fetchurl, unzip }: stdenv.mkDerivation rec { name = "symbola-7.12"; - ttf = fetchurl { - url = "http://users.teilar.gr/~g1951d/Symbola.ttf"; - sha256 = "7acc058bd4e56cc986b2a46420520f59be402c3565c202b5dcebca7f3bfd8b5a"; + src = fetchurl { + url = "http://users.teilar.gr/~g1951d/Symbola.zip"; + sha256 = "19q5wcqk1rz8ps7jvvx1rai6x8ais79z71sm8d36hvsk2vr135al"; }; docs_pdf = fetchurl { url = "http://users.teilar.gr/~g1951d/Symbola.pdf"; - sha256 = "11bb082ba5c2780a6f94a9bcddf4f314a54e2650bb63ce3081d1dc867c5e6843"; - }; - docs_docx = fetchurl { - url = "http://users.teilar.gr/~g1951d/Symbola.docx"; - sha256 = "4f0ab494e1e5a7aac147aa7bb8b8bdba7278aee2da942a35f995feb9051515b9"; + sha256 = "11h2202p1p4np4nv5m8k41wk7431p2m35sjpmbi1ygizakkbla3p"; }; + buildInputs = [ unzip ]; + phases = [ "installPhase" ]; installPhase = '' + unzip ${src} mkdir -p $out/share/fonts/truetype - cp -v "$ttf" $out/share/fonts/truetype/"${ttf.name}" + cp -v Symbola.ttf $out/share/fonts/truetype/ + cp -v Symbola_hint.ttf $out/share/fonts/truetype/ mkdir -p "$out/doc/${name}" + cp -v Symbola.docx "$out/doc/${name}/" + cp -v Symbola.htm "$out/doc/${name}/" cp -v "$docs_pdf" "$out/doc/${name}/${docs_pdf.name}" - cp -v "$docs_docx" "$out/doc/${name}/${docs_docx.name}" ''; meta = { - description = "Basic Latin, Greek, Cyrillic and many Symbol blocks of Unicode..."; - + description = "Basic Latin, Greek, Cyrillic and many Symbol blocks of Unicode"; # In lieu of a licence: # Fonts in this site are offered free for any use; # they may be installed, embedded, opened, edited, modified, regenerated, posted, packaged and redistributed. - license = "Unicode Fonts for Ancient Scripts"; - + license = stdenv.lib.licenses.free; homepage = http://users.teilar.gr/~g1951d/; }; } -- GitLab From 9c615653ea17c9ba45e654bc7bfae2578463cea6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sat, 30 Aug 2014 11:07:56 +0200 Subject: [PATCH 564/843] axis: remove the unused vulnerable version 1.3 --- pkgs/development/libraries/axis/builder.sh | 5 ----- pkgs/development/libraries/axis/default.nix | 16 ---------------- pkgs/top-level/all-packages.nix | 2 -- 3 files changed, 23 deletions(-) delete mode 100644 pkgs/development/libraries/axis/builder.sh delete mode 100644 pkgs/development/libraries/axis/default.nix diff --git a/pkgs/development/libraries/axis/builder.sh b/pkgs/development/libraries/axis/builder.sh deleted file mode 100644 index d979eb9d803..00000000000 --- a/pkgs/development/libraries/axis/builder.sh +++ /dev/null @@ -1,5 +0,0 @@ -source $stdenv/setup - -mkdir -p $out -unpackPhase -mv $directory/* $out diff --git a/pkgs/development/libraries/axis/default.nix b/pkgs/development/libraries/axis/default.nix deleted file mode 100644 index 62ae463b5fc..00000000000 --- a/pkgs/development/libraries/axis/default.nix +++ /dev/null @@ -1,16 +0,0 @@ -{stdenv, fetchurl}: - -stdenv.mkDerivation { - name = "axis-1.3"; - directory = "axis-1_3"; - builder = ./builder.sh; - src = fetchurl { - url = "http://archive.apache.org/dist/ws/axis/1_3/axis-bin-1_3.tar.gz"; - md5 = "dd8203f08c37872f4fd2bfb45c4bfe04"; - }; - inherit stdenv; - - meta = { - description = "Implementation of the SOAP (Simple Object Access Protocol) submission to W3C"; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2305a3fe98f..94928d92081 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4364,8 +4364,6 @@ let audiofile = callPackage ../development/libraries/audiofile { }; - axis = callPackage ../development/libraries/axis { }; - babl_0_0_22 = callPackage ../development/libraries/babl/0_0_22.nix { }; babl = callPackage ../development/libraries/babl { }; -- GitLab From 1f9d579c78c9c4e62cf19ea64f9154f2c1fc8bb5 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sat, 30 Aug 2014 14:34:42 +0400 Subject: [PATCH 565/843] =?UTF-8?q?Adding=20gulp=20and=20git-run=20to=20no?= =?UTF-8?q?de-packages.json=20=E2=80=94=20failed=20to=20regenerate=20node-?= =?UTF-8?q?packages-generated.nix,=20though;=20but=20the=20next=20succesfu?= =?UTF-8?q?l=20regeneration=20will=20actually=20add=20these=20packages?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/top-level/node-packages.json | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/top-level/node-packages.json b/pkgs/top-level/node-packages.json index fec7884eb25..1ebb9f290b7 100644 --- a/pkgs/top-level/node-packages.json +++ b/pkgs/top-level/node-packages.json @@ -83,6 +83,7 @@ , "grunt-contrib-uglify" , "grunt-karma" , "grunt-sed" +, "gulp" , "karma" , "karma-mocha" , "karma-coverage" @@ -123,4 +124,5 @@ , "sinon" , "shelljs" , "typescript" +, "git-run" ] -- GitLab From 33cbd6687c32d1a849cdf3f4c7ee0863edc46477 Mon Sep 17 00:00:00 2001 From: Longrin Wischnewski Date: Fri, 22 Aug 2014 13:24:18 +0200 Subject: [PATCH 566/843] wxhexeditor: adding version 0.22 wxhexeditor: add the package to all-packages.nix wxhexeditor: fix shebang --- .../editors/wxhexeditor/default.nix | 41 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 43 insertions(+) create mode 100644 pkgs/applications/editors/wxhexeditor/default.nix diff --git a/pkgs/applications/editors/wxhexeditor/default.nix b/pkgs/applications/editors/wxhexeditor/default.nix new file mode 100644 index 00000000000..de423987c02 --- /dev/null +++ b/pkgs/applications/editors/wxhexeditor/default.nix @@ -0,0 +1,41 @@ +{ stdenv, fetchurl, wxGTK, autoconf, automake, libtool, python, gettext, bash }: + +stdenv.mkDerivation rec { + name = "wxHexEditor-${version}"; + version = "v0.22"; + + src = fetchurl { + url = "mirror://sourceforge/wxhexeditor/${name}-src.tar.bz2"; + sha256 = "15ir038g4lyw1q5bsay974hvj0nkg2yd9kccwxz808cd45fp411w"; + }; + + buildInputs = [ wxGTK autoconf automake libtool python gettext ]; + + patchPhase = '' + substituteInPlace Makefile --replace "/usr/local" "$out" + substituteInPlace Makefile --replace "mhash; ./configure" "mhash; ./configure --prefix=$out" + substituteInPlace udis86/autogen.sh --replace "/bin/bash" "${bash}/bin/bash" + ''; + + buildPhase = '' + make OPTFLAGS="-fopenmp" + + ''; + + meta = { + description = "Hex Editor / Disk Editor for Huge Files or Devices"; + longDescription = '' + This is not an ordinary hex editor, but could work as low level disk editor too. + If you have problems with your HDD or partition, you can recover your data from HDD or + from partition via editing sectors in raw hex. + You can edit your partition tables or you could recover files from File System by hand + with help of wxHexEditor. + Or you might want to analyze your big binary files, partitions, devices... If you need + a good reverse engineer tool like a good hex editor, you welcome. + wxHexEditor could edit HDD/SDD disk devices or partitions in raw up to exabyte sizes. + ''; + homepage = "http://www.wxhexeditor.org/"; + license = stdenv.lib.licenses.gpl2; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 94928d92081..f9c1b56c309 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10091,6 +10091,8 @@ let gtk_modules = [ libcanberra ]; }; + wxhexeditor = callPackage ../applications/editors/wxhexeditor { }; + x11vnc = callPackage ../tools/X11/x11vnc { }; x2vnc = callPackage ../tools/X11/x2vnc { }; -- GitLab From 4210665c4f349d95685d14a8eacf21c3cf9e030c Mon Sep 17 00:00:00 2001 From: Mateusz Kowalczyk Date: Sat, 30 Aug 2014 13:47:01 +0100 Subject: [PATCH 567/843] mcomix: update to 1.00 --- pkgs/applications/graphics/mcomix/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/graphics/mcomix/default.nix b/pkgs/applications/graphics/mcomix/default.nix index cc1fe8c3a22..53c564beec7 100644 --- a/pkgs/applications/graphics/mcomix/default.nix +++ b/pkgs/applications/graphics/mcomix/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { namePrefix = ""; - name = "mcomix-0.98"; + name = "mcomix-1.00"; src = fetchurl { url = "mirror://sourceforge/mcomix/${name}.tar.bz2"; - sha256 = "93805b6c8540bd673ac4a6ef6e952f00f8fc10e59a63c7e163324a64db2a6b03"; + sha256 = "1phcdx1agacdadz8bvbibdbps1apz8idi668zmkky5cpl84k2ifq"; }; doCheck = false; @@ -28,7 +28,7 @@ buildPythonPackage rec { ''; homepage = http://mcomix.sourceforge.net/; - license = stdenv.lib.licenses.gpl2; + maintainers = with stdenv.lib.maintainers; [ fuuzetsu ]; }; } -- GitLab From 9a26b38ad30406188702603a1ce9d87948a4c1f7 Mon Sep 17 00:00:00 2001 From: Damien Cassou Date: Sat, 30 Aug 2014 15:56:22 +0200 Subject: [PATCH 568/843] Make sure gnome-python has gnomevfs binding --- pkgs/desktops/gnome-2/bindings/gnome-python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-2/bindings/gnome-python/default.nix b/pkgs/desktops/gnome-2/bindings/gnome-python/default.nix index ed794715ff8..41ca17bd5e4 100644 --- a/pkgs/desktops/gnome-2/bindings/gnome-python/default.nix +++ b/pkgs/desktops/gnome-2/bindings/gnome-python/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, python, pkgconfig, libgnome, GConf, pygobject, pygtk, glib, gtk, pythonDBus}: +{ stdenv, fetchurl, python, pkgconfig, libgnome, GConf, pygobject, pygtk, glib, gtk, pythonDBus, gnome_vfs}: with stdenv.lib; @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { cp bonobo/*.{py,defs} $out/share/pygtk/2.0/defs/ ''; - buildInputs = [ python pkgconfig pygobject pygtk glib gtk GConf libgnome pythonDBus ]; + buildInputs = [ python pkgconfig pygobject pygtk glib gtk GConf libgnome pythonDBus gnome_vfs ]; doCheck = false; -- GitLab From 7fc369cfca5cdcd3da87f807d005f42545f85fa5 Mon Sep 17 00:00:00 2001 From: Patrick Mahoney Date: Sat, 30 Aug 2014 09:19:23 -0500 Subject: [PATCH 569/843] dnsmasq: Replace deprecated ensureDir with mkdir. --- pkgs/tools/networking/dnsmasq/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/networking/dnsmasq/default.nix b/pkgs/tools/networking/dnsmasq/default.nix index 02f24ce4c00..3cfc902711e 100644 --- a/pkgs/tools/networking/dnsmasq/default.nix +++ b/pkgs/tools/networking/dnsmasq/default.nix @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { install -Dm644 dbus/dnsmasq.conf $out/etc/dbus-1/system.d/dnsmasq.conf install -Dm644 trust-anchors.conf $out/share/dnsmasq/trust-anchors.conf - ensureDir $out/share/dbus-1/system-services + mkdir -p $out/share/dbus-1/system-services cat < $out/share/dbus-1/system-services/uk.org.thekelleys.dnsmasq.service [D-BUS Service] Name=uk.org.thekelleys.dnsmasq -- GitLab From 098c8f4c77b1ed9ea28b5aabadde24b17df8d568 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Fri, 4 Jul 2014 14:57:19 -0500 Subject: [PATCH 570/843] nixos/network-interfaces: Add support for multiple ipv4 / ipv6 addresses --- nixos/modules/services/networking/dhcpcd.nix | 2 +- nixos/modules/tasks/network-interfaces.nix | 137 ++++++++++++------- 2 files changed, 85 insertions(+), 54 deletions(-) diff --git a/nixos/modules/services/networking/dhcpcd.nix b/nixos/modules/services/networking/dhcpcd.nix index 89aa9bdb6b6..65b4319b50a 100644 --- a/nixos/modules/services/networking/dhcpcd.nix +++ b/nixos/modules/services/networking/dhcpcd.nix @@ -11,7 +11,7 @@ let # Don't start dhcpcd on explicitly configured interfaces or on # interfaces that are part of a bridge, bond or sit device. ignoredInterfaces = - map (i: i.name) (filter (i: i.ipAddress != null) (attrValues config.networking.interfaces)) + map (i: i.name) (filter (i: i.ip4 != [ ]) (attrValues config.networking.interfaces)) ++ mapAttrsToList (i: _: i) config.networking.sits ++ concatLists (attrValues (mapAttrs (n: v: v.interfaces) config.networking.bridges)) ++ concatLists (attrValues (mapAttrs (n: v: v.interfaces) config.networking.bonds)) diff --git a/nixos/modules/tasks/network-interfaces.nix b/nixos/modules/tasks/network-interfaces.nix index 7dabe70f00c..30e2a143419 100644 --- a/nixos/modules/tasks/network-interfaces.nix +++ b/nixos/modules/tasks/network-interfaces.nix @@ -10,6 +10,26 @@ let hasSits = cfg.sits != { }; hasBonds = cfg.bonds != { }; + addrOpts = v: + assert v == 4 || v == 6; + { + address = mkOption { + type = types.str; + description = '' + IPv${toString v} address of the interface. Leave empty to configure the + interface using DHCP. + ''; + }; + + prefixLength = mkOption { + type = types.addCheck types.int (n: n >= 0 && n <= (if v == 4 then 32 else 128)); + description = '' + Subnet mask of the interface, specified as the number of + bits in the prefix (${if v == 4 then "24" else "64"}). + ''; + }; + }; + interfaceOpts = { name, ... }: { options = { @@ -20,54 +40,64 @@ let description = "Name of the interface."; }; + ip4 = mkOption { + default = [ ]; + example = [ + { address = "10.0.0.1"; prefixLength = 16; } + { address = "192.168.1.1"; prefixLength = 24; } + ]; + type = types.listOf types.optionSet; + options = addrOpts 4; + description = '' + List of IPv4 addresses that will be statically assigned to the interface. + ''; + }; + + ip6 = mkOption { + default = [ ]; + example = [ + { address = "fdfd:b3f0:482::1"; prefixLength = 48; } + { address = "2001:1470:fffd:2098::e006"; prefixLength = 64; } + ]; + type = types.listOf types.optionSet; + options = addrOpts 6; + description = '' + List of IPv6 addresses that will be statically assigned to the interface. + ''; + }; + ipAddress = mkOption { default = null; - example = "10.0.0.1"; - type = types.nullOr (types.str); description = '' - IP address of the interface. Leave empty to configure the - interface using DHCP. + Defunct, create an address in the ip4 list instead. ''; }; prefixLength = mkOption { default = null; - example = 24; - type = types.nullOr types.int; description = '' - Subnet mask of the interface, specified as the number of - bits in the prefix (24). + Defunct, supply the prefix length in the ip4 list instead. ''; }; subnetMask = mkOption { - default = ""; - example = "255.255.255.0"; - type = types.str; + default = null; description = '' - Subnet mask of the interface, specified as a bitmask. - This is deprecated; use - instead. + Defunct, supply the prefix length in the ip4 list instead. ''; }; ipv6Address = mkOption { default = null; - example = "2001:1470:fffd:2098::e006"; - type = types.nullOr types.string; description = '' - IPv6 address of the interface. Leave empty to configure the - interface using NDP. + Defunct, create an address in the ip6 list instead. ''; }; ipv6prefixLength = mkOption { - default = 64; - example = 64; - type = types.int; + default = null; description = '' - Subnet mask of the interface, specified as the number of - bits in the prefix (64). + Defunct, supply the prefix length in the ip6 list instead. ''; }; @@ -438,6 +468,16 @@ in config = { + assertions = + flip map interfaces (i: { + assertion = i.ipAddress == null && i.prefixLength == null && i.subnetMask == null; + message = "The networking.interfaces.${i.name}.ipAddress option is defunct. Use networking.ip4 instead."; + }) + ++ flip map interfaces (i: { + assertion = i.ipv6Address == null && i.ipv6prefixLength == null; + message = "The networking.interfaces.${i.name}.ipv6Address option is defunct. Use networking.ip6 instead."; + }); + boot.kernelModules = [ ] ++ optional cfg.enableIPv6 "ipv6" ++ optional hasVirtuals "tun" @@ -535,11 +575,6 @@ in # has appeared, and it's stopped when the interface # disappears. configureInterface = i: nameValuePair "${i.name}-cfg" - (let mask = - if i.prefixLength != null then toString i.prefixLength else - if i.subnetMask != "" then i.subnetMask else "32"; - staticIPv6 = cfg.enableIPv6 && i.ipv6Address != null; - in { description = "Configuration of ${i.name}"; wantedBy = [ "network-interfaces.target" ]; bindsTo = [ "sys-subsystem-net-devices-${i.name}.device" ]; @@ -562,36 +597,32 @@ in echo "setting MTU to ${toString i.mtu}..." ip link set "${i.name}" mtu "${toString i.mtu}" '' - + optionalString (i.ipAddress != null) + + # Ip Setup + + '' - cur=$(ip -4 -o a show dev "${i.name}" | awk '{print $4}') - # Only do a flush/add if it's necessary. This is + curIps=$(ip -o a show dev "${i.name}" | awk '{print $4}') + # Only do an add if it's necessary. This is # useful when the Nix store is accessed via this # interface (e.g. in a QEMU VM test). - if [ "$cur" != "${i.ipAddress}/${mask}" ]; then - echo "configuring interface..." - ip -4 addr flush dev "${i.name}" - ip -4 addr add "${i.ipAddress}/${mask}" dev "${i.name}" - restart_network_setup=true - else - echo "skipping configuring interface" - fi '' - + optionalString (staticIPv6) + + flip concatMapStrings (i.ip4 ++ optionals cfg.enableIPv6 i.ip6) (ip: + let + address = "${ip.address}/${toString ip.prefixLength}"; + in '' - # Only do a flush/add if it's necessary. This is - # useful when the Nix store is accessed via this - # interface (e.g. in a QEMU VM test). - if ! ip -6 -o a show dev "${i.name}" | grep "${i.ipv6Address}/${toString i.ipv6prefixLength}"; then - echo "configuring interface..." - ip -6 addr flush dev "${i.name}" - ip -6 addr add "${i.ipv6Address}/${toString i.ipv6prefixLength}" dev "${i.name}" - restart_network_setup=true - else - echo "skipping configuring interface" + echo "checking ip ${address}..." + if ! echo "$curIps" | grep "${address}" >/dev/null 2>&1; then + if out=$(ip addr add "${address}" dev "${i.name}" 2>&1); then + echo "added ip ${address}..." + restart_network_setup=true + elif ! echo "$out" | grep "File exists" >/dev/null 2>&1; then + echo "failed to add ${address}" + exit 1 + fi fi - '' - + optionalString (i.ipAddress != null || staticIPv6) + '') + + optionalString (i.ip4 != [ ] || (cfg.enableIPv6 && i.ip6 != [ ])) '' if [ restart_network_setup = true ]; then # Ensure that the default gateway remains set. @@ -608,7 +639,7 @@ in '' echo 1 > /proc/sys/net/ipv6/conf/${i.name}/proxy_ndp ''; - }); + }; createTunDevice = i: nameValuePair "${i.name}" { description = "Virtual Network Interface ${i.name}"; -- GitLab From 1ff4b838758f36dc8c54995e104dd17ba08a65a4 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Sun, 13 Jul 2014 10:39:59 -0500 Subject: [PATCH 571/843] nixos/network-interfaces: Add flush upon interface going down --- nixos/modules/tasks/network-interfaces.nix | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/nixos/modules/tasks/network-interfaces.nix b/nixos/modules/tasks/network-interfaces.nix index 30e2a143419..e8c770d077c 100644 --- a/nixos/modules/tasks/network-interfaces.nix +++ b/nixos/modules/tasks/network-interfaces.nix @@ -639,6 +639,19 @@ in '' echo 1 > /proc/sys/net/ipv6/conf/${i.name}/proxy_ndp ''; + preStop = + '' + echo "releasing configured ip's..." + '' + + flip concatMapStrings (i.ip4 ++ optionals cfg.enableIPv6 i.ip6) (ip: + let + address = "${ip.address}/${toString ip.prefixLength}"; + in + '' + echo -n "Deleting ${address}..." + ip addr del "${address}" dev "${i.name}" >/dev/null 2>&1 || echo -n " Failed" + echo "" + ''); }; createTunDevice = i: nameValuePair "${i.name}" -- GitLab From 86c0f8c549c2ad728e06f8bc11d805fe760e7df8 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Wed, 16 Jul 2014 17:29:50 -0500 Subject: [PATCH 572/843] Refactor nixos files relying on the old ipAddress / prefixLength / subnetMask attributes --- nixos/doc/manual/configuration/ipv4-config.xml | 5 +---- nixos/lib/build-vms.nix | 11 ++++++----- nixos/modules/programs/virtualbox.nix | 2 +- nixos/modules/tasks/network-interfaces.nix | 8 ++++---- nixos/tests/bittorrent.nix | 6 +++--- nixos/tests/nat.nix | 2 +- 6 files changed, 16 insertions(+), 18 deletions(-) diff --git a/nixos/doc/manual/configuration/ipv4-config.xml b/nixos/doc/manual/configuration/ipv4-config.xml index e2c51518349..053501b1736 100644 --- a/nixos/doc/manual/configuration/ipv4-config.xml +++ b/nixos/doc/manual/configuration/ipv4-config.xml @@ -12,12 +12,9 @@ interfaces. However, you can configure an interface manually as follows: -networking.interfaces.eth0 = { ipAddress = "192.168.1.2"; prefixLength = 24; }; +networking.interfaces.eth0.ip4 = [ { address = "192.168.1.2"; prefixLength = 24; } ]; -(The network prefix can also be specified using the option -subnetMask, -e.g. "255.255.255.0", but this is deprecated.) Typically you’ll also want to set a default gateway and set of name servers: diff --git a/nixos/lib/build-vms.nix b/nixos/lib/build-vms.nix index 498c0a37783..ba189555409 100644 --- a/nixos/lib/build-vms.nix +++ b/nixos/lib/build-vms.nix @@ -48,10 +48,11 @@ rec { let interfacesNumbered = zipTwoLists config.virtualisation.vlans (range 1 255); interfaces = flip map interfacesNumbered ({ first, second }: - nameValuePair "eth${toString second}" - { ipAddress = "192.168.${toString first}.${toString m.second}"; - subnetMask = "255.255.255.0"; - }); + nameValuePair "eth${toString second}" { ip4 = + [ { address = "192.168.${toString first}.${toString m.second}"; + prefixLength = 24; + } ]; + } in { key = "ip-address"; config = @@ -60,7 +61,7 @@ rec { networking.interfaces = listToAttrs interfaces; networking.primaryIPAddress = - optionalString (interfaces != []) (head interfaces).value.ipAddress; + optionalString (interfaces != []) (head (head interfaces).value.ip4).address; # Put the IP addresses of all VMs in this machine's # /etc/hosts file. If a machine has multiple diff --git a/nixos/modules/programs/virtualbox.nix b/nixos/modules/programs/virtualbox.nix index e2dd76219eb..fec1a7b61f3 100644 --- a/nixos/modules/programs/virtualbox.nix +++ b/nixos/modules/programs/virtualbox.nix @@ -44,5 +44,5 @@ let virtualbox = config.boot.kernelPackages.virtualbox; in ''; }; - networking.interfaces.vboxnet0 = { ipAddress = "192.168.56.1"; prefixLength = 24; }; + networking.interfaces.vboxnet0.ip4 = [ { address = "192.168.56.1"; prefixLength = 24; } ]; } diff --git a/nixos/modules/tasks/network-interfaces.nix b/nixos/modules/tasks/network-interfaces.nix index e8c770d077c..054784502eb 100644 --- a/nixos/modules/tasks/network-interfaces.nix +++ b/nixos/modules/tasks/network-interfaces.nix @@ -254,10 +254,10 @@ in networking.interfaces = mkOption { default = {}; example = - { eth0 = { - ipAddress = "131.211.84.78"; - subnetMask = "255.255.255.128"; - }; + { eth0.ip4 = [ { + address = "131.211.84.78"; + prefixLength = 25; + } ]; }; description = '' The configuration for each network interface. If diff --git a/nixos/tests/bittorrent.nix b/nixos/tests/bittorrent.nix index 002e012f65f..7eb9c215ee1 100644 --- a/nixos/tests/bittorrent.nix +++ b/nixos/tests/bittorrent.nix @@ -16,7 +16,7 @@ let miniupnpdConf = nodes: pkgs.writeText "miniupnpd.conf" '' ext_ifname=eth1 - listening_ip=${nodes.router.config.networking.interfaces.eth2.ipAddress}/24 + listening_ip=${(head nodes.router.config.networking.interfaces.eth2.ip4).address}/24 allow 1024-65535 192.168.2.0/24 1024-65535 ''; @@ -53,7 +53,7 @@ in { environment.systemPackages = [ pkgs.transmission ]; virtualisation.vlans = [ 2 ]; networking.defaultGateway = - nodes.router.config.networking.interfaces.eth2.ipAddress; + (head nodes.router.config.networking.interfaces.eth2.ip4).address; networking.firewall.enable = false; }; @@ -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://${nodes.tracker.config.networking.interfaces.eth1.ipAddress}:6969/announce -o /tmp/test.torrent"); + $tracker->succeed("transmission-create /tmp/data/test.tar.bz2 -t http://${(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/nat.nix b/nixos/tests/nat.nix index 5fdcc0e97ca..5a57cce6b67 100644 --- a/nixos/tests/nat.nix +++ b/nixos/tests/nat.nix @@ -13,7 +13,7 @@ import ./make-test.nix { { virtualisation.vlans = [ 1 ]; networking.firewall.allowPing = true; networking.defaultGateway = - nodes.router.config.networking.interfaces.eth2.ipAddress; + (head nodes.router.config.networking.interfaces.eth2.ip4).address; }; router = -- GitLab From 43654cba2c280ce17b81db44993d1c1bcae3a9c6 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sat, 30 Aug 2014 18:46:51 +0400 Subject: [PATCH 573/843] Update LibreOffice to 4.3.1 --- pkgs/applications/office/libreoffice/default.nix | 10 +++++----- .../office/libreoffice/libreoffice-srcs.nix | 9 +++++++-- 2 files changed, 12 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/office/libreoffice/default.nix b/pkgs/applications/office/libreoffice/default.nix index 63d4db20af3..bf6728abe63 100644 --- a/pkgs/applications/office/libreoffice/default.nix +++ b/pkgs/applications/office/libreoffice/default.nix @@ -24,8 +24,8 @@ let langsSpaces = stdenv.lib.concatStringsSep " " langs; major = "4"; minor = "3"; - patch = "0"; - tweak = "4"; + patch = "1"; + tweak = "2"; subdir = "${major}.${minor}.${patch}"; version = "${subdir}${if tweak == "" then "" else "."}${tweak}"; @@ -79,14 +79,14 @@ let translations = fetchSrc { name = "translations"; - sha256 = "1l445284mih0c7d6v3ps1piy5pbjvisyrjjvlrqizvwxqm7bxpr1"; + sha256 = "0vj1fpr99cb124hag0hijpp3pfbbi0gak56qiikxbwbq7mab6p9h"; }; # TODO: dictionaries help = fetchSrc { name = "help"; - sha256 = "0avsc11d4nmycsxvadr0xcd8z9506sjcc89hgmliqlmhmw48ax7y"; + sha256 = "1q0vzfla764zjz6xcx6r4nc8rikwb3pr2jsraj28hhwr5b26gdfz"; }; }; @@ -96,7 +96,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://download.documentfoundation.org/libreoffice/src/${subdir}/libreoffice-${version}.tar.xz"; - sha256 = "1r605nwjdq20qd96chqic1bjkw7y36wmpg2lzzvv5sz6gw12rzi8"; + sha256 = "0s1j5y1gfyf3r53bbqnzirx17p49i8ah07737nrzik0ggps3lgd5"; }; # Openoffice will open libcups dynamically, so we link it directly diff --git a/pkgs/applications/office/libreoffice/libreoffice-srcs.nix b/pkgs/applications/office/libreoffice/libreoffice-srcs.nix index 4e7dacfe0a9..6110a54feb5 100644 --- a/pkgs/applications/office/libreoffice/libreoffice-srcs.nix +++ b/pkgs/applications/office/libreoffice/libreoffice-srcs.nix @@ -184,6 +184,11 @@ md5 = "1e9ddfe25ac9577da709d7b2ea36f939"; brief = false; } +{ + name = "source-sans-pro-2.010R-ro-1.065R-it.tar.gz"; + md5 = "edc4d741888bc0d38e32dbaa17149596"; + brief = false; +} { name = "libfreehand-0.1.0.tar.bz2"; md5 = "5f029fef73e42a2c2ae4524a7513f97d"; @@ -326,8 +331,8 @@ } { name = "libgltf-0.0.0.tar.bz2"; - md5 = "3d9ea1f2828c46f8ba94b88a87b3326d"; - brief = false; + md5 = "ca5436e916bfe70694adfe2607782786"; + brief = true; subDir = "libgltf/"; } { -- GitLab From 4d8390be608ed047ef99d96b0a3f58516bad4419 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Sat, 30 Aug 2014 08:00:10 -0700 Subject: [PATCH 574/843] nixos/network-interfaces: Support the old ip configuration convention --- nixos/modules/services/networking/dhcpcd.nix | 2 +- nixos/modules/tasks/network-interfaces.nix | 51 ++++++++++++++------ 2 files changed, 36 insertions(+), 17 deletions(-) diff --git a/nixos/modules/services/networking/dhcpcd.nix b/nixos/modules/services/networking/dhcpcd.nix index 65b4319b50a..7e0b00a3d7b 100644 --- a/nixos/modules/services/networking/dhcpcd.nix +++ b/nixos/modules/services/networking/dhcpcd.nix @@ -11,7 +11,7 @@ let # Don't start dhcpcd on explicitly configured interfaces or on # interfaces that are part of a bridge, bond or sit device. ignoredInterfaces = - map (i: i.name) (filter (i: i.ip4 != [ ]) (attrValues config.networking.interfaces)) + map (i: i.name) (filter (i: i.ip4 != [ ] || i.ipAddress != null) (attrValues config.networking.interfaces)) ++ mapAttrsToList (i: _: i) config.networking.sits ++ concatLists (attrValues (mapAttrs (n: v: v.interfaces) config.networking.bridges)) ++ concatLists (attrValues (mapAttrs (n: v: v.interfaces) config.networking.bonds)) diff --git a/nixos/modules/tasks/network-interfaces.nix b/nixos/modules/tasks/network-interfaces.nix index 054784502eb..ac3a55332e4 100644 --- a/nixos/modules/tasks/network-interfaces.nix +++ b/nixos/modules/tasks/network-interfaces.nix @@ -68,36 +68,48 @@ let ipAddress = mkOption { default = null; + example = "10.0.0.1"; + type = types.nullOr types.str; description = '' - Defunct, create an address in the ip4 list instead. + IP address of the interface. Leave empty to configure the + interface using DHCP. ''; }; prefixLength = mkOption { default = null; + example = 24; + type = types.nullOr types.int; description = '' - Defunct, supply the prefix length in the ip4 list instead. + Subnet mask of the interface, specified as the number of + bits in the prefix (24). ''; }; subnetMask = mkOption { default = null; description = '' - Defunct, supply the prefix length in the ip4 list instead. + Defunct, supply the prefix length instead. ''; }; ipv6Address = mkOption { default = null; + example = "2001:1470:fffd:2098::e006"; + type = types.nullOr types.str; description = '' - Defunct, create an address in the ip6 list instead. + IPv6 address of the interface. Leave empty to configure the + interface using NDP. ''; }; ipv6prefixLength = mkOption { - default = null; + default = 64; + example = 64; + type = types.int; description = '' - Defunct, supply the prefix length in the ip6 list instead. + Subnet mask of the interface, specified as the number of + bits in the prefix (64). ''; }; @@ -470,12 +482,8 @@ in assertions = flip map interfaces (i: { - assertion = i.ipAddress == null && i.prefixLength == null && i.subnetMask == null; - message = "The networking.interfaces.${i.name}.ipAddress option is defunct. Use networking.ip4 instead."; - }) - ++ flip map interfaces (i: { - assertion = i.ipv6Address == null && i.ipv6prefixLength == null; - message = "The networking.interfaces.${i.name}.ipv6Address option is defunct. Use networking.ip6 instead."; + assertion = i.subnetMask == null; + message = "The networking.interfaces.${i.name}.subnetMask option is defunct. Use prefixLength instead."; }); boot.kernelModules = [ ] @@ -574,7 +582,18 @@ in # network device, so it only gets started after the interface # has appeared, and it's stopped when the interface # disappears. - configureInterface = i: nameValuePair "${i.name}-cfg" + configureInterface = i: + let + ips = i.ip4 ++ optionals cfg.enableIPv6 i.ip6 + ++ optional (i.ipAddress != null) { + ipAddress = i.ipAddress; + prefixLength = i.prefixLength; + } ++ optional (cfg.enableIPv6 && i.ipv6Address != null) { + ipAddress = i.ipv6Address; + prefixLength = i.ipv6PrefixLength; + }; + in + nameValuePair "${i.name}-cfg" { description = "Configuration of ${i.name}"; wantedBy = [ "network-interfaces.target" ]; bindsTo = [ "sys-subsystem-net-devices-${i.name}.device" ]; @@ -606,7 +625,7 @@ in # useful when the Nix store is accessed via this # interface (e.g. in a QEMU VM test). '' - + flip concatMapStrings (i.ip4 ++ optionals cfg.enableIPv6 i.ip6) (ip: + + flip concatMapStrings (ips) (ip: let address = "${ip.address}/${toString ip.prefixLength}"; in @@ -622,7 +641,7 @@ in fi fi '') - + optionalString (i.ip4 != [ ] || (cfg.enableIPv6 && i.ip6 != [ ])) + + optionalString (ips != [ ]) '' if [ restart_network_setup = true ]; then # Ensure that the default gateway remains set. @@ -643,7 +662,7 @@ in '' echo "releasing configured ip's..." '' - + flip concatMapStrings (i.ip4 ++ optionals cfg.enableIPv6 i.ip6) (ip: + + flip concatMapStrings (ips) (ip: let address = "${ip.address}/${toString ip.prefixLength}"; in -- GitLab From 618f439d2e0c5b31b68f7ff31ce4f7409e596dc1 Mon Sep 17 00:00:00 2001 From: Florent Becker Date: Thu, 15 May 2014 11:02:32 +0200 Subject: [PATCH 575/843] Add a derivation for ocaml-text --- .../ocaml-modules/ocaml-text/default.nix | 26 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 28 insertions(+) create mode 100644 pkgs/development/ocaml-modules/ocaml-text/default.nix diff --git a/pkgs/development/ocaml-modules/ocaml-text/default.nix b/pkgs/development/ocaml-modules/ocaml-text/default.nix new file mode 100644 index 00000000000..08136dd2b10 --- /dev/null +++ b/pkgs/development/ocaml-modules/ocaml-text/default.nix @@ -0,0 +1,26 @@ +{stdenv, fetchurl, libiconv, ocaml, findlib, ncurses}: + +stdenv.mkDerivation { + name = "ocaml-text-0.6"; + + src = fetchurl { + url = https://forge.ocamlcore.org/frs/download.php/937/ocaml-text-0.6.tar.gz; + sha256 = "0j8gaak0ajnlmn8knvfygqwwzs7awjv5rfn5cbj6qxqbxhjd5m6g"; + }; + + buildInputs = [ocaml findlib libiconv ncurses]; + + configurePhase = "iconv_prefix=${libiconv} ocaml setup.ml -configure"; + + createFindlibDestdir = true; + + + meta = { + homepage = "http://ocaml-text.forge.ocamlcore.org/"; + description = "OCaml-Text is a library for dealing with ``text'', i.e. sequence of unicode characters, in a convenient way. "; + license = "BSD"; + platforms = ocaml.meta.platforms; + maintainers = [ + ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index dac177ecb86..c0c5a179ed4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3333,6 +3333,8 @@ let ocaml_ssl = callPackage ../development/ocaml-modules/ssl { }; + ocaml_text = callPackage ../development/ocaml-modules/ocaml-text { }; + ounit = callPackage ../development/ocaml-modules/ounit { }; ulex = callPackage ../development/ocaml-modules/ulex { }; -- GitLab From 59b1bd0607e74e20d6cc495bf0ffca16d2c32ab6 Mon Sep 17 00:00:00 2001 From: Florent Becker Date: Thu, 15 May 2014 14:08:15 +0200 Subject: [PATCH 576/843] Add myself to the maintainer list --- lib/maintainers.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 3de82db1cd9..0c71669a8ae 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -47,6 +47,7 @@ flosse = "Markus Kohlhase "; funfunctor = "Edward O'Callaghan "; fuuzetsu = "Mateusz Kowalczyk "; + gal_bolle = "Florent Becker "; garbas = "Rok Garbas "; goibhniu = "Cillian de Róiste "; guibert = "David Guibert "; -- GitLab From 337a3b821278b41952a4970f84ec740e4c00346b Mon Sep 17 00:00:00 2001 From: Florent Becker Date: Sat, 7 Jun 2014 21:33:04 +0200 Subject: [PATCH 577/843] Update ocaml-react to 1.1.0 --- pkgs/development/ocaml-modules/react/default.nix | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/pkgs/development/ocaml-modules/react/default.nix b/pkgs/development/ocaml-modules/react/default.nix index 6b0e694d54a..dfc8dcd1439 100644 --- a/pkgs/development/ocaml-modules/react/default.nix +++ b/pkgs/development/ocaml-modules/react/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, ocaml, findlib, opam}: stdenv.mkDerivation { - name = "ocaml-react-1.0.1"; + name = "ocaml-react-1.1.0"; src = fetchurl { - url = "http://erratique.ch/software/react/releases/react-1.0.1.tbz"; - sha256 = "007c9kzl0i6xvxnqj9jny4hgm28v9a1i079q53vl5hfb5f7h1mda"; + url = http://erratique.ch/software/react/releases/react-1.1.0.tbz; + sha256 = "1gymn8hy7ga0l9qymmb1jcnnkqvy7l2zr87xavzqz0dfi9ci8dm7"; }; unpackCmd = "tar xjf $src"; @@ -15,8 +15,13 @@ stdenv.mkDerivation { configurePhase = "ocaml pkg/git.ml"; buildPhase = "ocaml pkg/build.ml native=true native-dynlink=true"; - installPhase = '' + + installPhase = + let ocamlVersion = (builtins.parseDrvName (ocaml.name)).version; + in + '' opam-installer --script --prefix=$out react.install > install.sh + sed -i s!lib/react!lib/ocaml/${ocamlVersion}/site-lib/react! install.sh sh install.sh ''; @@ -25,6 +30,6 @@ stdenv.mkDerivation { description = "Applicative events and signals for OCaml"; license = licenses.bsd3; platforms = ocaml.meta.platforms; - maintainers = with maintainers; [ z77z vbmithr ]; + maintainers = with maintainers; [ z77z vbmithr gal_bolle]; }; } -- GitLab From 7e2766d6464d94d2afd97354b882e777b85d4e60 Mon Sep 17 00:00:00 2001 From: Florent Becker Date: Sat, 17 May 2014 20:01:45 +0200 Subject: [PATCH 578/843] Update ocaml_lwt to version 2.4.5 (from git) --- .../development/ocaml-modules/lwt/default.nix | 22 +++++++++++-------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/pkgs/development/ocaml-modules/lwt/default.nix b/pkgs/development/ocaml-modules/lwt/default.nix index 9ef10906365..10175a1dbb0 100644 --- a/pkgs/development/ocaml-modules/lwt/default.nix +++ b/pkgs/development/ocaml-modules/lwt/default.nix @@ -1,21 +1,25 @@ -{stdenv, fetchurl, which, cryptopp, ocaml, findlib, ocaml_react, ocaml_ssl}: +{stdenv, fetchgit, which, cryptopp, ocaml, findlib, ocaml_react, ocaml_ssl, libev, pkgconfig, ncurses, ocaml_oasis, ocaml_text, glib}: let - ocaml_version = (builtins.parseDrvName ocaml.name).version; - version = "2.1.1"; + version = "2.4.5"; in stdenv.mkDerivation { + + name = "ocaml-lwt-${version}"; - src = fetchurl { - url = "http://ocsigen.org/download/lwt-${version}.tar.gz"; - sha256 = "1zjn0sgihryshancn4kna1xslhc8gifliny1qd3a85f72xxxnw0w"; + src = fetchgit { + url = git://github.com/ocsigen/lwt; + rev = "refs/tags/${version}"; + sha256 = "2bbf4f216dd62eeb765a89413f3b2b6d417a9c289ca49d595bb4d7a0545e343e"; }; - buildInputs = [which cryptopp ocaml findlib ocaml_react ocaml_ssl]; + buildInputs = [ocaml_oasis pkgconfig which cryptopp ocaml findlib ocaml_react ocaml_ssl libev ncurses ocaml_text glib]; + + configureFlags = [ "--enable-all" ]; - configurePhase = "true"; + createFindlibDestdir = true; meta = { homepage = http://ocsigen.org/lwt; @@ -23,7 +27,7 @@ stdenv.mkDerivation { license = "LGPL"; platforms = ocaml.meta.platforms; maintainers = [ - stdenv.lib.maintainers.z77z + stdenv.lib.maintainers.z77z stdenv.lib.maintainers.gal_bolle ]; }; } -- GitLab From 892490726c75b7f80f66a1aac794e32a137f5755 Mon Sep 17 00:00:00 2001 From: Florent Becker Date: Fri, 18 Jul 2014 17:04:16 +0200 Subject: [PATCH 579/843] Use propagated inputs in lwt --- pkgs/development/ocaml-modules/lwt/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/ocaml-modules/lwt/default.nix b/pkgs/development/ocaml-modules/lwt/default.nix index 10175a1dbb0..061dbb398fe 100644 --- a/pkgs/development/ocaml-modules/lwt/default.nix +++ b/pkgs/development/ocaml-modules/lwt/default.nix @@ -15,7 +15,9 @@ stdenv.mkDerivation { sha256 = "2bbf4f216dd62eeb765a89413f3b2b6d417a9c289ca49d595bb4d7a0545e343e"; }; - buildInputs = [ocaml_oasis pkgconfig which cryptopp ocaml findlib ocaml_react ocaml_ssl libev ncurses ocaml_text glib]; + buildInputs = [ocaml_oasis pkgconfig which cryptopp ocaml findlib glib libev ncurses]; + + propagatedBuildInputs = [ ocaml_react ocaml_ssl ocaml_text ]; configureFlags = [ "--enable-all" ]; -- GitLab From edc11bc4f96754dff40da09ed3275acef756ff05 Mon Sep 17 00:00:00 2001 From: Florent Becker Date: Sun, 20 Jul 2014 18:21:14 +0200 Subject: [PATCH 580/843] add the 'zed' ocaml editor library --- .../development/ocaml-modules/zed/default.nix | 34 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 3 ++ 2 files changed, 37 insertions(+) create mode 100644 pkgs/development/ocaml-modules/zed/default.nix diff --git a/pkgs/development/ocaml-modules/zed/default.nix b/pkgs/development/ocaml-modules/zed/default.nix new file mode 100644 index 00000000000..3c2fae472be --- /dev/null +++ b/pkgs/development/ocaml-modules/zed/default.nix @@ -0,0 +1,34 @@ +{stdenv, fetchurl, ocaml, findlib, camomile, ocaml_react}: + +stdenv.mkDerivation rec { + version = "1.3"; + name = "ocaml-zed-${version}"; + + src = fetchurl { + url = https://github.com/diml/zed/archive/1.3.tar.gz; + sha256 = "1fr9xzf5msdnl2wx279aqj051nqbhs6v9aq1mfpv3r1mrqvrrfwj"; + }; + + buildInputs = [ ocaml findlib ocaml_react]; + + propagatedBuildInputs = [ camomile ]; + + createFindlibDestdir = true; + + meta = { + description = "Abstract engine for text edition in OCaml"; + longDescription = '' + Zed is an abstract engine for text edition. It can be used to write text editors, edition widgets, readlines, ... + + Zed uses Camomile to fully support the Unicode specification, and implements an UTF-8 encoded string type with validation, and a rope datastructure to achieve efficient operations on large Unicode buffers. Zed also features a regular expression search on ropes. + + To support efficient text edition capabilities, Zed provides macro recording and cursor management facilities. + ''; + homepage = https://github.com/diml/zed; + license = stdenv.lib.licenses.bsd3; + platforms = ocaml.meta.platforms; + maintainers = [ + stdenv.lib.maintainers.gal_bolle + ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c0c5a179ed4..e745da4f2dc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3370,6 +3370,9 @@ let yojson = callPackage ../development/ocaml-modules/yojson { }; zarith = callPackage ../development/ocaml-modules/zarith { }; + + zed = callPackage ../development/ocaml-modules/zed { }; + }; ocamlPackages = recurseIntoAttrs ocamlPackages_4_01_0; -- GitLab From 328469aa06539b6917bca1374ab9a621a0b0ed8a Mon Sep 17 00:00:00 2001 From: Florent Becker Date: Sun, 20 Jul 2014 18:22:16 +0200 Subject: [PATCH 581/843] add the ocaml 'lambda-term' library (terminal control) --- .../ocaml-modules/lambda-term/default.nix | 41 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 43 insertions(+) create mode 100644 pkgs/development/ocaml-modules/lambda-term/default.nix diff --git a/pkgs/development/ocaml-modules/lambda-term/default.nix b/pkgs/development/ocaml-modules/lambda-term/default.nix new file mode 100644 index 00000000000..b6edadb0b14 --- /dev/null +++ b/pkgs/development/ocaml-modules/lambda-term/default.nix @@ -0,0 +1,41 @@ +{stdenv, fetchurl, libev, ocaml, findlib, ocaml_lwt, ocaml_react, zed}: + +stdenv.mkDerivation rec { + version = "1.6"; + name = "lambda-term-${version}"; + + src = fetchurl { + url = https://github.com/diml/lambda-term/archive/1.6.tar.gz; + sha256 = "1rhfixdgpylxznf6sa9wr31wb4pjzpfn5mxhxqpbchmpl2afwa09"; + }; + + buildInputs = [ libev ocaml findlib ocaml_lwt ocaml_react ]; + + propagatedBuildInputs = [ zed ]; + + createFindlibDestdir = true; + + meta = { description = "Terminal manipulation library for OCaml"; + longDescription = '' + Lambda-term is a cross-platform library for + manipulating the terminal. It provides an abstraction for keys, + mouse events, colors, as well as a set of widgets to write + curses-like applications. + + The main objective of lambda-term is to provide a higher level + functional interface to terminal manipulation than, for example, + ncurses, by providing a native OCaml interface instead of bindings to + a C library. + + Lambda-term integrates with zed to provide text edition facilities in + console applications. + ''; + + homepage = https://github.com/diml/lambda-term; + license = stdenv.lib.licenses.bsd3; + platforms = ocaml.meta.platforms; + maintainers = [ + stdenv.lib.maintainers.gal_bolle + ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e745da4f2dc..ccb2b351b8c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3289,6 +3289,8 @@ let gtkmathview = callPackage ../development/libraries/gtkmathview { }; }; + lambdaTerm = callPackage ../development/ocaml-modules/lambda-term { }; + menhir = callPackage ../development/ocaml-modules/menhir { }; merlin = callPackage ../development/tools/ocaml/merlin { }; -- GitLab From d7b67d8cfad6f9021f2eacee4402d6bb51d18b7e Mon Sep 17 00:00:00 2001 From: Florent Becker Date: Sun, 20 Jul 2014 18:23:42 +0200 Subject: [PATCH 582/843] add utop (improved ocaml toplevel) --- pkgs/development/tools/ocaml/utop/default.nix | 46 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 48 insertions(+) create mode 100644 pkgs/development/tools/ocaml/utop/default.nix diff --git a/pkgs/development/tools/ocaml/utop/default.nix b/pkgs/development/tools/ocaml/utop/default.nix new file mode 100644 index 00000000000..1b99c4d4d43 --- /dev/null +++ b/pkgs/development/tools/ocaml/utop/default.nix @@ -0,0 +1,46 @@ +{stdenv, fetchurl, ocaml, findlib, lambdaTerm, ocaml_lwt, makeWrapper, + ocaml_react, camomile, zed +}: + +stdenv.mkDerivation rec { + version = "1.14"; + name = "utop-${version}"; + + src = fetchurl { + url = https://github.com/diml/utop/archive/1.14.tar.gz; + sha256 = "17dqinvdrpba2fjs7sl6gxs47rrx6j8a5bbjhc7flp6bdls898zk"; + }; + + buildInputs = [ ocaml findlib makeWrapper]; + + propagatedBuildInputs = [ lambdaTerm ocaml_lwt ]; + + createFindlibDestdir = true; + + buildPhase = '' + make + make doc + ''; + + postFixup = + let ocamlVersion = (builtins.parseDrvName (ocaml.name)).version; + in + '' + wrapProgram "$out"/bin/utop --set CAML_LD_LIBRARY_PATH "${ocaml_lwt}"/lib/ocaml/${ocamlVersion}/site-lib/lwt/:"${lambdaTerm}"/lib/ocaml/${ocamlVersion}/site-lib/lambda-term/:'$CAML_LD_LIBRARY_PATH' --set OCAMLPATH "${ocaml_lwt}"/lib/ocaml/${ocamlVersion}/site-lib:${ocaml_react}/lib/ocaml/${ocamlVersion}/site-lib:${camomile}/lib/ocaml/${ocamlVersion}/site-lib:${zed}/lib/ocaml/${ocamlVersion}/site-lib:${lambdaTerm}/lib/ocaml/${ocamlVersion}/site-lib:"$out"/lib/ocaml/${ocamlVersion}/site-lib:'$OCAMLPATH' + ''; + + meta = { + description = "Universal toplevel for OCaml"; + longDescription = '' + utop is an improved toplevel for OCaml. It can run in a terminal or in Emacs. It supports line edition, history, real-time and context sensitive completion, colors, and more. + + It integrates with the tuareg mode in Emacs. + ''; + homepage = https://github.com/diml/utop; + license = stdenv.lib.licenses.bsd3; + platforms = ocaml.meta.platforms; + maintainers = [ + stdenv.lib.maintainers.gal_bolle + ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ccb2b351b8c..0a92e8ef1e8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3362,6 +3362,8 @@ let opam_1_1 = callPackage ../development/tools/ocaml/opam/1.1.nix { }; opam = opam_1_1; + utop = callPackage ../development/tools/ocaml/utop { }; + sawja = callPackage ../development/ocaml-modules/sawja { }; uucd = callPackage ../development/ocaml-modules/uucd { }; -- GitLab From a111e7ff08b116db5943babaa6236bde0cdc92c0 Mon Sep 17 00:00:00 2001 From: Longrin Wischnewski Date: Sat, 30 Aug 2014 19:14:35 +0200 Subject: [PATCH 583/843] texlive: Updated to latest release 2014.20140821 --- pkgs/tools/typesetting/tex/texlive/default.nix | 8 ++++---- pkgs/tools/typesetting/tex/texlive/extra.nix | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/typesetting/tex/texlive/default.nix b/pkgs/tools/typesetting/tex/texlive/default.nix index c2840fd843f..beb6a7f3a68 100644 --- a/pkgs/tools/typesetting/tex/texlive/default.nix +++ b/pkgs/tools/typesetting/tex/texlive/default.nix @@ -5,16 +5,16 @@ rec { sha256 = "0nh8hfayyf60nm4z8zyclrbc3792c62azgsvrwxnl28iq223200s"; }; - texmfVersion = "2014.20140717"; + texmfVersion = "2014.20140821"; texmfSrc = fetchurl { url = "mirror://debian/pool/main/t/texlive-base/texlive-base_${texmfVersion}.orig.tar.xz"; - sha256 = "08vhl6x742r8fl0gags2r6yspz8ynvz26vdjrqb4vyz5h7h3rzc9"; + sha256 = "02qkzlhb381sybs970fgpc94nhx4jm0l3j5pv8z48l11415lvm9b"; }; - langTexmfVersion = "2014.20140717"; + langTexmfVersion = "2014.20140821"; langTexmfSrc = fetchurl { url = "mirror://debian/pool/main/t/texlive-lang/texlive-lang_${langTexmfVersion}.orig.tar.xz"; - sha256 = "1x9aa3v2cg4lcb58lwksnfdsgrhi0sg968pjqsbndmbxhr1msbp7"; + sha256 = "075avhhhhzw5pbd19q659rn23rws15b5hv7nv0grd93vn3vfwdcy"; }; passthru = { inherit texmfSrc langTexmfSrc; }; diff --git a/pkgs/tools/typesetting/tex/texlive/extra.nix b/pkgs/tools/typesetting/tex/texlive/extra.nix index 4644ee3e50e..f47fedd927d 100644 --- a/pkgs/tools/typesetting/tex/texlive/extra.nix +++ b/pkgs/tools/typesetting/tex/texlive/extra.nix @@ -1,11 +1,11 @@ args: with args; rec { name = "texlive-extra-2014"; - version = "2014.20140717"; + version = "2014.20140821"; src = fetchurl { url = "mirror://debian/pool/main/t/texlive-extra/texlive-extra_${version}.orig.tar.xz"; - sha256 = "1khxqdq9gagm6z8kbpjbraysfzibfjs2cgbrhjpncbd24sxpw13q"; + sha256 = "1y3w8bgp85s90ng2y5dw9chrrvvdf7ibb6ynss8kycvgc0y4m6b3"; }; buildInputs = [texLive xz]; -- GitLab From c40a25654862311e757098bf7fbb9d308a9b9bd3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= Date: Mon, 25 Aug 2014 23:43:14 +0200 Subject: [PATCH 584/843] Add processing: A language and IDE for electronic arts (cherry picked from commit 0db6387d1c3a8a8f7a9a1e111532d8acd1f794d6) --- .../graphics/processing/default.nix | 36 ++++++++ .../graphics/processing/use-nixpkgs-jre.patch | 88 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 3 files changed, 126 insertions(+) create mode 100644 pkgs/applications/graphics/processing/default.nix create mode 100644 pkgs/applications/graphics/processing/use-nixpkgs-jre.patch diff --git a/pkgs/applications/graphics/processing/default.nix b/pkgs/applications/graphics/processing/default.nix new file mode 100644 index 00000000000..516068b4ea5 --- /dev/null +++ b/pkgs/applications/graphics/processing/default.nix @@ -0,0 +1,36 @@ +{ fetchurl, stdenv, ant, jre, makeWrapper, libXxf86vm }: + +stdenv.mkDerivation rec { + name = "processing-${version}"; + version = "2.2.1"; + + src = fetchurl { + url = "https://github.com/processing/processing/archive/processing-0227-${version}.tar.gz"; + sha256 = "1r8q5y0h4gpqap5jwkspc0li6566hzx5chr7hwrdn8mxlzsm50xk"; + }; + + # Stop it trying to download its own version of java + patches = [ ./use-nixpkgs-jre.patch ]; + + buildInputs = [ ant jre makeWrapper libXxf86vm ]; + + buildPhase = "cd build && ant build"; + + installPhase = '' + mkdir -p $out/bin + cp -r linux/work/* $out/ + rm $out/processing-java + sed -e "s#APPDIR=\`dirname \"\$APPDIR\"\`#APPDIR=$out#" -i $out/processing + mv $out/processing $out/bin/ + wrapProgram $out/bin/processing --prefix PATH : ${jre}/bin --prefix LD_LIBRARY_PATH : ${libXxf86vm}/lib + mkdir $out/java + ln -s ${jre}/bin $out/java/ + ''; + + meta = with stdenv.lib; { + description = "A language and IDE for electronic arts"; + homepage = http://processing.org; + maintainers = [ maintainers.goibhniu ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/applications/graphics/processing/use-nixpkgs-jre.patch b/pkgs/applications/graphics/processing/use-nixpkgs-jre.patch new file mode 100644 index 00000000000..8f6a5e2018e --- /dev/null +++ b/pkgs/applications/graphics/processing/use-nixpkgs-jre.patch @@ -0,0 +1,88 @@ +From d1fb63255ff028ecc9cc66d5a6b21b24031b4b4a Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= +Date: Tue, 26 Aug 2014 00:07:58 +0200 +Subject: [PATCH] patch + +--- + build/build.xml | 42 +++++++++++++++++++++--------------------- + 1 file changed, 21 insertions(+), 21 deletions(-) + +diff --git a/build/build.xml b/build/build.xml +index 4d0f0b2..c3f5c09 100755 +--- a/build/build.xml ++++ b/build/build.xml +@@ -640,10 +640,11 @@ + value="jre-tools-6u37-linux${sun.arch.data.model}.tgz" /> + --> + ++ + +- ++ + + +- +- +- ++ ++ ++ + + +- +- +- +- +- +- +- ++ ++ ++ ++ ++ ++ + + +- +- +- +- +- +- +- +- +- ++ ++ ++ ++ ++ ++ ++ ++ ++ + + + +-- +2.1.0 + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0a92e8ef1e8..3d67650ebe5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9576,6 +9576,8 @@ let qiv = callPackage ../applications/graphics/qiv { }; + processing = callPackage ../applications/graphics/processing { inherit (xorg) libXxf86vm; }; + # perhaps there are better apps for this task? It's how I had configured my preivous system. # And I don't want to rewrite all rules procmail = callPackage ../applications/misc/procmail { }; -- GitLab From ef9c1d612dab8e2ea7be6e7c6f99f0ce3a7f9bba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= Date: Sat, 30 Aug 2014 19:53:47 +0200 Subject: [PATCH 585/843] processing: add license --- pkgs/applications/graphics/processing/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/graphics/processing/default.nix b/pkgs/applications/graphics/processing/default.nix index 516068b4ea5..ce3d639d1a3 100644 --- a/pkgs/applications/graphics/processing/default.nix +++ b/pkgs/applications/graphics/processing/default.nix @@ -30,6 +30,7 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "A language and IDE for electronic arts"; homepage = http://processing.org; + license = licenses.gpl2Plus; maintainers = [ maintainers.goibhniu ]; platforms = platforms.linux; }; -- GitLab From 704e91bab005eabe968a3b140222fb0cf7afd4db Mon Sep 17 00:00:00 2001 From: Rickard Nilsson Date: Sat, 30 Aug 2014 19:54:09 +0200 Subject: [PATCH 586/843] Fix syntax error in nixos/lib/build-vms.nix, introduced by 86c0f8c --- nixos/lib/build-vms.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/lib/build-vms.nix b/nixos/lib/build-vms.nix index ba189555409..50b3b424166 100644 --- a/nixos/lib/build-vms.nix +++ b/nixos/lib/build-vms.nix @@ -52,7 +52,7 @@ rec { [ { address = "192.168.${toString first}.${toString m.second}"; prefixLength = 24; } ]; - } + }); in { key = "ip-address"; config = -- GitLab From d0fbe1e8bd2b8ce3ddeefd03573c7d64632d6b29 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= Date: Sat, 30 Aug 2014 19:58:12 +0200 Subject: [PATCH 587/843] suil: update from 0.8.0 to 0.8.2 --- pkgs/development/libraries/audio/suil/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/audio/suil/default.nix b/pkgs/development/libraries/audio/suil/default.nix index 87e03472659..f5a98750ded 100644 --- a/pkgs/development/libraries/audio/suil/default.nix +++ b/pkgs/development/libraries/audio/suil/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "suil-${version}"; - version = "0.8.0"; + version = "0.8.2"; src = fetchurl { url = "http://download.drobilla.net/${name}.tar.bz2"; - sha256 = "0y5sbgaivb03vmr3jcpzj16wqxa5h744ml4w3ylzglbxs2bqgl7n"; + sha256 = "1s3adyiw7sa5gfvm5wasa61qa23629kprxyv6w8hbxdiwp0hhxkq"; }; buildInputs = [ gtk lv2 pkgconfig python qt4 serd sord sratom ]; -- GitLab From 8eee0eaef4744b50eef82c001b616565e2eab61f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= Date: Sat, 30 Aug 2014 19:58:24 +0200 Subject: [PATCH 588/843] sord: update from 0.12.0 to 0.12.2 --- pkgs/development/libraries/sord/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/sord/default.nix b/pkgs/development/libraries/sord/default.nix index 8f122cb699a..96a19bf37cc 100644 --- a/pkgs/development/libraries/sord/default.nix +++ b/pkgs/development/libraries/sord/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "sord-${version}"; - version = "0.12.0"; + version = "0.12.2"; src = fetchurl { url = "http://download.drobilla.net/${name}.tar.bz2"; - sha256 = "1f0wz7ynnk72hyr4jfi0lgvj90ld2va1kig8fkw30s8b903alsqj"; + sha256 = "0rq7vafdv4vsxi6xk9zf5shr59w3kppdhqbj78185rz5gp9kh1dx"; }; buildInputs = [ pkgconfig python serd ]; -- GitLab From 455e0e0673d195e8bd67f0461208d6160ba810ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= Date: Sat, 30 Aug 2014 19:58:37 +0200 Subject: [PATCH 589/843] serd: update from 0.18.2 to 0.20.0 --- pkgs/development/libraries/serd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/serd/default.nix b/pkgs/development/libraries/serd/default.nix index 2fd5c9ad493..c0935bd33fd 100644 --- a/pkgs/development/libraries/serd/default.nix +++ b/pkgs/development/libraries/serd/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "serd-${version}"; - version = "0.18.2"; + version = "0.20.0"; src = fetchurl { url = "http://download.drobilla.net/${name}.tar.bz2"; - sha256 = "1hgajhm4iar4n2kh71pv6yr0yhipj28kds9y5mbig8izqc188gcf"; + sha256 = "1gxbzqsm212wmn8qkdd3lbl6wbv7fwmaf9qh2nxa4yxjbr7mylb4"; }; buildInputs = [ pcre pkgconfig python ]; -- GitLab From 9f1abe6b59b4a3d2d3435c2be48fd7f28b48d8d1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= Date: Sat, 30 Aug 2014 19:58:59 +0200 Subject: [PATCH 590/843] python34Packages.zope_testrunner: update from 4.4.1 to 4.4.3 --- pkgs/top-level/python-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 174fde47f2e..fa035b38964 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9673,11 +9673,11 @@ rec { zope_testrunner = buildPythonPackage rec { name = "zope.testrunner-${version}"; - version = "4.4.1"; + version = "4.4.3"; src = fetchurl { url = "http://pypi.python.org/packages/source/z/zope.testrunner/${name}.zip"; - md5 = "1d689abad000419891494b30dd7d8190"; + sha256 = "1dwk35kg0bmj2lzp4fd2bgp6dv64q5sda09bf0y8j63y53vqbsw8"; }; propagatedBuildInputs = [ zope_interface zope_exceptions zope_testing six ] ++ optional (!python.is_py3k or false) subunit; -- GitLab From 465e5fa21aad1247bbf7279a801f16cd37008259 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= Date: Sat, 30 Aug 2014 19:59:14 +0200 Subject: [PATCH 591/843] python34Packages.zope_size: update from 3.4.1 to 3.5.0 --- pkgs/top-level/python-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index fa035b38964..e97429c26b1 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9613,11 +9613,11 @@ rec { zope_size = buildPythonPackage rec { - name = "zope.size-3.4.1"; + name = "zope.size-3.5.0"; src = fetchurl { url = "http://pypi.python.org/packages/source/z/zope.size/${name}.tar.gz"; - md5 = "55d9084dfd9dcbdb5ad2191ceb5ed03d"; + sha256 = "006xfkhvmypwd3ww9gbba4zly7n9w30bpp1h74d53la7l7fiqk2f"; }; propagatedBuildInputs = [ zope_i18nmessageid zope_interface ]; -- GitLab From f6a529aa5105b45f4b6ed5a74ed05293bfdd23da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= Date: Sat, 30 Aug 2014 19:59:28 +0200 Subject: [PATCH 592/843] python34Packages.zope_schema: update from 4.2.2 to 4.4.1 --- pkgs/top-level/python-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e97429c26b1..ad4a414c373 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9578,11 +9578,11 @@ rec { zope_schema = buildPythonPackage rec { - name = "zope.schema-4.2.2"; + name = "zope.schema-4.4.1"; src = fetchurl { url = "http://pypi.python.org/packages/source/z/zope.schema/${name}.tar.gz"; - md5 = "e7e581af8193551831560a736a53cf58"; + sha256 = "0wpwfggd736ai8bbrwbsnqf522sh5j57d1zxq8m8p6i5nwml0q02"; }; propagatedBuildInputs = [ zope_location zope_event zope_interface zope_testing ] ++ optional isPy26 ordereddict; -- GitLab From 8c290a64a78377df2820ba5a4175802bd7ca212f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= Date: Sat, 30 Aug 2014 20:00:02 +0200 Subject: [PATCH 593/843] python34Packages.zope_location: update from 4.0.0 to 4.0.3 --- pkgs/top-level/python-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ad4a414c373..8834f24b47a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9521,11 +9521,11 @@ rec { zope_location = buildPythonPackage rec { - name = "zope.location-4.0.0"; + name = "zope.location-4.0.3"; src = fetchurl { - url = "http://pypi.python.org/packages/source/z/zope.location/zope.location-4.0.0.tar.gz"; - md5 = "cd0e10d5923c95e352bcde505cc11324"; + url = "http://pypi.python.org/packages/source/z/zope.location/zope.location-4.0.3.tar.gz"; + sha256 = "1nj9da4ksiyv3h8n2vpzwd0pb03mdsh7zy87hfpx72b6p2zcwg74"; }; propagatedBuildInputs = [ zope_proxy ]; -- GitLab From 297e9a0e52433e21e20c34067b17dc422d5307f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= Date: Sat, 30 Aug 2014 20:00:16 +0200 Subject: [PATCH 594/843] python34Packages.zope_lifecycleevent: update from 3.6.2 to 3.7.0 --- pkgs/top-level/python-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 8834f24b47a..58e4ed604d5 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9505,11 +9505,11 @@ rec { zope_lifecycleevent = buildPythonPackage rec { - name = "zope.lifecycleevent-3.6.2"; + name = "zope.lifecycleevent-3.7.0"; src = fetchurl { url = "http://pypi.python.org/packages/source/z/zope.lifecycleevent/${name}.tar.gz"; - md5 = "3ba978f3ba7c0805c81c2c79ea3edb33"; + sha256 = "0s5brphqzzz89cykg61gy7zcmz0ryq1jj2va7gh2n1b3cccllp95"; }; propagatedBuildInputs = [ zope_event zope_component ]; -- GitLab From 0b6613e1b60d28715526aa783c85dade7fe3a3e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= Date: Sat, 30 Aug 2014 20:00:45 +0200 Subject: [PATCH 595/843] python34Packages.zope_i18nmessageid: update from 4.0.2 to 4.0.3 --- pkgs/top-level/python-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 58e4ed604d5..253f0d6d2db 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9491,11 +9491,11 @@ rec { zope_i18nmessageid = buildPythonPackage rec { - name = "zope.i18nmessageid-4.0.2"; + name = "zope.i18nmessageid-4.0.3"; src = fetchurl { - url = "http://pypi.python.org/packages/source/z/zope.i18nmessageid/zope.i18nmessageid-4.0.2.tar.gz"; - md5 = "c4550f7a0b4a736186e6e0fa3b2471f7"; + url = "http://pypi.python.org/packages/source/z/zope.i18nmessageid/zope.i18nmessageid-4.0.3.tar.gz"; + sha256 = "1rslyph0klk58dmjjy4j0jxy21k03azksixc3x2xhqbkv97cmzml"; }; meta = { -- GitLab From 45d9d2a8b5ce82a33c1164ce5ffdbd65f0e30e50 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= Date: Sat, 30 Aug 2014 20:00:54 +0200 Subject: [PATCH 596/843] python34Packages.zope_i18n: update from 3.7.4 to 3.8.0 --- pkgs/top-level/python-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 253f0d6d2db..d959fc2eca3 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9475,11 +9475,11 @@ rec { zope_i18n = buildPythonPackage rec { - name = "zope.i18n-3.7.4"; + name = "zope.i18n-3.8.0"; src = fetchurl { url = "http://pypi.python.org/packages/source/z/zope.i18n/${name}.tar.gz"; - md5 = "a6fe9d9ad53dd7e94e87cd58fb67d3b7"; + sha256 = "045nnimmshibcq71yym2d8yrs6wzzhxq5gl7wxjnkpyjm5y0hfkm"; }; propagatedBuildInputs = [ pytz zope_component ]; -- GitLab From 7acf9a0c1c981d07a14c32aa777ba30da1d86dc9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= Date: Sat, 30 Aug 2014 20:01:02 +0200 Subject: [PATCH 597/843] python34Packages.zope_event: update from 4.0.2 to 4.0.3 --- pkgs/top-level/python-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d959fc2eca3..8266c6f1a24 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9422,11 +9422,11 @@ rec { zope_event = buildPythonPackage rec { name = "zope.event-${version}"; - version = "4.0.2"; + version = "4.0.3"; src = fetchurl { url = "http://pypi.python.org/packages/source/z/zope.event/${name}.tar.gz"; - md5 = "e08dd299d428d77a1cfcbfe841b81872"; + sha256 = "1w858k9kmgzfj36h65kp27m9slrmykvi5cjq6c119xqnaz5gdzgm"; }; meta = { -- GitLab From 65ef87293ae36e9a42d7ddb1d3169f926f10e08c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= Date: Sat, 30 Aug 2014 20:01:11 +0200 Subject: [PATCH 598/843] python34Packages.zope_configuration: update from 4.0.2 to 4.0.3 --- pkgs/top-level/python-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 8266c6f1a24..472dfee2f08 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9355,11 +9355,11 @@ rec { zope_configuration = buildPythonPackage rec { - name = "zope.configuration-4.0.2"; + name = "zope.configuration-4.0.3"; src = fetchurl { - url = "http://pypi.python.org/packages/source/z/zope.configuration/zope.configuration-4.0.2.tar.gz"; - md5 = "40b3c7ad0b748ede532d8cfe2544e44e"; + url = "http://pypi.python.org/packages/source/z/zope.configuration/zope.configuration-4.0.3.tar.gz"; + sha256 = "1x9dfqypgympnlm25p9m43xh4qv3p7d75vksv9pzqibrb4cggw5n"; }; propagatedBuildInputs = [ zope_i18nmessageid zope_schema ]; -- GitLab From c701503a4b86ce02f5468d8c5715d4c88a062a28 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= Date: Sat, 30 Aug 2014 20:01:19 +0200 Subject: [PATCH 599/843] python34Packages.zope_component: update from 4.0.2 to 4.2.1 --- pkgs/top-level/python-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 472dfee2f08..21a7064516e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9333,11 +9333,11 @@ rec { zope_component = buildPythonPackage rec { - name = "zope.component-4.0.2"; + name = "zope.component-4.2.1"; src = fetchurl { - url = "http://pypi.python.org/packages/source/z/zope.component/zope.component-4.0.2.tar.gz"; - md5 = "8c2fd4414ca23cbbe014dcaf911acebc"; + url = "http://pypi.python.org/packages/source/z/zope.component/zope.component-4.2.1.tar.gz"; + sha256 = "1gzbr0j6c2h0cqnpi2cjss38wrz1bcwx8xahl3vykgz5laid15l6"; }; propagatedBuildInputs = [ -- GitLab From b96574ff157947ec0a375eef9e5e618f3dd2c918 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= Date: Sat, 30 Aug 2014 20:01:28 +0200 Subject: [PATCH 600/843] python34Packages.zope_browser: update from 1.3 to 2.0.2 --- pkgs/top-level/python-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 21a7064516e..4467d58456a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9299,11 +9299,11 @@ rec { zope_browser = buildPythonPackage rec { - name = "zope.browser-1.3"; + name = "zope.browser-2.0.2"; src = fetchurl { url = "http://pypi.python.org/packages/source/z/zope.browser/${name}.zip"; - md5 = "4ff0ddbf64c45bfcc3189e35f4214ded"; + sha256 = "0f9r5rn9lzgi4hvkhgb6vgw8kpz9sv16jsfb9ws4am8gbqcgv2iy"; }; propagatedBuildInputs = [ zope_interface ]; -- GitLab From 6aa23db35dfdbb5101381729b6726e97b64cf5cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= Date: Sat, 30 Aug 2014 20:01:40 +0200 Subject: [PATCH 601/843] python27Packages.rope: update from 0.9.4 to 0.10.2 --- pkgs/top-level/python-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 4467d58456a..551c3e45890 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7286,14 +7286,14 @@ rec { rope = buildPythonPackage rec { - version = "0.9.4"; + version = "0.10.2"; name = "rope-${version}"; disabled = isPy3k; src = fetchurl { url = "http://pypi.python.org/packages/source/r/rope/${name}.tar.gz"; - sha256 = "1fm6ahff50b10mlnc0ar4x1fv9sxmcp1g651myyqy7c50hk39h1d"; + sha256 = "0rdlvp8h74qs49wz1hx6qy8mgp2ddwlfs7z13h9139ynq04a3z7z"; }; meta = with stdenv.lib; { -- GitLab From 4fe89ae412f1dee451a73d8d476cd25957c2c66c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= Date: Sat, 30 Aug 2014 20:02:16 +0200 Subject: [PATCH 602/843] lilv: update from 0.18.0 to 0.20.0 --- pkgs/development/libraries/audio/lilv/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/audio/lilv/default.nix b/pkgs/development/libraries/audio/lilv/default.nix index d1510e34238..9f3307742ec 100644 --- a/pkgs/development/libraries/audio/lilv/default.nix +++ b/pkgs/development/libraries/audio/lilv/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "lilv-${version}"; - version = "0.18.0"; + version = "0.20.0"; src = fetchurl { url = "http://download.drobilla.net/${name}.tar.bz2"; - sha256 = "1k9wfc08ylgbkwbnvh1fx1bdzl3y59xrrx8gv0vk68yzcvcmv6am"; + sha256 = "0aj2plkx56iar8vzjbq2l7hi7sp0ml99m0h44rgwai2x4vqkk2j2"; }; buildInputs = [ lv2 pkgconfig python serd sord sratom ]; -- GitLab From 33949a413c4f4ae773876ccba9036db8a694cae7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Sat, 30 Aug 2014 20:43:31 +0200 Subject: [PATCH 603/843] python34: include a patch to fix http://bugs.python.org/issue21121 --- .../interpreters/python/3.4/default.nix | 2 + .../python/3.4/issue21121-3.patch | 86 +++++++++++++++++++ 2 files changed, 88 insertions(+) create mode 100644 pkgs/development/interpreters/python/3.4/issue21121-3.patch diff --git a/pkgs/development/interpreters/python/3.4/default.nix b/pkgs/development/interpreters/python/3.4/default.nix index 3477cedf4b7..312bf247de7 100644 --- a/pkgs/development/interpreters/python/3.4/default.nix +++ b/pkgs/development/interpreters/python/3.4/default.nix @@ -36,6 +36,8 @@ stdenv.mkDerivation { NIX_LDFLAGS = stdenv.lib.optionalString stdenv.isLinux "-lgcc_s"; + patches = [ ./issue21121-3.patch ]; + preConfigure = '' for i in /usr /sw /opt /pkg; do # improve purity substituteInPlace ./setup.py --replace $i /no-such-path diff --git a/pkgs/development/interpreters/python/3.4/issue21121-3.patch b/pkgs/development/interpreters/python/3.4/issue21121-3.patch new file mode 100644 index 00000000000..506d9ea9b3d --- /dev/null +++ b/pkgs/development/interpreters/python/3.4/issue21121-3.patch @@ -0,0 +1,86 @@ +diff --git a/Makefile.pre.in b/Makefile.pre.in +--- a/Makefile.pre.in ++++ b/Makefile.pre.in +@@ -71,12 +71,17 @@ + BASECFLAGS= @BASECFLAGS@ + BASECPPFLAGS= @BASECPPFLAGS@ + CONFIGURE_CFLAGS= @CFLAGS@ ++# CFLAGS_NODIST is used for building the interpreter and stdlib C extensions. ++# Use it when a compiler flag should _not_ be part of the distutils CFLAGS ++# once Python is installed (Issue #21121). ++CONFIGURE_CFLAGS_NODIST=@CFLAGS_NODIST@ + CONFIGURE_CPPFLAGS= @CPPFLAGS@ + CONFIGURE_LDFLAGS= @LDFLAGS@ + # Avoid assigning CFLAGS, LDFLAGS, etc. so users can use them on the + # command line to append to these values without stomping the pre-set + # values. + PY_CFLAGS= $(BASECFLAGS) $(OPT) $(CONFIGURE_CFLAGS) $(CFLAGS) $(EXTRA_CFLAGS) ++PY_CFLAGS_NODIST=$(CONFIGURE_CFLAGS_NODIST) $(CFLAGS_NODIST) + # Both CPPFLAGS and LDFLAGS need to contain the shell's value for setup.py to + # be able to build extension modules using the directories specified in the + # environment variables +@@ -91,7 +96,7 @@ + # Extra C flags added for building the interpreter object files. + CFLAGSFORSHARED=@CFLAGSFORSHARED@ + # C flags used for building the interpreter object files +-PY_CORE_CFLAGS= $(PY_CFLAGS) $(PY_CPPFLAGS) $(CFLAGSFORSHARED) -DPy_BUILD_CORE ++PY_CORE_CFLAGS= $(PY_CFLAGS) $(PY_CFLAGS_NODIST) $(PY_CPPFLAGS) $(CFLAGSFORSHARED) -DPy_BUILD_CORE + + + # Machine-dependent subdirectories +diff --git a/configure b/configure +--- a/configure ++++ b/configure +@@ -662,6 +662,7 @@ + LIBTOOL_CRUFT + OTHER_LIBTOOL_OPT + UNIVERSAL_ARCH_FLAGS ++CFLAGS_NODIST + BASECFLAGS + OPT + ABIFLAGS +@@ -6504,7 +6505,7 @@ + + if test $ac_cv_declaration_after_statement_warning = yes + then +- BASECFLAGS="$BASECFLAGS -Werror=declaration-after-statement" ++ CFLAGS_NODIST="$CFLAGS_NODIST -Werror=declaration-after-statement" + fi + + # if using gcc on alpha, use -mieee to get (near) full IEEE 754 +diff --git a/configure.ac b/configure.ac +--- a/configure.ac ++++ b/configure.ac +@@ -1147,6 +1147,7 @@ + fi + + AC_SUBST(BASECFLAGS) ++AC_SUBST(CFLAGS_NODIST) + + # The -arch flags for universal builds on OSX + UNIVERSAL_ARCH_FLAGS= +@@ -1231,7 +1232,7 @@ + + if test $ac_cv_declaration_after_statement_warning = yes + then +- BASECFLAGS="$BASECFLAGS -Werror=declaration-after-statement" ++ CFLAGS_NODIST="$CFLAGS_NODIST -Werror=declaration-after-statement" + fi + + # if using gcc on alpha, use -mieee to get (near) full IEEE 754 +diff --git a/setup.py b/setup.py +--- a/setup.py ++++ b/setup.py +@@ -19,6 +19,12 @@ + + cross_compiling = "_PYTHON_HOST_PLATFORM" in os.environ + ++# Add special CFLAGS reserved for building the interpreter and the stdlib ++# modules (Issue #21121). ++cflags = sysconfig.get_config_var('CFLAGS') ++py_cflags_nodist = sysconfig.get_config_var('PY_CFLAGS_NODIST') ++sysconfig.get_config_vars()['CFLAGS'] = cflags + ' ' + py_cflags_nodist ++ + def get_platform(): + # cross build + if "_PYTHON_HOST_PLATFORM" in os.environ: -- GitLab From b8fca7b38c38fe28dc8bfe3d3e566581f296e03a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Sat, 30 Aug 2014 21:08:49 +0200 Subject: [PATCH 604/843] koji: factor python module into an standalone app --- .../tools/package-management/koji/default.nix | 21 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ pkgs/top-level/python-packages.nix | 19 ----------------- 3 files changed, 23 insertions(+), 19 deletions(-) create mode 100644 pkgs/tools/package-management/koji/default.nix diff --git a/pkgs/tools/package-management/koji/default.nix b/pkgs/tools/package-management/koji/default.nix new file mode 100644 index 00000000000..7f03ed1625e --- /dev/null +++ b/pkgs/tools/package-management/koji/default.nix @@ -0,0 +1,21 @@ +{ stdenv, fetchurl, pythonPackages, python }: + +stdenv.mkDerivation rec { + name = "koji-1.8"; + + src = fetchurl { + url = "https://fedorahosted.org/released/koji/koji-1.8.0.tar.bz2"; + sha256 = "10dph209h4jgajb5jmbjhqy4z4hd22i7s2d93vm3ikdf01i8iwf1"; + }; + + propagatedBuildInputs = [ pythonPackages.pycurl python ]; + + makeFlags = "DESTDIR=$(out)"; + + postInstall = '' + cp -R $out/nix/store/*/* $out/ + rm -rf $out/nix + ''; + + meta.maintainers = [ stdenv.lib.maintainers.mornfall ]; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3d67650ebe5..3d3e462f82f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9123,6 +9123,8 @@ let inherit (gnome) libglade; }; + koji = callPackage ../tools/package-management/koji { }; + lame = callPackage ../applications/audio/lame { }; larswm = callPackage ../applications/window-managers/larswm { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 551c3e45890..ec224fec54a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2260,25 +2260,6 @@ rec { }; }; - # TODO: this shouldn't use a buildPythonPackage - koji = buildPythonPackage (rec { - name = "koji-1.8"; - meta.maintainers = [ stdenv.lib.maintainers.mornfall ]; - disabled = isPy3k; - - src = fetchurl { - url = "https://fedorahosted.org/released/koji/koji-1.8.0.tar.bz2"; - sha256 = "10dph209h4jgajb5jmbjhqy4z4hd22i7s2d93vm3ikdf01i8iwf1"; - }; - - configurePhase = ":"; - buildPhase = ":"; - installPhase = "make install DESTDIR=$out/ && cp -R $out/nix/store/*/* $out/ && rm -rf $out/nix"; - doCheck = false; - propagatedBuildInputs = [ pythonPackages.pycurl ]; - - }); - logilab_astng = buildPythonPackage rec { name = "logilab-astng-0.24.3"; -- GitLab From 1e06594c0c70f618887e1ddaba35b4e165b448d5 Mon Sep 17 00:00:00 2001 From: Patrick Mahoney Date: Wed, 30 Apr 2014 09:54:35 -0500 Subject: [PATCH 605/843] mariadb: Patch to compile on OS X. * perl is required at build time on darwin. Copied from the mysql/5.5.x.nix * CMake on darwin creates shared libraries with relative 'install_name' paths which are made absolute by fixDarwinDylibNames. See http://answers.opencv.org/question/4134/cmake-install_name_tool-absolute-path-for-library/ * The asm patch was needed to compile on darwin, though I do not understand what is going on. Error before the patch: [ 15%] Building C object mysys/CMakeFiles/mysys.dir/my_context.c.o .../nix-build-mariadb-10.0.13.drv-1/mariadb-10.0.13/mysys/my_context.c:207:Unknown pseudo-op: .cfi_escape .../nix-build-mariadb-10.0.13.drv-1/mariadb-10.0.13/mysys/my_context.c:207:Rest of line ignored. 1st junk character valued 48 (0). make[2]: *** [mysys/CMakeFiles/mysys.dir/my_context.c.o] Error 1 --- pkgs/servers/sql/mariadb/default.nix | 17 +++++++++++++++-- pkgs/servers/sql/mariadb/my_context_asm.patch | 18 ++++++++++++++++++ 2 files changed, 33 insertions(+), 2 deletions(-) create mode 100644 pkgs/servers/sql/mariadb/my_context_asm.patch diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index bb0c0bc8da8..0efdd542fa4 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, cmake, ncurses, openssl, bison, boost, libxml2, libaio, judy, libevent, groff }: +{ stdenv, fetchurl, cmake, ncurses, openssl, bison, boost, libxml2, libaio, judy, libevent, groff, perl, fixDarwinDylibNames }: stdenv.mkDerivation rec { name = "mariadb-${version}"; @@ -9,12 +9,25 @@ stdenv.mkDerivation rec { sha256 = "039wz89vs03a27anpshj5xaqknm7cqi7mrypvwingqkq26ns0mhs"; }; - buildInputs = [ cmake ncurses openssl bison boost libxml2 libaio judy libevent groff ]; + buildInputs = [ cmake ncurses openssl bison boost libxml2 judy libevent groff ] + ++ stdenv.lib.optional (!stdenv.isDarwin) libaio + ++ stdenv.lib.optionals stdenv.isDarwin [ perl fixDarwinDylibNames ]; + + patches = stdenv.lib.optional stdenv.isDarwin ./my_context_asm.patch; cmakeFlags = [ "-DWITH_READLINE=yes" "-DWITH_EMBEDDED_SERVER=yes" "-DINSTALL_SCRIPTDIR=bin" ]; enableParallelBuilding = true; + prePatch = '' + substituteInPlace cmake/libutils.cmake \ + --replace /usr/bin/libtool libtool + ''; + postInstall = '' + substituteInPlace $out/bin/mysql_install_db \ + --replace basedir=\"\" basedir=\"$out\" + ''; + passthru.mysqlVersion = "5.5"; meta = { diff --git a/pkgs/servers/sql/mariadb/my_context_asm.patch b/pkgs/servers/sql/mariadb/my_context_asm.patch new file mode 100644 index 00000000000..3a747ed1b03 --- /dev/null +++ b/pkgs/servers/sql/mariadb/my_context_asm.patch @@ -0,0 +1,18 @@ +--- a/mysys/my_context.c ++++ b/mysys/my_context.c +@@ -206,15 +206,6 @@ my_context_spawn(struct my_context *c, void (*f)(void *), void *d) + ( + "movq %%rsp, (%[save])\n\t" + "movq %[stack], %%rsp\n\t" +-#if __GNUC__ >= 4 && __GNUC_MINOR__ >= 4 && !defined(__INTEL_COMPILER) +- /* +- This emits a DWARF DW_CFA_undefined directive to make the return address +- undefined. This indicates that this is the top of the stack frame, and +- helps tools that use DWARF stack unwinding to obtain stack traces. +- (I use numeric constant to avoid a dependency on libdwarf includes). +- */ +- ".cfi_escape 0x07, 16\n\t" +-#endif + "movq %%rbp, 8(%[save])\n\t" + "movq %%rbx, 16(%[save])\n\t" + "movq %%r12, 24(%[save])\n\t" -- GitLab From d593d3ac8810179501a8c8d404c0d19c06265510 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sat, 30 Aug 2014 23:48:58 +0400 Subject: [PATCH 606/843] Fix K3D patching and cmake-configuration phases --- pkgs/applications/graphics/k3d/default.nix | 8 +-- .../k3d/disable_mutable_in_boost_gil.patch | 20 ------- .../graphics/k3d/k3d-0.7.11.0-libpng14.patch | 54 ------------------- 3 files changed, 2 insertions(+), 80 deletions(-) delete mode 100644 pkgs/applications/graphics/k3d/disable_mutable_in_boost_gil.patch delete mode 100644 pkgs/applications/graphics/k3d/k3d-0.7.11.0-libpng14.patch diff --git a/pkgs/applications/graphics/k3d/default.nix b/pkgs/applications/graphics/k3d/default.nix index 35f3bed866d..bb577ec0552 100644 --- a/pkgs/applications/graphics/k3d/default.nix +++ b/pkgs/applications/graphics/k3d/default.nix @@ -1,7 +1,7 @@ {stdenv, fetchurl , cmake, mesa, zlib, python, expat, libxml2, libsigcxx, libuuid, freetype , libpng, boost, doxygen, cairomm, pkgconfig, imagemagick, libjpeg, libtiff -, gettext, intltool, perl, gtkmm, glibmm, gtkglext +, gettext, intltool, perl, gtkmm, glibmm, gtkglext, pangox_compat }: stdenv.mkDerivation rec { @@ -13,11 +13,7 @@ stdenv.mkDerivation rec { }; patches = [ - # debian package source - ./disable_mutable_in_boost_gil.patch ./k3d_gtkmm224.patch - # http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/media-gfx/k3d/files/k3d-0.7.11.0-libpng14.patch - ./k3d-0.7.11.0-libpng14.patch ]; preConfigure = '' @@ -29,7 +25,7 @@ stdenv.mkDerivation rec { cmake mesa zlib python expat libxml2 libsigcxx libuuid freetype libpng boost doxygen cairomm pkgconfig imagemagick libjpeg libtiff gettext intltool perl - gtkmm glibmm gtkglext + gtkmm glibmm gtkglext pangox_compat ]; doCheck = false; diff --git a/pkgs/applications/graphics/k3d/disable_mutable_in_boost_gil.patch b/pkgs/applications/graphics/k3d/disable_mutable_in_boost_gil.patch deleted file mode 100644 index 1774328c618..00000000000 --- a/pkgs/applications/graphics/k3d/disable_mutable_in_boost_gil.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- a/k3dsdk/gil/boost/gil/extension/dynamic_image/apply_operation_base.hpp -+++ b/k3dsdk/gil/boost/gil/extension/dynamic_image/apply_operation_base.hpp -@@ -114,7 +114,7 @@ - template - struct reduce_bind1 { - const T2& _t2; -- mutable Op& _op; -+ Op& _op; - - typedef typename Op::result_type result_type; - -@@ -127,7 +127,7 @@ - struct reduce_bind2 { - const Bits1& _bits1; - std::size_t _index1; -- mutable Op& _op; -+ Op& _op; - - typedef typename Op::result_type result_type; - diff --git a/pkgs/applications/graphics/k3d/k3d-0.7.11.0-libpng14.patch b/pkgs/applications/graphics/k3d/k3d-0.7.11.0-libpng14.patch deleted file mode 100644 index b54168227b4..00000000000 --- a/pkgs/applications/graphics/k3d/k3d-0.7.11.0-libpng14.patch +++ /dev/null @@ -1,54 +0,0 @@ -diff -ur k3d-source-0.7.11.0.orig/k3dsdk/gil/boost/gil/extension/io/png_io_private.hpp k3d-source-0.7.11.0/k3dsdk/gil/boost/gil/extension/io/png_io_private.hpp ---- k3d-source-0.7.11.0.orig/k3dsdk/gil/boost/gil/extension/io/png_io_private.hpp 2009-03-19 22:28:53.000000000 +0200 -+++ k3d-source-0.7.11.0/k3dsdk/gil/boost/gil/extension/io/png_io_private.hpp 2010-05-12 12:21:50.000000000 +0300 -@@ -148,12 +148,12 @@ - // allocate/initialize the image information data - _info_ptr = png_create_info_struct(_png_ptr); - if (_info_ptr == NULL) { -- png_destroy_read_struct(&_png_ptr,png_infopp_NULL,png_infopp_NULL); -+ png_destroy_read_struct(&_png_ptr,NULL,NULL); - io_error("png_get_file_size: fail to call png_create_info_struct()"); - } - if (setjmp(png_jmpbuf(_png_ptr))) { - //free all of the memory associated with the png_ptr and info_ptr -- png_destroy_read_struct(&_png_ptr, &_info_ptr, png_infopp_NULL); -+ png_destroy_read_struct(&_png_ptr, &_info_ptr, NULL); - io_error("png_get_file_size: fail to call setjmp()"); - } - png_init_io(_png_ptr, get()); -@@ -165,7 +165,7 @@ - png_reader(const char* filename) : file_mgr(filename, "rb") { init(); } - - ~png_reader() { -- png_destroy_read_struct(&_png_ptr,&_info_ptr,png_infopp_NULL); -+ png_destroy_read_struct(&_png_ptr,&_info_ptr,NULL); - } - point2 get_dimensions() { - return point2(png_get_image_width(_png_ptr,_info_ptr), -@@ -177,7 +177,7 @@ - int bit_depth, color_type, interlace_type; - png_get_IHDR(_png_ptr, _info_ptr, - &width, &height,&bit_depth,&color_type,&interlace_type, -- int_p_NULL, int_p_NULL); -+ (int *) NULL, (int *) NULL); - io_error_if(((png_uint_32)view.width()!=width || (png_uint_32)view.height()!= height), - "png_read_view: input view size does not match PNG file size"); - -@@ -219,7 +219,7 @@ - int bit_depth, color_type, interlace_type; - png_get_IHDR(_png_ptr, _info_ptr, - &width, &height,&bit_depth,&color_type,&interlace_type, -- int_p_NULL, int_p_NULL); -+ (int *) NULL, (int *) NULL); - io_error_if(((png_uint_32)view.width()!=width || (png_uint_32)view.height()!= height), - "png_reader_color_convert::apply(): input view size does not match PNG file size"); - switch (color_type) { -@@ -308,7 +308,7 @@ - io_error_if(!_png_ptr,"png_write_initialize: fail to call png_create_write_struct()"); - _info_ptr = png_create_info_struct(_png_ptr); - if (!_info_ptr) { -- png_destroy_write_struct(&_png_ptr,png_infopp_NULL); -+ png_destroy_write_struct(&_png_ptr,NULL); - io_error("png_write_initialize: fail to call png_create_info_struct()"); - } - if (setjmp(png_jmpbuf(_png_ptr))) { -- GitLab From dcb38fc8aa34d603bb57f14b913a338574afcecb Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sun, 31 Aug 2014 00:25:48 +0400 Subject: [PATCH 607/843] Add missing libXmu dependency --- pkgs/applications/graphics/k3d/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/k3d/default.nix b/pkgs/applications/graphics/k3d/default.nix index bb577ec0552..eb45ae3d8e7 100644 --- a/pkgs/applications/graphics/k3d/default.nix +++ b/pkgs/applications/graphics/k3d/default.nix @@ -1,7 +1,7 @@ {stdenv, fetchurl , cmake, mesa, zlib, python, expat, libxml2, libsigcxx, libuuid, freetype , libpng, boost, doxygen, cairomm, pkgconfig, imagemagick, libjpeg, libtiff -, gettext, intltool, perl, gtkmm, glibmm, gtkglext, pangox_compat +, gettext, intltool, perl, gtkmm, glibmm, gtkglext, pangox_compat, libXmu }: stdenv.mkDerivation rec { @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { cmake mesa zlib python expat libxml2 libsigcxx libuuid freetype libpng boost doxygen cairomm pkgconfig imagemagick libjpeg libtiff gettext intltool perl - gtkmm glibmm gtkglext pangox_compat + gtkmm glibmm gtkglext pangox_compat libXmu ]; doCheck = false; -- GitLab From 64a18d70e5a0ca60fcfdce4379de7dfd3b7f5c64 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sun, 31 Aug 2014 00:37:01 +0400 Subject: [PATCH 608/843] Julia 0.3.0 seems to have no more problems than 0.2.1, so make it default --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3d3e462f82f..f50cdee1898 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3145,7 +3145,7 @@ let llvm = llvm_34; openblas = openblas_0_2_10; }; - julia = julia021; + julia = julia030; lazarus = builderDefsPackage (import ../development/compilers/fpc/lazarus.nix) { inherit makeWrapper gtk glib pango atk gdk_pixbuf; -- GitLab From c59ef6af6f73cd6993c8ca76ba024d581969fecb Mon Sep 17 00:00:00 2001 From: Damien Cassou Date: Sat, 30 Aug 2014 17:33:04 +0200 Subject: [PATCH 609/843] backintime: a simple backup tool --- .../networking/sync/backintime/default.nix | 78 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 80 insertions(+) create mode 100644 pkgs/applications/networking/sync/backintime/default.nix diff --git a/pkgs/applications/networking/sync/backintime/default.nix b/pkgs/applications/networking/sync/backintime/default.nix new file mode 100644 index 00000000000..9b9e355f828 --- /dev/null +++ b/pkgs/applications/networking/sync/backintime/default.nix @@ -0,0 +1,78 @@ +{stdenv, fetchurl, makeWrapper, gettext, python2, python2Packages, gnome2, pkgconfig, pygobject, glib, libtool }: + +let + version = "1.0.36"; + + src = fetchurl { + url = "https://launchpad.net/backintime/1.0/${version}/+download/backintime-${version}.tar.gz"; + md5 = "28630bc7bd5f663ba8fcfb9ca6a742d8"; + }; + + # because upstream tarball has no top-level directory. + # https://bugs.launchpad.net/backintime/+bug/1359076 + sourceRoot = "."; + + genericBuildInputs = [ makeWrapper gettext python2 python2Packages.dbus ]; + + installFlagsArray = [ "DEST=$(out)" ]; + + meta = { + homepage = https://launchpad.net/backintime; + description = "Simple backup tool for Linux"; + license = stdenv.lib.licenses.gpl2; + maintainers = [ stdenv.lib.maintainers.DamienCassou ]; + platforms = stdenv.lib.platforms.linux; + longDescription = '' + Back In Time is a simple backup tool (on top of rsync) for Linux + inspired from “flyback project” and “TimeVault”. The backup is + done by taking snapshots of a specified set of directories. + ''; + }; + + common = stdenv.mkDerivation rec { + inherit version src sourceRoot installFlagsArray meta; + + name = "backintime-common-${version}"; + + buildInputs = genericBuildInputs; + + preConfigure = "cd common"; + + dontAddPrefix = true; + + preFixup = + '' + substituteInPlace "$out/bin/backintime" \ + --replace "=\"/usr/share" "=\"$prefix/share" + wrapProgram "$out/bin/backintime" \ + --prefix PYTHONPATH : "$PYTHONPATH" + ''; + }; + +in +stdenv.mkDerivation rec { + inherit version src sourceRoot installFlagsArray meta; + + name = "backintime-gnome-${version}"; + + buildInputs = genericBuildInputs ++ [ common python2Packages.pygtk python2Packages.notify gnome2.gnome_python ]; + + preConfigure = "cd gnome"; + configureFlagsArray = [ "--no-check" ]; + + preFixup = + '' + substituteInPlace "$out/share/backintime/gnome/app.py" \ + --replace "glade_file = os.path.join(self.config.get_app_path()," \ + "glade_file = os.path.join('$prefix/share/backintime'," + substituteInPlace "$out/share/backintime/gnome/settingsdialog.py" \ + --replace "glade_file = os.path.join(self.config.get_app_path()," \ + "glade_file = os.path.join('$prefix/share/backintime'," + substituteInPlace "$out/bin/backintime-gnome" \ + --replace "=\"/usr/share" "=\"$prefix/share" + wrapProgram "$out/bin/backintime-gnome" \ + --prefix PYTHONPATH : "${gnome2.gnome_python}/lib/python2.7/site-packages/gtk-2.0:${common}/share/backintime/common:$PYTHONPATH" \ + --prefix PATH : "$PATH" + ''; + +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index f50cdee1898..64bf223e5d9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8269,6 +8269,8 @@ let inherit (gnome3) baobab; + backintime = callPackage ../applications/networking/sync/backintime { }; + bar = callPackage ../applications/window-managers/bar { }; baresip = callPackage ../applications/networking/instant-messengers/baresip { -- GitLab From e9e5ff87765469aadee4b33417596d01502e8c43 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Sat, 30 Aug 2014 21:11:15 +0200 Subject: [PATCH 610/843] pypyPackages.random2: disable tests --- pkgs/top-level/python-packages.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ec224fec54a..894ffbd3ce9 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2749,6 +2749,8 @@ rec { random2 = pythonPackages.buildPythonPackage rec { name = "random2-1.0.1"; + + doCheck = !isPyPy; src = fetchurl { url = "https://pypi.python.org/packages/source/r/random2/${name}.zip"; -- GitLab From b746a1644f0a249c2eb1091343722783a9a0b9bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Sat, 30 Aug 2014 22:43:35 +0200 Subject: [PATCH 611/843] fix eval --- pkgs/top-level/python-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 894ffbd3ce9..6a988e4340b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7356,7 +7356,7 @@ rec { # buildPhase = "python setup.py build"; # doCheck = false; - propagatedBuildInputs = [ pycurl koji GitPython pkgs.git + propagatedBuildInputs = [ pycurl pkgs.koji GitPython pkgs.git pkgs.rpm pkgs.pyopenssl ]; }); -- GitLab From 188f0796b9a0d7d2e9d91ab69d673238ed0c09cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Sat, 30 Aug 2014 23:00:31 +0200 Subject: [PATCH 612/843] mesos: fix build --- pkgs/applications/networking/cluster/mesos/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/cluster/mesos/default.nix b/pkgs/applications/networking/cluster/mesos/default.nix index 4329308ba04..fe93a072b2c 100644 --- a/pkgs/applications/networking/cluster/mesos/default.nix +++ b/pkgs/applications/networking/cluster/mesos/default.nix @@ -18,7 +18,7 @@ in stdenv.mkDerivation { buildInputs = [ makeWrapper autoconf automake libtool curl sasl jdk maven - python wrapPython boto distutils-cfg + python wrapPython boto distutils-cfg setuptools ]; propagatedBuildInputs = [ -- GitLab From df98dda81d93f3067bbcfac9307fa544415f7d74 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Sat, 30 Aug 2014 23:00:46 +0200 Subject: [PATCH 613/843] pypy: compile also curses --- pkgs/development/interpreters/pypy/2.3/default.nix | 2 +- pkgs/top-level/python-packages.nix | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/interpreters/pypy/2.3/default.nix b/pkgs/development/interpreters/pypy/2.3/default.nix index 73a52e6dfc7..0b3ca739092 100644 --- a/pkgs/development/interpreters/pypy/2.3/default.nix +++ b/pkgs/development/interpreters/pypy/2.3/default.nix @@ -85,7 +85,7 @@ let ln -s $out/pypy-c/lib-python/${pythonVersion} $out/lib/${libPrefix} # verify cffi modules - $out/bin/pypy -c "import Tkinter;import sqlite3" + $out/bin/pypy -c "import Tkinter;import sqlite3;import curses" # make sure pypy finds sqlite3 library wrapProgram "$out/bin/pypy" \ diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 6a988e4340b..2ee854bdc9c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1521,11 +1521,11 @@ rec { }; cffi = buildPythonPackage rec { - name = "cffi-0.7.2"; + name = "cffi-0.8.6"; src = fetchurl { url = "http://pypi.python.org/packages/source/c/cffi/${name}.tar.gz"; - md5 = "d329f5cb2053fd31dafc02e2c9ef0299"; + md5 = "474b5a68299a6f05009171de1dc91be6"; }; propagatedBuildInputs = [ pkgs.libffi pycparser ]; -- GitLab From cafeb8e4f580e4a981d5cfa7aca3cd2c1039192b Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Sat, 30 Aug 2014 23:11:30 +0200 Subject: [PATCH 614/843] Disable Xen kernel builds Xen itself is currently broken in Nixpkgs, so building kernels for it is kind of pointless. --- pkgs/top-level/all-packages.nix | 7 ------- 1 file changed, 7 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 64bf223e5d9..c85521ecab8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7398,12 +7398,6 @@ let kernelPatches = []; }; - linux_3_2_xen = lowPrio (linux_3_2.override { - extraConfig = '' - XEN_DOM0 y - ''; - }); - linux_3_4 = makeOverridable (import ../os-specific/linux/kernel/linux-3.4.nix) { inherit fetchurl stdenv perl buildLinux; kernelPatches = lib.optionals ((platform.kernelArch or null) == "mips") @@ -7601,7 +7595,6 @@ let # Build the kernel modules for the some of the kernels. linuxPackages_3_2 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_2 linuxPackages_3_2); - linuxPackages_3_2_xen = linuxPackagesFor pkgs.linux_3_2_xen linuxPackages_3_2_xen; linuxPackages_3_4 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_4 linuxPackages_3_4); linuxPackages_3_6_rpi = linuxPackagesFor pkgs.linux_3_6_rpi linuxPackages_3_6_rpi; linuxPackages_3_10 = recurseIntoAttrs (linuxPackagesFor pkgs.linux_3_10 linuxPackages_3_10); -- GitLab From 4b7f1a9be33bcc098d5bf5a9c1f7310d68e6c08d Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Sat, 30 Aug 2014 23:14:17 +0200 Subject: [PATCH 615/843] lttng-modules: Mark as broken These do not build for any kernel: http://hydra.nixos.org/eval/1149989?filter=lttng&compare=1149981 --- pkgs/os-specific/linux/lttng-modules/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/os-specific/linux/lttng-modules/default.nix b/pkgs/os-specific/linux/lttng-modules/default.nix index 8e20bf1e3d3..4794cd8f96c 100644 --- a/pkgs/os-specific/linux/lttng-modules/default.nix +++ b/pkgs/os-specific/linux/lttng-modules/default.nix @@ -26,6 +26,7 @@ stdenv.mkDerivation rec { # TODO license = with licenses; [ lgpl21 gpl2 mit ]; platforms = platforms.linux; maintainers = [ maintainers.bjornfor ]; + broken = true; }; } -- GitLab From 6437e2541a11f93d95df3b8b2d16ffb8578f5a62 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Sat, 30 Aug 2014 23:20:57 +0200 Subject: [PATCH 616/843] Remove numerous failing kernel packages from Hydra http://hydra.nixos.org/eval/1149989?filter=linuxPackages --- pkgs/top-level/release.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/top-level/release.nix b/pkgs/top-level/release.nix index 9970c2789ac..07c3126e5ab 100644 --- a/pkgs/top-level/release.nix +++ b/pkgs/top-level/release.nix @@ -440,6 +440,14 @@ let xfwm4 = linux; }; + linuxPackages_testing = { }; + linuxPackages_grsec_stable_desktop = { }; + linuxPackages_grsec_stable_server = { }; + linuxPackages_grsec_stable_server_xen = { }; + linuxPackages_grsec_testing_desktop = { }; + linuxPackages_grsec_testing_server = { }; + linuxPackages_grsec_testing_server_xen = { }; + } )); in jobs -- GitLab From 3182cf00ff7da0a6102d981c14d750ddaff12a65 Mon Sep 17 00:00:00 2001 From: Daniel Peebles Date: Sat, 30 Aug 2014 17:22:51 -0400 Subject: [PATCH 617/843] Add xar --- lib/maintainers.nix | 1 + pkgs/tools/compression/xar/default.nix | 34 ++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 37 insertions(+) create mode 100644 pkgs/tools/compression/xar/default.nix diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 0c71669a8ae..9ff9f7ea27a 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -34,6 +34,7 @@ cfouche = "Chaddaï Fouché "; chaoflow = "Florian Friesdorf "; coconnor = "Corey O'Connor "; + copumpkin = "Dan Peebles "; coroa = "Jonas Hörsch "; cstrahan = "Charles Strahan "; DamienCassou = "Damien Cassou "; diff --git a/pkgs/tools/compression/xar/default.nix b/pkgs/tools/compression/xar/default.nix new file mode 100644 index 00000000000..0bb4a1fb2ae --- /dev/null +++ b/pkgs/tools/compression/xar/default.nix @@ -0,0 +1,34 @@ +{ stdenv, fetchurl, libxml2, openssl, zlib, bzip2 }: + +stdenv.mkDerivation rec { + version = "1.5.2"; + name = "xar-${version}"; + + src = fetchurl { + url = "https://xar.googlecode.com/files/${name}.tar.gz"; + sha256 = "1rp3va6akzlh35yqrapfqnbxaxa0zi8wyr93swbapprwh215cpac"; + }; + + buildInputs = [ libxml2 openssl zlib bzip2 ]; + + meta = { + homepage = https://code.google.com/p/xar/; + description = "Extensible Archiver"; + + longDescription = + '' The XAR project aims to provide an easily extensible archive format. + Important design decisions include an easily extensible XML table of + contents for random access to archived files, storing the toc at the + beginning of the archive to allow for efficient handling of streamed + archives, the ability to handle files of arbitrarily large sizes, the + ability to choose independent encodings for individual files in the + archive, the ability to store checksums for individual files in both + compressed and uncompressed form, and the ability to query the table + of content's rich meta-data. + ''; + + license = stdenv.lib.licenses.bsd3; + maintainers = with stdenv.lib.maintainers; [ copumpkin ]; + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c85521ecab8..e0e97c0fe3d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2407,6 +2407,8 @@ let unrar = callPackage ../tools/archivers/unrar { }; + xar = callPackage ../tools/compression/xar { }; + xarchive = callPackage ../tools/archivers/xarchive { }; xarchiver = callPackage ../tools/archivers/xarchiver { }; -- GitLab From 408832ac67ed9b6d517cc4395749cc488038f049 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Sat, 30 Aug 2014 23:59:07 +0200 Subject: [PATCH 618/843] help2man: update from 1.44.1 to 1.46.1 and add myself as a maintainer --- pkgs/development/tools/misc/help2man/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/tools/misc/help2man/default.nix b/pkgs/development/tools/misc/help2man/default.nix index c4ba7073889..c8cff116282 100644 --- a/pkgs/development/tools/misc/help2man/default.nix +++ b/pkgs/development/tools/misc/help2man/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, perl, gettext, LocaleGettext, makeWrapper }: stdenv.mkDerivation rec { - name = "help2man-1.44.1"; + name = "help2man-1.46.1"; src = fetchurl { url = "mirror://gnu/help2man/${name}.tar.xz"; - sha256 = "1yyyfw9zrfdvslnv91bnhyqmazwx243wmkc9wdaz888rfx36ipi2"; + sha256 = "0iqwb3qirl7rp1wwpbh01q89qxvi4h3bc73wi03av6hl4sh05z9x"; }; buildInputs = [ makeWrapper perl gettext LocaleGettext ]; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { ''; - meta = { + meta = with stdenv.lib; { description = "Generate man pages from `--help' output"; longDescription = @@ -28,8 +28,8 @@ stdenv.mkDerivation rec { homepage = http://www.gnu.org/software/help2man/; - license = stdenv.lib.licenses.gpl3Plus; - platforms = stdenv.lib.platforms.gnu; # arbitrary choice - maintainers = [ stdenv.lib.maintainers.ludo ]; + license = licenses.gpl3Plus; + platforms = platforms.gnu; # arbitrary choice + maintainers = with maintainers; [ ludo pSub ]; }; } -- GitLab From 5c3c7574e248d36b2933b476f10652b6fb525f2d Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Sun, 31 Aug 2014 00:32:37 +0200 Subject: [PATCH 619/843] lirc: update from 0.9.0 to 0.9.1, add meta information and adopt it --- pkgs/development/libraries/lirc/default.nix | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/lirc/default.nix b/pkgs/development/libraries/lirc/default.nix index 75f175a5b2d..3adddada27b 100644 --- a/pkgs/development/libraries/lirc/default.nix +++ b/pkgs/development/libraries/lirc/default.nix @@ -1,18 +1,30 @@ -{ stdenv, fetchurl, alsaLib }: +{ stdenv, fetchurl, alsaLib, bash, help2man }: stdenv.mkDerivation rec { - name = "lirc-0.9.0"; + name = "lirc-0.9.1"; src = fetchurl { url = "mirror://sourceforge/lirc/${name}.tar.bz2"; - sha256 = "1zx4mcnjwzz6jsi6ln7a3dkgx05nvg1pxxvmjqvd966ldapay8v3"; + sha256 = "0vakq9x10hyj9k7iv35sm5f4dhxvk0miwxvv6kn0bhwkr2mnapj6"; }; - buildInputs = [ alsaLib ]; + preBuild = "patchShebangs ."; + + buildInputs = [ alsaLib help2man ]; configureFlags = [ "--with-driver=devinput" "--sysconfdir=$(out)/etc" "--enable-sandboxed" ]; + + makeFlags = [ "m4dir=$(out)/m4" ]; + + meta = with stdenv.lib; { + description = "Allows to receive and send infrared signals"; + homepage = http://www.lirc.org/; + license = licenses.gpl2; + platforms = platforms.linux + maintainers = with maintainers; [ pSub ]; + }; } -- GitLab From 907845127e2b0a31971ee1ada81ad130985ba141 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Sun, 31 Aug 2014 00:41:40 +0200 Subject: [PATCH 620/843] mcabber: update from 0.10.1 to 0.10.3, add meta-information and adopt it --- .../instant-messengers/mcabber/default.nix | 19 +++++++++++-------- 1 file changed, 11 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/mcabber/default.nix b/pkgs/applications/networking/instant-messengers/mcabber/default.nix index cae0213c6be..6830e4614ee 100644 --- a/pkgs/applications/networking/instant-messengers/mcabber/default.nix +++ b/pkgs/applications/networking/instant-messengers/mcabber/default.nix @@ -1,19 +1,22 @@ {stdenv, fetchurl, openssl, ncurses, pkgconfig, glib, loudmouth}: -stdenv.mkDerivation { - - name = "mcabber-0.10.1"; +stdenv.mkDerivation rec { + name = "mcabber-${version}"; + version = "0.10.3"; src = fetchurl { - url = "http://mcabber.com/files/mcabber-0.10.1.tar.bz2"; + url = "http://mcabber.com/files/mcabber-${version}.tar.bz2"; sha256 = "1248cgci1v2ypb90wfhyipwdyp1wskn3gzh78af5ai1a4w5rrjq0"; }; - meta = { homepage = "http://mcabber.com/"; - description = "Small Jabber console client"; - }; - buildInputs = [openssl ncurses pkgconfig glib loudmouth]; configureFlags = "--with-openssl=${openssl}"; + + meta = with stdevn.lib; { + homepage = http://mcabber.com/; + description = "Small Jabber console client"; + license = licenses.gpl2; + maintainers = with maintainers; [ pSub ]; + }; } -- GitLab From b88c4796eaba32a4b132515ca76b68e25a3cb4a8 Mon Sep 17 00:00:00 2001 From: Dmitry Malikov Date: Sun, 31 Aug 2014 00:36:49 +0200 Subject: [PATCH 621/843] Add haskell-tagged-transformer 0.7.1 --- .../haskell/tagged-transformer/default.nix | 21 +++++++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 23 insertions(+) create mode 100644 pkgs/development/libraries/haskell/tagged-transformer/default.nix diff --git a/pkgs/development/libraries/haskell/tagged-transformer/default.nix b/pkgs/development/libraries/haskell/tagged-transformer/default.nix new file mode 100644 index 00000000000..34da51018e0 --- /dev/null +++ b/pkgs/development/libraries/haskell/tagged-transformer/default.nix @@ -0,0 +1,21 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, comonad, contravariant, distributive, exceptions, mtl +, reflection, semigroupoids, tagged +}: + +cabal.mkDerivation (self: { + pname = "tagged-transformer"; + version = "0.7.1"; + sha256 = "1qgfx546pj4aqdblb4gddfxp642snn5dx4kxj3sn5q7c9lsgdh8j"; + buildDepends = [ + comonad contravariant distributive exceptions mtl reflection + semigroupoids tagged + ]; + meta = { + homepage = "http://github.com/ekmett/tagged-transformer"; + description = "Provides newtype wrappers for phantom types to avoid unsafely passing dummy arguments"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 272091b151a..7c88f1cee5f 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -2403,6 +2403,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in tagged = callPackage ../development/libraries/haskell/tagged {}; + taggedTransformer = callPackage ../development/libraries/haskell/tagged-transformer {}; + taggy = callPackage ../development/libraries/haskell/taggy {}; taggyLens = callPackage ../development/libraries/haskell/taggy-lens {}; -- GitLab From 86d72b2c304c0a64f014476fadb50726e64e7399 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Sat, 30 Aug 2014 07:36:54 -0700 Subject: [PATCH 622/843] btrfsProgs: 3.14.2 -> 3.16.0 Additionally, add myself as a maintainer. --- pkgs/tools/filesystems/btrfsprogs/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/filesystems/btrfsprogs/default.nix b/pkgs/tools/filesystems/btrfsprogs/default.nix index 66152f9589b..02f214ad430 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.14.2"; in +let version = "3.16"; in stdenv.mkDerivation rec { name = "btrfs-progs-${version}"; src = fetchurl { url = "mirror://kernel/linux/kernel/people/mason/btrfs-progs/btrfs-progs-v${version}.tar.xz"; - sha256 = "14vpj6f2v076v9zabgrz8l4dp6n1ar2mvk3lvii51ykvi35d1qbh"; + sha256 = "0phbrgipl04q8cdj9nnshik7b6p2bg51jxb3l1gvfc04dkgm2xls"; }; buildInputs = [ @@ -21,10 +21,11 @@ stdenv.mkDerivation rec { makeFlags = "prefix=$(out)"; - meta = { + meta = with stdenv.lib; { description = "Utilities for the btrfs filesystem"; homepage = https://btrfs.wiki.kernel.org/; - maintainers = [ stdenv.lib.maintainers.raskin ]; - platforms = stdenv.lib.platforms.linux; + license = licenses.gpl2; + maintainers = with maintainers; [ raskin wkennington ]; + platforms = platforms.linux; }; } -- GitLab From 2bee211fc9bba7f8d7cf41ec19067191b0867cae Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Sun, 31 Aug 2014 02:09:21 +0200 Subject: [PATCH 623/843] mcabber: fix mispelled stdenv --- .../networking/instant-messengers/mcabber/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/instant-messengers/mcabber/default.nix b/pkgs/applications/networking/instant-messengers/mcabber/default.nix index 6830e4614ee..362bf0de977 100644 --- a/pkgs/applications/networking/instant-messengers/mcabber/default.nix +++ b/pkgs/applications/networking/instant-messengers/mcabber/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { configureFlags = "--with-openssl=${openssl}"; - meta = with stdevn.lib; { + meta = with stdenv.lib; { homepage = http://mcabber.com/; description = "Small Jabber console client"; license = licenses.gpl2; -- GitLab From efdb6ecb0cf5be0c340a2abca949db59e9c4ac79 Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Sun, 31 Aug 2014 02:17:19 +0200 Subject: [PATCH 624/843] lirc: add missing semicolon --- pkgs/development/libraries/lirc/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/lirc/default.nix b/pkgs/development/libraries/lirc/default.nix index 3adddada27b..88565d5d51b 100644 --- a/pkgs/development/libraries/lirc/default.nix +++ b/pkgs/development/libraries/lirc/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { description = "Allows to receive and send infrared signals"; homepage = http://www.lirc.org/; license = licenses.gpl2; - platforms = platforms.linux + platforms = platforms.linux; maintainers = with maintainers; [ pSub ]; }; } -- GitLab From 9073a30ceecf750012a22983289ee74cdf0372e2 Mon Sep 17 00:00:00 2001 From: Suvash Thapaliya Date: Sun, 31 Aug 2014 03:01:55 +0200 Subject: [PATCH 625/843] Add `extraConfig` option for SLiM so that various configuration options can be set without having to expose every single configurable parameter --- nixos/modules/services/x11/display-managers/slim.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/nixos/modules/services/x11/display-managers/slim.nix b/nixos/modules/services/x11/display-managers/slim.nix index 9ee4e0dc7cb..c7fbfa85e33 100644 --- a/nixos/modules/services/x11/display-managers/slim.nix +++ b/nixos/modules/services/x11/display-managers/slim.nix @@ -19,6 +19,7 @@ let reboot_cmd ${config.systemd.package}/sbin/shutdown -r now ${optionalString (cfg.defaultUser != null) ("default_user " + cfg.defaultUser)} ${optionalString cfg.autoLogin "auto_login yes"} + ${cfg.extraConfig} ''; # Unpack the SLiM theme, or use the default. @@ -89,6 +90,15 @@ in ''; }; + extraConfig = mkOption { + type = types.lines; + default = ""; + description = '' + Extra configuration options for SLiM login manager. Do not + add options that can be configured directly. + ''; + }; + }; }; -- GitLab From 347dd52019d57ae15c25d56a36aa881c0badc05f Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sun, 31 Aug 2014 12:52:59 +0400 Subject: [PATCH 626/843] Fix K3D build --- pkgs/applications/graphics/k3d/default.nix | 5 +- .../graphics/k3d/libpng-1.4.patch | 53 +++++++++++++++++++ 2 files changed, 57 insertions(+), 1 deletion(-) create mode 100644 pkgs/applications/graphics/k3d/libpng-1.4.patch diff --git a/pkgs/applications/graphics/k3d/default.nix b/pkgs/applications/graphics/k3d/default.nix index eb45ae3d8e7..6a66685e42b 100644 --- a/pkgs/applications/graphics/k3d/default.nix +++ b/pkgs/applications/graphics/k3d/default.nix @@ -14,6 +14,7 @@ stdenv.mkDerivation rec { patches = [ ./k3d_gtkmm224.patch + ./libpng-1.4.patch ]; preConfigure = '' @@ -28,7 +29,9 @@ stdenv.mkDerivation rec { gtkmm glibmm gtkglext pangox_compat libXmu ]; - doCheck = false; + #doCheck = false; + + enableParallelBuilding = true; meta = { description = "A 3D editor with support for procedural editing"; diff --git a/pkgs/applications/graphics/k3d/libpng-1.4.patch b/pkgs/applications/graphics/k3d/libpng-1.4.patch new file mode 100644 index 00000000000..e67236617af --- /dev/null +++ b/pkgs/applications/graphics/k3d/libpng-1.4.patch @@ -0,0 +1,53 @@ +--- k3d-source-0.8.0.1/k3dsdk/gil/boost/gil/extension/io/png_io_private.hpp 2010-04-18 13:49:33.000000000 +0800 ++++ k3d-source-0.8.0.1-patched/k3dsdk/gil/boost/gil/extension/io/png_io_private.hpp 2010-06-10 21:17:51.555920268 +0800 +@@ -148,12 +148,12 @@ + // allocate/initialize the image information data + _info_ptr = png_create_info_struct(_png_ptr); + if (_info_ptr == NULL) { +- png_destroy_read_struct(&_png_ptr,png_infopp_NULL,png_infopp_NULL); ++ png_destroy_read_struct(&_png_ptr,NULL,NULL); + io_error("png_get_file_size: fail to call png_create_info_struct()"); + } + if (setjmp(png_jmpbuf(_png_ptr))) { + //free all of the memory associated with the png_ptr and info_ptr +- png_destroy_read_struct(&_png_ptr, &_info_ptr, png_infopp_NULL); ++ png_destroy_read_struct(&_png_ptr, &_info_ptr, NULL); + io_error("png_get_file_size: fail to call setjmp()"); + } + png_init_io(_png_ptr, get()); +@@ -165,7 +165,7 @@ + png_reader(const char* filename) : file_mgr(filename, "rb") { init(); } + + ~png_reader() { +- png_destroy_read_struct(&_png_ptr,&_info_ptr,png_infopp_NULL); ++ png_destroy_read_struct(&_png_ptr,&_info_ptr,NULL); + } + point2 get_dimensions() { + return point2(png_get_image_width(_png_ptr,_info_ptr), +@@ -177,7 +177,7 @@ + int bit_depth, color_type, interlace_type; + png_get_IHDR(_png_ptr, _info_ptr, + &width, &height,&bit_depth,&color_type,&interlace_type, +- int_p_NULL, int_p_NULL); ++ (int *) NULL, (int *) NULL); + io_error_if(((png_uint_32)view.width()!=width || (png_uint_32)view.height()!= height), + "png_read_view: input view size does not match PNG file size"); + +@@ -219,7 +219,7 @@ + int bit_depth, color_type, interlace_type; + png_get_IHDR(_png_ptr, _info_ptr, + &width, &height,&bit_depth,&color_type,&interlace_type, +- int_p_NULL, int_p_NULL); ++ (int *) NULL, (int *) NULL); + io_error_if(((png_uint_32)view.width()!=width || (png_uint_32)view.height()!= height), + "png_reader_color_convert::apply(): input view size does not match PNG file size"); + switch (color_type) { +@@ -308,7 +308,7 @@ + io_error_if(!_png_ptr,"png_write_initialize: fail to call png_create_write_struct()"); + _info_ptr = png_create_info_struct(_png_ptr); + if (!_info_ptr) { +- png_destroy_write_struct(&_png_ptr,png_infopp_NULL); ++ png_destroy_write_struct(&_png_ptr,NULL); + io_error("png_write_initialize: fail to call png_create_info_struct()"); + } + if (setjmp(png_jmpbuf(_png_ptr))) { -- GitLab From 94205f5f21c4d9942bb4205c06229438051b6853 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sun, 31 Aug 2014 12:58:37 +0400 Subject: [PATCH 627/843] Revert "Merge pull request #2449 from wkennington/master.grub" This reverts commit 469f22d717e53c48d13a66ca862942e8098accc5, reversing changes made to 0078bc5d8f87512104902eab00c8a44bef286067. Conflicts: nixos/modules/installer/tools/nixos-generate-config.pl nixos/modules/system/boot/loader/grub/install-grub.pl nixos/release.nix nixos/tests/installer.nix I tried to keep apparently-safe code in conflicts. --- .../installer/tools/nixos-generate-config.pl | 21 --- nixos/modules/installer/tools/tools.nix | 1 - nixos/modules/installer/virtualbox-demo.nix | 3 - .../modules/system/boot/loader/grub/grub.nix | 37 ++--- .../system/boot/loader/grub/install-grub.pl | 136 +++--------------- nixos/modules/tasks/filesystems/zfs.nix | 6 +- nixos/release-combined.nix | 4 - nixos/release.nix | 2 +- nixos/tests/installer.nix | 13 +- pkgs/tools/misc/grub/2.0x.nix | 62 ++++---- pkgs/top-level/all-packages.nix | 6 +- 11 files changed, 69 insertions(+), 222 deletions(-) diff --git a/nixos/modules/installer/tools/nixos-generate-config.pl b/nixos/modules/installer/tools/nixos-generate-config.pl index 73dd87cef5c..66a8152a3a6 100644 --- a/nixos/modules/installer/tools/nixos-generate-config.pl +++ b/nixos/modules/installer/tools/nixos-generate-config.pl @@ -20,13 +20,6 @@ sub uniq { return @res; } -sub runCommand { - my ($cmd) = @_; - open FILE, "$cmd 2>/dev/null |" or die "Failed to execute: $cmd\n"; - my @ret = ; - close FILE; - return ($?, @ret); -} # Process the command line. my $outDir = "/etc/nixos"; @@ -344,20 +337,6 @@ EOF } } - # Is this a btrfs filesystem? - if ($fsType eq "btrfs") { - my ($status, @info) = runCommand("btrfs subvol show $rootDir$mountPoint"); - if ($status != 0) { - die "Failed to retreive subvolume info for $mountPoint"; - } - my @subvols = join("", @info) =~ m/Name:[ \t\n]*([^ \t\n]*)/; - if ($#subvols > 0) { - die "Btrfs subvol name for $mountPoint listed multiple times in mount\n" - } elsif ($#subvols == 0) { - push @extraOptions, "subvol=$subvols[0]"; - } - } - # Emit the filesystem. $fileSystems .= <df or - mount. Note, zfs zpools / datasets are ignored - and will always be mounted using their labels. - ''; - }; - - zfsSupport = mkOption { - default = false; - type = types.bool; + explicitBootRoot = mkOption { + default = ""; + type = types.str; description = '' - Whether grub should be build against libzfs. + The relative path of /boot within the parent volume. Leave empty + if /boot is not a btrfs subvolume. ''; }; @@ -276,9 +260,6 @@ in ${pkgs.coreutils}/bin/cp -pf "${v}" "/boot/${n}" '') config.boot.loader.grub.extraFiles); - assertions = [{ assertion = !cfg.zfsSupport || cfg.version == 2; - message = "Only grub version 2 provides zfs support";}]; - }) ]; diff --git a/nixos/modules/system/boot/loader/grub/install-grub.pl b/nixos/modules/system/boot/loader/grub/install-grub.pl index 7ced51f57e1..2fb771b5edf 100644 --- a/nixos/modules/system/boot/loader/grub/install-grub.pl +++ b/nixos/modules/system/boot/loader/grub/install-grub.pl @@ -1,6 +1,5 @@ use strict; use warnings; -use Class::Struct; use XML::LibXML; use File::Basename; use File::Path; @@ -28,14 +27,6 @@ sub writeFile { close FILE or die; } -sub runCommand { - my ($cmd) = @_; - open FILE, "$cmd 2>/dev/null |" or die "Failed to execute: $cmd\n"; - my @ret = ; - close FILE; - return ($?, @ret); -} - my $grub = get("grub"); my $grubVersion = int(get("version")); my $extraConfig = get("extraConfig"); @@ -48,7 +39,7 @@ my $configurationLimit = int(get("configurationLimit")); my $copyKernels = get("copyKernels") eq "true"; my $timeout = int(get("timeout")); my $defaultEntry = int(get("default")); -my $fsIdentifier = get("fsIdentifier"); +my $explicitBootRoot = get("explicitBootRoot"); $ENV{'PATH'} = get("path"); die "unsupported GRUB version\n" if $grubVersion != 1 && $grubVersion != 2; @@ -57,108 +48,22 @@ print STDERR "updating GRUB $grubVersion menu...\n"; mkpath("/boot/grub", 0, 0700); + # Discover whether /boot is on the same filesystem as / and # /nix/store. If not, then all kernels and initrds must be copied to -# /boot. -if (stat("/boot")->dev != stat("/nix/store")->dev) { +# /boot, and all paths in the GRUB config file must be relative to the +# root of the /boot filesystem. `$bootRoot' is the path to be +# prepended to paths under /boot. +my $bootRoot = "/boot"; +if (stat("/")->dev != stat("/boot")->dev) { + $bootRoot = ""; + $copyKernels = 1; +} elsif (stat("/boot")->dev != stat("/nix/store")->dev) { $copyKernels = 1; } -# Discover information about the location of /boot -struct(Fs => { - device => '$', - type => '$', - mount => '$', -}); -sub GetFs { - my ($dir) = @_; - my ($status, @dfOut) = runCommand("df -T $dir"); - if ($status != 0 || $#dfOut != 1) { - die "Failed to retrieve output about $dir from `df`"; - } - my @boot = split(/[ \n\t]+/, $dfOut[1]); - return Fs->new(device => $boot[0], type => $boot[1], mount => $boot[6]); -} -struct (Grub => { - path => '$', - search => '$', -}); -my $driveid = 1; -sub GrubFs { - my ($dir) = @_; - my $fs = GetFs($dir); - my $path = "/" . substr($dir, length($fs->mount)); - my $search = ""; - - if ($grubVersion > 1) { - # ZFS is completely separate logic as zpools are always identified by a label - # or custom UUID - if ($fs->type eq 'zfs') { - my $sid = index($fs->device, '/'); - - if ($sid < 0) { - $search = '--label ' . $fs->device; - $path = '/@' . $path; - } else { - $search = '--label ' . substr($fs->device, 0, $sid); - $path = '/' . substr($fs->device, $sid) . '/@' . $path; - } - } else { - my %types = ('uuid' => '--fs-uuid', 'label' => '--label'); - - if ($fsIdentifier eq 'provided') { - # If the provided dev is identifying the partition using a label or uuid, - # we should get the label / uuid and do a proper search - my @matches = $fs->device =~ m/\/dev\/disk\/by-(label|uuid)\/(.*)/; - if ($#matches > 1) { - die "Too many matched devices" - } elsif ($#matches == 1) { - $search = "$types{$matches[0]} $matches[1]" - } - } else { - # Determine the identifying type - $search = $types{$fsIdentifier} . ' '; - - # Based on the type pull in the identifier from the system - my ($status, @devInfo) = runCommand("blkid -o export @{[$fs->device]}"); - if ($status != 0) { - die "Failed to get blkid info for @{[$fs->device]}"; - } - my @matches = join("", @devInfo) =~ m/@{[uc $fsIdentifier]}=([^\n]*)/; - if ($#matches != 0) { - die "Couldn't find a $types{$fsIdentifier} for @{[$fs->device]}\n" - } - $search .= $matches[0]; - } - - # BTRFS is a special case in that we need to fix the referrenced path based on subvolumes - if ($fs->type eq 'btrfs') { - my ($status, @info) = runCommand("btrfs subvol show @{[$fs->mount]}"); - if ($status != 0) { - die "Failed to retreive subvolume info for @{[$fs->mount]}"; - } - my @subvols = join("", @info) =~ m/Name:[ \t\n]*([^ \t\n]*)/; - if ($#subvols > 0) { - die "Btrfs subvol name for @{[$fs->device]} listed multiple times in mount\n" - } elsif ($#subvols == 0) { - $path = "/$subvols[0]$path"; - } - } - } - if (not $search eq "") { - $search = "search --set=drive$driveid " . $search; - $path = "(\$drive$driveid)$path"; - $driveid += 1; - } - } - return Grub->new(path => $path, search => $search); -} -my $grubBoot = GrubFs("/boot"); -my $grubStore = GrubFs("/nix"); - -# We don't need to copy if we can read the kernels directly -if ($grubStore->search ne "") { - $copyKernels = 0; +if ($explicitBootRoot ne "") { + $bootRoot = $explicitBootRoot; } # Generate the header. @@ -171,14 +76,12 @@ if ($grubVersion == 1) { "; if ($splashImage) { copy $splashImage, "/boot/background.xpm.gz" or die "cannot copy $splashImage to /boot\n"; - $conf .= "splashimage " . $grubBoot->path . "/background.xpm.gz\n"; + $conf .= "splashimage $bootRoot/background.xpm.gz\n"; } } else { $conf .= " - " . $grubBoot->search . " - " . $grubStore->search . " if [ -s \$prefix/grubenv ]; then load_env fi @@ -199,7 +102,7 @@ else { set timeout=$timeout fi - if loadfont " . $grubBoot->path . "/grub/fonts/unicode.pf2; then + if loadfont $bootRoot/grub/fonts/unicode.pf2; then set gfxmode=640x480 insmod gfxterm insmod vbe @@ -213,7 +116,7 @@ else { copy $splashImage, "/boot/background.png" or die "cannot copy $splashImage to /boot\n"; $conf .= " insmod png - if background_image " . $grubBoot->path . "/background.png; then + if background_image $bootRoot/background.png; then set color_normal=white/black set color_highlight=black/white else @@ -235,7 +138,7 @@ mkpath("/boot/kernels", 0, 0755) if $copyKernels; sub copyToKernelsDir { my ($path) = @_; - return $grubStore->path . substr($path, length("/nix")) unless $copyKernels; + return $path unless $copyKernels; $path =~ /\/nix\/store\/(.*)/ or die; my $name = $1; $name =~ s/\//-/g; my $dst = "/boot/kernels/$name"; @@ -248,7 +151,7 @@ sub copyToKernelsDir { rename $tmp, $dst or die "cannot rename $tmp to $dst\n"; } $copied{$dst} = 1; - return $grubBoot->path . "/kernels/$name"; + return "$bootRoot/kernels/$name"; } sub addEntry { @@ -275,8 +178,11 @@ sub addEntry { $conf .= " " . ($xen ? "module" : "initrd") . " $initrd\n\n"; } else { $conf .= "menuentry \"$name\" {\n"; +<<<<<<< HEAD $conf .= $grubBoot->search . "\n"; $conf .= $grubStore->search . "\n"; +======= +>>>>>>> parent of 469f22d... Merge pull request #2449 from wkennington/master.grub $conf .= " $extraPerEntryConfig\n" if $extraPerEntryConfig; $conf .= " multiboot $xen $xenParams\n" if $xen; $conf .= " " . ($xen ? "module" : "linux") . " $kernel $kernelParams\n"; @@ -294,7 +200,7 @@ addEntry("NixOS - Default", $defaultConfig); $conf .= "$extraEntries\n" unless $extraEntriesBeforeNixOS; # extraEntries could refer to @bootRoot@, which we have to substitute -$conf =~ s/\@bootRoot\@/$grubBoot->path/g; +$conf =~ s/\@bootRoot\@/$bootRoot/g; # Emit submenus for all system profiles. sub addProfile { diff --git a/nixos/modules/tasks/filesystems/zfs.nix b/nixos/modules/tasks/filesystems/zfs.nix index 1c4bbc16b49..d7deb44c407 100644 --- a/nixos/modules/tasks/filesystems/zfs.nix +++ b/nixos/modules/tasks/filesystems/zfs.nix @@ -133,7 +133,7 @@ in }; boot.initrd = mkIf inInitrd { - kernelModules = [ "spl" "zfs" ]; + kernelModules = [ "spl" "zfs" ] ; extraUtilsCommands = '' cp -v ${zfsPkg}/sbin/zfs $out/bin @@ -148,10 +148,6 @@ in ''; }; - boot.loader.grub = mkIf inInitrd { - zfsSupport = true; - }; - systemd.services."zpool-import" = { description = "Import zpools"; after = [ "systemd-udev-settle.service" ]; diff --git a/nixos/release-combined.nix b/nixos/release-combined.nix index 23348e1d089..dae3b9210a8 100644 --- a/nixos/release-combined.nix +++ b/nixos/release-combined.nix @@ -52,10 +52,6 @@ in rec { (all nixos.tests.installer.lvm) (all nixos.tests.installer.separateBoot) (all nixos.tests.installer.simple) - (all nixos.tests.installer.simpleLabels) - (all nixos.tests.installer.simpleProvided) - (all nixos.tests.installer.btrfsSimple) - (all nixos.tests.installer.btrfsSubvols) (all nixos.tests.ipv6) (all nixos.tests.kde4) (all nixos.tests.login) diff --git a/nixos/release.nix b/nixos/release.nix index f78ecb4383d..e2b93640f91 100644 --- a/nixos/release.nix +++ b/nixos/release.nix @@ -231,7 +231,7 @@ in rec { tests.installer.simpleLabels = forAllSystems (system: (import tests/installer.nix { inherit system; }).simpleLabels.test); tests.installer.simpleProvided = forAllSystems (system: (import tests/installer.nix { inherit system; }).simpleProvided.test); tests.installer.btrfsSimple = forAllSystems (system: (import tests/installer.nix { inherit system; }).btrfsSimple.test); - tests.installer.btrfsSubvols = forAllSystems (system: (import tests/installer.nix { inherit system; }).btrfsSubvols.test); + #tests.installer.btrfsSubvols = forAllSystems (system: (import tests/installer.nix { inherit system; }).btrfsSubvols.test); tests.influxdb = callTest tests/influxdb.nix {}; tests.ipv6 = callTest tests/ipv6.nix {}; tests.jenkins = callTest tests/jenkins.nix {}; diff --git a/nixos/tests/installer.nix b/nixos/tests/installer.nix index 154f3323d29..6ee52fd63d8 100644 --- a/nixos/tests/installer.nix +++ b/nixos/tests/installer.nix @@ -35,8 +35,8 @@ let # The configuration to install. - makeConfig = { testChannel, useEFI, grubVersion, grubDevice, grubIdentifier }: - pkgs.writeText "configuration.nix" '' + makeConfig = { testChannel, useEFI, grubVersion, grubDevice }: pkgs.writeText "configuration.nix" + '' { config, pkgs, modulesPath, ... }: { imports = @@ -54,7 +54,6 @@ let ''} boot.loader.grub.device = "${grubDevice}"; boot.loader.grub.extraConfig = "serial; terminal_output.serial"; - boot.loader.grub.fsIdentifier = "${grubIdentifier}"; ''} environment.systemPackages = [ ${optionalString testChannel "pkgs.rlwrap"} ]; @@ -94,7 +93,7 @@ let # disk, and then reboot from the hard disk. It's parameterized with # a test script fragment `createPartitions', which must create # partitions and filesystems. - testScriptFun = { createPartitions, testChannel, useEFI, grubVersion, grubDevice, grubIdentifier }: + testScriptFun = { createPartitions, testChannel, useEFI, grubVersion, grubDevice }: let # FIXME: OVMF doesn't boot from virtio http://www.mail-archive.com/edk2-devel@lists.sourceforge.net/msg01501.html iface = if useEFI || grubVersion == 1 then "scsi" else "virtio"; @@ -162,7 +161,7 @@ let $machine->succeed("cat /mnt/etc/nixos/hardware-configuration.nix >&2"); $machine->copyFileFromHost( - "${ makeConfig { inherit testChannel useEFI grubVersion grubDevice grubIdentifier; } }", + "${ makeConfig { inherit testChannel useEFI grubVersion grubDevice; } }", "/mnt/etc/nixos/configuration.nix"); # Perform the installation. @@ -217,13 +216,13 @@ let makeInstallerTest = name: - { createPartitions, testChannel ? false, useEFI ? false, grubVersion ? 2, grubDevice ? "/dev/vda", grubIdentifier ? "uuid" }: + { createPartitions, testChannel ? false, useEFI ? false, grubVersion ? 2, grubDevice ? "/dev/vda" }: makeTest { inherit iso; name = "installer-" + name; nodes = if testChannel then { inherit webserver; } else { }; testScript = testScriptFun { - inherit createPartitions testChannel useEFI grubVersion grubDevice grubIdentifier; + inherit createPartitions testChannel useEFI grubVersion grubDevice; }; }; diff --git a/pkgs/tools/misc/grub/2.0x.nix b/pkgs/tools/misc/grub/2.0x.nix index e3c07af759c..b1877bdcf98 100644 --- a/pkgs/tools/misc/grub/2.0x.nix +++ b/pkgs/tools/misc/grub/2.0x.nix @@ -1,45 +1,30 @@ -{ stdenv, fetchurl, autogen, flex, bison, python, autoconf, automake -, gettext, ncurses, libusb, freetype, qemu, devicemapper -, linuxPackages ? null -, efiSupport ? false -, zfsSupport ? false -}: - -with stdenv.lib; -let - efiSystems = { - "i686-linux".target = "i386"; - "x86_64-linux".target = "x86_64"; - }; +{ fetchurl, stdenv, flex, bison, gettext, ncurses, libusb, freetype, qemu +, devicemapper, EFIsupport ? false }: - canEfi = any (system: stdenv.system == system) (mapAttrsToList (name: _: name) efiSystems); +let - prefix = "grub${if efiSupport then "-efi" else ""}"; + prefix = "grub${if EFIsupport then "-efi" else ""}"; - version = "2.02-beta2"; + version = "2.00"; unifont_bdf = fetchurl { url = "http://unifoundry.com/unifont-5.1.20080820.bdf.gz"; sha256 = "0s0qfff6n6282q28nwwblp5x295zd6n71kl43xj40vgvdqxv0fxx"; }; -in ( -assert efiSupport -> canEfi; -assert zfsSupport -> linuxPackages != null && linuxPackages.zfs != null; +in stdenv.mkDerivation rec { name = "${prefix}-${version}"; src = fetchurl { - name = "grub-2.02-beta2.tar.xz"; - url = "http://alpha.gnu.org/gnu/grub/grub-2.02~beta2.tar.xz"; - sha256 = "13a13fhc0wf473dn73zhga15mjvkg6vqp4h25dxg4n7am2r05izn"; + url = "mirror://gnu/grub/grub-${version}.tar.xz"; + sha256 = "0n64hpmsccvicagvr0c6v0kgp2yw0kgnd3jvsyd26cnwgs7c6kkq"; }; - nativeBuildInputs = [ autogen flex bison python autoconf automake ]; + nativeBuildInputs = [ flex bison ]; buildInputs = [ ncurses libusb freetype gettext devicemapper ] - ++ optional doCheck qemu - ++ optional zfsSupport linuxPackages.zfs; + ++ stdenv.lib.optional doCheck qemu; preConfigure = '' for i in "tests/util/"*.in @@ -58,19 +43,27 @@ stdenv.mkDerivation rec { # See . sed -i "tests/util/grub-shell.in" \ -e's/qemu-system-i386/qemu-system-x86_64 -nodefaults/g' + + # Fix for building on Glibc 2.16. Won't be needed once the + # gnulib in grub is updated. + sed -i '/gets is a security hole/d' grub-core/gnulib/stdio.in.h ''; prePatch = - '' sh autogen.sh - gunzip < "${unifont_bdf}" > "unifont.bdf" + '' gunzip < "${unifont_bdf}" > "unifont.bdf" sed -i "configure" \ -e "s|/usr/src/unifont.bdf|$PWD/unifont.bdf|g" ''; patches = [ ./fix-bash-completion.patch ]; - configureFlags = optional zfsSupport "--enable-libzfs" - ++ optionals efiSupport [ "--with-platform=efi" "--target=${efiSystems.${stdenv.system}.target}" "--program-prefix=" ]; + configureFlags = + let arch = if stdenv.system == "i686-linux" then "i386" + else if stdenv.system == "x86_64-linux" then "x86_64" + else throw "unsupported EFI firmware architecture"; + in + stdenv.lib.optionals EFIsupport + [ "--with-platform=efi" "--target=${arch}" "--program-prefix=" ]; doCheck = false; enableParallelBuilding = true; @@ -79,7 +72,7 @@ stdenv.mkDerivation rec { paxmark pms $out/sbin/grub-{probe,bios-setup} ''; - meta = with stdenv.lib; { + meta = { description = "GNU GRUB, the Grand Unified Boot Loader (2.x beta)"; longDescription = @@ -96,8 +89,11 @@ stdenv.mkDerivation rec { homepage = http://www.gnu.org/software/grub/; - license = licenses.gpl3Plus; + license = stdenv.lib.licenses.gpl3Plus; - platforms = platforms.gnu; + platforms = if EFIsupport then + [ "i686-linux" "x86_64-linux" ] + else + stdenv.lib.platforms.gnu; }; -}) +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e0e97c0fe3d..6ceca8e0c20 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1226,11 +1226,9 @@ let buggyBiosCDSupport = config.grub.buggyBiosCDSupport or true; }; - grub2 = callPackage ../tools/misc/grub/2.0x.nix { }; + grub2 = callPackage ../tools/misc/grub/2.0x.nix { libusb = libusb1; flex = flex_2_5_35; }; - grub2_efi = grub2.override { efiSupport = true; }; - - grub2_zfs = grub2.override { zfsSupport = true; }; + grub2_efi = grub2.override { EFIsupport = true; }; gssdp = callPackage ../development/libraries/gssdp { inherit (gnome) libsoup; -- GitLab From 2f697bf6931b24cdd428e22effbf6427a85afd42 Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Sun, 31 Aug 2014 10:58:50 +0200 Subject: [PATCH 628/843] Revert "Fix syntax error in nixos/lib/build-vms.nix, introduced by 86c0f8c" This reverts commit 704e91bab005eabe968a3b140222fb0cf7afd4db. --- nixos/lib/build-vms.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/lib/build-vms.nix b/nixos/lib/build-vms.nix index 50b3b424166..ba189555409 100644 --- a/nixos/lib/build-vms.nix +++ b/nixos/lib/build-vms.nix @@ -52,7 +52,7 @@ rec { [ { address = "192.168.${toString first}.${toString m.second}"; prefixLength = 24; } ]; - }); + } in { key = "ip-address"; config = -- GitLab From ea8910652fcecbcd4f21aa1c66b1a0a239408b04 Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Sun, 31 Aug 2014 10:58:54 +0200 Subject: [PATCH 629/843] Revert "Merge pull request #3182 from wkennington/master.ipv6" This reverts commit b23fd6585481a42937e105d5fce630a549900e86, reversing changes made to 43654cba2c280ce17b81db44993d1c1bcae3a9c6. --- .../doc/manual/configuration/ipv4-config.xml | 5 +- nixos/lib/build-vms.nix | 11 +- nixos/modules/programs/virtualbox.nix | 2 +- nixos/modules/services/networking/dhcpcd.nix | 2 +- nixos/modules/tasks/network-interfaces.nix | 147 +++++------------- nixos/tests/bittorrent.nix | 6 +- nixos/tests/nat.nix | 2 +- 7 files changed, 57 insertions(+), 118 deletions(-) diff --git a/nixos/doc/manual/configuration/ipv4-config.xml b/nixos/doc/manual/configuration/ipv4-config.xml index 053501b1736..e2c51518349 100644 --- a/nixos/doc/manual/configuration/ipv4-config.xml +++ b/nixos/doc/manual/configuration/ipv4-config.xml @@ -12,9 +12,12 @@ interfaces. However, you can configure an interface manually as follows: -networking.interfaces.eth0.ip4 = [ { address = "192.168.1.2"; prefixLength = 24; } ]; +networking.interfaces.eth0 = { ipAddress = "192.168.1.2"; prefixLength = 24; }; +(The network prefix can also be specified using the option +subnetMask, +e.g. "255.255.255.0", but this is deprecated.) Typically you’ll also want to set a default gateway and set of name servers: diff --git a/nixos/lib/build-vms.nix b/nixos/lib/build-vms.nix index ba189555409..498c0a37783 100644 --- a/nixos/lib/build-vms.nix +++ b/nixos/lib/build-vms.nix @@ -48,11 +48,10 @@ rec { let interfacesNumbered = zipTwoLists config.virtualisation.vlans (range 1 255); interfaces = flip map interfacesNumbered ({ first, second }: - nameValuePair "eth${toString second}" { ip4 = - [ { address = "192.168.${toString first}.${toString m.second}"; - prefixLength = 24; - } ]; - } + nameValuePair "eth${toString second}" + { ipAddress = "192.168.${toString first}.${toString m.second}"; + subnetMask = "255.255.255.0"; + }); in { key = "ip-address"; config = @@ -61,7 +60,7 @@ rec { networking.interfaces = listToAttrs interfaces; networking.primaryIPAddress = - optionalString (interfaces != []) (head (head interfaces).value.ip4).address; + optionalString (interfaces != []) (head interfaces).value.ipAddress; # Put the IP addresses of all VMs in this machine's # /etc/hosts file. If a machine has multiple diff --git a/nixos/modules/programs/virtualbox.nix b/nixos/modules/programs/virtualbox.nix index fec1a7b61f3..e2dd76219eb 100644 --- a/nixos/modules/programs/virtualbox.nix +++ b/nixos/modules/programs/virtualbox.nix @@ -44,5 +44,5 @@ let virtualbox = config.boot.kernelPackages.virtualbox; in ''; }; - networking.interfaces.vboxnet0.ip4 = [ { address = "192.168.56.1"; prefixLength = 24; } ]; + networking.interfaces.vboxnet0 = { ipAddress = "192.168.56.1"; prefixLength = 24; }; } diff --git a/nixos/modules/services/networking/dhcpcd.nix b/nixos/modules/services/networking/dhcpcd.nix index 7e0b00a3d7b..89aa9bdb6b6 100644 --- a/nixos/modules/services/networking/dhcpcd.nix +++ b/nixos/modules/services/networking/dhcpcd.nix @@ -11,7 +11,7 @@ let # Don't start dhcpcd on explicitly configured interfaces or on # interfaces that are part of a bridge, bond or sit device. ignoredInterfaces = - map (i: i.name) (filter (i: i.ip4 != [ ] || i.ipAddress != null) (attrValues config.networking.interfaces)) + map (i: i.name) (filter (i: i.ipAddress != null) (attrValues config.networking.interfaces)) ++ mapAttrsToList (i: _: i) config.networking.sits ++ concatLists (attrValues (mapAttrs (n: v: v.interfaces) config.networking.bridges)) ++ concatLists (attrValues (mapAttrs (n: v: v.interfaces) config.networking.bonds)) diff --git a/nixos/modules/tasks/network-interfaces.nix b/nixos/modules/tasks/network-interfaces.nix index ac3a55332e4..7dabe70f00c 100644 --- a/nixos/modules/tasks/network-interfaces.nix +++ b/nixos/modules/tasks/network-interfaces.nix @@ -10,26 +10,6 @@ let hasSits = cfg.sits != { }; hasBonds = cfg.bonds != { }; - addrOpts = v: - assert v == 4 || v == 6; - { - address = mkOption { - type = types.str; - description = '' - IPv${toString v} address of the interface. Leave empty to configure the - interface using DHCP. - ''; - }; - - prefixLength = mkOption { - type = types.addCheck types.int (n: n >= 0 && n <= (if v == 4 then 32 else 128)); - description = '' - Subnet mask of the interface, specified as the number of - bits in the prefix (${if v == 4 then "24" else "64"}). - ''; - }; - }; - interfaceOpts = { name, ... }: { options = { @@ -40,36 +20,10 @@ let description = "Name of the interface."; }; - ip4 = mkOption { - default = [ ]; - example = [ - { address = "10.0.0.1"; prefixLength = 16; } - { address = "192.168.1.1"; prefixLength = 24; } - ]; - type = types.listOf types.optionSet; - options = addrOpts 4; - description = '' - List of IPv4 addresses that will be statically assigned to the interface. - ''; - }; - - ip6 = mkOption { - default = [ ]; - example = [ - { address = "fdfd:b3f0:482::1"; prefixLength = 48; } - { address = "2001:1470:fffd:2098::e006"; prefixLength = 64; } - ]; - type = types.listOf types.optionSet; - options = addrOpts 6; - description = '' - List of IPv6 addresses that will be statically assigned to the interface. - ''; - }; - ipAddress = mkOption { default = null; example = "10.0.0.1"; - type = types.nullOr types.str; + type = types.nullOr (types.str); description = '' IP address of the interface. Leave empty to configure the interface using DHCP. @@ -87,16 +41,20 @@ let }; subnetMask = mkOption { - default = null; + default = ""; + example = "255.255.255.0"; + type = types.str; description = '' - Defunct, supply the prefix length instead. + Subnet mask of the interface, specified as a bitmask. + This is deprecated; use + instead. ''; }; ipv6Address = mkOption { default = null; example = "2001:1470:fffd:2098::e006"; - type = types.nullOr types.str; + type = types.nullOr types.string; description = '' IPv6 address of the interface. Leave empty to configure the interface using NDP. @@ -266,10 +224,10 @@ in networking.interfaces = mkOption { default = {}; example = - { eth0.ip4 = [ { - address = "131.211.84.78"; - prefixLength = 25; - } ]; + { eth0 = { + ipAddress = "131.211.84.78"; + subnetMask = "255.255.255.128"; + }; }; description = '' The configuration for each network interface. If @@ -480,12 +438,6 @@ in config = { - assertions = - flip map interfaces (i: { - assertion = i.subnetMask == null; - message = "The networking.interfaces.${i.name}.subnetMask option is defunct. Use prefixLength instead."; - }); - boot.kernelModules = [ ] ++ optional cfg.enableIPv6 "ipv6" ++ optional hasVirtuals "tun" @@ -582,18 +534,12 @@ in # network device, so it only gets started after the interface # has appeared, and it's stopped when the interface # disappears. - configureInterface = i: - let - ips = i.ip4 ++ optionals cfg.enableIPv6 i.ip6 - ++ optional (i.ipAddress != null) { - ipAddress = i.ipAddress; - prefixLength = i.prefixLength; - } ++ optional (cfg.enableIPv6 && i.ipv6Address != null) { - ipAddress = i.ipv6Address; - prefixLength = i.ipv6PrefixLength; - }; + configureInterface = i: nameValuePair "${i.name}-cfg" + (let mask = + if i.prefixLength != null then toString i.prefixLength else + if i.subnetMask != "" then i.subnetMask else "32"; + staticIPv6 = cfg.enableIPv6 && i.ipv6Address != null; in - nameValuePair "${i.name}-cfg" { description = "Configuration of ${i.name}"; wantedBy = [ "network-interfaces.target" ]; bindsTo = [ "sys-subsystem-net-devices-${i.name}.device" ]; @@ -616,32 +562,36 @@ in echo "setting MTU to ${toString i.mtu}..." ip link set "${i.name}" mtu "${toString i.mtu}" '' - - # Ip Setup - + + + optionalString (i.ipAddress != null) '' - curIps=$(ip -o a show dev "${i.name}" | awk '{print $4}') - # Only do an add if it's necessary. This is + cur=$(ip -4 -o a show dev "${i.name}" | awk '{print $4}') + # Only do a flush/add if it's necessary. This is # useful when the Nix store is accessed via this # interface (e.g. in a QEMU VM test). + if [ "$cur" != "${i.ipAddress}/${mask}" ]; then + echo "configuring interface..." + ip -4 addr flush dev "${i.name}" + ip -4 addr add "${i.ipAddress}/${mask}" dev "${i.name}" + restart_network_setup=true + else + echo "skipping configuring interface" + fi '' - + flip concatMapStrings (ips) (ip: - let - address = "${ip.address}/${toString ip.prefixLength}"; - in + + optionalString (staticIPv6) '' - echo "checking ip ${address}..." - if ! echo "$curIps" | grep "${address}" >/dev/null 2>&1; then - if out=$(ip addr add "${address}" dev "${i.name}" 2>&1); then - echo "added ip ${address}..." - restart_network_setup=true - elif ! echo "$out" | grep "File exists" >/dev/null 2>&1; then - echo "failed to add ${address}" - exit 1 - fi + # Only do a flush/add if it's necessary. This is + # useful when the Nix store is accessed via this + # interface (e.g. in a QEMU VM test). + if ! ip -6 -o a show dev "${i.name}" | grep "${i.ipv6Address}/${toString i.ipv6prefixLength}"; then + echo "configuring interface..." + ip -6 addr flush dev "${i.name}" + ip -6 addr add "${i.ipv6Address}/${toString i.ipv6prefixLength}" dev "${i.name}" + restart_network_setup=true + else + echo "skipping configuring interface" fi - '') - + optionalString (ips != [ ]) + '' + + optionalString (i.ipAddress != null || staticIPv6) '' if [ restart_network_setup = true ]; then # Ensure that the default gateway remains set. @@ -658,20 +608,7 @@ in '' echo 1 > /proc/sys/net/ipv6/conf/${i.name}/proxy_ndp ''; - preStop = - '' - echo "releasing configured ip's..." - '' - + flip concatMapStrings (ips) (ip: - let - address = "${ip.address}/${toString ip.prefixLength}"; - in - '' - echo -n "Deleting ${address}..." - ip addr del "${address}" dev "${i.name}" >/dev/null 2>&1 || echo -n " Failed" - echo "" - ''); - }; + }); createTunDevice = i: nameValuePair "${i.name}" { description = "Virtual Network Interface ${i.name}"; diff --git a/nixos/tests/bittorrent.nix b/nixos/tests/bittorrent.nix index 7eb9c215ee1..002e012f65f 100644 --- a/nixos/tests/bittorrent.nix +++ b/nixos/tests/bittorrent.nix @@ -16,7 +16,7 @@ let miniupnpdConf = nodes: pkgs.writeText "miniupnpd.conf" '' ext_ifname=eth1 - listening_ip=${(head nodes.router.config.networking.interfaces.eth2.ip4).address}/24 + listening_ip=${nodes.router.config.networking.interfaces.eth2.ipAddress}/24 allow 1024-65535 192.168.2.0/24 1024-65535 ''; @@ -53,7 +53,7 @@ in { environment.systemPackages = [ pkgs.transmission ]; virtualisation.vlans = [ 2 ]; networking.defaultGateway = - (head nodes.router.config.networking.interfaces.eth2.ip4).address; + nodes.router.config.networking.interfaces.eth2.ipAddress; networking.firewall.enable = false; }; @@ -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://${(head nodes.tracker.config.networking.interfaces.eth1.ip4).address}:6969/announce -o /tmp/test.torrent"); + $tracker->succeed("transmission-create /tmp/data/test.tar.bz2 -t http://${nodes.tracker.config.networking.interfaces.eth1.ipAddress}: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/nat.nix b/nixos/tests/nat.nix index 5a57cce6b67..5fdcc0e97ca 100644 --- a/nixos/tests/nat.nix +++ b/nixos/tests/nat.nix @@ -13,7 +13,7 @@ import ./make-test.nix { { virtualisation.vlans = [ 1 ]; networking.firewall.allowPing = true; networking.defaultGateway = - (head nodes.router.config.networking.interfaces.eth2.ip4).address; + nodes.router.config.networking.interfaces.eth2.ipAddress; }; router = -- GitLab From dba5fed12b4c7502f6dc6a541483f91193a081d4 Mon Sep 17 00:00:00 2001 From: Danyil Bohdan Date: Sun, 31 Aug 2014 11:48:51 +0300 Subject: [PATCH 630/843] add game 'tcl2048' --- pkgs/games/tcl2048/builder.sh | 5 +++++ pkgs/games/tcl2048/default.nix | 19 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 +++- 3 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 pkgs/games/tcl2048/builder.sh create mode 100644 pkgs/games/tcl2048/default.nix diff --git a/pkgs/games/tcl2048/builder.sh b/pkgs/games/tcl2048/builder.sh new file mode 100644 index 00000000000..b34441cdc99 --- /dev/null +++ b/pkgs/games/tcl2048/builder.sh @@ -0,0 +1,5 @@ +source $stdenv/setup + +mkdir -p $out/bin +cp $src $out/bin/2048 +chmod +x $out/bin/2048 diff --git a/pkgs/games/tcl2048/default.nix b/pkgs/games/tcl2048/default.nix new file mode 100644 index 00000000000..4f8818ac39a --- /dev/null +++ b/pkgs/games/tcl2048/default.nix @@ -0,0 +1,19 @@ +{ stdenv, fetchurl, tcl, tcllib }: + +stdenv.mkDerivation { + name = "tcl2048-0.2.5"; + + src = fetchurl { + url = https://raw.githubusercontent.com/dbohdan/2048-tcl/v0.2.5/2048.tcl; + sha256 = "b0d6e8a31dce8c1ca8dbbb8c513b50fbfb9cd6a313201941fa15531165bf68ce"; + }; + + builder = ./builder.sh; + + meta = { + homepage = https://github.com/dbohdan/2048-tcl; + description = "The game of 2048 implemented in Tcl."; + license = stdenv.lib.licenses.mit; + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e0e97c0fe3d..fb08876f831 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2211,6 +2211,8 @@ let tboot = callPackage ../tools/security/tboot { }; + tcl2048 = callPackage ../games/tcl2048 { }; + tcpdump = callPackage ../tools/networking/tcpdump { }; tcpflow = callPackage ../tools/networking/tcpflow { }; @@ -9215,7 +9217,7 @@ let lynx = callPackage ../applications/networking/browsers/lynx { }; lyx = callPackage ../applications/misc/lyx { }; - + makeself = callPackage ../applications/misc/makeself { }; matchbox = callPackage ../applications/window-managers/matchbox { }; -- GitLab From 327cab298eae1928d4ec0662e570002244ea5846 Mon Sep 17 00:00:00 2001 From: Danyil Bohdan Date: Sun, 31 Aug 2014 12:32:14 +0300 Subject: [PATCH 631/843] tcl2048: update to 0.2.6 --- pkgs/games/tcl2048/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/games/tcl2048/default.nix b/pkgs/games/tcl2048/default.nix index 4f8818ac39a..7678242f433 100644 --- a/pkgs/games/tcl2048/default.nix +++ b/pkgs/games/tcl2048/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, tcl, tcllib }: stdenv.mkDerivation { - name = "tcl2048-0.2.5"; + name = "tcl2048-0.2.6"; src = fetchurl { - url = https://raw.githubusercontent.com/dbohdan/2048-tcl/v0.2.5/2048.tcl; - sha256 = "b0d6e8a31dce8c1ca8dbbb8c513b50fbfb9cd6a313201941fa15531165bf68ce"; + url = https://raw.githubusercontent.com/dbohdan/2048-tcl/v0.2.6/2048.tcl; + sha256 = "3a6466a214c538daec8e2d08e0c1467f10f770c74e5897bea642134e22016730"; }; builder = ./builder.sh; -- GitLab From 68917916eeecd9f01714784b2709a2110fe9f912 Mon Sep 17 00:00:00 2001 From: Danyil Bohdan Date: Sun, 31 Aug 2014 12:40:05 +0300 Subject: [PATCH 632/843] tcl2048: wrong sha256sum. --- pkgs/games/tcl2048/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/games/tcl2048/default.nix b/pkgs/games/tcl2048/default.nix index 7678242f433..01ffd27d5bb 100644 --- a/pkgs/games/tcl2048/default.nix +++ b/pkgs/games/tcl2048/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation { src = fetchurl { url = https://raw.githubusercontent.com/dbohdan/2048-tcl/v0.2.6/2048.tcl; - sha256 = "3a6466a214c538daec8e2d08e0c1467f10f770c74e5897bea642134e22016730"; + sha256 = "481eac7cccc37d1122c3069da6186f584906bd27b86b8d4ae1a2d7e355c1b6b2"; }; builder = ./builder.sh; -- GitLab From 196c6260be03f41748c0599892718d2ec5a39b95 Mon Sep 17 00:00:00 2001 From: Longrin Wischnewski Date: Sun, 31 Aug 2014 12:29:13 +0200 Subject: [PATCH 633/843] grub: fix grub merge error --- nixos/modules/system/boot/loader/grub/install-grub.pl | 5 ----- 1 file changed, 5 deletions(-) diff --git a/nixos/modules/system/boot/loader/grub/install-grub.pl b/nixos/modules/system/boot/loader/grub/install-grub.pl index 2fb771b5edf..b4900358a5d 100644 --- a/nixos/modules/system/boot/loader/grub/install-grub.pl +++ b/nixos/modules/system/boot/loader/grub/install-grub.pl @@ -178,11 +178,6 @@ sub addEntry { $conf .= " " . ($xen ? "module" : "initrd") . " $initrd\n\n"; } else { $conf .= "menuentry \"$name\" {\n"; -<<<<<<< HEAD - $conf .= $grubBoot->search . "\n"; - $conf .= $grubStore->search . "\n"; -======= ->>>>>>> parent of 469f22d... Merge pull request #2449 from wkennington/master.grub $conf .= " $extraPerEntryConfig\n" if $extraPerEntryConfig; $conf .= " multiboot $xen $xenParams\n" if $xen; $conf .= " " . ($xen ? "module" : "linux") . " $kernel $kernelParams\n"; -- GitLab From a555193ee934ef2921983b901857d29a8d9e70b0 Mon Sep 17 00:00:00 2001 From: Longrin Wischnewski Date: Sun, 31 Aug 2014 12:44:29 +0200 Subject: [PATCH 634/843] gource: update to version 0.42 --- pkgs/applications/version-management/gource/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/version-management/gource/default.nix b/pkgs/applications/version-management/gource/default.nix index 13c55476774..afe0ac71ea4 100644 --- a/pkgs/applications/version-management/gource/default.nix +++ b/pkgs/applications/version-management/gource/default.nix @@ -3,11 +3,12 @@ }: stdenv.mkDerivation rec { - name = "gource-0.40"; + version = "0.42"; + name = "gource-${version}"; src = fetchurl { - url = "http://gource.googlecode.com/files/${name}.tar.gz"; - sha256 = "04nirh07xjslqsph557as4s50nlf91bi6v2l7vmbifmkdf90m2cw"; + url = "https://github.com/acaudwell/Gource/releases/download/${name}/${name}.tar.gz"; + sha256 = "08ab57z44y8b5wxg1193j6hiy50njbpi6dwafjh6nb0apcq8ziz5"; }; buildInputs = [ -- GitLab From 59ed27db2da3867339befaa6da17778da862973b Mon Sep 17 00:00:00 2001 From: Dmitry Malikov Date: Sun, 31 Aug 2014 13:16:48 +0200 Subject: [PATCH 635/843] haskell-xml-html-conduit-lens 0.3.2.0 -> 0.3.2.1 --- .../libraries/haskell/xml-html-conduit-lens/default.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/haskell/xml-html-conduit-lens/default.nix b/pkgs/development/libraries/haskell/xml-html-conduit-lens/default.nix index 3dded2dcb44..7a53fb456f7 100644 --- a/pkgs/development/libraries/haskell/xml-html-conduit-lens/default.nix +++ b/pkgs/development/libraries/haskell/xml-html-conduit-lens/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "xml-html-conduit-lens"; - version = "0.3.2.0"; - sha256 = "150b772wkl2k8xcrcbqj3qhndjkl35qzwqdjbgs9mxp867aihiv0"; + version = "0.3.2.1"; + sha256 = "0iy58nq5b6ixdky2xr4r8xxk3c8wqp1y3jbpsk3dr1qawzjbzp12"; buildDepends = [ htmlConduit lens text xmlConduit ]; testDepends = [ doctest hspec hspecExpectationsLens lens xmlConduit @@ -17,7 +17,5 @@ cabal.mkDerivation (self: { description = "Optics for xml-conduit and html-conduit"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; - broken = true; }; }) -- GitLab From 9103b8b512d634f53873fa7c652e870b5eaa3795 Mon Sep 17 00:00:00 2001 From: Aycan iRiCAN Date: Sun, 31 Aug 2014 14:27:15 +0300 Subject: [PATCH 636/843] Bump snort and daq --- pkgs/applications/networking/ids/daq/default.nix | 6 +++--- pkgs/applications/networking/ids/snort/default.nix | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/networking/ids/daq/default.nix b/pkgs/applications/networking/ids/daq/default.nix index 36571809a37..c80d55f9412 100644 --- a/pkgs/applications/networking/ids/daq/default.nix +++ b/pkgs/applications/networking/ids/daq/default.nix @@ -1,12 +1,12 @@ {stdenv, fetchurl, flex, bison, libpcap}: stdenv.mkDerivation rec { - name = "daq-2.0.0"; + name = "daq-2.0.2"; src = fetchurl { name = "${name}.tar.gz"; - url = http://www.snort.org/downloads/2311; - sha256 = "0f0w5jfmx0n2sms4f2mfg984a27r7qh927vkd7fclvx9cbiwibzv"; + url = "http://www.snort.org/downloads/snort/${name}.tar.gz"; + sha256 = "1a39qbm9nc05yr8llawl7mz0ny1fci4acj9c2k1h4klrqikiwpfn"; }; buildInputs = [ flex bison libpcap ]; diff --git a/pkgs/applications/networking/ids/snort/default.nix b/pkgs/applications/networking/ids/snort/default.nix index 580591c18ad..65e46176fcb 100644 --- a/pkgs/applications/networking/ids/snort/default.nix +++ b/pkgs/applications/networking/ids/snort/default.nix @@ -1,12 +1,12 @@ {stdenv, fetchurl, libpcap, pcre, libdnet, daq, zlib, flex, bison}: stdenv.mkDerivation rec { - name = "snort-2.9.4.6"; + name = "snort-2.9.6.2"; src = fetchurl { name = "${name}.tar.gz"; - url = http://www.snort.org/downloads/2320; - sha256 = "1g5kn36l67a5m95h2shqwqbbjb6rgl3sf1bciakal2l4n6857ang"; + url = "http://www.snort.org/downloads/snort/${name}.tar.gz"; + sha256 = "0xsxbd5h701ncnhn9sf7zkmzravlqhn1182whinphfjjw72py7cf"; }; buildInputs = [ libpcap pcre libdnet daq zlib flex bison ]; -- GitLab From 66f525c8d6b5c00401044d800f50ade40fa45a79 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Sun, 31 Aug 2014 13:33:04 +0200 Subject: [PATCH 637/843] pypyPackages.pycryptopp: mark as not supported on pypy --- pkgs/top-level/python-packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 2ee854bdc9c..095d5eb3c06 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6089,6 +6089,7 @@ rec { pycryptopp = buildPythonPackage (rec { name = "pycryptopp-0.6.0.1206569328141510525648634803928199668821045408958"; + disabled = isPy3k || isPyPy; # see https://bitbucket.org/pypy/pypy/issue/1190/ src = fetchurl { url = "http://pypi.python.org/packages/source/p/pycryptopp/${name}.tar.gz"; -- GitLab From b497011da9bcf4c7791565d81b26c919aeb2b03d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Sun, 31 Aug 2014 13:33:18 +0200 Subject: [PATCH 638/843] pythonPackages.cffi: 0.7.2 -> 0.8.6 --- pkgs/top-level/python-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 095d5eb3c06..55944225a18 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1521,11 +1521,11 @@ rec { }; cffi = buildPythonPackage rec { - name = "cffi-0.8.6"; + name = "cffi-0.7.2"; src = fetchurl { url = "http://pypi.python.org/packages/source/c/cffi/${name}.tar.gz"; - md5 = "474b5a68299a6f05009171de1dc91be6"; + md5 = "d329f5cb2053fd31dafc02e2c9ef0299"; }; propagatedBuildInputs = [ pkgs.libffi pycparser ]; -- GitLab From 7327e3f808a5e2fa2eb239947580c5892f5f75e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Sun, 31 Aug 2014 13:41:27 +0200 Subject: [PATCH 639/843] PyPy ships with cffi, so don't use external cffi for packages --- pkgs/top-level/python-packages.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 55944225a18..31c30678ec0 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -730,7 +730,8 @@ rec { }; buildInputs = [ pkgs.btrfsProgs ]; - propagatedBuildInputs = with pkgs; [ contextlib2 sqlalchemy9 pyxdg pycparser cffi alembic ]; + propagatedBuildInputs = with pkgs; [ contextlib2 sqlalchemy9 pyxdg pycparser alembic ] + ++ optionals (!isPyPy) [ cffi ]; meta = { description = "Deduplication for Btrfs"; @@ -1513,7 +1514,7 @@ rec { md5 = "c5df008669d17dd6eeb5e2042d5e136f"; }; - buildInputs = [ cffi pycparser mock pytest py ]; + buildInputs = [ pycparser mock pytest py ] ++ optionals (!isPyPy) [ cffi ]; meta = { maintainers = [ stdenv.lib.maintainers.iElectric ]; @@ -5998,7 +5999,7 @@ rec { export DYLD_LIBRARY_PATH="${pkgs.libgit2}/lib" '' else "" ); - propagatedBuildInputs = [ pkgs.libgit2 cffi ]; + propagatedBuildInputs = [ pkgs.libgit2 ] ++ optionals (!isPyPy) [ cffi ]; preCheck = '' # disable tests that require networking -- GitLab From 47ebc25c627d2e03826dadb804b099be0199f89f Mon Sep 17 00:00:00 2001 From: Longrin Wischnewski Date: Sun, 31 Aug 2014 13:43:24 +0200 Subject: [PATCH 640/843] audacious: update to version 3.5.1 --- pkgs/applications/audio/audacious/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/audio/audacious/default.nix b/pkgs/applications/audio/audacious/default.nix index 409a831727b..49b02f46e9b 100644 --- a/pkgs/applications/audio/audacious/default.nix +++ b/pkgs/applications/audio/audacious/default.nix @@ -1,28 +1,29 @@ { stdenv, fetchurl, pkgconfig, glib, gtk3, libmowgli, libmcs , gettext, dbus_glib, libxml2, libmad, xlibs, alsaLib, libogg , libvorbis, libcdio, libcddb, flac, ffmpeg, makeWrapper +, mpg123, neon, faad2 }: let - version = "3.4.3"; + version = "3.5.1"; in stdenv.mkDerivation { name = "audacious-${version}"; src = fetchurl { url = "http://distfiles.audacious-media-player.org/audacious-${version}.tar.bz2"; - sha256 = "04lzwdr1lx6ghbfxzygvnbmdl420w6rm453ds5lyb0hlvzs58d0q"; + sha256 = "01wmlvpp540gdjw759wif3byh98h3b3q6f5wawzp0b0ivqd0wf6z"; }; pluginsSrc = fetchurl { url = "http://distfiles.audacious-media-player.org/audacious-plugins-${version}.tar.bz2"; - sha256 = "00r88q9fs9a0gicdmk2svcans7igcqgacrw303a5bn44is7pmrmy"; + sha256 = "09lyvi15hbn3pvb2izyz2bm4021917mhcdrwxrn3q3sjvx337np6"; }; buildInputs = [ gettext pkgconfig glib gtk3 libmowgli libmcs libxml2 dbus_glib libmad xlibs.libXcomposite libogg libvorbis flac alsaLib libcdio - libcddb ffmpeg makeWrapper + libcddb ffmpeg makeWrapper mpg123 neon faad2 ]; # Here we build bouth audacious and audacious-plugins in one -- GitLab From 6ad299460caccd4c4ab928d7988f7a1f0460fea8 Mon Sep 17 00:00:00 2001 From: Longrin Wischnewski Date: Sun, 31 Aug 2014 13:59:29 +0200 Subject: [PATCH 641/843] rdesktop: update to version 1.8.2 rdesktop: add meta fields --- pkgs/applications/networking/remote/rdesktop/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/remote/rdesktop/default.nix b/pkgs/applications/networking/remote/rdesktop/default.nix index 09c20618d66..7d2b7990d3f 100644 --- a/pkgs/applications/networking/remote/rdesktop/default.nix +++ b/pkgs/applications/networking/remote/rdesktop/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation (rec { pname = "rdesktop"; - version = "1.8.1"; + version = "1.8.2"; name = "${pname}-${version}"; src = fetchurl { url = "mirror://sourceforge/${pname}/${name}.tar.gz"; - sha256 = "0il248cdsxvwjsl4bswf27ld9r1a7d48jf6bycr86kf3i55q7k3n"; + sha256 = "0y0s0qjfsflp4drcn75ykx6as7mn13092bcvlp2ibhilkpa27gzv"; }; buildInputs = [openssl libX11]; @@ -20,5 +20,8 @@ stdenv.mkDerivation (rec { meta = { description = "Open source client for Windows Terminal Services"; + homepage = http://www.rdesktop.org/; + platforms = stdenv.lib.platforms.linux; + license = stdenv.lib.licenses.gpl2; }; }) -- GitLab From 57b667fe65ecd06a788f2b1d7e659747248d7e8b Mon Sep 17 00:00:00 2001 From: Michael Fellinger Date: Sat, 30 Aug 2014 13:01:02 +0200 Subject: [PATCH 642/843] ruby: add version 2.1.2 --- .../interpreters/ruby/ruby-2.1.2.nix | 72 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 1 + 2 files changed, 73 insertions(+) create mode 100644 pkgs/development/interpreters/ruby/ruby-2.1.2.nix diff --git a/pkgs/development/interpreters/ruby/ruby-2.1.2.nix b/pkgs/development/interpreters/ruby/ruby-2.1.2.nix new file mode 100644 index 00000000000..430bf4f1665 --- /dev/null +++ b/pkgs/development/interpreters/ruby/ruby-2.1.2.nix @@ -0,0 +1,72 @@ +{ stdenv, fetchurl +, zlib, zlibSupport ? true +, openssl, opensslSupport ? true +, gdbm, gdbmSupport ? true +, ncurses, readline, cursesSupport ? false +, groff, docSupport ? false +, libyaml, yamlSupport ? true +}: + +let + op = stdenv.lib.optional; + ops = stdenv.lib.optionals; +in + +stdenv.mkDerivation rec { + name = "ruby-2.1.2"; + src = fetchurl { + url = "http://cache.ruby-lang.org/pub/ruby/2.1/${name}.tar.bz2"; + sha256 = "6948b02570cdfb89a8313675d4aa665405900e27423db408401473f30fc6e901"; + }; + + # Have `configure' avoid `/usr/bin/nroff' in non-chroot builds. + NROFF = "${groff}/bin/nroff"; + + buildInputs = (ops cursesSupport [ ncurses readline ] ) + ++ (op docSupport groff ) + ++ (op zlibSupport zlib) + ++ (op opensslSupport openssl) + ++ (op gdbmSupport gdbm) + ++ (op yamlSupport libyaml) + # Looks like ruby fails to build on darwin without readline even if curses + # support is not enabled, so add readline to the build inputs if curses + # support is disabled (if it's enabled, we already have it) and we're + # running on darwin + ++ (op (!cursesSupport && stdenv.isDarwin) readline); + + enableParallelBuilding = true; + + configureFlags = ["--enable-shared" ] + # on darwin, we have /usr/include/tk.h -- so the configure script detects + # that tk is installed + ++ ( if stdenv.isDarwin then [ "--with-out-ext=tk " ] else [ ]); + + installFlags = stdenv.lib.optionalString docSupport "install-doc"; + # Bundler tries to create this directory + postInstall = '' + # Bundler tries to create this directory + mkdir -pv $out/${passthru.gemPath} + mkdir -p $out/nix-support + cat > $out/nix-support/setup-hook < Date: Sun, 31 Aug 2014 14:31:02 +0200 Subject: [PATCH 643/843] deluge: update to version 1.3.7 --- pkgs/top-level/python-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 2ee854bdc9c..56e8ffbbd8e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2948,11 +2948,11 @@ rec { }; deluge = buildPythonPackage rec { - name = "deluge-1.3.6"; + name = "deluge-1.3.7"; src = fetchurl { - url = "http://download.deluge-torrent.org/source/${name}.tar.gz"; - md5 = "33557678bf2f320de670ddaefaea009d"; + url = "http://download.deluge-torrent.org/source/${name}.tar.bz2"; + sha256 = "07m5lgkqymlh0810bk2f5l0k83n51xb3gszj11sr509jgbnxjnmm"; }; propagatedBuildInputs = with pkgs; [ -- GitLab From d4de312452c60bb1f60b31ac9d9aafa90bb8bdfc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Sun, 31 Aug 2014 15:07:01 +0200 Subject: [PATCH 644/843] pypyPackages: use pypy internal greenlet module --- pkgs/top-level/python-packages.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 7632af13c65..dc8f70d936c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3324,7 +3324,7 @@ rec { buildInputs = [ nose httplib2 ]; - propagatedBuildInputs = [ greenlet ]; + propagatedBuildInputs = optionals (!isPyPy) [ greenlet ]; PYTHON_EGG_CACHE = "`pwd`/.egg-cache"; @@ -3615,7 +3615,7 @@ rec { gevent = buildPythonPackage rec { name = "gevent-1.0.1"; - disabled = isPy3k; + disabled = isPy3k || isPyPy; # see https://github.com/surfly/gevent/issues/248 src = fetchurl { url = "https://pypi.python.org/packages/source/g/gevent/${name}.tar.gz"; @@ -3623,7 +3623,7 @@ rec { }; buildInputs = [ pkgs.libev ]; - propagatedBuildInputs = [ greenlet ]; + propagatedBuildInputs = optionals (!isPyPy) [ greenlet ]; meta = with stdenv.lib; { description = "Coroutine-based networking library"; @@ -8699,6 +8699,7 @@ rec { pyuv = buildPythonPackage rec { name = "pyuv-0.11.5"; + disabled = isPyPy; # see https://github.com/saghul/pyuv/issues/49 src = fetchurl { url = "https://github.com/saghul/pyuv/archive/${name}.tar.gz"; -- GitLab From b63496ba6b03080f99fb56671ec6ef60b340e6a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Sun, 31 Aug 2014 15:12:17 +0200 Subject: [PATCH 645/843] Revert "h5py: New package, version 2.3.1" This reverts commit 3c6afb34967a241e2c2e106cb02bad55b5389b94. Doesn't build. --- .../python-modules/h5py/default.nix | 43 ------------------- pkgs/top-level/python-packages.nix | 13 ------ 2 files changed, 56 deletions(-) delete mode 100644 pkgs/development/python-modules/h5py/default.nix diff --git a/pkgs/development/python-modules/h5py/default.nix b/pkgs/development/python-modules/h5py/default.nix deleted file mode 100644 index 9ab68ac4cd2..00000000000 --- a/pkgs/development/python-modules/h5py/default.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ stdenv, fetchurl, python, buildPythonPackage -, numpy, hdf5, cython -, mpiSupport ? false, mpi4py ? null, mpi ? null }: - -assert mpiSupport == hdf5.mpiSupport; -assert mpiSupport -> mpi != null - && mpi4py != null - && mpi == mpi4py.mpi - && mpi == hdf5.mpi - ; - -with stdenv.lib; - -buildPythonPackage rec { - name = "h5py-2.3.1"; - - src = fetchurl { - url = "https://pypi.python.org/packages/source/h/h5py/${name}.tar.gz"; - md5 = "8f32f96d653e904d20f9f910c6d9dd91"; - }; - - setupPyBuildFlags = [ "--hdf5=${hdf5}" ] - ++ optional mpiSupport "--mpi" - ; - setupPyInstallFlags = setupPyBuildFlags; - - preBuild = if mpiSupport then "export CC=${mpi}/bin/mpicc" else ""; - - buildInputs = [ hdf5 cython ] - ++ optional mpiSupport mpi - ; - propagatedBuildInputs = [ numpy ] - ++ optional mpiSupport mpi4py - ; - - meta = { - description = " - The h5py package is a Pythonic interface to the HDF5 binary data format. - "; - homepage = "http://www.h5py.org/"; - license = stdenv.lib.licenses.bsd2; - }; -} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index dc8f70d936c..dad9da5324d 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -90,19 +90,6 @@ rec { ''; }; - h5py = callPackage ../development/python-modules/h5py { - inherit (pkgs) stdenv fetchurl; - inherit python buildPythonPackage cython numpy; - hdf5 = pkgs.hdf5.override { mpi = null; }; - }; - - h5py-mpi = h5py.override { - mpiSupport = true; - mpi = pkgs.openmpi; - hdf5 = pkgs.hdf5.override { mpi = pkgs.openmpi; enableShared = true; }; - inherit mpi4py; - }; - ipython = import ../shells/ipython { inherit (pkgs) stdenv fetchurl sip pyqt4; inherit buildPythonPackage pythonPackages; -- GitLab From 7e91d1c8a1a4c822562dd058e0efebbc99aca2d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Sun, 31 Aug 2014 15:12:34 +0200 Subject: [PATCH 646/843] Revert "mpi4py: New package, version 1.3.1" This reverts commit 63c062947eb765e4a02bc892e1891da7057fdfec. Doesn't build. --- .../python-modules/mpi4py/default.nix | 45 ------------------- pkgs/top-level/python-packages.nix | 6 --- 2 files changed, 51 deletions(-) delete mode 100644 pkgs/development/python-modules/mpi4py/default.nix diff --git a/pkgs/development/python-modules/mpi4py/default.nix b/pkgs/development/python-modules/mpi4py/default.nix deleted file mode 100644 index 74d46def907..00000000000 --- a/pkgs/development/python-modules/mpi4py/default.nix +++ /dev/null @@ -1,45 +0,0 @@ -{ stdenv, fetchurl, python, buildPythonPackage, mpi, openssh }: - -buildPythonPackage rec { - name = "mpi4py-1.3.1"; - - src = fetchurl { - url = "https://bitbucket.org/mpi4py/mpi4py/downloads/${name}.tar.gz"; - sha256 = "e7bd2044aaac5a6ea87a87b2ecc73b310bb6efe5026031e33067ea3c2efc3507"; - }; - - passthru = { - inherit mpi; - }; - - configurePhase = ""; - - installPhase = '' - mkdir -p "$out/lib/${python.libPrefix}/site-packages" - export PYTHONPATH="$out/lib/${python.libPrefix}/site-packages:$PYTHONPATH" - - ${python}/bin/${python.executable} setup.py install \ - --install-lib=$out/lib/${python.libPrefix}/site-packages \ - --prefix="$out" - - # --install-lib: - # sometimes packages specify where files should be installed outside the usual - # python lib prefix, we override that back so all infrastructure (setup hooks) - # work as expected - ''; - - setupPyBuildFlags = ["--mpicc=${mpi}/bin/mpicc"]; - - buildInputs = [ mpi ]; - # Requires openssh for tests. Tests of dependent packages will also fail, - # if openssh is not present. E.g. h5py with mpi support. - propagatedBuildInputs = [ openssh ]; - - meta = { - description = " - Provides Python bindings for the Message Passing Interface standard. - "; - homepage = "http://code.google.com/p/mpi4py/"; - license = stdenv.lib.licenses.bsd3; - }; -} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index dad9da5324d..6ec68d5537e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -106,12 +106,6 @@ rec { pylabQtSupport = false; }); - mpi4py = callPackage ../development/python-modules/mpi4py { - inherit (pkgs) stdenv fetchurl openssh; - inherit python buildPythonPackage; - mpi = pkgs.openmpi; - }; - nixpart = callPackage ../tools/filesystems/nixpart { }; # This is used for NixOps to make sure we won't break it with the next major -- GitLab From 9447a855f2996d9e462665c9985343aadc0fdcaf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= Date: Sun, 31 Aug 2014 12:11:15 +0200 Subject: [PATCH 647/843] lv2: update from 1.8.0 to 1.10.0 --- pkgs/development/libraries/audio/lv2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/audio/lv2/default.nix b/pkgs/development/libraries/audio/lv2/default.nix index 25d19d089a5..f03f6b3d371 100644 --- a/pkgs/development/libraries/audio/lv2/default.nix +++ b/pkgs/development/libraries/audio/lv2/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "lv2-${version}"; - version = "1.8.0"; + version = "1.10.0"; src = fetchurl { url = "http://lv2plug.in/spec/${name}.tar.bz2"; - sha256 = "1mxkp7gajh1alw6s358cqwf3qkpr1ld9wfxwswnqrxcd9a7hxjd4"; + sha256 = "1md41x9snrp4mcfyli7lyfpvcfa78nfy6xkdy84kppnl8m5qw378"; }; buildInputs = [ gtk libsndfile pkgconfig python ]; -- GitLab From b820c284d7f1fb4f298e60395659dedb4f351e60 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= Date: Sun, 31 Aug 2014 12:11:36 +0200 Subject: [PATCH 648/843] sratom: update from 0.4.4 to 0.4.6 --- pkgs/development/libraries/audio/sratom/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/audio/sratom/default.nix b/pkgs/development/libraries/audio/sratom/default.nix index ac0b9d233fa..a4ba4c16c87 100644 --- a/pkgs/development/libraries/audio/sratom/default.nix +++ b/pkgs/development/libraries/audio/sratom/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "sratom-${version}"; - version = "0.4.4"; + version = "0.4.6"; src = fetchurl { url = "http://download.drobilla.net/${name}.tar.bz2"; - sha256 = "1q4044md8nmqah8ay5mf4lgdl6x0sfa4cjqyqk9da8nqzvs2j37s"; + sha256 = "080jjiyxjnj7hf25844hd9rb01grvzz1rk8mxcdnakywmspbxfd4"; }; buildInputs = [ lv2 pkgconfig python serd sord ]; -- GitLab From dcbfff28f31b354ecb033c43b9fef3c84ddd9e44 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= Date: Sun, 31 Aug 2014 12:13:25 +0200 Subject: [PATCH 649/843] jalv: update from 1.4.4 to 1.4.6 --- pkgs/applications/audio/jalv/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/jalv/default.nix b/pkgs/applications/audio/jalv/default.nix index 70ef5bdec5c..bf01fe1a935 100644 --- a/pkgs/applications/audio/jalv/default.nix +++ b/pkgs/applications/audio/jalv/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "jalv-${version}"; - version = "1.4.4"; + version = "1.4.6"; src = fetchurl { url = "http://download.drobilla.net/${name}.tar.bz2"; - sha256 = "1iql1r52rmf87q6jkxhcxa3lpq7idzzg55ma91wphywyvh29q7lf"; + sha256 = "1f1hcq74n3ziw8bk97mn5a1vgw028dxikv3fchaxd430pbbhqgl9"; }; buildInputs = [ -- GitLab From 2bfe0a5d38ad56b20e99342c3cf546b7fa3c7884 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= Date: Sun, 31 Aug 2014 15:22:05 +0200 Subject: [PATCH 650/843] guitarix: update from 0.28.3 to 0.30.0 --- pkgs/applications/audio/guitarix/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/guitarix/default.nix b/pkgs/applications/audio/guitarix/default.nix index 777c0ddb2e3..46237a6c1c7 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.28.3"; + version = "0.30.0"; src = fetchurl { url = "mirror://sourceforge/guitarix/guitarix2-${version}.tar.bz2"; - sha256 = "0ks5avylyicqfj9l1wf4gj62i8m6is2jmp0h11h5l2wbg3xiwxjd"; + sha256 = "0fbapd1pcixzlqxgzb2s2q1c64g9z9lf4hz3vy73z55cnpk72vdx"; }; buildInputs = [ -- GitLab From 80da458388154a64279b0e4992c3f4058a6246fc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= Date: Sun, 31 Aug 2014 15:44:44 +0200 Subject: [PATCH 651/843] guitarix: fix 0.30.0 build by adding new dependencies --- pkgs/applications/audio/guitarix/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/audio/guitarix/default.nix b/pkgs/applications/audio/guitarix/default.nix index 46237a6c1c7..e593ddf41e6 100644 --- a/pkgs/applications/audio/guitarix/default.nix +++ b/pkgs/applications/audio/guitarix/default.nix @@ -1,6 +1,6 @@ -{ stdenv, fetchurl, avahi, boost, fftw, gettext, glib, glibmm, gtk -, gtkmm, intltool, jack2, ladspaH, librdf, libsndfile, lv2 -, pkgconfig, python }: +{ stdenv, fetchurl, avahi, boost, eigen, fftw, gettext, glib, glibmm, gtk +, gtkmm, intltool, jack2, ladspaH, librdf, libsndfile, lilv, lv2 +, pkgconfig, python, serd, sord, sratom }: stdenv.mkDerivation rec { name = "guitarix-${version}"; @@ -12,8 +12,8 @@ stdenv.mkDerivation rec { }; buildInputs = [ - avahi boost fftw gettext glib glibmm gtk gtkmm intltool jack2 - ladspaH librdf libsndfile lv2 pkgconfig python + avahi boost eigen fftw gettext glib glibmm gtk gtkmm intltool jack2 + ladspaH librdf libsndfile lilv lv2 pkgconfig python serd sord sratom ]; configurePhase = "python waf configure --prefix=$out"; -- GitLab From cdb3e6fa2fcc988b61251e5db714dad361db70e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Sun, 31 Aug 2014 15:51:54 +0200 Subject: [PATCH 652/843] python33Packages.sqlalchemy(8): fix build --- pkgs/top-level/python-packages.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 6ec68d5537e..7b39b083eea 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8027,6 +8027,9 @@ rec { # waiting for 0.7.11 release ../development/python-modules/sqlalchemy-0.7.10-test-failures.patch ]; + preConfigure = optionalString isPy3k '' + python3 sa2to3.py --no-diffs -w lib test examples + ''; }); sqlalchemy8 = pkgs.lib.overrideDerivation sqlalchemy9 (args: rec { @@ -8035,6 +8038,9 @@ rec { url = "https://pypi.python.org/packages/source/S/SQLAlchemy/${name}.tar.gz"; md5 = "4f3377306309e46739696721b1785335"; }; + preConfigure = optionalString isPy3k '' + python3 sa2to3.py --no-diffs -w lib test examples + ''; }); sqlalchemy9 = buildPythonPackage rec { -- GitLab From 933bca648fca37bf8516c34a81cfbec1d81dd040 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= Date: Sun, 31 Aug 2014 16:09:08 +0200 Subject: [PATCH 653/843] hydrogen: 0.9.5.1 -> 0.9.6 --- pkgs/applications/audio/hydrogen/default.nix | 28 ++++--------------- .../audio/hydrogen/scons-env.patch | 28 ------------------- 2 files changed, 6 insertions(+), 50 deletions(-) delete mode 100644 pkgs/applications/audio/hydrogen/scons-env.patch diff --git a/pkgs/applications/audio/hydrogen/default.nix b/pkgs/applications/audio/hydrogen/default.nix index 10f15f5882c..72e546246d5 100644 --- a/pkgs/applications/audio/hydrogen/default.nix +++ b/pkgs/applications/audio/hydrogen/default.nix @@ -1,35 +1,19 @@ -{ stdenv, fetchurl, alsaLib, boost, glib, jack2, ladspaPlugins -, libarchive, liblrdf , libsndfile, pkgconfig, qt4, scons, subversion }: +{ stdenv, fetchurl, alsaLib, boost, cmake, glib, jack2, libarchive +, liblrdf, libsndfile, pkgconfig, qt4 }: stdenv.mkDerivation rec { - version = "0.9.5.1"; + version = "0.9.6"; name = "hydrogen-${version}"; src = fetchurl { - url = "mirror://sourceforge/hydrogen/hydrogen-${version}.tar.gz"; - sha256 = "1fvyp6gfzcqcc90dmaqbm11p272zczz5pfz1z4lj33nfr7z0bqgb"; + url = "https://github.com/hydrogen-music/hydrogen/archive/${version}.tar.gz"; + sha256 = "1z7j8aq158mp41iv78j0w6fyx98y1y51z592b4x5hkvicabgck5w"; }; buildInputs = [ - alsaLib boost glib jack2 ladspaPlugins libarchive liblrdf - libsndfile pkgconfig qt4 scons subversion + alsaLib boost cmake glib jack2 libarchive liblrdf libsndfile pkgconfig qt4 ]; - patches = [ ./scons-env.patch ]; - - postPatch = '' - sed -e 's#/usr/lib/ladspa#${ladspaPlugins}/lib/ladspa#' -i libs/hydrogen/src/preferences.cpp - sed '/\/usr/d' -i libs/hydrogen/src/preferences.cpp - sed "s#pkg_ver.rstrip().split('.')#pkg_ver.rstrip().split('.')[:3]#" -i Sconstruct - ''; - - # why doesn't scons find librdf? - buildPhase = '' - scons prefix=$out libarchive=1 lrdf=0 install - ''; - - installPhase = ":"; - meta = with stdenv.lib; { description = "Advanced drum machine"; homepage = http://www.hydrogen-music.org; diff --git a/pkgs/applications/audio/hydrogen/scons-env.patch b/pkgs/applications/audio/hydrogen/scons-env.patch deleted file mode 100644 index ebc17f67872..00000000000 --- a/pkgs/applications/audio/hydrogen/scons-env.patch +++ /dev/null @@ -1,28 +0,0 @@ ---- hydrogen-0.9.5/Sconstruct 2011-03-15 13:22:35.000000000 +0100 -+++ hydrogen-0.9.5/Sconstruct 2011-04-17 16:06:54.000000000 +0200 -@@ -178,7 +178,7 @@ - - includes.append( "libs/hydrogen/include" ) - -- env = Environment( options = opts ) -+ env = Environment( options = opts, ENV = os.environ ) - - - #location of qt4.py -@@ -298,7 +298,6 @@ - - for N in glob.glob('./data/i18n/hydrogen.*'): - env.Alias(target="install", source=env.Install(dir= env['DESTDIR'] + env['prefix'] + '/share/hydrogen/data/i18n', source=N)) -- env.Alias(target="install", source=env.Install(dir= env['DESTDIR'] + env['prefix'] + '/share/hydrogen/data', source="./data/img")) - - #add every img in ./data/img to the install list. - os.path.walk("./data/img/",install_images,env) -@@ -379,7 +379,7 @@ - - includes, a , b = get_platform_flags( opts ) - --env = Environment(options = opts, CPPPATH = includes) -+env = Environment(options = opts, ENV = os.environ) - - - Help(opts.GenerateHelpText(env)) -- GitLab From 9785c31c9800a821bc2c92a04d2c532cc71c40f1 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sun, 31 Aug 2014 17:18:35 +0400 Subject: [PATCH 654/843] Update ASDF --- pkgs/development/lisp-modules/asdf/default.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/development/lisp-modules/asdf/default.nix b/pkgs/development/lisp-modules/asdf/default.nix index 97e1661544b..100577b3a7f 100644 --- a/pkgs/development/lisp-modules/asdf/default.nix +++ b/pkgs/development/lisp-modules/asdf/default.nix @@ -3,11 +3,11 @@ let s = # Generated upstream information rec { baseName="asdf"; - version="3.1.2"; + version="3.1.3"; name="${baseName}-${version}"; - hash="0d427908q4hcspmdhc5ps38dbvz113hy6687l9ypmfl79qfb2qki"; - url="http://common-lisp.net/project/asdf/archives/asdf-3.1.2.tar.gz"; - sha256="0d427908q4hcspmdhc5ps38dbvz113hy6687l9ypmfl79qfb2qki"; + hash="11jgbl2ys98i7lir0z76g0msm89zmz1b91gwkdz0gnxr6gavj6cn"; + url="http://common-lisp.net/project/asdf/archives/asdf-3.1.3.tar.gz"; + sha256="11jgbl2ys98i7lir0z76g0msm89zmz1b91gwkdz0gnxr6gavj6cn"; }; buildInputs = [ texinfo texLive @@ -29,7 +29,6 @@ stdenv.mkDerivation { cp -r ./* "$out"/lib/common-lisp/asdf/ cp -r doc/* "$out"/share/doc/asdf/ ''; - sourceRoot="."; meta = { inherit (s) version; description = ''Standard software-system definition library for Common Lisp''; -- GitLab From fe549d89be7df890d9403c2ad77fabc28950e292 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sun, 31 Aug 2014 17:22:23 +0400 Subject: [PATCH 655/843] Update CL-Launch --- pkgs/development/tools/misc/cl-launch/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/misc/cl-launch/default.nix b/pkgs/development/tools/misc/cl-launch/default.nix index d66ca9868f5..085af9df3a3 100644 --- a/pkgs/development/tools/misc/cl-launch/default.nix +++ b/pkgs/development/tools/misc/cl-launch/default.nix @@ -3,11 +3,11 @@ let s = # Generated upstream information rec { baseName="cl-launch"; - version="4.0.5"; + version="4.1"; name="${baseName}-${version}"; - hash="00i11pkwsb9r9cjzxjmj0dsp369i0gpz04f447xss9a9v192dhlj"; - url="http://common-lisp.net/project/xcvb/cl-launch/cl-launch-4.0.5.tar.gz"; - sha256="00i11pkwsb9r9cjzxjmj0dsp369i0gpz04f447xss9a9v192dhlj"; + hash="0fmxa8013sgxmbfmh1wqffywg72zynzlw5yyrdvy9qpx1my36pwb"; + url="http://common-lisp.net/project/xcvb/cl-launch/cl-launch-4.1.tar.gz"; + sha256="0fmxa8013sgxmbfmh1wqffywg72zynzlw5yyrdvy9qpx1my36pwb"; }; buildInputs = [ ]; -- GitLab From b28d7974fb5e8e3a117ee81c066d5632bcdf030e Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sun, 31 Aug 2014 17:27:03 +0400 Subject: [PATCH 656/843] Update SysDig --- pkgs/os-specific/linux/sysdig/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/sysdig/default.nix b/pkgs/os-specific/linux/sysdig/default.nix index d5e2ed3ff94..4abbb4c45b4 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.87"; + version = "0.1.88"; name="${baseName}-${version}"; url="https://github.com/draios/sysdig/archive/${version}.tar.gz"; - sha256="0xfildaj8kzbngpza47zqm363i6q87m97a18qlmdisrxmz11s32b"; + sha256 = "1a4ij3qpk1h7xnyhic6p21jp46p9lpnagfl46ky46snflld4bz96"; }; buildInputs = [ cmake zlib luajit -- GitLab From bddcee774715efe189857c19228d18639fa04952 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sun, 31 Aug 2014 17:28:05 +0400 Subject: [PATCH 657/843] Update Firejail --- pkgs/os-specific/linux/firejail/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/linux/firejail/default.nix b/pkgs/os-specific/linux/firejail/default.nix index c1fa2c26205..d7f3d293c48 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.8.1"; + version="0.9.10"; name="${baseName}-${version}"; - hash="0wjanz42k301zdwv06ylnzqrabxy424j0k9dh4i4aqhvihvxr83x"; - url="mirror://sourceforge/project/firejail/firejail/firejail-0.9.8.1.tar.bz2"; - sha256="0wjanz42k301zdwv06ylnzqrabxy424j0k9dh4i4aqhvihvxr83x"; + hash="0pjzs77r86nnhddpfm39f0a4lrzahq0cwi8d2wsg35gxvb19w1jg"; + url="mirror://sourceforge/project/firejail/firejail/firejail-0.9.10.tar.bz2"; + sha256="0pjzs77r86nnhddpfm39f0a4lrzahq0cwi8d2wsg35gxvb19w1jg"; }; buildInputs = [ ]; -- GitLab From 3bbf64b6d08bd0b3cf3ac8564f8f79c5d51b22eb Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sun, 31 Aug 2014 17:40:20 +0400 Subject: [PATCH 658/843] Update unstable Wine --- pkgs/misc/emulators/wine/unstable.nix | 4 ++-- pkgs/misc/emulators/wine/unstable.upstream | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/misc/emulators/wine/unstable.nix b/pkgs/misc/emulators/wine/unstable.nix index cd5c5a8b479..a7d52f2bca4 100644 --- a/pkgs/misc/emulators/wine/unstable.nix +++ b/pkgs/misc/emulators/wine/unstable.nix @@ -7,12 +7,12 @@ assert stdenv.isLinux; assert stdenv.gcc.gcc != null; let - version = "1.7.23"; + version = "1.7.25"; name = "wine-${version}"; src = fetchurl { url = "mirror://sourceforge/wine/${name}.tar.bz2"; - sha256 = "012ww1yifayakw9n2m23sx83dc3i2xiq3bn5n9iprppdhwxpp76v"; + sha256 = "0h7mijxv5nhn0nn5knr8arq9bl7chi3diaa668yyhjbxwn15xqzm"; }; gecko = fetchurl { diff --git a/pkgs/misc/emulators/wine/unstable.upstream b/pkgs/misc/emulators/wine/unstable.upstream index e3616df7680..fa78360c76a 100644 --- a/pkgs/misc/emulators/wine/unstable.upstream +++ b/pkgs/misc/emulators/wine/unstable.upstream @@ -1,5 +1,5 @@ url http://sourceforge.net/projects/wine/files/Source/ -attribute_name wine_unstable +attribute_name wineUnstable version_link '[.]tar[.][^./]+/download$' SF_redirect do_overwrite () { -- GitLab From 27ffa4093da85274cd7efe63db86ebaac2c5ca63 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sun, 31 Aug 2014 17:42:14 +0400 Subject: [PATCH 659/843] Update libgphoto2 --- pkgs/development/libraries/libgphoto2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libgphoto2/default.nix b/pkgs/development/libraries/libgphoto2/default.nix index ca8073fbe30..dc041490f78 100644 --- a/pkgs/development/libraries/libgphoto2/default.nix +++ b/pkgs/development/libraries/libgphoto2/default.nix @@ -5,7 +5,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://sourceforge/gphoto/${name}.tar.bz2"; - sha256 = "1h0bwrbc69yq561pw4fjyclwvk0g6rrj3pw6zrdx33isipi15d2z"; + sha256 = "1w2bfy6619fgrigasgmx3lnill8c99lq7blmy2bpp0qqqqwdb93d"; }; nativeBuildInputs = [ pkgconfig gettext ]; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { MTP, and other vendor specific protocols for controlling and transferring data from digital cameras. ''; - version = "2.5.4"; + version = "2.5.5"; # XXX: the homepage claims LGPL, but several src files are lgpl21Plus license = stdenv.lib.licenses.lgpl21Plus; platforms = with stdenv.lib.platforms; unix; -- GitLab From 7b4f0e2265a098a452bd7c74d95c7789cbd8c702 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sun, 31 Aug 2014 17:43:52 +0400 Subject: [PATCH 660/843] Update Sodiuum library --- pkgs/development/libraries/sodium/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/sodium/default.nix b/pkgs/development/libraries/sodium/default.nix index be52725f2c8..266675614ce 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="0.6.1"; + version="0.7.0"; name="${baseName}-${version}"; - hash="151nril3kzkpmy6khvqphk4zk15ri0dqv0isyyhz6n9nsbmzxk04"; - url="http://download.dnscrypt.org/libsodium/releases/libsodium-0.6.1.tar.gz"; - sha256="151nril3kzkpmy6khvqphk4zk15ri0dqv0isyyhz6n9nsbmzxk04"; + hash="0s4iis5h7yh27kamwic3rddyp5ra941bcqcawa37grjvl78zzjjc"; + url="http://download.dnscrypt.org/libsodium/releases/libsodium-0.7.0.tar.gz"; + sha256="0s4iis5h7yh27kamwic3rddyp5ra941bcqcawa37grjvl78zzjjc"; }; buildInputs = [ ]; -- GitLab From 7a998aca73423bee82b983e8fd34ce1da6e076f6 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sun, 31 Aug 2014 17:44:47 +0400 Subject: [PATCH 661/843] Update SlimerJS --- pkgs/development/tools/slimerjs/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/slimerjs/default.nix b/pkgs/development/tools/slimerjs/default.nix index 9741b0930d2..23b7d9e692c 100644 --- a/pkgs/development/tools/slimerjs/default.nix +++ b/pkgs/development/tools/slimerjs/default.nix @@ -3,11 +3,11 @@ let s = # Generated upstream information rec { baseName="slimerjs"; - version="0.9.1"; + version="0.9.2"; name="${baseName}-${version}"; - hash="1ss69z2794mv40nfa5bfjd8h78jzcjq5xm63hzay1iyvp5rjbl7k"; - url="http://download.slimerjs.org/v0.9/0.9.1/slimerjs-0.9.1.zip"; - sha256="1ss69z2794mv40nfa5bfjd8h78jzcjq5xm63hzay1iyvp5rjbl7k"; + hash="0817f3aq0gn04q4hq43xk4av02d86s2001lg5s5p38phd2jvh703"; + url="http://download.slimerjs.org/releases/0.9.2/slimerjs-0.9.2.zip"; + sha256="0817f3aq0gn04q4hq43xk4av02d86s2001lg5s5p38phd2jvh703"; }; buildInputs = [ unzip zip -- GitLab From 1bfcc7b4774bb58ceb05e0536b5b86a4a7977607 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sun, 31 Aug 2014 17:47:03 +0400 Subject: [PATCH 662/843] Update SCons --- pkgs/development/tools/build-managers/scons/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/build-managers/scons/default.nix b/pkgs/development/tools/build-managers/scons/default.nix index 93f7699481c..e173f827664 100644 --- a/pkgs/development/tools/build-managers/scons/default.nix +++ b/pkgs/development/tools/build-managers/scons/default.nix @@ -2,7 +2,7 @@ let name = "scons"; - version = "2.3.2"; + version = "2.3.3"; in stdenv.mkDerivation { @@ -10,7 +10,7 @@ stdenv.mkDerivation { src = fetchurl { url = "mirror://sourceforge/scons/${name}-${version}.tar.gz"; - sha256 = "1m29lhwz7p6k4f8wc8qjpwa89058lzq3vrycgxbfc5cmbq6354zr"; + sha256 = "1qn0gk4k796a6vwsq62w80d6w96r9xh6kz7aa14xb6md2884x9v3"; }; buildInputs = [python makeWrapper]; -- GitLab From 5fc69283f51daae7811755f24073b18c995e3efb Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sun, 31 Aug 2014 17:52:07 +0400 Subject: [PATCH 663/843] Update SBCL --- pkgs/development/compilers/sbcl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/sbcl/default.nix b/pkgs/development/compilers/sbcl/default.nix index d3892d43d15..535f2697fea 100644 --- a/pkgs/development/compilers/sbcl/default.nix +++ b/pkgs/development/compilers/sbcl/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "sbcl-${version}"; - version = "1.2.0"; + version = "1.2.3"; src = fetchurl { url = "mirror://sourceforge/project/sbcl/sbcl/${version}/${name}-source.tar.bz2"; - sha256 = "13k20sys1v4lvgis8cnbczww6zs93rw176vz07g4jx06418k53x2"; + sha256 = "0lz2a79dlxxyw05s14l6xp35zjsazgbp1dmqygqi0cmd8dc5vj6j"; }; buildInputs = [ ] -- GitLab From 8bc60391c65bd7e37c9bb1b5206b76ac67a4f55a Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sun, 31 Aug 2014 18:24:41 +0400 Subject: [PATCH 664/843] Remove old version of LibreOffice dependencies: we now have fresh LibreOffice, the old versions of deps are not used otherwise, and they require old versions of more packages --- pkgs/development/libraries/libe-book/0.0.nix | 30 ------------------- .../libraries/libe-book/0.0.upstream | 4 --- pkgs/development/libraries/libmwaw/0.2.nix | 29 ------------------ .../libraries/libmwaw/0.2.upstream | 4 --- pkgs/top-level/all-packages.nix | 2 -- 5 files changed, 69 deletions(-) delete mode 100644 pkgs/development/libraries/libe-book/0.0.nix delete mode 100644 pkgs/development/libraries/libe-book/0.0.upstream delete mode 100644 pkgs/development/libraries/libmwaw/0.2.nix delete mode 100644 pkgs/development/libraries/libmwaw/0.2.upstream diff --git a/pkgs/development/libraries/libe-book/0.0.nix b/pkgs/development/libraries/libe-book/0.0.nix deleted file mode 100644 index 2dc8de67039..00000000000 --- a/pkgs/development/libraries/libe-book/0.0.nix +++ /dev/null @@ -1,30 +0,0 @@ -{stdenv, fetchurl, gperf, pkgconfig, librevenge, libxml2, boost, icu, cppunit -, libwpd}: -let - s = # Generated upstream information - rec { - baseName="libe-book"; - version="0.0.3"; - name="${baseName}-${version}"; - hash="06xhg319wbqrkj8914npasv5lr7k2904mmy7wa78063mkh31365i"; - url="mirror://sourceforge/project/libebook/libe-book-0.0.3/libe-book-0.0.3.tar.xz"; - sha256="06xhg319wbqrkj8914npasv5lr7k2904mmy7wa78063mkh31365i"; - }; - buildInputs = [ - gperf pkgconfig librevenge libxml2 boost icu cppunit libwpd - ]; -in -stdenv.mkDerivation { - inherit (s) name version; - inherit buildInputs; - src = fetchurl { - inherit (s) url sha256; - }; - meta = { - inherit (s) version; - description = ''Library for import of reflowable e-book formats''; - license = stdenv.lib.licenses.lgpl21Plus ; - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.linux; - }; -} diff --git a/pkgs/development/libraries/libe-book/0.0.upstream b/pkgs/development/libraries/libe-book/0.0.upstream deleted file mode 100644 index e2994f52691..00000000000 --- a/pkgs/development/libraries/libe-book/0.0.upstream +++ /dev/null @@ -1,4 +0,0 @@ -url http://sourceforge.net/projects/libebook/files/ -SF_version_dir libe-book-0.0. -version_link '[.]tar.xz/download$' -SF_redirect diff --git a/pkgs/development/libraries/libmwaw/0.2.nix b/pkgs/development/libraries/libmwaw/0.2.nix deleted file mode 100644 index d66414b6814..00000000000 --- a/pkgs/development/libraries/libmwaw/0.2.nix +++ /dev/null @@ -1,29 +0,0 @@ -{stdenv, fetchurl, boost, pkgconfig, cppunit, zlib, libwpg, libwpd, librevenge}: -let - s = # Generated upstream information - rec { - baseName="libmwaw"; - version="0.2.1"; - name="${baseName}-${version}"; - hash="1fil1ll84pq0k3g6rcc2xfg1yrigkljp4ay5p2wpwd9qlmfvvvqn"; - url="mirror://sourceforge/project/libmwaw/libmwaw/libmwaw-0.2.1/libmwaw-0.2.1.tar.xz"; - sha256="1fil1ll84pq0k3g6rcc2xfg1yrigkljp4ay5p2wpwd9qlmfvvvqn"; - }; - buildInputs = [ - boost pkgconfig cppunit zlib libwpg libwpd librevenge - ]; -in -stdenv.mkDerivation { - inherit (s) name version; - inherit buildInputs; - src = fetchurl { - inherit (s) url sha256; - }; - meta = { - inherit (s) version; - description = ''Import library for some old mac text documents''; - license = stdenv.lib.licenses.mpl20 ; - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.linux; - }; -} diff --git a/pkgs/development/libraries/libmwaw/0.2.upstream b/pkgs/development/libraries/libmwaw/0.2.upstream deleted file mode 100644 index 8ce00ecf767..00000000000 --- a/pkgs/development/libraries/libmwaw/0.2.upstream +++ /dev/null @@ -1,4 +0,0 @@ -url http://sourceforge.net/projects/libmwaw/files/libmwaw/ -SF_version_dir libmwaw-0.2. -version_link '[.]tar.xz/download$' -SF_redirect diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ec8f9c00b2c..2478d881182 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5235,7 +5235,6 @@ let liblscp = callPackage ../development/libraries/liblscp { }; libe-book = callPackage ../development/libraries/libe-book {}; - libe-book_00 = callPackage ../development/libraries/libe-book/0.0.nix {}; libev = builderDefsPackage ../development/libraries/libev { }; @@ -5452,7 +5451,6 @@ let libmusicbrainz = libmusicbrainz3; libmwaw = callPackage ../development/libraries/libmwaw { }; - libmwaw_02 = callPackage ../development/libraries/libmwaw/0.2.nix { }; libmx = callPackage ../development/libraries/libmx { }; -- GitLab From a3d0fcda139d42f0cd72e00bef90d3d94f77ccb6 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sun, 31 Aug 2014 18:36:07 +0400 Subject: [PATCH 665/843] Update serf --- pkgs/development/libraries/serf/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/serf/default.nix b/pkgs/development/libraries/serf/default.nix index 409b5db0104..873f59dba3a 100644 --- a/pkgs/development/libraries/serf/default.nix +++ b/pkgs/development/libraries/serf/default.nix @@ -1,11 +1,12 @@ { stdenv, fetchurl, apr, scons, openssl, aprutil, zlib, krb5, pkgconfig }: stdenv.mkDerivation rec { - name = "serf-1.3.6"; + version = "1.3.7"; + name = "serf-${version}"; src = fetchurl { url = "http://serf.googlecode.com/svn/src_releases/${name}.tar.bz2"; - sha256 = "1wk3cplazs8jznjc9ylpd63rrk9k2y05xa7zqx7psycr0gmpnqya"; + sha256 = "1bphz616dv1svc50kkm8xbgyszhg3ni2dqbij99sfvjycr7bgk7c"; }; buildInputs = [ apr scons openssl aprutil zlib krb5 pkgconfig ]; @@ -30,5 +31,8 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.asl20 ; maintainers = [stdenv.lib.maintainers.raskin]; hydraPlatforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; + inherit version; + downloadPage = "http://serf.googlecode.com/svn/src_releases/"; + updateWalker = true; }; } -- GitLab From f70acd25847e1d18012acecb0923a024e7ff45d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Sun, 31 Aug 2014 16:53:29 +0200 Subject: [PATCH 666/843] munin: fix test --- pkgs/servers/monitoring/munin/default.nix | 2 +- pkgs/tools/misc/rrdtool/default.nix | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/monitoring/munin/default.nix b/pkgs/servers/monitoring/munin/default.nix index 245c838607f..0ce58e64015 100644 --- a/pkgs/servers/monitoring/munin/default.nix +++ b/pkgs/servers/monitoring/munin/default.nix @@ -105,7 +105,7 @@ stdenv.mkDerivation rec { *.jar) continue;; esac wrapProgram "$file" \ - --set PERL5LIB "$out/lib/perl5/site_perl:${with perlPackages; stdenv.lib.makePerlPath [ + --set PERL5LIB "$out/lib/perl5/site_perl:${rrdtool}/lib/perl:${with perlPackages; stdenv.lib.makePerlPath [ Log4Perl IOSocketInet6 Socket6 URI DBFile DateManip HTMLTemplate FileCopyRecursive FCGI NetSNMP NetServer ListMoreUtils TimeHiRes DBDPg LWPUserAgent diff --git a/pkgs/tools/misc/rrdtool/default.nix b/pkgs/tools/misc/rrdtool/default.nix index aa14087dfc8..29d98284ccf 100644 --- a/pkgs/tools/misc/rrdtool/default.nix +++ b/pkgs/tools/misc/rrdtool/default.nix @@ -7,6 +7,11 @@ stdenv.mkDerivation { sha256 = "07fgn0y4yj7p2vh6a37q273hf98gkfw2sdam5r1ldn1k0m1ayrqj"; }; buildInputs = [ gettext perl pkgconfig libxml2 pango cairo ]; + + postInstall = '' + # for munin support + mv $out/lib/perl/5*/*/*.pm $out/lib/perl/5*/ + ''; meta = { homepage = http://oss.oetiker.ch/rrdtool/; -- GitLab From 979f0e1d6731d915141d8bda628420cd3aec9d63 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sun, 31 Aug 2014 19:25:23 +0400 Subject: [PATCH 667/843] Update TPTP --- pkgs/applications/science/logic/tptp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/logic/tptp/default.nix b/pkgs/applications/science/logic/tptp/default.nix index ef00b135c27..d4c62858753 100644 --- a/pkgs/applications/science/logic/tptp/default.nix +++ b/pkgs/applications/science/logic/tptp/default.nix @@ -11,14 +11,14 @@ let (builtins.attrNames (builtins.removeAttrs x helperArgNames)); sourceInfo = rec { baseName="TPTP"; - version="6.0.0"; + version="6.1.0"; name="${baseName}-${version}"; urls= [ "http://www.cs.miami.edu/~tptp/TPTP/Distribution/TPTP-v${version}.tgz" "http://www.cs.miami.edu/~tptp/TPTP/Archive/TPTP-v${version}/TPTP-v${version}.tgz" ]; - hash="0jnjkqdz937c7mkxvh9wc3byw5h1k19jss058fbzdxxc2hkwq1af"; + hash="054p0kx9qh619ixslxpb4qcwvcqr4kan154b3a87b546b78k7kv4"; }; in rec { -- GitLab From 92ad86bb5e42c93430e82fc5d3f6b341896fd297 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sun, 31 Aug 2014 19:32:21 +0400 Subject: [PATCH 668/843] Allow search for updates for GNU Barcode --- pkgs/tools/graphics/barcode/default.nix | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/pkgs/tools/graphics/barcode/default.nix b/pkgs/tools/graphics/barcode/default.nix index 60dc5a285da..052dc8f9cb2 100644 --- a/pkgs/tools/graphics/barcode/default.nix +++ b/pkgs/tools/graphics/barcode/default.nix @@ -9,17 +9,16 @@ let buildInputs = map (n: builtins.getAttr n x) (builtins.attrNames (builtins.removeAttrs x helperArgNames)); sourceInfo = rec { - version="0.99"; + version = "0.99"; baseName="barcode"; name="${baseName}-${version}"; url="mirror://gnu/${baseName}/${name}.tar.gz"; - hash="0r2b2lwg7a9i9ic5spkbnavy1ynrppmrldv46vsl44l1xgriq0vw"; }; in rec { src = a.fetchurl { url = sourceInfo.url; - sha256 = sourceInfo.hash; + sha256 = "1indapql5fjz0bysyc88cmc54y8phqrbi7c76p71fgjp45jcyzp8"; }; inherit (sourceInfo) name version; @@ -35,11 +34,9 @@ rec { raskin ]; platforms = with a.lib.platforms; allBut darwin; - }; - passthru = { - updateInfo = { - downloadPage = "ftp://ftp.gnu.org/gnu/barcode/"; - }; + downloadPage = "http://ftp.gnu.org/gnu/barcode/"; + updateWalker = true; + inherit version; }; }) x -- GitLab From 965cf1b9fbc735c2903ecf6b23236d7e34194802 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sun, 31 Aug 2014 19:59:14 +0400 Subject: [PATCH 669/843] Update CGAL; NB: updating requires going through a formto get the fresh links --- pkgs/development/libraries/CGAL/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/CGAL/default.nix b/pkgs/development/libraries/CGAL/default.nix index 12273f84566..4c2739d00ec 100644 --- a/pkgs/development/libraries/CGAL/default.nix +++ b/pkgs/development/libraries/CGAL/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, cmake, boost, gmp, mpfr }: stdenv.mkDerivation rec { - version = "4.3"; + version = "4.4"; name = "cgal-${version}"; src = fetchurl { - url = "https://gforge.inria.fr/frs/download.php/32995/CGAL-${version}.tar.xz"; - sha256 = "015vw57dmy43bf63mg3916cgcsbv9dahwv24bnmiajyanj2mhiyc"; + url = "https://gforge.inria.fr/frs/download.php/33526/CGAL-${version}.tar.xz"; + sha256 = "1s0ylyrx74vgw6vsg6xxk4b07jrxh8pqcmxcbkx46v01nczv3ixj"; }; buildInputs = [ cmake boost gmp mpfr ]; -- GitLab From 242ae9c38c8f4a44692fed6ed64d57ae866b901f Mon Sep 17 00:00:00 2001 From: Damien Cassou Date: Sun, 31 Aug 2014 18:04:51 +0200 Subject: [PATCH 670/843] backintime: Definition improvement --- .../networking/sync/backintime/common.nix | 46 +++++++++++ .../networking/sync/backintime/default.nix | 78 ------------------- .../networking/sync/backintime/gnome.nix | 37 +++++++++ pkgs/top-level/all-packages.nix | 6 +- 4 files changed, 88 insertions(+), 79 deletions(-) create mode 100644 pkgs/applications/networking/sync/backintime/common.nix delete mode 100644 pkgs/applications/networking/sync/backintime/default.nix create mode 100644 pkgs/applications/networking/sync/backintime/gnome.nix diff --git a/pkgs/applications/networking/sync/backintime/common.nix b/pkgs/applications/networking/sync/backintime/common.nix new file mode 100644 index 00000000000..fa722747e5f --- /dev/null +++ b/pkgs/applications/networking/sync/backintime/common.nix @@ -0,0 +1,46 @@ +{stdenv, fetchurl, makeWrapper, gettext, python2, python2Packages }: + +stdenv.mkDerivation rec { + version = "1.0.36"; + + name = "backintime-common-${version}"; + + src = fetchurl { + url = "https://launchpad.net/backintime/1.0/${version}/+download/backintime-${version}.tar.gz"; + md5 = "28630bc7bd5f663ba8fcfb9ca6a742d8"; + }; + + # because upstream tarball has no top-level directory. + # https://bugs.launchpad.net/backintime/+bug/1359076 + sourceRoot = "."; + + buildInputs = [ makeWrapper gettext python2 python2Packages.dbus ]; + + installFlags = [ "DEST=$(out)" ]; + + preConfigure = "cd common"; + + dontAddPrefix = true; + + preFixup = + '' + substituteInPlace "$out/bin/backintime" \ + --replace "=\"/usr/share" "=\"$prefix/share" + wrapProgram "$out/bin/backintime" \ + --prefix PYTHONPATH : "$PYTHONPATH" \ + --prefix PATH : "$prefix/bin:$PATH" + ''; + + meta = { + homepage = https://launchpad.net/backintime; + description = "Simple backup tool for Linux"; + license = stdenv.lib.licenses.gpl2; + maintainers = [ stdenv.lib.maintainers.DamienCassou ]; + platforms = stdenv.lib.platforms.all; + longDescription = '' + Back In Time is a simple backup tool (on top of rsync) for Linux + inspired from “flyback project” and “TimeVault”. The backup is + done by taking snapshots of a specified set of directories. + ''; + }; +} \ No newline at end of file diff --git a/pkgs/applications/networking/sync/backintime/default.nix b/pkgs/applications/networking/sync/backintime/default.nix deleted file mode 100644 index 9b9e355f828..00000000000 --- a/pkgs/applications/networking/sync/backintime/default.nix +++ /dev/null @@ -1,78 +0,0 @@ -{stdenv, fetchurl, makeWrapper, gettext, python2, python2Packages, gnome2, pkgconfig, pygobject, glib, libtool }: - -let - version = "1.0.36"; - - src = fetchurl { - url = "https://launchpad.net/backintime/1.0/${version}/+download/backintime-${version}.tar.gz"; - md5 = "28630bc7bd5f663ba8fcfb9ca6a742d8"; - }; - - # because upstream tarball has no top-level directory. - # https://bugs.launchpad.net/backintime/+bug/1359076 - sourceRoot = "."; - - genericBuildInputs = [ makeWrapper gettext python2 python2Packages.dbus ]; - - installFlagsArray = [ "DEST=$(out)" ]; - - meta = { - homepage = https://launchpad.net/backintime; - description = "Simple backup tool for Linux"; - license = stdenv.lib.licenses.gpl2; - maintainers = [ stdenv.lib.maintainers.DamienCassou ]; - platforms = stdenv.lib.platforms.linux; - longDescription = '' - Back In Time is a simple backup tool (on top of rsync) for Linux - inspired from “flyback project” and “TimeVault”. The backup is - done by taking snapshots of a specified set of directories. - ''; - }; - - common = stdenv.mkDerivation rec { - inherit version src sourceRoot installFlagsArray meta; - - name = "backintime-common-${version}"; - - buildInputs = genericBuildInputs; - - preConfigure = "cd common"; - - dontAddPrefix = true; - - preFixup = - '' - substituteInPlace "$out/bin/backintime" \ - --replace "=\"/usr/share" "=\"$prefix/share" - wrapProgram "$out/bin/backintime" \ - --prefix PYTHONPATH : "$PYTHONPATH" - ''; - }; - -in -stdenv.mkDerivation rec { - inherit version src sourceRoot installFlagsArray meta; - - name = "backintime-gnome-${version}"; - - buildInputs = genericBuildInputs ++ [ common python2Packages.pygtk python2Packages.notify gnome2.gnome_python ]; - - preConfigure = "cd gnome"; - configureFlagsArray = [ "--no-check" ]; - - preFixup = - '' - substituteInPlace "$out/share/backintime/gnome/app.py" \ - --replace "glade_file = os.path.join(self.config.get_app_path()," \ - "glade_file = os.path.join('$prefix/share/backintime'," - substituteInPlace "$out/share/backintime/gnome/settingsdialog.py" \ - --replace "glade_file = os.path.join(self.config.get_app_path()," \ - "glade_file = os.path.join('$prefix/share/backintime'," - substituteInPlace "$out/bin/backintime-gnome" \ - --replace "=\"/usr/share" "=\"$prefix/share" - wrapProgram "$out/bin/backintime-gnome" \ - --prefix PYTHONPATH : "${gnome2.gnome_python}/lib/python2.7/site-packages/gtk-2.0:${common}/share/backintime/common:$PYTHONPATH" \ - --prefix PATH : "$PATH" - ''; - -} diff --git a/pkgs/applications/networking/sync/backintime/gnome.nix b/pkgs/applications/networking/sync/backintime/gnome.nix new file mode 100644 index 00000000000..56d0f6c5481 --- /dev/null +++ b/pkgs/applications/networking/sync/backintime/gnome.nix @@ -0,0 +1,37 @@ +{stdenv, fetchurl, makeWrapper, gettext, python2, python2Packages, gnome2, pkgconfig, pygobject, glib, libtool, backintime-common }: + +stdenv.mkDerivation rec { + inherit (backintime-common) version src sourceRoot installFlags meta; + + name = "backintime-gnome-${version}"; + + buildInputs = [ makeWrapper gettext python2 python2Packages.dbus backintime-common python2Packages.pygtk python2Packages.notify gnome2.gnome_python ]; + + preConfigure = "cd gnome"; + configureFlags = [ "--no-check" ]; + + preFixup = + '' + # Make sure all Python files refer to $prefix/share/backintime + # instead of config.get_app_path() which returns the path of the + # 'common' module, not the path of the 'gnome' module. + filelist=$(mktemp) + find "$out/share/backintime/gnome" -name "*.py" -print0 > $filelist + while IFS="" read -r -d "" file <&9; do + substituteInPlace "$file" \ + --replace "glade_file = os.path.join(config.get_app_path()," \ + "glade_file = os.path.join('$prefix/share/backintime'," \ + --replace "glade_file = os.path.join(self.config.get_app_path()," \ + "glade_file = os.path.join('$prefix/share/backintime'," + done 9< "$filelist" + rm "$filelist" + + substituteInPlace "$out/bin/backintime-gnome" \ + --replace "=\"/usr/share" "=\"$prefix/share" + + wrapProgram "$out/bin/backintime-gnome" \ + --prefix PYTHONPATH : "${gnome2.gnome_python}/lib/python2.7/site-packages/gtk-2.0:${backintime-common}/share/backintime/common:$PYTHONPATH" \ + --prefix PATH : "${backintime-common}/bin:$PATH" + ''; + +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8c2961e1a61..7bef44f15bf 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8264,7 +8264,11 @@ let inherit (gnome3) baobab; - backintime = callPackage ../applications/networking/sync/backintime { }; + backintime-common = callPackage ../applications/networking/sync/backintime/common.nix { }; + + backintime-gnome = callPackage ../applications/networking/sync/backintime/gnome.nix { }; + + backintime = backintime-gnome; bar = callPackage ../applications/window-managers/bar { }; -- GitLab From 5599a2959ea1bd26111ec2efdf6afb5dee4f8994 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sun, 31 Aug 2014 20:11:55 +0400 Subject: [PATCH 671/843] Update CM-Unicode font; note its migration to SF.net --- pkgs/data/fonts/cm-unicode/default.nix | 14 +++++--------- pkgs/data/fonts/cm-unicode/default.upstream | 7 +++++++ 2 files changed, 12 insertions(+), 9 deletions(-) create mode 100644 pkgs/data/fonts/cm-unicode/default.upstream diff --git a/pkgs/data/fonts/cm-unicode/default.nix b/pkgs/data/fonts/cm-unicode/default.nix index b8f7f7c6d3e..d8f6f7f8351 100644 --- a/pkgs/data/fonts/cm-unicode/default.nix +++ b/pkgs/data/fonts/cm-unicode/default.nix @@ -9,17 +9,16 @@ let buildInputs = map (n: builtins.getAttr n x) (builtins.attrNames (builtins.removeAttrs x helperArgNames)); sourceInfo = rec { - version="0.6.3a"; + version = "0.7.0"; baseName="cm-unicode"; name="${baseName}-${version}"; - url="ftp://canopus.iacp.dvo.ru/pub/Font/cm_unicode/${name}-otf.tar.gz"; - hash="1018gmvh7wl7sm6f3fqd917syd1yy0gz3pxmrc9lkxckcr7wz0zp"; + url="mirror://sourceforge/${baseName}/${baseName}/${version}/${name}-otf.tar.xz"; }; in rec { src = a.fetchurl { url = sourceInfo.url; - sha256 = sourceInfo.hash; + sha256 = "0a0w9qm9g8qz2xh3lr61bj1ymqslqsvk4w2ybc3v2qa89nz7x2jl"; }; inherit (sourceInfo) name version; @@ -34,11 +33,8 @@ rec { ]; platforms = with a.lib.platforms; all; - }; - passthru = { - updateInfo = { - downloadPage = "http://canopus.iacp.dvo.ru/~panov/cm-unicode/download.html"; - }; + downloadPage = "http://sourceforge.net/projects/cm-unicode/files/cm-unicode/"; + inherit version; }; }) x diff --git a/pkgs/data/fonts/cm-unicode/default.upstream b/pkgs/data/fonts/cm-unicode/default.upstream new file mode 100644 index 00000000000..bc24cd919b2 --- /dev/null +++ b/pkgs/data/fonts/cm-unicode/default.upstream @@ -0,0 +1,7 @@ +attribute_name cm_unicode +url http://sourceforge.net/projects/cm-unicode/files/cm-unicode/ +SF_version_dir +version_link '[-]otf[.]tar[.][a-z0-9]+/download$' +SF_redirect +ensure_hash +do_overwrite() { do_overwrite_just_version; } -- GitLab From 8fe8cb204e054da2848fd3ef0f8d9f786b3103b6 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sun, 31 Aug 2014 20:18:53 +0400 Subject: [PATCH 672/843] Update conspy; note the project move to SF.net --- pkgs/os-specific/linux/conspy/default.nix | 8 ++++---- pkgs/os-specific/linux/conspy/default.upstream | 6 +++++- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/conspy/default.nix b/pkgs/os-specific/linux/conspy/default.nix index d252d9ce162..78d403a3afc 100644 --- a/pkgs/os-specific/linux/conspy/default.nix +++ b/pkgs/os-specific/linux/conspy/default.nix @@ -3,11 +3,11 @@ let s = # Generated upstream information rec { baseName="conspy"; - version="1.9"; + version="1.10"; name="${baseName}-${version}"; - hash="1ndwdx8x5lnjl6cddy1d8g8m7ndxyj3wrs100w2bp9gnvbxbb8vv"; - url="http://ace-host.stuart.id.au/russell/files/conspy/conspy-1.9.tar.gz"; - sha256="1ndwdx8x5lnjl6cddy1d8g8m7ndxyj3wrs100w2bp9gnvbxbb8vv"; + hash="1vnph4xa1qp4sr52jc9zldmbdpkr6z5j7hk2vgyhfn7m1vc5g0qw"; + url="mirror://sourceforge/project/conspy/conspy-1.10-1/conspy-1.10.tar.gz"; + sha256="1vnph4xa1qp4sr52jc9zldmbdpkr6z5j7hk2vgyhfn7m1vc5g0qw"; }; buildInputs = [ autoconf automake ncurses diff --git a/pkgs/os-specific/linux/conspy/default.upstream b/pkgs/os-specific/linux/conspy/default.upstream index db0c0fd9680..3eeacf34694 100644 --- a/pkgs/os-specific/linux/conspy/default.upstream +++ b/pkgs/os-specific/linux/conspy/default.upstream @@ -1 +1,5 @@ -url http://ace-host.stuart.id.au/russell/files/conspy/ +url http://sourceforge.net/projects/conspy/files/ +version_link 'conspy-[-0-9.]+/$' +version_link '[-0-9.]+[.]tar[.][a-z0-9]+/download$' +SF_redirect +version '.*-([-0-9.]+)[.]tar[.].*' '\1' -- GitLab From b259dde85374342321a6e0b21ee251cc3dcfba36 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 31 Aug 2014 13:12:52 +0200 Subject: [PATCH 673/843] haskell-codex: update to version 0.1.0.4 --- pkgs/development/tools/haskell/codex/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/haskell/codex/default.nix b/pkgs/development/tools/haskell/codex/default.nix index fac145b14c2..a2f9c119700 100644 --- a/pkgs/development/tools/haskell/codex/default.nix +++ b/pkgs/development/tools/haskell/codex/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "codex"; - version = "0.1.0.3"; - sha256 = "0sbkri6y9f4wws120kbb93sv1z0z75hjw9pw5r3wadmmd0lygsn9"; + version = "0.1.0.4"; + sha256 = "1wnrjmf2iypnmdsmjxbjg7kqn8802yhd9vbdc4vg19pqspir87wz"; isLibrary = true; isExecutable = true; buildDepends = [ -- GitLab From c04507ea3eb200ae019216e7981541111ed09402 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 31 Aug 2014 13:12:57 +0200 Subject: [PATCH 674/843] haskell-idris: update to version 0.9.14.2 --- pkgs/development/compilers/idris/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/idris/default.nix b/pkgs/development/compilers/idris/default.nix index f0b07f9d0fa..0761f189bc8 100644 --- a/pkgs/development/compilers/idris/default.nix +++ b/pkgs/development/compilers/idris/default.nix @@ -11,8 +11,8 @@ cabal.mkDerivation (self: { pname = "idris"; - version = "0.9.14.1"; - sha256 = "11x4f0hvd51m9rlf9r0i5xsjmc73kjsayny4xyv0wgb88v9v737b"; + version = "0.9.14.2"; + sha256 = "0j64kx357l16z9y9j20i7mvxgqff94bfssbhh1shb13c0pk5lmi6"; isLibrary = true; isExecutable = true; buildDepends = [ -- GitLab From 5f46cfdfcd374beb9f61351a2d801659349fc59d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 31 Aug 2014 13:12:59 +0200 Subject: [PATCH 675/843] haskell-IntervalMap: update to version 0.4.0.1 --- pkgs/development/libraries/haskell/IntervalMap/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/IntervalMap/default.nix b/pkgs/development/libraries/haskell/IntervalMap/default.nix index 774cbd8a19e..65b53d91b52 100644 --- a/pkgs/development/libraries/haskell/IntervalMap/default.nix +++ b/pkgs/development/libraries/haskell/IntervalMap/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "IntervalMap"; - version = "0.3.0.3"; - sha256 = "11lxsjq9nw9mmj5ga0x03d8rgcx2s85kzi17d9cm7m28mq4dqdag"; + version = "0.4.0.1"; + sha256 = "0cq0dmmawrss4jjkz3br0lhp37d4k7rd3cinbcyf0bf39dfk6mrf"; buildDepends = [ deepseq ]; testDepends = [ Cabal deepseq QuickCheck ]; meta = { -- GitLab From b0c34028ba75f0b3f48c1fc78711edf0910d625f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 31 Aug 2014 13:13:00 +0200 Subject: [PATCH 676/843] haskell-JuicyPixels: update to version 3.1.7.1 --- pkgs/development/libraries/haskell/JuicyPixels/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/JuicyPixels/default.nix b/pkgs/development/libraries/haskell/JuicyPixels/default.nix index fcd2689c548..2305756f93b 100644 --- a/pkgs/development/libraries/haskell/JuicyPixels/default.nix +++ b/pkgs/development/libraries/haskell/JuicyPixels/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "JuicyPixels"; - version = "3.1.6.1"; - sha256 = "1v560y0l1zpznbpw8zgb2j6zlcwi8i207xgzggzzd3p0v2m8955c"; + version = "3.1.7.1"; + sha256 = "0mhsknqdrhxnm622mgrswvj4kvksh87x18s5ddgk4ylf0s2fjlap"; buildDepends = [ binary deepseq mtl primitive transformers vector zlib ]; -- GitLab From 7c5c6d0750f1e5eb082ee6a92b5e036b18d2988e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 31 Aug 2014 13:13:02 +0200 Subject: [PATCH 677/843] haskell-MFlow: update to version 0.4.5.8 --- pkgs/development/libraries/haskell/MFlow/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/MFlow/default.nix b/pkgs/development/libraries/haskell/MFlow/default.nix index a0e4b787ec9..f5e088a4238 100644 --- a/pkgs/development/libraries/haskell/MFlow/default.nix +++ b/pkgs/development/libraries/haskell/MFlow/default.nix @@ -9,8 +9,8 @@ cabal.mkDerivation (self: { pname = "MFlow"; - version = "0.4.5.7"; - sha256 = "0faw082z8yyzf0k1vrgpqa8kvwb2zwmasy1p1vvj3a7lhhnlr20s"; + version = "0.4.5.8"; + sha256 = "1gfv5ky68dyn8gjjg60c5s9x3dl9xn6j9q43w7vaj9sd1q12wk3c"; buildDepends = [ blazeHtml blazeMarkup caseInsensitive clientsession conduit conduitExtra extensibleExceptions httpTypes monadloc mtl parsec -- GitLab From fe2cc9870a4204396a052f5afdeb7a8a91313359 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 31 Aug 2014 13:13:03 +0200 Subject: [PATCH 678/843] haskell-Yampa: update to version 0.9.6 --- pkgs/development/libraries/haskell/Yampa/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/Yampa/default.nix b/pkgs/development/libraries/haskell/Yampa/default.nix index a4d1ea666a2..5ae451f8163 100644 --- a/pkgs/development/libraries/haskell/Yampa/default.nix +++ b/pkgs/development/libraries/haskell/Yampa/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "Yampa"; - version = "0.9.5"; - sha256 = "0r6fm2ccls7gbc5s0vbrzrqv6marnzlzc7zr4afkgfk9jsqfmqjh"; + version = "0.9.6"; + sha256 = "0a1m0sb0i3kkxbp10vpqd6iw83ksm4alavrg04arzrv71p3skyg0"; buildDepends = [ random ]; meta = { homepage = "http://www.haskell.org/haskellwiki/Yampa"; -- GitLab From 86264d9b52f81c82551800ec743dfcf9a3ce870e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 31 Aug 2014 13:13:05 +0200 Subject: [PATCH 679/843] haskell-cabal-cargs: update to version 0.7.2 --- pkgs/development/libraries/haskell/cabal-cargs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/cabal-cargs/default.nix b/pkgs/development/libraries/haskell/cabal-cargs/default.nix index a74e54f7e43..2f2b59b597a 100644 --- a/pkgs/development/libraries/haskell/cabal-cargs/default.nix +++ b/pkgs/development/libraries/haskell/cabal-cargs/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "cabal-cargs"; - version = "0.7.1"; - sha256 = "0y6v663mw4giwypdv34qr2l2fy1q7zdjvgw39m16sjna5lbwvm1n"; + version = "0.7.2"; + sha256 = "03095w08ff3g57qzx9dziv61q9x1rvqyph4lvxkccd1is2g1wywb"; isLibrary = true; isExecutable = true; buildDepends = [ -- GitLab From 0c817d5bcf2ab7f7ac92b2c0255fcff8e1ff6478 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 31 Aug 2014 13:13:07 +0200 Subject: [PATCH 680/843] haskell-cabal-lenses: update to version 0.4 --- pkgs/development/libraries/haskell/cabal-lenses/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/cabal-lenses/default.nix b/pkgs/development/libraries/haskell/cabal-lenses/default.nix index b5427b3b747..8bf0148ba6b 100644 --- a/pkgs/development/libraries/haskell/cabal-lenses/default.nix +++ b/pkgs/development/libraries/haskell/cabal-lenses/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "cabal-lenses"; - version = "0.3.1"; - sha256 = "17piwqyzd33shp12qa6j4s579rrs34l44x19p2nzz69anhc4g1j7"; + version = "0.4"; + sha256 = "19ryd1qvsc301kdpk0zvw89aqhvk26ccbrgddm9j5m31mn62jl2d"; buildDepends = [ Cabal lens unorderedContainers ]; meta = { description = "Lenses and traversals for the Cabal library"; -- GitLab From 0b537d24cff62f19fccc2510a289f1dce78680f4 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 31 Aug 2014 13:13:15 +0200 Subject: [PATCH 681/843] haskell-either: update to version 4.3.0.2 --- pkgs/development/libraries/haskell/either/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/either/default.nix b/pkgs/development/libraries/haskell/either/default.nix index 6d55afd41d6..72f3bff14df 100644 --- a/pkgs/development/libraries/haskell/either/default.nix +++ b/pkgs/development/libraries/haskell/either/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "either"; - version = "4.3.0.1"; - sha256 = "1ib6288gxzqfm2y198dzhhq588mlwqxm07pcrj4h66g1mcy54q1f"; + version = "4.3.0.2"; + sha256 = "01n4jkf6py00841cyf3fiwiay736dpbhda8ia2qgm26q4r4h58gd"; buildDepends = [ exceptions free monadControl MonadRandom mtl semigroupoids semigroups transformers transformersBase -- GitLab From 3ab26e53a56dee567c1d596414a079273439bba6 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 31 Aug 2014 13:13:17 +0200 Subject: [PATCH 682/843] haskell-haste-compiler: update to version 0.4.1 --- .../haskell/haste-compiler/default.nix | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/pkgs/development/libraries/haskell/haste-compiler/default.nix b/pkgs/development/libraries/haskell/haste-compiler/default.nix index 0b5f4875a75..962bf758a1e 100644 --- a/pkgs/development/libraries/haskell/haste-compiler/default.nix +++ b/pkgs/development/libraries/haskell/haste-compiler/default.nix @@ -1,22 +1,21 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! { cabal, binary, blazeBuilder, bzlib, dataBinaryIeee754 -, dataDefault, executablePath, filepath, ghcPaths, HTTP, monadsTf -, mtl, network, random, shellmate, systemFileio, tar, temporary -, time, transformers, utf8String, websockets, zipArchive +, dataDefault, either, filepath, ghcPaths, HTTP, monadsTf, mtl +, network, random, shellmate, systemFileio, tar, transformers +, utf8String, websockets }: cabal.mkDerivation (self: { pname = "haste-compiler"; - version = "0.3"; - sha256 = "0a0hyra1h484c404d95d411l7gddaazy1ikwzlgkgzaqzd7j7dbd"; + version = "0.4.1"; + sha256 = "15v4c6rxz4n0wmiys6mam8xprcdq8kxnhpwcqnljshr8wlyihn8b"; isLibrary = true; isExecutable = true; buildDepends = [ - binary blazeBuilder bzlib dataBinaryIeee754 dataDefault - executablePath filepath ghcPaths HTTP monadsTf mtl network random - shellmate systemFileio tar temporary time transformers utf8String - websockets zipArchive + binary blazeBuilder bzlib dataBinaryIeee754 dataDefault either + filepath ghcPaths HTTP monadsTf mtl network random shellmate + systemFileio tar transformers utf8String websockets ]; meta = { homepage = "http://github.com/valderman/haste-compiler"; -- GitLab From ba190e40a1b759a2af0b40cd12dc6152aae65919 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 31 Aug 2014 13:13:18 +0200 Subject: [PATCH 683/843] haskell-hsimport: update to version 0.5.2 --- pkgs/development/libraries/haskell/hsimport/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/hsimport/default.nix b/pkgs/development/libraries/haskell/hsimport/default.nix index 96bcecddc30..3093cbb2038 100644 --- a/pkgs/development/libraries/haskell/hsimport/default.nix +++ b/pkgs/development/libraries/haskell/hsimport/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "hsimport"; - version = "0.5.1"; - sha256 = "17yzfikfl8qvm6vp3d472l6p0kzzw694ng19xn3fmrb43qvki4jj"; + version = "0.5.2"; + sha256 = "00kzc7hiwsidwvjnbvc01yh6c8n135ypwsiyvcnf2g179pwmnzkc"; isLibrary = true; isExecutable = true; buildDepends = [ -- GitLab From 4a04820bcf8855ae0b2126a186055b9c79c54c43 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 31 Aug 2014 13:13:20 +0200 Subject: [PATCH 684/843] haskell-hspec-wai: update to version 0.3.0.2 --- .../libraries/haskell/hspec-wai/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/libraries/haskell/hspec-wai/default.nix b/pkgs/development/libraries/haskell/hspec-wai/default.nix index 8bc6776fd84..5937b0a417c 100644 --- a/pkgs/development/libraries/haskell/hspec-wai/default.nix +++ b/pkgs/development/libraries/haskell/hspec-wai/default.nix @@ -1,21 +1,21 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, aeson, aesonQq, caseInsensitive, doctest, hspec2 -, hspecMeta, httpTypes, markdownUnlit, scotty, text, transformers -, wai, waiExtra +{ cabal, aeson, aesonQq, caseInsensitive, hspec2, hspecMeta +, httpTypes, markdownUnlit, scotty, text, transformers, wai +, waiExtra }: cabal.mkDerivation (self: { pname = "hspec-wai"; - version = "0.3.0.1"; - sha256 = "0c04gh32xnvyz0679n7jhp1kdcn7lbkb7248j6lh28irsh84dvp8"; + version = "0.3.0.2"; + sha256 = "13jf8vw1mx5zg8diklbc4hbil9mkjdbg2azdsdfxp286wh718mna"; buildDepends = [ aeson aesonQq caseInsensitive hspec2 httpTypes text transformers wai waiExtra ]; testDepends = [ - aeson caseInsensitive doctest hspec2 hspecMeta httpTypes - markdownUnlit scotty text transformers wai waiExtra + aeson caseInsensitive hspec2 hspecMeta httpTypes markdownUnlit + scotty text transformers wai waiExtra ]; meta = { description = "Experimental Hspec support for testing WAI applications (depends on hspec2!)"; -- GitLab From 536fd769bf8afb6615206e18a0ef4a082fed1061 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 31 Aug 2014 13:13:23 +0200 Subject: [PATCH 685/843] haskell-http-client: update to version 0.3.8 --- pkgs/development/libraries/haskell/http-client/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/http-client/default.nix b/pkgs/development/libraries/haskell/http-client/default.nix index 7f032c3f675..7015c9446e8 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.3.7.2"; - sha256 = "1llrf2bfbh5z01pwg40zdgmz93h45h60mg2pv1k6b8pmzlwr6aaz"; + version = "0.3.8"; + sha256 = "0v5j6fcigjpksj1m0n15g3j680k7qkms3cqd0b1w0ma7k63kcibc"; buildDepends = [ base64Bytestring blazeBuilder caseInsensitive cookie dataDefaultClass deepseq exceptions filepath httpTypes mimeTypes -- GitLab From 9733b5660955d5000ff0688b90c59422a5b24f2d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 31 Aug 2014 13:13:27 +0200 Subject: [PATCH 686/843] haskell-cabal-bounds: update to version 0.8.6 --- pkgs/development/tools/haskell/cabal-bounds/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/haskell/cabal-bounds/default.nix b/pkgs/development/tools/haskell/cabal-bounds/default.nix index 97dac34af3b..368c421221b 100644 --- a/pkgs/development/tools/haskell/cabal-bounds/default.nix +++ b/pkgs/development/tools/haskell/cabal-bounds/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "cabal-bounds"; - version = "0.8.5"; - sha256 = "19lai2gdxs76mrvcz77sjsx7hh87cf1f4qmy7z1zcd130z11q04a"; + version = "0.8.6"; + sha256 = "0q7fpblhxba4np5a9igwmcvmkkvka9f85nccxw0m2lvwbjrs51xq"; isLibrary = true; isExecutable = true; buildDepends = [ -- GitLab From 6059abeea7e02b534c3b6fb5a00cc36f299c1917 Mon Sep 17 00:00:00 2001 From: Dmitry Malikov Date: Sun, 31 Aug 2014 00:23:50 +0200 Subject: [PATCH 687/843] Add haskell-meep package --- .../libraries/haskell/meep/default.nix | 21 +++++++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 23 insertions(+) create mode 100644 pkgs/development/libraries/haskell/meep/default.nix diff --git a/pkgs/development/libraries/haskell/meep/default.nix b/pkgs/development/libraries/haskell/meep/default.nix new file mode 100644 index 00000000000..f8ad537938c --- /dev/null +++ b/pkgs/development/libraries/haskell/meep/default.nix @@ -0,0 +1,21 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, bifunctors, doctest, hspec, hspecExpectationsLens, lens +, QuickCheck, semigroups +}: + +cabal.mkDerivation (self: { + pname = "meep"; + version = "0.1.1.0"; + sha256 = "1rk5mrvmk07m5zdayfvxirak58d1bxwb04sgg0gcx07w8q8k4yyq"; + buildDepends = [ bifunctors lens semigroups ]; + testDepends = [ + bifunctors doctest hspec hspecExpectationsLens lens QuickCheck + semigroups + ]; + meta = { + description = "A silly container"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 7c88f1cee5f..884f3f5bb05 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1557,6 +1557,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in MaybeT = callPackage ../development/libraries/haskell/MaybeT {}; + meep = callPackage ../development/libraries/haskell/meep {}; + MemoTrie = callPackage ../development/libraries/haskell/MemoTrie {}; mersenneRandomPure64 = callPackage ../development/libraries/haskell/mersenne-random-pure64 {}; -- GitLab From e4555d80c8facbc419ab9ad495097cfcfbe91950 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 31 Aug 2014 13:17:18 +0200 Subject: [PATCH 688/843] haskell-Rasterific: re-generate with cabal2nix --- pkgs/development/libraries/haskell/Rasterific/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/Rasterific/default.nix b/pkgs/development/libraries/haskell/Rasterific/default.nix index f8f843236a6..c53e9f72858 100644 --- a/pkgs/development/libraries/haskell/Rasterific/default.nix +++ b/pkgs/development/libraries/haskell/Rasterific/default.nix @@ -12,15 +12,15 @@ cabal.mkDerivation (self: { buildDepends = [ dlist FontyFruity free JuicyPixels mtl vector vectorAlgorithms ]; - doCheck = false; # depends on criterion < 0.9 testDepends = [ binary criterion deepseq filepath FontyFruity JuicyPixels QuickCheck statistics vector ]; + doCheck = false; meta = { description = "A pure haskell drawing engine"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.bergey ]; + maintainers = with self.stdenv.lib.maintainers; [ bergey ]; }; }) -- GitLab From f5527b2594045dec1c2be8a8faeb399ade55ba40 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 31 Aug 2014 13:17:42 +0200 Subject: [PATCH 689/843] haskell-FontyFruity: update to version 0.3 --- pkgs/development/libraries/haskell/FontyFruity/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/haskell/FontyFruity/default.nix b/pkgs/development/libraries/haskell/FontyFruity/default.nix index eaa8a5f3824..1a613492f43 100644 --- a/pkgs/development/libraries/haskell/FontyFruity/default.nix +++ b/pkgs/development/libraries/haskell/FontyFruity/default.nix @@ -11,6 +11,6 @@ cabal.mkDerivation (self: { description = "A true type file format loader"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.bergey ]; + maintainers = with self.stdenv.lib.maintainers; [ bergey ]; }; }) -- GitLab From 8e307572d25260f98afe28a1514fc68218b985b1 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 31 Aug 2014 13:17:44 +0200 Subject: [PATCH 690/843] haskell-diagrams-rasterific: update to version 0.1.0.1 --- pkgs/development/libraries/haskell/diagrams/rasterific.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/haskell/diagrams/rasterific.nix b/pkgs/development/libraries/haskell/diagrams/rasterific.nix index a49c98f988a..c2e85058a90 100644 --- a/pkgs/development/libraries/haskell/diagrams/rasterific.nix +++ b/pkgs/development/libraries/haskell/diagrams/rasterific.nix @@ -19,6 +19,6 @@ cabal.mkDerivation (self: { description = "Rasterific backend for diagrams"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - maintainers = [ self.stdenv.lib.maintainers.bergey ]; + maintainers = with self.stdenv.lib.maintainers; [ bergey ]; }; }) -- GitLab From dfcf682c215937963bc0fc9d3680ef6f2c347376 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 31 Aug 2014 13:17:45 +0200 Subject: [PATCH 691/843] haskell-monad-journal: update to version 0.2.3.1 --- pkgs/development/libraries/haskell/monad-journal/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/monad-journal/default.nix b/pkgs/development/libraries/haskell/monad-journal/default.nix index 3afce21810c..5cbfed976d1 100644 --- a/pkgs/development/libraries/haskell/monad-journal/default.nix +++ b/pkgs/development/libraries/haskell/monad-journal/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "monad-journal"; - version = "0.2.3.0"; - sha256 = "1k0da0fwk05k8530rlys3n2s1z8glnfdivx93isy6cjr8amndc6b"; + version = "0.2.3.1"; + sha256 = "11p7qdga26wz82x6a1fl57iij4swsr1d1aly76sjrlvl8maqlf7d"; buildDepends = [ either monadControl mtl transformers transformersBase ]; -- GitLab From b253792e06da0274fb1eebfcfaca49e989e1d77a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 31 Aug 2014 13:17:47 +0200 Subject: [PATCH 692/843] haskell-pandoc-citeproc: update to version 0.5 --- .../development/libraries/haskell/pandoc-citeproc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/pandoc-citeproc/default.nix b/pkgs/development/libraries/haskell/pandoc-citeproc/default.nix index e567bd82059..76ab2fc41b4 100644 --- a/pkgs/development/libraries/haskell/pandoc-citeproc/default.nix +++ b/pkgs/development/libraries/haskell/pandoc-citeproc/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "pandoc-citeproc"; - version = "0.4.0.1"; - sha256 = "1z21mdxa2hrwqdclriyn3s1qqij3ccbkg7hb0acxrk3pzgidcinx"; + version = "0.5"; + sha256 = "00azhpll0xnb9nnkh7c3hbfk0fzmvh5cgdxlgx7jvaglrmsnvzw3"; isLibrary = true; isExecutable = true; buildDepends = [ -- GitLab From fd4927d25e4c19176860d642d39bcd6a60b51601 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 31 Aug 2014 13:17:49 +0200 Subject: [PATCH 693/843] haskell-pandoc: update to version 1.13.1 --- .../libraries/haskell/pandoc/default.nix | 21 ++++++++++--------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/pkgs/development/libraries/haskell/pandoc/default.nix b/pkgs/development/libraries/haskell/pandoc/default.nix index 1b2571563c3..c8ef8ba2271 100644 --- a/pkgs/development/libraries/haskell/pandoc/default.nix +++ b/pkgs/development/libraries/haskell/pandoc/default.nix @@ -4,26 +4,27 @@ , blazeHtml, blazeMarkup, dataDefault, deepseqGenerics, Diff , executablePath, extensibleExceptions, filepath, haddockLibrary , happy, highlightingKate, hslua, HTTP, httpClient, httpClientTls -, httpTypes, HUnit, JuicyPixels, mtl, network, pandocTypes, parsec -, QuickCheck, random, scientific, SHA, syb, tagsoup, temporary -, testFramework, testFrameworkHunit, testFrameworkQuickcheck2 -, texmath, text, time, unorderedContainers, vector, wai, waiExtra -, xml, yaml, zipArchive, zlib +, httpTypes, HUnit, JuicyPixels, mtl, network, networkUri +, pandocTypes, parsec, QuickCheck, random, scientific, SHA, syb +, tagsoup, temporary, testFramework, testFrameworkHunit +, testFrameworkQuickcheck2, texmath, text, time +, unorderedContainers, vector, xml, yaml, zipArchive, zlib }: cabal.mkDerivation (self: { pname = "pandoc"; - version = "1.13.0.1"; - sha256 = "0pjyxsr93gv0vrdxlr5i0c56mg6rf21qxf1141cb8l0hl0b416d6"; + version = "1.13.1"; + sha256 = "0vvysa70xp4pskxrvslmddwdsalc479zb8wn6z1vmpvfssvvj6vv"; isLibrary = true; isExecutable = true; buildDepends = [ aeson alex base64Bytestring binary blazeHtml blazeMarkup dataDefault deepseqGenerics extensibleExceptions filepath haddockLibrary happy highlightingKate hslua HTTP httpClient - httpClientTls httpTypes JuicyPixels mtl network pandocTypes parsec - random scientific SHA syb tagsoup temporary texmath text time - unorderedContainers vector wai waiExtra xml yaml zipArchive zlib + httpClientTls httpTypes JuicyPixels mtl network networkUri + pandocTypes parsec random scientific SHA syb tagsoup temporary + texmath text time unorderedContainers vector xml yaml zipArchive + zlib ]; testDepends = [ ansiTerminal Diff executablePath filepath highlightingKate HUnit -- GitLab From 2f25d295b95b18eafc0c610d5f67afffbd7f9793 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 31 Aug 2014 13:17:59 +0200 Subject: [PATCH 694/843] haskell-robots-txt: update to version 0.4.1.1 --- pkgs/development/libraries/haskell/robots-txt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/robots-txt/default.nix b/pkgs/development/libraries/haskell/robots-txt/default.nix index c6534ff0cf4..0ebf6dac301 100644 --- a/pkgs/development/libraries/haskell/robots-txt/default.nix +++ b/pkgs/development/libraries/haskell/robots-txt/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "robots-txt"; - version = "0.4.1.0"; - sha256 = "1q18pgilrwppmd8d7pby3p6qgk47alzmd8izqspk7n4h4agrscn4"; + version = "0.4.1.1"; + sha256 = "16r6j96iay1r6435ym34dp9iggwlfigmzmqq5k5f5ss5bljfc72f"; buildDepends = [ attoparsec time ]; testDepends = [ attoparsec heredoc hspec QuickCheck transformers ]; meta = { -- GitLab From 6e8fd49909e932b638b041390e44012803880134 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 31 Aug 2014 13:18:01 +0200 Subject: [PATCH 695/843] haskell-simple-sendfile: update to version 0.2.17 --- .../libraries/haskell/simple-sendfile/default.nix | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/haskell/simple-sendfile/default.nix b/pkgs/development/libraries/haskell/simple-sendfile/default.nix index 3e8381bf34b..fc41353d357 100644 --- a/pkgs/development/libraries/haskell/simple-sendfile/default.nix +++ b/pkgs/development/libraries/haskell/simple-sendfile/default.nix @@ -1,16 +1,14 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, conduit, conduitExtra, hspec, HUnit, network -, networkConduit, resourcet -}: +{ cabal, conduit, conduitExtra, hspec, HUnit, network, resourcet }: cabal.mkDerivation (self: { pname = "simple-sendfile"; - version = "0.2.15"; - sha256 = "1fa20h2zcvxwdb5j5a0nnhl38bry1p5ckya1l7lrxx9r2bvjkyj9"; + version = "0.2.17"; + sha256 = "1xxzw916v5zwn8i5i61z6p1wa2rm95sa6ry9z3yg2b2ybpyagw5g"; buildDepends = [ network resourcet ]; testDepends = [ - conduit conduitExtra hspec HUnit network networkConduit resourcet + conduit conduitExtra hspec HUnit network resourcet ]; doCheck = false; meta = { -- GitLab From 6641887a7c44a271e7dd50fc4865b1546b17cabd Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 31 Aug 2014 13:18:25 +0200 Subject: [PATCH 696/843] haskell-zeromq4-haskell: update to version 0.6.1 --- .../development/libraries/haskell/zeromq4-haskell/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/zeromq4-haskell/default.nix b/pkgs/development/libraries/haskell/zeromq4-haskell/default.nix index 0e2cf67a19f..e4519c47358 100644 --- a/pkgs/development/libraries/haskell/zeromq4-haskell/default.nix +++ b/pkgs/development/libraries/haskell/zeromq4-haskell/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "zeromq4-haskell"; - version = "0.6"; - sha256 = "1n8vvlwnmvi2hlqhkmzsqgpbpxnhdcs8jy3rj1srsg729m2aqc8y"; + version = "0.6.1"; + sha256 = "14ai6sp39qv6kmj33basnvvfqhzbiqxskv3crjwfdaxbijh23mif"; buildDepends = [ async exceptions semigroups transformers ]; testDepends = [ async QuickCheck tasty tastyHunit tastyQuickcheck -- GitLab From 8aa476f4ff2dbaf2301be1c85ee9c4db8760d898 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 31 Aug 2014 13:19:13 +0200 Subject: [PATCH 697/843] haskell-vcsgui: update to version 0.1.0.0 --- pkgs/development/libraries/haskell/vcsgui/default.nix | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/haskell/vcsgui/default.nix b/pkgs/development/libraries/haskell/vcsgui/default.nix index 318f369fc3e..08605391fc2 100644 --- a/pkgs/development/libraries/haskell/vcsgui/default.nix +++ b/pkgs/development/libraries/haskell/vcsgui/default.nix @@ -1,20 +1,18 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, filepath, gtk3, mtl, vcswrapper }: +{ cabal, filepath, gtk3, mtl, text, vcswrapper }: cabal.mkDerivation (self: { pname = "vcsgui"; - version = "0.0.4"; - sha256 = "12hfdhnv3xc2dyqk76lyx5ggiygyap4hm50sd6qmwfjj3f2w6b98"; + version = "0.1.0.0"; + sha256 = "0wxalzil8ypvwp0z754m7g3848963znwwrjysdxp5q33imzbp60z"; isLibrary = true; isExecutable = true; - buildDepends = [ filepath gtk3 mtl vcswrapper ]; + buildDepends = [ filepath gtk3 mtl text vcswrapper ]; meta = { homepage = "https://github.com/forste/haskellVCSGUI"; description = "GUI library for source code management systems"; license = "GPL"; platforms = self.stdenv.lib.platforms.linux; - hydraPlatforms = self.stdenv.lib.platforms.none; - broken = true; }; }) -- GitLab From 7eac7c3d572cf72104a01496b680790f40bdaf3b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 31 Aug 2014 13:20:28 +0200 Subject: [PATCH 698/843] haskell-fay: update to version 0.20.1.3 --- .../libraries/haskell/fay/default.nix | 23 +++++++++---------- 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/pkgs/development/libraries/haskell/fay/default.nix b/pkgs/development/libraries/haskell/fay/default.nix index edbf19bda62..c00b009c51d 100644 --- a/pkgs/development/libraries/haskell/fay/default.nix +++ b/pkgs/development/libraries/haskell/fay/default.nix @@ -1,24 +1,23 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, aeson, attoparsec, dataDefault, filepath, ghcPaths, groom -, haskellNames, haskellPackages, haskellSrcExts, languageEcmascript -, mtl, optparseApplicative, safe, sourcemap, split, spoon, syb -, tasty, tastyHunit, tastyTh, text, time, transformers, uniplate -, unorderedContainers, utf8String, vector +{ cabal, aeson, dataDefault, filepath, ghcPaths, haskellNames +, haskellPackages, haskellSrcExts, languageEcmascript, mtl +, optparseApplicative, safe, sourcemap, split, spoon, syb, text +, time, transformers, uniplate, unorderedContainers, utf8String +, vector }: cabal.mkDerivation (self: { pname = "fay"; - version = "0.20.1.2"; - sha256 = "1ssii9wkml8jn8kcdq8h6sxrq4gap4asyglakvif2zawl3sqrdji"; + version = "0.20.1.3"; + sha256 = "1r9a1my8wydxx92xg04kacw90s1r4bms84fvs1w52r73knp5kb6r"; isLibrary = true; isExecutable = true; buildDepends = [ - aeson attoparsec dataDefault filepath ghcPaths groom haskellNames - haskellPackages haskellSrcExts languageEcmascript mtl - optparseApplicative safe sourcemap split spoon syb tasty tastyHunit - tastyTh text time transformers uniplate unorderedContainers - utf8String vector + aeson dataDefault filepath ghcPaths haskellNames haskellPackages + haskellSrcExts languageEcmascript mtl optparseApplicative safe + sourcemap split spoon syb text time transformers uniplate + unorderedContainers utf8String vector ]; meta = { homepage = "https://github.com/faylang/fay/wiki"; -- GitLab From 2f6b3ed7efd3052f1f6acf1c4a23536d774add90 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 31 Aug 2014 13:20:30 +0200 Subject: [PATCH 699/843] haskell-vcswrapper: update to version 0.1.0 --- pkgs/development/libraries/haskell/vcswrapper/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/vcswrapper/default.nix b/pkgs/development/libraries/haskell/vcswrapper/default.nix index 75336ef8816..8c2653c66f5 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.0.4"; - sha256 = "130pmzxdsqv703k2g197vd5rl60fwkqqv2xck66ygb932wsq3fnk"; + version = "0.1.0"; + sha256 = "058xbfgxsp3g4x4rwbp57dqgr9mwnmj623js39dbmiqkixsda31a"; isLibrary = true; isExecutable = true; buildDepends = [ filepath hxt mtl parsec split text ]; -- GitLab From 6ea21ad737cf4dffdc0cbaaf1d7539c05ef7cfd3 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 31 Aug 2014 13:22:23 +0200 Subject: [PATCH 700/843] haskell-Agda: update to version 2.4.2 I had to disable the Haddock phase because of lots of errors: http://hydra.cryp.to/build/181564/nixlog/1/raw --- pkgs/development/compilers/agda/default.nix | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/pkgs/development/compilers/agda/default.nix b/pkgs/development/compilers/agda/default.nix index 6705419add9..db160c652cf 100644 --- a/pkgs/development/compilers/agda/default.nix +++ b/pkgs/development/compilers/agda/default.nix @@ -1,15 +1,16 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, alex, binary, boxes, dataHash, deepseq, emacs, equivalence -, filepath, geniplate, happy, hashable, hashtables, haskeline -, haskellSrcExts, mtl, parallel, QuickCheck, STMonadTrans, strict -, text, time, transformers, unorderedContainers, xhtml, zlib +{ cabal, alex, binary, boxes, cpphs, dataHash, deepseq, emacs +, equivalence, filepath, geniplate, happy, hashable, hashtables +, haskeline, haskellSrcExts, mtl, parallel, QuickCheck +, STMonadTrans, strict, text, time, transformers +, unorderedContainers, xhtml, zlib }: cabal.mkDerivation (self: { pname = "Agda"; - version = "2.4.0.2"; - sha256 = "13c4ipscnlnbv94k93yajrp32mwzikqa8rhc95h8pmqzhjgwyh8b"; + version = "2.4.2"; + sha256 = "0pgwx79y02a08xn5f6lghw7fsc6wilab5q2gdm9r51yi9gm32aw5"; isLibrary = true; isExecutable = true; buildDepends = [ @@ -18,7 +19,8 @@ cabal.mkDerivation (self: { QuickCheck STMonadTrans strict text time transformers unorderedContainers xhtml zlib ]; - buildTools = [ alex emacs happy ]; + buildTools = [ alex cpphs emacs happy ]; + noHaddock = true; postInstall = '' $out/bin/agda -c --no-main $(find $out/share -name Primitive.agda) $out/bin/agda-mode compile -- GitLab From e81977172a5f1fc1e9578a943f54732714d2d229 Mon Sep 17 00:00:00 2001 From: Dmitry Malikov Date: Sun, 31 Aug 2014 00:03:49 +0200 Subject: [PATCH 701/843] Add haskell-directory-layout 0.7.4 --- .../haskell/directory-layout/default.nix | 25 +++++++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/development/libraries/haskell/directory-layout/default.nix diff --git a/pkgs/development/libraries/haskell/directory-layout/default.nix b/pkgs/development/libraries/haskell/directory-layout/default.nix new file mode 100644 index 00000000000..44f5a7635f6 --- /dev/null +++ b/pkgs/development/libraries/haskell/directory-layout/default.nix @@ -0,0 +1,25 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, commandQq, doctest, filepath, free, hspec, lens +, semigroups, temporary, text, transformers, unorderedContainers +}: + +cabal.mkDerivation (self: { + pname = "directory-layout"; + version = "0.7.4"; + sha256 = "1nrbv9mzl817d6c494sxd4jg15winpp9624n84av9vdxb8x1n14d"; + buildDepends = [ + commandQq filepath free hspec lens semigroups text transformers + unorderedContainers + ]; + testDepends = [ + commandQq doctest filepath free hspec lens semigroups temporary + text transformers unorderedContainers + ]; + meta = { + description = "Directory layout DSL"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; + doCheck = false; # issue https://github.com/supki/directory-layout/issues/8 +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 884f3f5bb05..c4798a6cbae 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -670,6 +670,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in directSqlite = callPackage ../development/libraries/haskell/direct-sqlite {}; + directoryLayout = callPackage ../development/libraries/haskell/directory-layout {}; + directoryTree = callPackage ../development/libraries/haskell/directory-tree {}; distributedStatic = callPackage ../development/libraries/haskell/distributed-static {}; -- GitLab From 903e273afb5718fff3974b4b39ac06b109b7b55d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 31 Aug 2014 13:24:18 +0200 Subject: [PATCH 702/843] haskell-scotty: update to version 0.9.0 --- .../development/libraries/haskell/scotty/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/haskell/scotty/default.nix b/pkgs/development/libraries/haskell/scotty/default.nix index 91876f7e318..6dfbb25def7 100644 --- a/pkgs/development/libraries/haskell/scotty/default.nix +++ b/pkgs/development/libraries/haskell/scotty/default.nix @@ -1,20 +1,20 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, aeson, blazeBuilder, caseInsensitive, conduit, dataDefault -, hspec, httpTypes, liftedBase, monadControl, mtl, regexCompat +{ cabal, aeson, blazeBuilder, caseInsensitive, dataDefault, hspec2 +, hspecWai, httpTypes, liftedBase, monadControl, mtl, regexCompat , text, transformers, transformersBase, wai, waiExtra, warp }: cabal.mkDerivation (self: { pname = "scotty"; - version = "0.8.2"; - sha256 = "07vjdj26380inlyi350mdifm7v1dpbc56041vi2czf5zzhx97qb0"; + version = "0.9.0"; + sha256 = "0gx00k5w4cs68bh3ciplkwhzh2412y6wqg0qdsslnnsb41l5kb1d"; buildDepends = [ - aeson blazeBuilder caseInsensitive conduit dataDefault httpTypes + aeson blazeBuilder caseInsensitive dataDefault httpTypes monadControl mtl regexCompat text transformers transformersBase wai waiExtra warp ]; - testDepends = [ hspec httpTypes liftedBase wai waiExtra ]; + testDepends = [ hspec2 hspecWai httpTypes liftedBase text wai ]; jailbreak = true; meta = { homepage = "https://github.com/scotty-web/scotty"; -- GitLab From 7910aef42c9652d5c53c20c284cf13a3a06f80a7 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 31 Aug 2014 13:29:39 +0200 Subject: [PATCH 703/843] haskell-llvm-general: update to version 3.4.4.x --- .../llvm-general-pure/{3.4.2.2.nix => 3.4.4.0.nix} | 4 ++-- .../haskell/llvm-general/{3.4.2.2.nix => 3.4.4.0.nix} | 4 ++-- pkgs/top-level/haskell-packages.nix | 10 +++++----- 3 files changed, 9 insertions(+), 9 deletions(-) rename pkgs/development/libraries/haskell/llvm-general-pure/{3.4.2.2.nix => 3.4.4.0.nix} (87%) rename pkgs/development/libraries/haskell/llvm-general/{3.4.2.2.nix => 3.4.4.0.nix} (89%) diff --git a/pkgs/development/libraries/haskell/llvm-general-pure/3.4.2.2.nix b/pkgs/development/libraries/haskell/llvm-general-pure/3.4.4.0.nix similarity index 87% rename from pkgs/development/libraries/haskell/llvm-general-pure/3.4.2.2.nix rename to pkgs/development/libraries/haskell/llvm-general-pure/3.4.4.0.nix index c8601d844ca..cd92b67b16a 100644 --- a/pkgs/development/libraries/haskell/llvm-general-pure/3.4.2.2.nix +++ b/pkgs/development/libraries/haskell/llvm-general-pure/3.4.4.0.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "llvm-general-pure"; - version = "3.4.2.2"; - sha256 = "0grbw0lamp0w4jzxg97jccl3jqdgqfgldpb4llvhr1l70591b0s8"; + version = "3.4.4.0"; + sha256 = "0x43yfcss3f5v5mlzyv7d13fvajbdgv4cmkx5yx1904xsiddg27v"; buildDepends = [ mtl parsec setenv transformers ]; testDepends = [ HUnit mtl QuickCheck testFramework testFrameworkHunit diff --git a/pkgs/development/libraries/haskell/llvm-general/3.4.2.2.nix b/pkgs/development/libraries/haskell/llvm-general/3.4.4.0.nix similarity index 89% rename from pkgs/development/libraries/haskell/llvm-general/3.4.2.2.nix rename to pkgs/development/libraries/haskell/llvm-general/3.4.4.0.nix index 25993bb9fd0..aec66b12723 100644 --- a/pkgs/development/libraries/haskell/llvm-general/3.4.2.2.nix +++ b/pkgs/development/libraries/haskell/llvm-general/3.4.4.0.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "llvm-general"; - version = "3.4.2.2"; - sha256 = "1dqdvv8pslblavyi14xy0bgrr1ca8d1jqp60x16zgbzkk3f2jx6a"; + version = "3.4.4.0"; + sha256 = "10x7qb2svw0gz0sqf4vn14hpzks3rk29g4i2pzfdi5qk11j8jd9b"; buildDepends = [ llvmGeneralPure mtl parsec setenv transformers utf8String ]; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index c4798a6cbae..2fe4a7ee829 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1512,14 +1512,14 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in llvmConfig = pkgs.llvm_33; llvmGeneralPure = self.llvmGeneralPure_3_3_8_2; }; - llvmGeneral_3_4_2_2 = callPackage ../development/libraries/haskell/llvm-general/3.4.2.2.nix { + llvmGeneral_3_4_4_0 = callPackage ../development/libraries/haskell/llvm-general/3.4.4.0.nix { llvmConfig = pkgs.llvm; }; - llvmGeneral = self.llvmGeneral_3_4_2_2; + llvmGeneral = self.llvmGeneral_3_4_4_0; - llvmGeneralPure_3_3_8_2 = callPackage ../development/libraries/haskell/llvm-general-pure/3.3.8.2.nix { }; - llvmGeneralPure_3_4_2_2 = callPackage ../development/libraries/haskell/llvm-general-pure/3.4.2.2.nix {}; - llvmGeneralPure = self.llvmGeneralPure_3_4_2_2; + llvmGeneralPure_3_3_8_2 = callPackage ../development/libraries/haskell/llvm-general-pure/3.3.8.2.nix {}; + llvmGeneralPure_3_4_4_0 = callPackage ../development/libraries/haskell/llvm-general-pure/3.4.4.0.nix {}; + llvmGeneralPure = self.llvmGeneralPure_3_4_4_0; lrucache = callPackage ../development/libraries/haskell/lrucache {}; -- GitLab From 544eceebf491fe00bbaabe20fb0c616653acc2bf Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 31 Aug 2014 13:29:48 +0200 Subject: [PATCH 704/843] haskell-packages.nix: cosmetic --- pkgs/top-level/haskell-packages.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 2fe4a7ee829..50ca0b97637 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -775,7 +775,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in eventList = callPackage ../development/libraries/haskell/event-list {}; - exPool = callPackage ../development/libraries/haskell/ex-pool { }; + exPool = callPackage ../development/libraries/haskell/ex-pool {}; exceptionMtl = callPackage ../development/libraries/haskell/exception-mtl {}; @@ -1737,7 +1737,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in networkProtocolXmpp = callPackage ../development/libraries/haskell/network-protocol-xmpp {}; - networkSimple = callPackage ../development/libraries/haskell/network-simple { }; + networkSimple = callPackage ../development/libraries/haskell/network-simple {}; networkTransport = callPackage ../development/libraries/haskell/network-transport {}; @@ -2971,7 +2971,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in pointful = callPackage ../development/tools/haskell/pointful {}; - ShellCheck = callPackage ../development/tools/misc/ShellCheck { }; + ShellCheck = callPackage ../development/tools/misc/ShellCheck {}; SourceGraph = callPackage ../development/tools/haskell/SourceGraph {}; -- GitLab From fb16c61577aa86d59299253e90e758f805a8502d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 31 Aug 2014 13:37:13 +0200 Subject: [PATCH 705/843] haskell-scotty: disable test suite to break infinite recursion with hspec-wai --- pkgs/development/libraries/haskell/scotty/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/haskell/scotty/default.nix b/pkgs/development/libraries/haskell/scotty/default.nix index 6dfbb25def7..4985f09b38e 100644 --- a/pkgs/development/libraries/haskell/scotty/default.nix +++ b/pkgs/development/libraries/haskell/scotty/default.nix @@ -16,6 +16,7 @@ cabal.mkDerivation (self: { ]; testDepends = [ hspec2 hspecWai httpTypes liftedBase text wai ]; jailbreak = true; + doCheck = false; meta = { homepage = "https://github.com/scotty-web/scotty"; description = "Haskell web framework inspired by Ruby's Sinatra, using WAI and Warp"; -- GitLab From 807e68c8c0af6361676b1868c85e2ada56593478 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 31 Aug 2014 13:44:55 +0200 Subject: [PATCH 706/843] haskell-binary-conduit: jailbreak to fix build with conduit 1.2.x --- pkgs/development/libraries/haskell/binary-conduit/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/haskell/binary-conduit/default.nix b/pkgs/development/libraries/haskell/binary-conduit/default.nix index 37774c1a16a..848004ca6af 100644 --- a/pkgs/development/libraries/haskell/binary-conduit/default.nix +++ b/pkgs/development/libraries/haskell/binary-conduit/default.nix @@ -12,6 +12,7 @@ cabal.mkDerivation (self: { testDepends = [ binary conduit hspec QuickCheck quickcheckAssertions resourcet ]; + jailbreak = true; meta = { homepage = "http://github.com/qnikst/binary-conduit"; description = "data serialization/deserialization conduit library"; -- GitLab From c3c03a0cdb4ec707756c1b64c0538d20d605faf7 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 31 Aug 2014 18:16:39 +0200 Subject: [PATCH 707/843] haskell-hakyll: jailbreak to fix build with pandoc-citeproc 0.5 --- pkgs/development/libraries/haskell/hakyll/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/libraries/haskell/hakyll/default.nix b/pkgs/development/libraries/haskell/hakyll/default.nix index e38eadad057..7ebc0de734a 100644 --- a/pkgs/development/libraries/haskell/hakyll/default.nix +++ b/pkgs/development/libraries/haskell/hakyll/default.nix @@ -27,6 +27,9 @@ cabal.mkDerivation (self: { snapCore snapServer systemFilepath tagsoup testFramework testFrameworkHunit testFrameworkQuickcheck2 text time utillinux ]; + patchPhase = '' + sed -i -e 's|pandoc-citeproc .*,|pandoc-citeproc,|' hakyll.cabal + ''; meta = { homepage = "http://jaspervdj.be/hakyll"; description = "A static website compiler library"; -- GitLab From a1814ea2b093f9d6579dd43ace5549e61c035fa4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 31 Aug 2014 18:33:31 +0200 Subject: [PATCH 708/843] pinfo: resurrect, update, add meta --- pkgs/applications/misc/pinfo/default.nix | 23 +++++++++++++++++------ 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/misc/pinfo/default.nix b/pkgs/applications/misc/pinfo/default.nix index d8dba39ccb5..658ff410d37 100644 --- a/pkgs/applications/misc/pinfo/default.nix +++ b/pkgs/applications/misc/pinfo/default.nix @@ -1,12 +1,23 @@ -{stdenv, fetchurl, ncurses, readline}: +{ stdenv, fetchurl, autoreconfHook, gettext, texinfo, ncurses, readline }: stdenv.mkDerivation { - name = "pinfo-0.6.9"; + name = "pinfo-0.6.10"; + src = fetchurl { - url = https://alioth.debian.org/frs/download.php/1498/pinfo-0.6.9.tar.bz2; - sha256 = "1rbsz1y7nyz6ax9xfkw5wk6pnrhvwz2xcm0wnfnk4sb2wwq760q3"; + # homepage needed you to login to download the tarball + url = "http://pkgs.fedoraproject.org/repo/pkgs/pinfo/pinfo-0.6.10.tar.bz2" + + "/fe3d3da50371b1773dfe29bf870dbc5b/pinfo-0.6.10.tar.bz2"; + sha256 = "0p8wyrpz9npjcbx6c973jspm4c3xz4zxx939nngbq49xqah8088j"; }; - buildInputs = [ncurses readline]; - configureFlags = "--with-curses=${ncurses} --with-readline=${readline}"; + buildInputs = [ autoreconfHook gettext texinfo ncurses readline ]; + + configureFlags = [ "--with-curses=${ncurses}" "--with-readline=${readline}" ]; + + meta = with stdenv.lib; { + description = "A viewer for info files"; + homepage = https://alioth.debian.org/projects/pinfo/; + license = licenses.gpl2Plus; + }; } + -- GitLab From 8152e66da54cd99e45ae4aa0001e879357677214 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sun, 31 Aug 2014 20:21:45 +0400 Subject: [PATCH 709/843] update dd_rescue --- pkgs/tools/system/dd_rescue/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/dd_rescue/default.nix b/pkgs/tools/system/dd_rescue/default.nix index 9c7f0413421..7b3e62a1bc0 100644 --- a/pkgs/tools/system/dd_rescue/default.nix +++ b/pkgs/tools/system/dd_rescue/default.nix @@ -1,10 +1,11 @@ { stdenv, fetchurl, autoconf }: stdenv.mkDerivation rec { - name = "dd_rescue-1.42.1"; + version = "1.46"; + name = "dd_rescue-${version}"; src = fetchurl { - sha256 = "0g2d292m1cnp8syy19hh5jvly3zy7lcvcj563wgjnf20ppm2diaq"; + sha256 = "1fhs4jl5pkyn4aq75fxczrgnsj2m0kz9hfa7dhxy93vp7xcba2cy"; url="http://www.garloff.de/kurt/linux/ddrescue/${name}.tar.gz"; }; @@ -33,5 +34,8 @@ stdenv.mkDerivation rec { description = "A tool to copy data from a damaged block device"; maintainers = with maintainers; [ raskin iElectric ]; platforms = with platforms; linux; + downloadPage = "http://www.garloff.de/kurt/linux/ddrescue/"; + inherit version; + updateWalker = true; }; } -- GitLab From c5168debe863a923d85fe156f535ef37b0841833 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sun, 31 Aug 2014 20:42:00 +0400 Subject: [PATCH 710/843] Update eigen --- pkgs/development/libraries/eigen/default.nix | 11 ++++++----- pkgs/development/libraries/eigen/default.upstream | 4 ++++ 2 files changed, 10 insertions(+), 5 deletions(-) create mode 100644 pkgs/development/libraries/eigen/default.upstream diff --git a/pkgs/development/libraries/eigen/default.nix b/pkgs/development/libraries/eigen/default.nix index 72a140ed371..c6650928458 100644 --- a/pkgs/development/libraries/eigen/default.nix +++ b/pkgs/development/libraries/eigen/default.nix @@ -1,15 +1,15 @@ {stdenv, fetchurl, cmake}: let - v = "3.2.1"; + version = "3.2.2"; in stdenv.mkDerivation { - name = "eigen-${v}"; + name = "eigen-${version}"; src = fetchurl { - url = "http://bitbucket.org/eigen/eigen/get/${v}.tar.bz2"; - name = "eigen-${v}.tar.bz2"; - sha256 = "12ljdirih9n3cf8hy00in285c2ccah7mgalmmr8gc3ldwznz5rk6"; + url = "http://bitbucket.org/eigen/eigen/get/${version}.tar.bz2"; + name = "eigen-${version}.tar.bz2"; + sha256 = "0pwykjkz5n8wfyg9cjj7smgs54a9zc80m9gi106w43n2m72ni39i"; }; nativeBuildInputs = [ cmake ]; @@ -19,5 +19,6 @@ stdenv.mkDerivation { license = licenses.lgpl3Plus; homepage = http://eigen.tuxfamily.org ; maintainers = with stdenv.lib.maintainers; [ sander urkud raskin ]; + inherit version; }; } diff --git a/pkgs/development/libraries/eigen/default.upstream b/pkgs/development/libraries/eigen/default.upstream new file mode 100644 index 00000000000..c0c05efc466 --- /dev/null +++ b/pkgs/development/libraries/eigen/default.upstream @@ -0,0 +1,4 @@ +url http://eigen.tuxfamily.org/ +ensure_choice +version '.*/([-0-9.]+)[.]tar[.].*' '\1' +do_overwrite() { do_overwrite_just_version; } -- GitLab From 0667d67c9540604738c8d5c5a5c872e70bcf2b3b Mon Sep 17 00:00:00 2001 From: Sam Griffin Date: Wed, 20 Aug 2014 22:57:41 -0400 Subject: [PATCH 711/843] Adding vpnc configuration module --- nixos/modules/config/vpnc.nix | 41 +++++++++++++++++++++++++++++++++++ nixos/modules/module-list.nix | 1 + 2 files changed, 42 insertions(+) create mode 100644 nixos/modules/config/vpnc.nix diff --git a/nixos/modules/config/vpnc.nix b/nixos/modules/config/vpnc.nix new file mode 100644 index 00000000000..956a4c7d3fd --- /dev/null +++ b/nixos/modules/config/vpnc.nix @@ -0,0 +1,41 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.networking.vpnc; + mkServiceDef = name: value: + { + source = builtins.toFile "${name}.conf" value; + target = "vpnc/${name}.conf"; + }; + +in +{ + options = { + networking.vpnc = { + services = mkOption { + type = types.attrsOf types.str; + default = []; + example = { + test = + '' + IPSec gateway 192.168.1.1 + IPSec ID someID + IPSec secret secretKey + Xauth username name + Xauth password pass + ''; + }; + description = + '' + The names of cisco VPNs and their associated definitions + ''; + }; + }; + }; + + config.environment.etc = mapAttrsToList mkServiceDef cfg.services; +} + + diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 6754c8a4f1a..297ca0d1be4 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -21,6 +21,7 @@ ./config/system-environment.nix ./config/system-path.nix ./config/timezone.nix + ./config/vpnc.nix ./config/unix-odbc-drivers.nix ./config/users-groups.nix ./config/zram.nix -- GitLab From 655e5c01b4754c73d323cd8ad1b7671875e6d4f0 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sun, 31 Aug 2014 20:44:17 +0400 Subject: [PATCH 712/843] Oops; a mistake with src --- pkgs/development/libraries/eigen/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/eigen/default.nix b/pkgs/development/libraries/eigen/default.nix index c6650928458..14308dc0eb0 100644 --- a/pkgs/development/libraries/eigen/default.nix +++ b/pkgs/development/libraries/eigen/default.nix @@ -7,8 +7,8 @@ stdenv.mkDerivation { name = "eigen-${version}"; src = fetchurl { - url = "http://bitbucket.org/eigen/eigen/get/${version}.tar.bz2"; - name = "eigen-${version}.tar.bz2"; + url = "http://bitbucket.org/eigen/eigen/get/${version}.tar.gz"; + name = "eigen-${version}.tar.gz"; sha256 = "0pwykjkz5n8wfyg9cjj7smgs54a9zc80m9gi106w43n2m72ni39i"; }; -- GitLab From 3d037ebb94f7c28dc7019a3332bf5d27f2cd9ebb Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Sun, 31 Aug 2014 09:46:16 -0700 Subject: [PATCH 713/843] Revert "Revert "Merge pull request #3182 from wkennington/master.ipv6"" This reverts commit ea8910652fcecbcd4f21aa1c66b1a0a239408b04. --- .../doc/manual/configuration/ipv4-config.xml | 5 +- nixos/lib/build-vms.nix | 11 +- nixos/modules/programs/virtualbox.nix | 2 +- nixos/modules/services/networking/dhcpcd.nix | 2 +- nixos/modules/tasks/network-interfaces.nix | 147 +++++++++++++----- nixos/tests/bittorrent.nix | 6 +- nixos/tests/nat.nix | 2 +- 7 files changed, 118 insertions(+), 57 deletions(-) diff --git a/nixos/doc/manual/configuration/ipv4-config.xml b/nixos/doc/manual/configuration/ipv4-config.xml index e2c51518349..053501b1736 100644 --- a/nixos/doc/manual/configuration/ipv4-config.xml +++ b/nixos/doc/manual/configuration/ipv4-config.xml @@ -12,12 +12,9 @@ interfaces. However, you can configure an interface manually as follows: -networking.interfaces.eth0 = { ipAddress = "192.168.1.2"; prefixLength = 24; }; +networking.interfaces.eth0.ip4 = [ { address = "192.168.1.2"; prefixLength = 24; } ]; -(The network prefix can also be specified using the option -subnetMask, -e.g. "255.255.255.0", but this is deprecated.) Typically you’ll also want to set a default gateway and set of name servers: diff --git a/nixos/lib/build-vms.nix b/nixos/lib/build-vms.nix index 498c0a37783..ba189555409 100644 --- a/nixos/lib/build-vms.nix +++ b/nixos/lib/build-vms.nix @@ -48,10 +48,11 @@ rec { let interfacesNumbered = zipTwoLists config.virtualisation.vlans (range 1 255); interfaces = flip map interfacesNumbered ({ first, second }: - nameValuePair "eth${toString second}" - { ipAddress = "192.168.${toString first}.${toString m.second}"; - subnetMask = "255.255.255.0"; - }); + nameValuePair "eth${toString second}" { ip4 = + [ { address = "192.168.${toString first}.${toString m.second}"; + prefixLength = 24; + } ]; + } in { key = "ip-address"; config = @@ -60,7 +61,7 @@ rec { networking.interfaces = listToAttrs interfaces; networking.primaryIPAddress = - optionalString (interfaces != []) (head interfaces).value.ipAddress; + optionalString (interfaces != []) (head (head interfaces).value.ip4).address; # Put the IP addresses of all VMs in this machine's # /etc/hosts file. If a machine has multiple diff --git a/nixos/modules/programs/virtualbox.nix b/nixos/modules/programs/virtualbox.nix index e2dd76219eb..fec1a7b61f3 100644 --- a/nixos/modules/programs/virtualbox.nix +++ b/nixos/modules/programs/virtualbox.nix @@ -44,5 +44,5 @@ let virtualbox = config.boot.kernelPackages.virtualbox; in ''; }; - networking.interfaces.vboxnet0 = { ipAddress = "192.168.56.1"; prefixLength = 24; }; + networking.interfaces.vboxnet0.ip4 = [ { address = "192.168.56.1"; prefixLength = 24; } ]; } diff --git a/nixos/modules/services/networking/dhcpcd.nix b/nixos/modules/services/networking/dhcpcd.nix index 89aa9bdb6b6..7e0b00a3d7b 100644 --- a/nixos/modules/services/networking/dhcpcd.nix +++ b/nixos/modules/services/networking/dhcpcd.nix @@ -11,7 +11,7 @@ let # Don't start dhcpcd on explicitly configured interfaces or on # interfaces that are part of a bridge, bond or sit device. ignoredInterfaces = - map (i: i.name) (filter (i: i.ipAddress != null) (attrValues config.networking.interfaces)) + map (i: i.name) (filter (i: i.ip4 != [ ] || i.ipAddress != null) (attrValues config.networking.interfaces)) ++ mapAttrsToList (i: _: i) config.networking.sits ++ concatLists (attrValues (mapAttrs (n: v: v.interfaces) config.networking.bridges)) ++ concatLists (attrValues (mapAttrs (n: v: v.interfaces) config.networking.bonds)) diff --git a/nixos/modules/tasks/network-interfaces.nix b/nixos/modules/tasks/network-interfaces.nix index 7dabe70f00c..ac3a55332e4 100644 --- a/nixos/modules/tasks/network-interfaces.nix +++ b/nixos/modules/tasks/network-interfaces.nix @@ -10,6 +10,26 @@ let hasSits = cfg.sits != { }; hasBonds = cfg.bonds != { }; + addrOpts = v: + assert v == 4 || v == 6; + { + address = mkOption { + type = types.str; + description = '' + IPv${toString v} address of the interface. Leave empty to configure the + interface using DHCP. + ''; + }; + + prefixLength = mkOption { + type = types.addCheck types.int (n: n >= 0 && n <= (if v == 4 then 32 else 128)); + description = '' + Subnet mask of the interface, specified as the number of + bits in the prefix (${if v == 4 then "24" else "64"}). + ''; + }; + }; + interfaceOpts = { name, ... }: { options = { @@ -20,10 +40,36 @@ let description = "Name of the interface."; }; + ip4 = mkOption { + default = [ ]; + example = [ + { address = "10.0.0.1"; prefixLength = 16; } + { address = "192.168.1.1"; prefixLength = 24; } + ]; + type = types.listOf types.optionSet; + options = addrOpts 4; + description = '' + List of IPv4 addresses that will be statically assigned to the interface. + ''; + }; + + ip6 = mkOption { + default = [ ]; + example = [ + { address = "fdfd:b3f0:482::1"; prefixLength = 48; } + { address = "2001:1470:fffd:2098::e006"; prefixLength = 64; } + ]; + type = types.listOf types.optionSet; + options = addrOpts 6; + description = '' + List of IPv6 addresses that will be statically assigned to the interface. + ''; + }; + ipAddress = mkOption { default = null; example = "10.0.0.1"; - type = types.nullOr (types.str); + type = types.nullOr types.str; description = '' IP address of the interface. Leave empty to configure the interface using DHCP. @@ -41,20 +87,16 @@ let }; subnetMask = mkOption { - default = ""; - example = "255.255.255.0"; - type = types.str; + default = null; description = '' - Subnet mask of the interface, specified as a bitmask. - This is deprecated; use - instead. + Defunct, supply the prefix length instead. ''; }; ipv6Address = mkOption { default = null; example = "2001:1470:fffd:2098::e006"; - type = types.nullOr types.string; + type = types.nullOr types.str; description = '' IPv6 address of the interface. Leave empty to configure the interface using NDP. @@ -224,10 +266,10 @@ in networking.interfaces = mkOption { default = {}; example = - { eth0 = { - ipAddress = "131.211.84.78"; - subnetMask = "255.255.255.128"; - }; + { eth0.ip4 = [ { + address = "131.211.84.78"; + prefixLength = 25; + } ]; }; description = '' The configuration for each network interface. If @@ -438,6 +480,12 @@ in config = { + assertions = + flip map interfaces (i: { + assertion = i.subnetMask == null; + message = "The networking.interfaces.${i.name}.subnetMask option is defunct. Use prefixLength instead."; + }); + boot.kernelModules = [ ] ++ optional cfg.enableIPv6 "ipv6" ++ optional hasVirtuals "tun" @@ -534,12 +582,18 @@ in # network device, so it only gets started after the interface # has appeared, and it's stopped when the interface # disappears. - configureInterface = i: nameValuePair "${i.name}-cfg" - (let mask = - if i.prefixLength != null then toString i.prefixLength else - if i.subnetMask != "" then i.subnetMask else "32"; - staticIPv6 = cfg.enableIPv6 && i.ipv6Address != null; + configureInterface = i: + let + ips = i.ip4 ++ optionals cfg.enableIPv6 i.ip6 + ++ optional (i.ipAddress != null) { + ipAddress = i.ipAddress; + prefixLength = i.prefixLength; + } ++ optional (cfg.enableIPv6 && i.ipv6Address != null) { + ipAddress = i.ipv6Address; + prefixLength = i.ipv6PrefixLength; + }; in + nameValuePair "${i.name}-cfg" { description = "Configuration of ${i.name}"; wantedBy = [ "network-interfaces.target" ]; bindsTo = [ "sys-subsystem-net-devices-${i.name}.device" ]; @@ -562,36 +616,32 @@ in echo "setting MTU to ${toString i.mtu}..." ip link set "${i.name}" mtu "${toString i.mtu}" '' - + optionalString (i.ipAddress != null) + + # Ip Setup + + '' - cur=$(ip -4 -o a show dev "${i.name}" | awk '{print $4}') - # Only do a flush/add if it's necessary. This is + curIps=$(ip -o a show dev "${i.name}" | awk '{print $4}') + # Only do an add if it's necessary. This is # useful when the Nix store is accessed via this # interface (e.g. in a QEMU VM test). - if [ "$cur" != "${i.ipAddress}/${mask}" ]; then - echo "configuring interface..." - ip -4 addr flush dev "${i.name}" - ip -4 addr add "${i.ipAddress}/${mask}" dev "${i.name}" - restart_network_setup=true - else - echo "skipping configuring interface" - fi '' - + optionalString (staticIPv6) + + flip concatMapStrings (ips) (ip: + let + address = "${ip.address}/${toString ip.prefixLength}"; + in '' - # Only do a flush/add if it's necessary. This is - # useful when the Nix store is accessed via this - # interface (e.g. in a QEMU VM test). - if ! ip -6 -o a show dev "${i.name}" | grep "${i.ipv6Address}/${toString i.ipv6prefixLength}"; then - echo "configuring interface..." - ip -6 addr flush dev "${i.name}" - ip -6 addr add "${i.ipv6Address}/${toString i.ipv6prefixLength}" dev "${i.name}" - restart_network_setup=true - else - echo "skipping configuring interface" + echo "checking ip ${address}..." + if ! echo "$curIps" | grep "${address}" >/dev/null 2>&1; then + if out=$(ip addr add "${address}" dev "${i.name}" 2>&1); then + echo "added ip ${address}..." + restart_network_setup=true + elif ! echo "$out" | grep "File exists" >/dev/null 2>&1; then + echo "failed to add ${address}" + exit 1 + fi fi - '' - + optionalString (i.ipAddress != null || staticIPv6) + '') + + optionalString (ips != [ ]) '' if [ restart_network_setup = true ]; then # Ensure that the default gateway remains set. @@ -608,7 +658,20 @@ in '' echo 1 > /proc/sys/net/ipv6/conf/${i.name}/proxy_ndp ''; - }); + preStop = + '' + echo "releasing configured ip's..." + '' + + flip concatMapStrings (ips) (ip: + let + address = "${ip.address}/${toString ip.prefixLength}"; + in + '' + echo -n "Deleting ${address}..." + ip addr del "${address}" dev "${i.name}" >/dev/null 2>&1 || echo -n " Failed" + echo "" + ''); + }; createTunDevice = i: nameValuePair "${i.name}" { description = "Virtual Network Interface ${i.name}"; diff --git a/nixos/tests/bittorrent.nix b/nixos/tests/bittorrent.nix index 002e012f65f..7eb9c215ee1 100644 --- a/nixos/tests/bittorrent.nix +++ b/nixos/tests/bittorrent.nix @@ -16,7 +16,7 @@ let miniupnpdConf = nodes: pkgs.writeText "miniupnpd.conf" '' ext_ifname=eth1 - listening_ip=${nodes.router.config.networking.interfaces.eth2.ipAddress}/24 + listening_ip=${(head nodes.router.config.networking.interfaces.eth2.ip4).address}/24 allow 1024-65535 192.168.2.0/24 1024-65535 ''; @@ -53,7 +53,7 @@ in { environment.systemPackages = [ pkgs.transmission ]; virtualisation.vlans = [ 2 ]; networking.defaultGateway = - nodes.router.config.networking.interfaces.eth2.ipAddress; + (head nodes.router.config.networking.interfaces.eth2.ip4).address; networking.firewall.enable = false; }; @@ -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://${nodes.tracker.config.networking.interfaces.eth1.ipAddress}:6969/announce -o /tmp/test.torrent"); + $tracker->succeed("transmission-create /tmp/data/test.tar.bz2 -t http://${(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/nat.nix b/nixos/tests/nat.nix index 5fdcc0e97ca..5a57cce6b67 100644 --- a/nixos/tests/nat.nix +++ b/nixos/tests/nat.nix @@ -13,7 +13,7 @@ import ./make-test.nix { { virtualisation.vlans = [ 1 ]; networking.firewall.allowPing = true; networking.defaultGateway = - nodes.router.config.networking.interfaces.eth2.ipAddress; + (head nodes.router.config.networking.interfaces.eth2.ip4).address; }; router = -- GitLab From 9a697d775adae3524a5ee214644c637c272ffc41 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Sun, 31 Aug 2014 09:46:26 -0700 Subject: [PATCH 714/843] Revert "Revert "Fix syntax error in nixos/lib/build-vms.nix, introduced by 86c0f8c"" This reverts commit 2f697bf6931b24cdd428e22effbf6427a85afd42. --- nixos/lib/build-vms.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/lib/build-vms.nix b/nixos/lib/build-vms.nix index ba189555409..50b3b424166 100644 --- a/nixos/lib/build-vms.nix +++ b/nixos/lib/build-vms.nix @@ -52,7 +52,7 @@ rec { [ { address = "192.168.${toString first}.${toString m.second}"; prefixLength = 24; } ]; - } + }); in { key = "ip-address"; config = -- GitLab From 02ecc98e87dd35afe5a07299a9d0674ed1533ace Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Sun, 31 Aug 2014 09:47:18 -0700 Subject: [PATCH 715/843] nixos/network-interfaces: Fix bug in converting old ipAddresses --- nixos/modules/tasks/network-interfaces.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/tasks/network-interfaces.nix b/nixos/modules/tasks/network-interfaces.nix index ac3a55332e4..2adb4bcfaba 100644 --- a/nixos/modules/tasks/network-interfaces.nix +++ b/nixos/modules/tasks/network-interfaces.nix @@ -586,10 +586,10 @@ in let ips = i.ip4 ++ optionals cfg.enableIPv6 i.ip6 ++ optional (i.ipAddress != null) { - ipAddress = i.ipAddress; + address = i.ipAddress; prefixLength = i.prefixLength; } ++ optional (cfg.enableIPv6 && i.ipv6Address != null) { - ipAddress = i.ipv6Address; + address = i.ipv6Address; prefixLength = i.ipv6PrefixLength; }; in -- GitLab From ec8e4d23f11132e2433fcb4d976f646b3164bf61 Mon Sep 17 00:00:00 2001 From: Sam Griffin Date: Sun, 31 Aug 2014 13:00:54 -0400 Subject: [PATCH 716/843] cleanup per Lethalman's suggestions --- nixos/modules/config/vpnc.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nixos/modules/config/vpnc.nix b/nixos/modules/config/vpnc.nix index 956a4c7d3fd..e79e4d1c20f 100644 --- a/nixos/modules/config/vpnc.nix +++ b/nixos/modules/config/vpnc.nix @@ -6,8 +6,8 @@ let cfg = config.networking.vpnc; mkServiceDef = name: value: { - source = builtins.toFile "${name}.conf" value; - target = "vpnc/${name}.conf"; + name = "vpnc/${name}.conf"; + value = { text = value; }; }; in @@ -35,7 +35,7 @@ in }; }; - config.environment.etc = mapAttrsToList mkServiceDef cfg.services; + config.environment.etc = mapAttrs' mkServiceDef cfg.services; } -- GitLab From eb66d3654fe5b3aa2696fe8e9862e1a382069d84 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sun, 31 Aug 2014 21:08:56 +0400 Subject: [PATCH 717/843] Update and adopt LVM2. --- pkgs/os-specific/linux/lvm2/default.nix | 11 +++++++---- pkgs/os-specific/linux/lvm2/default.upstream | 4 ++++ 2 files changed, 11 insertions(+), 4 deletions(-) create mode 100644 pkgs/os-specific/linux/lvm2/default.upstream diff --git a/pkgs/os-specific/linux/lvm2/default.nix b/pkgs/os-specific/linux/lvm2/default.nix index 9e2b0c90079..96f8dbf5784 100644 --- a/pkgs/os-specific/linux/lvm2/default.nix +++ b/pkgs/os-specific/linux/lvm2/default.nix @@ -1,15 +1,15 @@ { stdenv, fetchurl, pkgconfig, udev, utillinux, coreutils }: let - v = "2.02.106"; + version = "2.02.110"; in stdenv.mkDerivation { - name = "lvm2-${v}"; + name = "lvm2-${version}"; src = fetchurl { - url = "ftp://sources.redhat.com/pub/lvm2/releases/LVM2.${v}.tgz"; - sha256 = "0nr833bl0q4zq52drjxmmpf7bs6kqxwa5kahwwxm9411khkxz0vc"; + url = "ftp://sources.redhat.com/pub/lvm2/releases/LVM2.${version}.tgz"; + sha256 = "04fdzvv5431d1i4p701zkm9kc50087q56k7l2l5l5f3i9ah1mb9x"; }; configureFlags = @@ -54,5 +54,8 @@ stdenv.mkDerivation { homepage = http://sourceware.org/lvm2/; descriptions = "Tools to support Logical Volume Management (LVM) on Linux"; platforms = stdenv.lib.platforms.linux; + maintainers = with stdenv.lib.maintainers; [raskin]; + inherit version; + downloadPage = "ftp://sources.redhat.com/pub/lvm2/"; }; } diff --git a/pkgs/os-specific/linux/lvm2/default.upstream b/pkgs/os-specific/linux/lvm2/default.upstream new file mode 100644 index 00000000000..1e5aaf5ab5c --- /dev/null +++ b/pkgs/os-specific/linux/lvm2/default.upstream @@ -0,0 +1,4 @@ +url ftp://sources.redhat.com/pub/lvm2/ +version_link '[.]tgz$' +version '.*[^0-9.][^.]*[.]([0-9.]+)[.].*' '\1' +do_overwrite () { do_overwrite_just_version; } -- GitLab From 7c40939c3a15180926ae6d8be060c9adc5ef405d Mon Sep 17 00:00:00 2001 From: Dmitry Malikov Date: Sun, 31 Aug 2014 19:09:44 +0200 Subject: [PATCH 718/843] haskell-directory-layout: 0.7.4 -> 0.7.4.1, doCheck = true --- .../libraries/haskell/directory-layout/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/haskell/directory-layout/default.nix b/pkgs/development/libraries/haskell/directory-layout/default.nix index 44f5a7635f6..610b1a5ec63 100644 --- a/pkgs/development/libraries/haskell/directory-layout/default.nix +++ b/pkgs/development/libraries/haskell/directory-layout/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "directory-layout"; - version = "0.7.4"; - sha256 = "1nrbv9mzl817d6c494sxd4jg15winpp9624n84av9vdxb8x1n14d"; + version = "0.7.4.1"; + sha256 = "0hj7dfv5i2s1dk0rws2fg84crpxz1kgvrq68f373a6hwkbfhv89b"; buildDepends = [ commandQq filepath free hspec lens semigroups text transformers unorderedContainers @@ -21,5 +21,4 @@ cabal.mkDerivation (self: { license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; }; - doCheck = false; # issue https://github.com/supki/directory-layout/issues/8 }) -- GitLab From eecfa6d657380ec52d34017da0fde37332a182a8 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sun, 31 Aug 2014 21:15:57 +0400 Subject: [PATCH 719/843] Enable dmeventd --- pkgs/os-specific/linux/lvm2/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/lvm2/default.nix b/pkgs/os-specific/linux/lvm2/default.nix index 96f8dbf5784..739b47bf91d 100644 --- a/pkgs/os-specific/linux/lvm2/default.nix +++ b/pkgs/os-specific/linux/lvm2/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation { }; configureFlags = - "--disable-readline --enable-udev_rules --enable-udev_sync --enable-pkgconfig --enable-applib"; + "--disable-readline --enable-udev_rules --enable-udev_sync --enable-pkgconfig --enable-applib --enable-dmeventd --enable-cmdlib"; buildInputs = [ pkgconfig udev ]; -- GitLab From 5f22bc48cdbe8e4e42f0f2cecfc3ea15b0742421 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sun, 31 Aug 2014 21:16:07 +0400 Subject: [PATCH 720/843] Update dmraid --- pkgs/os-specific/linux/dmraid/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/dmraid/default.nix b/pkgs/os-specific/linux/dmraid/default.nix index 35efa8533ab..ec4621e6957 100644 --- a/pkgs/os-specific/linux/dmraid/default.nix +++ b/pkgs/os-specific/linux/dmraid/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, devicemapper }: stdenv.mkDerivation rec { - name = "dmraid-1.0.0.rc15"; + name = "dmraid-1.0.0.rc16"; src = fetchurl { url = "http://people.redhat.com/~heinzm/sw/dmraid/src/old/${name}.tar.bz2"; - sha256 = "01bcaq0sc329ghgj7f182xws7jgjpdc41bvris8fsiprnxc7511h"; + sha256 = "0m92971gyqp61darxbiri6a48jz3wq3gkp8r2k39320z0i6w8jgq"; }; preConfigure = "cd */"; -- GitLab From 44d772d1e03dbfbd2d0125e9b574ce813819f3d2 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Sun, 31 Aug 2014 14:25:39 -0300 Subject: [PATCH 721/843] Stella 4.0: New Package Stella is an Atari 2600 VCS emulator --- pkgs/misc/emulators/stella/default.nix | 37 ++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 39 insertions(+) create mode 100644 pkgs/misc/emulators/stella/default.nix diff --git a/pkgs/misc/emulators/stella/default.nix b/pkgs/misc/emulators/stella/default.nix new file mode 100644 index 00000000000..154a5d02a80 --- /dev/null +++ b/pkgs/misc/emulators/stella/default.nix @@ -0,0 +1,37 @@ +{ stdenv, fetchurl +, pkgconfig, SDL2 +}: + +stdenv.mkDerivation rec { + + name = "stella-${version}"; + version = "4.0"; + + src = fetchurl { + url = "http://downloads.sourceforge.net/project/stella/stella/${version}/${name}-src.tar.gz"; + sha256 = "1j96sj2qflq3agb7fvb08ih3pxy8nsvlkwj40q3n00q9k884ad5w"; + }; + + buildInputs = with stdenv.lib; + [ pkgconfig SDL2 ]; + + configureFlags = '' + ''; + + NIX_CFLAGS_COMPILE=""; + + meta = with stdenv.lib; { + description = "An open-source Atari 2600 VCS emulator"; + longDescription = '' + Stella is a multi-platform Atari 2600 VCS emulator released under + the GNU General Public License (GPL). Stella was originally + developed for Linux by Bradford W. Mott, and is currently + maintained by Stephen Anthony. + As of its 3.5 release, Stella is officialy donationware. + ''; + homepage = http://stella.sourceforge.net/; + license = licenses.gpl2; + maintainers = [ maintainers.AndersonTorres ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2478d881182..5ef7987a476 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9709,6 +9709,8 @@ let conf = config.st.conf or null; }; + stella = callPackage ../misc/emulators/stella { }; + linuxstopmotion = callPackage ../applications/video/linuxstopmotion { }; sweethome3d = recurseIntoAttrs ( (callPackage ../applications/misc/sweethome3d { }) -- GitLab From 14f417ce9b114da2507f792e92b05840fc605583 Mon Sep 17 00:00:00 2001 From: Dmitry Malikov Date: Sun, 31 Aug 2014 19:54:02 +0200 Subject: [PATCH 722/843] haskell-wordexp: add 0.2.0.0 --- .../libraries/haskell/wordexp/default.nix | 16 ++++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 18 insertions(+) create mode 100644 pkgs/development/libraries/haskell/wordexp/default.nix diff --git a/pkgs/development/libraries/haskell/wordexp/default.nix b/pkgs/development/libraries/haskell/wordexp/default.nix new file mode 100644 index 00000000000..7d03b1adea5 --- /dev/null +++ b/pkgs/development/libraries/haskell/wordexp/default.nix @@ -0,0 +1,16 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, c2hs, semigroups }: + +cabal.mkDerivation (self: { + pname = "wordexp"; + version = "0.2.0.0"; + sha256 = "1hfpvzbyyh47ai166xyrhmhvg2shrqcswsfalwa16wab6hcg32ki"; + buildDepends = [ semigroups ]; + buildTools = [ c2hs ]; + meta = { + description = "wordexp(3) wrappers"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 50ca0b97637..b074a6ab48d 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -2753,6 +2753,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in word8 = callPackage ../development/libraries/haskell/word8 {}; + wordexp = callPackage ../development/libraries/haskell/wordexp {}; + Workflow = callPackage ../development/libraries/haskell/Workflow {}; wreq = callPackage ../development/libraries/haskell/wreq {}; -- GitLab From d1a8a8d76d16f756920fc2b84b64c0e1efba07e6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Sun, 31 Aug 2014 20:02:41 +0200 Subject: [PATCH 723/843] pythonPackages.rainbowstream: 0.9.3 -> 0.9.5, fix build on py3k --- pkgs/top-level/python-packages.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 7b39b083eea..57032cf2ec4 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4590,25 +4590,25 @@ rec { rainbowstream = buildPythonPackage rec { name = "rainbowstream-${version}"; - version = "0.9.3"; + version = "0.9.5"; src = fetchurl { url = "https://pypi.python.org/packages/source/r/rainbowstream/${name}.tar.gz"; - sha256 = "1xgfxk3qwbfdl2fwabcppi43dxmv8pik0wb9jsbszwxz9xv3fcpk"; + sha256 = "0v79xiihgsfjipxkzzi92l8y1f8vxxachpv71gyzyhxdsl2zfj57"; }; doCheck = false; + preBuild = '' + export LOCALE_ARCHIVE=${pkgs.glibcLocales}/lib/locale/locale-archive + export LC_ALL="en_US.UTF-8" + ''; + buildInputs = [ pkgs.libjpeg pkgs.freetype pkgs.zlib pillow twitter pyfiglet requests arrow dateutil modules.readline ]; - postInstall = '' - wrapProgram "$out/bin/rainbowstream" \ - --prefix PYTHONPATH : "$PYTHONPATH" - ''; - meta = { description = "Streaming command-line twitter client"; homepage = "http://www.rainbowstream.org/"; -- GitLab From b1e388cefbf30872a9d9e567da0598c24e61027a Mon Sep 17 00:00:00 2001 From: Mateusz Kowalczyk Date: Sun, 31 Aug 2014 19:26:05 +0100 Subject: [PATCH 724/843] agda-stdlib: update to 0.8.1 This is necessary after the Agda-2.4.2 bump --- pkgs/development/compilers/agda/stdlib.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/agda/stdlib.nix b/pkgs/development/compilers/agda/stdlib.nix index 913ae5cd90f..d0ae1394f89 100644 --- a/pkgs/development/compilers/agda/stdlib.nix +++ b/pkgs/development/compilers/agda/stdlib.nix @@ -2,11 +2,11 @@ cabal.mkDerivation (self: rec { pname = "Agda-stdlib"; - version = "0.8"; + version = "0.8.1"; src = fetchurl { url = "https://github.com/agda/agda-stdlib/archive/v${version}.tar.gz"; - sha256 = "03gdcy2gar46qlmd6w91y05cm1x304ig6bda90ryww9qn05kif78"; + sha256 = "0ij4rg4lk0pq01ing285gbmnn23dcf2rhihdcs8bbdpjg52vl4gf"; }; buildDepends = [ filemanip Agda ]; -- GitLab From 6b962e6e9e47f20f9dc4d3b2dc456aa8e82d8b6b Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sun, 31 Aug 2014 22:47:28 +0400 Subject: [PATCH 725/843] Update FPC binary expression --- pkgs/development/compilers/fpc/binary-builder.sh | 1 + pkgs/development/compilers/fpc/binary.nix | 10 +++++----- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/development/compilers/fpc/binary-builder.sh b/pkgs/development/compilers/fpc/binary-builder.sh index 8be36dec73e..4308c1ed211 100755 --- a/pkgs/development/compilers/fpc/binary-builder.sh +++ b/pkgs/development/compilers/fpc/binary-builder.sh @@ -1,6 +1,7 @@ source $stdenv/setup tar xf $src +cd */ tarballdir=$(pwd) for i in *.tar; do tar xvf $i; done echo "Deploying binaries.." diff --git a/pkgs/development/compilers/fpc/binary.nix b/pkgs/development/compilers/fpc/binary.nix index 88f0ab91067..57e670750db 100644 --- a/pkgs/development/compilers/fpc/binary.nix +++ b/pkgs/development/compilers/fpc/binary.nix @@ -1,18 +1,18 @@ { stdenv, fetchurl }: stdenv.mkDerivation { - name = "fpc-2.4.0-binary"; + name = "fpc-2.6.0-binary"; src = if stdenv.system == "i686-linux" then fetchurl { - url = "ftp://ftp.chg.ru/pub/lang/pascal/fpc/dist/2.4.0/i386-linux/fpc-2.4.0.i386-linux.tar"; - sha256 = "1zas9kp0b36zxqvb9i4idh2l0nb6qpmgah038l77w6las7ghh0dv"; + url = "http://sourceforge.net/projects/freepascal/files/Linux/2.6.0/fpc-2.6.0.i386-linux.tar"; + sha256 = "08yklvrfxvk59bxsd4rh1i6s3cjn0q06dzjs94h9fbq3n1qd5zdf"; } else if stdenv.system == "x86_64-linux" then fetchurl { - url = "ftp://ftp.chg.ru/pub/lang/pascal/fpc/dist/2.4.0/x86_64-linux/fpc-2.4.0.x86_64-linux.tar"; - sha256 = "111d11g5ra55hjywx64ldwwflpimsy8zryvap68v0309nyd23f0z"; + url = "http://sourceforge.net/projects/freepascal/files/Linux/2.6.0/fpc-2.6.0.x86_64-linux.tar"; + sha256 = "0k9vi75k39y735fng4jc2vppdywp82j4qhzn7x4r6qjkad64d8lx"; } else throw "Not supported on ${stdenv.system}."; -- GitLab From 2406a892196695a5faf15fb4c27745a9cf53f962 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sun, 31 Aug 2014 22:47:45 +0400 Subject: [PATCH 726/843] Update FPC to 2.6.4 --- pkgs/development/compilers/fpc/default.nix | 11 ++++++++--- pkgs/development/compilers/fpc/default.upstream | 6 ++++++ 2 files changed, 14 insertions(+), 3 deletions(-) create mode 100644 pkgs/development/compilers/fpc/default.upstream diff --git a/pkgs/development/compilers/fpc/default.nix b/pkgs/development/compilers/fpc/default.nix index 6be976783bc..b34b5e8a446 100644 --- a/pkgs/development/compilers/fpc/default.nix +++ b/pkgs/development/compilers/fpc/default.nix @@ -3,12 +3,12 @@ let startFPC = import ./binary.nix { inherit stdenv fetchurl; }; in stdenv.mkDerivation rec { - version = "2.6.0"; + version = "2.6.4"; name = "fpc-${version}"; src = fetchurl { url = "mirror://sourceforge/freepascal/fpcbuild-${version}.tar.gz"; - sha256 = "1vxy2y8pm0ribhpdhqlwwz696ncnz4rk2dafbn1mjgipm97qb26p"; + sha256 = "1akdlp4n9ai1gnn4yq236i5rx03rs5sjfgk60myb7nb9lk7kp74d"; }; buildInputs = [ startFPC gawk ]; @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { sed -e "s@'/lib64/ld-linux[^']*'@'''@" -i fpcsrc/compiler/systems/t_linux.pas '' else ""; - makeFlags = "NOGDB=1"; + makeFlags = "NOGDB=1 FPC=${startFPC}/bin/fpc"; installFlags = "INSTALL_PREFIX=\${out}"; @@ -31,9 +31,14 @@ stdenv.mkDerivation rec { $out/lib/fpc/*/samplecfg $out/lib/fpc/${version} $out/lib/fpc/etc/ ''; + passthru = { + bootstrap = startFPC; + }; + meta = { description = "Free Pascal Compiler from a source distribution"; maintainers = [stdenv.lib.maintainers.raskin]; platforms = stdenv.lib.platforms.linux; + inherit version; }; } diff --git a/pkgs/development/compilers/fpc/default.upstream b/pkgs/development/compilers/fpc/default.upstream new file mode 100644 index 00000000000..7c11fb4761e --- /dev/null +++ b/pkgs/development/compilers/fpc/default.upstream @@ -0,0 +1,6 @@ +url http://sourceforge.net/projects/freepascal/files/Source/ +SF_version_dir +version_link 'fpcbuild-[0-9.]+[.]tar[.]gz/download$' +SF_redirect +version '.*-([0-9.]+)[.]tar[.]gz' '\1' +do_overwrite () { do_overwrite_just_version; } -- GitLab From fc83dfbc49cb3b1d1430eaa4d6fe787ed3f65952 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sun, 31 Aug 2014 22:54:37 +0400 Subject: [PATCH 727/843] Update smbnetfs --- pkgs/tools/filesystems/smbnetfs/default.nix | 13 +++++-------- pkgs/tools/filesystems/smbnetfs/default.upstream | 6 ++++++ 2 files changed, 11 insertions(+), 8 deletions(-) create mode 100644 pkgs/tools/filesystems/smbnetfs/default.upstream diff --git a/pkgs/tools/filesystems/smbnetfs/default.nix b/pkgs/tools/filesystems/smbnetfs/default.nix index 616f61e6c84..e9d9b27d751 100644 --- a/pkgs/tools/filesystems/smbnetfs/default.nix +++ b/pkgs/tools/filesystems/smbnetfs/default.nix @@ -12,17 +12,16 @@ let sourceInfo = rec { baseName="smbnetfs"; dirBaseName="SMBNetFS"; - version="0.5.3a"; + version = "0.5.3b"; name="${baseName}-${version}"; project="${baseName}"; url="mirror://sourceforge/project/${project}/${baseName}/${dirBaseName}-${version}/${name}.tar.bz2"; - hash="0fzlw11y2vkxmjzz3qcypqlvz074v6a3pl4pyffbniqal64qgrsw"; }; in rec { src = a.fetchurl { url = sourceInfo.url; - sha256 = sourceInfo.hash; + sha256 = "1j9b30kh4ymv4nr8c1qc7hfg6pscgyj75ib16pqa0zljjk1klx18"; }; inherit (sourceInfo) name version; @@ -40,11 +39,9 @@ rec { platforms = with a.lib.platforms; linux; license = a.lib.licenses.gpl2; - }; - passthru = { - updateInfo = { - downloadPage = "http://sourceforge.net/projects/smbnetfs/files/smbnetfs"; - }; + downloadPage = "http://sourceforge.net/projects/smbnetfs/files/smbnetfs"; + updateWalker = true; + inherit version; }; }) x diff --git a/pkgs/tools/filesystems/smbnetfs/default.upstream b/pkgs/tools/filesystems/smbnetfs/default.upstream new file mode 100644 index 00000000000..9e2ba2bd59b --- /dev/null +++ b/pkgs/tools/filesystems/smbnetfs/default.upstream @@ -0,0 +1,6 @@ +url http://sourceforge.net/projects/smbnetfs/files/smbnetfs/ +version_link '[-][0-9.]+[a-z]*/$' +version_link '[.]tar[.][a-z0-9]+/download$' +SF_redirect +version '.*[-]([0-9.]+[a-z]*)[.]tar[.].*' '\1' +do_overwrite () { do_overwrite_just_version; } -- GitLab From 3da42c811ffd082f92a82fb8f2f0ce0016e31fd7 Mon Sep 17 00:00:00 2001 From: Philip Horger Date: Sat, 30 Aug 2014 23:41:46 -0700 Subject: [PATCH 728/843] hawkthorne: Initial commit, license issue still unresolved --- pkgs/games/hawkthorne/default.nix | 38 ++++++++++++++++++++++++++++ pkgs/games/hawkthorne/makefile.patch | 33 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 73 insertions(+) create mode 100644 pkgs/games/hawkthorne/default.nix create mode 100644 pkgs/games/hawkthorne/makefile.patch diff --git a/pkgs/games/hawkthorne/default.nix b/pkgs/games/hawkthorne/default.nix new file mode 100644 index 00000000000..4a99ec44764 --- /dev/null +++ b/pkgs/games/hawkthorne/default.nix @@ -0,0 +1,38 @@ +{ fetchgit, stdenv, love, curl, zip }: + +stdenv.mkDerivation rec { + version = "0.9.1"; + name = "hawkthorne-${version}"; + + src = fetchgit { + url = "https://github.com/hawkthorne/hawkthorne-journey.git"; + rev = "e48b5eef0058f63bb8ee746bc00b47b3e03f0854"; + sha256 = "0rvcpv8fsi450xs2cglv4w6m5iqbhsr2n09pcvhh0krhg7xay538"; + }; + + buildInputs = [ + love curl zip + ]; + + patches = [ + ./makefile.patch + ]; + + enableParallelBuilding = true; + + meta = { + description = "Journey to the Center of Hawkthorne - A fan-made retro-style game based on the show Community"; + longDescription = '' + Journey to the Center of Hawkthorne is an open source game written in Love2D. + It's based on the show Community, starring Jim Rash and Joel McHale as + the primary will-they-or-won't-they relationship. + + This game has been entirely developed by fans of the show, who were inspired + to bring to life the video game used to determine the winner of Pierce + Hawthorne's inheritance. + ''; + homepage = "http://www.reddit.com/r/hawkthorne"; + license = stdenv.lib.licenses.mit; + maintainers = with stdenv.lib.maintainers; [ campadrenalin ]; + }; +} diff --git a/pkgs/games/hawkthorne/makefile.patch b/pkgs/games/hawkthorne/makefile.patch new file mode 100644 index 00000000000..16a79683149 --- /dev/null +++ b/pkgs/games/hawkthorne/makefile.patch @@ -0,0 +1,33 @@ +diff --git a/Makefile b/Makefile +index 55eb817..f3406aa 100644 +--- a/Makefile ++++ b/Makefile +@@ -18,10 +18,14 @@ endif + + tilemaps := $(patsubst %.tmx,%.lua,$(wildcard src/maps/*.tmx)) + +-maps: $(tilemaps) +- + love: build/hawkthorne.love + ++shebang: build/hawkthorne.love ++ cat <(echo '#!/usr/bin/env love') build/hawkthorne.love > build/hawkthorne ++ chmod +x build/hawkthorne ++ ++maps: $(tilemaps) ++ + build/hawkthorne.love: $(tilemaps) src/* + mkdir -p build + cd src && zip --symlinks -q -r ../build/hawkthorne.love . -x ".*" \ +@@ -30,6 +34,12 @@ build/hawkthorne.love: $(tilemaps) src/* + run: $(tilemaps) $(LOVE) + $(LOVE) src + ++check: test ++ ++install: shebang ++ mkdir -p $(out)/bin ++ cp build/hawkthorne $(out)/bin ++ + src/maps/%.lua: src/maps/%.tmx bin/tmx2lua + bin/tmx2lua $< diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2478d881182..4a63b75bb54 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1278,6 +1278,8 @@ let haveged = callPackage ../tools/security/haveged { }; + hawkthorne = callPackage ../games/hawkthorne { love = love_0_9; }; + hardlink = callPackage ../tools/system/hardlink { }; hashcat = callPackage ../tools/security/hashcat { }; -- GitLab From 5588ad472b2ce83ba6f0854b1a6491569ec51509 Mon Sep 17 00:00:00 2001 From: Vladimir Still Date: Sun, 31 Aug 2014 21:12:15 +0200 Subject: [PATCH 729/843] vpnc: Fix building of system config. --- nixos/modules/config/vpnc.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/config/vpnc.nix b/nixos/modules/config/vpnc.nix index e79e4d1c20f..68d755232eb 100644 --- a/nixos/modules/config/vpnc.nix +++ b/nixos/modules/config/vpnc.nix @@ -16,7 +16,7 @@ in networking.vpnc = { services = mkOption { type = types.attrsOf types.str; - default = []; + default = {}; example = { test = '' -- GitLab From 3c8ddf78816d25fd057f0c0f03e7e63c9af35c86 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= Date: Sun, 31 Aug 2014 21:51:49 +0200 Subject: [PATCH 730/843] lmms: 0.4.15 -> 1.0.3, fix ogg vorbis and fluidsynth support --- pkgs/applications/audio/lmms/default.nix | 18 ++++++++---------- 1 file changed, 8 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/audio/lmms/default.nix b/pkgs/applications/audio/lmms/default.nix index dd0649811bb..ee47d607c2b 100644 --- a/pkgs/applications/audio/lmms/default.nix +++ b/pkgs/applications/audio/lmms/default.nix @@ -1,24 +1,22 @@ -{ stdenv, fetchurl, SDL, alsaLib, cmake, fftwSinglePrec, jack2, libogg -, libsamplerate, libsndfile, pkgconfig, pulseaudio, qt4, freetype +{ stdenv, fetchurl, SDL, alsaLib, cmake, fftwSinglePrec, fluidsynth +, fltk13, jack2, libvorbis , libsamplerate, libsndfile, pkgconfig +, pulseaudio, qt4, freetype }: stdenv.mkDerivation rec { name = "lmms-${version}"; - version = "0.4.15"; + version = "1.0.3"; src = fetchurl { - url = "mirror://sourceforge/lmms/${name}.tar.bz2"; - sha256 = "02q2gbsqwk3hf9kvzz58a5bxmlb4cfr2mzy41wdvbxxdm2pcl101"; + url = "https://github.com/LMMS/lmms/archive/v${version}.tar.gz"; + sha256 = "191mfld3gspnxlgwcszp9kls58kdwrplj0rfw4zqsz90zdbsjnx3"; }; buildInputs = [ - SDL alsaLib cmake fftwSinglePrec jack2 libogg libsamplerate - libsndfile pkgconfig pulseaudio qt4 + SDL alsaLib cmake fftwSinglePrec fltk13 fluidsynth jack2 + libsamplerate libsndfile libvorbis pkgconfig pulseaudio qt4 ]; - # work around broken build system of 0.4.* - NIX_CFLAGS_COMPILE = "-I${freetype}/include/freetype2"; - enableParallelBuilding = true; meta = with stdenv.lib; { -- GitLab From a735c308b69f4809eada30622279ae9fff03b016 Mon Sep 17 00:00:00 2001 From: Vladimir Still Date: Wed, 30 Jul 2014 23:47:52 +0200 Subject: [PATCH 731/843] nfsd: Make it possible to fix rpc.{mountd,statd,lockd} ports. --- .../services/network-filesystems/nfsd.nix | 13 ++++++- nixos/modules/tasks/filesystems/nfs.nix | 37 +++++++++++++++++-- 2 files changed, 46 insertions(+), 4 deletions(-) diff --git a/nixos/modules/services/network-filesystems/nfsd.nix b/nixos/modules/services/network-filesystems/nfsd.nix index 2217fec3b0f..57d56cd7287 100644 --- a/nixos/modules/services/network-filesystems/nfsd.nix +++ b/nixos/modules/services/network-filesystems/nfsd.nix @@ -56,6 +56,14 @@ in default = false; description = "Whether to create the mount points in the exports file at startup time."; }; + + mountdPort = mkOption { + default = null; + example = 4002; + description = '' + Use fixed port for rpc.mountd, usefull if server is behind firewall. + ''; + }; }; }; @@ -138,7 +146,10 @@ in restartTriggers = [ exports ]; serviceConfig.Type = "forking"; - serviceConfig.ExecStart = "@${pkgs.nfsUtils}/sbin/rpc.mountd rpc.mountd"; + serviceConfig.ExecStart = '' + @${pkgs.nfsUtils}/sbin/rpc.mountd rpc.mountd \ + ${if cfg.mountdPort != null then "-p ${toString cfg.mountdPort}" else ""} + ''; serviceConfig.Restart = "always"; }; diff --git a/nixos/modules/tasks/filesystems/nfs.nix b/nixos/modules/tasks/filesystems/nfs.nix index e8c3d8ab56d..c902b9e0790 100644 --- a/nixos/modules/tasks/filesystems/nfs.nix +++ b/nixos/modules/tasks/filesystems/nfs.nix @@ -24,13 +24,37 @@ let Method = nsswitch ''; + cfg = config.services.nfs; + in { + ###### interface + + options = { + + services.nfs = { + statdPort = mkOption { + default = null; + example = 4000; + description = '' + Use fixed port for rpc.statd, usefull if NFS server is behind firewall. + ''; + }; + lockdPort = mkOption { + default = null; + example = 4001; + description = '' + Use fixed port for NFS lock manager kernel module (lockd/nlockmgr), + usefull if NFS server is behind firewall. + ''; + }; + }; + }; ###### implementation - config = mkIf (any (fs: fs == "nfs" || fs == "nfs4") config.boot.supportedFilesystems) { + config = mkIf (any (fs: fs == "nfs" || fs == "nfs4") config.boot.supportedFilesystems) ({ services.rpcbind.enable = true; @@ -60,7 +84,10 @@ in ''; serviceConfig.Type = "forking"; - serviceConfig.ExecStart = "@${pkgs.nfsUtils}/sbin/rpc.statd rpc.statd --no-notify"; + serviceConfig.ExecStart = '' + @${pkgs.nfsUtils}/sbin/rpc.statd rpc.statd --no-notify \ + ${if cfg.statdPort != null then "-p ${toString statdPort}" else ""} + ''; serviceConfig.Restart = "always"; }; @@ -90,5 +117,9 @@ in serviceConfig.Restart = "always"; }; - }; + } // mkIf (cfg.lockdPort != null) { + boot.extraModprobeConfig = '' + options lockd nlm_udpport=${toString cfg.lockdPort} nlm_tcpport=${toString cfg.lockdPort} + ''; + }); } -- GitLab From ba13808259753206c8c329676710b3c0d08b78ec Mon Sep 17 00:00:00 2001 From: Daniel Peebles Date: Sun, 31 Aug 2014 16:00:51 -0400 Subject: [PATCH 732/843] Fix byacc --- pkgs/development/tools/parsing/byacc/default.nix | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/pkgs/development/tools/parsing/byacc/default.nix b/pkgs/development/tools/parsing/byacc/default.nix index ec302611053..f3ec8225f1c 100644 --- a/pkgs/development/tools/parsing/byacc/default.nix +++ b/pkgs/development/tools/parsing/byacc/default.nix @@ -4,15 +4,10 @@ stdenv.mkDerivation { name = "byacc-1.9"; src = fetchurl { - url = http://www.isc.org/sources/devel/tools/byacc-1.9.tar.gz; - sha256 = "d61a15ac4ac007c188d0c0e99365f016f8d327755f43032b58e400754846f736"; + url = http://invisible-island.net/datafiles/release/byacc.tar.gz; + sha256 = "1rbzx5ipkvih9rjfdfv6310wcr6mxjbdlsh9zcv5aaz6yxxxil7c"; }; - preConfigure = - ''mkdir -p $out/bin - sed -i "s@^DEST.*\$@DEST = $out/bin/yacc@" Makefile - ''; - meta = { description = "Berkeley YACC"; homepage = http://dickey.his.com/byacc/byacc.html; -- GitLab From e728e7cb6dce9ceede36215c312b603a6610bd91 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= Date: Sun, 31 Aug 2014 22:03:48 +0200 Subject: [PATCH 733/843] petri-foo: use released version 0.1.87 --- pkgs/applications/audio/petrifoo/default.nix | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/audio/petrifoo/default.nix b/pkgs/applications/audio/petrifoo/default.nix index 152ee442761..197a0aa1bbe 100644 --- a/pkgs/applications/audio/petrifoo/default.nix +++ b/pkgs/applications/audio/petrifoo/default.nix @@ -1,14 +1,14 @@ -{ stdenv, fetchgit, alsaLib, cmake, gtk, jack2, libgnomecanvas +{ stdenv, fetchurl, alsaLib, cmake, gtk, jack2, libgnomecanvas , libpthreadstubs, libsamplerate, libsndfile, libtool, libxml2 , pkgconfig }: stdenv.mkDerivation rec { - name = "petri-foo"; + name = "petri-foo-${version}"; + version = "0.1.87"; - src = fetchgit { - url = https://github.com/licnep/Petri-Foo.git; - rev = "eef3b6efebe842d2fa18ed32b881fea4562b84e0"; - sha256 = "a20c3f1a633500a65c099c528c7dc2405daa60738b64d881bb8f2036ae59913c"; + src = fetchurl { + url = "mirror://sourceforge/petri-foo/${name}.tar.bz2"; + sha256 = "0b25iicgn8c42487fdw32ycfrll1pm2zjgy5djvgw6mfcaa4gizh"; }; buildInputs = @@ -16,8 +16,6 @@ stdenv.mkDerivation rec { libsamplerate libsndfile libtool libxml2 pkgconfig ]; - dontUseCmakeBuildDir=true; - meta = with stdenv.lib; { description = "MIDI controllable audio sampler"; longDescription = "a fork of Specimen"; -- GitLab From edbaf9497ba278e5e4cd20efc11f59f304ff9a0f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= Date: Sun, 31 Aug 2014 22:19:04 +0200 Subject: [PATCH 734/843] zynaddsubfx: 2.4.3 -> 2.4.4 --- pkgs/applications/audio/zynaddsubfx/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/audio/zynaddsubfx/default.nix b/pkgs/applications/audio/zynaddsubfx/default.nix index a5aa7d5c8d9..3a89b406742 100644 --- a/pkgs/applications/audio/zynaddsubfx/default.nix +++ b/pkgs/applications/audio/zynaddsubfx/default.nix @@ -1,17 +1,17 @@ -{ stdenv, fetchurl, alsaLib, cmake, jack2, fftw, fltk13, minixml -, pkgconfig, zlib +{ stdenv, fetchurl, alsaLib, cmake, jack2, fftw, fltk13, libjpeg +, minixml, pkgconfig, zlib }: stdenv.mkDerivation rec { name = "zynaddsubfx-${version}"; - version = "2.4.3"; + version = "2.4.4"; src = fetchurl { - url = "mirror://sourceforge/zynaddsubfx/ZynAddSubFX-${version}.tar.bz2"; - sha256 = "0kgmwyh4rhyqdfrdzhbzjjk2hzggkp9c4aac6sy3xv6cc1b5jjxq"; + url = "mirror://sourceforge/zynaddsubfx/zynaddsubfx-${version}.tar.xz"; + sha256 = "15byz08p5maf3v8l1zz11xan6s0qcfasjf1b81xc8rffh13x5f53"; }; - buildInputs = [ alsaLib jack2 fftw fltk13 minixml zlib ]; + buildInputs = [ alsaLib jack2 fftw fltk13 libjpeg minixml zlib ]; nativeBuildInputs = [ cmake pkgconfig ]; meta = with stdenv.lib; { -- GitLab From 60d4216d01ce588372a0504266b2e09fd1a10032 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sun, 31 Aug 2014 23:54:14 +0400 Subject: [PATCH 735/843] Update Graphviz --- pkgs/tools/graphics/graphviz/default.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/graphics/graphviz/default.nix b/pkgs/tools/graphics/graphviz/default.nix index 27883ca6037..e9a552e3300 100644 --- a/pkgs/tools/graphics/graphviz/default.nix +++ b/pkgs/tools/graphics/graphviz/default.nix @@ -3,11 +3,12 @@ }: stdenv.mkDerivation rec { - name = "graphviz-2.36.0"; + version = "2.38.0"; + name = "graphviz-${version}"; src = fetchurl { url = "http://www.graphviz.org/pub/graphviz/ARCHIVE/${name}.tar.gz"; - sha256 = "0qb30z5sxlbjni732ndad3j4x7l36vsxpxn4fmf5fn7ivvc6dz9p"; + sha256 = "17l5czpvv5ilmg17frg0w4qwf89jzh2aglm9fgx0l0aakn6j7al1"; }; buildInputs = @@ -52,6 +53,9 @@ stdenv.mkDerivation rec { ''; hydraPlatforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; - maintainers = with stdenv.lib.maintainers; [ simons bjornfor ]; + maintainers = with stdenv.lib.maintainers; [ simons bjornfor raskin ]; + downloadPage = "http://www.graphviz.org/pub/graphviz/ARCHIVE/"; + inherit version; + updateWalker = true; }; } -- GitLab From 08131bd5d5f627f03625cf28ca8afbd7eb83e7fa Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Mon, 1 Sep 2014 00:37:57 +0400 Subject: [PATCH 736/843] Update guitone --- .../version-management/guitone/default.nix | 8 +-- pkgs/tools/graphics/graphviz/2.32.nix | 61 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 12 +++- 3 files changed, 75 insertions(+), 6 deletions(-) create mode 100644 pkgs/tools/graphics/graphviz/2.32.nix diff --git a/pkgs/applications/version-management/guitone/default.nix b/pkgs/applications/version-management/guitone/default.nix index a396765e918..135e7c7e1ef 100644 --- a/pkgs/applications/version-management/guitone/default.nix +++ b/pkgs/applications/version-management/guitone/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, fetchmtn, qt4 }: +{ stdenv, fetchurl, fetchmtn, qt4, pkgconfig, graphviz }: let version = "1.0-mtn-head"; in stdenv.mkDerivation rec { @@ -11,12 +11,12 @@ stdenv.mkDerivation rec { src = fetchmtn { dbs = ["mtn://code.monotone.ca/guitone"]; - selector = "2777cdef424c65df93fa1ff181f02ee30d4901ab"; - sha256 = "918d36a83060b84efa0ee0fe0fd058f1c871c91156d91366e2e979c886ff4271"; + selector = "3a728afdbd3943b1d86c2a249b1e2ede7bf64c27"; + sha256 = "01vs8m00phs5pl75mjkpdarynfpkqrg0qf4rsn95czi3q6nxiaq5"; branch = "net.venge.monotone.guitone"; }; - buildInputs = [ qt4 ]; + buildInputs = [ qt4 pkgconfig graphviz ]; prefixKey="PREFIX="; configureScript = "qmake guitone.pro"; diff --git a/pkgs/tools/graphics/graphviz/2.32.nix b/pkgs/tools/graphics/graphviz/2.32.nix new file mode 100644 index 00000000000..0a86a892417 --- /dev/null +++ b/pkgs/tools/graphics/graphviz/2.32.nix @@ -0,0 +1,61 @@ +{ stdenv, fetchurl, pkgconfig, libpng, libjpeg, expat, libXaw +, yacc, libtool, fontconfig, pango, gd, xlibs, gts, gettext, cairo +}: + +stdenv.mkDerivation rec { + version = "2.32.0"; + name = "graphviz-${version}"; + + src = fetchurl { + url = "http://www.graphviz.org/pub/graphviz/ARCHIVE/${name}.tar.gz"; + sha256 = "0ym7lw3xnkcgbk32vfmm3329xymca60gzn90rq6dv8887qqv4lyq"; + }; + + buildInputs = + [ pkgconfig libpng libjpeg expat libXaw yacc libtool fontconfig + pango gd gts + ] ++ stdenv.lib.optionals (xlibs != null) [ xlibs.xlibs xlibs.libXrender ] + ++ stdenv.lib.optional (stdenv.system == "x86_64-darwin") gettext; + + CPPFLAGS = stdenv.lib.optionalString (stdenv.system == "x86_64-darwin") "-I${cairo}/include/cairo"; + + configureFlags = + [ "--with-pngincludedir=${libpng}/include" + "--with-pnglibdir=${libpng}/lib" + "--with-jpegincludedir=${libjpeg}/include" + "--with-jpeglibdir=${libjpeg}/lib" + "--with-expatincludedir=${expat}/include" + "--with-expatlibdir=${expat}/lib" + "--with-cgraph=no" + "--with-sparse=no" + ] + ++ stdenv.lib.optional (xlibs == null) "--without-x"; + + preBuild = '' + sed -e 's@am__append_5 *=.*@am_append_5 =@' -i lib/gvc/Makefile + ''; + + # "command -v" is POSIX, "which" is not + postInstall = '' + sed -i 's|`which lefty`|"'$out'/bin/lefty"|' $out/bin/dotty + sed -i 's|which|command -v|' $out/bin/vimdot + ''; + + meta = { + homepage = "http://www.graphviz.org/"; + description = "Open source graph visualization software"; + + longDescription = '' + Graphviz is open source graph visualization software. Graph + visualization is a way of representing structural information as + diagrams of abstract graphs and networks. It has important + applications in networking, bioinformatics, software engineering, + database and web design, machine learning, and in visual + interfaces for other technical domains. + ''; + + hydraPlatforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; + maintainers = with stdenv.lib.maintainers; [ simons bjornfor raskin ]; + inherit version; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4a63b75bb54..d0b12a1e24f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1210,9 +1210,15 @@ let /* Readded by Michael Raskin. There are programs in the wild * that do want 2.0 but not 2.22. Please give a day's notice for - * objections before removal. + * objections before removal. The feature is integer coordinates */ graphviz_2_0 = callPackage ../tools/graphics/graphviz/2.0.nix { }; + + /* Readded by Michael Raskin. There are programs in the wild + * that do want 2.32 but not 2.0 or 2.36. Please give a day's notice for + * objections before removal. The feature is libgraph. + */ + graphviz_2_32 = callPackage ../tools/graphics/graphviz/2.32.nix { }; grive = callPackage ../tools/filesystems/grive { json_c = json-c-0-11; # won't configure with 0.12; others are vulnerable @@ -8984,7 +8990,9 @@ let gpsd = callPackage ../servers/gpsd { }; - guitone = callPackage ../applications/version-management/guitone { }; + guitone = callPackage ../applications/version-management/guitone { + graphviz = graphviz_2_32; + }; gv = callPackage ../applications/misc/gv { }; -- GitLab From 622bdca26c55872ef8870ff3316360fade96f056 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= Date: Sun, 31 Aug 2014 22:45:37 +0200 Subject: [PATCH 737/843] processing: keep processing-java and patch it to make it work --- pkgs/applications/graphics/processing/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/processing/default.nix b/pkgs/applications/graphics/processing/default.nix index ce3d639d1a3..7d0595134e9 100644 --- a/pkgs/applications/graphics/processing/default.nix +++ b/pkgs/applications/graphics/processing/default.nix @@ -19,10 +19,11 @@ stdenv.mkDerivation rec { installPhase = '' mkdir -p $out/bin cp -r linux/work/* $out/ - rm $out/processing-java sed -e "s#APPDIR=\`dirname \"\$APPDIR\"\`#APPDIR=$out#" -i $out/processing - mv $out/processing $out/bin/ + sed -e "s#APPDIR=\`dirname \"\$APPDIR\"\`#APPDIR=$out#" -i $out/processing-java + mv $out/processing{,-java} $out/bin/ wrapProgram $out/bin/processing --prefix PATH : ${jre}/bin --prefix LD_LIBRARY_PATH : ${libXxf86vm}/lib + wrapProgram $out/bin/processing-java --prefix PATH : ${jre}/bin --prefix LD_LIBRARY_PATH : ${libXxf86vm}/lib mkdir $out/java ln -s ${jre}/bin $out/java/ ''; -- GitLab From d9b13c1eb1b6834461c43f378c0b9ba9318c0225 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Mon, 1 Sep 2014 02:06:41 +0400 Subject: [PATCH 738/843] Make dmeventd support in lvm2 optional; use it for dmraid --- pkgs/os-specific/linux/lvm2/default.nix | 6 ++++-- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/lvm2/default.nix b/pkgs/os-specific/linux/lvm2/default.nix index 739b47bf91d..ee6165bfc9a 100644 --- a/pkgs/os-specific/linux/lvm2/default.nix +++ b/pkgs/os-specific/linux/lvm2/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, udev, utillinux, coreutils }: +{ stdenv, fetchurl, pkgconfig, udev, utillinux, coreutils, enable_dmeventd ? false }: let version = "2.02.110"; @@ -13,7 +13,9 @@ stdenv.mkDerivation { }; configureFlags = - "--disable-readline --enable-udev_rules --enable-udev_sync --enable-pkgconfig --enable-applib --enable-dmeventd --enable-cmdlib"; + "--disable-readline --enable-udev_rules --enable-udev_sync --enable-pkgconfig --enable-applib --enable-cmdlib" + + (stdenv.lib.optionalString enable_dmeventd " --enable-dmeventd") + ; buildInputs = [ pkgconfig udev ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d0b12a1e24f..cfc93a8cf45 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7259,7 +7259,9 @@ let inherit (xlibs) xproto; }; - dmraid = callPackage ../os-specific/linux/dmraid { }; + dmraid = callPackage ../os-specific/linux/dmraid { + devicemapper = devicemapper.override {enable_dmeventd = true;}; + }; drbd = callPackage ../os-specific/linux/drbd { }; -- GitLab From f60ac82cac0c4c94da76d294114955c8185752ff Mon Sep 17 00:00:00 2001 From: Emery Hemingway Date: Sun, 31 Aug 2014 15:42:38 -0400 Subject: [PATCH 739/843] cjdns: new declarative service expression systemd service wants network-interfaces.target rather than network.target assertion on config.networking.enableIPv6 --- nixos/modules/services/networking/cjdns.nix | 316 +++++++++++--------- 1 file changed, 167 insertions(+), 149 deletions(-) diff --git a/nixos/modules/services/networking/cjdns.nix b/nixos/modules/services/networking/cjdns.nix index 9306ffd5a18..0519172db91 100644 --- a/nixos/modules/services/networking/cjdns.nix +++ b/nixos/modules/services/networking/cjdns.nix @@ -1,13 +1,3 @@ -# You may notice the commented out sections in this file, -# it would be great to configure cjdns from nix, but cjdns -# reads its configuration from stdin, including the private -# key and admin password, all nested in a JSON structure. -# -# Until a good method of storing the keys outside the nix -# store and mixing them back into a string is devised -# (without too much shell hackery), a skeleton of the -# configuration building lies commented out. - { config, lib, pkgs, ... }: with lib; @@ -16,41 +6,35 @@ let cfg = config.services.cjdns; - /* - # can't keep keys and passwords in the nix store, - # but don't want to deal with this stdin quagmire. - - cjdrouteConf = '' { - "admin": {"bind": "${cfg.admin.bind}", "password": "\${CJDNS_ADMIN}" }, - "privateKey": "\${CJDNS_KEY}", - - "interfaces": { - '' - - + optionalString (cfg.interfaces.udp.bind.address != null) '' - "UDPInterface": [ { - "bind": "${cfg.interfaces.udp.bind.address}:"'' - ${if cfg.interfaces.upd.bind.port != null - then ${toString cfg.interfaces.udp.bind.port} - else ${RANDOM} - fi) - + '' } ]'' - - + (if cfg.interfaces.eth.bind != null then '' - "ETHInterface": [ { - "bind": "${cfg.interfaces.eth.bind}", - "beacon": ${toString cfg.interfaces.eth.beacon} - } ] - '' fi ) - + '' - }, - "router": { "interface": { "type": "TUNInterface" }, }, - "security": [ { "setuser": "nobody" } ] - } - ''; - - cjdrouteConfFile = pkgs.writeText "cjdroute.conf" cjdrouteConf - */ + # would be nice to merge 'cfg' with a //, + # but the json nesting is wacky. + cjdrouteConf = builtins.toJSON ( { + admin = { + bind = cfg.admin.bind; + password = "@CJDNS_ADMIN_PASSWORD@"; + }; + authorizedPasswords = map (p: { password = p; }) cfg.authorizedPasswords; + interfaces = { + ETHInterface = if (cfg.ETHInterface.bind != "") then [ cfg.ETHInterface ] else [ ]; + UDPInterface = if (cfg.UDPInterface.bind != "") then [ cfg.UDPInterface ] else [ ]; + }; + + privateKey = "@CJDNS_PRIVATE_KEY@"; + + resetAfterInactivitySeconds = 100; + + router = { + interface = { type = "TUNInterface"; }; + ipTunnel = { + allowedConnections = []; + outgoingConnections = []; + }; + }; + + security = [ { exemptAngel = 1; setuser = "nobody"; } ]; + + }); + in { @@ -62,146 +46,180 @@ in type = types.bool; default = false; description = '' - Enable this option to start a instance of the - cjdns network encryption and and routing engine. - Configuration will be read from confFile. + Whether to enable the cjdns network encryption + and routing engine. A file at /etc/cjdns.keys will + be created if it does not exist to contain a random + secret key that your IPv6 address will be derived from. ''; }; - confFile = mkOption { - default = "/etc/cjdroute.conf"; - description = '' - Configuration file to pipe to cjdroute. + authorizedPasswords = mkOption { + type = types.listOf types.str; + default = [ ]; + example = [ + "snyrfgkqsc98qh1y4s5hbu0j57xw5s0" + "z9md3t4p45mfrjzdjurxn4wuj0d8swv" + "49275fut6tmzu354pq70sr5b95qq0vj" + ]; + description = '' + Any remote cjdns nodes that offer these passwords on + connection will be allowed to route through this node. ''; }; - - /* + admin = { bind = mkOption { + type = types.string; default = "127.0.0.1:11234"; description = '' Bind the administration port to this address and port. ''; }; + }; - passwordFile = mkOption { - example = "/root/cjdns.adminPassword"; - description = '' - File containing a password to the administration port. + UDPInterface = { + bind = mkOption { + type = types.string; + default = ""; + example = "192.168.1.32:43211"; + description = '' + Address and port to bind UDP tunnels to. + ''; + }; + connectTo = mkOption { + type = types.attrsOf ( types.submodule ( + { options, ... }: + { options = { + # TODO make host an option, and add it to networking.extraHosts + password = mkOption { + type = types.str; + description = "Authorized password to the opposite end of the tunnel."; + }; + publicKey = mkOption { + type = types.str; + description = "Public key at the opposite end of the tunnel."; + }; + }; + } + )); + default = { }; + example = { + "192.168.1.1:27313" = { + password = "5kG15EfpdcKNX3f2GSQ0H1HC7yIfxoCoImnO5FHM"; + publicKey = "371zpkgs8ss387tmr81q04mp0hg1skb51hw34vk1cq644mjqhup0.k"; + }; + }; + description = '' + Credentials for making UDP tunnels. ''; }; }; - keyFile = mkOption { - type = types.str; - example = "/root/cjdns.key"; - description = '' - Path to a file containing a cjdns private key on a single line. - ''; - }; - - passwordsFile = mkOption { - type = types.str; - default = null; - example = "/root/cjdns.authorizedPasswords"; - description = '' - A file containing a list of json dictionaries with passwords. - For example: - {"password": "s8xf5z7znl4jt05g922n3wpk75wkypk"}, - { "name": "nice guy", - "password": "xhthk1mglz8tpjrbbvdlhyc092rhpx5"}, - {"password": "3qfxyhmrht7uwzq29pmhbdm9w4bnc8w"} + ETHInterface = { + bind = mkOption { + default = ""; + example = "eth0"; + description = '' + Bind to this device for native ethernet operation. ''; - }; - - interfaces = { - udp = { - bind = { - address = mkOption { - default = "0.0.0.0"; - description = '' - Address to bind UDP tunnels to; disable by setting to null; - ''; - }; - port = mkOption { - type = types.int; - default = null; - description = '' - Port to bind UDP tunnels to. - A port will be choosen at random if this is not set. - This option is required to act as the server end of - a tunnel. - ''; - }; - }; - }; + }; - eth = { - bind = mkOption { - default = null; - example = "eth0"; - description = '' - Bind to this device and operate with native wire format. - ''; - }; - - beacon = mkOption { - default = 2; - description = '' - Auto-connect to other cjdns nodes on the same network. - Options: - 0 -- Disabled. - - 1 -- Accept beacons, this will cause cjdns to accept incoming - beacon messages and try connecting to the sender. - - 2 -- Accept and send beacons, this will cause cjdns to broadcast - messages on the local network which contain a randomly - generated per-session password, other nodes which have this - set to 1 or 2 will hear the beacon messages and connect - automatically. - ''; - }; - - connectTo = mkOption { - type = types.listOf types.str; - default = []; - description = '' - Credentials for connecting look similar to UDP credientials - except they begin with the mac address, for example: - "01:02:03:04:05:06":{"password":"a","publicKey":"b"} - ''; - }; + beacon = mkOption { + type = types.int; + default = 2; + description = '' + Auto-connect to other cjdns nodes on the same network. + Options: + 0: Disabled. + 1: Accept beacons, this will cause cjdns to accept incoming + beacon messages and try connecting to the sender. + 2: Accept and send beacons, this will cause cjdns to broadcast + messages on the local network which contain a randomly + generated per-session password, other nodes which have this + set to 1 or 2 will hear the beacon messages and connect + automatically. + ''; }; + + connectTo = mkOption { + type = types.attrsOf ( types.submodule ( + { options, ... }: + { options = { + password = mkOption { + type = types.str; + description = "Authorized password to the opposite end of the tunnel."; + }; + publicKey = mkOption { + type = types.str; + description = "Public key at the opposite end of the tunnel."; + }; + }; + } + )); + default = { }; + example = { + "01:02:03:04:05:06" = { + password = "5kG15EfpdcKNX3f2GSQ0H1HC7yIfxoCoImnO5FHM"; + publicKey = "371zpkgs8ss387tmr81q04mp0hg1skb51hw34vk1cq644mjqhup0.k"; + }; + }; + description = '' + Credentials for connecting look similar to UDP credientials + except they begin with the mac address. + ''; + }; }; - */ + }; + }; config = mkIf config.services.cjdns.enable { boot.kernelModules = [ "tun" ]; - /* - networking.firewall.allowedUDPPorts = mkIf (cfg.udp.bind.port != null) [ - cfg.udp.bind.port - ]; - */ + # networking.firewall.allowedUDPPorts = ... systemd.services.cjdns = { description = "encrypted networking for everybody"; wantedBy = [ "multi-user.target" ]; - wants = [ "network.target" ]; - before = [ "network.target" ]; - path = [ pkgs.cjdns ]; + after = [ "network-interfaces.target" ]; + + script = '' + source /etc/cjdns.keys + echo '${cjdrouteConf}' | sed \ + -e "s/@CJDNS_ADMIN_PASSWORD@/$CJDNS_ADMIN_PASSWORD/g" \ + -e "s/@CJDNS_PRIVATE_KEY@/$CJDNS_PRIVATE_KEY/g" \ + | ${pkgs.cjdns}/sbin/cjdroute + ''; serviceConfig = { Type = "forking"; - ExecStart = '' - ${pkgs.stdenv.shell} -c "${pkgs.cjdns}/sbin/cjdroute < ${cfg.confFile}" - ''; Restart = "on-failure"; }; }; + + system.activationScripts.cjdns = '' + grep -q "CJDNS_PRIVATE_KEY=" /etc/cjdns.keys || \ + echo "CJDNS_PRIVATE_KEY=$(${pkgs.cjdns}/sbin/makekey)" \ + >> /etc/cjdns.keys + + grep -q "CJDNS_ADMIN_PASSWORD=" /etc/cjdns.keys || \ + echo "CJDNS_ADMIN_PASSWORD=$(${pkgs.coreutils}/bin/head -c 96 /dev/urandom | ${pkgs.coreutils}/bin/tr -dc A-Za-z0-9)" \ + >> /etc/cjdns.keys + + chmod 600 /etc/cjdns.keys + ''; + + assertions = [ + { assertion = ( cfg.ETHInterface.bind != "" || cfg.UDPInterface.bind != "" ); + message = "Neither cjdns.ETHInterface.bind nor cjdns.UDPInterface.bind defined."; + } + { assertion = config.networking.enableIPv6; + message = "networking.enableIPv6 must be enabled for CJDNS to work"; + } + ]; + }; -} + +} \ No newline at end of file -- GitLab From fc6ccd1080918a433d03f9e0762296b0e486aef8 Mon Sep 17 00:00:00 2001 From: Emery Hemingway Date: Sun, 31 Aug 2014 15:44:42 -0400 Subject: [PATCH 740/843] cjdns: package update from 20140303 to 20140829 --- pkgs/tools/networking/cjdns/default.nix | 16 ++++-- pkgs/tools/networking/cjdns/makekey.patch | 64 +++++++++++++++++++++++ 2 files changed, 75 insertions(+), 5 deletions(-) create mode 100644 pkgs/tools/networking/cjdns/makekey.patch diff --git a/pkgs/tools/networking/cjdns/default.nix b/pkgs/tools/networking/cjdns/default.nix index 48e21f4507e..be107dfa81e 100644 --- a/pkgs/tools/networking/cjdns/default.nix +++ b/pkgs/tools/networking/cjdns/default.nix @@ -1,21 +1,27 @@ { stdenv, fetchgit, nodejs, which, python27 }: let - date = "20140303"; - rev = "f11ce1fd4795b0173ac0ef18c8a6f752aa824adb"; + date = "20140829"; + rev = "9595d67f9edd759054c5bd3aaee0968ff55e361a"; in stdenv.mkDerivation { name = "cjdns-${date}-${stdenv.lib.strings.substring 0 7 rev}"; src = fetchgit { - url = "git://github.com/cjdelisle/cjdns.git"; + url = "https://github.com/cjdelisle/cjdns.git"; inherit rev; - sha256 = "1bxhf9f1v0slf9mz3ll6jf45mkwvwxlf3yqxx9k23kjyr1nsc8s8"; + sha256 = "519c549c42ae26c5359ae13a4548c44b51e36db403964b4d9f78c19b749dfb83"; }; buildInputs = [ which python27 nodejs]; - builder = ./builder.sh; + patches = [ ./makekey.patch ]; + + buildPhase = "bash do"; + installPhase = '' + mkdir -p $out/sbin + cp cjdroute makekey $out/sbin + ''; meta = { homepage = https://github.com/cjdelisle/cjdns; diff --git a/pkgs/tools/networking/cjdns/makekey.patch b/pkgs/tools/networking/cjdns/makekey.patch new file mode 100644 index 00000000000..fcce5e3e728 --- /dev/null +++ b/pkgs/tools/networking/cjdns/makekey.patch @@ -0,0 +1,64 @@ +diff --git a/contrib/c/makekey.c b/contrib/c/makekey.c +new file mode 100644 +index 0000000..c7184e5 +--- /dev/null ++++ b/contrib/c/makekey.c +@@ -0,0 +1,46 @@ ++/* vim: set expandtab ts=4 sw=4: */ ++/* ++ * You may redistribute this program and/or modify it under the terms of ++ * the GNU General Public License as published by the Free Software Foundation, ++ * either version 3 of the License, or (at your option) any later version. ++ * ++ * This program is distributed in the hope that it will be useful, ++ * but WITHOUT ANY WARRANTY; without even the implied warranty of ++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the ++ * GNU General Public License for more details. ++ * ++ * You should have received a copy of the GNU General Public License ++ * along with this program. If not, see . ++ */ ++#include "crypto/random/Random.h" ++#include "memory/MallocAllocator.h" ++#include "crypto/AddressCalc.h" ++#include "util/AddrTools.h" ++#include "util/Hex.h" ++ ++#include "crypto_scalarmult_curve25519.h" ++ ++#include ++ ++int main(int argc, char** argv) ++{ ++ struct Allocator* alloc = MallocAllocator_new(1<<22); ++ struct Random* rand = Random_new(alloc, NULL, NULL); ++ ++ uint8_t privateKey[32]; ++ uint8_t publicKey[32]; ++ uint8_t ip[16]; ++ uint8_t hexPrivateKey[65]; ++ ++ for (;;) { ++ Random_bytes(rand, privateKey, 32); ++ crypto_scalarmult_curve25519_base(publicKey, privateKey); ++ if (AddressCalc_addressForPublicKey(ip, publicKey)) { ++ Hex_encode(hexPrivateKey, 65, privateKey, 32); ++ printf(hexPrivateKey); ++ return 0; ++ } ++ } ++ return 0; ++} ++ +diff --git a/node_build/make.js b/node_build/make.js +index 5e51645..11465e3 100644 +--- a/node_build/make.js ++++ b/node_build/make.js +@@ -339,6 +339,7 @@ Builder.configure({ + builder.buildExecutable('contrib/c/privatetopublic.c'); + builder.buildExecutable('contrib/c/sybilsim.c'); + builder.buildExecutable('contrib/c/makekeys.c'); ++ builder.buildExecutable('contrib/c/makekey.c'); + + builder.buildExecutable('crypto/random/randombytes.c'); + -- GitLab From a20b4cbbbae652153764697252b4904edb7ec6e4 Mon Sep 17 00:00:00 2001 From: "Jason \"Don\" O'Conal" Date: Mon, 1 Sep 2014 13:55:46 +1000 Subject: [PATCH 741/843] openldap: fix build on darwin --- pkgs/development/libraries/openldap/default.nix | 7 ++++--- pkgs/top-level/all-packages.nix | 6 +++++- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/openldap/default.nix b/pkgs/development/libraries/openldap/default.nix index cfbbce2f559..01a4e2e21da 100644 --- a/pkgs/development/libraries/openldap/default.nix +++ b/pkgs/development/libraries/openldap/default.nix @@ -18,9 +18,10 @@ stdenv.mkDerivation rec { dontPatchELF = 1; # !!! - meta = { - homepage = "http://www.openldap.org/"; + meta = with stdenv.lib; { + homepage = http://www.openldap.org/; description = "An open source implementation of the Lightweight Directory Access Protocol"; - maintainers = stdenv.lib.maintainers.mornfall; + maintainers = with maintainers; [ lovek323 mornfall ]; + platforms = platforms.unix; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d1f9487ab4a..8baa450f805 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5899,7 +5899,11 @@ let openexr = callPackage ../development/libraries/openexr { }; - openldap = callPackage ../development/libraries/openldap { }; + openldap = callPackage ../development/libraries/openldap { + stdenv = if stdenv.isDarwin + then clangStdenv + else stdenv; + }; openlierox = callPackage ../games/openlierox { }; -- GitLab From 24b4105ed7747bf19f129a988206858c9c81a0cb Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Mon, 1 Sep 2014 08:56:37 +0400 Subject: [PATCH 742/843] Remove fpc 2.4.0: lazarus doesn't need it and it doesn't like .2.6.0 as bootstrap compiler --- pkgs/development/compilers/fpc/2.4.0.nix | 39 ------------------------ pkgs/top-level/all-packages.nix | 1 - 2 files changed, 40 deletions(-) delete mode 100644 pkgs/development/compilers/fpc/2.4.0.nix diff --git a/pkgs/development/compilers/fpc/2.4.0.nix b/pkgs/development/compilers/fpc/2.4.0.nix deleted file mode 100644 index 30081c9d805..00000000000 --- a/pkgs/development/compilers/fpc/2.4.0.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ stdenv, fetchurl, gawk }: - -let startFPC = import ./binary.nix { inherit stdenv fetchurl; }; in - -stdenv.mkDerivation rec { - version = "2.4.0"; - name = "fpc-${version}"; - - src = fetchurl { - url = "http://downloads.sourceforge.net/sourceforge/freepascal/fpcbuild-${version}.tar.gz"; - sha256 = "1m2g2bafjixbwl5b9lna5h7r56y1rcayfnbp8kyjfd1c1ymbxaxk"; - }; - - buildInputs = [ startFPC gawk ]; - - preConfigure = - if stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux" then '' - sed -e "s@'/lib/ld-linux[^']*'@'''@" -i fpcsrc/compiler/systems/t_linux.pas - sed -e "s@'/lib64/ld-linux[^']*'@'''@" -i fpcsrc/compiler/systems/t_linux.pas - '' else ""; - - makeFlags = "NOGDB=1"; - - installFlags = "INSTALL_PREFIX=\${out}"; - - postInstall = '' - for i in $out/lib/fpc/*/ppc*; do - ln -fs $i $out/bin/$(basename $i) - done - mkdir -p $out/lib/fpc/etc/ - $out/lib/fpc/*/samplecfg $out/lib/fpc/${version} $out/lib/fpc/etc/ - ''; - - meta = { - description = "Free Pascal Compiler from a source distribution"; - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.linux; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cfc93a8cf45..e6809fc45c6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2690,7 +2690,6 @@ let adobe_flex_sdk = callPackage ../development/compilers/adobe-flex-sdk { }; fpc = callPackage ../development/compilers/fpc { }; - fpc_2_4_0 = callPackage ../development/compilers/fpc/2.4.0.nix { }; gambit = callPackage ../development/compilers/gambit { }; -- GitLab From a27e27c1f94c020e29ae72eca50de0d3ac7bbdc0 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Mon, 1 Sep 2014 09:07:54 +0400 Subject: [PATCH 743/843] Fix barcode src --- pkgs/tools/graphics/barcode/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/graphics/barcode/default.nix b/pkgs/tools/graphics/barcode/default.nix index 052dc8f9cb2..23a2e6dd78f 100644 --- a/pkgs/tools/graphics/barcode/default.nix +++ b/pkgs/tools/graphics/barcode/default.nix @@ -12,7 +12,7 @@ let version = "0.99"; baseName="barcode"; name="${baseName}-${version}"; - url="mirror://gnu/${baseName}/${name}.tar.gz"; + url="mirror://gnu/${baseName}/${name}.tar.xz"; }; in rec { -- GitLab From ef22c5390577127cb2e243898a8187916d509db8 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Mon, 1 Sep 2014 09:11:32 +0400 Subject: [PATCH 744/843] Update ACL2 --- pkgs/development/interpreters/acl2/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/acl2/default.nix b/pkgs/development/interpreters/acl2/default.nix index 6d074ac9f27..568551bb5ba 100644 --- a/pkgs/development/interpreters/acl2/default.nix +++ b/pkgs/development/interpreters/acl2/default.nix @@ -2,7 +2,7 @@ a : let fetchurl = a.fetchurl; - version = a.lib.attrByPath ["version"] "v3-5" a; + version = a.lib.attrByPath ["version"] "v6-5" a; buildInputs = with a; [ sbcl ]; @@ -10,7 +10,7 @@ in rec { src = fetchurl { url = "http://www.cs.utexas.edu/users/moore/acl2/${version}/distrib/acl2.tar.gz"; - sha256 = "0zmh1njpp7n7azcyjlygr0h0k51d18s1jkj0dr1jn2bh7mpysajk"; + sha256 = "19kfclgpdyms016s06pjf3icj3mx9jlcj8vfgpbx2ac4ls0ir36g"; name = "acl2-${version}.tar.gz"; }; -- GitLab From 8f50d803ef9c94fb82909e22b603982a0a522aea Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Tue, 15 Apr 2014 14:46:35 +0000 Subject: [PATCH 745/843] nixos: add support for mkhomedir in PAM --- nixos/modules/security/pam.nix | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/nixos/modules/security/pam.nix b/nixos/modules/security/pam.nix index b1b75a0068d..2a1606e42f3 100644 --- a/nixos/modules/security/pam.nix +++ b/nixos/modules/security/pam.nix @@ -126,6 +126,16 @@ let description = "Whether to show the message of the day."; }; + makeHomeDir = mkOption { + default = false; + type = types.bool; + description = '' + Whether to try to create home directories for users + with $HOMEs pointing to nonexistent + locations on session login. + ''; + }; + updateWtmp = mkOption { default = false; type = types.bool; @@ -192,6 +202,8 @@ let "session ${ if config.boot.isContainer then "optional" else "required" } pam_loginuid.so"} + ${optionalString cfg.makeHomeDir + "session required ${pkgs.pam}/lib/security/pam_mkhomedir.so silent skel=/etc/skel umask=0022"} ${optionalString cfg.updateWtmp "session required ${pkgs.pam}/lib/security/pam_lastlog.so silent"} ${optionalString config.users.ldap.enable -- GitLab From 99243a5c514c888e09bbc13214a6ba23ea03d392 Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Thu, 12 Jun 2014 05:36:16 +0000 Subject: [PATCH 746/843] nixos: add atftpd service --- nixos/modules/module-list.nix | 1 + nixos/modules/services/networking/atftpd.nix | 51 ++++++++++++++++++++ 2 files changed, 52 insertions(+) create mode 100644 nixos/modules/services/networking/atftpd.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 297ca0d1be4..f7ab4a474b8 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -192,6 +192,7 @@ ./services/network-filesystems/rsyncd.nix ./services/network-filesystems/samba.nix ./services/networking/amuled.nix + ./services/networking/atftpd.nix ./services/networking/avahi-daemon.nix ./services/networking/bind.nix ./services/networking/bitlbee.nix diff --git a/nixos/modules/services/networking/atftpd.nix b/nixos/modules/services/networking/atftpd.nix new file mode 100644 index 00000000000..ab9f8650f0f --- /dev/null +++ b/nixos/modules/services/networking/atftpd.nix @@ -0,0 +1,51 @@ +# NixOS module for atftpd TFTP server + +{ config, pkgs, ... }: + +with pkgs.lib; + +let + + cfg = config.services.atftpd; + +in + +{ + + options = { + + services.atftpd = { + + enable = mkOption { + default = false; + type = types.uniq types.bool; + description = '' + Whenever to enable the atftpd TFTP server. + ''; + }; + + root = mkOption { + default = "/var/empty"; + type = types.uniq types.string; + description = '' + Document root directory for the atftpd. + ''; + }; + + }; + + }; + + config = mkIf cfg.enable { + + systemd.services.atftpd = { + description = "atftpd TFTP server"; + after = [ "network.target" ]; + wantedBy = [ "multi-user.target" ]; + # runs as nobody + serviceConfig.ExecStart = "${pkgs.atftp}/sbin/atftpd --daemon --no-fork --bind-address 0.0.0.0 ${cfg.root}"; + }; + + }; + +} -- GitLab From 8c9b6d932a7b8ce5feca240abbe8b2232c699b05 Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Thu, 12 Jun 2014 23:34:40 +0000 Subject: [PATCH 747/843] nixos: add dhcpcd.persistent option --- nixos/modules/services/networking/dhcpcd.nix | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/networking/dhcpcd.nix b/nixos/modules/services/networking/dhcpcd.nix index 89aa9bdb6b6..09c271bfbfb 100644 --- a/nixos/modules/services/networking/dhcpcd.nix +++ b/nixos/modules/services/networking/dhcpcd.nix @@ -64,7 +64,7 @@ let # ${config.systemd.package}/bin/systemctl start ip-down.target #fi - ${config.networking.dhcpcd.runHook} + ${cfg.runHook} ''; in @@ -75,6 +75,18 @@ in options = { + networking.dhcpcd.persistent = mkOption { + type = types.bool; + default = false; + description = '' + Whenever to leave interfaces configured on dhcpcd daemon + shutdown. Set to true if you have your root or store mounted + over the network or this machine accepts SSH connections + through DHCP interfaces and clients should be notified when + it shuts down. + ''; + }; + networking.dhcpcd.denyInterfaces = mkOption { type = types.listOf types.str; default = []; @@ -139,7 +151,7 @@ in serviceConfig = { Type = "forking"; PIDFile = "/run/dhcpcd.pid"; - ExecStart = "@${dhcpcd}/sbin/dhcpcd dhcpcd --quiet --config ${dhcpcdConf}"; + ExecStart = "@${dhcpcd}/sbin/dhcpcd dhcpcd --quiet ${optionalString cfg.persistent "--persistent"} --config ${dhcpcdConf}"; ExecReload = "${dhcpcd}/sbin/dhcpcd --rebind"; Restart = "always"; }; -- GitLab From 26a4001a98322ab903b8186b97f33c5b282828a5 Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Thu, 12 Jun 2014 23:45:42 +0000 Subject: [PATCH 748/843] nixos: add setuid wrappers for some networked filesystems' helpers So that `user` mount option would work allowing normal users to mount and umount stuff marked with it in `fileSystems..options`. --- nixos/modules/security/setuid-wrappers.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/nixos/modules/security/setuid-wrappers.nix b/nixos/modules/security/setuid-wrappers.nix index 373afffd3fb..22dbdf6a6bf 100644 --- a/nixos/modules/security/setuid-wrappers.nix +++ b/nixos/modules/security/setuid-wrappers.nix @@ -77,7 +77,9 @@ in config = { security.setuidPrograms = - [ "fusermount" "wodim" "cdrdao" "growisofs" ]; + [ "mount.nfs" "mount.nfs4" "mount.cifs" + "fusermount" "umount" + "wodim" "cdrdao" "growisofs" ]; system.activationScripts.setuid = let -- GitLab From a49caa77e7e5e861e5b8d0b614157fe9c42ac7e2 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Mon, 1 Sep 2014 10:53:00 +0400 Subject: [PATCH 749/843] Add IDs for uhub service --- nixos/modules/misc/ids.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix index 513da5d50a1..efd8b253cd4 100644 --- a/nixos/modules/misc/ids.nix +++ b/nixos/modules/misc/ids.nix @@ -149,6 +149,7 @@ radvd = 139; zookeeper = 140; dnsmasq = 141; + uhub = 142; # When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399! @@ -268,6 +269,7 @@ mlmmj = 135; riemann = 137; riemanndash = 138; + uhub = 142; # When adding a gid, make sure it doesn't match an existing uid. And don't use gids above 399! -- GitLab From 9aa9345a5a5fda36ed0ce4dd1081494ea2391b3a Mon Sep 17 00:00:00 2001 From: Emery Hemingway Date: Fri, 18 Jul 2014 13:02:53 -0400 Subject: [PATCH 750/843] uhub: initial package for version 0.4.1 --- pkgs/servers/uhub/default.nix | 43 ++++++++ pkgs/servers/uhub/plugin-dir.patch | 23 ++++ pkgs/servers/uhub/systemd.patch | 164 +++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 4 files changed, 232 insertions(+) create mode 100644 pkgs/servers/uhub/default.nix create mode 100644 pkgs/servers/uhub/plugin-dir.patch create mode 100644 pkgs/servers/uhub/systemd.patch diff --git a/pkgs/servers/uhub/default.nix b/pkgs/servers/uhub/default.nix new file mode 100644 index 00000000000..a6e0d474d89 --- /dev/null +++ b/pkgs/servers/uhub/default.nix @@ -0,0 +1,43 @@ +{ stdenv, fetchurl, cmake, openssl, sqlite, pkgconfig, systemd +, tlsSupport ? false }: + +assert tlsSupport -> openssl != null; + +let version = "0.4.1"; in +stdenv.mkDerivation { + name = "uhub-${version}"; + + src = fetchurl { + url = "http://www.extatic.org/downloads/uhub/uhub-${version}-src.tar.bz2"; + sha256 = "1q0n74fb0h5w0k9fhfkznxb4r46qyfb8g2ss3wflivx4l0m1f9x2"; + }; + + buildInputs = [ cmake sqlite pkgconfig systemd ] ++ stdenv.lib.optional tlsSupport openssl; + + outputs = [ "out" + "mod_example" + "mod_welcome" + "mod_logging" + "mod_auth_simple" + "mod_auth_sqlite" + "mod_chat_history" + "mod_chat_only" + "mod_topic" + "mod_no_guest_downloads" + ]; + + patches = [ ./plugin-dir.patch ./systemd.patch ]; + + cmakeFlags = '' + -DSYSTEMD_SUPPORT=ON + ${if tlsSupport then "-DSSL_SUPPORT=ON" else "-DSSL_SUPPORT=OFF"} + ''; + + meta = with stdenv.lib; { + description = "High performance peer-to-peer hub for the ADC network"; + homepage = https://www.uhub.org/; + license = licenses.gpl3; + maintainers = [ maintainers.emery ]; + platforms = platforms.unix; + }; +} \ No newline at end of file diff --git a/pkgs/servers/uhub/plugin-dir.patch b/pkgs/servers/uhub/plugin-dir.patch new file mode 100644 index 00000000000..95ebfd6706f --- /dev/null +++ b/pkgs/servers/uhub/plugin-dir.patch @@ -0,0 +1,23 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 40e996e..d3b7e6d 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -185,10 +185,16 @@ else() + # add_definitions(-DDEBUG) + endif() + ++set( PLUGINS mod_example mod_welcome mod_logging mod_auth_simple mod_auth_sqlite mod_chat_history mod_chat_only mod_topic mod_no_guest_downloads ) ++ + if (UNIX) + install( TARGETS uhub RUNTIME DESTINATION bin ) +- install( TARGETS mod_example mod_welcome mod_logging mod_auth_simple mod_auth_sqlite mod_chat_history mod_chat_only mod_topic mod_no_guest_downloads DESTINATION /usr/lib/uhub/ OPTIONAL ) +- install( FILES ${CMAKE_SOURCE_DIR}/doc/uhub.conf ${CMAKE_SOURCE_DIR}/doc/plugins.conf ${CMAKE_SOURCE_DIR}/doc/rules.txt ${CMAKE_SOURCE_DIR}/doc/motd.txt DESTINATION /etc/uhub OPTIONAL ) ++ ++ foreach( PLUGIN ${PLUGINS} ) ++ install( TARGETS ${PLUGIN} DESTINATION $ENV{${PLUGIN}} OPTIONAL ) ++ endforeach( PLUGIN ) ++ ++ install( FILES ${CMAKE_SOURCE_DIR}/doc/uhub.conf ${CMAKE_SOURCE_DIR}/doc/plugins.conf ${CMAKE_SOURCE_DIR}/doc/rules.txt ${CMAKE_SOURCE_DIR}/doc/motd.txt DESTINATION doc/ OPTIONAL ) + + if (SQLITE_SUPPORT) + install( TARGETS uhub-passwd RUNTIME DESTINATION bin ) diff --git a/pkgs/servers/uhub/systemd.patch b/pkgs/servers/uhub/systemd.patch new file mode 100644 index 00000000000..05e7571d18d --- /dev/null +++ b/pkgs/servers/uhub/systemd.patch @@ -0,0 +1,164 @@ +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 40e996e..fc4fb01 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -19,6 +19,7 @@ option(LINK_SUPPORT "Allow hub linking" OFF) + option(SSL_SUPPORT "Enable SSL support" ON) + option(USE_OPENSSL "Use OpenSSL's SSL support" ON ) + option(SQLITE_SUPPORT "Enable SQLite support" ON) ++option(SYSTEMD_SUPPORT "Enable systemd notify and journal logging" OFF) + option(ADC_STRESS "Enable the stress tester client" OFF) + + find_package(Git) +@@ -34,6 +35,12 @@ if (SSL_SUPPORT) + endif() + endif() + ++if (SYSTEMD_SUPPORT) ++ INCLUDE(FindPkgConfig) ++ pkg_search_module(SD_DAEMON REQUIRED libsystemd-daemon) ++ pkg_search_module(SD_JOURNAL REQUIRED libsystemd-journal) ++endif() ++ + if (MSVC) + add_definitions(-D_CRT_SECURE_NO_WARNINGS) + endif() +@@ -175,6 +182,18 @@ if(SSL_SUPPORT) + endif() + endif() + ++if (SYSTEMD_SUPPORT) ++ target_link_libraries(uhub ${SD_DAEMON_LIBRARIES}) ++ target_link_libraries(uhub ${SD_JOURNAL_LIBRARIES}) ++ target_link_libraries(test ${SD_DAEMON_LIBRARIES}) ++ target_link_libraries(test ${SD_JOURNAL_LIBRARIES}) ++ target_link_libraries(uhub-passwd ${SD_JOURNAL_LIBRARIES}) ++ target_link_libraries(uhub-admin ${SD_JOURNAL_LIBRARIES}) ++ include_directories(${SD_DAEMON_INCLUDE_DIRS}) ++ include_directories(${SD_JOURNAL_INCLUDE_DIRS}) ++ add_definitions(-DSYSTEMD) ++endif() ++ + configure_file ("${PROJECT_SOURCE_DIR}/version.h.in" "${PROJECT_SOURCE_DIR}/version.h") + + mark_as_advanced(FORCE CMAKE_BUILD_TYPE) +diff --git a/src/core/main.c b/src/core/main.c +index bb78672..ac2d2a8 100644 +--- a/src/core/main.c ++++ b/src/core/main.c +@@ -19,6 +19,10 @@ + + #include "uhub.h" + ++#ifdef SYSTEMD ++#include ++#endif ++ + static int arg_verbose = 5; + static int arg_fork = 0; + static int arg_check_config = 0; +@@ -145,7 +149,16 @@ int main_loop() + } + #if !defined(WIN32) + setup_signal_handlers(hub); +-#endif ++#ifdef SYSTEMD ++ /* Notify the service manager that this daemon has ++ * been successfully initalized and shall enter the ++ * main loop. ++ */ ++ sd_notifyf(0, "READY=1\n" ++ "MAINPID=%lu", (unsigned long) getpid()); ++#endif /* SYSTEMD */ ++ ++#endif /* ! WIN32 */ + } + + hub_set_variables(hub, &acl); +@@ -216,13 +229,17 @@ void print_usage(char* program) + " -q Quiet mode - no output\n" + " -f Fork to background\n" + " -l Log messages to given file (default: stderr)\n" +- " -L Log messages to syslog\n" + " -c Specify configuration file (default: " SERVER_CONFIG ")\n" + " -C Check configuration and return\n" + " -s Show configuration parameters\n" + " -S Show configuration parameters, but ignore defaults\n" + " -h This message\n" + #ifndef WIN32 ++#ifdef SYSTEMD ++ " -L Log messages to journal\n" ++#else ++ " -L Log messages to syslog\n" ++#endif + " -u Run as given user\n" + " -g Run with given group permissions\n" + " -p Store pid in file (process id)\n" +diff --git a/src/util/log.c b/src/util/log.c +index 42badb3..2d97528 100644 +--- a/src/util/log.c ++++ b/src/util/log.c +@@ -21,7 +21,15 @@ + #include + + #ifndef WIN32 ++ ++#ifdef SYSTEMD ++#define SD_JOURNAL_SUPPRESS_LOCATION ++#include ++ ++#else + #include ++#endif ++ + static int use_syslog = 0; + #endif + +@@ -83,7 +91,9 @@ void hub_log_initialize(const char* file, int syslog) + if (syslog) + { + use_syslog = 1; ++ #ifndef SYSTEMD + openlog("uhub", LOG_PID, LOG_USER); ++ #endif + } + #endif + +@@ -132,7 +142,9 @@ void hub_log_shutdown() + if (use_syslog) + { + use_syslog = 0; ++ #ifndef SYSTEMD + closelog(); ++ #endif + } + #endif + } +@@ -212,7 +224,12 @@ void hub_log(int log_verbosity, const char *format, ...) + case log_fatal: level = LOG_CRIT; break; + case log_error: level = LOG_ERR; break; + case log_warning: level = LOG_WARNING; break; +- case log_user: level = LOG_INFO | LOG_AUTH; break; ++ #ifdef SYSTEMD ++ case log_user: level = LOG_INFO; break; ++ ++ #else ++ case log_user: level = LOG_INFO | LOG_AUTH; break; ++ #endif + case log_info: level = LOG_INFO; break; + case log_debug: level = LOG_DEBUG; break; + +@@ -224,8 +241,13 @@ void hub_log(int log_verbosity, const char *format, ...) + if (level == 0) + return; + ++ #ifdef SYSTEMD ++ sd_journal_print(level, "%s", logmsg); ++ ++ #else + level |= (LOG_USER | LOG_DAEMON); + syslog(level, "%s", logmsg); ++ #endif + } + #endif + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e6809fc45c6..965a7c45f87 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2407,6 +2407,8 @@ let inherit (pkgs.kde4) kdelibs; }; + uhub = callPackage ../servers/uhub { }; + unclutter = callPackage ../tools/misc/unclutter { }; unbound = callPackage ../tools/networking/unbound { }; -- GitLab From f5b4eacad609b43f5fcb4a88f0057ae8621d6c49 Mon Sep 17 00:00:00 2001 From: Emery Hemingway Date: Fri, 18 Jul 2014 13:27:55 -0400 Subject: [PATCH 751/843] uhub: initial service expression --- nixos/modules/module-list.nix | 1 + nixos/modules/services/misc/uhub.nix | 186 +++++++++++++++++++++++++++ 2 files changed, 187 insertions(+) create mode 100644 nixos/modules/services/misc/uhub.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index f7ab4a474b8..a2862a6d609 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -170,6 +170,7 @@ ./services/misc/siproxd.nix ./services/misc/svnserve.nix ./services/misc/synergy.nix + ./services/misc/uhub.nix ./services/misc/zookeeper.nix ./services/monitoring/apcupsd.nix ./services/monitoring/dd-agent.nix diff --git a/nixos/modules/services/misc/uhub.nix b/nixos/modules/services/misc/uhub.nix new file mode 100644 index 00000000000..15071202b9c --- /dev/null +++ b/nixos/modules/services/misc/uhub.nix @@ -0,0 +1,186 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + + cfg = config.services.uhub; + + uhubPkg = pkgs.uhub.override { tlsSupport = cfg.enableTLS; }; + + pluginConfig = "" + + optionalString cfg.plugins.authSqlite.enable '' + plugin ${uhubPkg.mod_auth_sqlite}/mod_auth_sqlite.so "file=${cfg.plugins.authSqlite.file}" + '' + + optionalString cfg.plugins.logging.enable '' + plugin ${uhubPkg.mod_logging}/mod_logging.so ${if cfg.plugins.logging.syslog then "syslog=true" else "file=${cfg.plugins.logging.file}"} + '' + + optionalString cfg.plugins.welcome.enable '' + plugin ${uhubPkg.mod_welcome}/mod_welcome.so "motd=${pkgs.writeText "motd.txt" cfg.plugins.welcome.motd} rules=${pkgs.writeText "rules.txt" cfg.plugins.welcome.rules}" + '' + + optionalString cfg.plugins.history.enable '' + plugin ${uhubPkg.mod_chat_history}/mod_chat_history.so "history_max=${toString cfg.plugins.history.max} history_default=${toString cfg.plugins.history.default} history_connect=${toString cfg.plugins.history.connect}" + ''; + + uhubConfigFile = pkgs.writeText "uhub.conf" '' + file_acl=${pkgs.writeText "users.conf" cfg.aclConfig} + file_plugins=${pkgs.writeText "plugins.conf" pluginConfig} + server_bind_addr=${cfg.address} + server_port=${toString cfg.port} + ${lib.optionalString cfg.enableTLS "tls_enable=yes"} + ${cfg.hubConfig} + ''; + +in + +{ + options = { + + services.uhub = { + + enable = mkOption { + type = types.bool; + default = false; + description = "Whether to enable the uhub ADC hub."; + }; + + port = mkOption { + type = types.int; + default = 1511; + description = "TCP port to bind the hub to."; + }; + + address = mkOption { + type = types.string; + default = "any"; + description = "Address to bind the hub to."; + }; + + enableTLS = mkOption { + type = types.bool; + default = false; + description = "Whether to enable TLS support."; + }; + + hubConfig = mkOption { + type = types.lines; + default = ""; + description = "Contents of uhub configuration file."; + }; + + aclConfig = mkOption { + type = types.lines; + default = ""; + description = "Contents of user ACL configuration file."; + }; + + plugins = { + + authSqlite = { + enable = mkOption { + type = types.bool; + default = false; + description = "Whether to enable the Sqlite authentication database plugin"; + }; + file = mkOption { + type = types.string; + example = "/var/db/uhub-users"; + description = "Path to user database. Use the uhub-passwd utility to create the database and add/remove users."; + }; + }; + + logging = { + enable = mkOption { + type = types.bool; + default = false; + description = "Whether to enable the logging plugin."; + }; + file = mkOption { + type = types.string; + default = ""; + description = "Path of log file."; + }; + syslog = mkOption { + type = types.bool; + default = false; + description = "If true then the system log is used instead of writing to file."; + }; + }; + + welcome = { + enable = mkOption { + type = types.bool; + default = false; + description = "Whether to enable the welcome plugin."; + }; + motd = mkOption { + default = ""; + type = types.lines; + description = '' + Welcome message displayed to clients after connecting + and with the !motd command. + ''; + }; + rules = mkOption { + default = ""; + type = types.lines; + description = '' + Rules message, displayed to clients with the !rules command. + ''; + }; + }; + + history = { + enable = mkOption { + type = types.bool; + default = false; + description = "Whether to enable the history plugin."; + }; + max = mkOption { + type = types.int; + default = 200; + description = "The maximum number of messages to keep in history"; + }; + default = mkOption { + type = types.int; + default = 10; + description = "When !history is provided without arguments, then this default number of messages are returned."; + }; + connect = mkOption { + type = types.int; + default = 5; + description = "The number of chat history messages to send when users connect (0 = do not send any history)."; + }; + }; + + }; + }; + + }; + + config = mkIf cfg.enable { + + users = { + extraUsers = singleton { + name = "uhub"; + uid = config.ids.uids.uhub; + }; + extraGroups = singleton { + name = "uhub"; + gid = config.ids.gids.uhub; + }; + }; + + systemd.services.uhub = { + description = "high performance peer-to-peer hub for the ADC network"; + after = [ "network.target" ]; + wantedBy = [ "multi-user.target" ]; + serviceConfig = { + Type = "notify"; + ExecStart = "${uhubPkg}/bin/uhub -c ${uhubConfigFile} -u uhub -g uhub -L"; + ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; + }; + }; + }; + +} \ No newline at end of file -- GitLab From 28fd7ea19019685b1330dac5118ab412ff25bdc2 Mon Sep 17 00:00:00 2001 From: Longrin Wischnewski Date: Mon, 1 Sep 2014 09:41:19 +0200 Subject: [PATCH 752/843] clamav: run freshclam in daemon mode --- nixos/modules/services/security/clamav.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/security/clamav.nix b/nixos/modules/services/security/clamav.nix index 057891a6047..a4d54301fc1 100644 --- a/nixos/modules/services/security/clamav.nix +++ b/nixos/modules/services/security/clamav.nix @@ -71,10 +71,10 @@ in mkdir -m 0755 -p ${stateDir} chown ${clamavUser}:${clamavGroup} ${stateDir} ''; - exec = "${pkgs.clamav}/bin/freshclam --config-file=${pkgs.writeText "freshclam.conf" cfg.updater.config}"; + exec = "${pkgs.clamav}/bin/freshclam --daemon --config-file=${pkgs.writeText "freshclam.conf" cfg.updater.config}"; }; }; }; -} \ No newline at end of file +} -- GitLab From 38f2c19324436878ee69f913881df83704df438b Mon Sep 17 00:00:00 2001 From: Longrin Wischnewski Date: Mon, 1 Sep 2014 09:44:00 +0200 Subject: [PATCH 753/843] clamav: update to version 0.98.4 --- pkgs/tools/security/clamav/default.nix | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/security/clamav/default.nix b/pkgs/tools/security/clamav/default.nix index fc43f01b344..f5c4a4e9b4e 100644 --- a/pkgs/tools/security/clamav/default.nix +++ b/pkgs/tools/security/clamav/default.nix @@ -1,19 +1,23 @@ -{ stdenv, fetchurl, zlib, bzip2, libiconv }: +{ stdenv, fetchurl, zlib, bzip2, libiconv, libxml2, openssl, ncurses, curl }: stdenv.mkDerivation rec { name = "clamav-${version}"; - version = "0.98.1"; + version = "0.98.4"; src = fetchurl { url = "mirror://sourceforge/clamav/clamav-${version}.tar.gz"; - sha256 = "1p13n8g3b88cxwxj07if9z1d2cav1ib94v6cq4r4bpacfd6yix9m"; + sha256 = "071yzamalj3rf7kl2jvc35ipnk1imdkq5ylbb8whyxfgmd3nf06k"; }; - buildInputs = [ zlib bzip2 libiconv ]; + buildInputs = [ zlib bzip2 libiconv libxml2 openssl ncurses curl ]; configureFlags = [ "--with-zlib=${zlib}" "--with-libbz2-prefix=${bzip2}" "--with-iconv-dir=${libiconv}" + "--with-xml=${libxml2}" + "--with-openssl=${openssl}" + "--with-libncurses-prefix=${ncurses}" + "--with-libcurl=${curl}" "--disable-clamav" ]; meta = with stdenv.lib; { -- GitLab From bc7f1b058ab54889ea162153c150f1661cf63cf3 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Mon, 1 Sep 2014 00:47:42 -0700 Subject: [PATCH 754/843] spice-protocol: 0.12.6 -> 0.12.7 --- .../libraries/spice-protocol/default.nix | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/pkgs/development/libraries/spice-protocol/default.nix b/pkgs/development/libraries/spice-protocol/default.nix index 162a832c93a..79fe47ff476 100644 --- a/pkgs/development/libraries/spice-protocol/default.nix +++ b/pkgs/development/libraries/spice-protocol/default.nix @@ -1,19 +1,18 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "spice-protocol-0.12.6"; + name = "spice-protocol-0.12.7"; src = fetchurl { url = "http://www.spice-space.org/download/releases/${name}.tar.bz2"; - sha256 = "16r5x2sppiaa6pzawkrvk5q4hmw7ynmlp2xr38f1vaxj5rh4aiwx"; + sha256 = "1hhn94bw2l76h09sy05a15bs6zalsijnylyqpwcys5hq6rrwpiln"; }; - meta = { + meta = with stdenv.lib; { description = "Protocol headers for the SPICE protocol"; homepage = http://www.spice-space.org; - license = stdenv.lib.licenses.bsd3; - - maintainers = [ stdenv.lib.maintainers.bluescreen303 ]; - platforms = stdenv.lib.platforms.linux; + license = licenses.bsd3; + maintainers = with maintainers; [ bluescreen303 ]; + platforms = platforms.linux; }; } -- GitLab From b0d13c5400c31e12737d387e54bd4414e19267b4 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Mon, 1 Sep 2014 00:53:30 -0700 Subject: [PATCH 755/843] spice: 0.12.4 -> 0.12.5 --- pkgs/development/libraries/spice/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/spice/default.nix b/pkgs/development/libraries/spice/default.nix index 2af9565e0b4..2353eec7348 100644 --- a/pkgs/development/libraries/spice/default.nix +++ b/pkgs/development/libraries/spice/default.nix @@ -5,11 +5,11 @@ with stdenv.lib; stdenv.mkDerivation rec { - name = "spice-0.12.4"; + name = "spice-0.12.5"; src = fetchurl { url = "http://www.spice-space.org/download/releases/${name}.tar.bz2"; - sha256 = "11xkdz26b39syynxm3iyjsr8q7x0v09zdli9an1ilcrfyiykw1ng"; + sha256 = "10gmqaanfg929aamf11n4si4r3d1g7z9qjdclsl9kjv7iw6s42a2"; }; buildInputs = [ pixman celt alsaLib openssl libjpeg zlib -- GitLab From 3a663f679f0ecad309abe2b78720ec02d3c6a2b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Mon, 1 Sep 2014 11:34:19 +0200 Subject: [PATCH 756/843] duplicity: update to 0.6.24. --- pkgs/tools/backup/duplicity/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/backup/duplicity/default.nix b/pkgs/tools/backup/duplicity/default.nix index 45d6cb83739..0f8c46e2dc3 100644 --- a/pkgs/tools/backup/duplicity/default.nix +++ b/pkgs/tools/backup/duplicity/default.nix @@ -1,14 +1,15 @@ -{ stdenv, fetchurl, python, librsync, ncftp, gnupg, boto, makeWrapper, lockfile }: +{ stdenv, fetchurl, python, librsync, ncftp, gnupg, boto, makeWrapper +, lockfile, setuptools }: let - version = "0.6.23"; + version = "0.6.24"; in stdenv.mkDerivation { name = "duplicity-${version}"; src = fetchurl { url = "http://code.launchpad.net/duplicity/0.6-series/${version}/+download/duplicity-${version}.tar.gz"; - sha256 = "0q0ckkmyq9z7xfbb1jajflmbzjwxpcjkkiab43rxrplm0ghz25vs"; + sha256 = "0l14nrhbgkyjgvh339bbhnm6hrdwrjadphq1jmpi0mcgcdbdfh8x"; }; installPhase = '' @@ -20,7 +21,7 @@ stdenv.mkDerivation { --prefix PYTHONPATH : "$(toPythonPath $out):$(toPythonPath ${boto}):$(toPythonPath ${lockfile})" \ ''; - buildInputs = [ python librsync makeWrapper ]; + buildInputs = [ python librsync makeWrapper setuptools ]; meta = { description = "Encrypted bandwidth-efficient backup using the rsync algorithm"; -- GitLab From ba0c5e7b9eb20325a086ae594a4622fac807b690 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Mon, 1 Sep 2014 12:59:34 +0200 Subject: [PATCH 757/843] Updating homebank to 4.6.3. --- pkgs/applications/office/homebank/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/office/homebank/default.nix b/pkgs/applications/office/homebank/default.nix index 007e093378d..0fbd2e39812 100644 --- a/pkgs/applications/office/homebank/default.nix +++ b/pkgs/applications/office/homebank/default.nix @@ -2,7 +2,7 @@ let download_root = "http://homebank.free.fr/public/"; - name = "homebank-4.5.5"; + name = "homebank-4.6.3"; lastrelease = download_root + name + ".tar.gz"; oldrelease = download_root + "old/" + name + ".tar.gz"; in @@ -12,7 +12,7 @@ stdenv.mkDerivation { src = fetchurl { urls = [ lastrelease oldrelease ]; - sha256 = "05k4497qsb6fzr662h9yxz1amsavd287wh0sabrpr9jdbh3jcfkg"; + sha256 = "0j39788xz9m7ic277phffznbl35c1dm1g7dgq83va9nni6vipqzn"; }; buildInputs = [ pkgconfig gtk libofx intltool ]; -- GitLab From 3e834e17839a0e0c79050ad6cb4269d636077674 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Mon, 1 Sep 2014 04:39:45 -0700 Subject: [PATCH 758/843] nixos/tests: Fix usage of head function without pkgs.lib --- nixos/tests/bittorrent.nix | 6 +++--- nixos/tests/nat.nix | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/nixos/tests/bittorrent.nix b/nixos/tests/bittorrent.nix index 7eb9c215ee1..b12a861f723 100644 --- a/nixos/tests/bittorrent.nix +++ b/nixos/tests/bittorrent.nix @@ -16,7 +16,7 @@ let miniupnpdConf = nodes: pkgs.writeText "miniupnpd.conf" '' ext_ifname=eth1 - listening_ip=${(head nodes.router.config.networking.interfaces.eth2.ip4).address}/24 + listening_ip=${(pkgs.lib.head nodes.router.config.networking.interfaces.eth2.ip4).address}/24 allow 1024-65535 192.168.2.0/24 1024-65535 ''; @@ -53,7 +53,7 @@ in { environment.systemPackages = [ pkgs.transmission ]; virtualisation.vlans = [ 2 ]; networking.defaultGateway = - (head nodes.router.config.networking.interfaces.eth2.ip4).address; + (pkgs.lib.head nodes.router.config.networking.interfaces.eth2.ip4).address; networking.firewall.enable = false; }; @@ -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://${(head nodes.tracker.config.networking.interfaces.eth1.ip4).address}:6969/announce -o /tmp/test.torrent"); + $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("chmod 644 /tmp/test.torrent"); # Start the tracker. !!! use a less crappy tracker diff --git a/nixos/tests/nat.nix b/nixos/tests/nat.nix index 5a57cce6b67..87ed974edad 100644 --- a/nixos/tests/nat.nix +++ b/nixos/tests/nat.nix @@ -13,7 +13,7 @@ import ./make-test.nix { { virtualisation.vlans = [ 1 ]; networking.firewall.allowPing = true; networking.defaultGateway = - (head nodes.router.config.networking.interfaces.eth2.ip4).address; + (pkgs.lib.head nodes.router.config.networking.interfaces.eth2.ip4).address; }; router = -- GitLab From cfed33ce2b8678fe7683992b3d56093b0eff85c7 Mon Sep 17 00:00:00 2001 From: "Ricardo M. Correia" Date: Sat, 30 Aug 2014 19:31:42 +0200 Subject: [PATCH 759/843] flashplayer: Update from 11.2.202.394 -> 11.2.202.400 --- .../browsers/mozilla-plugins/flashplayer-11/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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 d39dfe3582e..55521a13f9c 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.394"; + version = "11.2.202.400"; 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 = "1w82kmda91xdsrqpkrbcbrzswnbfszy0x9hvf9wf2h14isimdknx"; + sha256 = "043bzjcqxjkjk68kba5nk77m59k6g71h32bypjpnwaigdgbhafyl"; } else if stdenv.system == "i686-linux" then if debug then { @@ -58,7 +58,7 @@ let } else rec { inherit version; url = "http://fpdownload.macromedia.com/get/flashplayer/pdc/${version}/install_flash_player_11_linux.i386.tar.gz"; - sha256 = "0c8wp4qn6k224krihxb08g7727wlklk9bl4h7nqp3cpp85x9hg97"; + sha256 = "1xvfzm926rj0l2mq2kybrvykrv7bjfl3m7p5mvhj1586a3x1gb6h"; } else throw "Flash Player is not supported on this platform"; -- GitLab From f9e63ca20dfeeaf95837b22f7baa1ca8904338af Mon Sep 17 00:00:00 2001 From: "Ricardo M. Correia" Date: Sun, 31 Aug 2014 14:46:24 +0200 Subject: [PATCH 760/843] inotify-tools: Fix hash The hash wasn't updated when the version was bumped. --- pkgs/development/tools/misc/inotify-tools/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/misc/inotify-tools/default.nix b/pkgs/development/tools/misc/inotify-tools/default.nix index 3402c2060e7..4c1cd5bd7bd 100644 --- a/pkgs/development/tools/misc/inotify-tools/default.nix +++ b/pkgs/development/tools/misc/inotify-tools/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://github.com/downloads/rvoicilas/inotify-tools/inotify-tools-${version}.tar.gz"; - sha256 = "0icl4bx041axd5dvhg89kilfkysjj86hjakc7bk8n49cxjn4cha6"; + sha256 = "0by9frv1k59f76cx08sn06sk6lmdxsfb6zr0rshzhyrxi6lcqar2"; }; meta = with stdenv.lib; { -- GitLab From 3fbb9f05026900ec2d760574f15de16ba3ac536e Mon Sep 17 00:00:00 2001 From: aszlig Date: Mon, 1 Sep 2014 14:51:50 +0200 Subject: [PATCH 761/843] Add new openntpd package in version 20080406p-10. It's actually a fork from Debian who are providing cross-platform compatibility fixes for it. A big advantage is that it is far more minimal than the ntpd reference implementation and especially useful if you don't want to run an NTP service. Signed-off-by: aszlig --- pkgs/tools/networking/openntpd/default.nix | 32 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 34 insertions(+) create mode 100644 pkgs/tools/networking/openntpd/default.nix diff --git a/pkgs/tools/networking/openntpd/default.nix b/pkgs/tools/networking/openntpd/default.nix new file mode 100644 index 00000000000..c90582a7547 --- /dev/null +++ b/pkgs/tools/networking/openntpd/default.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchgit, openssl +, privsepPath ? "/var/empty" +, privsepUser ? "ntp" +}: + +stdenv.mkDerivation rec { + name = "openntpd-${version}"; + version = "20080406p-10"; + + src = fetchgit { + url = "git://git.debian.org/collab-maint/openntpd.git"; + rev = "refs/tags/debian/${version}"; + sha256 = "0gd6j4sw4x4adlz0jzbp6lblx5vlnk6l1034hzbj2xd95k8hjhh8"; + }; + + postPatch = '' + sed -i -e '/^install:/,/^$/{/@if.*PRIVSEP_PATH/,/^$/d}' Makefile.in + ''; + + configureFlags = [ + "--with-privsep-path=${privsepPath}" + "--with-privsep-user=${privsepUser}" + ]; + + buildInputs = [ openssl ]; + + meta = { + homepage = "http://www.openntpd.org/"; + license = stdenv.lib.licenses.bsd3; + description = "OpenBSD NTP daemon (Debian port)"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 965a7c45f87..b58114113bb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1752,6 +1752,8 @@ let openjade = callPackage ../tools/text/sgml/openjade { }; + openntpd = callPackage ../tools/networking/openntpd { }; + openobex = callPackage ../tools/bluetooth/openobex { }; openopc = callPackage ../tools/misc/openopc { -- GitLab From 29f46422844b8f18f4905fc3f730abe0b5b494da Mon Sep 17 00:00:00 2001 From: aszlig Date: Mon, 1 Sep 2014 15:14:00 +0200 Subject: [PATCH 762/843] nixos: Add new service for OpenNTPd. This conflicts with the existing reference NTP daemon, so we're using services.ntp.enable = mkForce false here to make sure both services aren't enabled in par. I was already trying to merge the module with services.ntp, but it would have been quite a mess with a bunch of conditions on the package name. They both have a bit in common if it comes to the configuration files, but differ in handling of the state dir (for example, OpenNTPd doesn't allow it to be owned by anything other than root). Signed-off-by: aszlig --- nixos/modules/module-list.nix | 1 + .../modules/services/networking/openntpd.nix | 49 +++++++++++++++++++ 2 files changed, 50 insertions(+) create mode 100644 nixos/modules/services/networking/openntpd.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index a2862a6d609..045eb469de9 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -231,6 +231,7 @@ ./services/networking/ntpd.nix ./services/networking/oidentd.nix ./services/networking/openfire.nix + ./services/networking/openntpd.nix ./services/networking/openvpn.nix ./services/networking/polipo.nix ./services/networking/prayer.nix diff --git a/nixos/modules/services/networking/openntpd.nix b/nixos/modules/services/networking/openntpd.nix new file mode 100644 index 00000000000..bd8a7a04a2a --- /dev/null +++ b/nixos/modules/services/networking/openntpd.nix @@ -0,0 +1,49 @@ +{ pkgs, lib, config, options, ... }: + +with lib; + +let + cfg = config.services.openntpd; + + package = pkgs.openntpd.override { + privsepUser = "ntp"; + privsepPath = "/var/empty"; + }; + + cfgFile = pkgs.writeText "openntpd.conf" '' + ${concatStringsSep "\n" (map (s: "server ${s}") cfg.servers)} + ''; +in +{ + ###### interface + + options.services.openntpd = { + enable = mkEnableOption "OpenNTP time synchronization server"; + + servers = mkOption { + default = config.services.ntp.servers; + type = types.listOf types.str; + inherit (options.services.ntp.servers) description; + }; + }; + + ###### implementation + + config = mkIf cfg.enable { + services.ntp.enable = mkForce false; + + users.extraUsers = singleton { + name = "ntp"; + uid = config.ids.uids.ntp; + description = "OpenNTP daemon user"; + home = "/var/empty"; + }; + + systemd.services.openntpd = { + description = "OpenNTP Server"; + wantedBy = [ "ip-up.target" ]; + partOf = [ "ip-up.target" ]; + serviceConfig.ExecStart = "${package}/sbin/ntpd -d -f ${cfgFile}"; + }; + }; +} -- GitLab From 31b7cae0188a569867626068580d96dfbf3b3219 Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Mon, 1 Sep 2014 16:08:44 +0200 Subject: [PATCH 763/843] nixos/znc: fix immutable config. Fix references to coreutils echo and rm. Make config writable even if immutable because of https://github.com/znc/znc/blob/master/src/znc.cpp#L964 . --- nixos/modules/services/networking/znc.nix | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/nixos/modules/services/networking/znc.nix b/nixos/modules/services/networking/znc.nix index 5aed20ee3e0..9b26b2b3244 100644 --- a/nixos/modules/services/networking/znc.nix +++ b/nixos/modules/services/networking/znc.nix @@ -274,20 +274,16 @@ in # If mutable, regenerate conf file every time. ${optionalString (!cfg.mutable) '' - ${pkgs.coreutils}/echo "znc is set to be system-managed. Now deleting old znc.conf file to be regenerated." - ${pkgs.coreutils}/rm -f ${cfg.dataDir}/configs/znc.conf + ${pkgs.coreutils}/bin/echo "znc is set to be system-managed. Now deleting old znc.conf file to be regenerated." + ${pkgs.coreutils}/bin/rm -f ${cfg.dataDir}/configs/znc.conf ''} # Ensure essential files exist. if [[ ! -f ${cfg.dataDir}/configs/znc.conf ]]; then - ${pkgs.coreutils}/bin/echo "No znc.conf file found in ${cfg.dataDir}. Creating one now." - ${if (!cfg.mutable) - then "${pkgs.coreutils}/bin/ln --force -s ${zncConfFile} ${cfg.dataDir}/.znc/configs/znc.conf" - else '' - ${pkgs.coreutils}/bin/cp --no-clobber ${zncConfFile} ${cfg.dataDir}/configs/znc.conf - ${pkgs.coreutils}/bin/chmod u+rw ${cfg.dataDir}/configs/znc.conf - ${pkgs.coreutils}/bin/chown ${cfg.user} ${cfg.dataDir}/configs/znc.conf - ''} + ${pkgs.coreutils}/bin/echo "No znc.conf file found in ${cfg.dataDir}. Creating one now." + ${pkgs.coreutils}/bin/cp --no-clobber ${zncConfFile} ${cfg.dataDir}/configs/znc.conf + ${pkgs.coreutils}/bin/chmod u+rw ${cfg.dataDir}/configs/znc.conf + ${pkgs.coreutils}/bin/chown ${cfg.user} ${cfg.dataDir}/configs/znc.conf fi if [[ ! -f ${cfg.dataDir}/znc.pem ]]; then -- GitLab From 41cd2d870ab7dc76913ba1cc2dc21e313732b4f1 Mon Sep 17 00:00:00 2001 From: Mateusz Kowalczyk Date: Mon, 1 Sep 2014 17:07:37 +0100 Subject: [PATCH 764/843] haskell-saltine: add 0.0.0.3 --- .../libraries/haskell/saltine/default.nix | 22 +++++++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 24 insertions(+) create mode 100644 pkgs/development/libraries/haskell/saltine/default.nix diff --git a/pkgs/development/libraries/haskell/saltine/default.nix b/pkgs/development/libraries/haskell/saltine/default.nix new file mode 100644 index 00000000000..acb4066fb2e --- /dev/null +++ b/pkgs/development/libraries/haskell/saltine/default.nix @@ -0,0 +1,22 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, libsodium, profunctors, QuickCheck, testFramework +, testFrameworkQuickcheck2, vector +}: + +cabal.mkDerivation (self: { + pname = "saltine"; + version = "0.0.0.3"; + sha256 = "1xjpjblxlpziyyz74ldaqh04shvy2qi34sc6b3232wpc0kyl5s8y"; + buildDepends = [ profunctors ]; + testDepends = [ + QuickCheck testFramework testFrameworkQuickcheck2 vector + ]; + extraLibraries = [ libsodium ]; + meta = { + description = "Cryptography that's easy to digest (NaCl/libsodium bindings)"; + license = self.stdenv.lib.licenses.mit; + platforms = self.ghc.meta.platforms; + maintainers = with self.stdenv.lib.maintainers; [ fuuzetsu ]; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index b074a6ab48d..cfb06b0880d 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -2134,6 +2134,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in RSA = callPackage ../development/libraries/haskell/RSA {}; + saltine = callPackage ../development/libraries/haskell/saltine {}; + sampleFrame = callPackage ../development/libraries/haskell/sample-frame {}; safe = callPackage ../development/libraries/haskell/safe {}; -- GitLab From 933ac5e9f8cd1f09e649621200dc7053675fe4c1 Mon Sep 17 00:00:00 2001 From: Daniel Peebles Date: Mon, 1 Sep 2014 14:23:43 -0400 Subject: [PATCH 765/843] Use a more permanent URL for the byacc version we're using The other one is likely to change with every new release. --- pkgs/development/tools/parsing/byacc/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/parsing/byacc/default.nix b/pkgs/development/tools/parsing/byacc/default.nix index f3ec8225f1c..8842c8723b1 100644 --- a/pkgs/development/tools/parsing/byacc/default.nix +++ b/pkgs/development/tools/parsing/byacc/default.nix @@ -4,7 +4,7 @@ stdenv.mkDerivation { name = "byacc-1.9"; src = fetchurl { - url = http://invisible-island.net/datafiles/release/byacc.tar.gz; + url = ftp://invisible-island.net/byacc/byacc-20140715.tgz; sha256 = "1rbzx5ipkvih9rjfdfv6310wcr6mxjbdlsh9zcv5aaz6yxxxil7c"; }; -- GitLab From e15aa51f2f419bf5e08d9afdfbcced8407733288 Mon Sep 17 00:00:00 2001 From: Vladimir Kirillov Date: Mon, 1 Sep 2014 21:28:14 +0300 Subject: [PATCH 766/843] sysdig: cheat nix into not capturing linux-dev as a runtime dependency --- pkgs/os-specific/linux/sysdig/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/os-specific/linux/sysdig/default.nix b/pkgs/os-specific/linux/sysdig/default.nix index 4abbb4c45b4..80677a52a32 100644 --- a/pkgs/os-specific/linux/sysdig/default.nix +++ b/pkgs/os-specific/linux/sysdig/default.nix @@ -10,7 +10,7 @@ let }; buildInputs = [ cmake zlib luajit - ] ++ optional (kernel != null) kernel; + ]; in stdenv.mkDerivation { inherit (s) name version; @@ -30,6 +30,10 @@ stdenv.mkDerivation { ''; postInstall = optionalString (kernel != null) '' make install_driver + kernel_dev=${kernel.dev} + kernel_dev=''${kernel_dev#/nix/store/} + kernel_dev=''${kernel_dev%%-linux*dev*} + sed -i "s#$kernel_dev#................................#g" $out/lib/modules/${kernel.modDirVersion}/extra/sysdig-probe.ko ''; meta = with stdenv.lib; { -- GitLab From 5b9110233d47d892bb6db759681c39da23420839 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Tue, 2 Sep 2014 00:55:54 +0400 Subject: [PATCH 767/843] Update atftp --- pkgs/tools/networking/atftp/default.nix | 57 ++++++++++++++----------- 1 file changed, 32 insertions(+), 25 deletions(-) diff --git a/pkgs/tools/networking/atftp/default.nix b/pkgs/tools/networking/atftp/default.nix index acd71ea893d..b6bdfc7fabc 100644 --- a/pkgs/tools/networking/atftp/default.nix +++ b/pkgs/tools/networking/atftp/default.nix @@ -1,27 +1,34 @@ -{ stdenv, fetchurl, pcre, readline }: - +{ lib, stdenv, fetchurl, readline, tcp_wrappers, pcre, makeWrapper }: +assert stdenv.isLinux; +assert stdenv.gcc.gcc != null; +let +version = "0.7"; +debianPatch = fetchurl { +url = "mirror://debian/pool/main/a/atftp/atftp_${version}.dfsg-11.diff.gz"; +sha256 = "07g4qbmp0lnscg2dkj6nsj657jaghibvfysdm1cdxcn215n3zwqd"; +}; +in stdenv.mkDerivation { - name = "atftp-0.7.1"; - - src = fetchurl { - url = "mirror://sourceforge/atftp/atftp-0.7.1.tar.gz"; - sha256 = "0bgr31gbnr3qx4ixf8hz47l58sh3367xhcnfqd8233fvr84nyk5f"; - }; - - buildInputs = [ pcre readline ]; - - NIX_LDFLAGS = "-lgcc_s"; # for pthread_cancel - - configureFlags = [ - "--enable-libreadline" - "--enable-libpcre" - "--enable-mtftp" - ]; - - meta = with stdenv.lib; { - description = "Advanced TFTP server and client"; - homepage = http://sourceforge.net/projects/atftp/; - license = licenses.gpl2Plus; - platforms = platforms.linux; - }; +name = "atftp"; +inherit version; +src = fetchurl { +url = "mirror://debian/pool/main/a/atftp/atftp_${version}.dfsg.orig.tar.gz"; +sha256 = "0nd5dl14d6z5abgcbxcn41rfn3syza6s57bbgh4aq3r9cxdmz08q"; +}; +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 ""} +''; +meta = { +description = "Advanced tftp tools"; +maintainers = lib.maintainers.raskin; +platforms = lib.platforms.linux; +license = lib.licenses.gpl2Plus; +passthru = { +updateInfo = { +downloadPage = "http://packages.debian.org/source/wheezy/atftp"; +}; +}; +}; } -- GitLab From 038c71a11a6800b89dce123b074837f8033126ba Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Mon, 1 Sep 2014 22:50:14 +0200 Subject: [PATCH 768/843] boinc: update from 7.2.42 to 7.4.14 (fixes CVE-2013-2298) --- pkgs/applications/science/misc/boinc/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/science/misc/boinc/default.nix b/pkgs/applications/science/misc/boinc/default.nix index 7020de0bca8..0898b458593 100644 --- a/pkgs/applications/science/misc/boinc/default.nix +++ b/pkgs/applications/science/misc/boinc/default.nix @@ -3,12 +3,12 @@ mesa, libXmu, libXi, freeglut, libjpeg, libtool, wxGTK, xcbutil, sqlite, gtk, patchelf, libXScrnSaver, libnotify, libX11, libxcb }: stdenv.mkDerivation rec { - name = "boinc-7.2.42"; + name = "boinc-7.4.14"; src = fetchgit { url = "git://boinc.berkeley.edu/boinc-v2.git"; - rev = "dd0d630882547c123ca0f8fda7a62e058d60f6a9"; - sha256 = "1zifpi3mjgaj68fba6kammp3x7z8n2x164zz6fj91xfiapnan56j"; + rev = "fb31ab18f94f3b5141bea03e8537d76c606cd276"; + sha256 = "1465zl8l87fm1ps5f2may6mcc3pp40mpd6wphpxnwwk1lmv48x96"; }; buildInputs = [ libtool automake autoconf m4 pkgconfig curl mesa libXmu libXi -- GitLab From e12337156c35ed2bfd245a995e0e77a6192f94ee Mon Sep 17 00:00:00 2001 From: Vladimir Still Date: Sun, 31 Aug 2014 13:15:39 +0200 Subject: [PATCH 769/843] sshd: Allow to specify ListenAddress. --- .../modules/services/networking/ssh/sshd.nix | 35 +++++++++++++++++++ 1 file changed, 35 insertions(+) diff --git a/nixos/modules/services/networking/ssh/sshd.nix b/nixos/modules/services/networking/ssh/sshd.nix index e4b29a0b909..3eb646f0750 100644 --- a/nixos/modules/services/networking/ssh/sshd.nix +++ b/nixos/modules/services/networking/ssh/sshd.nix @@ -144,6 +144,33 @@ in ''; }; + listenAddresses = mkOption { + type = types.listOf types.optionSet; + default = []; + example = [ { addr = "192.168.3.1"; port = 22; } { addr = "0.0.0.0"; port = 64022; } ]; + description = '' + List of addresses and ports to listen on (ListenAddress directive + in config). If port is not specified for address sshd will listen + on all ports specified by ports option. + ''; + options = { + addr = mkOption { + type = types.nullOr types.str; + default = null; + description = '' + Host, IPv4 or IPv6 address to listen to. + ''; + }; + port = mkOption { + type = types.nullOr types.int; + default = null; + description = '' + Port to listen to. + ''; + }; + }; + }; + passwordAuthentication = mkOption { type = types.bool; default = true; @@ -349,6 +376,10 @@ in Port ${toString port} '') cfg.ports} + ${concatMapStrings ({ port, addr }: '' + ListenAddress ${addr}${if port != null then ":" + toString port else ""} + '') cfg.listenAddresses} + ${optionalString cfgc.setXAuthLocation '' XAuthLocation ${pkgs.xorg.xauth}/bin/xauth ''} @@ -383,6 +414,10 @@ in assertion = (data.publicKey == null && data.publicKeyFile != null) || (data.publicKey != null && data.publicKeyFile == null); message = "knownHost ${name} must contain either a publicKey or publicKeyFile"; + }) + ++ flip map cfg.listenAddresses ({ addr, port }: { + assertion = addr != null; + message = "addr must be spefied in each listenAddresses entry"; }); }; -- GitLab From ac39d839c3dccb2890b64a3fbe1a28d8aba1007f Mon Sep 17 00:00:00 2001 From: Vladimir Still Date: Sun, 31 Aug 2014 17:21:14 +0200 Subject: [PATCH 770/843] sshd: Add note about firewall and listenAddresses. --- nixos/modules/services/networking/ssh/sshd.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/modules/services/networking/ssh/sshd.nix b/nixos/modules/services/networking/ssh/sshd.nix index 3eb646f0750..9b2f56fa400 100644 --- a/nixos/modules/services/networking/ssh/sshd.nix +++ b/nixos/modules/services/networking/ssh/sshd.nix @@ -152,6 +152,8 @@ in List of addresses and ports to listen on (ListenAddress directive in config). If port is not specified for address sshd will listen on all ports specified by ports option. + NOTE: setting this option won't automatically enable given ports + in firewall configuration. ''; options = { addr = mkOption { -- GitLab From a2394f09c7003efc238eb065afdd57221f6ba257 Mon Sep 17 00:00:00 2001 From: Vladimir Still Date: Mon, 1 Sep 2014 13:02:39 +0200 Subject: [PATCH 771/843] sshd: Add note about listening on port 22 to listenAddresses. --- nixos/modules/services/networking/ssh/sshd.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/networking/ssh/sshd.nix b/nixos/modules/services/networking/ssh/sshd.nix index 9b2f56fa400..956c31a8ba3 100644 --- a/nixos/modules/services/networking/ssh/sshd.nix +++ b/nixos/modules/services/networking/ssh/sshd.nix @@ -151,7 +151,8 @@ in description = '' List of addresses and ports to listen on (ListenAddress directive in config). If port is not specified for address sshd will listen - on all ports specified by ports option. + on all ports specified by ports option. + NOTE: this will override default listening on all local addresses and port 22. NOTE: setting this option won't automatically enable given ports in firewall configuration. ''; -- GitLab From 82ed86dd7675e19a496ef15da10af73d12867490 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Tue, 2 Sep 2014 01:03:39 +0400 Subject: [PATCH 772/843] Remove unneeded definitions --- pkgs/misc/emulators/stella/default.nix | 5 ----- 1 file changed, 5 deletions(-) diff --git a/pkgs/misc/emulators/stella/default.nix b/pkgs/misc/emulators/stella/default.nix index 154a5d02a80..3f10d7afb6e 100644 --- a/pkgs/misc/emulators/stella/default.nix +++ b/pkgs/misc/emulators/stella/default.nix @@ -15,11 +15,6 @@ stdenv.mkDerivation rec { buildInputs = with stdenv.lib; [ pkgconfig SDL2 ]; - configureFlags = '' - ''; - - NIX_CFLAGS_COMPILE=""; - meta = with stdenv.lib; { description = "An open-source Atari 2600 VCS emulator"; longDescription = '' -- GitLab From f87c516a9135f6086b6c05d510a7ae8d3112bee7 Mon Sep 17 00:00:00 2001 From: "tv@shackspace.de" Date: Tue, 29 Jul 2014 22:13:47 +0200 Subject: [PATCH 773/843] urlwatch: add version 1.16 --- pkgs/tools/networking/urlwatch/default.nix | 21 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 23 insertions(+) create mode 100644 pkgs/tools/networking/urlwatch/default.nix diff --git a/pkgs/tools/networking/urlwatch/default.nix b/pkgs/tools/networking/urlwatch/default.nix new file mode 100644 index 00000000000..4843f07c8f2 --- /dev/null +++ b/pkgs/tools/networking/urlwatch/default.nix @@ -0,0 +1,21 @@ +{ stdenv, fetchurl, python3Packages }: + +python3Packages.buildPythonPackage rec { + name = "urlwatch-1.16"; + + src = fetchurl { + url = "http://thp.io/2008/urlwatch/${name}.tar.gz"; + sha256 = "0yf1m909awfm06z7xwn20qxbbgslb1vjwwb6rygp6bn7sq022f1f"; + }; + + patchPhase = '' + ./convert-to-python3.sh + ''; + + meta = { + description = "A tool for monitoring webpages for updates"; + homepage = https://thp.io/2008/urlwatch/; + license = stdenv.lib.licenses.bsd3; + maintainers = [ stdenv.lib.maintainers.tv ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fb5cab51b45..0905a6a951d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2437,6 +2437,8 @@ let uptimed = callPackage ../tools/system/uptimed { }; + urlwatch = callPackage ../tools/networking/urlwatch { }; + varnish = callPackage ../servers/varnish { }; varnish2 = callPackage ../servers/varnish/2.1.nix { }; -- GitLab From a6dd9bd0cb3ef4896c41f70e37bc3a72d36aa569 Mon Sep 17 00:00:00 2001 From: "tv@shackspace.de" Date: Wed, 30 Jul 2014 19:44:21 +0200 Subject: [PATCH 774/843] python-wrapper: fix wrapped argv[0] w/o sed, maybe --- pkgs/build-support/setup-hooks/make-wrapper.sh | 5 ++++- pkgs/development/python-modules/generic/wrap.sh | 6 ------ 2 files changed, 4 insertions(+), 7 deletions(-) diff --git a/pkgs/build-support/setup-hooks/make-wrapper.sh b/pkgs/build-support/setup-hooks/make-wrapper.sh index 41f2a59246d..95d1a519213 100644 --- a/pkgs/build-support/setup-hooks/make-wrapper.sh +++ b/pkgs/build-support/setup-hooks/make-wrapper.sh @@ -96,7 +96,10 @@ filterExisting() { # Syntax: wrapProgram wrapProgram() { local prog="$1" - local hidden="$(dirname "$prog")/.$(basename "$prog")"-wrapped + local progBasename=$(basename $prog) + local hiddenDir=$(dirname $prog)/.$progBasename-wrapped-bin + local hidden=$hiddenDir/$progBasename + mkdir $hiddenDir mv $prog $hidden makeWrapper $hidden $prog "$@" } diff --git a/pkgs/development/python-modules/generic/wrap.sh b/pkgs/development/python-modules/generic/wrap.sh index 857f002cace..282aeca9ed1 100644 --- a/pkgs/development/python-modules/generic/wrap.sh +++ b/pkgs/development/python-modules/generic/wrap.sh @@ -26,12 +26,6 @@ wrapPythonProgramsIn() { # dont wrap EGG-INFO scripts since they are called from python if echo "$i" | grep -v EGG-INFO/scripts; then echo "wrapping \`$i'..." - sed -i "$i" -re '1 { - /^#!/!b; :r - /\\$/{N;b r} - /__future__|^ *(#.*)?$/{n;b r} - /^ *[^# ]/i import sys; sys.argv[0] = '"'$(basename "$i")'"' - }' wrapProgram "$i" \ --prefix PYTHONPATH ":" $program_PYTHONPATH \ --prefix PATH ":" $program_PATH -- GitLab From 2a1a814e5356a93a5c477352a31b6239ae481492 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Tue, 2 Sep 2014 01:36:10 +0400 Subject: [PATCH 775/843] Make console-getty only used inside container by default --- nixos/modules/services/ttys/agetty.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/services/ttys/agetty.nix b/nixos/modules/services/ttys/agetty.nix index 3878b02b1a8..3958be33df2 100644 --- a/nixos/modules/services/ttys/agetty.nix +++ b/nixos/modules/services/ttys/agetty.nix @@ -70,6 +70,7 @@ with lib; { serviceConfig.ExecStart = "@${pkgs.utillinux}/sbin/agetty agetty --noclear --login-program ${pkgs.shadow}/bin/login --keep-baud console 115200,38400,9600 $TERM"; serviceConfig.Restart = "always"; restartIfChanged = false; + enable = mkDefault config.boot.isContainer; }; environment.etc = singleton -- GitLab From 9deb7f8aae431ed7725cfaa13edf8645d19d91f2 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Tue, 2 Sep 2014 01:45:15 +0400 Subject: [PATCH 776/843] Create wrapper directory outside of /bin/ for FHS chroots to be closer to FHS --- pkgs/build-support/setup-hooks/make-wrapper.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/build-support/setup-hooks/make-wrapper.sh b/pkgs/build-support/setup-hooks/make-wrapper.sh index 95d1a519213..dd43068be27 100644 --- a/pkgs/build-support/setup-hooks/make-wrapper.sh +++ b/pkgs/build-support/setup-hooks/make-wrapper.sh @@ -97,9 +97,9 @@ filterExisting() { wrapProgram() { local prog="$1" local progBasename=$(basename $prog) - local hiddenDir=$(dirname $prog)/.$progBasename-wrapped-bin - local hidden=$hiddenDir/$progBasename - mkdir $hiddenDir + local hiddenDir="$(dirname $prog)/../wrapped-bin/.$progBasename-wrapped-bin" + mkdir -p $hiddenDir + local hidden="$(cd "$hiddenDir"; pwd)/$progBasename" mv $prog $hidden makeWrapper $hidden $prog "$@" } -- GitLab From 8ef11bb0ee4567826d9a7509ea2c8f1e226bcebf Mon Sep 17 00:00:00 2001 From: Chris Farmiloe Date: Thu, 12 Jun 2014 15:16:38 +0200 Subject: [PATCH 777/843] add openvswitch package + basic nixos module to enable it --- nixos/modules/module-list.nix | 1 + nixos/modules/virtualisation/libvirtd.nix | 11 +- nixos/modules/virtualisation/openvswitch.nix | 120 ++++++++++++++++++ .../os-specific/linux/openvswitch/default.nix | 49 +++++++ pkgs/top-level/all-packages.nix | 2 + 5 files changed, 180 insertions(+), 3 deletions(-) create mode 100644 nixos/modules/virtualisation/openvswitch.nix create mode 100644 pkgs/os-specific/linux/openvswitch/default.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 045eb469de9..76d1ed8a9d4 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -365,6 +365,7 @@ ./virtualisation/docker.nix ./virtualisation/libvirtd.nix #./virtualisation/nova.nix + ./virtualisation/openvswitch.nix ./virtualisation/virtualbox-guest.nix #./virtualisation/xen-dom0.nix ] diff --git a/nixos/modules/virtualisation/libvirtd.nix b/nixos/modules/virtualisation/libvirtd.nix index d7d700d8841..ed157bba882 100644 --- a/nixos/modules/virtualisation/libvirtd.nix +++ b/nixos/modules/virtualisation/libvirtd.nix @@ -7,6 +7,7 @@ with lib; let cfg = config.virtualisation.libvirtd; + vswitch = config.virtualisation.vswitch; configFile = pkgs.writeText "libvirtd.conf" '' unix_sock_group = "libvirtd" unix_sock_rw_perms = "0770" @@ -75,10 +76,14 @@ in wantedBy = [ "multi-user.target" ]; after = [ "systemd-udev-settle.service" ]; - path = - [ pkgs.bridge_utils pkgs.dmidecode pkgs.dnsmasq + path = [ + pkgs.bridge_utils + pkgs.dmidecode + pkgs.dnsmasq pkgs.ebtables - ] ++ optional cfg.enableKVM pkgs.qemu_kvm; + ] + ++ optional cfg.enableKVM pkgs.qemu_kvm + ++ optional vswitch.enable vswitch.package; preStart = '' diff --git a/nixos/modules/virtualisation/openvswitch.nix b/nixos/modules/virtualisation/openvswitch.nix new file mode 100644 index 00000000000..2070dd0f783 --- /dev/null +++ b/nixos/modules/virtualisation/openvswitch.nix @@ -0,0 +1,120 @@ +# Systemd services for openvswitch + +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.virtualisation.vswitch; + +in + +{ + # ------------------------------------------------------------ + + options = { + + virtualisation.vswitch.enable = mkOption { + type = types.bool; + default = false; + description = + '' + Enable Open vSwitch. A configuration + daemon (ovs-server) will be started. + ''; + }; + + + virtualisation.vswitch.package = mkOption { + type = types.package; + default = pkgs.openvswitch; + description = + '' + Open vSwitch package to use. + ''; + }; + + }; + + # ------------------------------------------------------------ + + config = mkIf cfg.enable (let + + # Where the communication sockets live + runDir = "/var/run/openvswitch"; + + # Where the config database live (can't be in nix-store) + stateDir = "/var/db/openvswitch"; + + # The path to the an initialized version of the database + db = pkgs.stdenv.mkDerivation { + name = "vswitch.db"; + unpackPhase = "true"; + buildPhase = "true"; + buildInputs = with pkgs; [ + cfg.package + ]; + installPhase = + '' + ensureDir $out/ + ''; + }; + + in { + + environment.systemPackages = [ cfg.package ]; + + boot.kernelModules = [ "tun" "openvswitch" ]; + + boot.extraModulePackages = [ cfg.package ]; + + systemd.services.ovsdb = { + description = "Open_vSwitch Database Server"; + wantedBy = [ "multi-user.target" ]; + after = [ "systemd-udev-settle.service" ]; + wants = [ "vswitchd.service" ]; + path = [ cfg.package ]; + restartTriggers = [ db cfg.package ]; + # Create the config database + preStart = + '' + mkdir -p ${runDir} + mkdir -p /var/db/openvswitch + chmod +w /var/db/openvswitch + if [[ ! -e /var/db/openvswitch/conf.db ]]; then + ${cfg.package}/bin/ovsdb-tool create \ + "/var/db/openvswitch/conf.db" \ + "${cfg.package}/share/openvswitch/vswitch.ovsschema" + fi + chmod -R +w /var/db/openvswitch + ''; + serviceConfig.ExecStart = + '' + ${cfg.package}/bin/ovsdb-server \ + --remote=punix:${runDir}/db.sock \ + --private-key=db:Open_vSwitch,SSL,private_key \ + --certificate=db:Open_vSwitch,SSL,certificate \ + --bootstrap-ca-cert=db:Open_vSwitch,SSL,ca_cert \ + --unixctl=ovsdb.ctl.sock \ + /var/db/openvswitch/conf.db + ''; + serviceConfig.Restart = "always"; + serviceConfig.RestartSec = 3; + postStart = + '' + ${cfg.package}/bin/ovs-vsctl --timeout 3 --retry --no-wait init + ''; + + }; + + systemd.services.vswitchd = { + description = "Open_vSwitch Daemon"; + bindsTo = [ "ovsdb.service" ]; + after = [ "ovsdb.service" ]; + path = [ cfg.package ]; + serviceConfig.ExecStart = ''${cfg.package}/bin/ovs-vswitchd''; + }; + + }); + +} diff --git a/pkgs/os-specific/linux/openvswitch/default.nix b/pkgs/os-specific/linux/openvswitch/default.nix new file mode 100644 index 00000000000..13b41ebe9c8 --- /dev/null +++ b/pkgs/os-specific/linux/openvswitch/default.nix @@ -0,0 +1,49 @@ +{ stdenv, fetchurl, openssl, python27, iproute, perl510, kernel ? null}: +let + + version = "2.1.2"; + + skipKernelMod = kernel == null; + +in +stdenv.mkDerivation { + version = "2.1.2"; + name = "openvswitch-${version}"; + src = fetchurl { + url = "http://openvswitch.org/releases/openvswitch-2.1.2.tar.gz"; + sha256 = "16q7faqrj2pfchhn0x5s9ggi5ckcg9n62f6bnqaih064aaq2jm47"; + }; + kernel = if skipKernelMod then null else kernel.dev; + buildInputs = [ + openssl + python27 + perl510 + ]; + configureFlags = [ + "--localstatedir=/var" + "--sharedstatedir=/var" + "--sbindir=$(out)/bin" + ] ++ (if skipKernelMod then [] else ["--with-linux"]); + # Leave /var out of this! + installFlags = [ + "LOGDIR=$(TMPDIR)/dummy" + "RUNDIR=$(TMPDIR)/dummy" + "PKIDIR=$(TMPDIR)/dummy" + ]; + meta = { + platforms = stdenv.lib.platforms.linux; + description = "A multilayer virtual switch"; + longDescription = '' + Open vSwitch is a production quality, multilayer virtual switch + licensed under the open source Apache 2.0 license. It is + designed to enable massive network automation through + programmatic extension, while still supporting standard + management interfaces and protocols (e.g. NetFlow, sFlow, SPAN, + RSPAN, CLI, LACP, 802.1ag). In addition, it is designed to + support distribution across multiple physical servers similar + to VMware's vNetwork distributed vswitch or Cisco's Nexus 1000V. + ''; + homepage = "http://openvswitch.org/"; + licence = "Apache 2.0"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0905a6a951d..9e94861e9f0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1788,6 +1788,8 @@ let openvpn_learnaddress = callPackage ../tools/networking/openvpn/openvpn_learnaddress.nix { }; + openvswitch = callPackage ../os-specific/linux/openvswitch { }; + optipng = callPackage ../tools/graphics/optipng { libpng = libpng12; }; -- GitLab From 76a4de68c17217e016043dc19b98a96ea5073b0f Mon Sep 17 00:00:00 2001 From: Chris Farmiloe Date: Thu, 12 Jun 2014 16:08:49 +0200 Subject: [PATCH 778/843] formatting/retab --- nixos/modules/virtualisation/openvswitch.nix | 205 +++++++++--------- .../os-specific/linux/openvswitch/default.nix | 83 +++---- 2 files changed, 143 insertions(+), 145 deletions(-) diff --git a/nixos/modules/virtualisation/openvswitch.nix b/nixos/modules/virtualisation/openvswitch.nix index 2070dd0f783..c1579d94657 100644 --- a/nixos/modules/virtualisation/openvswitch.nix +++ b/nixos/modules/virtualisation/openvswitch.nix @@ -5,116 +5,113 @@ with lib; let - cfg = config.virtualisation.vswitch; + cfg = config.virtualisation.vswitch; in { - # ------------------------------------------------------------ - - options = { - - virtualisation.vswitch.enable = mkOption { - type = types.bool; - default = false; - description = - '' - Enable Open vSwitch. A configuration - daemon (ovs-server) will be started. - ''; - }; - - - virtualisation.vswitch.package = mkOption { - type = types.package; - default = pkgs.openvswitch; - description = - '' - Open vSwitch package to use. - ''; - }; + options = { + + virtualisation.vswitch.enable = mkOption { + type = types.bool; + default = false; + description = + '' + Enable Open vSwitch. A configuration + daemon (ovs-server) will be started. + ''; + }; + + + virtualisation.vswitch.package = mkOption { + type = types.package; + default = pkgs.openvswitch; + description = + '' + Open vSwitch package to use. + ''; + }; + + }; + + config = mkIf cfg.enable (let + + # Where the communication sockets live + runDir = "/var/run/openvswitch"; + + # Where the config database live (can't be in nix-store) + stateDir = "/var/db/openvswitch"; + + # The path to the an initialized version of the database + db = pkgs.stdenv.mkDerivation { + name = "vswitch.db"; + unpackPhase = "true"; + buildPhase = "true"; + buildInputs = with pkgs; [ + cfg.package + ]; + installPhase = + '' + ensureDir $out/ + ''; + }; + + in { + + environment.systemPackages = [ cfg.package ]; + + boot.kernelModules = [ "tun" "openvswitch" ]; + + boot.extraModulePackages = [ cfg.package ]; + + systemd.services.ovsdb = { + description = "Open_vSwitch Database Server"; + wantedBy = [ "multi-user.target" ]; + after = [ "systemd-udev-settle.service" ]; + wants = [ "vswitchd.service" ]; + path = [ cfg.package ]; + restartTriggers = [ db cfg.package ]; + # Create the config database + preStart = + '' + mkdir -p ${runDir} + mkdir -p /var/db/openvswitch + chmod +w /var/db/openvswitch + if [[ ! -e /var/db/openvswitch/conf.db ]]; then + ${cfg.package}/bin/ovsdb-tool create \ + "/var/db/openvswitch/conf.db" \ + "${cfg.package}/share/openvswitch/vswitch.ovsschema" + fi + chmod -R +w /var/db/openvswitch + ''; + serviceConfig.ExecStart = + '' + ${cfg.package}/bin/ovsdb-server \ + --remote=punix:${runDir}/db.sock \ + --private-key=db:Open_vSwitch,SSL,private_key \ + --certificate=db:Open_vSwitch,SSL,certificate \ + --bootstrap-ca-cert=db:Open_vSwitch,SSL,ca_cert \ + --unixctl=ovsdb.ctl.sock \ + /var/db/openvswitch/conf.db + ''; + serviceConfig.Restart = "always"; + serviceConfig.RestartSec = 3; + postStart = + '' + ${cfg.package}/bin/ovs-vsctl --timeout 3 --retry --no-wait init + ''; + + }; + + systemd.services.vswitchd = { + description = "Open_vSwitch Daemon"; + bindsTo = [ "ovsdb.service" ]; + after = [ "ovsdb.service" ]; + path = [ cfg.package ]; + serviceConfig.ExecStart = ''${cfg.package}/bin/ovs-vswitchd''; }; - # ------------------------------------------------------------ - - config = mkIf cfg.enable (let - - # Where the communication sockets live - runDir = "/var/run/openvswitch"; - - # Where the config database live (can't be in nix-store) - stateDir = "/var/db/openvswitch"; - - # The path to the an initialized version of the database - db = pkgs.stdenv.mkDerivation { - name = "vswitch.db"; - unpackPhase = "true"; - buildPhase = "true"; - buildInputs = with pkgs; [ - cfg.package - ]; - installPhase = - '' - ensureDir $out/ - ''; - }; - - in { - - environment.systemPackages = [ cfg.package ]; - - boot.kernelModules = [ "tun" "openvswitch" ]; - - boot.extraModulePackages = [ cfg.package ]; - - systemd.services.ovsdb = { - description = "Open_vSwitch Database Server"; - wantedBy = [ "multi-user.target" ]; - after = [ "systemd-udev-settle.service" ]; - wants = [ "vswitchd.service" ]; - path = [ cfg.package ]; - restartTriggers = [ db cfg.package ]; - # Create the config database - preStart = - '' - mkdir -p ${runDir} - mkdir -p /var/db/openvswitch - chmod +w /var/db/openvswitch - if [[ ! -e /var/db/openvswitch/conf.db ]]; then - ${cfg.package}/bin/ovsdb-tool create \ - "/var/db/openvswitch/conf.db" \ - "${cfg.package}/share/openvswitch/vswitch.ovsschema" - fi - chmod -R +w /var/db/openvswitch - ''; - serviceConfig.ExecStart = - '' - ${cfg.package}/bin/ovsdb-server \ - --remote=punix:${runDir}/db.sock \ - --private-key=db:Open_vSwitch,SSL,private_key \ - --certificate=db:Open_vSwitch,SSL,certificate \ - --bootstrap-ca-cert=db:Open_vSwitch,SSL,ca_cert \ - --unixctl=ovsdb.ctl.sock \ - /var/db/openvswitch/conf.db - ''; - serviceConfig.Restart = "always"; - serviceConfig.RestartSec = 3; - postStart = - '' - ${cfg.package}/bin/ovs-vsctl --timeout 3 --retry --no-wait init - ''; - - }; - - systemd.services.vswitchd = { - description = "Open_vSwitch Daemon"; - bindsTo = [ "ovsdb.service" ]; - after = [ "ovsdb.service" ]; - path = [ cfg.package ]; - serviceConfig.ExecStart = ''${cfg.package}/bin/ovs-vswitchd''; - }; - - }); + }); } diff --git a/pkgs/os-specific/linux/openvswitch/default.nix b/pkgs/os-specific/linux/openvswitch/default.nix index 13b41ebe9c8..6b82cc5f9b6 100644 --- a/pkgs/os-specific/linux/openvswitch/default.nix +++ b/pkgs/os-specific/linux/openvswitch/default.nix @@ -1,49 +1,50 @@ { stdenv, fetchurl, openssl, python27, iproute, perl510, kernel ? null}: let - version = "2.1.2"; + version = "2.1.2"; - skipKernelMod = kernel == null; + skipKernelMod = kernel == null; in stdenv.mkDerivation { - version = "2.1.2"; - name = "openvswitch-${version}"; - src = fetchurl { - url = "http://openvswitch.org/releases/openvswitch-2.1.2.tar.gz"; - sha256 = "16q7faqrj2pfchhn0x5s9ggi5ckcg9n62f6bnqaih064aaq2jm47"; - }; - kernel = if skipKernelMod then null else kernel.dev; - buildInputs = [ - openssl - python27 - perl510 - ]; - configureFlags = [ - "--localstatedir=/var" - "--sharedstatedir=/var" - "--sbindir=$(out)/bin" - ] ++ (if skipKernelMod then [] else ["--with-linux"]); - # Leave /var out of this! - installFlags = [ - "LOGDIR=$(TMPDIR)/dummy" - "RUNDIR=$(TMPDIR)/dummy" - "PKIDIR=$(TMPDIR)/dummy" - ]; - meta = { - platforms = stdenv.lib.platforms.linux; - description = "A multilayer virtual switch"; - longDescription = '' - Open vSwitch is a production quality, multilayer virtual switch - licensed under the open source Apache 2.0 license. It is - designed to enable massive network automation through - programmatic extension, while still supporting standard - management interfaces and protocols (e.g. NetFlow, sFlow, SPAN, - RSPAN, CLI, LACP, 802.1ag). In addition, it is designed to - support distribution across multiple physical servers similar - to VMware's vNetwork distributed vswitch or Cisco's Nexus 1000V. - ''; - homepage = "http://openvswitch.org/"; - licence = "Apache 2.0"; - }; + version = "2.1.2"; + name = "openvswitch-${version}"; + src = fetchurl { + url = "http://openvswitch.org/releases/openvswitch-2.1.2.tar.gz"; + sha256 = "16q7faqrj2pfchhn0x5s9ggi5ckcg9n62f6bnqaih064aaq2jm47"; + }; + kernel = if skipKernelMod then null else kernel.dev; + buildInputs = [ + openssl + python27 + perl510 + ]; + configureFlags = [ + "--localstatedir=/var" + "--sharedstatedir=/var" + "--sbindir=$(out)/bin" + ] ++ (if skipKernelMod then [] else ["--with-linux"]); + # Leave /var out of this! + installFlags = [ + "LOGDIR=$(TMPDIR)/dummy" + "RUNDIR=$(TMPDIR)/dummy" + "PKIDIR=$(TMPDIR)/dummy" + ]; + meta = { + platforms = stdenv.lib.platforms.linux; + description = "A multilayer virtual switch"; + longDescription = + '' + Open vSwitch is a production quality, multilayer virtual switch + licensed under the open source Apache 2.0 license. It is + designed to enable massive network automation through + programmatic extension, while still supporting standard + management interfaces and protocols (e.g. NetFlow, sFlow, SPAN, + RSPAN, CLI, LACP, 802.1ag). In addition, it is designed to + support distribution across multiple physical servers similar + to VMware's vNetwork distributed vswitch or Cisco's Nexus 1000V. + ''; + homepage = "http://openvswitch.org/"; + licence = "Apache 2.0"; + }; } -- GitLab From 08534000a4e845f0fc3c368f7195c3cebc0d5daf Mon Sep 17 00:00:00 2001 From: Chris Farmiloe Date: Mon, 16 Jun 2014 16:45:08 +0200 Subject: [PATCH 779/843] Ensure libvirtd is started after vswitch and add ability to configure how libvirtd guests are shutdown --- nixos/modules/virtualisation/libvirtd.nix | 24 +++++++++++++++++-- .../development/libraries/libvirt/default.nix | 1 + 2 files changed, 23 insertions(+), 2 deletions(-) diff --git a/nixos/modules/virtualisation/libvirtd.nix b/nixos/modules/virtualisation/libvirtd.nix index ed157bba882..318460f4c2c 100644 --- a/nixos/modules/virtualisation/libvirtd.nix +++ b/nixos/modules/virtualisation/libvirtd.nix @@ -57,6 +57,20 @@ in ''; }; + virtualisation.libvirtd.onShutdown = + mkOption { + type = types.enum ["shutdown" "suspend" ]; + default = "suspend"; + description = + '' + When shutting down / restarting the host what method should + be used to gracefully halt the guests. Setting to "shutdown" + will cause an ACPI shutdown of each guest. "suspend" will + attempt to save the state of the guests ready to restore on boot. + ''; + }; + + }; @@ -74,7 +88,8 @@ in { description = "Libvirt Virtual Machine Management Daemon"; wantedBy = [ "multi-user.target" ]; - after = [ "systemd-udev-settle.service" ]; + after = [ "systemd-udev-settle.service" ] + ++ optional vswitch.enable "vswitchd.service"; path = [ pkgs.bridge_utils @@ -157,7 +172,12 @@ in ${pkgs.libvirt}/etc/rc.d/init.d/libvirt-guests start || true ''; - postStop = "${pkgs.libvirt}/etc/rc.d/init.d/libvirt-guests stop"; + postStop = + '' + export PATH=${pkgs.gettext}/bin:$PATH + export ON_SHUTDOWN=${cfg.onShutdown} + ${pkgs.libvirt}/etc/rc.d/init.d/libvirt-guests stop + ''; serviceConfig.Type = "oneshot"; serviceConfig.RemainAfterExit = true; diff --git a/pkgs/development/libraries/libvirt/default.nix b/pkgs/development/libraries/libvirt/default.nix index e2ff06fcd43..a4c8c167b39 100644 --- a/pkgs/development/libraries/libvirt/default.nix +++ b/pkgs/development/libraries/libvirt/default.nix @@ -39,6 +39,7 @@ stdenv.mkDerivation rec { ]; postInstall = '' + sed -i 's/ON_SHUTDOWN=suspend/ON_SHUTDOWN=''${ON_SHUTDOWN:-suspend}/' $out/libexec/libvirt-guests.sh substituteInPlace $out/libexec/libvirt-guests.sh \ --replace "$out/bin" "${gettext}/bin" wrapProgram $out/sbin/libvirtd \ -- GitLab From a0ea30c613f61831054b43fd3c6c73f9e9d7f2b0 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Tue, 2 Sep 2014 01:53:42 +0400 Subject: [PATCH 780/843] Minor cleanup after merge --- pkgs/development/libraries/gmock/default.nix | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/pkgs/development/libraries/gmock/default.nix b/pkgs/development/libraries/gmock/default.nix index 33c6e00ef65..71ac281195b 100644 --- a/pkgs/development/libraries/gmock/default.nix +++ b/pkgs/development/libraries/gmock/default.nix @@ -11,12 +11,6 @@ stdenv.mkDerivation rec { buildInputs = [ unzip cmake ]; - configurePhase = '' - mkdir build - cd build - cmake ../ -DCMAKE_INSTALL_PREFIX=$out - ''; - buildPhase = '' # avoid building gtest make gmock gmock_main @@ -30,7 +24,7 @@ stdenv.mkDerivation rec { ''; meta = { - description = "Google mock: Google's framework for writing C++ mock classes."; + description = "Google mock: Google's framework for writing C++ mock classes"; homepage = https://code.google.com/p/googlemock/; license = stdenv.lib.licenses.bsd3; maintainers = [ stdenv.lib.maintainers.auntie ]; -- GitLab From e743d1ca85c582d7f8b3c0d2588e68c485515c94 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Tue, 2 Sep 2014 02:04:59 +0400 Subject: [PATCH 781/843] Minor cleanup --- pkgs/applications/misc/namecoin/default.nix | 4 ++-- pkgs/applications/misc/namecoin/qt.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/misc/namecoin/default.nix b/pkgs/applications/misc/namecoin/default.nix index 1a26403e6f4..b1bd401b2eb 100644 --- a/pkgs/applications/misc/namecoin/default.nix +++ b/pkgs/applications/misc/namecoin/default.nix @@ -30,8 +30,8 @@ stdenv.mkDerivation rec { meta = { description = "Decentralized open source information registration and transfer system based on the Bitcoin cryptocurrency"; homepage = "http://namecoin.info"; - license = "MIT"; - maintainers = [ "Chris Double " ]; + license = stdenv.lib.licenses.mit; + maintainers = [ stdenv.lib.maintainers.doublec ]; platforms = with stdenv.lib.platforms; linux; }; } diff --git a/pkgs/applications/misc/namecoin/qt.nix b/pkgs/applications/misc/namecoin/qt.nix index 08dbee26f0b..447a2b42b6b 100644 --- a/pkgs/applications/misc/namecoin/qt.nix +++ b/pkgs/applications/misc/namecoin/qt.nix @@ -26,8 +26,8 @@ stdenv.mkDerivation rec { meta = { description = "Decentralized open source information registration and transfer system based on the Bitcoin cryptocurrency"; homepage = "http://namecoin.info"; - license = "MIT"; - maintainers = [ "Chris Double " ]; + license = stdenv.lib.licenses.mit; + maintainers = [ stdenv.lib.maintainers.doublec ]; platforms = with stdenv.lib.platforms; linux; }; } -- GitLab From 4cf191a42530cce961b445b40243c3deb9fc4a7c Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Mon, 1 Sep 2014 23:58:43 +0200 Subject: [PATCH 782/843] miscfiles: update from 1.4.2 to 1.5 and adopt it --- pkgs/data/misc/miscfiles/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/data/misc/miscfiles/default.nix b/pkgs/data/misc/miscfiles/default.nix index db4d13b890f..a40856e5910 100644 --- a/pkgs/data/misc/miscfiles/default.nix +++ b/pkgs/data/misc/miscfiles/default.nix @@ -1,16 +1,17 @@ {stdenv, fetchurl}: stdenv.mkDerivation rec { - name = "miscfiles-1.4.2"; + name = "miscfiles-1.5"; src = fetchurl { url = "mirror://gnu/miscfiles/${name}.tar.gz"; - sha256 = "1rh10y63asyrqyp5mlmxy7y4kdp6svk2inws3y7mfx8lsrhcm6dn"; + sha256 = "005588vfrwx8ghsdv9p7zczj9lbc9a3r4m5aphcaqv8gif4siaka"; }; - meta = { + meta = with stdenv.lib; { homepage = http://www.gnu.org/software/miscfiles/; - license = stdenv.lib.licenses.gpl2Plus; + license = licenses.gpl2Plus; description = "Collection of files not of crucial importance for sysadmins"; + maintainers = with maintainers; [ pSub ]; }; } -- GitLab From 7727a3fe1dad9293eb58f5a7bf49bfb2cdf0daa9 Mon Sep 17 00:00:00 2001 From: Raymond Gauthier Date: Thu, 14 Aug 2014 07:00:00 +0200 Subject: [PATCH 783/843] Added support for minimal zim desktop wiki package. --- pkgs/applications/office/zim/default.nix | 82 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 ++ 2 files changed, 86 insertions(+) create mode 100644 pkgs/applications/office/zim/default.nix diff --git a/pkgs/applications/office/zim/default.nix b/pkgs/applications/office/zim/default.nix new file mode 100644 index 00000000000..cca52be1a17 --- /dev/null +++ b/pkgs/applications/office/zim/default.nix @@ -0,0 +1,82 @@ +{ stdenv, lib, fetchurl, buildPythonPackage, pythonPackages, pygtk, pygobject, python }: + +# +# TODO: Declare configuration options for the following optional dependencies: +# - File stores: hg, git, bzr +# - Included plugins depenencies: dot, ditaa, dia, any other? +# - pyxdg: Need to make it work first (see setupPyInstallFlags). +# + +buildPythonPackage rec { + name = "zim-${version}"; + version = "0.60"; + namePrefix = ""; + + src = fetchurl { + url = "http://zim-wiki.org/downloads/zim-0.61.tar.gz"; + sha256 = "0jncxkf83bwra3022jbvjfwhk5w8az0jlwr8nsvm7wa1zfrajhsq"; + }; + + propagatedBuildInputs = [ pythonPackages.sqlite3 pygtk /*pythonPackages.pyxdg*/ pygobject ]; + + preBuild = '' + mkdir -p $tmp/home + export HOME="$tmp/home" + ''; + + setupPyInstallFlags = ["--skip-xdg-cmd"]; + + # + # Exactly identical to buildPythonPackage's version but for the + # `--old-and-unmanagable`, which I removed. This was removed because + # this is a setuptools specific flag and as zim is overriding + # the install step, setuptools could not perform its monkey + # patching trick for the command. Alternate solutions were to + # + # - Remove the custom install step (tested as working but + # also remove the possibility of performing the xdg-cmd + # stuff). + # - Explicitly replace distutils import(s) by their setuptools + # equivalent (untested). + # + # Both solutions were judged unsatisfactory as altering the code + # would be required. + # + # Note that a improved solution would be to expose the use of + # the `--old-and-unmanagable` flag as an option of passed to the + # buildPythonPackage function. + # + # Also note that I stripped all comments. + # + installPhase = '' + runHook preInstall + + mkdir -p "$out/lib/${python.libPrefix}/site-packages" + + export PYTHONPATH="$out/lib/${python.libPrefix}/site-packages:$PYTHONPATH" + + ${python}/bin/${python.executable} setup.py install \ + --install-lib=$out/lib/${python.libPrefix}/site-packages \ + --prefix="$out" ${lib.concatStringsSep " " setupPyInstallFlags} + + eapth="$out/lib/${python.libPrefix}"/site-packages/easy-install.pth + if [ -e "$eapth" ]; then + # move colliding easy_install.pth to specifically named one + mv "$eapth" $(dirname "$eapth")/${name}.pth + fi + + rm -f "$out/lib/${python.libPrefix}"/site-packages/site.py* + + runHook postInstall + ''; + + # Testing fails. + doCheck = false; + + meta = { + description = "A desktop wiki"; + homepage = http://zim-wiki.org; + license = stdenv.lib.licenses.gpl2Plus; + }; +} + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4fd7fc950ea..dc04bb7f7f3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10279,6 +10279,10 @@ let zgrviewer = callPackage ../applications/graphics/zgrviewer {}; + zim = callPackage ../applications/office/zim { + pygtk = pyGtkGlade; + }; + zotero = callPackage ../applications/office/zotero { xulrunner = xulrunner_30; }; -- GitLab From fa55a997015820ec54f9847f7d297c561e98629f Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Tue, 2 Sep 2014 02:12:46 +0400 Subject: [PATCH 784/843] Load EHCI befor OHCI and UHCI; from patch by Mathnerd314 --- nixos/modules/system/boot/modprobe.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/nixos/modules/system/boot/modprobe.nix b/nixos/modules/system/boot/modprobe.nix index 652eb046f50..eaf8cf1ecd6 100644 --- a/nixos/modules/system/boot/modprobe.nix +++ b/nixos/modules/system/boot/modprobe.nix @@ -77,6 +77,11 @@ with lib; '')} ${config.boot.extraModprobeConfig} ''; + environment.etc."modprobe.d/usb-load-ehci-first.conf".text = + '' + softdep uhci_hcd pre: ehci_hcd + softdep ohci_hcd pre: ehci_hcd + ''; environment.systemPackages = [ config.system.sbin.modprobe pkgs.kmod ]; -- GitLab From d1db6465bbfdfc1b53d194da5783af5d77cd9025 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Tue, 2 Sep 2014 00:08:51 +0200 Subject: [PATCH 785/843] muparser: update from 2.2.2 to 2.2.3 --- pkgs/development/libraries/muparser/default.nix | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/muparser/default.nix b/pkgs/development/libraries/muparser/default.nix index 9d9a524e86d..b68f04f642f 100644 --- a/pkgs/development/libraries/muparser/default.nix +++ b/pkgs/development/libraries/muparser/default.nix @@ -1,11 +1,14 @@ {stdenv, fetchurl, unzip}: -stdenv.mkDerivation { - name = "muparser-2.2.2"; - src = fetchurl { - url = mirror://sourceforge/muparser/muparser_v2_2_2.zip; - sha256 = "0pncvjzzbwcadgpwnq5r7sl9v5r2y9gjgfnlw0mrs9wj206dbhx9"; - }; +stdenv.mkDerivation rec { + name = "muparser-${version}"; + version = "2.2.3"; + url-version = stdenv.lib.replaceChars ["."] ["_"] version; + + src = fetchurl { + url = "mirror://sourceforge/muparser/muparser_v${url-version}.zip"; + sha256 = "00l92k231yb49wijzkspa2l58mapn6vh2dlxnlg0pawjjfv33s6z"; + }; buildInputs = [ unzip ]; -- GitLab From 416b20fbd5d44aea8ff76677ebf2e5ea36827724 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Tue, 2 Sep 2014 03:04:17 +0400 Subject: [PATCH 786/843] Don't specify Perl version --- pkgs/os-specific/linux/openvswitch/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/openvswitch/default.nix b/pkgs/os-specific/linux/openvswitch/default.nix index 6b82cc5f9b6..2e25c0383b7 100644 --- a/pkgs/os-specific/linux/openvswitch/default.nix +++ b/pkgs/os-specific/linux/openvswitch/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, openssl, python27, iproute, perl510, kernel ? null}: +{ stdenv, fetchurl, openssl, python27, iproute, perl, kernel ? null}: let version = "2.1.2"; @@ -17,7 +17,7 @@ stdenv.mkDerivation { buildInputs = [ openssl python27 - perl510 + perl ]; configureFlags = [ "--localstatedir=/var" -- GitLab From cc1866eacb1a19b1d57f4737123721e797c9d9b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= Date: Tue, 2 Sep 2014 00:25:18 +0200 Subject: [PATCH 787/843] processing: apply patch from IRC to make it work without the IDE too --- .../graphics/processing/default.nix | 21 ++++++++++--------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/graphics/processing/default.nix b/pkgs/applications/graphics/processing/default.nix index 7d0595134e9..ecce0e260bb 100644 --- a/pkgs/applications/graphics/processing/default.nix +++ b/pkgs/applications/graphics/processing/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, ant, jre, makeWrapper, libXxf86vm }: +{ fetchurl, stdenv, ant, jre, makeWrapper, libXxf86vm, which }: stdenv.mkDerivation rec { name = "processing-${version}"; @@ -12,20 +12,21 @@ stdenv.mkDerivation rec { # Stop it trying to download its own version of java patches = [ ./use-nixpkgs-jre.patch ]; - buildInputs = [ ant jre makeWrapper libXxf86vm ]; + buildInputs = [ ant jre makeWrapper libXxf86vm which ]; buildPhase = "cd build && ant build"; installPhase = '' + mkdir -p $out/${name} mkdir -p $out/bin - cp -r linux/work/* $out/ - sed -e "s#APPDIR=\`dirname \"\$APPDIR\"\`#APPDIR=$out#" -i $out/processing - sed -e "s#APPDIR=\`dirname \"\$APPDIR\"\`#APPDIR=$out#" -i $out/processing-java - mv $out/processing{,-java} $out/bin/ - wrapProgram $out/bin/processing --prefix PATH : ${jre}/bin --prefix LD_LIBRARY_PATH : ${libXxf86vm}/lib - wrapProgram $out/bin/processing-java --prefix PATH : ${jre}/bin --prefix LD_LIBRARY_PATH : ${libXxf86vm}/lib - mkdir $out/java - ln -s ${jre}/bin $out/java/ + cp -r linux/work/* $out/${name}/ + makeWrapper $out/${name}/processing $out/bin/processing \ + --prefix PATH : "${jre}/bin:${which}/bin" \ + --prefix LD_LIBRARY_PATH : ${libXxf86vm}/lib + makeWrapper $out/${name}/processing-java $out/bin/processing-java \ + --prefix PATH : "${jre}/bin:${which}/bin" \ + --prefix LD_LIBRARY_PATH : ${libXxf86vm}/lib + ln -s ${jre} $out/${name}/java ''; meta = with stdenv.lib; { -- GitLab From 13bbce96c3fefa68cb81f36e171512bf5c84fc31 Mon Sep 17 00:00:00 2001 From: Vladimir Still Date: Tue, 2 Sep 2014 10:06:04 +0200 Subject: [PATCH 788/843] sshd: Fix typo in assetion. --- nixos/modules/services/networking/ssh/sshd.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/networking/ssh/sshd.nix b/nixos/modules/services/networking/ssh/sshd.nix index 956c31a8ba3..379dec2e92c 100644 --- a/nixos/modules/services/networking/ssh/sshd.nix +++ b/nixos/modules/services/networking/ssh/sshd.nix @@ -420,7 +420,7 @@ in }) ++ flip map cfg.listenAddresses ({ addr, port }: { assertion = addr != null; - message = "addr must be spefied in each listenAddresses entry"; + message = "addr must be specified in each listenAddresses entry"; }); }; -- GitLab From 73439c605320d82be97aad276329777d3689e481 Mon Sep 17 00:00:00 2001 From: Cray Elliott Date: Tue, 2 Sep 2014 01:19:44 -0700 Subject: [PATCH 789/843] add dolphinEmu and dolphinEmuMaster Dolphin is a high quality, open source Gamecube/Wii/Triforce emulator for Windows, Mac OS X and Linux --- pkgs/misc/emulators/dolphin-emu/default.nix | 33 ++++++++++++++++++++ pkgs/misc/emulators/dolphin-emu/master.nix | 34 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 3 ++ 3 files changed, 70 insertions(+) create mode 100644 pkgs/misc/emulators/dolphin-emu/default.nix create mode 100644 pkgs/misc/emulators/dolphin-emu/master.nix diff --git a/pkgs/misc/emulators/dolphin-emu/default.nix b/pkgs/misc/emulators/dolphin-emu/default.nix new file mode 100644 index 00000000000..ff7a57723d3 --- /dev/null +++ b/pkgs/misc/emulators/dolphin-emu/default.nix @@ -0,0 +1,33 @@ +{ stdenv, pkgconfig, cmake, bluez, ffmpeg, libao, mesa, gtk2, glib +, gettext, git, libpthreadstubs, libXrandr, libXext, readline +, openal, libXdmcp, portaudio, SDL, wxGTK30, fetchurl +, pulseaudio ? null }: + +stdenv.mkDerivation rec { + name = "dolphin-emu-4.0.2"; + src = fetchurl { + url = https://github.com/dolphin-emu/dolphin/archive/4.0.2.tar.gz; + sha256 = "0a8ikcxdify9d7lqz8fn2axk2hq4q1nvbcsi1b8vb9z0mdrhzw89"; + }; + + cmakeFlags = '' + -DGTK2_GLIBCONFIG_INCLUDE_DIR=${glib}/lib/glib-2.0/include + -DGTK2_GDKCONFIG_INCLUDE_DIR=${gtk2}/lib/gtk-2.0/include + -DGTK2_INCLUDE_DIRS=${gtk2}/include/gtk-2.0 + -DCMAKE_BUILD_TYPE=Release + -DENABLE_LTO=True + ''; + + enableParallelBuilding = true; + + buildInputs = [ stdenv pkgconfig cmake bluez ffmpeg libao mesa gtk2 glib + gettext libpthreadstubs libXrandr libXext readline openal + git libXdmcp portaudio SDL wxGTK30 pulseaudio ]; + + meta = { + homepage = http://dolphin-emu.org/; + description = "Gamecube/Wii/Triforce emulator for x86_64 and ARM"; + license = stdenv.lib.licenses.gpl2; + maintainers = with stdenv.lib.maintainers; [ MP2E ]; + }; +} diff --git a/pkgs/misc/emulators/dolphin-emu/master.nix b/pkgs/misc/emulators/dolphin-emu/master.nix new file mode 100644 index 00000000000..4823d41d1ac --- /dev/null +++ b/pkgs/misc/emulators/dolphin-emu/master.nix @@ -0,0 +1,34 @@ +{ stdenv, pkgconfig, cmake, bluez, ffmpeg, libao, mesa, gtk2, glib +, gettext, git, libpthreadstubs, libXrandr, libXext, readline +, openal, libXdmcp, portaudio, SDL, wxGTK30, fetchgit +, pulseaudio ? null }: + +stdenv.mkDerivation rec { + name = "dolphin-emu-20140902"; + src = fetchgit { + url = git://github.com/dolphin-emu/dolphin.git; + rev = "cc6db8cf26c1508ae382912bc25e64aaf12e0543"; + sha256 = "17pc4kk1v0p1llc12ifih02j2klfjz29qh8nhz5lapb0a1wr6lb3"; + }; + + cmakeFlags = '' + -DGTK2_GLIBCONFIG_INCLUDE_DIR=${glib}/lib/glib-2.0/include + -DGTK2_GDKCONFIG_INCLUDE_DIR=${gtk2}/lib/gtk-2.0/include + -DGTK2_INCLUDE_DIRS=${gtk2}/include/gtk-2.0 + -DCMAKE_BUILD_TYPE=Release + -DENABLE_LTO=True + ''; + + enableParallelBuilding = true; + + buildInputs = [ stdenv pkgconfig cmake bluez ffmpeg libao mesa gtk2 glib + gettext libpthreadstubs libXrandr libXext readline openal + git libXdmcp portaudio SDL wxGTK30 pulseaudio ]; + + meta = { + homepage = http://dolphin-emu.org/; + description = "Gamecube/Wii/Triforce emulator for x86_64 and ARM"; + license = stdenv.lib.licenses.gpl2; + maintainers = with stdenv.lib.maintainers; [ MP2E ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 901c80dc659..d2d0f69132c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -933,6 +933,9 @@ let dotnetfx40 = callPackage ../development/libraries/dotnetfx40 { }; + dolphinEmu = callPackage ../misc/emulators/dolphin-emu { }; + dolphinEmuMaster = callPackage ../misc/emulators/dolphin-emu/master.nix { }; + dropbear = callPackage ../tools/networking/dropbear { }; dtach = callPackage ../tools/misc/dtach { }; -- GitLab From cc7fa316a4c3608cba955a4846fddcf21a2ff81b Mon Sep 17 00:00:00 2001 From: Cray Elliott Date: Tue, 2 Sep 2014 01:26:27 -0700 Subject: [PATCH 790/843] dolphinEmu doesn't need the git package --- pkgs/misc/emulators/dolphin-emu/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/misc/emulators/dolphin-emu/default.nix b/pkgs/misc/emulators/dolphin-emu/default.nix index ff7a57723d3..812e20ebc06 100644 --- a/pkgs/misc/emulators/dolphin-emu/default.nix +++ b/pkgs/misc/emulators/dolphin-emu/default.nix @@ -1,5 +1,5 @@ { stdenv, pkgconfig, cmake, bluez, ffmpeg, libao, mesa, gtk2, glib -, gettext, git, libpthreadstubs, libXrandr, libXext, readline +, gettext, libpthreadstubs, libXrandr, libXext, readline , openal, libXdmcp, portaudio, SDL, wxGTK30, fetchurl , pulseaudio ? null }: -- GitLab From eaeee5748320ca07caad646de3e981ad9bfe8c58 Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Tue, 2 Sep 2014 11:20:26 +0200 Subject: [PATCH 791/843] gnome-tweak-tool: update 3.10.1 -> 3.12.0 --- .../desktops/gnome-3/3.12/misc/gnome-tweak-tool/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/gnome-3/3.12/misc/gnome-tweak-tool/default.nix b/pkgs/desktops/gnome-3/3.12/misc/gnome-tweak-tool/default.nix index 2eccb9a32cf..e424ab3635a 100644 --- a/pkgs/desktops/gnome-3/3.12/misc/gnome-tweak-tool/default.nix +++ b/pkgs/desktops/gnome-3/3.12/misc/gnome-tweak-tool/default.nix @@ -4,11 +4,11 @@ , gnome3, librsvg, gdk_pixbuf, file, libnotify }: stdenv.mkDerivation rec { - name = "gnome-tweak-tool-3.10.1"; + name = "gnome-tweak-tool-3.12.0"; src = fetchurl { - url = "mirror://gnome/sources/gnome-tweak-tool/3.10/${name}.tar.xz"; - sha256 = "fb5af9022c0521a925ef9f295e4080212b1b45427cd5f5f3a901667590afa7ec"; + url = "mirror://gnome/sources/gnome-tweak-tool/3.12/${name}.tar.xz"; + sha256 = "f8811d638797ef62500770a8dccc5bc689a427c8396a0dff8cbeddffdebf0e29"; }; doCheck = true; -- GitLab From 463585a5ecf33064747fe9720007416fdd6f68a5 Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Tue, 2 Sep 2014 11:20:26 +0200 Subject: [PATCH 792/843] gnome-tweak-tool: update 3.10.1 -> 3.12.0 --- .../desktops/gnome-3/3.12/misc/gnome-tweak-tool/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/desktops/gnome-3/3.12/misc/gnome-tweak-tool/default.nix b/pkgs/desktops/gnome-3/3.12/misc/gnome-tweak-tool/default.nix index 2eccb9a32cf..e424ab3635a 100644 --- a/pkgs/desktops/gnome-3/3.12/misc/gnome-tweak-tool/default.nix +++ b/pkgs/desktops/gnome-3/3.12/misc/gnome-tweak-tool/default.nix @@ -4,11 +4,11 @@ , gnome3, librsvg, gdk_pixbuf, file, libnotify }: stdenv.mkDerivation rec { - name = "gnome-tweak-tool-3.10.1"; + name = "gnome-tweak-tool-3.12.0"; src = fetchurl { - url = "mirror://gnome/sources/gnome-tweak-tool/3.10/${name}.tar.xz"; - sha256 = "fb5af9022c0521a925ef9f295e4080212b1b45427cd5f5f3a901667590afa7ec"; + url = "mirror://gnome/sources/gnome-tweak-tool/3.12/${name}.tar.xz"; + sha256 = "f8811d638797ef62500770a8dccc5bc689a427c8396a0dff8cbeddffdebf0e29"; }; doCheck = true; -- GitLab From aa8a728b047c3955f8bacda1016aeef39de90518 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Fri, 29 Aug 2014 18:18:02 +0200 Subject: [PATCH 793/843] Cache::Cache: Disable tests --- pkgs/top-level/perl-packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index a50a5617794..67accf016cc 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -480,6 +480,7 @@ let self = _self // overrides; _self = with self; { sha256 = "14s75bsm5irisp8wkbwl3ycw160srr1rks7x9jcbvcxh79wr6gbh"; }; propagatedBuildInputs = [ DigestSHA1 Error IPCShareLite ]; + doCheck = false; # randomly fails }; CacheFastMmap = buildPerlPackage rec { -- GitLab From ccd4a52f68479599f8bfaa2656d0c00acd1cc209 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 1 Sep 2014 15:10:13 +0200 Subject: [PATCH 794/843] haskell-git-annex: update to version 5.20140831 --- .../version-management/git-and-tools/git-annex/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 62132271ec9..7224d8c6900 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 @@ -17,8 +17,8 @@ cabal.mkDerivation (self: { pname = "git-annex"; - version = "5.20140817"; - sha256 = "0cly19rd250qiikzszgad2r5xz570kr00vcb8ij6icbm53pw3hxc"; + version = "5.20140831"; + sha256 = "0s2pc8bm3c79dsbafwp2pc5yghzh6vdzs9sj0mfq6rxiv27wrrwq"; isLibrary = false; isExecutable = true; buildDepends = [ -- GitLab From 1cac137bd799882b877778a69951cb023db80d4b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 1 Sep 2014 15:10:24 +0200 Subject: [PATCH 795/843] haskell-Chart-cairo: update to version 1.3 --- pkgs/development/libraries/haskell/Chart-cairo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/Chart-cairo/default.nix b/pkgs/development/libraries/haskell/Chart-cairo/default.nix index d2dea815819..28480a4d27d 100644 --- a/pkgs/development/libraries/haskell/Chart-cairo/default.nix +++ b/pkgs/development/libraries/haskell/Chart-cairo/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "Chart-cairo"; - version = "1.2.4"; - sha256 = "1ggqh3v14mwv9q1pmz3hbx7g1dvibfwl1vzvag92q7432q4pqm2z"; + version = "1.3"; + sha256 = "1d8v4imbb2g30gbxj3xlm1vqc17cnqbiysxp78n3vrxnalr8s98l"; buildDepends = [ cairo Chart colour dataDefaultClass lens mtl operational time ]; -- GitLab From e76cc54f0c36bbfaff4e0e29d18d3cec5753f678 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 1 Sep 2014 15:10:26 +0200 Subject: [PATCH 796/843] haskell-Chart-diagrams: update to version 1.3 --- .../development/libraries/haskell/Chart-diagrams/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/haskell/Chart-diagrams/default.nix b/pkgs/development/libraries/haskell/Chart-diagrams/default.nix index 002b762fbac..ff4898eb1e7 100644 --- a/pkgs/development/libraries/haskell/Chart-diagrams/default.nix +++ b/pkgs/development/libraries/haskell/Chart-diagrams/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "Chart-diagrams"; - version = "1.2.4"; - sha256 = "099frqvfjqqc7h3zr52saqyg37di0klr0y649afzxd7lj3d67mvw"; + version = "1.3"; + sha256 = "1lfdv2bn942w4b0bjd6aw59wdc2jfk305ym5vm88liy9127b65bp"; buildDepends = [ blazeSvg Chart colour dataDefaultClass diagramsCore diagramsLib diagramsPostscript diagramsSvg lens mtl operational SVGFonts text @@ -20,6 +20,5 @@ cabal.mkDerivation (self: { description = "Diagrams backend for Charts"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - hydraPlatforms = self.stdenv.lib.platforms.none; }; }) -- GitLab From ba1ccb4bf446970ad40e32e697d8cd832de63e39 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 1 Sep 2014 15:10:29 +0200 Subject: [PATCH 797/843] haskell-Chart-gtk: update to version 1.3 --- pkgs/development/libraries/haskell/Chart-gtk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/Chart-gtk/default.nix b/pkgs/development/libraries/haskell/Chart-gtk/default.nix index 9dbb3c8ae9a..0ce13bd8737 100644 --- a/pkgs/development/libraries/haskell/Chart-gtk/default.nix +++ b/pkgs/development/libraries/haskell/Chart-gtk/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "Chart-gtk"; - version = "1.2.4"; - sha256 = "16dfmkls341cmk13j1z3rw2wxdvxr5rqsv1ff4qjhjak9j7hkqjq"; + version = "1.3"; + sha256 = "1bi7gim31w3xf6jsd2hkwhkhw1i9c4dmxnm3f46336k9rsxn59ph"; buildDepends = [ cairo Chart ChartCairo colour gtk mtl time ]; meta = { homepage = "https://github.com/timbod7/haskell-chart/wiki"; -- GitLab From 7c8afa9d047f601dac68817830271c938d6bc20a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 1 Sep 2014 15:10:31 +0200 Subject: [PATCH 798/843] haskell-Chart: update to version 1.3 --- pkgs/development/libraries/haskell/Chart/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/Chart/default.nix b/pkgs/development/libraries/haskell/Chart/default.nix index d5696a562da..557721007ed 100644 --- a/pkgs/development/libraries/haskell/Chart/default.nix +++ b/pkgs/development/libraries/haskell/Chart/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "Chart"; - version = "1.2.4"; - sha256 = "0zizrkxsligvxs5x5r2j0pynf6ncjl4mgyzbh1zfqgnz29frylh7"; + version = "1.3"; + sha256 = "1xvr90x1kmnjfmbap47ffzi3xbawcwz7q6b76v2gbqp4gjlhiyx7"; buildDepends = [ colour dataDefaultClass lens mtl operational time ]; -- GitLab From 3bd01d920317564d110520f0c926007495382ddb Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 1 Sep 2014 15:10:34 +0200 Subject: [PATCH 799/843] haskell-c2hs: update to version 0.18.1 --- pkgs/development/libraries/haskell/c2hs/default.nix | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/haskell/c2hs/default.nix b/pkgs/development/libraries/haskell/c2hs/default.nix index 95ead17f01f..eaa91c51a23 100644 --- a/pkgs/development/libraries/haskell/c2hs/default.nix +++ b/pkgs/development/libraries/haskell/c2hs/default.nix @@ -1,18 +1,19 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, filepath, HUnit, languageC, shelly, testFramework -, testFrameworkHunit, text, yaml +{ cabal, dlist, filepath, HUnit, languageC, shelly, testFramework +, testFrameworkHunit, text, transformers, yaml }: cabal.mkDerivation (self: { pname = "c2hs"; - version = "0.17.2"; - sha256 = "1xrk0izdy5akjgmg9k4l9ccmmgv1avwh152pfpc1xm2rrwrg4bxk"; + version = "0.18.1"; + sha256 = "17miqihfidzd1nqdswnd7j0580jlv2pj19wxlx8vb3dc5wga58xd"; isLibrary = false; isExecutable = true; - buildDepends = [ filepath languageC ]; + buildDepends = [ dlist filepath languageC shelly text yaml ]; testDepends = [ - filepath HUnit shelly testFramework testFrameworkHunit text yaml + filepath HUnit shelly testFramework testFrameworkHunit text + transformers ]; jailbreak = true; doCheck = false; -- GitLab From 3c52c0c203de642b79deada54b5901e9d9bc682d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 1 Sep 2014 15:10:37 +0200 Subject: [PATCH 800/843] haskell-doctest: update to version 0.9.11.1 --- pkgs/development/libraries/haskell/doctest/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/haskell/doctest/default.nix b/pkgs/development/libraries/haskell/doctest/default.nix index 018fac06670..af3f9e2d525 100644 --- a/pkgs/development/libraries/haskell/doctest/default.nix +++ b/pkgs/development/libraries/haskell/doctest/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "doctest"; - version = "0.9.11"; - sha256 = "04y6y5hixqh8awl37wrss20c2drvx070w7wd6icfx7r0jqds97jr"; + version = "0.9.11.1"; + sha256 = "1gzzzwr7f7281mlbfbk74nxr28l70lwfaws4xjfx2v06xazl99db"; isLibrary = true; isExecutable = true; buildDepends = [ deepseq filepath ghcPaths syb transformers ]; @@ -18,7 +18,7 @@ cabal.mkDerivation (self: { doCheck = false; noHaddock = self.stdenv.lib.versionOlder self.ghc.version "7.4"; meta = { - homepage = "https://github.com/sol/doctest-haskell#readme"; + homepage = "https://github.com/sol/doctest#readme"; description = "Test interactive Haskell examples"; license = self.stdenv.lib.licenses.mit; platforms = self.ghc.meta.platforms; -- GitLab From ab5e6c2e5cf7f7539f6cd42fc890242a8ad13820 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 1 Sep 2014 15:10:40 +0200 Subject: [PATCH 801/843] haskell-haddock-library: update to version 1.1.1 --- .../development/libraries/haskell/haddock-library/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/haddock-library/default.nix b/pkgs/development/libraries/haskell/haddock-library/default.nix index aece9e35873..a7041b3ba28 100644 --- a/pkgs/development/libraries/haskell/haddock-library/default.nix +++ b/pkgs/development/libraries/haskell/haddock-library/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "haddock-library"; - version = "1.1.0"; - sha256 = "0apqm9nxgxbpvcphaim93q4z67c1cd0vdjz0i1cbr67ymffl69nd"; + version = "1.1.1"; + sha256 = "0sjnmbmq1pss9ikcqnhvpf57rv78lzi1r99ywpmmvj1gyva2s31m"; buildDepends = [ deepseq ]; testDepends = [ baseCompat deepseq hspec QuickCheck ]; meta = { -- GitLab From 1e43fac17110c71871a11ee343397b03d295511a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 1 Sep 2014 15:10:42 +0200 Subject: [PATCH 802/843] haskell-http-client: update to version 0.3.8.1 --- pkgs/development/libraries/haskell/http-client/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/http-client/default.nix b/pkgs/development/libraries/haskell/http-client/default.nix index 7015c9446e8..6e41fb85e68 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.3.8"; - sha256 = "0v5j6fcigjpksj1m0n15g3j680k7qkms3cqd0b1w0ma7k63kcibc"; + version = "0.3.8.1"; + sha256 = "1iy3wg88z1w0l5dzxkynlw0xd7np5xbxcrcdj3f2kzyfr39mw5v0"; buildDepends = [ base64Bytestring blazeBuilder caseInsensitive cookie dataDefaultClass deepseq exceptions filepath httpTypes mimeTypes -- GitLab From 3c63776aa597c172cd2f01509fdd3c8337fc245b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 1 Sep 2014 15:10:45 +0200 Subject: [PATCH 803/843] haskell-recaptcha: update to version 0.1.0.3 --- pkgs/development/libraries/haskell/recaptcha/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/haskell/recaptcha/default.nix b/pkgs/development/libraries/haskell/recaptcha/default.nix index dd92b7e79de..00fe58be4b1 100644 --- a/pkgs/development/libraries/haskell/recaptcha/default.nix +++ b/pkgs/development/libraries/haskell/recaptcha/default.nix @@ -1,12 +1,12 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, HTTP, network, xhtml }: +{ cabal, HTTP, network, networkUri, xhtml }: cabal.mkDerivation (self: { pname = "recaptcha"; - version = "0.1.0.2"; - sha256 = "04sdfp6bmcd3qkz1iqxijfiqa4qf78m5d16r9gjv90ckqf68kbih"; - buildDepends = [ HTTP network xhtml ]; + version = "0.1.0.3"; + sha256 = "18rqsqzni11nr2cvs7ah9k87w493d92c0gmc0n6fhfq6gay9ia19"; + buildDepends = [ HTTP network networkUri xhtml ]; meta = { homepage = "http://github.com/jgm/recaptcha/tree/master"; description = "Functions for using the reCAPTCHA service in web applications"; -- GitLab From 49c7b7040bc9cb8c989f9a0dea5ef6522bd3dc82 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 1 Sep 2014 15:12:59 +0200 Subject: [PATCH 804/843] haskell-haddock: add version 2.15.0 --- .../libraries/haskell/haddock-api/default.nix | 19 ++++++++++++++++++ .../tools/documentation/haddock/2.15.0.nix | 20 +++++++++++++++++++ pkgs/top-level/haskell-packages.nix | 5 ++++- 3 files changed, 43 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/libraries/haskell/haddock-api/default.nix create mode 100644 pkgs/development/tools/documentation/haddock/2.15.0.nix diff --git a/pkgs/development/libraries/haskell/haddock-api/default.nix b/pkgs/development/libraries/haskell/haddock-api/default.nix new file mode 100644 index 00000000000..2f3afa32196 --- /dev/null +++ b/pkgs/development/libraries/haskell/haddock-api/default.nix @@ -0,0 +1,19 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, Cabal, deepseq, filepath, ghcPaths, haddockLibrary, xhtml +}: + +cabal.mkDerivation (self: { + pname = "haddock-api"; + version = "2.15.0"; + sha256 = "17h5h40ddn0kiqnz6rmz9p0jqvng11lq3xm6lnizwix9kcwl843b"; + buildDepends = [ + Cabal deepseq filepath ghcPaths haddockLibrary xhtml + ]; + meta = { + homepage = "http://www.haskell.org/haddock/"; + description = "A documentation-generation tool for Haskell libraries"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/development/tools/documentation/haddock/2.15.0.nix b/pkgs/development/tools/documentation/haddock/2.15.0.nix new file mode 100644 index 00000000000..3b3d91a1f2f --- /dev/null +++ b/pkgs/development/tools/documentation/haddock/2.15.0.nix @@ -0,0 +1,20 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, Cabal, filepath, haddockApi }: + +cabal.mkDerivation (self: { + pname = "haddock"; + version = "2.15.0"; + sha256 = "1vay0v0a02xj2m40w71vmjadlm6pzv309r1jhr61xv1wnj88i75w"; + isLibrary = false; + isExecutable = true; + buildDepends = [ haddockApi ]; + testDepends = [ Cabal filepath ]; + preCheck = "unset GHC_PACKAGE_PATH"; + meta = { + homepage = "http://www.haskell.org/haddock/"; + description = "A documentation-generation tool for Haskell libraries"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index cfb06b0880d..15f6ed71007 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -2928,7 +2928,10 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in haddock_2_13_2 = callPackage ../development/tools/documentation/haddock/2.13.2.nix {}; haddock_2_14_2 = callPackage ../development/tools/documentation/haddock/2.14.2.nix {}; haddock_2_14_3 = callPackage ../development/tools/documentation/haddock/2.14.3.nix {}; - haddock = self.haddock_2_14_3; + haddock_2_15_0 = callPackage ../development/tools/documentation/haddock/2.15.0.nix {}; + haddock = self.haddock_2_15_0; + + haddockApi = callPackage ../development/libraries/haskell/haddock-api {}; haddockLibrary = callPackage ../development/libraries/haskell/haddock-library {}; -- GitLab From baa186c020edd5294d89f44e41aa6038c7e12189 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 1 Sep 2014 15:19:19 +0200 Subject: [PATCH 805/843] haskell-directory-layout: disable test suite to fix https://github.com/supki/directory-layout/issues/9 --- pkgs/development/libraries/haskell/directory-layout/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/haskell/directory-layout/default.nix b/pkgs/development/libraries/haskell/directory-layout/default.nix index 610b1a5ec63..2cc9682dccb 100644 --- a/pkgs/development/libraries/haskell/directory-layout/default.nix +++ b/pkgs/development/libraries/haskell/directory-layout/default.nix @@ -16,6 +16,7 @@ cabal.mkDerivation (self: { commandQq doctest filepath free hspec lens semigroups temporary text transformers unorderedContainers ]; + doCheck = false; meta = { description = "Directory layout DSL"; license = self.stdenv.lib.licenses.bsd3; -- GitLab From 3129fb3a11051de5ace0ce25a21e02e8e481cfa8 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 1 Sep 2014 16:10:06 +0200 Subject: [PATCH 806/843] haskell-docs: broken by the recent update to Haddock 2.15 --- pkgs/development/tools/haskell/haskell-docs/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/tools/haskell/haskell-docs/default.nix b/pkgs/development/tools/haskell/haskell-docs/default.nix index b9cd34c716e..9cc92aafc21 100644 --- a/pkgs/development/tools/haskell/haskell-docs/default.nix +++ b/pkgs/development/tools/haskell/haskell-docs/default.nix @@ -20,5 +20,7 @@ cabal.mkDerivation (self: { description = "A program to find and display the docs and type of a name"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; + hydraPlatforms = self.stdenv.lib.platforms.none; + broken = true; }; }) -- GitLab From bf197d6f58627d8a10c11690f7e8a7b874296a00 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 1 Sep 2014 16:18:09 +0200 Subject: [PATCH 807/843] haskell-ncurses: broken by update of c2hs Upstream has been notified. --- pkgs/development/libraries/haskell/ncurses/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/libraries/haskell/ncurses/default.nix b/pkgs/development/libraries/haskell/ncurses/default.nix index 7e9ac0ddd95..f964af3c8b7 100644 --- a/pkgs/development/libraries/haskell/ncurses/default.nix +++ b/pkgs/development/libraries/haskell/ncurses/default.nix @@ -15,5 +15,7 @@ cabal.mkDerivation (self: { description = "Modernised bindings to GNU ncurses"; license = self.stdenv.lib.licenses.gpl3; platforms = self.ghc.meta.platforms; + hydraPlatforms = self.stdenv.lib.platforms.none; + broken = true; }; }) -- GitLab From 2fcbff576ad95922a66c73a7ba8551f1eab19410 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 2 Sep 2014 11:41:54 +0200 Subject: [PATCH 808/843] haskell-timeplot: broken by Chart update https://github.com/jkff/timeplot/issues/17 --- pkgs/development/tools/haskell/timeplot/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/tools/haskell/timeplot/default.nix b/pkgs/development/tools/haskell/timeplot/default.nix index 4342b877a2e..a07383778ed 100644 --- a/pkgs/development/tools/haskell/timeplot/default.nix +++ b/pkgs/development/tools/haskell/timeplot/default.nix @@ -20,5 +20,7 @@ cabal.mkDerivation (self: { description = "A tool for visualizing time series from log files"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; + hydraPlatforms = self.stdenv.lib.platforms.none; + broken = true; }; }) -- GitLab From b8260f543597ab2b5a9afa5c4937934416a646a5 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 2 Sep 2014 11:57:34 +0200 Subject: [PATCH 809/843] dolphin-emu: drop reference to git from buildInputs since it's no longer an argument to the expression after #3936 --- pkgs/misc/emulators/dolphin-emu/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/misc/emulators/dolphin-emu/default.nix b/pkgs/misc/emulators/dolphin-emu/default.nix index 812e20ebc06..bf03e1e52aa 100644 --- a/pkgs/misc/emulators/dolphin-emu/default.nix +++ b/pkgs/misc/emulators/dolphin-emu/default.nix @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { buildInputs = [ stdenv pkgconfig cmake bluez ffmpeg libao mesa gtk2 glib gettext libpthreadstubs libXrandr libXext readline openal - git libXdmcp portaudio SDL wxGTK30 pulseaudio ]; + libXdmcp portaudio SDL wxGTK30 pulseaudio ]; meta = { homepage = http://dolphin-emu.org/; -- GitLab From 44b58f4e7455124ec97f075755130def29a45734 Mon Sep 17 00:00:00 2001 From: Jaka Hudoklin Date: Tue, 2 Sep 2014 12:07:36 +0200 Subject: [PATCH 810/843] pythonPackages: add docker-py --- pkgs/top-level/python-packages.nix | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 57032cf2ec4..3af1950f9b1 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1835,6 +1835,27 @@ rec { }; }; + docker = buildPythonPackage rec { + name = "docker-py-0.4.0"; + + src = fetchurl { + url = "https://pypi.python.org/packages/source/d/docker-py/${name}.tar.gz"; + md5 = "21ab8fd729105487e6423b654d6c0860"; + }; + + propagatedBuildInputs = [ six requests ]; + + # Version conflict + doCheck = false; + + meta = { + description = "An API client for docker written in Python"; + homepage = https://github.com/docker/docker-py; + license = licenses.asl20; + }; + }; + + dogpile_cache = buildPythonPackage rec { name = "dogpile.cache-0.5.4"; -- GitLab From f6dd506372cf9501eb992849fd8e28ec12fa97b3 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Tue, 2 Sep 2014 12:58:17 +0400 Subject: [PATCH 811/843] Update freeipmi --- pkgs/tools/system/freeipmi/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/freeipmi/default.nix b/pkgs/tools/system/freeipmi/default.nix index 48562adffeb..8f94b21a771 100644 --- a/pkgs/tools/system/freeipmi/default.nix +++ b/pkgs/tools/system/freeipmi/default.nix @@ -1,11 +1,12 @@ { fetchurl, stdenv, libgcrypt, readline }: stdenv.mkDerivation rec { - name = "freeipmi-1.3.4"; + version = "1.4.5"; + name = "freeipmi-${version}"; src = fetchurl { url = "mirror://gnu/freeipmi/${name}.tar.gz"; - sha256 = "0gadf3yj019y3rvgf34pxk502p0p6nrhy6nwldvvir5rknndxh63"; + sha256 = "033zakrk3kvi4y41kslicr90b3yb2kj052cl6nbja7ybn70y9nkz"; }; buildInputs = [ libgcrypt readline ]; @@ -30,10 +31,14 @@ stdenv.mkDerivation rec { ''; homepage = http://www.gnu.org/software/freeipmi/; + downloadPage = "http://www.gnu.org/software/freeipmi/download.html"; license = stdenv.lib.licenses.gpl3Plus; maintainers = with stdenv.lib.maintainers; [ raskin ]; platforms = stdenv.lib.platforms.gnu; # arbitrary choice + + updateWalker = true; + inherit version; }; } -- GitLab From 9668a7a63bf7f3f12404f9cd742c63a2b1e78cf4 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Tue, 2 Sep 2014 12:58:32 +0400 Subject: [PATCH 812/843] Update getmail --- pkgs/tools/networking/getmail/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/getmail/default.nix b/pkgs/tools/networking/getmail/default.nix index 6d9666506b8..8c9103790b9 100644 --- a/pkgs/tools/networking/getmail/default.nix +++ b/pkgs/tools/networking/getmail/default.nix @@ -1,12 +1,13 @@ { stdenv, fetchurl, buildPythonPackage }: buildPythonPackage rec { - name = "getmail-4.43.0"; + version = "4.46.0"; + name = "getmail-${version}"; namePrefix = ""; src = fetchurl { url = "http://pyropus.ca/software/getmail/old-versions/${name}.tar.gz"; - sha256 = "0abcj4d2jp9y56c85kq7265d8wcij91w9lpzib9q6j9lcs4la8hy"; + sha256 = "15rqmm25pq6ll8aaqh8h6pfdkpqs7y6yismb3h3w1bz8j292c8zl"; }; doCheck = false; @@ -15,5 +16,9 @@ buildPythonPackage rec { description = "A program for retrieving mail"; maintainers = [ stdenv.lib.maintainers.raskin stdenv.lib.maintainers.iElectric ]; platforms = stdenv.lib.platforms.linux; + + homepage = "http://pyropus.ca/software/getmail/"; + inherit version; + updateWalker = true; }; } -- GitLab From 23639a93fa0822168009033ae35ede874546d9cc Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Tue, 2 Sep 2014 13:03:33 +0400 Subject: [PATCH 813/843] Update ioping --- pkgs/tools/system/ioping/default.nix | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/pkgs/tools/system/ioping/default.nix b/pkgs/tools/system/ioping/default.nix index 52d32b4e838..588da0624ce 100644 --- a/pkgs/tools/system/ioping/default.nix +++ b/pkgs/tools/system/ioping/default.nix @@ -10,16 +10,15 @@ let (builtins.attrNames (builtins.removeAttrs x helperArgNames)); sourceInfo = rec { baseName="ioping"; - version="0.7"; + version = "0.8"; name="${baseName}-${version}"; url="http://ioping.googlecode.com/files/${name}.tar.gz"; - hash="1c0k9gsq7rr9fqh6znn3i196l84zsm44nq3pl1b7grsnnbp2hki3"; }; in rec { src = a.fetchurl { url = sourceInfo.url; - sha256 = sourceInfo.hash; + sha256 = "0j7yal61nby1lkg9wnr6lxfljbd7wl3n0z8khqwvc9lf57bxngz2"; }; inherit (sourceInfo) name version; @@ -40,11 +39,8 @@ rec { platforms = with a.lib.platforms; linux; license = a.lib.licenses.gpl3Plus; - }; - passthru = { - updateInfo = { - downloadPage = "http://code.google.com/p/ioping/downloads/list"; - }; + downloadPage = "http://code.google.com/p/ioping/downloads/list"; + inherit version; }; }) x -- GitLab From 36e3de7646a8afd4a1cfc6f0b4b327f7bc9e2fb5 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Tue, 2 Sep 2014 13:07:53 +0400 Subject: [PATCH 814/843] ioping auto-updater --- pkgs/tools/system/ioping/default.upstream | 5 +++++ 1 file changed, 5 insertions(+) create mode 100644 pkgs/tools/system/ioping/default.upstream diff --git a/pkgs/tools/system/ioping/default.upstream b/pkgs/tools/system/ioping/default.upstream new file mode 100644 index 00000000000..e51cb487852 --- /dev/null +++ b/pkgs/tools/system/ioping/default.upstream @@ -0,0 +1,5 @@ +url http://code.google.com/p/ioping/downloads/list +version_link '[.]tar[.][a-z0-9]+$' +process 'code[.]google[.]com//' '' + +do_overwrite() { do_overwrite_just_version; } -- GitLab From 5addaeb74f4dbb57220ebe8ad3bdd092fd48d768 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Tue, 2 Sep 2014 13:08:18 +0400 Subject: [PATCH 815/843] More support for SF.net in auto-updater --- .../upstream-updater/update-walker-service-specific.sh | 4 ++++ pkgs/build-support/upstream-updater/update-walker.sh | 10 +++++++--- 2 files changed, 11 insertions(+), 3 deletions(-) diff --git a/pkgs/build-support/upstream-updater/update-walker-service-specific.sh b/pkgs/build-support/upstream-updater/update-walker-service-specific.sh index 28c28f69587..b66001073f2 100644 --- a/pkgs/build-support/upstream-updater/update-walker-service-specific.sh +++ b/pkgs/build-support/upstream-updater/update-walker-service-specific.sh @@ -8,6 +8,10 @@ SF_version_dir () { version_link 'http://sourceforge.net/.+/'"$1"'[0-9.]+/$' } +SF_version_tarball () { + version_link '[.]tar[.].*/download$' +} + GH_latest () { prefetch_command_rel ../fetchgit/nix-prefetch-git revision "$("$(dirname "$0")/urls-from-page.sh" "$CURRENT_URL/commits" | grep /commit/ | head -n 1 | xargs basename )" diff --git a/pkgs/build-support/upstream-updater/update-walker.sh b/pkgs/build-support/upstream-updater/update-walker.sh index e11eb722e0e..e60499b60f2 100755 --- a/pkgs/build-support/upstream-updater/update-walker.sh +++ b/pkgs/build-support/upstream-updater/update-walker.sh @@ -280,6 +280,12 @@ do_overwrite_just_version () { set_var_value sha256 $CURRENT_HASH } +minimize_overwrite() { + do_overwrite(){ + do_overwrite_just_version + } +} + process_config () { CONFIG_DIR="$(directory_of "$1")" CONFIG_NAME="$(basename "$1")" @@ -297,9 +303,7 @@ process_config () { exit 1; } [ -z "$(retrieve_meta fullRegenerate)" ] && eval " - do_overwrite(){ - do_overwrite_just_version - } + minimize_overwrite " fi ensure_attribute_name -- GitLab From 1d7f18798ee74d9ad099d97f4cfbfce139b7b63f Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Tue, 2 Sep 2014 13:09:44 +0400 Subject: [PATCH 816/843] Update ipmiutil --- pkgs/tools/system/ipmiutil/default.nix | 12 ++++-------- pkgs/tools/system/ipmiutil/default.upstream | 4 ++++ 2 files changed, 8 insertions(+), 8 deletions(-) create mode 100644 pkgs/tools/system/ipmiutil/default.upstream diff --git a/pkgs/tools/system/ipmiutil/default.nix b/pkgs/tools/system/ipmiutil/default.nix index c5f33c32359..6590b1ad209 100644 --- a/pkgs/tools/system/ipmiutil/default.nix +++ b/pkgs/tools/system/ipmiutil/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { baseName = "ipmiutil"; - version = "2.9.3"; + version = "2.7.3"; name = "${baseName}-${version}"; src = fetchurl { url = "mirror://sourceforge/project/${baseName}/${name}.tar.gz"; - sha256 = "1dwyxp4jn5wxzyahd0x839kj1q7z6xin1wybpx9na4xsgscj6v27"; + sha256 = "0z6ykz5db4ws7hpi25waf9vznwsh0vp819h5s7s8r054vxslrfpq"; }; buildInputs = [ openssl ]; @@ -26,11 +26,7 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ raskin ]; platforms = platforms.linux; license = licenses.bsd3; - }; - - passthru = { - updateInfo = { - downloadPage = "http://sourceforge.net/projects/ipmiutil/files/ipmiutil/"; - }; + downloadPage = "http://sourceforge.net/projects/ipmiutil/files/ipmiutil/"; + inherit version; }; } diff --git a/pkgs/tools/system/ipmiutil/default.upstream b/pkgs/tools/system/ipmiutil/default.upstream new file mode 100644 index 00000000000..18dc096a36b --- /dev/null +++ b/pkgs/tools/system/ipmiutil/default.upstream @@ -0,0 +1,4 @@ +url http://sourceforge.net/projects/ipmiutil/files/ipmiutil/ +SF_version_tarball +SF_redirect +minimize_overwrite -- GitLab From 6d7c2c785821b08f69f558049610d253fc777773 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Tue, 2 Sep 2014 13:16:25 +0400 Subject: [PATCH 817/843] Update ised --- pkgs/tools/misc/ised/default.nix | 11 +++-------- pkgs/tools/misc/ised/default.upstream | 4 ++++ 2 files changed, 7 insertions(+), 8 deletions(-) create mode 100644 pkgs/tools/misc/ised/default.upstream diff --git a/pkgs/tools/misc/ised/default.nix b/pkgs/tools/misc/ised/default.nix index 02cb65b1060..96acc6c8ab9 100644 --- a/pkgs/tools/misc/ised/default.nix +++ b/pkgs/tools/misc/ised/default.nix @@ -10,16 +10,15 @@ let (builtins.attrNames (builtins.removeAttrs x helperArgNames)); sourceInfo = rec { baseName="ised"; - version="2.5.0"; + version = "2.6.0"; name="${baseName}-${version}"; url="mirror://sourceforge/project/ised/${name}.tar.bz2"; - hash="1avfb4ivq6iz50rraci0pcxl0w94899sz6icdqc0l4954y4zs8qd"; }; in rec { src = a.fetchurl { url = sourceInfo.url; - sha256 = sourceInfo.hash; + sha256 = "0rf9brqkrad8f3czpfc1bxq9ybv3nxci9276wdxas033c82cqkjs"; }; inherit (sourceInfo) name version; @@ -37,11 +36,7 @@ rec { platforms = with a.lib.platforms; linux; license = a.lib.licenses.gpl3Plus; - }; - passthru = { - updateInfo = { - downloadPage = "ised.sf.net"; - }; + inherit version; }; }) x diff --git a/pkgs/tools/misc/ised/default.upstream b/pkgs/tools/misc/ised/default.upstream new file mode 100644 index 00000000000..6539bf477e5 --- /dev/null +++ b/pkgs/tools/misc/ised/default.upstream @@ -0,0 +1,4 @@ +url http://ised.sourceforge.net/web_nav.html +SF_version_tarball +SF_redirect +minimize_overwrite -- GitLab From ee713859f4017aececc4025f11d1874d1e930690 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Tue, 2 Sep 2014 13:25:05 +0400 Subject: [PATCH 818/843] Update libosip --- pkgs/development/libraries/osip/default.nix | 5 +++-- pkgs/development/libraries/osip/default.upstream | 3 +++ 2 files changed, 6 insertions(+), 2 deletions(-) create mode 100644 pkgs/development/libraries/osip/default.upstream diff --git a/pkgs/development/libraries/osip/default.nix b/pkgs/development/libraries/osip/default.nix index cfa838f5a37..4db1cb5b524 100644 --- a/pkgs/development/libraries/osip/default.nix +++ b/pkgs/development/libraries/osip/default.nix @@ -1,9 +1,9 @@ {stdenv, fetchurl}: stdenv.mkDerivation rec { - version = "4.0.0"; + version = "4.1.0"; src = fetchurl { url = "mirror://gnu/osip/libosip2-${version}.tar.gz"; - sha256 = "05dhj4s5k4qmhn2amca070xgh1gkcl42n040fhwsn3vm86524bdv"; + sha256 = "014503kqv7z63az6lgxr5fbajlrqylm5c4kgbf8p3a0n6cva0slr"; }; name = "libosip2-${version}"; @@ -13,5 +13,6 @@ stdenv.mkDerivation rec { description = "The GNU oSIP library, an implementation of the Session Initiation Protocol (SIP)"; maintainers = with stdenv.lib.maintainers; [ raskin ]; platforms = stdenv.lib.platforms.linux; + inherit version; }; } diff --git a/pkgs/development/libraries/osip/default.upstream b/pkgs/development/libraries/osip/default.upstream new file mode 100644 index 00000000000..ba0ed2a9b29 --- /dev/null +++ b/pkgs/development/libraries/osip/default.upstream @@ -0,0 +1,3 @@ +url http://ftp.u-tx.net/gnu/osip/ +attribute_name libosip +minimize_overwrite -- GitLab From bacd3e852dbd11fd24f3013e0535ac9d1af19e36 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Tue, 2 Sep 2014 13:41:46 +0400 Subject: [PATCH 819/843] Update pari --- pkgs/applications/science/math/pari/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/math/pari/default.nix b/pkgs/applications/science/math/pari/default.nix index 576a28b054f..e59bb9fe666 100644 --- a/pkgs/applications/science/math/pari/default.nix +++ b/pkgs/applications/science/math/pari/default.nix @@ -1,11 +1,12 @@ { stdenv, fetchurl, gmp, readline }: stdenv.mkDerivation rec { - name = "pari-2.5.5"; + version = "2.7.1"; + name = "pari-${version}"; src = fetchurl { url = "http://pari.math.u-bordeaux.fr/pub/pari/unix/${name}.tar.gz"; - sha256 = "058nw1fhggy7idii4f124ami521lv3izvngs9idfz964aks8cvvn"; + sha256 = "1gj1rddi22hinzwy7r6hljgbi252wwwyd6gapg4hvcn0ycc7jqyc"; }; buildInputs = [gmp readline]; @@ -21,5 +22,9 @@ stdenv.mkDerivation rec { license = "GPLv2+"; maintainers = with stdenv.lib.maintainers; [ertes raskin]; platforms = stdenv.lib.platforms.linux; + + inherit version; + downloadPage = "http://pari.math.u-bordeaux.fr/download.html"; + updateWalker = true; }; } -- GitLab From 3ba3ec0f8fb68f4c0f9b731af4dadf3f3686def5 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Tue, 2 Sep 2014 13:48:05 +0400 Subject: [PATCH 820/843] Update Regina-REXX --- pkgs/development/interpreters/regina/default.nix | 12 ++++-------- .../development/interpreters/regina/default.upstream | 5 +++++ 2 files changed, 9 insertions(+), 8 deletions(-) create mode 100644 pkgs/development/interpreters/regina/default.upstream diff --git a/pkgs/development/interpreters/regina/default.nix b/pkgs/development/interpreters/regina/default.nix index d8b3558be4f..992f7281554 100644 --- a/pkgs/development/interpreters/regina/default.nix +++ b/pkgs/development/interpreters/regina/default.nix @@ -12,16 +12,15 @@ let sourceInfo = rec { baseName="Regina-REXX"; pname="regina-rexx"; - version="3.5"; + version = "3.8.2"; name="${baseName}-${version}"; url="mirror://sourceforge/${pname}/${pname}/${version}/${name}.tar.gz"; - hash="0gh0k6lbhfixs44adha7lxirl3a08jabdylzr6m7mh5q5fhzv5f8"; }; in rec { src = a.fetchurl { url = sourceInfo.url; - sha256 = sourceInfo.hash; + sha256 = "06vr6p9pqr5zzsxm1l9iwb2w9z8qkm971c2knh0vf5bbm6znjz35"; }; inherit (sourceInfo) name version; @@ -43,11 +42,8 @@ rec { platforms = with a.lib.platforms; linux; license = a.lib.licenses.lgpl2; - }; - passthru = { - updateInfo = { - downloadPage = "http://sourceforge.net/projects/regina-rexx/files/regina-rexx/"; - }; + downloadPage = "http://sourceforge.net/projects/regina-rexx/files/regina-rexx/"; + inherit version; }; }) x diff --git a/pkgs/development/interpreters/regina/default.upstream b/pkgs/development/interpreters/regina/default.upstream new file mode 100644 index 00000000000..7b3c6905a1c --- /dev/null +++ b/pkgs/development/interpreters/regina/default.upstream @@ -0,0 +1,5 @@ +url http://sourceforge.net/projects/regina-rexx/files/regina-rexx/ +SF_version_dir +SF_version_tarball +SF_redirect +minimize_overwrite -- GitLab From f78afc0b27622372ad485466509a6cc377c172bf Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Tue, 2 Sep 2014 14:15:10 +0400 Subject: [PATCH 821/843] Update libefw. Releases on Google Drive. Ouch --- pkgs/development/libraries/libewf/default.nix | 13 ++++++++----- pkgs/development/libraries/libewf/default.upstream | 7 +++++++ 2 files changed, 15 insertions(+), 5 deletions(-) create mode 100644 pkgs/development/libraries/libewf/default.upstream diff --git a/pkgs/development/libraries/libewf/default.nix b/pkgs/development/libraries/libewf/default.nix index 7c948aa9824..fad0170ade7 100644 --- a/pkgs/development/libraries/libewf/default.nix +++ b/pkgs/development/libraries/libewf/default.nix @@ -1,10 +1,11 @@ -{ fetchurl, stdenv, zlib, openssl, libuuid, file }: +{ fetchurl, stdenv, zlib, openssl, libuuid, file, fuse }: stdenv.mkDerivation rec { - name = "libewf-20100226"; + version = "20140608"; + name = "libewf-${version}"; src = fetchurl { - url = "mirror://sourceforge/libewf/${name}.tar.gz"; - sha256 = "aedd2a6b3df6525ff535ab95cd569ebb361a4022eb4163390f26257913c2941a"; + url = "https://googledrive.com/host/0B3fBvzttpiiSMTdoaVExWWNsRjg/libewf-20140608.tar.gz"; + sha256 = "0wfsffzxk934hl8cpwr14w8ixnh8d23x0xnnzcspjwi2c7730h6i"; }; preConfigure = ''sed -e 's@/usr/bin/file@file@g' -i configure''; @@ -14,6 +15,8 @@ stdenv.mkDerivation rec { meta = { description = "Library for support of the Expert Witness Compression Format"; homepage = http://sourceforge.net/projects/libewf/; - license = "free"; + license = stdenv.lib.licenses.lgpl3; + maintainers = [ stdenv.lib.maintainers.raskin ] ; + inherit version; }; } diff --git a/pkgs/development/libraries/libewf/default.upstream b/pkgs/development/libraries/libewf/default.upstream new file mode 100644 index 00000000000..a071132463f --- /dev/null +++ b/pkgs/development/libraries/libewf/default.upstream @@ -0,0 +1,7 @@ +url https://code.google.com/p/libewf/ +version_link 'googledrive[.]com' +version_link '[.]tar[.]' +do_overwrite () { + do_overwrite_just_version + set_var_value url "$CURRENT_URL" +} -- GitLab From 7b6d33a591a541af26564fd5e3312fbc4782d387 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Tue, 2 Sep 2014 14:15:51 +0400 Subject: [PATCH 822/843] Update spandsp --- pkgs/development/libraries/spandsp/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/spandsp/default.nix b/pkgs/development/libraries/spandsp/default.nix index f88ab48e027..24dc443ca70 100644 --- a/pkgs/development/libraries/spandsp/default.nix +++ b/pkgs/development/libraries/spandsp/default.nix @@ -1,10 +1,10 @@ {stdenv, fetchurl, audiofile, libtiff}: stdenv.mkDerivation rec { - version = "0.0.5"; + version = "0.0.6"; name = "spandsp-${version}"; src=fetchurl { - url = "http://www.soft-switch.org/downloads/spandsp/spandsp-${version}.tgz"; - sha256 = "07f42a237c77b08fa765c3a148c83cdfa267bf24c0ab681d80b90d30dd0b3dbf"; + url = "http://www.soft-switch.org/downloads/spandsp/spandsp-${version}.tar.gz"; + sha256 = "0rclrkyspzk575v8fslzjpgp4y2s4x7xk3r55ycvpi4agv33l1fc"; }; buildInputs = []; propagatedBuildInputs = [audiofile libtiff]; @@ -13,6 +13,9 @@ stdenv.mkDerivation rec { platforms = with stdenv.lib.platforms; linux; maintainers = with stdenv.lib.maintainers; [raskin]; license = with stdenv.lib.licenses; gpl2; + downloadPage = "http://www.soft-switch.org/downloads/spandsp/"; + inherit version; + updateWalker = true; }; } -- GitLab From 0d8c76057fa561407d4f23e1b903cd1927f56efa Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Tue, 2 Sep 2014 14:17:59 +0400 Subject: [PATCH 823/843] Update Wavemon --- pkgs/tools/networking/wavemon/default.nix | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/pkgs/tools/networking/wavemon/default.nix b/pkgs/tools/networking/wavemon/default.nix index e9c102817e1..b5927fd2478 100644 --- a/pkgs/tools/networking/wavemon/default.nix +++ b/pkgs/tools/networking/wavemon/default.nix @@ -11,16 +11,15 @@ let (builtins.attrNames (builtins.removeAttrs x helperArgNames)); sourceInfo = rec { baseName="wavemon"; - version="0.7.5"; + version = "0.7.6"; name="${baseName}-${version}"; url="http://eden-feed.erg.abdn.ac.uk/wavemon/stable-releases/${name}.tar.bz2"; - hash="0b1fx00aar2fsw49a10w5bpiyjpz8h8f4nrlwb1acfw36yi1pfkd"; }; in rec { src = a.fetchurl { url = sourceInfo.url; - sha256 = sourceInfo.hash; + sha256 = "18cwlzgmwzy7z9dfr6lwd8kmkv0pqiihizm4gi0kkm52bzz6836y"; }; inherit (sourceInfo) name version; @@ -38,11 +37,9 @@ rec { platforms = with a.lib.platforms; linux; license = a.lib.licenses.gpl2Plus; - }; - passthru = { - updateInfo = { - downloadPage = "http://eden-feed.erg.abdn.ac.uk/wavemon/"; - }; + downloadPage = "http://eden-feed.erg.abdn.ac.uk/wavemon/"; + inherit version; + updateWalker = true; }; }) x -- GitLab From 85caa0942d2a468782d83e21d8cf4a6ed98e5415 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Tue, 2 Sep 2014 14:18:19 +0400 Subject: [PATCH 824/843] Update SleuthKit --- pkgs/tools/system/sleuthkit/default.nix | 6 ++++-- pkgs/tools/system/sleuthkit/default.upstream | 5 +++++ 2 files changed, 9 insertions(+), 2 deletions(-) create mode 100644 pkgs/tools/system/sleuthkit/default.upstream diff --git a/pkgs/tools/system/sleuthkit/default.nix b/pkgs/tools/system/sleuthkit/default.nix index 0148e3c699e..016e2ccda37 100644 --- a/pkgs/tools/system/sleuthkit/default.nix +++ b/pkgs/tools/system/sleuthkit/default.nix @@ -1,11 +1,12 @@ { stdenv, fetchurl, libewf, afflib, openssl, zlib }: stdenv.mkDerivation rec { - name = "sleuthkit-3.2.2"; + version = "4.1.3"; + name = "sleuthkit-${version}"; src = fetchurl { url = "mirror://sourceforge/sleuthkit/${name}.tar.gz"; - sha256 = "02hik5xvbgh1dpisvc3wlhhq1aprnlsk0spbw6h5khpbq9wqnmgj"; + sha256 = "09q3ky4rpv18jasf5gc2hlivzadzl70jy4nnk23db1483aix5yb7"; }; enableParallelBuilding = true; @@ -20,5 +21,6 @@ stdenv.mkDerivation rec { maintainers = [ stdenv.lib.maintainers.raskin ]; platforms = stdenv.lib.platforms.linux; license = "IBM Public License"; + inherit version; }; } diff --git a/pkgs/tools/system/sleuthkit/default.upstream b/pkgs/tools/system/sleuthkit/default.upstream new file mode 100644 index 00000000000..f8ffe9352ed --- /dev/null +++ b/pkgs/tools/system/sleuthkit/default.upstream @@ -0,0 +1,5 @@ +url http://sourceforge.net/projects/sleuthkit/files/sleuthkit/ +SF_version_dir +SF_version_tarball +SF_redirect +minimize_overwrite -- GitLab From 10b4bc3c439c0d37c833d7a00f52673759d9b3b4 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Tue, 2 Sep 2014 14:22:49 +0400 Subject: [PATCH 825/843] Update XDaliClock --- pkgs/tools/misc/xdaliclock/default.nix | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/pkgs/tools/misc/xdaliclock/default.nix b/pkgs/tools/misc/xdaliclock/default.nix index 79c6a743bce..df1a7eedeff 100644 --- a/pkgs/tools/misc/xdaliclock/default.nix +++ b/pkgs/tools/misc/xdaliclock/default.nix @@ -12,17 +12,16 @@ let (builtins.attrNames (builtins.removeAttrs x helperArgNames)); sourceInfo = rec { baseName="xdaliclock"; - version="2.40"; + version = "2.41"; name="${baseName}-${version}"; project="${baseName}"; url="http://www.jwz.org/${project}/${name}.tar.gz"; - hash="03i8vwi9vz3gr938wr4miiymwv283mg11wgfaf2jhl6aqbmz4id7"; }; in rec { src = a.fetchurl { url = sourceInfo.url; - sha256 = sourceInfo.hash; + sha256 = "1crkjvza692irkqm9vwgn58m8ps93n0rxigm6pasgl5dnx3p6d1d"; }; inherit (sourceInfo) name version; @@ -46,10 +45,8 @@ rec { platforms = with a.lib.platforms; linux ++ freebsd; license = "free"; #TODO BSD on Gentoo, looks like MIT - }; - passthru = { - updateInfo = { - downloadPage = "http://www.jwz.org/xdaliclock/"; - }; + downloadPage = "http://www.jwz.org/xdaliclock/"; + inherit version; + updateWalker = true; }; }) x -- GitLab From 48dce0642bef6481a934ae19c6db514f12cb5c10 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Tue, 2 Sep 2014 14:25:04 +0400 Subject: [PATCH 826/843] Add auto-updater for XScreensaver --- pkgs/misc/screensavers/xscreensaver/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/misc/screensavers/xscreensaver/default.nix b/pkgs/misc/screensavers/xscreensaver/default.nix index 04791749810..40fad768b16 100644 --- a/pkgs/misc/screensavers/xscreensaver/default.nix +++ b/pkgs/misc/screensavers/xscreensaver/default.nix @@ -41,5 +41,8 @@ stdenv.mkDerivation rec { description = "A set of screensavers"; maintainers = with stdenv.lib.maintainers; [ raskin urkud ]; platforms = with stdenv.lib.platforms; allBut cygwin; + inherit version; + downloadPage = "http://www.jwz.org/xscreensaver/download.html"; + updateWalker = true; }; } -- GitLab From 2fc76ea05417671306d27f9ba83ef1b8d4049f3d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 2 Sep 2014 12:28:56 +0200 Subject: [PATCH 827/843] haskell-auto-update: disable test suite to work around build failure https://github.com/yesodweb/wai/issues/285 --- pkgs/development/libraries/haskell/auto-update/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/haskell/auto-update/default.nix b/pkgs/development/libraries/haskell/auto-update/default.nix index e047e938dae..85f15b500ed 100644 --- a/pkgs/development/libraries/haskell/auto-update/default.nix +++ b/pkgs/development/libraries/haskell/auto-update/default.nix @@ -7,6 +7,7 @@ cabal.mkDerivation (self: { version = "0.1.1.2"; sha256 = "0901zqky70wyxl17vwz6smhnpsfjnsk0f2xqiyz902vl7apx66c6"; testDepends = [ hspec ]; + doCheck = false; meta = { homepage = "https://github.com/yesodweb/wai"; description = "Efficiently run periodic, on-demand actions"; -- GitLab From ac9cb299355fb082c0b9ee1950606dcc5e82fc08 Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Tue, 2 Sep 2014 12:53:33 +0200 Subject: [PATCH 828/843] gnome3_12.clutter-gst: update from 2.0.10 to 2.0.12 --- pkgs/development/libraries/clutter-gst/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/clutter-gst/default.nix b/pkgs/development/libraries/clutter-gst/default.nix index c73aac074e7..7cef673dbc6 100644 --- a/pkgs/development/libraries/clutter-gst/default.nix +++ b/pkgs/development/libraries/clutter-gst/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, pkgconfig, clutter, gtk3, glib, cogl }: stdenv.mkDerivation rec { - name = "clutter-gst-2.0.10"; + name = "clutter-gst-2.0.12"; src = fetchurl { url = "mirror://gnome/sources/clutter-gst/2.0/${name}.tar.xz"; - sha256 = "f00cf492a6d4f1036c70d8a0ebd2f0f47586ea9a9b49b1ffda79c9dc7eadca00"; + sha256 = "1dgzpd5l5ld622b8185c3khvvllm5hfvq4q1a1mgzhxhj8v4bwf2"; }; propagatedBuildInputs = [ clutter gtk3 glib cogl ]; -- GitLab From df6d65ad550f5f6dc76f4889dc74eb621744a663 Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Tue, 2 Sep 2014 12:53:41 +0200 Subject: [PATCH 829/843] gnome3_12.empathy: update from 3.12.2 to 3.12.5 --- pkgs/desktops/gnome-3/3.12/core/empathy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/3.12/core/empathy/default.nix b/pkgs/desktops/gnome-3/3.12/core/empathy/default.nix index 7fb341948be..c6ac93b1074 100644 --- a/pkgs/desktops/gnome-3/3.12/core/empathy/default.nix +++ b/pkgs/desktops/gnome-3/3.12/core/empathy/default.nix @@ -11,11 +11,11 @@ # TODO: enable more features stdenv.mkDerivation rec { - name = "empathy-3.12.2"; + name = "empathy-3.12.5"; src = fetchurl { url = "mirror://gnome/sources/empathy/3.12/${name}.tar.xz"; - sha256 = "414d0c6b1a30b1afbf35ad04b0b9ff3ada3e06fab797a50a7147cdfe0905e7cd"; + sha256 = "0rhgpiv75aafmdh6r7d4ci59lnxqmmwg9hvsa5b3mk7j2d2pma86"; }; propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard -- GitLab From 64746e1f24d073e958ff16b42d17be73751c68fe Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Tue, 2 Sep 2014 12:53:49 +0200 Subject: [PATCH 830/843] gnome3_12.evolution: update from 3.12.2 to 3.12.5 --- pkgs/desktops/gnome-3/3.12/apps/evolution/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/3.12/apps/evolution/default.nix b/pkgs/desktops/gnome-3/3.12/apps/evolution/default.nix index f9fbbbe56c6..8cba366faae 100644 --- a/pkgs/desktops/gnome-3/3.12/apps/evolution/default.nix +++ b/pkgs/desktops/gnome-3/3.12/apps/evolution/default.nix @@ -5,11 +5,11 @@ , libcanberra_gtk3, bogofilter, gst_all_1, procps, p11_kit }: stdenv.mkDerivation rec { - name = "evolution-3.12.2"; + name = "evolution-3.12.5"; src = fetchurl { url = "mirror://gnome/sources/evolution/3.12/${name}.tar.xz"; - sha256 = "60742334aaf1e3b9f044c2003c44a37be5905b166e24580e9e6e6c5ae1b9f948"; + sha256 = "08y1qiydbbk4fq8rrql9sgbwsny8bwz6f7m5kbbj5zjqvf1baksj"; }; doCheck = true; -- GitLab From de51a490f5039b950b8742b8c2dd78089fb0b6a3 Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Tue, 2 Sep 2014 12:54:01 +0200 Subject: [PATCH 831/843] gnome3_12.folks: update from 0.9.6 to 0.9.8 --- pkgs/desktops/gnome-3/3.12/core/folks/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/3.12/core/folks/default.nix b/pkgs/desktops/gnome-3/3.12/core/folks/default.nix index 47b958002a3..7e3af8405a4 100644 --- a/pkgs/desktops/gnome-3/3.12/core/folks/default.nix +++ b/pkgs/desktops/gnome-3/3.12/core/folks/default.nix @@ -5,11 +5,11 @@ # TODO: enable more folks backends stdenv.mkDerivation rec { - name = "folks-0.9.6"; + name = "folks-0.9.8"; src = fetchurl { url = "mirror://gnome/sources/folks/0.9/${name}.tar.xz"; - sha256 = "a67e055b5a2724a34a80946e2940c4c0ad708cb1f4e0a09407c6b69a5e40267f"; + sha256 = "09cbs3ihcswpi1wg8xbjmkqjbhnxa1idy1fbzmz0gah7l5mxmlfj"; }; propagatedBuildInputs = [ glib gnome3.libgee sqlite ]; -- GitLab From f3bc1dc2632ffa8b46055ea088a400f993b4830f Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Tue, 2 Sep 2014 12:54:08 +0200 Subject: [PATCH 832/843] gnome3_12.geary: update from 0.6.0 to 0.6.2 --- pkgs/desktops/gnome-3/3.12/misc/geary/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/3.12/misc/geary/default.nix b/pkgs/desktops/gnome-3/3.12/misc/geary/default.nix index 1eb6c0e3ed2..768e8bdb36e 100644 --- a/pkgs/desktops/gnome-3/3.12/misc/geary/default.nix +++ b/pkgs/desktops/gnome-3/3.12/misc/geary/default.nix @@ -5,11 +5,11 @@ , gnome3, librsvg, gnome_doc_utils, webkitgtk }: stdenv.mkDerivation rec { - name = "geary-0.6.0"; + name = "geary-0.6.2"; src = fetchurl { url = "mirror://gnome/sources/geary/0.6/${name}.tar.xz"; - sha256 = "44ad1dc2c81c50006c751f8e72aa817f07002188da4c29e158060524a1962715"; + sha256 = "0ap40mpj89sx82kcxlhl9gipq34ks2b70yhiv9s8zc5wg0nm7rpg"; }; propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; -- GitLab From f08c327ab2dc69b0151d6d589e7732c5655efdfd Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Tue, 2 Sep 2014 12:54:14 +0200 Subject: [PATCH 833/843] gnome3_12.gedit: update from 3.12.1 to 3.12.2 --- pkgs/desktops/gnome-3/3.12/apps/gedit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/3.12/apps/gedit/default.nix b/pkgs/desktops/gnome-3/3.12/apps/gedit/default.nix index 0909a4239db..c65a28c3446 100644 --- a/pkgs/desktops/gnome-3/3.12/apps/gedit/default.nix +++ b/pkgs/desktops/gnome-3/3.12/apps/gedit/default.nix @@ -4,11 +4,11 @@ , gnome3, librsvg, gdk_pixbuf, file }: stdenv.mkDerivation rec { - name = "gedit-3.12.1"; + name = "gedit-3.12.2"; src = fetchurl { url = "mirror://gnome/sources/gedit/3.12/${name}.tar.xz"; - sha256 = "8e3edc62102934a8be708b0fdf27b86368fa9ede885628283bf8e91b26bbb67f"; + sha256 = "0lxnswqa0ysr57cqh062wp41sd76p6q7y3mnkl7rligd5c8hnikm"; }; propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; -- GitLab From 95dffc12e8049b0caa8c8490fdfde6adbd154b22 Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Tue, 2 Sep 2014 12:54:22 +0200 Subject: [PATCH 834/843] gnome3_12.gnome-calculator: update from 3.12.1 to 3.12.3 --- pkgs/desktops/gnome-3/3.12/core/gnome-calculator/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-calculator/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-calculator/default.nix index 666032f56a7..19d0c9c10e8 100644 --- a/pkgs/desktops/gnome-3/3.12/core/gnome-calculator/default.nix +++ b/pkgs/desktops/gnome-3/3.12/core/gnome-calculator/default.nix @@ -3,11 +3,11 @@ , itstool, gnome3, librsvg, gdk_pixbuf }: stdenv.mkDerivation rec { - name = "gnome-calculator-3.12.1"; + name = "gnome-calculator-3.12.3"; src = fetchurl { url = "mirror://gnome/sources/gnome-calculator/3.12/${name}.tar.xz"; - sha256 = "15a75bbe19f6d2280d864f0504f6fc5b1f148fea9738b5548b64b7b8c0c64740"; + sha256 = "0bn3agh3g22iradfpzkc19a2b33b1mbf0ciy1hf2sijrczi24410"; }; NIX_CFLAGS_COMPILE = "-I${gnome3.glib}/include/gio-unix-2.0"; -- GitLab From ac7f0a8cf257f1f2dd589d57e332da47fb216f3b Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Tue, 2 Sep 2014 12:54:30 +0200 Subject: [PATCH 835/843] gnome3_12.gnome-music: update from 3.12.2 to 3.12.2.1 --- pkgs/desktops/gnome-3/3.12/apps/gnome-music/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 d784544a183..c5f9bdb2774 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 @@ -4,11 +4,11 @@ , makeWrapper, itstool, gnome3, librsvg, gst_all_1 }: stdenv.mkDerivation rec { - name = "gnome-music-3.12.2"; + name = "gnome-music-3.12.2.1"; src = fetchurl { url = "mirror://gnome/sources/gnome-music/3.12/${name}.tar.xz"; - sha256 = "ec4807018166aabed0263cb3ffce672e1fc1a3e959f48a5ad48b8eb08ddb451a"; + sha256 = "1vwzjv5001pg37qc0sh4ph3srqwg3vgibbdlqpim9w2k70l9j34z"; }; propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; -- GitLab From b00b560dba7477bdfa20b18e2b0a9bb4b504ddf5 Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Tue, 2 Sep 2014 12:54:38 +0200 Subject: [PATCH 836/843] gnome3_12.gnome-user-docs: update from 3.12.1 to 3.12.2 --- pkgs/desktops/gnome-3/3.12/core/gnome-user-docs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/3.12/core/gnome-user-docs/default.nix b/pkgs/desktops/gnome-3/3.12/core/gnome-user-docs/default.nix index 7377c839d1c..2a237b15c21 100644 --- a/pkgs/desktops/gnome-3/3.12/core/gnome-user-docs/default.nix +++ b/pkgs/desktops/gnome-3/3.12/core/gnome-user-docs/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, file, gnome3, itstool, libxml2, intltool }: stdenv.mkDerivation rec { - name = "gnome-user-docs-3.12.1"; + name = "gnome-user-docs-3.12.2"; src = fetchurl { url = "mirror://gnome/sources/gnome-user-docs/3.12/${name}.tar.xz"; - sha256 = "bfd084d72c688d6efb0c34bb572a704cc2ce093c97a33390eaffb5e42158d418"; + sha256 = "1cj45lpa74vkbxyila3d6pn5m1gh51nljp9fjirxmzwi1h6wg7jd"; }; buildInputs = [ pkgconfig gnome3.yelp itstool libxml2 intltool ]; -- GitLab From 4426b5aca7e05e78c10a0ebaedaa6dd0e99c8907 Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Tue, 2 Sep 2014 12:55:33 +0200 Subject: [PATCH 837/843] grilo: update from 0.2.10 to 0.2.11 --- pkgs/desktops/gnome-3/3.12/core/grilo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/3.12/core/grilo/default.nix b/pkgs/desktops/gnome-3/3.12/core/grilo/default.nix index 6f1bfbbcfe9..9c0e3f9a0bc 100644 --- a/pkgs/desktops/gnome-3/3.12/core/grilo/default.nix +++ b/pkgs/desktops/gnome-3/3.12/core/grilo/default.nix @@ -2,11 +2,11 @@ , libxml2, gnome3, gobjectIntrospection, libsoup }: stdenv.mkDerivation rec { - name = "grilo-0.2.10"; + name = "grilo-0.2.11"; src = fetchurl { url = "mirror://gnome/sources/grilo/0.2/${name}.tar.xz"; - sha256 = "559a2470fe541b0090bcfdfac7a33e92dba967727bbab6d0eca70e5636a77b25"; + sha256 = "8a52c37521de80d6caf08a519a708489b9e2b097c2758a0acaab6fbd26d30ea6"; }; configureFlags = [ "--enable-grl-pls" "--enable-grl-net" ]; -- GitLab From 7cb6d4cd87702dd5f61487431d846d318b91fb05 Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Tue, 2 Sep 2014 12:55:46 +0200 Subject: [PATCH 838/843] gnome3_12.grilo-plugins: update from 0.2.12 to 0.2.13 --- pkgs/desktops/gnome-3/3.12/core/grilo-plugins/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/3.12/core/grilo-plugins/default.nix b/pkgs/desktops/gnome-3/3.12/core/grilo-plugins/default.nix index a8a1c244767..9076d5c5839 100644 --- a/pkgs/desktops/gnome-3/3.12/core/grilo-plugins/default.nix +++ b/pkgs/desktops/gnome-3/3.12/core/grilo-plugins/default.nix @@ -3,11 +3,11 @@ , gmime, json_glib, avahi, tracker, itstool }: stdenv.mkDerivation rec { - name = "grilo-plugins-0.2.12"; + name = "grilo-plugins-0.2.13"; src = fetchurl { url = "mirror://gnome/sources/grilo-plugins/0.2/${name}.tar.xz"; - sha256 = "15bed8a633c81b251920ab677d455433e641388f605277ca88e549cc89012b48"; + sha256 = "008jwm5ydl0k25p3d2fkcail40fj9y3qknihxb5fg941p8qlhm55"; }; installFlags = [ "GRL_PLUGINS_DIR=$(out)/lib/grilo-0.2" ]; -- GitLab From 70991e666e44d8ee314bda3ee6a4315f5e064632 Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Tue, 2 Sep 2014 12:55:54 +0200 Subject: [PATCH 839/843] gnome3_12.gtksourceview: update from 3.12.2 to 3.12.3 --- pkgs/desktops/gnome-3/3.12/core/gtksourceview/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/3.12/core/gtksourceview/default.nix b/pkgs/desktops/gnome-3/3.12/core/gtksourceview/default.nix index 4564b0d21e1..8a89425a696 100644 --- a/pkgs/desktops/gnome-3/3.12/core/gtksourceview/default.nix +++ b/pkgs/desktops/gnome-3/3.12/core/gtksourceview/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "gtksourceview-${version}"; - version = "3.12.2"; + version = "3.12.3"; src = fetchurl { url = "mirror://gnome/sources/gtksourceview/3.12/gtksourceview-${version}.tar.xz"; - sha256 = "62a31eee00f633d7959efb7eec44049ebd0345d670265853dcd21c057f3f30ad"; + sha256 = "1xzmw9n9zbkaasl8xi7s5h49wiv5dq4qf8hr2pzjkack3ai5j6gk"; }; buildInputs = [ pkgconfig atk cairo glib gtk3 pango -- GitLab From f02ab3f9c4f4afa08c2b32f4fea74241d9800327 Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Tue, 2 Sep 2014 12:56:01 +0200 Subject: [PATCH 840/843] gnome3_12.totem: update from 3.12.1 to 3.12.2 --- pkgs/desktops/gnome-3/3.12/core/totem/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/3.12/core/totem/default.nix b/pkgs/desktops/gnome-3/3.12/core/totem/default.nix index 3589299df3e..1322fdcaae3 100644 --- a/pkgs/desktops/gnome-3/3.12/core/totem/default.nix +++ b/pkgs/desktops/gnome-3/3.12/core/totem/default.nix @@ -5,11 +5,11 @@ , gnome3, librsvg, gdk_pixbuf, file }: stdenv.mkDerivation rec { - name = "totem-3.12.1"; + name = "totem-3.12.2"; src = fetchurl { url = "mirror://gnome/sources/totem/3.12/${name}.tar.xz"; - sha256 = "dd168cdd4051d01131d47c24fa45bfd08b6ccf45900ac4b64bae47f6f47a35e3"; + sha256 = "1law033wxbs8v3l2fk0p1v8lf9m45dm997yhq0cmqgw10jxxiybn"; }; doCheck = true; -- GitLab From 12018a0df9b2d33e4c0c8ec4366382211447a54d Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Tue, 2 Sep 2014 12:56:07 +0200 Subject: [PATCH 841/843] gnome3_12.tracker: update from 1.0.1 to 1.0.3, potentially fixes CVE-2012-2671, CVE-2012-6109 --- pkgs/desktops/gnome-3/3.12/core/tracker/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 79155fe9b56..cf84f511416 100644 --- a/pkgs/desktops/gnome-3/3.12/core/tracker/default.nix +++ b/pkgs/desktops/gnome-3/3.12/core/tracker/default.nix @@ -8,11 +8,11 @@ , libpng, libexif, libgsf, libuuid, bzip2 }: stdenv.mkDerivation rec { - name = "tracker-1.0.1"; + name = "tracker-1.0.3"; src = fetchurl { url = "mirror://gnome/sources/tracker/1.0/${name}.tar.xz"; - sha256 = "76e7918e62526a8209f9c9226f82abe592a6332826ac7c12e6e405063181e889"; + sha256 = "11pqcldgh07mjn38dlbj6ry5qkfbpf79ln5sqx7q86hhqzh3712h"; }; propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; -- GitLab From 17e96cd1a3d09e250b5a067a4402c01966adf832 Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Tue, 2 Sep 2014 12:57:10 +0200 Subject: [PATCH 842/843] vte: update from 0.36.2 to 0.36.3 --- pkgs/desktops/gnome-3/3.12/core/vte/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/gnome-3/3.12/core/vte/default.nix b/pkgs/desktops/gnome-3/3.12/core/vte/default.nix index 41597e47fa5..011424820e8 100644 --- a/pkgs/desktops/gnome-3/3.12/core/vte/default.nix +++ b/pkgs/desktops/gnome-3/3.12/core/vte/default.nix @@ -3,14 +3,14 @@ stdenv.mkDerivation rec { versionMajor = "0.36"; - versionMinor = "2"; + versionMinor = "3"; moduleName = "vte"; name = "${moduleName}-${versionMajor}.${versionMinor}"; src = fetchurl { url = "mirror://gnome/sources/${moduleName}/${versionMajor}/${name}.tar.xz"; - sha256 = "f45eed3aed823068c7563345ea947be0e6ddb3dacd74646e6d7d26a921e04345"; + sha256 = "54e5b07be3c0f7b158302f54ee79d4de1cb002f4259b6642b79b1e0e314a959c"; }; buildInputs = [ gobjectIntrospection intltool pkgconfig gnome3.glib gnome3.gtk3 ncurses ]; -- GitLab From 8a4a0a5aa077298bc87cc3547789339fcaa139c2 Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Tue, 2 Sep 2014 12:58:06 +0200 Subject: [PATCH 843/843] json-glib: update from 1.0.0 to 1.0.2 --- pkgs/development/libraries/json-glib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/json-glib/default.nix b/pkgs/development/libraries/json-glib/default.nix index 7a45ca0f227..a50163c601d 100644 --- a/pkgs/development/libraries/json-glib/default.nix +++ b/pkgs/development/libraries/json-glib/default.nix @@ -7,9 +7,9 @@ stdenv.mkDerivation rec { project = "json-glib"; major = "1"; minor = "0"; - patchlevel = "0"; + patchlevel = "2"; extension = "xz"; - sha256 = "dbf558d2da989ab84a27e4e13daa51ceaa97eb959c2c2f80976c9322a8f4cdde"; + sha256 = "887bd192da8f5edc53b490ec51bf3ffebd958a671f5963e4f3af32c22e35660a"; }; configureflags= "--with-introspection" ; -- GitLab