From 6bb278659f4670107e0445d7ed258e88fb1c4801 Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Thu, 23 Oct 2014 13:23:40 +0200 Subject: [PATCH 001/383] kde installer: enable networkmanager. Closes #3433 --- nixos/modules/installer/cd-dvd/installation-cd-graphical.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/nixos/modules/installer/cd-dvd/installation-cd-graphical.nix b/nixos/modules/installer/cd-dvd/installation-cd-graphical.nix index b1e1d16c610..189cca9e23b 100644 --- a/nixos/modules/installer/cd-dvd/installation-cd-graphical.nix +++ b/nixos/modules/installer/cd-dvd/installation-cd-graphical.nix @@ -14,6 +14,10 @@ with lib; # Include gparted for partitioning disks environment.systemPackages = [ pkgs.gparted ]; + # Provide networkmanager for easy wireless configuration. + networking.networkmanager.enable = true; + networking.wireless.enable = mkForce false; + # KDE complains if power management is disabled (to be precise, if # there is no power management backend such as upower). powerManagement.enable = true; From 7dbf4d73c7f21714ca41af268e21019eaf06ccfd Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Sun, 2 Nov 2014 23:41:01 +0100 Subject: [PATCH 002/383] docs: hint to stop NetworkManager during installation to manually configure the network --- nixos/doc/manual/installation/installing.xml | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/nixos/doc/manual/installation/installing.xml b/nixos/doc/manual/installation/installing.xml index b140c56fbee..dd1acba2168 100644 --- a/nixos/doc/manual/installation/installing.xml +++ b/nixos/doc/manual/installation/installing.xml @@ -11,14 +11,9 @@ Boot from the CD. The CD contains a basic NixOS installation. (It - also contains Memtest86+, useful if you want to test new hardware.) + 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. + hardware. The NixOS manual is available on virtual console 8 (press Alt+F8 to access). @@ -29,6 +24,16 @@ If you downloaded the graphical ISO image, you can run start display-manager to start KDE. + The boot process should have 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. + To manually configure the network on the graphical installer, + first disable NetworkManager with + stop NetworkManager. + The NixOS installer doesn’t do any partitioning or formatting yet, so you need to that yourself. Use the following commands: From 2b243bfbad88be9c079a139ceda83a87ea7abc7b Mon Sep 17 00:00:00 2001 From: Ronny Esterluss Date: Fri, 14 Nov 2014 16:07:17 +0100 Subject: [PATCH 003/383] enable different useraccount name for gitolite user --- nixos/modules/services/misc/gitolite.nix | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/misc/gitolite.nix b/nixos/modules/services/misc/gitolite.nix index 462b68aa0a1..66e19d13d72 100644 --- a/nixos/modules/services/misc/gitolite.nix +++ b/nixos/modules/services/misc/gitolite.nix @@ -46,11 +46,19 @@ in A list of custom git hooks that get copied to ~/.gitolite/hooks/common. ''; }; + + user = mkOption { + type = types.str; + default = "gitolite"; + description = '' + Gitolite user account. This is the username of the gitolite endpoint. + ''; + }; }; }; config = mkIf cfg.enable { - users.extraUsers.gitolite = { + users.extraUsers.${cfg.user} = { description = "Gitolite user"; home = cfg.dataDir; createHome = true; @@ -62,7 +70,7 @@ in description = "Gitolite initialization"; wantedBy = [ "multi-user.target" ]; - serviceConfig.User = "gitolite"; + serviceConfig.User = "${cfg.user}"; serviceConfig.Type = "oneshot"; serviceConfig.RemainAfterExit = true; From 88d731925d62b162fc7b7b1bc8c75a519a9ac718 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Sun, 16 Nov 2014 01:07:54 +0300 Subject: [PATCH 004/383] sane: fix multifunctional devices rights conflict with cups --- pkgs/applications/graphics/sane/backends.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/sane/backends.nix b/pkgs/applications/graphics/sane/backends.nix index 28d2f1e200b..74321549318 100644 --- a/pkgs/applications/graphics/sane/backends.nix +++ b/pkgs/applications/graphics/sane/backends.nix @@ -33,8 +33,8 @@ stdenv.mkDerivation rec { postInstall = '' if test "$udevSupport" = "1"; then mkdir -p $out/etc/udev/rules.d/ - ./tools/sane-desc -m udev > $out/etc/udev/rules.d/60-libsane.rules || \ - cp tools/udev/libsane.rules $out/etc/udev/rules.d/60-libsane.rules + ./tools/sane-desc -m udev > $out/etc/udev/rules.d/49-libsane.rules || \ + cp tools/udev/libsane.rules $out/etc/udev/rules.d/49-libsane.rules fi ''; From 7b8237f6fc82582da193496a133fef40211b6d1d Mon Sep 17 00:00:00 2001 From: David Virgilio Date: Sun, 16 Nov 2014 00:57:50 -0600 Subject: [PATCH 005/383] new package: data-flags --- .../libraries/haskell/data-flags/default.nix | 14 ++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 16 insertions(+) create mode 100644 pkgs/development/libraries/haskell/data-flags/default.nix diff --git a/pkgs/development/libraries/haskell/data-flags/default.nix b/pkgs/development/libraries/haskell/data-flags/default.nix new file mode 100644 index 00000000000..ed2c5b682ce --- /dev/null +++ b/pkgs/development/libraries/haskell/data-flags/default.nix @@ -0,0 +1,14 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal }: + +cabal.mkDerivation (self: { + pname = "data-flags"; + version = "0.0.3.1"; + sha256 = "1s0djw1qarjn1fkyf21fd6pacfpfy4cvyw3wbd63ccaf9g0s1gs5"; + meta = { + description = "A package for working with bit masks and flags in general"; + 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 78b33244b1f..052ce703c3d 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -578,6 +578,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in dataFix = callPackage ../development/libraries/haskell/data-fix {}; + dataFlags = callPackage ../development/libraries/haskell/data-flags {}; + dataHash = callPackage ../development/libraries/haskell/data-hash {}; dataInttrie = callPackage ../development/libraries/haskell/data-inttrie {}; From 55bb7dd1f2abf4df95cb9f8348bd87b8e91d188c Mon Sep 17 00:00:00 2001 From: David Virgilio Date: Sun, 16 Nov 2014 02:08:39 -0600 Subject: [PATCH 006/383] new package: hayland --- .../libraries/haskell/hayland/default.nix | 25 +++++++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/development/libraries/haskell/hayland/default.nix diff --git a/pkgs/development/libraries/haskell/hayland/default.nix b/pkgs/development/libraries/haskell/hayland/default.nix new file mode 100644 index 00000000000..6704aa5ff02 --- /dev/null +++ b/pkgs/development/libraries/haskell/hayland/default.nix @@ -0,0 +1,25 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, c2hs, dataFlags, time, wayland, xml, + mesa +}: + +cabal.mkDerivation (self: { + pname = "hayland"; + version = "0.1.0.1"; + sha256 = "0dpisbqfsay8lwpfihw5fmpzi2ajc8qshsawbr4r6x8indy4kdy0"; + isLibrary = true; + isExecutable = true; + buildDepends = [ c2hs dataFlags time xml ]; + testDepends = [ xml ]; + pkgconfigDepends = [ + wayland + mesa + ]; + doCheck = false; + meta = { + description = "Haskell bindings for the C Wayland library"; + 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 052ce703c3d..667237f1f9a 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1087,6 +1087,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in HaTeX = callPackage ../development/libraries/haskell/HaTeX {}; + hayland = callPackage ../development/libraries/haskell/hayland {}; + hcltest = callPackage ../development/libraries/haskell/hcltest {}; hedis = callPackage ../development/libraries/haskell/hedis {}; From b205cdc8d670833bfaa66d3b5803ae299e8add62 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Sun, 16 Nov 2014 22:41:38 +0100 Subject: [PATCH 007/383] hello: Update to 2.10 --- pkgs/applications/misc/hello/ex-2/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/misc/hello/ex-2/default.nix b/pkgs/applications/misc/hello/ex-2/default.nix index 71c9777ff9b..161be5c6f1b 100644 --- a/pkgs/applications/misc/hello/ex-2/default.nix +++ b/pkgs/applications/misc/hello/ex-2/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "hello-2.9"; + name = "hello-2.10"; src = fetchurl { url = "mirror://gnu/hello/${name}.tar.gz"; - sha256 = "19qy37gkasc4csb1d3bdiz9snn8mir2p3aj0jgzmfv0r2hi7mfzc"; + sha256 = "0ssi1wpaf7plaswqqjwigppsg5fyh99vdlb9kzl7c9lng89ndq1i"; }; doCheck = true; @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { ''; homepage = http://www.gnu.org/software/hello/manual/; license = stdenv.lib.licenses.gpl3Plus; - maintainers = [ stdenv.lib.maintainers.ludo ]; + maintainers = [ stdenv.lib.maintainers.ludo stdenv.lib.maintainers.eelco ]; platforms = stdenv.lib.platforms.all; }; } From d6e8ab78dbc215e25ed0035472a1af5e1562bc16 Mon Sep 17 00:00:00 2001 From: Abhinav Gupta Date: Sun, 16 Nov 2014 15:32:29 -0800 Subject: [PATCH 008/383] haskell-digest-pure: Add version 0.0.3 --- .../libraries/haskell/digest-pure/default.nix | 16 ++++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 18 insertions(+) create mode 100644 pkgs/development/libraries/haskell/digest-pure/default.nix diff --git a/pkgs/development/libraries/haskell/digest-pure/default.nix b/pkgs/development/libraries/haskell/digest-pure/default.nix new file mode 100644 index 00000000000..a36483bf2f7 --- /dev/null +++ b/pkgs/development/libraries/haskell/digest-pure/default.nix @@ -0,0 +1,16 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, digest, QuickCheck }: + +cabal.mkDerivation (self: { + pname = "digest-pure"; + version = "0.0.3"; + sha256 = "0rb5jkzn1d4z90hd47qh98mf4n90wvj0cqf3qfpj7ndvw52yy95w"; + testDepends = [ digest QuickCheck ]; + meta = { + homepage = "http://github.com/danieldk/digest-pure"; + description = "Pure hash functions for bytestrings"; + license = "unknown"; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 3d3d2408eef..cb9cdb44fba 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -655,6 +655,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in inherit (pkgs) zlib; }; + digestPure = callPackage ../development/libraries/haskell/digest-pure {}; + digestiveFunctors = callPackage ../development/libraries/haskell/digestive-functors {}; digestiveFunctorsAeson = callPackage ../development/libraries/haskell/digestive-functors-aeson {}; From 86165ca2eec99b555615246372a7a07b2b98258f Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 12 Nov 2014 15:59:14 +0100 Subject: [PATCH 009/383] Add a job for generating options.json Useful for the nixos.org options search. --- nixos/release.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/release.nix b/nixos/release.nix index 5a89b38acc7..472961c27d0 100644 --- a/nixos/release.nix +++ b/nixos/release.nix @@ -130,6 +130,7 @@ in rec { manual = buildFromConfig ({ pkgs, ... }: { }) (config: config.system.build.manual.manual); manualPDF = (buildFromConfig ({ pkgs, ... }: { }) (config: config.system.build.manual.manualPDF)).x86_64-linux; manpages = buildFromConfig ({ pkgs, ... }: { }) (config: config.system.build.manual.manpages); + options = (buildFromConfig ({ pkgs, ... }: { }) (config: config.system.build.manual.options)).x86_64-linux; # Build the initial ramdisk so Hydra can keep track of its size over time. From b2557476f75f408eac2a1c9d02ad07ea94c7d59e Mon Sep 17 00:00:00 2001 From: aszlig Date: Mon, 17 Nov 2014 01:06:02 +0100 Subject: [PATCH 010/383] quazip: Use qt instead of qt5 for refering to Qt. Qt 5 is passed via all-packages.nix, so it doesn't look too odd if you want to build against qt4 instead. Before you'd have to use something like: quazip.override { qt5 = qt4; } Now, it is: quazip.override { qt = qt4; } Signed-off-by: aszlig --- pkgs/development/libraries/quazip/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/quazip/default.nix b/pkgs/development/libraries/quazip/default.nix index 9eb068bebb0..7b1e70e0eed 100644 --- a/pkgs/development/libraries/quazip/default.nix +++ b/pkgs/development/libraries/quazip/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, zip, zlib, qt5 }: +{ fetchurl, stdenv, zip, zlib, qt }: stdenv.mkDerivation rec { name = "quazip-0.7"; @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { installFlags = "INSTALL_ROOT=$(out)"; - buildInputs = [ zlib qt5 ]; + buildInputs = [ zlib qt ]; meta = { description = "Provides access to ZIP archives from Qt programs"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 22be1d18368..1c9fa640e50 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6591,7 +6591,9 @@ let qoauth = callPackage ../development/libraries/qoauth { }; - quazip = callPackage ../development/libraries/quazip { }; + quazip = callPackage ../development/libraries/quazip { + qt = qt5; + }; qt3 = callPackage ../development/libraries/qt-3 { openglSupport = mesaSupported; From aafc04ef351aa305e3d4ecc73779f2d8fce58385 Mon Sep 17 00:00:00 2001 From: aszlig Date: Mon, 17 Nov 2014 01:16:08 +0100 Subject: [PATCH 011/383] libechonest: Add new package, version 2.3.0. Required as a dependency of the Tomahawk music player. Tests are disabled because they require networking support. Signed-off-by: aszlig --- .../libraries/libechonest/default.nix | 20 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 22 insertions(+) create mode 100644 pkgs/development/libraries/libechonest/default.nix diff --git a/pkgs/development/libraries/libechonest/default.nix b/pkgs/development/libraries/libechonest/default.nix new file mode 100644 index 00000000000..42a3c5f243b --- /dev/null +++ b/pkgs/development/libraries/libechonest/default.nix @@ -0,0 +1,20 @@ +{ stdenv, fetchurl, cmake, qt4, qjson, doxygen, boost }: + +stdenv.mkDerivation rec { + name = "libechonest-${version}"; + version = "2.3.0"; + + src = fetchurl { + url = "http://files.lfranchi.com/${name}.tar.bz2"; + sha1 = "cf1b279c96f15c87c36fdeb23b569a60cdfb01db"; + }; + + buildInputs = [ cmake qt4 qjson doxygen boost ]; + enableParallelBuilding = true; + + meta = { + description = "A C++/Qt wrapper around the Echo Nest API"; + homepage = "http://projects.kde.org/projects/playground/libs/libechonest"; + license = stdenv.lib.licenses.gpl2Plus; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1c9fa640e50..9479a0b76b7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5754,6 +5754,8 @@ let libe-book = callPackage ../development/libraries/libe-book {}; + libechonest = callPackage ../development/libraries/libechonest { }; + libev = builderDefsPackage ../development/libraries/libev { }; libevent14 = callPackage ../development/libraries/libevent/1.4.nix { }; From 281a95b454d4c2f569b819cf9fc08cebe90ba834 Mon Sep 17 00:00:00 2001 From: aszlig Date: Mon, 17 Nov 2014 01:21:09 +0100 Subject: [PATCH 012/383] qtkeychain: Add new package, version 0.4.0. Required as a dependency of the Tomahawk music player. Signed-off-by: aszlig --- .../libraries/qtkeychain/default.nix | 23 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 25 insertions(+) create mode 100644 pkgs/development/libraries/qtkeychain/default.nix diff --git a/pkgs/development/libraries/qtkeychain/default.nix b/pkgs/development/libraries/qtkeychain/default.nix new file mode 100644 index 00000000000..7d33e95326a --- /dev/null +++ b/pkgs/development/libraries/qtkeychain/default.nix @@ -0,0 +1,23 @@ +{ stdenv, fetchFromGitHub, cmake, qt4 }: + +stdenv.mkDerivation rec { + name = "qtkeychain-${version}"; + version = "0.4.0"; + + src = fetchFromGitHub { + owner = "frankosterfeld"; + repo = "qtkeychain"; + rev = "v${version}"; + sha256 = "10msaylisbwmgpwd59vr4dfgml75kji8mlfwnwq8yp29jikj5amq"; + }; + + cmakeFlags = [ "-DQT_TRANSLATIONS_DIR=$out/share/qt/translations" ]; + + buildInputs = [ cmake qt4 ]; + + meta = { + description = "Platform-independent Qt API for storing passwords securely"; + homepage = "https://github.com/frankosterfeld/qtkeychain"; + license = stdenv.lib.licenses.BSD3; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9479a0b76b7..90bc51933e0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6667,6 +6667,8 @@ let qtLib = qt48.override { developerBuild = true; }; }; + qtkeychain = callPackage ../development/libraries/qtkeychain { }; + qtscriptgenerator = callPackage ../development/libraries/qtscriptgenerator { }; quesoglc = callPackage ../development/libraries/quesoglc { }; From 0a271c00bebd1c004d61a1aabc3daa1b8bbbd777 Mon Sep 17 00:00:00 2001 From: aszlig Date: Mon, 17 Nov 2014 01:22:27 +0100 Subject: [PATCH 013/383] lucenepp: Add new package, version 3.0.6. Required as a dependency of the Tomahawk music player. The latest upstream release needs to be patched quite a bit in order to build and to correctly install the header files. Other distributions seem to largely use the latest Git master version, because all those build problems have been fixed there already. In order to ensure we have version 3.0.6, we just cherry-pick the relevant patches, so as soon as the next upstream version is released we just need to drop the patches/postPatch attributes. The postPatch is needed in order to get rid of the subversion dependency, which the upstream build process tries to use for fetching gtest. We don't have networking support inside the Nix build process, so let's pass that dependency directly. Signed-off-by: aszlig --- .../libraries/lucene++/default.nix | 46 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 48 insertions(+) create mode 100644 pkgs/development/libraries/lucene++/default.nix diff --git a/pkgs/development/libraries/lucene++/default.nix b/pkgs/development/libraries/lucene++/default.nix new file mode 100644 index 00000000000..74c7b5e7261 --- /dev/null +++ b/pkgs/development/libraries/lucene++/default.nix @@ -0,0 +1,46 @@ +{ stdenv, fetchurl, fetchpatch, cmake, boost, gtest }: + +stdenv.mkDerivation rec { + name = "lucene++-${version}"; + version = "3.0.6"; + + src = fetchurl { + url = "https://github.com/luceneplusplus/LucenePlusPlus/" + + "archive/rel_${version}.tar.gz"; + sha256 = "068msvh05gsbfj1wwdqj698kxxfjdqy8zb6pqvail3ayjfj94w1y"; + }; + + patches = let + baseurl = "https://github.com/luceneplusplus/LucenePlusPlus"; + in [ + (fetchpatch { + url = "${baseurl}/pull/62.diff"; + sha256 = "0v314877mjb0hljg4mcqi317m1p1v27rgsgf5wdr9swix43vmhgw"; + }) + (fetchpatch { + url = "${baseurl}/commit/994f03cf736229044a168835ae7387696041658f.diff"; + sha256 = "0fcm5b87nxw062wjd7b4qrfcwsyblmcw19s64004pklj9grk30zz"; + }) + ]; + + postPatch = '' + sed -i -e '/Subversion *REQUIRED/d' \ + -e '/include.*CMakeExternal/d' \ + CMakeLists.txt + # not using -f because we want it to fail for the next release + rm CMakeExternal.txt + ''; + + cmakeFlags = [ "-DGTEST_INCLUDE_DIR=${gtest}/include" ]; + buildInputs = [ cmake boost gtest ]; + + enableParallelBuilding = true; + doCheck = true; + checkTarget = "test"; + + meta = { + description = "C++ port of the popular Java Lucene search engine"; + homepage = "https://github.com/luceneplusplus/LucenePlusPlus"; + license = with stdenv.lib.licenses; [ asl20 lgpl3Plus ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 90bc51933e0..18e7455eb10 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7198,6 +7198,8 @@ let lucene = callPackage ../development/libraries/java/lucene { }; + lucenepp = callPackage ../development/libraries/lucene++ { }; + mockobjects = callPackage ../development/libraries/java/mockobjects { }; saxon = callPackage ../development/libraries/java/saxon { }; From 2856b0e66cb0c253fb5e880dd7ddc290fca9aa21 Mon Sep 17 00:00:00 2001 From: aszlig Date: Mon, 17 Nov 2014 01:35:41 +0100 Subject: [PATCH 014/383] websocketpp: Add new package, version 0.4.0. Required as a dependency of the Tomahawk music player. Signed-off-by: aszlig --- .../libraries/websocket++/default.nix | 21 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 23 insertions(+) create mode 100644 pkgs/development/libraries/websocket++/default.nix diff --git a/pkgs/development/libraries/websocket++/default.nix b/pkgs/development/libraries/websocket++/default.nix new file mode 100644 index 00000000000..0db201fefcd --- /dev/null +++ b/pkgs/development/libraries/websocket++/default.nix @@ -0,0 +1,21 @@ +{ stdenv, fetchFromGitHub, cmake }: + +stdenv.mkDerivation rec { + name = "websocket++-${version}"; + version = "0.4.0"; + + src = fetchFromGitHub { + owner = "zaphoyd"; + repo = "websocketpp"; + rev = version; + sha256 = "1n6j0dh3qpis0f7crd49a2nhxd5459h0blch408z3kwlasx2g0i5"; + }; + + buildInputs = [ cmake ]; + + meta = { + homepage = "http://www.zaphoyd.com/websocketpp/"; + description = "C++/Boost Asio based websocket client/server library"; + license = stdenv.lib.licenses.BSD3; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 18e7455eb10..8a9e59ec099 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7000,6 +7000,8 @@ let enableIntrospection = false; }; + websocketpp = callPackage ../development/libraries/websocket++ { }; + wildmidi = callPackage ../development/libraries/wildmidi { }; wvstreams = callPackage ../development/libraries/wvstreams { }; From a28ba461e7bbfd3b483fbbb86eea6b640a22b4e4 Mon Sep 17 00:00:00 2001 From: aszlig Date: Mon, 17 Nov 2014 01:37:13 +0100 Subject: [PATCH 015/383] libjreen: Add new package, version 1.2.0. Required as an optional dependency of the Tomahawk music player. Signed-off-by: aszlig --- .../libraries/libjreen/default.nix | 20 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 22 insertions(+) create mode 100644 pkgs/development/libraries/libjreen/default.nix diff --git a/pkgs/development/libraries/libjreen/default.nix b/pkgs/development/libraries/libjreen/default.nix new file mode 100644 index 00000000000..04e37fd14f1 --- /dev/null +++ b/pkgs/development/libraries/libjreen/default.nix @@ -0,0 +1,20 @@ +{ stdenv, fetchurl, cmake, qt4, pkgconfig, gsasl }: + +stdenv.mkDerivation rec { + name = "libjreen-${version}"; + version = "1.2.0"; + + src = fetchurl { + url = "https://qutim.org/dwnl/73/${name}.tar.bz2"; + sha256 = "14nwwk40xx8w6x7yaysgcr0lgzhs7l064f7ikp32s5y9a8mmp582"; + }; + + buildInputs = [ cmake qt4 pkgconfig gsasl ]; + enableParallelBuilding = true; + + meta = { + description = "C++ Jabber library using Qt framework"; + homepage = "https://qutim.org/jreen/"; + license = stdenv.lib.licenses.gpl2Plus; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8a9e59ec099..5694965ba12 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5925,6 +5925,8 @@ let libtool = libtool_1_5; }; + libjreen = callPackage ../development/libraries/libjreen { }; + libjson_rpc_cpp = callPackage ../development/libraries/libjson-rpc-cpp { }; libkate = callPackage ../development/libraries/libkate { }; From a9a10ac2ed98cfbff7e8c1357b31337465f8e6bb Mon Sep 17 00:00:00 2001 From: tv Date: Mon, 17 Nov 2014 04:14:48 +0100 Subject: [PATCH 016/383] urlwatch: update to version 1.17 --- pkgs/tools/networking/urlwatch/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/urlwatch/default.nix b/pkgs/tools/networking/urlwatch/default.nix index 1be71942e70..4ad9c7cebad 100644 --- a/pkgs/tools/networking/urlwatch/default.nix +++ b/pkgs/tools/networking/urlwatch/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, python3Packages }: python3Packages.buildPythonPackage rec { - name = "urlwatch-1.16"; + name = "urlwatch-1.17"; src = fetchurl { url = "http://thp.io/2008/urlwatch/${name}.tar.gz"; - sha256 = "0yf1m909awfm06z7xwn20qxbbgslb1vjwwb6rygp6bn7sq022f1f"; + sha256 = "1xl8gi01bfbrg2mchns9cgagpxjjsig1x4kis3isqgfg4k0h8vq0"; }; patchPhase = '' From 8b9b0d95a08706aa0757150d5fb310d545ef9176 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Mon, 17 Nov 2014 00:59:31 -0500 Subject: [PATCH 017/383] nixUnstable: bump --- 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 4fea4972f80..d48a18360f3 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.8pre3890_8cfe939"; + name = "nix-1.8pre3893_2719627"; src = fetchurl { - url = "http://hydra.nixos.org/build/16917221/download/4/${name}.tar.xz"; - sha256 = "70c15f84d302c346af2c0a98ede1822d71da88f4f0aeae7ff3df25ca435938aa"; + url = http://hydra.nixos.org/build/16998611/download/3/nix-1.8pre3893_2719627.tar.bz2; + sha256 = "8f4ace015d179c546eb0f5101d200b2687cbde024f2d21e821b9faeb490df7d7"; }; nativeBuildInputs = [ perl pkgconfig ]; From 4dd7bf116bd3832df0b90b65653b0cba6633b529 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Mon, 17 Nov 2014 09:44:26 +0300 Subject: [PATCH 018/383] Adding eudev --- pkgs/os-specific/linux/eudev/default.nix | 31 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 1 + 2 files changed, 32 insertions(+) create mode 100644 pkgs/os-specific/linux/eudev/default.nix diff --git a/pkgs/os-specific/linux/eudev/default.nix b/pkgs/os-specific/linux/eudev/default.nix new file mode 100644 index 00000000000..d9ffbfa622e --- /dev/null +++ b/pkgs/os-specific/linux/eudev/default.nix @@ -0,0 +1,31 @@ +{stdenv, fetchurl, pkgconfig, glib, gperf}: +let + s = # Generated upstream information + rec { + baseName="eudev"; + version="2.1.1"; + name="${baseName}-${version}"; + url="http://dev.gentoo.org/~blueness/eudev/eudev-${version}.tar.gz"; + sha256="0shf5vqiz9fdxl95aa1a8vh0xjxwim3psc39wr2xr8lnahf11vva"; + }; + buildInputs = [ + glib pkgconfig gperf + ]; +in +stdenv.mkDerivation { + inherit (s) name version; + inherit buildInputs; + src = fetchurl { + inherit (s) url sha256; + }; + meta = { + inherit (s) version; + description = ''An udev fork by Gentoo''; + license = stdenv.lib.licenses.gpl2Plus ; + maintainers = [stdenv.lib.maintainers.raskin]; + platforms = stdenv.lib.platforms.linux; + homepage = ''http://www.gentoo.org/proj/en/eudev/''; + downloadPage = ''http://dev.gentoo.org/~blueness/eudev/''; + updateWalker = true; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0d9e13b7ead..07e2ef90126 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8579,6 +8579,7 @@ let udev145 = callPackage ../os-specific/linux/udev/145.nix { }; udev = pkgs.systemd; + eudev = callPackage ../os-specific/linux/eudev {}; udisks1 = callPackage ../os-specific/linux/udisks/1-default.nix { }; udisks2 = callPackage ../os-specific/linux/udisks/2-default.nix { }; From 8227297567738bc351894aca59af207f0c6730fd Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Mon, 17 Nov 2014 06:53:45 +0000 Subject: [PATCH 019/383] hol_light: update from 199 to 205 --- .../science/logic/hol_light/Makefile.patch | 13 ------------- .../science/logic/hol_light/default.nix | 6 ++---- 2 files changed, 2 insertions(+), 17 deletions(-) delete mode 100644 pkgs/applications/science/logic/hol_light/Makefile.patch diff --git a/pkgs/applications/science/logic/hol_light/Makefile.patch b/pkgs/applications/science/logic/hol_light/Makefile.patch deleted file mode 100644 index ae521004f33..00000000000 --- a/pkgs/applications/science/logic/hol_light/Makefile.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: Makefile -=================================================================== ---- /Makefile (révision 199) -+++ /Makefile (copie de travail) -@@ -59,7 +59,7 @@ - then cp pa_j_3.1x_6.02.1.ml pa_j.ml; \ - else if test ${CAMLP5_VERSION} = "6.02.2" -o ${CAMLP5_VERSION} = "6.02.3" -o ${CAMLP5_VERSION} = "6.03" -o ${CAMLP5_VERSION} = "6.04" -o ${CAMLP5_VERSION} = "6.05" -o ${CAMLP5_VERSION} = "6.06" ; \ - then cp pa_j_3.1x_6.02.2.ml pa_j.ml; \ -- else if test ${CAMLP5_VERSION} = "6.06" -o ${CAMLP5_VERSION} = "6.07" -o ${CAMLP5_VERSION} = "6.08" -o ${CAMLP5_VERSION} = "6.09" -o ${CAMLP5_VERSION} = "6.10" -o ${CAMLP5_VERSION} = "6.11" ; \ -+ else if test ${CAMLP5_VERSION} = "6.06" -o ${CAMLP5_VERSION} = "6.07" -o ${CAMLP5_VERSION} = "6.08" -o ${CAMLP5_VERSION} = "6.09" -o ${CAMLP5_VERSION} = "6.10" -o ${CAMLP5_VERSION} = "6.11" -o ${CAMLP5_VERSION} = "6.12" ; \ - then cp pa_j_3.1x_6.11.ml pa_j.ml; \ - else cp pa_j_3.1x_${CAMLP5_BINARY_VERSION}.xx.ml pa_j.ml; \ - fi \ diff --git a/pkgs/applications/science/logic/hol_light/default.nix b/pkgs/applications/science/logic/hol_light/default.nix index 9b8f25cab77..1e4fe08639f 100644 --- a/pkgs/applications/science/logic/hol_light/default.nix +++ b/pkgs/applications/science/logic/hol_light/default.nix @@ -10,18 +10,16 @@ in stdenv.mkDerivation rec { name = "hol_light-${version}"; - version = "199"; + version = "205"; src = fetchsvn { url = http://hol-light.googlecode.com/svn/trunk; rev = version; - sha256 = "0308nw91iww18wvl30g5ygf6lhw329jh1vqi9hsh30inhb3dx3jw"; + sha256 = "1qnk3fkfr6f74nd8wsi84s9kg872cw766sa15a2ldlhs9ma76chj"; }; buildInputs = [ ocaml findlib camlp5 ]; - patches = [ ./Makefile.patch ]; - installPhase = '' mkdir -p "$out/lib/hol_light" "$out/bin" cp -a . $out/lib/hol_light From eac8fcff1a168948b2930ed2ef7b8ca426197aaa Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Mon, 17 Nov 2014 00:12:18 -0800 Subject: [PATCH 020/383] kernel: 3.18-rc4 -> 3.18-rc5 --- pkgs/os-specific/linux/kernel/linux-testing.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix index 1fef29e5aec..9cb788bb1a9 100644 --- a/pkgs/os-specific/linux/kernel/linux-testing.nix +++ b/pkgs/os-specific/linux/kernel/linux-testing.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, ... } @ args: import ./generic.nix (args // rec { - version = "3.18-rc4"; - modDirVersion = "3.18.0-rc4"; + version = "3.18-rc5"; + modDirVersion = "3.18.0-rc5"; extraMeta.branch = "3.18"; src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/testing/linux-${version}.tar.xz"; - sha256 = "1ifdz4ss2ghaw8h89f5738fhgy8m7g92y763q8wrd9r4nipqdpnr"; + sha256 = "1dx354hsncx3r33y35c4f5baz75q5xs25yi5bgkszad1rlrg86sk"; }; features.iwlwifi = true; From 48776868f7a6a0aa9139584b3425c441a429c018 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Sun, 16 Nov 2014 09:40:54 +0100 Subject: [PATCH 021/383] nginxUnstable: disable the broken syslog patch --- 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 07e2ef90126..1c28384c506 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7568,7 +7568,7 @@ let }; nginxUnstable = callPackage ../servers/http/nginx/unstable.nix { fullWebDAV = true; - syslog = true; + syslog = false; # the patch is not found moreheaders = true; }; From cab722f816fd3ad6d2672a0c5e3754a9fb62358f Mon Sep 17 00:00:00 2001 From: "Antoine R. Dumont" Date: Sun, 16 Nov 2014 20:42:19 +0100 Subject: [PATCH 022/383] pidgin-with-plugins: fix plugin directories (close #5009) --- .../networking/instant-messengers/pidgin/default.nix | 3 ++- .../networking/instant-messengers/pidgin/wrapper.nix | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/pidgin/default.nix b/pkgs/applications/networking/instant-messengers/pidgin/default.nix index 32004496534..bcbc003b3d2 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin/default.nix @@ -12,7 +12,8 @@ stdenv.mkDerivation rec { name = "pidgin-${version}"; - version = "2.10.10"; + majorVersion = "2"; + version = "${majorVersion}.10.10"; src = fetchurl { url = "mirror://sourceforge/pidgin/${name}.tar.bz2"; diff --git a/pkgs/applications/networking/instant-messengers/pidgin/wrapper.nix b/pkgs/applications/networking/instant-messengers/pidgin/wrapper.nix index 0c498dd612e..7e637c767cf 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin/wrapper.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin/wrapper.nix @@ -17,7 +17,7 @@ drv = buildEnv { done fi wrapProgram $out/bin/pidgin \ - --suffix-each PURPLE_PLUGIN_PATH ':' "$out/lib/purple-${pidgin.version} $out/lib/pidgin" \ + --suffix-each PURPLE_PLUGIN_PATH ':' "$out/lib/purple-${pidgin.majorVersion} $out/lib/pidgin" \ ${toString extraArgs} ''; }; From 6e75afb5cf656f152a656d01b36498c74a315172 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Mon, 17 Nov 2014 09:27:17 +0100 Subject: [PATCH 023/383] pidgin: enableParallelBuilding --- .../networking/instant-messengers/pidgin/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/networking/instant-messengers/pidgin/default.nix b/pkgs/applications/networking/instant-messengers/pidgin/default.nix index bcbc003b3d2..a5f286d4705 100644 --- a/pkgs/applications/networking/instant-messengers/pidgin/default.nix +++ b/pkgs/applications/networking/instant-messengers/pidgin/default.nix @@ -52,6 +52,8 @@ stdenv.mkDerivation rec { ] ++ (lib.optionals (gnutls != null) ["--enable-gnutls=yes" "--enable-nss=no"]); + enableParallelBuilding = true; + meta = with stdenv.lib; { description = "Multi-protocol instant messaging client"; homepage = http://pidgin.im; From adeb4fb56b20dad055ffa87ad5cd28416fb5a40b Mon Sep 17 00:00:00 2001 From: John Wiegley Date: Mon, 17 Nov 2014 02:49:06 -0600 Subject: [PATCH 024/383] emacs24Macport: emacs-24.4-mac-5.0 -> emacs-24.4-mac-5.1 --- pkgs/applications/editors/emacs-24/macport-24.4.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/emacs-24/macport-24.4.nix b/pkgs/applications/editors/emacs-24/macport-24.4.nix index b357d19b674..0af0e479a07 100644 --- a/pkgs/applications/editors/emacs-24/macport-24.4.nix +++ b/pkgs/applications/editors/emacs-24/macport-24.4.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { emacsName = "emacs-24.4"; - name = "${emacsName}-mac-5.0"; + name = "${emacsName}-mac-5.1"; #builder = ./builder.sh; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { macportSrc = fetchurl { url = "ftp://ftp.math.s.chiba-u.ac.jp/emacs/${name}.tar.gz"; - sha256 = "14ipkwmzv0b02sclhgp2xj0cvhl3gk40sc2l21s87621kk640dzv"; + sha256 = "0qn200vv91qxf93x6y8fdi7l3bsni3clqzf8rcjdpbva1qzgcx27"; }; patches = [ ./darwin-new-sections.patch ]; From 5b0756cd21a6d7e00baacf8ba2141ee70f66a552 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Mon, 17 Nov 2014 10:14:42 +0100 Subject: [PATCH 025/383] db-*: only use the osx.patch for db5 where it applies This unbreaks builds of all other versions (4.* and 6.*). --- pkgs/development/libraries/db/db-5.3.nix | 1 + pkgs/development/libraries/db/generic.nix | 4 ---- pkgs/development/libraries/db/osx.patch | 4 ++-- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/db/db-5.3.nix b/pkgs/development/libraries/db/db-5.3.nix index af16f1ddf54..fe376ee3b4f 100644 --- a/pkgs/development/libraries/db/db-5.3.nix +++ b/pkgs/development/libraries/db/db-5.3.nix @@ -3,4 +3,5 @@ import ./generic.nix (args // rec { version = "5.3.28"; sha256 = "0a1n5hbl7027fbz5lm0vp0zzfp1hmxnz14wx3zl9563h83br5ag0"; + extraPatches = [ ./osx.patch ]; }) diff --git a/pkgs/development/libraries/db/generic.nix b/pkgs/development/libraries/db/generic.nix index 9d3f87ad5cb..6217bc46124 100644 --- a/pkgs/development/libraries/db/generic.nix +++ b/pkgs/development/libraries/db/generic.nix @@ -18,10 +18,6 @@ stdenv.mkDerivation rec { patches = extraPatches; - patchPhase = '' - patch src/dbinc/atomic.h < ${./osx.patch} - ''; - configureFlags = [ (if cxxSupport then "--enable-cxx" else "--disable-cxx") (if compat185 then "--enable-compat185" else "--disable-compat185") diff --git a/pkgs/development/libraries/db/osx.patch b/pkgs/development/libraries/db/osx.patch index 398aa1d3700..438fa7eedd7 100644 --- a/pkgs/development/libraries/db/osx.patch +++ b/pkgs/development/libraries/db/osx.patch @@ -1,5 +1,5 @@ ---- src/dbinc/atomic.h 2013-03-12 14:07:22.000000000 -0400 -+++ src/dbinc/atomic.h.change 2013-03-12 14:06:35.000000000 -0400 +--- a/src/dbinc/atomic.h 2013-03-12 14:07:22.000000000 -0400 ++++ b/src/dbinc/atomic.h.change 2013-03-12 14:06:35.000000000 -0400 @@ -144,7 +144,7 @@ #define atomic_inc(env, p) __atomic_inc(p) #define atomic_dec(env, p) __atomic_dec(p) From 92f67bccba90f239062e7a9d9ee0c65289827e55 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Bernardy Date: Mon, 17 Nov 2014 09:40:45 +0100 Subject: [PATCH 026/383] add parsek --- .../libraries/haskell/parsek/default.nix | 14 ++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 16 insertions(+) create mode 100644 pkgs/development/libraries/haskell/parsek/default.nix diff --git a/pkgs/development/libraries/haskell/parsek/default.nix b/pkgs/development/libraries/haskell/parsek/default.nix new file mode 100644 index 00000000000..ebde6d7ca40 --- /dev/null +++ b/pkgs/development/libraries/haskell/parsek/default.nix @@ -0,0 +1,14 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal }: + +cabal.mkDerivation (self: { + pname = "parsek"; + version = "1.0.1"; + sha256 = "197hjys71f9qgsw83w3wrmijimjzvb9cy4kywkqr95ack8a7pizn"; + meta = { + description = "Parallel Parsing Processes"; + license = "GPL"; + platforms = self.ghc.meta.platforms; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 9725f2a0bca..8b8d6daf2e5 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1832,6 +1832,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in parsec = callPackage ../development/libraries/haskell/parsec {}; + parsek = callPackage ../development/libraries/haskell/parsek {}; + parsers = callPackage ../development/libraries/haskell/parsers {}; parsimony = callPackage ../development/libraries/haskell/parsimony {}; From 75425ff879a9c8ca8d01b05bccd1ab7d52784fbb Mon Sep 17 00:00:00 2001 From: Chris Double Date: Tue, 18 Nov 2014 01:14:16 +1300 Subject: [PATCH 027/383] Update Tor to 0.2.5.10. Updates Tor to latest stable version. Add myself to the maintainer list. --- pkgs/tools/security/tor/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/tor/default.nix b/pkgs/tools/security/tor/default.nix index b7bde895439..8eddc992f9f 100644 --- a/pkgs/tools/security/tor/default.nix +++ b/pkgs/tools/security/tor/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, libevent, openssl, zlib }: stdenv.mkDerivation rec { - name = "tor-0.2.4.24"; + name = "tor-0.2.5.10"; src = fetchurl { url = "https://archive.torproject.org/tor-package-archive/${name}.tar.gz"; - sha256 = "1l8aczqz8injzcj3mabx4figl8ahkzb0vs9s3nir6kn0b1l5rccr"; + sha256 = "0fx8qnwh2f8ykfx0np4hyznjfi4xfy96z59pk96y3zyjvjjh5pdk"; }; buildInputs = [ libevent openssl zlib ]; @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { license="mBSD"; - maintainers = with stdenv.lib.maintainers; [ phreedom ludo ]; + maintainers = with stdenv.lib.maintainers; [ phreedom ludo doublec ]; platforms = stdenv.lib.platforms.gnu; # arbitrary choice }; } From bc392e40aa5fe48f10d773c3671084948f5f80b5 Mon Sep 17 00:00:00 2001 From: Oliver Charles Date: Mon, 17 Nov 2014 13:53:20 +0000 Subject: [PATCH 028/383] haskellPackages.snapCors: Update to 1.2.6 --- .../libraries/haskell/snap-cors/default.nix | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/pkgs/development/libraries/haskell/snap-cors/default.nix b/pkgs/development/libraries/haskell/snap-cors/default.nix index a81c6ec24ab..f9d043dff80 100644 --- a/pkgs/development/libraries/haskell/snap-cors/default.nix +++ b/pkgs/development/libraries/haskell/snap-cors/default.nix @@ -1,22 +1,21 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, attoparsec, caseInsensitive, hashable, network, snap, text -, transformers, unorderedContainers +{ cabal, attoparsec, caseInsensitive, hashable, network, networkUri +, snap, text, transformers, unorderedContainers }: cabal.mkDerivation (self: { pname = "snap-cors"; - version = "1.2.5.1"; - sha256 = "1fijby8iryhcjdb7n95hdbjff4rnqyfx5s9x01nbmd9lxrch12dr"; + version = "1.2.6"; + sha256 = "1ihqqpzymgc25shz4dvjfh8lzjczqdqg6ril39d5p7rkn4a8y2d8"; buildDepends = [ - attoparsec caseInsensitive hashable network snap text transformers - unorderedContainers + attoparsec caseInsensitive hashable network networkUri snap text + transformers unorderedContainers ]; meta = { homepage = "http://github.com/ocharles/snap-cors"; description = "Add CORS headers to Snap applications"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - broken = true; }; }) From 310acaf1a05b80cc42399eb30e66674c74661b82 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Mon, 17 Nov 2014 07:54:11 -0600 Subject: [PATCH 029/383] hoogle-local: expand wrapper's arguments correctly The wrapper was expanding all the words of all its arguments. Instead, we want to expand each argument as a word; there is a subtle difference! --- .../libraries/haskell/hoogle/hoogle-local-wrapper.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/haskell/hoogle/hoogle-local-wrapper.sh b/pkgs/development/libraries/haskell/hoogle/hoogle-local-wrapper.sh index c7b15b8f99d..970c0e6845e 100644 --- a/pkgs/development/libraries/haskell/hoogle/hoogle-local-wrapper.sh +++ b/pkgs/development/libraries/haskell/hoogle/hoogle-local-wrapper.sh @@ -3,4 +3,4 @@ COMMAND=$1 shift HOOGLE_DOC_PATH=@out@/share/hoogle/doc exec @hoogle@/bin/hoogle \ - $COMMAND -d @out@/share/hoogle $@ + $COMMAND -d @out@/share/hoogle "$@" From 97d5a55dd7dbea5929120a4c36410ee65c4577e1 Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Mon, 17 Nov 2014 14:55:45 +0100 Subject: [PATCH 030/383] libndp: add new package Library for Neighbor Discovery Protocol. Will be needed for the new networkmanager. http://libndp.org/ --- pkgs/development/libraries/libndp/default.nix | 19 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 21 insertions(+) create mode 100644 pkgs/development/libraries/libndp/default.nix diff --git a/pkgs/development/libraries/libndp/default.nix b/pkgs/development/libraries/libndp/default.nix new file mode 100644 index 00000000000..ae0db409a1a --- /dev/null +++ b/pkgs/development/libraries/libndp/default.nix @@ -0,0 +1,19 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "libndp-1.4"; + + src = fetchurl { + url = "http://libndp.org/files/${name}.tar.gz"; + sha256 = "0pym5xxq3avg348q61xggwy05i0r2m4sj3mlwlpxfjq2xi3y42rs"; + }; + + meta = with stdenv.lib; { + homepage = http://libndp.org/; + description = "Library for Neighbor Discovery Protocol"; + platforms = platforms.linux; + maintainers = [ maintainers.lethalman ]; + license = licenses.lgpl21; + }; + +} \ No newline at end of file diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1c28384c506..63febd93008 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5852,6 +5852,8 @@ let libnatspec = callPackage ../development/libraries/libnatspec { }; + libndp = callPackage ../development/libraries/libndp { }; + libnfc = callPackage ../development/libraries/libnfc { }; libnfsidmap = callPackage ../development/libraries/libnfsidmap { }; From 9631274f77ad76747a0a87dc4506a07621a75831 Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Mon, 17 Nov 2014 14:57:21 +0100 Subject: [PATCH 031/383] Add vala 0.26. Will be needed for gnome-terminal 3.14 --- pkgs/development/compilers/vala/0.26.nix | 31 ++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 33 insertions(+) create mode 100644 pkgs/development/compilers/vala/0.26.nix diff --git a/pkgs/development/compilers/vala/0.26.nix b/pkgs/development/compilers/vala/0.26.nix new file mode 100644 index 00000000000..48b5476fe1d --- /dev/null +++ b/pkgs/development/compilers/vala/0.26.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchurl, pkgconfig, flex, bison, libxslt +, glib, libiconvOrEmpty, libintlOrEmpty +}: + +let + major = "0.26"; + minor = "1"; + sha256 = "8407abb19ab3a58bbfc0d288abb47666ef81f76d0540258c03965e7545f59e6b"; +in +stdenv.mkDerivation rec { + name = "vala-${major}.${minor}"; + + meta = { + description = "Compiler for GObject type system"; + homepage = "http://live.gnome.org/Vala"; + license = stdenv.lib.licenses.lgpl21Plus; + platforms = stdenv.lib.platforms.unix; + maintainers = with stdenv.lib.maintainers; [ antono lethalman ]; + }; + + src = fetchurl { + url = "mirror://gnome/sources/vala/${major}/${name}.tar.xz"; + inherit sha256; + }; + + nativeBuildInputs = [ pkgconfig flex bison libxslt ]; + + buildInputs = [ glib ] + ++ libiconvOrEmpty + ++ libintlOrEmpty; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 63febd93008..13e068d3dfb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3830,6 +3830,8 @@ let vala = callPackage ../development/compilers/vala/default.nix { }; + vala_0_26 = callPackage ../development/compilers/vala/0.26.nix { }; + visualcpp = callPackage ../development/compilers/visual-c++ { }; vs90wrapper = callPackage ../development/compilers/vs90wrapper { }; From 5e14c86b80650575562a81d453fde7f080f82ca1 Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Mon, 17 Nov 2014 15:05:50 +0100 Subject: [PATCH 032/383] clutter: update 1.18 -> 1.20. Shouldn't break anything --- pkgs/desktops/gnome-3/3.12/default.nix | 2 +- pkgs/development/libraries/clutter/{1.18.nix => 1.20.nix} | 8 ++++---- pkgs/top-level/all-packages.nix | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) rename pkgs/development/libraries/clutter/{1.18.nix => 1.20.nix} (89%) diff --git a/pkgs/desktops/gnome-3/3.12/default.nix b/pkgs/desktops/gnome-3/3.12/default.nix index 85628ff13b2..dfb7a673d5b 100644 --- a/pkgs/desktops/gnome-3/3.12/default.nix +++ b/pkgs/desktops/gnome-3/3.12/default.nix @@ -3,7 +3,7 @@ rec { inherit (pkgs) glib gtk2 gtk3 gnome2; gnome3 = pkgs.gnome3_12 // { recurseForDerivations = false; }; - clutter = pkgs.clutter_1_18; + clutter = pkgs.clutter_1_20; clutter_gtk = pkgs.clutter_gtk.override { inherit clutter; }; clutter-gst = pkgs.clutter-gst.override { inherit clutter; }; upower = pkgs.upower_99; diff --git a/pkgs/development/libraries/clutter/1.18.nix b/pkgs/development/libraries/clutter/1.20.nix similarity index 89% rename from pkgs/development/libraries/clutter/1.18.nix rename to pkgs/development/libraries/clutter/1.20.nix index 7a9d114ce8e..7afe7568273 100644 --- a/pkgs/development/libraries/clutter/1.18.nix +++ b/pkgs/development/libraries/clutter/1.20.nix @@ -4,15 +4,15 @@ gobjectIntrospection }: let - ver_maj = "1.18"; - ver_min = "2"; + ver_maj = "1.20"; + ver_min = "0"; in stdenv.mkDerivation rec { name = "clutter-${ver_maj}.${ver_min}"; src = fetchurl { url = "mirror://gnome/sources/clutter/${ver_maj}/${name}.tar.xz"; - sha256 = "f9fe12e6148426063c90e67dfaeb56013bf1aea224ef502223d13eab6c1add63"; + sha256 = "cc940809e6e1469ce349c4bddb0cbcc2c13c087d4fc15cda9278d855ee2d1293"; }; nativeBuildInputs = [ pkgconfig ]; @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.lgpl2Plus; homepage = http://www.clutter-project.org/; - maintainers = with stdenv.lib.maintainers; [ urkud ]; + maintainers = with stdenv.lib.maintainers; [ urkud lethalman ]; platforms = stdenv.lib.platforms.mesaPlatforms; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 13e068d3dfb..56163e7d7f3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4926,7 +4926,7 @@ let clutter = callPackage ../development/libraries/clutter { }; - clutter_1_18 = callPackage ../development/libraries/clutter/1.18.nix { + clutter_1_20 = callPackage ../development/libraries/clutter/1.20.nix { cogl = cogl_1_18; }; From 24ad1612b4d15e263e4ed3a9b90f30c58884749f Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Mon, 17 Nov 2014 15:10:56 +0100 Subject: [PATCH 033/383] Revert "clutter: update 1.18 -> 1.20. Shouldn't break anything" This reverts commit 5e14c86b80650575562a81d453fde7f080f82ca1. Overlooked an experimental API that breaks mutter in GNOME 3.12. --- pkgs/desktops/gnome-3/3.12/default.nix | 2 +- pkgs/development/libraries/clutter/{1.20.nix => 1.18.nix} | 8 ++++---- pkgs/top-level/all-packages.nix | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) rename pkgs/development/libraries/clutter/{1.20.nix => 1.18.nix} (89%) diff --git a/pkgs/desktops/gnome-3/3.12/default.nix b/pkgs/desktops/gnome-3/3.12/default.nix index dfb7a673d5b..85628ff13b2 100644 --- a/pkgs/desktops/gnome-3/3.12/default.nix +++ b/pkgs/desktops/gnome-3/3.12/default.nix @@ -3,7 +3,7 @@ rec { inherit (pkgs) glib gtk2 gtk3 gnome2; gnome3 = pkgs.gnome3_12 // { recurseForDerivations = false; }; - clutter = pkgs.clutter_1_20; + clutter = pkgs.clutter_1_18; clutter_gtk = pkgs.clutter_gtk.override { inherit clutter; }; clutter-gst = pkgs.clutter-gst.override { inherit clutter; }; upower = pkgs.upower_99; diff --git a/pkgs/development/libraries/clutter/1.20.nix b/pkgs/development/libraries/clutter/1.18.nix similarity index 89% rename from pkgs/development/libraries/clutter/1.20.nix rename to pkgs/development/libraries/clutter/1.18.nix index 7afe7568273..7a9d114ce8e 100644 --- a/pkgs/development/libraries/clutter/1.20.nix +++ b/pkgs/development/libraries/clutter/1.18.nix @@ -4,15 +4,15 @@ gobjectIntrospection }: let - ver_maj = "1.20"; - ver_min = "0"; + ver_maj = "1.18"; + ver_min = "2"; in stdenv.mkDerivation rec { name = "clutter-${ver_maj}.${ver_min}"; src = fetchurl { url = "mirror://gnome/sources/clutter/${ver_maj}/${name}.tar.xz"; - sha256 = "cc940809e6e1469ce349c4bddb0cbcc2c13c087d4fc15cda9278d855ee2d1293"; + sha256 = "f9fe12e6148426063c90e67dfaeb56013bf1aea224ef502223d13eab6c1add63"; }; nativeBuildInputs = [ pkgconfig ]; @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.lgpl2Plus; homepage = http://www.clutter-project.org/; - maintainers = with stdenv.lib.maintainers; [ urkud lethalman ]; + maintainers = with stdenv.lib.maintainers; [ urkud ]; platforms = stdenv.lib.platforms.mesaPlatforms; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 56163e7d7f3..13e068d3dfb 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4926,7 +4926,7 @@ let clutter = callPackage ../development/libraries/clutter { }; - clutter_1_20 = callPackage ../development/libraries/clutter/1.20.nix { + clutter_1_18 = callPackage ../development/libraries/clutter/1.18.nix { cogl = cogl_1_18; }; From 0a34445d7443118d51b339e88e5184ed70a61b9b Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Mon, 17 Nov 2014 15:15:19 +0100 Subject: [PATCH 034/383] Document the fact that GNOME 3.12 must use clutter 1.18 --- pkgs/desktops/gnome-3/3.12/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/desktops/gnome-3/3.12/default.nix b/pkgs/desktops/gnome-3/3.12/default.nix index 85628ff13b2..a60e1a85bca 100644 --- a/pkgs/desktops/gnome-3/3.12/default.nix +++ b/pkgs/desktops/gnome-3/3.12/default.nix @@ -3,11 +3,14 @@ rec { inherit (pkgs) glib gtk2 gtk3 gnome2; gnome3 = pkgs.gnome3_12 // { recurseForDerivations = false; }; + + # DO NOT UPGRADE CLUTTER, IT BREAKS GNOME 3.12 clutter = pkgs.clutter_1_18; clutter_gtk = pkgs.clutter_gtk.override { inherit clutter; }; clutter-gst = pkgs.clutter-gst.override { inherit clutter; }; - upower = pkgs.upower_99; cogl = pkgs.cogl_1_18; + + upower = pkgs.upower_99; gtk = gtk3; # just to be sure libcanberra = pkgs.libcanberra_gtk3; # just to be sure inherit (pkgs.gnome2) ORBit2; From 8b79cc00bfbe9528b7bb752a4975849c3cdf982a Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 17 Nov 2014 13:41:18 +0100 Subject: [PATCH 035/383] Manual: Don't depend on the JSON options --- nixos/doc/manual/default.nix | 48 ++++++++++++++++-------------------- nixos/release.nix | 2 +- 2 files changed, 22 insertions(+), 28 deletions(-) diff --git a/nixos/doc/manual/default.nix b/nixos/doc/manual/default.nix index 68248081af6..ea1d8ffc7de 100644 --- a/nixos/doc/manual/default.nix +++ b/nixos/doc/manual/default.nix @@ -30,34 +30,13 @@ let else fn; - # Convert the list of options into an XML file and a JSON file. The builtin - # unsafeDiscardStringContext is used to prevent the realisation of the store - # paths which are used in options definitions. + # Convert the list of options into an XML file. The builtin + # unsafeDiscardStringContext is used to prevent the realisation of + # the store paths which are used in options definitions. optionsXML = builtins.toFile "options.xml" (builtins.unsafeDiscardStringContext (builtins.toXML optionsList')); - optionsJSON = builtins.toFile "options.json" (builtins.unsafeDiscardStringContext (builtins.toJSON optionsList')); - - # Tools-friendly version of the list of NixOS options. - options' = stdenv.mkDerivation { - name = "options"; - - buildCommand = '' - # Export list of options in different format. - dst=$out/share/doc/nixos - mkdir -p $dst - - cp ${optionsJSON} $dst/options.json - cp ${optionsXML} $dst/options.xml - - mkdir -p $out/nix-support - echo "file json $dst/options.json" >> $out/nix-support/hydra-build-products - echo "file xml $dst/options.xml" >> $out/nix-support/hydra-build-products - ''; # */ - - meta.description = "List of NixOS options in various formats."; - }; optionsDocBook = runCommand "options-db.xml" {} '' - optionsXML=${options'}/share/doc/nixos/options.xml + optionsXML=${optionsXML} if grep /nixpkgs/nixos/modules $optionsXML; then echo "The manual appears to depend on the location of Nixpkgs, which is bad" echo "since this prevents sharing via the NixOS channel. This is typically" @@ -83,8 +62,23 @@ let in rec { - # Tools-friendly version of the list of NixOS options. - options = options'; + # The NixOS options in JSON format. + optionsJSON = stdenv.mkDerivation { + name = "options-json"; + + buildCommand = '' + # Export list of options in different format. + dst=$out/share/doc/nixos + mkdir -p $dst + + cp ${builtins.toFile "options.json" (builtins.unsafeDiscardStringContext (builtins.toJSON optionsList'))} $dst/options.json + + mkdir -p $out/nix-support + echo "file json $dst/options.json" >> $out/nix-support/hydra-build-products + ''; # */ + + meta.description = "List of NixOS options in JSON format"; + }; # Generate the NixOS manual. manual = stdenv.mkDerivation { diff --git a/nixos/release.nix b/nixos/release.nix index 472961c27d0..ddb0b495a91 100644 --- a/nixos/release.nix +++ b/nixos/release.nix @@ -130,7 +130,7 @@ in rec { manual = buildFromConfig ({ pkgs, ... }: { }) (config: config.system.build.manual.manual); manualPDF = (buildFromConfig ({ pkgs, ... }: { }) (config: config.system.build.manual.manualPDF)).x86_64-linux; manpages = buildFromConfig ({ pkgs, ... }: { }) (config: config.system.build.manual.manpages); - options = (buildFromConfig ({ pkgs, ... }: { }) (config: config.system.build.manual.options)).x86_64-linux; + options = (buildFromConfig ({ pkgs, ... }: { }) (config: config.system.build.manual.optionsJSON)).x86_64-linux; # Build the initial ramdisk so Hydra can keep track of its size over time. From 44d14e2264a958de0d5828b4ae001387aaac7ac2 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 17 Nov 2014 13:44:52 +0100 Subject: [PATCH 036/383] options.json: Export as an object rather than a list This makes it easier to look up options by name. --- nixos/doc/manual/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/nixos/doc/manual/default.nix b/nixos/doc/manual/default.nix index ea1d8ffc7de..1a74307f100 100644 --- a/nixos/doc/manual/default.nix +++ b/nixos/doc/manual/default.nix @@ -71,7 +71,9 @@ in rec { dst=$out/share/doc/nixos mkdir -p $dst - cp ${builtins.toFile "options.json" (builtins.unsafeDiscardStringContext (builtins.toJSON optionsList'))} $dst/options.json + cp ${builtins.toFile "options.json" (builtins.unsafeDiscardStringContext (builtins.toJSON + (listToAttrs (map (o: { name = o.name; value = removeAttrs o ["name"]; }) optionsList')))) + } $dst/options.json mkdir -p $out/nix-support echo "file json $dst/options.json" >> $out/nix-support/hydra-build-products From b89c06722f1ed8149144aad0841fbc0160d6a064 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 17 Nov 2014 13:58:23 +0100 Subject: [PATCH 037/383] options.json: Filter out "visible" and "internal" attributes --- 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 1a74307f100..b0a755c6a6f 100644 --- a/nixos/doc/manual/default.nix +++ b/nixos/doc/manual/default.nix @@ -72,7 +72,7 @@ in rec { mkdir -p $dst cp ${builtins.toFile "options.json" (builtins.unsafeDiscardStringContext (builtins.toJSON - (listToAttrs (map (o: { name = o.name; value = removeAttrs o ["name"]; }) optionsList')))) + (listToAttrs (map (o: { name = o.name; value = removeAttrs o ["name" "visible" "internal"]; }) optionsList')))) } $dst/options.json mkdir -p $out/nix-support From 75eb9bccb8494348aa2fa95a76d750d36e412878 Mon Sep 17 00:00:00 2001 From: Oliver Charles Date: Mon, 17 Nov 2014 14:25:12 +0000 Subject: [PATCH 038/383] haskellPackages.digestiveFunctorsAeson: Update to 1.1.12.1 --- .../libraries/haskell/digestive-functors-aeson/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/haskell/digestive-functors-aeson/default.nix b/pkgs/development/libraries/haskell/digestive-functors-aeson/default.nix index 5b618b6f1f3..819d4690da5 100644 --- a/pkgs/development/libraries/haskell/digestive-functors-aeson/default.nix +++ b/pkgs/development/libraries/haskell/digestive-functors-aeson/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "digestive-functors-aeson"; - version = "1.1.11"; - sha256 = "0jf62ssyc317x070xkjdnfbb2g8mb19a83hig08j95vyqwjgk4vg"; + version = "1.1.12.1"; + sha256 = "1jwrlmavwjq3bf8ylazi91mwl47n5pdh3lipv4p7v0gq45dm3hg9"; buildDepends = [ aeson digestiveFunctors lens lensAeson safe text vector ]; @@ -20,6 +20,5 @@ cabal.mkDerivation (self: { license = self.stdenv.lib.licenses.gpl3; platforms = self.ghc.meta.platforms; maintainers = with self.stdenv.lib.maintainers; [ ocharles ]; - broken = true; }; }) From a7ea8bea2614d602cb2f30188534e100b9f36e65 Mon Sep 17 00:00:00 2001 From: Oliver Charles Date: Mon, 17 Nov 2014 14:29:39 +0000 Subject: [PATCH 039/383] haskellPackages.engineIo: Update to 1.2.1 --- .../libraries/haskell/engine-io/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/haskell/engine-io/default.nix b/pkgs/development/libraries/haskell/engine-io/default.nix index 9e3d6a5b5b1..7632ee31666 100644 --- a/pkgs/development/libraries/haskell/engine-io/default.nix +++ b/pkgs/development/libraries/haskell/engine-io/default.nix @@ -1,17 +1,18 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, aeson, async, attoparsec, base64Bytestring, either +{ cabal, aeson, async, attoparsec, base64Bytestring, either, free , monadLoops, mwcRandom, stm, text, transformers , unorderedContainers, vector, websockets }: cabal.mkDerivation (self: { pname = "engine-io"; - version = "1.2.0"; - sha256 = "07k5zc8zbjpcj3iql0kcs4zrw5g24cngkp9yanpdmnhi18ms45dv"; + version = "1.2.1"; + sha256 = "17zyl61qdxrsxy7xiqkrl3pp40hhv76gndsi30p00468a6nbk0z6"; buildDepends = [ - aeson async attoparsec base64Bytestring either monadLoops mwcRandom - stm text transformers unorderedContainers vector websockets + aeson async attoparsec base64Bytestring either free monadLoops + mwcRandom stm text transformers unorderedContainers vector + websockets ]; meta = { homepage = "http://github.com/ocharles/engine.io"; From 98a06ff71f057ffdfb3b5cd2e441b9dad62d01fd Mon Sep 17 00:00:00 2001 From: Jean-Philippe Bernardy Date: Mon, 17 Nov 2014 15:52:00 +0100 Subject: [PATCH 040/383] add myself as maintainer for parsek. --- lib/maintainers.nix | 1 + pkgs/development/libraries/haskell/parsek/default.nix | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/lib/maintainers.nix b/lib/maintainers.nix index fe58405eb10..b919fde0153 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -84,6 +84,7 @@ joachifm = "Joachim Fasting "; joamaki = "Jussi Maki "; joelteon = "Joel Taylor "; + jpbernardy = "Jean-Philippe Bernardy "; jwiegley = "John Wiegley "; kkallio = "Karn Kallio "; koral = "Koral "; diff --git a/pkgs/development/libraries/haskell/parsek/default.nix b/pkgs/development/libraries/haskell/parsek/default.nix index ebde6d7ca40..6ca9cd719b1 100644 --- a/pkgs/development/libraries/haskell/parsek/default.nix +++ b/pkgs/development/libraries/haskell/parsek/default.nix @@ -8,7 +8,8 @@ cabal.mkDerivation (self: { sha256 = "197hjys71f9qgsw83w3wrmijimjzvb9cy4kywkqr95ack8a7pizn"; meta = { description = "Parallel Parsing Processes"; - license = "GPL"; + license = self.stdenv.lib.licenses.gpl3; platforms = self.ghc.meta.platforms; + maintainers = with self.stdenv.lib.maintainers; [ jpbernardy ]; }; }) From c12db21b54824fbc33c84cd4657ac7fe91aa824f Mon Sep 17 00:00:00 2001 From: Jean-Philippe Bernardy Date: Mon, 17 Nov 2014 15:52:40 +0100 Subject: [PATCH 041/383] add myself as maintainer for labeled-tree --- pkgs/development/libraries/haskell/labeled-tree/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/haskell/labeled-tree/default.nix b/pkgs/development/libraries/haskell/labeled-tree/default.nix index dd6ea9e7af3..ef0301ef773 100644 --- a/pkgs/development/libraries/haskell/labeled-tree/default.nix +++ b/pkgs/development/libraries/haskell/labeled-tree/default.nix @@ -10,5 +10,6 @@ cabal.mkDerivation (self: { description = "Labeled tree structure"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; + maintainers = with self.stdenv.lib.maintainers; [ jpbernardy ]; }; }) From d31b62d2880ce71372ee7902b9ce1c4093d7e853 Mon Sep 17 00:00:00 2001 From: aszlig Date: Mon, 17 Nov 2014 17:04:16 +0100 Subject: [PATCH 042/383] tomahawk: Add new package, version 0.8.1. Although I've not tested the Tomahawk build on Mac OS X, it *should* work on it, so I'm using platforms.all here. Telepathy and KDE support are disabled by default in order to not get in the way of users who want to use a more minimalistic window-manager-only setup. But I'm not sure whether it matters in reality, we'll see once more people are using Tomahawk. Signed-off-by: aszlig --- pkgs/applications/audio/tomahawk/default.nix | 46 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 7 +++ 2 files changed, 53 insertions(+) create mode 100644 pkgs/applications/audio/tomahawk/default.nix diff --git a/pkgs/applications/audio/tomahawk/default.nix b/pkgs/applications/audio/tomahawk/default.nix new file mode 100644 index 00000000000..228940cb192 --- /dev/null +++ b/pkgs/applications/audio/tomahawk/default.nix @@ -0,0 +1,46 @@ +{ stdenv, fetchurl, cmake, pkgconfig, attica, boost, gnutls, libechonest +, liblastfm, lucenepp, phonon, qca2, qjson, qt4, qtkeychain, quazip, sparsehash +, taglib, websocketpp + +, enableXMPP ? true, libjreen ? null +, enableKDE ? false, kdelibs ? null +, enableTelepathy ? false, telepathy_qt ? null +}: + +assert enableXMPP -> libjreen != null; +assert enableKDE -> kdelibs != null; +assert enableTelepathy -> telepathy_qt != null; + +let + quazipQt4 = quazip.override { qt = qt4; }; +in stdenv.mkDerivation rec { + name = "tomahawk-${version}"; + version = "0.8.1"; + + src = fetchurl { + url = "http://download.tomahawk-player.org/tomahawk-0.8.1.tar.bz2"; + sha256 = "0ca6fah30a2s8nnlryav95wyzhwys1ikjfwakrqf2hb0y5aczdpw"; + }; + + cmakeFlags = [ + "-DLUCENEPP_INCLUDE_DIR=${lucenepp}/include" + "-DLUCENEPP_LIBRARY_DIR=${lucenepp}/lib" + ]; + + buildInputs = [ + cmake pkgconfig attica boost gnutls libechonest liblastfm lucenepp phonon + qca2 qjson qt4 qtkeychain quazipQt4 sparsehash taglib websocketpp + ] ++ stdenv.lib.optional enableXMPP libjreen + ++ stdenv.lib.optional enableKDE kdelibs + ++ stdenv.lib.optional enableTelepathy telepathy_qt; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + description = "A multi-source music player"; + homepage = "http://tomahawk-player.org/"; + license = licenses.gpl3Plus; + platforms = platforms.all; + maintainers = [ maintainers.aszlig ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5694965ba12..4c629e5cf64 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10783,6 +10783,13 @@ let todo-txt-cli = callPackage ../applications/office/todo.txt-cli { }; + tomahawk = callPackage ../applications/audio/tomahawk { + inherit (pkgs.kde4) kdelibs; + enableXMPP = config.tomahawk.enableXMPP or true; + enableKDE = config.tomahawk.enableKDE or false; + enableTelepathy = config.tomahawk.enableTelepathy or false; + }; + torchat = callPackage ../applications/networking/instant-messengers/torchat { wrapPython = pythonPackages.wrapPython; }; From 8835d932b1572d7918f30f778a554dbd7731f4fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Mon, 17 Nov 2014 17:11:05 +0100 Subject: [PATCH 043/383] nixos-generate-config: add 'lib' to module template The NixOS manual says modules have the following signature: { config, lib, pkgs, ... }: But our generated configuration.nix file lacks the 'lib' part. Add it. --- nixos/modules/installer/tools/nixos-generate-config.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/installer/tools/nixos-generate-config.pl b/nixos/modules/installer/tools/nixos-generate-config.pl index 9abc1b4cc1b..7178c4b1dfb 100644 --- a/nixos/modules/installer/tools/nixos-generate-config.pl +++ b/nixos/modules/installer/tools/nixos-generate-config.pl @@ -430,7 +430,7 @@ my $hwConfig = < Date: Mon, 17 Nov 2014 16:42:28 +0000 Subject: [PATCH 044/383] imapfilter: update from 2.5.6 to 2.5.7 --- pkgs/applications/networking/mailreaders/imapfilter.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/imapfilter.nix b/pkgs/applications/networking/mailreaders/imapfilter.nix index d42b71b2312..d7aff753e23 100644 --- a/pkgs/applications/networking/mailreaders/imapfilter.nix +++ b/pkgs/applications/networking/mailreaders/imapfilter.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, openssl, lua, pcre }: stdenv.mkDerivation rec { - name = "imapfilter-2.5.6"; + name = "imapfilter-2.5.7"; src = fetchurl { - url = "https://github.com/lefcha/imapfilter/archive/v2.5.6.tar.gz"; - sha256 = "0c94xdcnkk33d2filzkbraymfzm09np78486kqzqwidnnfllsk86"; + url = "https://github.com/lefcha/imapfilter/archive/v2.5.7.tar.gz"; + sha256 = "1l7sg7pyw1i8cxqnyb5xv983fakj8mxq6w44qd7w3kc7l6ixd4n7"; }; makeFlagsArray = "PREFIX=$(out)"; From 9e79811eb6fe04e424e03b7b9e319a3d020cc579 Mon Sep 17 00:00:00 2001 From: Mateusz Kowalczyk Date: Mon, 17 Nov 2014 16:46:58 +0000 Subject: [PATCH 045/383] AgdaStdlib: update to 0.9 This should have really been updated with Agda itself. --- pkgs/development/compilers/agda/stdlib.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/agda/stdlib.nix b/pkgs/development/compilers/agda/stdlib.nix index a583ff33cb6..597d0228b45 100644 --- a/pkgs/development/compilers/agda/stdlib.nix +++ b/pkgs/development/compilers/agda/stdlib.nix @@ -1,12 +1,12 @@ { stdenv, agda, fetchurl, ghc, filemanip }: agda.mkDerivation (self: rec { - name = "Agda-stdlib"; - version = "0.8.1"; + version = "0.9"; + name = "Agda-stdlib-${version}"; src = fetchurl { url = "https://github.com/agda/agda-stdlib/archive/v${version}.tar.gz"; - sha256 = "0ij4rg4lk0pq01ing285gbmnn23dcf2rhihdcs8bbdpjg52vl4gf"; + sha256 = "05rpmd2xra8wygq33mahdmijcjwq132l1akqyzj66n13frw4hfwj"; }; buildInputs = [ filemanip ghc ]; From 9ee5b8d3fc26c54d52e5f2756cf62265c442a515 Mon Sep 17 00:00:00 2001 From: Mateusz Kowalczyk Date: Mon, 17 Nov 2014 17:13:01 +0000 Subject: [PATCH 046/383] agda-iowa-stdlib: mark as broken The recent update of Agda breaks this, including the most recent SVN checkout. I notified the author but marking as broken until a fix is committed. --- pkgs/development/libraries/agda/agda-iowa-stdlib/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/agda/agda-iowa-stdlib/default.nix b/pkgs/development/libraries/agda/agda-iowa-stdlib/default.nix index fa8ed9e80a7..e8efcf3d1eb 100644 --- a/pkgs/development/libraries/agda/agda-iowa-stdlib/default.nix +++ b/pkgs/development/libraries/agda/agda-iowa-stdlib/default.nix @@ -22,5 +22,6 @@ agda.mkDerivation (self: rec { license = stdenv.lib.licenses.free; platforms = stdenv.lib.platforms.unix; maintainers = with stdenv.lib.maintainers; [ fuuzetsu ]; + broken = true; }; }) From 2b91426920cf26ac2925312262483d6740eb5113 Mon Sep 17 00:00:00 2001 From: Igor Pashev Date: Mon, 17 Nov 2014 20:30:37 +0300 Subject: [PATCH 047/383] Use lib instead of pkgs.lib Usage of pkgs.lib may cause infinite recursion --- nixos/modules/services/backup/crashplan.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nixos/modules/services/backup/crashplan.nix b/nixos/modules/services/backup/crashplan.nix index 1862709b136..74643d1d463 100644 --- a/nixos/modules/services/backup/crashplan.nix +++ b/nixos/modules/services/backup/crashplan.nix @@ -1,4 +1,4 @@ -{ config, pkgs, ... }: +{ config, pkgs, lib, ... }: let cfg = config.services.crashplan; @@ -6,7 +6,7 @@ let varDir = "/var/lib/crashplan"; in -with pkgs.lib; +with lib; { options = { @@ -60,4 +60,4 @@ with pkgs.lib; }; }; }; -} \ No newline at end of file +} From 0c43a02e3609fb1730ae92465434f40bb8c8e21d Mon Sep 17 00:00:00 2001 From: Mateusz Kowalczyk Date: Mon, 17 Nov 2014 18:04:59 +0000 Subject: [PATCH 048/383] Attach a bunch of meta.branch info for the monitor This should stop explicitly-versioned expressions from showing up in the monitor as in need of update. --- pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.1.2.nix | 3 +++ pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.2.nix | 3 +++ pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.3.nix | 3 +++ pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.5.nix | 3 +++ pkgs/data/sgml+xml/schemas/xml-dtd/docbook/generic.nix | 4 ++-- pkgs/development/libraries/db/db-4.4.nix | 1 + pkgs/development/libraries/db/db-4.5.nix | 1 + pkgs/development/libraries/db/db-4.7.nix | 1 + pkgs/development/libraries/db/db-4.8.nix | 1 + pkgs/development/libraries/db/db-5.3.nix | 1 + pkgs/development/libraries/db/db-6.0.nix | 1 + pkgs/development/libraries/db/generic.nix | 2 ++ 12 files changed, 22 insertions(+), 2 deletions(-) diff --git a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.1.2.nix b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.1.2.nix index e4e5a7367c6..7ff79488a89 100644 --- a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.1.2.nix +++ b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.1.2.nix @@ -21,4 +21,7 @@ import ./generic.nix { postInstall = " sed 's|V4.2|V4.1.2|g' < ${docbook42catalog} > catalog.xml "; + meta = { + branch = "4.1.2"; + }; } diff --git a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.2.nix b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.2.nix index 47cbbf33c01..7071d4a471f 100644 --- a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.2.nix +++ b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.2.nix @@ -7,4 +7,7 @@ import ./generic.nix { url = http://www.docbook.org/xml/4.2/docbook-xml-4.2.zip; md5 = "73fe50dfe74ca631c1602f558ed8961f"; }; + meta = { + branch = "4.2"; + }; } diff --git a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.3.nix b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.3.nix index 6a2e4e65a82..478dd68e8bb 100644 --- a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.3.nix +++ b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.3.nix @@ -7,4 +7,7 @@ import ./generic.nix { url = http://www.docbook.org/xml/4.3/docbook-xml-4.3.zip; md5 = "ab200202b9e136a144db1e0864c45074"; }; + meta = { + branch = "4.3"; + }; } diff --git a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.5.nix b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.5.nix index eb26d185bbe..669536962a1 100644 --- a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.5.nix +++ b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/4.5.nix @@ -7,4 +7,7 @@ import ./generic.nix { url = http://www.docbook.org/xml/4.5/docbook-xml-4.5.zip; sha256 = "1d671lcjckjri28xfbf6dq7y3xnkppa910w1jin8rjc35dx06kjf"; }; + meta = { + branch = "4.5"; + }; } diff --git a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/generic.nix b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/generic.nix index f4ee845b5f1..29a18f4ce69 100644 --- a/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/generic.nix +++ b/pkgs/data/sgml+xml/schemas/xml-dtd/docbook/generic.nix @@ -1,9 +1,9 @@ -{stdenv, fetchurl, unzip, src, name, postInstall ? "true"}: +{ stdenv, fetchurl, unzip, src, name, postInstall ? "true", meta ? {} }: assert unzip != null; stdenv.mkDerivation { - inherit src name postInstall; + inherit src name postInstall meta; builder = ./builder.sh; buildInputs = [unzip]; } diff --git a/pkgs/development/libraries/db/db-4.4.nix b/pkgs/development/libraries/db/db-4.4.nix index 4a182353f25..757b1f71405 100644 --- a/pkgs/development/libraries/db/db-4.4.nix +++ b/pkgs/development/libraries/db/db-4.4.nix @@ -4,4 +4,5 @@ import ./generic.nix (args // rec { version = "4.4.20"; extraPatches = [ ./cygwin-4.4.patch ]; sha256 = "0y9vsq8dkarx1mhhip1vaciz6imbbyv37c1dm8b20l7p064bg2i9"; + branch = "4.4"; }) diff --git a/pkgs/development/libraries/db/db-4.5.nix b/pkgs/development/libraries/db/db-4.5.nix index 6a0a921d8de..b1e4b2c4708 100644 --- a/pkgs/development/libraries/db/db-4.5.nix +++ b/pkgs/development/libraries/db/db-4.5.nix @@ -4,4 +4,5 @@ import ./generic.nix (args // rec { version = "4.5.20"; extraPatches = [ ./cygwin-4.5.patch ./register-race-fix.patch ]; sha256 = "0bd81k0qv5i8w5gbddrvld45xi9k1gvmcrfm0393v0lrm37dab7m"; + branch = "4.5"; }) diff --git a/pkgs/development/libraries/db/db-4.7.nix b/pkgs/development/libraries/db/db-4.7.nix index 62ccfd7d3a5..9a7d586cd04 100644 --- a/pkgs/development/libraries/db/db-4.7.nix +++ b/pkgs/development/libraries/db/db-4.7.nix @@ -3,4 +3,5 @@ import ./generic.nix (args // rec { version = "4.7.25"; sha256 = "0gi667v9cw22c03hddd6xd6374l0pczsd56b7pba25c9sdnxjkzi"; + branch = "4.7"; }) diff --git a/pkgs/development/libraries/db/db-4.8.nix b/pkgs/development/libraries/db/db-4.8.nix index e77307d6fa5..9b5e8cb39bd 100644 --- a/pkgs/development/libraries/db/db-4.8.nix +++ b/pkgs/development/libraries/db/db-4.8.nix @@ -3,4 +3,5 @@ import ./generic.nix (args // rec { version = "4.8.30"; sha256 = "0ampbl2f0hb1nix195kz1syrqqxpmvnvnfvphambj7xjrl3iljg0"; + branch = "4.8"; }) diff --git a/pkgs/development/libraries/db/db-5.3.nix b/pkgs/development/libraries/db/db-5.3.nix index fe376ee3b4f..b5e62ee686f 100644 --- a/pkgs/development/libraries/db/db-5.3.nix +++ b/pkgs/development/libraries/db/db-5.3.nix @@ -4,4 +4,5 @@ import ./generic.nix (args // rec { version = "5.3.28"; sha256 = "0a1n5hbl7027fbz5lm0vp0zzfp1hmxnz14wx3zl9563h83br5ag0"; extraPatches = [ ./osx.patch ]; + branch = "5.3"; }) diff --git a/pkgs/development/libraries/db/db-6.0.nix b/pkgs/development/libraries/db/db-6.0.nix index 22e858a9d18..716cad9ab07 100644 --- a/pkgs/development/libraries/db/db-6.0.nix +++ b/pkgs/development/libraries/db/db-6.0.nix @@ -4,4 +4,5 @@ import ./generic.nix (args // rec { version = "6.0.20"; sha256 = "00r2aaglq625y8r9xd5vw2y070plp88f1mb2gbq3kqsl7128lsl0"; license = stdenv.lib.licenses.agpl3; + branch = "6.0"; }) diff --git a/pkgs/development/libraries/db/generic.nix b/pkgs/development/libraries/db/generic.nix index 6217bc46124..013a7fd35b9 100644 --- a/pkgs/development/libraries/db/generic.nix +++ b/pkgs/development/libraries/db/generic.nix @@ -6,6 +6,7 @@ , version, sha256 , extraPatches ? [ ] , license ? stdenv.lib.licenses.sleepycat +, branch ? null }: stdenv.mkDerivation rec { @@ -37,5 +38,6 @@ stdenv.mkDerivation rec { description = "Berkeley DB"; license = license; platforms = platforms.unix; + branch = branch; }; } From 99439dc4eec5917343deceb8b7bed574c28478e1 Mon Sep 17 00:00:00 2001 From: Mateusz Kowalczyk Date: Mon, 17 Nov 2014 18:06:36 +0000 Subject: [PATCH 049/383] bluez5: update from 5.24 to 5.25 --- pkgs/os-specific/linux/bluez/bluez5.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/bluez/bluez5.nix b/pkgs/os-specific/linux/bluez/bluez5.nix index 3d1f90fe8eb..e8be1b6b0e6 100644 --- a/pkgs/os-specific/linux/bluez/bluez5.nix +++ b/pkgs/os-specific/linux/bluez/bluez5.nix @@ -5,11 +5,11 @@ assert stdenv.isLinux; stdenv.mkDerivation rec { - name = "bluez-5.24"; + name = "bluez-5.25"; src = fetchurl { url = "mirror://kernel/linux/bluetooth/${name}.tar.xz"; - sha256 = "0dxqkyxjx4051k6ghacqnm0cyvw52z9f4867dy2rcd5zl3xwaw78"; + sha256 = "0c7xs4imwfgyx59qxbinfi403vhki1n8src1g87qlqz28lzjz9jw"; }; pythonPath = with pythonPackages; From 3f8ff5b5ba902c5beae6f85e3b37797e4bef30ad Mon Sep 17 00:00:00 2001 From: Mateusz Kowalczyk Date: Mon, 17 Nov 2014 18:06:55 +0000 Subject: [PATCH 050/383] b43FirmwareCutter: update from 018 to 019 --- .../linux/firmware/b43-firmware-cutter/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/firmware/b43-firmware-cutter/default.nix b/pkgs/os-specific/linux/firmware/b43-firmware-cutter/default.nix index a01d5d38e93..701b9742b6a 100644 --- a/pkgs/os-specific/linux/firmware/b43-firmware-cutter/default.nix +++ b/pkgs/os-specific/linux/firmware/b43-firmware-cutter/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "b43-fwcutter-018"; + name = "b43-fwcutter-019"; src = fetchurl { url = "http://bues.ch/b43/fwcutter/${name}.tar.bz2"; - sha256 = "13v34pa0y1jf4hkhsh3zagyb7s8b8ymplffaayscwsd3s7f6kc2p"; + sha256 = "1ki1f5fy3yrw843r697f8mqqdz0pbsbqnvg4yzkhibpn1lqqbsnn"; }; patches = [ ./no-root-install.patch ]; From 88ea3e8c484961830715ee596d3b8149206201c7 Mon Sep 17 00:00:00 2001 From: Mateusz Kowalczyk Date: Mon, 17 Nov 2014 18:07:17 +0000 Subject: [PATCH 051/383] bsddb3: update from 6.0.1 to 6.1.0 --- pkgs/development/python-modules/bsddb3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/bsddb3/default.nix b/pkgs/development/python-modules/bsddb3/default.nix index 574796e2c68..bd5b953f048 100644 --- a/pkgs/development/python-modules/bsddb3/default.nix +++ b/pkgs/development/python-modules/bsddb3/default.nix @@ -1,10 +1,10 @@ {stdenv, fetchurl, python, db}: stdenv.mkDerivation rec { - name = "bsddb3-6.0.1"; + name = "bsddb3-6.1.0"; src = fetchurl { url = "https://pypi.python.org/packages/source/b/bsddb3/${name}.tar.gz"; - md5 = "2b22ab1b4d896961c30e4106660e9139"; + sha256 = "05gx3rfgq1qrgdmpd6hri6y5l97bh1wczvb6x853jchwi7in6cdi"; }; buildInputs = [python]; buildPhase = "true"; From 1e8e030f6b6d0dcedd52952e777ecec77c9b0b93 Mon Sep 17 00:00:00 2001 From: Mateusz Kowalczyk Date: Mon, 17 Nov 2014 18:07:47 +0000 Subject: [PATCH 052/383] bwidget: update from 1.9.7 to 1.9.8 --- pkgs/development/libraries/bwidget/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/bwidget/default.nix b/pkgs/development/libraries/bwidget/default.nix index 0d1913bc8e7..ed670e61243 100644 --- a/pkgs/development/libraries/bwidget/default.nix +++ b/pkgs/development/libraries/bwidget/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "bwidget-${version}"; - version = "1.9.7"; + version = "1.9.8"; src = fetchurl { url = "mirror://sourceforge/tcllib/bwidget-${version}.tar.gz"; - sha256 = "1z2z77l41g01ra7v716c0q3x8s2kx30l4p1kf21ma8bdqa98arp6"; + sha256 = "055kpl3ghznk028jnhzsa3p48qgipckfzn2liwq932crxviicl2l"; }; dontBuild = true; From 6e12ae2bc6ce0dad5402ee1645ab0cfbfe3dac1c Mon Sep 17 00:00:00 2001 From: Mateusz Kowalczyk Date: Mon, 17 Nov 2014 18:08:11 +0000 Subject: [PATCH 053/383] check: update from 0.9.12 to 0.9.14 --- pkgs/development/libraries/check/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/check/default.nix b/pkgs/development/libraries/check/default.nix index a782ff61e28..5273e88763a 100644 --- a/pkgs/development/libraries/check/default.nix +++ b/pkgs/development/libraries/check/default.nix @@ -1,12 +1,12 @@ { fetchurl, stdenv }: -let version = "0.9.12"; in +let version = "0.9.14"; in stdenv.mkDerivation { name = "check-${version}"; src = fetchurl { url = "mirror://sourceforge/check/${version}/check-${version}.tar.gz"; - sha256 = "18qybf3s25s1gydp2lwbc4icnmdc6f9sj21fllcwm81kw5apxm67"; + sha256 = "02l4g79d81s07hzywcv1knwj5dyrwjiq2pgxaz7kidxi8m364wn2"; }; # Test can randomly fail: http://hydra.nixos.org/build/7243912 From f4c350d26ebce68b1ca483693a3ffe4b471da27a Mon Sep 17 00:00:00 2001 From: Mateusz Kowalczyk Date: Mon, 17 Nov 2014 18:09:30 +0000 Subject: [PATCH 054/383] dropbear: update from 2013.62 to 2014.66 --- pkgs/tools/networking/dropbear/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/dropbear/default.nix b/pkgs/tools/networking/dropbear/default.nix index 1f7c8a449f3..c9b0101a7e6 100644 --- a/pkgs/tools/networking/dropbear/default.nix +++ b/pkgs/tools/networking/dropbear/default.nix @@ -2,11 +2,11 @@ sftpPath ? "/var/run/current-system/sw/libexec/sftp-server" }: stdenv.mkDerivation rec { - name = "dropbear-2013.62"; + name = "dropbear-2014.66"; src = fetchurl { url = "http://matt.ucc.asn.au/dropbear/releases/${name}.tar.bz2"; - sha256 = "1ylz0zd68cxdgs4x4cpc2y8h75395y10bxb1qflv0m6cpc166rf6"; + sha256 = "0xmbcjm2pbhih459667wy8acs4nax4amvzwqwfxw0z2i19ky4gxb"; }; dontDisableStatic = enableStatic; From 9b14ab9f6aba404b98e5932a7d5f03252576839c Mon Sep 17 00:00:00 2001 From: Mateusz Kowalczyk Date: Mon, 17 Nov 2014 18:10:49 +0000 Subject: [PATCH 055/383] e17.eina: update from 1.7.5 to 1.7.10 --- pkgs/desktops/e17/eina/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/e17/eina/default.nix b/pkgs/desktops/e17/eina/default.nix index 77d4829a841..653bb639b1b 100644 --- a/pkgs/desktops/e17/eina/default.nix +++ b/pkgs/desktops/e17/eina/default.nix @@ -1,10 +1,10 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { name = "eina-${version}"; - version = "1.7.5"; + version = "1.7.10"; src = fetchurl { url = "http://download.enlightenment.org/releases/${name}.tar.bz2"; - sha256 = "0kd4116njrbag9h459cmfpg07c4ag04z3yrsg513lpi27amch27w"; + sha256 = "06pqn17zknmxzdk5gw6df0gpbicnrdjl9g4vncw57k2wzf5icy33"; }; meta = { description = "Enlightenment's core data structure library"; From d3568f277c8688fd0464bce9a316e1086ab014c6 Mon Sep 17 00:00:00 2001 From: Mateusz Kowalczyk Date: Mon, 17 Nov 2014 18:11:03 +0000 Subject: [PATCH 056/383] e17.terminology: update from 0.5.1 to 0.7.0 --- pkgs/desktops/e17/terminology/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/e17/terminology/default.nix b/pkgs/desktops/e17/terminology/default.nix index 692f4e73ac2..35e2f3f5a34 100644 --- a/pkgs/desktops/e17/terminology/default.nix +++ b/pkgs/desktops/e17/terminology/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { name = "terminology-${version}"; - version = "0.5.1"; + version = "0.7.0"; src = fetchurl { url = "http://download.enlightenment.org/rel/apps/terminology/${name}.tar.gz"; - sha256 = "1b8m6fhzx2fdr3m6ak2163v33zc4svmg2k875m0xppzifdd9xvyf"; + sha256 = "1x248dh9r292r8ycvf43vrfk4l8wpli50sgywp0zy3q93f8ljgs5"; }; buildInputs = [ pkgconfig elementary eina eet evas ecore edje emotion ecore ethumb efreet ]; From 1f199f21a5454f090966a28e2816b2d592b7db73 Mon Sep 17 00:00:00 2001 From: Mateusz Kowalczyk Date: Mon, 17 Nov 2014 18:11:17 +0000 Subject: [PATCH 057/383] emacs24Packages.rainbowDelimiters: update from 1.3.12 to 1.3.13 --- .../editors/emacs-modes/rainbow-delimiters/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/emacs-modes/rainbow-delimiters/default.nix b/pkgs/applications/editors/emacs-modes/rainbow-delimiters/default.nix index 62b3a0af1fb..2b4223cdc1f 100644 --- a/pkgs/applications/editors/emacs-modes/rainbow-delimiters/default.nix +++ b/pkgs/applications/editors/emacs-modes/rainbow-delimiters/default.nix @@ -1,13 +1,13 @@ {stdenv, fetchurl, emacs}: -let version = "1.3.12"; +let version = "1.3.13"; in stdenv.mkDerivation { name = "emacs-rainbow-delimiters-${version}"; src = fetchurl { url = "https://github.com/jlr/rainbow-delimiters/archive/${version}.tar.gz"; - sha256 = "0l65rqmnrc02q1b406kxc29w5cfpmrmq0glv493pjzhzc5m3r63z"; + sha256 = "075j3nsk4jm0rs5671n28c1wksrfbvpl9a4f89kzcd7sk1h6ncvl"; }; buildInputs = [ emacs ]; From 4603a8eff622c859fd89f2767e5bcfa53cebef31 Mon Sep 17 00:00:00 2001 From: Mateusz Kowalczyk Date: Mon, 17 Nov 2014 18:11:50 +0000 Subject: [PATCH 058/383] giflib_5_0: update from 5.0.5 to 5.0.6 --- pkgs/development/libraries/giflib/5.0.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/giflib/5.0.nix b/pkgs/development/libraries/giflib/5.0.nix index 4dc8132805c..6dcf696839f 100644 --- a/pkgs/development/libraries/giflib/5.0.nix +++ b/pkgs/development/libraries/giflib/5.0.nix @@ -1,10 +1,10 @@ {stdenv, fetchurl, xmlto, docbook_xml_dtd_412, docbook_xsl, libxml2 }: stdenv.mkDerivation { - name = "giflib-5.0.5"; + name = "giflib-5.0.6"; src = fetchurl { - url = mirror://sourceforge/giflib/giflib-5.0.5.tar.bz2; - sha256 = "02c6pwll9pzw5fhg5gccx2ws56d70ylfryk21nv5lqhwdcv8lvb0"; + url = mirror://sourceforge/giflib/giflib-5.0.6.tar.bz2; + sha256 = "1sk9ysh27nabwb6z7a38n8gy2y2rnl3vjkbapv7pbjnzrff862c9"; }; buildInputs = [ xmlto docbook_xml_dtd_412 docbook_xsl libxml2 ]; From 35218a325a91f9ffd44f896d84dcebeef99b7b4a Mon Sep 17 00:00:00 2001 From: Mateusz Kowalczyk Date: Mon, 17 Nov 2014 18:13:21 +0000 Subject: [PATCH 059/383] giflib: add meta.branch info --- pkgs/development/libraries/giflib/5.0.nix | 8 +++++++- pkgs/development/libraries/giflib/5.1.nix | 1 + 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/giflib/5.0.nix b/pkgs/development/libraries/giflib/5.0.nix index 6dcf696839f..49e3fc40ba6 100644 --- a/pkgs/development/libraries/giflib/5.0.nix +++ b/pkgs/development/libraries/giflib/5.0.nix @@ -8,5 +8,11 @@ stdenv.mkDerivation { }; buildInputs = [ xmlto docbook_xml_dtd_412 docbook_xsl libxml2 ]; + meta = { + description = "giflib is a library for reading and writing gif images"; + platforms = stdenv.lib.platforms.unix; + license = stdenv.lib.licenses.mit; + maintainers = with stdenv.lib.maintainers; [ fuuzetsu ]; + branch = "5.0"; + }; } - diff --git a/pkgs/development/libraries/giflib/5.1.nix b/pkgs/development/libraries/giflib/5.1.nix index 3ff71255b85..dcd52fc93f4 100644 --- a/pkgs/development/libraries/giflib/5.1.nix +++ b/pkgs/development/libraries/giflib/5.1.nix @@ -13,5 +13,6 @@ stdenv.mkDerivation { platforms = stdenv.lib.platforms.unix; license = stdenv.lib.licenses.mit; maintainers = with stdenv.lib.maintainers; [ fuuzetsu ]; + branch = "5.1"; }; } From 2d3ec7d6f8c66c92c3f3e06c2c8e6fe8492f284a Mon Sep 17 00:00:00 2001 From: "Ricardo M. Correia" Date: Mon, 17 Nov 2014 15:47:25 +0000 Subject: [PATCH 060/383] rustcMaster: Update from 0.12.0-pre-961-g93c85eb -> 0.12.0-pre-1166-g0047dbe --- pkgs/development/compilers/rustc/head.nix | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/development/compilers/rustc/head.nix b/pkgs/development/compilers/rustc/head.nix index 707cfe42d1e..25727844144 100644 --- a/pkgs/development/compilers/rustc/head.nix +++ b/pkgs/development/compilers/rustc/head.nix @@ -18,19 +18,19 @@ assert stdenv.gcc.gcc != null; */ -with ((import ./common.nix) {inherit stdenv; version = "0.12.0-pre-961-g93c85eb";}); +with ((import ./common.nix) {inherit stdenv; version = "0.12.0-pre-1166-g0047dbe";}); let snapshot = if stdenv.system == "i686-linux" - then "d827fbbd778b854923971873cf03bdb79c2e8575" + then "3f8bb33f86800affca3cb7245925c19b28a94498" else if stdenv.system == "x86_64-linux" - then "1ddca522a8ba4a4f662dc17ca16b0f50f2c15f87" + then "e0e13a4312bea0bcc7db35b46bcce957178b18a4" else if stdenv.system == "i686-darwin" - then "597cd42301e1569df8ad090574cd535d19283387" + then "22f084aaecb773e8348c64fb9ac6d5eba363eb56" else if stdenv.system == "x86_64-darwin" - then "4bfb2aff1c3e3c57653b32adc34b399c5aeb759b" + then "c8554badab19cee96fbf51c2b98ee1bba87caa5c" else abort "no-snapshot for platform ${stdenv.system}"; - snapshotDate = "2014-11-04"; - snapshotRev = "1b2ad78"; + snapshotDate = "2014-11-10"; + snapshotRev = "f89e975"; snapshotName = "rust-stage0-${snapshotDate}-${snapshotRev}-${platform}-${snapshot}.tar.bz2"; in stdenv.mkDerivation { @@ -40,8 +40,8 @@ in stdenv.mkDerivation { src = fetchgit { url = https://github.com/rust-lang/rust; - rev = "93c85eb8bdcc910a27caf6abd20207a626ae98e5"; - sha256 = "0zj84xsyg8jpd6ixmdv7jsjrnsd4zwrac98qqmwgrd78h74g8kpq"; + rev = "0047dbe59c41b951d34ce6324f3a8c0e15d523e9"; + sha256 = "1w22w5rfpw0kcmnrrmrxslsxyl4xhyckcxgwmv3hbir05qxsxm6m"; }; # We need rust to build rust. If we don't provide it, configure will try to download it. From 3000c1b1e9dc19d1f611be824c11dd3970ee67ea Mon Sep 17 00:00:00 2001 From: Sven Keidel Date: Mon, 17 Nov 2014 21:00:03 +0100 Subject: [PATCH 061/383] gpodder: update from 3.8.0 to 3.8.3 --- pkgs/applications/audio/gpodder/default.nix | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/applications/audio/gpodder/default.nix b/pkgs/applications/audio/gpodder/default.nix index ebe847353dd..e8c14a9c763 100644 --- a/pkgs/applications/audio/gpodder/default.nix +++ b/pkgs/applications/audio/gpodder/default.nix @@ -1,6 +1,5 @@ { pkgs, stdenv, fetchurl, python, buildPythonPackage, pythonPackages, mygpoclient, intltool, - ipodSupport ? true, libgpod, gpodderHome ? "", gpodderDownloadDir ? "", - gnome3, hicolor_icon_theme }: + ipodSupport ? true, libgpod, gnome3, hicolor_icon_theme }: with pkgs.lib; @@ -8,20 +7,23 @@ let inherit (pythonPackages) coverage feedparser minimock sqlite3 dbus pygtk eyeD3; in buildPythonPackage rec { - name = "gpodder-3.8.0"; + name = "gpodder-3.8.3"; src = fetchurl { url = "http://gpodder.org/src/${name}.tar.gz"; - sha256 = "0731f08f4270c81872b841b55200ae80feb4502706397d0085079471fb9a8fe4"; + sha256 = "8ac120a6084bded6bc88ecadbbc9df54a85f44ef4507f73a76de1d7a5574303c"; }; buildInputs = [ coverage feedparser minimock sqlite3 mygpoclient intltool - gnome3.gnome_icon_theme gnome3.gnome_icon_theme_symbolic - hicolor_icon_theme + gnome3.gnome_themes_standard gnome3.gnome_icon_theme + gnome3.gnome_icon_theme_symbolic hicolor_icon_theme + gnome3.gsettings_desktop_schemas ]; - propagatedBuildInputs = [ feedparser dbus mygpoclient sqlite3 pygtk eyeD3 ] + propagatedUserEnvPkgs = [ gnome3.gnome_themes_standard ]; + + pythonPath = [ feedparser dbus mygpoclient sqlite3 pygtk eyeD3 ] ++ stdenv.lib.optional ipodSupport libgpod; postPatch = "sed -ie 's/PYTHONPATH=src/PYTHONPATH=\$(PYTHONPATH):src/' makefile"; @@ -30,8 +32,6 @@ in buildPythonPackage rec { preFixup = '' wrapProgram $out/bin/gpodder \ - ${optionalString (gpodderHome != "") "--set GPODDER_HOME ${gpodderHome}"} \ - ${optionalString (gpodderDownloadDir != "") "--set GPODDER_DOWNLOAD_DIR ${gpodderDownloadDir}"} \ --prefix XDG_DATA_DIRS : "${gnome3.gnome_themes_standard}/share:$XDG_ICON_DIRS:$GSETTINGS_SCHEMAS_PATH" ''; From bb999776f3242108d86e18e8d8791814484d115e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?James=20=E2=80=98Twey=E2=80=99=20Kay?= Date: Sat, 15 Nov 2014 02:22:29 +0000 Subject: [PATCH 062/383] New package: stdman --- pkgs/data/documentation/stdman/default.nix | 31 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 33 insertions(+) create mode 100644 pkgs/data/documentation/stdman/default.nix diff --git a/pkgs/data/documentation/stdman/default.nix b/pkgs/data/documentation/stdman/default.nix new file mode 100644 index 00000000000..51ac354c2a9 --- /dev/null +++ b/pkgs/data/documentation/stdman/default.nix @@ -0,0 +1,31 @@ +{ stdenv, curl, fetchgit }: + +stdenv.mkDerivation rec { + name = "stdman-${version}"; + version = "d860212"; + + src = fetchgit { + url = "git://github.com/jeaye/stdman"; + sha256 = "0fr4bw6rsddf95chdlwami9q1fwwfbk4di35zzi25zg72ibi12qz"; + rev = "d860212767ca60472e33aa3bad22a3eac834b1f8"; + }; + + preConfigure = " + substituteInPlace configure --replace /bin/bash /bin/sh; + substituteInPlace do_install --replace /bin/bash /bin/sh; + "; + + buildInputs = [ curl ]; + + meta = with stdenv.lib; { + description = "Formatted C++11/14 stdlib man pages (cppreference)"; + longDescription = "stdman is a tool that parses archived HTML + files from cppreference and generates groff-formatted manual + pages for Unix-based systems. The goal is to provide excellent + formatting for easy readability."; + homepage = https://github.com/jeaye/stdman; + license = licenses.mit; + platforms = platforms.linux; + maintainers = [ maintainers.twey ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 13e068d3dfb..97cd824246d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2374,6 +2374,8 @@ let inherit (gnome) libgnomeui scrollkeeper; }; + stdman = callPackage ../data/documentation/stdman { }; + storebrowse = callPackage ../tools/system/storebrowse { }; fusesmb = callPackage ../tools/filesystems/fusesmb { }; From d157865b65b3290c4472323ce1facf1d2da4e0f0 Mon Sep 17 00:00:00 2001 From: Aristid Breitkreuz Date: Mon, 17 Nov 2014 22:13:39 +0100 Subject: [PATCH 063/383] stdman: improvements to package description --- pkgs/data/documentation/stdman/default.nix | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/pkgs/data/documentation/stdman/default.nix b/pkgs/data/documentation/stdman/default.nix index 51ac354c2a9..33c002e9801 100644 --- a/pkgs/data/documentation/stdman/default.nix +++ b/pkgs/data/documentation/stdman/default.nix @@ -1,18 +1,19 @@ -{ stdenv, curl, fetchgit }: +{ stdenv, curl, fetchFromGitHub }: stdenv.mkDerivation rec { name = "stdman-${version}"; version = "d860212"; - src = fetchgit { - url = "git://github.com/jeaye/stdman"; - sha256 = "0fr4bw6rsddf95chdlwami9q1fwwfbk4di35zzi25zg72ibi12qz"; + src = fetchFromGitHub { + owner = "jeaye"; + repo = "stdman"; rev = "d860212767ca60472e33aa3bad22a3eac834b1f8"; + sha256 = "09c5gjhcz97ghfrv9zkgfb1wckvmqnhbzga0xidbm1ir7640di8l"; }; preConfigure = " - substituteInPlace configure --replace /bin/bash /bin/sh; - substituteInPlace do_install --replace /bin/bash /bin/sh; + patchShebangs ./configure + patchShebangs ./do_install "; buildInputs = [ curl ]; From 583ab7512df8dc16fb059259276110d4dd55832f Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Mon, 17 Nov 2014 13:18:23 -0800 Subject: [PATCH 064/383] consul: 0.4.0 -> 0.4.1 --- pkgs/servers/consul/default.nix | 2 +- pkgs/servers/consul/deps.nix | 61 +++++++++++++++++++-------------- 2 files changed, 36 insertions(+), 27 deletions(-) diff --git a/pkgs/servers/consul/default.nix b/pkgs/servers/consul/default.nix index 9244ee2f2cf..49a3dac14ea 100644 --- a/pkgs/servers/consul/default.nix +++ b/pkgs/servers/consul/default.nix @@ -2,7 +2,7 @@ , ruby, rubyLibs, nodejs }: let - version = "0.4.0"; + version = "0.4.1"; in with lib; diff --git a/pkgs/servers/consul/deps.nix b/pkgs/servers/consul/deps.nix index c6e7cb735fe..fcfc3e911ec 100644 --- a/pkgs/servers/consul/deps.nix +++ b/pkgs/servers/consul/deps.nix @@ -16,8 +16,8 @@ let src = fetchFromGitHub { owner = "armon"; repo = "consul-api"; - rev = "045662de1042be0662fe4a1e21b57c8f7669261a"; - sha256 = "1cdf9mpfa97qwzc0nz0788d97xmwh08dsvqmkmijrdm2a6c07q1r"; + rev = "1b81c8e0c4cbf1d382310e4c0dc11221632e79d1"; + sha256 = "0fgawc1si0hn41kfr9sq351jccy8y5ac83l437vnshj60i9q9s6w"; }; } { @@ -52,8 +52,8 @@ let src = fetchFromGitHub { owner = "hashicorp"; repo = "consul"; - rev = "e1d87dee26c05cea64342fadd2a728894b764aec"; - sha256 = "0y05pjvvxlamf74s15pcgv48xyd6116m5lyyd7jkh28lb3l2fykf"; + rev = "v0.4.1"; + sha256 = "0fqrhmzi0jbbwylv7c1l0ywqr67aqlv6s891f4inp0y4abd7shc7"; }; } { @@ -65,6 +65,15 @@ let sha256 = "0mfykh9jkh1m2zxlm2df4j5i6hd6iq1kc8afjladdhcqyrkwcch0"; }; } + { + root = "github.com/hashicorp/go-msgpack"; + src = fetchFromGitHub { + owner = "hashicorp"; + repo = "go-msgpack"; + rev = "71c2886f5a673a35f909803f38ece5810165097b"; + sha256 = "157f24xnkhclrjwwa1b7lmpj112ynlbf7g1cfw0c657iqny5720j"; + }; + } { root = "github.com/hashicorp/go-syslog"; src = fetchFromGitHub { @@ -79,8 +88,8 @@ let src = fetchFromGitHub { owner = "hashicorp"; repo = "golang-lru"; - rev = "4dfff096c4973178c8f35cf6dd1a732a0a139370"; - sha256 = "16x78183xzk9bjn7il71l3mff3rqjwc88q9fpbj5i65kvl5ws9di"; + rev = "253b2dc1ca8bae42c3b5b6e53dd2eab1a7551116"; + sha256 = "01vdya86x4fylzwapnz6p3wkb8y17sfvbss656sixc37iirrhqr2"; }; } { @@ -88,8 +97,8 @@ let src = fetchFromGitHub { owner = "hashicorp"; repo = "hcl"; - rev = "9b5d9eb9b09475889ae49a4a613c60280875b3d1"; - sha256 = "02x5by78a3bblzqnhl9dm98wz61h0vkk1wcw7mx6480a7qj5jx3m"; + rev = "e51eabcdf801f663738fa12f4340fbad13062738"; + sha256 = "09d047lg6py9waqd6zwb0c9id8hya4xv2cg7yi9jbx8kwq31s75l"; }; } { @@ -97,8 +106,8 @@ let src = fetchFromGitHub { owner = "hashicorp"; repo = "logutils"; - rev = "8e0820fe7ac5eb2b01626b1d99df47c5449eb2d8"; - sha256 = "033rbkc066g657r0dnzysigjz2bs4biiz0kmiypd139d34jvslwz"; + rev = "23b0af5510a2d1442103ef83ffcf53eb82f3debc"; + sha256 = "018bfknmc2qdk0br1ri6dgd45sx308j3qd77sxnzxsyaivw1mm0d"; }; } { @@ -106,8 +115,8 @@ let src = fetchFromGitHub { owner = "hashicorp"; repo = "memberlist"; - rev = "def5afe3702fce72d72922fb44ef2b8e5608b205"; - sha256 = "1ch8c160nkqb79ql59vgpnf9kfq2v38xjrprvfv4hmnpmf6yx6i2"; + rev = "16d947e2d4b3f1fe508ee1d9b6ec34b8fd2e96d8"; + sha256 = "0xagvyyfl37r0n6s67m1dmrahaxf4gprnfkm12x9jcpp5rbq7jjq"; }; } { @@ -115,8 +124,8 @@ let src = fetchFromGitHub { owner = "hashicorp"; repo = "raft"; - rev = "35f5fa082f5a064595d84715b0cf8821f002e9ac"; - sha256 = "0s5qhs19n0rxdhsxw77q5sjw4hrkfggxz3w0p3szcd8rsnpfswkg"; + rev = "cc9710ab540985954a67c108f414aa3152f5916f"; + sha256 = "1v4hib68gaicaqcx3iyclxbp5p3g750rayh8f35sh5fwbklqw1qi"; }; } { @@ -124,8 +133,8 @@ let src = fetchFromGitHub { owner = "hashicorp"; repo = "raft-mdb"; - rev = "95d26447c3c54581de2bb102ecc3344079b234bd"; - sha256 = "1fqf7s2snzbjzxy1k04wdfkqsrxddp6iz72b9hxz9jmgx3l7nl2z"; + rev = "6f52d0ce62a34e3f5bd29aa4d7068030d700d94a"; + sha256 = "0pchi88ib7nzz6rdc91dpxq1k3q2021m8245v0yqh0ilbvvvyj7i"; }; } { @@ -142,8 +151,8 @@ let src = fetchFromGitHub { owner = "hashicorp"; repo = "terraform"; - rev = "v0.2.2"; - sha256 = "05hy9vq8b05nxbmm277ll6p7ncjhxifnqii8y1dralz5x3cw27r3"; + rev = "v0.3.1"; + sha256 = "0z6r9dbqrzxaw4b1vbr14ci85jgz6qrq8p36ylcyabzfvwbxrl1m"; }; } { @@ -151,8 +160,8 @@ let src = fetchFromGitHub { owner = "hashicorp"; repo = "yamux"; - rev = "35417c7dfab4085d7c921b33e4d5ea6cf9ceef65"; - sha256 = "02pk30dgjmp0zz5g3dcll6lf7izmpfh6fw2rp13al7771vaziqyl"; + rev = "9feabe6854fadca1abec9cd3bd2a613fe9a34000"; + sha256 = "03lgbhwhiqk6rivc5cl6zxph5n2pdbdz95h0x7m0ngp3yk3aqgan"; }; } { @@ -169,8 +178,8 @@ let src = fetchFromGitHub { owner = "miekg"; repo = "dns"; - rev = "5cdb7e11a3f60c88cf2dbce42866e7b42c74b394"; - sha256 = "0glzs9r2i5vrncb3skdl987mdzqj2w86fqr5aj64lqgp7ghwj6hw"; + rev = "dc30c7cd4ed2fc8af73d49da4ee285404958b8bd"; + sha256 = "1pqdgjz0qwbbfgya2brsvhj88jp6rmprjwzgjsjnnv9nxwfsbb5s"; }; } { @@ -178,8 +187,8 @@ let src = fetchFromGitHub { owner = "mitchellh"; repo = "cli"; - rev = "bfacda5ba006a32b10ddfe2abad56c11661573eb"; - sha256 = "0lzvsya04nh7m804azanhs28vsk4g8knw3yay2yx4wffikbkjbgk"; + rev = "e3c2e3d39391e9beb9660ccd6b4bd9a2f38dd8a0"; + sha256 = "1fwf7wmlhri19bl2yyjd4zlgndgwwqrdry45clpszzjsr8b5wfgm"; }; } { @@ -205,8 +214,8 @@ let src = fetchFromGitHub { owner = "ugorji"; repo = "go"; - rev = "e906e395b9d45d3230e800c8ad1f92f99764e753"; - sha256 = "0dqzbxa4ziw10sa5ksl8sfzm0rhrddp6gs732zs9bjkq4rl50j89"; + rev = "a7f0616e8cd41d08149bec05c87524abe4e0520e"; + sha256 = "1sxbsvfb46gp6jpb8wy9z6329g2zzbm07xnzml627dsvwdcxvy4q"; }; } ]; From 927c78cbaa2dd663b646356b98198a37497340d5 Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Mon, 17 Nov 2014 23:40:28 +0100 Subject: [PATCH 065/383] webkitgtk: fix build --- pkgs/development/libraries/webkitgtk/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/libraries/webkitgtk/default.nix b/pkgs/development/libraries/webkitgtk/default.nix index 08576c2ebc3..3cbf3698732 100644 --- a/pkgs/development/libraries/webkitgtk/default.nix +++ b/pkgs/development/libraries/webkitgtk/default.nix @@ -17,6 +17,8 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ iyzsong koral ]; }; + preConfigure = "patchShebangs Tools"; + src = fetchurl { url = "http://webkitgtk.org/releases/${name}.tar.xz"; sha256 = "1f9qm5g1mbjm2hrnlzymas99piws4h4y3yxz4p6f6gavnsvfjwji"; From 15eec14f3af049a4dec7cd1987d3cb2f18d2b39c Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Mon, 17 Nov 2014 22:38:32 +0000 Subject: [PATCH 066/383] Removes roadsend (broken) --- .../compilers/roadsend/default.nix | 40 ------------------- pkgs/top-level/all-packages.nix | 2 - 2 files changed, 42 deletions(-) delete mode 100644 pkgs/development/compilers/roadsend/default.nix diff --git a/pkgs/development/compilers/roadsend/default.nix b/pkgs/development/compilers/roadsend/default.nix deleted file mode 100644 index f17cbbbda9a..00000000000 --- a/pkgs/development/compilers/roadsend/default.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ composableDerivation, fetchurl, bigloo, curl, fcgi ? null, libxml2 ? null, mysql ? null }: - -let edf = composableDerivation.edf; in - -composableDerivation.composableDerivation {} { - name = "roadsend-2.9.3"; - - buildInputs = [bigloo curl]; - - flags = edf { name = "pcre"; } - // edf { name = "fcgi"; enable = { inherit fcgi; }; } - // edf { name = "xml"; enable = { buildInputs = [ libxml2 ]; }; } - // edf { name = "mysql"; enable = { buildInputs = [ mysql ]; }; } - // edf { name = "odbc"; }; - # // edf { name = "gtk"} } - # // edf { name = "gtk2", enable = { buildInputs = [ mysql ]; } } - - cfg = { - pcreSupport = true; - fcgiSupport = true; - xmlSupport = true; - mysqlSupport = true; - }; - - src = fetchurl { - url = "http://code.roadsend.com/snaps/roadsend-php-20081210.tar.bz2"; - sha256 = "0yhpiik0dyayd964wvn2k0cq7b1gihx1k3qx343r2l7lla4mapsx"; - }; - - # tell pcc where to find the fastcgi library - postInstall = " sed -e \"s=(ldflags fastcgi.*=(ldflags -l fastcgi -L \$fcgi)=\" -i \$out/etc/pcc.conf "; - - meta = { - description = "A PHP to C compiler"; - homepage = http://www.roadsend.com; - # you can choose one of the following licenses: - # Runtime license is LPGL 2.1 - license = ["GPL2"]; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 97cd824246d..70aa2e74425 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3777,8 +3777,6 @@ let ocaml = ocaml_3_08_0; }; - roadsend = callPackage ../development/compilers/roadsend { }; - rustc = callPackage ../development/compilers/rustc/0.12.nix {}; rustcMaster = callPackage ../development/compilers/rustc/head.nix {}; From 1825255272058414c8d9db35e65f76d7ba0567ba Mon Sep 17 00:00:00 2001 From: John Wiegley Date: Mon, 17 Nov 2014 17:29:42 -0600 Subject: [PATCH 067/383] coq_HEAD: update --- pkgs/applications/science/logic/coq/HEAD.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/science/logic/coq/HEAD.nix b/pkgs/applications/science/logic/coq/HEAD.nix index 293fcaf8cee..edf3091ef16 100644 --- a/pkgs/applications/science/logic/coq/HEAD.nix +++ b/pkgs/applications/science/logic/coq/HEAD.nix @@ -3,7 +3,7 @@ {stdenv, fetchgit, writeText, pkgconfig, ocaml, findlib, camlp5, ncurses, lablgtk ? null}: let - version = "8.5pre-edbd6a21"; + version = "8.5pre-52f51fb3"; coq-version = "8.5"; buildIde = lablgtk != null; ideFlags = if buildIde then "-lablgtkdir ${lablgtk}/lib/ocaml/*/site-lib/lablgtk2 -coqide opt" else ""; @@ -17,8 +17,8 @@ stdenv.mkDerivation { src = fetchgit { url = git://scm.gforge.inria.fr/coq/coq.git; - rev = "edbd6a211c934778d9721c36463836ef902b4fdd"; - sha256 = "19zk1lghqljh86z2kv6kpxwzinpkbwxzf244dmszx31zw4zdrskl"; + rev = "52f51fb385d6a1c90bd7d055185fee50ef2670be"; + sha256 = "0pgp59j2j8vk7nmcja5smly39dpkqfhpp29wpsn71piq6n52pql3"; }; buildInputs = [ pkgconfig ocaml findlib camlp5 ncurses lablgtk ]; From 117f3359ace66dcec4ad1df4af057ad3e70c68c6 Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Tue, 18 Nov 2014 01:02:43 +0100 Subject: [PATCH 068/383] nixos: document default GNOME 3.12 in the 14.11 release notes --- nixos/doc/manual/release-notes/rl-1411.xml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/doc/manual/release-notes/rl-1411.xml b/nixos/doc/manual/release-notes/rl-1411.xml index e355118139d..f26cfee7a2c 100644 --- a/nixos/doc/manual/release-notes/rl-1411.xml +++ b/nixos/doc/manual/release-notes/rl-1411.xml @@ -28,6 +28,8 @@ services.httpd.package = pkgs.apacheHttpd_2_2; is now called ve-container-name rather than c-container-name. + GNOME 3.10 support has been dropped. The default GNOME version is now 3.12. + From 4d807e55aa854b825756016d0af40f84d9af6d8f Mon Sep 17 00:00:00 2001 From: Charles Strahan Date: Tue, 18 Nov 2014 00:36:12 +0000 Subject: [PATCH 069/383] sublime3: set rpath for libbz2 and libssl This fixes the Package Control package. --- pkgs/applications/editors/sublime3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/sublime3/default.nix b/pkgs/applications/editors/sublime3/default.nix index 87310efc875..c27f5171de5 100644 --- a/pkgs/applications/editors/sublime3/default.nix +++ b/pkgs/applications/editors/sublime3/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, glib, xlibs, cairo, gtk, pango, makeWrapper}: +{ fetchurl, stdenv, glib, xlibs, cairo, gtk, pango, makeWrapper, openssl, bzip2 }: assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux"; @@ -41,7 +41,7 @@ in let mkdir -p $out cp -prvd * $out/ # Without this, plugin_host crashes, even though it has the rpath - wrapProgram $out/plugin_host --prefix LD_PRELOAD : ${stdenv.gcc.gcc}/lib${stdenv.lib.optionalString stdenv.is64bit "64"}/libgcc_s.so.1 + wrapProgram $out/plugin_host --prefix LD_PRELOAD : ${stdenv.gcc.gcc}/lib${stdenv.lib.optionalString stdenv.is64bit "64"}/libgcc_s.so.1:${openssl}/lib/libssl.so:${bzip2}/lib/libbz2.so ''; }; in stdenv.mkDerivation { From 2d252e78c13dec4892419728c452864e4ea0230f Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 18 Nov 2014 00:47:23 +0000 Subject: [PATCH 070/383] boehm-gc: fixes URLs in meta --- pkgs/development/libraries/boehm-gc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/boehm-gc/default.nix b/pkgs/development/libraries/boehm-gc/default.nix index 68b1fb1c9ba..5ee0cd5291d 100644 --- a/pkgs/development/libraries/boehm-gc/default.nix +++ b/pkgs/development/libraries/boehm-gc/default.nix @@ -37,10 +37,10 @@ stdenv.mkDerivation rec { C or C++ programs, though that is not its primary goal. ''; - homepage = http://www.hpl.hp.com/personal/Hans_Boehm/gc/; + homepage = http://hboehm.info/gc/; # non-copyleft, X11-style license - license = "http://www.hpl.hp.com/personal/Hans_Boehm/gc/license.txt"; + license = http://hboehm.info/gc/license.txt; maintainers = [ stdenv.lib.maintainers.ludo ]; platforms = stdenv.lib.platforms.all; From 1354bc0eba455e9ce0621355778b412773b39048 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 18 Nov 2014 00:25:15 +0000 Subject: [PATCH 071/383] Updates (and fixes) opa --- pkgs/development/compilers/opa/default.nix | 57 +++++-------- pkgs/development/compilers/opa/libdir.patch | 93 --------------------- pkgs/development/compilers/opa/locate.patch | 14 ---- pkgs/top-level/all-packages.nix | 4 +- 4 files changed, 25 insertions(+), 143 deletions(-) delete mode 100644 pkgs/development/compilers/opa/libdir.patch delete mode 100644 pkgs/development/compilers/opa/locate.patch diff --git a/pkgs/development/compilers/opa/default.nix b/pkgs/development/compilers/opa/default.nix index c25080229ff..f0b503bd0be 100644 --- a/pkgs/development/compilers/opa/default.nix +++ b/pkgs/development/compilers/opa/default.nix @@ -1,32 +1,25 @@ -{ stdenv, fetchurl, which, ocaml, perl, jdk -, findlib, ocaml_ssl, openssl, cryptokit, camlzip, ulex -, ocamlgraph, coreutils, zlib, ncurses, makeWrapper -, gcc, binutils, gnumake, nodejs, git } : +{ stdenv, fetchgit, which, perl, jdk +, ocamlPackages, openssl +, coreutils, zlib, ncurses, makeWrapper +, gcc, binutils, gnumake, nodejs} : stdenv.mkDerivation rec { pname = "opa"; - version = "4308"; + version = "4309"; name = "${pname}-${version}"; - src = fetchurl { - url = "https://github.com/MLstate/opalang/tarball/v${version}"; - name = "opa-${version}.tar.gz"; - sha256 = "1farii9474i14ack6bpqm1jihs6i8pvwky3a7q8v8pbnl4i6lb5g"; + src = fetchgit { + url = https://github.com/MLstate/opalang.git; + rev = "047f58bfd4be35ee30176156b3718c707a6c0f76"; + sha256 = "1jbxfrmpbjjk7qvaxdn47044w5m8wr96q9yx65ib3wlapmjbvdvf"; }; # Paths so the opa compiler code generation will use the same programs as were # used to build opa. - codeGeneratorPaths = "${ocaml}/bin:${gcc}/bin:${binutils}/bin:${gnumake}/bin"; - - prePatch = '' - find . -type f -exec sed -i 's@/usr/bin/env@${coreutils}/bin/env@' {} \; - find . -type f -exec sed -i 's@/usr/bin/perl@${perl}/bin/perl@' {} \; - ''; - - patches = []; + codeGeneratorPaths = "${ocamlPackages.ocaml}/bin:${gcc}/bin:${binutils}/bin:${gnumake}/bin:${nodejs}/bin"; preConfigure = '' - configureFlags="$configureFlags -prefix $out" + patchShebangs . ( cat ./compiler/buildinfos/buildInfos.ml.pre ./compiler/buildinfos/generate_buildinfos.sh . --release --version ./compiler/buildinfos/version_major.txt @@ -36,14 +29,17 @@ stdenv.mkDerivation rec { )> ./compiler/buildinfos/buildInfos.ml ''; - dontAddPrefix = true; + prefixKey = "-prefix "; - configureFlags = "-ocamlfind ${findlib}/bin/ocamlfind "; + configureFlags = "-ocamlfind ${ocamlPackages.findlib}/bin/ocamlfind "; - buildInputs = [ which ocaml perl jdk findlib ocaml_ssl openssl cryptokit camlzip ulex - ocamlgraph coreutils zlib ncurses makeWrapper gcc binutils gnumake - nodejs git - ]; + buildInputs = [ which perl jdk openssl coreutils zlib ncurses + makeWrapper gcc binutils gnumake nodejs + ] ++ (with ocamlPackages; [ + ocaml findlib ocaml_ssl cryptokit camlzip ulex ocamlgraph + ]); + + NIX_LDFLAGS = "-lgcc_s"; postInstall = '' # Have compiler use same tools for code generation as used to build it. @@ -53,7 +49,7 @@ stdenv.mkDerivation rec { # Install emacs mode. mkdir -p $out/share/emacs/site-lisp/opa - install -m 0644 -v ./utils/emacs/{opa-mode.el,site-start.el} $out/share/emacs/site-lisp/opa + install -m 0644 -v ./tools/editors/emacs/{opa-mode.el,site-start.el} $out/share/emacs/site-lisp/opa ''; meta = { @@ -66,15 +62,6 @@ stdenv.mkDerivation rec { homepage = http://opalang.org/; license = stdenv.lib.licenses.gpl3; maintainers = [ stdenv.lib.maintainers.kkallio ]; - platforms = [ "x86_64-linux" ]; - # File "compiler/libqmlcompil/dbGen/schema_io.ml", line 199, characters 3-53: - # Error: Signature mismatch: - # ... - # The field `remove_edge_e' is required but not provided - # The field `remove_edge' is required but not provided - # The field `remove_vertex' is required but not provided - # Command exited with code 2. - # make: *** [node] Error 10 - broken = true; + platforms = with stdenv.lib.platforms; linux; }; } diff --git a/pkgs/development/compilers/opa/libdir.patch b/pkgs/development/compilers/opa/libdir.patch deleted file mode 100644 index 05c8a89afa8..00000000000 --- a/pkgs/development/compilers/opa/libdir.patch +++ /dev/null @@ -1,93 +0,0 @@ -These patches have the compiler place path flags in various places so that -ocaml and c libraries are found in their Nixpkgs locations. - -diff -x '*~' -Naur MLstate-opalang-6b295a9//build_rules.ml MLstate-opalang-6b295a9-new//build_rules.ml ---- MLstate-opalang-6b295a9//build_rules.ml 2011-11-21 08:07:04.000000000 -0430 -+++ MLstate-opalang-6b295a9-new//build_rules.ml 2011-11-27 00:34:35.845277134 -0430 -@@ -373,7 +373,11 @@ - | Some dep -> dep::list - ) (tags_of_pathname (env "%.opa_plugin")) [] - in -- let lib_dir s = [A"--ml";A"-I";A"--ml";P (if Pathname.exists s then ".." / s else ("+"^s))] in -+ let cryptokitdir_opt = function -+ | Some path -> path -+ | None -> "" -+ in -+ let lib_dir s = [A"--ml";A"-I";A"--ml";P (if Pathname.exists s then ".." / s else (if s = "cryptokit" then (cryptokitdir_opt Config.Libdir.cryptokit) else ("+"^s)))] in - let include_dirs = List.flatten (List.map lib_dir caml_use_lib) in - let files = List.map ((^) path) files in - build_list build files; -diff -x '*~' -Naur MLstate-opalang-6b295a9//config.mli MLstate-opalang-6b295a9-new//config.mli ---- MLstate-opalang-6b295a9//config.mli 2011-11-21 08:07:04.000000000 -0430 -+++ MLstate-opalang-6b295a9-new//config.mli 2011-11-27 00:30:39.312443906 -0430 -@@ -43,6 +43,9 @@ - (** Flag for Dbm present *) - val has_dbm : bool - -+(** openssh link directory *) -+val openssl : string option -+ - (** library directories, if the libs are enabled *) - val libnatpmp : (string*string*string) option (** name of the lib, lib dir, include dir *) - -diff -x '*~' -Naur MLstate-opalang-6b295a9//configure MLstate-opalang-6b295a9-new//configure ---- MLstate-opalang-6b295a9//configure 2011-11-21 08:07:04.000000000 -0430 -+++ MLstate-opalang-6b295a9-new//configure 2011-11-27 00:40:52.496151405 -0430 -@@ -27,6 +27,7 @@ - - NO_CAMLIDL=1 - NO_DBM=1 -+CONFIG_LIB_OPENSSL="" - - while [ $# -gt 0 ]; do - case "$1" in -@@ -51,6 +52,11 @@ - shift - OCAMLOPT=$1 - ;; -+ -openssl) -+ if [ $# -lt 2 ]; then echo "Error: option $1 requires an argument" >&2; exit 1; fi -+ shift -+ CONFIG_LIB_OPENSSL=$1 -+ ;; - -ocamlfind) - if [ $# -lt 2 ]; then echo "Error: option $1 requires an argument" >&2; exit 1; fi - shift -@@ -647,6 +653,8 @@ - let miniupnpc = $(camlopt "$HAS_MINIUPNPC" "$(camlstrtuple "${MINIUPNPC[@]}")") - let has_dbm = $(camlbool "$HAS_DBM") - -+let openssl = $(camlopt "$CONFIG_LIB_OPENSSL" '"'"$CONFIG_LIB_OPENSSL"'"') -+ - let available = [ $TAGS_LIST] - let all_tags = [ $(for t in $ALL_TAGS_LIST; do echo -n "\"$t\"; "; done)] - -diff -x '*~' -Naur MLstate-opalang-6b295a9//qml2ocaml/qml2ocamlOptions.ml MLstate-opalang-6b295a9-new//qml2ocaml/qml2ocamlOptions.ml ---- MLstate-opalang-6b295a9//qml2ocaml/qml2ocamlOptions.ml 2011-11-21 08:07:04.000000000 -0430 -+++ MLstate-opalang-6b295a9-new//qml2ocaml/qml2ocamlOptions.ml 2011-11-27 00:32:57.721442828 -0430 -@@ -44,6 +44,7 @@ - - let options_linker = - ["-w a"] -+ @ (match Config.openssl with | Some dir -> ["-ccopt"; "-L"^dir] | None -> []) - @ (if Base.is_windows then - ["-cclib"; "Dnsapi.lib"; "-cclib"; "libeay32.lib"; "-cclib"; "ssleay32.lib" (*; "ssl_stubs.obj" *)] - else []) -@@ -51,11 +52,13 @@ - (** - Absolute path for include directory, will be passed with the option -I to the ocaml compiler. - *) -+ let uselibdirpath = fun po p -> match po with | Some path -> path | None -> p -+ - let server_include_dir = [ -- "+zip" ; "+site-lib/zip" ; "+site-lib/camlzip" ; -- "+ssl" ; "+site-lib/ssl" ; -- "+cryptokit"; "+site-lib/cryptokit" ; -- "+ulex" ; "+site-lib/ulex" ; -+ uselibdirpath Config.Libdir.camlzip "+zip" ; "+site-lib/zip" ; "+site-lib/camlzip" ; -+ uselibdirpath Config.Libdir.ssl "+ssl" ; "+site-lib/ssl" ; -+ uselibdirpath Config.Libdir.cryptokit "+cryptokit"; "+site-lib/cryptokit" ; -+ uselibdirpath Config.Libdir.ulex "+ulex" ; "+site-lib/ulex" ; - ] @ ( - if Config.has_dbm then [ - "+dbm" ; "+site-lib/dbm" ; diff --git a/pkgs/development/compilers/opa/locate.patch b/pkgs/development/compilers/opa/locate.patch deleted file mode 100644 index e67e6bab260..00000000000 --- a/pkgs/development/compilers/opa/locate.patch +++ /dev/null @@ -1,14 +0,0 @@ -Needed to have ocamlfind discover ocamlgraph with Nixpkgs. - -diff -x '*~' -Naur MLstate-opalang-ee92891/configure MLstate-opalang-ee92891-new//configure ---- MLstate-opalang-ee92891/configure 2011-09-30 05:41:18.000000000 -0430 -+++ MLstate-opalang-ee92891-new//configure 2011-11-24 13:47:01.332558705 -0430 -@@ -567,7 +567,7 @@ - fi - - # - checking ocamlgraph --if ! CONFIG_LIB_OCAMLGRAPH=$(locate-ocaml-lib "Graph" "ocamlgraph/graph") -+if ! CONFIG_LIB_OCAMLGRAPH=$(locate-ocaml-lib "Graph" "ocamlgraph" "graph") - then lib-not-found "ocamlgraph" "libocamlgraph-ocaml-dev" - fi - diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 97cd824246d..8f69511565b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3761,7 +3761,9 @@ let ocaml_make = callPackage ../development/ocaml-modules/ocamlmake { }; - opa = let callPackage = newScope pkgs.ocamlPackages_4_00_1; in callPackage ../development/compilers/opa { }; + opa = callPackage ../development/compilers/opa { + ocamlPackages = ocamlPackages_4_00_1; + }; opam_1_0_0 = callPackage ../development/tools/ocaml/opam/1.0.0.nix { }; opam_1_1 = callPackage ../development/tools/ocaml/opam/1.1.nix { From e6698855a7c8eaf38bfc55dd79811e60aaeda746 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Bernardy Date: Tue, 18 Nov 2014 08:50:47 +0100 Subject: [PATCH 072/383] haskell-parsek: update to have consistent license --- pkgs/development/libraries/haskell/parsek/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/parsek/default.nix b/pkgs/development/libraries/haskell/parsek/default.nix index 6ca9cd719b1..45bb96561c3 100644 --- a/pkgs/development/libraries/haskell/parsek/default.nix +++ b/pkgs/development/libraries/haskell/parsek/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "parsek"; - version = "1.0.1"; - sha256 = "197hjys71f9qgsw83w3wrmijimjzvb9cy4kywkqr95ack8a7pizn"; + version = "1.0.1.2"; + sha256 = "0ybh76cx5y73ywhlv4g2z74x1mvg5n2rxl045mscs6dwcyw9vhbd"; meta = { description = "Parallel Parsing Processes"; license = self.stdenv.lib.licenses.gpl3; From 73db2dab55ac007de81448b3886649aed702db04 Mon Sep 17 00:00:00 2001 From: Mateusz Kowalczyk Date: Tue, 18 Nov 2014 07:58:50 +0000 Subject: [PATCH 073/383] agda-iowa-stdlib: update to r18734 Now works with Agda 2.4.2.1 --- pkgs/development/libraries/agda/agda-iowa-stdlib/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/agda/agda-iowa-stdlib/default.nix b/pkgs/development/libraries/agda/agda-iowa-stdlib/default.nix index e8efcf3d1eb..2c76c2f4350 100644 --- a/pkgs/development/libraries/agda/agda-iowa-stdlib/default.nix +++ b/pkgs/development/libraries/agda/agda-iowa-stdlib/default.nix @@ -1,13 +1,13 @@ { stdenv, agda, fetchsvn }: agda.mkDerivation (self: rec { - version = "18437"; + version = "18734"; name = "agda-iowa-stdlib-${version}"; src = fetchsvn { url = "https://svn.divms.uiowa.edu/repos/clc/projects/agda/lib"; rev = version; - sha256 = "1g6pwvrcir53ppf6wd8s62gizc3qy35mp229b66mh53abg4brik2"; + sha256 = "0aqib88m5n6aqb5lmns9nl62x40yqhg6zpj0zjxibbn4s4qjw9ky"; }; sourceDirectories = [ "./." ]; @@ -22,6 +22,5 @@ agda.mkDerivation (self: rec { license = stdenv.lib.licenses.free; platforms = stdenv.lib.platforms.unix; maintainers = with stdenv.lib.maintainers; [ fuuzetsu ]; - broken = true; }; }) From d9f94dc51d6858a864a37e882532dfa44becd7cd Mon Sep 17 00:00:00 2001 From: Tim Dysinger Date: Tue, 18 Nov 2014 08:59:15 +0100 Subject: [PATCH 074/383] purescript-0.6.1 release --- pkgs/development/libraries/haskell/purescript/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/purescript/default.nix b/pkgs/development/libraries/haskell/purescript/default.nix index 473b5157bcf..b4a28877ea3 100644 --- a/pkgs/development/libraries/haskell/purescript/default.nix +++ b/pkgs/development/libraries/haskell/purescript/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "purescript"; - version = "0.6.0.2"; - sha256 = "1fkbdpfbx7sywcaybw8y5s3x44xlpkrp24gvl0286kajmciix2f8"; + version = "0.6.1"; + sha256 = "0b2alnavqs700b59v8ifyl3qwwialmpwzk8mgiwi0i6n7h0afsm9"; isLibrary = true; isExecutable = true; buildDepends = [ From c0ee8187dddc40af0bbc6b0b286cefdefa63a80b Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 18 Nov 2014 09:54:35 +0100 Subject: [PATCH 075/383] sqlite: Update to 3.8.7.1 --- pkgs/development/libraries/sqlite/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/sqlite/default.nix b/pkgs/development/libraries/sqlite/default.nix index e1e2be3137b..0598b0bd684 100644 --- a/pkgs/development/libraries/sqlite/default.nix +++ b/pkgs/development/libraries/sqlite/default.nix @@ -3,11 +3,11 @@ assert interactive -> readline != null && ncurses != null; stdenv.mkDerivation { - name = "sqlite-3.8.7"; + name = "sqlite-3.8.7.1"; src = fetchurl { - url = "http://www.sqlite.org/2014/sqlite-autoconf-3080700.tar.gz"; - sha1 = "8b773b006db46f3ffcbabe065e927823d13bf5c0"; + url = "http://www.sqlite.org/2014/sqlite-autoconf-3080701.tar.gz"; + sha1 = "5601be1263842209d7c5dbf6128f1cc0b6bbe2e5"; }; buildInputs = lib.optionals interactive [ readline ncurses ]; From c4364d591423d40bd3191f0235cac5c6d32d9f6f Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 18 Nov 2014 09:56:41 +0100 Subject: [PATCH 076/383] firefox: Update to 33.1.1 --- pkgs/applications/networking/browsers/firefox/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/firefox/default.nix b/pkgs/applications/networking/browsers/firefox/default.nix index bb96d417a4d..fde1547f4d4 100644 --- a/pkgs/applications/networking/browsers/firefox/default.nix +++ b/pkgs/applications/networking/browsers/firefox/default.nix @@ -15,14 +15,14 @@ assert stdenv.gcc ? libc && stdenv.gcc.libc != null; -let version = "33.1"; in +let version = "33.1.1"; in stdenv.mkDerivation rec { name = "firefox-${version}"; src = fetchurl { url = "http://ftp.mozilla.org/pub/mozilla.org/firefox/releases/${version}/source/firefox-${version}.source.tar.bz2"; - sha1 = "bc87055d3b68e8458f07d0c04503b6aaed3771df"; + sha1 = "1e9e3176e7d221c4f2ce479f37ee7c432236a0ec"; }; buildInputs = From 73aef348bbdfd51841d730ded46b4bc5417c4d92 Mon Sep 17 00:00:00 2001 From: Longrin Wischnewski Date: Tue, 18 Nov 2014 11:14:17 +0100 Subject: [PATCH 077/383] hdf5: move to a more stable URL --- pkgs/tools/misc/hdf5/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/misc/hdf5/default.nix b/pkgs/tools/misc/hdf5/default.nix index 3eea2fc9190..bcfca5fddb5 100644 --- a/pkgs/tools/misc/hdf5/default.nix +++ b/pkgs/tools/misc/hdf5/default.nix @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { version = "1.8.14"; name = "hdf5-${version}"; src = fetchurl { - url = "http://www.hdfgroup.org/ftp/HDF5/current/src/hdf5-${version}.tar.gz"; + url = "http://www.hdfgroup.org/ftp/HDF5/releases/hdf5-${version}/src/hdf5-${version}.tar.gz"; sha256 = "0f86gv32pjrrphvamgims1dd7f3bp46hjarbcdy8k4gmyzpgxghx"; }; From 253c54e411c786e261b780464f0a2cad556430d7 Mon Sep 17 00:00:00 2001 From: Moritz Ulrich Date: Tue, 18 Nov 2014 11:23:26 +0100 Subject: [PATCH 078/383] Dwarf Fortress: Update to 0.40.16. --- pkgs/games/dwarf-fortress/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/games/dwarf-fortress/default.nix b/pkgs/games/dwarf-fortress/default.nix index c2f40131094..851b97ad7d0 100644 --- a/pkgs/games/dwarf-fortress/default.nix +++ b/pkgs/games/dwarf-fortress/default.nix @@ -4,7 +4,8 @@ /* set copyDataDirectory as true by default since df 40 does not seem to run without it */ let - + baseVersion = "40"; + patchVersion = "16"; srcs = { df_unfuck = fetchgit { url = "https://github.com/svenstaro/dwarf_fortress_unfuck"; @@ -13,8 +14,8 @@ let }; df = fetchurl { - url = "http://www.bay12games.com/dwarves/df_40_15_linux.tar.bz2"; - sha256 = "1mmz7mnsm2y5n2aqyf30zrflyl58haaj6p380pi4022gbd13mnsn"; + url = "http://www.bay12games.com/dwarves/df_${baseVersion}_${patchVersion}_linux.tar.bz2"; + sha256 = "0045ac9wz1spm4yajrnq5v802ks7aajk422zqkhsd331s1fhpirc"; }; }; @@ -23,7 +24,7 @@ in assert stdenv.system == "i686-linux"; stdenv.mkDerivation rec { - name = "dwarf-fortress-0.40.15"; + name = "dwarf-fortress-0.${baseVersion}.${patchVersion}"; buildInputs = [ SDL SDL_image SDL_ttf gtk2 glib glew mesa ncurses openal glibc libsndfile pango atk cmake gdk_pixbuf]; @@ -105,6 +106,6 @@ stdenv.mkDerivation rec { description = "control a dwarven outpost or an adventurer in a randomly generated, persistent world"; homepage = http://www.bay12games.com/dwarves; license = stdenv.lib.licenses.unfreeRedistributable; - maintainers = [stdenv.lib.maintainers.roconnor]; + maintainers = with stdenv.lib.maintainers; [ roconnor the-kenny ]; }; } From 32d09e2699cb490f1b9bb7472934a46e382836ca Mon Sep 17 00:00:00 2001 From: Chris Double Date: Tue, 18 Nov 2014 09:52:29 +1300 Subject: [PATCH 079/383] Update Tor Browser to 4.0.1 Updates Tor Browser to 4.0.1. This requires the gcc 4.9 runtime. Add myself to the maintainers. --- pkgs/tools/security/tor/torbrowser.nix | 18 +++++++++--------- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 12 insertions(+), 10 deletions(-) diff --git a/pkgs/tools/security/tor/torbrowser.nix b/pkgs/tools/security/tor/torbrowser.nix index f220a46bddc..15660630201 100644 --- a/pkgs/tools/security/tor/torbrowser.nix +++ b/pkgs/tools/security/tor/torbrowser.nix @@ -20,18 +20,18 @@ let in stdenv.mkDerivation rec { name = "tor-browser-${version}"; - version = "3.6.2"; + version = "4.0.1"; src = fetchurl { url = "https://archive.torproject.org/tor-package-archive/torbrowser/${version}/tor-browser-linux${bits}-${version}_en-US.tar.xz"; sha256 = if bits == "64" then - "1rfv59k9mia6hr1z1k4im20dy59ir7i054cgf78sfj1zsh08q7hf" else - "1klkk1k5r51pcx44r1z3sw08fqcl2f2v5iblf4yh83js482c37r8"; + "1cz36g7jfcz8xs7sa2fl44g1bxlrl0psbsx5hig6j5ydsl87vyak" else + "135ya109skzd4x8zhmsiwjg6d533yijbdrscm36lsplgcf7dx8l3"; }; patchPhase = '' patchelf --set-interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" Browser/firefox - patchelf --set-interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" Tor/tor + patchelf --set-interpreter "$(cat $NIX_GCC/nix-support/dynamic-linker)" Browser/TorBrowser/Tor/tor ''; doCheck = true; @@ -41,7 +41,7 @@ in stdenv.mkDerivation rec { echo "Checking firefox..." LD_LIBRARY_PATH=${ldLibraryPath} Browser/firefox --help 1> /dev/null echo "Checking tor..." - LD_LIBRARY_PATH=${torEnv}/lib:Tor Tor/tor --help 1> /dev/null + LD_LIBRARY_PATH=${torEnv}/lib:Browser/TorBrowser/Tor Browser/TorBrowser/Tor/tor --help 1> /dev/null ''; installPhase = '' @@ -50,13 +50,13 @@ in stdenv.mkDerivation rec { cp -R * $out/share/tor-browser cat > "$out/bin/tor-browser" << EOF - export HOME="\$HOME/.torbrowser" + export HOME="\$HOME/.torbrowser4" if [ ! -d \$HOME ]; then - mkdir -p \$HOME && cp -R $out/share/tor-browser/Data \$HOME/ && chmod -R +w \$HOME + mkdir -p \$HOME && cp -R $out/share/tor-browser/Browser/TorBrowser/Data \$HOME/ && chmod -R +w \$HOME echo "pref(\"extensions.torlauncher.tordatadir_path\", \"\$HOME/Data/Tor/\");" >> \ ~/Data/Browser/profile.default/preferences/extension-overrides.js fi - export LD_LIBRARY_PATH=${ldLibraryPath}:$out/share/tor-browser/Tor + export LD_LIBRARY_PATH=${ldLibraryPath}:$out/share/tor-browser/Browser/TorBrowser/Tor $out/share/tor-browser/Browser/firefox -no-remote -profile ~/Data/Browser/profile.default "$@" EOF chmod +x $out/bin/tor-browser @@ -68,6 +68,6 @@ in stdenv.mkDerivation rec { description = "Tor Browser Bundle for GNU/Linux, everything you need to safely browse the Internet"; homepage = https://www.torproject.org/; platforms = ["i686-linux" "x86_64-linux"]; - maintainers = [ maintainers.offline maintainers.matejc ]; + maintainers = [ maintainers.offline maintainers.matejc maintainers.doublec ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1c28384c506..634151c3d92 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2497,7 +2497,9 @@ let torbutton = callPackage ../tools/security/torbutton { }; - torbrowser = callPackage ../tools/security/tor/torbrowser.nix { }; + torbrowser = callPackage ../tools/security/tor/torbrowser.nix { + stdenv = overrideGCC stdenv gcc49; + }; torsocks = callPackage ../tools/security/tor/torsocks.nix { }; From 76167c6d15c741fea506f367e0b9021cce04783a Mon Sep 17 00:00:00 2001 From: Attila Sztupak Date: Tue, 18 Nov 2014 12:33:50 +0000 Subject: [PATCH 080/383] crashplan: 3.6.3 -> 3.6.4 --- pkgs/applications/backup/crashplan/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/backup/crashplan/default.nix b/pkgs/applications/backup/crashplan/default.nix index 8359c0dbc39..1a78dea2157 100644 --- a/pkgs/applications/backup/crashplan/default.nix +++ b/pkgs/applications/backup/crashplan/default.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, makeWrapper, jre, cpio, gawk, gnugrep, gnused, procps, swt, gtk2, glib, libXtst }: -let version = "3.6.3"; +let version = "3.6.4"; in stdenv.mkDerivation rec { name = "crashplan-${version}"; crashPlanArchive = fetchurl { url = "http://download.crashplan.com/installs/linux/install/CrashPlan/CrashPlan_${version}_Linux.tgz"; - sha256 = "0v01fzc62bxr6lpamnxg1nb7vh4a8ky6mahbq76kmjxfqv7q0mb0"; + sha256 = "0xmzpxfm8vghk552jy167wg1nky1pp93dqds1p922hn73g0x5cv3"; }; srcs = [ crashPlanArchive ]; From c7d83e5ee087eb97fdcf0655100f4502cc558349 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Tue, 18 Nov 2014 10:52:12 -0200 Subject: [PATCH 081/383] Bochs: upgrade to 2.6.7 Now, with SDL2 upgrade! --- pkgs/applications/virtualization/bochs/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/virtualization/bochs/default.nix b/pkgs/applications/virtualization/bochs/default.nix index a3e7a5b2994..914114467e6 100644 --- a/pkgs/applications/virtualization/bochs/default.nix +++ b/pkgs/applications/virtualization/bochs/default.nix @@ -2,7 +2,7 @@ , pkgconfig, libtool , gtk, mesa, readline, libX11, libXpm , docbook_xml_dtd_45, docbook_xsl -, sdlSupport ? true, SDL ? null +, sdlSupport ? true, SDL2 ? null , termSupport ? true , ncurses ? null , wxSupport ? false, wxGTK ? null # Warning! Broken # Optional, undocumented dependencies @@ -10,7 +10,7 @@ , curlSupport ? false, curl ? null }: -assert sdlSupport -> (SDL != null); +assert sdlSupport -> (SDL2 != null); assert termSupport -> (ncurses != null); assert wxSupport -> (gtk != null && wxGTK != null); assert wgetSupport -> (wget != null); @@ -19,11 +19,11 @@ assert curlSupport -> (curl != null); stdenv.mkDerivation rec { name = "bochs-${version}"; - version = "2.6.6"; + version = "2.6.7"; src = fetchurl { url = "http://downloads.sourceforge.net/project/bochs/bochs/${version}/${name}.tar.gz"; - sha256 = "0nlrl218x93vz97n46aw2szsalx97r020mn43fjsif100v7zix6f"; + sha256 = "10l2pgzwnmng0rd44kqv7y46nwpcc18j53h3kf3dlqlnd7mlwdd4"; }; # The huge list of configurable options @@ -71,7 +71,7 @@ stdenv.mkDerivation rec { buildInputs = with stdenv.lib; [ pkgconfig libtool gtk mesa readline libX11 libXpm docbook_xml_dtd_45 docbook_xsl ] ++ optionals termSupport [ ncurses ] - ++ optionals sdlSupport [ SDL ] + ++ optionals sdlSupport [ SDL2 ] ++ optionals wxSupport [ wxGTK ] ++ optionals wgetSupport [ wget ] ++ optionals curlSupport [ curl ]; @@ -105,7 +105,7 @@ stdenv.mkDerivation rec { "--enable-raw-serial=no" ] # Boolean flags ++ stdenv.lib.optional termSupport "--with-term" - ++ stdenv.lib.optional sdlSupport "--with-sdl" + ++ stdenv.lib.optional sdlSupport "--with-sdl2" ++ stdenv.lib.optional wxSupport "--with-wx" ++ stdenv.lib.optional largefile "--enable-largefile" ++ stdenv.lib.optional idleHack "--enable-idle-hack" From f9c2d0a7a3635c4ecba5a630a80402796b1847fe Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Sat, 27 Sep 2014 17:34:38 -0300 Subject: [PATCH 082/383] Stella: update to 4.1.1 --- pkgs/misc/emulators/stella/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/misc/emulators/stella/default.nix b/pkgs/misc/emulators/stella/default.nix index 768d018ba51..a0b33032cea 100644 --- a/pkgs/misc/emulators/stella/default.nix +++ b/pkgs/misc/emulators/stella/default.nix @@ -1,14 +1,13 @@ -{ stdenv, fetchurl, pkgconfig -, SDL2 }: +{ stdenv, fetchurl, pkgconfig, SDL2 }: stdenv.mkDerivation rec { name = "stella-${version}"; - version = "4.0"; + version = "4.1.1"; src = fetchurl { url = "http://downloads.sourceforge.net/project/stella/stella/${version}/${name}-src.tar.gz"; - sha256 = "1j96sj2qflq3agb7fvb08ih3pxy8nsvlkwj40q3n00q9k884ad5w"; + sha256 = "1gg3z3drg3cdz1vzd0xdgkgl7jxp04hijdd1wmmymph6j1dwwf22"; }; buildInputs = with stdenv.lib; From a86ba451bf717d44a96915668e1bcdab6edcef9d Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Tue, 18 Nov 2014 11:11:45 -0200 Subject: [PATCH 083/383] Stella: update to 4.2 --- pkgs/misc/emulators/stella/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/emulators/stella/default.nix b/pkgs/misc/emulators/stella/default.nix index a0b33032cea..d26b5281efa 100644 --- a/pkgs/misc/emulators/stella/default.nix +++ b/pkgs/misc/emulators/stella/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "stella-${version}"; - version = "4.1.1"; + version = "4.2"; src = fetchurl { url = "http://downloads.sourceforge.net/project/stella/stella/${version}/${name}-src.tar.gz"; - sha256 = "1gg3z3drg3cdz1vzd0xdgkgl7jxp04hijdd1wmmymph6j1dwwf22"; + sha256 = "0aikd7l5ill0vl5q06dg1wly8v9vav7wd78yjm6rmikd0cd2irzh"; }; buildInputs = with stdenv.lib; From 213536568bd64fdcbfd9969f29d817a450662bab Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Tue, 18 Nov 2014 11:25:29 -0200 Subject: [PATCH 084/383] Tilda: update to 1.2.2 --- pkgs/applications/misc/tilda/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/tilda/default.nix b/pkgs/applications/misc/tilda/default.nix index 7edd86c7409..187ab039014 100644 --- a/pkgs/applications/misc/tilda/default.nix +++ b/pkgs/applications/misc/tilda/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { name = "tilda-${version}"; - version = "1.1.13"; + version = "1.2.2"; src = fetchurl { url = "https://github.com/lanoxx/tilda/archive/${name}.tar.gz"; - sha256 = "1b9rnyrdvqmw2xjv899a4k6hvr9w482c4xvlpfnckckxdyp2852d"; + sha256 = "1mzly0llsrxpc2yd1hml3gmwm023my2j3aszjw383pp34dab2nl5"; }; buildInputs = [ pkgconfig autoreconfHook gettext confuse vte gtk makeWrapper ]; From a24225da614fe702245011d49864b6db70daa31a Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Tue, 18 Nov 2014 11:31:55 -0200 Subject: [PATCH 085/383] Youtube-DL: update to 2014.11.16 --- pkgs/tools/misc/youtube-dl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/youtube-dl/default.nix b/pkgs/tools/misc/youtube-dl/default.nix index 9fbc17f16d2..0a68ec60eb8 100644 --- a/pkgs/tools/misc/youtube-dl/default.nix +++ b/pkgs/tools/misc/youtube-dl/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, python, zip }: let - version = "2014.11.13.3"; + version = "2014.11.16"; in stdenv.mkDerivation rec { name = "youtube-dl-${version}"; src = fetchurl { url = "http://youtube-dl.org/downloads/${version}/${name}.tar.gz"; - sha256 = "1qv59pd84fwm95p9gb1v2dy3qd02x530nccw8yh6gfwdfmg353lp"; + sha256 = "0i0j5dzmwil5x5qh6bghqy7zmj8wqqilp5m9sq95vqmsxpjfgw3q"; }; buildInputs = [ python ]; From 849232f13dcaad81540682162cb3b69c6733dd7e Mon Sep 17 00:00:00 2001 From: Max Gonzih Date: Tue, 18 Nov 2014 14:42:07 +0100 Subject: [PATCH 086/383] Update sha256 for mutt sidebar patch Seems like file was changed. --- pkgs/applications/networking/mailreaders/mutt/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/mailreaders/mutt/default.nix b/pkgs/applications/networking/mailreaders/mutt/default.nix index 4091876cbe3..744e68b402d 100644 --- a/pkgs/applications/networking/mailreaders/mutt/default.nix +++ b/pkgs/applications/networking/mailreaders/mutt/default.nix @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { patches = [] ++ (stdenv.lib.optional withSidebar (fetchurl { url = http://lunar-linux.org/~tchan/mutt/patch-1.5.23.sidebar.20140412.txt; - sha256 = "0bq556sycl0qkr5vg5c3l16bh2bifqc2j7d64n4hw19q0ba2b45w"; + sha256 = "1i2r7dj0pd1k0z3jjxn2szi6sf0k28i8dwhr4f65pn8r2lh3wisz"; })); meta = with stdenv.lib; { From b46201250c6290d6e9c37133d891455992b27f35 Mon Sep 17 00:00:00 2001 From: Moritz Ulrich Date: Tue, 18 Nov 2014 14:38:55 +0100 Subject: [PATCH 087/383] gforth: Install gforth.el & add meta-data. --- pkgs/development/compilers/gforth/default.nix | 25 ++++++++++++++++--- 1 file changed, 21 insertions(+), 4 deletions(-) diff --git a/pkgs/development/compilers/gforth/default.nix b/pkgs/development/compilers/gforth/default.nix index d710f672995..c6165bb5586 100644 --- a/pkgs/development/compilers/gforth/default.nix +++ b/pkgs/development/compilers/gforth/default.nix @@ -1,10 +1,27 @@ { stdenv, fetchurl, m4 }: -stdenv.mkDerivation rec { - name = "gforth-0.7.3"; +let + version = "0.7.3"; +in +stdenv.mkDerivation { + name = "gforth-${version}"; src = fetchurl { - url = "http://ftp.gnu.org/gnu/gforth/gforth-0.7.3.tar.gz"; + url = "http://ftp.gnu.org/gnu/gforth/gforth-${version}.tar.gz"; sha256 = "1c1bahc9ypmca8rv2dijiqbangm1d9av286904yw48ph7ciz4qig"; }; + buildInputs = [ m4 ]; -} \ No newline at end of file + + postInstall = '' + mkdir -p $out/share/emacs/site-lisp + cp gforth.el $out/share/emacs/site-lisp/ + ''; + + meta = { + description = "The Forth implementation of the GNU project"; + homepage = https://www.gnu.org/software/gforth/; + license = stdenv.lib.licenses.gpl3; + platforms = stdenv.lib.platforms.all; + maintainers = with stdenv.lib.maintainers; [ the-kenny ]; + }; +} From fda5c17a6f6d2fdc736532acfdd31539c949e4be Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Tue, 18 Nov 2014 14:49:14 +0100 Subject: [PATCH 088/383] vmTools: Fix permissions on /tmp and /dev/* --- pkgs/build-support/vm/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix index 18b5b3063f0..4aaccabc300 100644 --- a/pkgs/build-support/vm/default.nix +++ b/pkgs/build-support/vm/default.nix @@ -52,11 +52,11 @@ rec { createDeviceNodes = dev: '' - mknod ${dev}/null c 1 3 - mknod ${dev}/zero c 1 5 - mknod ${dev}/random c 1 8 - mknod ${dev}/urandom c 1 9 - mknod ${dev}/tty c 5 0 + mknod -m 666 ${dev}/null c 1 3 + mknod -m 666 ${dev}/zero c 1 5 + mknod -m 666 ${dev}/random c 1 8 + mknod -m 666 ${dev}/urandom c 1 9 + mknod -m 666 ${dev}/tty c 5 0 mknod ${dev}/rtc c 254 0 . /sys/class/block/${hd}/uevent mknod ${dev}/${hd} b $MAJOR $MINOR @@ -118,7 +118,7 @@ rec { mount -t 9p store /fs/nix/store -o trans=virtio,version=9p2000.L,msize=262144,cache=loose mkdir -p /fs/tmp - mount -t tmpfs -o "mode=755" none /fs/tmp + mount -t tmpfs -o "mode=1777" none /fs/tmp echo "mounting host's temporary directory..." mkdir -p /fs/tmp/xchg From 9512e0cd0b0301e30f752c6aa007db2b5e10cacc Mon Sep 17 00:00:00 2001 From: Longrin Wischnewski Date: Tue, 18 Nov 2014 15:12:58 +0100 Subject: [PATCH 089/383] Symbola: update hash for PDF file --- pkgs/data/fonts/symbola/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/data/fonts/symbola/default.nix b/pkgs/data/fonts/symbola/default.nix index 70375a22bae..259cb904d7f 100644 --- a/pkgs/data/fonts/symbola/default.nix +++ b/pkgs/data/fonts/symbola/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { }; docs_pdf = fetchurl { url = "http://users.teilar.gr/~g1951d/Symbola.pdf"; - sha256 = "11h2202p1p4np4nv5m8k41wk7431p2m35sjpmbi1ygizakkbla3p"; + sha256 = "16f37fsi2zyy3ka409g3m5d9c09l0ba3rqkz912j90p4588dvk85"; }; buildInputs = [ unzip ]; From dbe2f139cfce114172b164cb0c61e8e01bc0097b Mon Sep 17 00:00:00 2001 From: Longrin Wischnewski Date: Tue, 18 Nov 2014 15:20:26 +0100 Subject: [PATCH 090/383] Symbola: bump from 7.17 to 7.18 --- pkgs/data/fonts/symbola/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/fonts/symbola/default.nix b/pkgs/data/fonts/symbola/default.nix index 259cb904d7f..7efb1ea3947 100644 --- a/pkgs/data/fonts/symbola/default.nix +++ b/pkgs/data/fonts/symbola/default.nix @@ -1,11 +1,11 @@ {stdenv, fetchurl, unzip }: stdenv.mkDerivation rec { - name = "symbola-7.17"; + name = "symbola-7.18"; src = fetchurl { url = "http://users.teilar.gr/~g1951d/Symbola.zip"; - sha256 = "19q5wcqk1rz8ps7jvvx1rai6x8ais79z71sm8d36hvsk2vr135al"; + sha256 = "1dk0qawlgdfh58pz2wb80rs9h8m20nmnr4bhk6jmva8201ixz62f"; }; docs_pdf = fetchurl { url = "http://users.teilar.gr/~g1951d/Symbola.pdf"; From f9432af1e26b200487d77c809336ef8ca3d1c9c0 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 18 Nov 2014 14:34:08 +0000 Subject: [PATCH 091/383] ocaml-cmdliner: update from 0.9.5 to 0.9.6 --- pkgs/development/ocaml-modules/cmdliner/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/ocaml-modules/cmdliner/default.nix b/pkgs/development/ocaml-modules/cmdliner/default.nix index 2dfd7ba1286..0a35dc92296 100644 --- a/pkgs/development/ocaml-modules/cmdliner/default.nix +++ b/pkgs/development/ocaml-modules/cmdliner/default.nix @@ -2,7 +2,7 @@ let pname = "cmdliner"; - version = "0.9.5"; + version = "0.9.6"; ocaml_version = (builtins.parseDrvName ocaml.name).version; in @@ -14,7 +14,7 @@ stdenv.mkDerivation { src = fetchurl { url = "http://erratique.ch/software/${pname}/releases/${pname}-${version}.tbz"; - sha256 = "a0e199c4930450e12edf81604eeceddeeb32d55c43438be689e60df282277a7e"; + sha256 = "1i08yjkk5wln60bw9rrllh6ajjgq14cvzvcci8y1nk5v6ys7jr8p"; }; unpackCmd = "tar xjf $src"; From 8d2b3e11f3af6ab6147c3b469145f505f8a5a49e Mon Sep 17 00:00:00 2001 From: Longrin Wischnewski Date: Tue, 18 Nov 2014 15:43:09 +0100 Subject: [PATCH 092/383] jmeter: fix download URL --- pkgs/applications/networking/jmeter/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/jmeter/default.nix b/pkgs/applications/networking/jmeter/default.nix index 77aeb64478f..4f936f2677e 100644 --- a/pkgs/applications/networking/jmeter/default.nix +++ b/pkgs/applications/networking/jmeter/default.nix @@ -3,7 +3,7 @@ stdenv.mkDerivation rec { name = "jmeter-2.11"; src = fetchurl { - url = "http://ftp.unicamp.br/pub/apache//jmeter/binaries/apache-${name}.tgz"; + url = "http://archive.apache.org/dist/jmeter/binaries/apache-${name}.tgz"; sha256 = "1fr3sw06qncb6yygcf2lbnkxma4v1dbigpf39ajrm0isxbpyv944"; }; From f54c852a366c343eae8996b3b9b62fea750af8cf Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Tue, 18 Nov 2014 16:06:36 +0100 Subject: [PATCH 093/383] docker: update from 1.3.0 to 1.3.1, potentially fixes CVE-2014-5277 --- pkgs/applications/virtualization/docker/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index b5292b908f7..354666f3374 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -3,11 +3,11 @@ btrfsProgs, iptables, bash, e2fsprogs, xz}: stdenv.mkDerivation rec { name = "docker-${version}"; - version = "1.3.0"; + version = "1.3.1"; src = fetchurl { url = "https://github.com/dotcloud/docker/archive/v${version}.tar.gz"; - sha256 = "09bn88i8acv7kw39js1p7mgf3sglq7d782xnafkp0i97svf0x4y9"; + sha256 = "0w1gz1apkcrmhgng2rkkzy7wmxm68zgs6a16bi4cx3a38n4mgday"; }; buildInputs = [ makeWrapper go sqlite lxc iproute bridge_utils devicemapper btrfsProgs iptables e2fsprogs]; From 0aa742989f528b128cb51e6664f9457070d3d355 Mon Sep 17 00:00:00 2001 From: Rob Vermaas Date: Tue, 18 Nov 2014 16:06:44 +0100 Subject: [PATCH 094/383] mysql_jdbc: update from 5.1.31 to 5.1.32, potentially fixes CVE-2012-0075, CVE-2012-0087, CVE-2012-0101, CVE-2012-0102, CVE-2012-0112, CVE-2012-0113, CVE-2012-0114, CVE-2012-0115, CVE-2012-0116, CVE-2012-0118, CVE-2012-0119, CVE-2012-0120, CVE-2012-0484, CVE-2012-0485, CVE-2012-0490, CVE-2012-0492, CVE-2012-0540, CVE-2012-0553, CVE-2012-0572, CVE-2012-0574, CVE-2012-0583, CVE-2012-0882, CVE-2012-1688, CVE-2012-1689, CVE-2012-1690, CVE-2012-1696, CVE-2012-1697, CVE-2012-1702, CVE-2012-1703, CVE-2012-1705, CVE-2012-1734, CVE-2012-2102, CVE-2012-2749, CVE-2012-3150, CVE-2012-3158, CVE-2012-3160, CVE-2012-3163, CVE-2012-3166, CVE-2012-3167, CVE-2012-3173, CVE-2012-3177, CVE-2012-3180, CVE-2012-3197, CVE-2012-5060, CVE-2013-0375, CVE-2013-0383, CVE-2013-0384, CVE-2013-0385, CVE-2013-0389, CVE-2013-1492, CVE-2013-1506, CVE-2013-1521, CVE-2013-1548, CVE-2013-1552, CVE-2013-1555, CVE-2013-2378, CVE-2013-2389, CVE-2013-2391, CVE-2013-2392, CVE-2013-3802, CVE-2013-3804, CVE-2013-3808, CVE-2013-5908, CVE-2014-0386, CVE-2014-0393, CVE-2014-0401, CVE-2014-0402, CVE-2014-0412, CVE-2014-0437 --- pkgs/servers/sql/mysql/jdbc/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/sql/mysql/jdbc/default.nix b/pkgs/servers/sql/mysql/jdbc/default.nix index 7fde706479d..59643fa3e00 100644 --- a/pkgs/servers/sql/mysql/jdbc/default.nix +++ b/pkgs/servers/sql/mysql/jdbc/default.nix @@ -1,12 +1,12 @@ {stdenv, fetchurl, ant, unzip}: stdenv.mkDerivation { - name = "mysql-connector-java-5.1.31"; + name = "mysql-connector-java-5.1.32"; builder = ./builder.sh; src = fetchurl { - url = http://dev.mysql.com/get/Downloads/Connector-J/mysql-connector-java-5.1.31.zip; - sha256 = "1j6jvpadlib2hb6n3kh7s9ygjyqvi5gawrmnk1dsvvdcbkk1v871"; + url = http://dev.mysql.com/get/Downloads/Connector-J/mysql-connector-java-5.1.32.zip; + sha256 = "11vjwws1pa8fdwn86rrmqdwsq3ld3sh2r0pp4lpr2gxw0w18ykc7"; }; buildInputs = [ unzip ant ]; From fabbf0c86ac8a6bdb3ceaa1ce4662aecc290cf1a Mon Sep 17 00:00:00 2001 From: Oliver Charles Date: Tue, 18 Nov 2014 16:41:30 +0000 Subject: [PATCH 095/383] haskellPackages.iCalendar: Apply PR #14 to build again --- .../libraries/haskell/iCalendar/default.nix | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/haskell/iCalendar/default.nix b/pkgs/development/libraries/haskell/iCalendar/default.nix index 867474fdfb9..635254bca75 100644 --- a/pkgs/development/libraries/haskell/iCalendar/default.nix +++ b/pkgs/development/libraries/haskell/iCalendar/default.nix @@ -1,7 +1,7 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! { cabal, base64Bytestring, caseInsensitive, dataDefault, mime, mtl -, network, parsec, text, time +, network, networkUri, parsec, text, time, fetchpatch }: cabal.mkDerivation (self: { @@ -10,7 +10,13 @@ cabal.mkDerivation (self: { sha256 = "08m47nxxz70lmmndlgycfb27x8xfwakxi8izbba0f6w23ddaljp3"; buildDepends = [ base64Bytestring caseInsensitive dataDefault mime mtl network - parsec text time + networkUri parsec text time + ]; + patches = [ + (fetchpatch { + url = "https://github.com/tingtun/iCalendar/pull/14.patch"; + sha256 = "0pyzlshckvbqns3yryh9pm5r3n2hpqx0c2i3niyqsh6a1lk9hc5m"; + }) ]; meta = { homepage = "http://github.com/tingtun/iCalendar"; @@ -18,6 +24,5 @@ cabal.mkDerivation (self: { license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; maintainers = with self.stdenv.lib.maintainers; [ ocharles ]; - broken = true; }; }) From 0e4c1cc06602af62fa094883695303b5410cf215 Mon Sep 17 00:00:00 2001 From: aszlig Date: Tue, 18 Nov 2014 18:41:56 +0100 Subject: [PATCH 096/383] nixos: Add rudimentary VM tests for Chromium. Currently, the test is only for testing the user namespace sandbox and even that isn't very representative, because we're running the tests as root. But apart from that, we should have functionality for opening/closing windows and the main goal here is to get them as deterministic as possible, because Chromium usually isn't very nice to chained xdotool keystrokes. And of course, the most important "test" we have here: We know at least whether Chromium works _at_all_. Signed-off-by: aszlig --- nixos/release.nix | 1 + nixos/tests/chromium.nix | 157 +++++++++++++++++++++++++++++++++++++++ 2 files changed, 158 insertions(+) create mode 100644 nixos/tests/chromium.nix diff --git a/nixos/release.nix b/nixos/release.nix index ddb0b495a91..83594629226 100644 --- a/nixos/release.nix +++ b/nixos/release.nix @@ -236,6 +236,7 @@ in rec { tests.avahi = callTest tests/avahi.nix {}; tests.bittorrent = callTest tests/bittorrent.nix {}; tests.blivet = callTest tests/blivet.nix {}; + tests.chromium = callTest tests/chromium.nix {}; tests.cjdns = callTest tests/cjdns.nix {}; tests.containers = callTest tests/containers.nix {}; tests.firefox = callTest tests/firefox.nix {}; diff --git a/nixos/tests/chromium.nix b/nixos/tests/chromium.nix new file mode 100644 index 00000000000..71fa1e5268f --- /dev/null +++ b/nixos/tests/chromium.nix @@ -0,0 +1,157 @@ +import ./make-test.nix ({ pkgs, ... }: rec { + name = "chromium"; + + machine.imports = [ ./common/x11.nix ]; + + startupHTML = pkgs.writeText "chromium-startup.html" '' + + + + + Chromium startup notifier + + + + + + ''; + + testScript = let + xdo = name: text: let + xdoScript = pkgs.writeText "${name}.xdo" text; + in "${pkgs.xdotool}/bin/xdotool '${xdoScript}'"; + in '' + sub createNewWin { + $machine->nest("creating a new Chromium window", sub { + $machine->execute("${xdo "new-window" '' + search --onlyvisible --name "startup done" + windowfocus --sync + windowactivate --sync + key Ctrl+n + ''}"); + }); + } + + sub closeWin { + Machine::retry sub { + $machine->execute("${xdo "close-window" '' + search --onlyvisible --name "new tab" + windowfocus --sync + windowactivate --sync + key Ctrl+w + ''}"); + for (1..20) { + my ($status, $out) = $machine->execute("${xdo "wait-for-close" '' + search --onlyvisible --name "new tab" + ''}"); + return 1 if $status != 0; + $machine->sleep(1); + } + } + } + + sub waitForNewWin { + my $ret = 0; + $machine->nest("waiting for new Chromium window to appear", sub { + for (1..20) { + my ($status, $out) = $machine->execute("${xdo "wait-for-window" '' + search --onlyvisible --name "new tab" + windowfocus --sync + windowactivate --sync + ''}"); + if ($status == 0) { + $ret = 1; + last; + } + $machine->sleep(1); + } + }); + return $ret; + } + + sub createAndWaitForNewWin { + for (1..3) { + createNewWin; + return 1 if waitForNewWin; + } + die "new window didn't appear within 60 seconds"; + } + + sub testNewWin { + my ($desc, $code) = @_; + createAndWaitForNewWin; + subtest($desc, $code); + closeWin; + } + + sub chromiumTest { + my ($channel, $pkg, $code) = @_; + $machine->waitForX; + + my $url = "file://${startupHTML}"; + my $args = "--user-data-dir=/tmp/chromium-$channel"; + $machine->execute( + "ulimit -c unlimited; ". + "$pkg/bin/chromium $args \"$url\" & disown" + ); + $machine->waitUntilSucceeds("${xdo "check-startup" '' + search --sync --onlyvisible --name "startup done" + # close first start help popup + key Escape + windowfocus --sync + windowactivate --sync + ''}"); + + createAndWaitForNewWin; + $machine->screenshot($channel."_emptywin"); + closeWin; + + $machine->screenshot($channel."_startup_done"); + + subtest("Chromium $channel", $code); + + $machine->shutdown; + } + + for ( + ["stable", "${pkgs.chromium}"], + ["beta", "${pkgs.chromiumBeta}"], + ["dev", "${pkgs.chromiumDev}"] + ) { + my ($channel, $pkg) = @$_; + chromiumTest $channel, $pkg, sub { + testNewWin "check sandbox", sub { + $machine->succeed("${xdo "type-url" '' + search --sync --onlyvisible --name "new tab" + windowfocus --sync + type --delay 1000 "chrome://sandbox" + ''}"); + + $machine->succeed("${xdo "submit-url" '' + search --sync --onlyvisible --name "new tab" + windowfocus --sync + key --delay 1000 Return + ''}"); + + $machine->screenshot($channel."_sandbox"); + + $machine->succeed("${xdo "submit-url" '' + search --sync --onlyvisible --name "sandbox status" + windowfocus --sync + key --delay 1000 Ctrl+a Ctrl+c + ''}"); + + my $clipboard = $machine->succeed("${pkgs.xclip}/bin/xclip -o"); + die "sandbox not working properly: $clipboard" + unless $clipboard =~ /suid sandbox.*yes/mi + && $clipboard =~ /pid namespaces.*yes/mi + && $clipboard =~ /network namespaces.*yes/mi + && $clipboard =~ /seccomp.*sandbox.*yes/mi; + }; + }; + } + ''; +}) From fc9f0b89a4ffba27374061dfc07b8a86263ac181 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Tue, 18 Nov 2014 20:33:18 +0100 Subject: [PATCH 097/383] fix evaluation (bad meta.license) --- pkgs/development/libraries/qtkeychain/default.nix | 2 +- pkgs/development/libraries/websocket++/default.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/qtkeychain/default.nix b/pkgs/development/libraries/qtkeychain/default.nix index 7d33e95326a..6ab29fa9ac5 100644 --- a/pkgs/development/libraries/qtkeychain/default.nix +++ b/pkgs/development/libraries/qtkeychain/default.nix @@ -18,6 +18,6 @@ stdenv.mkDerivation rec { meta = { description = "Platform-independent Qt API for storing passwords securely"; homepage = "https://github.com/frankosterfeld/qtkeychain"; - license = stdenv.lib.licenses.BSD3; + license = stdenv.lib.licenses.bsd3; }; } diff --git a/pkgs/development/libraries/websocket++/default.nix b/pkgs/development/libraries/websocket++/default.nix index 0db201fefcd..7146ec4bb5b 100644 --- a/pkgs/development/libraries/websocket++/default.nix +++ b/pkgs/development/libraries/websocket++/default.nix @@ -16,6 +16,6 @@ stdenv.mkDerivation rec { meta = { homepage = "http://www.zaphoyd.com/websocketpp/"; description = "C++/Boost Asio based websocket client/server library"; - license = stdenv.lib.licenses.BSD3; + license = stdenv.lib.licenses.bsd3; }; } From be7d29a03682425e855efd1c8154e9eaedff1626 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Tue, 18 Nov 2014 20:35:33 +0100 Subject: [PATCH 098/383] apulse: update from 0.1.2 to 0.1.4 --- pkgs/misc/apulse/default.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/misc/apulse/default.nix b/pkgs/misc/apulse/default.nix index 9e73afa5922..1a249cc6a2c 100644 --- a/pkgs/misc/apulse/default.nix +++ b/pkgs/misc/apulse/default.nix @@ -1,12 +1,14 @@ -{ stdenv, fetchurl, alsaLib, cmake, pkgconfig, glib }: +{ stdenv, fetchFromGitHub, alsaLib, cmake, pkgconfig, glib }: stdenv.mkDerivation rec { name = "apulse-${version}"; - version = "0.1.2"; + version = "0.1.4"; - src = fetchurl { - url = "https://github.com/i-rinat/apulse/archive/v${version}.tar.gz"; - sha256 = "02906a8iwwjzzkjvhqqai2yd1636cgz9vl69vwq0vkv2v6cn21ky"; + src = fetchFromGitHub { + owner = "i-rinat"; + repo = "apulse"; + rev = "v${version}"; + sha256 = "115z5a0n8lkcqfgz0cgvjw3p7d0nvzfxzd9g0h137ziflyx3ysh1"; }; buildInputs = From 818bd7dd1c28c6f702a3ad825e3b46f3aaa33db9 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Tue, 18 Nov 2014 20:52:29 +0100 Subject: [PATCH 099/383] cppcheck: update from 1.66 to 1.67 --- pkgs/development/tools/analysis/cppcheck/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/cppcheck/default.nix b/pkgs/development/tools/analysis/cppcheck/default.nix index 094cabb7306..d65500d9d50 100644 --- a/pkgs/development/tools/analysis/cppcheck/default.nix +++ b/pkgs/development/tools/analysis/cppcheck/default.nix @@ -4,14 +4,14 @@ let name = "cppcheck"; - version = "1.66"; + version = "1.67"; in stdenv.mkDerivation { name = "${name}-${version}"; src = fetchurl { url = "mirror://sourceforge/${name}/${name}-${version}.tar.bz2"; - sha256 = "1dy1jd9ckqs565iwcv281pc3xmp9fnfw5ydh3wq06pyz74yw4scl"; + sha256 = "1f9azv714mk37mjij29nfyd3hizsnj6wry1mmv7kxj0i1k7w0532"; }; configurePhase = '' From 48032400ca160db16dccbcee324a19678beeeb9e Mon Sep 17 00:00:00 2001 From: Moritz Ulrich Date: Tue, 18 Nov 2014 21:20:53 +0100 Subject: [PATCH 100/383] httrack: update from 3.48.19 to 3.48.20 --- pkgs/tools/backup/httrack/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/backup/httrack/default.nix b/pkgs/tools/backup/httrack/default.nix index fc5b8330522..c09ee6a52f7 100644 --- a/pkgs/tools/backup/httrack/default.nix +++ b/pkgs/tools/backup/httrack/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, zlib, openssl }: stdenv.mkDerivation rec { - version = "3.48.19"; + version = "3.48.20"; name = "httrack-${version}"; src = fetchurl { url = "http://mirror.httrack.com/httrack-${version}.tar.gz"; - sha256 = "1zlayvl6x0ck1g5rvmj7cc88w0an5f4y93r3g5l10hhhl87cvw0n"; + sha256 = "129cpf324ihqxc8mvvkqjfanl17g60zfiqy1zx8ri56dkrg52mii"; }; buildInputs = [ zlib openssl ]; From 546ece8f25575b66d3f3d4417a37c88b691d9f45 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= Date: Tue, 18 Nov 2014 21:23:41 +0100 Subject: [PATCH 101/383] emacs24Packages.rainbowDelimiters: update from 1.3.12 to 1.3.13 --- .../editors/emacs-modes/rainbow-delimiters/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/emacs-modes/rainbow-delimiters/default.nix b/pkgs/applications/editors/emacs-modes/rainbow-delimiters/default.nix index 62b3a0af1fb..2b4223cdc1f 100644 --- a/pkgs/applications/editors/emacs-modes/rainbow-delimiters/default.nix +++ b/pkgs/applications/editors/emacs-modes/rainbow-delimiters/default.nix @@ -1,13 +1,13 @@ {stdenv, fetchurl, emacs}: -let version = "1.3.12"; +let version = "1.3.13"; in stdenv.mkDerivation { name = "emacs-rainbow-delimiters-${version}"; src = fetchurl { url = "https://github.com/jlr/rainbow-delimiters/archive/${version}.tar.gz"; - sha256 = "0l65rqmnrc02q1b406kxc29w5cfpmrmq0glv493pjzhzc5m3r63z"; + sha256 = "075j3nsk4jm0rs5671n28c1wksrfbvpl9a4f89kzcd7sk1h6ncvl"; }; buildInputs = [ emacs ]; From 369ea045deda42cf549eb59308009166b39194b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= Date: Tue, 18 Nov 2014 21:31:08 +0100 Subject: [PATCH 102/383] csound: update from 5.19.01 to 6.03.2 --- pkgs/applications/audio/csound/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/audio/csound/default.nix b/pkgs/applications/audio/csound/default.nix index 19c590330f6..64f3f3586a3 100644 --- a/pkgs/applications/audio/csound/default.nix +++ b/pkgs/applications/audio/csound/default.nix @@ -12,13 +12,13 @@ }: stdenv.mkDerivation { - name = "csound-5.19.01"; + name = "csound-6.03.2"; enableParallelBuilding = true; src = fetchurl { - url = mirror://sourceforge/csound/Csound5.19.01.tar.gz; - sha256 = "078i69jwgadmxwa5ffn8h1py7cmd9asa8swnh38fyp56lzgzn669"; + url = mirror://sourceforge/csound/Csound6.03.2.tar.gz; + sha256 = "0w6ij57dbfjljpf05bb9r91jphwaq1v63rh0713vl2n11d73dy7m"; }; buildInputs = [ cmake libsndfile flex bison alsaLib pulseaudio tcltk ]; From 86fd3ad7a4c1ec0c8709a8750692f148807920a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= Date: Tue, 18 Nov 2014 21:32:58 +0100 Subject: [PATCH 103/383] kde4.digikam: update from 3.5.0 to 4.4.0, potentially fixes CVE-2012-4514 --- pkgs/applications/graphics/digikam/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/digikam/default.nix b/pkgs/applications/graphics/digikam/default.nix index 5bc409d10e5..b067358ea06 100644 --- a/pkgs/applications/graphics/digikam/default.nix +++ b/pkgs/applications/graphics/digikam/default.nix @@ -4,11 +4,11 @@ liblqr1, lensfun, pkgconfig, qjson, libkdcraw, opencv, libkexiv2, libkipi, boost shared_desktop_ontologies, marble, mysql }: stdenv.mkDerivation rec { - name = "digikam-3.5.0"; + name = "digikam-4.4.0"; src = fetchurl { url = "http://download.kde.org/stable/digikam/${name}.tar.bz2"; - sha256 = "0an4awlg0b8pwl6v8p5zfl3aghgnxck2pc322cyk6i6yznj2mgap"; + sha256 = "1sflh3i989f9xi4qym3rzcrx7ahrjf1n9si8c5q05dgm039a4s2w"; }; nativeBuildInputs = [ cmake automoc4 pkgconfig ]; From aa3ba007c1b33cff80c286b53b2c63d647f486b6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= Date: Tue, 18 Nov 2014 21:52:47 +0100 Subject: [PATCH 104/383] mpv: update from 0.6.1 to 0.6.2 --- pkgs/applications/video/mpv/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/video/mpv/default.nix b/pkgs/applications/video/mpv/default.nix index 9eed69abe87..28b3727fa4f 100644 --- a/pkgs/applications/video/mpv/default.nix +++ b/pkgs/applications/video/mpv/default.nix @@ -58,11 +58,11 @@ in stdenv.mkDerivation rec { name = "mpv-${version}"; - version = "0.6.1"; + version = "0.6.2"; src = fetchurl { url = "https://github.com/mpv-player/mpv/archive/v${version}.tar.gz"; - sha256 = "03vzsvvb1dvm4rn70m97fdbzhlqj9crk7zpvcp00bcl956xjfc9s"; + sha256 = "1s42i3vf8i86lx62kw00vvimjizvp8zpxdq53mqhdz1p5im2ylr0"; }; buildInputs = with stdenv.lib; From 71d1542c2d76963ff1ce6fa633e93019c874eb69 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= Date: Tue, 18 Nov 2014 21:52:57 +0100 Subject: [PATCH 105/383] redshift: update from 1.8 to 1.9.1 --- pkgs/applications/misc/redshift/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/redshift/default.nix b/pkgs/applications/misc/redshift/default.nix index 8ee006c5d7f..6070c560815 100644 --- a/pkgs/applications/misc/redshift/default.nix +++ b/pkgs/applications/misc/redshift/default.nix @@ -3,11 +3,11 @@ , GConf, dbus, dbus_glib, makeWrapper, gtk, pygtk, pyxdg, geoclue }: stdenv.mkDerivation rec { - version = "1.8"; + version = "1.9.1"; name = "redshift-${version}"; src = fetchurl { url = "https://github.com/jonls/redshift/archive/v${version}.tar.gz"; - sha256 = "1srj2dwy32h71iqikb4ysv5ipclym80i9lys2ns8vjmclg7hj3vi"; + sha256 = "0rj7lyg4ikwpk1hr1k2bgk9gjqvvv51z8hydsgpx2k2lqdv6lqri"; }; buildInputs = [ From c6d4881a42adeb63bd07379ff90d3876196029c0 Mon Sep 17 00:00:00 2001 From: Robert Helgesson Date: Sat, 15 Nov 2014 17:49:00 +0100 Subject: [PATCH 106/383] Add package 'xml2'. --- pkgs/tools/text/xml/xml2/default.nix | 19 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 21 insertions(+) create mode 100644 pkgs/tools/text/xml/xml2/default.nix diff --git a/pkgs/tools/text/xml/xml2/default.nix b/pkgs/tools/text/xml/xml2/default.nix new file mode 100644 index 00000000000..89d56e030e0 --- /dev/null +++ b/pkgs/tools/text/xml/xml2/default.nix @@ -0,0 +1,19 @@ +{ stdenv, fetchurl, pkgconfig, libxml2 }: + +stdenv.mkDerivation rec { + name = "xml2-0.5"; + + src = fetchurl { + url = "http://download.ofb.net/gale/${name}.tar.gz"; + sha256 = "01cps980m99y99cnmvydihga9zh3pvdsqag2fi1n6k2x7rfkl873"; + }; + + buildInputs = [ pkgconfig libxml2 ]; + + meta = with stdenv.lib; { + homepage = http://ofb.net/~egnor/xml2/; + description = "Tools for command line processing of XML, HTML, and CSV"; + license = licenses.gpl2Plus; + maintainers = [ maintainers.rycee ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 2510867688f..e4e0fad4ed5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2791,6 +2791,8 @@ let xfsprogs = callPackage ../tools/filesystems/xfsprogs { }; + xml2 = callPackage ../tools/text/xml/xml2 { }; + xmlroff = callPackage ../tools/typesetting/xmlroff { inherit (gnome) libgnomeprint; }; From 142c9d76d83d7fae4a823f781fd9cac25874c321 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Tue, 18 Nov 2014 16:05:46 -0500 Subject: [PATCH 107/383] npth: bump --- pkgs/development/libraries/npth/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/npth/default.nix b/pkgs/development/libraries/npth/default.nix index 784b132a2e4..ba75c8aefe7 100644 --- a/pkgs/development/libraries/npth/default.nix +++ b/pkgs/development/libraries/npth/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "npth-1.0"; + name = "npth-1.1"; src = fetchurl { url = "ftp://ftp.gnupg.org/gcrypt/npth/${name}.tar.bz2"; - sha256 = "0vppr13821bkdv8348067l1aj3sb0n0rbmnsgymzy3iifvirvm4s"; + sha256 = "0zyzwmk4mp6pas87jz35zx0jvwdz7x5b13w225gs73gcn8g5cv49"; }; meta = with stdenv.lib; { From 9ec0ff90021c7e6d08e076745ab0286321bb244d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 18 Nov 2014 22:21:04 +0100 Subject: [PATCH 108/383] haskell-js-flot: add version 0.8.3 --- .../libraries/haskell/js-flot/default.nix | 16 ++++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 18 insertions(+) create mode 100644 pkgs/development/libraries/haskell/js-flot/default.nix diff --git a/pkgs/development/libraries/haskell/js-flot/default.nix b/pkgs/development/libraries/haskell/js-flot/default.nix new file mode 100644 index 00000000000..3bc570d557d --- /dev/null +++ b/pkgs/development/libraries/haskell/js-flot/default.nix @@ -0,0 +1,16 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, HTTP }: + +cabal.mkDerivation (self: { + pname = "js-flot"; + version = "0.8.3"; + sha256 = "0yjyzqh3qzhy5h3nql1fckw0gcfb0f4wj9pm85nafpfqp2kg58hv"; + testDepends = [ HTTP ]; + meta = { + homepage = "https://github.com/ndmitchell/js-flot#readme"; + description = "Obtain minified flot code"; + 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 dcf8caac4a3..60b6759f997 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1424,6 +1424,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in jpeg = callPackage ../development/libraries/haskell/jpeg {}; + jsFlot = callPackage ../development/libraries/haskell/js-flot {}; + json = callPackage ../development/libraries/haskell/json {}; jsonAssertions = callPackage ../development/libraries/haskell/json-assertions {}; From 41d98fa03fe53645d880e7c1bf0f2a1d9cdfd625 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 18 Nov 2014 22:21:37 +0100 Subject: [PATCH 109/383] haskell-js-jquery: add version 1.11.1 --- .../libraries/haskell/js-jquery/default.nix | 16 ++++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 18 insertions(+) create mode 100644 pkgs/development/libraries/haskell/js-jquery/default.nix diff --git a/pkgs/development/libraries/haskell/js-jquery/default.nix b/pkgs/development/libraries/haskell/js-jquery/default.nix new file mode 100644 index 00000000000..badeb036543 --- /dev/null +++ b/pkgs/development/libraries/haskell/js-jquery/default.nix @@ -0,0 +1,16 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, HTTP }: + +cabal.mkDerivation (self: { + pname = "js-jquery"; + version = "1.11.1"; + sha256 = "0k4hrpxsc48nanr2zw6jcirirsarlshycx7d5hzqqv9jfhy1i88d"; + testDepends = [ HTTP ]; + meta = { + homepage = "https://github.com/ndmitchell/js-jquery#readme"; + description = "Obtain minified jQuery code"; + 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 60b6759f997..8227c52d4b2 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1426,6 +1426,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in jsFlot = callPackage ../development/libraries/haskell/js-flot {}; + jsJquery = callPackage ../development/libraries/haskell/js-jquery {}; + json = callPackage ../development/libraries/haskell/json {}; jsonAssertions = callPackage ../development/libraries/haskell/json-assertions {}; From f587079dcb9999630366f9b31a4fb188c597af76 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Tue, 18 Nov 2014 22:50:22 +0100 Subject: [PATCH 110/383] haskell-js-jquery: disable the test suite ... which wants to access the network. --- pkgs/development/libraries/haskell/js-jquery/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/haskell/js-jquery/default.nix b/pkgs/development/libraries/haskell/js-jquery/default.nix index badeb036543..ad776b577f4 100644 --- a/pkgs/development/libraries/haskell/js-jquery/default.nix +++ b/pkgs/development/libraries/haskell/js-jquery/default.nix @@ -7,6 +7,7 @@ cabal.mkDerivation (self: { version = "1.11.1"; sha256 = "0k4hrpxsc48nanr2zw6jcirirsarlshycx7d5hzqqv9jfhy1i88d"; testDepends = [ HTTP ]; + doCheck = false; meta = { homepage = "https://github.com/ndmitchell/js-jquery#readme"; description = "Obtain minified jQuery code"; From 25b4674e6700bec306f464b4fff8b9c536153edf Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Tue, 18 Nov 2014 16:58:14 -0500 Subject: [PATCH 111/383] gnupg-2.1: Add socket activation patch --- pkgs/tools/security/gnupg/21.nix | 5 +- .../security/gnupg/socket-activate.patch | 180 ++++++++++++++++++ 2 files changed, 184 insertions(+), 1 deletion(-) create mode 100644 pkgs/tools/security/gnupg/socket-activate.patch diff --git a/pkgs/tools/security/gnupg/21.nix b/pkgs/tools/security/gnupg/21.nix index 8c3854ac23d..e1f849560c8 100644 --- a/pkgs/tools/security/gnupg/21.nix +++ b/pkgs/tools/security/gnupg/21.nix @@ -1,6 +1,6 @@ { fetchurl, stdenv, pkgconfig, libgcrypt, libassuan, libksba, npth , readline ? null, libusb ? null, gnutls ? null, adns ? null, openldap ? null -, zlib ? null, bzip2 ? null, pinentry ? null +, zlib ? null, bzip2 ? null, pinentry ? null, autoreconfHook, gettext }: with stdenv.lib; @@ -12,9 +12,12 @@ stdenv.mkDerivation rec { sha256 = "12q5shx6ldqad3rky154nv8f2cy57sxy9idivz93ggqm1bsw7a0n"; }; + patches = [ ./socket-activate.patch ]; + buildInputs = [ pkgconfig libgcrypt libassuan libksba npth readline libusb gnutls adns openldap zlib bzip2 + autoreconfHook gettext ]; configureFlags = diff --git a/pkgs/tools/security/gnupg/socket-activate.patch b/pkgs/tools/security/gnupg/socket-activate.patch new file mode 100644 index 00000000000..02aa0652e03 --- /dev/null +++ b/pkgs/tools/security/gnupg/socket-activate.patch @@ -0,0 +1,180 @@ +From 8fde13d07c0059040ed531ca3ac365f5780ff240 Mon Sep 17 00:00:00 2001 +From: Shea Levy +Date: Tue, 18 Nov 2014 14:34:53 -0500 +Subject: [PATCH] gpg-agent: Enable socket activation + +This allows gpg-agent to be managed by tools such as systemd or launchd +--- + agent/gpg-agent.c | 62 ++++++++++++++++++++++++++++++++++++------------------ + doc/gpg-agent.texi | 21 +++++++++++++++++- + 2 files changed, 61 insertions(+), 22 deletions(-) + +diff --git a/agent/gpg-agent.c b/agent/gpg-agent.c +index 5960fe3..2f06982 100644 +--- a/agent/gpg-agent.c ++++ b/agent/gpg-agent.c +@@ -124,7 +124,9 @@ enum cmd_and_opt_values + oPuttySupport, + oDisableScdaemon, + oDisableCheckOwnSocket, +- oWriteEnvFile ++ oWriteEnvFile, ++ oAgentFD, ++ oSSHAgentFD + }; + + +@@ -138,6 +140,8 @@ static ARGPARSE_OPTS opts[] = { + { 301, NULL, 0, N_("@Options:\n ") }, + + { oDaemon, "daemon", 0, N_("run in daemon mode (background)") }, ++ { oAgentFD, "agent-fd", 1, "@" }, ++ { oSSHAgentFD, "ssh-agent-fd", 1, "@" }, + { oServer, "server", 0, N_("run in server mode (foreground)") }, + { oVerbose, "verbose", 0, N_("verbose") }, + { oQuiet, "quiet", 0, N_("be somewhat more quiet") }, +@@ -596,6 +600,31 @@ parse_rereadable_options (ARGPARSE_ARGS *pargs, int reread) + return 1; /* handled */ + } + ++/* Handle agent socket(s) */ ++static void ++handle_agent_socks(int fd, int fd_ssh) ++{ ++#ifndef HAVE_W32_SYSTEM ++ if (chdir("/")) ++ { ++ log_error ("chdir to / failed: %s\n", strerror (errno)); ++ exit (1); ++ } ++ ++ { ++ struct sigaction sa; ++ ++ sa.sa_handler = SIG_IGN; ++ sigemptyset (&sa.sa_mask); ++ sa.sa_flags = 0; ++ sigaction (SIGPIPE, &sa, NULL); ++ } ++#endif /*!HAVE_W32_SYSTEM*/ ++ ++ log_info ("%s %s started\n", strusage(11), strusage(13) ); ++ handle_connections (fd, fd_ssh); ++ assuan_sock_close (fd); ++} + + /* The main entry point. */ + int +@@ -612,6 +641,8 @@ main (int argc, char **argv ) + int default_config =1; + int pipe_server = 0; + int is_daemon = 0; ++ int fd_agent = GNUPG_INVALID_FD; ++ int fd_ssh_agent = GNUPG_INVALID_FD; + int nodetach = 0; + int csh_style = 0; + char *logfile = NULL; +@@ -819,6 +850,8 @@ main (int argc, char **argv ) + case oSh: csh_style = 0; break; + case oServer: pipe_server = 1; break; + case oDaemon: is_daemon = 1; break; ++ case oAgentFD: fd_agent = pargs.r.ret_int; break; ++ case oSSHAgentFD: fd_ssh_agent = pargs.r.ret_int; break; + + case oDisplay: default_display = xstrdup (pargs.r.ret_str); break; + case oTTYname: default_ttyname = xstrdup (pargs.r.ret_str); break; +@@ -904,7 +937,8 @@ main (int argc, char **argv ) + bind_textdomain_codeset (PACKAGE_GT, "UTF-8"); + #endif + +- if (!pipe_server && !is_daemon && !gpgconf_list) ++ if (!pipe_server && !is_daemon && !gpgconf_list && ++ fd_agent == GNUPG_INVALID_FD) + { + /* We have been called without any options and thus we merely + check whether an agent is already running. We do this right +@@ -1054,6 +1088,10 @@ main (int argc, char **argv ) + agent_deinit_default_ctrl (ctrl); + xfree (ctrl); + } ++ else if (fd_agent != GNUPG_INVALID_FD) ++ { ++ handle_agent_socks(fd_agent, fd_ssh_agent); ++ } + else if (!is_daemon) + ; /* NOTREACHED */ + else +@@ -1238,26 +1276,8 @@ main (int argc, char **argv ) + log_set_prefix (NULL, oldflags | JNLIB_LOG_RUN_DETACHED); + opt.running_detached = 1; + } +- +- if (chdir("/")) +- { +- log_error ("chdir to / failed: %s\n", strerror (errno)); +- exit (1); +- } +- +- { +- struct sigaction sa; +- +- sa.sa_handler = SIG_IGN; +- sigemptyset (&sa.sa_mask); +- sa.sa_flags = 0; +- sigaction (SIGPIPE, &sa, NULL); +- } + #endif /*!HAVE_W32_SYSTEM*/ +- +- log_info ("%s %s started\n", strusage(11), strusage(13) ); +- handle_connections (fd, opt.ssh_support ? fd_ssh : GNUPG_INVALID_FD); +- assuan_sock_close (fd); ++ handle_agent_socks(fd, opt.ssh_support ? fd_ssh : GNUPG_INVALID_FD); + } + + return 0; +diff --git a/doc/gpg-agent.texi b/doc/gpg-agent.texi +index a4079d7..1556e54 100644 +--- a/doc/gpg-agent.texi ++++ b/doc/gpg-agent.texi +@@ -43,7 +43,15 @@ + .IR file ] + .RI [ options ] + .B \-\-daemon +-.RI [ command_line ] ++.br ++.B gpg-agent ++.RB [ \-\-homedir ++.IR dir ] ++.RB [ \-\-options ++.IR file ] ++.RI [ options ] ++.B \-\-agent-fd ++.IR fd + @end ifset + + @mansect description +@@ -186,6 +194,11 @@ Yet another way is creating + a new process as a child of gpg-agent: @code{gpg-agent --daemon + /bin/sh}. This way you get a new shell with the environment setup + properly; if you exit from this shell, gpg-agent terminates as well. ++ ++@item --agent-fd @var{fd} ++@opindex agent-fd ++Start the gpg-agent using @var{fd} as the listening socket. This is useful for ++socket activation a la systemd and launchd. + @end table + + @mansect options +@@ -532,6 +545,12 @@ Ignore requests to change the current @code{tty} or X window system's + @code{DISPLAY} variable respectively. This is useful to lock the + pinentry to pop up at the @code{tty} or display you started the agent. + ++@item --ssh-agent-fd @var{fd} ++@opindex ssh-agent-fd ++ ++When starting the agent with @option{--agent-fd}, use this to pass in a socket ++to be used for the OpenSSH agent protocol. ++ + @anchor{option --enable-ssh-support} + @item --enable-ssh-support + @opindex enable-ssh-support From 555e3a0debb9ba0ea1cee1f52de2f69aabfcf72c Mon Sep 17 00:00:00 2001 From: Arseniy Seroka Date: Wed, 19 Nov 2014 01:05:30 +0300 Subject: [PATCH 112/383] vim: add plugins --- pkgs/misc/vim-plugins/default.nix | 39 +++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix index fc4d268ff81..cd694feb9b2 100644 --- a/pkgs/misc/vim-plugins/default.nix +++ b/pkgs/misc/vim-plugins/default.nix @@ -330,6 +330,45 @@ rec { }; }; + neosnippet = buildVimPlugin { + name = "neosnippet-git-2014-11-18"; + src = fetchgit { + url = "https://github.com/Shougo/neosnippet.vim.git"; + rev = "811176b29b1a60a164c9878f8dcbe4a680ee32e5"; + sha256 = "903b6fa01511e319e5ce3efa3a7007047512f5f7ee7d61b69cd4a324420cf718"; + }; + meta = { + homepage = https://github.com/Shougo/neosnippet.vim; + maintainers = [ stdenv.lib.maintainers.jagajaga ]; + }; + }; + + neocomplete = buildVimPlugin { + name = "neocomplete-git-2014-11-18"; + src = fetchgit { + url = "https://github.com/Shougo/neocomplete.vim.git"; + rev = "26aef680ece29047089e7540b78696f1e6336be2"; + sha256 = "42734ddb29f6661de687e0d18c5ddbd443adc6d2f69fe8e44d0e47473f1bc0ae"; + }; + meta = { + homepage = https://github.com/Shougo/neocomplete.vim; + maintainers = [ stdenv.lib.maintainers.jagajaga ]; + }; + }; + + neosnippet-snippets = buildVimPlugin { + name = "neosnippet-snippets-git-2014-11-17"; + src = fetchgit { + url = "https://github.com/Shougo/neosnippet-snippets.git"; + rev = "a15cdc307a62d64c3510b4a1097a8bd174746894"; + sha256 = "8d69b93163dd93474422bf4f362130151f25e2c9fad3500ba170161c24bf5bce"; + }; + meta = { + homepage = https://github.com/Shougo/neosnippet-snippets; + maintainers = [ stdenv.lib.maintainers.jagajaga ]; + }; + }; + # vim-pi: quickrun%3146 quickrun = buildVimPlugin { From 40261b7484e5ee4fdbfba4496ee466d6a1533a2f Mon Sep 17 00:00:00 2001 From: Brian McKenna Date: Tue, 18 Nov 2014 20:55:36 -0700 Subject: [PATCH 113/383] Add Flow A static type checker for JavaScript --- .../tools/analysis/flow/default.nix | 27 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 29 insertions(+) create mode 100644 pkgs/development/tools/analysis/flow/default.nix diff --git a/pkgs/development/tools/analysis/flow/default.nix b/pkgs/development/tools/analysis/flow/default.nix new file mode 100644 index 00000000000..0777b5a5f9a --- /dev/null +++ b/pkgs/development/tools/analysis/flow/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchFromGitHub, ocaml, libelf }: + +stdenv.mkDerivation rec { + version = "0.1.0"; + name = "flow-${version}"; + src = fetchFromGitHub { + owner = "facebook"; + repo = "flow"; + rev = "v${version}"; + sha256 = "1f33zmajd6agb36gp8bwj0yqihjhxnkpig9x3a4ggn369x6ixhn3"; + }; + + installPhase = '' + mkdir -p $out/bin + cp bin/flow $out/bin/ + ''; + + buildInputs = [ ocaml libelf ]; + + meta = with stdenv.lib; { + homepage = "http://flowtype.org/"; + description = "A static type checker for JavaScript"; + license = stdenv.lib.licenses.bsd3; + platforms = stdenv.lib.platforms.unix; + maintainers = with maintainers; [ puffnfresh ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e4e0fad4ed5..e04ec226f9e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4470,6 +4470,8 @@ let findbugs = callPackage ../development/tools/analysis/findbugs { }; + flow = callPackage ../development/tools/analysis/flow { }; + pmd = callPackage ../development/tools/analysis/pmd { }; jdepend = callPackage ../development/tools/analysis/jdepend { }; From 75738437a4c2fcff57ae3de8a40eea2d9456eeaa Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Wed, 19 Nov 2014 08:38:44 +0100 Subject: [PATCH 114/383] php: update from 5.4.34 to 5.4.35 (fixes CVE-2014-3710) --- pkgs/development/interpreters/php/5.4.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/interpreters/php/5.4.nix b/pkgs/development/interpreters/php/5.4.nix index 79363f189d0..c9a3ae61862 100644 --- a/pkgs/development/interpreters/php/5.4.nix +++ b/pkgs/development/interpreters/php/5.4.nix @@ -9,7 +9,7 @@ in composableDerivation.composableDerivation {} ( fixed : let inherit (fixed.fixed) version; in { - version = "5.4.34"; + version = "5.4.35"; name = "php-${version}"; From 885a29eefdb1205015e823e2ecdba7c304c5e159 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Wed, 19 Nov 2014 08:40:18 +0100 Subject: [PATCH 115/383] nasm: update from 2.11.05 to 2.11.06 and adopt it --- pkgs/development/compilers/nasm/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/development/compilers/nasm/default.nix b/pkgs/development/compilers/nasm/default.nix index 8219882a2a2..5a95c2dd044 100644 --- a/pkgs/development/compilers/nasm/default.nix +++ b/pkgs/development/compilers/nasm/default.nix @@ -2,16 +2,17 @@ stdenv.mkDerivation rec { name = "nasm-${version}"; - version = "2.11.05"; + version = "2.11.06"; src = fetchurl { url = "http://www.nasm.us/pub/nasm/releasebuilds/${version}/${name}.tar.bz2"; - sha256 = "1sgspnascc0asmwlv3jm1mq4vzx653sa7vlg48z20pfybk7pnhaa"; + sha256 = "0v1y1kx09nzmk8w4v79jxhn15fmi3g7l9nmgkn7ldjl1d5yxkdl7"; }; - meta = { + meta = with stdenv.lib; { homepage = http://www.nasm.us/; description = "An 80x86 and x86-64 assembler designed for portability and modularity"; - platforms = stdenv.lib.platforms.unix; + platforms = platforms.unix; + maintainers = with maintainers; [ pSub ]; }; } From fb5dfbdbc74e43c1a9dc0450807918ab86579b9b Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Wed, 19 Nov 2014 08:42:52 +0100 Subject: [PATCH 116/383] gource: update from 0.42 to 0.43 and adopt it --- .../version-management/gource/default.nix | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/version-management/gource/default.nix b/pkgs/applications/version-management/gource/default.nix index 56095762f04..8d784b3e3d3 100644 --- a/pkgs/applications/version-management/gource/default.nix +++ b/pkgs/applications/version-management/gource/default.nix @@ -3,12 +3,12 @@ }: stdenv.mkDerivation rec { - version = "0.42"; + version = "0.43"; name = "gource-${version}"; src = fetchurl { url = "https://github.com/acaudwell/Gource/releases/download/${name}/${name}.tar.gz"; - sha256 = "08ab57z44y8b5wxg1193j6hiy50njbpi6dwafjh6nb0apcq8ziz5"; + sha256 = "1r5x9ai86f609hf584n0xaf5hxkbilj5qihn89v7ghpmwk40m945"; }; buildInputs = [ @@ -20,10 +20,10 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = "-fpermissive"; # fix build with newer gcc versions - meta = { - homepage = "http://code.google.com/p/gource/"; - description = "software version control visualization tool"; - license = stdenv.lib.licenses.gpl3Plus; + meta = with stdenv.lib; { + homepage = http://code.google.com/p/gource/; + description = "A Software version control visualization tool"; + license = licenses.gpl3Plus; longDescription = '' Software projects are displayed by Gource as an animated tree with the root directory of the project at its centre. Directories @@ -34,6 +34,7 @@ stdenv.mkDerivation rec { Mercurial and Bazaar and SVN. Gource can also parse logs produced by several third party tools for CVS repositories. ''; - platforms = stdenv.lib.platforms.linux; + platforms = platforms.linux; + maintainers = with maintainers; [ pSub ]; }; } From 01783c8dd8ecb542a1295e2efa8f840fdef07e20 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Wed, 19 Nov 2014 08:43:36 +0100 Subject: [PATCH 117/383] ming: update from 0.4.0.rc1 to 0.4.5 --- pkgs/development/libraries/ming/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/ming/default.nix b/pkgs/development/libraries/ming/default.nix index a470f771561..9df90555218 100644 --- a/pkgs/development/libraries/ming/default.nix +++ b/pkgs/development/libraries/ming/default.nix @@ -2,11 +2,11 @@ , perl }: stdenv.mkDerivation rec { - name = "ming-0.4.0.rc1"; + name = "ming-0.4.5"; src = fetchurl { url = "mirror://sourceforge/ming/${name}.tar.bz2"; - sha256 = "19brcqh4mqav5gsnmnb6j4gv9s0rmkg71657ck17xj8fdklq38y7"; + sha256 = "1sws4cs9i9hysr1l0b8hsmqf4gh06ldc24fw6avzr9y3vydhinl2"; }; # We don't currently build the Python, Perl, PHP, etc. bindings. From 6e3318e233278d55dc7aeb1dc2579a14fdac5409 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Wed, 19 Nov 2014 08:44:54 +0100 Subject: [PATCH 118/383] nzbget: update from 0.13 to 0.14 and adopt it --- pkgs/tools/networking/nzbget/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/networking/nzbget/default.nix b/pkgs/tools/networking/nzbget/default.nix index ec14b8ee99a..edf7825a2d3 100644 --- a/pkgs/tools/networking/nzbget/default.nix +++ b/pkgs/tools/networking/nzbget/default.nix @@ -2,11 +2,11 @@ , gnutls, libgcrypt }: stdenv.mkDerivation rec { - name = "nzbget-13.0"; + name = "nzbget-14.0"; src = fetchurl { url = "mirror://sourceforge/nzbget/${name}.tar.gz"; - sha256 = "13lgwwrdv6ds25kj6hj0b5laqaf739n7l3j530x3640zyd254vv6"; + sha256 = "1r9qdp17px8vq3mh18fzxhm5cqd37wcz2vv7hsxdq8rmgxhl7lj1"; }; buildInputs = [ pkgconfig libxml2 ncurses libsigcxx libpar2 gnutls libgcrypt ]; @@ -15,9 +15,10 @@ stdenv.mkDerivation rec { NIX_LDFLAGS = "-lz"; - meta = { + meta = with stdenv.lib; { homepage = http://nzbget.sourceforge.net/; - license = stdenv.lib.licenses.gpl2Plus; + license = licenses.gpl2Plus; description = "A command line tool for downloading files from news servers"; + maintainers = with maintainers; [ pSub ]; }; } From 7862ef25a9468f79931b2952fa02c4e2490b47e4 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Wed, 19 Nov 2014 08:46:19 +0100 Subject: [PATCH 119/383] groff: update from 1.22.2 to 1.22.3 an adopt it --- pkgs/tools/text/groff/default.nix | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/text/groff/default.nix b/pkgs/tools/text/groff/default.nix index cd1d719bdaf..90beca862c0 100644 --- a/pkgs/tools/text/groff/default.nix +++ b/pkgs/tools/text/groff/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, ghostscript, perl, groff }: stdenv.mkDerivation rec { - name = "groff-1.22.2"; + name = "groff-1.22.3"; src = fetchurl { url = "mirror://gnu/groff/${name}.tar.gz"; - sha256 = "0xi07nhj5vdgax37rj25mwxzdmsz1ifx50hjgc6hqbkpqkd6821q"; + sha256 = "1998v2kcs288d3y7kfxpvl369nqi06zbbvjzafyvyl3pr7bajj1s"; }; buildInputs = [ ghostscript ]; @@ -36,11 +36,12 @@ stdenv.mkDerivation rec { find $out/share/doc/${name} -type f -print0 | xargs -0 sed -i -e 's/%%CreationDate: .*//' ''; - meta = { - homepage = "http://www.gnu.org/software/groff/"; + meta = with stdenv.lib; { + homepage = http://www.gnu.org/software/groff/; description = "GNU Troff, a typesetting package that reads plain text and produces formatted output"; - license = stdenv.lib.licenses.gpl3Plus; - platforms = stdenv.lib.platforms.all; + license = licenses.gpl3Plus; + platforms = platforms.all; + maintainers = with maintainers; [ pSub ]; longDescription = '' groff is the GNU implementation of troff, a document formatting From 4ec6e0c935d08400e249ddfef611ebb252f0ee12 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Wed, 19 Nov 2014 08:26:43 +0000 Subject: [PATCH 120/383] mldonkey: adds license information --- pkgs/applications/networking/p2p/mldonkey/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/networking/p2p/mldonkey/default.nix b/pkgs/applications/networking/p2p/mldonkey/default.nix index 57ea6248531..9813393c4b5 100644 --- a/pkgs/applications/networking/p2p/mldonkey/default.nix +++ b/pkgs/applications/networking/p2p/mldonkey/default.nix @@ -11,6 +11,7 @@ stdenv.mkDerivation (rec { meta = { description = "Client for many p2p networks, with multiple frontends"; homepage = http://mldonkey.sourceforge.net/; + license = stdenv.lib.licenses.gpl2; }; buildInputs = [ ocaml zlib ncurses bzip2 file gd libpng ]; From 5519e0d62220bc5263be2eab3efcff5bdecae0fe Mon Sep 17 00:00:00 2001 From: Oliver Charles Date: Wed, 19 Nov 2014 10:54:21 +0000 Subject: [PATCH 121/383] haskellPackages.snapletStripe: Update to 0.3.0 --- .../libraries/haskell/snaplet-stripe/default.nix | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/pkgs/development/libraries/haskell/snaplet-stripe/default.nix b/pkgs/development/libraries/haskell/snaplet-stripe/default.nix index ecc2507a8ca..7320b200120 100644 --- a/pkgs/development/libraries/haskell/snaplet-stripe/default.nix +++ b/pkgs/development/libraries/haskell/snaplet-stripe/default.nix @@ -1,23 +1,22 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, configurator, heist, mtl, snap, stripe, text, textFormat -, transformers, xmlhtml +{ cabal, configurator, heist, lensFamilyCore, mtl, snap, stripe +, text, textFormat, transformers, xmlhtml }: cabal.mkDerivation (self: { pname = "snaplet-stripe"; - version = "0.2.0"; - sha256 = "01ichbwk31zfjq5rc09scz0j4ir6b7jnppdvmm8ilvkj7bl442xs"; + version = "0.3.0"; + sha256 = "0j85vzfmw6skag8rfww4gsg1lyfc7qbxiqhmwbsh4vfjiagrc9wp"; buildDepends = [ - configurator heist mtl snap stripe text textFormat transformers - xmlhtml + configurator heist lensFamilyCore mtl snap stripe text textFormat + transformers xmlhtml ]; - jailbreak = true; meta = { homepage = "https://github.com/LukeHoersten/snaplet-stripe"; description = "Stripe snaplet for the Snap Framework"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; - broken = true; + maintainers = with self.stdenv.lib.maintainers; [ ocharles ]; }; }) From 2f71724a0209c3672770ec0c18dc001153528f53 Mon Sep 17 00:00:00 2001 From: Mateusz Kowalczyk Date: Wed, 19 Nov 2014 10:55:13 +0000 Subject: [PATCH 122/383] tibia: update to 10.63 --- pkgs/games/tibia/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/games/tibia/default.nix b/pkgs/games/tibia/default.nix index 4168a84cebc..8cb8befb084 100644 --- a/pkgs/games/tibia/default.nix +++ b/pkgs/games/tibia/default.nix @@ -3,11 +3,11 @@ with stdenv.lib; assert stdenv.isi686; stdenv.mkDerivation { - name = "tibia-10.62"; + name = "tibia-10.63"; src = fetchurl { - url = http://static.tibia.com/download/tibia1062.tgz; - sha256 = "0s7kxq3li0z8d23x51bwn2bc4vxj309vr9rzwr2025sm6yxn3x5l"; + url = http://static.tibia.com/download/tibia1063.tgz; + sha256 = "1kycc8wc69yx9v9f3nxd9548wgic9rs8pccyh2vgflcaqq0kbrqf"; }; shell = stdenv.shell; From 825e99808c1ca05973c084f4bd0509b844ca51b8 Mon Sep 17 00:00:00 2001 From: Cray Elliott Date: Wed, 19 Nov 2014 03:03:00 -0800 Subject: [PATCH 123/383] add a platform to all of my packages --- pkgs/applications/misc/doomseeker/default.nix | 1 + pkgs/games/chocolate-doom/default.nix | 1 + pkgs/games/eternity-engine/default.nix | 1 + pkgs/games/odamex/default.nix | 1 + pkgs/misc/emulators/dolphin-emu/default.nix | 1 + pkgs/misc/emulators/dolphin-emu/master.nix | 1 + pkgs/misc/emulators/retroarch/default.nix | 1 + 7 files changed, 7 insertions(+) diff --git a/pkgs/applications/misc/doomseeker/default.nix b/pkgs/applications/misc/doomseeker/default.nix index 4a06ee9a1b1..404fb955386 100644 --- a/pkgs/applications/misc/doomseeker/default.nix +++ b/pkgs/applications/misc/doomseeker/default.nix @@ -23,6 +23,7 @@ stdenv.mkDerivation rec { homepage = http://doomseeker.drdteam.org/; description = "Multiplayer server browser for many Doom source ports"; license = stdenv.lib.licenses.gpl2; + platforms = stdenv.lib.platforms.unix; maintainers = with stdenv.lib.maintainers; [ MP2E ]; }; } diff --git a/pkgs/games/chocolate-doom/default.nix b/pkgs/games/chocolate-doom/default.nix index ce38d06d655..75cee19c680 100644 --- a/pkgs/games/chocolate-doom/default.nix +++ b/pkgs/games/chocolate-doom/default.nix @@ -18,6 +18,7 @@ stdenv.mkDerivation rec { homepage = http://chocolate-doom.org/; description = "A Doom source port that accurately reproduces the experience of Doom as it was played in the 1990s"; license = stdenv.lib.licenses.gpl2Plus; + platforms = stdenv.lib.platforms.unix; maintainers = with stdenv.lib.maintainers; [ MP2E ]; }; } diff --git a/pkgs/games/eternity-engine/default.nix b/pkgs/games/eternity-engine/default.nix index 2e04c76a990..f9ff7a5ae0c 100644 --- a/pkgs/games/eternity-engine/default.nix +++ b/pkgs/games/eternity-engine/default.nix @@ -24,6 +24,7 @@ stdenv.mkDerivation rec { homepage = http://doomworld.com/eternity; description = "New school Doom port by James Haley"; license = stdenv.lib.licenses.gpl3; + platforms = stdenv.lib.platforms.linux; maintainers = with stdenv.lib.maintainers; [ MP2E ]; }; } diff --git a/pkgs/games/odamex/default.nix b/pkgs/games/odamex/default.nix index 7b7ab1c155a..f24e6155ec6 100644 --- a/pkgs/games/odamex/default.nix +++ b/pkgs/games/odamex/default.nix @@ -19,6 +19,7 @@ stdenv.mkDerivation rec { homepage = http://odamex.net/; description = "A client/server port for playing old-school Doom online"; license = stdenv.lib.licenses.gpl2; + platforms = stdenv.lib.platforms.unix; maintainers = with stdenv.lib.maintainers; [ MP2E ]; }; } diff --git a/pkgs/misc/emulators/dolphin-emu/default.nix b/pkgs/misc/emulators/dolphin-emu/default.nix index 8028498d669..275e6f06520 100644 --- a/pkgs/misc/emulators/dolphin-emu/default.nix +++ b/pkgs/misc/emulators/dolphin-emu/default.nix @@ -28,6 +28,7 @@ stdenv.mkDerivation rec { homepage = http://dolphin-emu.org/; description = "Gamecube/Wii/Triforce emulator for x86_64 and ARM"; license = stdenv.lib.licenses.gpl2; + platforms = stdenv.lib.platforms.linux; maintainers = with stdenv.lib.maintainers; [ MP2E ]; }; } diff --git a/pkgs/misc/emulators/dolphin-emu/master.nix b/pkgs/misc/emulators/dolphin-emu/master.nix index ca35ed1f092..2285f0d5d64 100644 --- a/pkgs/misc/emulators/dolphin-emu/master.nix +++ b/pkgs/misc/emulators/dolphin-emu/master.nix @@ -30,6 +30,7 @@ stdenv.mkDerivation rec { homepage = http://dolphin-emu.org/; description = "Gamecube/Wii/Triforce emulator for x86_64 and ARM"; license = stdenv.lib.licenses.gpl2; + platforms = stdenv.lib.platforms.linux; maintainers = with stdenv.lib.maintainers; [ MP2E ]; }; } diff --git a/pkgs/misc/emulators/retroarch/default.nix b/pkgs/misc/emulators/retroarch/default.nix index ff08523845b..aa17bac7343 100644 --- a/pkgs/misc/emulators/retroarch/default.nix +++ b/pkgs/misc/emulators/retroarch/default.nix @@ -26,6 +26,7 @@ stdenv.mkDerivation rec { homepage = http://libretro.org/; description = "Multi-platform emulator frontend for libretro cores"; license = licenses.gpl3; + platforms = stdenv.lib.platforms.linux; maintainers = with maintainers; [ MP2E ]; }; } From aa9c9aecbe89434af82e4e08a90a51f6efdefa5b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benno=20F=C3=BCnfst=C3=BCck?= Date: Wed, 19 Nov 2014 12:38:46 +0100 Subject: [PATCH 124/383] xvkbd: set meta.platforms --- pkgs/tools/X11/xvkbd/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/X11/xvkbd/default.nix b/pkgs/tools/X11/xvkbd/default.nix index f365065c9c4..37af62e8cdf 100644 --- a/pkgs/tools/X11/xvkbd/default.nix +++ b/pkgs/tools/X11/xvkbd/default.nix @@ -25,5 +25,6 @@ stdenv.mkDerivation rec { homepage = http://homepage3.nifty.com/tsato/xvkbd/; license = licenses.gpl2Plus; maintainers = [ maintainers.bennofs ]; + platforms = platforms.linux; }; } From 76f065a8de0e2bc78de09516109ce4b7d58a2142 Mon Sep 17 00:00:00 2001 From: Rickard Nilsson Date: Wed, 19 Nov 2014 12:55:42 +0100 Subject: [PATCH 125/383] nixos/riemann: Add option configFiles --- nixos/modules/services/monitoring/riemann.nix | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/monitoring/riemann.nix b/nixos/modules/services/monitoring/riemann.nix index a1935c29a04..ab37d717b86 100644 --- a/nixos/modules/services/monitoring/riemann.nix +++ b/nixos/modules/services/monitoring/riemann.nix @@ -11,11 +11,15 @@ let cfg.extraClasspathEntries ++ [ "${riemann}/share/java/riemann.jar" ] ); + riemannConfig = concatStringsSep "\n" ( + [cfg.config] ++ (map (f: ''(load-file "${f}")'') cfg.configFiles) + ); + launcher = writeScriptBin "riemann" '' #!/bin/sh exec ${openjdk}/bin/java ${concatStringsSep "\n" cfg.extraJavaOpts} \ -cp ${classpath} \ - riemann.bin ${writeText "riemann.config" cfg.config} + riemann.bin ${writeText "riemann-config.clj" riemannConfig} ''; in { @@ -36,6 +40,16 @@ in { Contents of the Riemann configuration file. ''; }; + configFiles = mkOption { + type = with types; listOf path; + default = []; + description = '' + Extra files containing Riemann configuration. These files will be + loaded at runtime by Riemann (with Clojure's + load-file function) at the end of the + configuration. + ''; + }; extraClasspathEntries = mkOption { type = with types; listOf str; default = []; From 63d936621210076893a0dfbaa0bfe0f90ccdf70d Mon Sep 17 00:00:00 2001 From: Rickard Nilsson Date: Wed, 19 Nov 2014 12:56:32 +0100 Subject: [PATCH 126/383] nixos/haveged: Fix incorrect unit configuration (documentation -> Documentation) --- nixos/modules/services/security/haveged.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/security/haveged.nix b/nixos/modules/services/security/haveged.nix index 1d52ed55dbd..2aa523bf70a 100644 --- a/nixos/modules/services/security/haveged.nix +++ b/nixos/modules/services/security/haveged.nix @@ -46,7 +46,7 @@ in systemd.services.haveged = { description = "Entropy Harvesting Daemon"; - unitConfig.documentation = "man:haveged(8)"; + unitConfig.Documentation = "man:haveged(8)"; wantedBy = [ "multi-user.target" ]; path = [ pkgs.haveged ]; @@ -60,4 +60,4 @@ in }; -} \ No newline at end of file +} From daa9e53e2698bc900ce866706649b5aa8b2472b8 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Wed, 19 Nov 2014 15:30:42 +0300 Subject: [PATCH 127/383] beret: fix checksum --- pkgs/games/beret/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/games/beret/default.nix b/pkgs/games/beret/default.nix index a92fe4d7c67..a3ffaf0df62 100644 --- a/pkgs/games/beret/default.nix +++ b/pkgs/games/beret/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { src = fetchurl { url = https://gitorious.org/beret/beret/archive-tarball/ae029777; name = "beret-1.2.0.tar.gz"; - sha256 = "0md00ipacvz5mq8q83h7xbzycnwympr06pc1n5c351swjvyw0ysx"; + sha256 = "14283p27y7g8dq9is7n8zlfslv370pia414frp18722279ps6gqp"; }; installPhase = '' From bddffb705fa16cd7949c5985b3b9999fd88d3bb6 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Wed, 19 Nov 2014 15:30:59 +0300 Subject: [PATCH 128/383] gosmore: update, fix checksum --- pkgs/applications/misc/gosmore/default.nix | 38 ++++++++++------------ pkgs/top-level/all-packages.nix | 4 +-- 2 files changed, 18 insertions(+), 24 deletions(-) diff --git a/pkgs/applications/misc/gosmore/default.nix b/pkgs/applications/misc/gosmore/default.nix index e93e2be85e3..ea72dc03269 100644 --- a/pkgs/applications/misc/gosmore/default.nix +++ b/pkgs/applications/misc/gosmore/default.nix @@ -1,34 +1,30 @@ -a@{fetchsvn, libxml2, gtk, curl, pkgconfig, lib, ...} : -let - fetchsvn = a.fetchsvn; +{ stdenv, fetchsvn, libxml2, gtk, curl, pkgconfig } : - buildInputs = with a; [ - libxml2 gtk curl pkgconfig - ]; +let + version = "30811"; in -rec { +stdenv.mkDerivation { + name = "gosmore-r${version}"; src = fetchsvn { url = http://svn.openstreetmap.org/applications/rendering/gosmore; - sha256 = "0ds61gl75rnzvm0hj9papl5sfcgdv4310df9ch7x9rifssfli9zm"; - rev = "24178"; - } + "/"; + sha256 = "0qyvrb4xgy4msc7f65widzkvjzc8mlddc4dyr1i76b7wd3gpk0xj"; + rev = "${version}"; + }; - inherit buildInputs; - configureFlags = []; + buildInputs = [ libxml2 gtk curl ]; - /* doConfigure should be removed if not needed */ - phaseNames = ["fixCurlIncludes" "doConfigure" "doMakeInstall"]; + nativeBuildInputs = [ pkgconfig ]; - fixCurlIncludes = a.fullDepEntry '' + prePatch = '' sed -e '/curl.types.h/d' -i *.{c,h,hpp,cpp} - '' ["minInit" "doUnpack"]; + ''; - name = "gosmore-r21657"; - meta = { + meta = with stdenv.lib; { description = "Open Street Map viewer"; - maintainers = [ - a.lib.maintainers.raskin + homepage = http://sourceforge.net/projects/gosmore/; + maintainers = with maintainers; [ + raskin ]; - platforms = a.lib.platforms.linux; + platforms = platforms.linux; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ea48c5b28e1..3fc9ee5746b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9800,9 +9800,7 @@ let libpng = libpng12; }; - gosmore = builderDefsPackage ../applications/misc/gosmore { - inherit fetchsvn curl pkgconfig libxml2 gtk; - }; + gosmore = callPackage ../applications/misc/gosmore { }; gpsbabel = callPackage ../applications/misc/gpsbabel { }; From a2efa84ccb1b515de24b578219a65f6c66539e6f Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Wed, 19 Nov 2014 15:31:09 +0300 Subject: [PATCH 129/383] praat: update, fix checksum --- pkgs/applications/audio/praat/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/audio/praat/default.nix b/pkgs/applications/audio/praat/default.nix index 86c68d087b7..354a3e43616 100644 --- a/pkgs/applications/audio/praat/default.nix +++ b/pkgs/applications/audio/praat/default.nix @@ -1,11 +1,12 @@ { stdenv, fetchurl, alsaLib, gtk, pkgconfig }: +let version = "5401"; in stdenv.mkDerivation { - name = "praat-5365"; + name = "praat-${version}"; src = fetchurl { - url = http://www.fon.hum.uva.nl/praat/praat5365_sources.tar.gz; - sha256 = "1w3mcq0mipx88i7ckhvzhmdj0p67nhppnn7kbkp21d01yyyz5rgq"; + url = "http://www.fon.hum.uva.nl/praat/praat${version}_sources.tar.gz"; + sha256 = "1hx0simc0hp5w5scyaiw8h8lrpafra4h1zy1jn1kzb0299yd06n3"; }; configurePhase = '' From 1f071d37efc56e0fbc0c81ed612fd83bedb3c02f Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 19 Nov 2014 12:07:16 +0100 Subject: [PATCH 130/383] Add some Hydra dependencies to the channel --- pkgs/top-level/perl-packages.nix | 22 +++++++++++++++++----- 1 file changed, 17 insertions(+), 5 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index c930be076c8..a6a66f6fd2d 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -693,6 +693,7 @@ let self = _self // overrides; _self = with self; { meta = { description = "A storage class for Catalyst Authentication using DBIx::Class"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + platforms = stdenv.lib.platforms.linux; }; }; @@ -992,6 +993,7 @@ let self = _self // overrides; _self = with self; { meta = { description = "Display a stack trace on the debug screen"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + platforms = stdenv.lib.platforms.linux; }; }; @@ -1017,6 +1019,10 @@ let self = _self // overrides; _self = with self; { }; buildInputs = [ TestWWWMechanizeCatalyst Testuseok ]; propagatedBuildInputs = [ CatalystRuntime TextCSV XMLSimple ]; + meta = { + license = "perl"; + platforms = stdenv.lib.platforms.linux; + }; }; CatalystViewJSON = buildPerlPackage { @@ -1068,14 +1074,19 @@ let self = _self // overrides; _self = with self; { propagatedBuildInputs = [ MooseXRelatedClassRoles CatalystRuntime ]; }; - CatalystTraitForRequestProxyBase = buildPerlPackage rec { + CatalystTraitForRequestProxyBase = buildPerlPackage { name = "Catalyst-TraitFor-Request-ProxyBase-0.000005"; src = fetchurl { - url = "mirror://cpan/modules/by-module/Catalyst/${name}.tar.gz"; - sha256 = "02kir63d5cs2ipj3fn1qlmmx3gqi1xqzrxfr4pv5vjhjgsm0zgx7"; + url = mirror://cpan/authors/id/B/BO/BOBTFISH/Catalyst-TraitFor-Request-ProxyBase-0.000005.tar.gz; + sha256 = "a7bf0faa7e12ca5df625d9f5fc710f11bfd16ba5385837e48d42b3d286c9710a"; + }; + buildInputs = [ CatalystRuntime HTTPMessage ]; + propagatedBuildInputs = [ CatalystXRoleApplicator Moose URI namespaceautoclean ]; + meta = { + description = "Replace request base with value passed by HTTP proxy"; + license = "perl"; + platforms = stdenv.lib.platforms.linux; }; - buildInputs = [ CatalystRuntime ]; - propagatedBuildInputs = [ Moose URI CatalystXRoleApplicator ]; }; CatalystXScriptServerStarman = buildPerlPackage { @@ -3195,6 +3206,7 @@ let self = _self // overrides; _self = with self; { homepage = https://github.com/rjbs/email-sender; description = "A library for sending email"; license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + platforms = stdenv.lib.platforms.linux; }; }; From 3a77a2e409c967d609a1ad5e77f32fec9d0bb937 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 19 Nov 2014 14:00:25 +0100 Subject: [PATCH 131/383] Email::Sender: Update to 1.300016 This fixes CR/LF handling when using sendmail. --- pkgs/top-level/perl-packages.nix | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index a6a66f6fd2d..d02a4f69a16 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -3196,16 +3196,17 @@ let self = _self // overrides; _self = with self; { }; EmailSender = buildPerlPackage { - name = "Email-Sender-1.300014"; + name = "Email-Sender-1.300016"; src = fetchurl { - url = mirror://cpan/authors/id/R/RJ/RJBS/Email-Sender-1.300014.tar.gz; - sha256 = "0yxqk0fjxasd7q62m65dl2n6xm4xcvfb6i1lajvwibygd9ckifw6"; + url = mirror://cpan/authors/id/R/RJ/RJBS/Email-Sender-1.300016.tar.gz; + sha256 = "00042de1b78fb26b2ff37bd92c0d61631810725a5235f4841e38a501a533a2a3"; }; - propagatedBuildInputs = [ CaptureTiny EmailAbstract EmailAddress EmailSimple ListMoreUtils Moose Throwable TryTiny ]; + buildInputs = [ CaptureTiny ]; + propagatedBuildInputs = [ EmailAbstract EmailAddress EmailSimple ListMoreUtils ModuleRuntime Moo MooXTypesMooseLike SubExporter Throwable TryTiny ]; meta = { - homepage = https://github.com/rjbs/email-sender; + homepage = https://github.com/rjbs/Email-Sender; description = "A library for sending email"; - license = with stdenv.lib.licenses; [ artistic1 gpl1Plus ]; + license = "perl"; platforms = stdenv.lib.platforms.linux; }; }; From 5b91aa5f657c602cff4a32215915e71241c13aed Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Wed, 19 Nov 2014 16:51:33 +0300 Subject: [PATCH 132/383] haskell-greencard: add package --- .../libraries/haskell/greencard/default.nix | 17 +++++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 19 insertions(+) create mode 100644 pkgs/development/libraries/haskell/greencard/default.nix diff --git a/pkgs/development/libraries/haskell/greencard/default.nix b/pkgs/development/libraries/haskell/greencard/default.nix new file mode 100644 index 00000000000..530c3be1505 --- /dev/null +++ b/pkgs/development/libraries/haskell/greencard/default.nix @@ -0,0 +1,17 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal }: + +cabal.mkDerivation (self: { + pname = "greencard"; + version = "3.0.4.2"; + sha256 = "1vl9p6mqss5r4jfqnjir7m1q7fhh9f204c99qd5y5d0j7yc26r5y"; + isLibrary = true; + isExecutable = true; + meta = { + homepage = "https://github.com/sof/greencard"; + description = "GreenCard, a foreign function pre-processor for Haskell"; + 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 8227c52d4b2..be8bea6060a 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -988,6 +988,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in gnutls = callPackage ../development/libraries/haskell/gnutls { inherit (pkgs) gnutls; }; + greencard = callPackage ../development/libraries/haskell/greencard { }; + gsasl = callPackage ../development/libraries/haskell/gsasl { inherit (pkgs) gsasl; }; gtk = callPackage ../development/libraries/haskell/gtk { From a726dd7697df2f190d0f513b710a04476a66cb33 Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Wed, 19 Nov 2014 17:36:47 +0300 Subject: [PATCH 133/383] eaglemode: update and fix 404 --- 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 ea9383a6e10..9d9b22abcb1 100644 --- a/pkgs/applications/misc/eaglemode/default.nix +++ b/pkgs/applications/misc/eaglemode/default.nix @@ -1,16 +1,16 @@ { stdenv, fetchurl, perl, libX11, libjpeg, libpng, libtiff, pkgconfig, -librsvg, glib, gtk, libXext, libXxf86vm, poppler }: +librsvg, glib, gtk, libXext, libXxf86vm, poppler, xineLib }: stdenv.mkDerivation rec { - name = "eaglemode-0.85.0"; + name = "eaglemode-0.86.0"; src = fetchurl { url = "mirror://sourceforge/eaglemode/${name}.tar.bz2"; - sha256 = "0mz4rg2k36wvcv55dg0a5znaczpl5h4gwkkb34syj89xk8jlbwsc"; + sha256 = "1a2hzyck95g740qg4p4wd4fjwsmlknh75i9sbx5r5v9pyr4i3m4f"; }; buildInputs = [ perl libX11 libjpeg libpng libtiff pkgconfig - librsvg glib gtk libXxf86vm libXext poppler ]; + librsvg glib gtk libXxf86vm libXext poppler xineLib ]; # The program tries to dlopen both Xxf86vm and Xext, so we use the # trick on NIX_LDFLAGS and dontPatchELF to make it find them. From ad87aef2ab46423fca575aa99194bb6192c43a26 Mon Sep 17 00:00:00 2001 From: aszlig Date: Wed, 19 Nov 2014 15:48:14 +0100 Subject: [PATCH 134/383] nixos/tests/chromium: Allow to override packages. Of course, this could be done via packageOverrides, but this is more explicit and makes it possible to run the tests with various Chromium overrides. Signed-off-by: aszlig --- nixos/tests/chromium.nix | 19 +++++++++++++------ 1 file changed, 13 insertions(+), 6 deletions(-) diff --git a/nixos/tests/chromium.nix b/nixos/tests/chromium.nix index 71fa1e5268f..d571a435816 100644 --- a/nixos/tests/chromium.nix +++ b/nixos/tests/chromium.nix @@ -1,4 +1,12 @@ -import ./make-test.nix ({ pkgs, ... }: rec { +import ./make-test.nix ( +{ pkgs +, channelMap ? { + stable = pkgs.chromium; + beta = pkgs.chromiumBeta; + dev = pkgs.chromiumDev; + } +, ... +}: rec { name = "chromium"; machine.imports = [ ./common/x11.nix ]; @@ -116,11 +124,10 @@ import ./make-test.nix ({ pkgs, ... }: rec { $machine->shutdown; } - for ( - ["stable", "${pkgs.chromium}"], - ["beta", "${pkgs.chromiumBeta}"], - ["dev", "${pkgs.chromiumDev}"] - ) { + for (${let + mkArray = name: pkg: "[\"${name}\", \"${pkg}\"]"; + chanArrays = pkgs.lib.mapAttrsToList mkArray channelMap; + in pkgs.lib.concatStringsSep ", " chanArrays}) { my ($channel, $pkg) = @$_; chromiumTest $channel, $pkg, sub { testNewWin "check sandbox", sub { From 9c658343dd2a6bc27e6e98c4c255fb44561151ca Mon Sep 17 00:00:00 2001 From: Nikolay Amiantov Date: Wed, 19 Nov 2014 18:02:41 +0300 Subject: [PATCH 135/383] mutt-with-sidebar: simplify, fix checksum --- .../networking/mailreaders/mutt/default.nix | 22 +++++++++---------- pkgs/top-level/all-packages.nix | 1 - 2 files changed, 11 insertions(+), 12 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/mutt/default.nix b/pkgs/applications/networking/mailreaders/mutt/default.nix index 4091876cbe3..7c60864b486 100644 --- a/pkgs/applications/networking/mailreaders/mutt/default.nix +++ b/pkgs/applications/networking/mailreaders/mutt/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, ncurses, which, perl, automake, autoconf +{ stdenv, fetchurl, ncurses, which, perl, autoreconfHook , sslSupport ? true , imapSupport ? true , headerCache ? true @@ -14,6 +14,7 @@ assert headerCache -> gdbm != null; assert sslSupport -> openssl != null; assert saslSupport -> cyrus_sasl != null; +assert gpgmeSupport -> gpgme != null; let version = "1.5.23"; @@ -26,15 +27,14 @@ stdenv.mkDerivation rec { sha256 = "0dzx4qk50pjfsb6cs5jahng96a52k12f7pm0sc78iqdrawg71w1s"; }; - buildInputs = [ - ncurses which perl - (if headerCache then gdbm else null) - (if sslSupport then openssl else null) - (if saslSupport then cyrus_sasl else null) - (if gpgmeSupport then gpgme else null) - ] - ++ (stdenv.lib.optionals withSidebar [automake autoconf]) - ; + buildInputs = with stdenv.lib; + [ ncurses which perl ] + ++ optional headerCache gdbm + ++ optional sslSupport openssl + ++ optional saslSupport cyrus_sasl + ++ optional gpgmeSupport gpgme; + + nativeBuildInputs = stdenv.lib.optional withSidebar autoreconfHook; configureFlags = [ "--with-mailpath=" "--enable-smtp" @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { patches = [] ++ (stdenv.lib.optional withSidebar (fetchurl { url = http://lunar-linux.org/~tchan/mutt/patch-1.5.23.sidebar.20140412.txt; - sha256 = "0bq556sycl0qkr5vg5c3l16bh2bifqc2j7d64n4hw19q0ba2b45w"; + sha256 = "1i2r7dj0pd1k0z3jjxn2szi6sf0k28i8dwhr4f65pn8r2lh3wisz"; })); meta = with stdenv.lib; { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3fc9ee5746b..ac8834062e5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10227,7 +10227,6 @@ let mutt = callPackage ../applications/networking/mailreaders/mutt { }; mutt-with-sidebar = callPackage ../applications/networking/mailreaders/mutt { withSidebar = true; - automake = automake113x; }; namecoin = callPackage ../applications/misc/namecoin { }; From 8be7b23cb3535811b42f917c0b80cacb2eea9f18 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 19 Nov 2014 18:25:58 +0100 Subject: [PATCH 136/383] nixUnstable: Update to 1.8pre3899_8299aaf --- 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 d48a18360f3..f2719a070d6 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.8pre3893_2719627"; + name = "nix-1.8pre3899_8299aaf"; src = fetchurl { - url = http://hydra.nixos.org/build/16998611/download/3/nix-1.8pre3893_2719627.tar.bz2; - sha256 = "8f4ace015d179c546eb0f5101d200b2687cbde024f2d21e821b9faeb490df7d7"; + url = "http://hydra.nixos.org/build/17210259/download/4/${name}.tar.xz"; + sha256 = "acf4b1f0e4ea9c95b2a24b987991d3af928cde10445a45f37cad060d1ee30bc1"; }; nativeBuildInputs = [ perl pkgconfig ]; From fc0b1e4baede09478a91c7cd3347c7b02715cf2c Mon Sep 17 00:00:00 2001 From: j-keck Date: Wed, 19 Nov 2014 14:12:50 +0100 Subject: [PATCH 137/383] sbt: update to version 0.13.7 --- pkgs/development/tools/build-managers/sbt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/build-managers/sbt/default.nix b/pkgs/development/tools/build-managers/sbt/default.nix index 9b1e8b7c6fc..72beb092bb0 100644 --- a/pkgs/development/tools/build-managers/sbt/default.nix +++ b/pkgs/development/tools/build-managers/sbt/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "sbt-${version}"; - version = "0.13.6"; + version = "0.13.7"; src = fetchurl { url = "http://repo.typesafe.com/typesafe/ivy-releases/org.scala-sbt/sbt-launch/${version}/sbt-launch.jar"; - sha256 = "928ddfdee8aa05c297e7252699b211748139bbb3b2d25c22e590c939352c3bff"; + sha256 = "9673ca4611e6367955ae068d5888f7ae665ab013c3e8435ffe2ca94318c6d607"; }; phases = [ "installPhase" ]; From 8236ca5d70565fb02c2b9d57d7bdf5881d040481 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Wed, 19 Nov 2014 19:41:36 +0100 Subject: [PATCH 138/383] properly package pyopenssl --- .../instant-messengers/gajim/default.nix | 4 +- .../python-modules/pyopenssl/default.nix | 26 ------ pkgs/tools/graphics/scrot/default.nix | 1 + pkgs/top-level/all-packages.nix | 4 +- pkgs/top-level/python-packages.nix | 84 +++++++++++++++---- 5 files changed, 73 insertions(+), 46 deletions(-) delete mode 100644 pkgs/development/python-modules/pyopenssl/default.nix diff --git a/pkgs/applications/networking/instant-messengers/gajim/default.nix b/pkgs/applications/networking/instant-messengers/gajim/default.nix index 8584eb84273..82d11e02fe1 100644 --- a/pkgs/applications/networking/instant-messengers/gajim/default.nix +++ b/pkgs/applications/networking/instant-messengers/gajim/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchurl, python, intltool, pkgconfig, libX11, gtk -, ldns, pyopenssl, pythonDBus, pythonPackages +, ldns, pythonDBus, pythonPackages , enableJingle ? true, farstream ? null, gst_plugins_bad ? null , libnice ? null @@ -64,7 +64,7 @@ stdenv.mkDerivation rec { pythonPackages.sqlite3 pythonPackages.pyasn1 pythonPackages.pyxdg pythonPackages.nbxmpp - pyopenssl pythonDBus + pythonPackages.pyopenssl pythonDBus ] ++ optionals enableJingle [ farstream gst_plugins_bad libnice ] ++ optional enableE2E pythonPackages.pycrypto ++ optional enableRST pythonPackages.docutils diff --git a/pkgs/development/python-modules/pyopenssl/default.nix b/pkgs/development/python-modules/pyopenssl/default.nix deleted file mode 100644 index 5f92e2cf202..00000000000 --- a/pkgs/development/python-modules/pyopenssl/default.nix +++ /dev/null @@ -1,26 +0,0 @@ -a : -let - fetchurl = a.fetchurl; - - version = a.lib.attrByPath ["version"] "0.13.1" a; - propagatedBuildInputs = with a; [ - openssl python - ]; -in -rec { - src = fetchurl { - url = "http://pypi.python.org/packages/source/p/pyOpenSSL/pyOpenSSL-${version}.tar.gz"; - sha256 = "1nrg2kas0wsv65j8sia8zkkc6ir5i20lrhkfavjxzxhl0iqyq1ms"; - }; - - inherit propagatedBuildInputs; - configureFlags = []; - - /* doConfigure should be removed if not needed */ - phaseNames = ["installPythonPackage"]; - - name = "pyOpenSSL-" + version; - meta = { - description = "Python OpenSSL wrapper capable of checking certificates"; - }; -} diff --git a/pkgs/tools/graphics/scrot/default.nix b/pkgs/tools/graphics/scrot/default.nix index e5f2ca83a9b..411e2fb45c8 100644 --- a/pkgs/tools/graphics/scrot/default.nix +++ b/pkgs/tools/graphics/scrot/default.nix @@ -13,5 +13,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://linuxbrit.co.uk/scrot/; description = "A command-line screen capture utility"; + platforms = stdenv.lib.platforms.linux; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 079fd413378..d330e4b942d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7357,9 +7357,7 @@ let pylint = callPackage ../development/python-modules/pylint { }; - pyopenssl = builderDefsPackage (import ../development/python-modules/pyopenssl) { - inherit python openssl; - }; + pyopenssl = pythonPackages.pyopenssl; rhpl = callPackage ../development/python-modules/rhpl { }; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index dcaf8766618..db1de45dd91 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1662,6 +1662,43 @@ let maintainers = [ stdenv.lib.maintainers.iElectric ]; }; }; + + cryptography = buildPythonPackage rec { + name = "cryptography-0.6.1"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/c/cryptography/${name}.tar.gz"; + sha256 = "17ij2acy28ryxahiq64lpf71d5z3sa9xhr4pjv7a1v81189i0j82"; + }; + + buildInputs = [ pkgs.openssl self.pretend self.cryptography_vectors + self.iso8601 self.pyasn1 self.pytest ]; + propagatedBuildInputs = [ self.six self.cffi ]; + }; + + cryptography_vectors = buildPythonPackage rec { + name = "cryptography_vectors-0.6.1"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/c/cryptography-vectors/${name}.tar.gz"; + sha256 = "1ks1xdb1ff74qmjdzqcfvkrwsbnwpsjgg3cy18zh37p8985cvl3r"; + }; + }; + + pretend = buildPythonPackage rec { + name = "pretend-1.0.8"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/p/pretend/pretend-1.0.8.tar.gz"; + sha256 = "0r5r7ygz9m6d2bklflbl84cqhjkc2q12xgis8268ygjh30g2q3wk"; + }; + + meta = with stdenv.lib; { + homepage = https://github.com/alex/pretend; + license = licenses.bsd; + }; + }; + detox = self.buildPythonPackage rec { name = "detox-0.9.3"; @@ -1712,11 +1749,11 @@ let }; cffi = buildPythonPackage rec { - name = "cffi-0.7.2"; + name = "cffi-0.8.6"; src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/c/cffi/${name}.tar.gz"; - md5 = "d329f5cb2053fd31dafc02e2c9ef0299"; + sha256 = "0406j3sgndmx88idv5zxkkrwfqxmjl18pj8gf47nsg4ymzixjci5"; }; propagatedBuildInputs = with self; [ pkgs.libffi pycparser ]; @@ -2419,19 +2456,21 @@ let }; gcutil = buildPythonPackage rec { - name = "gcutil-1.15.0"; + name = "gcutil-1.16.1"; meta.maintainers = [ stdenv.lib.maintainers.phreedom ]; src = pkgs.fetchurl { - url = https://dl.google.com/dl/cloudsdk/release/artifacts/gcutil-1.15.0.tar.gz; - sha256 = "12c98ivhjr01iz6lkga574xm8p0bsil6arydvpblyw8sjkgim5sq"; + url = https://dl.google.com/dl/cloudsdk/release/artifacts/gcutil-1.16.1.tar.gz; + sha256 = "00jaf7x1ji9y46fbkww2sg6r6almrqfsprydz3q2swr4jrnrsx9x"; }; patchPhase = '' - substituteInPlace setup.py --replace "httplib2==0.8" "httplib2" + substituteInPlace setup.py \ + --replace "httplib2==0.8" "httplib2" \ + --replace "iso8601==0.1.4" "iso8601" ''; - propagatedBuildInputs = with self; [ gflags iso8601_0_1_4 ipaddr httplib2 google_apputils google_api_python_client ]; + propagatedBuildInputs = with self; [ gflags iso8601 ipaddr httplib2 google_apputils google_api_python_client ]; }; gnutls = buildPythonPackage rec { @@ -3296,7 +3335,7 @@ let }; propagatedBuildInputs = with self; [ - pyGtkGlade pkgs.libtorrentRasterbar twisted Mako chardet pyxdg pkgs.pyopenssl modules.curses + pyGtkGlade pkgs.libtorrentRasterbar twisted Mako chardet pyxdg self.pyopenssl modules.curses ]; postInstall = '' @@ -3908,7 +3947,7 @@ let sha256 = "16cddyk5is0gjfn0ia5n2l4lhdzvbjzlx6sfpy7ddjd3d3fq7ckl"; }; - propagatedBuildInputs = with self; [ twisted pkgs.pyopenssl ]; + propagatedBuildInputs = with self; [ twisted self.pyopenssl ]; meta = { homepage = http://foolscap.lothar.com/; @@ -4585,11 +4624,11 @@ let propagatedBuildInputs = with self; [ self.nose self.ipythonLight ]; }; - iso8601_0_1_4 = buildPythonPackage { - name = "iso8601-0.1.4"; + iso8601 = buildPythonPackage { + name = "iso8601-0.1.10"; src = pkgs.fetchurl { - url = https://pypi.python.org/packages/source/i/iso8601/iso8601-0.1.4.tar.gz; - sha256 = "03gnjxpfq0wwimqnsvz32xcngq0hrdqryn3zm8qh95hnnggwqa3s"; + url = https://pypi.python.org/packages/source/i/iso8601/iso8601-0.1.10.tar.gz; + sha256 = "1qf01afxh7j4gja71vxv345if8avg6nnm0ry0zsk6j3030xgy4p7"; }; meta = { @@ -5177,7 +5216,7 @@ let }; buildInputs = with self; [ - pkgs.pyopenssl pyasn1 urwid pil lxml flask protobuf netlib + pyopenssl pyasn1 urwid pil lxml flask protobuf netlib ]; doCheck = false; @@ -5581,7 +5620,7 @@ let }; buildInputs = with self; [ - pkgs.pyopenssl pyasn1 + pyopenssl pyasn1 ]; doCheck = false; @@ -7474,6 +7513,21 @@ let platforms = stdenv.lib.platforms.mesaPlatforms; }; }; + + pyopenssl = buildPythonPackage rec { + name = "pyopenssl-${version}"; + version = "0.14"; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/p/pyOpenSSL/pyOpenSSL-0.14.tar.gz"; + sha256 = "0vpfqhng4cky7chliknkxv910iabqbfcxvkjiankh08jkkjvi7d9"; + }; + + # 17 tests failing + doCheck = false; + + propagatedBuildInputs = [ self.cryptography ]; + }; pyquery = buildPythonPackage rec { From 18b306b0414c13b5584c2325e9a01e065d715498 Mon Sep 17 00:00:00 2001 From: aszlig Date: Wed, 19 Nov 2014 19:33:20 +0100 Subject: [PATCH 139/383] protobuf: Clean up and update to version 2.6.1. The upstream URL has changed as well as the download URL. I'm using the archive from GitHub directly now, because version 2.6.1 hasn't been uploaded to Google Code yet. Changed the meta.license attribute to BSD3, because I haven't actually found anything regarding "mBSD" on the web, so I'm guessing it should mean "modified BSD". After digging up a bit more, there seems to be overall consensus on BSD3/"new BSD" license, because it's BSD3 with copyright of Google Inc. on the license. Signed-off-by: aszlig --- .../libraries/protobuf/default.nix | 39 ++++++++++++------- 1 file changed, 26 insertions(+), 13 deletions(-) diff --git a/pkgs/development/libraries/protobuf/default.nix b/pkgs/development/libraries/protobuf/default.nix index bba8481780a..0f52999bc0e 100644 --- a/pkgs/development/libraries/protobuf/default.nix +++ b/pkgs/development/libraries/protobuf/default.nix @@ -1,28 +1,41 @@ -{ fetchurl, stdenv, zlib }: +{ stdenv, fetchFromGitHub, autoconf, automake, libtool, zlib, gtest }: stdenv.mkDerivation rec { - name = "protobuf-2.5.0"; + name = "protobuf-${version}"; + version = "2.6.1"; - src = fetchurl { - url = "http://protobuf.googlecode.com/files/${name}.tar.bz2"; - sha256 = "0xxn9gxhvsgzz2sgmihzf6pf75clr05mqj6218camwrwajpcbgqk"; + src = fetchFromGitHub { + owner = "google"; + repo = "protobuf"; + rev = version; + sha256 = "03df8zvx2sry3jz2x4pi3l32qyfqa7w8kj8jdbz30nzy0h7aa070"; }; - buildInputs = [ zlib ]; + postPatch = '' + sed -i -e '/gtest/d' Makefile.am + sed -i \ + -e 's!\$(top_\(build\|src\)dir)/gtest!${gtest}!g' \ + -e 's/\(libgtest[^.]*\.\)la/\1a/g' \ + src/Makefile.am + ''; + + buildInputs = [ zlib autoconf automake libtool gtest ]; + + preConfigure = "autoreconf -vfi"; doCheck = true; meta = { description = "Protocol Buffers - Google's data interchange format"; - longDescription = - '' Protocol Buffers are a way of encoding structured data in an - efficient yet extensible format. Google uses Protocol Buffers for - almost all of its internal RPC protocols and file formats. - ''; + longDescription = '' + Protocol Buffers are a way of encoding structured data in an + efficient yet extensible format. Google uses Protocol Buffers for + almost all of its internal RPC protocols and file formats. + ''; - license = "mBSD"; + license = stdenv.lib.licenses.bsd3; - homepage = http://code.google.com/p/protobuf/; + homepage = "https://developers.google.com/protocol-buffers/"; }; } From 03655c332a1171c4293d07027e75eb9a86d0b87d Mon Sep 17 00:00:00 2001 From: Mateusz Kowalczyk Date: Wed, 19 Nov 2014 18:53:56 +0000 Subject: [PATCH 140/383] Add meta.branch to a bunch of packages Gives better results in the monitor --- pkgs/development/compilers/scala/2.10.nix | 1 + pkgs/development/compilers/scala/2.9.nix | 1 + pkgs/development/libraries/libsigcxx/1.2.nix | 3 ++- pkgs/development/libraries/libsigsegv/2.5.nix | 3 ++- pkgs/development/libraries/qwt/6.nix | 1 + pkgs/development/libraries/readline/5.x.nix | 4 +++- pkgs/development/libraries/readline/6.2.nix | 1 + pkgs/development/libraries/readline/6.3.nix | 1 + pkgs/development/tools/misc/texinfo/4.13a.nix | 1 + pkgs/development/tools/misc/texinfo/5.2.nix | 1 + pkgs/tools/typesetting/tex/pgf/1.x.nix | 5 ++++- pkgs/tools/typesetting/tex/pgf/2.x.nix | 7 +++++-- pkgs/tools/typesetting/tex/pgf/3.x.nix | 9 ++++++--- 13 files changed, 29 insertions(+), 9 deletions(-) diff --git a/pkgs/development/compilers/scala/2.10.nix b/pkgs/development/compilers/scala/2.10.nix index 11c3c0d8c31..6a20afe2bca 100644 --- a/pkgs/development/compilers/scala/2.10.nix +++ b/pkgs/development/compilers/scala/2.10.nix @@ -33,5 +33,6 @@ stdenv.mkDerivation rec { homepage = http://www.scala-lang.org/; license = "BSD"; platforms = stdenv.lib.platforms.all; + branch = "2.10"; }; } diff --git a/pkgs/development/compilers/scala/2.9.nix b/pkgs/development/compilers/scala/2.9.nix index 41f377dbfa3..93e87735571 100644 --- a/pkgs/development/compilers/scala/2.9.nix +++ b/pkgs/development/compilers/scala/2.9.nix @@ -30,5 +30,6 @@ stdenv.mkDerivation rec { homepage = http://www.scala-lang.org/; license = "BSD"; platforms = stdenv.lib.platforms.all; + branch = "2.9"; }; } diff --git a/pkgs/development/libraries/libsigcxx/1.2.nix b/pkgs/development/libraries/libsigcxx/1.2.nix index 29a7093dbbd..896b321272a 100644 --- a/pkgs/development/libraries/libsigcxx/1.2.nix +++ b/pkgs/development/libraries/libsigcxx/1.2.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { name = "libsigc++-1.2.7"; - + src = fetchurl { url = "mirror://gnome/sources/libsigc++/1.2/${name}.tar.bz2"; sha256 = "099224v5y0y1ggqrfc8vga8afr3nb93iicn7cj8xxgsrwa83s5nr"; @@ -13,5 +13,6 @@ stdenv.mkDerivation rec { meta = { homepage = http://libsigc.sourceforge.net/; description = "A typesafe callback system for standard C++"; + branch = "1.2"; }; } diff --git a/pkgs/development/libraries/libsigsegv/2.5.nix b/pkgs/development/libraries/libsigsegv/2.5.nix index ba11e0752b2..81b563bb022 100644 --- a/pkgs/development/libraries/libsigsegv/2.5.nix +++ b/pkgs/development/libraries/libsigsegv/2.5.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { name = "libsigsegv-2.5"; - + src = fetchurl { url = "mirror://gnu/libsigsegv/${name}.tar.gz"; sha256 = "0fvcsq9msi63vrbpvks6mqkrnls5cfy6bzww063sqhk2h49vsyyg"; @@ -11,6 +11,7 @@ stdenv.mkDerivation rec { meta = { homepage = http://libsigsegv.sf.net; description = "A library for handling page faults in user mode"; + branch = "2.5"; }; doCheck = true; diff --git a/pkgs/development/libraries/qwt/6.nix b/pkgs/development/libraries/qwt/6.nix index 8d31978657d..3660ff88981 100644 --- a/pkgs/development/libraries/qwt/6.nix +++ b/pkgs/development/libraries/qwt/6.nix @@ -23,5 +23,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.qwt; platforms = platforms.linux; maintainers = [ maintainers.bjornfor ]; + branch = "6"; }; } diff --git a/pkgs/development/libraries/readline/5.x.nix b/pkgs/development/libraries/readline/5.x.nix index ad9860d855e..13916040fba 100644 --- a/pkgs/development/libraries/readline/5.x.nix +++ b/pkgs/development/libraries/readline/5.x.nix @@ -11,5 +11,7 @@ stdenv.mkDerivation { propagatedBuildInputs = [ncurses]; patches = stdenv.lib.optional stdenv.isDarwin ./shobj-darwin.patch; + meta = { + branch = "5"; + }; } - diff --git a/pkgs/development/libraries/readline/6.2.nix b/pkgs/development/libraries/readline/6.2.nix index 1555f255c51..f50331ba684 100644 --- a/pkgs/development/libraries/readline/6.2.nix +++ b/pkgs/development/libraries/readline/6.2.nix @@ -49,6 +49,7 @@ stdenv.mkDerivation (rec { license = stdenv.lib.licenses.gpl3Plus; maintainers = [ stdenv.lib.maintainers.ludo ]; + branch = "6.2"; }; } diff --git a/pkgs/development/libraries/readline/6.3.nix b/pkgs/development/libraries/readline/6.3.nix index 38ecc034d89..ea459f291b3 100644 --- a/pkgs/development/libraries/readline/6.3.nix +++ b/pkgs/development/libraries/readline/6.3.nix @@ -54,5 +54,6 @@ stdenv.mkDerivation rec { maintainers = [ maintainers.ludo ]; platforms = platforms.unix; + branch = "6.3"; }; } diff --git a/pkgs/development/tools/misc/texinfo/4.13a.nix b/pkgs/development/tools/misc/texinfo/4.13a.nix index a3155230514..6eb384f51e3 100644 --- a/pkgs/development/tools/misc/texinfo/4.13a.nix +++ b/pkgs/development/tools/misc/texinfo/4.13a.nix @@ -36,5 +36,6 @@ stdenv.mkDerivation rec { license = stdenv.lib.licenses.gpl3Plus; homepage = http://www.gnu.org/software/texinfo/; + branch = "4.13"; }; } diff --git a/pkgs/development/tools/misc/texinfo/5.2.nix b/pkgs/development/tools/misc/texinfo/5.2.nix index 62e1ff62d1e..c43ebcd2de2 100644 --- a/pkgs/development/tools/misc/texinfo/5.2.nix +++ b/pkgs/development/tools/misc/texinfo/5.2.nix @@ -39,5 +39,6 @@ stdenv.mkDerivation rec { need revise only that one document. The Texinfo system is well-integrated with GNU Emacs. ''; + branch = "5.2"; }; } diff --git a/pkgs/tools/typesetting/tex/pgf/1.x.nix b/pkgs/tools/typesetting/tex/pgf/1.x.nix index 032d9b5520e..a26513d9f26 100644 --- a/pkgs/tools/typesetting/tex/pgf/1.x.nix +++ b/pkgs/tools/typesetting/tex/pgf/1.x.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation { name = "pgf-1.18"; - + src = fetchurl { url = mirror://sourceforge/pgf/pgf-1.18.tar.gz; sha256 = "0s6b8rx9yfxcjjg18vx1mphnwbd28fl5lnq0dasjz40pp3ypwdjv"; @@ -13,4 +13,7 @@ stdenv.mkDerivation { mkdir -p $out/share/texmf-nix cp -prd * $out/share/texmf-nix "; + meta = { + branch = "1"; + }; } diff --git a/pkgs/tools/typesetting/tex/pgf/2.x.nix b/pkgs/tools/typesetting/tex/pgf/2.x.nix index 09ec1729cfd..821357e7273 100644 --- a/pkgs/tools/typesetting/tex/pgf/2.x.nix +++ b/pkgs/tools/typesetting/tex/pgf/2.x.nix @@ -2,16 +2,19 @@ stdenv.mkDerivation { name = "pgf-2.00"; - + src = fetchurl { url = mirror://sourceforge/pgf/pgf-2.00.tar.gz; sha256 = "0j57niag4jb2k0iyrvjsannxljc3vkx0iag7zd35ilhiy4dh6264"; }; buildPhase = "true"; - + installPhase = " mkdir -p $out/share/texmf-nix cp -prd * $out/share/texmf-nix "; + meta = { + branch = "2"; + }; } diff --git a/pkgs/tools/typesetting/tex/pgf/3.x.nix b/pkgs/tools/typesetting/tex/pgf/3.x.nix index 9a03500bb96..5c0c387a340 100644 --- a/pkgs/tools/typesetting/tex/pgf/3.x.nix +++ b/pkgs/tools/typesetting/tex/pgf/3.x.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation { name = "pgf-3.00"; - + src = fetchurl { url = http://downloads.sourceforge.net/project/pgf/pgf/version%203.0.0/pgf_3.0.0.tds.zip; sha256 = "0kj769hyp4z2zmdv3f8xv443wcfqn5nkkbzxzqgfxjizlz81aav7"; }; - + buildInputs = [ unzip ]; # Multiple files problem @@ -18,9 +18,12 @@ stdenv.mkDerivation { ''; buildPhase = "true"; - + installPhase = " mkdir -p $out/share/texmf-nix cp -prd * $out/share/texmf-nix "; + meta = { + branch = "3"; + }; } From 1bded4188bc8ef8edd08738ac5aa674bf143b9d0 Mon Sep 17 00:00:00 2001 From: Mateusz Kowalczyk Date: Wed, 19 Nov 2014 18:54:24 +0000 Subject: [PATCH 141/383] scala: lib.licenses instead of a string --- pkgs/development/compilers/scala/2.10.nix | 2 +- pkgs/development/compilers/scala/2.9.nix | 2 +- pkgs/development/compilers/scala/default.nix | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/scala/2.10.nix b/pkgs/development/compilers/scala/2.10.nix index 6a20afe2bca..d7e7ecf1ce2 100644 --- a/pkgs/development/compilers/scala/2.10.nix +++ b/pkgs/development/compilers/scala/2.10.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { compared to an equivalent Java application. ''; homepage = http://www.scala-lang.org/; - license = "BSD"; + license = stdenv.lib.licenses.bsd3; platforms = stdenv.lib.platforms.all; branch = "2.10"; }; diff --git a/pkgs/development/compilers/scala/2.9.nix b/pkgs/development/compilers/scala/2.9.nix index 93e87735571..de5db1eff99 100644 --- a/pkgs/development/compilers/scala/2.9.nix +++ b/pkgs/development/compilers/scala/2.9.nix @@ -28,7 +28,7 @@ stdenv.mkDerivation rec { compared to an equivalent Java application. ''; homepage = http://www.scala-lang.org/; - license = "BSD"; + license = stdenv.lib.licenses.bsd3; platforms = stdenv.lib.platforms.all; branch = "2.9"; }; diff --git a/pkgs/development/compilers/scala/default.nix b/pkgs/development/compilers/scala/default.nix index 499fdbc7596..e9f6c71eb2c 100644 --- a/pkgs/development/compilers/scala/default.nix +++ b/pkgs/development/compilers/scala/default.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { compared to an equivalent Java application. ''; homepage = http://www.scala-lang.org/; - license = "BSD"; + license = stdenv.lib.licenses.bsd3; platforms = stdenv.lib.platforms.all; }; } From 745c2e9d731d7320e9ba220cf8465b74c40f06a3 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Wed, 19 Nov 2014 13:17:21 -0800 Subject: [PATCH 142/383] systemd: Enable networking features --- pkgs/os-specific/linux/systemd/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index c62907c2064..2df23cf0e16 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -50,14 +50,14 @@ stdenv.mkDerivation rec { "--disable-tests" "--disable-hostnamed" - "--disable-networkd" # enable/use eventually + "--enable-networkd" "--disable-sysusers" "--disable-timedated" - "--disable-timesyncd" + "--enable-timesyncd" "--disable-readahead" "--disable-firstboot" "--disable-localed" - "--disable-resolved" + "--enable-resolved" "--disable-split-usr" "--with-sysvinit-path=" From 92af853b8b0cdd89f8bf121e09910cc6cb5eb396 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Wed, 19 Nov 2014 22:55:18 +0100 Subject: [PATCH 143/383] 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 db1de45dd91..c2a7d0c7cde 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1695,7 +1695,7 @@ let meta = with stdenv.lib; { homepage = https://github.com/alex/pretend; - license = licenses.bsd; + license = licenses.bsd3; }; }; From f578c0ce5dbd101c2f3ecd0900cc465162de3601 Mon Sep 17 00:00:00 2001 From: Aycan iRiCAN Date: Thu, 20 Nov 2014 00:37:37 +0200 Subject: [PATCH 144/383] emacsPackages.js2-mode updated to latest release. --- pkgs/applications/editors/emacs-modes/js2/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/emacs-modes/js2/default.nix b/pkgs/applications/editors/emacs-modes/js2/default.nix index 00123bfc8c7..ba9fb4f8d6f 100644 --- a/pkgs/applications/editors/emacs-modes/js2/default.nix +++ b/pkgs/applications/editors/emacs-modes/js2/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchgit, emacs }: stdenv.mkDerivation { - name = "js2-mode-0-20140114"; + name = "js2-mode-0-20141118"; src = fetchgit { url = "git://github.com/mooz/js2-mode.git"; - rev = "b250efaad886dd07b8c69d4573425d095c6652e2"; - sha256 = "30e61e7d364e9175d408bdaf57fda886a4eea22cf5cbd97abb5c307c52b05918"; + rev = "3abcd90ddc2f446ddf0fb874dd79ba870c26ad2d"; + sha256 = "c0aaab4eeb8d60cfd5c382c3e30d4725e5ec492720d573e663ea69ee43aa73a8"; }; buildInputs = [ emacs ]; From 487e47a8e12b6cf4ce36f46bbffc3f3e3b35bc37 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Wed, 19 Nov 2014 14:59:42 -0800 Subject: [PATCH 145/383] nixos/ids: Add systemd networking ids --- nixos/modules/misc/ids.nix | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix index 4eeaa2008fd..2e5d5a08c50 100644 --- a/nixos/modules/misc/ids.nix +++ b/nixos/modules/misc/ids.nix @@ -159,6 +159,9 @@ prosody = 149; i2pd = 150; dnscrypt-proxy = 151; + systemd-networkd = 152; + systemd-resolved = 153; + systemd-timesyncd = 154; # When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399! @@ -284,6 +287,9 @@ seeks = 148; prosody = 149; i2pd = 150; + systemd-networkd = 152; + systemd-resolved = 153; + systemd-timesyncd = 154; # When adding a gid, make sure it doesn't match an existing uid. And don't use gids above 399! From e33cccd68677e410c1387b4c7828070abe654913 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Wed, 19 Nov 2014 15:01:44 -0800 Subject: [PATCH 146/383] nixos/ids: Fix systemd ids --- nixos/modules/misc/ids.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix index 2e5d5a08c50..0b836cb2903 100644 --- a/nixos/modules/misc/ids.nix +++ b/nixos/modules/misc/ids.nix @@ -159,9 +159,9 @@ prosody = 149; i2pd = 150; dnscrypt-proxy = 151; - systemd-networkd = 152; - systemd-resolved = 153; - systemd-timesyncd = 154; + systemd-network = 152; + systemd-resolve = 153; + systemd-timesync = 154; # When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399! @@ -287,9 +287,9 @@ seeks = 148; prosody = 149; i2pd = 150; - systemd-networkd = 152; - systemd-resolved = 153; - systemd-timesyncd = 154; + systemd-network = 152; + systemd-resolve = 153; + systemd-timesync = 154; # When adding a gid, make sure it doesn't match an existing uid. And don't use gids above 399! From df59a2473082957a0d60df96e5d006a2919070c4 Mon Sep 17 00:00:00 2001 From: David Virgilio Date: Thu, 2 Oct 2014 20:32:29 -0500 Subject: [PATCH 147/383] new package: pond --- pkgs/applications/networking/pond/default.nix | 32 ++++++++++ pkgs/applications/networking/pond/deps.nix | 60 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 3 files changed, 94 insertions(+) create mode 100644 pkgs/applications/networking/pond/default.nix create mode 100644 pkgs/applications/networking/pond/deps.nix diff --git a/pkgs/applications/networking/pond/default.nix b/pkgs/applications/networking/pond/default.nix new file mode 100644 index 00000000000..9d3954d839b --- /dev/null +++ b/pkgs/applications/networking/pond/default.nix @@ -0,0 +1,32 @@ +{ stdenv, lib, fetchgit, fetchhg, go, trousers }: + +let deps = import ./deps.nix { + inherit stdenv lib fetchgit fetchhg; +}; + +in stdenv.mkDerivation rec { + name = "pond"; + + buildInputs = [ go trousers ]; + + unpackPhase = '' + export GOPATH=$PWD + echo $PWD + cp -LR ${deps}/src src + chmod u+w -R src + ''; + + installPhase = '' + export GOPATH="$PWD" + mkdir -p $out/bin + go build --tags nogui -v -o $out/bin/pond-cli github.com/agl/pond/client + ''; + + meta = with lib; { + description = "Forward secure, asynchronous messaging for the discerning"; + homepage = https://pond.imperialviolet.org; + license = licenses.bsd3; + platforms = platforms.linux; + }; +} + diff --git a/pkgs/applications/networking/pond/deps.nix b/pkgs/applications/networking/pond/deps.nix new file mode 100644 index 00000000000..0983ad275e2 --- /dev/null +++ b/pkgs/applications/networking/pond/deps.nix @@ -0,0 +1,60 @@ +# This file was generated by go2nix. +{ stdenv, lib, fetchgit, fetchhg}: + +let + goDeps = [ + { + root = "github.com/agl/pond"; + src = fetchgit { + url = "git://github.com/agl/pond.git"; + rev = "f4e441c77a2039814046ff8219629c547fe8b689"; + sha256 = "f2dfc6cb96cc4b8ae732e41d1958b62036f40cb346df2e14f27b5964a1416026"; + }; + } + { + root = "github.com/agl/ed25519"; + src = fetchgit { + url = "git://github.com/agl/ed25519.git"; + rev = "d2b94fd789ea21d12fac1a4443dd3a3f79cda72c"; + sha256 = "83e3010509805d1d315c7aa85a356fda69d91b51ff99ed98a503d63adb3613e9"; + }; + } + { + root = "code.google.com/p/go.crypto"; + src = fetchhg { + url = "https://code.google.com/p/go.crypto"; + rev = "31393df5baea"; + sha256 = "0b95dpsvxxapcjjvhj05fdmyn0mzffamc25hvxy7xgsl2l9yy3nw"; + }; + } + { + root = "code.google.com/p/go.net"; + src = fetchhg { + url = "https://code.google.com/p/go.net"; + rev = "90e232e2462d"; + sha256 = "0hqvkaa0rbxwbi74xa6aqbkf63zk662x5hp3bp8vbhzkc4yl1h59"; + }; + } + { + root = "code.google.com/p/goprotobuf"; + src = fetchhg { + url = "https://code.google.com/p/goprotobuf"; + rev = "36be16571e14"; + sha256 = "14yay2sgfbbs0bx3q03bdqn1kivyvxfdm34rmp2612gvinlll215"; + }; + } + ]; + +in + +stdenv.mkDerivation rec { + name = "go-deps"; + + buildCommand = + lib.concatStrings + (map (dep: '' + mkdir -p $out/src/`dirname ${dep.root}` + ln -s ${dep.src} $out/src/${dep.root} + '') goDeps); +} + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d330e4b942d..0862389aa99 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10428,6 +10428,8 @@ let inherit (xorg) libXpm; }; + pond = callPackage ../applications/networking/pond { }; + potrace = callPackage ../applications/graphics/potrace {}; posterazor = callPackage ../applications/misc/posterazor { }; From 997b4bff292a918bf43fddd446e45ec6853b3b64 Mon Sep 17 00:00:00 2001 From: Mateusz Kowalczyk Date: Thu, 20 Nov 2014 09:04:29 +0000 Subject: [PATCH 148/383] agda-pretty: mark as broken Broken by updating the stdlib to 0.9. For now I let the author know. --- pkgs/development/libraries/agda/pretty/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/agda/pretty/default.nix b/pkgs/development/libraries/agda/pretty/default.nix index 1bcb9f8459b..e0a24a1adc1 100644 --- a/pkgs/development/libraries/agda/pretty/default.nix +++ b/pkgs/development/libraries/agda/pretty/default.nix @@ -21,5 +21,6 @@ agda.mkDerivation (self: rec { license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.unix; maintainers = with maintainers; [ fuuzetsu ]; + broken = true; }; }) From 49a933c5963c28f8ed2bcee6c762333633115a06 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Thu, 20 Nov 2014 10:08:31 +0100 Subject: [PATCH 149/383] Revert "zmq: initial package" This reverts commit b9c7f8dba1cf5a21166bac8c7a68e98067d18717. Conflicts: pkgs/servers/zeromq/default.nix pkgs/top-level/all-packages.nix --- pkgs/servers/zeromq/default.nix | 29 ----------------------------- pkgs/top-level/all-packages.nix | 1 - 2 files changed, 30 deletions(-) delete mode 100644 pkgs/servers/zeromq/default.nix diff --git a/pkgs/servers/zeromq/default.nix b/pkgs/servers/zeromq/default.nix deleted file mode 100644 index 15d453321fb..00000000000 --- a/pkgs/servers/zeromq/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ stdenv, fetchurl }: - -stdenv.mkDerivation rec { - name = "zeromq"; - version = "4.1.0-rc1"; - - src = fetchurl { - url = "http://download.zeromq.org/${name}-${version}.tar.gz"; - sha256 = "e8e6325abe2ede0a9fb3d1abbe425d8a7911f6ac283652ee49b36afbb0164d60"; - }; - - doCheck = true; - - meta = { - description = "0MQ is a lightweight messaging kernel"; - longDescription = '' - The 0MQ lightweight messaging kernel is a library which extends - the standard socket interfaces with features traditionally provided - by specialised messaging middleware products. 0MQ sockets provide - an abstraction of asynchronous message queues, multiple messaging patterns, - message filtering (subscriptions), seamless access to multiple transport protocols - and more. - ''; - homepage = http://zeromq.org/; - license = stdenv.lib.licenses.gpl3; - maintainers = [ stdenv.lib.maintainers.gavin ]; - platforms = stdenv.lib.platforms.all; - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0862389aa99..fdb90cc866d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7834,7 +7834,6 @@ let zabbix20 = callPackage ../servers/monitoring/zabbix/2.0.nix { }; zabbix22 = callPackage ../servers/monitoring/zabbix/2.2.nix { }; - zmq = callPackage ../servers/zeromq/default.nix { }; ### OS-SPECIFIC From cd336bbc69968c3e58b151de63cbaa035f57514d Mon Sep 17 00:00:00 2001 From: Georges Dubus Date: Thu, 20 Nov 2014 10:37:37 +0100 Subject: [PATCH 150/383] fabric: update to 1.10.0 --- pkgs/top-level/python-packages.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index c2a7d0c7cde..f117acc5ff0 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2373,10 +2373,10 @@ let fabric = buildPythonPackage rec { name = "fabric-${version}"; - version = "1.9.1"; + version = "1.10.0"; src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/F/Fabric/Fabric-${version}.tar.gz"; - sha256 = "103mzf0l15kyvw5nmf7bsdrqg6y3wpyxmkyl2h9lk7jxb5gdc9s1"; + sha256 = "0nikc05iz1fx2c9pvxrhrs819cpmg566azm99450yq2m8qmp1cpd"; }; disabled = isPy3k; doCheck = (!isPyPy); # https://github.com/fabric/fabric/issues/11891 @@ -2414,10 +2414,10 @@ let }); fudge = buildPythonPackage rec { - name = "fudge-0.9.4"; + name = "fudge-0.9.6"; src = pkgs.fetchurl { - url = https://pypi.python.org/packages/source/f/fudge/fudge-0.9.4.tar.gz; - sha256 = "03sj2x6mpzm48swpa4hnn1gi6yilgniyjfg1ylz95wm1ijggi33w"; + url = "https://pypi.python.org/packages/source/f/fudge/${name}.tar.gz"; + sha256 = "185ia3vr3qk4f2s1a9hdxb8ci4qc0x0xidrad96pywg8j930qs9l"; }; buildInputs = with self; [ nose nosejs ]; propagatedBuildInputs = with self; [ sphinx ]; From e5513ac4dc49680e3be76ee80567bdd956088b65 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 20 Nov 2014 11:11:08 +0100 Subject: [PATCH 151/383] Add Ubuntu 14.10 --- pkgs/build-support/vm/default.nix | 34 +++++++++++++++++++++++++++++++ 1 file changed, 34 insertions(+) diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix index 4aaccabc300..cbb3d24c8e0 100644 --- a/pkgs/build-support/vm/default.nix +++ b/pkgs/build-support/vm/default.nix @@ -1511,6 +1511,40 @@ rec { packages = commonDebPackages ++ [ "diffutils" "libc-bin" ]; }; + ubuntu1410i386 = { + name = "ubuntu-14.10-utopic-i386"; + fullName = "Ubuntu 14.10 Utopic (i386)"; + packagesLists = + [ (fetchurl { + url = mirror://ubuntu/dists/utopic/main/binary-i386/Packages.bz2; + sha256 = "d703032d9291783772c790c17d428ea6cf6d04c3baac5159e623ae60b681e64e"; + }) + (fetchurl { + url = mirror://ubuntu/dists/utopic/universe/binary-i386/Packages.bz2; + sha256 = "cc9232b7fd937bd8894ad6daf28bd4b2a7428e09a0c1661c708e846b3af24ec8"; + }) + ]; + urlPrefix = mirror://ubuntu; + packages = commonDebPackages ++ [ "diffutils" "libc-bin" ]; + }; + + ubuntu1410x86_64 = { + name = "ubuntu-14.10-utopic-amd64"; + fullName = "Ubuntu 14.10 Utopic (amd64)"; + packagesList = + [ (fetchurl { + url = mirror://ubuntu/dists/utopic/main/binary-amd64/Packages.bz2; + sha256 = "56b5cce1a2c8ae1ea46b1d4c50345f0fc8f1108a8db27f6dd8409d566eb517c9"; + }) + (fetchurl { + url = mirror://ubuntu/dists/utopic/universe/binary-amd64/Packages.bz2; + sha256 = "66ca2bf3363b4b45b97e5f5047bd736947d672c31693ed78bacd36e63b19bb63"; + }) + ]; + urlPrefix = mirror://ubuntu; + packages = commonDebPackages ++ [ "diffutils" "libc-bin" ]; + }; + debian40i386 = { name = "debian-4.0r9-etch-i386"; fullName = "Debian 4.0r9 Etch (i386)"; From 99a2afd7842f322200941b0f2fc6d914d520c4c3 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 20 Nov 2014 11:11:21 +0100 Subject: [PATCH 152/383] Update to Debian 7.7 --- pkgs/build-support/vm/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix index cbb3d24c8e0..962f9f6a10f 100644 --- a/pkgs/build-support/vm/default.nix +++ b/pkgs/build-support/vm/default.nix @@ -1616,22 +1616,22 @@ rec { debian70x86_64 = debian7x86_64; debian7i386 = { - name = "debian-7.6-wheezy-i386"; - fullName = "Debian 7.6 Wheezy (i386)"; + name = "debian-7.7-wheezy-i386"; + fullName = "Debian 7.7 Wheezy (i386)"; packagesList = fetchurl { url = mirror://debian/dists/wheezy/main/binary-i386/Packages.bz2; - sha256 = "1j093d6dwixyrk87sdvaayh3ffcn5aqwik36blndiw5njw2qkzgj"; + sha256 = "f2fd890597b6f0d82c5d66ccc8b12a963937a0576a377dd0ccbe47de4c1b09c8"; }; urlPrefix = mirror://debian; packages = commonDebianPackages; }; debian7x86_64 = { - name = "debian-7.6-wheezy-amd64"; - fullName = "Debian 7.6 Wheezy (amd64)"; + name = "debian-7.7-wheezy-amd64"; + fullName = "Debian 7.7 Wheezy (amd64)"; packagesList = fetchurl { url = mirror://debian/dists/wheezy/main/binary-amd64/Packages.bz2; - sha256 = "1n46fxq8a2dm1i7ysc80s5lg10z5dh0hyd8k3h532n5wzs44xqcc"; + sha256 = "8ce14e88febc58310a1c13350f016ce583f068d10031ed4f0cb50985707786d8"; }; urlPrefix = mirror://debian; packages = commonDebianPackages; From e3388aea6e92bd41f862ed7479a80f33ba02d807 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Thu, 20 Nov 2014 11:31:25 +0100 Subject: [PATCH 153/383] nasm: downgrade again until syslinux gets fixed Syslinux won't compile with the new version http://hydra.nixos.org/build/17236670 We've already had one update+revert cycle before. CC @psub. --- pkgs/development/compilers/nasm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/nasm/default.nix b/pkgs/development/compilers/nasm/default.nix index 5a95c2dd044..0c22d790bc5 100644 --- a/pkgs/development/compilers/nasm/default.nix +++ b/pkgs/development/compilers/nasm/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "nasm-${version}"; - version = "2.11.06"; + version = "2.11.05"; src = fetchurl { url = "http://www.nasm.us/pub/nasm/releasebuilds/${version}/${name}.tar.bz2"; - sha256 = "0v1y1kx09nzmk8w4v79jxhn15fmi3g7l9nmgkn7ldjl1d5yxkdl7"; + sha256 = "1sgspnascc0asmwlv3jm1mq4vzx653sa7vlg48z20pfybk7pnhaa"; }; meta = with stdenv.lib; { From 87419c016f8843a634f91225df4864782b3d0643 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 20 Nov 2014 12:12:33 +0100 Subject: [PATCH 154/383] openssh: Update to 6.7p1 --- pkgs/tools/networking/openssh/default.nix | 18 +++++------------- 1 file changed, 5 insertions(+), 13 deletions(-) diff --git a/pkgs/tools/networking/openssh/default.nix b/pkgs/tools/networking/openssh/default.nix index 453b6d8623f..05b97bdcaac 100644 --- a/pkgs/tools/networking/openssh/default.nix +++ b/pkgs/tools/networking/openssh/default.nix @@ -18,11 +18,11 @@ let in stdenv.mkDerivation rec { - name = "openssh-6.6p1"; + name = "openssh-6.7p1"; src = fetchurl { url = "http://ftp.nluug.nl/pub/OpenBSD/OpenSSH/portable/${name}.tar.gz"; - sha256 = "1fq3w86q05y5nn6z878wm312k0svaprw8k007188fd259dkg1ha8"; + sha256 = "01smf9pvn2sk5qs80gkmc9acj07ckawi1b3xxyysp3c5mr73ky5j"; }; prePatch = stdenv.lib.optionalString hpnSupport @@ -31,17 +31,7 @@ stdenv.mkDerivation rec { export NIX_LDFLAGS="$NIX_LDFLAGS -lgcc_s" ''; - patches = [ - ./locale_archive.patch - (fetchurl { - name = "CVE-2014-2653.patch"; - url = "http://anonscm.debian.org/gitweb/?p=pkg-ssh/openssh.git;a=blobdiff_plain;" - + "f=sshconnect.c;h=324f5e0a396a4da9885d121bbbef87f6ccf2b149;" - + "hp=87c3770c0fd5c7ff41227c45b4528985eaea54a6;hb=63d5fa28e16d96db6bac2dbe3fcecb65328f8966;" - + "hpb=9cbb60f5e4932634db04c330c88abc49cc5567bd"; - sha256 = "160c434igl2r8q4cavhdlwvnbqizx444sjrhg98f997pyhz524h9"; - }) - ]; + patches = [ ./locale_archive.patch ]; buildInputs = [ zlib openssl libedit pkgconfig pam ] ++ stdenv.lib.optional withKerberos [ kerberos ]; @@ -64,6 +54,8 @@ stdenv.mkDerivation rec { mkdir -p $out/empty ''; + enableParallelBuilding = true; + postInstall = '' # Install ssh-copy-id, it's very useful. From ac696769af2acbf638ce048c95a68ef24be251f3 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Wed, 19 Nov 2014 16:33:04 -0600 Subject: [PATCH 155/383] Revert "Merge pull request #4693 from flosse/hplip-update" This reverts commit 1b064645ed10a2bee70faec6896d4d33e2a86300, reversing changes made to 14cef95e84e44a830b7317c095c7ffd6b9796fef. As discussed in the comments to the aforementioned pull request, while the new version supports many new printer models, many components of the driver are broken because of some corner cases in the Python wrapper. In particular, the loader for the binary binary driver needed by many middle- and high-end printers is broken, negating most of the value in updating! --- pkgs/misc/drivers/hplip/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/misc/drivers/hplip/default.nix b/pkgs/misc/drivers/hplip/default.nix index 2539cdf7701..678f74745b3 100644 --- a/pkgs/misc/drivers/hplip/default.nix +++ b/pkgs/misc/drivers/hplip/default.nix @@ -5,16 +5,16 @@ }: stdenv.mkDerivation rec { - name = "hplip-3.14.10"; + name = "hplip-3.14.4"; src = fetchurl { url = "mirror://sourceforge/hplip/${name}.tar.gz"; - sha256 = "164mm30yb61psk5j4ziybxdd310y09fixgl09hmb59ny261wvcqi"; + sha256 = "1j8h44f8igl95wqypj4rk9awcw513hlps980jmcnkx60xghc4l6f"; }; plugin = fetchurl { url = "http://www.openprinting.org/download/printdriver/auxfiles/HP/plugins/${name}-plugin.run"; - sha256 = "10cvgy1h84fwh7xpw4x6cbkpisqbn3nbcqrgd9xz5fc6mn0b95dk"; + sha256 = "0k1vpmy7babbm3c5v4dcbhq0jgyr8as722nylfs8zx0dy7kr8874"; }; hplip_state = ./hplip.state; From 4e117488861bfc4d49e3fc479488c91e0016e59f Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Wed, 19 Nov 2014 19:58:13 -0600 Subject: [PATCH 156/383] hplip: update license attribute --- pkgs/misc/drivers/hplip/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/misc/drivers/hplip/default.nix b/pkgs/misc/drivers/hplip/default.nix index 678f74745b3..9ac7aec2a87 100644 --- a/pkgs/misc/drivers/hplip/default.nix +++ b/pkgs/misc/drivers/hplip/default.nix @@ -118,7 +118,9 @@ stdenv.mkDerivation rec { meta = with stdenv.lib; { description = "Print, scan and fax HP drivers for Linux"; homepage = http://hplipopensource.com/; - license = if withPlugin then licenses.unfree else "free"; # MIT/BSD/GPL + license = if withPlugin + then licenses.unfree + else with stdenv.licenses; [ mit bsd2 gpl2Plus ]; platforms = platforms.linux; maintainers = with maintainers; [ ttuegel jgeerds ]; }; From f383ecb8c4fb7c66ce95cbbdc639ba9fdedf66d7 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Wed, 19 Nov 2014 20:41:45 -0600 Subject: [PATCH 157/383] qvim: upgrade to 20140827 (stable) --- pkgs/applications/editors/vim/qvim.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/editors/vim/qvim.nix b/pkgs/applications/editors/vim/qvim.nix index 2357e23bf01..8a2b71e3b57 100644 --- a/pkgs/applications/editors/vim/qvim.nix +++ b/pkgs/applications/editors/vim/qvim.nix @@ -1,5 +1,8 @@ args@{...}: with args; +let tag = "20140827"; + sha256 = "02adf2212872db3c5d133642d2c12fbfc28b506e4c0c42552e3d079756f63f65"; +in let inherit (args.composableDerivation) composableDerivation edf; in composableDerivation { @@ -9,14 +12,14 @@ composableDerivation { else stdenv ).mkDerivation; } (fix: { - name = "qvim-7.4"; + name = "qvim-7.4." + tag; enableParallelBuilding = true; # test this src = fetchgit { url = https://bitbucket.org/equalsraf/vim-qt.git ; - rev = "4160bfd5c1380e899d2f426b494fc4f1cf6ae85e"; - sha256 = "1qa3xl1b9gqw66p71h53l7ibs4y3zfyj553jss70ybxaxchbhi5b"; + rev = "refs/tags/package-" + tag; + inherit sha256; }; # FIXME: adopt Darwin fixes from vim/default.nix, then chage meta.platforms.linux From 1286572302d4bb7ee4b1630dae6849a669bfcbad Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Wed, 19 Nov 2014 20:41:58 -0600 Subject: [PATCH 158/383] qvim: add ttuegel to maintainers --- pkgs/applications/editors/vim/qvim.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/editors/vim/qvim.nix b/pkgs/applications/editors/vim/qvim.nix index 8a2b71e3b57..5d1a8a6f141 100644 --- a/pkgs/applications/editors/vim/qvim.nix +++ b/pkgs/applications/editors/vim/qvim.nix @@ -122,7 +122,7 @@ composableDerivation { meta = with stdenv.lib; { description = "The most popular clone of the VI editor (Qt GUI fork)"; homepage = https://bitbucket.org/equalsraf/vim-qt/wiki/Home; - maintainers = with maintainers; [ smironov ]; + maintainers = with maintainers; [ smironov ttuegel ]; platforms = platforms.linux; }; }) From 44e32468111b37fecc9d25b718dc31241e281041 Mon Sep 17 00:00:00 2001 From: Joachim Schiele Date: Thu, 20 Nov 2014 11:24:51 +0100 Subject: [PATCH 159/383] owncloudclient: initial 1.7.0 packaged added --- .../networking/owncloud-client/default.nix | 32 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 34 insertions(+) create mode 100644 pkgs/applications/networking/owncloud-client/default.nix diff --git a/pkgs/applications/networking/owncloud-client/default.nix b/pkgs/applications/networking/owncloud-client/default.nix new file mode 100644 index 00000000000..6e7755c7bf4 --- /dev/null +++ b/pkgs/applications/networking/owncloud-client/default.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchurl, cmake, qt4, pkgconfig, neon, qtkeychain, sqlite }: + +stdenv.mkDerivation rec { + name = "owncloud-client" + "-" + version; + + version = "1.7.0"; + + src = fetchurl { + url = "https://download.owncloud.com/desktop/stable/mirall-${version}.tar.bz2"; + sha256 = "b1cb0612e5022de263dc4c6309eba8207d694a40a80dae6762b4a56fa8d4d944"; + }; + + buildInputs = + [ cmake qt4 pkgconfig neon qtkeychain sqlite]; + + #configurePhase = '' + # mkdir build + # cd build + # cmake -DBUILD_WITH_QT4=on \ + # -DCMAKE_INSTALL_PREFIX=$out \ + # -DCMAKE_BUILD_TYPE=Release \ + # .. + #''; + + enableParallelBuilding = true; + + meta = { + description = "Synchronise your ownCloud with your computer using this desktop client"; + homepage = https://owncloud.org; + maintainers = with stdenv.lib.maintainers; [ qknight ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fdb90cc866d..55c7e9bb644 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1994,6 +1994,8 @@ let otpw = callPackage ../os-specific/linux/otpw { }; + owncloudclient = callPackage ../applications/networking/owncloud-client { }; + p7zip = callPackage ../tools/archivers/p7zip { }; pal = callPackage ../tools/misc/pal { }; From c14dee55e8f4b07e40046aaf3e6e0e3295b8dd86 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Thu, 20 Nov 2014 12:53:44 +0100 Subject: [PATCH 160/383] ruby-2.0: fix patch paths (and build) Wrong patch paths were ignored until recently by our stdenv. --- pkgs/development/interpreters/ruby/ruby-2.0.0.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/interpreters/ruby/ruby-2.0.0.nix b/pkgs/development/interpreters/ruby/ruby-2.0.0.nix index 1e886b0219a..ea8fcc327ee 100644 --- a/pkgs/development/interpreters/ruby/ruby-2.0.0.nix +++ b/pkgs/development/interpreters/ruby/ruby-2.0.0.nix @@ -51,11 +51,11 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; patches = ops useRailsExpress [ - "${patchSet}/patches/ruby/2.0.0/p481/01-zero-broken-tests.patch" - "${patchSet}/patches/ruby/2.0.0/p481/02-railsexpress-gc.patch" - "${patchSet}/patches/ruby/2.0.0/p481/03-display-more-detailed-stack-trace.patch" - "${patchSet}/patches/ruby/2.0.0/p481/04-show-full-backtrace-on-stack-overflow.patch" - "${patchSet}/patches/ruby/2.0.0/p481/05-fix-missing-c-return-event.patch" + "${patchSet}/patches/ruby/2.0.0/p481/railsexpress/01-zero-broken-tests.patch" + "${patchSet}/patches/ruby/2.0.0/p481/railsexpress/02-railsexpress-gc.patch" + "${patchSet}/patches/ruby/2.0.0/p481/railsexpress/03-display-more-detailed-stack-trace.patch" + "${patchSet}/patches/ruby/2.0.0/p481/railsexpress/04-show-full-backtrace-on-stack-overflow.patch" + "${patchSet}/patches/ruby/2.0.0/p481/railsexpress/05-fix-missing-c-return-event.patch" ]; configureFlags = ["--enable-shared" ] From 17cf42d876f8b33fcd29fec65c04e0c355ffc0f4 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 20 Nov 2014 13:19:36 +0100 Subject: [PATCH 161/383] Fix patchelf RPM builds http://hydra.nixos.org/build/17037187 --- pkgs/build-support/release/functions.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/build-support/release/functions.sh b/pkgs/build-support/release/functions.sh index d3be4084e4f..875a2da178d 100644 --- a/pkgs/build-support/release/functions.sh +++ b/pkgs/build-support/release/functions.sh @@ -2,7 +2,7 @@ findTarball() { local suffix i if [ -d "$1/tarballs/" ]; then for suffix in tar.gz tgz tar.bz2 tbz2 tar.xz tar.lzma; do - for i in $1/tarballs/*.$suffix; do echo $i; return; done + for i in $1/tarballs/*.$suffix; do echo $i; break; done done | sort | head -1 return else From a19eeddd7067bdfde48601ee393429659403028b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Thu, 20 Nov 2014 13:21:41 +0100 Subject: [PATCH 162/383] ruby-2.1.1: fix patch numbering (and build) Wrong patch paths were ignored until recently by our stdenv. It's slightly unclear to me which patches were supposed to be used. --- pkgs/development/interpreters/ruby/ruby-2.1.1.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/interpreters/ruby/ruby-2.1.1.nix b/pkgs/development/interpreters/ruby/ruby-2.1.1.nix index e26cdd5b315..6a53c2d93ea 100644 --- a/pkgs/development/interpreters/ruby/ruby-2.1.1.nix +++ b/pkgs/development/interpreters/ruby/ruby-2.1.1.nix @@ -57,12 +57,12 @@ stdenv.mkDerivation rec { "${patchSet}/patches/ruby/2.1.0/railsexpress/03-display-more-detailed-stack-trace.patch" "${patchSet}/patches/ruby/2.1.0/railsexpress/04-show-full-backtrace-on-stack-overflow.patch" "${patchSet}/patches/ruby/2.1.0/railsexpress/05-fix-missing-c-return-event.patch" - "${patchSet}/patches/ruby/2.1.0/railsexpress/06-backport-006e66b6680f60adfb434ee7397f0dbc77de7873.patch" - "${patchSet}/patches/ruby/2.1.0/railsexpress/07-funny-falcon-stc-density.patch" - "${patchSet}/patches/ruby/2.1.0/railsexpress/08-funny-falcon-stc-pool-allocation.patch" - "${patchSet}/patches/ruby/2.1.0/railsexpress/09-aman-opt-aset-aref-str.patch" - "${patchSet}/patches/ruby/2.1.0/railsexpress/10-funny-falcon-method-cache.patch" - "${patchSet}/patches/ruby/2.1.0/railsexpress/11-backport-r44370.patch" + "${patchSet}/patches/ruby/2.1.0/railsexpress/07-backport-006e66b6680f60adfb434ee7397f0dbc77de7873.patch" + "${patchSet}/patches/ruby/2.1.0/railsexpress/08-funny-falcon-stc-density.patch" + "${patchSet}/patches/ruby/2.1.0/railsexpress/09-funny-falcon-stc-pool-allocation.patch" + "${patchSet}/patches/ruby/2.1.0/railsexpress/10-aman-opt-aset-aref-str.patch" + "${patchSet}/patches/ruby/2.1.0/railsexpress/11-funny-falcon-method-cache.patch" + "${patchSet}/patches/ruby/2.1.0/railsexpress/12-backport-r44370.patch" ]; # Ruby >= 2.1.0 tries to download config.{guess,sub} From 3630b985553d1ebf3fe0d5c3ba0b62927e16f257 Mon Sep 17 00:00:00 2001 From: Vladimir Kirillov Date: Thu, 20 Nov 2014 15:22:55 +0200 Subject: [PATCH 163/383] all-packages: add gitMinimal, use it for nix-exec and fetchgit since git is used to bootstrap a lot, this can save lots of waiting time. --- pkgs/top-level/all-packages.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 55c7e9bb644..0d849aa32c5 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -309,7 +309,8 @@ let }; fetchgit = import ../build-support/fetchgit { - inherit stdenv git cacert; + inherit stdenv cacert; + git = gitMinimal; }; fetchgitPrivate = import ../build-support/fetchgit/private.nix { @@ -3983,10 +3984,7 @@ let nix-exec = callPackage ../development/interpreters/nix-exec { nix = nixUnstable; - git = git.override { - withManual = false; - pythonSupport = false; - }; + git = gitMinimal; }; octave = callPackage ../development/interpreters/octave { @@ -9653,6 +9651,10 @@ let }); git = gitAndTools.git; gitFull = gitAndTools.gitFull; + gitMinimal = git.override { + withManual = false; + pythonSupport = false; + }; gitSVN = gitAndTools.gitSVN; gitRepo = callPackage ../applications/version-management/git-repo { From 21753791b1e090909f17588b02caf9d4478a8115 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= Date: Thu, 20 Nov 2014 14:23:19 +0100 Subject: [PATCH 164/383] hplip: fix typo in license --- pkgs/misc/drivers/hplip/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/misc/drivers/hplip/default.nix b/pkgs/misc/drivers/hplip/default.nix index 9ac7aec2a87..4fa35c8b812 100644 --- a/pkgs/misc/drivers/hplip/default.nix +++ b/pkgs/misc/drivers/hplip/default.nix @@ -120,7 +120,7 @@ stdenv.mkDerivation rec { homepage = http://hplipopensource.com/; license = if withPlugin then licenses.unfree - else with stdenv.licenses; [ mit bsd2 gpl2Plus ]; + else with licenses; [ mit bsd2 gpl2Plus ]; platforms = platforms.linux; maintainers = with maintainers; [ ttuegel jgeerds ]; }; From 8570046e5c879e8c30bc1fa1656350127a9fcee4 Mon Sep 17 00:00:00 2001 From: Mateusz Kowalczyk Date: Thu, 20 Nov 2014 13:26:54 +0000 Subject: [PATCH 165/383] rlwrap: update from 0.41 to 0.42 --- pkgs/tools/misc/rlwrap/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/rlwrap/default.nix b/pkgs/tools/misc/rlwrap/default.nix index ace42e41887..ee330c0bee5 100644 --- a/pkgs/tools/misc/rlwrap/default.nix +++ b/pkgs/tools/misc/rlwrap/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, readline }: stdenv.mkDerivation rec { - name = "rlwrap-0.41"; + name = "rlwrap-0.42"; src = fetchurl { url = "http://utopia.knoware.nl/~hlub/uck/rlwrap/${name}.tar.gz"; - sha256 = "02n22yy9wgz1cj59is17j0my17y7146ghkng381yxx4dnr3pcj9l"; + sha256 = "0i3yz303wscrysyzpdq04h4nrl9ajz9dbwi80risdl5rkm3dhw2s"; }; buildInputs = [ readline ]; From 5fc61b7fa0a803e05fa552c9de91fb7704919c91 Mon Sep 17 00:00:00 2001 From: Mateusz Kowalczyk Date: Thu, 20 Nov 2014 13:30:01 +0000 Subject: [PATCH 166/383] mpd: update to 0.19.4 --- pkgs/servers/mpd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/mpd/default.nix b/pkgs/servers/mpd/default.nix index 12bbd8c6811..ba134c6e8f7 100644 --- a/pkgs/servers/mpd/default.nix +++ b/pkgs/servers/mpd/default.nix @@ -25,13 +25,13 @@ let opt = stdenv.lib.optional; mkFlag = c: f: if c then "--enable-${f}" else "--disable-${f}"; major = "0.19"; - minor = "3"; + minor = "4"; in stdenv.mkDerivation rec { name = "mpd-${major}.${minor}"; src = fetchurl { url = "http://www.musicpd.org/download/mpd/${major}/${name}.tar.gz"; - sha256 = "0m1xh4diip912zwqj54p75a4iy71a9wpx5ilvf7qa17b9sm0czr4"; + sha256 = "1mxs30z96px5vgz0786xln2k8cs0l58gnac5py58pbigcqgihi3p"; }; buildInputs = [ pkgconfig glib boost ] From 0cb9343af1e4c8dde9fd1757dcd8e03a81783679 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Thu, 20 Nov 2014 16:46:08 +0100 Subject: [PATCH 167/383] haskell-hayland: revert new addition Reverts (one half of) NixOS/nixpkgs#4999, i.e. 55bb7dd1f2abf4df. The package doesn't compile: http://hydra.cryp.to/build/249781/log/raw. Please re-submit when the issue has been resolved. --- .../libraries/haskell/hayland/default.nix | 25 ------------------- pkgs/top-level/haskell-packages.nix | 2 -- 2 files changed, 27 deletions(-) delete mode 100644 pkgs/development/libraries/haskell/hayland/default.nix diff --git a/pkgs/development/libraries/haskell/hayland/default.nix b/pkgs/development/libraries/haskell/hayland/default.nix deleted file mode 100644 index 6704aa5ff02..00000000000 --- a/pkgs/development/libraries/haskell/hayland/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -# This file was auto-generated by cabal2nix. Please do NOT edit manually! - -{ cabal, c2hs, dataFlags, time, wayland, xml, - mesa -}: - -cabal.mkDerivation (self: { - pname = "hayland"; - version = "0.1.0.1"; - sha256 = "0dpisbqfsay8lwpfihw5fmpzi2ajc8qshsawbr4r6x8indy4kdy0"; - isLibrary = true; - isExecutable = true; - buildDepends = [ c2hs dataFlags time xml ]; - testDepends = [ xml ]; - pkgconfigDepends = [ - wayland - mesa - ]; - doCheck = false; - meta = { - description = "Haskell bindings for the C Wayland library"; - 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 8227c52d4b2..3d34e249f3c 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1089,8 +1089,6 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in HaTeX = callPackage ../development/libraries/haskell/HaTeX {}; - hayland = callPackage ../development/libraries/haskell/hayland {}; - hcltest = callPackage ../development/libraries/haskell/hcltest {}; hedis = callPackage ../development/libraries/haskell/hedis {}; From 4c9c9c394fde974d354e8b9dbd01cac33b8f4513 Mon Sep 17 00:00:00 2001 From: Boris Sukholitko Date: Thu, 20 Nov 2014 17:59:08 +0200 Subject: [PATCH 168/383] libdwarf: upgrade to the latest version Also build and export dwarfdump, dwarfdump2 utilities. --- .../libraries/libdwarf/default.nix | 24 +++++++++++-------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/pkgs/development/libraries/libdwarf/default.nix b/pkgs/development/libraries/libdwarf/default.nix index 44eec24cb41..295fcbc1da9 100644 --- a/pkgs/development/libraries/libdwarf/default.nix +++ b/pkgs/development/libraries/libdwarf/default.nix @@ -1,27 +1,31 @@ { stdenv, fetchurl, libelf }: stdenv.mkDerivation rec { - name = "libdwarf-20121130"; + name = "libdwarf-20140805"; src = fetchurl { - url = http://reality.sgiweb.org/davea/libdwarf-20121130.tar.gz; - sha256 = "1nfdfn5xf3n485pvpb853awyxxnvrg207i0wmrr7bhk8fcxdxbn0"; + url = "http://www.prevanders.net/${name}.tar.gz"; + sha256 = "1z5xz0w1yvk8swcqzx4dvnig94j51pns39jmipv5rl20qahik0nl"; }; - configureFlags = " --enable-shared --disable-nonshared"; + configureFlags = "--enable-shared"; - preConfigure = '' - cd libdwarf + preBuild = '' + export LD_LIBRARY_PATH=`pwd`/libdwarf ''; + buildInputs = [ libelf ]; installPhase = '' - mkdir -p $out/lib $out/include - cp libdwarf.so $out/lib - cp libdwarf.h dwarf.h $out/include + mkdir -p $out/lib $out/include $out/bin + cp ./dwarfdump2/dwarfdump $out/bin/dwarfdump2 + cp ./dwarfdump/dwarfdump $out/bin/dwarfdump + cp libdwarf/libdwarf.so $out/lib + cp libdwarf/libdwarf.h libdwarf/dwarf.h $out/include ''; meta = { - homepage = http://reality.sgiweb.org/davea/dwarf.html; + homepage = http://www.prevanders.net/dwarf.html; + license = stdenv.lib.licenses.gpl2; }; } From e887fc72d32821818dac4a6b62201a5629d088ed Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Thu, 20 Nov 2014 17:58:10 +0100 Subject: [PATCH 169/383] nasm: add a do-not-update comment --- pkgs/development/compilers/nasm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/nasm/default.nix b/pkgs/development/compilers/nasm/default.nix index 0c22d790bc5..fad8a584ed2 100644 --- a/pkgs/development/compilers/nasm/default.nix +++ b/pkgs/development/compilers/nasm/default.nix @@ -2,8 +2,8 @@ stdenv.mkDerivation rec { name = "nasm-${version}"; - version = "2.11.05"; - + version = "2.11.05"; # do not update until syslinux is fixed with that version + src = fetchurl { url = "http://www.nasm.us/pub/nasm/releasebuilds/${version}/${name}.tar.bz2"; sha256 = "1sgspnascc0asmwlv3jm1mq4vzx653sa7vlg48z20pfybk7pnhaa"; From 4f3190f3da1dd1046cf4786a5efa533292de3750 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Thu, 20 Nov 2014 08:40:17 +0000 Subject: [PATCH 170/383] Adds libltc Linear (or Longitudinal) Timecode (LTC) is an encoding of timecode data as a Manchester-Biphase encoded audio signal. The audio signal is commonly recorded on a VTR track or other storage media. libltc provides functionality to encode and decode LTC from/to timecode, including SMPTE date support. libltc is the successor of libltcsmpte. Homepage: http://x42.github.io/libltc/ --- pkgs/development/libraries/libltc/default.nix | 17 +++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 19 insertions(+) create mode 100644 pkgs/development/libraries/libltc/default.nix diff --git a/pkgs/development/libraries/libltc/default.nix b/pkgs/development/libraries/libltc/default.nix new file mode 100644 index 00000000000..ec306e0f7c3 --- /dev/null +++ b/pkgs/development/libraries/libltc/default.nix @@ -0,0 +1,17 @@ +{stdenv, fetchurl}: + +stdenv.mkDerivation { + name = "libltc-1.1.4"; + + src = fetchurl { + url = https://github.com/x42/libltc/releases/download/v1.1.4/libltc-1.1.4.tar.gz; + sha256 = "0xas0zbi11nhq15al6cxn0iwa563s6fcz01hw0np1clh25h4773x"; + }; + + meta = with stdenv.lib; { + homepage = http://x42.github.io/libltc/; + description = "POSIX-C Library for handling Linear/Logitudinal Time Code (LTC)"; + license = licenses.lgpl3Plus; + platforms = platforms.all; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0d849aa32c5..03c24a961bd 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5852,6 +5852,8 @@ let liblogging = callPackage ../development/libraries/liblogging { }; + libltc = callPackage ../development/libraries/libltc { }; + libmcrypt = callPackage ../development/libraries/libmcrypt {}; libmhash = callPackage ../development/libraries/libmhash {}; From f54f79e5a3632a510daceeb0ccd6fa1ebd8a9ce4 Mon Sep 17 00:00:00 2001 From: Arseniy Seroka Date: Thu, 20 Nov 2014 23:49:17 +0300 Subject: [PATCH 171/383] sort plugins --- pkgs/misc/vim-plugins/default.nix | 1450 +++++++++++++++-------------- 1 file changed, 753 insertions(+), 697 deletions(-) diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix index cd694feb9b2..ecb3fbc1d57 100644 --- a/pkgs/misc/vim-plugins/default.nix +++ b/pkgs/misc/vim-plugins/default.nix @@ -76,10 +76,79 @@ in # call nix#ExportPluginsForNix({'path_to_nixpkgs': '/etc/nixos/nixpkgs', 'names': ["vim-addon-manager", "vim-addon-nix"], 'cache_file': 'cache'}) # # [1] https://bitbucket.org/vimcommunity/vim-pi +/* + Some of the plugin definitions below are generated the following VimL command + provided by vim-addon-manager. + + " Copy /tmp/tmp.vim file and run: :source /tmp/tmp.vim + call nix#ExportPluginsForNix({ + \ 'path_to_nixpkgs': '/etc/nixos/nixpkgs', + \ 'cache_file': '/tmp/vim2nix-cache', + \ 'names': [ + \ "vim-addon-syntax-checker", + \ "vim-addon-other", + \ "vim-addon-local-vimrc", + \ "snipmate", + \ "vim-snippets", + \ "vim-addon-mru", + \ "vim-addon-commenting", + \ "vim-addon-sql", + \ "vim-addon-async", + \ "vim-addon-toggle-buffer", + \ "vim-addon-mw-utils", + \ "matchit.zip", + \ "vim-addon-xdebug", + \ "vim-addon-php-manual", + \ "sourcemap.vim", + \ "vim-iced-coffee-script", + \ "ctrlp", + \ "commentary", + \ "Colour_Sampler_Pack", + \ "Solarized", + \ "vim-coffee-script", + \ "vim-easy-align", + \ "Tagbar", + \ "Tabular", + \ "table-mode", + \ "Syntastic", + \ "vim-signature", + \ "surround", + \ "Supertab", + \ "rust", + \ "rainbow_parentheses", + \ "pathogen", + \ "quickfixstatus", + \ "The_NERD_Commenter", + \ "The_NERD_tree", + \ "vim-latex-live-preview", + \ "Hoogle", + \ "Gundo", + \ "vim-gitgutter", + \ "Gist", + \ "ghcmod", + \ "fugitive", + \ "extradite", + \ "vim-airline", + \ "VimOutliner", + \ "vim2hs", + \ "undotree", + \ "UltiSnips", + \ "wombat256", + \ "vundle", + \ "WebAPI", + \ "YankRing", + \ "vim-addon-manager", + \ "vim-addon-nix", + \ "YUNOcommit" + \ ], + \ }) + +# TODO: think about how to add license information? +*/ + rec { inherit rtpPath; - # vim-pi: not git version a = buildVimPlugin { name = "a-git-2010-11-06"; src = fetchgit { @@ -93,9 +162,8 @@ rec { }; }; - alternative = a; # backwards compat, added 2014-10-21 + airline = vim-airline; - # vim-pi: Align%294 align = buildVimPlugin { name = "align-git-2012-08-07"; src = fetchgit { @@ -109,7 +177,8 @@ rec { }; }; - # vim-pi: not git versior + alternative = a; # backwards compat, added 2014-10-21 + calendar = buildVimPlugin { name = "calendar-git-2014-10-19"; src = fetchgit { @@ -123,6 +192,28 @@ rec { }; }; + coffee-script = vim-coffee-script; + + coffeeScript = coffee-script; # backwards compat, added 2014-10-18 + + colors-solarized = Solarized; + + colorsamplerpack = Colour_Sampler_Pack; + + Colour_Sampler_Pack = buildVimPlugin { + name = "Colour_Sampler_Pack"; + src = fetchurl { + url = "http://www.vim.org/scripts/download_script.php?src_id=18915"; + name = "ColorSamplerPack.zip"; + sha256 = "1wsrb3vpqn9fncnalfpvc8r92wk1mcskm4shb3s2h9x5dyihf2rd"; + }; + buildInputs = [ unzip ]; + dependencies = []; + meta = { + url = "http://www.vim.org/scripts/script.php?script_id=625"; + }; + }; + command-t = buildVimPlugin rec { version = "1.8"; name = "command-t-${version}"; @@ -142,8 +233,28 @@ rec { command_T = command-t; # backwards compat, added 2014-10-18 + commentary = buildVimPlugin { + name = "commentary"; + src = fetchgit { + url = "git://github.com/tpope/vim-commentary"; + rev = "401dbd8abee69defe66acf5e9ccc85e2746c27e2"; + sha256 = "3deec79d6c40a6c91fa504423f38c9f6a9e3495804f1996e2420d0ad34fe2da8"; + }; + dependencies = []; + }; + + ctrlp = buildVimPlugin { + name = "ctrlp"; + src = fetchgit { + url = "git://github.com/kien/ctrlp.vim"; + rev = "b5d3fe66a58a13d2ff8b6391f4387608496a030f"; + sha256 = "41f7884973770552395b96f8693da70999dc815462d4018c560d3ff6be462e76"; + }; + dependencies = []; + }; + + easy-align = vim-easy-align; - # vim-pi: not git version easymotion = buildVimPlugin { name = "easymotion-git-2014-09-29"; src = fetchgit { @@ -157,7 +268,6 @@ rec { }; }; - # not replacing by vim-pi because license information would get lost eighties = buildVimPlugin rec { version = "1.0.4"; name = "eighties-${version}"; @@ -174,8 +284,53 @@ rec { }; }; + extradite = buildVimPlugin { + name = "extradite"; + src = fetchgit { + url = "git://github.com/int3/vim-extradite"; + rev = "af4f3a51b6b654d655121b93c0cd9d8fe9a0c85d"; + sha256 = "d1d29cfbc654134be383747f2cd6b14b7a87de75f997af6a041f14d7ef61ade6"; + }; + dependencies = []; + }; + + fugitive = buildVimPlugin { + name = "fugitive"; + src = fetchgit { + url = "git://github.com/tpope/vim-fugitive"; + rev = "0374322ba5d85ae44dd9dc44ef31ca015a59097e"; + sha256 = "3bb09693726c4f9fc1695bc8b40c45d64a6a0f1d9a4243b4a79add841013ad6c"; + }; + dependencies = []; + }; + + ghc-mod-vim = ghcmod; + + ghcmod = buildVimPlugin { + name = "ghcmod"; + src = fetchgit { + url = "git://github.com/eagletmt/ghcmod-vim"; + rev = "d5c6c7f3c85608b5b76dc3e7e001f60b86c32cb9"; + sha256 = "ab56d470ea18da3fae021e22bba14460505e61a94f8bf707778dff5eec51cd6d"; + }; + dependencies = []; + }; + + Gist = buildVimPlugin { + name = "Gist"; + src = fetchgit { + url = "git://github.com/mattn/gist-vim"; + rev = "d609d93472db9cf45bd701bebe51adc356631547"; + sha256 = "e5cabc03d5015c589a32f11c654ab9fbd1e91d26ba01f4b737685be81852c511"; + }; + buildInputs = [ zip ]; + dependencies = []; + }; + + gist-vim = Gist; + + gitgutter = vim-gitgutter; - # unkown by vim-pi golang = buildVimPlugin { name = "golang-git-2014-08-06"; src = fetchgit { @@ -189,7 +344,18 @@ rec { }; }; - # unkown by vim-pi + Gundo = buildVimPlugin { + name = "Gundo"; + src = fetchgit { + url = "https://bitbucket.org/sjl/gundo.vim"; + rev = ""; + sha256 = ""; + }; + dependencies = []; + }; + + gundo = Gundo; + hardtime = buildVimPlugin { name = "hardtime-git-2014-10-21"; src = fetchgit { @@ -203,7 +369,6 @@ rec { }; }; - # unkown by vim-pi haskellconceal = buildVimPlugin { name = "haskellconceal-git-2014-08-07"; src = fetchgit { @@ -217,7 +382,8 @@ rec { }; }; - # unkown by vim-pi + haskellConceal = haskellconceal; # backwards compat, added 2014-10-18 + hasksyn = buildVimPlugin { name = "hasksyn-git-2014-09-03"; src = fetchgit { @@ -231,7 +397,6 @@ rec { }; }; - # unkown by vim-pi hdevtools = buildVimPlugin { name = "hdevtools-git-2012-12-29"; src = fetchgit { @@ -245,7 +410,6 @@ rec { }; }; - # not git version in vim-pi hier = buildVimPlugin { name = "hier-git-2011-08-27"; src = fetchgit { @@ -260,7 +424,18 @@ rec { }; }; - # unkown by vim-pi + Hoogle = buildVimPlugin { + name = "Hoogle"; + src = fetchgit { + url = "git://github.com/Twinside/vim-hoogle"; + rev = "81f28318b0d4174984c33df99db7752891c5c4e9"; + sha256 = "0f96f3badb6218cac87d0f7027ff032ecc74f08ad3ada542898278ce11cbd5a0"; + }; + dependencies = []; + }; + + hoogle = Hoogle; + idris-vim = buildVimPlugin { name = "idris-vim-git-2014-10-14"; src = fetchgit { @@ -274,7 +449,6 @@ rec { }; }; - # not git version in vim-pi ipython = buildVimPlugin { name = "ipython-git-2014-07-17"; src = fetchgit { @@ -288,7 +462,6 @@ rec { }; }; - # unkown by vim-pi ? latex-box = buildVimPlugin { name = "latex-box-git-2014-10-05"; src = fetchgit { @@ -302,7 +475,8 @@ rec { }; }; - # unkown by vim-pi ? + latex-live-preview = vim-latex-live-preview; + lushtags = buildVimPlugin { name = "lushtags-git-2013-12-27"; src = fetchgit { @@ -316,7 +490,20 @@ rec { }; }; - # unkown by vim-pi ? + matchit.zip = buildVimPlugin { + name = "matchit.zip"; + src = fetchurl { + url = "http://www.vim.org/scripts/download_script.php?src_id=8196"; + name = "matchit.zip"; + sha256 = "1bbm8j1bhb70kagwdimwy9vcvlrz9ax5bk2a7wrmn4cy87f9xj4l"; + }; + buildInputs = [ unzip ]; + dependencies = []; + meta = { + url = "http://www.vim.org/scripts/script.php?script_id=39"; + }; + }; + neco-ghc = buildVimPlugin { name = "neco-ghc-git-2014-10-17"; src = fetchgit { @@ -330,6 +517,21 @@ rec { }; }; + necoGhc = neco-ghc; # backwards compat, added 2014-10-18 + + neocomplete = buildVimPlugin { + name = "neocomplete-git-2014-11-18"; + src = fetchgit { + url = "https://github.com/Shougo/neocomplete.vim.git"; + rev = "26aef680ece29047089e7540b78696f1e6336be2"; + sha256 = "42734ddb29f6661de687e0d18c5ddbd443adc6d2f69fe8e44d0e47473f1bc0ae"; + }; + meta = { + homepage = https://github.com/Shougo/neocomplete.vim; + maintainers = [ stdenv.lib.maintainers.jagajaga ]; + }; + }; + neosnippet = buildVimPlugin { name = "neosnippet-git-2014-11-18"; src = fetchgit { @@ -343,19 +545,6 @@ rec { }; }; - neocomplete = buildVimPlugin { - name = "neocomplete-git-2014-11-18"; - src = fetchgit { - url = "https://github.com/Shougo/neocomplete.vim.git"; - rev = "26aef680ece29047089e7540b78696f1e6336be2"; - sha256 = "42734ddb29f6661de687e0d18c5ddbd443adc6d2f69fe8e44d0e47473f1bc0ae"; - }; - meta = { - homepage = https://github.com/Shougo/neocomplete.vim; - maintainers = [ stdenv.lib.maintainers.jagajaga ]; - }; - }; - neosnippet-snippets = buildVimPlugin { name = "neosnippet-snippets-git-2014-11-17"; src = fetchgit { @@ -369,8 +558,30 @@ rec { }; }; + nerdcommenter = The_NERD_Commenter; + + nerdtree = The_NERD_tree; + + pathogen = buildVimPlugin { + name = "pathogen"; + src = fetchgit { + url = "git://github.com/tpope/vim-pathogen"; + rev = "91e6378908721d20514bbe5d18d292a0a15faf0c"; + sha256 = "24c1897d6b58576b2189c90050a7f8ede72a51343c752e9d030e833dbe5cac6f"; + }; + dependencies = []; + }; + + quickfixstatus = buildVimPlugin { + name = "quickfixstatus"; + src = fetchgit { + url = "git://github.com/dannyob/quickfixstatus"; + rev = "fd3875b914fc51bbefefa8c4995588c088163053"; + sha256 = "7b6831d5da1c23d95f3158c67e4376d32c2f62ab2e30d02d3f3e14dcfd867d9b"; + }; + dependencies = []; + }; - # vim-pi: quickrun%3146 quickrun = buildVimPlugin { name = "quickrun-git-2014-10-08"; src = fetchgit { @@ -384,8 +595,26 @@ rec { }; }; + rainbow_parentheses = buildVimPlugin { + name = "rainbow_parentheses"; + src = fetchgit { + url = "git://github.com/kien/rainbow_parentheses.vim"; + rev = "eb8baa5428bde10ecc1cb14eed1d6e16f5f24695"; + sha256 = "47975a426d06f41811882691d8a51f32bc72f590477ed52b298660486b2488e3"; + }; + dependencies = []; + }; + + rust = buildVimPlugin { + name = "rust"; + src = fetchgit { + url = "git://github.com/wting/rust.vim"; + rev = "0cf510adc5a83ad4c256f576fd36b38c74349d43"; + sha256 = "839f4ea2e045fc41fa2292882576237dc36d714bd78e46728c6696c44d2851d8"; + }; + dependencies = []; + }; - # unkown by vim-pi shabadou = buildVimPlugin { name = "shabadou-git-2014-07-27"; src = fetchgit { @@ -399,6 +628,38 @@ rec { }; }; + signature = vim-signature; + + snipmate = buildVimPlugin { + name = "snipmate"; + src = fetchgit { + url = "git://github.com/garbas/vim-snipmate"; + rev = "e6eb057a58e2fe98137997157d0eff9d1a975888"; + sha256 = "4d8f9091b92a75f21d96a6f6a862aa4ad5671ab8317ceef4498eeb14a1524190"; + }; + dependencies = ["vim-addon-mw-utils" "tlib"]; + }; + + Solarized = buildVimPlugin { + name = "Solarized"; + src = fetchgit { + url = "git://github.com/altercation/vim-colors-solarized"; + rev = "528a59f26d12278698bb946f8fb82a63711eec21"; + sha256 = "a1b2ef696eee94dafa76431c31ee260acdd13a7cf87939f27eca431d5aa5a315"; + }; + dependencies = []; + }; + + sourcemap.vim = buildVimPlugin { + name = "sourcemap.vim"; + src = fetchgit { + url = "git://github.com/chikatoike/sourcemap.vim"; + rev = "0dd82d40faea2fdb0771067f46c01deb41610ba1"; + sha256 = "a08c77aea39be4a0a980d62673d1d17fecc518a8aeb9101210e453aaacb78fbd"; + }; + dependencies = []; + }; + stylish-haskell = buildVimPlugin { name = "stylish-haskell-git-2014-07-14"; src = fetchgit { @@ -412,8 +673,52 @@ rec { }; }; + stylishHaskell = stylish-haskell; # backwards compat, added 2014-10-18 + + Supertab = buildVimPlugin { + name = "Supertab"; + src = fetchgit { + url = "git://github.com/ervandew/supertab"; + rev = "fd4e0d06c2b1d9bff2eef1d15e7895b3b4da7cd7"; + sha256 = "5919521b95519d4baa8ed146c340ca739fa7f31dfd305c74ca0ace324ba93d74"; + }; + dependencies = []; + }; + + supertab = Supertab; + + surround = buildVimPlugin { + name = "surround"; + src = fetchgit { + url = "git://github.com/tpope/vim-surround"; + rev = "fa433e0b7330753688f715f3be5d10dc480f20e5"; + sha256 = "5f01daf72d23fc065f4e4e8eac734275474f32bfa276a9d90ce0d20dfe24058d"; + }; + dependencies = []; + }; + + Syntastic = buildVimPlugin { + name = "Syntastic"; + src = fetchgit { + url = "git://github.com/scrooloose/syntastic"; + rev = "e4c94d67a9ba7f35397b4a2f0daa8f346a84a8b9"; + sha256 = "366b5568ddf0db0e35a19bbd3ae4d0dc4accaefe5fdd14159540d26a76e3a96e"; + }; + dependencies = []; + }; + + syntastic = Syntastic; + + table-mode = buildVimPlugin { + name = "table-mode"; + src = fetchgit { + url = "git://github.com/dhruvasagar/vim-table-mode"; + rev = "ea78f6256513b4b853ea01b55b18baf0f9d99f8c"; + sha256 = "570a9660b17489ec6a976d878aec45470bc91c8da41f0e3ab8f09962683b2da7"; + }; + dependencies = []; + }; - # unkown by vim-pi tabmerge = buildVimPlugin { name = "tabmerge-git-2010-10-17"; src = fetchgit { @@ -427,6 +732,29 @@ rec { }; }; + Tabular = buildVimPlugin { + name = "Tabular"; + src = fetchgit { + url = "git://github.com/godlygeek/tabular"; + rev = "60f25648814f0695eeb6c1040d97adca93c4e0bb"; + sha256 = "28c860ad621587f2c3213fae47d1a3997746527c17d51e9ab94c209eb7bfeb0f"; + }; + dependencies = []; + }; + + tabular = Tabular; + + Tagbar = buildVimPlugin { + name = "Tagbar"; + src = fetchgit { + url = "git://github.com/majutsushi/tagbar"; + rev = "5283bc834a8c39b058d5eef1173e323b23b04fa0"; + sha256 = "ed2bcbbb9caf476251cbbe650fc685b9e781390f9966f0c75ff02da0677deb1c"; + }; + dependencies = []; + }; + + tagbar = Tagbar; taglist = buildVimPlugin { name = "taglist-4.6"; @@ -451,6 +779,26 @@ rec { buildInputs = [ unzip ]; }; + The_NERD_Commenter = buildVimPlugin { + name = "The_NERD_Commenter"; + src = fetchgit { + url = "git://github.com/scrooloose/nerdcommenter"; + rev = "6549cfde45339bd4f711504196ff3e8b766ef5e6"; + sha256 = "ef270ae5617237d68b3d618068e758af8ffd8d3ba27a3799149f7a106cfd178e"; + }; + dependencies = []; + }; + + The_NERD_tree = buildVimPlugin { + name = "The_NERD_tree"; + src = fetchgit { + url = "git://github.com/scrooloose/nerdtree"; + rev = "f8fd2ecce20f5005e6313ce57d6d2a209890c946"; + sha256 = "b86f8923d4068add210101d34c5272b575dcb1c1352992ee878af59db581fd75"; + }; + dependencies = []; + }; + thumbnail = buildVimPlugin { name = "thumbnail-git-2014-07-24"; src = fetchgit { @@ -464,6 +812,16 @@ rec { }; }; + tlib = buildVimPlugin { + name = "tlib"; + src = fetchgit { + url = "git://github.com/tomtom/tlib_vim"; + rev = "88c5a2427e12397f9b5b1819e3d80c2eebe2c411"; + sha256 = "6cbbeb7fcda26028f73836ce3bae880db3e250cf8289804e6e28cb914854b7de"; + }; + dependencies = []; + }; + tmux-navigator = buildVimPlugin { name = "tmux-navigator-git-2014-09-09"; src = fetchgit { @@ -492,6 +850,315 @@ rec { }; }; + UltiSnips = buildVimPlugin { + name = "UltiSnips"; + src = fetchgit { + url = "git://github.com/sirver/ultisnips"; + rev = "cb8536d7240f5f458c292f8aa38fc50278222fe8"; + sha256 = "95bc88fc3dae45896893797cff9bb697f3701572c27442898c661d004b50be16"; + }; + dependencies = []; + }; + + undotree = buildVimPlugin { + name = "undotree"; + src = fetchgit { + url = "git://github.com/mbbill/undotree"; + rev = "88e4a9bc2f7916f24441faf884853a01ba11d294"; + sha256 = "ad55b88db051f57d0c7ddc226a7b7778daab58fa67dc8ac1d78432c0e7d38520"; + }; + dependencies = []; + }; + + vim-addon-actions = buildVimPlugin { + name = "vim-addon-actions"; + src = fetchgit { + url = "git://github.com/MarcWeber/vim-addon-actions"; + rev = "a5d20500fb8812958540cf17862bd73e7af64936"; + sha256 = "d2c3eb7a1f29e7233c6fcf3b02d07efebe8252d404ee593419ad399a5fdf6383"; + }; + dependencies = ["vim-addon-mw-utils" "tlib"]; + }; + + vim-addon-async = buildVimPlugin { + name = "vim-addon-async"; + src = fetchgit { + url = "git://github.com/MarcWeber/vim-addon-async"; + rev = "dadc96e188f1cdacbac62129eb29a1eacfed792c"; + sha256 = "27f941e21a8ca5940bd20914e2a9e3809e554f3ef2c27b3bafb9a153107a5d07"; + }; + dependencies = ["vim-addon-signs"]; + }; + + vim-addon-background-cmd = buildVimPlugin { + name = "vim-addon-background-cmd"; + src = fetchgit { + url = "git://github.com/MarcWeber/vim-addon-background-cmd"; + rev = "14df72660a95804a57c02b9ff0ae3198608e2491"; + sha256 = "5c2ece1f3ff7653eb7c1b40180554e8e89e5ae43d67e7cc159d95c0156135687"; + }; + dependencies = ["vim-addon-mw-utils"]; + }; + + vim-addon-commenting = buildVimPlugin { + name = "vim-addon-commenting"; + src = fetchgit { + url = "git://github.com/MarcWeber/vim-addon-commenting"; + rev = "b7cf748ac1c9bf555cbd347589e3b7196030d20b"; + sha256 = "4ad7d5f6669f0a1b4a24c9ce3649c030d7d3fc8588de4d4d6c3269140fbe9b3e"; + }; + dependencies = []; + }; + + vim-addon-completion = buildVimPlugin { + name = "vim-addon-completion"; + src = fetchgit { + url = "git://github.com/MarcWeber/vim-addon-completion"; + rev = "80f717d68df5b0d7b32228229ddfd29c3e86e435"; + sha256 = "c8c0af8760f2622c4caef371482916861f68a850eb6a7cd746fe8c9ab405c859"; + }; + dependencies = ["tlib"]; + }; + + vim-addon-errorformats = buildVimPlugin { + name = "vim-addon-errorformats"; + src = fetchgit { + url = "git://github.com/MarcWeber/vim-addon-errorformats"; + rev = "dcbb203ad5f56e47e75fdee35bc92e2ba69e1d28"; + sha256 = "a1260206545d5ae17f2e6b3319f5cf1808b74e792979b1c6667d75974cc53f95"; + }; + dependencies = []; + }; + + vim-addon-goto-thing-at-cursor = buildVimPlugin { + name = "vim-addon-goto-thing-at-cursor"; + src = fetchgit { + url = "git://github.com/MarcWeber/vim-addon-goto-thing-at-cursor"; + rev = "f052e094bdb351829bf72ae3435af9042e09a6e4"; + sha256 = "34658ac99d9a630db9c544b3dfcd2c3df69afa5209e27558cc022b7afc2078ea"; + }; + dependencies = ["tlib"]; + }; + + vim-addon-local-vimrc = buildVimPlugin { + name = "vim-addon-local-vimrc"; + src = fetchgit { + url = "git://github.com/MarcWeber/vim-addon-local-vimrc"; + rev = "7689b55ee86dd6046923fd28ceab49da3881abfe"; + sha256 = "f11d13676e2fdfcc9cabc991577f0b2e85909665b6f245aa02f21ff78d6a8556"; + }; + dependencies = []; + }; + + vim-addon-manager = buildVimPlugin { + name = "vim-addon-manager"; + src = fetchgit { + url = "git://github.com/MarcWeber/vim-addon-manager"; + rev = "d6de0d52bfe338eb373a4908b51b0eb89eaf42b0"; + sha256 = "4becba76d3389e4ace9e01c4393bc7bf38767eecf9eee239689054b9ee0c1fc9"; + }; + dependencies = []; + }; + + vim-addon-mru = buildVimPlugin { + name = "vim-addon-mru"; + src = fetchgit { + url = "git://github.com/MarcWeber/vim-addon-mru"; + rev = "e41e39bd9d1bf78ccfd8d5e1bc05ae5e1026c2bb"; + sha256 = "15b70f796f28cbd999060fea7f47408fa8a6cb176cd4915b9cc3dc6c53eed960"; + }; + dependencies = ["vim-addon-other" "vim-addon-mw-utils"]; + }; + + vim-addon-mw-utils = buildVimPlugin { + name = "vim-addon-mw-utils"; + src = fetchgit { + url = "git://github.com/MarcWeber/vim-addon-mw-utils"; + rev = "0c5612fa31ee434ba055e21c76f456244b3b5109"; + sha256 = "4e1b6d1b59050f1063e58ef4bee9e9603616ad184cd9ef7466d0ec3d8e22b91c"; + }; + dependencies = []; + }; + + vim-addon-nix = buildVimPlugin { + name = "vim-addon-nix"; + src = fetchgit { + url = "git://github.com/MarcWeber/vim-addon-nix"; + rev = "7b0a376bb1797fef8da2dc14e768f318bcb671e8"; + sha256 = "c2b0f6f50083063b5e801b872f38d4f00307fe5d7a4f3977a108e5cd10c1c410"; + }; + dependencies = ["vim-addon-completion" "vim-addon-goto-thing-at-cursor" "vim-addon-errorformats" "vim-addon-actions" "vim-addon-mw-utils" "tlib"]; + }; + + vim-addon-other = buildVimPlugin { + name = "vim-addon-other"; + src = fetchgit { + url = "git://github.com/MarcWeber/vim-addon-other"; + rev = "f78720c9cb5bf871cabb13c7cbf94378dbf0163b"; + sha256 = "43f027e4b7576031072515c23c2b09f7f2c8bba7ee43a1e2041a4371bd954d1b"; + }; + dependencies = ["vim-addon-actions" "vim-addon-mw-utils"]; + }; + + vim-addon-php-manual = buildVimPlugin { + name = "vim-addon-php-manual"; + src = fetchgit { + url = "git://github.com/MarcWeber/vim-addon-php-manual"; + rev = "e09ccdce3d2132771d0bd32884553207cc7122d0"; + sha256 = "b2f44be3a1ceca9de7789ea9b5fd36035b720ea529f4301f3771b010d1e453c2"; + }; + dependencies = []; + }; + + vim-addon-signs = buildVimPlugin { + name = "vim-addon-signs"; + src = fetchgit { + url = "git://github.com/MarcWeber/vim-addon-signs"; + rev = "17a49f293d18174ff09d1bfff5ba86e8eee8e8ae"; + sha256 = "a9c03a32e758d51106741605188cb7f00db314c73a26cae75c0c9843509a8fb8"; + }; + dependencies = []; + }; + + vim-addon-sql = buildVimPlugin { + name = "vim-addon-sql"; + src = fetchgit { + url = "git://github.com/MarcWeber/vim-addon-sql"; + rev = "05b8a0c211f1ae4c515c64e91dec555cdf20d90b"; + sha256 = "a1334ae694e0a03229bacc8ba7e08e7223df240244c7378e3f1bd91d74e957c2"; + }; + dependencies = ["vim-addon-completion" "vim-addon-background-cmd" "tlib"]; + }; + + vim-addon-syntax-checker = buildVimPlugin { + name = "vim-addon-syntax-checker"; + src = fetchgit { + url = "git://github.com/MarcWeber/vim-addon-syntax-checker"; + rev = "8eb7217e636ca717d4de5cd03cc0180c5b66ae77"; + sha256 = "aef048e664653b5007df71ac24ed34ec55d8938c763d3f80885a122e445a9b3d"; + }; + dependencies = ["vim-addon-mw-utils" "tlib"]; + }; + + vim-addon-toggle-buffer = buildVimPlugin { + name = "vim-addon-toggle-buffer"; + src = fetchgit { + url = "git://github.com/MarcWeber/vim-addon-toggle-buffer"; + rev = "a1b38b9c5709cba666ed2d84ef06548f675c6b0b"; + sha256 = "672166ecfe0599177afb56b444366f587f77e9659c256ac4e41ee45cb2df6055"; + }; + dependencies = ["vim-addon-mw-utils" "tlib"]; + }; + + vim-addon-xdebug = buildVimPlugin { + name = "vim-addon-xdebug"; + src = fetchgit { + url = "git://github.com/MarcWeber/vim-addon-xdebug"; + rev = "45f26407305b4ce6f8f5f37d2b5e6e4354104172"; + sha256 = "0a7bf2caf36772c94bd25bfbf46bf628623809c9cfab447ff788eb74149464ef"; + }; + dependencies = ["WebAPI" "vim-addon-mw-utils" "vim-addon-signs" "vim-addon-async"]; + }; + + vim-airline = buildVimPlugin { + name = "vim-airline"; + src = fetchgit { + url = "git://github.com/bling/vim-airline"; + rev = "256dec6800342c121c1b26dabc06dafb0c91edca"; + sha256 = "9bb684da91bffc80d8489210fc74476895be81772b1d1370ee0b9a9ec7469750"; + }; + dependencies = []; + }; + + vim-coffee-script = buildVimPlugin { + name = "vim-coffee-script"; + src = fetchgit { + url = "git://github.com/kchmck/vim-coffee-script"; + rev = "827e4a38b07479433b619091469a7495a392df8a"; + sha256 = "89ee4c7cce9f3310be502df6b2dd2e70a715c0b06882afc9c8169fbf58b207d0"; + }; + dependencies = []; + }; + + vim-easy-align = buildVimPlugin { + name = "vim-easy-align"; + src = fetchgit { + url = "git://github.com/junegunn/vim-easy-align"; + rev = "2595ebf9333f3598502276b29f78ad39965bc595"; + sha256 = "1223b587c515169d4b735bf56f109f7bfc4f7c1327e76865f498309f7472ef78"; + }; + dependencies = []; + }; + + vim-gitgutter = buildVimPlugin { + name = "vim-gitgutter"; + src = fetchgit { + url = "git://github.com/airblade/vim-gitgutter"; + rev = "39f011909620e0c7ae555efdace20c3963ac88af"; + sha256 = "585c367c8cf72d7ef511b3beca3d1eae1d68bbd61b9a8d4dc7aea6e0caa4813a"; + }; + dependencies = []; + }; + + vim-iced-coffee-script = buildVimPlugin { + name = "vim-iced-coffee-script"; + src = fetchgit { + url = "git://github.com/noc7c9/vim-iced-coffee-script"; + rev = "e42e0775fa4b1f8840c55cd36ac3d1cedbc1dea2"; + sha256 = "c7859591975a51a1736f99a433d7ca3e7638b417340a0472a63995e16d8ece93"; + }; + dependencies = ["vim-coffee-script"]; + }; + + vim-latex-live-preview = buildVimPlugin { + name = "vim-latex-live-preview"; + src = fetchgit { + url = "git://github.com/xuhdev/vim-latex-live-preview"; + rev = "18625ceca4de5984f3df50cdd0202fc13eb9e37c"; + sha256 = "261852d3830189a50176f997a4c6b4ec7e25893c5b7842a3eb57eb7771158722"; + }; + dependencies = []; + }; + + vim-signature = buildVimPlugin { + name = "vim-signature"; + src = fetchgit { + url = "git://github.com/kshenoy/vim-signature"; + rev = "29fc095535c4a3206d3194305739b33cd72ffad2"; + sha256 = "46101330cd291dd819552ba1f47571342fe671d6985d06897c34465b87fd7bc4"; + }; + dependencies = []; + }; + + vim-snippets = buildVimPlugin { + name = "vim-snippets"; + src = fetchgit { + url = "git://github.com/honza/vim-snippets"; + rev = "d05ca095ef93e256b45accb1e4b56ae3c44af125"; + sha256 = "1685ebe317ad1029bfc25e06c8f14cc3c14db887a7e1d743378c3748e416ac77"; + }; + dependencies = []; + }; + + vim2hs = buildVimPlugin { + name = "vim2hs"; + src = fetchgit { + url = "git://github.com/dag/vim2hs"; + rev = "f2afd55704bfe0a2d66e6b270d247e9b8a7b1664"; + sha256 = "485fc58595bb4e50f2239bec5a4cbb0d8f5662aa3f744e42c110cd1d66b7e5b0"; + }; + dependencies = []; + }; + + VimOutliner = buildVimPlugin { + name = "VimOutliner"; + src = fetchgit { + url = "git://github.com/vimoutliner/vimoutliner"; + rev = "91dccce033ca3924ad47831d29cd93fccc546013"; + sha256 = "c6dd19df1432908574e84a339a15076ddf8bfd6dfd2544b220928c29d9f752d3"; + }; + dependencies = []; + }; vimproc = buildVimPlugin { name = "vimproc-git-2014-10-03"; @@ -540,6 +1207,16 @@ rec { ''; }; + vundle = buildVimPlugin { + name = "vundle"; + src = fetchgit { + url = "git://github.com/gmarik/vundle"; + rev = "0b28e334e65b6628b0a61c412fcb45204a2f2bab"; + sha256 = "9681d471d1391626cb9ad22b2b469003d9980cd23c5c3a8d34666376447e6204"; + }; + dependencies = []; + }; + watchdogs = buildVimPlugin { name = "watchdogs-git-2014-10-18"; src = fetchgit { @@ -553,6 +1230,33 @@ rec { }; }; + WebAPI = buildVimPlugin { + name = "WebAPI"; + src = fetchgit { + url = "git://github.com/mattn/webapi-vim"; + rev = "a7789abffe936db56e3152e23733847f94755753"; + sha256 = "455b84d9fd13200ff5ced5d796075f434a7fb9c00f506769174579266ae2be80"; + }; + buildInputs = [ zip ]; + dependencies = []; + }; + + webapi-vim = WebAPI; + + wombat256 = buildVimPlugin { + name = "wombat256"; + src = fetchurl { + url = "http://www.vim.org/scripts/download_script.php?src_id=13400"; + name = "wombat256mod.vim"; + sha256 = "1san0jg9sfm6chhnr1wc5nhczlp11ibca0v7i4gf68h9ick9mysn"; + }; + buildInputs = [ unzip ]; + dependencies = []; + meta = { + url = "http://www.vim.org/scripts/script.php?script_id=2465"; + }; + }; + xdebug = buildVimPlugin { name = "xdebug-git-2012-08-15"; src = fetchgit { @@ -567,6 +1271,21 @@ rec { }; }; + YankRing = buildVimPlugin { + name = "YankRing"; + src = fetchurl { + url = "http://www.vim.org/scripts/download_script.php?src_id=20842"; + name = "yankring_180.zip"; + sha256 = "0bsq4pxagy12jqxzs7gcf25k5ahwif13ayb9k8clyhm0jjdkf0la"; + }; + buildInputs = [ unzip ]; + dependencies = []; + meta = { + url = "http://www.vim.org/scripts/script.php?script_id=1234"; + }; + }; + + yankring = YankRing; YouCompleteMe = addRtp "${rtpPath}/youcompleteme" (stdenv.mkDerivation { src = fetchgit { @@ -611,636 +1330,8 @@ rec { }; }); - # aliases - airline = vim-airline; - coffee-script = vim-coffee-script; - coffeeScript = coffee-script; # backwards compat, added 2014-10-18 - colors-solarized = Solarized; - colorsamplerpack = Colour_Sampler_Pack; - easy-align = vim-easy-align; - ghc-mod-vim = ghcmod; - gist-vim = Gist; - gitgutter = vim-gitgutter; - gundo = Gundo; - haskellConceal = haskellconceal; # backwards compat, added 2014-10-18 - hoogle = Hoogle; - latex-live-preview = vim-latex-live-preview; - necoGhc = neco-ghc; # backwards compat, added 2014-10-18 - nerdcommenter = The_NERD_Commenter; - nerdtree = The_NERD_tree; - signature = vim-signature; - stylishHaskell = stylish-haskell; # backwards compat, added 2014-10-18 - supertab = Supertab; - syntastic = Syntastic; - tabular = Tabular; - tagbar = Tagbar; - webapi-vim = WebAPI; - yankring = YankRing; youcompleteme = YouCompleteMe; - - /* - The plugin definitions below are generated the following VimL command - provided by vim-addon-manager. - - " Copy /tmp/tmp.vim file and run: :source /tmp/tmp.vim - call nix#ExportPluginsForNix({ - \ 'path_to_nixpkgs': '/etc/nixos/nixpkgs', - \ 'cache_file': '/tmp/vim2nix-cache', - \ 'names': [ - \ "vim-addon-syntax-checker", - \ "vim-addon-other", - \ "vim-addon-local-vimrc", - \ "snipmate", - \ "vim-snippets", - \ "vim-addon-mru", - \ "vim-addon-commenting", - \ "vim-addon-sql", - \ "vim-addon-async", - \ "vim-addon-toggle-buffer", - \ "vim-addon-mw-utils", - \ "matchit.zip", - \ "vim-addon-xdebug", - \ "vim-addon-php-manual", - \ "sourcemap.vim", - \ "vim-iced-coffee-script", - \ "ctrlp", - \ "commentary", - \ "Colour_Sampler_Pack", - \ "Solarized", - \ "vim-coffee-script", - \ "vim-easy-align", - \ "Tagbar", - \ "Tabular", - \ "table-mode", - \ "Syntastic", - \ "vim-signature", - \ "surround", - \ "Supertab", - \ "rust", - \ "rainbow_parentheses", - \ "pathogen", - \ "quickfixstatus", - \ "The_NERD_Commenter", - \ "The_NERD_tree", - \ "vim-latex-live-preview", - \ "Hoogle", - \ "Gundo", - \ "vim-gitgutter", - \ "Gist", - \ "ghcmod", - \ "fugitive", - \ "extradite", - \ "vim-airline", - \ "VimOutliner", - \ "vim2hs", - \ "undotree", - \ "UltiSnips", - \ "wombat256", - \ "vundle", - \ "WebAPI", - \ "YankRing", - \ "vim-addon-manager", - \ "vim-addon-nix", - \ "YUNOcommit" - \ ], - \ }) - - # TODO: think about how to add license information? - */ - - - ctrlp = buildVimPlugin { - name = "ctrlp"; - src = fetchgit { - url = "git://github.com/kien/ctrlp.vim"; - rev = "b5d3fe66a58a13d2ff8b6391f4387608496a030f"; - sha256 = "41f7884973770552395b96f8693da70999dc815462d4018c560d3ff6be462e76"; - }; - dependencies = []; - }; - vim-addon-signs = buildVimPlugin { - name = "vim-addon-signs"; - src = fetchgit { - url = "git://github.com/MarcWeber/vim-addon-signs"; - rev = "17a49f293d18174ff09d1bfff5ba86e8eee8e8ae"; - sha256 = "a9c03a32e758d51106741605188cb7f00db314c73a26cae75c0c9843509a8fb8"; - }; - dependencies = []; - }; - vundle = buildVimPlugin { - name = "vundle"; - src = fetchgit { - url = "git://github.com/gmarik/vundle"; - rev = "0b28e334e65b6628b0a61c412fcb45204a2f2bab"; - sha256 = "9681d471d1391626cb9ad22b2b469003d9980cd23c5c3a8d34666376447e6204"; - }; - dependencies = []; - }; - vim-signature = buildVimPlugin { - name = "vim-signature"; - src = fetchgit { - url = "git://github.com/kshenoy/vim-signature"; - rev = "29fc095535c4a3206d3194305739b33cd72ffad2"; - sha256 = "46101330cd291dd819552ba1f47571342fe671d6985d06897c34465b87fd7bc4"; - }; - dependencies = []; - }; - vim-addon-sql = buildVimPlugin { - name = "vim-addon-sql"; - src = fetchgit { - url = "git://github.com/MarcWeber/vim-addon-sql"; - rev = "05b8a0c211f1ae4c515c64e91dec555cdf20d90b"; - sha256 = "a1334ae694e0a03229bacc8ba7e08e7223df240244c7378e3f1bd91d74e957c2"; - }; - dependencies = ["vim-addon-completion" "vim-addon-background-cmd" "tlib"]; - }; - vim-addon-background-cmd = buildVimPlugin { - name = "vim-addon-background-cmd"; - src = fetchgit { - url = "git://github.com/MarcWeber/vim-addon-background-cmd"; - rev = "14df72660a95804a57c02b9ff0ae3198608e2491"; - sha256 = "5c2ece1f3ff7653eb7c1b40180554e8e89e5ae43d67e7cc159d95c0156135687"; - }; - dependencies = ["vim-addon-mw-utils"]; - }; - extradite = buildVimPlugin { - name = "extradite"; - src = fetchgit { - url = "git://github.com/int3/vim-extradite"; - rev = "af4f3a51b6b654d655121b93c0cd9d8fe9a0c85d"; - sha256 = "d1d29cfbc654134be383747f2cd6b14b7a87de75f997af6a041f14d7ef61ade6"; - }; - dependencies = []; - }; - UltiSnips = buildVimPlugin { - name = "UltiSnips"; - src = fetchgit { - url = "git://github.com/sirver/ultisnips"; - rev = "cb8536d7240f5f458c292f8aa38fc50278222fe8"; - sha256 = "95bc88fc3dae45896893797cff9bb697f3701572c27442898c661d004b50be16"; - }; - dependencies = []; - }; - vim-addon-goto-thing-at-cursor = buildVimPlugin { - name = "vim-addon-goto-thing-at-cursor"; - src = fetchgit { - url = "git://github.com/MarcWeber/vim-addon-goto-thing-at-cursor"; - rev = "f052e094bdb351829bf72ae3435af9042e09a6e4"; - sha256 = "34658ac99d9a630db9c544b3dfcd2c3df69afa5209e27558cc022b7afc2078ea"; - }; - dependencies = ["tlib"]; - }; - Tagbar = buildVimPlugin { - name = "Tagbar"; - src = fetchgit { - url = "git://github.com/majutsushi/tagbar"; - rev = "5283bc834a8c39b058d5eef1173e323b23b04fa0"; - sha256 = "ed2bcbbb9caf476251cbbe650fc685b9e781390f9966f0c75ff02da0677deb1c"; - }; - dependencies = []; - }; - surround = buildVimPlugin { - name = "surround"; - src = fetchgit { - url = "git://github.com/tpope/vim-surround"; - rev = "fa433e0b7330753688f715f3be5d10dc480f20e5"; - sha256 = "5f01daf72d23fc065f4e4e8eac734275474f32bfa276a9d90ce0d20dfe24058d"; - }; - dependencies = []; - }; - vim-addon-actions = buildVimPlugin { - name = "vim-addon-actions"; - src = fetchgit { - url = "git://github.com/MarcWeber/vim-addon-actions"; - rev = "a5d20500fb8812958540cf17862bd73e7af64936"; - sha256 = "d2c3eb7a1f29e7233c6fcf3b02d07efebe8252d404ee593419ad399a5fdf6383"; - }; - dependencies = ["vim-addon-mw-utils" "tlib"]; - }; - Tabular = buildVimPlugin { - name = "Tabular"; - src = fetchgit { - url = "git://github.com/godlygeek/tabular"; - rev = "60f25648814f0695eeb6c1040d97adca93c4e0bb"; - sha256 = "28c860ad621587f2c3213fae47d1a3997746527c17d51e9ab94c209eb7bfeb0f"; - }; - dependencies = []; - }; - vim-addon-completion = buildVimPlugin { - name = "vim-addon-completion"; - src = fetchgit { - url = "git://github.com/MarcWeber/vim-addon-completion"; - rev = "80f717d68df5b0d7b32228229ddfd29c3e86e435"; - sha256 = "c8c0af8760f2622c4caef371482916861f68a850eb6a7cd746fe8c9ab405c859"; - }; - dependencies = ["tlib"]; - }; - table-mode = buildVimPlugin { - name = "table-mode"; - src = fetchgit { - url = "git://github.com/dhruvasagar/vim-table-mode"; - rev = "ea78f6256513b4b853ea01b55b18baf0f9d99f8c"; - sha256 = "570a9660b17489ec6a976d878aec45470bc91c8da41f0e3ab8f09962683b2da7"; - }; - dependencies = []; - }; - vim-addon-xdebug = buildVimPlugin { - name = "vim-addon-xdebug"; - src = fetchgit { - url = "git://github.com/MarcWeber/vim-addon-xdebug"; - rev = "45f26407305b4ce6f8f5f37d2b5e6e4354104172"; - sha256 = "0a7bf2caf36772c94bd25bfbf46bf628623809c9cfab447ff788eb74149464ef"; - }; - dependencies = ["WebAPI" "vim-addon-mw-utils" "vim-addon-signs" "vim-addon-async"]; - }; - vim2hs = buildVimPlugin { - name = "vim2hs"; - src = fetchgit { - url = "git://github.com/dag/vim2hs"; - rev = "f2afd55704bfe0a2d66e6b270d247e9b8a7b1664"; - sha256 = "485fc58595bb4e50f2239bec5a4cbb0d8f5662aa3f744e42c110cd1d66b7e5b0"; - }; - dependencies = []; - }; - WebAPI = buildVimPlugin { - name = "WebAPI"; - src = fetchgit { - url = "git://github.com/mattn/webapi-vim"; - rev = "a7789abffe936db56e3152e23733847f94755753"; - sha256 = "455b84d9fd13200ff5ced5d796075f434a7fb9c00f506769174579266ae2be80"; - }; - buildInputs = [ zip ]; - dependencies = []; - }; - rainbow_parentheses = buildVimPlugin { - name = "rainbow_parentheses"; - src = fetchgit { - url = "git://github.com/kien/rainbow_parentheses.vim"; - rev = "eb8baa5428bde10ecc1cb14eed1d6e16f5f24695"; - sha256 = "47975a426d06f41811882691d8a51f32bc72f590477ed52b298660486b2488e3"; - }; - dependencies = []; - }; - sourcemap.vim = buildVimPlugin { - name = "sourcemap.vim"; - src = fetchgit { - url = "git://github.com/chikatoike/sourcemap.vim"; - rev = "0dd82d40faea2fdb0771067f46c01deb41610ba1"; - sha256 = "a08c77aea39be4a0a980d62673d1d17fecc518a8aeb9101210e453aaacb78fbd"; - }; - dependencies = []; - }; - vim-addon-other = buildVimPlugin { - name = "vim-addon-other"; - src = fetchgit { - url = "git://github.com/MarcWeber/vim-addon-other"; - rev = "f78720c9cb5bf871cabb13c7cbf94378dbf0163b"; - sha256 = "43f027e4b7576031072515c23c2b09f7f2c8bba7ee43a1e2041a4371bd954d1b"; - }; - dependencies = ["vim-addon-actions" "vim-addon-mw-utils"]; - }; - vim-addon-mw-utils = buildVimPlugin { - name = "vim-addon-mw-utils"; - src = fetchgit { - url = "git://github.com/MarcWeber/vim-addon-mw-utils"; - rev = "0c5612fa31ee434ba055e21c76f456244b3b5109"; - sha256 = "4e1b6d1b59050f1063e58ef4bee9e9603616ad184cd9ef7466d0ec3d8e22b91c"; - }; - dependencies = []; - }; - Gist = buildVimPlugin { - name = "Gist"; - src = fetchgit { - url = "git://github.com/mattn/gist-vim"; - rev = "d609d93472db9cf45bd701bebe51adc356631547"; - sha256 = "e5cabc03d5015c589a32f11c654ab9fbd1e91d26ba01f4b737685be81852c511"; - }; - buildInputs = [ zip ]; - dependencies = []; - }; - pathogen = buildVimPlugin { - name = "pathogen"; - src = fetchgit { - url = "git://github.com/tpope/vim-pathogen"; - rev = "91e6378908721d20514bbe5d18d292a0a15faf0c"; - sha256 = "24c1897d6b58576b2189c90050a7f8ede72a51343c752e9d030e833dbe5cac6f"; - }; - dependencies = []; - }; - vim-latex-live-preview = buildVimPlugin { - name = "vim-latex-live-preview"; - src = fetchgit { - url = "git://github.com/xuhdev/vim-latex-live-preview"; - rev = "18625ceca4de5984f3df50cdd0202fc13eb9e37c"; - sha256 = "261852d3830189a50176f997a4c6b4ec7e25893c5b7842a3eb57eb7771158722"; - }; - dependencies = []; - }; - vim-addon-mru = buildVimPlugin { - name = "vim-addon-mru"; - src = fetchgit { - url = "git://github.com/MarcWeber/vim-addon-mru"; - rev = "e41e39bd9d1bf78ccfd8d5e1bc05ae5e1026c2bb"; - sha256 = "15b70f796f28cbd999060fea7f47408fa8a6cb176cd4915b9cc3dc6c53eed960"; - }; - dependencies = ["vim-addon-other" "vim-addon-mw-utils"]; - }; - VimOutliner = buildVimPlugin { - name = "VimOutliner"; - src = fetchgit { - url = "git://github.com/vimoutliner/vimoutliner"; - rev = "91dccce033ca3924ad47831d29cd93fccc546013"; - sha256 = "c6dd19df1432908574e84a339a15076ddf8bfd6dfd2544b220928c29d9f752d3"; - }; - dependencies = []; - }; - tlib = buildVimPlugin { - name = "tlib"; - src = fetchgit { - url = "git://github.com/tomtom/tlib_vim"; - rev = "88c5a2427e12397f9b5b1819e3d80c2eebe2c411"; - sha256 = "6cbbeb7fcda26028f73836ce3bae880db3e250cf8289804e6e28cb914854b7de"; - }; - dependencies = []; - }; - vim-airline = buildVimPlugin { - name = "vim-airline"; - src = fetchgit { - url = "git://github.com/bling/vim-airline"; - rev = "256dec6800342c121c1b26dabc06dafb0c91edca"; - sha256 = "9bb684da91bffc80d8489210fc74476895be81772b1d1370ee0b9a9ec7469750"; - }; - dependencies = []; - }; - vim-addon-manager = buildVimPlugin { - name = "vim-addon-manager"; - src = fetchgit { - url = "git://github.com/MarcWeber/vim-addon-manager"; - rev = "d6de0d52bfe338eb373a4908b51b0eb89eaf42b0"; - sha256 = "4becba76d3389e4ace9e01c4393bc7bf38767eecf9eee239689054b9ee0c1fc9"; - }; - dependencies = []; - }; - vim-gitgutter = buildVimPlugin { - name = "vim-gitgutter"; - src = fetchgit { - url = "git://github.com/airblade/vim-gitgutter"; - rev = "39f011909620e0c7ae555efdace20c3963ac88af"; - sha256 = "585c367c8cf72d7ef511b3beca3d1eae1d68bbd61b9a8d4dc7aea6e0caa4813a"; - }; - dependencies = []; - }; - wombat256 = buildVimPlugin { - name = "wombat256"; - src = fetchurl { - url = "http://www.vim.org/scripts/download_script.php?src_id=13400"; - name = "wombat256mod.vim"; - sha256 = "1san0jg9sfm6chhnr1wc5nhczlp11ibca0v7i4gf68h9ick9mysn"; - }; - buildInputs = [ unzip ]; - dependencies = []; - meta = { - url = "http://www.vim.org/scripts/script.php?script_id=2465"; - }; - }; - vim-addon-async = buildVimPlugin { - name = "vim-addon-async"; - src = fetchgit { - url = "git://github.com/MarcWeber/vim-addon-async"; - rev = "dadc96e188f1cdacbac62129eb29a1eacfed792c"; - sha256 = "27f941e21a8ca5940bd20914e2a9e3809e554f3ef2c27b3bafb9a153107a5d07"; - }; - dependencies = ["vim-addon-signs"]; - }; - fugitive = buildVimPlugin { - name = "fugitive"; - src = fetchgit { - url = "git://github.com/tpope/vim-fugitive"; - rev = "0374322ba5d85ae44dd9dc44ef31ca015a59097e"; - sha256 = "3bb09693726c4f9fc1695bc8b40c45d64a6a0f1d9a4243b4a79add841013ad6c"; - }; - dependencies = []; - }; - vim-addon-errorformats = buildVimPlugin { - name = "vim-addon-errorformats"; - src = fetchgit { - url = "git://github.com/MarcWeber/vim-addon-errorformats"; - rev = "dcbb203ad5f56e47e75fdee35bc92e2ba69e1d28"; - sha256 = "a1260206545d5ae17f2e6b3319f5cf1808b74e792979b1c6667d75974cc53f95"; - }; - dependencies = []; - }; - vim-addon-php-manual = buildVimPlugin { - name = "vim-addon-php-manual"; - src = fetchgit { - url = "git://github.com/MarcWeber/vim-addon-php-manual"; - rev = "e09ccdce3d2132771d0bd32884553207cc7122d0"; - sha256 = "b2f44be3a1ceca9de7789ea9b5fd36035b720ea529f4301f3771b010d1e453c2"; - }; - dependencies = []; - }; - matchit.zip = buildVimPlugin { - name = "matchit.zip"; - src = fetchurl { - url = "http://www.vim.org/scripts/download_script.php?src_id=8196"; - name = "matchit.zip"; - sha256 = "1bbm8j1bhb70kagwdimwy9vcvlrz9ax5bk2a7wrmn4cy87f9xj4l"; - }; - buildInputs = [ unzip ]; - dependencies = []; - meta = { - url = "http://www.vim.org/scripts/script.php?script_id=39"; - }; - }; - ghcmod = buildVimPlugin { - name = "ghcmod"; - src = fetchgit { - url = "git://github.com/eagletmt/ghcmod-vim"; - rev = "d5c6c7f3c85608b5b76dc3e7e001f60b86c32cb9"; - sha256 = "ab56d470ea18da3fae021e22bba14460505e61a94f8bf707778dff5eec51cd6d"; - }; - dependencies = []; - }; - YankRing = buildVimPlugin { - name = "YankRing"; - src = fetchurl { - url = "http://www.vim.org/scripts/download_script.php?src_id=20842"; - name = "yankring_180.zip"; - sha256 = "0bsq4pxagy12jqxzs7gcf25k5ahwif13ayb9k8clyhm0jjdkf0la"; - }; - buildInputs = [ unzip ]; - dependencies = []; - meta = { - url = "http://www.vim.org/scripts/script.php?script_id=1234"; - }; - }; - The_NERD_tree = buildVimPlugin { - name = "The_NERD_tree"; - src = fetchgit { - url = "git://github.com/scrooloose/nerdtree"; - rev = "f8fd2ecce20f5005e6313ce57d6d2a209890c946"; - sha256 = "b86f8923d4068add210101d34c5272b575dcb1c1352992ee878af59db581fd75"; - }; - dependencies = []; - }; - Colour_Sampler_Pack = buildVimPlugin { - name = "Colour_Sampler_Pack"; - src = fetchurl { - url = "http://www.vim.org/scripts/download_script.php?src_id=18915"; - name = "ColorSamplerPack.zip"; - sha256 = "1wsrb3vpqn9fncnalfpvc8r92wk1mcskm4shb3s2h9x5dyihf2rd"; - }; - buildInputs = [ unzip ]; - dependencies = []; - meta = { - url = "http://www.vim.org/scripts/script.php?script_id=625"; - }; - }; - Syntastic = buildVimPlugin { - name = "Syntastic"; - src = fetchgit { - url = "git://github.com/scrooloose/syntastic"; - rev = "e4c94d67a9ba7f35397b4a2f0daa8f346a84a8b9"; - sha256 = "366b5568ddf0db0e35a19bbd3ae4d0dc4accaefe5fdd14159540d26a76e3a96e"; - }; - dependencies = []; - }; - Gundo = buildVimPlugin { - name = "Gundo"; - src = fetchgit { - url = "https://bitbucket.org/sjl/gundo.vim"; - rev = ""; - sha256 = ""; - }; - dependencies = []; - }; - snipmate = buildVimPlugin { - name = "snipmate"; - src = fetchgit { - url = "git://github.com/garbas/vim-snipmate"; - rev = "e6eb057a58e2fe98137997157d0eff9d1a975888"; - sha256 = "4d8f9091b92a75f21d96a6f6a862aa4ad5671ab8317ceef4498eeb14a1524190"; - }; - dependencies = ["vim-addon-mw-utils" "tlib"]; - }; - The_NERD_Commenter = buildVimPlugin { - name = "The_NERD_Commenter"; - src = fetchgit { - url = "git://github.com/scrooloose/nerdcommenter"; - rev = "6549cfde45339bd4f711504196ff3e8b766ef5e6"; - sha256 = "ef270ae5617237d68b3d618068e758af8ffd8d3ba27a3799149f7a106cfd178e"; - }; - dependencies = []; - }; - vim-addon-nix = buildVimPlugin { - name = "vim-addon-nix"; - src = fetchgit { - url = "git://github.com/MarcWeber/vim-addon-nix"; - rev = "7b0a376bb1797fef8da2dc14e768f318bcb671e8"; - sha256 = "c2b0f6f50083063b5e801b872f38d4f00307fe5d7a4f3977a108e5cd10c1c410"; - }; - dependencies = ["vim-addon-completion" "vim-addon-goto-thing-at-cursor" "vim-addon-errorformats" "vim-addon-actions" "vim-addon-mw-utils" "tlib"]; - }; - vim-addon-syntax-checker = buildVimPlugin { - name = "vim-addon-syntax-checker"; - src = fetchgit { - url = "git://github.com/MarcWeber/vim-addon-syntax-checker"; - rev = "8eb7217e636ca717d4de5cd03cc0180c5b66ae77"; - sha256 = "aef048e664653b5007df71ac24ed34ec55d8938c763d3f80885a122e445a9b3d"; - }; - dependencies = ["vim-addon-mw-utils" "tlib"]; - }; - commentary = buildVimPlugin { - name = "commentary"; - src = fetchgit { - url = "git://github.com/tpope/vim-commentary"; - rev = "401dbd8abee69defe66acf5e9ccc85e2746c27e2"; - sha256 = "3deec79d6c40a6c91fa504423f38c9f6a9e3495804f1996e2420d0ad34fe2da8"; - }; - dependencies = []; - }; - undotree = buildVimPlugin { - name = "undotree"; - src = fetchgit { - url = "git://github.com/mbbill/undotree"; - rev = "88e4a9bc2f7916f24441faf884853a01ba11d294"; - sha256 = "ad55b88db051f57d0c7ddc226a7b7778daab58fa67dc8ac1d78432c0e7d38520"; - }; - dependencies = []; - }; - vim-easy-align = buildVimPlugin { - name = "vim-easy-align"; - src = fetchgit { - url = "git://github.com/junegunn/vim-easy-align"; - rev = "2595ebf9333f3598502276b29f78ad39965bc595"; - sha256 = "1223b587c515169d4b735bf56f109f7bfc4f7c1327e76865f498309f7472ef78"; - }; - dependencies = []; - }; - vim-addon-toggle-buffer = buildVimPlugin { - name = "vim-addon-toggle-buffer"; - src = fetchgit { - url = "git://github.com/MarcWeber/vim-addon-toggle-buffer"; - rev = "a1b38b9c5709cba666ed2d84ef06548f675c6b0b"; - sha256 = "672166ecfe0599177afb56b444366f587f77e9659c256ac4e41ee45cb2df6055"; - }; - dependencies = ["vim-addon-mw-utils" "tlib"]; - }; - Hoogle = buildVimPlugin { - name = "Hoogle"; - src = fetchgit { - url = "git://github.com/Twinside/vim-hoogle"; - rev = "81f28318b0d4174984c33df99db7752891c5c4e9"; - sha256 = "0f96f3badb6218cac87d0f7027ff032ecc74f08ad3ada542898278ce11cbd5a0"; - }; - dependencies = []; - }; - vim-addon-commenting = buildVimPlugin { - name = "vim-addon-commenting"; - src = fetchgit { - url = "git://github.com/MarcWeber/vim-addon-commenting"; - rev = "b7cf748ac1c9bf555cbd347589e3b7196030d20b"; - sha256 = "4ad7d5f6669f0a1b4a24c9ce3649c030d7d3fc8588de4d4d6c3269140fbe9b3e"; - }; - dependencies = []; - }; - quickfixstatus = buildVimPlugin { - name = "quickfixstatus"; - src = fetchgit { - url = "git://github.com/dannyob/quickfixstatus"; - rev = "fd3875b914fc51bbefefa8c4995588c088163053"; - sha256 = "7b6831d5da1c23d95f3158c67e4376d32c2f62ab2e30d02d3f3e14dcfd867d9b"; - }; - dependencies = []; - }; - vim-coffee-script = buildVimPlugin { - name = "vim-coffee-script"; - src = fetchgit { - url = "git://github.com/kchmck/vim-coffee-script"; - rev = "827e4a38b07479433b619091469a7495a392df8a"; - sha256 = "89ee4c7cce9f3310be502df6b2dd2e70a715c0b06882afc9c8169fbf58b207d0"; - }; - dependencies = []; - }; - vim-iced-coffee-script = buildVimPlugin { - name = "vim-iced-coffee-script"; - src = fetchgit { - url = "git://github.com/noc7c9/vim-iced-coffee-script"; - rev = "e42e0775fa4b1f8840c55cd36ac3d1cedbc1dea2"; - sha256 = "c7859591975a51a1736f99a433d7ca3e7638b417340a0472a63995e16d8ece93"; - }; - dependencies = ["vim-coffee-script"]; - }; - rust = buildVimPlugin { - name = "rust"; - src = fetchgit { - url = "git://github.com/wting/rust.vim"; - rev = "0cf510adc5a83ad4c256f576fd36b38c74349d43"; - sha256 = "839f4ea2e045fc41fa2292882576237dc36d714bd78e46728c6696c44d2851d8"; - }; - dependencies = []; - }; YUNOcommit = buildVimPlugin { name = "YUNOcommit"; src = fetchgit { @@ -1250,40 +1341,5 @@ rec { }; dependencies = []; }; - vim-snippets = buildVimPlugin { - name = "vim-snippets"; - src = fetchgit { - url = "git://github.com/honza/vim-snippets"; - rev = "d05ca095ef93e256b45accb1e4b56ae3c44af125"; - sha256 = "1685ebe317ad1029bfc25e06c8f14cc3c14db887a7e1d743378c3748e416ac77"; - }; - dependencies = []; - }; - Solarized = buildVimPlugin { - name = "Solarized"; - src = fetchgit { - url = "git://github.com/altercation/vim-colors-solarized"; - rev = "528a59f26d12278698bb946f8fb82a63711eec21"; - sha256 = "a1b2ef696eee94dafa76431c31ee260acdd13a7cf87939f27eca431d5aa5a315"; - }; - dependencies = []; - }; - vim-addon-local-vimrc = buildVimPlugin { - name = "vim-addon-local-vimrc"; - src = fetchgit { - url = "git://github.com/MarcWeber/vim-addon-local-vimrc"; - rev = "7689b55ee86dd6046923fd28ceab49da3881abfe"; - sha256 = "f11d13676e2fdfcc9cabc991577f0b2e85909665b6f245aa02f21ff78d6a8556"; - }; - dependencies = []; - }; - Supertab = buildVimPlugin { - name = "Supertab"; - src = fetchgit { - url = "git://github.com/ervandew/supertab"; - rev = "fd4e0d06c2b1d9bff2eef1d15e7895b3b4da7cd7"; - sha256 = "5919521b95519d4baa8ed146c340ca739fa7f31dfd305c74ca0ace324ba93d74"; - }; - dependencies = []; - }; + } From 12cb1dcb189c367f376030ff2865bde131821648 Mon Sep 17 00:00:00 2001 From: Mateusz Kowalczyk Date: Thu, 20 Nov 2014 21:16:33 +0000 Subject: [PATCH 172/383] agda-TotalParserCombinators: mark as broken Due to 0.9 stdlib update, author notified. --- .../libraries/agda/TotalParserCombinators/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/agda/TotalParserCombinators/default.nix b/pkgs/development/libraries/agda/TotalParserCombinators/default.nix index 6b0a63066b2..b9ed0380e46 100644 --- a/pkgs/development/libraries/agda/TotalParserCombinators/default.nix +++ b/pkgs/development/libraries/agda/TotalParserCombinators/default.nix @@ -21,5 +21,6 @@ agda.mkDerivation (self: rec { license = stdenv.lib.licenses.mit; platforms = stdenv.lib.platforms.unix; maintainers = with maintainers; [ fuuzetsu ]; + broken = true; }; }) From c1f458eb85147b6eb6baff0f7873da7bc111957e Mon Sep 17 00:00:00 2001 From: Emery Hemingway Date: Sun, 24 Aug 2014 11:29:49 -0400 Subject: [PATCH 173/383] initial liquidsoap package expression --- pkgs/tools/audio/liquidsoap/full.nix | 45 ++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 47 insertions(+) create mode 100644 pkgs/tools/audio/liquidsoap/full.nix diff --git a/pkgs/tools/audio/liquidsoap/full.nix b/pkgs/tools/audio/liquidsoap/full.nix new file mode 100644 index 00000000000..30b608c5ba4 --- /dev/null +++ b/pkgs/tools/audio/liquidsoap/full.nix @@ -0,0 +1,45 @@ +{ stdenv, fetchurl, which, pkgconfig +, ocaml, ocamlPackages +, libao, portaudio, alsaLib, pulseaudio, jack2 +, libsamplerate, libmad, taglib, lame, libogg +, libvorbis, speex, libtheora, libopus, fdk_aac +, faad2, flac, ladspaH, ffmpeg, frei0r, dssi +, }: + +let + version = "1.1.1"; + + packageFilters = map (p: "-e '/ocaml-${p}/d'" ) + [ "gstreamer" "shine" "aacplus" "schroedinger" + "voaacenc" "soundtouch" "gavl" "lo" + ]; +in +stdenv.mkDerivation { + name = "liquidsoap-full-${version}"; + + src = fetchurl { + url = "mirror://sourceforge/project/savonet/liquidsoap/${version}/liquidsoap-${version}-full.tar.gz"; + sha256 = "1w1grgja5yibph90vsxj7ffkpz1sgzmr54jj52s8889dpy609wqa"; + }; + + preConfigure = "sed ${toString packageFilters} PACKAGES.default > PACKAGES"; + configureFlags = [ "--localstatedir=/var" ]; + + buildInputs = + [ which ocaml ocamlPackages.findlib pkgconfig + libao portaudio alsaLib pulseaudio jack2 + libsamplerate libmad taglib lame libogg + libvorbis speex libtheora libopus fdk_aac + faad2 flac ladspaH ffmpeg frei0r dssi + ocamlPackages.xmlm ocamlPackages.ocaml_pcre + ocamlPackages.camomile + ]; + + meta = with stdenv.lib; { + description = "Swiss-army knife for multimedia streaming"; + homepage = http://liquidsoap.fm/; + maintainers = with maintainers; [ emery ]; + license = licenses.gpl2; + platform = ocaml.meta.platforms; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 03c24a961bd..e310dccd621 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1545,6 +1545,8 @@ let less = callPackage ../tools/misc/less { }; + liquidsoap = callPackage ../tools/audio/liquidsoap/full.nix { }; + lockfileProgs = callPackage ../tools/misc/lockfile-progs { }; logstash = callPackage ../tools/misc/logstash { }; From 21e4ff562409747a4ce18ffd61375db8dcd8116f Mon Sep 17 00:00:00 2001 From: Emery Hemingway Date: Thu, 20 Nov 2014 17:30:24 -0500 Subject: [PATCH 174/383] initial liquidsoap service expression --- nixos/modules/misc/ids.nix | 2 + nixos/modules/module-list.nix | 1 + nixos/modules/services/audio/liquidsoap.nix | 74 +++++++++++++++++++++ 3 files changed, 77 insertions(+) create mode 100644 nixos/modules/services/audio/liquidsoap.nix diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix index 0b836cb2903..b08082af352 100644 --- a/nixos/modules/misc/ids.nix +++ b/nixos/modules/misc/ids.nix @@ -162,6 +162,7 @@ systemd-network = 152; systemd-resolve = 153; systemd-timesync = 154; + liquidsoap = 155; # When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399! @@ -290,6 +291,7 @@ systemd-network = 152; systemd-resolve = 153; systemd-timesync = 154; + liquidsoap = 155; # 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 fcea0fed380..19d69185392 100755 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -89,6 +89,7 @@ ./services/audio/alsa.nix # Disabled as fuppes it does no longer builds. # ./services/audio/fuppes.nix + ./services/audio/liquidsoap.nix ./services/audio/mpd.nix ./services/audio/mopidy.nix ./services/backup/almir.nix diff --git a/nixos/modules/services/audio/liquidsoap.nix b/nixos/modules/services/audio/liquidsoap.nix new file mode 100644 index 00000000000..bf67d2399eb --- /dev/null +++ b/nixos/modules/services/audio/liquidsoap.nix @@ -0,0 +1,74 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + streams = builtins.attrNames config.services.liquidsoap.streams; + + streamService = + name: + let stream = builtins.getAttr name config.services.liquidsoap.streams; in + { inherit name; + value = { + after = [ "network-online.target" "sound.target" ]; + description = "${name} liquidsoap stream"; + wantedBy = [ "multi-user.target" ]; + path = [ pkgs.wget ]; + preStart = + '' + mkdir -p /var/log/liquidsoap + chown liquidsoap -R /var/log/liquidsoap + ''; + serviceConfig = { + PermissionsStartOnly="true"; + ExecStart = "${pkgs.liquidsoap}/bin/liquidsoap ${stream}"; + User = "liquidsoap"; + }; + }; + }; +in +{ + + ##### interface + + options = { + + services.liquidsoap.streams = mkOption { + + description = + '' + Set of Liquidsoap streams to start, + one systemd service per stream. + ''; + + default = {}; + + example = { + myStream1 = literalExample "\"/etc/liquidsoap/myStream1.liq\""; + myStream2 = literalExample "./myStream2.liq"; + myStream3 = literalExample "\"out(playlist(\"/srv/music/\"))\""; + }; + + type = types.attrsOf (types.either types.path types.str); + }; + + }; + ##### implementation + + config = mkIf (builtins.length streams != 0) { + + users.extraUsers.liquidsoap = { + uid = config.ids.uids.liquidsoap; + group = "liquidsoap"; + extraGroups = [ "audio" ]; + description = "Liquidsoap streaming user"; + home = "/var/lib/liquidsoap"; + createHome = true; + }; + + users.extraGroups.liquidsoap.gid = config.ids.gids.liquidsoap; + + systemd.services = builtins.listToAttrs ( map streamService streams ); + }; + +} From e6f70fd2b3c74ded46a6c310e7d972f885242c37 Mon Sep 17 00:00:00 2001 From: Emery Hemingway Date: Sun, 24 Aug 2014 13:29:26 -0400 Subject: [PATCH 175/383] icecast: update 2.3.3 to 2.4.0 now with opus support --- pkgs/servers/icecast/default.nix | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/pkgs/servers/icecast/default.nix b/pkgs/servers/icecast/default.nix index 8b940fdb0cf..6b8a75e6901 100644 --- a/pkgs/servers/icecast/default.nix +++ b/pkgs/servers/icecast/default.nix @@ -1,28 +1,28 @@ {stdenv, fetchurl , libxml2, libxslt, curl -, libvorbis, libtheora, speex, libkate }: +, libvorbis, libtheora, speex, libkate, libopus }: stdenv.mkDerivation rec { - name = "icecast-2.3.3"; + name = "icecast-2.4.0"; src = fetchurl { url = "http://downloads.xiph.org/releases/icecast/${name}.tar.gz"; - sha256 = "0vf38mk13z1czpbj0g8va4rzjf201slqmiwcs8y9i6iwz3shc78v"; + sha256 = "0chg8v3c0wkbakjcw73rsfccx13f28arrmmbz9p5fsmiw5bykdqp"; }; - buildInputs = [ libxml2 libxslt curl libvorbis libtheora speex libkate ]; + buildInputs = [ libxml2 libxslt curl libvorbis libtheora speex libkate libopus ]; meta = { description = "Server software for streaming multimedia"; longDescription = '' - Icecast is a streaming media server which currently supports Ogg Vorbis and MP3 - audio streams. It can be used to create an Internet radio station or a - privately running jukebox and many things in between. It is very versatile in - that new formats can be added relatively easily and supports open standards for - commuincation and interaction. + Icecast is a streaming media server which currently supports + Ogg (Vorbis and Theora), Opus, WebM and MP3 audio streams. + It can be used to create an Internet radio station or a privately + running jukebox and many things in between. It is very versatile + in that new formats can be added relatively easily and supports + open standards for commuincation and interaction. ''; - homepage = http://www.icecast.org; license = stdenv.lib.licenses.gpl2; From cee89ef215eff7a2f84455246c2f2be08c9136e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= Date: Tue, 14 Oct 2014 18:51:25 +0200 Subject: [PATCH 176/383] Pymacs: use buildPythonPackage instead of mkDerivation --- pkgs/top-level/python-packages.nix | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index f117acc5ff0..ce99d7e8ca1 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7460,9 +7460,10 @@ let }); - pymacs = pkgs.stdenv.mkDerivation rec { + pymacs = buildPythonPackage rec { version = "0.25"; - name = "Pymacs-${version}"; + name = "pymacs-${version}"; + disabled = isPy3k || isPyPy; src = pkgs.fetchurl { url = "https://github.com/pinard/Pymacs/tarball/v${version}"; @@ -7470,12 +7471,17 @@ let sha256 = "1hmy76c5igm95rqbld7gvk0az24smvc8hplfwx2f5rhn6frj3p2i"; }; - buildInputs = with self; [ python ]; + configurePhase = "make"; - patchPhase = '' - sed -e "s@ install@ install --prefix=$out@g" -i Makefile + # Doesn't work with --old-and-unmanagable + installPhase = '' + ${python}/bin/${python.executable} setup.py install \ + --install-lib=$out/lib/${python.libPrefix}/site-packages \ + --prefix="$out" ''; + doCheck = false; + meta = with stdenv.lib; { description = "Emacs Lisp to Python interface"; homepage = http://pymacs.progiciels-bpi.ca; From ba930acc44977a6af2def0dbe3ad4ebe4f828124 Mon Sep 17 00:00:00 2001 From: jz Date: Thu, 20 Nov 2014 11:56:54 -0700 Subject: [PATCH 177/383] add vimus and myself as maintainer add vimus to all-packages.nix should be in haskell-packages.nix not all-packages.nix i don't think this can be both a library and an executable --- lib/maintainers.nix | 1 + pkgs/applications/audio/vimus/default.nix | 29 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 +- pkgs/top-level/haskell-packages.nix | 2 ++ 4 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 pkgs/applications/audio/vimus/default.nix diff --git a/lib/maintainers.nix b/lib/maintainers.nix index b919fde0153..12afb7847db 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -86,6 +86,7 @@ joelteon = "Joel Taylor "; jpbernardy = "Jean-Philippe Bernardy "; jwiegley = "John Wiegley "; + jzellner = "Jeff Zellner "; kkallio = "Karn Kallio "; koral = "Koral "; kragniz = "Louis Taylor "; diff --git a/pkgs/applications/audio/vimus/default.nix b/pkgs/applications/audio/vimus/default.nix new file mode 100644 index 00000000000..7f8c4e89f7f --- /dev/null +++ b/pkgs/applications/audio/vimus/default.nix @@ -0,0 +1,29 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, c2hs, dataDefault, deepseq, filepath, hspec +, hspecExpectations, libmpd, mtl, ncurses, QuickCheck, time +, transformers, utf8String, wcwidth +}: + +cabal.mkDerivation (self: { + pname = "vimus"; + version = "0.2.0"; + sha256 = "0s7hfyil9rnr9rmjb08g1l1sxybx3qdkw2f59p433fkdjp2m140h"; + isLibrary = false; + isExecutable = true; + buildDepends = [ + dataDefault deepseq filepath libmpd mtl time utf8String wcwidth + ]; + testDepends = [ + dataDefault hspec hspecExpectations mtl QuickCheck transformers + wcwidth + ]; + buildTools = [ c2hs ]; + extraLibraries = [ ncurses ]; + meta = { + description = "An MPD client with vim-like key bindings"; + license = self.stdenv.lib.licenses.mit; + platforms = self.ghc.meta.platforms; + maintainers = with self.stdenv.lib.maintainers; [ jzellner ]; + }; +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0d849aa32c5..625d46a6243 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5865,7 +5865,7 @@ let libnatspec = callPackage ../development/libraries/libnatspec { }; libndp = callPackage ../development/libraries/libndp { }; - + libnfc = callPackage ../development/libraries/libnfc { }; libnfsidmap = callPackage ../development/libraries/libnfsidmap { }; diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 76ce4db251c..ca9a32bdd24 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -2963,6 +2963,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in validation = callPackage ../development/libraries/haskell/validation {}; + vimus = callPackage ../applications/audio/vimus {}; + xlsx = callPackage ../development/libraries/haskell/xlsx {}; xmobar = callPackage ../applications/misc/xmobar {}; From b7b956ffecd9ce13b59c7b344d74cb7429309b4e Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Thu, 20 Nov 2014 19:40:14 -0500 Subject: [PATCH 178/383] nix-exec: bump --- pkgs/development/interpreters/nix-exec/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/nix-exec/default.nix b/pkgs/development/interpreters/nix-exec/default.nix index f716f7643bd..886c3622e2b 100644 --- a/pkgs/development/interpreters/nix-exec/default.nix +++ b/pkgs/development/interpreters/nix-exec/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, pkgconfig, nix, git }: let - version = "2.0.3"; + version = "3.0.0"; in stdenv.mkDerivation { name = "nix-exec-${version}"; src = fetchurl { url = "https://github.com/shlevy/nix-exec/releases/download/v${version}/nix-exec-${version}.tar.xz"; - sha256 = "1w06viqcrfl9y4gbj0zjwwg3f001f6gvvym55bcdsbnjgn5r1lr8"; + sha256 = "1c5akl24jym30cfhqg9wx2mzlcx6d91fh62dvf1l13y1akqrsk06"; }; buildInputs = [ pkgconfig nix git ]; From 855241400cf09d7f20c875e693ce7e2f04f272e6 Mon Sep 17 00:00:00 2001 From: "Ricardo M. Correia" Date: Fri, 21 Nov 2014 01:43:40 +0100 Subject: [PATCH 179/383] rustcMaster: Update from 0.12.0-pre-1166-g0047dbe -> 0.12.0-pre-1336-g394269d Fixes #5056 --- .../compilers/rustc/hardcode_paths.HEAD.patch | 32 +++++++++---------- pkgs/development/compilers/rustc/head.nix | 20 ++++++------ 2 files changed, 26 insertions(+), 26 deletions(-) diff --git a/pkgs/development/compilers/rustc/hardcode_paths.HEAD.patch b/pkgs/development/compilers/rustc/hardcode_paths.HEAD.patch index 23bb3f69986..83fb26e7a47 100644 --- a/pkgs/development/compilers/rustc/hardcode_paths.HEAD.patch +++ b/pkgs/development/compilers/rustc/hardcode_paths.HEAD.patch @@ -1,20 +1,5 @@ -diff --git a/src/librustc/back/link.rs b/src/librustc/back/link.rs -index 81f856c..c2078a5 100644 ---- a/src/librustc/back/link.rs -+++ b/src/librustc/back/link.rs -@@ -361,8 +361,8 @@ pub fn mangle_internal_name_by_path_and_seq(path: PathElems, flav: &str) -> Stri - - pub fn get_cc_prog(sess: &Session) -> String { - match sess.opts.cg.linker { -- Some(ref linker) => return linker.to_string(), -- None => sess.target.target.options.linker.clone(), -+ Some(ref linker) => linker.to_string(), -+ None => "@ccPath@".to_string(), - } - } - diff --git a/src/librustc_back/archive.rs b/src/librustc_back/archive.rs -index db2f291..c7a13dc 100644 +index a88bcaf..9c3858d 100644 --- a/src/librustc_back/archive.rs +++ b/src/librustc_back/archive.rs @@ -54,7 +54,7 @@ fn run_ar(handler: &ErrorHandler, maybe_ar_prog: &Option, @@ -26,3 +11,18 @@ index db2f291..c7a13dc 100644 }; let mut cmd = Command::new(ar); +diff --git a/src/librustc_trans/back/link.rs b/src/librustc_trans/back/link.rs +index d27a338..c9b1508 100644 +--- a/src/librustc_trans/back/link.rs ++++ b/src/librustc_trans/back/link.rs +@@ -361,8 +361,8 @@ pub fn mangle_internal_name_by_path_and_seq(path: PathElems, flav: &str) -> Stri + + pub fn get_cc_prog(sess: &Session) -> String { + match sess.opts.cg.linker { +- Some(ref linker) => return linker.to_string(), +- None => sess.target.target.options.linker.clone(), ++ Some(ref linker) => linker.to_string(), ++ None => "@ccPath@".to_string(), + } + } + diff --git a/pkgs/development/compilers/rustc/head.nix b/pkgs/development/compilers/rustc/head.nix index 25727844144..06d691411fa 100644 --- a/pkgs/development/compilers/rustc/head.nix +++ b/pkgs/development/compilers/rustc/head.nix @@ -18,19 +18,19 @@ assert stdenv.gcc.gcc != null; */ -with ((import ./common.nix) {inherit stdenv; version = "0.12.0-pre-1166-g0047dbe";}); +with ((import ./common.nix) {inherit stdenv; version = "0.12.0-pre-1336-g394269d";}); let snapshot = if stdenv.system == "i686-linux" - then "3f8bb33f86800affca3cb7245925c19b28a94498" + then "999ba4a0dfb70adca628138a7d5f491023621140" else if stdenv.system == "x86_64-linux" - then "e0e13a4312bea0bcc7db35b46bcce957178b18a4" + then "55eaaed3bd6dd5a8d08e99aa4cd618d207f87d8c" else if stdenv.system == "i686-darwin" - then "22f084aaecb773e8348c64fb9ac6d5eba363eb56" + then "0581dff21a238343602ec0202a551bac93d21300" else if stdenv.system == "x86_64-darwin" - then "c8554badab19cee96fbf51c2b98ee1bba87caa5c" + then "aad290cf3f8ac4aa0661984a9799c78161ea5a72" else abort "no-snapshot for platform ${stdenv.system}"; - snapshotDate = "2014-11-10"; - snapshotRev = "f89e975"; + snapshotDate = "2014-11-18"; + snapshotRev = "9c96a79"; snapshotName = "rust-stage0-${snapshotDate}-${snapshotRev}-${platform}-${snapshot}.tar.bz2"; in stdenv.mkDerivation { @@ -40,8 +40,8 @@ in stdenv.mkDerivation { src = fetchgit { url = https://github.com/rust-lang/rust; - rev = "0047dbe59c41b951d34ce6324f3a8c0e15d523e9"; - sha256 = "1w22w5rfpw0kcmnrrmrxslsxyl4xhyckcxgwmv3hbir05qxsxm6m"; + rev = "394269d16e3752a23ffa273e68f8aaefd2a510c4"; + sha256 = "0zkz5f4gba4glhrf9f7v42qxk638q9ahgf6m0bjh8b7c3x52cv71"; }; # We need rust to build rust. If we don't provide it, configure will try to download it. @@ -69,7 +69,7 @@ in stdenv.mkDerivation { ++ stdenv.lib.optional stdenv.needsPax ./grsec.HEAD.patch; postPatch = '' - substituteInPlace src/librustc/back/link.rs \ + substituteInPlace src/librustc_trans/back/link.rs \ --subst-var-by "ccPath" "${stdenv.gcc}/bin/cc" substituteInPlace src/librustc_back/archive.rs \ --subst-var-by "arPath" "${stdenv.gcc.binutils}/bin/ar" From 8a175367570bdd7576413bf673112399ea90c396 Mon Sep 17 00:00:00 2001 From: Andreas Herrmann Date: Fri, 21 Nov 2014 11:18:01 +0100 Subject: [PATCH 180/383] maintainers: Add aherrmann --- lib/maintainers.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 12afb7847db..e5960eaf470 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -7,6 +7,7 @@ _1126 = "Christian Lask "; abbradar = "Nikolay Amiantov "; aforemny = "Alexander Foremny "; + aherrmann = "Andreas Herrmann "; ak = "Alexander Kjeldaas "; akc = "Anders Claesson "; algorith = "Dries Van Daele "; From f89eac32a7a2099d16a1a82709494b5d3f5e3694 Mon Sep 17 00:00:00 2001 From: Andreas Herrmann Date: Thu, 20 Nov 2014 11:52:38 +0100 Subject: [PATCH 181/383] blitz: New package, version 0.10 (close #5062) Fast multi-dimensional array library for C++ Blitz++ is a C++ class library for scientific computing which provides performance on par with Fortran 77/90. It uses template techniques to achieve high performance. Blitz++ provides dense arrays and vectors, random number generators, and small vectors (useful for representing multicomponent or vector fields). --- .../libraries/blitz/blitz-gcc47.patch | 33 ++++++++ .../blitz/blitz-testsuite-stencil-et.patch | 13 +++ pkgs/development/libraries/blitz/default.nix | 80 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 4 files changed, 128 insertions(+) create mode 100644 pkgs/development/libraries/blitz/blitz-gcc47.patch create mode 100644 pkgs/development/libraries/blitz/blitz-testsuite-stencil-et.patch create mode 100644 pkgs/development/libraries/blitz/default.nix diff --git a/pkgs/development/libraries/blitz/blitz-gcc47.patch b/pkgs/development/libraries/blitz/blitz-gcc47.patch new file mode 100644 index 00000000000..d0b35665567 --- /dev/null +++ b/pkgs/development/libraries/blitz/blitz-gcc47.patch @@ -0,0 +1,33 @@ +diff -ur blitz-0.10/blitz/bzdebug.h blitz-0.10.new/blitz/bzdebug.h +--- blitz-0.10/blitz/bzdebug.h 2012-05-11 22:11:13.000000000 +0200 ++++ blitz-0.10.new/blitz/bzdebug.h 2012-06-28 15:42:38.060656045 +0200 +@@ -117,15 +117,15 @@ + } + } + +- #define BZASSERT(X) checkAssert(X, __FILE__, __LINE__) +- #define BZPRECONDITION(X) checkAssert(X, __FILE__, __LINE__) +- #define BZPOSTCONDITION(X) checkAssert(X, __FILE__, __LINE__) +- #define BZSTATECHECK(X,Y) checkAssert(X == Y, __FILE__, __LINE__) ++ #define BZASSERT(X) blitz::checkAssert(X, __FILE__, __LINE__) ++ #define BZPRECONDITION(X) blitz::checkAssert(X, __FILE__, __LINE__) ++ #define BZPOSTCONDITION(X) blitz::checkAssert(X, __FILE__, __LINE__) ++ #define BZSTATECHECK(X,Y) blitz::checkAssert(X == Y, __FILE__, __LINE__) + #define BZPRECHECK(X,Y) \ + { \ + if ((assertFailMode == false) && (!(X))) \ + BZ_STD_SCOPE(cerr) << Y << BZ_STD_SCOPE(endl); \ +- checkAssert(X, __FILE__, __LINE__); \ ++ blitz::checkAssert(X, __FILE__, __LINE__); \ + } + + #define BZ_DEBUG_MESSAGE(X) \ +@@ -138,7 +138,7 @@ + } + + #define BZ_DEBUG_PARAM(X) X +- #define BZ_PRE_FAIL checkAssert(0) ++ #define BZ_PRE_FAIL blitz::checkAssert(0) + #define BZ_ASM_DEBUG_MARKER + + #elif defined(BZ_DEBUG) diff --git a/pkgs/development/libraries/blitz/blitz-testsuite-stencil-et.patch b/pkgs/development/libraries/blitz/blitz-testsuite-stencil-et.patch new file mode 100644 index 00000000000..fcff8685a08 --- /dev/null +++ b/pkgs/development/libraries/blitz/blitz-testsuite-stencil-et.patch @@ -0,0 +1,13 @@ +diff --git a/testsuite/stencil-et.cpp b/testsuite/stencil-et.cpp +index b23e979..fe6b5ed 100644 +--- a/testsuite/stencil-et.cpp ++++ b/testsuite/stencil-et.cpp +@@ -44,7 +44,7 @@ void test_expr(const T1& d1, const T2& d2) + BZTEST(all(d1==d2)); + } + */ +-#define test_expr(d1,d2) BZTEST(all((d1)==(d2))); ++#define test_expr(d1,d2) BZTEST(all((d1)-(d2)<=1e-7)); + + // Test two vector expressions for equality + template diff --git a/pkgs/development/libraries/blitz/default.nix b/pkgs/development/libraries/blitz/default.nix new file mode 100644 index 00000000000..a64a8bd5943 --- /dev/null +++ b/pkgs/development/libraries/blitz/default.nix @@ -0,0 +1,80 @@ +{ stdenv, fetchurl, pkgconfig, gfortran, texinfo + +# Select SIMD alignment width (in bytes) for vectorization. +, simdWidth ? 1 + +# Pad arrays to simdWidth by default? +# Note: Only useful if simdWidth > 1 +, enablePadding ? false + +# Activate serialization through Boost.Serialize? +, enableSerialization ? true, boost ? null + +# Activate test-suite? +# WARNING: Some of the tests require up to 1700MB of memory to compile. +, doCheck ? true + +}: + +assert enableSerialization -> boost != null; + +let + inherit (stdenv.lib) optional optionals optionalString; +in + +stdenv.mkDerivation rec { + name = "blitz++-0.10"; + src = fetchurl { + url = mirror://sourceforge/blitz/blitz-0.10.tar.gz; + sha256 = "153g9sncir6ip9l7ssl6bhc4qzh0qr3lx2d15qm68hqxj7kg0kl0"; + }; + + patches = [ ./blitz-gcc47.patch ./blitz-testsuite-stencil-et.patch ]; + + buildInputs = [ pkgconfig gfortran texinfo ] + ++ optional (boost != null) boost + ; + + configureFlags = + [ "--enable-shared" + "--disable-static" + "--enable-fortran" + "--enable-optimize" + "--with-pic=yes" + "--enable-html-docs" + "--disable-doxygen" + "--disable-dot" + "--disable-latex-docs" + "--enable-simd-width=${toString simdWidth}" + ] + ++ optional enablePadding "--enable-array-length-padding" + ++ optional enableSerialization "--enable-serialization" + ++ optionals (boost != null) [ "--with-boost=${boost.dev}" + "--with-boost-libdir=${boost.lib}/lib" ] + ++ optional stdenv.is64bit "--enable-64bit" + ; + + enableParallelBuilding = true; + + buildFlags = "lib info pdf html"; + installTargets = [ "install" "install-info" "install-pdf" "install-html" ]; + + inherit doCheck; + checkTarget = "check-testsuite check-examples"; + + meta = { + description = "Fast multi-dimensional array library for C++"; + homepage = http://sourceforge.net/projects/blitz/; + license = stdenv.lib.licenses.lgpl3; + platforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin; + maintainers = [ stdenv.lib.maintainers.aherrmann ]; + + longDescription = '' + Blitz++ is a C++ class library for scientific computing which provides + performance on par with Fortran 77/90. It uses template techniques to + achieve high performance. Blitz++ provides dense arrays and vectors, + random number generators, and small vectors (useful for representing + multicomponent or vector fields). + ''; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7c0ee929439..144853788a7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -624,6 +624,8 @@ let blink = callPackage ../applications/networking/instant-messengers/blink { }; + blitz = callPackage ../development/libraries/blitz { }; + blockdiag = pythonPackages.blockdiag; bmon = callPackage ../tools/misc/bmon { }; From 2151abb92d7bfd603c919781d58d94645c3018c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= Date: Fri, 21 Nov 2014 11:44:41 +0100 Subject: [PATCH 182/383] i2pd: 0.2.0 -> 0.3.0 --- pkgs/tools/networking/i2pd/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/networking/i2pd/default.nix b/pkgs/tools/networking/i2pd/default.nix index b5510033928..f163f73edb2 100644 --- a/pkgs/tools/networking/i2pd/default.nix +++ b/pkgs/tools/networking/i2pd/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { name = "i2pd-${version}"; - version = "0.2.0"; + version = "0.3.0"; src = fetchurl { - url = "https://github.com/PrivacySolutions/i2pd/archive/${version}.tar.gz"; - sha256 = "0jr7svnwxiaxlxa3a8vcb8n6iy66ahwwx7glcwf2x57xssq27ily"; + url = "https://github.com/PrivacySolutions/i2pd/archive/v${version}-1stbinrelease.tar.gz"; + sha256 = "015y5v6w1mmzmnylfdc1l3r4qbmax3nywyz0r0pd651xgvvvinrv"; }; buildInputs = [ boost cryptopp ]; From c9dff002a378a9b70e8b1de2e2a8beae9fc8b94e Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Thu, 20 Nov 2014 14:21:38 +0000 Subject: [PATCH 183/383] Adds matio-1.5.2 matio is an C library for reading and writing Matlab MAT files. Homepage: http://matio.sourceforge.net/ --- pkgs/development/libraries/matio/default.nix | 16 ++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 18 insertions(+) create mode 100644 pkgs/development/libraries/matio/default.nix diff --git a/pkgs/development/libraries/matio/default.nix b/pkgs/development/libraries/matio/default.nix new file mode 100644 index 00000000000..da4b8a8570b --- /dev/null +++ b/pkgs/development/libraries/matio/default.nix @@ -0,0 +1,16 @@ +{ stdenv, fetchurl }: +stdenv.mkDerivation rec { + name = "matio-1.5.2"; + src = fetchurl { + url = "mirror://sourceforge/matio/${name}.tar.gz"; + sha256 = "0i8xj4g1gv50y6lj3s8hasjqspaawqbrnc06lrkdghvk6gxx00nv"; + }; + + meta = with stdenv.lib; { + description = "A C library for reading and writing Matlab MAT files"; + license = licenses.bsd2; + platforms = platforms.all; + maintainers = [ maintainers.vbgl ]; + homepage = http://matio.sourceforge.net/; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 144853788a7..6c8997ffe68 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6305,6 +6305,8 @@ let lzo = callPackage ../development/libraries/lzo { }; + matio = callPackage ../development/libraries/matio { }; + mdds_0_7_1 = callPackage ../development/libraries/mdds/0.7.1.nix { }; mdds = callPackage ../development/libraries/mdds { }; From 94f20a542a541413572686ad53c24c5e4c6fb278 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Thu, 20 Nov 2014 14:30:33 +0000 Subject: [PATCH 184/383] Adds getdata-0.8.5 The GetData Project is the reference implementation of the Dirfile Standards, a filesystem-based, column-oriented database format for time-ordered binary data. The Dirfile database format is designed to provide a fast, simple format for storing and reading data. Homepage: http://getdata.sourceforge.net/ --- pkgs/development/libraries/getdata/default.nix | 16 ++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 18 insertions(+) create mode 100644 pkgs/development/libraries/getdata/default.nix diff --git a/pkgs/development/libraries/getdata/default.nix b/pkgs/development/libraries/getdata/default.nix new file mode 100644 index 00000000000..93ecb7c05e6 --- /dev/null +++ b/pkgs/development/libraries/getdata/default.nix @@ -0,0 +1,16 @@ +{ stdenv, fetchurl }: +stdenv.mkDerivation rec { + name = "getdata-0.8.5"; + src = fetchurl { + url = "mirror://sourceforge/getdata/${name}.tar.bz2"; + sha256 = "0km6hbv18m9g8fxdqfcmk3bjr47w856v4hbrxpd609m6rk0j40zf"; + }; + + meta = with stdenv.lib; { + description = "Reference implementation of the Dirfile Standards"; + license = licenses.lgpl21Plus; + platforms = platforms.all; + maintainers = [ maintainers.vbgl ]; + homepage = http://getdata.sourceforge.net/; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6c8997ffe68..1bf7b30b10e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5169,6 +5169,8 @@ let geos = callPackage ../development/libraries/geos { }; + getdata = callPackage ../development/libraries/getdata { }; + gettext = gettext_0_18; gettext_0_17 = callPackage ../development/libraries/gettext/0.17.nix { }; From d1d22919aabfe06e9cefa1b657895a2971546aed Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Thu, 20 Nov 2014 16:55:25 +0000 Subject: [PATCH 185/383] Adds Kst-2.0.8 Kst is a real-time large-dataset viewing and plotting tool that has built-in data analysis functionality. Homepage: https://kst-plot.kde.org/ --- pkgs/tools/graphics/kst/default.nix | 31 +++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 33 insertions(+) create mode 100644 pkgs/tools/graphics/kst/default.nix diff --git a/pkgs/tools/graphics/kst/default.nix b/pkgs/tools/graphics/kst/default.nix new file mode 100644 index 00000000000..14720664427 --- /dev/null +++ b/pkgs/tools/graphics/kst/default.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchurl, cmake, pkgconfig +, qt5, gsl, getdata, netcdf, muparser, matio +}: +stdenv.mkDerivation rec { + name = "Kst-2.0.8"; + src = fetchurl { + url = "mirror://sourceforge/kst/${name}.tar.gz"; + sha256 = "1ihqmwqw0h2p7hn5shd8iwb0gd4axybs60lgw22ijxqh6wzgvyyf"; + }; + + nativeBuildInputs = [ cmake pkgconfig ]; + buildInputs = [ qt5 gsl getdata netcdf muparser matio ]; + + cmakeFlags = "-Dkst_qt5=1 -Dkst_release=1"; + + postInstall = '' + mkdir -p $out + for d in bin lib share + do + cp -r INSTALLED/$d $out/ + done + ''; + + meta = with stdenv.lib; { + description = "Real-time large-dataset viewing and plotting tool"; + homepage = https://kst-plot.kde.org/; + license = licenses.gpl2; + platforms = platforms.all; + maintainers = [ maintainers.vbgl ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1bf7b30b10e..ad7b21c960e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1545,6 +1545,8 @@ let kismet = callPackage ../applications/networking/sniffers/kismet { }; + kst = callPackage ../tools/graphics/kst { }; + less = callPackage ../tools/misc/less { }; liquidsoap = callPackage ../tools/audio/liquidsoap/full.nix { }; From bcf9da32f74818beeaf3ca749a4ea2a56027e80d Mon Sep 17 00:00:00 2001 From: Jaka Hudoklin Date: Fri, 21 Nov 2014 13:48:02 +0100 Subject: [PATCH 186/383] etcd: update to v0.5.0-alpha3 --- pkgs/servers/etcd/default.nix | 4 ++-- pkgs/servers/etcd/deps.nix | 34 ++++------------------------------ 2 files changed, 6 insertions(+), 32 deletions(-) diff --git a/pkgs/servers/etcd/default.nix b/pkgs/servers/etcd/default.nix index 8b4903c8602..c3307b249cd 100644 --- a/pkgs/servers/etcd/default.nix +++ b/pkgs/servers/etcd/default.nix @@ -1,11 +1,11 @@ { stdenv, lib, go, fetchurl, fetchgit, fetchhg, fetchbzr, fetchFromGitHub }: stdenv.mkDerivation rec { - version = "0.4.3"; + version = "0.5.0-alpha.3"; name = "etcd-${version}"; src = import ./deps.nix { - inherit stdenv lib fetchgit fetchhg fetchbzr fetchFromGitHub; + inherit stdenv lib fetchFromGitHub; }; buildInputs = [ go ]; diff --git a/pkgs/servers/etcd/deps.nix b/pkgs/servers/etcd/deps.nix index e9fd4a50d3e..5516c1e79d1 100644 --- a/pkgs/servers/etcd/deps.nix +++ b/pkgs/servers/etcd/deps.nix @@ -1,4 +1,5 @@ -{ stdenv, lib, fetchgit, fetchhg, fetchbzr, fetchFromGitHub }: +# This file was generated by go2nix. +{ stdenv, lib, fetchFromGitHub }: let goDeps = [ @@ -7,35 +8,8 @@ let src = fetchFromGitHub { owner = "coreos"; repo = "etcd"; - rev = "9970141f76241c909977af7bafe7b6f2c4923de8"; - sha256 = "1bva46gfy4rkfw8k8pb3lsfzfg16csds01f0nvfrkh99pr7sp0sy"; - }; - } - { - root = "github.com/stathat/go"; - src = fetchFromGitHub { - owner = "stathat"; - repo = "go"; - rev = "01d012b9ee2ecc107cb28b6dd32d9019ed5c1d77"; - sha256 = "0mrn70wjfcs4rfkmga3hbfqmbjk33skcsc8pyqxp02bzpwdpc4bi"; - }; - } - { - root = "github.com/stretchr/objx"; - src = fetchFromGitHub { - owner = "stretchr"; - repo = "objx"; - rev = "cbeaeb16a013161a98496fad62933b1d21786672"; - sha256 = "1xn7iibjik77h6h0jilfvcjkkzaqz45baf44p3rb2i03hbmkqkp1"; - }; - } - { - root = "github.com/stretchr/testify"; - src = fetchFromGitHub { - owner = "stretchr"; - repo = "testify"; - rev = "3e03dde72495487a4deb74152ac205d0619fbc8d"; - sha256 = "1xd9sbi6y68cfwkxgybcz0dbfx4r6jmxq51wjj6six3wm9p7m8ls"; + rev = "a817ca705b5a06b3d8c008e1a59f08895971cb1e"; + sha256 = "1lksjrb7anh6z8ajnp8jpfz9mxmvm762acdczvc6h1h4997dz982"; }; } ]; From b3bc157f7ff84a7ed0dc34901830c589d17a51e9 Mon Sep 17 00:00:00 2001 From: Jaka Hudoklin Date: Sat, 15 Nov 2014 16:27:27 +0100 Subject: [PATCH 187/383] nixos: add etcd module --- nixos/modules/misc/ids.nix | 1 + nixos/modules/module-list.nix | 1 + nixos/modules/services/misc/etcd.nix | 141 +++++++++++++++++++++++++++ nixos/release.nix | 1 + nixos/tests/etcd.nix | 108 ++++++++++++++++++++ 5 files changed, 252 insertions(+) create mode 100644 nixos/modules/services/misc/etcd.nix create mode 100644 nixos/tests/etcd.nix diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix index b08082af352..166bb931a62 100644 --- a/nixos/modules/misc/ids.nix +++ b/nixos/modules/misc/ids.nix @@ -163,6 +163,7 @@ systemd-resolve = 153; systemd-timesync = 154; liquidsoap = 155; + etcd = 156; # 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 19d69185392..0f09ee24027 100755 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -166,6 +166,7 @@ ./services/misc/cgminer.nix ./services/misc/dictd.nix ./services/misc/disnix.nix + ./services/misc/etcd.nix ./services/misc/felix.nix ./services/misc/folding-at-home.nix ./services/misc/gitolite.nix diff --git a/nixos/modules/services/misc/etcd.nix b/nixos/modules/services/misc/etcd.nix new file mode 100644 index 00000000000..f0693911616 --- /dev/null +++ b/nixos/modules/services/misc/etcd.nix @@ -0,0 +1,141 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.etcd; + +in { + + options.services.etcd = { + enable = mkOption { + description = "Whether to enable etcd."; + default = false; + type = types.uniq types.bool; + }; + + name = mkOption { + description = "Etcd unique node name."; + default = config.networking.hostName; + type = types.str; + }; + + advertiseClientUrls = mkOption { + description = "Etcd list of this member's client URLs to advertise to the rest of the cluster."; + default = cfg.listenClientUrls; + type = types.listOf types.str; + }; + + listenClientUrls = mkOption { + description = "Etcd list of URLs to listen on for client traffic."; + default = ["http://localhost:2379" "http://localhost:4001"]; + type = types.listOf types.str; + }; + + listenPeerUrls = mkOption { + description = "Etcd list of URLs to listen on for peer traffic."; + default = ["http://localhost:2380" "http://localhost:7001"]; + type = types.listOf types.str; + }; + + initialAdvertisePeerUrls = mkOption { + description = "Etcd list of this member's peer URLs to advertise to rest of the cluster."; + default = cfg.listenPeerUrls; + type = types.listOf types.str; + }; + + initialCluster = mkOption { + description = "Etcd initial cluster configuration for bootstrapping."; + default = ["${cfg.name}=http://localhost:2380" "${cfg.name}=http://localhost:7001"]; + type = types.listOf types.str; + }; + + initialClusterState = mkOption { + description = "Etcd initial cluster configuration for bootstrapping."; + default = "new"; + type = types.enum ["new" "existing"]; + }; + + initialClusterToken = mkOption { + description = "Etcd initial cluster token for etcd cluster during bootstrap."; + default = "etcd-cluster"; + type = types.str; + }; + + discovery = mkOption { + description = "Etcd discovery url"; + default = ""; + type = types.str; + }; + + extraConf = mkOption { + description = '' + Etcd extra configuration. See + + ''; + type = types.attrsOf types.str; + default = {}; + example = literalExample '' + { + "CORS": "*", + "NAME": "default-name", + "MAX_RESULT_BUFFER": "1024", + "MAX_CLUSTER_SIZE": "9", + "MAX_RETRY_ATTEMPTS": "3" + } + ''; + }; + + dataDir = mkOption { + type = types.path; + default = "/var/lib/etcd"; + description = "Etcd data directory."; + }; + }; + + config = mkIf cfg.enable { + systemd.services.etcd = { + description = "Etcd Daemon"; + wantedBy = [ "multi-user.target" ]; + after = [ "network-interfaces.target" ]; + + environment = { + ETCD_NAME = cfg.name; + ETCD_DISCOVERY = cfg.discovery; + ETCD_DATA_DIR = cfg.dataDir; + ETCD_ADVERTISE_CLIENT_URLS = concatStringsSep "," cfg.advertiseClientUrls; + ETCD_LISTEN_CLIENT_URLS = concatStringsSep "," cfg.listenClientUrls; + ETCD_LISTEN_PEER_URLS = concatStringsSep "," cfg.listenPeerUrls; + ETCD_INITIAL_ADVERTISE_PEER_URLS = concatStringsSep "," cfg.initialAdvertisePeerUrls; + } // (optionalAttrs (cfg.discovery == ""){ + ETCD_INITIAL_CLUSTER = concatStringsSep "," cfg.initialCluster; + ETCD_INITIAL_CLUSTER_STATE = cfg.initialClusterState; + ETCD_INITIAL_CLUSTER_TOKEN = cfg.initialClusterToken; + }) // (mapAttrs' (n: v: nameValuePair "ETCD_${n}" v) cfg.extraConf); + + serviceConfig = { + ExecStart = "${pkgs.etcd}/bin/etcd"; + User = "etcd"; + PermissionsStartOnly = true; + }; + preStart = '' + mkdir -m 0700 -p ${cfg.dataDir} + if [ "$(id -u)" = 0 ]; then chown etcd ${cfg.dataDir}; fi + ''; + postStart = '' + until ${pkgs.curl}/bin/curl -s -o /dev/null '${head cfg.listenClientUrls}/version'; do + sleep 1; + done + ''; + }; + + environment.systemPackages = [ pkgs.etcdctl ]; + + users.extraUsers = singleton { + name = "etcd"; + uid = config.ids.uids.etcd; + description = "Etcd daemon user"; + home = cfg.dataDir; + }; + }; +} diff --git a/nixos/release.nix b/nixos/release.nix index 83594629226..890d8d483d7 100644 --- a/nixos/release.nix +++ b/nixos/release.nix @@ -239,6 +239,7 @@ in rec { tests.chromium = callTest tests/chromium.nix {}; tests.cjdns = callTest tests/cjdns.nix {}; tests.containers = callTest tests/containers.nix {}; + tests.etcd = callTest tests/etcd.nix {}; tests.firefox = callTest tests/firefox.nix {}; tests.firewall = callTest tests/firewall.nix {}; tests.gnome3 = callTest tests/gnome3.nix {}; diff --git a/nixos/tests/etcd.nix b/nixos/tests/etcd.nix new file mode 100644 index 00000000000..6c6dd84f558 --- /dev/null +++ b/nixos/tests/etcd.nix @@ -0,0 +1,108 @@ +# This test runs etcd as single node, multy node and using discovery + +import ./make-test.nix { + name = "etcd"; + + nodes = { + simple = + { config, pkgs, nodes, ... }: + { + services.etcd.enable = true; + services.etcd.listenClientUrls = ["http://0.0.0.0:4001"]; + environment.systemPackages = [ pkgs.curl ]; + networking.firewall.allowedTCPPorts = [ 4001 ]; + }; + + + node1 = + { config, pkgs, nodes, ... }: + { + services = { + etcd = { + enable = true; + listenPeerUrls = ["http://0.0.0.0:7001"]; + initialAdvertisePeerUrls = ["http://node1:7001"]; + initialCluster = ["node1=http://node1:7001" "node2=http://node2:7001"]; + }; + }; + + networking.firewall.allowedTCPPorts = [ 7001 ]; + }; + + node2 = + { config, pkgs, ... }: + { + services = { + etcd = { + enable = true; + listenPeerUrls = ["http://0.0.0.0:7001"]; + initialAdvertisePeerUrls = ["http://node2:7001"]; + initialCluster = ["node1=http://node1:7001" "node2=http://node2:7001"]; + }; + }; + + networking.firewall.allowedTCPPorts = [ 7001 ]; + }; + + discovery1 = + { config, pkgs, nodes, ... }: + { + services = { + etcd = { + enable = true; + listenPeerUrls = ["http://0.0.0.0:7001"]; + initialAdvertisePeerUrls = ["http://discovery1:7001"]; + discovery = "http://simple:4001/v2/keys/discovery/6c007a14875d53d9bf0ef5a6fc0257c817f0fb83/"; + }; + }; + + networking.firewall.allowedTCPPorts = [ 7001 ]; + }; + + discovery2 = + { config, pkgs, ... }: + { + services = { + etcd = { + enable = true; + listenPeerUrls = ["http://0.0.0.0:7001"]; + initialAdvertisePeerUrls = ["http://discovery2:7001"]; + discovery = "http://simple:4001/v2/keys/discovery/6c007a14875d53d9bf0ef5a6fc0257c817f0fb83/"; + }; + }; + + networking.firewall.allowedTCPPorts = [ 7001 ]; + }; + }; + + testScript = '' + subtest "single node", sub { + $simple->start(); + $simple->waitForUnit("etcd.service"); + $simple->succeed("etcdctl set /foo/bar 'Hello world'"); + $simple->succeed("etcdctl get /foo/bar | grep 'Hello world'"); + }; + + subtest "multy node", sub { + $node1->start(); + $node2->start(); + $node1->waitForUnit("etcd.service"); + $node2->waitForUnit("etcd.service"); + $node1->succeed("etcdctl set /foo/bar 'Hello world'"); + $node2->succeed("etcdctl get /foo/bar | grep 'Hello world'"); + $node1->shutdown(); + $node2->shutdown(); + }; + + subtest "discovery", sub { + $simple->succeed("curl -X PUT http://localhost:4001/v2/keys/discovery/6c007a14875d53d9bf0ef5a6fc0257c817f0fb83/_config/size -d value=2"); + + $discovery1->start(); + $discovery2->start(); + $discovery1->waitForUnit("etcd.service"); + $discovery2->waitForUnit("etcd.service"); + $discovery1->succeed("etcdctl set /foo/bar 'Hello world'"); + $discovery2->succeed("etcdctl get /foo/bar | grep 'Hello world'"); + }; + ''; +} From 52b848861a11bfb1f7899f4f5c3e6603b9fea210 Mon Sep 17 00:00:00 2001 From: Jaka Hudoklin Date: Sat, 15 Nov 2014 17:18:14 +0100 Subject: [PATCH 188/383] Add kubernetes --- .../networking/cluster/kubernetes/default.nix | 34 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 36 insertions(+) create mode 100644 pkgs/applications/networking/cluster/kubernetes/default.nix diff --git a/pkgs/applications/networking/cluster/kubernetes/default.nix b/pkgs/applications/networking/cluster/kubernetes/default.nix new file mode 100644 index 00000000000..764cf804e70 --- /dev/null +++ b/pkgs/applications/networking/cluster/kubernetes/default.nix @@ -0,0 +1,34 @@ +{ stdenv, fetchFromGitHub, which, go, makeWrapper, iptables,rsync }: + +stdenv.mkDerivation rec { + name = "kubernetes-${version}"; + version = "v0.5.2"; + + src = fetchFromGitHub { + owner = "GoogleCloudPlatform"; + repo = "kubernetes"; + rev = version; + sha256 = "0nrm59v43jx0cskpd294q946053cfw3y2cgs53ji35dnhgj6fl6w"; + }; + + buildInputs = [ makeWrapper which go iptables rsync ]; + + preBuild = "patchShebangs ./hack"; + + installPhase = '' + mkdir -p "$out/bin" + cp _output/local/go/bin/* "$out/bin/" + ''; + + preFixup = '' + wrapProgram "$out/bin/proxy" --set "PATH" "${iptables}/bin" + ''; + + meta = with stdenv.lib; { + description = "Open source implementation of container cluster management."; + license = licenses.asl20; + homepage = https://github.com/GoogleCloudPlatform; + maintainers = with maintainers; [offline]; + platforms = with platforms; linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 144853788a7..f41ac427d86 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9950,6 +9950,8 @@ let koji = callPackage ../tools/package-management/koji { }; + kubernetes = callPackage ../applications/networking/cluster/kubernetes { }; + lame = callPackage ../applications/audio/lame { }; larswm = callPackage ../applications/window-managers/larswm { }; From 97f35cf29a1701c0ad53cdbdb2f67af44b8484a5 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Fri, 21 Nov 2014 08:36:02 -0500 Subject: [PATCH 189/383] nixUnstable: bump Bug fixed in b0c5c2a was giving me segfaults... --- 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 f2719a070d6..7ed7f14e5c9 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.8pre3899_8299aaf"; + name = "nix-1.8pre3903_b0c5c2a"; src = fetchurl { - url = "http://hydra.nixos.org/build/17210259/download/4/${name}.tar.xz"; - sha256 = "acf4b1f0e4ea9c95b2a24b987991d3af928cde10445a45f37cad060d1ee30bc1"; + url = http://hydra.nixos.org/build/17484284/download/4/nix-1.8pre3903_b0c5c2a.tar.xz; + sha256 = "2e49f9599f6aa3119ef963d44be4e327ac74b7240e11c0b1836ec61ae5e0b61b"; }; nativeBuildInputs = [ perl pkgconfig ]; From 683e4d747a34df88c12bfea61c5a56d9794e8ccb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= Date: Fri, 21 Nov 2014 14:51:00 +0100 Subject: [PATCH 190/383] Revert "libdwarf: upgrade to the latest version" --- .../libraries/libdwarf/default.nix | 24 ++++++++----------- 1 file changed, 10 insertions(+), 14 deletions(-) diff --git a/pkgs/development/libraries/libdwarf/default.nix b/pkgs/development/libraries/libdwarf/default.nix index 295fcbc1da9..44eec24cb41 100644 --- a/pkgs/development/libraries/libdwarf/default.nix +++ b/pkgs/development/libraries/libdwarf/default.nix @@ -1,31 +1,27 @@ { stdenv, fetchurl, libelf }: stdenv.mkDerivation rec { - name = "libdwarf-20140805"; + name = "libdwarf-20121130"; src = fetchurl { - url = "http://www.prevanders.net/${name}.tar.gz"; - sha256 = "1z5xz0w1yvk8swcqzx4dvnig94j51pns39jmipv5rl20qahik0nl"; + url = http://reality.sgiweb.org/davea/libdwarf-20121130.tar.gz; + sha256 = "1nfdfn5xf3n485pvpb853awyxxnvrg207i0wmrr7bhk8fcxdxbn0"; }; - configureFlags = "--enable-shared"; + configureFlags = " --enable-shared --disable-nonshared"; - preBuild = '' - export LD_LIBRARY_PATH=`pwd`/libdwarf + preConfigure = '' + cd libdwarf ''; - buildInputs = [ libelf ]; installPhase = '' - mkdir -p $out/lib $out/include $out/bin - cp ./dwarfdump2/dwarfdump $out/bin/dwarfdump2 - cp ./dwarfdump/dwarfdump $out/bin/dwarfdump - cp libdwarf/libdwarf.so $out/lib - cp libdwarf/libdwarf.h libdwarf/dwarf.h $out/include + mkdir -p $out/lib $out/include + cp libdwarf.so $out/lib + cp libdwarf.h dwarf.h $out/include ''; meta = { - homepage = http://www.prevanders.net/dwarf.html; - license = stdenv.lib.licenses.gpl2; + homepage = http://reality.sgiweb.org/davea/dwarf.html; }; } From b02d90969fec957160dd5252b2a47df8efae9e47 Mon Sep 17 00:00:00 2001 From: Jaka Hudoklin Date: Fri, 21 Nov 2014 15:06:51 +0100 Subject: [PATCH 191/383] make zookeeper.nix non-executable --- nixos/modules/services/misc/zookeeper.nix | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100755 => 100644 nixos/modules/services/misc/zookeeper.nix diff --git a/nixos/modules/services/misc/zookeeper.nix b/nixos/modules/services/misc/zookeeper.nix old mode 100755 new mode 100644 From 97dfbdd7080797625360f042a64daad715beef27 Mon Sep 17 00:00:00 2001 From: Jaka Hudoklin Date: Fri, 21 Nov 2014 15:12:22 +0100 Subject: [PATCH 192/383] pythonPackages: add docker registry --- pkgs/top-level/python-packages.nix | 70 ++++++++++++++++++++++++++++++ 1 file changed, 70 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ce99d7e8ca1..e5d9ca58e14 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -601,6 +601,24 @@ let }; }; + backports_lzma = self.buildPythonPackage rec { + name = "backports.lzma-0.0.3"; + disabled = isPy3k; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/b/backports.lzma/${name}.tar.gz"; + md5 = "c3d109746aefa86268e500c07d7e8e0f"; + }; + + buildInputs = [ pkgs.lzma ]; + + meta = { + describe = "Backport of Python 3.3's 'lzma' module for XZ/LZMA compressed files."; + homepage = https://github.com/peterjc/backports.lzma; + license = stdenv.lib.licenses.bsd3; + }; + }; + babelfish = buildPythonPackage rec { version = "0.5.3"; name = "babelfish-${version}"; @@ -2105,6 +2123,58 @@ let }; }; + docker_registry_core = buildPythonPackage rec { + name = "docker-registry-core-2.0.3"; + disabled = isPy3k; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/d/docker-registry-core/${name}.tar.gz"; + md5 = "610ef9395f2e9a2f91c68d13325fce7b"; + }; + + DEPS = "loose"; + + doCheck = false; + propagatedBuildInputs = with self; [ + boto redis setuptools simplejson + ]; + + meta = { + description = "Docker registry core package"; + homepage = https://github.com/docker/docker-registry; + license = licenses.asl20; + }; + }; + + docker_registry = buildPythonPackage rec { + name = "docker-registry-0.9.0"; + disabled = isPy3k; + + src = pkgs.fetchurl { + url = "https://pypi.python.org/packages/source/d/docker-registry/${name}.tar.gz"; + md5 = "65eb9fd05b94f7f9fbbb5e2e8ca62912"; + }; + + DEPS = "loose"; + + doCheck = false; # requires redis server + propagatedBuildInputs = with self; [ + docker_registry_core blinker flask gevent gunicorn pyyaml + requests2 rsa sqlalchemy setuptools backports_lzma pyasn1 + ]; + + # Default config uses needed env variables + postInstall = '' + ln -s $out/lib/python2.7/site-packages/config/config_sample.yml $out/lib/python2.7/site-packages/config/config.yml + ''; + + meta = { + description = "Docker registry core package"; + homepage = https://github.com/docker/docker-registry; + license = licenses.asl20; + }; + }; + dogpile_cache = buildPythonPackage rec { name = "dogpile.cache-0.5.4"; From 77fffad1abb423c530807aa144e55849ec833734 Mon Sep 17 00:00:00 2001 From: Pascal Wittmann Date: Fri, 21 Nov 2014 15:39:50 +0100 Subject: [PATCH 193/383] calibre: update from 2.10.0 to 2.11.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 9cda2d93d7a..f6159c79b1f 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.10.0"; + name = "calibre-2.11.0"; src = fetchurl { url = "mirror://sourceforge/calibre/${name}.tar.xz"; - sha256 = "06nya8r3bfkgfjsl83fl6l6g3ccw3mpmn3kih4i51gpcgma3aa6b"; + sha256 = "19pn55yvc7yiz21gri5838zf7n88l6m2abbwzswn4x8v9915lls1"; }; inherit python; From 76854052f90664551c792178e945341fb899f0ad Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Fri, 21 Nov 2014 09:59:53 -0500 Subject: [PATCH 194/383] nix-exec: bump --- pkgs/development/interpreters/nix-exec/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/nix-exec/default.nix b/pkgs/development/interpreters/nix-exec/default.nix index 886c3622e2b..0cf5a1332ab 100644 --- a/pkgs/development/interpreters/nix-exec/default.nix +++ b/pkgs/development/interpreters/nix-exec/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, pkgconfig, nix, git }: let - version = "3.0.0"; + version = "3.0.1"; in stdenv.mkDerivation { name = "nix-exec-${version}"; src = fetchurl { url = "https://github.com/shlevy/nix-exec/releases/download/v${version}/nix-exec-${version}.tar.xz"; - sha256 = "1c5akl24jym30cfhqg9wx2mzlcx6d91fh62dvf1l13y1akqrsk06"; + sha256 = "1ncyhmwch9l2iz58ycfy53bb3l850d24aryraf6vvfkw8yg9d7kq"; }; buildInputs = [ pkgconfig nix git ]; From e90a1728a31b29b5c05dca4a3774078f1870da8c Mon Sep 17 00:00:00 2001 From: Jaka Hudoklin Date: Fri, 21 Nov 2014 17:28:27 +0100 Subject: [PATCH 195/383] Add selendroid --- .../tools/selenium/selendroid/default.nix | 36 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 38 insertions(+) create mode 100644 pkgs/development/tools/selenium/selendroid/default.nix diff --git a/pkgs/development/tools/selenium/selendroid/default.nix b/pkgs/development/tools/selenium/selendroid/default.nix new file mode 100644 index 00000000000..e34e479e938 --- /dev/null +++ b/pkgs/development/tools/selenium/selendroid/default.nix @@ -0,0 +1,36 @@ +{ stdenv, fetchurl, makeWrapper, jdk, selenium-server-standalone }: + +with stdenv.lib; + +stdenv.mkDerivation rec { + name = "selendroid-standalone-${version}"; + version = "0.11.0"; + + src = fetchurl { + url = "https://github.com/selendroid/selendroid/releases/download/${version}/selendroid-standalone-${version}-with-dependencies.jar"; + sha256 = "1p6k974pr2634q1g65wx243cxdqhac63x8w2gsmh6vnni0818clk"; + }; + + unpackPhase = "true"; + + buildInputs = [ jdk makeWrapper ]; + + installPhase = '' + mkdir -p $out/share/lib/selendroid + cp $src $out/share/lib/selendroid/${name}.jar + makeWrapper ${jdk}/bin/java $out/bin/selendroid \ + --add-flags "-jar $out/share/lib/selendroid/${name}.jar" + makeWrapper ${jdk}/bin/java $out/bin/selendroid-selenium \ + --add-flags "-Dfile.encoding=UTF-8" \ + --add-flags "-cp \"$out/share/lib/selendroid/${name}.jar:${selenium-server-standalone}/share/lib/${selenium-server-standalone.name}/${selenium-server-standalone.name}.jar\"" \ + --add-flags "org.openqa.grid.selenium.GridLauncher" + ''; + + meta = { + homepage = https://code.google.com/p/selenium; + description = "Test automation for native or hybrid Android apps and the mobile web."; + maintainers = with maintainers; [ offline ]; + platforms = platforms.all; + license = licenses.asl20; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 144853788a7..561292ba96b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4669,6 +4669,8 @@ let selenium-server-standalone = callPackage ../development/tools/selenium/server { }; + selendroid = callPackage ../development/tools/selenium/selendroid { }; + scons = callPackage ../development/tools/build-managers/scons { }; sbt = callPackage ../development/tools/build-managers/sbt { }; From e668e2650ffe57a076c23451667a6b983bcf32af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= Date: Fri, 21 Nov 2014 20:29:43 +0100 Subject: [PATCH 196/383] guitarix: update from 0.31.0 to 0.32.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 5e88da8f856..c4ba88c87ed 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.31.0"; + version = "0.32.0"; src = fetchurl { url = "mirror://sourceforge/guitarix/guitarix2-${version}.tar.bz2"; - sha256 = "0n3swk4xahspf42qglikfmvcz8my43wmp6sp4ns7h4m8hr9lgfk6"; + sha256 = "06qxydcba1ga1l19kyqy0mk141mv6pa4wbkyh75xbwhyr65bwkc4"; }; buildInputs = [ From d123f1faf0f29eee2cd7bdc841277e4643ab3fcd Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Fri, 21 Nov 2014 15:10:34 -0500 Subject: [PATCH 197/383] solr: bump --- pkgs/servers/search/solr/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/search/solr/default.nix b/pkgs/servers/search/solr/default.nix index 443e7af71ad..a5dbaa1731d 100644 --- a/pkgs/servers/search/solr/default.nix +++ b/pkgs/servers/search/solr/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "solr-${version}"; - version = "4.7.0"; + version = "4.10.2"; src = fetchurl { url = "mirror://apache/lucene/solr/${version}/solr-${version}.tgz"; - sha256 = "0qm3pnhpfqjxdl0xiwffrcchp79q3ja5w5d278bkkxglc2y1y4xc"; + sha256 = "07wwfgwcca3ndjrkfk7qyc4q8bdhwr0s6h4ijl4sqdy65aqcc6qh"; }; phases = [ "unpackPhase" "installPhase" ]; From 40274943347d8d5223935ed358712d87119c9f46 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Fri, 21 Nov 2014 22:29:19 +0300 Subject: [PATCH 198/383] We had hash for wrong mcabber version and the tarball was cached --- .../networking/instant-messengers/mcabber/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/mcabber/default.nix b/pkgs/applications/networking/instant-messengers/mcabber/default.nix index 362bf0de977..4fda2d9cc06 100644 --- a/pkgs/applications/networking/instant-messengers/mcabber/default.nix +++ b/pkgs/applications/networking/instant-messengers/mcabber/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, openssl, ncurses, pkgconfig, glib, loudmouth}: +{stdenv, fetchurl, openssl, ncurses, pkgconfig, glib, loudmouth, libotr}: stdenv.mkDerivation rec { name = "mcabber-${version}"; @@ -6,12 +6,12 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://mcabber.com/files/mcabber-${version}.tar.bz2"; - sha256 = "1248cgci1v2ypb90wfhyipwdyp1wskn3gzh78af5ai1a4w5rrjq0"; + sha256 = "0vgsqw6yn0lzzcnr4fql4ycgf3gwqj6w4p0l4nqnvhkc94w62ikp"; }; - buildInputs = [openssl ncurses pkgconfig glib loudmouth]; + buildInputs = [openssl ncurses pkgconfig glib loudmouth libotr]; - configureFlags = "--with-openssl=${openssl}"; + configureFlags = "--with-openssl=${openssl} --enable-modules --enable-otr"; meta = with stdenv.lib; { homepage = http://mcabber.com/; From 5c7c63af66d5b772d97d5ffda09df9cf2ef96f8b Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Fri, 21 Nov 2014 16:12:33 -0500 Subject: [PATCH 199/383] Add src revision control software --- .../version-management/src/default.nix | 38 +++++++++++++++++++ .../version-management/src/path.patch | 30 +++++++++++++++ pkgs/top-level/all-packages.nix | 4 ++ 3 files changed, 72 insertions(+) create mode 100644 pkgs/applications/version-management/src/default.nix create mode 100644 pkgs/applications/version-management/src/path.patch diff --git a/pkgs/applications/version-management/src/default.nix b/pkgs/applications/version-management/src/default.nix new file mode 100644 index 00000000000..d3b0ee9131b --- /dev/null +++ b/pkgs/applications/version-management/src/default.nix @@ -0,0 +1,38 @@ +{ stdenv, fetchurl, python, rcs, git }: + +stdenv.mkDerivation rec { + name = "src-0.12"; + + src = fetchurl { + url = "http://www.catb.org/~esr/src/${name}.tar.gz"; + sha256 = "1w8k9z2dxim99nniid9kjsc5lzri7m4sd0n819y73aqcdi54lr1s"; + }; + + buildInputs = [ python ]; + + patches = [ ./path.patch ]; + + postPatch = '' + sed -i \ + -e 's|@python@|${python}|' \ + -e 's|@rcs@|${rcs}|' \ + -e 's|@git@|${git}|' \ + src srctest + ''; + + makeFlags = [ "prefix=$(out)" ]; + + doCheck = true; + + meta = { + description = "Simple single-file revision control"; + + homepage = http://www.catb.org/~esr/src/; + + license = [ stdenv.lib.licenses.bsd3 ]; + + maintainers = [ stdenv.lib.maintainers.shlevy ]; + + platforms = stdenv.lib.platforms.all; + }; +} diff --git a/pkgs/applications/version-management/src/path.patch b/pkgs/applications/version-management/src/path.patch new file mode 100644 index 00000000000..05e643e9e0f --- /dev/null +++ b/pkgs/applications/version-management/src/path.patch @@ -0,0 +1,30 @@ +diff -Naur src-0.12-orig/src src-0.12/src +--- src-0.12-orig/src 2014-11-21 08:19:59.000000000 -0500 ++++ src-0.12/src 2014-11-21 15:54:54.598113846 -0500 +@@ -1,4 +1,4 @@ +-#!/usr/bin/env python2 ++#!@python@/bin/python + # + # src - simple revision control. + # +@@ -58,6 +58,8 @@ + + import sys, os, subprocess, time, calendar, stat, glob, shutil, hashlib + ++os.environ['PATH'] = "@rcs@/bin:@git@/bin:" + os.environ['PATH'] ++ + version="0.12" + + def rfc3339(t): +diff -Naur src-0.12-orig/srctest src-0.12/srctest +--- src-0.12-orig/srctest 2014-11-21 08:12:00.000000000 -0500 ++++ src-0.12/srctest 2014-11-21 15:58:31.370500990 -0500 +@@ -12,7 +12,7 @@ + + # Set the PATH to include the current directory, so the repository + # head version of src can always be tested. +-PATH="$(pwd)":$PATH ++PATH="$(pwd)":@git@/bin:$PATH + + trap "rm -fr $SANDBOX" 0 1 2 15 + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 144853788a7..497c027b35f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10668,6 +10668,10 @@ let apiKey = config.libspotify.apiKey or null; }; + src = callPackage ../applications/version-management/src/default.nix { + git = gitMinimal; + }; + stalonetray = callPackage ../applications/window-managers/stalonetray {}; stp = callPackage ../applications/science/logic/stp {}; From c9fab7eb97120fda469e721fec229847b9df8c9a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= Date: Fri, 21 Nov 2014 23:23:01 +0100 Subject: [PATCH 200/383] ardour: update from 3.5.380 to 3.5.403 --- pkgs/applications/audio/ardour/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/ardour/default.nix b/pkgs/applications/audio/ardour/default.nix index 62b88cbe077..5180be3c940 100644 --- a/pkgs/applications/audio/ardour/default.nix +++ b/pkgs/applications/audio/ardour/default.nix @@ -6,7 +6,7 @@ , perl, pkgconfig, python, serd, sord, sratom, suil }: let - tag = "3.5.380"; + tag = "3.5.403"; in stdenv.mkDerivation rec { @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { src = fetchgit { url = git://git.ardour.org/ardour/ardour.git; rev = "refs/tags/${tag}"; - sha256 = "dbcbb2d9143e196d079c27b15266e47d24b81cb7591fe64b717f3485965ded7b"; + sha256 = "7d7c8e2c7ccccca6c8324fd874509e1b0d89f3f42cb92982c50d212797463f4c"; }; buildInputs = From f1b9f88e5b82a2636312528827122fa283bf0e05 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Fri, 21 Nov 2014 14:38:48 -0800 Subject: [PATCH 201/383] kernel: 3.10.60 -> 3.10.61 --- pkgs/os-specific/linux/kernel/linux-3.10.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-3.10.nix b/pkgs/os-specific/linux/kernel/linux-3.10.nix index b39272623de..88e00e2f3bd 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.10.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.10.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, ... } @ args: import ./generic.nix (args // rec { - version = "3.10.60"; + version = "3.10.61"; extraMeta.branch = "3.10"; src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "0hd67wxgg2idijydll97jq235dcvy014575f048cs12n4ssga4fw"; + sha256 = "1pxkm4ix1051qma535087zkshwmwhirb73wyfhqaqrxp4177rja2"; }; features.iwlwifi = true; From 30597a9c7acd4603f6ce5eb6b95b05e538b49eab Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Fri, 21 Nov 2014 14:39:15 -0800 Subject: [PATCH 202/383] kernel: 3.12.32 -> 3.12.33 --- pkgs/os-specific/linux/kernel/linux-3.12.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-3.12.nix b/pkgs/os-specific/linux/kernel/linux-3.12.nix index bb046999925..8c68a09a535 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.32"; + version = "3.12.33"; extraMeta.branch = "3.12"; src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "1hzws2bf267hfk81ywqcxspkyi1lg56x63izdc0pv1338xcfas53"; + sha256 = "18vrlrda8xa6j7771x8bwl7vrhvi2kmrp91nlwhkqr4siwkh0jxp"; }; features.iwlwifi = true; From 9f1bd2d41957afcdafdf32cd40747ce309cb2da4 Mon Sep 17 00:00:00 2001 From: Emery Hemingway Date: Fri, 21 Nov 2014 18:04:53 -0500 Subject: [PATCH 203/383] cjdns: update 20141023 -> 20141121 include protocol version in package version string --- pkgs/tools/networking/cjdns/default.nix | 13 ++++----- .../networking/cjdns/makekeys-sigpipe.patch | 29 ------------------- 2 files changed, 5 insertions(+), 37 deletions(-) delete mode 100644 pkgs/tools/networking/cjdns/makekeys-sigpipe.patch diff --git a/pkgs/tools/networking/cjdns/default.nix b/pkgs/tools/networking/cjdns/default.nix index cbaca948b2b..1fed2caa68d 100644 --- a/pkgs/tools/networking/cjdns/default.nix +++ b/pkgs/tools/networking/cjdns/default.nix @@ -1,22 +1,19 @@ { stdenv, fetchFromGitHub, nodejs, which, python27, utillinux }: let - date = "20141023"; - rev = "c7eed6b14688458e16fab368f68904e530651a30"; + version = "12"; # see ${src}/util/version/Version.h + date = "20141121"; in stdenv.mkDerivation { - name = "cjdns-${date}-${stdenv.lib.strings.substring 0 7 rev}"; + name = "cjdns-${version}-${date}"; src = fetchFromGitHub { owner = "cjdelisle"; repo = "cjdns"; - inherit rev; - sha256 = "11z8dk7byxh9pfv7mhfvnk465qln1g7z8c8f822623d59lwjpbs1"; + rev = "f176d2c0271d764412bd13c7adf7ea475fa25e0f"; + sha256 = "02vp917pr0kkcg41ani2azfbmdv1rjghmlrc7nc07ckkcqg6sk0y"; }; - # Make the NixOS service work a little better. - patches = [ ./makekeys-sigpipe.patch ]; - buildInputs = [ which python27 nodejs ] ++ # for flock stdenv.lib.optional stdenv.isLinux [ utillinux ]; diff --git a/pkgs/tools/networking/cjdns/makekeys-sigpipe.patch b/pkgs/tools/networking/cjdns/makekeys-sigpipe.patch deleted file mode 100644 index 2b21f56709d..00000000000 --- a/pkgs/tools/networking/cjdns/makekeys-sigpipe.patch +++ /dev/null @@ -1,29 +0,0 @@ -diff --git a/contrib/c/makekeys.c b/contrib/c/makekeys.c -index 29582f1..555cf85 100644 ---- a/contrib/c/makekeys.c -+++ b/contrib/c/makekeys.c -@@ -21,6 +21,7 @@ - - #include "crypto_scalarmult_curve25519.h" - -+#include - #include - - int main(int argc, char** argv) -@@ -35,6 +36,8 @@ int main(int argc, char** argv) - uint8_t hexPrivateKey[65]; - uint8_t printedIp[40]; - -+ signal(SIGPIPE,SIG_DFL); -+ - for (;;) { - Random_bytes(rand, privateKey, 32); - crypto_scalarmult_curve25519_base(publicKey, privateKey); -@@ -43,6 +46,7 @@ int main(int argc, char** argv) - Base32_encode(publicKeyBase32, 53, publicKey, 32); - AddrTools_printShortIp(printedIp, ip); - printf("%s %s %s.k\n", hexPrivateKey, printedIp, publicKeyBase32); -+ fflush(stdout); - } - } - return 0; From 07e80c6d9877267e17792166772eaf1094d1af66 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Fri, 21 Nov 2014 16:11:15 -0800 Subject: [PATCH 204/383] boost: Add dependency fix for ipp files --- pkgs/development/libraries/boost/generic.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/boost/generic.nix b/pkgs/development/libraries/boost/generic.nix index cb9f0422c76..6e1a2cfc413 100644 --- a/pkgs/development/libraries/boost/generic.nix +++ b/pkgs/development/libraries/boost/generic.nix @@ -104,7 +104,8 @@ let # Make boost header paths relative so that they are not runtime dependencies ( cd "$dev" - find include \( -name '*.hpp' -or -name '*.h' \) -exec sed '1i#line 1 "{}"' -i '{}' \; + find include \( -name '*.hpp' -or -name '*.h' -or -name '*.ipp' \) \ + -exec sed '1i#line 1 "{}"' -i '{}' \; ) ''; From 2495e819aa7ccbd59adb5bcaac898b18d0532684 Mon Sep 17 00:00:00 2001 From: aszlig Date: Thu, 20 Nov 2014 01:48:10 +0100 Subject: [PATCH 205/383] chromium: Update all channels to latest versions. With this commit, the following new upstream versions are introduced: stable: 38.0.2125.101 -> 39.0.2171.65 beta: 39.0.2171.19 -> 40.0.2214.10 dev: 40.0.2182.3 -> 41.0.2224.3 We can now remove missing_alg_import.patch, because version 39 is nom stable and thus fixes the missing include directive upstream. However, starting with version 40, we hit a few bugs with system protobuf, so we're disabling it for every version >=40 to avoid runtime/startup errors. Here is the stable channel announcement for version 39 on the official blog: http://googlechromereleases.blogspot.de/2014/11/stable-channel-update_18.html Signed-off-by: aszlig --- .../networking/browsers/chromium/common.nix | 2 +- .../browsers/chromium/source/default.nix | 4 +--- .../chromium/source/missing_alg_import.patch | 11 --------- .../browsers/chromium/source/sources.nix | 24 +++++++++---------- 4 files changed, 14 insertions(+), 27 deletions(-) delete mode 100644 pkgs/applications/networking/browsers/chromium/source/missing_alg_import.patch diff --git a/pkgs/applications/networking/browsers/chromium/common.nix b/pkgs/applications/networking/browsers/chromium/common.nix index 2676104db3e..49ddaae04f9 100644 --- a/pkgs/applications/networking/browsers/chromium/common.nix +++ b/pkgs/applications/networking/browsers/chromium/common.nix @@ -69,7 +69,7 @@ let use_system_xdg_utils = true; use_system_yasm = true; use_system_zlib = false; - use_system_protobuf = true; + use_system_protobuf = versionOlder source.version "40.0.0.0"; use_system_harfbuzz = false; use_system_icu = false; # Doesn't support ICU 52 yet. diff --git a/pkgs/applications/networking/browsers/chromium/source/default.nix b/pkgs/applications/networking/browsers/chromium/source/default.nix index 3c7abc0d5e2..ef442004d7e 100644 --- a/pkgs/applications/networking/browsers/chromium/source/default.nix +++ b/pkgs/applications/networking/browsers/chromium/source/default.nix @@ -22,9 +22,7 @@ stdenv.mkDerivation { prePatch = "patchShebangs ."; - patches = let - onPre39 = optional (versionOlder version "39.0.0.0"); - in [ ./sandbox_userns_36.patch ] ++ onPre39 ./missing_alg_import.patch; + patches = [ ./sandbox_userns_36.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 deleted file mode 100644 index 243e3fe7049..00000000000 --- a/pkgs/applications/networking/browsers/chromium/source/missing_alg_import.patch +++ /dev/null @@ -1,11 +0,0 @@ -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 - diff --git a/pkgs/applications/networking/browsers/chromium/source/sources.nix b/pkgs/applications/networking/browsers/chromium/source/sources.nix index 0640a6abd09..5437f8e283a 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 = "40.0.2182.3"; - sha256 = "1713y6f2q5qh32wg027nphkv6p6rgq0q1awqcy543ypbk9p1jvbm"; - sha256bin32 = "0qf0ccfg77qc17iy5cndkp827s8li3qyxasmgjq224g579wcj0bl"; - sha256bin64 = "07f97m548kj7indpzyyvksa4gisndxc1s8qslk43mgsx26kz62rf"; + version = "41.0.2224.3"; + sha256 = "04lgklidxx4bryqhnm7kjqbfr12ns8ic9g4yxk3dig71081sas5f"; + sha256bin32 = "17fgh57yckk318r7r6qkc934dpq35qa6ps4x5fwscl070rzjf81k"; + sha256bin64 = "1qsvjm38cxx3inrw0hs4q9f4i9arqfj9cs57xh64wflrnh2z52zf"; }; beta = { - version = "39.0.2171.19"; - sha256 = "19j86hzh552a73mvabzgdiq0s1ypr30b6lkn4kfxc2vhs1ds8nmg"; - sha256bin32 = "06imcc3r6g4f7yi8b4mzknqk11khzk44pjrw0qnw40kgjf0kkgd3"; - sha256bin64 = "0qd594rbg049g1h4s7lgw9abcccx6wrl3fggkd1z9bl8ihj54j4b"; + version = "40.0.2214.10"; + sha256 = "0wxkxgj6z18l2qkm0k16r8bpv9rdxk1g1ias03zzvlbj1bw3brdn"; + sha256bin32 = "0wr2vg97d3qrryb5sz31sd3ycb1l17irrs79vfa04ip85jqv89zn"; + sha256bin64 = "0bclgy386vdmfdf59hwkypcs8wwmlpgl3npp089hmcdvv7dmars8"; }; stable = { - version = "38.0.2125.101"; - sha256 = "12hrl7i0xrjdwz8yaap5jhc6bzn29pk6dcz96743n6j7mcckac6k"; - sha256bin32 = "1c35j4wx53njcqbdqznz2m0791bb9lpmhnpkrll36051437f25wl"; - sha256bin64 = "1k8hrrxlqc1mv88v2qkyq8188lfaibvqpqg0g8qgj2ha5vsnvwvw"; + version = "39.0.2171.65"; + sha256 = "0lglcjvyhgmdm0sd76wv509pgwcfl86rlp9rj83z9giadwqlcmxi"; + sha256bin32 = "1iqzi462vw8da5f8ysk76q68xhiw5ndqc3hhc6djipsc6h240bji"; + sha256bin64 = "1gxh3sxpnl0167la9ncnz7l85gzi4ax6g5pqni1nma5g5cqqm177"; }; } From c2740b5017dcf0f1a3be7975bdb035c77d3730bc Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Fri, 21 Nov 2014 21:00:14 -0600 Subject: [PATCH 206/383] network-manager: patch for libnl-3.2.25 --- .../networking/network-manager/default.nix | 1 + .../network-manager/libnl-3.2.25.patch | 61 +++++++++++++++++++ 2 files changed, 62 insertions(+) create mode 100644 pkgs/tools/networking/network-manager/libnl-3.2.25.patch diff --git a/pkgs/tools/networking/network-manager/default.nix b/pkgs/tools/networking/network-manager/default.nix index 20102aedeb9..ea14183ba3c 100644 --- a/pkgs/tools/networking/network-manager/default.nix +++ b/pkgs/tools/networking/network-manager/default.nix @@ -49,6 +49,7 @@ stdenv.mkDerivation rec { inherit avahi dnsmasq ppp bind; glibc = stdenv.gcc.libc; }) + ./libnl-3.2.25.patch ]; preInstall = diff --git a/pkgs/tools/networking/network-manager/libnl-3.2.25.patch b/pkgs/tools/networking/network-manager/libnl-3.2.25.patch new file mode 100644 index 00000000000..17c2966b706 --- /dev/null +++ b/pkgs/tools/networking/network-manager/libnl-3.2.25.patch @@ -0,0 +1,61 @@ +diff --git a/src/nm-netlink-monitor.c b/src/nm-netlink-monitor.c +index ba8053e..5ac39d3 100644 +--- a/src/nm-netlink-monitor.c ++++ b/src/nm-netlink-monitor.c +@@ -177,40 +177,15 @@ link_msg_handler (struct nl_object *obj, void *arg) + static int + event_msg_recv (struct nl_msg *msg, void *arg) + { +- struct nl_sock *nlh = arg; +- struct nlmsghdr *hdr = nlmsg_hdr (msg); + struct ucred *creds = nlmsg_get_creds (msg); +- const struct sockaddr_nl *snl; +- guint32 local_port; +- gboolean accept_msg = FALSE; +- +- /* Only messages sent from the kernel */ +- if (!creds || creds->uid != 0) { +- nm_log_dbg (LOGD_HW, "ignoring netlink message from UID %d", +- creds ? creds->uid : -1); +- return NL_SKIP; +- } +- +- snl = nlmsg_get_src (msg); +- g_assert (snl); +- +- /* Accept any messages from the kernel */ +- if (hdr->nlmsg_pid == 0 || snl->nl_pid == 0) +- accept_msg = TRUE; + +- /* And any multicast message directed to our netlink PID, since multicast +- * currently requires CAP_ADMIN to use. +- */ +- local_port = nl_socket_get_local_port (nlh); +- if ((hdr->nlmsg_pid == local_port) && snl->nl_groups) +- accept_msg = TRUE; +- +- if (accept_msg == FALSE) { +- nm_log_dbg (LOGD_HW, "ignoring netlink message from PID %d (local PID %d, multicast %d)", +- hdr->nlmsg_pid, +- local_port, +- (hdr->nlmsg_flags & NLM_F_MULTI)); +- return NL_SKIP; ++ if (!creds || creds->pid || creds->uid || creds->gid) { ++ if (creds) ++ nm_log_dbg (LOGD_HW, "netlink: received non-kernel message (pid %d uid %d gid %d)", ++ creds->pid, creds->uid, creds->gid); ++ else ++ nm_log_dbg (LOGD_HW, "netlink: received message without credentials"); ++ return NL_STOP; + } + + return NL_OK; +@@ -285,7 +260,7 @@ nlh_setup (struct nl_sock *nlh, + { + int err; + +- nl_socket_modify_cb (nlh, NL_CB_MSG_IN, NL_CB_CUSTOM, event_msg_recv, cb_data); ++ nl_socket_modify_cb (nlh, NL_CB_MSG_IN, NL_CB_CUSTOM, event_msg_recv, NULL); + + if (valid_func) + nl_socket_modify_cb (nlh, NL_CB_VALID, NL_CB_CUSTOM, valid_func, cb_data); From 1b84fbf0cacaa3999979602919c3ee8df7ae9c6d Mon Sep 17 00:00:00 2001 From: aszlig Date: Thu, 20 Nov 2014 16:46:09 +0100 Subject: [PATCH 207/383] chromium: Allow env vars for passing plugin paths. Introduces environment variables to set plugin base paths. The schema for these is like NIX_CHROMIUM_PLUGIN_PATH_. Where is the path type we want to change, the supported (full) variable names are: * NIX_CHROMIUM_PLUGIN_PATH_ALL * NIX_CHROMIUM_PLUGIN_PATH_PEPPERFLASH * NIX_CHROMIUM_PLUGIN_PATH_FILEFLASH * NIX_CHROMIUM_PLUGIN_PATH_PDF * NIX_CHROMIUM_PLUGIN_PATH_FILE_EFFECTS * NIX_CHROMIUM_PLUGIN_PATH_NACL * NIX_CHROMIUM_PLUGIN_PATH_PNACL * NIX_CHROMIUM_PLUGIN_PATH_WIDEVINE Whereas NIX_CHROMIUM_PLUGIN_PATH_ALL is the plugin base path for every path which is not set explicitly, so by setting ..._ALL and not setting ..._WIDEVINE, the widevine plugin will be searched in the directory specified using ..._ALL. Right now, the only plugin where this is used is widevine, and it still doesn't properly work yet. Signed-off-by: aszlig --- .../networking/browsers/chromium/default.nix | 1 + .../networking/browsers/chromium/plugins.nix | 10 +- .../browsers/chromium/source/default.nix | 2 +- .../chromium/source/nix_plugin_paths.patch | 99 +++++++++++++++++++ 4 files changed, 109 insertions(+), 3 deletions(-) create mode 100644 pkgs/applications/networking/browsers/chromium/source/nix_plugin_paths.patch diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index 14881d11601..82637095c43 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -74,6 +74,7 @@ in stdenv.mkDerivation { ln -s "${chromium.browser}/share" "$out/share" makeWrapper "${browserBinary}" "$out/bin/chromium" \ --set CHROMIUM_SANDBOX_BINARY_PATH "${sandboxBinary}" \ + --run "export ${chromium.plugins.envVarsEnabled}" \ --add-flags "${chromium.plugins.flagsEnabled}" ln -s "$out/bin/chromium" "$out/bin/chromium-browser" diff --git a/pkgs/applications/networking/browsers/chromium/plugins.nix b/pkgs/applications/networking/browsers/chromium/plugins.nix index 5bd41158632..d4a655a88d9 100644 --- a/pkgs/applications/networking/browsers/chromium/plugins.nix +++ b/pkgs/applications/networking/browsers/chromium/plugins.nix @@ -88,13 +88,19 @@ let mkdir -p "$widevine/nix-support" echo "--register-pepper-plugins='${wvModule}${wvInfo}'" \ > "$widevine/nix-support/chromium-flags" + echo "NIX_CHROMIUM_PLUGIN_PATH_WIDEVINE=$widevine/lib" \ + > "$widevine/nix-support/chromium-env-vars" ''; - passthru.flagsEnabled = let + passthru = let enabledPlugins = optional enablePepperFlash plugins.flash ++ optional enablePepperPDF plugins.pdf ++ optional enableWideVine plugins.widevine; getFlags = plugin: "$(< ${plugin}/nix-support/chromium-flags)"; - in concatStringsSep " " (map getFlags enabledPlugins); + getEnvVars = plugin: "$(< ${plugin}/nix-support/chromium-env-vars)"; + in { + flagsEnabled = concatStringsSep " " (map getFlags enabledPlugins); + envVarsEnabled = concatStringsSep " " (map getEnvVars enabledPlugins); + }; }; in plugins diff --git a/pkgs/applications/networking/browsers/chromium/source/default.nix b/pkgs/applications/networking/browsers/chromium/source/default.nix index ef442004d7e..adac4baa29c 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 = [ ./sandbox_userns_36.patch ]; + patches = [ ./sandbox_userns_36.patch ./nix_plugin_paths.patch ]; postPatch = '' sed -i -r \ diff --git a/pkgs/applications/networking/browsers/chromium/source/nix_plugin_paths.patch b/pkgs/applications/networking/browsers/chromium/source/nix_plugin_paths.patch new file mode 100644 index 00000000000..0220d042941 --- /dev/null +++ b/pkgs/applications/networking/browsers/chromium/source/nix_plugin_paths.patch @@ -0,0 +1,99 @@ +diff --git a/chrome/common/chrome_paths.cc b/chrome/common/chrome_paths.cc +index 8a205a6..d5c24e1 100644 +--- a/chrome/common/chrome_paths.cc ++++ b/chrome/common/chrome_paths.cc +@@ -97,21 +97,14 @@ static base::LazyInstance + g_invalid_specified_user_data_dir = LAZY_INSTANCE_INITIALIZER; + + // Gets the path for internal plugins. +-bool GetInternalPluginsDirectory(base::FilePath* result) { +-#if defined(OS_MACOSX) && !defined(OS_IOS) +- // If called from Chrome, get internal plugins from a subdirectory of the +- // framework. +- if (base::mac::AmIBundled()) { +- *result = chrome::GetFrameworkBundlePath(); +- DCHECK(!result->empty()); +- *result = result->Append("Internet Plug-Ins"); +- return true; +- } +- // In tests, just look in the module directory (below). +-#endif +- +- // The rest of the world expects plugins in the module directory. +- return PathService::Get(base::DIR_MODULE, result); ++bool GetInternalPluginsDirectory(base::FilePath* result, ++ const std::string& ident) { ++ std::string full_env = std::string("NIX_CHROMIUM_PLUGIN_PATH_") + ident; ++ const char* value = getenv(full_env.c_str()); ++ if (value == NULL) ++ return PathService::Get(base::DIR_MODULE, result); ++ else ++ *result = base::FilePath(value); + } + + } // namespace +@@ -248,11 +241,11 @@ bool PathProvider(int key, base::FilePath* result) { + create_dir = true; + break; + case chrome::DIR_INTERNAL_PLUGINS: +- if (!GetInternalPluginsDirectory(&cur)) ++ if (!GetInternalPluginsDirectory(&cur, "ALL")) + return false; + break; + case chrome::DIR_PEPPER_FLASH_PLUGIN: +- if (!GetInternalPluginsDirectory(&cur)) ++ if (!GetInternalPluginsDirectory(&cur, "PEPPERFLASH")) + return false; + cur = cur.Append(kPepperFlashBaseDirectory); + break; +@@ -285,7 +278,7 @@ bool PathProvider(int key, base::FilePath* result) { + cur = cur.Append(FILE_PATH_LITERAL("script.log")); + break; + case chrome::FILE_FLASH_PLUGIN: +- if (!GetInternalPluginsDirectory(&cur)) ++ if (!GetInternalPluginsDirectory(&cur, "FILEFLASH")) + return false; + cur = cur.Append(kInternalFlashPluginFileName); + break; +@@ -295,12 +288,12 @@ bool PathProvider(int key, base::FilePath* result) { + cur = cur.Append(chrome::kPepperFlashPluginFilename); + break; + case chrome::FILE_PDF_PLUGIN: +- if (!GetInternalPluginsDirectory(&cur)) ++ if (!GetInternalPluginsDirectory(&cur, "PDF")) + return false; + cur = cur.Append(kInternalPDFPluginFileName); + break; + case chrome::FILE_EFFECTS_PLUGIN: +- if (!GetInternalPluginsDirectory(&cur)) ++ if (!GetInternalPluginsDirectory(&cur, "FILE_EFFECTS")) + return false; + cur = cur.Append(kEffectsPluginFileName); + break; +@@ -308,7 +301,7 @@ bool PathProvider(int key, base::FilePath* result) { + // We currently need a path here to look up whether the plugin is disabled + // and what its permissions are. + case chrome::FILE_NACL_PLUGIN: +- if (!GetInternalPluginsDirectory(&cur)) ++ if (!GetInternalPluginsDirectory(&cur, "NACL")) + return false; + cur = cur.Append(kInternalNaClPluginFileName); + break; +@@ -343,7 +336,7 @@ bool PathProvider(int key, base::FilePath* result) { + cur = cur.DirName(); + } + #else +- if (!GetInternalPluginsDirectory(&cur)) ++ if (!GetInternalPluginsDirectory(&cur, "PNACL")) + return false; + #endif + cur = cur.Append(FILE_PATH_LITERAL("pnacl")); +@@ -372,7 +365,7 @@ bool PathProvider(int key, base::FilePath* result) { + // In the component case, this is the source adapter. Otherwise, it is the + // actual Pepper module that gets loaded. + case chrome::FILE_WIDEVINE_CDM_ADAPTER: +- if (!GetInternalPluginsDirectory(&cur)) ++ if (!GetInternalPluginsDirectory(&cur, "WIDEVINE")) + return false; + cur = cur.AppendASCII(kWidevineCdmAdapterFileName); + break; From 45c4d68960d8014e174cf331af0df061f10d707a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Edward=20Tj=C3=B6rnhammar?= Date: Wed, 15 Oct 2014 08:54:00 +0200 Subject: [PATCH 208/383] cups: bump 1.5.4 -> 1.7.5 --- pkgs/misc/cups/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/cups/default.nix b/pkgs/misc/cups/default.nix index c332dc02154..0f99902badb 100644 --- a/pkgs/misc/cups/default.nix +++ b/pkgs/misc/cups/default.nix @@ -1,7 +1,7 @@ { stdenv, fetchurl, pkgconfig, zlib, libjpeg, libpng, libtiff, pam, openssl , dbus, libusb, acl }: -let version = "1.5.4"; in +let version = "1.7.5"; in stdenv.mkDerivation { name = "cups-${version}"; @@ -10,7 +10,7 @@ stdenv.mkDerivation { src = fetchurl { url = "https://www.cups.org/software/${version}/cups-${version}-source.tar.bz2"; - sha256 = "1rfhlv9b37120d6shngvyrcp99vh4a3lwdkrfanv3sjqid7068w0"; + sha256 = "00mx4rpiqw9cwx46bd3hd5lcgmcxy63zfnmkr02smanv8xl4rjqq"; }; buildInputs = [ pkgconfig zlib libjpeg libpng libtiff libusb ] From 7eb4d3a3a9c65ec18eb1f5c8ad5872359ad51887 Mon Sep 17 00:00:00 2001 From: aszlig Date: Fri, 21 Nov 2014 16:34:05 +0100 Subject: [PATCH 209/383] chromium: Switch to use open-source PDF plugin. The Chromium PDF plugin is now available as open source software and is already included in the Chromium source tree in current stable, so there is no need to extract it from the Chrome binary package anymore. See release announcement at http://blog.foxitsoftware.com/?p=641 Signed-off-by: aszlig --- .../networking/browsers/chromium/browser.nix | 2 +- .../networking/browsers/chromium/default.nix | 3 +-- .../networking/browsers/chromium/plugins.nix | 20 ++----------------- pkgs/top-level/all-packages.nix | 1 - 4 files changed, 4 insertions(+), 22 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/browser.nix b/pkgs/applications/networking/browsers/chromium/browser.nix index daab75c74ff..902a22840c3 100644 --- a/pkgs/applications/networking/browsers/chromium/browser.nix +++ b/pkgs/applications/networking/browsers/chromium/browser.nix @@ -12,7 +12,7 @@ mkChromiumDerivation (base: rec { cp -v "$buildPath/"*.pak "$libExecPath/" cp -v "$buildPath/icudtl.dat" "$libExecPath/" cp -vLR "$buildPath/locales" "$buildPath/resources" "$libExecPath/" - cp -v $buildPath/libffmpegsumo.so "$libExecPath/" + cp -v "$buildPath/libpdf.so" "$buildPath/libffmpegsumo.so" "$libExecPath/" cp -v "$buildPath/chrome" "$libExecPath/$packageName" diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index 82637095c43..f122e753b5c 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -9,7 +9,6 @@ , gnomeKeyringSupport ? false , proprietaryCodecs ? true , enablePepperFlash ? false -, enablePepperPDF ? false , enableWideVine ? false , cupsSupport ? false , pulseSupport ? false @@ -36,7 +35,7 @@ let sandbox = callPackage ./sandbox.nix { }; plugins = callPackage ./plugins.nix { - inherit enablePepperFlash enablePepperPDF enableWideVine; + inherit enablePepperFlash enableWideVine; }; }; diff --git a/pkgs/applications/networking/browsers/chromium/plugins.nix b/pkgs/applications/networking/browsers/chromium/plugins.nix index d4a655a88d9..8098ec74722 100644 --- a/pkgs/applications/networking/browsers/chromium/plugins.nix +++ b/pkgs/applications/networking/browsers/chromium/plugins.nix @@ -1,6 +1,5 @@ { stdenv , enablePepperFlash ? false -, enablePepperPDF ? false , enableWideVine ? false , source @@ -16,7 +15,7 @@ let src = source.plugins; phases = [ "unpackPhase" "patchPhase" "installPhase" "checkPhase" ]; - outputs = [ "pdf" "flash" "widevine" ]; + outputs = [ "flash" "widevine" ]; unpackCmd = let chan = if source.channel == "dev" then "chrome-unstable" @@ -26,7 +25,6 @@ let mkdir -p plugins ar p "$src" data.tar.lzma | tar xJ -C plugins --strip-components=4 \ ./opt/google/${chan}/PepperFlash \ - ./opt/google/${chan}/libpdf.so \ ./opt/google/${chan}/libwidevinecdm.so \ ./opt/google/${chan}/libwidevinecdmadapter.so ''; @@ -40,7 +38,7 @@ let rpaths = [ stdenv.gcc.gcc ]; mkrpath = p: "${makeSearchPath "lib64" p}:${makeSearchPath "lib" p}"; in '' - for sofile in PepperFlash/libpepflashplayer.so libpdf.so \ + for sofile in PepperFlash/libpepflashplayer.so \ libwidevinecdm.so libwidevinecdmadapter.so; do chmod +x "$sofile" patchelf --set-rpath "${mkrpath rpaths}" "$sofile" @@ -51,25 +49,12 @@ let ''; installPhase = let - pdfName = "Chrome PDF Viewer"; - pdfDescription = "Portable Document Format"; - pdfMimeTypes = concatStringsSep ";" [ - "application/pdf" - "application/x-google-chrome-print-preview-pdf" - ]; - pdfInfo = "#${pdfName}#${pdfDescription};${pdfMimeTypes}"; - wvName = "Widevine Content Decryption Module"; wvDescription = "Playback of encrypted HTML audio/video content"; wvMimeTypes = "application/x-ppapi-widevine-cdm"; wvModule = "$widevine/lib/libwidevinecdmadapter.so"; wvInfo = "#${wvName}#${wvDescription}:${wvMimeTypes}"; in '' - install -vD libpdf.so "$pdf/lib/libpdf.so" - mkdir -p "$pdf/nix-support" - echo "--register-pepper-plugins='$pdf/lib/libpdf.so${pdfInfo}'" \ - > "$pdf/nix-support/chromium-flags" - flashVersion="$( sed -n -r 's/.*"version": "([^"]+)",.*/\1/p' PepperFlash/manifest.json )" @@ -94,7 +79,6 @@ let passthru = let enabledPlugins = optional enablePepperFlash plugins.flash - ++ optional enablePepperPDF plugins.pdf ++ optional enableWideVine plugins.widevine; getFlags = plugin: "$(< ${plugin}/nix-support/chromium-flags)"; getEnvVars = plugin: "$(< ${plugin}/nix-support/chromium-env-vars)"; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index d330e4b942d..d1578c5683a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9120,7 +9120,6 @@ let channel = "stable"; pulseSupport = config.pulseaudio or true; enablePepperFlash = config.chromium.enablePepperFlash or false; - enablePepperPDF = config.chromium.enablePepperPDF or false; hiDPISupport = config.chromium.hiDPISupport or false; }; From aebbc5db0182bb123d4a945893a2f3d2594f8af3 Mon Sep 17 00:00:00 2001 From: aszlig Date: Sat, 22 Nov 2014 05:02:08 +0100 Subject: [PATCH 210/383] tomahawk: Propagate phonon_backend_vlc. Otherwise it won't work outside of KDE. Signed-off-by: aszlig --- pkgs/applications/audio/tomahawk/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/tomahawk/default.nix b/pkgs/applications/audio/tomahawk/default.nix index 228940cb192..fec93f0183d 100644 --- a/pkgs/applications/audio/tomahawk/default.nix +++ b/pkgs/applications/audio/tomahawk/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, cmake, pkgconfig, attica, boost, gnutls, libechonest -, liblastfm, lucenepp, phonon, qca2, qjson, qt4, qtkeychain, quazip, sparsehash -, taglib, websocketpp +, liblastfm, lucenepp, phonon, phonon_backend_vlc, qca2, qjson, qt4, qtkeychain +, quazip, sparsehash, taglib, websocketpp , enableXMPP ? true, libjreen ? null , enableKDE ? false, kdelibs ? null @@ -34,6 +34,8 @@ in stdenv.mkDerivation rec { ++ stdenv.lib.optional enableKDE kdelibs ++ stdenv.lib.optional enableTelepathy telepathy_qt; + propagatedBuildInputs = [ phonon_backend_vlc ]; + enableParallelBuilding = true; meta = with stdenv.lib; { From a8bce0cf73f314471599092a7cb2bd93efcfc642 Mon Sep 17 00:00:00 2001 From: Longrin Wischnewski Date: Sat, 22 Nov 2014 09:50:41 +0100 Subject: [PATCH 211/383] clamav: bump 0.98.4 to 0.98.5 --- pkgs/tools/security/clamav/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/clamav/default.nix b/pkgs/tools/security/clamav/default.nix index 6cbc82b2695..1a76008f889 100644 --- a/pkgs/tools/security/clamav/default.nix +++ b/pkgs/tools/security/clamav/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, zlib, bzip2, libiconvOrNull, libxml2, openssl, ncurses, curl }: stdenv.mkDerivation rec { name = "clamav-${version}"; - version = "0.98.4"; + version = "0.98.5"; src = fetchurl { url = "mirror://sourceforge/clamav/clamav-${version}.tar.gz"; - sha256 = "071yzamalj3rf7kl2jvc35ipnk1imdkq5ylbb8whyxfgmd3nf06k"; + sha256 = "0kdaimnbbb0hymg7d15a3iwk17r8555nyzr3d1j96cwhzbakfbww"; }; buildInputs = [ zlib bzip2 libxml2 openssl ncurses curl ] From 73dc767aa0a1d4bf098fccd3a8f00024ab672912 Mon Sep 17 00:00:00 2001 From: Jaka Hudoklin Date: Fri, 21 Nov 2014 17:20:14 +0100 Subject: [PATCH 212/383] nixos: add docker-registry module --- nixos/modules/misc/ids.nix | 1 + nixos/modules/module-list.nix | 1 + .../modules/services/misc/docker-registry.nix | 82 +++++++++++++++++++ nixos/release.nix | 1 + nixos/tests/docker-registry.nix | 40 +++++++++ 5 files changed, 125 insertions(+) create mode 100644 nixos/modules/services/misc/docker-registry.nix create mode 100644 nixos/tests/docker-registry.nix diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix index 166bb931a62..10f227b15a5 100644 --- a/nixos/modules/misc/ids.nix +++ b/nixos/modules/misc/ids.nix @@ -164,6 +164,7 @@ systemd-timesync = 154; liquidsoap = 155; etcd = 156; + docker-registry = 157; # 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 0f09ee24027..4097224bc1d 100755 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -166,6 +166,7 @@ ./services/misc/cgminer.nix ./services/misc/dictd.nix ./services/misc/disnix.nix + ./services/misc/docker-registry.nix ./services/misc/etcd.nix ./services/misc/felix.nix ./services/misc/folding-at-home.nix diff --git a/nixos/modules/services/misc/docker-registry.nix b/nixos/modules/services/misc/docker-registry.nix new file mode 100644 index 00000000000..67580a1c627 --- /dev/null +++ b/nixos/modules/services/misc/docker-registry.nix @@ -0,0 +1,82 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.dockerRegistry; + +in { + ###### interface + + options.services.dockerRegistry = { + enable = mkOption { + description = "Whether to enable docker registry server."; + default = false; + type = types.bool; + }; + + host = mkOption { + description = "Docker registry host or ip to bind to."; + default = "127.0.0.1"; + type = types.str; + }; + + port = mkOption { + description = "Docker registry port to bind to."; + default = 5000; + type = types.int; + }; + + storagePath = mkOption { + type = types.path; + default = "/var/lib/docker/registry"; + description = "Docker registry strorage path."; + }; + + extraConfig = mkOption { + description = '' + Docker extra registry configuration. See + + ''; + default = {}; + type = types.attrsOf types.str; + }; + }; + + config = mkIf cfg.enable { + systemd.services.docker-registry = { + description = "Docker Container Registry"; + wantedBy = [ "multi-user.target" ]; + after = [ "network.target" ]; + + environment = { + REGISTRY_HOST = cfg.host; + REGISTRY_PORT = toString cfg.port; + GUNICORN_OPTS = "[--preload]"; # see https://github.com/docker/docker-registry#sqlalchemy + STORAGE_PATH = cfg.storagePath; + } // cfg.extraConfig; + + serviceConfig = { + ExecStart = "${pkgs.pythonPackages.docker_registry}/bin/docker-registry"; + User = "docker-registry"; + Group = "docker"; + PermissionsStartOnly = true; + }; + + preStart = '' + mkdir -p ${cfg.storagePath} + if [ "$(id -u)" = 0 ]; then + chown -R docker-registry:docker ${cfg.storagePath} + fi + ''; + postStart = '' + until ${pkgs.curl}/bin/curl -s -o /dev/null 'http://${cfg.host}:${toString cfg.port}/'; do + sleep 1; + done + ''; + }; + + users.extraGroups.docker.gid = mkDefault config.ids.gids.docker; + users.extraUsers.docker-registry.uid = config.ids.uids.docker-registry; + }; +} diff --git a/nixos/release.nix b/nixos/release.nix index 890d8d483d7..5c08b26c3cf 100644 --- a/nixos/release.nix +++ b/nixos/release.nix @@ -239,6 +239,7 @@ in rec { tests.chromium = callTest tests/chromium.nix {}; tests.cjdns = callTest tests/cjdns.nix {}; tests.containers = callTest tests/containers.nix {}; + tests.dockerRegistry = callTest tests/docker-registry.nix {}; tests.etcd = callTest tests/etcd.nix {}; tests.firefox = callTest tests/firefox.nix {}; tests.firewall = callTest tests/firewall.nix {}; diff --git a/nixos/tests/docker-registry.nix b/nixos/tests/docker-registry.nix new file mode 100644 index 00000000000..cc3c4774680 --- /dev/null +++ b/nixos/tests/docker-registry.nix @@ -0,0 +1,40 @@ +# This test runs docker-registry and check if it works + +import ./make-test.nix { + name = "docker-registry"; + + nodes = { + registry = { config, pkgs, ... }: { + services.dockerRegistry.enable = true; + services.dockerRegistry.port = 8080; + services.dockerRegistry.host = "0.0.0.0"; + networking.firewall.allowedTCPPorts = [ 8080 ]; + }; + + client1 = { config, pkgs, ...}: { + virtualisation.docker.enable = true; + virtualisation.docker.extraOptions = "--insecure-registry registry:8080"; + }; + + client2 = { config, pkgs, ...}: { + virtualisation.docker.enable = true; + virtualisation.docker.extraOptions = "--insecure-registry registry:8080"; + }; + }; + + testScript = '' + $client1->start(); + $client1->waitForUnit("docker.service"); + $client1->succeed("tar cv --files-from /dev/null | docker import - scratch"); + $client1->succeed("docker tag scratch registry:8080/scratch"); + + $registry->start(); + $registry->waitForUnit("docker-registry.service"); + $client1->succeed("docker push registry:8080/scratch"); + + $client2->start(); + $client2->waitForUnit("docker.service"); + $client2->succeed("docker pull registry:8080/scratch"); + $client2->succeed("docker images | grep scratch"); + ''; +} From d4bd9779dca8ffa5be89077dbcff18a1f0d5a920 Mon Sep 17 00:00:00 2001 From: Henry Till Date: Sat, 22 Nov 2014 09:30:30 -0500 Subject: [PATCH 213/383] mr: update to 1.20141024 --- .../version-management/mr/default.nix | 55 +++++-------------- 1 file changed, 15 insertions(+), 40 deletions(-) diff --git a/pkgs/applications/version-management/mr/default.nix b/pkgs/applications/version-management/mr/default.nix index 29fafc4db74..d52802e42f1 100644 --- a/pkgs/applications/version-management/mr/default.nix +++ b/pkgs/applications/version-management/mr/default.nix @@ -1,56 +1,31 @@ { stdenv, fetchurl, perl }: stdenv.mkDerivation rec { - - version = "1.13"; - name = "mr-" + version; + version = "1.20141024"; + name = "mr-${version}"; src = fetchurl { - url = "http://ftp.de.debian.org/debian/pool/main/m/mr/mr_${version}.tar.gz"; - sha256 = "1q3qxk8dwbv30v2xxh852wnwl1msgkvk5cgxyicpqj8kh5b96zlz"; + url = "https://github.com/joeyh/myrepos/archive/${version}.tar.gz"; + sha256 = "7b68183476867d15d6f111fc9678335b94824dcfa09f07c761a72d64cdf5ad4a"; }; - buildInputs = [perl]; + buildInputs = [ perl ]; - buildPhase = '' - make build - ''; - - installPhase = '' - mkdir -pv $out/bin $out/share/man/man1 $out/share/mr - cp -v mr $out/bin - cp -v webcheckout $out/bin - cp -v mr.1 $out/share/man/man1 - cp -v webcheckout.1 $out/share/man/man1 - cp -v lib/* $out/share/mr - ''; + makeFlags = "PREFIX=$(out)"; meta = { description = "Multiple Repository management tool"; - longDescription = ''The mr(1) command can checkout, update, or perform other actions on a - set of repositories as if they were one combined respository. It - supports any combination of subversion, git, cvs, mercurial, bzr, - darcs, cvs, vcsh, fossil and veracity repositories, and support for - other revision control systems can easily be added. (There are - extensions adding support for unison and git-svn.) - - It is extremely configurable via simple shell scripting. Some examples - of things it can do include: - - - Update a repository no more frequently than once every twelve - hours. - - Run an arbitrary command before committing to a - repository. - - When updating a git repository, pull from two - different upstreams and merge the two together. - - Run several repository updates in parallel, greatly speeding - up the update process. - - Remember actions that failed due to a laptop being - offline, so they can be retried when it comes back online. + longDescription = '' + mr is a tool to manage all your version control repos. It can + checkout, update, or perform other actions on a set of + repositories as if they were one combined repository. It + supports any combination of subversion, git, cvs, mercurial, + bzr, darcs, fossil and veracity repositories, and support for + other version control systems can easily be added. ''; - homepage = http://joeyh.name/code/mr/; + homepage = http://myrepos.branchable.com/; license = stdenv.lib.licenses.gpl2Plus; platforms = stdenv.lib.platforms.unix; - maintainers = [ stdenv.lib.maintainers.antono ]; + maintainers = with stdenv.lib.maintainers; [ antono henrytill ]; }; } From 119d93e22396f337fb3c74a68db2f2ce3ba81977 Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Fri, 21 Nov 2014 15:42:11 +0100 Subject: [PATCH 214/383] dnscrypt-proxy: minor superficial improvements - Use upstream description and explicitly set platforms = all - Coding conventions fix --- .../services/networking/dnscrypt-proxy.nix | 15 ++++++++------- pkgs/tools/networking/dnscrypt-proxy/default.nix | 3 ++- 2 files changed, 10 insertions(+), 8 deletions(-) diff --git a/nixos/modules/services/networking/dnscrypt-proxy.nix b/nixos/modules/services/networking/dnscrypt-proxy.nix index d847e10a936..26549bfe6f1 100644 --- a/nixos/modules/services/networking/dnscrypt-proxy.nix +++ b/nixos/modules/services/networking/dnscrypt-proxy.nix @@ -6,13 +6,14 @@ let dnscrypt-proxy = pkgs.dnscrypt-proxy; cfg = config.services.dnscrypt-proxy; uid = config.ids.uids.dnscrypt-proxy; - daemonArgs = [ "--daemonize" - "--user=dnscrypt-proxy" - "--local-address=${cfg.localAddress}:${toString cfg.port}" - (optionalString cfg.tcpOnly "--tcp-only") - "--resolvers-list=${dnscrypt-proxy}/share/dnscrypt-proxy/dnscrypt-resolvers.csv" - "--resolver-name=${cfg.resolverName}" - ]; + daemonArgs = + [ "--daemonize" + "--user=dnscrypt-proxy" + "--local-address=${cfg.localAddress}:${toString cfg.port}" + (optionalString cfg.tcpOnly "--tcp-only") + "--resolvers-list=${dnscrypt-proxy}/share/dnscrypt-proxy/dnscrypt-resolvers.csv" + "--resolver-name=${cfg.resolverName}" + ]; in { diff --git a/pkgs/tools/networking/dnscrypt-proxy/default.nix b/pkgs/tools/networking/dnscrypt-proxy/default.nix index d0205be35b9..50c8dae902c 100644 --- a/pkgs/tools/networking/dnscrypt-proxy/default.nix +++ b/pkgs/tools/networking/dnscrypt-proxy/default.nix @@ -11,9 +11,10 @@ stdenv.mkDerivation rec { buildInputs = [ libsodium ]; meta = { - description = "A DNS proxy which encrypts and authenticates requests using the DNSCrypt protocol."; + description = "A tool for securing communications between a client and a DNS resolver"; homepage = http://dnscrypt.org/; license = with stdenv.lib.licenses; [ isc ]; maintainers = with stdenv.lib.maintainers; [ joachifm ]; + platform = stdenv.lib.platforms.all; }; } From 4fdb98f54072768d06c8a2b35563f8c03582cce3 Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Wed, 19 Nov 2014 04:12:02 +0100 Subject: [PATCH 215/383] macchanger: new expression GNU macchanger is a tool for viewing/changing the MAC address of a network device, with support for address randomisation. --- pkgs/os-specific/linux/macchanger/default.nix | 22 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 24 insertions(+) create mode 100644 pkgs/os-specific/linux/macchanger/default.nix diff --git a/pkgs/os-specific/linux/macchanger/default.nix b/pkgs/os-specific/linux/macchanger/default.nix new file mode 100644 index 00000000000..1bbad958bfd --- /dev/null +++ b/pkgs/os-specific/linux/macchanger/default.nix @@ -0,0 +1,22 @@ +{ stdenv, fetchurl }: + +let + pname = "macchanger"; + version = "1.6.0"; +in + +stdenv.mkDerivation rec { + name = "${pname}-${version}"; + src = fetchurl { + url = "mirror://gnu/${pname}/${name}.tar.gz"; + sha256 = "31534f138f1d21fa247be74ba6bef3fbfa47bbcd5033e99bd10c432fe58e51f7"; + }; + + meta = { + description = "A utility for viewing/manipulating the MAC address of network interfaces"; + maintainer = with stdenv.lib.maintainers; [ joachifm ]; + license = with stdenv.lib.licenses; gpl2Plus; + homepage = "https://www.gnu.org/software/macchanger"; + platform = with stdenv.lib.platforms; linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c96d5b255ed..517737b3a16 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1656,6 +1656,8 @@ let lzop = callPackage ../tools/compression/lzop { }; + macchanger = callPackage ../os-specific/linux/macchanger { }; + maildrop = callPackage ../tools/networking/maildrop { }; mailsend = callPackage ../tools/networking/mailsend { }; From d562934ee7eb8df8fd9c9c6c4c5527045427411f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Sat, 22 Nov 2014 21:13:13 +0100 Subject: [PATCH 216/383] nokogiri: use libiconvOrEmpty. assert libiconv is not used on linux --- pkgs/development/interpreters/ruby/patches.nix | 6 +++--- pkgs/development/libraries/libiconv/default.nix | 2 ++ 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/development/interpreters/ruby/patches.nix b/pkgs/development/interpreters/ruby/patches.nix index 438aaf7ba54..029e5cf18a5 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, libiconv }: +, pkgconfig }: let @@ -83,8 +83,8 @@ in buildInputs = [ libxml2 ]; buildFlags = [ "--with-xml2-dir=${libxml2} --with-xml2-include=${libxml2}/include/libxml2" - "--with-xslt-dir=${libxslt} --with-iconv-dir=${libiconv} --use-system-libraries" - ]; + "--with-xslt-dir=${libxslt} --use-system-libraries" + ] ++ libiconvOrEmpty; }; pry = { gemFlags = "--no-ri --no-rdoc"; }; diff --git a/pkgs/development/libraries/libiconv/default.nix b/pkgs/development/libraries/libiconv/default.nix index 76f7ed31d00..9e65e63ffdb 100644 --- a/pkgs/development/libraries/libiconv/default.nix +++ b/pkgs/development/libraries/libiconv/default.nix @@ -1,5 +1,7 @@ { fetchurl, stdenv }: +assert (!stdenv.isLinux); + stdenv.mkDerivation rec { name = "libiconv-1.14"; From f5e8b86e2909d5f11063aacee91177f4f28137f5 Mon Sep 17 00:00:00 2001 From: Jonathan Rudenberg Date: Sat, 22 Nov 2014 16:24:39 -0500 Subject: [PATCH 217/383] makemkv: Update 1.8.14 -> 1.9.0 --- pkgs/applications/video/makemkv/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/video/makemkv/default.nix b/pkgs/applications/video/makemkv/default.nix index 3513f76da4e..9f360e964af 100644 --- a/pkgs/applications/video/makemkv/default.nix +++ b/pkgs/applications/video/makemkv/default.nix @@ -4,17 +4,17 @@ stdenv.mkDerivation rec { name = "makemkv-${ver}"; - ver = "1.8.14"; + ver = "1.9.0"; builder = ./builder.sh; src_bin = fetchurl { url = "http://www.makemkv.com/download/makemkv-bin-${ver}.tar.gz"; - sha256 = "1kjxawqh6xnjcgvaqy7idg8k0g3zqrr1w5r2r3bf11pg0h1ys5l5"; + sha256 = "1rcvg7a1h59mfwsl5w0fr89m101pkqm9vgj06dl91hkgp5nh3wah"; }; src_oss = fetchurl { url = "http://www.makemkv.com/download/makemkv-oss-${ver}.tar.gz"; - sha256 = "0cq3h45yyqma0kzi594dz0gbgjf3gyjcgxkiynifz3hacrbxbnd5"; + sha256 = "0415gw2nacb57sz5m0hcaznynmznc6v8qb6028qnsqgv39d4w8f8"; }; buildInputs = [openssl qt4 mesa zlib pkgconfig libav]; @@ -22,7 +22,7 @@ stdenv.mkDerivation rec { libPath = stdenv.lib.makeLibraryPath [stdenv.gcc.gcc openssl mesa qt4 zlib ] + ":" + stdenv.gcc.gcc + "/lib64"; - meta = { + meta = with stdenv.lib; { description = "convert blu-ray and dvd to mkv"; longDescription = '' makemkv is a one-click QT application that transcodes an encrypted @@ -33,7 +33,8 @@ stdenv.mkDerivation rec { can always download the latest version from makemkv.com that will reset the expiration date. ''; - license = stdenv.lib.licenses.unfree; + license = licenses.unfree; homepage = http://makemkv.com; + maintainers = [ maintainers.titanous ]; }; } From 30578e30d8ac8aaa551205922761d0d1d4e723d2 Mon Sep 17 00:00:00 2001 From: Jonathan Rudenberg Date: Sat, 22 Nov 2014 16:44:59 -0500 Subject: [PATCH 218/383] kernel: 3.17.3 -> 3.17.4 --- pkgs/os-specific/linux/kernel/linux-3.17.nix | 4 ++-- pkgs/os-specific/linux/kernel/patches.nix | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-3.17.nix b/pkgs/os-specific/linux/kernel/linux-3.17.nix index aaa800c49e8..cc77f4409db 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.17.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.17.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, ... } @ args: import ./generic.nix (args // rec { - version = "3.17.3"; + version = "3.17.4"; # Remember to update grsecurity! extraMeta.branch = "3.17"; src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "1hkjq74ap4ll6s2fmmrbmqybfz6sqwciyrq75m1xcjnvjaim9zzi"; + sha256 = "0ayh9y58iv38h76jl2r77856af2cazzkwcdhjqmccibajjf42maa"; }; features.iwlwifi = true; diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index 4ca363341ec..580ed226df0 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -67,10 +67,10 @@ rec { }; grsecurity_unstable = grsecPatch - { kversion = "3.17.3"; - revision = "201411150027"; + { kversion = "3.17.4"; + revision = "201411220955"; branch = "test"; - sha256 = "19kfnpgx3gxcmy474vyx5hxni9axlrh9ll6q3wxx2qxmr0f2gb93"; + sha256 = "1iw5ivm97dkpigxn04qmacd43f2l0ihixq1j9f8c32hxjbqvsps2"; }; grsec_fix_path = From 9f82cc26840ef7b8cab89ac2d18b8ed69d79ea7e Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sat, 22 Nov 2014 22:50:31 +0000 Subject: [PATCH 219/383] ocaml-cil: update from 1.3.2 to 1.7.3 --- pkgs/development/libraries/cil/default.nix | 8 ------ .../development/ocaml-modules/cil/default.nix | 25 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 4 +-- 3 files changed, 27 insertions(+), 10 deletions(-) delete mode 100644 pkgs/development/libraries/cil/default.nix create mode 100644 pkgs/development/ocaml-modules/cil/default.nix diff --git a/pkgs/development/libraries/cil/default.nix b/pkgs/development/libraries/cil/default.nix deleted file mode 100644 index ecbb0c19412..00000000000 --- a/pkgs/development/libraries/cil/default.nix +++ /dev/null @@ -1,8 +0,0 @@ -{stdenv, fetchurl, ocaml, perl}: stdenv.mkDerivation { - name = "cil-1.3.2"; - src = fetchurl { - url = http://manju.cs.berkeley.edu/cil/distrib/cil-1.3.2.tar.gz; - md5 = "aba80dd700fcb1411598670cc36a9573"; - }; - buildInputs = [ocaml perl]; -} diff --git a/pkgs/development/ocaml-modules/cil/default.nix b/pkgs/development/ocaml-modules/cil/default.nix new file mode 100644 index 00000000000..43522e180b6 --- /dev/null +++ b/pkgs/development/ocaml-modules/cil/default.nix @@ -0,0 +1,25 @@ +{ stdenv, fetchurl, perl, ocaml, findlib }: +stdenv.mkDerivation { + name = "ocaml-cil-1.7.3"; + src = fetchurl { + url = mirror://sourceforge/cil/cil-1.7.3.tar.gz; + sha256 = "05739da0b0msx6kmdavr3y2bwi92jbh3szc35d7d8pdisa8g5dv9"; + }; + + buildInputs = [ perl ocaml findlib ]; + + createFindlibDestdir = true; + + preConfigure = '' + export FORCE_PERL_PREFIX=1 + ''; + prefixKey = "-prefix="; + + meta = with stdenv.lib; { + homepage = http://kerneis.github.io/cil/; + description = "A front-end for the C programming language that facilitates program analysis and transformation"; + license = licenses.bsd3; + maintainers = [ maintainers.vbgl ]; + platforms = ocaml.meta.platforms; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b1a5407050a..1701881ebaf 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3577,6 +3577,8 @@ let ocaml_cairo2 = callPackage ../development/ocaml-modules/ocaml-cairo2 { }; + cil = callPackage ../development/ocaml-modules/cil { }; + cmdliner = callPackage ../development/ocaml-modules/cmdliner { }; cppo = callPackage ../development/tools/ocaml/cppo { }; @@ -4910,8 +4912,6 @@ let chromaprint = callPackage ../development/libraries/chromaprint { }; - cil = callPackage ../development/libraries/cil { }; - cilaterm = callPackage ../development/libraries/cil-aterm { stdenv = overrideInStdenv stdenv [gnumake380]; }; From e5118655804b7cbb85f5487fa86c446068fed46e Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sun, 23 Nov 2014 02:35:04 +0300 Subject: [PATCH 220/383] Add a binary distribution of ZXing 1D/2D code library --- pkgs/tools/graphics/zxing/default.nix | 34 +++++++++++++++++++ pkgs/tools/graphics/zxing/java-zxing.sh | 3 ++ .../graphics/zxing/zxing-cmdline-encoder.sh | 3 ++ .../graphics/zxing/zxing-cmdline-runner.sh | 3 ++ pkgs/tools/graphics/zxing/zxing.sh | 11 ++++++ pkgs/top-level/all-packages.nix | 2 ++ 6 files changed, 56 insertions(+) create mode 100644 pkgs/tools/graphics/zxing/default.nix create mode 100644 pkgs/tools/graphics/zxing/java-zxing.sh create mode 100644 pkgs/tools/graphics/zxing/zxing-cmdline-encoder.sh create mode 100644 pkgs/tools/graphics/zxing/zxing-cmdline-runner.sh create mode 100644 pkgs/tools/graphics/zxing/zxing.sh diff --git a/pkgs/tools/graphics/zxing/default.nix b/pkgs/tools/graphics/zxing/default.nix new file mode 100644 index 00000000000..6834150f477 --- /dev/null +++ b/pkgs/tools/graphics/zxing/default.nix @@ -0,0 +1,34 @@ +{stdenv, fetchurl, openjre, jre ? openjre}: +stdenv.mkDerivation rec { + name = "zxing-${version}"; + version = "3.1.0"; + # Maven builds are hard to get right + core_jar = fetchurl { + url = "http://repo1.maven.org/maven2/com/google/zxing/core/${version}/core-${version}.jar"; + sha256 = "199l4xvlcpafqn69r3k9qjpqkw9lvkl02hzpm0ackvdhl7vk42zh"; + }; + javase_jar = fetchurl { + url = "http://repo1.maven.org/maven2/com/google/zxing/javase/${version}/javase-${version}.jar"; + sha256 = "0fzxvvf5dqyrs5m9rqw4ffm9h1s27bi7q3jb1dam34s80q2rp2zq"; + }; + inherit jre; + unpackPhase = ''true''; + installPhase = '' + mkdir -p "$out/lib/java" "$out/bin" + cp "${core_jar}" "${javase_jar}" "$out/lib/java" + substituteAll "${./java-zxing.sh}" "$out/bin/java-zxing" + substituteAll "${./zxing-cmdline-runner.sh}" "$out/bin/zxing-cmdline-runner" + substituteAll "${./zxing-cmdline-encoder.sh}" "$out/bin/zxing-cmdline-encoder" + substituteAll "${./zxing.sh}" "$out/bin/zxing" + chmod a+x "$out/bin"/* + cd "$out/lib/java"; for i in *.jar; do mv "$i" "''${i#*-}"; done + ''; + meta = { + inherit version; + description = ''1D and 2D code reading library''; + license = stdenv.lib.licenses.asl20; + maintainers = [stdenv.lib.maintainers.raskin]; + platforms = stdenv.lib.platforms.linux; + homepage = "https://github.com/zxing/zxing"; + }; +} diff --git a/pkgs/tools/graphics/zxing/java-zxing.sh b/pkgs/tools/graphics/zxing/java-zxing.sh new file mode 100644 index 00000000000..bee3ac9e27a --- /dev/null +++ b/pkgs/tools/graphics/zxing/java-zxing.sh @@ -0,0 +1,3 @@ +#! /bin/sh + +@jre@/bin/java -cp @out@/lib/java/core-@version@.jar:@out@/lib/java/javase-@version@.jar "$@" diff --git a/pkgs/tools/graphics/zxing/zxing-cmdline-encoder.sh b/pkgs/tools/graphics/zxing/zxing-cmdline-encoder.sh new file mode 100644 index 00000000000..a17ba49cecf --- /dev/null +++ b/pkgs/tools/graphics/zxing/zxing-cmdline-encoder.sh @@ -0,0 +1,3 @@ +#! /bin/sh + +java-zxing com.google.zxing.client.j2se.CommandLineEncoder "$@" diff --git a/pkgs/tools/graphics/zxing/zxing-cmdline-runner.sh b/pkgs/tools/graphics/zxing/zxing-cmdline-runner.sh new file mode 100644 index 00000000000..cb2a25dc03f --- /dev/null +++ b/pkgs/tools/graphics/zxing/zxing-cmdline-runner.sh @@ -0,0 +1,3 @@ +#! /bin/sh + +java-zxing com.google.zxing.client.j2se.CommandLineRunner "$@" diff --git a/pkgs/tools/graphics/zxing/zxing.sh b/pkgs/tools/graphics/zxing/zxing.sh new file mode 100644 index 00000000000..1d473236e94 --- /dev/null +++ b/pkgs/tools/graphics/zxing/zxing.sh @@ -0,0 +1,11 @@ +#! /bin/sh +choice="$1"; +shift +case "$choice" in + encode | create | write | CommandLineEncoder) + zxing-cmdline-encoder "$@"; + ;; + decode | read | run | CommandLineRunner) + zxing-cmdline-runner "$@"; + ;; +esac diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1701881ebaf..912decd2afc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2855,6 +2855,8 @@ let zsync = callPackage ../tools/compression/zsync { }; + zxing = callPackage ../tools/graphics/zxing {}; + ### SHELLS From d72f6c85e45a38249d4db888f092e91b20f3f099 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Tue, 18 Nov 2014 16:12:59 +0100 Subject: [PATCH 221/383] Add eid-viewer: Java reader for Belgian eID identity cards --- lib/maintainers.nix | 1 + pkgs/tools/security/eid-viewer/default.nix | 38 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 41 insertions(+) create mode 100644 pkgs/tools/security/eid-viewer/default.nix diff --git a/lib/maintainers.nix b/lib/maintainers.nix index e5960eaf470..8631c4ba83c 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -108,6 +108,7 @@ MP2E = "Cray Elliott "; msackman = "Matthew Sackman "; nathan-gs = "Nathan Bijnens "; + nckx = "Tobias Geerinckx-Rice "; notthemessiah = "Brian Cohen "; nslqqq = "Nikita Mikhailov "; ocharles = "Oliver Charles "; diff --git a/pkgs/tools/security/eid-viewer/default.nix b/pkgs/tools/security/eid-viewer/default.nix new file mode 100644 index 00000000000..cb8b9db908b --- /dev/null +++ b/pkgs/tools/security/eid-viewer/default.nix @@ -0,0 +1,38 @@ +{ stdenv, fetchurl, jre, makeWrapper, pcsclite }: + +stdenv.mkDerivation rec { + # TODO: find out what the version components actually mean, if anything: + package = "eid-viewer-4.0.7-195"; + build = "tcm406-258907"; + name = "${package}-${build}"; + + src = fetchurl { + url = "http://eid.belgium.be/en/binaries/${package}.src.tar_${build}.gz"; + sha256 = "e263e6751ef7c185e278a607fdc46c207306d9a56c6ddb2ce6f58fb4464a2893"; + }; + + buildInputs = [ jre makeWrapper pcsclite ]; + + unpackPhase = "tar -xzf ${src} --strip-components=1"; + + preConfigure = '' + substituteInPlace eid-viewer.sh.in --replace "exec java" "exec ${jre}/bin/java" + ''; + + postInstall = '' + wrapProgram $out/bin/eid-viewer --suffix LD_LIBRARY_PATH : ${pcsclite}/lib + ''; + + meta = with stdenv.lib; { + description = "Belgian electronic identity card (eID) viewer"; + homepage = http://eid.belgium.be/en/using_your_eid/installing_the_eid_software/linux/; + license = with licenses; lgpl3; + longDescription = '' + A simple, graphical Java application to view, print and save data from + Belgian electronic identity cards. Independent of the eid-mw package, + which is required to actually use your eID for authentication or signing. + ''; + maintainers = with maintainers; [ nckx ]; + platforms = with platforms; linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 912decd2afc..89f24ea39a7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1063,6 +1063,8 @@ let edk2 = callPackage ../development/compilers/edk2 { }; + eid-viewer = callPackage ../tools/security/eid-viewer { }; + emscripten = callPackage ../development/compilers/emscripten { }; emscriptenfastcomp = callPackage ../development/compilers/emscripten-fastcomp { }; From a5703dd8fc309f60de6deff102d9b981502c1098 Mon Sep 17 00:00:00 2001 From: Jaka Hudoklin Date: Sun, 23 Nov 2014 01:22:11 +0100 Subject: [PATCH 222/383] kubernetes: fix kube-proxy wrapper --- pkgs/applications/networking/cluster/kubernetes/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/networking/cluster/kubernetes/default.nix b/pkgs/applications/networking/cluster/kubernetes/default.nix index 764cf804e70..76b29b13c00 100644 --- a/pkgs/applications/networking/cluster/kubernetes/default.nix +++ b/pkgs/applications/networking/cluster/kubernetes/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { ''; preFixup = '' - wrapProgram "$out/bin/proxy" --set "PATH" "${iptables}/bin" + wrapProgram "$out/bin/kube-proxy" --set "PATH" "${iptables}/bin" ''; meta = with stdenv.lib; { From 7202121e0e475b924826f3c3f180db021ad78f83 Mon Sep 17 00:00:00 2001 From: Jaka Hudoklin Date: Sun, 23 Nov 2014 01:25:53 +0100 Subject: [PATCH 223/383] nixos/etcd: only use one cient url by default --- nixos/modules/services/misc/etcd.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nixos/modules/services/misc/etcd.nix b/nixos/modules/services/misc/etcd.nix index f0693911616..550d351ccfb 100644 --- a/nixos/modules/services/misc/etcd.nix +++ b/nixos/modules/services/misc/etcd.nix @@ -28,13 +28,13 @@ in { listenClientUrls = mkOption { description = "Etcd list of URLs to listen on for client traffic."; - default = ["http://localhost:2379" "http://localhost:4001"]; + default = ["http://localhost:4001"]; type = types.listOf types.str; }; listenPeerUrls = mkOption { description = "Etcd list of URLs to listen on for peer traffic."; - default = ["http://localhost:2380" "http://localhost:7001"]; + default = ["http://localhost:7001"]; type = types.listOf types.str; }; @@ -100,7 +100,7 @@ in { after = [ "network-interfaces.target" ]; environment = { - ETCD_NAME = cfg.name; + ETCD_NAME = cfg.name; ETCD_DISCOVERY = cfg.discovery; ETCD_DATA_DIR = cfg.dataDir; ETCD_ADVERTISE_CLIENT_URLS = concatStringsSep "," cfg.advertiseClientUrls; From 52c311547c78a882fedf40a6904b7ca3fa8aec66 Mon Sep 17 00:00:00 2001 From: Eike Kettner Date: Sat, 22 Nov 2014 13:23:16 +0100 Subject: [PATCH 224/383] add sqliteman package --- pkgs/applications/misc/sqliteman/default.nix | 31 ++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 33 insertions(+) create mode 100644 pkgs/applications/misc/sqliteman/default.nix diff --git a/pkgs/applications/misc/sqliteman/default.nix b/pkgs/applications/misc/sqliteman/default.nix new file mode 100644 index 00000000000..803dfe075c1 --- /dev/null +++ b/pkgs/applications/misc/sqliteman/default.nix @@ -0,0 +1,31 @@ +{ stdenv, fetchurl, cmake, qt4, qscintilla }: + +stdenv.mkDerivation rec { + name = "sqliteman"; + version = "1.2.0-c41b89e1"; + + src = fetchurl { + url = https://github.com/pvanek/sqliteman/archive/1.2.0.tar.gz; + sha256 = "1x4ppwf01jdnz3a4ycia6vv5qf3w2smbqx690z1pnkwbvk337akm"; + }; + + buildInputs = [ cmake qt4 qscintilla ]; + + prePatch = '' + sed -i 's,m_file(0),m_file(QString()),' Sqliteman/sqliteman/main.cpp + ''; + + preConfigure = '' + cd Sqliteman + sed -i 's,/usr/include/Qsci,${qscintilla}/include/Qsci,' cmake/modules/FindQScintilla.cmake + sed -i 's,PATHS ''${QT_LIBRARY_DIR},PATHS ${qscintilla}/libs,' cmake/modules/FindQScintilla.cmake + ''; + + meta = with stdenv.lib; { + description = "Sqliteman is simple but powerfull Sqlite3 GUI database manager."; + homepage = http://sqliteman.yarpen.cz/; + license = licenses.gpl2Plus; + platforms = platforms.linux; + maintainers = [ maintainers.eikek ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 497c027b35f..2a25d7b63df 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2377,6 +2377,8 @@ let sproxy-web = haskellPackages.callPackage ../tools/networking/sproxy-web { }; + sqliteman = callPackage ../applications/misc/sqliteman { }; + stardict = callPackage ../applications/misc/stardict/stardict.nix { inherit (gnome) libgnomeui scrollkeeper; }; From 9a33f806ff9aa5ea9005d05a75e6db0428fbfbae Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Sat, 22 Nov 2014 20:25:15 -0800 Subject: [PATCH 225/383] synergy: 1.5.1 -> 1.6.1 --- pkgs/applications/misc/synergy/default.nix | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/misc/synergy/default.nix b/pkgs/applications/misc/synergy/default.nix index df4c0ea97eb..2a518b9d7cc 100644 --- a/pkgs/applications/misc/synergy/default.nix +++ b/pkgs/applications/misc/synergy/default.nix @@ -1,16 +1,19 @@ -{ stdenv, fetchurl, cmake, x11, libX11, libXi, libXtst, libXrandr, xinput, curl -, cryptopp ? null, unzip }: +{ stdenv, fetchFromGitHub, cmake, x11, libX11, libXi, libXtst, libXrandr +, xinput, curl, cryptopp ? null, unzip }: assert stdenv.isLinux -> cryptopp != null; with stdenv.lib; stdenv.mkDerivation rec { - name = "synergy-1.5.1"; + name = "synergy-${version}"; + version = "1.6.1"; - src = fetchurl { - url = "http://synergy-project.org/files/packages/${name}-r2398-Source.tar.gz"; - sha256 = "19q8ck15f0jgpbzlm34dzp046wf3iiwa21s1qfyj5sj7xjxwa367"; + src = fetchFromGitHub { + owner = "synergy"; + repo = "synergy"; + rev = "1.6.1"; + sha256 = "1043101c4phv1nbxiqp2jn1jhgzspv9q6v75z0kfzwgii5n5xq1c"; }; patches = optional stdenv.isLinux ./cryptopp.patch; From 5a3683d7ee91cecd9e63d2386ffcfeb98e43f2fd Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Sun, 23 Nov 2014 02:33:15 -0800 Subject: [PATCH 226/383] boost: Add 1.57.0 --- pkgs/development/libraries/boost/1.57.nix | 10 ++++++++++ pkgs/top-level/all-packages.nix | 1 + 2 files changed, 11 insertions(+) create mode 100644 pkgs/development/libraries/boost/1.57.nix diff --git a/pkgs/development/libraries/boost/1.57.nix b/pkgs/development/libraries/boost/1.57.nix new file mode 100644 index 00000000000..6393c6e0d30 --- /dev/null +++ b/pkgs/development/libraries/boost/1.57.nix @@ -0,0 +1,10 @@ +{ callPackage, fetchurl, ... } @ args: + +callPackage ./generic.nix (args // rec { + version = "1.57.0"; + + src = fetchurl { + url = "mirror://sourceforge/boost/boost_1_57_0.tar.bz2"; + sha256 = "0rs94vdmg34bwwj23fllva6mhrml2i7mvmlb11zyrk1k5818q34i"; + }; +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 89f24ea39a7..968ae5e465e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4864,6 +4864,7 @@ let boost155 = callPackage ../development/libraries/boost/1.55.nix { }; boost156 = callPackage ../development/libraries/boost/1.56.nix { }; + boost157 = callPackage ../development/libraries/boost/1.57.nix { }; boost = boost156; boost_process = callPackage ../development/libraries/boost-process { }; From d1493bc1eecf4b0240781ea13bda2a01838f4dfb Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Sun, 23 Nov 2014 02:43:04 -0800 Subject: [PATCH 227/383] kernel: 3.14.24 -> 3.14.25 --- pkgs/os-specific/linux/kernel/linux-3.14.nix | 4 ++-- pkgs/os-specific/linux/kernel/patches.nix | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-3.14.nix b/pkgs/os-specific/linux/kernel/linux-3.14.nix index 27b09a74f24..c301a312112 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.14.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.14.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, ... } @ args: import ./generic.nix (args // rec { - version = "3.14.24"; + version = "3.14.25"; # Remember to update grsecurity! extraMeta.branch = "3.14"; src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/linux-${version}.tar.xz"; - sha256 = "0wix7w8sn222lsfgkbpzb44q4s7c5rb13z2h07m5111p57jyvalw"; + sha256 = "07zwiywmijg5z8iy628w9f8rhi8j4hjd3raczq9pm7dqryayyaj2"; }; features.iwlwifi = true; diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index 580ed226df0..b0b9d96e95c 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -60,10 +60,10 @@ rec { }; grsecurity_stable = grsecPatch - { kversion = "3.14.24"; - revision = "201411150026"; + { kversion = "3.14.25"; + revision = "201411220954"; branch = "stable"; - sha256 = "1vrsidq4vsbb5s88k27l5n2mwgwwfz1qpwcvxwgncrkr4gaxzwrn"; + sha256 = "01x2i1r96r29s8sp2bl642ifwilfx7lh3id6a8sz6d0nf3mfypln"; }; grsecurity_unstable = grsecPatch From 4f592d4f29a06a553858bf50d64deda6752168e5 Mon Sep 17 00:00:00 2001 From: Jaka Hudoklin Date: Sun, 23 Nov 2014 12:16:50 +0100 Subject: [PATCH 228/383] nixos/etcd: fix postStart check and make tests deterministic --- nixos/modules/services/misc/etcd.nix | 7 +++++-- nixos/tests/etcd.nix | 6 +++--- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/nixos/modules/services/misc/etcd.nix b/nixos/modules/services/misc/etcd.nix index 550d351ccfb..284361a04d9 100644 --- a/nixos/modules/services/misc/etcd.nix +++ b/nixos/modules/services/misc/etcd.nix @@ -46,7 +46,7 @@ in { initialCluster = mkOption { description = "Etcd initial cluster configuration for bootstrapping."; - default = ["${cfg.name}=http://localhost:2380" "${cfg.name}=http://localhost:7001"]; + default = ["${cfg.name}=http://localhost:7001"]; type = types.listOf types.str; }; @@ -123,7 +123,10 @@ in { if [ "$(id -u)" = 0 ]; then chown etcd ${cfg.dataDir}; fi ''; postStart = '' - until ${pkgs.curl}/bin/curl -s -o /dev/null '${head cfg.listenClientUrls}/version'; do + until ${pkgs.etcdctl}/bin/etcdctl set /nixos/state 'up'; do + sleep 1; + done + until ${pkgs.etcdctl}/bin/etcdctl get /nixos/state | grep up; do sleep 1; done ''; diff --git a/nixos/tests/etcd.nix b/nixos/tests/etcd.nix index 6c6dd84f558..ace5e05b170 100644 --- a/nixos/tests/etcd.nix +++ b/nixos/tests/etcd.nix @@ -80,7 +80,7 @@ import ./make-test.nix { $simple->start(); $simple->waitForUnit("etcd.service"); $simple->succeed("etcdctl set /foo/bar 'Hello world'"); - $simple->succeed("etcdctl get /foo/bar | grep 'Hello world'"); + $simple->waitUntilSucceeds("etcdctl get /foo/bar | grep 'Hello world'"); }; subtest "multy node", sub { @@ -89,7 +89,7 @@ import ./make-test.nix { $node1->waitForUnit("etcd.service"); $node2->waitForUnit("etcd.service"); $node1->succeed("etcdctl set /foo/bar 'Hello world'"); - $node2->succeed("etcdctl get /foo/bar | grep 'Hello world'"); + $node2->waitUntilSucceeds("etcdctl get /foo/bar | grep 'Hello world'"); $node1->shutdown(); $node2->shutdown(); }; @@ -102,7 +102,7 @@ import ./make-test.nix { $discovery1->waitForUnit("etcd.service"); $discovery2->waitForUnit("etcd.service"); $discovery1->succeed("etcdctl set /foo/bar 'Hello world'"); - $discovery2->succeed("etcdctl get /foo/bar | grep 'Hello world'"); + $discovery2->waitUntilSucceeds("etcdctl get /foo/bar | grep 'Hello world'"); }; ''; } From 5ff169f4d7f2a2dc76f6670faefe589cbf416ea6 Mon Sep 17 00:00:00 2001 From: Aristid Breitkreuz Date: Sun, 23 Nov 2014 12:21:15 +0100 Subject: [PATCH 229/383] containers: remove obsolete comment --- nixos/modules/virtualisation/containers.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/nixos/modules/virtualisation/containers.nix b/nixos/modules/virtualisation/containers.nix index 3a603e0bbac..994a00fb028 100644 --- a/nixos/modules/virtualisation/containers.nix +++ b/nixos/modules/virtualisation/containers.nix @@ -308,8 +308,6 @@ in ''; }) config.containers; - # FIXME: auto-start containers. - # Generate /etc/hosts entries for the containers. networking.extraHosts = concatStrings (mapAttrsToList (name: cfg: optionalString (cfg.localAddress != null) '' From 1be6e7c60f9a1dadb8bea4db04831d540e94514a Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sun, 23 Nov 2014 11:23:06 +0000 Subject: [PATCH 230/383] js_of_ocaml: propagate lwt dependency --- pkgs/development/tools/ocaml/js_of_ocaml/default.nix | 12 +++++------- 1 file changed, 5 insertions(+), 7 deletions(-) diff --git a/pkgs/development/tools/ocaml/js_of_ocaml/default.nix b/pkgs/development/tools/ocaml/js_of_ocaml/default.nix index 103b0bfa45e..9989afdefc4 100644 --- a/pkgs/development/tools/ocaml/js_of_ocaml/default.nix +++ b/pkgs/development/tools/ocaml/js_of_ocaml/default.nix @@ -8,23 +8,21 @@ stdenv.mkDerivation { sha256 = "1prm08nf8szmd3p13ysb0yx1cy6lr671bnwsp25iny8hfbs39sjv"; }; - buildInputs = [ocaml findlib ocaml_lwt menhir ocsigen_deriving + buildInputs = [ocaml findlib menhir ocsigen_deriving cmdliner tyxml camlp4 reactivedata]; + propagatedBuildInputs = [ ocaml_lwt ]; patches = [ ./Makefile.conf.diff ]; createFindlibDestdir = true; - - meta = { + meta = with stdenv.lib; { homepage = http://ocsigen.org/js_of_ocaml/; description = "Compiler of OCaml bytecode to Javascript. It makes it possible to run Ocaml programs in a Web browser"; - license = "LGPL"; + license = licenses.lgpl2; platforms = ocaml.meta.platforms; maintainers = [ - stdenv.lib.maintainers.gal_bolle + maintainers.gal_bolle ]; }; - - } From 5ee08d42f1ef8452ff47d94754e9d78150c1145a Mon Sep 17 00:00:00 2001 From: Merlin Gaillard Date: Sun, 23 Nov 2014 14:18:55 +0100 Subject: [PATCH 231/383] updated to v0.150.0 and fixed apm LD_LIBRARY_PATH --- pkgs/applications/editors/atom/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/atom/default.nix b/pkgs/applications/editors/atom/default.nix index 2fa28f5e591..d16233332e5 100644 --- a/pkgs/applications/editors/atom/default.nix +++ b/pkgs/applications/editors/atom/default.nix @@ -16,11 +16,11 @@ let }; in stdenv.mkDerivation rec { name = "atom-${version}"; - version = "0.139.0"; + version = "0.150.0"; src = fetchurl { url = "https://github.com/atom/atom/releases/download/v${version}/atom-amd64.deb"; - sha256 = "0732s4r9qx0sgsnz415z5r9685scly2084q80kz2xw0d2gfx04xr"; + sha256 = "1vvsxj1pwpcz0hn58k1hsrv994vm61lxkih58ix1rkj32wpvdjxn"; name = "${name}.deb"; }; @@ -39,6 +39,8 @@ in stdenv.mkDerivation rec { $out/share/atom/resources/app/apm/node_modules/atom-package-manager/bin/node wrapProgram $out/bin/atom \ --prefix "LD_LIBRARY_PATH" : "${atomEnv}/lib:${atomEnv}/lib64" + wrapProgram $out/bin/apm \ + --prefix "LD_LIBRARY_PATH" : "${atomEnv}/lib:${atomEnv}/lib64" ''; meta = with stdenv.lib; { From b67bf6e038a62adaaaafaf2aa520a9f2fc6a2113 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sun, 23 Nov 2014 15:02:58 +0300 Subject: [PATCH 232/383] Behave in a sane way in ZXing wrapper when user gives --help argument --- pkgs/tools/graphics/zxing/zxing.sh | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/tools/graphics/zxing/zxing.sh b/pkgs/tools/graphics/zxing/zxing.sh index 1d473236e94..ca6ac60bab6 100644 --- a/pkgs/tools/graphics/zxing/zxing.sh +++ b/pkgs/tools/graphics/zxing/zxing.sh @@ -8,4 +8,11 @@ case "$choice" in decode | read | run | CommandLineRunner) zxing-cmdline-runner "$@"; ;; + help | usage | --help | --usage | -h) + zxing read; + zxing write; + ;; + *) + zxing read "$choice" "$@" + ;; esac From 48a1b59f6aa0c38c419dc128bc76f23adbcdca19 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sun, 23 Nov 2014 16:27:17 +0300 Subject: [PATCH 233/383] Remove cups_pdf_filter from the default set - adding to default set is easier than removing... --- nixos/modules/services/printing/cupsd.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/printing/cupsd.nix b/nixos/modules/services/printing/cupsd.nix index 8a8085cad28..fab1318f5b9 100644 --- a/nixos/modules/services/printing/cupsd.nix +++ b/nixos/modules/services/printing/cupsd.nix @@ -175,7 +175,7 @@ in }; services.printing.drivers = - [ pkgs.cups pkgs.cups_pdf_filter pkgs.ghostscript additionalBackends + [ pkgs.cups pkgs.ghostscript additionalBackends pkgs.perl pkgs.coreutils pkgs.gnused pkgs.bc pkgs.gawk pkgs.gnugrep ]; From ff2a1a3691543cc23bf9cfe06e6eb663d6f8a908 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sun, 23 Nov 2014 18:36:16 +0300 Subject: [PATCH 234/383] Adding Alpine mail reader --- .../networking/mailreaders/alpine/default.nix | 35 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 37 insertions(+) create mode 100644 pkgs/applications/networking/mailreaders/alpine/default.nix diff --git a/pkgs/applications/networking/mailreaders/alpine/default.nix b/pkgs/applications/networking/mailreaders/alpine/default.nix new file mode 100644 index 00000000000..fb5a683a900 --- /dev/null +++ b/pkgs/applications/networking/mailreaders/alpine/default.nix @@ -0,0 +1,35 @@ +{stdenv, fetchurl, ncurses, tcl, openssl, pam, pkgconfig, gettext, kerberos +, openldap +}: +let + s = + rec { + version = "2.00"; + url = "ftp://ftp.cac.washington.edu/alpine/alpine-${version}.tar.bz2"; + sha256 = "19m2w21dqn55rhxbh5lr9qarc2fqa9wmpj204jx7a0zrb90bhpf8"; + baseName = "alpine"; + name = "${baseName}-${version}"; + }; + buildInputs = [ + ncurses tcl openssl pam kerberos openldap + ]; +in +stdenv.mkDerivation { + inherit (s) name version; + inherit buildInputs; + src = fetchurl { + inherit (s) url sha256; + }; + configureFlags = [ + "--with-ssl-include-dir=${openssl}/include/openssl" + "--with-tcl-lib=tcl8.5" + ]; + meta = { + inherit (s) version; + description = ''Console mail reader''; + license = stdenv.lib.licenses.asl20; + maintainers = [stdenv.lib.maintainers.raskin]; + platforms = stdenv.lib.platforms.linux; + homepage = "https://www.washington.edu/alpine/"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 62fcd800ce3..7486e8cbb1e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8980,6 +8980,8 @@ let alock = callPackage ../misc/screensavers/alock { }; + alpine = callPackage ../applications/networking/mailreaders/alpine {}; + ams-lv2 = callPackage ../applications/audio/ams-lv2 { }; amsn = callPackage ../applications/networking/instant-messengers/amsn { }; From 09288d4c019a5c9a2a9d7f0b8070f6177e86985e Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sun, 23 Nov 2014 19:23:03 +0300 Subject: [PATCH 235/383] Fix the libgcc_s problem in alpine --- pkgs/applications/networking/mailreaders/alpine/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/applications/networking/mailreaders/alpine/default.nix b/pkgs/applications/networking/mailreaders/alpine/default.nix index fb5a683a900..87e824a977d 100644 --- a/pkgs/applications/networking/mailreaders/alpine/default.nix +++ b/pkgs/applications/networking/mailreaders/alpine/default.nix @@ -24,6 +24,9 @@ stdenv.mkDerivation { "--with-ssl-include-dir=${openssl}/include/openssl" "--with-tcl-lib=tcl8.5" ]; + preConfigure = '' + export NIX_LDFLAGS="$NIX_LDFLAGS -lgcc_s" + ''; meta = { inherit (s) version; description = ''Console mail reader''; From e9c9437445b22e93217a56e619e4267f7296f3f0 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sun, 23 Nov 2014 19:46:03 +0300 Subject: [PATCH 236/383] Add realpine alpine continuation --- .../mailreaders/realpine/default.nix | 39 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 1 + 2 files changed, 40 insertions(+) create mode 100644 pkgs/applications/networking/mailreaders/realpine/default.nix diff --git a/pkgs/applications/networking/mailreaders/realpine/default.nix b/pkgs/applications/networking/mailreaders/realpine/default.nix new file mode 100644 index 00000000000..11097672ae7 --- /dev/null +++ b/pkgs/applications/networking/mailreaders/realpine/default.nix @@ -0,0 +1,39 @@ +{stdenv, fetchurl, ncurses, tcl, openssl, pam, pkgconfig, gettext, kerberos +, openldap +}: +let + s = + rec { + version = "2.03"; + url = "mirror://sourceforge/re-alpine/re-alpine-${version}.tar.bz2"; + sha256 = "11xspzbk9cwmklmcw6rxsan7j71ysd4m9c7qldlc59ck595k5nbh"; + baseName = "re-alpine"; + name = "${baseName}-${version}"; + }; + buildInputs = [ + ncurses tcl openssl pam kerberos openldap + ]; +in +stdenv.mkDerivation { + inherit (s) name version; + inherit buildInputs; + src = fetchurl { + inherit (s) url sha256; + }; + configureFlags = [ + "--with-ssl-include-dir=${openssl}/include/openssl" + "--with-tcl-lib=tcl8.5" + ]; + preConfigure = '' + export NIX_LDFLAGS="$NIX_LDFLAGS -lgcc_s" + ''; + meta = { + inherit (s) version; + description = ''Console mail reader''; + license = stdenv.lib.licenses.asl20; + maintainers = [stdenv.lib.maintainers.raskin]; + platforms = stdenv.lib.platforms.linux; + homepage = "http://re-alpine.sf.net/"; + downloadPage = "http://sourceforge.net/projects/re-alpine/files/"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7486e8cbb1e..c64da1e54f9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8981,6 +8981,7 @@ let alock = callPackage ../misc/screensavers/alock { }; alpine = callPackage ../applications/networking/mailreaders/alpine {}; + realpine = callPackage ../applications/networking/mailreaders/realpine {}; ams-lv2 = callPackage ../applications/audio/ams-lv2 { }; From 909b62fa6e04aa70c691706beac8ff9c5e806281 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Sun, 23 Nov 2014 17:10:20 +0100 Subject: [PATCH 237/383] fetchurl: friendly message if hash is not given --- pkgs/build-support/fetchurl/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/build-support/fetchurl/default.nix b/pkgs/build-support/fetchurl/default.nix index c74131a9e60..0fcbf2f3d0d 100644 --- a/pkgs/build-support/fetchurl/default.nix +++ b/pkgs/build-support/fetchurl/default.nix @@ -81,16 +81,16 @@ assert builtins.isList urls; assert urls != [] -> url == ""; assert url != "" -> urls == []; -assert showURLs || (outputHash != "" && outputHashAlgo != "") - || md5 != "" || sha1 != "" || sha256 != ""; let + hasHash = showURLs || (outputHash != "" && outputHashAlgo != "") + || md5 != "" || sha1 != "" || sha256 != ""; urls_ = if urls != [] then urls else [url]; in -stdenv.mkDerivation { +if (!hasHash) then throw "Specify hash for fetchurl fixed-output derivation: ${stdenv.lib.concatStringsSep ", " urls_}" else stdenv.mkDerivation { name = if showURLs then "urls" else if name != "" then name From 23567ac200dddaa06ff1b45201b58f032ed0f881 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Sun, 23 Nov 2014 17:51:55 +0100 Subject: [PATCH 238/383] cups-pdf-filter -> cups-filters, enable by default for cups --- nixos/modules/services/printing/cupsd.nix | 4 +-- pkgs/misc/cups/filters.nix | 30 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 +- 3 files changed, 33 insertions(+), 3 deletions(-) create mode 100644 pkgs/misc/cups/filters.nix diff --git a/nixos/modules/services/printing/cupsd.nix b/nixos/modules/services/printing/cupsd.nix index fab1318f5b9..fb6e2b90590 100644 --- a/nixos/modules/services/printing/cupsd.nix +++ b/nixos/modules/services/printing/cupsd.nix @@ -107,7 +107,7 @@ in type = types.listOf types.path; example = literalExample "[ pkgs.splix ]"; description = '' - CUPS drivers to use. Drivers provided by CUPS, Ghostscript + CUPS drivers to use. Drivers provided by CUPS, cups-filters, Ghostscript and Samba are added unconditionally. ''; }; @@ -175,7 +175,7 @@ in }; services.printing.drivers = - [ pkgs.cups pkgs.ghostscript additionalBackends + [ pkgs.cups pkgs.ghostscript pkgs.cups_filters additionalBackends pkgs.perl pkgs.coreutils pkgs.gnused pkgs.bc pkgs.gawk pkgs.gnugrep ]; diff --git a/pkgs/misc/cups/filters.nix b/pkgs/misc/cups/filters.nix new file mode 100644 index 00000000000..31ef0bc0efc --- /dev/null +++ b/pkgs/misc/cups/filters.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchurl, pkgconfig, cups, poppler, fontconfig +, libjpeg, libpng, perl, ijs, qpdf, dbus }: + +stdenv.mkDerivation rec { + name = "cups-filters-${version}"; + version = "1.0.61"; + + src = fetchurl { + url = "http://openprinting.org/download/cups-filters/${name}.tar.xz"; + sha256 = "1bq48nnrarlbf6qc93bz1n5wlh6j420gppbck3r45sinwhz5wa7m"; + }; + + buildInputs = [ + pkgconfig cups poppler fontconfig libjpeg libpng perl + ijs qpdf dbus + ]; + + preBuild = '' + substituteInPlace Makefile --replace "/etc/rc.d" "$out/etc/rc.d" + ''; + configureFlags = "--with-pdftops=pdftops --enable-imagefilters"; + makeFlags = "CUPS_SERVERBIN=$(out)/lib/cups CUPS_DATADIR=$(out)/share/cups CUPS_SERVERROOT=$(out)/etc/cups"; + + meta = { + homepage = http://www.linuxfoundation.org/collaborate/workgroups/openprinting/cups-filters; + description = "Backends, filters, and other software that was once part of the core CUPS distribution but is no longer maintained by Apple Inc"; + 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 c64da1e54f9..479f5fe6e96 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12332,7 +12332,7 @@ let cups = callPackage ../misc/cups { libusb = libusb1; }; - cups_pdf_filter = callPackage ../misc/cups/pdf-filter.nix { }; + cups_filters = callPackage ../misc/cups/filters.nix { }; crashplan = callPackage ../applications/backup/crashplan { }; From 1bb8611a09a9ce37d202775512e2dfdaa642e0f4 Mon Sep 17 00:00:00 2001 From: Dmitry Malikov Date: Sun, 23 Nov 2014 19:55:12 +0300 Subject: [PATCH 239/383] haskellPackages.hspecContrib: add 0.2.0 --- .../libraries/haskell/hspec-contrib/default.nix | 17 +++++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 19 insertions(+) create mode 100644 pkgs/development/libraries/haskell/hspec-contrib/default.nix diff --git a/pkgs/development/libraries/haskell/hspec-contrib/default.nix b/pkgs/development/libraries/haskell/hspec-contrib/default.nix new file mode 100644 index 00000000000..53f94edc793 --- /dev/null +++ b/pkgs/development/libraries/haskell/hspec-contrib/default.nix @@ -0,0 +1,17 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, hspec, hspecCore, HUnit, QuickCheck }: + +cabal.mkDerivation (self: { + pname = "hspec-contrib"; + version = "0.2.0"; + sha256 = "0p6jh3j84cq66gfp2pk957ha4ds7797vfbfri9lsg9gd4998dwkq"; + buildDepends = [ hspecCore HUnit ]; + testDepends = [ hspec hspecCore HUnit QuickCheck ]; + meta = { + homepage = "http://hspec.github.io/"; + description = "Contributed functionality for Hspec"; + 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 ca9a32bdd24..b37ff75e0d4 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1303,6 +1303,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in hspecCore = callPackage ../development/libraries/haskell/hspec-core {}; + hspecContrib = callPackage ../development/libraries/haskell/hspec-contrib {}; + hspecDiscover = callPackage ../development/libraries/haskell/hspec-discover {}; hstatsd = callPackage ../development/libraries/haskell/hstatsd {}; From 764f428ede8b903d7936105a1714d0ca1b63cc44 Mon Sep 17 00:00:00 2001 From: aszlig Date: Sun, 23 Nov 2014 18:17:39 +0100 Subject: [PATCH 240/383] libgnomecups: Add CUPS >= 1.6 compatibility patch. Patch is from Gentoo at: http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/net-print/libgnomecups/files/libgnomecups-0.2.3-cups-1.6.patch Fixes the following Hydra build failure: http://hydra.cryp.to/build/250133/nixlog/5/raw Thanks to @peti for the notification. Signed-off-by: aszlig --- .../platform/libgnomecups/cups_1.6.patch | 285 ++++++++++++++++++ .../gnome-2/platform/libgnomecups/default.nix | 2 +- 2 files changed, 286 insertions(+), 1 deletion(-) create mode 100644 pkgs/desktops/gnome-2/platform/libgnomecups/cups_1.6.patch diff --git a/pkgs/desktops/gnome-2/platform/libgnomecups/cups_1.6.patch b/pkgs/desktops/gnome-2/platform/libgnomecups/cups_1.6.patch new file mode 100644 index 00000000000..68f379c2510 --- /dev/null +++ b/pkgs/desktops/gnome-2/platform/libgnomecups/cups_1.6.patch @@ -0,0 +1,285 @@ +From ae783efde4fa69578651994505462f02b8639220 Mon Sep 17 00:00:00 2001 +From: Alexandre Rostovtsev +Date: Tue, 7 Aug 2012 06:53:09 -0400 +Subject: [PATCH] Use CUPS-1.6 IPP API getter/setter functions + +CUPS 1.6 makes various structures private and introduces these ippGet +and ippSet functions for all of the fields in these structures. +http://www.cups.org/str.php?L3928 + +We define our own accessors when building against CUPS < 1.6. + +Based on work by Jiri Popelka at +https://bugzilla.gnome.org/show_bug.cgi?id=679759 +--- + libgnomecups/gnome-cups-printer.c | 48 +++++++++++++++++++++++++++++------- + libgnomecups/gnome-cups-queue.c | 43 +++++++++++++++++++++++++++------ + libgnomecups/gnome-cups-request.c | 44 ++++++++++++++++++++++++++++----- + 3 files changed, 110 insertions(+), 25 deletions(-) + +diff --git a/libgnomecups/gnome-cups-printer.c b/libgnomecups/gnome-cups-printer.c +index c924af0..f5e1ef7 100644 +--- a/libgnomecups/gnome-cups-printer.c ++++ b/libgnomecups/gnome-cups-printer.c +@@ -37,6 +37,34 @@ + + #define UPDATE_TIMEOUT 5000 + ++#if (CUPS_VERSION_MAJOR > 1) || (CUPS_VERSION_MINOR > 5) ++#define HAVE_CUPS_1_6 1 ++#endif ++ ++#ifndef HAVE_CUPS_1_6 ++#define ippGetCount(attr) attr->num_values ++#define ippGetName(attr) attr->name ++#define ippGetInteger(attr, element) attr->values[element].integer ++#define ippGetString(attr, element, language) attr->values[element].string.text ++ ++static ipp_attribute_t * ++ippFirstAttribute(ipp_t *ipp) ++{ ++ if (!ipp) ++ return (NULL); ++ return (ipp->current = ipp->attrs); ++} ++ ++static ipp_attribute_t * ++ippNextAttribute(ipp_t *ipp) ++{ ++ if (!ipp || !ipp->current) ++ return (NULL); ++ return (ipp->current = ipp->current->next); ++} ++#endif ++ ++ + struct _GnomeCupsPPDFile { + char name[1]; + }; +@@ -173,9 +201,9 @@ map_reasons (GnomeCupsPrinter *printer, + printer->details->state_reasons = NULL; + + /* cf. RFC2911 4.4.12 */ +- for (i = 0; i < attr->num_values; i++) { ++ for (i = 0; i < ippGetCount (attr); i++) { + const char *p; +- const char *keyword = attr->values [i].string.text; ++ const char *keyword = ippGetString (attr, i, NULL); + + reason = g_new (GnomeCupsPrinterReason, 1); + +@@ -224,8 +252,8 @@ gnome_cups_printer_get_info (GnomeCupsPrinter *printer) + return printer->details->info; + } + +-#define MAP_INT(v,a) {if (!g_ascii_strcasecmp (attr->name, (a))) { if ((v) != attr->values[0].integer) { changed = TRUE; } (v) = attr->values[0].integer; }} +-#define MAP_STRING(v,a) {if (!g_ascii_strcasecmp (attr->name, (a))) { if (!v || strcmp (v, attr->values[0].string.text)) { g_free (v); changed = TRUE; (v) = g_strdup (attr->values[0].string.text); }}} ++#define MAP_INT(v,a) {if (!g_ascii_strcasecmp (ippGetName (attr), (a))) { if ((v) != ippGetInteger (attr, 0)) { changed = TRUE; } (v) = ippGetInteger (attr, 0); }} ++#define MAP_STRING(v,a) {if (!g_ascii_strcasecmp (ippGetName (attr), (a))) { if (!v || strcmp (v, ippGetString (attr, 0, NULL))) { g_free (v); changed = TRUE; (v) = g_strdup (ippGetString (attr, 0, NULL)); }}} + + static void + attributes_update_cb (guint id, +@@ -243,14 +271,14 @@ attributes_update_cb (guint id, + changed = FALSE; + + if (!error && response) { +- for (attr = response->attrs; attr != NULL; attr = attr->next) { +- if (!attr->name) { ++ for (attr = ippFirstAttribute (response); attr != NULL; attr = ippNextAttribute (response)) { ++ if (!ippGetName (attr)) { + continue; + } +- if (!g_ascii_strcasecmp (attr->name, "attributes-charset") || !strcmp (attr->name, "attributes-charset")) { ++ if (!g_ascii_strcasecmp (ippGetName (attr), "attributes-charset") || !strcmp (ippGetName (attr), "attributes-charset")) { + continue; + } +- if (!g_ascii_strcasecmp (attr->name, "printer-state-reasons")) { ++ if (!g_ascii_strcasecmp (ippGetName (attr), "printer-state-reasons")) { + map_reasons (printer, attr); + } + MAP_INT (printer->details->state, "printer-state"); +@@ -570,7 +598,7 @@ get_default (void) + + attr = ippFindAttribute (response, "printer-name", IPP_TAG_NAME); + if (attr) { +- name = g_strdup (attr->values[0].string.text); ++ name = g_strdup (ippGetString (attr, 0, NULL)); + } else { + name = NULL; + } +@@ -698,7 +726,7 @@ get_printer_names (void) + attr = ippFindAttribute (response, "printer-name", IPP_TAG_NAME); + while (attr) { + ret = g_list_prepend (ret, +- g_strdup (attr->values[0].string.text)); ++ g_strdup (ippGetString (attr, 0, NULL))); + + attr = ippFindNextAttribute (response, + "printer-name", +diff --git a/libgnomecups/gnome-cups-queue.c b/libgnomecups/gnome-cups-queue.c +index 9f98ed9..298db42 100644 +--- a/libgnomecups/gnome-cups-queue.c ++++ b/libgnomecups/gnome-cups-queue.c +@@ -15,6 +15,33 @@ + + #define UPDATE_TIMEOUT 3000 + ++#if (CUPS_VERSION_MAJOR > 1) || (CUPS_VERSION_MINOR > 5) ++#define HAVE_CUPS_1_6 1 ++#endif ++ ++#ifndef HAVE_CUPS_1_6 ++#define ippGetName(attr) attr->name ++#define ippGetInteger(attr, element) attr->values[element].integer ++#define ippGetString(attr, element, language) attr->values[element].string.text ++ ++static ipp_attribute_t * ++ippFirstAttribute(ipp_t *ipp) ++{ ++ if (!ipp) ++ return (NULL); ++ return (ipp->current = ipp->attrs); ++} ++ ++static ipp_attribute_t * ++ippNextAttribute(ipp_t *ipp) ++{ ++ if (!ipp || !ipp->current) ++ return (NULL); ++ return (ipp->current = ipp->current->next); ++} ++#endif ++ ++ + struct _GnomeCupsQueueDetails { + char *queue_name; + GList *jobs; +@@ -199,8 +226,8 @@ finish_job (GnomeCupsJob *job) + job->size = job->size * 1024; + } + +-#define MAP_STR(dest, src) { if (!g_ascii_strcasecmp (attr->name, (src))) { if ((dest) != NULL) g_free (dest); (dest) = g_strdup (attr->values[0].string.text);}} +-#define MAP_INT(dest, src) { if (!g_ascii_strcasecmp (attr->name, (src))) { (dest) = attr->values[0].integer; } } ++#define MAP_STR(dest, src) { if (!g_ascii_strcasecmp (ippGetName (attr), (src))) { if ((dest) != NULL) g_free (dest); (dest) = g_strdup (ippGetString (attr, 0, NULL));}} ++#define MAP_INT(dest, src) { if (!g_ascii_strcasecmp (ippGetName (attr), (src))) { (dest) = ippGetInteger (attr, 0); } } + + static void + get_jobs_cb (guint id, +@@ -231,8 +258,8 @@ get_jobs_cb (guint id, + + if (response) { + job = g_new0 (GnomeCupsJob, 1); +- for (attr = response->attrs; attr != NULL; attr = attr->next) { +- if (attr->name == NULL) { ++ for (attr = ippFirstAttribute (response); attr != NULL; attr = ippNextAttribute (response)) { ++ if (ippGetName (attr) == NULL) { + if (job->name) { + finish_job (job); + jobs = g_list_prepend (jobs, job); +@@ -244,7 +271,7 @@ get_jobs_cb (guint id, + continue; + } + +- if (!g_ascii_strcasecmp (attr->name, "attributes-charset") || !g_ascii_strcasecmp (attr->name, "attributes-charset")) { ++ if (!g_ascii_strcasecmp (ippGetName (attr), "attributes-charset") || !g_ascii_strcasecmp (ippGetName (attr), "attributes-charset")) { + continue; + + } +@@ -355,8 +382,8 @@ gnome_cups_queue_get_job_nocache (GnomeCupsQueue *queue, + + if (response) { + job = g_new0 (GnomeCupsJob, 1); +- for (attr = response->attrs; attr != NULL; attr = attr->next) { +- if (attr->name == NULL) { ++ for (attr = ippFirstAttribute (response); attr != NULL; attr = ippNextAttribute (response)) { ++ if (ippGetName (attr) == NULL) { + if (job->name) { + finish_job (job); + } else { +@@ -366,7 +393,7 @@ gnome_cups_queue_get_job_nocache (GnomeCupsQueue *queue, + break; + } + +- if (!g_ascii_strcasecmp (attr->name, "attributes-charset") || !g_ascii_strcasecmp (attr->name, "attributes-charset")) { ++ if (!g_ascii_strcasecmp (ippGetName (attr), "attributes-charset") || !g_ascii_strcasecmp (ippGetName (attr), "attributes-charset")) { + continue; + } + +diff --git a/libgnomecups/gnome-cups-request.c b/libgnomecups/gnome-cups-request.c +index c94f623..13f0948 100644 +--- a/libgnomecups/gnome-cups-request.c ++++ b/libgnomecups/gnome-cups-request.c +@@ -19,6 +19,36 @@ + #define STOP_UNUSED_THREADS_TIMEOUT 60 + #define CLOSE_UNUSED_CONNECTIONS_TIMEOUT 30 + ++#if (CUPS_VERSION_MAJOR > 1) || (CUPS_VERSION_MINOR > 5) ++#define HAVE_CUPS_1_6 1 ++#endif ++ ++#ifndef HAVE_CUPS_1_6 ++#define ippGetCount(attr) attr->num_values ++#define ippGetValueTag(attr) attr->value_tag ++#define ippGetName(attr) attr->name ++#define ippGetBoolean(attr, element) attr->values[element].boolean ++#define ippGetInteger(attr, element) attr->values[element].integer ++#define ippGetString(attr, element, language) attr->values[element].string.text ++ ++static ipp_attribute_t * ++ippFirstAttribute(ipp_t *ipp) ++{ ++ if (!ipp) ++ return (NULL); ++ return (ipp->current = ipp->attrs); ++} ++ ++static ipp_attribute_t * ++ippNextAttribute(ipp_t *ipp) ++{ ++ if (!ipp || !ipp->current) ++ return (NULL); ++ return (ipp->current = ipp->current->next); ++} ++#endif ++ ++ + typedef struct + { + GMutex *mutex; +@@ -276,14 +306,14 @@ dump_request (ipp_t const *req) + unsigned i; + ipp_attribute_t *attr; + +- for (attr = req->attrs; attr != NULL; attr = attr->next) { +- g_print ("%s", attr->name); +- for (i = 0 ; i < attr->num_values ; i++) { ++ for (attr = ippFirstAttribute (req); attr != NULL; attr = ippNextAttribute (req)) { ++ g_print ("%s", ippGetName (attr)); ++ for (i = 0 ; i < ippGetCount (attr) ; i++) { + g_print ("\t[%d] = ", i); +- switch (attr->value_tag & ~IPP_TAG_COPY) { ++ switch (ippGetValueTag (attr) & ~IPP_TAG_COPY) { + case IPP_TAG_INTEGER: + case IPP_TAG_ENUM: +- g_print ("%d\n", attr->values[i].integer); ++ g_print ("%d\n", ippGetInteger (attr, i)); + break; + + case IPP_TAG_STRING: +@@ -294,11 +324,11 @@ dump_request (ipp_t const *req) + case IPP_TAG_CHARSET: + case IPP_TAG_LANGUAGE: + case IPP_TAG_MIMETYPE: +- g_print ("'%s'\n", attr->values[i].string.text); ++ g_print ("'%s'\n", ippGetString (attr, i, NULL)); + break; + + case IPP_TAG_BOOLEAN: +- g_print ("%s\n", (int)attr->values[i].boolean ? "true" : "false"); ++ g_print ("%s\n", (int)ippGetBoolean (attr, i) ? "true" : "false"); + break; + + default: +-- +1.7.8.6 + diff --git a/pkgs/desktops/gnome-2/platform/libgnomecups/default.nix b/pkgs/desktops/gnome-2/platform/libgnomecups/default.nix index 9a0afd1275d..2aa47d799c9 100644 --- a/pkgs/desktops/gnome-2/platform/libgnomecups/default.nix +++ b/pkgs/desktops/gnome-2/platform/libgnomecups/default.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { sha256 = "0a8xdaxzz2wc0n1fjcav65093gixzyac3948l8cxx1mk884yhc71"; }; - patches = [ ./glib.patch ]; + patches = [ ./glib.patch ./cups_1.6.patch ]; buildInputs = [ pkgconfig gtk gettext intltool libart_lgpl ]; From 54d206e5cc84f36230a26bec5e107720135082ba Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sun, 23 Nov 2014 17:32:35 +0000 Subject: [PATCH 241/383] cppo: update from 1.0.1 to 1.1.2 --- pkgs/development/tools/ocaml/cppo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/ocaml/cppo/default.nix b/pkgs/development/tools/ocaml/cppo/default.nix index f61c8ad4da4..461fda45d4c 100644 --- a/pkgs/development/tools/ocaml/cppo/default.nix +++ b/pkgs/development/tools/ocaml/cppo/default.nix @@ -1,7 +1,7 @@ {stdenv, fetchurl, ocaml, findlib}: let pname = "cppo"; - version = "1.0.1"; + version = "1.1.2"; webpage = "http://mjambon.com/${pname}.html"; in assert stdenv.lib.versionAtLeast (stdenv.lib.getVersion ocaml) "3.12"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://mjambon.com/releases/${pname}/${name}.tar.gz"; - sha256 = "1r71qv9sl6jpza1vi5kgmbi7iwbddh3f9j7yji063c9vimp9f25z"; + sha256 = "1pfzch4ys5gjac2lrkqq0gzmm5plkq2jl17b2m3n06kmwashqplp"; }; buildInputs = [ ocaml findlib ]; From 3cc397b2a1d99e92c2de85c9f6f11e6a8f72bd87 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Sun, 23 Nov 2014 12:56:49 -0500 Subject: [PATCH 242/383] dar: bump cc @viric --- pkgs/tools/archivers/dar/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/archivers/dar/default.nix b/pkgs/tools/archivers/dar/default.nix index 17b0b77f872..f964aded2a4 100644 --- a/pkgs/tools/archivers/dar/default.nix +++ b/pkgs/tools/archivers/dar/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, zlib, bzip2, openssl, attr, lzo, libgcrypt, e2fsprogs }: stdenv.mkDerivation rec { - name = "dar-2.4.11"; + name = "dar-2.4.15"; src = fetchurl { url = "mirror://sourceforge/dar/${name}.tar.gz"; - sha256 = "0psahvnrkljqg9507dk0vq05w8vilpm98igjrcjkqdirqcfd2py1"; + sha256 = "1x694g7yhach8swkjwbkdryp74r3rh0d2lrsa8mnf0azp0mrj1ln"; }; buildInputs = [ zlib bzip2 openssl lzo libgcrypt ] From 34e714c32d38bb3b7843388e416c34bdb3651072 Mon Sep 17 00:00:00 2001 From: taku0 Date: Fri, 21 Nov 2014 22:15:40 +0900 Subject: [PATCH 243/383] add udunits: a C library for units of physical quantities --- .../libraries/udunits/configure.patch | 12 ++++++++++++ .../development/libraries/udunits/default.nix | 19 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 33 insertions(+) create mode 100644 pkgs/development/libraries/udunits/configure.patch create mode 100644 pkgs/development/libraries/udunits/default.nix diff --git a/pkgs/development/libraries/udunits/configure.patch b/pkgs/development/libraries/udunits/configure.patch new file mode 100644 index 00000000000..36a0efb8590 --- /dev/null +++ b/pkgs/development/libraries/udunits/configure.patch @@ -0,0 +1,12 @@ +diff -ru -x '*~' udunits-2.1.24_orig/configure udunits-2.1.24/configure +--- udunits-2.1.24_orig/configure 2011-09-13 05:58:39.000000000 +0900 ++++ udunits-2.1.24/configure 2014-11-21 21:59:30.308180814 +0900 +@@ -7033,7 +7033,7 @@ + ac_status=$? + $as_echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; then +- case `/usr/bin/file conftest.o` in ++ case `$MAGIC_CMD conftest.o` in + *32-bit*) + case $host in + x86_64-*kfreebsd*-gnu) diff --git a/pkgs/development/libraries/udunits/default.nix b/pkgs/development/libraries/udunits/default.nix new file mode 100644 index 00000000000..608900c85ad --- /dev/null +++ b/pkgs/development/libraries/udunits/default.nix @@ -0,0 +1,19 @@ +{ stdenv, fetchurl, + bison, flex, expat, file +}: + +stdenv.mkDerivation rec { + name = "udunits-2.1.24"; + src = fetchurl { + url = "ftp://ftp.unidata.ucar.edu/pub/udunits/${name}.tar.gz"; + sha256 = "1l0fdsl55374w7fjyd1wdx474f3p265b6rw1lq269cii61ca8prf"; + }; + + buildInputs = [ + bison flex expat file + ]; + + patches = [ ./configure.patch ]; + + MAGIC_CMD="${file}/bin/file"; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 4c3d75ea489..e3b9f1c05ad 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2671,6 +2671,8 @@ let ttmkfdir = callPackage ../tools/misc/ttmkfdir { }; + udunits = callPackage ../development/libraries/udunits { }; + uim = callPackage ../tools/inputmethods/uim { inherit (pkgs.kde4) kdelibs; }; From 0bffb637266024a6a60731fa26f7b58bd6d9c065 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sun, 23 Nov 2014 13:10:35 -0600 Subject: [PATCH 244/383] dropbox: update to 2.10.52 --- pkgs/applications/networking/dropbox/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/dropbox/default.nix b/pkgs/applications/networking/dropbox/default.nix index 82a340591f2..d55e2b18162 100644 --- a/pkgs/applications/networking/dropbox/default.nix +++ b/pkgs/applications/networking/dropbox/default.nix @@ -25,9 +25,9 @@ let else if stdenv.system == "i686-linux" then "ld-linux.so.2" else throw "Dropbox client for: ${stdenv.system} not supported!"; - version = "2.10.30"; - sha256 = if stdenv.system == "x86_64-linux" then "1gdch4fka5f671zwl329j6b60igki1rzxw9ggxcywcg1h4rlvw7r" - else if stdenv.system == "i686-linux" then "1a4pswpy945iqzvi8kcs1r0sydb04h28v5zv0hdyra0c548wsm2g" + version = "2.10.52"; + sha256 = if stdenv.system == "x86_64-linux" then "0fn2frp00f0p0r6v5czzxfbw1ifan9w12k3ry8gq1m4bvx6g27p6" + else if stdenv.system == "i686-linux" then "1rm5kspb53zqgaz48v8x3ffk1mcfi0nh0zsmsdniyrgqbis5mmm9" else throw "Dropbox client for: ${stdenv.system} not supported!"; # relative location where the dropbox libraries are stored From 73f4466a90885677c29ecd364226699a32d6bb78 Mon Sep 17 00:00:00 2001 From: Michael Raskin <7c6f434c@mail.ru> Date: Sun, 23 Nov 2014 22:50:40 +0300 Subject: [PATCH 245/383] Add ncurses-2048 game --- pkgs/games/n2048/default.nix | 35 +++++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 37 insertions(+) create mode 100644 pkgs/games/n2048/default.nix diff --git a/pkgs/games/n2048/default.nix b/pkgs/games/n2048/default.nix new file mode 100644 index 00000000000..f5ff0b4690e --- /dev/null +++ b/pkgs/games/n2048/default.nix @@ -0,0 +1,35 @@ +{stdenv, fetchurl, ncurses}: +let + s = + rec { + baseName = "n2048"; + version = "0.1"; + name = "${baseName}-${version}"; + url = "http://www.dettus.net/n2048/${baseName}_v${version}.tar.gz"; + sha256 = "184z2rr0rnj4p740qb4mzqr6kgd76ynb5gw9bj8hrfshcxdcg1kk"; + }; + buildInputs = [ + ncurses + ]; +in +stdenv.mkDerivation { + inherit (s) name version; + inherit buildInputs; + src = fetchurl { + inherit (s) url sha256; + }; + makeFlags = [ + ''DESTDIR=$(out)'' + ]; + preInstall = '' + mkdir -p "$out"/{share/man,bin} + ''; + meta = { + inherit (s) version; + description = ''Console implementation of 2048 game''; + license = stdenv.lib.licenses.bsd2; + maintainers = [stdenv.lib.maintainers.raskin]; + platforms = stdenv.lib.platforms.linux; + homepage = "http://www.dettus.net/n2048/"; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e3b9f1c05ad..27959253890 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11469,6 +11469,8 @@ let inherit (pythonPackages) matplotlib cherrypy sqlite3; }; + n2048 = callPackage ../games/n2048 {}; + naev = callPackage ../games/naev { }; nexuiz = callPackage ../games/nexuiz { }; From bc03398930b11131673d6dc3181eee0d814a26dd Mon Sep 17 00:00:00 2001 From: Moritz Ulrich Date: Sun, 23 Nov 2014 20:52:56 +0100 Subject: [PATCH 246/383] dwarf-fortress: Clean up expression & config file handling. --- pkgs/games/dwarf-fortress/default.nix | 73 +++++++++++---------------- pkgs/top-level/all-packages.nix | 4 -- 2 files changed, 30 insertions(+), 47 deletions(-) diff --git a/pkgs/games/dwarf-fortress/default.nix b/pkgs/games/dwarf-fortress/default.nix index 851b97ad7d0..e7a8abf01d8 100644 --- a/pkgs/games/dwarf-fortress/default.nix +++ b/pkgs/games/dwarf-fortress/default.nix @@ -1,7 +1,6 @@ -{ stdenv, fetchgit, fetchurl, cmake, glew, ncurses, SDL, SDL_image, SDL_ttf, gtk2, glib, mesa, openal, pango, atk, gdk_pixbuf, glibc, libsndfile - , copyDataDirectory ? true }: - -/* set copyDataDirectory as true by default since df 40 does not seem to run without it */ +{ stdenv, fetchgit, fetchurl, cmake, glew, ncurses +, SDL, SDL_image, SDL_ttf, gtk2, glib +, mesa, openal, pango, atk, gdk_pixbuf, glibc, libsndfile }: let baseVersion = "40"; @@ -38,8 +37,6 @@ stdenv.mkDerivation rec { "-DGTK2_GDKCONFIG_INCLUDE_DIR=${gtk2}/lib/gtk-2.0/include" ]; - /* :TODO: Game options should be configurable by patching the default configuration files */ - permission = ./df_permission; installPhase = '' @@ -57,55 +54,45 @@ stdenv.mkDerivation rec { patchelf --set-interpreter ${glibc}/lib/ld-linux.so.2 $out/share/df_linux/libs/Dwarf_Fortress cat > $out/bin/dwarf-fortress << EOF - #!${stdenv.shell} - export DF_DIR="\$HOME/.config/df_linux" - if [ -n "\$XDG_DATA_HOME" ] - then export DF_DIR="\$XDG_DATA_HOME/df_linux" - fi + #!${stdenv.shell} + + set -ex - # Recreate a directory structure reflecting the original - # distribution in the user directory (for modding support) - ${if copyDataDirectory then '' - if [ ! -d "\$DF_DIR" ]; - then - mkdir -p \$DF_DIR - cp -r $out/share/df_linux/* \$DF_DIR/ - chmod -R u+rw \$DF_DIR/ + export DF_DIR="\$HOME/.config/df_linux" + if [ -n "\$XDG_DATA_HOME" ] + then export DF_DIR="\$XDG_DATA_HOME/df_linux" fi - '' else '' - # Link in the static stuff - mkdir -p \$DF_DIR - ln -sf $out/share/df_linux/libs \$DF_DIR/ - ln -sf $out/share/df_linux/raw \$DF_DIR/ - ln -sf $out/share/df_linux/df \$DF_DIR/ - # Delete old data directory - rm -rf \$DF_DIR/data + if [[ ! -d "\$DF_DIR" ]]; then + mkdir -p "\$DF_DIR" + ln -s $out/share/df_linux/raw "\$DF_DIR/raw" + ln -s $out/share/df_linux/libs "\$DF_DIR/libs" + mkdir -p "\$DF_DIR/data/init" + cp -rn $out/share/df_linux/data/init "\$DF_DIR/data/" + fi - # Link in the static data directory - mkdir \$DF_DIR/data - for i in $out/share/df_linux/data/* - do - ln -s \$i \$DF_DIR/data/ + for link in announcement art dipscript help index initial_movies movies shader.fs shader.vs sound speech; do + cp -r $out/share/df_linux/data/\$link "\$DF_DIR/data/\$link" + chmod -R u+rw "\$DF_DIR/data/\$link" done - # link in persistant data - mkdir -p \$DF_DIR/save - ln -s \$DF_DIR/save \$DF_DIR/data/ - ''} + # now run Dwarf Fortress! + export LD_LIBRARY_PATH=\${stdenv.gcc}/lib:${SDL}/lib:${SDL_image}/lib/:${SDL_ttf}/lib/:${gtk2}/lib/:${glib}/lib/:${mesa}/lib/:${openal}/lib/:${libsndfile}/lib:\$DF_DIR/df_linux/libs/ - # now run Dwarf Fortress! - export LD_LIBRARY_PATH=\${stdenv.gcc}/lib:${SDL}/lib:${SDL_image}/lib/:${SDL_ttf}/lib/:${gtk2}/lib/:${glib}/lib/:${mesa}/lib/:${openal}/lib/:${libsndfile}/lib:$DF_DIR/df_linux/libs/ - \$DF_DIR/df "\$@" + export SDL_DISABLE_LOCK_KEYS=1 # Work around for bug in Debian/Ubuntu SDL patch. + #export SDL_VIDEO_CENTERED=1 # Centre the screen. Messes up resizing. + + cd \$DF_DIR + $out/share/df_linux/libs/Dwarf_Fortress "$@" EOF chmod +x $out/bin/dwarf-fortress ''; meta = { - description = "control a dwarven outpost or an adventurer in a randomly generated, persistent world"; - homepage = http://www.bay12games.com/dwarves; - license = stdenv.lib.licenses.unfreeRedistributable; - maintainers = with stdenv.lib.maintainers; [ roconnor the-kenny ]; + description = "A single-player fantasy game with a randomly generated adventure world"; + homepage = http://www.bay12games.com/dwarves; + license = stdenv.lib.licenses.unfreeRedistributable; + maintainers = with stdenv.lib.maintainers; [ roconnor the-kenny ]; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 27959253890..28359170ec3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11379,10 +11379,6 @@ let }; }; - dwarf_fortress_modable = appendToName "moddable" (dwarf_fortress.override { - copyDataDirectory = true; - }); - dwarf-therapist = callPackage ../games/dwarf-therapist { }; d1x_rebirth = callPackage ../games/d1x-rebirth { }; From a1757764772c93b19b808518ea9a5cdcddaa4fc0 Mon Sep 17 00:00:00 2001 From: Moritz Ulrich Date: Sun, 23 Nov 2014 21:29:01 +0100 Subject: [PATCH 247/383] dwarf-fortress: Update to 0.40.18. --- pkgs/games/dwarf-fortress/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/games/dwarf-fortress/default.nix b/pkgs/games/dwarf-fortress/default.nix index e7a8abf01d8..ac037efe88a 100644 --- a/pkgs/games/dwarf-fortress/default.nix +++ b/pkgs/games/dwarf-fortress/default.nix @@ -4,17 +4,17 @@ let baseVersion = "40"; - patchVersion = "16"; + patchVersion = "18"; srcs = { df_unfuck = fetchgit { url = "https://github.com/svenstaro/dwarf_fortress_unfuck"; - rev = "7c1d8bf027c8d8835d0d3ef50502f0c45a7f9bae"; - sha256 = "d4a681231da00fec7bcdb092bcf51415c75fd20fc9da786fb6013e0c03fbc373"; + rev = "f7ef8d4fa92bcbbf8e4790056c6c3668e3c3b20b"; + sha256 = "0kpb3gzjllvi1lahhi74cp2ny1dl7kvnhdlca7i2yxkmyzaaj9qy"; }; df = fetchurl { url = "http://www.bay12games.com/dwarves/df_${baseVersion}_${patchVersion}_linux.tar.bz2"; - sha256 = "0045ac9wz1spm4yajrnq5v802ks7aajk422zqkhsd331s1fhpirc"; + sha256 = "0l29dn24xhkyj8fvmz8318i5sz2wpl420mwy1ccpdd3yfd3hrjmb"; }; }; From 98344757b92c40de1fc266df2e8fc0569f77374d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Sun, 23 Nov 2014 21:33:25 +0100 Subject: [PATCH 248/383] rdiff-backup: set meta.platforms --- pkgs/tools/backup/rdiff-backup/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/backup/rdiff-backup/default.nix b/pkgs/tools/backup/rdiff-backup/default.nix index 58affe10e4e..441c37c5f7d 100644 --- a/pkgs/tools/backup/rdiff-backup/default.nix +++ b/pkgs/tools/backup/rdiff-backup/default.nix @@ -21,6 +21,7 @@ stdenv.mkDerivation { description = "backup system trying to combine best a mirror and an incremental backup system"; homepage = http://rdiff-backup.nongnu.org/; license = stdenv.lib.licenses.gpl2; + platforms = stdenv.lib.platforms.all; maintainers = with stdenv.lib.maintainers; [ the-kenny ]; }; } From bad831d6fe6fa3a798b4c34e6e3c932519077337 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Sun, 23 Nov 2014 21:58:46 +0100 Subject: [PATCH 249/383] rdiff-backup: unbreak 'rdiff-backup-statistics' By adding needed module to python sys.path. Fixes this: $ rdiff-backup-statistics backup-dir Traceback (most recent call last): File "/home/bfo/.nix-profile/bin/rdiff-backup-statistics", line 24, in from rdiff_backup import connection, regress, rpath, Globals, restore, \ ImportError: No module named rdiff_backup --- pkgs/tools/backup/rdiff-backup/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/tools/backup/rdiff-backup/default.nix b/pkgs/tools/backup/rdiff-backup/default.nix index 441c37c5f7d..47db1a5d4b2 100644 --- a/pkgs/tools/backup/rdiff-backup/default.nix +++ b/pkgs/tools/backup/rdiff-backup/default.nix @@ -13,6 +13,8 @@ stdenv.mkDerivation { python ./setup.py install --prefix=$out sed -i $out/bin/rdiff-backup -e \ "/import sys/ asys.path += [ \"$out/lib/python2.7/site-packages/\" ]" + sed -i $out/bin/rdiff-backup-statistics -e \ + "/import .*sys/ asys.path += [ \"$out/lib/python2.7/site-packages/\" ]" ''; buildInputs = [ python librsync gnused ]; From f5e31f4e5cc90d38eb316ae8491f76444a7bc7a0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Sun, 23 Nov 2014 22:04:21 +0100 Subject: [PATCH 250/383] rdiff-backup: align attrname with pkgname --- pkgs/top-level/all-packages.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 28359170ec3..b87f7bbaa23 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2230,7 +2230,7 @@ let reptyr = callPackage ../os-specific/linux/reptyr {}; - rdiff_backup = callPackage ../tools/backup/rdiff-backup { }; + rdiff-backup = callPackage ../tools/backup/rdiff-backup { }; rdmd = callPackage ../development/compilers/rdmd { }; @@ -12781,6 +12781,7 @@ let lttngUst = lttng-ust; # added 2014-07-31 jquery_ui = jquery-ui; # added 2014-09-07 youtubeDL = youtube-dl; # added 2014-10-26 + rdiff_backup = rdiff-backup; # added 2014-11-23 }; in self; in pkgs From a96eda1cfca22258c82e09d383351896bd6dbd6d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 23 Nov 2014 20:42:49 +0100 Subject: [PATCH 251/383] haskell-hspec-core: update to version 2.0.2 --- pkgs/development/libraries/haskell/hspec-core/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/hspec-core/default.nix b/pkgs/development/libraries/haskell/hspec-core/default.nix index 454f7c55bc7..5e8378dd871 100644 --- a/pkgs/development/libraries/haskell/hspec-core/default.nix +++ b/pkgs/development/libraries/haskell/hspec-core/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "hspec-core"; - version = "2.0.1"; - sha256 = "1yr2hkr1p95bpj5n6hqw20g8imqal6pva4nrvy0hmxdg53jyxcf7"; + version = "2.0.2"; + sha256 = "19nssrvwnpa9yib9qqrhf1hi8m624si97874hhdh2hqc7kjqr332"; buildDepends = [ ansiTerminal async deepseq hspecExpectations HUnit QuickCheck quickcheckIo random setenv tfRandom time transformers From 4fd4b2c6bc924428dcae5c99984e7606e6f7bbdb Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 23 Nov 2014 20:45:02 +0100 Subject: [PATCH 252/383] haskell-vimus: re-generate with cabal2nix --- pkgs/applications/audio/vimus/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/audio/vimus/default.nix b/pkgs/applications/audio/vimus/default.nix index 7f8c4e89f7f..6bd51760e88 100644 --- a/pkgs/applications/audio/vimus/default.nix +++ b/pkgs/applications/audio/vimus/default.nix @@ -9,7 +9,7 @@ cabal.mkDerivation (self: { pname = "vimus"; version = "0.2.0"; sha256 = "0s7hfyil9rnr9rmjb08g1l1sxybx3qdkw2f59p433fkdjp2m140h"; - isLibrary = false; + isLibrary = true; isExecutable = true; buildDepends = [ dataDefault deepseq filepath libmpd mtl time utf8String wcwidth From 893d25a211687b6e04a08cf28dbddd066835a7df Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 23 Nov 2014 20:45:17 +0100 Subject: [PATCH 253/383] haskell-hspec-discover: update to version 2.0.2 --- pkgs/development/libraries/haskell/hspec-discover/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/hspec-discover/default.nix b/pkgs/development/libraries/haskell/hspec-discover/default.nix index b8af52ee87d..bf7d280fca0 100644 --- a/pkgs/development/libraries/haskell/hspec-discover/default.nix +++ b/pkgs/development/libraries/haskell/hspec-discover/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "hspec-discover"; - version = "2.0.1"; - sha256 = "0k54j1id5yj60kjxs16w4hr52wanc55l131arypcjgf9w4yx3x3w"; + version = "2.0.2"; + sha256 = "1439134sdgwimjihjy06g4vq3bkym97da4z1zkgxgj91ljfwlb2i"; isLibrary = true; isExecutable = true; buildDepends = [ filepath ]; From 88d5b7a3ba41591ed52cb51ef72a376615a8879a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 23 Nov 2014 20:45:19 +0100 Subject: [PATCH 254/383] haskell-hspec-wai: update to version 0.6.2 --- .../libraries/haskell/hspec-wai/default.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/haskell/hspec-wai/default.nix b/pkgs/development/libraries/haskell/hspec-wai/default.nix index 52e6c05a206..cb817c6df43 100644 --- a/pkgs/development/libraries/haskell/hspec-wai/default.nix +++ b/pkgs/development/libraries/haskell/hspec-wai/default.nix @@ -1,23 +1,23 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! { cabal, caseInsensitive, hspec, hspecCore, hspecExpectations -, httpTypes, text, transformers, wai, waiExtra +, httpTypes, QuickCheck, text, transformers, wai, waiExtra }: cabal.mkDerivation (self: { pname = "hspec-wai"; - version = "0.6.0"; - sha256 = "1zynikaa57pb1npmhckfcaad1q9p4xdzll9g3yfka55yc4x59nwr"; + version = "0.6.2"; + sha256 = "0nia4hz41g4264mn4s5j8dn9dh0xhdf1gym92wvjmy43rhj3qpzb"; buildDepends = [ caseInsensitive hspecCore hspecExpectations httpTypes text transformers wai waiExtra ]; testDepends = [ - caseInsensitive hspec hspecCore hspecExpectations httpTypes text - transformers wai waiExtra + caseInsensitive hspec hspecCore hspecExpectations httpTypes + QuickCheck text transformers wai waiExtra ]; meta = { - description = "Experimental Hspec support for testing WAI applications (depends on hspec2!)"; + description = "Experimental Hspec support for testing WAI applications"; license = self.stdenv.lib.licenses.mit; platforms = self.ghc.meta.platforms; }; From 24d450074ec89ab0d39798ecafb52881f4f1a46b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 23 Nov 2014 20:45:21 +0100 Subject: [PATCH 255/383] haskell-hspec: update to version 2.0.2 --- pkgs/development/libraries/haskell/hspec/default.nix | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/haskell/hspec/default.nix b/pkgs/development/libraries/haskell/hspec/default.nix index 58b0022d3b3..fc60a54cd73 100644 --- a/pkgs/development/libraries/haskell/hspec/default.nix +++ b/pkgs/development/libraries/haskell/hspec/default.nix @@ -1,17 +1,18 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! { cabal, hspecCore, hspecDiscover, hspecExpectations, hspecMeta -, QuickCheck, stringbuilder, transformers +, HUnit, QuickCheck, stringbuilder, transformers }: cabal.mkDerivation (self: { pname = "hspec"; - version = "2.0.1"; - sha256 = "05kwxn5sws8gc1v8im2pyirrj5bzc6lnj22q2klgj4mg3apjd0jb"; + version = "2.0.2"; + sha256 = "19zxsadp1xwxdyp6zksaz4czdnmjd0x3gmbh7pqv6l4dxmd0545a"; buildDepends = [ - hspecCore hspecDiscover hspecExpectations QuickCheck transformers + hspecCore hspecDiscover hspecExpectations HUnit QuickCheck + transformers ]; - testDepends = [ hspecCore hspecMeta QuickCheck stringbuilder ]; + testDepends = [ hspecCore hspecMeta stringbuilder ]; doCheck = false; meta = { homepage = "http://hspec.github.io/"; From 222366883df167e877719b86a489abd6323ea80d Mon Sep 17 00:00:00 2001 From: koral Date: Sun, 23 Nov 2014 23:37:53 +0100 Subject: [PATCH 256/383] girara: provided an alternative installation that doesn't require ncurses or gcc 4.9 --- pkgs/applications/misc/girara/default.nix | 27 ++++++++++++++--------- pkgs/top-level/all-packages.nix | 6 +++++ 2 files changed, 23 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/misc/girara/default.nix b/pkgs/applications/misc/girara/default.nix index 3a7e5da1e73..c7c110a978a 100644 --- a/pkgs/applications/misc/girara/default.nix +++ b/pkgs/applications/misc/girara/default.nix @@ -1,19 +1,27 @@ -{ stdenv, fetchurl, pkgconfig, gtk, gettext, ncurses }: +{ stdenv, fetchurl, pkgconfig, gtk, gettext, withBuildColors ? true, ncurses ? null}: +assert withBuildColors -> ncurses != null; + +with stdenv.lib; stdenv.mkDerivation rec { - name = "girara-0.2.3"; + name = "girara-${version}"; + version = "0.2.3"; src = fetchurl { url = "http://pwmt.org/projects/girara/download/${name}.tar.gz"; sha256 = "1phfmqp8y17zcy9yi6pm2f80x8ldbk60iswpm4bmjz5217jwqzxh"; }; + preConfigure = '' + sed -i 's/ifdef TPUT_AVAILABLE/ifneq ($(TPUT_AVAILABLE), 0)/' colors.mk + ''; + buildInputs = [ pkgconfig gtk gettext ]; - makeFlags = [ - "PREFIX=$(out)" - "TPUT=${ncurses}/bin/tput" - ]; + makeFlags = [ "PREFIX=$(out)" ] + ++ optional withBuildColors "TPUT=${ncurses}/bin/tput" + ++ optional (!withBuildColors) "TPUT_AVAILABLE=0" + ; meta = { homepage = http://pwmt.org/projects/girara/; @@ -22,9 +30,8 @@ stdenv.mkDerivation rec { girara is a library that implements a GTK+ based VIM-like user interface that focuses on simplicity and minimalism. ''; - license = stdenv.lib.licenses.zlib; - platforms = stdenv.lib.platforms.linux; - maintainers = [ stdenv.lib.maintainers.garbas ]; + license = licenses.zlib; + platforms = platforms.linux; + maintainers = [ maintainers.garbas ]; }; } - diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c96d5b255ed..66357ffcd40 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11286,6 +11286,12 @@ let stdenv = overrideGCC stdenv gcc49; }; + girara-light = callPackage ../applications/misc/girara { + gtk = gtk3; + withBuildColors = false; + ncurses = null; + }; + zgrviewer = callPackage ../applications/graphics/zgrviewer {}; zim = callPackage ../applications/office/zim { From ec8bfcb6962807600c54ee230f3ec7c33fcd9097 Mon Sep 17 00:00:00 2001 From: Arseniy Seroka Date: Sun, 23 Nov 2014 22:42:22 +0300 Subject: [PATCH 257/383] racer: add pkg and vim plugin --- pkgs/development/tools/rust/racer/default.nix | 29 +++++++++++++++++++ pkgs/misc/vim-plugins/default.nix | 22 +++++++++++++- pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 52 insertions(+), 1 deletion(-) create mode 100644 pkgs/development/tools/rust/racer/default.nix diff --git a/pkgs/development/tools/rust/racer/default.nix b/pkgs/development/tools/rust/racer/default.nix new file mode 100644 index 00000000000..277f83ded73 --- /dev/null +++ b/pkgs/development/tools/rust/racer/default.nix @@ -0,0 +1,29 @@ +{stdenv, fetchgit, rust, makeWrapper }: + +let + rustSrc = rust.src; +in + +stdenv.mkDerivation rec { + #TODO add emacs support + name = "racer-git-2014-11-24"; + src = fetchgit { + url = https://github.com/phildawes/racer; + rev = "50655ffd509bea09ea9b310970dedfeaf5a33cf3"; + sha256 = "0bd456i4nz12z39ljnw1kjg8mcflvm7rjql2r80fb038c7rd6xi1"; + }; + + buildInputs = [ rust makeWrapper ]; + + installPhase = '' + mkdir -p $out/bin + cp -p bin/racer $out/bin/ + wrapProgram $out/bin/racer --set RUST_SRC_PATH "${rustSrc}/src" + ''; + + meta = { + description = "A utility intended to provide rust code completion for editors and IDEs."; + homepage = https://github.com/phildawes/racer; + license = stdenv.lib.licenses.mit; + }; +} diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix index ecb3fbc1d57..7988b112c76 100644 --- a/pkgs/misc/vim-plugins/default.nix +++ b/pkgs/misc/vim-plugins/default.nix @@ -1,5 +1,5 @@ # TODO check that no license information gets lost -{ fetchurl, bash, stdenv, python, cmake, vim, perl, ruby, unzip, which, fetchgit, fetchzip, llvmPackages, zip }: +{ fetchurl, bash, stdenv, python, cmake, vim, perl, ruby, unzip, which, fetchgit, fetchzip, llvmPackages, zip, racerRust }: /* Typical plugin files: @@ -595,6 +595,26 @@ rec { }; }; + racer = buildVimPlugin { + name = "racer-git-2014-11-24"; + src = fetchgit { + url = https://github.com/phildawes/racer; + rev = "50655ffd509bea09ea9b310970dedfeaf5a33cf3"; + sha256 = "0bd456i4nz12z39ljnw1kjg8mcflvm7rjql2r80fb038c7rd6xi1"; + }; + buildPhase = '' + find . -type f -not -name 'racer.vim' -exec rm -rf {} \; + mkdir plugin + mv ./editors/racer.vim plugin/racer.vim + rm -rf editors images src + ''; + /*patches = [ ./racer.patch ];*/ + meta = { + homepage = https://github.com/phildawes/racer; + maintainers = [ stdenv.lib.maintainers.jagajaga ]; + }; + }; + rainbow_parentheses = buildVimPlugin { name = "rainbow_parentheses"; src = fetchgit { diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b87f7bbaa23..862d86b7817 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4646,6 +4646,8 @@ let pstack = callPackage ../development/tools/misc/gdb/pstack.nix { }; + racerRust = callPackage ../development/tools/rust/racer { rust = rustcMaster; }; + radare = callPackage ../development/tools/analysis/radare { inherit (gnome) vte; lua = lua5; From 3367a28270b261bebecac2542b1de22175114b87 Mon Sep 17 00:00:00 2001 From: Arseniy Seroka Date: Mon, 24 Nov 2014 02:44:27 +0300 Subject: [PATCH 258/383] fix typos and remove useless imports --- pkgs/misc/vim-plugins/default.nix | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix index 7988b112c76..bafa6dc21bf 100644 --- a/pkgs/misc/vim-plugins/default.nix +++ b/pkgs/misc/vim-plugins/default.nix @@ -1,5 +1,5 @@ # TODO check that no license information gets lost -{ fetchurl, bash, stdenv, python, cmake, vim, perl, ruby, unzip, which, fetchgit, fetchzip, llvmPackages, zip, racerRust }: +{ fetchurl, bash, stdenv, python, cmake, vim, perl, ruby, unzip, which, fetchgit, fetchzip, llvmPackages, zip }: /* Typical plugin files: @@ -606,9 +606,8 @@ rec { find . -type f -not -name 'racer.vim' -exec rm -rf {} \; mkdir plugin mv ./editors/racer.vim plugin/racer.vim - rm -rf editors images src + rm -rf editors images src ''; - /*patches = [ ./racer.patch ];*/ meta = { homepage = https://github.com/phildawes/racer; maintainers = [ stdenv.lib.maintainers.jagajaga ]; From 2db4171978794c05de7c47354339d40faa14e959 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Sun, 23 Nov 2014 19:27:11 -0500 Subject: [PATCH 259/383] Add jetty 9.2.5 --- pkgs/servers/http/jetty/9.2.nix | 30 ++++++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 32 insertions(+) create mode 100644 pkgs/servers/http/jetty/9.2.nix diff --git a/pkgs/servers/http/jetty/9.2.nix b/pkgs/servers/http/jetty/9.2.nix new file mode 100644 index 00000000000..41afc9b40af --- /dev/null +++ b/pkgs/servers/http/jetty/9.2.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchurl }: + +stdenv.mkDerivation rec { + name = "jetty-9.2.5"; + + src = fetchurl { + url = "http://eclipse.org/downloads/download.php?file=/jetty/stable-9/dist/jetty-distribution-9.2.5.v20141112.tar.gz&r=1"; + name = "jetty-distribution-9.2.5.v20141112.tar.gz"; + sha256 = "1azqhvvqm9il5n07vms5vv27vr3qhmsy44nmqcgsaggq7p37swf1"; + }; + + phases = [ "unpackPhase" "installPhase" ]; + + installPhase = '' + mkdir -p $out + mv etc lib modules start.jar $out + ''; + + meta = { + description = "A Web server and javax.servlet container"; + + homepage = http://www.eclipse.org/jetty/; + + maintainers = [ stdenv.lib.maintainers.shlevy ]; + + platforms = stdenv.lib.platforms.all; + + license = [ stdenv.lib.licenses.asl20 stdenv.lib.licenses.epl10 ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 862d86b7817..c8022b60737 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7569,6 +7569,8 @@ let jetty61 = callPackage ../servers/http/jetty/6.1 { }; + jetty92 = callPackage ../servers/http/jetty/9.2.nix { }; + joseki = callPackage ../servers/http/joseki {}; leafnode = callPackage ../servers/news/leafnode { }; From acefc2220964f0b4cd94dda0fa852c3bdef30754 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Sun, 23 Nov 2014 16:49:25 -0800 Subject: [PATCH 260/383] kernel: 3.18.0-rc5 -> 3.18.0-rc6 --- pkgs/os-specific/linux/kernel/linux-testing.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-testing.nix b/pkgs/os-specific/linux/kernel/linux-testing.nix index 9cb788bb1a9..54105ade1e9 100644 --- a/pkgs/os-specific/linux/kernel/linux-testing.nix +++ b/pkgs/os-specific/linux/kernel/linux-testing.nix @@ -1,13 +1,13 @@ { stdenv, fetchurl, ... } @ args: import ./generic.nix (args // rec { - version = "3.18-rc5"; - modDirVersion = "3.18.0-rc5"; + version = "3.18-rc6"; + modDirVersion = "3.18.0-rc6"; extraMeta.branch = "3.18"; src = fetchurl { url = "mirror://kernel/linux/kernel/v3.x/testing/linux-${version}.tar.xz"; - sha256 = "1dx354hsncx3r33y35c4f5baz75q5xs25yi5bgkszad1rlrg86sk"; + sha256 = "03flqar4jgaw042bf1v9ay3sg6y18irqklbpxk5x1g1yyjpbc6h8"; }; features.iwlwifi = true; From b02f1cc2a42924e468b659edbc4f79bf764a1b6b Mon Sep 17 00:00:00 2001 From: Jeremy Huffman Date: Sun, 23 Nov 2014 20:12:49 -0500 Subject: [PATCH 261/383] add higher-leveldb from hackage --- .../haskell/higher-leveldb/default.nix | 25 +++++++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/development/libraries/haskell/higher-leveldb/default.nix diff --git a/pkgs/development/libraries/haskell/higher-leveldb/default.nix b/pkgs/development/libraries/haskell/higher-leveldb/default.nix new file mode 100644 index 00000000000..07afeea6a92 --- /dev/null +++ b/pkgs/development/libraries/haskell/higher-leveldb/default.nix @@ -0,0 +1,25 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, cereal, dataDefault, hspec, leveldbHaskell, liftedBase +, monadControl, mtl, resourcet, transformers, transformersBase +}: + +cabal.mkDerivation (self: { + pname = "higher-leveldb"; + version = "0.2.0.0"; + sha256 = "1al8l96ysmcjx3g93ryfr939jqhjqk8g5bvww5gj9mx6pdkqrcm3"; + buildDepends = [ + cereal dataDefault leveldbHaskell liftedBase monadControl mtl + resourcet transformers transformersBase + ]; + testDepends = [ + cereal hspec leveldbHaskell liftedBase monadControl mtl resourcet + transformers transformersBase + ]; + meta = { + homepage = "https://github.com/jeremyjh/higher-leveldb"; + description = "A rich monadic API for working with leveldb databases"; + 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 b37ff75e0d4..3753b490208 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1105,6 +1105,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in hgal = callPackage ../development/libraries/haskell/hgal {}; + higherLeveldb = callPackage ../development/libraries/haskell/higher-leveldb {}; + hourglass = callPackage ../development/libraries/haskell/hourglass {}; hplayground = callPackage ../development/libraries/haskell/hplayground {}; From 7893b6c5976962c3c4c831e46c7b873f14179694 Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Mon, 24 Nov 2014 03:10:09 +0100 Subject: [PATCH 262/383] added myself --- lib/maintainers.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 8631c4ba83c..101d392b221 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -99,6 +99,7 @@ ludo = "Ludovic Courtès "; madjar = "Georges Dubus "; manveru = "Michael Fellinger "; + magnetophon = "Bart Brouns "; marcweber = "Marc Weber "; matejc = "Matej Cotman "; meisternu = "Matt Miemiec "; From 9b670274229f654410c3c237ccf5e002de57db18 Mon Sep 17 00:00:00 2001 From: "Ricardo M. Correia" Date: Thu, 20 Nov 2014 19:54:27 +0100 Subject: [PATCH 263/383] pax-utils: Update from 0.9.1 -> 0.9.2 --- pkgs/os-specific/linux/pax-utils/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/pax-utils/default.nix b/pkgs/os-specific/linux/pax-utils/default.nix index 635402a35f0..5646ba89f66 100644 --- a/pkgs/os-specific/linux/pax-utils/default.nix +++ b/pkgs/os-specific/linux/pax-utils/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "pax-utils-${version}"; - version = "0.9.1"; + version = "0.9.2"; src = fetchurl { url = "http://dev.gentoo.org/~vapier/dist/${name}.tar.xz"; - sha256 = "034b365il58bd01ld8r5493x7qkxbxzavmgwm916r0rgjpvclg34"; + sha256 = "1pmlpjhr2475h5v90abmsfgr37r3b6c4mknhzswbgcb10vgh322p"; }; makeFlags = [ From c07f81ce894bbaa05ab42a0d92a4ffdd924ce35a Mon Sep 17 00:00:00 2001 From: "Ricardo M. Correia" Date: Mon, 24 Nov 2014 03:52:41 +0100 Subject: [PATCH 264/383] grsecurity: Update stable and test patches stable: 3.0-3.14.25-201411220954 -> 3.0-3.14.25-201411231452 test: 3.0-3.17.4-201411220955 -> 3.0-3.17.4-201411231452 --- pkgs/os-specific/linux/kernel/patches.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/patches.nix b/pkgs/os-specific/linux/kernel/patches.nix index b0b9d96e95c..e0e328566c8 100644 --- a/pkgs/os-specific/linux/kernel/patches.nix +++ b/pkgs/os-specific/linux/kernel/patches.nix @@ -61,16 +61,16 @@ rec { grsecurity_stable = grsecPatch { kversion = "3.14.25"; - revision = "201411220954"; + revision = "201411231452"; branch = "stable"; - sha256 = "01x2i1r96r29s8sp2bl642ifwilfx7lh3id6a8sz6d0nf3mfypln"; + sha256 = "033i7lgc0qp63d772xgikb3bh9hp78xapdaqwi85lgbzi39ak2gz"; }; grsecurity_unstable = grsecPatch { kversion = "3.17.4"; - revision = "201411220955"; + revision = "201411231452"; branch = "test"; - sha256 = "1iw5ivm97dkpigxn04qmacd43f2l0ihixq1j9f8c32hxjbqvsps2"; + sha256 = "1ns8im11lbqyvk2kmaz88ymw1b1ni1h4byb763rbrnxclrid1f2d"; }; grsec_fix_path = From 0edc635d8088840508cb3f49bff921a94f366746 Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Mon, 24 Nov 2014 05:27:56 +0100 Subject: [PATCH 265/383] Add faust, the functional audio stream programming language --- pkgs/applications/audio/faust/default.nix | 44 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 46 insertions(+) create mode 100644 pkgs/applications/audio/faust/default.nix diff --git a/pkgs/applications/audio/faust/default.nix b/pkgs/applications/audio/faust/default.nix new file mode 100644 index 00000000000..e9f47088f52 --- /dev/null +++ b/pkgs/applications/audio/faust/default.nix @@ -0,0 +1,44 @@ +{ fetchurl, stdenv, unzip, pkgconfig, gcc }: + +stdenv.mkDerivation rec { + + version = "0.9.67"; + name = "faust-${version}"; + src = fetchurl { + url = "http://downloads.sourceforge.net/project/faudiostream/${name}.zip"; + sha256 = "068vl9536zn0j4pknwfcchzi90rx5pk64wbcbd67z32w0csx8xm1"; + }; + + buildInputs = [ unzip pkgconfig gcc ]; + + patchPhase='' + sed -i 's#?= $(shell uname -s)#:= Linux#g' architecture/osclib/oscpack/Makefile + sed -e "s@\$FAUST_INSTALL /usr/local /usr /opt /opt/local@$out@g" -i tools/faust2appls/faustpath + ''; + + + makeFlags="PREFIX=$(out)"; + + meta = with stdenv.lib; { + description = "A functional programming language for realtime audio signal processing"; + longDescription = '' + FAUST (Functional Audio Stream) is a functional programming + language specifically designed for real-time signal processing + and synthesis. FAUST targets high-performance signal processing + applications and audio plug-ins for a variety of platforms and + standards. + The Faust compiler translates DSP specifications into very + efficient C++ code. Thanks to the notion of architecture, + FAUST programs can be easily deployed on a large variety of + audio platforms and plugin formats (jack, alsa, ladspa, maxmsp, + puredata, csound, supercollider, pure, vst, coreaudio) without + any change to the FAUST code. + ''; + homepage = http://faust.grame.fr/; + downloadPage = http://sourceforge.net/projects/faudiostream/files/; + license = licenses.gpl2; + platforms = platforms.linux; + maintainers = [ maintainers.magnetophon ]; + }; +} + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c8022b60737..a35576a4f1a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12372,6 +12372,8 @@ let fakenes = callPackage ../misc/emulators/fakenes { }; + faust = callPackage ../applications/audio/faust { }; + fceux = callPackage ../misc/emulators/fceux { }; foldingathome = callPackage ../misc/foldingathome { }; From 3e714701e5f59a86bcb42b1beca298366f2005ca Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Mon, 24 Nov 2014 08:07:27 +0100 Subject: [PATCH 266/383] remove unused stuff leave only faust itself, it's libraries, and cpp architecture files that can be used as examples. --- lib/maintainers.nix | 1 + pkgs/applications/audio/faust/default.nix | 8 ++++++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 8631c4ba83c..d02e2cec53d 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -98,6 +98,7 @@ lovek323 = "Jason O'Conal "; ludo = "Ludovic Courtès "; madjar = "Georges Dubus "; + magnetophon = "Bart Brouns "; manveru = "Michael Fellinger "; marcweber = "Marc Weber "; matejc = "Matej Cotman "; diff --git a/pkgs/applications/audio/faust/default.nix b/pkgs/applications/audio/faust/default.nix index e9f47088f52..bcfd6020a4f 100644 --- a/pkgs/applications/audio/faust/default.nix +++ b/pkgs/applications/audio/faust/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, unzip, pkgconfig, gcc }: +{ fetchurl, stdenv, unzip }: stdenv.mkDerivation rec { @@ -9,13 +9,17 @@ stdenv.mkDerivation rec { sha256 = "068vl9536zn0j4pknwfcchzi90rx5pk64wbcbd67z32w0csx8xm1"; }; - buildInputs = [ unzip pkgconfig gcc ]; + buildInputs = [ unzip ]; patchPhase='' + sed -i '77,101d' Makefile sed -i 's#?= $(shell uname -s)#:= Linux#g' architecture/osclib/oscpack/Makefile sed -e "s@\$FAUST_INSTALL /usr/local /usr /opt /opt/local@$out@g" -i tools/faust2appls/faustpath ''; + postInstallPhase='' + rm -rf $out/include/ + ''; makeFlags="PREFIX=$(out)"; From 9b75a2d26515da2cf73ce76f638964f5a26001cb Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 24 Nov 2014 08:28:29 +0100 Subject: [PATCH 267/383] Revert "added myself" --- lib/maintainers.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/lib/maintainers.nix b/lib/maintainers.nix index de1e533a2aa..d02e2cec53d 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -100,7 +100,6 @@ madjar = "Georges Dubus "; magnetophon = "Bart Brouns "; manveru = "Michael Fellinger "; - magnetophon = "Bart Brouns "; marcweber = "Marc Weber "; matejc = "Matej Cotman "; meisternu = "Matt Miemiec "; From 7855e28868272797c0158243dd277aef3860afce Mon Sep 17 00:00:00 2001 From: Jean-Philippe Bernardy Date: Thu, 20 Nov 2014 16:21:15 +0100 Subject: [PATCH 268/383] haskell: polynomials-bernstein: new package --- .../haskell/polynomials-bernstein/default.nix | 16 ++++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 18 insertions(+) create mode 100644 pkgs/development/libraries/haskell/polynomials-bernstein/default.nix diff --git a/pkgs/development/libraries/haskell/polynomials-bernstein/default.nix b/pkgs/development/libraries/haskell/polynomials-bernstein/default.nix new file mode 100644 index 00000000000..39d11b80de9 --- /dev/null +++ b/pkgs/development/libraries/haskell/polynomials-bernstein/default.nix @@ -0,0 +1,16 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, vector }: + +cabal.mkDerivation (self: { + pname = "polynomials-bernstein"; + version = "1.1.1"; + sha256 = "0pjdwi84gz5j1rij4m89nyljjafzjnakmf4yd6vj4xz54nmmygg6"; + buildDepends = [ vector ]; + meta = { + description = "A solver for systems of polynomial equations in bernstein form"; + license = self.stdenv.lib.licenses.gpl2Plus; + platforms = self.ghc.meta.platforms; + maintainers = with self.stdenv.lib.maintainers; [ jpbernardy ]; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 9725f2a0bca..b6eba8d3991 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1908,6 +1908,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in plugins= callPackage ../development/libraries/haskell/plugins {}; + polynomialsBernstein = callPackage ../development/libraries/haskell/polynomials-bernstein {}; + polyparse = callPackage ../development/libraries/haskell/polyparse {}; pointed = callPackage ../development/libraries/haskell/pointed {}; From 5f599a3ddd622ce11034a550654d3e5c970d46ac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Mon, 24 Nov 2014 08:42:50 +0100 Subject: [PATCH 269/383] remove pdf-filter --- pkgs/misc/cups/pdf-filter.nix | 39 ----------------------------------- 1 file changed, 39 deletions(-) delete mode 100644 pkgs/misc/cups/pdf-filter.nix diff --git a/pkgs/misc/cups/pdf-filter.nix b/pkgs/misc/cups/pdf-filter.nix deleted file mode 100644 index e99ad03212c..00000000000 --- a/pkgs/misc/cups/pdf-filter.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, cups, poppler }: - -stdenv.mkDerivation { - name = "cups-pdf-filter-${cups.version}"; - - inherit (cups) src; - - buildInputs = [ pkgconfig cups poppler ]; - - preConfigure = '' - sed -e 's@\.\./cups/$(LIBCUPS)@@' -e 's@$(LIBCUPSIMAGE)@@' -i filter/Makefile - ''; - - NIX_LDFLAGS="-L${cups}/lib"; - - configureFlags = '' - --localstatedir=/var --enable-dbus - --enable-image --with-pdftops=pdftops''; - - buildPhase = '' - cd filter - make pdftops - ''; - - installPhase = '' - mkdir -pv $out/lib/cups/filter $out/share/cups/mime - cp -v pdftops $out/lib/cups/filter - echo >$out/share/cups/mime/pdftops.convs 'application/pdf application/vnd.cups-postscript 66 pdftops' - ''; - - - meta = { - homepage = http://www.cups.org/; - description = "Image and pdf filters for CUPS"; - license = stdenv.lib.licenses.gpl2; - maintainers = [ stdenv.lib.maintainers.urkud ]; - platforms = stdenv.lib.platforms.linux; - }; -} From d8e89ebd4b8feaf3326350267c43b4e4ace1beb6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Mon, 24 Nov 2014 08:43:34 +0100 Subject: [PATCH 270/383] xmlroff: 0.3.98 -> 0.6.2 --- pkgs/tools/typesetting/xmlroff/default.nix | 30 ++++++++++++++------ pkgs/tools/typesetting/xmlroff/xmlroff.patch | 23 +++++++-------- pkgs/top-level/all-packages.nix | 4 +-- 3 files changed, 33 insertions(+), 24 deletions(-) diff --git a/pkgs/tools/typesetting/xmlroff/default.nix b/pkgs/tools/typesetting/xmlroff/default.nix index 1545b626a7f..5f118e636b8 100644 --- a/pkgs/tools/typesetting/xmlroff/default.nix +++ b/pkgs/tools/typesetting/xmlroff/default.nix @@ -1,27 +1,39 @@ -{ stdenv, fetchurl, pkgconfig, libxml2, libxslt, popt -, glib, pango, libgnomeprint, pangoxsl, gtk}: +{ stdenv, fetchurl, pkgconfig, libxml2, libxslt, popt, perl +, glib, pango, pangoxsl, gtk, libtool, autoconf, automake }: + +stdenv.mkDerivation rec { + name = "xmlroff-${version}"; + version = "0.6.2"; -stdenv.mkDerivation { - #name = "xmlroff-0.3.5"; - name = "xmlroff-0.3.98"; src = fetchurl { - url = mirror://sourceforge/xmlroff/xmlroff-0.3.98.tar.gz; - sha256 = "0pg7zc8ri0xzmdk30vnyd84wy8yn973h1bnrvibv71q44s6xhwp2"; + url = "https://github.com/xmlroff/xmlroff/archive/v${version}.tar.gz"; + sha256 = "1sczn6xjczsfdxlbjqv4xqlki2a95y2s8ih2nl9v1vhqfk17fiww"; }; buildInputs = [ pkgconfig + autoconf + automake libxml2 libxslt + libtool glib pango - libgnomeprint pangoxsl gtk popt ]; - configureFlags = "--disable-pangoxsl"; + configureScript = "./autogen.sh"; + + configureFlags = "--disable-pangoxsl --disable-gp"; + + preBuild = '' + substituteInPlace tools/insert-file-as-string.pl --replace "/usr/bin/perl" "${perl}/bin/perl" + substituteInPlace Makefile --replace "docs" "" + ''; + + sourceRoot = "${name}/xmlroff/"; patches = [./xmlroff.patch]; } diff --git a/pkgs/tools/typesetting/xmlroff/xmlroff.patch b/pkgs/tools/typesetting/xmlroff/xmlroff.patch index 16bd7b0a76d..6f0246e9679 100644 --- a/pkgs/tools/typesetting/xmlroff/xmlroff.patch +++ b/pkgs/tools/typesetting/xmlroff/xmlroff.patch @@ -1,12 +1,11 @@ -diff -ruN xmlroff-0.3.98/Makefile.in xmlroff-0.3.98.new/Makefile.in ---- xmlroff-0.3.98/Makefile.in 2006-05-30 17:46:37.000000000 +0200 -+++ xmlroff-0.3.98.new/Makefile.in 2006-06-18 13:47:37.000000000 +0200 -@@ -288,7 +288,7 @@ - subdirs = @subdirs@ - sysconfdir = @sysconfdir@ - target_alias = @target_alias@ --SUBDIRS = pangoxsl libfo area fo datatype property expr util . examples docs -+SUBDIRS = libfo area fo datatype property expr util . examples docs - @PLATFORM_WIN32_TRUE@no_undefined = -no-undefined - INCLUDES = \ - -DG_LOG_DOMAIN=\"libfo\" \ +--- xmlroff-0.6.2.orig/libfo/fo-libfo-basic.h ++++ xmlroff-0.6.2/libfo/fo-libfo-basic.h +@@ -11,8 +11,7 @@ + #define __FO_LIBFO_BASIC_H__ + + #include +-#include +-#include ++#include + + G_BEGIN_DECLS diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a35576a4f1a..a2541188567 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2808,9 +2808,7 @@ let xml2 = callPackage ../tools/text/xml/xml2 { }; - xmlroff = callPackage ../tools/typesetting/xmlroff { - inherit (gnome) libgnomeprint; - }; + xmlroff = callPackage ../tools/typesetting/xmlroff { }; xmlstarlet = callPackage ../tools/text/xml/xmlstarlet { }; From 11a414ddd5030563994165cd559fc6c367c86007 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Mon, 24 Nov 2014 08:57:18 +0100 Subject: [PATCH 271/383] fix eval --- pkgs/development/mobile/androidenv/androidndk.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/mobile/androidenv/androidndk.nix b/pkgs/development/mobile/androidenv/androidndk.nix index e24d6cefc3f..14fdb00b7a9 100644 --- a/pkgs/development/mobile/androidenv/androidndk.nix +++ b/pkgs/development/mobile/androidenv/androidndk.nix @@ -1,6 +1,8 @@ { stdenv, fetchurl, zlib, ncurses, p7zip }: +assert stdenv.isLinux; + stdenv.mkDerivation rec { name = "android-ndk-r10c"; From b4c3eadd08205525118dc38a5e9a891bca223cd5 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Mon, 24 Nov 2014 00:05:56 -0800 Subject: [PATCH 272/383] unifi: 3.2.1 -> 3.2.7 --- pkgs/servers/unifi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/unifi/default.nix b/pkgs/servers/unifi/default.nix index 8aa15ee9f82..27958494d17 100644 --- a/pkgs/servers/unifi/default.nix +++ b/pkgs/servers/unifi/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "unifi-controller-${version}"; - version = "3.2.1"; + version = "3.2.7"; src = fetchurl { url = "http://dl.ubnt.com/unifi/${version}/UniFi.unix.zip"; - sha256 = "0x7s5k9wxkw0rcs4c2mdrmmjpcfmbh5pvvpj8brrwnkgx072n53c"; + sha256 = "12g9x1k0l89rdlaw260561m17yc0bkp62prg3y05z6gbs7khh2xh"; }; buildInputs = [ unzip ]; From 3f7b2bc70dc8fc375aab07a575c08b57f856299c Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Mon, 24 Nov 2014 00:06:39 -0800 Subject: [PATCH 273/383] unifi: Fix typo --- nixos/modules/services/networking/unifi.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/networking/unifi.nix b/nixos/modules/services/networking/unifi.nix index 764b83ff332..6584786bb52 100644 --- a/nixos/modules/services/networking/unifi.nix +++ b/nixos/modules/services/networking/unifi.nix @@ -65,7 +65,7 @@ in # Create the volatile webapps mkdir -p "${stateDir}/webapps" chown unifi "${stateDir}/webapps" - rm -f "{stateDir}/webapps/ROOT.war" + rm -f "${stateDir}/webapps/ROOT.war" ln -s "${pkgs.unifi}/webapps/ROOT.war" "${stateDir}/webapps/ROOT.war" ''; From 6872a4a79793ef0c4e2569a3e1ce1cdc99cce9fd Mon Sep 17 00:00:00 2001 From: Cray Elliott Date: Mon, 24 Nov 2014 00:16:08 -0800 Subject: [PATCH 274/383] Fix Android NDK package, previously ndk-build was not being properly put in $PATH This commit also brings in the dependencies ndk-build needs and fixes a bug with permissions This was commited on behalf of ewemoa --- .../mobile/androidenv/androidndk.nix | 59 ++++++++++++++++--- .../mobile/androidenv/build-app.nix | 2 +- .../development/mobile/androidenv/default.nix | 4 +- 3 files changed, 54 insertions(+), 11 deletions(-) diff --git a/pkgs/development/mobile/androidenv/androidndk.nix b/pkgs/development/mobile/androidenv/androidndk.nix index 14fdb00b7a9..91dbdc77361 100644 --- a/pkgs/development/mobile/androidenv/androidndk.nix +++ b/pkgs/development/mobile/androidenv/androidndk.nix @@ -1,4 +1,6 @@ -{ stdenv, fetchurl, zlib, ncurses, p7zip +{ stdenv, fetchurl, zlib, ncurses, p7zip, lib, makeWrapper +, coreutils, file, findutils, gawk, gnugrep, gnused, jdk, which +, platformTools }: assert stdenv.isLinux; @@ -17,23 +19,62 @@ stdenv.mkDerivation rec { } else throw "platform ${stdenv.system} not supported!"; - phases = "installPhase"; + phases = "buildPhase"; - buildInputs = [ p7zip ]; + buildInputs = [ p7zip makeWrapper ]; - installPhase = '' + buildCommand = let + bin_path = "$out/bin"; + pkg_path = "$out/libexec/${name}"; + sed_script_1 = + "'s|^PROGDIR=`dirname $0`" + + "|PROGDIR=`dirname $(readlink -f $(which $0))`|'"; + sed_script_2 = + "'s|^MYNDKDIR=`dirname $0`" + + "|MYNDKDIR=`dirname $(readlink -f $(which $0))`|'"; + runtime_paths = (lib.makeSearchPath "bin" [ + coreutils file findutils + gawk gnugrep gnused + jdk + which + ]) + ":${platformTools}/platform-tools"; + in '' set -x - mkdir -pv $out + mkdir -pv $out/libexec + cd $out/libexec 7z x $src - mv */* $out # so that it doesn't fail because of read-only permissions set - patch -p1 -d $out < ${ ./make-standalone-toolchain.patch } + cd - + patch -p1 \ + --no-backup-if-mismatch \ + -d $out/libexec/${name} < ${ ./make-standalone-toolchain.patch } + cd ${pkg_path} find $out \( \ \( -type f -a -name "*.so*" \) -o \ - \( -type f -a -perm +0100 \) \ + \( -type f -a -perm /0100 \) \ \) -exec patchelf --set-interpreter ${stdenv.gcc.libc}/lib/ld-*so.? \ - --set-rpath ${zlib}/lib:${ncurses}/lib {} \; + --set-rpath ${zlib}/lib:${ncurses}/lib {} \; + # fix ineffective PROGDIR / MYNDKDIR determination + for i in ndk-build ndk-gdb ndk-gdb-py + do + sed -i -e ${sed_script_1} $i + done + sed -i -e ${sed_script_2} ndk-which + # a bash script + patchShebangs ndk-which + # make some executables available in PATH + mkdir -pv ${bin_path} + for i in \ + ndk-build ndk-depends ndk-gdb ndk-gdb-py ndk-gdb.py ndk-stack ndk-which + do + ln -sf ${pkg_path}/$i ${bin_path}/$i + done + # wrap + for i in ndk-build ndk-gdb ndk-gdb-py ndk-which + do + wrapProgram "${bin_path}/$i" --prefix PATH : "${runtime_paths}" + done ''; } diff --git a/pkgs/development/mobile/androidenv/build-app.nix b/pkgs/development/mobile/androidenv/build-app.nix index ca00e78b2cb..25af902679d 100644 --- a/pkgs/development/mobile/androidenv/build-app.nix +++ b/pkgs/development/mobile/androidenv/build-app.nix @@ -39,7 +39,7 @@ stdenv.mkDerivation ({ ${if useNDK then '' export GNUMAKE=${gnumake}/bin/make export NDK_HOST_AWK=${gawk}/bin/gawk - ${androidndk}/ndk-build + ${androidndk}/bin/ndk-build '' else ""} ant ${antFlags} ${if release then "release" else "debug"} ''; diff --git a/pkgs/development/mobile/androidenv/default.nix b/pkgs/development/mobile/androidenv/default.nix index 74afa5072f9..37e4db45822 100644 --- a/pkgs/development/mobile/androidenv/default.nix +++ b/pkgs/development/mobile/androidenv/default.nix @@ -129,7 +129,9 @@ rec { }; androidndk = import ./androidndk.nix { - inherit (pkgs) stdenv fetchurl zlib ncurses p7zip; + inherit (pkgs) stdenv fetchurl zlib ncurses p7zip lib makeWrapper; + inherit (pkgs) coreutils file findutils gawk gnugrep gnused jdk which; + inherit platformTools; }; buildApp = import ./build-app.nix { From 8f0d65e2df7bea5502b7be9d6b5ba74bbc880a1d Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Mon, 24 Nov 2014 00:22:12 -0800 Subject: [PATCH 275/383] unifi: Clean all of webapps at start and stop --- nixos/modules/services/networking/unifi.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/networking/unifi.nix b/nixos/modules/services/networking/unifi.nix index 6584786bb52..3a0640b0d80 100644 --- a/nixos/modules/services/networking/unifi.nix +++ b/nixos/modules/services/networking/unifi.nix @@ -63,14 +63,14 @@ in chmod 0700 "${stateDir}" # Create the volatile webapps + rm -rf "${stateDir}/webapps" mkdir -p "${stateDir}/webapps" chown unifi "${stateDir}/webapps" - rm -f "${stateDir}/webapps/ROOT.war" ln -s "${pkgs.unifi}/webapps/ROOT.war" "${stateDir}/webapps/ROOT.war" ''; postStop = '' - rm "${stateDir}/webapps/ROOT.war" + rm "${stateDir}/webapps" ''; serviceConfig = { From 35d5e4de762598d3fe309dccd20992cb58f855cb Mon Sep 17 00:00:00 2001 From: Cray Elliott Date: Mon, 24 Nov 2014 00:46:09 -0800 Subject: [PATCH 276/383] add android build tools to $PATH commited on behalf of ewemoa --- pkgs/development/mobile/androidenv/androidsdk.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/development/mobile/androidenv/androidsdk.nix b/pkgs/development/mobile/androidenv/androidsdk.nix index 560753eecfc..533c605cf24 100644 --- a/pkgs/development/mobile/androidenv/androidsdk.nix +++ b/pkgs/development/mobile/androidenv/androidsdk.nix @@ -192,6 +192,14 @@ stdenv.mkDerivation rec { ln -sf $i $out/bin/$(basename $i) fi done + + for i in $out/libexec/android-sdk-*/build-tools/android-*/* + do + if [ ! -d $i ] && [ -x $i ] + then + ln -sf $i $out/bin/$(basename $i) + fi + done ''; buildInputs = [ unzip makeWrapper ]; From b05e325b345a40b9826a90698db770531e926d45 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B6nke=20Hahn?= Date: Mon, 24 Nov 2014 16:18:44 +0800 Subject: [PATCH 277/383] new haskell package: logging-facade-0.0.0 --- .../haskell/logging-facade/default.nix | 19 +++++++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 21 insertions(+) create mode 100644 pkgs/development/libraries/haskell/logging-facade/default.nix diff --git a/pkgs/development/libraries/haskell/logging-facade/default.nix b/pkgs/development/libraries/haskell/logging-facade/default.nix new file mode 100644 index 00000000000..9e4e7601d85 --- /dev/null +++ b/pkgs/development/libraries/haskell/logging-facade/default.nix @@ -0,0 +1,19 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, fetchzip, hspec, transformers }: + +cabal.mkDerivation (self: { + pname = "logging-facade"; + version = "0.0.0"; + src = fetchzip { + url = "https://hackage.haskell.org/package/logging-facade-0.0.0/logging-facade-0.0.0.tar.gz"; + sha256 = "0w6bkzgf0lamcdnris95i1xq8wg882wf17b517rgr5d1vhxz9y7s"; + }; + buildDepends = [ transformers ]; + testDepends = [ hspec ]; + meta = { + description = "Simple logging abstraction that allows multiple backends"; + 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 b37ff75e0d4..94d5a97105c 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 logging = callPackage ../development/libraries/haskell/logging {}; + loggingFacade = callPackage ../development/libraries/haskell/logging-facade {}; + logict = callPackage ../development/libraries/haskell/logict {}; loop = callPackage ../development/libraries/haskell/loop {}; From d088a8152d56c8cf886ccf67c242119b5cc56e84 Mon Sep 17 00:00:00 2001 From: Jean-Philippe Bernardy Date: Mon, 24 Nov 2014 10:30:46 +0100 Subject: [PATCH 278/383] haskell: typography-geometry: new package --- .../haskell/typography-geometry/default.nix | 16 ++++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 18 insertions(+) create mode 100644 pkgs/development/libraries/haskell/typography-geometry/default.nix diff --git a/pkgs/development/libraries/haskell/typography-geometry/default.nix b/pkgs/development/libraries/haskell/typography-geometry/default.nix new file mode 100644 index 00000000000..c0b5b5fb1ab --- /dev/null +++ b/pkgs/development/libraries/haskell/typography-geometry/default.nix @@ -0,0 +1,16 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, parallel, polynomialsBernstein, vector }: + +cabal.mkDerivation (self: { + pname = "typography-geometry"; + version = "1.0.0"; + sha256 = "1vvqch3pdwymjbmir7b208qyzdzljsw1gf8icmzw5pi3vn6wkihf"; + buildDepends = [ parallel polynomialsBernstein vector ]; + meta = { + description = "Drawings for printed text documents"; + license = "GPL"; + platforms = self.ghc.meta.platforms; + maintainers = with self.stdenv.lib.maintainers; [ jpbernardy ]; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index 9289c1babab..c8d09ae9378 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -2590,6 +2590,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in typeLevelNaturalNumber = callPackage ../development/libraries/haskell/type-level-natural-number {}; + typographyGeometry = callPackage ../development/libraries/haskell/typography-geometry {}; + tz = callPackage ../development/libraries/haskell/tz { pkgs_tzdata = pkgs.tzdata; }; From 9dff67eed7238e338ec28a1d8341b0ce438b2663 Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Mon, 24 Nov 2014 04:46:55 +0100 Subject: [PATCH 279/383] lib/licenses: add gpl1 (close #5103) @vcunat changed format to spdx. --- lib/licenses.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/lib/licenses.nix b/lib/licenses.nix index 75a8149b7b9..93fe1118c94 100644 --- a/lib/licenses.nix +++ b/lib/licenses.nix @@ -134,6 +134,11 @@ lib.mapAttrs (n: v: v // { shortName = n; }) rec { fullName = "Unspecified free software license"; }; + gpl1 = spdx { + shortName = "GPL-1.0"; + fullName = "GNU General Public License v1.0 only"; + }; + gpl1Plus = spdx { spdxId = "GPL-1.0+"; fullName = "GNU General Public License v1.0 or later"; From eeb7ecbdc6171c9db3f46700ccd63863a73a45cb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?S=C3=B6nke=20Hahn?= Date: Mon, 24 Nov 2014 17:40:18 +0800 Subject: [PATCH 280/383] new haskell package: logging-facade-journald-0.0.0 --- .../logging-facade-journald/default.nix | 25 +++++++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/development/libraries/haskell/logging-facade-journald/default.nix diff --git a/pkgs/development/libraries/haskell/logging-facade-journald/default.nix b/pkgs/development/libraries/haskell/logging-facade-journald/default.nix new file mode 100644 index 00000000000..54a7feee595 --- /dev/null +++ b/pkgs/development/libraries/haskell/logging-facade-journald/default.nix @@ -0,0 +1,25 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, fetchzip, hspec, libsystemdJournal, loggingFacade, text +, unorderedContainers +}: + +cabal.mkDerivation (self: { + pname = "logging-facade-journald"; + version = "0.0.0"; + src = fetchzip { + url = "https://hackage.haskell.org/package/logging-facade-journald-0.0.0/logging-facade-journald-0.0.0.tar.gz"; + sha256 = "1wvh48y3lz2ipz6cwh7gbwajwrd7ziivhkmgpglzjfy335zin7m6"; + }; + buildDepends = [ + libsystemdJournal loggingFacade text unorderedContainers + ]; + testDepends = [ + hspec libsystemdJournal loggingFacade text unorderedContainers + ]; + meta = { + description = "Journald back-end for logging-facade"; + 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 94d5a97105c..87ae0b12647 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -1559,6 +1559,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in loggingFacade = callPackage ../development/libraries/haskell/logging-facade {}; + loggingFacadeJournald = callPackage ../development/libraries/haskell/logging-facade-journald {}; + logict = callPackage ../development/libraries/haskell/logict {}; loop = callPackage ../development/libraries/haskell/loop {}; From 8309aa04b25287fbc61a271f3354f2762a484224 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Mon, 24 Nov 2014 02:29:53 -0800 Subject: [PATCH 281/383] unifi: Actually remove webapps at shutdown --- nixos/modules/services/networking/unifi.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/networking/unifi.nix b/nixos/modules/services/networking/unifi.nix index 3a0640b0d80..ca6738f0fe1 100644 --- a/nixos/modules/services/networking/unifi.nix +++ b/nixos/modules/services/networking/unifi.nix @@ -70,7 +70,7 @@ in ''; postStop = '' - rm "${stateDir}/webapps" + rm -rf "${stateDir}/webapps" ''; serviceConfig = { From a39ecc27f855054e8d44ac37bd24b608171a89b9 Mon Sep 17 00:00:00 2001 From: Tobias Geerinckx-Rice Date: Sun, 23 Nov 2014 08:53:40 +0100 Subject: [PATCH 282/383] Add fatrace: reports system-wide file access events --- pkgs/os-specific/linux/fatrace/default.nix | 31 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 33 insertions(+) create mode 100644 pkgs/os-specific/linux/fatrace/default.nix diff --git a/pkgs/os-specific/linux/fatrace/default.nix b/pkgs/os-specific/linux/fatrace/default.nix new file mode 100644 index 00000000000..c6e52934a77 --- /dev/null +++ b/pkgs/os-specific/linux/fatrace/default.nix @@ -0,0 +1,31 @@ +{stdenv, fetchurl, python3}: + +stdenv.mkDerivation rec { + version = "0.9"; + name = "fatrace-${version}"; + + src = fetchurl { + url = "https://launchpad.net/fatrace/trunk/${version}/+download/${name}.tar.bz2"; + sha256 = "c028d822ffde68805e5d1f62c4e2d0f4b3d4ae565802cc9468c82b25b92e68cd"; + }; + + buildInputs = [ python3 ]; + + makeFlagsArray = "PREFIX=$(out)"; + + meta = with stdenv.lib; { + description = "Report system-wide file access events"; + homepage = https://launchpad.net/fatrace/; + license = with licenses; gpl3Plus; + longDescription = '' + fatrace reports file access events from all running processes. + Its main purpose is to find processes which keep waking up the disk + unnecessarily and thus prevent some power saving. + + Requires a Linux kernel with the FANOTIFY configuration option enabled. + Enabling X86_MSR is also recommended for power-usage-report on x86. + ''; + maintainers = with maintainers; [ nckx ]; + platforms = with platforms; linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9e3cd16fe6b..c39b98a6b4c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1127,6 +1127,8 @@ let fakechroot = callPackage ../tools/system/fakechroot { }; + fatrace = callPackage ../os-specific/linux/fatrace { }; + fcitx = callPackage ../tools/inputmethods/fcitx { }; fcitx-anthy = callPackage ../tools/inputmethods/fcitx/fcitx-anthy.nix { }; From 7930cdd12ee64bee862249d9c83e9af2bc777ba6 Mon Sep 17 00:00:00 2001 From: Oliver Charles Date: Mon, 24 Nov 2014 11:46:28 +0000 Subject: [PATCH 283/383] haskellPackages.ekgBosun: New expression --- .../libraries/haskell/ekg-bosun/default.nix | 22 +++++++++++++++++++ pkgs/top-level/haskell-packages.nix | 1 + 2 files changed, 23 insertions(+) create mode 100644 pkgs/development/libraries/haskell/ekg-bosun/default.nix diff --git a/pkgs/development/libraries/haskell/ekg-bosun/default.nix b/pkgs/development/libraries/haskell/ekg-bosun/default.nix new file mode 100644 index 00000000000..255c995ae95 --- /dev/null +++ b/pkgs/development/libraries/haskell/ekg-bosun/default.nix @@ -0,0 +1,22 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, aeson, ekgCore, httpClient, lens, network, networkUri +, text, time, unorderedContainers, vector, wreq +}: + +cabal.mkDerivation (self: { + pname = "ekg-bosun"; + version = "1.0.0"; + sha256 = "0r7ri2mfqhxypjm96s03d00b3fh28mw79wkj2cbhk4w23v2rhdv0"; + buildDepends = [ + aeson ekgCore httpClient lens network networkUri text time + unorderedContainers vector wreq + ]; + meta = { + homepage = "http://github.com/ocharles/ekg-bosun"; + description = "Send ekg metrics to a Bosun instance"; + 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 9289c1babab..050d1f2dd45 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -727,6 +727,7 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in editline = callPackage ../development/libraries/haskell/editline {}; ekg = callPackage ../development/libraries/haskell/ekg {}; + ekgBosun = callPackage ../development/libraries/haskell/ekg-bosun {}; ekgCarbon = callPackage ../development/libraries/haskell/ekg-carbon {}; ekgCore = callPackage ../development/libraries/haskell/ekg-core {}; From 328c3330928d53fdfcd3d26ecef40cc2d5280b22 Mon Sep 17 00:00:00 2001 From: Oliver Charles Date: Mon, 24 Nov 2014 13:00:39 +0000 Subject: [PATCH 284/383] haskellPackages.stmDelay: New expression --- .../libraries/haskell/stm-delay/default.nix | 18 ++++++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 20 insertions(+) create mode 100644 pkgs/development/libraries/haskell/stm-delay/default.nix diff --git a/pkgs/development/libraries/haskell/stm-delay/default.nix b/pkgs/development/libraries/haskell/stm-delay/default.nix new file mode 100644 index 00000000000..ee2500db8d3 --- /dev/null +++ b/pkgs/development/libraries/haskell/stm-delay/default.nix @@ -0,0 +1,18 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, stm }: + +cabal.mkDerivation (self: { + pname = "stm-delay"; + version = "0.1.1.1"; + sha256 = "0cla21v89gcvmr1iwzibq13v1yq02xg4h6k9l6kcprj7mhd5hcmi"; + buildDepends = [ stm ]; + testDepends = [ stm ]; + meta = { + homepage = "https://github.com/joeyadams/haskell-stm-delay"; + description = "Updatable one-shot timer polled with STM"; + 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 ad005678222..a094cd82904 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -2382,6 +2382,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in stmContainers = callPackage ../development/libraries/haskell/stm-containers {}; + stmDelay = callPackage ../development/libraries/haskell/stm-delay {}; + STMonadTrans = callPackage ../development/libraries/haskell/STMonadTrans {}; stmStats = callPackage ../development/libraries/haskell/stm-stats {}; From d51cfe1f0f19a563cc273dc2f6021aebc5e1a65f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 24 Nov 2014 14:06:25 +0100 Subject: [PATCH 285/383] haskell-polynomials-bernstein: re-generate with cabal2nix @jyp, please don't edit these files manually! --- .../libraries/haskell/polynomials-bernstein/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/haskell/polynomials-bernstein/default.nix b/pkgs/development/libraries/haskell/polynomials-bernstein/default.nix index 39d11b80de9..e2bb34f895c 100644 --- a/pkgs/development/libraries/haskell/polynomials-bernstein/default.nix +++ b/pkgs/development/libraries/haskell/polynomials-bernstein/default.nix @@ -9,7 +9,7 @@ cabal.mkDerivation (self: { buildDepends = [ vector ]; meta = { description = "A solver for systems of polynomial equations in bernstein form"; - license = self.stdenv.lib.licenses.gpl2Plus; + license = "GPL"; platforms = self.ghc.meta.platforms; maintainers = with self.stdenv.lib.maintainers; [ jpbernardy ]; }; From 93e9680fcb043a0111b11f3bcdafdba5043fa1c8 Mon Sep 17 00:00:00 2001 From: Oliver Charles Date: Mon, 24 Nov 2014 13:23:07 +0000 Subject: [PATCH 286/383] haskellPackages.engineIo: Update to 1.2.2 --- pkgs/development/libraries/haskell/engine-io/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/haskell/engine-io/default.nix b/pkgs/development/libraries/haskell/engine-io/default.nix index 7632ee31666..141d54ab23c 100644 --- a/pkgs/development/libraries/haskell/engine-io/default.nix +++ b/pkgs/development/libraries/haskell/engine-io/default.nix @@ -1,17 +1,17 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! { cabal, aeson, async, attoparsec, base64Bytestring, either, free -, monadLoops, mwcRandom, stm, text, transformers +, monadLoops, mwcRandom, stm, stmDelay, text, transformers , unorderedContainers, vector, websockets }: cabal.mkDerivation (self: { pname = "engine-io"; - version = "1.2.1"; - sha256 = "17zyl61qdxrsxy7xiqkrl3pp40hhv76gndsi30p00468a6nbk0z6"; + version = "1.2.2"; + sha256 = "1d8323nxklbhva2y8ymgm5h57j2p86sdjfh0yi1fjjr8p26dh2py"; buildDepends = [ aeson async attoparsec base64Bytestring either free monadLoops - mwcRandom stm text transformers unorderedContainers vector + mwcRandom stm stmDelay text transformers unorderedContainers vector websockets ]; meta = { From 8964667bcdd9e6be1664c8c16472decde15685ac Mon Sep 17 00:00:00 2001 From: Oliver Charles Date: Thu, 20 Nov 2014 11:29:07 +0000 Subject: [PATCH 287/383] hbase: New package and NixOS module --- nixos/modules/misc/ids.nix | 2 + nixos/modules/module-list.nix | 1 + nixos/modules/services/databases/hbase.nix | 102 +++++++++++++++++++++ pkgs/servers/hbase/default.nix | 13 +++ pkgs/top-level/all-packages.nix | 1 + 5 files changed, 119 insertions(+) create mode 100644 nixos/modules/services/databases/hbase.nix create mode 100644 pkgs/servers/hbase/default.nix diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix index 10f227b15a5..6b192d4eeef 100644 --- a/nixos/modules/misc/ids.nix +++ b/nixos/modules/misc/ids.nix @@ -165,6 +165,7 @@ liquidsoap = 155; etcd = 156; docker-registry = 157; + hbase = 158; # When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399! @@ -284,6 +285,7 @@ mlmmj = 135; riemann = 137; riemanndash = 138; + hbase = 139; uhub = 142; mailpile = 146; redmine = 147; diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 4097224bc1d..be07c4330f0 100755 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -108,6 +108,7 @@ ./services/databases/4store.nix ./services/databases/couchdb.nix ./services/databases/firebird.nix + ./services/databases/hbase.nix ./services/databases/influxdb.nix ./services/databases/memcached.nix ./services/databases/monetdb.nix diff --git a/nixos/modules/services/databases/hbase.nix b/nixos/modules/services/databases/hbase.nix new file mode 100644 index 00000000000..1bee9895e36 --- /dev/null +++ b/nixos/modules/services/databases/hbase.nix @@ -0,0 +1,102 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.hbase; + +in { + + ###### interface + + options = { + + services.hbase = { + + enable = mkOption { + type = types.bool; + default = false; + description = '' + Whether to run HBase. + ''; + }; + + package = mkOption { + type = types.package; + default = pkgs.hbase; + example = literalExample "pkgs.hbase"; + description = '' + HBase package to use. + ''; + }; + + + user = mkOption { + type = types.string; + default = "hbase"; + description = '' + User account under which HBase runs. + ''; + }; + + group = mkOption { + type = types.string; + default = "hbase"; + description = '' + Group account under which HBase runs. + ''; + }; + + dataDir = mkOption { + type = types.path; + default = "/var/lib/hbase"; + description = '' + Specifies location of HBase database files. This location should be + writable and readable for the user the HBase service runs as + (hbase by default). + ''; + }; + + logDir = mkOption { + type = types.path; + default = "/var/log/hbase"; + description = '' + Specifies the location of HBase log files. + ''; + }; + + }; + + }; + + ###### implementation + + config = mkIf config.services.hbase.enable { + + systemd.services.hbase = { + description = "HBase Server"; + wantedBy = [ "multi-user.target" ]; + + environment = { + JAVA_HOME = "${pkgs.jre}"; + HBASE_LOG_DIR = cfg.logDir; + }; + + serviceConfig = { + PermissionsStartOnly = true; + User = cfg.user; + Group = cfg.group; + ExecStart = "${cfg.package}/bin/hbase master start"; + }; + }; + + users.extraUsers.hbase = { + description = "HBase Server user"; + group = "hbase"; + uid = config.ids.uids.hbase; + }; + + users.extraGroups.hbase.gid = config.ids.gids.hbase; + + }; +} diff --git a/pkgs/servers/hbase/default.nix b/pkgs/servers/hbase/default.nix new file mode 100644 index 00000000000..e11a6375469 --- /dev/null +++ b/pkgs/servers/hbase/default.nix @@ -0,0 +1,13 @@ +{ stdenv, fetchurl, jre, makeWrapper }: +stdenv.mkDerivation { + name = "hbase-0.98.8"; + src = fetchurl { + url = http://mirror.gopotato.co.uk/apache/hbase/stable/hbase-0.98.8-hadoop2-bin.tar.gz; + sha256 = "0nvxaqpw8v2hg6mn2p2zxj3y6r4dj4xzxmp8rfmv6m6algn5apv6"; + }; + buildInputs = [ makeWrapper ]; + installPhase = '' + mkdir -p $out + cp -R * $out + ''; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index aa50832ff00..5a2236712a3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12801,5 +12801,6 @@ let youtubeDL = youtube-dl; # added 2014-10-26 rdiff_backup = rdiff-backup; # added 2014-11-23 + hbase = callPackage ../servers/hbase {}; }; in self; in pkgs From 764cca613d24780b3799394561f5af9fa53da39c Mon Sep 17 00:00:00 2001 From: Oliver Charles Date: Thu, 20 Nov 2014 12:00:53 +0000 Subject: [PATCH 288/383] opentsdb: New package and NixOS module --- nixos/modules/misc/ids.nix | 2 + nixos/modules/module-list.nix | 1 + nixos/modules/services/databases/opentsdb.nix | 89 +++++++++++++++++++ pkgs/tools/misc/opentsdb/default.nix | 21 +++++ pkgs/top-level/all-packages.nix | 2 + 5 files changed, 115 insertions(+) create mode 100644 nixos/modules/services/databases/opentsdb.nix create mode 100644 pkgs/tools/misc/opentsdb/default.nix diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix index 6b192d4eeef..e3c3f465f1b 100644 --- a/nixos/modules/misc/ids.nix +++ b/nixos/modules/misc/ids.nix @@ -166,6 +166,7 @@ etcd = 156; docker-registry = 157; hbase = 158; + opentsdb = 159; # When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399! @@ -286,6 +287,7 @@ riemann = 137; riemanndash = 138; hbase = 139; + opentsdb = 140; uhub = 142; mailpile = 146; redmine = 147; diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index be07c4330f0..6e328339056 100755 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -116,6 +116,7 @@ ./services/databases/mysql.nix ./services/databases/neo4j.nix ./services/databases/openldap.nix + ./services/databases/opentsdb.nix ./services/databases/postgresql.nix ./services/databases/redis.nix ./services/databases/virtuoso.nix diff --git a/nixos/modules/services/databases/opentsdb.nix b/nixos/modules/services/databases/opentsdb.nix new file mode 100644 index 00000000000..93980dc7b12 --- /dev/null +++ b/nixos/modules/services/databases/opentsdb.nix @@ -0,0 +1,89 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.opentsdb; + +in { + + ###### interface + + options = { + + services.opentsdb = { + + enable = mkOption { + type = types.bool; + default = false; + description = '' + Whether to run OpenTSDB. + ''; + }; + + package = mkOption { + type = types.package; + default = pkgs.opentsdb; + example = literalExample "pkgs.opentsdb"; + description = '' + OpenTSDB package to use. + ''; + }; + + user = mkOption { + type = types.string; + default = "opentsdb"; + description = '' + User account under which OpenTSDB runs. + ''; + }; + + group = mkOption { + type = types.string; + default = "opentsdb"; + description = '' + Group account under which OpenTSDB runs. + ''; + }; + + port = mkOption { + type = types.int; + default = 4242; + description = '' + Which port OpenTSDB listens on. + ''; + }; + + }; + + }; + + ###### implementation + + config = mkIf config.services.opentsdb.enable { + + systemd.services.opentsdb = { + description = "OpenTSDB Server"; + wantedBy = [ "multi-user.target" ]; + requires = [ "hbase.service" ]; + + environment.JAVA_HOME = "${pkgs.jre}"; + + serviceConfig = { + PermissionsStartOnly = true; + User = cfg.user; + Group = cfg.group; + ExecStart = "${cfg.package}/bin/tsdb tsd --staticroot=${cfg.package}/share/opentsdb/static --cachedir=/tmp/opentsdb --port=${toString cfg.port}"; + }; + }; + + users.extraUsers.opentsdb = { + description = "OpenTSDB Server user"; + group = "opentsdb"; + uid = config.ids.uids.opentsdb; + }; + + users.extraGroups.opentsdb.gid = config.ids.gids.opentsdb; + + }; +} diff --git a/pkgs/tools/misc/opentsdb/default.nix b/pkgs/tools/misc/opentsdb/default.nix new file mode 100644 index 00000000000..b1d02233046 --- /dev/null +++ b/pkgs/tools/misc/opentsdb/default.nix @@ -0,0 +1,21 @@ +{ stdenv, fetchurl, curl, jdk, jre, makeWrapper, nettools, python }: +with stdenv.lib; +stdenv.mkDerivation rec { + name = "opentsdb-2.0.1"; + + src = fetchurl { + url = https://github.com/OpenTSDB/opentsdb/releases/download/v2.0.1/opentsdb-2.0.1.tar.gz; + sha256 = "1q2gkl72yjzd8yrggl0018m9s8mc9zwnz3d8ias54vqh3irypc2c"; + }; + + buildPhase = "find ."; + + buildInputs = [ curl jdk makeWrapper nettools python ]; + + installPhase = '' + make install + wrapProgram $out/bin/tsdb \ + --set JAVA_HOME "${jre}" \ + --set JAVA "${jre}/bin/java" + ''; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 5a2236712a3..c3ee0c1fcb6 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12801,6 +12801,8 @@ let youtubeDL = youtube-dl; # added 2014-10-26 rdiff_backup = rdiff-backup; # added 2014-11-23 + opentsdb = callPackage ../tools/misc/opentsdb {}; + hbase = callPackage ../servers/hbase {}; }; in self; in pkgs From bc8fd69fe859d193e8ee264af05fc49e4a017e06 Mon Sep 17 00:00:00 2001 From: Oliver Charles Date: Thu, 20 Nov 2014 12:14:48 +0000 Subject: [PATCH 289/383] New packages: bosun and scollector --- pkgs/servers/monitoring/bosun/default.nix | 35 ++++++++++++++++++++ pkgs/servers/monitoring/bosun/scollector.nix | 27 +++++++++++++++ pkgs/top-level/all-packages.nix | 3 ++ 3 files changed, 65 insertions(+) create mode 100644 pkgs/servers/monitoring/bosun/default.nix create mode 100644 pkgs/servers/monitoring/bosun/scollector.nix diff --git a/pkgs/servers/monitoring/bosun/default.nix b/pkgs/servers/monitoring/bosun/default.nix new file mode 100644 index 00000000000..5b1fe0cd806 --- /dev/null +++ b/pkgs/servers/monitoring/bosun/default.nix @@ -0,0 +1,35 @@ +{ stdenv, fetchgit, fetchurl, go }: +let + go-fs = fetchgit { + url = git://github.com/rakyll/statik.git; + rev = "f19d7c21cd036701d42ec176b13e0946cc9591b0"; + sha256 = "0vaa8xzkmj1dgiayg7ccrniapz4f4rhsizx2hybyc5rgmalfj9ac"; + }; + +in stdenv.mkDerivation rec { + name = "bosun-20141114233454"; + src = fetchurl { + url = https://github.com/bosun-monitor/bosun/archive/20141114233453.tar.gz; + sha256 = "0sd4gqfclasdw3z5j67lh2i7gyxyshgakpi9bj0mb3jz3lvcz4wb"; + }; + buildInputs = [ go ]; + + sourceRoot = "."; + + buildPhase = '' + mkdir -p src/github.com/bosun-monitor + mv bosun-20141114233453 src/github.com/bosun-monitor/bosun + + mkdir -p src/github.com/rakyll + ln -s ${go-fs} src/github.com/rakyll/statik + + export GOPATH=$PWD + go build -v -o bosun src/github.com/bosun-monitor/bosun/main.go + ''; + + installPhase = '' + mkdir -p $out/bin + cp bosun $out/bin + ''; + +} diff --git a/pkgs/servers/monitoring/bosun/scollector.nix b/pkgs/servers/monitoring/bosun/scollector.nix new file mode 100644 index 00000000000..6d4414efab3 --- /dev/null +++ b/pkgs/servers/monitoring/bosun/scollector.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchgit, fetchurl, go }: +let + +in stdenv.mkDerivation rec { + name = "scollector-20141119233025"; + src = fetchurl { + url = https://github.com/bosun-monitor/scollector/archive/20141119233025.tar.gz; + sha256 = "13f7hg4mswcdl76ksx8ds3297rslsswb1hq327b3xm1wyr42k6wa"; + }; + buildInputs = [ go ]; + + sourceRoot = "."; + + buildPhase = '' + mkdir -p src/github.com/bosun-monitor + mv scollector-20141119233025 src/github.com/bosun-monitor/scollector + + export GOPATH=$PWD + go build -v -o scollector src/github.com/bosun-monitor/scollector/main.go + ''; + + installPhase = '' + mkdir -p $out/bin + cp scollector $out/bin + ''; + +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c3ee0c1fcb6..21479eaabf7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7495,6 +7495,9 @@ let bird = callPackage ../servers/bird { }; + bosun = callPackage ../servers/monitoring/bosun {}; + scollector = callPackage ../servers/monitoring/bosun/scollector.nix {}; + couchdb = callPackage ../servers/http/couchdb { spidermonkey = spidermonkey_185; python = python27; From 751a2943f49bdbc9a231ccf2d748c171ed3d6389 Mon Sep 17 00:00:00 2001 From: Oliver Charles Date: Thu, 20 Nov 2014 12:23:37 +0000 Subject: [PATCH 290/383] opentsdb: Upgrade to 2.1.0-RC1 --- nixos/modules/services/databases/opentsdb.nix | 7 ++++++- pkgs/tools/misc/opentsdb/default.nix | 17 +++++++++++------ 2 files changed, 17 insertions(+), 7 deletions(-) diff --git a/nixos/modules/services/databases/opentsdb.nix b/nixos/modules/services/databases/opentsdb.nix index 93980dc7b12..dce2d193641 100644 --- a/nixos/modules/services/databases/opentsdb.nix +++ b/nixos/modules/services/databases/opentsdb.nix @@ -5,6 +5,10 @@ with lib; let cfg = config.services.opentsdb; + configFile = pkgs.writeText "opentsdb.conf" '' + tsd.core.auto_create_metrics = true + ''; + in { ###### interface @@ -68,12 +72,13 @@ in { requires = [ "hbase.service" ]; environment.JAVA_HOME = "${pkgs.jre}"; + path = [ pkgs.gnuplot ]; serviceConfig = { PermissionsStartOnly = true; User = cfg.user; Group = cfg.group; - ExecStart = "${cfg.package}/bin/tsdb tsd --staticroot=${cfg.package}/share/opentsdb/static --cachedir=/tmp/opentsdb --port=${toString cfg.port}"; + ExecStart = "${cfg.package}/bin/tsdb tsd --staticroot=${cfg.package}/share/opentsdb/static --cachedir=/tmp/opentsdb --port=${toString cfg.port} --config=${configFile}"; }; }; diff --git a/pkgs/tools/misc/opentsdb/default.nix b/pkgs/tools/misc/opentsdb/default.nix index b1d02233046..2e388f2186f 100644 --- a/pkgs/tools/misc/opentsdb/default.nix +++ b/pkgs/tools/misc/opentsdb/default.nix @@ -1,16 +1,21 @@ -{ stdenv, fetchurl, curl, jdk, jre, makeWrapper, nettools, python }: +{ stdenv, autoconf, automake, fetchurl, curl, jdk, jre, makeWrapper, nettools, python }: with stdenv.lib; stdenv.mkDerivation rec { - name = "opentsdb-2.0.1"; + name = "opentsdb-2.1.0-rc1"; src = fetchurl { - url = https://github.com/OpenTSDB/opentsdb/releases/download/v2.0.1/opentsdb-2.0.1.tar.gz; - sha256 = "1q2gkl72yjzd8yrggl0018m9s8mc9zwnz3d8ias54vqh3irypc2c"; + url = https://github.com/OpenTSDB/opentsdb/archive/v2.1.0RC1.tar.gz; + sha256 = "01li02j8kjanmas2gxkcz3gsn54nyfyvqdylxz3fqqjgg6y7hrm7"; }; - buildPhase = "find ."; + buildInputs = [ autoconf automake curl jdk makeWrapper nettools python ]; - buildInputs = [ curl jdk makeWrapper nettools python ]; + configurePhase = '' + ./bootstrap + mkdir build + cd build + ../configure --prefix=$out + ''; installPhase = '' make install From 2ed07c6cc1ce6c2e1c91f87630633dd92057e72b Mon Sep 17 00:00:00 2001 From: Oliver Charles Date: Thu, 20 Nov 2014 14:38:04 +0000 Subject: [PATCH 291/383] scollector: New NixOS module --- nixos/modules/misc/ids.nix | 2 + nixos/modules/module-list.nix | 1 + .../services/monitoring/scollector.nix | 88 +++++++++++++++++++ 3 files changed, 91 insertions(+) create mode 100644 nixos/modules/services/monitoring/scollector.nix diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix index e3c3f465f1b..2c63a19deb7 100644 --- a/nixos/modules/misc/ids.nix +++ b/nixos/modules/misc/ids.nix @@ -167,6 +167,7 @@ docker-registry = 157; hbase = 158; opentsdb = 159; + scollector = 160; # When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399! @@ -298,6 +299,7 @@ systemd-resolve = 153; systemd-timesync = 154; liquidsoap = 155; + scollector = 156; # 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 6e328339056..c6b44f590f8 100755 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -198,6 +198,7 @@ ./services/monitoring/nagios.nix ./services/monitoring/riemann.nix ./services/monitoring/riemann-dash.nix + ./services/monitoring/scollector.nix ./services/monitoring/smartd.nix ./services/monitoring/statsd.nix ./services/monitoring/systemhealth.nix diff --git a/nixos/modules/services/monitoring/scollector.nix b/nixos/modules/services/monitoring/scollector.nix new file mode 100644 index 00000000000..3d52631538b --- /dev/null +++ b/nixos/modules/services/monitoring/scollector.nix @@ -0,0 +1,88 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.scollector; + +in { + + options = { + + services.scollector = { + + enable = mkOption { + type = types.bool; + default = false; + description = '' + Whether to run scollector. + ''; + }; + + package = mkOption { + type = types.package; + default = pkgs.scollector; + example = literalExample "pkgs.scollector"; + description = '' + scollector binary to use. + ''; + }; + + user = mkOption { + type = types.string; + default = "scollector"; + description = '' + User account under which scollector runs. + ''; + }; + + group = mkOption { + type = types.string; + default = "scollector"; + description = '' + Group account under which scollector runs. + ''; + }; + + opentsdbHost = mkOption { + type = types.string; + default = "localhost:4242"; + description = '' + Host and port of the OpenTSDB database that will store the collected + data. + ''; + }; + + }; + + }; + + config = mkIf config.services.scollector.enable { + + systemd.services.scollector = { + description = "scollector metrics collector (part of Bosun)"; + wantedBy = [ "multi-user.target" ]; + + path = [ pkgs.coreutils pkgs.iproute ]; + + serviceConfig = { + PermissionsStartOnly = true; + User = cfg.user; + Group = cfg.group; + ExecStart = '' + ${cfg.package}/bin/scollector -h=${cfg.opentsdbHost} + ''; + }; + }; + + users.extraUsers.scollector = { + description = "scollector user"; + group = "scollector"; + uid = config.ids.uids.scollector; + }; + + users.extraGroups.scollector.gid = config.ids.gids.scollector; + + }; + +} From 891c262e9a90520070762389db3e97ca44c88ac3 Mon Sep 17 00:00:00 2001 From: Oliver Charles Date: Thu, 20 Nov 2014 14:49:45 +0000 Subject: [PATCH 292/383] Add a NixOS module to run bosun --- nixos/modules/misc/ids.nix | 2 + nixos/modules/module-list.nix | 1 + nixos/modules/services/monitoring/bosun.nix | 121 ++++++++++++++++++++ 3 files changed, 124 insertions(+) create mode 100644 nixos/modules/services/monitoring/bosun.nix diff --git a/nixos/modules/misc/ids.nix b/nixos/modules/misc/ids.nix index 2c63a19deb7..4d91e266d85 100644 --- a/nixos/modules/misc/ids.nix +++ b/nixos/modules/misc/ids.nix @@ -168,6 +168,7 @@ hbase = 158; opentsdb = 159; scollector = 160; + bosun = 161; # When adding a uid, make sure it doesn't match an existing gid. And don't use uids above 399! @@ -300,6 +301,7 @@ systemd-timesync = 154; liquidsoap = 155; scollector = 156; + bosun = 157; # 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 c6b44f590f8..3965dc3e53e 100755 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -190,6 +190,7 @@ ./services/misc/uhub.nix ./services/misc/zookeeper.nix ./services/monitoring/apcupsd.nix + ./services/monitoring/bosun.nix ./services/monitoring/collectd.nix ./services/monitoring/dd-agent.nix ./services/monitoring/graphite.nix diff --git a/nixos/modules/services/monitoring/bosun.nix b/nixos/modules/services/monitoring/bosun.nix new file mode 100644 index 00000000000..90fa573e9cd --- /dev/null +++ b/nixos/modules/services/monitoring/bosun.nix @@ -0,0 +1,121 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.bosun; + + configFile = pkgs.writeText "bosun.conf" '' + tsdbHost = ${cfg.opentsdbHost} + httpListen = ${cfg.listenAddress} + stateFile = ${cfg.stateFile} + checkFrequency = 5m + ''; + +in { + + options = { + + services.bosun = { + + enable = mkOption { + type = types.bool; + default = false; + description = '' + Whether to run bosun. + ''; + }; + + package = mkOption { + type = types.package; + default = pkgs.bosun; + example = literalExample "pkgs.bosun"; + description = '' + bosun binary to use. + ''; + }; + + user = mkOption { + type = types.string; + default = "bosun"; + description = '' + User account under which bosun runs. + ''; + }; + + group = mkOption { + type = types.string; + default = "bosun"; + description = '' + Group account under which bosun runs. + ''; + }; + + opentsdbHost = mkOption { + type = types.string; + default = "localhost:4242"; + description = '' + Host and port of the OpenTSDB database that stores bosun data. + ''; + }; + + listenAddress = mkOption { + type = types.string; + default = ":8070"; + description = '' + The host address and port that bosun's web interface will listen on. + ''; + }; + + stateFile = mkOption { + type = types.string; + default = "/var/lib/bosun/bosun.state"; + description = '' + Path to bosun's state file. + ''; + }; + + }; + + }; + + config = mkIf config.services.bosun.enable { + + + systemd.services.bosun = { + description = "bosun metrics collector (part of Bosun)"; + wantedBy = [ "multi-user.target" ]; + + preStart = + '' + mkdir -p `dirname ${cfg.stateFile}`; + touch ${cfg.stateFile} + touch ${cfg.stateFile}.tmp + + if [ "$(id -u)" = 0 ]; then + chown ${cfg.user}:${cfg.group} ${cfg.stateFile} + chown ${cfg.user}:${cfg.group} ${cfg.stateFile}.tmp + fi + ''; + + serviceConfig = { + PermissionsStartOnly = true; + User = cfg.user; + Group = cfg.group; + ExecStart = '' + ${cfg.package}/bin/bosun -c ${configFile} + ''; + }; + }; + + users.extraUsers.bosun = { + description = "bosun user"; + group = "bosun"; + uid = config.ids.uids.bosun; + }; + + users.extraGroups.bosun.gid = config.ids.gids.bosun; + + }; + +} From fb67616588ebd4bf4343ffab9d900dd77a6d97c6 Mon Sep 17 00:00:00 2001 From: Oliver Charles Date: Thu, 20 Nov 2014 14:49:56 +0000 Subject: [PATCH 293/383] scollector should talk to Bosun, not OpenTSDB --- nixos/modules/services/monitoring/scollector.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/nixos/modules/services/monitoring/scollector.nix b/nixos/modules/services/monitoring/scollector.nix index 3d52631538b..ca0cbd97d89 100644 --- a/nixos/modules/services/monitoring/scollector.nix +++ b/nixos/modules/services/monitoring/scollector.nix @@ -44,11 +44,11 @@ in { ''; }; - opentsdbHost = mkOption { + bosunHost = mkOption { type = types.string; - default = "localhost:4242"; + default = "localhost:8070"; description = '' - Host and port of the OpenTSDB database that will store the collected + Host and port of the bosun server that will store the collected data. ''; }; @@ -70,7 +70,7 @@ in { User = cfg.user; Group = cfg.group; ExecStart = '' - ${cfg.package}/bin/scollector -h=${cfg.opentsdbHost} + ${cfg.package}/bin/scollector -h=${cfg.bosunHost} ''; }; }; From 1280c6aa640f0e4afc7902d76c78b57d45f4aa8b Mon Sep 17 00:00:00 2001 From: Oliver Charles Date: Thu, 20 Nov 2014 14:56:49 +0000 Subject: [PATCH 294/383] Add an `extraConfig` option to `bosun` --- nixos/modules/services/monitoring/bosun.nix | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/nixos/modules/services/monitoring/bosun.nix b/nixos/modules/services/monitoring/bosun.nix index 90fa573e9cd..067c826f4e4 100644 --- a/nixos/modules/services/monitoring/bosun.nix +++ b/nixos/modules/services/monitoring/bosun.nix @@ -10,6 +10,8 @@ let httpListen = ${cfg.listenAddress} stateFile = ${cfg.stateFile} checkFrequency = 5m + + ${cfg.extraConfig} ''; in { @@ -75,6 +77,19 @@ in { ''; }; + extraConfig = mkOption { + type = types.string; + default = ""; + description = '' + Extra configuration options for Bosun. You should describe your + desired templates, alerts, macros, etc through this configuration + option. + + A detailed description of the supported syntax can be found at-spi2-atk + http://bosun.org/configuration.html + ''; + }; + }; }; From 5c670c81d58351974cda32e9c7e7dc27e96bce61 Mon Sep 17 00:00:00 2001 From: Oliver Charles Date: Thu, 20 Nov 2014 15:22:07 +0000 Subject: [PATCH 295/383] hbase should use dataDir to specify where to store data --- nixos/modules/services/databases/hbase.nix | 33 +++++++++++++++++++++- 1 file changed, 32 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/databases/hbase.nix b/nixos/modules/services/databases/hbase.nix index 1bee9895e36..ccfabc9de0b 100644 --- a/nixos/modules/services/databases/hbase.nix +++ b/nixos/modules/services/databases/hbase.nix @@ -5,6 +5,26 @@ with lib; let cfg = config.services.hbase; + configFile = pkgs.writeText "hbase-site.xml" '' + + + hbase.rootdir + file://${cfg.dataDir}/hbase + + + hbase.zookeeper.property.dataDir + ${cfg.dataDir}/zookeeper + + + ''; + + configDir = pkgs.runCommand "hbase-config-dir" {} '' + mkdir -p $out + cp ${cfg.package}/conf/* $out/ + rm $out/hbase-site.xml + ln -s ${configFile} $out/hbase-site.xml + '' ; + in { ###### interface @@ -82,11 +102,22 @@ in { HBASE_LOG_DIR = cfg.logDir; }; + preStart = + '' + mkdir -p ${cfg.dataDir}; + mkdir -p ${cfg.logDir}; + + if [ "$(id -u)" = 0 ]; then + chown ${cfg.user}:${cfg.group} ${cfg.dataDir} + chown ${cfg.user}:${cfg.group} ${cfg.logDir} + fi + ''; + serviceConfig = { PermissionsStartOnly = true; User = cfg.user; Group = cfg.group; - ExecStart = "${cfg.package}/bin/hbase master start"; + ExecStart = "${cfg.package}/bin/hbase --config ${configDir} master start"; }; }; From ced9e83732a6c077b51797da691fe95d0b379304 Mon Sep 17 00:00:00 2001 From: Oliver Charles Date: Thu, 20 Nov 2014 15:27:06 +0000 Subject: [PATCH 296/383] OpenTSDB should create its schema on start up --- nixos/modules/services/databases/opentsdb.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/nixos/modules/services/databases/opentsdb.nix b/nixos/modules/services/databases/opentsdb.nix index dce2d193641..fc037b58c0e 100644 --- a/nixos/modules/services/databases/opentsdb.nix +++ b/nixos/modules/services/databases/opentsdb.nix @@ -74,6 +74,11 @@ in { environment.JAVA_HOME = "${pkgs.jre}"; path = [ pkgs.gnuplot ]; + preStart = + '' + COMPRESSION=NONE HBASE_HOME=${config.services.hbase.package} ${cfg.package}/share/opentsdb/tools/create_table.sh + ''; + serviceConfig = { PermissionsStartOnly = true; User = cfg.user; From 5a8d5f3094d2da8f8cc4e43bb28734a9d3e4f52d Mon Sep 17 00:00:00 2001 From: Oliver Charles Date: Thu, 20 Nov 2014 15:45:05 +0000 Subject: [PATCH 297/383] bosun: Update to 20141119233013 --- pkgs/servers/monitoring/bosun/default.nix | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/monitoring/bosun/default.nix b/pkgs/servers/monitoring/bosun/default.nix index 5b1fe0cd806..a0b4a75f863 100644 --- a/pkgs/servers/monitoring/bosun/default.nix +++ b/pkgs/servers/monitoring/bosun/default.nix @@ -7,10 +7,11 @@ let }; in stdenv.mkDerivation rec { - name = "bosun-20141114233454"; + name = "bosun-${version}"; + version = "20141119233013"; src = fetchurl { - url = https://github.com/bosun-monitor/bosun/archive/20141114233453.tar.gz; - sha256 = "0sd4gqfclasdw3z5j67lh2i7gyxyshgakpi9bj0mb3jz3lvcz4wb"; + url = "https://github.com/bosun-monitor/bosun/archive/${version}.tar.gz"; + sha256 = "0l16g073ixk42g3jz1r0lhmvssc0k8s1vnr9pvgxs897rzpdjjm1"; }; buildInputs = [ go ]; @@ -18,7 +19,7 @@ in stdenv.mkDerivation rec { buildPhase = '' mkdir -p src/github.com/bosun-monitor - mv bosun-20141114233453 src/github.com/bosun-monitor/bosun + mv bosun-${version} src/github.com/bosun-monitor/bosun mkdir -p src/github.com/rakyll ln -s ${go-fs} src/github.com/rakyll/statik From abd24523f3775e16845329ca6363c6e06162cabb Mon Sep 17 00:00:00 2001 From: Oliver Charles Date: Fri, 21 Nov 2014 12:12:47 +0000 Subject: [PATCH 298/383] scollector: Allow users to specify external collectors --- .../services/monitoring/scollector.nix | 28 ++++++++++++++++++- 1 file changed, 27 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/monitoring/scollector.nix b/nixos/modules/services/monitoring/scollector.nix index ca0cbd97d89..ce70739abbc 100644 --- a/nixos/modules/services/monitoring/scollector.nix +++ b/nixos/modules/services/monitoring/scollector.nix @@ -5,6 +5,21 @@ with lib; let cfg = config.services.scollector; + collectors = pkgs.runCommand "collectors" {} + '' + mkdir -p $out + ${lib.concatStringsSep + "\n" + (lib.mapAttrsToList + (frequency: binaries: + "mkdir -p $out/${frequency}\n" + + (lib.concatStringsSep + "\n" + (map (path: "ln -s ${path} $out/${frequency}/$(basename ${path})") + binaries))) + cfg.collectors)} + ''; + in { options = { @@ -53,6 +68,17 @@ in { ''; }; + collectors = mkOption { + type = types.attrs; + default = {}; + example = literalExample "{ 0 = [ \"\${postgresStats}/bin/collect-stats\" ]; }"; + description = '' + An attribute set mapping the frequency of collection to a list of + binaries that should be executed at that frequency. You can use "0" + to run a binary forever. + ''; + }; + }; }; @@ -70,7 +96,7 @@ in { User = cfg.user; Group = cfg.group; ExecStart = '' - ${cfg.package}/bin/scollector -h=${cfg.bosunHost} + ${cfg.package}/bin/scollector -h=${cfg.bosunHost} -c=${collectors} ''; }; }; From 9cab0e1b8afdfb49d0aa90c74d1b58c584d04713 Mon Sep 17 00:00:00 2001 From: Oliver Charles Date: Fri, 21 Nov 2014 14:43:12 +0000 Subject: [PATCH 299/383] Add meta information to hbase, bosun, scollector, opentsdb --- pkgs/servers/hbase/default.nix | 6 ++++++ pkgs/servers/monitoring/bosun/default.nix | 9 +++++++++ pkgs/servers/monitoring/bosun/scollector.nix | 6 ++++++ pkgs/tools/misc/opentsdb/default.nix | 7 +++++++ 4 files changed, 28 insertions(+) diff --git a/pkgs/servers/hbase/default.nix b/pkgs/servers/hbase/default.nix index e11a6375469..de5be18713e 100644 --- a/pkgs/servers/hbase/default.nix +++ b/pkgs/servers/hbase/default.nix @@ -10,4 +10,10 @@ stdenv.mkDerivation { mkdir -p $out cp -R * $out ''; + meta = with stdenv.lib; { + description = "A distributed, scalable, big data store"; + homepage = https://hbase.apache.org; + license = licenses.asl20; + platforms = stdenv.lib.platforms.linux; + }; } diff --git a/pkgs/servers/monitoring/bosun/default.nix b/pkgs/servers/monitoring/bosun/default.nix index a0b4a75f863..e7e70873d59 100644 --- a/pkgs/servers/monitoring/bosun/default.nix +++ b/pkgs/servers/monitoring/bosun/default.nix @@ -33,4 +33,13 @@ in stdenv.mkDerivation rec { cp bosun $out/bin ''; + meta = with stdenv.lib; { + description = "Time series alerting framework"; + longDescription = '' + An advanced, open-source monitoring and alerting system by Stack Exchange. + ''; + homepage = http://bosun.org; + license = licenses.mit; + platforms = stdenv.lib.platforms.linux; + }; } diff --git a/pkgs/servers/monitoring/bosun/scollector.nix b/pkgs/servers/monitoring/bosun/scollector.nix index 6d4414efab3..137b59714c1 100644 --- a/pkgs/servers/monitoring/bosun/scollector.nix +++ b/pkgs/servers/monitoring/bosun/scollector.nix @@ -24,4 +24,10 @@ in stdenv.mkDerivation rec { cp scollector $out/bin ''; + meta = with stdenv.lib; { + description = "Collect system information and store it in OpenTSDB or Bosun"; + homepage = http://bosun.org/scollector; + license = licenses.mit; + platforms = stdenv.lib.platforms.linux; + }; } diff --git a/pkgs/tools/misc/opentsdb/default.nix b/pkgs/tools/misc/opentsdb/default.nix index 2e388f2186f..b0980222f13 100644 --- a/pkgs/tools/misc/opentsdb/default.nix +++ b/pkgs/tools/misc/opentsdb/default.nix @@ -23,4 +23,11 @@ stdenv.mkDerivation rec { --set JAVA_HOME "${jre}" \ --set JAVA "${jre}/bin/java" ''; + + meta = with stdenv.lib; { + description = "Time series database with millisecond precision"; + homepage = http://opentsdb.net; + license = licenses.lgpl21Plus; + platforms = stdenv.lib.platforms.linux; + }; } From ac616e17b356627b92c29367f3fa7d693b39b056 Mon Sep 17 00:00:00 2001 From: Oliver Charles Date: Mon, 24 Nov 2014 11:43:30 +0000 Subject: [PATCH 300/383] opentsdb: Enable chunked API requests by default --- nixos/modules/services/databases/opentsdb.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/services/databases/opentsdb.nix b/nixos/modules/services/databases/opentsdb.nix index fc037b58c0e..9c9738570e3 100644 --- a/nixos/modules/services/databases/opentsdb.nix +++ b/nixos/modules/services/databases/opentsdb.nix @@ -7,6 +7,7 @@ let configFile = pkgs.writeText "opentsdb.conf" '' tsd.core.auto_create_metrics = true + tsd.http.request.enable_chunked = true ''; in { From 5c9ee48de1919be335e07a5de53308a1dbd42109 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Mon, 24 Nov 2014 10:13:31 -0500 Subject: [PATCH 301/383] nix-exec: bump --- pkgs/development/interpreters/nix-exec/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/interpreters/nix-exec/default.nix b/pkgs/development/interpreters/nix-exec/default.nix index 0cf5a1332ab..5f9e5277f94 100644 --- a/pkgs/development/interpreters/nix-exec/default.nix +++ b/pkgs/development/interpreters/nix-exec/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, pkgconfig, nix, git }: let - version = "3.0.1"; + version = "3.0.2"; in stdenv.mkDerivation { name = "nix-exec-${version}"; src = fetchurl { url = "https://github.com/shlevy/nix-exec/releases/download/v${version}/nix-exec-${version}.tar.xz"; - sha256 = "1ncyhmwch9l2iz58ycfy53bb3l850d24aryraf6vvfkw8yg9d7kq"; + sha256 = "1c45ardfk0qm3n7hx8wvsmyw6zs47sjcs2pd4rg4n87wsdi3hv7k"; }; buildInputs = [ pkgconfig nix git ]; From 86d980bd59e5aab455e5d27bce69a95b659ed344 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 23 Nov 2014 21:05:02 +0100 Subject: [PATCH 302/383] haskell-packunused: update to version 0.1.1.3 --- pkgs/development/tools/haskell/packunused/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/haskell/packunused/default.nix b/pkgs/development/tools/haskell/packunused/default.nix index c68d5dec8b3..9df5b2472bf 100644 --- a/pkgs/development/tools/haskell/packunused/default.nix +++ b/pkgs/development/tools/haskell/packunused/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "packunused"; - version = "0.1.1.2"; - sha256 = "1kp004lh6sa4gjqm37ldgk70jbncrnr76rk9c77464cnj6ajxmlm"; + version = "0.1.1.3"; + sha256 = "1f8lc9lzqwyzdz1j8czdan04d4bj393xk1rxfhr39j4a56qskp1c"; isLibrary = false; isExecutable = true; buildDepends = [ From 2431b8572b717873ed562e485d87d05ae064b241 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 23 Nov 2014 21:05:35 +0100 Subject: [PATCH 303/383] haskell-twitter-types-lens: add version 0.6.0 --- .../haskell/twitter-types-lens/default.nix | 16 ++++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 18 insertions(+) create mode 100644 pkgs/development/libraries/haskell/twitter-types-lens/default.nix diff --git a/pkgs/development/libraries/haskell/twitter-types-lens/default.nix b/pkgs/development/libraries/haskell/twitter-types-lens/default.nix new file mode 100644 index 00000000000..85407fc00b2 --- /dev/null +++ b/pkgs/development/libraries/haskell/twitter-types-lens/default.nix @@ -0,0 +1,16 @@ +# This file was auto-generated by cabal2nix. Please do NOT edit manually! + +{ cabal, lens, text, twitterTypes }: + +cabal.mkDerivation (self: { + pname = "twitter-types-lens"; + version = "0.6.0"; + sha256 = "0n2z7v2mcvj2czkszkp87sf7cv4zj82yccygs9ah5ax28dw823v3"; + buildDepends = [ lens text twitterTypes ]; + meta = { + homepage = "https://github.com/himura/twitter-types-lens"; + description = "Twitter JSON types (lens powered)"; + 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 a094cd82904..6d54c2e8b1c 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -2587,6 +2587,8 @@ self : let callPackage = x : y : modifyPrio (newScope self x y); in twitterTypes = callPackage ../development/libraries/haskell/twitter-types {}; + twitterTypesLens = callPackage ../development/libraries/haskell/twitter-types-lens {}; + TypeCompose = callPackage ../development/libraries/haskell/TypeCompose {}; typeEq = callPackage ../development/libraries/haskell/type-eq {}; From ff9fb6229f641905d906de88a2003b2635589500 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 23 Nov 2014 21:05:44 +0100 Subject: [PATCH 304/383] haskell-RSA: update to version 2.1.0 --- .../libraries/haskell/RSA/default.nix | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/pkgs/development/libraries/haskell/RSA/default.nix b/pkgs/development/libraries/haskell/RSA/default.nix index 61c2d0fb225..53655d46765 100644 --- a/pkgs/development/libraries/haskell/RSA/default.nix +++ b/pkgs/development/libraries/haskell/RSA/default.nix @@ -1,20 +1,14 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, binary, cryptoApi, cryptoPubkeyTypes, DRBG -, monadcryptorandom, pureMD5, QuickCheck, SHA, tagged -, testFramework, testFrameworkQuickcheck2 +{ cabal, binary, cryptoApi, cryptoPubkeyTypes, DRBG, pureMD5 +, QuickCheck, SHA, tagged, testFramework, testFrameworkQuickcheck2 }: cabal.mkDerivation (self: { pname = "RSA"; - version = "2.0.0"; - sha256 = "1v2d6sxpqr0lmiqdr3ym5qzp3p1y57yj6939vdlsac6k6ifj6pwq"; - isLibrary = true; - isExecutable = true; - buildDepends = [ - binary cryptoApi cryptoPubkeyTypes DRBG monadcryptorandom pureMD5 - QuickCheck SHA tagged testFramework testFrameworkQuickcheck2 - ]; + version = "2.1.0"; + sha256 = "0bhnnz7vp1942ac2vg0y6vsag9bm0pslnm4ix6lmw28hy6d1jk2a"; + buildDepends = [ binary cryptoApi cryptoPubkeyTypes pureMD5 SHA ]; testDepends = [ binary cryptoApi cryptoPubkeyTypes DRBG pureMD5 QuickCheck SHA tagged testFramework testFrameworkQuickcheck2 From 31e84afd4ed8182b792cd271d5f1a5a27bb64dda Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 23 Nov 2014 21:05:46 +0100 Subject: [PATCH 305/383] haskell-cabal-cargs: update to version 0.7.5 --- 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 ea1f896d78c..ba535cd13b2 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.4"; - sha256 = "0dar64xk3bcccyaz2b9v1qc8y63vrm60vb54k8c4n1j6cqzcdp8h"; + version = "0.7.5"; + sha256 = "0z17s4w9wlmdqbzh0c1jwqfp4d6599hqv0r4dzm9djb0x8vj327k"; isLibrary = true; isExecutable = true; buildDepends = [ From 33bbf5a13103481738fdb6cf035019549202a2a5 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 23 Nov 2014 21:05:48 +0100 Subject: [PATCH 306/383] haskell-cabal-lenses: update to version 0.4.2 --- 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 7416e001d1b..256cba3734c 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.4.1"; - sha256 = "0gkd82g6q8ahrrfmnjzr4r9n5cgdmhpxkqvnsy50k043v0faa0cx"; + version = "0.4.2"; + sha256 = "0vsicvk979qznm3b174r6d5wkkyhpqx8gxjs5jw9na2jhimzjcjf"; buildDepends = [ Cabal lens unorderedContainers ]; jailbreak = true; meta = { From ceea18d4efb2a98a28d5313115e6782ff750fd0c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 23 Nov 2014 21:05:52 +0100 Subject: [PATCH 307/383] haskell-cgrep: update to version 6.4.8 --- pkgs/development/libraries/haskell/cgrep/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/cgrep/default.nix b/pkgs/development/libraries/haskell/cgrep/default.nix index 304ba2d0cb0..a49697bccf9 100644 --- a/pkgs/development/libraries/haskell/cgrep/default.nix +++ b/pkgs/development/libraries/haskell/cgrep/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "cgrep"; - version = "6.4.7"; - sha256 = "1937dvd69igx41sp1ljpghwqz0ki436pv0xmwz6bq1vny0axwmp7"; + version = "6.4.8"; + sha256 = "0xz2kzrvxxaa67x21dckv7l01s7jhmak7ka0rp8qygx6zjf836wy"; isLibrary = false; isExecutable = true; buildDepends = [ From 60182effc458b631891f51ccef6842dab6379747 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 23 Nov 2014 21:05:54 +0100 Subject: [PATCH 308/383] haskell-clay: update to version 0.10 --- pkgs/development/libraries/haskell/clay/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/clay/default.nix b/pkgs/development/libraries/haskell/clay/default.nix index 11b141d74ca..4e1b617c0b6 100644 --- a/pkgs/development/libraries/haskell/clay/default.nix +++ b/pkgs/development/libraries/haskell/clay/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "clay"; - version = "0.9.0.1"; - sha256 = "1w2617kpj6rblmycqb97gyshwbvzp5w2h4xh494mvdzi3bkahqpn"; + version = "0.10"; + sha256 = "0xw7j9v2cfs4874l5n852b38m6v2mpkbr93dxxfkp2kwmqkjbl5v"; buildDepends = [ mtl text ]; testDepends = [ HUnit mtl testFramework testFrameworkHunit text ]; jailbreak = true; From 0cf75518f0b5408ac708b1c79a28199d67f835c1 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 23 Nov 2014 21:05:56 +0100 Subject: [PATCH 309/383] haskell-colors: update to version 0.2.0.1 --- pkgs/development/libraries/haskell/colors/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/colors/default.nix b/pkgs/development/libraries/haskell/colors/default.nix index f5523a5a2b5..167637863ef 100644 --- a/pkgs/development/libraries/haskell/colors/default.nix +++ b/pkgs/development/libraries/haskell/colors/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "colors"; - version = "0.2"; - sha256 = "009qkab6m1gnvxc23ayhv5h2v9mpiji5hasiym7a8nm69p8678xa"; + version = "0.2.0.1"; + sha256 = "0xl7hdp1di8gl0g28vz2lm6pbj7hihdkfnr18843016736hll4qn"; buildDepends = [ profunctors ]; meta = { homepage = "https://github.com/fumieval/colors"; From 025d675fa094d4cb464807c093b632a29c12261c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 23 Nov 2014 21:05:59 +0100 Subject: [PATCH 310/383] haskell-cond: update to version 0.4.1.1 --- pkgs/development/libraries/haskell/cond/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/cond/default.nix b/pkgs/development/libraries/haskell/cond/default.nix index 64b62db5ba8..4846e5cb61f 100644 --- a/pkgs/development/libraries/haskell/cond/default.nix +++ b/pkgs/development/libraries/haskell/cond/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "cond"; - version = "0.4.1"; - sha256 = "16xk8clsxv5qi5f745xvs44y8p8dnmlmjkjzwqz9jl8fbmkmki3b"; + version = "0.4.1.1"; + sha256 = "12xcjxli1scd4asr4zc77i5q9qka2100gx97hv3vv12l7gj7d703"; meta = { homepage = "https://github.com/kallisti-dev/cond"; description = "Basic conditional and boolean operators with monadic variants"; From e7e8bf5e9335d82f4addc045b7e552554379980a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 23 Nov 2014 21:06:01 +0100 Subject: [PATCH 311/383] haskell-data-ordlist: update to version 0.4.7.0 --- pkgs/development/libraries/haskell/data-ordlist/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/data-ordlist/default.nix b/pkgs/development/libraries/haskell/data-ordlist/default.nix index 959eb57e779..3db8f1ef067 100644 --- a/pkgs/development/libraries/haskell/data-ordlist/default.nix +++ b/pkgs/development/libraries/haskell/data-ordlist/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "data-ordlist"; - version = "0.4.6.1"; - sha256 = "1qrvyin5567br99zfip7krdy6snnbm5z5jdi6ghmk0cfmhmyrwy3"; + version = "0.4.7.0"; + sha256 = "03a9ix1fcx08viwv2jg5ndw1qbkydyyrmjvqr9wasmcik9x1wv3g"; meta = { description = "Set and bag operations on ordered lists"; license = self.stdenv.lib.licenses.bsd3; From 17d85a0a9924cbf27d574e91d9c1f803529e6455 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 23 Nov 2014 21:06:05 +0100 Subject: [PATCH 312/383] haskell-diagrams-contrib: update to version 1.1.2.3 --- pkgs/development/libraries/haskell/diagrams/contrib.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/diagrams/contrib.nix b/pkgs/development/libraries/haskell/diagrams/contrib.nix index e91ed955ca9..a958c0b6266 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.2"; - sha256 = "1a9ayqyffgwq8k9d8l12s6l1pqv27fvzngsklnh3y1bgp20d2z01"; + version = "1.1.2.3"; + sha256 = "00bn9p2a6h26q7hfqqzwimfgr2avf7ilf61z3anz25raz8jqvfxc"; buildDepends = [ arithmoi circlePacking colour dataDefault dataDefaultClass diagramsCore diagramsLib forceLayout lens MonadRandom mtl parsec From ae6ef59d3a77aa5b98ad3195cd519adee78a58bd Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 23 Nov 2014 21:06:07 +0100 Subject: [PATCH 313/383] haskell-diagrams-core: update to version 1.2.0.3 --- pkgs/development/libraries/haskell/diagrams/core.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/diagrams/core.nix b/pkgs/development/libraries/haskell/diagrams/core.nix index 1df0cc32a5b..0ce9a559059 100644 --- a/pkgs/development/libraries/haskell/diagrams/core.nix +++ b/pkgs/development/libraries/haskell/diagrams/core.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "diagrams-core"; - version = "1.2.0.2"; - sha256 = "10glkp05pnxx7c7f33654rjcvahslxx010v36wf6zsa8nscdrccn"; + version = "1.2.0.3"; + sha256 = "1pmdz75v2xl8y0clqifs017gq40syxqpfa2h2mc50pip3484a7m5"; buildDepends = [ dualTree lens MemoTrie monoidExtras newtype semigroups vectorSpace vectorSpacePoints From bc2805a09f27ff293fc2364fe1df383ef39599ba Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 23 Nov 2014 21:06:09 +0100 Subject: [PATCH 314/383] haskell-diagrams-lib: update to version 1.2.0.5 --- pkgs/development/libraries/haskell/diagrams/lib.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/diagrams/lib.nix b/pkgs/development/libraries/haskell/diagrams/lib.nix index 5f2d6a90682..3b42584bb28 100644 --- a/pkgs/development/libraries/haskell/diagrams/lib.nix +++ b/pkgs/development/libraries/haskell/diagrams/lib.nix @@ -8,8 +8,8 @@ cabal.mkDerivation (self: { pname = "diagrams-lib"; - version = "1.2.0.4"; - sha256 = "01gcbgxsnrcsysvpjhprym5ix10350x7l57f28nm0hbrfrsgidhz"; + version = "1.2.0.5"; + sha256 = "0km2j74riybmlhpb3jp4i3xilz4q2ngkifnsq6bsk8d0m3kqizd6"; buildDepends = [ active colour dataDefaultClass diagramsCore dualTree filepath fingertree hashable intervals JuicyPixels lens MemoTrie From ca7da2bd4c3e7972b3fc7579024bdac2fc239ae6 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 23 Nov 2014 21:06:11 +0100 Subject: [PATCH 315/383] haskell-diagrams-postscript: update to version 1.1.0.2 --- pkgs/development/libraries/haskell/diagrams/postscript.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/diagrams/postscript.nix b/pkgs/development/libraries/haskell/diagrams/postscript.nix index 3d8656c5244..73bc954de5d 100644 --- a/pkgs/development/libraries/haskell/diagrams/postscript.nix +++ b/pkgs/development/libraries/haskell/diagrams/postscript.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "diagrams-postscript"; - version = "1.1.0.1"; - sha256 = "03747g5y33kzf76hs4y0ak9q6b79r92z130b03bcc2892na62ad6"; + version = "1.1.0.2"; + sha256 = "1djvra4igw43746wqhwg1ms76w2qlrsdwhr0b795si4wdx8k28b3"; buildDepends = [ dataDefaultClass diagramsCore diagramsLib dlist filepath hashable lens monoidExtras mtl semigroups split vectorSpace From 7d8dde79b5d70b42f0b525e09b021d39f2e85d5d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 23 Nov 2014 21:06:13 +0100 Subject: [PATCH 316/383] haskell-diagrams-rasterific: update to version 0.1.0.4 --- pkgs/development/libraries/haskell/diagrams/rasterific.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/diagrams/rasterific.nix b/pkgs/development/libraries/haskell/diagrams/rasterific.nix index c9cd6dedc18..0aa953537ce 100644 --- a/pkgs/development/libraries/haskell/diagrams/rasterific.nix +++ b/pkgs/development/libraries/haskell/diagrams/rasterific.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "diagrams-rasterific"; - version = "0.1.0.3"; - sha256 = "0bscz7jkx1pwamfx5w90k19349qypzrlbd0in6kjpsw4nb58sy58"; + version = "0.1.0.4"; + sha256 = "0l6072blz56rc4nxr2s7gh5p3zdcyq8cfndbqgzndsfak6wyixgb"; buildDepends = [ dataDefaultClass diagramsCore diagramsLib filepath FontyFruity JuicyPixels lens mtl optparseApplicative Rasterific split From 403dd0d7e259ba8ec3b0340c4371a3f1b26e7443 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 23 Nov 2014 21:06:15 +0100 Subject: [PATCH 317/383] haskell-diagrams-svg: update to version 1.1.0.2 --- pkgs/development/libraries/haskell/diagrams/svg.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/diagrams/svg.nix b/pkgs/development/libraries/haskell/diagrams/svg.nix index 9f1f3175525..00ce51e8d97 100644 --- a/pkgs/development/libraries/haskell/diagrams/svg.nix +++ b/pkgs/development/libraries/haskell/diagrams/svg.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "diagrams-svg"; - version = "1.1.0.1"; - sha256 = "02krwy1v7rhcgg0ps7kd8ym50kh48dcfqm2xz3k6hr32jzqa5hlw"; + version = "1.1.0.2"; + sha256 = "0dzws9c3swgnrx70a64614m9pc8rszfajgh674n7x56fbbp3ra1n"; buildDepends = [ base64Bytestring blazeMarkup blazeSvg colour diagramsCore diagramsLib filepath hashable JuicyPixels lens monoidExtras mtl From 80f808ab463c8896f2e53ebcd698cb0bef477b2c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 23 Nov 2014 21:06:17 +0100 Subject: [PATCH 318/383] haskell-elerea: update to version 2.8.0 --- pkgs/development/libraries/haskell/elerea/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/haskell/elerea/default.nix b/pkgs/development/libraries/haskell/elerea/default.nix index ff6e4819283..4d843bb0836 100644 --- a/pkgs/development/libraries/haskell/elerea/default.nix +++ b/pkgs/development/libraries/haskell/elerea/default.nix @@ -1,11 +1,12 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal }: +{ cabal, transformers, transformersBase }: cabal.mkDerivation (self: { pname = "elerea"; - version = "2.7.0.2"; - sha256 = "1n45q1hx548c6yqbj3321lky3xxsffpqvmcq0m9hw36d3cvwbvg0"; + version = "2.8.0"; + sha256 = "1sc71775f787dh70ay9fm6x6npsn81yci9yr984ai87ddz023sab"; + buildDepends = [ transformers transformersBase ]; meta = { description = "A minimalistic FRP library"; license = self.stdenv.lib.licenses.bsd3; From ee614eacb97a7daceaaabb296a3936808f2c7934 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 23 Nov 2014 21:06:19 +0100 Subject: [PATCH 319/383] haskell-extensible-effects: update to version 1.7.1.2 --- .../libraries/haskell/extensible-effects/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/extensible-effects/default.nix b/pkgs/development/libraries/haskell/extensible-effects/default.nix index 0c743df4a16..2bae81325ae 100644 --- a/pkgs/development/libraries/haskell/extensible-effects/default.nix +++ b/pkgs/development/libraries/haskell/extensible-effects/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "extensible-effects"; - version = "1.7.1"; - sha256 = "1i7bmyga63svnky03f5xvz63795pjsqp3x7rn9amj55yj11fmp05"; + version = "1.7.1.2"; + sha256 = "1mvyiqlga6al81j4b4rg9yl46ml5s0hnx1g2hyvqljzr12njmajv"; buildDepends = [ transformers transformersBase ]; testDepends = [ HUnit QuickCheck testFramework testFrameworkHunit From 5744c74029b0f7777de977a3263751c1a25853f1 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 23 Nov 2014 21:06:22 +0100 Subject: [PATCH 320/383] haskell-force-layout: update to version 0.3.0.8 --- pkgs/development/libraries/haskell/force-layout/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/force-layout/default.nix b/pkgs/development/libraries/haskell/force-layout/default.nix index 6721e439682..91dfc9dca84 100644 --- a/pkgs/development/libraries/haskell/force-layout/default.nix +++ b/pkgs/development/libraries/haskell/force-layout/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "force-layout"; - version = "0.3.0.7"; - sha256 = "1kq6fg90yj735rpipspykvkmzs2cnwyib6pkph58523bvahgi2dy"; + version = "0.3.0.8"; + sha256 = "00b831l94r3lx0b330ql3w551w0fwziayhsjydzbfqq335syaaxg"; buildDepends = [ dataDefaultClass lens vectorSpace vectorSpacePoints ]; From 1effd019e0d710f4a4831991285e60f52b1ac8f0 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 23 Nov 2014 21:06:24 +0100 Subject: [PATCH 321/383] haskell-free-game: update to version 1.1.80 --- pkgs/development/libraries/haskell/free-game/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/free-game/default.nix b/pkgs/development/libraries/haskell/free-game/default.nix index acd217f73f6..a7edf7817ba 100644 --- a/pkgs/development/libraries/haskell/free-game/default.nix +++ b/pkgs/development/libraries/haskell/free-game/default.nix @@ -8,8 +8,8 @@ cabal.mkDerivation (self: { pname = "free-game"; - version = "1.1.79"; - sha256 = "0dlkkcbi7442cbl3ibzy234alaixh34hkc20wr7p75z47w1r5fbx"; + version = "1.1.80"; + sha256 = "1vpwrviwxib22mkaqmwndzfly8iicr85sh1y914gwp5n83lmkava"; buildDepends = [ boundingboxes colors controlBool filepath free freetype2 GLFWB hashable JuicyPixels JuicyPixelsUtil lens linear mtl OpenGL From cef64b8e796a2e0a58300f07138477c4e00d0499 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 23 Nov 2014 21:06:26 +0100 Subject: [PATCH 322/383] haskell-gio: update to version 0.13.0.3 --- pkgs/development/libraries/haskell/gio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/gio/default.nix b/pkgs/development/libraries/haskell/gio/default.nix index 7b53ccf1179..c98f772f87a 100644 --- a/pkgs/development/libraries/haskell/gio/default.nix +++ b/pkgs/development/libraries/haskell/gio/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "gio"; - version = "0.13.0.2"; - sha256 = "12wcgycljlrxbf9hdp0c9n6d2h709wb3jk94v3lngwc7z5lnv5hs"; + version = "0.13.0.3"; + sha256 = "15025jj6i1gpvjs46545vzmvs6ka41x15lrllqr9hd0qsyhibsf5"; buildDepends = [ glib mtl ]; buildTools = [ gtk2hsBuildtools ]; pkgconfigDepends = [ glib ]; From 4d2fb9e7d16c64b5b3032b8782758c19a7ee8174 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 23 Nov 2014 21:06:28 +0100 Subject: [PATCH 323/383] haskell-glib: update to version 0.13.0.6 --- pkgs/development/libraries/haskell/glib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/glib/default.nix b/pkgs/development/libraries/haskell/glib/default.nix index 1229b7c8506..872364fe985 100644 --- a/pkgs/development/libraries/haskell/glib/default.nix +++ b/pkgs/development/libraries/haskell/glib/default.nix @@ -5,8 +5,8 @@ cabal.mkDerivation (self: { pname = "glib"; - version = "0.13.0.5"; - sha256 = "0drpsdzdk47qkcn9jca8i4xrhhcql5gphm9wx2xaavqs8g7aqkg3"; + version = "0.13.0.6"; + sha256 = "1hn3l0vrz76gmk7bjhs4nw68izf29k0pxm92l0zih7wq5ny4lhrv"; buildDepends = [ text utf8String ]; buildTools = [ gtk2hsBuildtools ]; extraLibraries = [ libc pkgconfig ]; From 2724426c2aa351ee0127e8f806bec6e38af528dd Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 23 Nov 2014 21:06:32 +0100 Subject: [PATCH 324/383] haskell-gtk2hs-buildtools: update to version 0.13.0.3 --- .../libraries/haskell/gtk2hs-buildtools/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/gtk2hs-buildtools/default.nix b/pkgs/development/libraries/haskell/gtk2hs-buildtools/default.nix index 2081f7467d7..9fabf287166 100644 --- a/pkgs/development/libraries/haskell/gtk2hs-buildtools/default.nix +++ b/pkgs/development/libraries/haskell/gtk2hs-buildtools/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "gtk2hs-buildtools"; - version = "0.13.0.2"; - sha256 = "14yx2v2y3k0cvjsgknff9qbv0pfnbar4j1b1hpz9ygjhb8kd5kjl"; + version = "0.13.0.3"; + sha256 = "1ijcmcjp8mralpzl1gvh24bzq8njlzkvck1r07b010rrklv04arp"; isLibrary = false; isExecutable = true; buildDepends = [ filepath hashtables random ]; From b91ed78d79624d7f8cf38b1355a4f56e8aeb3969 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 23 Nov 2014 21:06:34 +0100 Subject: [PATCH 325/383] haskell-gtk3: update to version 0.13.1 --- pkgs/development/libraries/haskell/gtk3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/gtk3/default.nix b/pkgs/development/libraries/haskell/gtk3/default.nix index 52604727d8a..2bcb6848e59 100644 --- a/pkgs/development/libraries/haskell/gtk3/default.nix +++ b/pkgs/development/libraries/haskell/gtk3/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "gtk3"; - version = "0.13.0.3"; - sha256 = "12ywqxvmakcdmfj5y4jpn91rxa4xskd0w3hn2l679dk6lxyl15q7"; + version = "0.13.1"; + sha256 = "063my2y0fjsr2dgw066l6ck3mbcp1ahx5rqlzyb5xx1sbafrpl6a"; isLibrary = true; isExecutable = true; buildDepends = [ cairo gio glib mtl pango text time transformers ]; From 4f1731bb029dc705e363de5b599ae4759669eca7 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 23 Nov 2014 21:06:36 +0100 Subject: [PATCH 326/383] haskell-hakyll: update to version 4.6.1.0 --- pkgs/development/libraries/haskell/hakyll/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/hakyll/default.nix b/pkgs/development/libraries/haskell/hakyll/default.nix index fd9685d326e..03730449a1a 100644 --- a/pkgs/development/libraries/haskell/hakyll/default.nix +++ b/pkgs/development/libraries/haskell/hakyll/default.nix @@ -11,8 +11,8 @@ cabal.mkDerivation (self: { pname = "hakyll"; - version = "4.6.0.0"; - sha256 = "0ihaw53935g9pyasa8g5qi1dgvxanhhpkg0xcjq7aazqk2cciqy3"; + version = "4.6.1.0"; + sha256 = "19yw5yp84vli228zmyz23vs6d5mb14rjbb81kvyra8fi8mmy2l6b"; isLibrary = true; isExecutable = true; buildDepends = [ From 6b7da1b142437748f1a2c9a53c70344df3ecb1c6 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 23 Nov 2014 21:06:41 +0100 Subject: [PATCH 327/383] haskell-hsimport: update to version 0.6.4 --- 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 6eeb6f36f89..cc9b8046322 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.6.3"; - sha256 = "0pmlspz09qj8zb1qpv6dxd25l69hh2ccsyvc37914dis74g9rw03"; + version = "0.6.4"; + sha256 = "07v7sm98a0vzfk1xx8mf6l2ybf3rwx4ml2wxp1rlw5w1aapffsfw"; isLibrary = true; isExecutable = true; buildDepends = [ From fc0a79032c5f09ed97cfdbe43127ee5dea0c42c5 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 23 Nov 2014 21:06:43 +0100 Subject: [PATCH 328/383] haskell-http-conduit: update to version 2.1.5 --- 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 ffb01a4a48d..bb5dc9f7505 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.7"; - sha256 = "1fr8vxv2xidysls9g8zh04qddg9s6i9vs1xr4zkwr6fw750547n3"; + version = "2.1.5"; + sha256 = "0vk2an6h3h7a5klk9xrf3apfm6xdmqm418yrr7pb56b7w5sfq003"; buildDepends = [ conduit httpClient httpClientTls httpTypes liftedBase monadControl mtl resourcet transformers From 69dbbd42a7fe9b9620157514fdc1d01023413ab9 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 23 Nov 2014 21:06:45 +0100 Subject: [PATCH 329/383] haskell-iCalendar: update to version 0.4.0.2 --- .../libraries/haskell/iCalendar/default.nix | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/pkgs/development/libraries/haskell/iCalendar/default.nix b/pkgs/development/libraries/haskell/iCalendar/default.nix index 635254bca75..734c7587aa9 100644 --- a/pkgs/development/libraries/haskell/iCalendar/default.nix +++ b/pkgs/development/libraries/haskell/iCalendar/default.nix @@ -1,23 +1,17 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! { cabal, base64Bytestring, caseInsensitive, dataDefault, mime, mtl -, network, networkUri, parsec, text, time, fetchpatch +, network, networkUri, parsec, text, time }: cabal.mkDerivation (self: { pname = "iCalendar"; - version = "0.4.0.1"; - sha256 = "08m47nxxz70lmmndlgycfb27x8xfwakxi8izbba0f6w23ddaljp3"; + version = "0.4.0.2"; + sha256 = "0a6kj6ih8dpzvld7hjvjp6gcf4f2y81x6bx17z6wgzwdj9fv7jry"; buildDepends = [ base64Bytestring caseInsensitive dataDefault mime mtl network networkUri parsec text time ]; - patches = [ - (fetchpatch { - url = "https://github.com/tingtun/iCalendar/pull/14.patch"; - sha256 = "0pyzlshckvbqns3yryh9pm5r3n2hpqx0c2i3niyqsh6a1lk9hc5m"; - }) - ]; meta = { homepage = "http://github.com/tingtun/iCalendar"; description = "iCalendar data types, parser, and printer"; From d45a1cab251865b402e7cf171ce23df75b6f2239 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 23 Nov 2014 21:06:47 +0100 Subject: [PATCH 330/383] haskell-json-schema: update to version 0.7.3.0 --- pkgs/development/libraries/haskell/json-schema/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/json-schema/default.nix b/pkgs/development/libraries/haskell/json-schema/default.nix index d40dc03be47..cd102d35803 100644 --- a/pkgs/development/libraries/haskell/json-schema/default.nix +++ b/pkgs/development/libraries/haskell/json-schema/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "json-schema"; - version = "0.7.1.1"; - sha256 = "1fzlavgx60gzqvk5h1wb0igz5qjb52zcxnmm48pwmbcjl9d6j57v"; + version = "0.7.3.0"; + sha256 = "0jdhmzg1is8dnyz46r6w616xq0w1lypc9xz1c2mcimr9xb9r70zw"; buildDepends = [ aeson genericAeson genericDeriving mtl scientific tagged text time unorderedContainers vector From bd9df3f6b6cb9d42eb74224d5ad14b618cbb7a51 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 23 Nov 2014 21:06:49 +0100 Subject: [PATCH 331/383] haskell-linear: update to version 1.15.2 --- pkgs/development/libraries/haskell/linear/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/linear/default.nix b/pkgs/development/libraries/haskell/linear/default.nix index 1a2f875b05c..507d9c19dde 100644 --- a/pkgs/development/libraries/haskell/linear/default.nix +++ b/pkgs/development/libraries/haskell/linear/default.nix @@ -8,8 +8,8 @@ cabal.mkDerivation (self: { pname = "linear"; - version = "1.13"; - sha256 = "1gad6dvri7a21v8zx6m2m3ghcvb4zfrra3c4ghrc7ywccxvzmxpc"; + version = "1.15.2"; + sha256 = "1zikj932wbmjnq02msq5c2i3w2993lya0kvs326ajlpmq5q35gpj"; buildDepends = [ adjunctions binary distributive hashable lens reflection semigroupoids semigroups tagged transformers unorderedContainers From 16b689a0f061ad9e873777950aeb9c4b949c8c9e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 23 Nov 2014 21:06:51 +0100 Subject: [PATCH 332/383] haskell-machines: update to version 0.4.0.1 --- pkgs/development/libraries/haskell/machines/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/machines/default.nix b/pkgs/development/libraries/haskell/machines/default.nix index 98a6248899b..02b2ec272b0 100644 --- a/pkgs/development/libraries/haskell/machines/default.nix +++ b/pkgs/development/libraries/haskell/machines/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "machines"; - version = "0.4"; - sha256 = "00qs1hv1sc4278hlwjfv9ykbhxg4hxb0kqyrglagb42sn8j35kyz"; + version = "0.4.0.1"; + sha256 = "11h1b6hls7v4ifz3p7v1gdsgxqgyx92v978pjfyp81ianwjyclqg"; buildDepends = [ comonad free mtl pointed profunctors semigroups transformers void ]; From 6a4711949d8c238a0c04f7c4c54394dbb0b2b80d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 23 Nov 2014 21:06:53 +0100 Subject: [PATCH 333/383] haskell-mono-traversable: update to version 0.6.3 --- .../libraries/haskell/mono-traversable/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/mono-traversable/default.nix b/pkgs/development/libraries/haskell/mono-traversable/default.nix index 5a5249657eb..91d160fc345 100644 --- a/pkgs/development/libraries/haskell/mono-traversable/default.nix +++ b/pkgs/development/libraries/haskell/mono-traversable/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "mono-traversable"; - version = "0.6.2"; - sha256 = "17ipqxzpz1vnv2qlj7rl8iz3awk593z39c716bikx03z67h85qzr"; + version = "0.6.3"; + sha256 = "026qii2i6l8lsvhvb9l8gkzybrvf87skg6mjam2bxc3i1bjx1lkr"; buildDepends = [ comonad dlist dlistInstances hashable semigroupoids semigroups text transformers unorderedContainers vector vectorAlgorithms From 2b111f780d29709abdb7ca783681dfb1f4db58ba Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 23 Nov 2014 21:06:55 +0100 Subject: [PATCH 334/383] haskell-network-conduit-tls: update to version 1.1.0.2 --- .../libraries/haskell/network-conduit-tls/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/network-conduit-tls/default.nix b/pkgs/development/libraries/haskell/network-conduit-tls/default.nix index 256b6a6102a..5b023f91b66 100644 --- a/pkgs/development/libraries/haskell/network-conduit-tls/default.nix +++ b/pkgs/development/libraries/haskell/network-conduit-tls/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "network-conduit-tls"; - version = "1.1.0.1"; - sha256 = "13axzdzcljv240nkrfpycj184ap94hn6zsk9mszp5k48rb3ddc8a"; + version = "1.1.0.2"; + sha256 = "1jgv2g3fsfp0rym4g0d9w5hm5ws0sfisj07hcfk2711rm107zaax"; buildDepends = [ conduit conduitExtra connection cprngAes dataDefault monadControl network streamingCommons systemFileio systemFilepath tls From 51783594449cb579e97e0e90c10196508fda9bbe Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 23 Nov 2014 21:06:59 +0100 Subject: [PATCH 335/383] haskell-pango: update to version 0.13.0.4 --- pkgs/development/libraries/haskell/pango/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/pango/default.nix b/pkgs/development/libraries/haskell/pango/default.nix index c3ce339f7d5..d79b931132d 100644 --- a/pkgs/development/libraries/haskell/pango/default.nix +++ b/pkgs/development/libraries/haskell/pango/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "pango"; - version = "0.13.0.3"; - sha256 = "0xvmv1r7lh727w1pag8myp069s4wnvgsqlr3c3ir1gyzxy5jq69f"; + version = "0.13.0.4"; + sha256 = "1fglwywac36abpjjpgdsk62f4sndgr5nf29fmana0yac7hxsm1sq"; buildDepends = [ cairo glib mtl text ]; buildTools = [ gtk2hsBuildtools ]; extraLibraries = [ libc pkgconfig ]; From 5076f0d29ff30c512d7388b3b9fb9391031ebbd6 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 23 Nov 2014 21:07:02 +0100 Subject: [PATCH 336/383] haskell-persistent-mysql: update to version 2.1.2 --- .../libraries/haskell/persistent-mysql/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/persistent-mysql/default.nix b/pkgs/development/libraries/haskell/persistent-mysql/default.nix index a43d4cea23f..db4b89990b2 100644 --- a/pkgs/development/libraries/haskell/persistent-mysql/default.nix +++ b/pkgs/development/libraries/haskell/persistent-mysql/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "persistent-mysql"; - version = "2.1.1"; - sha256 = "058i7iblbf73z2gnyc1d70vdwmcyfr4hq3lw59hng1qmqs93dv4l"; + version = "2.1.2"; + sha256 = "06i2wcrqvk216bq3853acqi6wgrdzkz3wzah231gv3yz348lr6sv"; buildDepends = [ aeson blazeBuilder conduit monadControl monadLogger mysql mysqlSimple persistent resourcet text transformers From 81e1f193b196930fe9146fb746f99402a9befa07 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 23 Nov 2014 21:07:04 +0100 Subject: [PATCH 337/383] haskell-persistent-postgresql: update to version 2.1.1 --- .../libraries/haskell/persistent-postgresql/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/persistent-postgresql/default.nix b/pkgs/development/libraries/haskell/persistent-postgresql/default.nix index 1343404a15d..1ccdeca9277 100644 --- a/pkgs/development/libraries/haskell/persistent-postgresql/default.nix +++ b/pkgs/development/libraries/haskell/persistent-postgresql/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "persistent-postgresql"; - version = "2.1.0.1"; - sha256 = "0ndy8vbzxqcdx9hqmpmp9f7b8cd6lpgzzc8m7jlwzjz4agc51767"; + version = "2.1.1"; + sha256 = "0mfvzd62qn7ffx6nrgkr52qzl3prjq8xkahvb6j5akb6azdmzg80"; buildDepends = [ aeson blazeBuilder conduit monadControl monadLogger persistent postgresqlLibpq postgresqlSimple resourcet text time transformers From 9e14853dabc352bc9330141385a51c828add3da0 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 23 Nov 2014 21:07:06 +0100 Subject: [PATCH 338/383] haskell-persistent-sqlite: update to version 2.1.1 --- .../libraries/haskell/persistent-sqlite/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/persistent-sqlite/default.nix b/pkgs/development/libraries/haskell/persistent-sqlite/default.nix index fb8fd059aa7..34a427ddb07 100644 --- a/pkgs/development/libraries/haskell/persistent-sqlite/default.nix +++ b/pkgs/development/libraries/haskell/persistent-sqlite/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "persistent-sqlite"; - version = "2.1.0.1"; - sha256 = "1l5iwyd8qi75ijjiznkp9i6b3rzs64bb1lph0syr0xi2arx18bxs"; + version = "2.1.1"; + sha256 = "1hypaixwp6q10gfwbg0xfqfw7vz9j56max5i0k1mklan6js7wy9w"; isLibrary = true; isExecutable = true; buildDepends = [ From 66c1de7bffde51583ef472c99140156e33202e87 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 23 Nov 2014 21:07:08 +0100 Subject: [PATCH 339/383] haskell-purescript: update to version 0.6.1.1 --- pkgs/development/libraries/haskell/purescript/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/purescript/default.nix b/pkgs/development/libraries/haskell/purescript/default.nix index b4a28877ea3..a1d999d9a86 100644 --- a/pkgs/development/libraries/haskell/purescript/default.nix +++ b/pkgs/development/libraries/haskell/purescript/default.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "purescript"; - version = "0.6.1"; - sha256 = "0b2alnavqs700b59v8ifyl3qwwialmpwzk8mgiwi0i6n7h0afsm9"; + version = "0.6.1.1"; + sha256 = "1wzaimcdddwivlzhb7m4888wwa58al2rccgdnhzng70r0r9qvpng"; isLibrary = true; isExecutable = true; buildDepends = [ From 532aa6588dd0c620bfc0e70388e52c41033e3bd0 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 23 Nov 2014 21:07:10 +0100 Subject: [PATCH 340/383] haskell-resourcet: update to version 1.1.3 --- pkgs/development/libraries/haskell/resourcet/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/resourcet/default.nix b/pkgs/development/libraries/haskell/resourcet/default.nix index 81a7c9d28a2..affeff4d1b0 100644 --- a/pkgs/development/libraries/haskell/resourcet/default.nix +++ b/pkgs/development/libraries/haskell/resourcet/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "resourcet"; - version = "1.1.2.3"; - sha256 = "1n1z1q3k8lg3wqdkrmcfl9mvlx1p81gkh5j911w1006rnm8r87im"; + version = "1.1.3"; + sha256 = "0qai73ip4fwghd27c9ddpbl4kw338xhp17n9r5gh8v9awxc5ppap"; buildDepends = [ exceptions liftedBase mmorph monadControl mtl transformers transformersBase From 8125f34937a83d357675d11b9f8eec020a762600 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 23 Nov 2014 21:07:12 +0100 Subject: [PATCH 341/383] haskell-rest-core: update to version 0.33.1.1 --- 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 7bb7a9e15f5..bea8d8655e1 100644 --- a/pkgs/development/libraries/haskell/rest-core/default.nix +++ b/pkgs/development/libraries/haskell/rest-core/default.nix @@ -8,8 +8,8 @@ cabal.mkDerivation (self: { pname = "rest-core"; - version = "0.33.1"; - sha256 = "0vrxdfnv53f65nifvvjj961h9nj7dlbfwk5y21zy9cl5w0dbg5yy"; + version = "0.33.1.1"; + sha256 = "0sdknsh2y2lag4n59vdvwq95h0x32s3nvr1alddnpfpw6fsd7m2s"; buildDepends = [ aeson aesonUtils either errors fclabels hxt hxtPickleUtils jsonSchema mtl multipart random restStringmap restTypes safe split From bf7a0d77d548c812541666997dbd10b7bf811a46 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 23 Nov 2014 21:07:14 +0100 Subject: [PATCH 342/383] haskell-sbv: update to version 3.2 --- pkgs/development/libraries/haskell/sbv/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/sbv/default.nix b/pkgs/development/libraries/haskell/sbv/default.nix index 0a21f13dbc2..088fc38d0f8 100644 --- a/pkgs/development/libraries/haskell/sbv/default.nix +++ b/pkgs/development/libraries/haskell/sbv/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "sbv"; - version = "3.1"; - sha256 = "19rn5ynqqjz0zw7gcb0y4clzxxnmq56a2qx369mz283455l86h5j"; + version = "3.2"; + sha256 = "0hqibdl2bhxyc0akfy97j41mkp9s39ahdz25nyrzpjj89b9hzzi0"; isLibrary = true; isExecutable = true; buildDepends = [ From 74cc312024cadecf19ea2b954e6ce37ff2717c49 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 23 Nov 2014 21:07:16 +0100 Subject: [PATCH 343/383] haskell-shake: update to version 0.14.1 --- .../libraries/haskell/shake/default.nix | 21 ++++++++++--------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/pkgs/development/libraries/haskell/shake/default.nix b/pkgs/development/libraries/haskell/shake/default.nix index 42dbb2079c8..1983f80b60d 100644 --- a/pkgs/development/libraries/haskell/shake/default.nix +++ b/pkgs/development/libraries/haskell/shake/default.nix @@ -1,25 +1,26 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, binary, deepseq, filepath, hashable, QuickCheck, random -, time, transformers, unorderedContainers, utf8String +{ cabal, binary, deepseq, extra, filepath, hashable, jsFlot +, jsJquery, QuickCheck, random, time, transformers +, unorderedContainers, utf8String }: cabal.mkDerivation (self: { pname = "shake"; - version = "0.13.4"; - sha256 = "05w78d2hdw13f3i876iq1b5j137p4vr759da273p8k6alk4mi3am"; + version = "0.14.1"; + sha256 = "101sdrp3whp1yvx4n8zri0rjkagq3hkmpd2xpkidzj9ssaz4x4fa"; isLibrary = true; isExecutable = true; buildDepends = [ - binary deepseq filepath hashable random time transformers - unorderedContainers utf8String - ]; - testDepends = [ - binary deepseq filepath hashable QuickCheck random time + binary deepseq extra filepath hashable jsFlot jsJquery random time transformers unorderedContainers utf8String ]; + testDepends = [ + binary deepseq extra filepath hashable jsFlot jsJquery QuickCheck + random time transformers unorderedContainers utf8String + ]; meta = { - homepage = "https://github.com/ndmitchell/shake#readme"; + homepage = "http://www.shakebuild.com/"; description = "Build system library, like Make, but more accurate dependencies"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; From a44a622ae73dae0798975cf09e5318d54ca734b6 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 23 Nov 2014 21:07:18 +0100 Subject: [PATCH 344/383] haskell-streaming-commons: update to version 0.1.6 --- .../libraries/haskell/streaming-commons/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/streaming-commons/default.nix b/pkgs/development/libraries/haskell/streaming-commons/default.nix index f42634473bb..ba9b8794eb5 100644 --- a/pkgs/development/libraries/haskell/streaming-commons/default.nix +++ b/pkgs/development/libraries/haskell/streaming-commons/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "streaming-commons"; - version = "0.1.5"; - sha256 = "1gmr8yv6r87y1826rc3y3i8darwsaisqpbhjx1bn3m070g9fhqlp"; + version = "0.1.6"; + sha256 = "0wapq6h7c0c3wciqfjz7j4z8kgf7wdr1s0al493jcrdyfy5k43dh"; buildDepends = [ blazeBuilder network random stm text transformers zlib ]; From 80e27951059a39764450a8972166736fdbc04606 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 23 Nov 2014 21:07:20 +0100 Subject: [PATCH 345/383] haskell-traverse-with-class: update to version 0.2.0.3 --- .../libraries/haskell/traverse-with-class/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/traverse-with-class/default.nix b/pkgs/development/libraries/haskell/traverse-with-class/default.nix index 50d5c61dd09..2ec410dc0a4 100644 --- a/pkgs/development/libraries/haskell/traverse-with-class/default.nix +++ b/pkgs/development/libraries/haskell/traverse-with-class/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "traverse-with-class"; - version = "0.1.1.1"; - sha256 = "0agdgnibv8q65av2fkr2qm0air8zqmygwpkl30wmay5mqqknzxiq"; + version = "0.2.0.3"; + sha256 = "0snms19w3n9ni1wmf4ikwpp298nc6qk6phrjxi5g023ihqqdvr6g"; buildDepends = [ transformers ]; meta = { description = "Generic applicative traversals"; From fc263e7685c076236ddd3363166a7cb83d71b73d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 23 Nov 2014 21:07:23 +0100 Subject: [PATCH 346/383] haskell-twitter-conduit: update to version 0.1.0 --- .../haskell/twitter-conduit/default.nix | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/pkgs/development/libraries/haskell/twitter-conduit/default.nix b/pkgs/development/libraries/haskell/twitter-conduit/default.nix index a1b3cf56165..f7cc5c343b6 100644 --- a/pkgs/development/libraries/haskell/twitter-conduit/default.nix +++ b/pkgs/development/libraries/haskell/twitter-conduit/default.nix @@ -3,27 +3,27 @@ { cabal, aeson, attoparsec, authenticateOauth, caseInsensitive , conduit, conduitExtra, dataDefault, doctest, filepath, hlint , hspec, httpClient, httpConduit, httpTypes, lens, lensAeson -, monadControl, monadLogger, networkUri, resourcet, text, time -, transformers, transformersBase, twitterTypes +, monadControl, networkUri, resourcet, text, time, transformers +, transformersBase, twitterTypes, twitterTypesLens }: cabal.mkDerivation (self: { pname = "twitter-conduit"; - version = "0.0.8"; - sha256 = "16yxf9qdy1x2w4l4ix1kp1a9vcgmd1cvkqffkj52rzckcjpyd6fs"; + version = "0.1.0"; + sha256 = "1cymgp3wlswxn5qfdr442cqq2ak48b5w1zcsr67n2g5p1izadwji"; isLibrary = true; isExecutable = true; buildDepends = [ aeson attoparsec authenticateOauth conduit conduitExtra dataDefault - httpClient httpConduit httpTypes lens lensAeson monadLogger - networkUri resourcet text time transformers twitterTypes + httpClient httpConduit httpTypes lens lensAeson networkUri + resourcet text time transformers twitterTypes twitterTypesLens ]; testDepends = [ aeson attoparsec authenticateOauth caseInsensitive conduit conduitExtra dataDefault doctest filepath hlint hspec httpClient - httpConduit httpTypes lens lensAeson monadControl monadLogger - networkUri resourcet text time transformers transformersBase - twitterTypes + httpConduit httpTypes lens lensAeson monadControl networkUri + resourcet text time transformers transformersBase twitterTypes + twitterTypesLens ]; meta = { homepage = "https://github.com/himura/twitter-conduit"; @@ -31,6 +31,5 @@ cabal.mkDerivation (self: { license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; maintainers = with self.stdenv.lib.maintainers; [ ocharles ]; - broken = true; }; }) From 5a3bb5a09ea81c00d2140f692c04979bbce95149 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 23 Nov 2014 21:07:25 +0100 Subject: [PATCH 347/383] haskell-twitter-types: update to version 0.6.0 --- .../libraries/haskell/twitter-types/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/development/libraries/haskell/twitter-types/default.nix b/pkgs/development/libraries/haskell/twitter-types/default.nix index 4a3df6f1b9f..9ed6a77ac2d 100644 --- a/pkgs/development/libraries/haskell/twitter-types/default.nix +++ b/pkgs/development/libraries/haskell/twitter-types/default.nix @@ -1,18 +1,18 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, aeson, attoparsec, filepath, httpTypes, HUnit -, testFramework, testFrameworkHunit, testFrameworkThPrime, text +{ cabal, aeson, attoparsec, filepath, HUnit, testFramework +, testFrameworkHunit, testFrameworkThPrime, text , unorderedContainers }: cabal.mkDerivation (self: { pname = "twitter-types"; - version = "0.5.0"; - sha256 = "0nnis96rki60ily7ydq155nawmhz7dn51d1d3hwikb1vz16ji47a"; - buildDepends = [ aeson httpTypes text unorderedContainers ]; + version = "0.6.0"; + sha256 = "0yvs57f3m0nq11qpxziazp9r95g1v231d2djmch9c5d8g22cjvdn"; + buildDepends = [ aeson text unorderedContainers ]; testDepends = [ - aeson attoparsec filepath httpTypes HUnit testFramework - testFrameworkHunit testFrameworkThPrime text unorderedContainers + aeson attoparsec filepath HUnit testFramework testFrameworkHunit + testFrameworkThPrime text unorderedContainers ]; doCheck = false; meta = { From faf2d31e39e6cdbb676d26e850fe927fc282e056 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 23 Nov 2014 21:07:27 +0100 Subject: [PATCH 348/383] haskell-units: update to version 2.2 --- pkgs/development/libraries/haskell/units/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/haskell/units/default.nix b/pkgs/development/libraries/haskell/units/default.nix index c5d5262750d..2024aacf7ff 100644 --- a/pkgs/development/libraries/haskell/units/default.nix +++ b/pkgs/development/libraries/haskell/units/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "units"; - version = "2.1"; - sha256 = "1qrjc57j15ras0v43cpd7qhh9nzh9dbnkaik6s4c8aj8nkhgd8vs"; + version = "2.2"; + sha256 = "1hd7klv0h2rsq971rbghvgy2921bf0zxikdsl26qw08yb0zirvza"; buildDepends = [ mtl multimap parsec singletons syb thDesugar vectorSpace ]; @@ -16,7 +16,7 @@ cabal.mkDerivation (self: { thDesugar vectorSpace ]; meta = { - homepage = "http://www.cis.upenn.edu/~eir/packages/units"; + homepage = "https://github.com/goldfirere/units"; description = "A domain-specific type system for dimensional analysis"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; From e75da9bb5bdfebad6290661a40dcee7c30fdd088 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 23 Nov 2014 21:07:29 +0100 Subject: [PATCH 349/383] haskell-wai-app-static: update to version 3.0.0.3 --- pkgs/development/libraries/haskell/wai-app-static/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/wai-app-static/default.nix b/pkgs/development/libraries/haskell/wai-app-static/default.nix index 8d4b598e2b8..ce99df0390e 100644 --- a/pkgs/development/libraries/haskell/wai-app-static/default.nix +++ b/pkgs/development/libraries/haskell/wai-app-static/default.nix @@ -10,8 +10,8 @@ cabal.mkDerivation (self: { pname = "wai-app-static"; - version = "3.0.0.2"; - sha256 = "1y8x8gb60330mxzp649xp8dhancimmraf2h7py76wjmjp5vc5cx4"; + version = "3.0.0.3"; + sha256 = "0krvjnysmfaqds715mp6lhh5am327swi2vja5insmn08da87zhnb"; isLibrary = true; isExecutable = true; buildDepends = [ From b5430cfff0aeb84a19190ea963b6af96d52c34c2 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 23 Nov 2014 21:07:31 +0100 Subject: [PATCH 350/383] haskell-webdriver: update to version 0.6.0.3 --- .../libraries/haskell/webdriver/default.nix | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/haskell/webdriver/default.nix b/pkgs/development/libraries/haskell/webdriver/default.nix index b7c1828c3e5..883359db9ff 100644 --- a/pkgs/development/libraries/haskell/webdriver/default.nix +++ b/pkgs/development/libraries/haskell/webdriver/default.nix @@ -2,19 +2,19 @@ { cabal, aeson, attoparsec, base64Bytestring, cond, dataDefault , directoryTree, exceptions, filepath, httpClient, httpTypes -, liftedBase, monadControl, mtl, network, parallel, scientific -, temporary, text, time, transformers, transformersBase +, liftedBase, monadControl, mtl, network, networkUri, parallel +, scientific, temporary, text, time, transformers, transformersBase , unorderedContainers, vector, zipArchive }: cabal.mkDerivation (self: { pname = "webdriver"; - version = "0.6.0.1"; - sha256 = "0qpk1i6qr12lcx25bdljwqxgdhf5qk67h04bp6vwmm16dwzsyqd1"; + version = "0.6.0.3"; + sha256 = "1q0l9rs5j4cxzyqsy6r40y425359s246spk3g3pks7s47yynjn4q"; buildDepends = [ aeson attoparsec base64Bytestring cond dataDefault directoryTree exceptions filepath httpClient httpTypes liftedBase monadControl - mtl network scientific temporary text time transformers + mtl network networkUri scientific temporary text time transformers transformersBase unorderedContainers vector zipArchive ]; testDepends = [ parallel text ]; @@ -26,6 +26,5 @@ cabal.mkDerivation (self: { license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; maintainers = with self.stdenv.lib.maintainers; [ aycanirican ]; - broken = true; }; }) From 7664a1ad075d8a55816494dbfc61ac36135006a5 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 23 Nov 2014 21:07:33 +0100 Subject: [PATCH 351/383] haskell-yaml: update to version 0.8.10 --- .../libraries/haskell/yaml/default.nix | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/pkgs/development/libraries/haskell/yaml/default.nix b/pkgs/development/libraries/haskell/yaml/default.nix index 22222e1177c..e00e7c4712d 100644 --- a/pkgs/development/libraries/haskell/yaml/default.nix +++ b/pkgs/development/libraries/haskell/yaml/default.nix @@ -1,21 +1,22 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, aeson, attoparsec, conduit, hspec, HUnit, resourcet -, scientific, text, transformers, unorderedContainers, vector +{ cabal, aeson, aesonQq, attoparsec, conduit, filepath, hspec +, HUnit, resourcet, scientific, text, transformers +, unorderedContainers, vector }: cabal.mkDerivation (self: { pname = "yaml"; - version = "0.8.9.3"; - sha256 = "0hpxmb7flb9xl5s5pf1g76lvm73fbnfs9fr37vlhdxcdqgih0m68"; + version = "0.8.10"; + sha256 = "1m51h253gcp77a0sjsckccrwz5ajd991ppczvyhnprphx1y210ig"; isLibrary = true; isExecutable = true; buildDepends = [ - aeson attoparsec conduit resourcet scientific text transformers - unorderedContainers vector + aeson attoparsec conduit filepath resourcet scientific text + transformers unorderedContainers vector ]; testDepends = [ - aeson conduit hspec HUnit resourcet text transformers + aeson aesonQq conduit hspec HUnit resourcet text transformers unorderedContainers vector ]; meta = { From a43ddafe8ea6a7d32f163b3fbffd1404da20455e Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 23 Nov 2014 21:07:35 +0100 Subject: [PATCH 352/383] haskell-yesod-auth: update to version 1.4.1 --- pkgs/development/libraries/haskell/yesod-auth/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/yesod-auth/default.nix b/pkgs/development/libraries/haskell/yesod-auth/default.nix index 51b3d0f5df7..cf705ac8fc9 100644 --- a/pkgs/development/libraries/haskell/yesod-auth/default.nix +++ b/pkgs/development/libraries/haskell/yesod-auth/default.nix @@ -11,8 +11,8 @@ cabal.mkDerivation (self: { pname = "yesod-auth"; - version = "1.4.0.2"; - sha256 = "15k30si28jj6ivazwxbcy15hplvbpwwgwf5zcvzchi2w56z8j5gn"; + version = "1.4.1"; + sha256 = "1nvc5ni4bwhb10ayr75s3z44ynv9kq3lp6kgd536xyagbi054gdp"; buildDepends = [ aeson authenticate base16Bytestring base64Bytestring binary blazeBuilder blazeHtml blazeMarkup byteable conduit conduitExtra From 1c26473da20ed5aa4494b894f7c729e761da6151 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 23 Nov 2014 21:07:37 +0100 Subject: [PATCH 353/383] haskell-yesod-bin: update to version 1.4.0.9 --- pkgs/development/libraries/haskell/yesod-bin/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/yesod-bin/default.nix b/pkgs/development/libraries/haskell/yesod-bin/default.nix index c5826c29fcc..4809609036b 100644 --- a/pkgs/development/libraries/haskell/yesod-bin/default.nix +++ b/pkgs/development/libraries/haskell/yesod-bin/default.nix @@ -11,8 +11,8 @@ cabal.mkDerivation (self: { pname = "yesod-bin"; - version = "1.4.0.7"; - sha256 = "1sr36qzxqwv00qbvmszkqbfx8xcyc731y5637awgkd1i7d0klw7w"; + version = "1.4.0.9"; + sha256 = "0pm45wi72v0kx9cqbwsbq9g6w93cb8aknps6aa153vbv7k8ikn7v"; isLibrary = false; isExecutable = true; buildDepends = [ From f602eadcb5854f2043509b08c831e28151a43e6a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 23 Nov 2014 21:07:39 +0100 Subject: [PATCH 354/383] haskell-yesod-core: update to version 1.4.4.4 --- .../libraries/haskell/yesod-core/default.nix | 35 ++++++++++--------- 1 file changed, 18 insertions(+), 17 deletions(-) diff --git a/pkgs/development/libraries/haskell/yesod-core/default.nix b/pkgs/development/libraries/haskell/yesod-core/default.nix index e15793fdbae..88b33620edc 100644 --- a/pkgs/development/libraries/haskell/yesod-core/default.nix +++ b/pkgs/development/libraries/haskell/yesod-core/default.nix @@ -1,27 +1,28 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! -{ cabal, aeson, async, blazeBuilder, blazeHtml, blazeMarkup -, caseInsensitive, cereal, clientsession, conduit, conduitExtra -, cookie, dataDefault, deepseq, exceptions, fastLogger, hspec -, httpTypes, HUnit, liftedBase, monadControl, monadLogger, mtl -, mwcRandom, network, parsec, pathPieces, primitive, QuickCheck -, random, resourcet, safe, shakespeare, streamingCommons, text -, time, transformers, transformersBase, unixCompat -, unorderedContainers, vector, wai, waiExtra, waiLogger, warp -, word8 +{ cabal, aeson, async, autoUpdate, blazeBuilder, blazeHtml +, blazeMarkup, caseInsensitive, cereal, clientsession, conduit +, conduitExtra, cookie, dataDefault, deepseq, exceptions +, fastLogger, hspec, httpTypes, HUnit, liftedBase, monadControl +, monadLogger, mtl, mwcRandom, network, parsec, pathPieces +, primitive, QuickCheck, random, resourcet, safe, shakespeare +, streamingCommons, text, time, transformers, transformersBase +, unixCompat, unorderedContainers, vector, wai, waiExtra, waiLogger +, warp, word8 }: cabal.mkDerivation (self: { pname = "yesod-core"; - version = "1.4.4"; - sha256 = "0g9q21x96m3198am6nqawinry2p93fca579xyz4g1gfcyv1yngzm"; + version = "1.4.4.4"; + sha256 = "0l4a49a3y1m257zkzmvqwg5cm6shxzssgd143qqzhg1svikavv82"; buildDepends = [ - aeson blazeBuilder blazeHtml blazeMarkup caseInsensitive cereal - clientsession conduit conduitExtra cookie dataDefault deepseq - exceptions fastLogger httpTypes liftedBase monadControl monadLogger - mtl mwcRandom parsec pathPieces primitive random resourcet safe - shakespeare text time transformers transformersBase unixCompat - unorderedContainers vector wai waiExtra waiLogger warp word8 + aeson autoUpdate blazeBuilder blazeHtml blazeMarkup caseInsensitive + cereal clientsession conduit conduitExtra cookie dataDefault + deepseq exceptions fastLogger httpTypes liftedBase monadControl + monadLogger mtl mwcRandom parsec pathPieces primitive random + resourcet safe shakespeare text time transformers transformersBase + unixCompat unorderedContainers vector wai waiExtra waiLogger warp + word8 ]; testDepends = [ async blazeBuilder conduit conduitExtra hspec httpTypes HUnit From 9e73c0ac095a08b9b81d3a0b8489e8af1894710a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 23 Nov 2014 21:07:41 +0100 Subject: [PATCH 355/383] haskell-yesod-static: update to version 1.4.0.3 --- pkgs/development/libraries/haskell/yesod-static/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/yesod-static/default.nix b/pkgs/development/libraries/haskell/yesod-static/default.nix index 02ffd51b47b..60a94cfb20d 100644 --- a/pkgs/development/libraries/haskell/yesod-static/default.nix +++ b/pkgs/development/libraries/haskell/yesod-static/default.nix @@ -11,8 +11,8 @@ cabal.mkDerivation (self: { pname = "yesod-static"; - version = "1.4.0.2"; - sha256 = "0s5jx1hj6rsrsm36xzg8l21v5z2dbd6k63wihrz31rc3gan3wxj2"; + version = "1.4.0.3"; + sha256 = "15rwlw76rfh18l3ap73aqmwz4bafmxbr5pchyarll14ps0rjs74g"; buildDepends = [ async attoparsec base64Bytestring blazeBuilder byteable conduit conduitExtra cryptohash cryptohashConduit cssText dataDefault From 9626601f8a23e620a14109521607ed146d4c6b55 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 23 Nov 2014 21:07:43 +0100 Subject: [PATCH 356/383] haskell-yesod-test: update to version 1.4.2 --- .../libraries/haskell/yesod-test/default.nix | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/haskell/yesod-test/default.nix b/pkgs/development/libraries/haskell/yesod-test/default.nix index 09fda53aa90..50a6369f186 100644 --- a/pkgs/development/libraries/haskell/yesod-test/default.nix +++ b/pkgs/development/libraries/haskell/yesod-test/default.nix @@ -1,18 +1,19 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! { cabal, attoparsec, blazeBuilder, blazeHtml, blazeMarkup -, caseInsensitive, cookie, hspec, htmlConduit, httpTypes, HUnit -, monadControl, network, persistent, text, time, transformers, wai -, waiExtra, xmlConduit, xmlTypes, yesodCore, yesodForm +, caseInsensitive, cookie, hspec, hspecCore, htmlConduit, httpTypes +, HUnit, monadControl, network, persistent, text, time +, transformers, wai, waiExtra, xmlConduit, xmlTypes, yesodCore +, yesodForm }: cabal.mkDerivation (self: { pname = "yesod-test"; - version = "1.4.1"; - sha256 = "10z88ki694z0kzbg84gaj10h8s9hrj5ghgbxq4y486nvmp4px8f1"; + version = "1.4.2"; + sha256 = "09iia8vligw41ayhp1fp797n783avb0sf89z8midindrhb5plfbl"; buildDepends = [ attoparsec blazeBuilder blazeHtml blazeMarkup caseInsensitive - cookie hspec htmlConduit httpTypes HUnit monadControl network + cookie hspecCore htmlConduit httpTypes HUnit monadControl network persistent text time transformers wai waiExtra xmlConduit xmlTypes yesodCore ]; From 5ecee5fde9f49e0ca5c0a26e8ea134ecc982b82b Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 23 Nov 2014 21:07:46 +0100 Subject: [PATCH 357/383] haskell-zlib: update to version 0.5.4.2 --- pkgs/development/libraries/haskell/zlib/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/zlib/default.nix b/pkgs/development/libraries/haskell/zlib/default.nix index 28f69ad0a64..dad288c8fd0 100644 --- a/pkgs/development/libraries/haskell/zlib/default.nix +++ b/pkgs/development/libraries/haskell/zlib/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "zlib"; - version = "0.5.4.1"; - sha256 = "0l550l2qw4gx530h1yjjpdh6rkm59l9l6jbmlm0vx41cqpj6b8yc"; + version = "0.5.4.2"; + sha256 = "15hhsk7z3gvm7sz2ic2z1ca5c6rpsln2rr391mdbm1bxlzc1gmkm"; extraLibraries = [ zlib ]; meta = { description = "Compression and decompression in the gzip and zlib formats"; From 56bdbabbc536a663ddddfa5a5f2af7491ceb59a0 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 23 Nov 2014 21:07:48 +0100 Subject: [PATCH 358/383] haskell-cabal-bounds: update to version 0.8.9 --- 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 ec2310ff582..0f10b13c5d1 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.8"; - sha256 = "0jd901r6312yw4rzxvy5x7q18kjwjhgr5s5npczhwc4q7zvxdj7q"; + version = "0.8.9"; + sha256 = "1vprf6nsw3qnppqxcm5jwvwxyalkaq364xcmig54ma47rsk23nzk"; isLibrary = true; isExecutable = true; buildDepends = [ From 2440e27ee50a131a136c740cc868ac690f81b289 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sun, 23 Nov 2014 21:07:50 +0100 Subject: [PATCH 359/383] haskell-keter: update to version 1.3.6 --- pkgs/development/tools/haskell/keter/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/haskell/keter/default.nix b/pkgs/development/tools/haskell/keter/default.nix index 38c343903d9..9aa35ea940f 100644 --- a/pkgs/development/tools/haskell/keter/default.nix +++ b/pkgs/development/tools/haskell/keter/default.nix @@ -11,8 +11,8 @@ cabal.mkDerivation (self: { pname = "keter"; - version = "1.3.5.3"; - sha256 = "18dpi97q4sz5zxv2yc6ar5nbf9gvs71n6gmxd9mv5myknvsliif2"; + version = "1.3.6"; + sha256 = "00g34gazj3kk39nk34vzw88dy04rr3swb0hcl6k6gafwqrpv3i79"; isLibrary = true; isExecutable = true; buildDepends = [ From 4535d19f93ae037e8a168f93da4c2b7bb5e4972d Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 24 Nov 2014 14:22:20 +0100 Subject: [PATCH 360/383] haskell-authenticate-oauth: jailbreak to support current versions of RSA --- .../development/libraries/haskell/authenticate-oauth/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/haskell/authenticate-oauth/default.nix b/pkgs/development/libraries/haskell/authenticate-oauth/default.nix index ae996df0d5b..a6f46415683 100644 --- a/pkgs/development/libraries/haskell/authenticate-oauth/default.nix +++ b/pkgs/development/libraries/haskell/authenticate-oauth/default.nix @@ -13,6 +13,7 @@ cabal.mkDerivation (self: { base64Bytestring blazeBuilder blazeBuilderConduit cryptoPubkeyTypes dataDefault httpClient httpTypes random RSA SHA time transformers ]; + jailbreak = true; meta = { homepage = "http://github.com/yesodweb/authenticate"; description = "Library to authenticate with OAuth for Haskell web applications"; From c62278fe2b976eb971493d8b9b3c9aa04b98e9e9 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 24 Nov 2014 14:34:05 +0100 Subject: [PATCH 361/383] haskell-pandoc: patch build to load the edited Cabal file from Hackage --- pkgs/development/libraries/haskell/pandoc/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/development/libraries/haskell/pandoc/default.nix b/pkgs/development/libraries/haskell/pandoc/default.nix index 0fa41e250b4..f6a1966ddd0 100644 --- a/pkgs/development/libraries/haskell/pandoc/default.nix +++ b/pkgs/development/libraries/haskell/pandoc/default.nix @@ -9,8 +9,15 @@ , tagsoup, temporary, testFramework, testFrameworkHunit , testFrameworkQuickcheck2, texmath, text, time , unorderedContainers, vector, xml, yaml, zipArchive, zlib +, fetchurl }: +let + editedCabalFile = fetchurl { + url = "hackage.haskell.org/package/pandoc-1.13.1/pandoc.cabal"; + sha256 = "1i57yk1pql4gv97cs86fk82hkwncics1wkzjqd9iz866204y4wrg"; + }; +in cabal.mkDerivation (self: { pname = "pandoc"; version = "1.13.1"; @@ -31,6 +38,7 @@ cabal.mkDerivation (self: { pandocTypes QuickCheck syb testFramework testFrameworkHunit testFrameworkQuickcheck2 text zipArchive ]; + preConfigure = "cp ${editedCabalFile} pandoc.cabal"; configureFlags = "-fhttps -fmake-pandoc-man-pages"; jailbreak = true; doCheck = false; From bdbe5cd147c5cc9c96454720bafb40c50d5183d4 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 24 Nov 2014 14:34:40 +0100 Subject: [PATCH 362/383] haskell-http-client: update to version 0.4.5 --- 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 020fd4973c8..12e69b7c723 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.2"; - sha256 = "06c34h7wvn3mbr8lrkcmjygj22d94mr5rxzqwpjfdjgimd98hw3s"; + version = "0.4.5"; + sha256 = "04ikxigxhppayzw4bfh52zznly6cd9vfd9gn3a12xz4js6q3pwva"; buildDepends = [ base64Bytestring blazeBuilder caseInsensitive cookie dataDefaultClass deepseq exceptions filepath httpTypes mimeTypes From 3deaeb43fc5bb68ad34d76e289a19dabc799aa31 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 24 Nov 2014 14:37:13 +0100 Subject: [PATCH 363/383] haskell-cairo: update to version 0.13.0.5 --- pkgs/development/libraries/haskell/cairo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/cairo/default.nix b/pkgs/development/libraries/haskell/cairo/default.nix index 10eedda6f24..8f64f23585c 100644 --- a/pkgs/development/libraries/haskell/cairo/default.nix +++ b/pkgs/development/libraries/haskell/cairo/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "cairo"; - version = "0.13.0.4"; - sha256 = "0sj6c83md51qvjpp3dckv3hvg9dm2qkiw1wzlvdypdd1c09957n2"; + version = "0.13.0.5"; + sha256 = "0ak6hzfrcyxajx7qybsmd5g26blqb6zxvv8r2a8bnylvm5sdj70r"; buildDepends = [ mtl text utf8String ]; buildTools = [ gtk2hsBuildtools ]; extraLibraries = [ cairo libc pkgconfig zlib ]; From 4b95beb82d35b9d2e31e9bf35632a1bd6334af15 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 24 Nov 2014 14:41:57 +0100 Subject: [PATCH 364/383] haskell-Chart-cairo: update to version 1.3.2 --- 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 95d346cd9f3..c01793881ad 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.3.1"; - sha256 = "15d52x0xr0klkfp9jh9i2aqki8gkm805mm6yk53f3ky92vdylg6q"; + version = "1.3.2"; + sha256 = "19ghd5xav7pn3z5igbkbsa81vhlpvy55xscc42vbxx1v9f6shq7g"; buildDepends = [ cairo Chart colour dataDefaultClass lens mtl operational time ]; From d82dbca3b771a47debcae3fa02e9fa6639dfe361 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 24 Nov 2014 14:41:59 +0100 Subject: [PATCH 365/383] haskell-Chart-diagrams: update to version 1.3.2 --- pkgs/development/libraries/haskell/Chart-diagrams/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/Chart-diagrams/default.nix b/pkgs/development/libraries/haskell/Chart-diagrams/default.nix index 6b90954c4a7..d6b17ec320f 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.3.1"; - sha256 = "0p959m350rj0fl91f94c0gcxnzgy8yrz27naw9ciqi36za7sxl6j"; + version = "1.3.2"; + sha256 = "0q5qvzzl5wirlj26a6zpnyq95lpzzkwiqq0mkh25aa3qzzbg4y6g"; buildDepends = [ blazeSvg Chart colour dataDefaultClass diagramsCore diagramsLib diagramsPostscript diagramsSvg lens mtl operational SVGFonts text From 817564741c3cbe3cc55023e742ca5bda28f42cde Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 24 Nov 2014 14:42:01 +0100 Subject: [PATCH 366/383] haskell-Chart-gtk: update to version 1.3.2 --- 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 7e6f7d794af..6d55bedb24f 100644 --- a/pkgs/development/libraries/haskell/Chart-gtk/default.nix +++ b/pkgs/development/libraries/haskell/Chart-gtk/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "Chart-gtk"; - version = "1.3.1"; - sha256 = "1bnhwiabwjhry6pfwi9xs4zg23vycqx3rpbc5qs7773sij93v7bj"; + version = "1.3.2"; + sha256 = "175bqh5pl4z0gx50z34afg149g94qw8sk87gbp9mavh5bnpj5a07"; buildDepends = [ cairo Chart ChartCairo colour dataDefaultClass gtk mtl time ]; From ea0d509a813e682535840576b87296e7a79e9b25 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 24 Nov 2014 14:42:02 +0100 Subject: [PATCH 367/383] haskell-Chart: update to version 1.3.2 --- 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 94e40a28afa..c41fa5a5a5d 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.3.1"; - sha256 = "019q77hgv5hyhfpsfs2k1a4qn8fandk1nj7xkzn00z21jqhman2s"; + version = "1.3.2"; + sha256 = "0y4xkqdmbyyaxf810dgz0zsfmywlx07c26s9wkk155iriz0yz4m9"; buildDepends = [ colour dataDefaultClass lens mtl operational time ]; From e398b44cf6ecd68b1ce83ba32b327fea8794d7e3 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 24 Nov 2014 14:42:04 +0100 Subject: [PATCH 368/383] haskell-diagrams-cairo: update to version 1.2.0.4 --- pkgs/development/libraries/haskell/diagrams/cairo.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/diagrams/cairo.nix b/pkgs/development/libraries/haskell/diagrams/cairo.nix index 33268b29592..24c26e052d9 100644 --- a/pkgs/development/libraries/haskell/diagrams/cairo.nix +++ b/pkgs/development/libraries/haskell/diagrams/cairo.nix @@ -7,8 +7,8 @@ cabal.mkDerivation (self: { pname = "diagrams-cairo"; - version = "1.2.0.3"; - sha256 = "00x759n6jn8cpf49ma3mfs4v77g535cpjr5vcc81am37a3vq3ypk"; + version = "1.2.0.4"; + sha256 = "1yg6ja5jha499b6j5fsgdl4f3l2ff1gp6cl7ixzj9y26m7a10bqq"; buildDepends = [ cairo colour dataDefaultClass diagramsCore diagramsLib filepath hashable JuicyPixels lens mtl optparseApplicative pango split From 3fc1624faf6f5c14925884b886a7751c5c4aa992 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 24 Nov 2014 14:42:08 +0100 Subject: [PATCH 369/383] haskell-lens-family-core: update to version 1.2.0 --- .../libraries/haskell/lens-family-core/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/lens-family-core/default.nix b/pkgs/development/libraries/haskell/lens-family-core/default.nix index a5c9e65f8a4..94a53898325 100644 --- a/pkgs/development/libraries/haskell/lens-family-core/default.nix +++ b/pkgs/development/libraries/haskell/lens-family-core/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "lens-family-core"; - version = "1.1.0"; - sha256 = "0pvc7iv7y5s3496w7ic9qzdw3l76ldnrg0my0jxi1dyn0vm9xwm3"; + version = "1.2.0"; + sha256 = "0hxrbbc4azfafnr4ab2zxgic093wwg6gx5h1ggp4xks55d8rhraz"; buildDepends = [ transformers ]; meta = { description = "Haskell 98 Lens Families"; From 3400054d694cb2cb96f5d6c0d193fc06ea4f0607 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 24 Nov 2014 14:42:10 +0100 Subject: [PATCH 370/383] haskell-lens-family: update to version 1.2.0 --- pkgs/development/libraries/haskell/lens-family/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/lens-family/default.nix b/pkgs/development/libraries/haskell/lens-family/default.nix index 582f0c52daf..58ce93e1b65 100644 --- a/pkgs/development/libraries/haskell/lens-family/default.nix +++ b/pkgs/development/libraries/haskell/lens-family/default.nix @@ -4,8 +4,8 @@ cabal.mkDerivation (self: { pname = "lens-family"; - version = "1.1.0"; - sha256 = "0cr4wdnix138iklh4l8nrzp52m7qrrgrq9ngr61zs02gbww46sz3"; + version = "1.2.0"; + sha256 = "0pbyx43ajx96nhcw4brml1r5azs1041k7nv4m94ak6x77n5sr4mb"; buildDepends = [ lensFamilyCore mtl transformers ]; meta = { description = "Lens Families"; From 357af72d0a9e8ed9795770279de033883e4838f2 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 24 Nov 2014 14:42:12 +0100 Subject: [PATCH 371/383] haskell-linear: update to version 1.15.4 --- pkgs/development/libraries/haskell/linear/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/linear/default.nix b/pkgs/development/libraries/haskell/linear/default.nix index 507d9c19dde..bbe0763cd23 100644 --- a/pkgs/development/libraries/haskell/linear/default.nix +++ b/pkgs/development/libraries/haskell/linear/default.nix @@ -8,8 +8,8 @@ cabal.mkDerivation (self: { pname = "linear"; - version = "1.15.2"; - sha256 = "1zikj932wbmjnq02msq5c2i3w2993lya0kvs326ajlpmq5q35gpj"; + version = "1.15.4"; + sha256 = "0xpprafv7dndihnk2mapgvhy4cpz2d24k5j1p3q5crrsi2wj7k0b"; buildDepends = [ adjunctions binary distributive hashable lens reflection semigroupoids semigroups tagged transformers unorderedContainers From 005b7898397cfb082d9611a6344f23efde561c43 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 24 Nov 2014 14:42:14 +0100 Subject: [PATCH 372/383] haskell-pipes: update to version 4.1.4 --- pkgs/development/libraries/haskell/pipes/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/pipes/default.nix b/pkgs/development/libraries/haskell/pipes/default.nix index 4dd93bc8e8b..9703b14fc71 100644 --- a/pkgs/development/libraries/haskell/pipes/default.nix +++ b/pkgs/development/libraries/haskell/pipes/default.nix @@ -6,8 +6,8 @@ cabal.mkDerivation (self: { pname = "pipes"; - version = "4.1.3"; - sha256 = "188gwfw0v8v9rac9m00j453a4hr0n4dmjfn92r8zymxc8806mqaw"; + version = "4.1.4"; + sha256 = "0bv7i18lf15mvfscnif4hkwgm4anw8b7bbqhzdw4wbjqcvrrsppb"; buildDepends = [ mmorph mtl transformers ]; testDepends = [ mtl QuickCheck testFramework testFrameworkQuickcheck2 transformers From e432a4bcf124e0d9097acdfa511aec839e024247 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 24 Nov 2014 14:42:15 +0100 Subject: [PATCH 373/383] haskell-yesod-form: update to version 1.4.1.1 --- pkgs/development/libraries/haskell/yesod-form/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/haskell/yesod-form/default.nix b/pkgs/development/libraries/haskell/yesod-form/default.nix index 84f8d0ca7a6..f8645b3d108 100644 --- a/pkgs/development/libraries/haskell/yesod-form/default.nix +++ b/pkgs/development/libraries/haskell/yesod-form/default.nix @@ -8,8 +8,8 @@ cabal.mkDerivation (self: { pname = "yesod-form"; - version = "1.4.1"; - sha256 = "034bgkr5fmfjbxwy6kkz36als51jyq0ksx8wknwxf7pr07zwbl3x"; + version = "1.4.1.1"; + sha256 = "0as2hgl78hqyci0f9ysa7sy3r7c8vq1a0a0y7wpbybz0c4690pqi"; buildDepends = [ aeson attoparsec blazeBuilder blazeHtml blazeMarkup byteable dataDefault emailValidate networkUri persistent resourcet From 3970579141e900f0dda0ab3d8f00b0873887c53c Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 24 Nov 2014 14:42:17 +0100 Subject: [PATCH 374/383] haskell-yesod: update to version 1.4.1 --- .../libraries/haskell/yesod/default.nix | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/pkgs/development/libraries/haskell/yesod/default.nix b/pkgs/development/libraries/haskell/yesod/default.nix index 1cc7f282f2a..2860cab4d1a 100644 --- a/pkgs/development/libraries/haskell/yesod/default.nix +++ b/pkgs/development/libraries/haskell/yesod/default.nix @@ -1,21 +1,21 @@ # This file was auto-generated by cabal2nix. Please do NOT edit manually! { cabal, aeson, blazeHtml, blazeMarkup, conduitExtra, dataDefault -, fastLogger, monadControl, monadLogger, safe, shakespeare -, streamingCommons, text, transformers, unorderedContainers, wai -, waiExtra, warp, yaml, yesodAuth, yesodCore, yesodForm -, yesodPersistent +, fastLogger, monadControl, monadLogger, safe, semigroups +, shakespeare, streamingCommons, text, transformers +, unorderedContainers, wai, waiExtra, waiLogger, warp, yaml +, yesodAuth, yesodCore, yesodForm, yesodPersistent }: cabal.mkDerivation (self: { pname = "yesod"; - version = "1.4.0"; - sha256 = "1h4jrzbf85malv3k1r4xxqp2y537naj1l284wazsrs2xikndwwn9"; + version = "1.4.1"; + sha256 = "1h4l78qjaiv3aqw02cj3qakkxv7ds946iagdccm8pav2wlkdl5pw"; buildDepends = [ aeson blazeHtml blazeMarkup conduitExtra dataDefault fastLogger - monadControl monadLogger safe shakespeare streamingCommons text - transformers unorderedContainers wai waiExtra warp yaml yesodAuth - yesodCore yesodForm yesodPersistent + monadControl monadLogger safe semigroups shakespeare + streamingCommons text transformers unorderedContainers wai waiExtra + waiLogger warp yaml yesodAuth yesodCore yesodForm yesodPersistent ]; meta = { homepage = "http://www.yesodweb.com/"; From 4f48c33b746337a1f47af41b47a4b66856537843 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 24 Nov 2014 14:43:16 +0100 Subject: [PATCH 375/383] haskell-elm-get: jailbreak to fix build with recent http-client --- pkgs/development/compilers/elm/elm-get.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/compilers/elm/elm-get.nix b/pkgs/development/compilers/elm/elm-get.nix index db6feecea42..d01a3226d29 100644 --- a/pkgs/development/compilers/elm/elm-get.nix +++ b/pkgs/development/compilers/elm/elm-get.nix @@ -15,6 +15,7 @@ cabal.mkDerivation (self: { aeson aesonPretty ansiWlPprint binary Elm filepath HTTP httpClient httpClientTls httpTypes mtl network optparseApplicative vector ]; + jailbreak = true; meta = { homepage = "http://github.com/elm-lang/elm-get"; description = "Tool for sharing and using Elm libraries"; From 52809ef21da334f3a9b1458dc53457fca95b1803 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 24 Nov 2014 14:44:26 +0100 Subject: [PATCH 376/383] haskell-twitter-conduit: patch build to load the edited Cabal file from Hackage --- .../libraries/haskell/twitter-conduit/default.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/haskell/twitter-conduit/default.nix b/pkgs/development/libraries/haskell/twitter-conduit/default.nix index f7cc5c343b6..54d091ebb86 100644 --- a/pkgs/development/libraries/haskell/twitter-conduit/default.nix +++ b/pkgs/development/libraries/haskell/twitter-conduit/default.nix @@ -4,9 +4,15 @@ , conduit, conduitExtra, dataDefault, doctest, filepath, hlint , hspec, httpClient, httpConduit, httpTypes, lens, lensAeson , monadControl, networkUri, resourcet, text, time, transformers -, transformersBase, twitterTypes, twitterTypesLens +, transformersBase, twitterTypes, twitterTypesLens, fetchurl }: +let + editedCabalFile = fetchurl { + url = "http://hackage.haskell.org/package/twitter-conduit-0.1.0/twitter-conduit.cabal"; + sha256 = "06z8dwvc17xhzpvb7cm0j6v63r5f3xirj36rr86bds3rw1zbnd0z"; + }; +in cabal.mkDerivation (self: { pname = "twitter-conduit"; version = "0.1.0"; @@ -25,6 +31,7 @@ cabal.mkDerivation (self: { resourcet text time transformers transformersBase twitterTypes twitterTypesLens ]; + preConfigure = "cp ${editedCabalFile} twitter-conduit.cabal"; meta = { homepage = "https://github.com/himura/twitter-conduit"; description = "Twitter API package with conduit interface and Streaming API support"; From ad0de68dc5edd66f74515f81c275282133dbda21 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 24 Nov 2014 14:45:14 +0100 Subject: [PATCH 377/383] haskell-ekg-bosun: jailbreak to fix build with recent http-client --- pkgs/development/libraries/haskell/ekg-bosun/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/haskell/ekg-bosun/default.nix b/pkgs/development/libraries/haskell/ekg-bosun/default.nix index 255c995ae95..44a810d9039 100644 --- a/pkgs/development/libraries/haskell/ekg-bosun/default.nix +++ b/pkgs/development/libraries/haskell/ekg-bosun/default.nix @@ -12,6 +12,7 @@ cabal.mkDerivation (self: { aeson ekgCore httpClient lens network networkUri text time unorderedContainers vector wreq ]; + jailbreak = true; meta = { homepage = "http://github.com/ocharles/ekg-bosun"; description = "Send ekg metrics to a Bosun instance"; From d9924f565e5ced885cc39f8735be8706fb3b53ef Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Mon, 24 Nov 2014 14:51:58 +0100 Subject: [PATCH 378/383] haskell-snaplet-stripe: jailbreak to fix build with recent lens-family-core --- pkgs/development/libraries/haskell/snaplet-stripe/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/libraries/haskell/snaplet-stripe/default.nix b/pkgs/development/libraries/haskell/snaplet-stripe/default.nix index 7320b200120..6f0f3d5de06 100644 --- a/pkgs/development/libraries/haskell/snaplet-stripe/default.nix +++ b/pkgs/development/libraries/haskell/snaplet-stripe/default.nix @@ -12,6 +12,7 @@ cabal.mkDerivation (self: { configurator heist lensFamilyCore mtl snap stripe text textFormat transformers xmlhtml ]; + jailbreak = true; meta = { homepage = "https://github.com/LukeHoersten/snaplet-stripe"; description = "Stripe snaplet for the Snap Framework"; From 56119961728b02046e5e59fa0a08f9c119d3de8c Mon Sep 17 00:00:00 2001 From: Jos van den Oever Date: Mon, 24 Nov 2014 16:26:37 +0100 Subject: [PATCH 379/383] Update Calligra to 2.8.6. --- pkgs/applications/office/calligra/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/office/calligra/default.nix b/pkgs/applications/office/calligra/default.nix index e87053d5326..3c58d367ab1 100644 --- a/pkgs/applications/office/calligra/default.nix +++ b/pkgs/applications/office/calligra/default.nix @@ -6,11 +6,11 @@ }: stdenv.mkDerivation rec { - name = "calligra-2.7.5"; + name = "calligra-2.8.6"; src = fetchurl { url = "mirror://kde/stable/${name}/${name}.tar.xz"; - sha256 = "0png8ac10xywxsml1z18as18kc9k9162l6an67hi6lgx0rv27ldi"; + sha256 = "587dda4a340f46e28fe69de8f292fa33a3cf237445013f6ce5ceafa191cb3694"; }; nativeBuildInputs = [ cmake perl pkgconfig ]; From cc28e819e44431effb918d200859cbb631acc5ba Mon Sep 17 00:00:00 2001 From: aszlig Date: Mon, 24 Nov 2014 17:40:03 +0100 Subject: [PATCH 380/383] nixos/cupsd: Ignore collisions in cups-progs. There currently are collisions between the main CUPS package and the filters package, which are: * $storepath/share/cups/banners/classified * $storepath/share/cups/banners/confidential * $storepath/share/cups/banners/secret * $storepath/share/cups/banners/standard * $storepath/share/cups/banners/topsecret * $storepath/share/cups/banners/unclassified * $storepath/share/cups/data/testprint And they actually have different content, so let's ignore those for now until we have a better fix. Signed-off-by: aszlig --- nixos/modules/services/printing/cupsd.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/nixos/modules/services/printing/cupsd.nix b/nixos/modules/services/printing/cupsd.nix index fb6e2b90590..9c289f68512 100644 --- a/nixos/modules/services/printing/cupsd.nix +++ b/nixos/modules/services/printing/cupsd.nix @@ -37,6 +37,7 @@ let paths = cfg.drivers; pathsToLink = [ "/lib/cups" "/share/cups" "/bin" "/etc/cups" ]; postBuild = cfg.bindirCmds; + ignoreCollisions = true; }; in From 4e46e4cb593812d5a2885141cdd1d5a2113585d7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Cillian=20de=20R=C3=B3iste?= Date: Mon, 24 Nov 2014 18:27:04 +0100 Subject: [PATCH 381/383] qtractor: update from 0.6.3 to 0.6.4 --- pkgs/applications/audio/qtractor/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/qtractor/default.nix b/pkgs/applications/audio/qtractor/default.nix index 561a72bb38b..079703d40ae 100644 --- a/pkgs/applications/audio/qtractor/default.nix +++ b/pkgs/applications/audio/qtractor/default.nix @@ -3,12 +3,12 @@ , libtool, libvorbis, pkgconfig, qt4, rubberband, stdenv }: stdenv.mkDerivation rec { - version = "0.6.3"; + version = "0.6.4"; name = "qtractor-${version}"; src = fetchurl { url = "mirror://sourceforge/qtractor/${name}.tar.gz"; - sha256 = "1lsmd83vhgfzb3bf02hi6xp5ryh08lz4h21agy7wm3acjqc6gsc2"; + sha256 = "1wgm9cx9mrxgd69kdabh78vb3nlyhhfbpd5k4g9s15ifny9cgwz4"; }; buildInputs = From f83aa6c0ea72e5957dc5e5da08653ef91184c98e Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Mon, 24 Nov 2014 12:39:36 -0800 Subject: [PATCH 382/383] nixos/unifi: Properly depend on mountpoints --- nixos/modules/services/networking/unifi.nix | 39 +++++++++++---------- 1 file changed, 21 insertions(+), 18 deletions(-) diff --git a/nixos/modules/services/networking/unifi.nix b/nixos/modules/services/networking/unifi.nix index ca6738f0fe1..71dd38a3f47 100644 --- a/nixos/modules/services/networking/unifi.nix +++ b/nixos/modules/services/networking/unifi.nix @@ -1,9 +1,24 @@ -{ config, lib, pkgs, ... }: +{ config, lib, pkgs, utils, ... }: with lib; let cfg = config.services.unifi; stateDir = "/var/lib/unifi"; cmd = "@${pkgs.icedtea7_jre}/bin/java java -jar ${stateDir}/lib/ace.jar"; + mountPoints = [ + { + what = "${pkgs.unifi}/dl"; + where = "${stateDir}/dl"; + } + { + what = "${pkgs.unifi}/lib"; + where = "${stateDir}/lib"; + } + { + what = "${pkgs.mongodb}/bin"; + where = "${stateDir}/bin"; + } + ]; + systemdMountPoints = map (m: "${utils.escapeSystemdPath m.where}.mount") mountPoints; in { @@ -32,30 +47,18 @@ in # to be used as the working directory. systemd.mounts = map ({ what, where }: { bindsTo = [ "unifi.service" ]; - requiredBy = [ "unifi.service" ]; - before = [ "unifi.service" ]; + partOf = [ "unifi.service" ]; options = "bind"; what = what; where = where; - }) [ - { - what = "${pkgs.unifi}/dl"; - where = "${stateDir}/dl"; - } - { - what = "${pkgs.unifi}/lib"; - where = "${stateDir}/lib"; - } - { - what = "${pkgs.mongodb}/bin"; - where = "${stateDir}/bin"; - } - ]; + }) mountPoints; systemd.services.unifi = { description = "UniFi controller daemon"; wantedBy = [ "multi-user.target" ]; - after = [ "network.target" ]; + after = [ "network.target" ] ++ systemdMountPoints; + partOf = systemdMountPoints; + bindsTo = systemdMountPoints; preStart = '' # Ensure privacy of state From 0168c1ba194e35f618a311b6d07cc86461c9b77f Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Mon, 24 Nov 2014 21:57:36 +0100 Subject: [PATCH 383/383] faust: rename to faust-compiler (close #5113) @vcunat adjusted coding style slightly. --- .../{faust => faust-compiler}/default.nix | 19 +++++++++++-------- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 12 insertions(+), 9 deletions(-) rename pkgs/applications/audio/{faust => faust-compiler}/default.nix (83%) diff --git a/pkgs/applications/audio/faust/default.nix b/pkgs/applications/audio/faust-compiler/default.nix similarity index 83% rename from pkgs/applications/audio/faust/default.nix rename to pkgs/applications/audio/faust-compiler/default.nix index bcfd6020a4f..f924fe2953d 100644 --- a/pkgs/applications/audio/faust/default.nix +++ b/pkgs/applications/audio/faust-compiler/default.nix @@ -3,25 +3,26 @@ stdenv.mkDerivation rec { version = "0.9.67"; - name = "faust-${version}"; + name = "faust-compiler-${version}"; src = fetchurl { - url = "http://downloads.sourceforge.net/project/faudiostream/${name}.zip"; + url = "http://downloads.sourceforge.net/project/faudiostream/faust-${version}.zip"; sha256 = "068vl9536zn0j4pknwfcchzi90rx5pk64wbcbd67z32w0csx8xm1"; }; buildInputs = [ unzip ]; - patchPhase='' + patchPhase = '' sed -i '77,101d' Makefile sed -i 's#?= $(shell uname -s)#:= Linux#g' architecture/osclib/oscpack/Makefile sed -e "s@\$FAUST_INSTALL /usr/local /usr /opt /opt/local@$out@g" -i tools/faust2appls/faustpath - ''; + ''; - postInstallPhase='' + postInstallPhase = '' rm -rf $out/include/ - ''; - - makeFlags="PREFIX=$(out)"; + ''; + + makeFlags = "PREFIX=$(out)"; + FPATH = "$out"; # <- where to search meta = with stdenv.lib; { description = "A functional programming language for realtime audio signal processing"; @@ -37,6 +38,8 @@ stdenv.mkDerivation rec { audio platforms and plugin formats (jack, alsa, ladspa, maxmsp, puredata, csound, supercollider, pure, vst, coreaudio) without any change to the FAUST code. + This package has just the compiler. Install faust for the full + set of faust2somethingElse tools. ''; homepage = http://faust.grame.fr/; downloadPage = http://sourceforge.net/projects/faudiostream/files/; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 21479eaabf7..29f1dea4a4a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12387,7 +12387,7 @@ let fakenes = callPackage ../misc/emulators/fakenes { }; - faust = callPackage ../applications/audio/faust { }; + faust-compiler = callPackage ../applications/audio/faust-compiler { }; fceux = callPackage ../misc/emulators/fceux { };