From 2e0933787bff6772a698a3e8e8f3c93cb2bb7370 Mon Sep 17 00:00:00 2001 From: Joachim Fasting Date: Sat, 18 Apr 2015 23:15:35 +0200 Subject: [PATCH 01/46] nixos: add AppArmor PAM support Enables attaching AppArmor profiles at the user/group level. This is not intended to be used directly, but as part of a role-based access control scheme. For now, profile attachment is 'session optional', but should be changed to 'required' once a more comprehensive solution is in place. --- nixos/modules/security/apparmor.nix | 8 -------- nixos/modules/security/pam.nix | 12 ++++++++++++ 2 files changed, 12 insertions(+), 8 deletions(-) diff --git a/nixos/modules/security/apparmor.nix b/nixos/modules/security/apparmor.nix index 4fef62cbffd..202639f9870 100644 --- a/nixos/modules/security/apparmor.nix +++ b/nixos/modules/security/apparmor.nix @@ -37,13 +37,5 @@ in ) cfg.profiles; }; }; - - security.pam.services.apparmor.text = '' - ## AppArmor changes hats according to `order`: first try user, then - ## group, and finally fall back to a hat called "DEFAULT" - ## - ## For now, enable debugging as this is an experimental feature. - session optional ${pkgs.apparmor-pam}/lib/security/pam_apparmor.so order=user,group,default debug - ''; }; } diff --git a/nixos/modules/security/pam.nix b/nixos/modules/security/pam.nix index 02520fb88cd..15533fbdc3d 100644 --- a/nixos/modules/security/pam.nix +++ b/nixos/modules/security/pam.nix @@ -192,6 +192,16 @@ let description = "Whether to log authentication failures in /var/log/faillog."; }; + enableAppArmor = mkOption { + default = false; + type = types.bool; + description = '' + Enable support for attaching AppArmor profiles at the + user/group level, e.g., as part of a role based access + control scheme. + ''; + }; + text = mkOption { type = types.nullOr types.lines; description = "Contents of the PAM service file."; @@ -294,6 +304,8 @@ let "session optional ${pkgs.pam}/lib/security/pam_motd.so motd=${motd}"} ${optionalString cfg.pamMount "session optional ${pkgs.pam_mount}/lib/security/pam_mount.so"} + ${optionalString (cfg.enableAppArmor && config.security.apparmor.enable) + "session optional ${pkgs.apparmor-pam}/lib/security/pam_apparmor.so order=user,group,default debug"} ''; }; From 86b34e3a0d858737d5c355fe8056566220c60277 Mon Sep 17 00:00:00 2001 From: Kamil Chmielewski Date: Tue, 18 Aug 2015 08:53:08 +0200 Subject: [PATCH 02/46] vimPlugins: add molokai --- pkgs/misc/vim-plugins/default.nix | 10 ++++++++++ pkgs/misc/vim-plugins/vim-plugin-names | 1 + 2 files changed, 11 insertions(+) diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix index 23f8b0e16e3..8a88847f164 100644 --- a/pkgs/misc/vim-plugins/default.nix +++ b/pkgs/misc/vim-plugins/default.nix @@ -879,6 +879,16 @@ rec { ''; }; + molokai = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "molokai-2014-04-11"; + src = fetchgit { + url = "git://github.com/tomasr/molokai"; + rev = "db8ce13b3737d3ddea8368498183d7c204a762eb"; + sha256 = "34587133f0f17b8950ed0428b3deeacc2f15933ede8bfdd000593098ed6d903a"; + }; + dependencies = []; + }; + pathogen = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "pathogen-2014-11-06"; src = fetchgit { diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index 7d3fa343375..486df183da3 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -51,6 +51,7 @@ "github:shougo/vimshell.vim" "github:takac/vim-hardtime" "github:thinca/vim-quickrun" +"github:tomasr/molokai" "github:travitch/hasksyn" "github:twinside/vim-haskellconceal" "github:valloric/youcompleteme" From 088cc7f5f74ab7ed6b7deb54a0df2c3ac1ef06d7 Mon Sep 17 00:00:00 2001 From: "Ryan Scheel (Havvy)" Date: Thu, 20 Aug 2015 13:21:53 +0200 Subject: [PATCH 03/46] iojs: 3.0.0 -> 3.1.0 --- pkgs/development/web/iojs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/web/iojs/default.nix b/pkgs/development/web/iojs/default.nix index d6072484669..6a0c8ca512e 100644 --- a/pkgs/development/web/iojs/default.nix +++ b/pkgs/development/web/iojs/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchurl, python, utillinux, openssl_1_0_2, http-parser, zlib, libuv }: let - version = "3.0.0"; + version = "3.1.0"; inherit (stdenv.lib) optional maintainers licenses platforms; in stdenv.mkDerivation { name = "iojs-${version}"; src = fetchurl { url = "https://iojs.org/dist/v${version}/iojs-v${version}.tar.gz"; - sha256 = "0maxxmr6y7z3y3r88nhcnfzmpvbhs5p8knyz886bh2shgzd6nzqf"; + sha256 = "15qh5pscg3588hyf4yfhma34gjkg87v5i4xzxj804g6m52m6y727"; }; prePatch = '' From 17c0af24d219f1b0431734d0b086d38200e3da2b Mon Sep 17 00:00:00 2001 From: Jeffrey David Johnson Date: Wed, 19 Aug 2015 18:38:10 -0700 Subject: [PATCH 04/46] add bitcoin-xt as a separate package --- lib/maintainers.nix | 1 + pkgs/applications/altcoins/bitcoin-xt.nix | 39 +++++++++++++++++++++++ pkgs/applications/altcoins/default.nix | 3 ++ pkgs/top-level/all-packages.nix | 1 + 4 files changed, 44 insertions(+) create mode 100644 pkgs/applications/altcoins/bitcoin-xt.nix diff --git a/lib/maintainers.nix b/lib/maintainers.nix index d42d81399cf..db42435301b 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -121,6 +121,7 @@ jagajaga = "Arseniy Seroka "; jb55 = "William Casarin "; jcumming = "Jack Cummings "; + jefdaj = "Jeffrey David Johnson "; jfb = "James Felix Black "; jgeerds = "Jascha Geerds "; jirkamarsik = "Jirka Marsik "; diff --git a/pkgs/applications/altcoins/bitcoin-xt.nix b/pkgs/applications/altcoins/bitcoin-xt.nix new file mode 100644 index 00000000000..e6c95729c6e --- /dev/null +++ b/pkgs/applications/altcoins/bitcoin-xt.nix @@ -0,0 +1,39 @@ +{ stdenv, fetchurl, pkgconfig, autoreconfHook, openssl, db48, boost +, zlib, miniupnpc, qt4, utillinux, protobuf, qrencode, curl +, withGui }: + +with stdenv.lib; +stdenv.mkDerivation rec{ + + name = "bitcoin" + (toString (optional (!withGui) "d")) + "-xt-" + version; + xt_version = "0.11A"; + version = xt_version; + + src = fetchurl { + url = "https://github.com/bitcoinxt/bitcoinxt/archive/v0.11A.tar.gz"; + sha256 = "129cbqf6bln6rhdk70c6nfwdjk6afvsaaw4xdyp0pnfand8idz7n"; + }; + + buildInputs = [ pkgconfig autoreconfHook openssl db48 boost zlib + miniupnpc utillinux protobuf curl ] + ++ optionals withGui [ qt4 qrencode ]; + + configureFlags = [ + "--with-boost-libdir=${boost.lib}/lib" + "--with-libcurl-headers=${curl}/include" + ] ++ optionals withGui [ "--with-gui=qt4" ]; + + meta = { + description = "Peer-to-peer electronic cash system"; + longDescription= '' + Bitcoin XT is an implementation of a Bitcoin full node, based upon the + source code of Bitcoin Core. It is built by taking the latest stable + Core release, applying a series of patches, and then doing deterministic + builds so anyone can check the downloads correspond to the source code. + ''; + homepage = "https://bitcoinxt.software/"; + maintainers = with maintainers; [ jefdaj ]; + license = licenses.mit; + platforms = platforms.unix; + }; +} diff --git a/pkgs/applications/altcoins/default.nix b/pkgs/applications/altcoins/default.nix index a49e4dc9f90..762ef804f83 100644 --- a/pkgs/applications/altcoins/default.nix +++ b/pkgs/applications/altcoins/default.nix @@ -5,6 +5,9 @@ rec { bitcoin = callPackage ./bitcoin.nix { withGui = true; }; bitcoind = callPackage ./bitcoin.nix { withGui = false; }; + bitcoin-xt = callPackage ./bitcoin-xt.nix { withGui = true; }; + bitcoind-xt = callPackage ./bitcoin-xt.nix { withGui = false; }; + darkcoin = callPackage ./darkcoin.nix { withGui = true; }; darkcoind = callPackage ./darkcoin.nix { withGui = false; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 29038081ad4..61036967994 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10764,6 +10764,7 @@ let callPackage = newScope { boost = boost157; }; } ); bitcoin = altcoins.bitcoin; + bitcoin-xt = altcoins.bitcoin-xt; aumix = callPackage ../applications/audio/aumix { gtkGUI = false; From e4410bfd8565ce317d31e4a670ba50ebbfec74df Mon Sep 17 00:00:00 2001 From: Artjom Vejsel Date: Mon, 24 Aug 2015 07:49:21 +0300 Subject: [PATCH 05/46] qt4SDK/qt5SDK: delete (see #9342) --- pkgs/top-level/all-packages.nix | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b27ca65f794..750c3b8484e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7948,11 +7948,6 @@ let developerBuild = true; }); - qt4SDK = qtcreator.override { - sdkBuild = true; - qtLib = qt48Full; - }; - qt53 = callPackage ../development/libraries/qt-5/5.3 { mesa = mesa_noglu; cups = if stdenv.isLinux then cups else null; @@ -7972,12 +7967,6 @@ let developerBuild = true; }); - qt5SDK = qtcreator.override { - sdkBuild = true; - qtLib = qt5Full; - withDocumentation = true; - }; - qtcreator = callPackage ../development/qtcreator { qtLib = qt5Full; # 3.4 only supports qt5; TODO: use modularized qt>=5.4 withDocumentation = true; From 9c206b6cf7ab22aa20d8ed4ab7169b716c999762 Mon Sep 17 00:00:00 2001 From: Artjom Vejsel Date: Mon, 24 Aug 2015 07:50:17 +0300 Subject: [PATCH 06/46] qtcreator: refactor for using qt54 --- lib/maintainers.nix | 1 + pkgs/development/qtcreator/default.nix | 27 +++++++++++--------------- pkgs/top-level/all-packages.nix | 2 +- 3 files changed, 13 insertions(+), 17 deletions(-) diff --git a/lib/maintainers.nix b/lib/maintainers.nix index d42d81399cf..21ee19708a4 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -14,6 +14,7 @@ aflatter = "Alexander Flatter "; aherrmann = "Andreas Herrmann "; ak = "Alexander Kjeldaas "; + akaWolf = "Artjom Vejsel "; akc = "Anders Claesson "; algorith = "Dries Van Daele "; all = "Nix Committers "; diff --git a/pkgs/development/qtcreator/default.nix b/pkgs/development/qtcreator/default.nix index 199df25d552..0f55d4ee9af 100644 --- a/pkgs/development/qtcreator/default.nix +++ b/pkgs/development/qtcreator/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, qtLib, sdkBuild ? false, withDocumentation ? true }: +{ stdenv, fetchurl, makeWrapper, qtLib, withDocumentation ? false }: with stdenv.lib; @@ -9,31 +9,21 @@ let in stdenv.mkDerivation rec { - # The package name depends on wether we are just building the QtCreator package or the whole Qt SDK - # If we are building the QtCreator package: qtcreator-version - # If we are building the QtSDK package, the Qt version is also included: qtsdk-version-qt-version - name = "qt${if sdkBuild then "sdk" else "creator"}-${version}" - + optionalString sdkBuild "-qt-${qtLib.version}"; + name = "qtcreator-${version}"; src = fetchurl { url = "http://download.qt-project.org/official_releases/qtcreator/${baseVersion}/${version}/qt-creator-opensource-src-${version}.tar.gz"; sha256 = "1asbfphws0aqs92gjgh0iqzr1911kg51r9al44jxpfk88yazjzgm"; }; - # This property can be used in a nix development environment to refer to the Qt package - # eg: export QTDIR=${qtSDK.qt} - qt = qtLib; - - # We must only propagate Qt (including qmake) when building the QtSDK - propagatedBuildInputs = if sdkBuild then [ qtLib ] else []; - buildInputs = if sdkBuild == false then [ qtLib ] else []; + buildInputs = [ makeWrapper qtLib.base qtLib.script qtLib.quickcontrols qtLib.declarative ]; doCheck = false; enableParallelBuilding = true; preConfigure = '' - qmake -spec linux-g++ "QT_PRIVATE_HEADERS=${qtLib}/include" qtcreator.pro + qmake -spec linux-g++ qtcreator.pro ''; buildFlags = optionalString withDocumentation " docs"; @@ -54,6 +44,11 @@ stdenv.mkDerivation rec { Type=Application Categories=Qt;Development;IDE; __EOF__ + # Wrap the qtcreator binary + wrapProgram $out/bin/qtcreator \ + --prefix QT_PLUGIN_PATH : "$QT_PLUGIN_PATH" \ + --prefix QML_IMPORT_PATH : "$QML_IMPORT_PATH" \ + --prefix QML2_IMPORT_PATH : "$QML2_IMPORT_PATH" ''; meta = { @@ -63,9 +58,9 @@ stdenv.mkDerivation rec { tailored to the needs of Qt developers. It includes features such as an advanced code editor, a visual debugger and a GUI designer. ''; - homepage = "http://qt-project.org/wiki/Category:Tools::QtCreator"; + homepage = "https://wiki.qt.io/Category:Tools::QtCreator"; license = "LGPL"; - maintainers = [ maintainers.bbenoist ]; + maintainers = [ maintainers.akaWolf maintainers.bbenoist ]; platforms = platforms.all; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 750c3b8484e..aa5d09855d9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7968,7 +7968,7 @@ let }); qtcreator = callPackage ../development/qtcreator { - qtLib = qt5Full; # 3.4 only supports qt5; TODO: use modularized qt>=5.4 + qtLib = qt54; withDocumentation = true; }; From 17667cd6ac261c936b1d185b3f8292c30d551143 Mon Sep 17 00:00:00 2001 From: Daniel Fox Franke Date: Fri, 28 Aug 2015 22:41:56 -0400 Subject: [PATCH 07/46] haskellPackages.tar: disable tests They fail on i686-linux: http://hydra.nixos.org/build/25088435/nixlog/2 --- pkgs/development/haskell-modules/configuration-common.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 5e135a99973..11a806289ed 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -465,6 +465,7 @@ self: super: { static-resources = dontCheck super.static-resources; strive = dontCheck super.strive; # fails its own hlint test with tons of warnings svndump = dontCheck super.svndump; + tar = dontCheck super.tar; #http://hydra.nixos.org/build/25088435/nixlog/2 (fails only on 32-bit) thumbnail-plus = dontCheck super.thumbnail-plus; tickle = dontCheck super.tickle; tpdb = dontCheck super.tpdb; From 7f26d95dcf8d2340c15eb63afdf9f04d8ff3f534 Mon Sep 17 00:00:00 2001 From: Daniel Fox Franke Date: Sat, 29 Aug 2015 01:09:24 -0400 Subject: [PATCH 08/46] glob2: fix build failure The same issue was reported here to Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=746854 Apparently this failure only cropped up with g++-4.9, but looking at the code I have no idea how it ever worked without this patch. --- pkgs/games/globulation/default.nix | 2 +- .../globulation/public-buildproject.patch | 21 +++++++++++++++++++ 2 files changed, 22 insertions(+), 1 deletion(-) create mode 100644 pkgs/games/globulation/public-buildproject.patch diff --git a/pkgs/games/globulation/default.nix b/pkgs/games/globulation/default.nix index ed134bcf3c9..061f7c328d6 100644 --- a/pkgs/games/globulation/default.nix +++ b/pkgs/games/globulation/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { sha256 = "1f0l2cqp2g3llhr9jl6jj15k0wb5q8n29vqj99xy4p5hqs78jk8g"; }; - patches = [ ./header-order.patch ]; + patches = [ ./header-order.patch ./public-buildproject.patch ]; postPatch = '' cp campaigns/tutorial-part4.map{,.orig} diff --git a/pkgs/games/globulation/public-buildproject.patch b/pkgs/games/globulation/public-buildproject.patch new file mode 100644 index 00000000000..1eaedf08820 --- /dev/null +++ b/pkgs/games/globulation/public-buildproject.patch @@ -0,0 +1,21 @@ +diff -Nru glob2-0.9.4.4/src/Game.h glob2-0.9.4.4.new/src/Game.h +--- glob2-0.9.4.4/src/Game.h 2009-08-29 16:39:06.000000000 -0400 ++++ glob2-0.9.4.4.new/src/Game.h 2015-08-29 00:59:07.843398596 -0400 +@@ -148,7 +148,7 @@ + TOP_TO_BOTTOM, + BOTTOM_TO_TOP + }; +- ++public: + struct BuildProject + { + int posX; +@@ -158,7 +158,7 @@ + int unitWorking; + int unitWorkingFuture; + }; +- ++private: + ///Initiates Game + void init(GameGUI *gui, MapEdit* edit); + From 6b866a37fc62321b42a6dd82f058d5c152c1c6e7 Mon Sep 17 00:00:00 2001 From: Tuomas Tynkkynen Date: Sat, 29 Aug 2015 01:06:06 +0300 Subject: [PATCH 09/46] xrdb: Use mcpp as the preprocessor Close #9501, fixes #9480. By default, xrdb uses GCC as the preprocessor at runtime for X resource files. However, gcc is a large dependency, so replace it with mcpp, a much smaller preprocessor (currently under a megabyte on i686). Arch Linux already does this as well, so this should be relatively safe: https://projects.archlinux.org/svntogit/packages.git/tree/trunk/PKGBUILD?h=packages/xorg-xrdb --- pkgs/servers/x11/xorg/overrides.nix | 4 ++++ pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index 71185643a9e..2036e62ee94 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -421,4 +421,8 @@ in outputs = [ "out" "doc" ]; }; + xrdb = attrs: attrs // { + configureFlags = "--with-cpp=${args.mcpp}/bin/mcpp"; + }; + } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e1c50957d00..b8ad3c07f7d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9374,7 +9374,7 @@ let xorg = recurseIntoAttrs (import ../servers/x11/xorg/default.nix { inherit clangStdenv fetchurl fetchgit fetchpatch stdenv pkgconfig intltool freetype fontconfig libxslt expat libpng zlib perl mesa_drivers spice_protocol - dbus libuuid openssl gperf m4 libevdev tradcpp libinput makeWrapper autoreconfHook + dbus libuuid openssl gperf m4 libevdev tradcpp libinput mcpp makeWrapper autoreconfHook autoconf automake libtool xmlto asciidoc flex bison python mtdev pixman; bootstrap_cmds = if stdenv.isDarwin then darwin.bootstrap_cmds else null; mesa = mesa_noglu; From 49f9aba5dd41ab329d1830796396b6e876d3cc64 Mon Sep 17 00:00:00 2001 From: Benjamin Staffin Date: Sat, 29 Aug 2015 00:10:30 -0700 Subject: [PATCH 10/46] goPackages: update various Prometheus dependencies Improving style and adding dates along the dependency tree. --- pkgs/top-level/go-packages.nix | 188 +++++++++++++-------------------- 1 file changed, 75 insertions(+), 113 deletions(-) diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix index 7c319e36517..b69f3fd26b8 100644 --- a/pkgs/top-level/go-packages.nix +++ b/pkgs/top-level/go-packages.nix @@ -51,9 +51,10 @@ let }; net = buildFromGitHub { - rev = "3a29182c25eeabbaaf94daaeecbc7823d86261e7"; - owner = "golang"; - repo = "net"; + rev = "3a29182c25eeabbaaf94daaeecbc7823d86261e7"; + date = "2015-07-28"; + owner = "golang"; + repo = "net"; sha256 = "0g4w411l0v9yg8aib05kzjm9j6dwsd6nk6ayk8j0dkmqildqrx5v"; goPackagePath = "golang.org/x/net"; goPackageAliases = [ @@ -102,6 +103,7 @@ let snappy = buildFromGitHub { rev = "0c7f8a7704bfec561913f4df52c832f094ef56f0"; + date = "2015-07-21"; owner = "golang"; repo = "snappy"; sha256 = "17j421ra8jm2da8gc0sk71g3n1nizqsfx1mapn255nvs887lqm0y"; @@ -378,17 +380,12 @@ let sha256 = "0xmxy8ay0wzd307x7xba3rmigvr6rjlpfk9fmn6ir2nc97ifv3i0"; }; - consul = buildGoPackage rec { - rev = "v0.5.2"; - name = "consul-${rev}"; - goPackagePath = "github.com/hashicorp/consul"; - - src = fetchFromGitHub { - inherit rev; - owner = "hashicorp"; - repo = "consul"; - sha256 = "0p3lc1p346a5ipvkf15l94gn1ml3m7zz6bx0viark3hsv0a7iij7"; - }; + consul = buildFromGitHub { + rev = "a6317f2fb2ba9d5ae695f7fa703cfb30a1c59af1"; + date = "2015-07-24"; + owner = "hashicorp"; + repo = "consul"; + sha256 = "0jixpl9yksasqx9rkidx8qmqc59m34kiibsqfsv56g87wzyp89rs"; buildInputs = [ circbuf armon.go-metrics go-radix gomdb bolt consul-migrate go-checkpoint @@ -434,18 +431,12 @@ let buildInputs = [ logrus docopt-go hipchat-go gopherduty ]; }; - consul-migrate = buildGoPackage rec { - rev = "4977886fc950a0db1a6f0bbadca56dfabf170f9c"; - name = "consul-migrate-${stdenv.lib.strings.substring 0 7 rev}"; - goPackagePath = "github.com/hashicorp/consul-migrate"; - - src = fetchFromGitHub { - inherit rev; - owner = "hashicorp"; - repo = "consul-migrate"; - sha256 = "0kjziwhz1ifj4wpy5viba6z17sfgjjibdhnn73ffp7q5q8abg8w3"; - }; - + consul-migrate = buildFromGitHub { + rev = "678fb10cdeae25ab309e99e655148f0bf65f9710"; + date = "2015-05-19"; + owner = "hashicorp"; + repo = "consul-migrate"; + sha256 = "18zqyzbc3pny700fnh4hi45i5mlsramqykikcr7lgyx7id6alf16"; buildInputs = [ raft raft-boltdb raft-mdb ]; }; @@ -531,10 +522,11 @@ let }; dns = buildFromGitHub { - rev = "bb1103f648f811d2018d4bedcb2d4b2bce34a0f1"; + rev = "e59f851c912767b1db587dcabee6e6652e495c75"; + date = "2015-07-22"; owner = "miekg"; repo = "dns"; - sha256 = "1c1gasvzlcmgwyqhksm656p03nc76kxjxllbcw9bwfy5v7p9w7qq"; + sha256 = "1zcj4drmmskwvjy5ld54qd8a34ls9651ysl3q7c2bcambax5r0hp"; }; docopt-go = buildFromGitHub { @@ -792,32 +784,22 @@ let sha256 = "1xx6lpv1r2sji8m9w35a2fkr9v4vsgvxrrahcq9bdg75qvadq91d"; }; - golang_protobuf_extensions = buildGoPackage rec { - rev = "fc2b8d3a73c4867e51861bbdd5ae3c1f0869dd6a"; - name = "golang-protobuf-extensions-${stdenv.lib.strings.substring 0 7 rev}"; - goPackagePath = "github.com/matttproud/golang_protobuf_extensions"; - - src = fetchFromGitHub { - inherit rev; - owner = "matttproud"; - repo = "golang_protobuf_extensions"; - sha256 = "0ajg41h6402big484drvm72wvid1af2sffw0qkzbmpy04lq68ahj"; - }; - + golang_protobuf_extensions = buildFromGitHub { + rev = "fc2b8d3a73c4867e51861bbdd5ae3c1f0869dd6a"; + date = "2015-04-06"; + owner = "matttproud"; + repo = "golang_protobuf_extensions"; + sha256 = "0ajg41h6402big484drvm72wvid1af2sffw0qkzbmpy04lq68ahj"; buildInputs = [ protobuf ]; }; - goleveldb = buildGoPackage rec { - rev = "e9e2c8f6d3b9c313fb4acaac5ab06285bcf30b04"; - name = "goleveldb-${stdenv.lib.strings.substring 0 7 rev}"; - goPackagePath = "github.com/syndtr/goleveldb"; - src = fetchFromGitHub { - inherit rev; - owner = "syndtr"; - repo = "goleveldb"; - sha256 = "0vg3pcrbdhbmanwkc5njxagi64f4k2ikfm173allcghxcjamrkwv"; - }; - propagatedBuildInputs = [ ginkgo gomega gosnappy ]; + goleveldb = buildFromGitHub { + rev = "183614d6b32571e867df4cf086f5480ceefbdfac"; + date = "2015-06-17"; + owner = "syndtr"; + repo = "goleveldb"; + sha256 = "0crslwglkh8b3204l4zvav712a7yd2ykjnbrnny6yrq94mlvba8r"; + propagatedBuildInputs = [ ginkgo gomega snappy ]; }; gollectd = buildFromGitHub { @@ -1331,6 +1313,7 @@ let go-zookeeper = buildFromGitHub { rev = "5bb5cfc093ad18a28148c578f8632cfdb4d802e4"; + date = "2015-06-02"; owner = "samuel"; repo = "go-zookeeper"; sha256 = "1kpx1ymh7rds0b2km291idnyqi0zck74nd8hnk72crgz7wmpqv6z"; @@ -1457,10 +1440,11 @@ let }; httprouter = buildFromGitHub { - rev = "bde5c16eb82ff15a1734a3818d9b9547065f65b1"; + rev = "6aacfd5ab513e34f7e64ea9627ab9670371b34e7"; + date = "2015-07-08"; owner = "julienschmidt"; repo = "httprouter"; - sha256 = "1l74pvqqhhval4vfnhca9d6i1ij69qs3ljf41w3m1l2id42rq7r9"; + sha256 = "00rrjysmq898qcrf2hfwfh9s70vwvmjx2kp5w03nz1krxa4zhrkl"; }; inf = buildFromGitHub { @@ -1562,7 +1546,7 @@ let levigo = buildGoPackage rec { rev = "1ddad808d437abb2b8a55a950ec2616caa88969b"; - name = "logrus-${stdenv.lib.strings.substring 0 7 rev}"; + name = "levigo-${stdenv.lib.strings.substring 0 7 rev}"; goPackagePath = "github.com/jmhodges/levigo"; excludedPackages = "examples"; @@ -1621,20 +1605,13 @@ let propagatedBuildInputs = [ go-colortext ]; }; - logrus = buildGoPackage rec { - rev = "v0.8.2"; - name = "logrus-${stdenv.lib.strings.substring 0 7 rev}"; - goPackagePath = "github.com/Sirupsen/logrus"; - + logrus = buildFromGitHub rec { + rev = "v0.8.6"; + date = rev; # Trick buildFromGitHub into keeping the version number. + owner = "Sirupsen"; + repo = "logrus"; + sha256 = "1v2qcjy6w24jgdm7kk0f8lqpa25qxzll2x6ycqwidd3pzjhrkifa"; excludedPackages = "examples"; - - src = fetchFromGitHub { - inherit rev; - owner = "Sirupsen"; - repo = "logrus"; - sha256 = "0isihf185bw54yc72mbkf3cgfh7xj0x8ky04fs52xpj6vrmd72bv"; - }; - propagatedBuildInputs = [ airbrake-go bugsnag-go raven-go ]; }; @@ -1932,17 +1909,13 @@ let sha256 = "03k4cars7hcqqgdsd0minfls2p7gjpm8q6y8vknh1s68kvxd4xam"; }; - beorn7.perks = buildGoPackage rec { - rev = "b965b613227fddccbfffe13eae360ed3fa822f8d"; - name = "beorn7.perks-${stdenv.lib.strings.substring 0 7 rev}"; + beorn7.perks = buildFromGitHub rec { + date = "2015-02-23"; + owner = "beorn7"; + repo = "perks"; + rev = "b965b613227fddccbfffe13eae360ed3fa822f8d"; + sha256 = "1p8zsj4r0g61q922khfxpwxhdma2dx4xad1m5qx43mfn28kxngqk"; goPackagePath = "github.com/beorn7/perks"; - - src = fetchFromGitHub { - inherit rev; - owner = "beorn7"; - repo = "perks"; - sha256 = "1p8zsj4r0g61q922khfxpwxhdma2dx4xad1m5qx43mfn28kxngqk"; - }; }; pflag = buildGoPackage rec { @@ -2000,11 +1973,12 @@ let propagatedBuildInputs = [ kr.text ]; }; - prometheus.client_golang = buildFromGitHub { - rev = "3a499bf7fc46bc58337ce612d0cbb29c550b8118"; + prometheus.client_golang = buildFromGitHub rec { + rev = "0.7.0"; + date = rev; # Trick buildFromGitHub into keeping the version number owner = "prometheus"; repo = "client_golang"; - sha256 = "1hf79m83kr3b6nxxwz8qw1c5nls58j1xfaz7q6k6bb9kwabpc3gi"; + sha256 = "1i3g5h2ncdb8b67742kfpid7d0a1jas1pyicglbglwngfmzhpkna"; propagatedBuildInputs = [ goautoneg protobuf @@ -2016,43 +1990,30 @@ let excludedPackages = "examples"; }; - prometheus.client_model = buildGoPackage rec { - rev = "fa8ad6fec33561be4280a8f0514318c79d7f6cb6"; - name = "prometheus-client-model-${stdenv.lib.strings.substring 0 7 rev}"; - goPackagePath = "github.com/prometheus/client_model"; - src = fetchFromGitHub { - inherit rev; - owner = "prometheus"; - repo = "client_model"; - sha256 = "11a7v1fjzhhwsl128znjcf5v7v6129xjgkdpym2lial4lac1dhm9"; - }; + prometheus.client_model = buildFromGitHub { + rev = "fa8ad6fec33561be4280a8f0514318c79d7f6cb6"; + date = "2015-02-12"; + owner = "prometheus"; + repo = "client_model"; + sha256 = "11a7v1fjzhhwsl128znjcf5v7v6129xjgkdpym2lial4lac1dhm9"; buildInputs = [ protobuf ]; }; - prometheus.log = buildGoPackage rec { - name = "prometheus-log-${version}"; - version = "git-2015-05-29"; - goPackagePath = "github.com/prometheus/log"; - src = fetchFromGitHub { - rev = "439e5db48fbb50ebbaf2c816030473a62f505f55"; - owner = "prometheus"; - repo = "log"; - sha256 = "1fl23gsw2hn3c1y91qckr661sybqcw2gqnd1gllxn3hp6p2w6hxv"; - }; + prometheus.log = buildFromGitHub { + rev = "439e5db48fbb50ebbaf2c816030473a62f505f55"; + date = "2015-05-29"; + owner = "prometheus"; + repo = "log"; + sha256 = "1fl23gsw2hn3c1y91qckr661sybqcw2gqnd1gllxn3hp6p2w6hxv"; propagatedBuildInputs = [ logrus ]; }; - prometheus.procfs = buildGoPackage rec { - rev = "351fbfac67c8ae8bcacd468f678f5e8d5a585d3d"; - name = "prometheus-procfs-${stdenv.lib.strings.substring 0 7 rev}"; - goPackagePath = "github.com/prometheus/procfs"; - - src = fetchFromGitHub { - inherit rev; - owner = "prometheus"; - repo = "procfs"; - sha256 = "0hxssp6h1cs7l2cvnxj1hyacy3328hhpi1pd123f2a57aikha9ff"; - }; + prometheus.procfs = buildFromGitHub { + rev = "c91d8eefde16bd047416409eb56353ea84a186e4"; + date = "2015-06-16"; + owner = "prometheus"; + repo = "procfs"; + sha256 = "0pj3gzw9b58l72w0rkpn03ayssglmqfmyxghhfad6mh0b49dvj3r"; }; pty = buildFromGitHub { @@ -2122,10 +2083,11 @@ let }; raven-go = buildFromGitHub { - rev = "c8f8fb7c415203f52ca882e2661d21bc6dcb54d7"; + rev = "74c334d7b8aaa4fd1b4fc6aa428c36fed1699e28"; + date = "2015-07-21"; owner = "getsentry"; repo = "raven-go"; - sha256 = "052avpl8xsqlcmjmi3v00nm23lhs95af6vpaw2sh5xckln0lfbxh"; + sha256 = "1356a7h8zp1mcywnr0y83w0h4qdblp65rcf9slbx667n8x2rzda8"; }; redigo = buildFromGitHub { From 86eca38b0c2e341a97e4ecab07d1ebd517bf1d05 Mon Sep 17 00:00:00 2001 From: Benjamin Staffin Date: Sat, 29 Aug 2015 00:11:59 -0700 Subject: [PATCH 11/46] prometheus: 0.14.0 -> 0.15.1 --- .../servers/monitoring/prometheus/default.nix | 52 ++++++++----------- 1 file changed, 23 insertions(+), 29 deletions(-) diff --git a/pkgs/servers/monitoring/prometheus/default.nix b/pkgs/servers/monitoring/prometheus/default.nix index 4b8d1cdbe56..c6ed75e0d09 100644 --- a/pkgs/servers/monitoring/prometheus/default.nix +++ b/pkgs/servers/monitoring/prometheus/default.nix @@ -2,47 +2,41 @@ goPackages.buildGoPackage rec { name = "prometheus-${version}"; - version = "0.14.0"; + version = "0.15.1"; goPackagePath = "github.com/prometheus/prometheus"; - rev = "67e77411ba30b1b0ce0989c85b6684fb3adef430"; + rev = "64349aade284846cb194be184b1b180fca629a7c"; src = fetchFromGitHub { inherit rev; owner = "prometheus"; repo = "prometheus"; - sha256 = "06xsxigimw5i1fla0k83pf5bpmybskvy50433hs8h876gyvgjxp9"; + sha256 = "0gljpwnlip1fnmhbc96hji2rc56xncy97qccm7v1z5j1nhc5fam2"; }; - buildInputs = [ - goPackages.consul - goPackages.dns - goPackages.fsnotify.v1 - goPackages.goleveldb - goPackages.logrus - goPackages.net - goPackages.prometheus.client_golang - goPackages.prometheus.log - goPackages.yaml-v2 - vim # for xxd, used in embed-static.sh + buildInputs = with goPackages; [ + consul + dns + fsnotify.v1 + go-zookeeper + goleveldb + httprouter + logrus + net + prometheus.client_golang + prometheus.log + yaml-v2 ]; # Metadata that gets embedded into the binary - buildFlagsArray = '' + buildFlagsArray = let t = "${goPackagePath}/version"; in + '' -ldflags= - -X main.buildVersion ${version} - -X main.buildRevision ${builtins.substring 0 6 rev} - -X main.buildBranch master - -X main.buildUser nix@nixpkgs - -X main.buildDate 20150101-00:00:00 - -X main.goVersion ${lib.getVersion goPackages.go} - ''; - - preBuild = '' - ( - cd "go/src/$goPackagePath/web" - ${stdenv.shell} ../utility/embed-static.sh static templates \ - | gofmt > blob/files.go - ) + -X ${t}.Version=${version} + -X ${t}.Revision=${builtins.substring 0 6 rev} + -X ${t}.Branch=master + -X ${t}.BuildUser=nix@nixpkgs + -X ${t}.BuildDate=20150101-00:00:00 + -X ${t}.GoVersion=${lib.getVersion goPackages.go} ''; meta = with lib; { From 50aed1ee1052c9c844ff258cc5780b5b4d670ec8 Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Fri, 28 Aug 2015 15:09:31 +0200 Subject: [PATCH 12/46] importlib: disable for Python>2.6 and PyPy importlib is part of the standard library for Python > 2.6 and PyPy. Tested with nix-shell for all *Packages.importlib versions. --- pkgs/top-level/python-packages.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 3ab9738c6c7..1a92621d05a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6805,14 +6805,16 @@ let }; }; - importlib = if isPy26 then (buildPythonPackage { + importlib = buildPythonPackage rec { name = "importlib-1.0.2"; + + disabled = (!isPy26) || isPyPy; + src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/i/importlib/importlib-1.0.2.tar.gz"; md5 = "4aa23397da8bd7c7426864e88e4db7e1"; }; - doCheck = false; - }) else null; + }; influxdb = buildPythonPackage rec { name = "influxdb-0.1.12"; From 1a2d05a840aa7cd504120f549332be0c4a907ed0 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sat, 29 Aug 2015 11:57:10 +0200 Subject: [PATCH 13/46] getdata: 0.8.8 -> 0.8.9 --- pkgs/development/libraries/getdata/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/getdata/default.nix b/pkgs/development/libraries/getdata/default.nix index 464d2f66e45..e3dfc9fe0a9 100644 --- a/pkgs/development/libraries/getdata/default.nix +++ b/pkgs/development/libraries/getdata/default.nix @@ -1,9 +1,9 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "getdata-0.8.8"; + name = "getdata-0.8.9"; src = fetchurl { url = "mirror://sourceforge/getdata/${name}.tar.bz2"; - sha256 = "1p5sncbr0bjrx1ki57di0j9rl5ksv0hbfy7bkcb4vaz9z9mrn8xj"; + sha256 = "1cgwrflpp9ia2cwnhmwp45nmsg15ymjh03pysrfigyfmag94ac51"; }; meta = with stdenv.lib; { From d9cb4f92b55e3576df6925eb8ac8808c65b0bdfe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Sat, 29 Aug 2015 13:16:22 +0200 Subject: [PATCH 14/46] pythonPackages.protobuf: disable on pypy MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit 172d2793b9819eb6fa87f88806aaf6c7587e3a2c) Signed-off-by: Domen Kožar --- 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 1a92621d05a..759d464d9ae 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3552,7 +3552,7 @@ let gmpy2 = buildPythonPackage rec { name = "gmpy2-2.0.6"; disabled = isPyPy; - + src = pkgs.fetchurl { url = "https://pypi.python.org/packages/source/g/gmpy2/${name}.zip"; md5 = "7365d880953ba54c2cdcf171c7e19b2b"; @@ -6807,9 +6807,9 @@ let importlib = buildPythonPackage rec { name = "importlib-1.0.2"; - + disabled = (!isPy26) || isPyPy; - + src = pkgs.fetchurl { url = "http://pypi.python.org/packages/source/i/importlib/importlib-1.0.2.tar.gz"; md5 = "4aa23397da8bd7c7426864e88e4db7e1"; @@ -8408,7 +8408,7 @@ let nose modules.sqlite3 ]; - + # Test does not work on Py3k because it calls 'python'. # https://github.com/nipy/nibabel/issues/341 preCheck = '' @@ -9864,7 +9864,7 @@ let protobuf2_5 = self.protobufBuild pkgs.protobuf2_5; protobufBuild = protobuf: buildPythonPackage rec { inherit (protobuf) name src; - disabled = isPy3k; + disabled = isPy3k || isPyPy; propagatedBuildInputs = with self; [ protobuf google_apputils ]; From fe0d91a0ebba1a10d4933ead998ec3dc3b4159d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Domen=20Ko=C5=BEar?= Date: Sat, 29 Aug 2015 14:12:18 +0200 Subject: [PATCH 15/46] petrifoo: fix build MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit (cherry picked from commit dc8e1c199c074319be63fba8a0301b3332262927) Signed-off-by: Domen Kožar --- pkgs/applications/audio/petrifoo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/petrifoo/default.nix b/pkgs/applications/audio/petrifoo/default.nix index ffd920427ac..c9d9ad57487 100644 --- a/pkgs/applications/audio/petrifoo/default.nix +++ b/pkgs/applications/audio/petrifoo/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, alsaLib, cmake, gtk, libjack2, libgnomecanvas , libpthreadstubs, libsamplerate, libsndfile, libtool, libxml2 -, pkgconfig }: +, pkgconfig, openssl }: stdenv.mkDerivation rec { name = "petri-foo-${version}"; @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { buildInputs = [ alsaLib cmake gtk libjack2 libgnomecanvas libpthreadstubs - libsamplerate libsndfile libtool libxml2 pkgconfig + libsamplerate libsndfile libtool libxml2 pkgconfig openssl ]; meta = with stdenv.lib; { From 69b648ea950b25d09c0aec4087a036bc268cb860 Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 29 Aug 2015 15:37:34 +0200 Subject: [PATCH 16/46] Revert "Added K Framework package." This reverts commit de0211090334c2d562ee8560a298d5f5f76b40b3. The package doesn't compile: https://github.com/NixOS/nixpkgs/pull/7419#issuecomment-135972366. --- .../programming/kframework/default.nix | 102 ------------------ pkgs/top-level/all-packages.nix | 2 - 2 files changed, 104 deletions(-) delete mode 100644 pkgs/applications/science/programming/kframework/default.nix diff --git a/pkgs/applications/science/programming/kframework/default.nix b/pkgs/applications/science/programming/kframework/default.nix deleted file mode 100644 index e8a4f2b3156..00000000000 --- a/pkgs/applications/science/programming/kframework/default.nix +++ /dev/null @@ -1,102 +0,0 @@ -{ stdenv, fetchFromGitHub, maven, openjdk8, releaseTools }: - -# TODO: -# - Investigate builds on platforms other than 64-bit linux -# - Separate package for Maven cache? This would speed up builds and -# theoretically could still be pure -# - Find a way to prevent Maven from downloading artifacts irrelevant -# to the platform for which we are building - -releaseTools.mvnBuild rec { - name = "kframework-20150415"; - - mvn8 = maven.override { - jdk = openjdk8; # K uses Java 8. The official docs reference the - # Oracle VM, but it's been working with OpenJDK - }; - - src = fetchFromGitHub { - owner = "kframework"; - repo = "k"; - rev = "85a41bc024"; # nightly build for April 15th, 2015 - sha256 = "01ndfdnqxp2w86pg3ax39sxayb2pfm39lj1h3818zzn86gqwa1vc"; - }; - - buildInputs = [ mvn8 openjdk8 ]; - - preSetupPhase = '' - # z3 needs this to pass tests - export LD_LIBRARY_PATH=$(cat $NIX_CC/nix-support/orig-cc)/lib - # not sure if this does anything, since it might only speed up incremental builds - export MAVEN_OPTS="-XX:+TieredCompilation" - ''; - - mvnAssembly = '' - mvn package -Dcheckstyle.skip -Dmaven.test.skip=true -Dmaven.repo.local=$M2_REPO - ''; - - mvnRelease = '' - true # do nothing, since mvn package is sufficient - ''; - - # this is a custom version of k-distribution/src/main/scripts/lib/k - kscript = '' - #!/usr/bin/env bash - export JAVA=${openjdk8}/bin/java - - export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:"$out/lib" - - export K_OPTS="-Xms64m -Xmx1024m -Xss32m -XX:+TieredCompilation" - export MISC_ARGS="-Djava.awt.headless=true" - export ARGS="$MISC_ARGS $K_OPTS" - $JAVA $ARGS -cp "$out/share/kframework/lib/java/*" org.kframework.main.Main "$@" - ''; - - finalPhase = '' - # set some environment variables - export K_ROOT=$PWD/k-distribution/target/release/k/ - export K_SHARE=$out/share/kframework/ - # make requisite directories - mkdir -p $out/lib $K_SHARE/lib/native - # copy over bin - cp -R $K_ROOT/bin $K_SHARE/ - # symlink $out/bin to $out/share/kframework/bin - ln -s $K_SHARE/bin $out/bin - # copy everything relevant to $out/share/kframework - # we may want to consider adding the documentation etc. - cp -R $K_ROOT/include $K_SHARE/ - cp -R $K_ROOT/lib/java $K_SHARE/lib/ - cp -R $K_ROOT/lib/native/linux $K_SHARE/lib/native/ - cp -R $K_ROOT/lib/native/linux64 $K_SHARE/lib/native/ - # remove Windows batch scripts - rm $K_SHARE/bin/*.bat # */ - # TODO: fix these scripts so they work - rm $K_SHARE/bin/kserver $K_SHARE/bin/stop-kserver - # make our k wrapper script and substitute $out for its value - echo -n "$kscript" | sed "s:\$out:$out:g" > $K_SHARE/lib/k - chmod +x $K_SHARE/lib/k - # symlink requisite binaries - ln -s $K_SHARE/lib/k $out/lib/k - ln -s $K_SHARE/lib/native/linux/sdf2table $out/bin/sdf2table - ln -s $K_SHARE/lib/native/linux64/z3 $out/bin/z3 - ln -s $K_SHARE/lib/native/linux64/libz3.so $out/lib/libz3.so - ln -s $K_SHARE/lib/native/linux64/libz3java.so $out/lib/libz3java.so - # patch Z3 so it uses the right interpreter/libs - patchelf \ - --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath $(cat $NIX_CC/nix-support/orig-cc)/lib \ - --force-rpath \ - $K_SHARE/lib/native/linux64/z3 - ''; - - meta = { - description = "A rewrite-based executable semantic framework in which programming languages, type systems and formal analysis tools can be defined"; - homepage = http://www.kframework.org; - license = stdenv.lib.licenses.bsd3; # technically it is the UIUC/NCSA license - # but LLVM uses that license as well and - # it is marked as BSD3 - maintainers = [ stdenv.lib.maintainers.taktoa ]; - platforms = stdenv.lib.platforms.linux; # I haven't done testing on other OSes, but - # since it's Java it should run anywhere - }; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index b8ad3c07f7d..a8bb0c7b59c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -14419,8 +14419,6 @@ let ### SCIENCE/PROGRAMMING - kframework = callPackage ../applications/science/programming/kframework { }; - plm = callPackage ../applications/science/programming/plm { }; ### SCIENCE/LOGIC From f6135c9fbaf920a5021fa8619da593ddda6638bf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Sat, 29 Aug 2015 15:55:06 +0200 Subject: [PATCH 17/46] calibre: 2.35.0 -> 2.36.0 Unbreaks build, as the 2.35.0 source URL returns HTTP error 404. --- 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 7f8a42b077e..abea6201e75 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { name = "calibre-${version}"; - version = "2.35.0"; + version = "2.36.0"; src = fetchurl { url = "https://github.com/kovidgoyal/calibre/releases/download/v${version}/${name}.tar.xz"; - sha256 = "13sic0l16myvka8mgpr56h6qlpf1cwx8xlf4acp3qz6gsmz3r23x"; + sha256 = "1my7fjj1lc28mhmvb85rcc4c5bwsycs6bgmafbx9agil5bgrbnb2"; }; inherit python; From 41507ce41538bec2499f9cc2bf32408f02e00221 Mon Sep 17 00:00:00 2001 From: Damien Cassou Date: Sat, 29 Aug 2015 16:57:08 +0200 Subject: [PATCH 18/46] Change my email address --- lib/maintainers.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 7c136725061..d4375fcdf3c 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -67,7 +67,7 @@ couchemar = "Andrey Pavlov "; cstrahan = "Charles Strahan "; cwoac = "Oliver Matthews "; - DamienCassou = "Damien Cassou "; + DamienCassou = "Damien Cassou "; davidrusu = "David Rusu "; dbohdan = "Danyil Bohdan "; DerGuteMoritz = "Moritz Heidkamp "; From dbc7e0fea55f4597f8c12221e13bd6bb993aed5b Mon Sep 17 00:00:00 2001 From: Frederik Rietdijk Date: Sat, 8 Aug 2015 22:02:12 +0200 Subject: [PATCH 19/46] spyder: 2.2.5 -> 2.3.6 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Set environment variable to use setuptools (fixes build issue). [Bjørn: split enabling spyder for python3 into separate commit.] --- pkgs/applications/science/spyder/default.nix | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/science/spyder/default.nix b/pkgs/applications/science/spyder/default.nix index 806d2f546cf..c068847c331 100644 --- a/pkgs/applications/science/spyder/default.nix +++ b/pkgs/applications/science/spyder/default.nix @@ -8,12 +8,13 @@ }: buildPythonPackage rec { - name = "spyder-2.2.5"; + name = "spyder-${version}"; + version = "2.3.6"; namePrefix = ""; src = fetchurl { - url = "https://spyderlib.googlecode.com/files/${name}.zip"; - sha256 = "1bxc5qs2bqc21s6kxljsfxnmwgrgnyjfr9mkwzg9njpqsran3bp2"; + url = "https://pypi.python.org/packages/source/s/spyder/${name}.zip"; + sha256 = "0e6502e0d3f270ea8916d1a3d7ca29915801d31932db399582bc468c01d535e2"; }; buildInputs = [ unzip ]; @@ -23,6 +24,11 @@ buildPythonPackage rec { # There is no test for spyder doCheck = false; + # Use setuptools instead of distutils. + preConfigure = '' + export USE_SETUPTOOLS=True + ''; + desktopItem = makeDesktopItem { name = "Spyder"; exec = "spyder"; @@ -49,7 +55,7 @@ buildPythonPackage rec { environment for the Python language with advanced editing, interactive testing, debugging and introspection features. ''; - homepage = https://code.google.com/p/spyderlib/; + homepage = https://github.com/spyder-ide/spyder/; license = licenses.mit; platforms = platforms.linux; maintainers = [ maintainers.bjornfor ]; From ab6af31ecb72dcdd4f5b41a13c030b1d40889d91 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Sat, 29 Aug 2015 17:38:50 +0200 Subject: [PATCH 20/46] spyder: enable for all python interpreters Rope is not ported to python3 yet, so it is disabled (it's a "recommended" dependency, not critical). --- pkgs/top-level/python-packages.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 759d464d9ae..93d40c3cd3a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -13272,6 +13272,10 @@ let }; }); + spyder = callPackage ../applications/science/spyder { + rope = if isPy3k then null else self.rope; + }; + sqlalchemy = self.sqlalchemy9.override rec { name = "SQLAlchemy-0.7.10"; disabled = isPy34; From 07903b161715f2017ce9fed8c434db4524f7edc9 Mon Sep 17 00:00:00 2001 From: Daniel Fox Franke Date: Fri, 28 Aug 2015 20:54:45 -0400 Subject: [PATCH 21/46] cvs-fast-export: don't link against librt It's superfluous on Linux, and it breaks the build on Darwin. --- pkgs/applications/version-management/cvs-fast-export/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/applications/version-management/cvs-fast-export/default.nix b/pkgs/applications/version-management/cvs-fast-export/default.nix index 15035a345d4..62a58ee985c 100644 --- a/pkgs/applications/version-management/cvs-fast-export/default.nix +++ b/pkgs/applications/version-management/cvs-fast-export/default.nix @@ -30,6 +30,7 @@ mkDerivation rec { preBuild = '' makeFlagsArray=( XML_CATALOG_FILES="${docbook_xml_dtd_45}/xml/dtd/docbook/catalog.xml ${docbook_xml_xslt}/xml/xsl/docbook/catalog.xml" + LIBS="" prefix="$out" ) ''; From 29c0262708a6524f9de0cd96fa7b8df12891ea00 Mon Sep 17 00:00:00 2001 From: Jaka Hudoklin Date: Sat, 29 Aug 2015 18:21:43 +0200 Subject: [PATCH 22/46] openvswitch service: fix ipsec startup order --- nixos/modules/virtualisation/openvswitch.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/nixos/modules/virtualisation/openvswitch.nix b/nixos/modules/virtualisation/openvswitch.nix index 69ca13a7147..b5155246fda 100644 --- a/nixos/modules/virtualisation/openvswitch.nix +++ b/nixos/modules/virtualisation/openvswitch.nix @@ -67,7 +67,6 @@ in { description = "Open_vSwitch Database Server"; wantedBy = [ "multi-user.target" ]; after = [ "systemd-udev-settle.service" ]; - wants = [ "vswitchd.service" ]; path = [ cfg.package ]; restartTriggers = [ db cfg.package ]; # Create the config database @@ -108,6 +107,7 @@ in { systemd.services.vswitchd = { description = "Open_vSwitch Daemon"; + wantedBy = [ "multi-user.target" ]; bindsTo = [ "ovsdb.service" ]; after = [ "ovsdb.service" ]; path = [ cfg.package ]; @@ -135,8 +135,8 @@ in { systemd.services.ovs-monitor-ipsec = { description = "Open_vSwitch Ipsec Daemon"; wantedBy = [ "multi-user.target" ]; - requires = [ "racoon.service" ]; - after = [ "vswitchd.service" ]; + requires = [ "ovsdb.service" ]; + before = [ "vswitchd.service" "racoon.service" ]; environment.UNIXCTLPATH = "/tmp/ovsdb.ctl.sock"; serviceConfig = { ExecStart = '' From 367b0be7b48b4cd01dda831b9437ac007ce38d16 Mon Sep 17 00:00:00 2001 From: Jaka Hudoklin Date: Sat, 29 Aug 2015 18:22:44 +0200 Subject: [PATCH 23/46] qtpass: 0.8.4 -> 1.0.1 --- pkgs/applications/misc/qtpass/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/qtpass/default.nix b/pkgs/applications/misc/qtpass/default.nix index 828019011fc..e768a692f59 100644 --- a/pkgs/applications/misc/qtpass/default.nix +++ b/pkgs/applications/misc/qtpass/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "qtpass-${version}"; - version = "0.8.4"; + version = "1.0.1"; src = fetchurl { url = "https://github.com/IJHack/qtpass/archive/v${version}.tar.gz"; - sha256 = "14avh04q559p64ska1w814pbwv0742aaqln036pw99fjxav685g0"; + sha256 = "1mmncvamvwr3hizc1jgpb5kscl9idmrfd2785jhwi87q11wjrwxz"; }; buildInputs = [ git gnupg makeWrapper pass qt5.base ]; From ff0575a2f1538ec07425637f4dea7cb0c6306d02 Mon Sep 17 00:00:00 2001 From: Jaka Hudoklin Date: Sat, 29 Aug 2015 18:25:39 +0200 Subject: [PATCH 24/46] docker: add blkid from utillinux to path --- pkgs/applications/virtualization/docker/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/virtualization/docker/default.nix b/pkgs/applications/virtualization/docker/default.nix index c3b141cba81..223d3175179 100644 --- a/pkgs/applications/virtualization/docker/default.nix +++ b/pkgs/applications/virtualization/docker/default.nix @@ -1,15 +1,15 @@ { stdenv, fetchFromGitHub, makeWrapper, go, lxc, sqlite, iproute, bridge-utils, devicemapper, -btrfsProgs, iptables, bash, e2fsprogs, xz}: +btrfsProgs, iptables, bash, e2fsprogs, xz, utillinux}: stdenv.mkDerivation rec { name = "docker-${version}"; - version = "1.7.1"; + version = "1.8.1"; src = fetchFromGitHub { owner = "docker"; repo = "docker"; rev = "v${version}"; - sha256 = "0r0j8aj1a7lbnc9piznp02h5n2gdw3v3n4q2ipmapi9ax0wj82lz"; + sha256 = "0nwd5wsw9f50jh4s5c5sfd6hnyh3g2kmxcrid36y1phabh30yrcz"; }; buildInputs = [ makeWrapper go sqlite lxc iproute bridge-utils devicemapper btrfsProgs iptables e2fsprogs ]; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { installPhase = '' install -Dm755 ./bundles/${version}/dynbinary/docker-${version} $out/libexec/docker/docker install -Dm755 ./bundles/${version}/dynbinary/dockerinit-${version} $out/libexec/docker/dockerinit - makeWrapper $out/libexec/docker/docker $out/bin/docker --prefix PATH : "${iproute}/sbin:sbin:${lxc}/bin:${iptables}/sbin:${e2fsprogs}/sbin:${xz}/bin" + makeWrapper $out/libexec/docker/docker $out/bin/docker --prefix PATH : "${iproute}/sbin:sbin:${lxc}/bin:${iptables}/sbin:${e2fsprogs}/sbin:${xz}/bin:${utillinux}/bin" # systemd install -Dm644 ./contrib/init/systemd/docker.service $out/etc/systemd/system/docker.service From e2f673e0244d9e660d115fc60dde3b50b846cba7 Mon Sep 17 00:00:00 2001 From: Jaka Hudoklin Date: Sat, 29 Aug 2015 18:28:50 +0200 Subject: [PATCH 25/46] skydns: 2.5.0a -> 2.5.2b --- pkgs/servers/dns/skydns/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/dns/skydns/default.nix b/pkgs/servers/dns/skydns/default.nix index 054c5c422e1..c430ed4b37c 100644 --- a/pkgs/servers/dns/skydns/default.nix +++ b/pkgs/servers/dns/skydns/default.nix @@ -4,7 +4,7 @@ with goPackages; buildGoPackage rec { name = "skydns-${version}"; - version = "2.5.0a"; + version = "2.5.2b"; goPackagePath = "github.com/skynetservices/skydns"; @@ -12,7 +12,7 @@ buildGoPackage rec { owner = "skynetservices"; repo = "skydns"; rev = version; - sha256 = "18mw8bcz54i4yrv6pc73s3ffcj1vv9cwnn76c9k0bj1mxp1pmdl2"; + sha256 = "01vac6bd71wky5jbd5k4a0x665bjn1cpmw7p655jrdcn5757c2lv"; }; buildInputs = with goPackages; [ go-etcd rcrowley.go-metrics influxdb go-systemd go-log dns stathat osext etcd ]; From 256d2950b9f5eb1ba64132052763cb695fdaeae1 Mon Sep 17 00:00:00 2001 From: Jaka Hudoklin Date: Wed, 19 Aug 2015 23:36:35 +0200 Subject: [PATCH 26/46] xca: 0.9.3 -> 1.3.0 --- .../xca/0001-Fix-for-openssl-1.0.1i.patch | 57 ------------------- pkgs/applications/misc/xca/default.nix | 12 +--- 2 files changed, 2 insertions(+), 67 deletions(-) delete mode 100644 pkgs/applications/misc/xca/0001-Fix-for-openssl-1.0.1i.patch diff --git a/pkgs/applications/misc/xca/0001-Fix-for-openssl-1.0.1i.patch b/pkgs/applications/misc/xca/0001-Fix-for-openssl-1.0.1i.patch deleted file mode 100644 index 9bfe3831c4a..00000000000 --- a/pkgs/applications/misc/xca/0001-Fix-for-openssl-1.0.1i.patch +++ /dev/null @@ -1,57 +0,0 @@ -From abd9d530776e8bb6d8f05312fc3ae3044796139c Mon Sep 17 00:00:00 2001 -From: Oliver Winker -Date: Tue, 12 Aug 2014 19:08:05 +0200 -Subject: [PATCH] Fix for openssl 1.0.1i - -Fixes following application error ---- -Errors -error:0D0C40D8:asn1 encoding routines:c2i_ASN1_OBJECT:invalid object encoding error:0D08303A:asn1 encoding routines:ASN1_TEMPLATE_NOEXP_D2I:nested asn1 error error:0D0C40D8:asn1 encoding routines:c2i_ASN1_OBJECT:invalid object encoding error:0D08303A:asn1 encoding routines:ASN1_TEMPLATE_NOEXP_D2I:nested asn1 error error:0D0C40D8:asn1 encoding routines:c2i_ASN1_OBJECT:invalid object encoding error:0D08303A:asn1 encoding routines:ASN1_TEMPLATE_NOEXP_D2I:nested asn1 error error:0D0C40D8:asn1 encoding routines:c2i_ASN1_OBJECT:invalid object encoding error:0D08303A:asn1 encoding routines:ASN1_TEMPLATE_NOEXP_D2I:nested asn1 error error:0D0C40D8:asn1 encoding routines:c2i_ASN1_OBJECT:invalid object encoding error:0D08303A:asn1 encoding routines:ASN1_TEMPLATE_NOEXP_D2I:nested asn1 error ---- - -Due to openssl 1.0.1i change: ---- -commit 03b04ddac162c7b7fa3c57eadccc5a583a00d291 -Author: Emilia Kasper -Date: Wed Jul 2 19:02:33 2014 +0200 - - Fix OID handling: - - - Upon parsing, reject OIDs with invalid base-128 encoding. - - Always NUL-terminate the destination buffer in OBJ_obj2txt printing function. - - CVE-2014-3508 - - Reviewed-by: Dr. Stephen Henson - Reviewed-by: Kurt Roeckx - Reviewed-by: Tim Hudson ---- ---- - lib/x509v3ext.cpp | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/lib/x509v3ext.cpp b/lib/x509v3ext.cpp -index cf74c32..d94cbda 100644 ---- a/lib/x509v3ext.cpp -+++ b/lib/x509v3ext.cpp -@@ -27,6 +27,8 @@ x509v3ext::x509v3ext(const X509_EXTENSION *n) - x509v3ext::x509v3ext(const x509v3ext &n) - { - ext = NULL; -+ if (!n.isValid()) -+ return; - set(n.ext); - } - -@@ -743,7 +745,7 @@ X509_EXTENSION *x509v3ext::get() const - - bool x509v3ext::isValid() const - { -- return ext->value->length > 0 && -+ return ext && ext->value && ext->value->length > 0 && - OBJ_obj2nid(ext->object) != NID_undef; - } - --- -2.0.1 - diff --git a/pkgs/applications/misc/xca/default.nix b/pkgs/applications/misc/xca/default.nix index d5fa5e5ec56..fdd136cc838 100644 --- a/pkgs/applications/misc/xca/default.nix +++ b/pkgs/applications/misc/xca/default.nix @@ -2,21 +2,13 @@ stdenv.mkDerivation rec { name = "xca-${version}"; - version = "0.9.3"; + version = "1.3.0"; src = fetchurl { url = "mirror://sourceforge/xca/${name}.tar.gz"; - sha256 = "1fn6kh8mdy65rrgjif7j9wn3mxg1mrrcnhzpi86hfy24ic6bahk8"; + sha256 = "0k21d4lfkn0nlj8az6067dmc5dgy5cidspljagmh5frsv576wnzg"; }; - patches = [ ./0001-Fix-for-openssl-1.0.1i.patch ]; - - configurePhase = '' - export PATH=$PATH:${which}/bin - export QTDIR=${qt4} - prefix=$out ./configure ${openssl} ${libtool} - ''; - postInstall = '' wrapProgram "$out/bin/xca" \ --prefix LD_LIBRARY_PATH : "${qt4}/lib:${gcc.cc}/lib:${gcc.cc}/lib64:${openssl}/lib:${libtool}/lib" From c65cdcf7229e322e6375110078da47455ca53d6d Mon Sep 17 00:00:00 2001 From: Jaka Hudoklin Date: Sat, 29 Aug 2015 18:20:24 +0200 Subject: [PATCH 27/46] kubernetes service: add a few options --- nixos/modules/services/cluster/kubernetes.nix | 67 +++++++++++++++---- 1 file changed, 55 insertions(+), 12 deletions(-) diff --git a/nixos/modules/services/cluster/kubernetes.nix b/nixos/modules/services/cluster/kubernetes.nix index 99915438f92..ba09f04d502 100644 --- a/nixos/modules/services/cluster/kubernetes.nix +++ b/nixos/modules/services/cluster/kubernetes.nix @@ -105,7 +105,7 @@ in { tokenAuth = mkOption { description = '' Kubernetes apiserver token authentication file. See - + ''; default = {}; example = literalExample '' @@ -120,7 +120,7 @@ in { authorizationMode = mkOption { description = '' Kubernetes apiserver authorization mode (AlwaysAllow/AlwaysDeny/ABAC). See - + ''; default = "AlwaysAllow"; type = types.enum ["AlwaysAllow" "AlwaysDeny" "ABAC"]; @@ -129,7 +129,7 @@ in { authorizationPolicy = mkOption { description = '' Kubernetes apiserver authorization policy file. See - + ''; default = []; example = literalExample '' @@ -159,18 +159,37 @@ in { }; runtimeConfig = mkOption { - description = "Api runtime configuration"; + description = '' + Api runtime configuration. See + + ''; default = ""; example = "api/all=false,api/v1=true"; type = types.str; }; admissionControl = mkOption { - description = "Kubernetes admission control plugins to use."; + description = '' + Kubernetes admission control plugins to use. See + + ''; default = ["AlwaysAdmit"]; + example = [ + "NamespaceLifecycle" "NamespaceExists" "LimitRanger" + "SecurityContextDeny" "ServiceAccount" "ResourceQuota" + ]; type = types.listOf types.str; }; + serviceAccountKey = mkOption { + description = '' + Kubernetes apiserver PEM-encoded x509 RSA private or public key file, + used to verify ServiceAccount tokens. + ''; + default = null; + type = types.nullOr types.path; + }; + extraOpts = mkOption { description = "Kubernetes apiserver extra command line options."; default = ""; @@ -235,8 +254,26 @@ in { type = types.str; }; + serviceAccountPrivateKey = mkOption { + description = '' + Kubernetes controller manager PEM-encoded private RSA key file used to + sign service account tokens + ''; + default = null; + type = types.nullOr types.path; + }; + + rootCaFile = mkOption { + description = '' + Kubernetes controller manager certificate authority file included in + service account's token secret. + ''; + default = null; + type = types.nullOr types.path; + }; + extraOpts = mkOption { - description = "Kubernetes controller extra command line options."; + description = "Kubernetes controller manager extra command line options."; default = ""; type = types.str; }; @@ -294,7 +331,10 @@ in { }; apiServers = mkOption { - description = "Kubernetes kubelet list of Kubernetes API servers for publishing events, and reading pods and services."; + description = '' + Kubernetes kubelet list of Kubernetes API servers for publishing events, + and reading pods and services. + ''; default = ["${cfg.apiserver.address}:${toString cfg.apiserver.port}"]; type = types.listOf types.str; }; @@ -413,17 +453,14 @@ in { ${optionalString (cfg.apiserver.runtimeConfig!="") "--runtime-config=${cfg.apiserver.runtimeConfig}"} \ --admission_control=${concatStringsSep "," cfg.apiserver.admissionControl} \ + ${optionalString (cfg.apiserver.serviceAccountKey!=null) + "--service-account-key-file=${cfg.apiserver.serviceAccountKey}"} \ --logtostderr=true \ ${optionalString cfg.verbose "--v=6 --log-flush-frequency=1s"} \ ${cfg.apiserver.extraOpts} ''; User = "kubernetes"; }; - postStart = '' - until ${pkgs.curl}/bin/curl -s -o /dev/null 'http://${cfg.apiserver.address}:${toString cfg.apiserver.port}/'; do - sleep 1; - done - ''; }; }) @@ -456,6 +493,10 @@ in { --address=${cfg.controllerManager.address} \ --port=${toString cfg.controllerManager.port} \ --master=${cfg.controllerManager.master} \ + ${optionalString (cfg.controllerManager.serviceAccountPrivateKey!=null) + "--service-account-private-key-file=${cfg.controllerManager.serviceAccountPrivateKey}"} \ + ${optionalString (cfg.controllerManager.rootCaFile!=null) + "--root-ca-file=${cfg.controllerManager.rootCaFile}"} \ --logtostderr=true \ ${optionalString cfg.verbose "--v=6 --log-flush-frequency=1s"} \ ${cfg.controllerManager.extraOpts} @@ -509,6 +550,8 @@ in { ${optionalString cfg.verbose "--v=6 --log-flush-frequency=1s"} \ ${cfg.proxy.extraOpts} ''; + Restart = "always"; # Retry connection + RestartSec = "5s"; }; }; }) From 4121c5064aea6a9a755a767f3ac4288e997498a8 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Sat, 29 Aug 2015 10:49:00 -0700 Subject: [PATCH 28/46] parallel: Fix some needed dependencies --- pkgs/tools/misc/parallel/default.nix | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/pkgs/tools/misc/parallel/default.nix b/pkgs/tools/misc/parallel/default.nix index 4a3b90f56d8..d96ca1080d8 100644 --- a/pkgs/tools/misc/parallel/default.nix +++ b/pkgs/tools/misc/parallel/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, stdenv, perl }: +{ fetchurl, stdenv, perl, makeWrapper, procps }: stdenv.mkDerivation rec { name = "parallel-20150822"; @@ -8,13 +8,14 @@ stdenv.mkDerivation rec { sha256 = "1ij7bjxhk2866mzh0v0v2m629b6d39r5ivwdzmh72s471m9hg45d"; }; - patchPhase = '' - sed -i "src/parallel" -e's|/usr/bin/perl|${perl}/bin/perl|g' - ''; + nativeBuildInputs = [ makeWrapper ]; - # The `sem' program wants to write to `~/.parallel'. - preBuild = '' - export HOME="$PWD" + preFixup = '' + sed -i 's,#![ ]*/usr/bin/env[ ]*perl,#!${perl}/bin/perl,' $out/bin/* + + wrapProgram $out/bin/parallel \ + --prefix PATH : "${procps}/bin" \ + --prefix PATH : "${perl}/bin" \ ''; doCheck = true; From 6b1bcc66aeded3f0d440af06162081189b768d7a Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 29 Aug 2015 20:01:32 +0200 Subject: [PATCH 29/46] haskell-MFlow: fix build --- pkgs/development/haskell-modules/configuration-common.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 11a806289ed..e107e0b1458 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1018,4 +1018,7 @@ self: super: { # https://github.com/brendanhay/amazonka/issues/203 amazonka-core = dontCheck super.amazonka-core; + # https://github.com/agocorona/MFlow/issues/63 + MFlow = addBuildTool super.MFlow self.cpphs; + } From 3afc3494bb5c5135e270baab14fe2a486878de22 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Sat, 29 Aug 2015 11:51:15 -0700 Subject: [PATCH 30/46] goPackages: Use parallel instead of forking in bash --- .../go-modules/generic/default.nix | 89 ++++++++----------- pkgs/top-level/all-packages.nix | 4 +- 2 files changed, 38 insertions(+), 55 deletions(-) diff --git a/pkgs/development/go-modules/generic/default.nix b/pkgs/development/go-modules/generic/default.nix index f0d3be6487c..7842df6b58f 100644 --- a/pkgs/development/go-modules/generic/default.nix +++ b/pkgs/development/go-modules/generic/default.nix @@ -1,4 +1,4 @@ -{ go, govers, lib }: +{ go, govers, parallel, lib }: { name, buildInputs ? [], nativeBuildInputs ? [], passthru ? {}, preFixup ? "" @@ -41,7 +41,7 @@ go.stdenv.mkDerivation ( (builtins.removeAttrs args [ "goPackageAliases" "disabled" ]) // { name = "go${go.meta.branch}-${name}"; - nativeBuildInputs = [ go ] + nativeBuildInputs = [ go parallel ] ++ (lib.optional (!dontRenameImports) govers) ++ nativeBuildInputs; buildInputs = [ go ] ++ buildInputs; @@ -62,7 +62,7 @@ go.stdenv.mkDerivation ( rmdir extraSrc '') + '' - GOPATH=$NIX_BUILD_TOP/go:$GOPATH + export GOPATH=$NIX_BUILD_TOP/go:$GOPATH runHook postConfigure ''; @@ -80,38 +80,39 @@ go.stdenv.mkDerivation ( runHook renameImports - PIDS=() - if [ -n "$subPackages" ] ; then - for p in $subPackages ; do - go install $buildFlags "''${buildFlagsArray[@]}" -p $NIX_BUILD_CORES -v $goPackagePath/$p & - PIDS+=("$!") - done - else - pushd go/src - while read d; do - { - echo "$d" | grep -q "/_" && continue - [ -n "$excludedPackages" ] && echo "$d" | grep -q "$excludedPackages" && continue - local OUT - if ! OUT="$(go install $buildFlags "''${buildFlagsArray[@]}" -p $NIX_BUILD_CORES -v $d 2>&1)"; then - if ! echo "$OUT" | grep -q 'no buildable Go source files'; then - echo "$OUT" >&2 - exit 1 - fi - fi - if [ -n "$OUT" ]; then - echo "$OUT" >&2 - fi - } & - PIDS+=("$!") - done < <(find $goPackagePath -type f -name \*.go -exec dirname {} \; | sort | uniq) - popd - fi + buildGoDir() { + local d; local cmd; + cmd="$1" + d="$2" + echo "$d" | grep -q "/_" && return 0 + [ -n "$excludedPackages" ] && echo "$d" | grep -q "$excludedPackages" && return 0 + local OUT + if ! OUT="$(go $cmd $buildFlags "''${buildFlagsArray[@]}" -v $d 2>&1)"; then + if ! echo "$OUT" | grep -q 'no buildable Go source files'; then + echo "$OUT" >&2 + return 1 + fi + fi + if [ -n "$OUT" ]; then + echo "$OUT" >&2 + fi + return 0 + } - # Exit on error from the parallel process - for PID in "''${PIDS[@]}"; do - wait $PID || exit 1 - done + getGoDirs() { + local type; + type="$1" + if [ -n "$subPackages" ]; then + echo "$subPackages" | sed "s,\(^\| \),\1$goPackagePath/,g" + else + pushd go/src >/dev/null + find "$goPackagePath" -type f -name \*$type.go -exec dirname {} \; | sort | uniq + popd >/dev/null + fi + } + + export -f buildGoDir # parallel needs to see the function + getGoDirs "" | parallel -j $NIX_BUILD_CORES buildGoDir install runHook postBuild ''; @@ -119,25 +120,7 @@ go.stdenv.mkDerivation ( checkPhase = args.checkPhase or '' runHook preCheck - PIDS=() - if [ -n "$subPackages" ] ; then - for p in $subPackages ; do - go test -p $NIX_BUILD_CORES -v $goPackagePath/$p & - PIDS+=("$!") - done - else - pushd go/src - while read d; do - go test -p $NIX_BUILD_CORES -v $d & - PIDS+=("$!") - done < <(find $goPackagePath -type f -name \*_test.go -exec dirname {} \; | sort | uniq) - popd - fi - - # Exit on error from the parallel process - for PID in "''${PIDS[@]}"; do - wait $PID || exit 1 - done + getGoDirs test | parallel -j $NIX_BUILD_CORES buildGoDir test runHook postCheck ''; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7ef3efd8c83..fe194bdc3f7 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8665,7 +8665,7 @@ let buildGoPackage = import ../development/go-modules/generic { go = go_1_4; govers = go14Packages.govers; - inherit lib; + inherit parallel lib; }; overrides = (config.goPackageOverrides or (p: {})) pkgs; }); @@ -8675,7 +8675,7 @@ let buildGoPackage = import ../development/go-modules/generic { go = go_1_5; govers = go15Packages.govers; - inherit lib; + inherit parallel lib; }; overrides = (config.goPackageOverrides or (p: {})) pkgs; }); From c61ade7b52e6b26d84ef514f7d104d328f68590b Mon Sep 17 00:00:00 2001 From: Rok Garbas Date: Wed, 26 Aug 2015 03:00:19 +0200 Subject: [PATCH 31/46] vimPlugins: updated (and sorted alphabetically) --- pkgs/misc/vim-plugins/default.nix | 191 +++++++++++++------------ pkgs/misc/vim-plugins/vim-plugin-names | 4 +- 2 files changed, 98 insertions(+), 97 deletions(-) diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix index c8bd4d860b1..83fcea51728 100644 --- a/pkgs/misc/vim-plugins/default.nix +++ b/pkgs/misc/vim-plugins/default.nix @@ -85,17 +85,6 @@ rec { yankring = YankRing; - CheckAttach = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "CheckAttach-2015-06-22"; - src = fetchgit { - url = "git://github.com/chrisbra/CheckAttach"; - rev = "a1d86be7e69b25b41ce1a7fe2d2844330f783b68"; - sha256 = "b8921c826f5a122e9b128301c620b8b3d3fd88a15a2b0634fdea01062fba2c1f"; - }; - dependencies = []; - - }; - CSApprox = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "CSApprox-2013-07-26"; src = fetchgit { @@ -107,12 +96,23 @@ rec { }; + CheckAttach = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "CheckAttach-2015-06-22"; + src = fetchgit { + url = "git://github.com/chrisbra/CheckAttach"; + rev = "a1d86be7e69b25b41ce1a7fe2d2844330f783b68"; + sha256 = "b8921c826f5a122e9b128301c620b8b3d3fd88a15a2b0634fdea01062fba2c1f"; + }; + dependencies = []; + + }; + Gist = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "Gist-2015-07-04"; + name = "Gist-2015-08-13"; src = fetchgit { url = "git://github.com/mattn/gist-vim"; - rev = "52e2d54a038baf548de01c9413a6ebc8860fa111"; - sha256 = "32b9c0ccc51b846651ac49d496060b842a57ca342bdc1038b16c59c1b34b0ca0"; + rev = "ea7dc962c5c2ac2a1c4adc94d54cac190d713648"; + sha256 = "0b96a572018de25120fe91eea17b8ee2844881c88ab63e03d999c22fc292f11e"; }; dependencies = []; @@ -152,22 +152,22 @@ rec { }; Supertab = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "Supertab-2015-02-15"; + name = "Supertab-2015-08-23"; src = fetchgit { url = "git://github.com/ervandew/supertab"; - rev = "c8bfeceb1fc92ad58f2ae6967cbfcd6fbcb0d6e7"; - sha256 = "e9e4054c683435b36adf87bebb4895c06a7e85130a807d8c9307588d4744b04b"; + rev = "43b98dd2c74977a02473d923c159d4110c94273e"; + sha256 = "35255894ad3f6701417b0796d24880d8727e2d4ee05c5bb29c207eb127b435a0"; }; dependencies = []; }; Syntastic = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "Syntastic-2015-07-29"; + name = "Syntastic-2015-08-14"; src = fetchgit { url = "git://github.com/scrooloose/syntastic"; - rev = "a01107ffa66fdd38d3ea0fcc769f3582349c5a3f"; - sha256 = "66b2ef4ad41f30ed409c77e05e637b9c122e62a4acda98d2f89c9205227eba64"; + rev = "47c70b3e1e388d8f9cc7c6d9687efc047df843ac"; + sha256 = "7c6a1dc4eef9ec29c09f3a6f60792a9df78b4d86b7f41fc278ae95670c24b40a"; }; dependencies = []; @@ -207,22 +207,22 @@ rec { }; The_NERD_tree = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "The_NERD_tree-2015-07-13"; + name = "The_NERD_tree-2015-07-30"; src = fetchgit { url = "git://github.com/scrooloose/nerdtree"; - rev = "86e2e40af161e65a3ad671214f16f23af360a5a7"; - sha256 = "de4f35757f6e14644e59a7ba3e5d0a10ffe04aea9d192f2f81bba24d14c7595c"; + rev = "bcf3de4fdffae45fc7c85b6b84a01b37177924aa"; + sha256 = "969c3d81f85674303fb295c55da6be3339ffa8658ed98cb20f92eb21551da847"; }; dependencies = []; }; UltiSnips = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "UltiSnips-2015-07-27"; + name = "UltiSnips-2015-08-21"; src = fetchgit { url = "git://github.com/sirver/ultisnips"; - rev = "67fbdb2ad8c965378bdd60c892d3a43049caf3f1"; - sha256 = "487fd113adc9a2c66ae6c12cbbd21e283e1a9c024a65910398ecf26322772c07"; + rev = "e48d8a28e55e931a3340dae937aa7f66954815ad"; + sha256 = "8859aeebd30fc48e481ec11ba7f38c2d91ceae979fbc2045969b077e2b0cf124"; }; dependencies = []; @@ -300,22 +300,22 @@ rec { }; fugitive = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "fugitive-2015-07-20"; + name = "fugitive-2015-08-02"; src = fetchgit { url = "git://github.com/tpope/vim-fugitive"; - rev = "03cc95cc198ea94a6a003a92cd0e58af4416ec25"; - sha256 = "cab17591d0eeb0fff4520855347467d85baf56b444dd60b797323d164e92a9de"; + rev = "b319b694539017dcd789dc2c42f784a30d7b28b8"; + sha256 = "88e0ac84a016969cf6231ae3705b931d3ee7d0902417c50d7c1397d80b1534b4"; }; dependencies = []; }; ghcmod = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "ghcmod-2015-07-26"; + name = "ghcmod-2015-08-05"; src = fetchgit { url = "git://github.com/eagletmt/ghcmod-vim"; - rev = "caf086cd84fe0b26f24f0f93233d4c0c98bce524"; - sha256 = "04fa2558baab2b9d93c49f3d984f0ed8196513875095ab7117f39b02087bfeeb"; + rev = "ff8fe7d64d0db35be9a753e2c2a289760ab02dd5"; + sha256 = "db5a932e4604bed9d4a7d6ff06367f9cae93a87424fc79d2fade7c15061ab563"; }; dependencies = []; @@ -366,11 +366,11 @@ rec { }; neco-ghc = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "neco-ghc-2015-07-05"; + name = "neco-ghc-2015-08-22"; src = fetchgit { url = "git://github.com/eagletmt/neco-ghc"; - rev = "2ad708360c8f64732a0827618cddfd23e89a8664"; - sha256 = "ff18dcb7e5b076f88acc51dd508729635a76c619e592db010af6e877ff7afa92"; + rev = "8ef2df39c83826f7beeb3ea290e05223e43d8571"; + sha256 = "7f688cadf2fdb483d9541dd77a893fdca97dc59bed609a9a38a48293939b1e5b"; }; dependencies = []; @@ -388,11 +388,11 @@ rec { }; idris-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "idris-vim-2015-07-19"; + name = "idris-vim-2015-08-14"; src = fetchgit { url = "git://github.com/idris-hackers/idris-vim"; - rev = "91b695a9120268a9b9828a0665e89b3c39a1f070"; - sha256 = "df16f45fd6c79f44c7da179c6cfc06e1d43aa801832249b12d8134c476db7ff9"; + rev = "45680a3c412f2cc8d40aff512e5e9ace44002922"; + sha256 = "e053a37cb14228a49be265c5fa1af96d3bae1a5a5ceffdd21e3c4547a79656b1"; }; dependencies = []; @@ -443,22 +443,22 @@ rec { }; vim-buffergator = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-buffergator-2015-07-12"; + name = "vim-buffergator-2015-08-15"; src = fetchgit { url = "git://github.com/jeetsukumaran/vim-buffergator"; - rev = "28f818ea0aea6771c153efb91a35fc0ab9a16700"; - sha256 = "d19710b41d24b2e5611e5c2977dc7fac47f3d9899b80c44da2f5d08b3538551a"; + rev = "ed3bfc2b560f687075d9c2225079bfe43f1f2390"; + sha256 = "f2024ecf447e5cca2d66efdb6d31e2890e7210e142728873ab521b8c5ea17c11"; }; dependencies = []; }; tslime-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "tslime-vim-2015-02-10"; + name = "tslime-vim-2015-08-14"; src = fetchgit { url = "git://github.com/jgdavey/tslime.vim"; - rev = "71ec1cbe8f9ead9805f8e0c3b76c590aeb5ed0b7"; - sha256 = "81f45f579dcc239ce0b9689044d0e92969f7538759ab0cd88596c7a010d8730b"; + rev = "4a8091956e331d7b1d4187a2883b720dfec7e9dd"; + sha256 = "e63113f80c056484c462f6d1eb4634cbe4c6c29170f76f4c992adc17b3539a25"; }; dependencies = []; @@ -531,11 +531,11 @@ rec { }; vim-easymotion = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-easymotion-2015-07-25"; + name = "vim-easymotion-2015-08-06"; src = fetchgit { url = "git://github.com/lokaltog/vim-easymotion"; - rev = "eab003a0991608464b58c90c56be5d9c6b64d840"; - sha256 = "6f5d4942481c41c1a88c45066ea51019ee4ecd4235e0f54c549cb7df2b8b59e6"; + rev = "0806257ca6432ac7beb75c4319dadf7f3ba9907b"; + sha256 = "529f836da3a546c507ec99f7c827902a75472fefe570a93258360bfa4c253909"; }; dependencies = []; @@ -590,11 +590,11 @@ rec { }; racer = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "racer-2015-07-29"; + name = "racer-2015-08-25"; src = fetchgit { url = "git://github.com/phildawes/racer"; - rev = "25150ce32e5936b38933d66324830fedb95a8c7c"; - sha256 = "40a3d9c22f50f69e45e8f551a655c2ca327fd07b8872059f2938983387e07707"; + rev = "7074f2ceb84f121d6b933bacf8f619f313e0fdaf"; + sha256 = "0dc7815d6eb2bd7f934a86a7d7c4acfc85097d7f131a23ccaa39216544aaaf7b"; }; dependencies = []; buildPhase = '' @@ -604,44 +604,44 @@ rec { }; neocomplete-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "neocomplete-vim-2015-07-25"; + name = "neocomplete-vim-2015-08-22"; src = fetchgit { url = "git://github.com/shougo/neocomplete.vim"; - rev = "aaa1f08b06bfcc2a329dba12a37ce8e1578636bd"; - sha256 = "56c2dc4431858432763bcf134ebbc74272d6f3cdd2db5f9a8b21f2e4a8b028c8"; + rev = "39661033cce39ebd013451b49809e94ade3ba08c"; + sha256 = "7a1482f44ff7a1fb27273d12023da25028c9fa393e6cbfcf9c417fecdb09f0b2"; }; dependencies = []; }; neosnippet-snippets = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "neosnippet-snippets-2015-07-27"; + name = "neosnippet-snippets-2015-08-21"; src = fetchgit { url = "git://github.com/shougo/neosnippet-snippets"; - rev = "a34e67d4b3f91bf2320cd7ce1e85bbd300c6095e"; - sha256 = "773170fddb95bc5df1b26abc52e29338f3d5515a5afd99719aa23d9569c5389d"; + rev = "f72814aee4f8530b0f22ca9fa814e1e6473ba543"; + sha256 = "934177c1c51e3a386f21b678fceaa46a6ea63c7570ab71afa25f35fe30119777"; }; dependencies = []; }; neosnippet-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "neosnippet-vim-2015-07-23"; + name = "neosnippet-vim-2015-08-25"; src = fetchgit { url = "git://github.com/shougo/neosnippet.vim"; - rev = "e619d43571a675057461f29f2c039dab64728f32"; - sha256 = "8682bba6039962c01ffa0f9946a1f2a8e8a37ffda2d32862d72c5ee3d87241c5"; + rev = "19dc3db526f4441b7a419dd7899d84d5ab3f599f"; + sha256 = "422448182499941494b1280f93a2b6bc7995531bd2f8af2820d52bdc0c000f66"; }; dependencies = []; }; vimproc-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vimproc-vim-2015-07-22"; + name = "vimproc-vim-2015-08-22"; src = fetchgit { url = "git://github.com/shougo/vimproc.vim"; - rev = "0555aecded8737435747e903efc4b6f3241cc62c"; - sha256 = "0a9445214c6733d21d56ebe278f2e0bc1027b08eb7763df95b8d0ebd34850a60"; + rev = "150d5fd04fed462831b99539dfe9920a00a7cea6"; + sha256 = "baa6557377d7f64c7cd36bf8f7a5439d31c3d869ec8eb9e1e1e8c0d1c0852ccd"; }; dependencies = []; buildInputs = [ which ]; @@ -656,11 +656,11 @@ rec { }; vimshell-vim = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vimshell-vim-2015-07-25"; + name = "vimshell-vim-2015-08-25"; src = fetchgit { url = "git://github.com/shougo/vimshell.vim"; - rev = "adb2a0d95e9b0009d152c35c930eb04875562d87"; - sha256 = "fe52fef67c242756c67ec134634b380077e16729d59b1dcd8f50e41512010723"; + rev = "05c9001a7fa15aedb444566e2753b901924460a3"; + sha256 = "aa68b059d5c9d00189ab50014924c920391b76bc448bdda4d82ab6de4ec8b435"; }; dependencies = [ "vimproc-vim" ]; }; @@ -677,11 +677,11 @@ rec { }; vim-quickrun = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-quickrun-2015-07-27"; + name = "vim-quickrun-2015-08-09"; src = fetchgit { url = "git://github.com/thinca/vim-quickrun"; - rev = "c22f2f50614a68d8f60ae334cc4545dbc57051a9"; - sha256 = "fef4f13c3d1946040cb4e4ceba6a89759fc77c1f72f2f7f038df644620a41398"; + rev = "ec9f7f2c26dd49ffaf4f3ce8c6254c76696fbf41"; + sha256 = "dc80ac9ee04329e770a549f83a6b167629daf29f513f31af0c076c237e978b5a"; }; dependencies = []; @@ -710,11 +710,11 @@ rec { }; youcompleteme = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "youcompleteme-2015-07-08"; + name = "youcompleteme-2015-08-25"; src = fetchgit { url = "git://github.com/valloric/youcompleteme"; - rev = "b9dd9096a34c1d720878f0058dc3e68f9e9c87ea"; - sha256 = "88a3ff421300f53756359ec8e6c901fe96de492091587cf9a5e40b299698f077"; + rev = "b7e9871801392b12187191673f492965d142f8ef"; + sha256 = "a9db1b251d21048bd5d74914b611cc326dfa0a06737be8782f2077e145f53ca3"; }; dependencies = []; buildInputs = [ @@ -833,11 +833,11 @@ rec { }; vim-wakatime = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-wakatime-2015-07-03"; + name = "vim-wakatime-2015-08-25"; src = fetchgit { url = "git://github.com/wakatime/vim-wakatime"; - rev = "28044b7b5f5be812fd34c757632d1d814578ec9b"; - sha256 = "74fa0eac0a546c7012b4a6fe5f6cd66eaa2ed40887bc61d468be148dcd538692"; + rev = "9bf0d3ec459def5c67a2d9bf5aae8e588a0f3980"; + sha256 = "d2ce4a890c0044f0088e335660c001764a4df075eeafc6ab32871b82f7bb728a"; }; dependencies = []; buildInputs = [ python ]; @@ -981,11 +981,11 @@ rec { }; surround = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "surround-2015-03-15"; + name = "surround-2015-08-07"; src = fetchgit { url = "git://github.com/tpope/vim-surround"; - rev = "772ab9587b7d1e2c3bae75395c9123803059ba8a"; - sha256 = "5f4c5afecaa99dc67875a2356b46cb6e8daeffca4a00a451965ca022de26cbef"; + rev = "2d05440ad23f97a7874ebd9b5de3a0e65d25d85c"; + sha256 = "e5372cbb384e747181e3dfe4a53f042da18bd0d6af7a01184850ecb084ddb350"; }; dependencies = []; @@ -1024,22 +1024,22 @@ rec { }; tlib = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "tlib-2015-05-20"; + name = "tlib-2015-08-05"; src = fetchgit { url = "git://github.com/tomtom/tlib_vim"; - rev = "c9ffbef0718a35bd30eb711456e2100e4adf79f7"; - sha256 = "b0752538ee629c6f2c52d3b2b2fb61247bcd186ef9610ad8ae5c7d24ea41d971"; + rev = "4c128ee2fee6d97cc5c6089e7797b4ad536de2a4"; + sha256 = "9cd0fc23bb332d5ae939019929d989b636b891c894f350c38234eaf084e0656c"; }; dependencies = []; }; undotree = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "undotree-2015-03-01"; + name = "undotree-2015-08-19"; src = fetchgit { url = "git://github.com/mbbill/undotree"; - rev = "fa018f38252f58073f2987f8bf0d2d4a61e07277"; - sha256 = "c52874b0b85d0a44a1f2f055a74985886af97615bac032259fc21d6ea40d6ca7"; + rev = "8ff701a5bdb8d382431eb042e4faf3320883b020"; + sha256 = "9c166cb812be486350a3e71eed273a630545d91e3198a214e3dce13b131aeb1d"; }; dependencies = []; @@ -1299,11 +1299,11 @@ rec { }; vim-gitgutter = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-gitgutter-2015-07-28"; + name = "vim-gitgutter-2015-08-17"; src = fetchgit { url = "git://github.com/airblade/vim-gitgutter"; - rev = "fe10e6474d70c382edcda84dc6bcd6fcd575a6c5"; - sha256 = "0266775153760c86e51a83106813936c661717a1c72d4103215739aff9ad1b76"; + rev = "0e66fc915c5c7d8f18eb62f69230393465812fc3"; + sha256 = "cf66babbacd29eda332b0dada2f3f2fe3f3d84b5ae0bb34291303c6f0d6ecb62"; }; dependencies = []; @@ -1332,11 +1332,11 @@ rec { }; vim-multiple-cursors = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-multiple-cursors-2015-05-29"; + name = "vim-multiple-cursors-2015-08-07"; src = fetchgit { url = "git://github.com/terryma/vim-multiple-cursors"; - rev = "3199d34f57e1e20d2dd807b31a5a72d7f7d42e96"; - sha256 = "26b43c921b416cc19482d03435516d42a209ab104bac9979b073d0db61e95186"; + rev = "e37b9358980d312c1f4fbbcb4a36d1a9d4bdb415"; + sha256 = "126694d6b12e710495d390b5df2fa8ae06ca6e2eadec2a04c4a3899287595ce9"; }; dependencies = []; @@ -1354,11 +1354,11 @@ rec { }; vim-snippets = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vim-snippets-2015-07-29"; + name = "vim-snippets-2015-08-23"; src = fetchgit { url = "git://github.com/honza/vim-snippets"; - rev = "814896e4d29f2b796d076935d7d079c64c351f4f"; - sha256 = "173d2f52c0715dd78692b5f1d3368920ed976a05a87887b056526abfd530ffa3"; + rev = "21c7f2052057304f9002b42b53391e2c89197a10"; + sha256 = "11a5cf8bf8f7fbf9100a69c2457d901143aaaeea5bd29884eb93d8b4439b306d"; }; dependencies = []; @@ -1387,13 +1387,14 @@ rec { }; vundle = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "vundle-2015-03-21"; + name = "vundle-2015-08-10"; src = fetchgit { url = "git://github.com/gmarik/vundle"; - rev = "cfd3b2d388a8c2e9903d7a9d80a65539aabfe933"; - sha256 = "7ce9bb0a59c8f86cedd9b3867b834bcd160f2224c187189997ef76c2bfd99d50"; + rev = "0ee36b26e127cda512a8f2852a59e5a5f374c87f"; + sha256 = "62fc2b756bd2a8bc9452c61de5babbb1f02de6e8122424a60862be61b8f80af1"; }; dependencies = []; }; + } diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index 486df183da3..a18c24c7825 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -1,5 +1,5 @@ -"CheckAttach" "CSApprox" +"CheckAttach" "Gist" "Gundo" "Hoogle" @@ -69,8 +69,8 @@ "quickfixstatus" "rainbow_parentheses" "rust" -"sleuth" "sensible" +"sleuth" "snipmate" "sourcemap" "surround" From 33cb16104c3157ce3f61e95c002a2b73cb8e0ac3 Mon Sep 17 00:00:00 2001 From: Rok Garbas Date: Thu, 27 Aug 2015 18:08:15 +0200 Subject: [PATCH 32/46] vimPlugins: adding css_color_5056, ctrlp-py-matcher, ctrlp-z, goyo, vim-signify, vim-webdevicons --- pkgs/misc/vim-plugins/default.nix | 68 +++++++++++++++++++++++++- pkgs/misc/vim-plugins/vim-plugin-names | 7 +++ 2 files changed, 74 insertions(+), 1 deletion(-) diff --git a/pkgs/misc/vim-plugins/default.nix b/pkgs/misc/vim-plugins/default.nix index 83fcea51728..f24058a468e 100644 --- a/pkgs/misc/vim-plugins/default.nix +++ b/pkgs/misc/vim-plugins/default.nix @@ -277,6 +277,17 @@ rec { }; + "css_color_5056" = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "css_color_5056-2015-06-22"; + src = fetchgit { + url = "git://github.com/ap/vim-css-color"; + rev = "ceb028b27eae0550533501b1f02cb512a482ba85"; + sha256 = "d428970699b59b0da89d3cf73be39f62c2751512919fa2773baa241a9f79fccd"; + }; + dependencies = []; + + }; + ctrlp = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "ctrlp-2013-07-29"; src = fetchgit { @@ -288,6 +299,28 @@ rec { }; + ctrlp-py-matcher = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "ctrlp-py-matcher-2015-07-18"; + src = fetchgit { + url = "git://github.com/FelikZ/ctrlp-py-matcher"; + rev = "9e84cf8072866b92faf5082cb93a554b75e35fd0"; + sha256 = "7d4d5f7da148ddc9c8956aca87f53d9d0ff458b8fb4bc4ab2a9bff2ee6026cde"; + }; + dependencies = []; + + }; + + ctrlp-z = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "ctrlp-z-2013-05-08"; + src = fetchgit { + url = "git://github.com/amiorin/ctrlp-z"; + rev = "7845735a3d63a68ed63aa3a5363b178c48f199bf"; + sha256 = "14c5240e6ab373cbd04d105a46808aed4a324472ddfd67b993534bf5d726e93f"; + }; + dependencies = []; + + }; + extradite = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "extradite-2015-01-26"; src = fetchgit { @@ -736,7 +769,7 @@ rec { cd $target/build cmake -G "Unix Makefiles" . $target/third_party/ycmd/cpp -DPYTHON_LIBRARIES:PATH=${python}/lib/libpython2.7.so -DPYTHON_INCLUDE_DIR:PATH=${python}/include/python2.7 -DUSE_CLANG_COMPLETER=ON -DUSE_SYSTEM_LIBCLANG=ON make ycm_support_libs -j''${NIX_BUILD_CORES} -l''${NIX_BUILD_CORES}} - ${bash}/bin/bash $target/install.sh --clang-completer --system-libclang + ${python}/bin/python $target/third_party/ycmd/build.py --clang-completer --system-libclang ${vimHelpTags} vimHelpTags $target @@ -860,6 +893,17 @@ rec { ''; }; + goyo = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "goyo-2015-08-08"; + src = fetchgit { + url = "git://github.com/junegunn/goyo.vim"; + rev = "c1293a91a3a04bcb82421b2ee711c49f83a418ae"; + sha256 = "258b23f4f043569e6e0458c8035d5b00be6031b02e460136f7783da1bbadcc49"; + }; + dependencies = []; + + }; + matchit-zip = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "matchit-zip"; src = fetchurl { @@ -1353,6 +1397,17 @@ rec { }; + vim-signify = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-signify-2015-08-13"; + src = fetchgit { + url = "git://github.com/mhinz/vim-signify"; + rev = "d08f17873e3187da3f9998ddb81d81626ffb9ecf"; + sha256 = "7fffc5fbd21dd4f3ea81131ccb52d992d95a73be72288457b2ec3a0fa53ce3b2"; + }; + dependencies = []; + + }; + vim-snippets = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "vim-snippets-2015-08-23"; src = fetchgit { @@ -1364,6 +1419,17 @@ rec { }; + vim-webdevicons = buildVimPluginFrom2Nix { # created by nix#NixDerivation + name = "vim-webdevicons-2015-08-14"; + src = fetchgit { + url = "git://github.com/ryanoasis/vim-devicons"; + rev = "771769d21615d08b22f23c32e97e67e95db7d122"; + sha256 = "8291c8be6a45d6492ad9ff2972f481d7093fff95c764b3499d0877f5365b3f27"; + }; + dependencies = []; + + }; + vim2hs = buildVimPluginFrom2Nix { # created by nix#NixDerivation name = "vim2hs-2014-04-16"; src = fetchgit { diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names index a18c24c7825..d6b731783d1 100644 --- a/pkgs/misc/vim-plugins/vim-plugin-names +++ b/pkgs/misc/vim-plugins/vim-plugin-names @@ -1,3 +1,5 @@ +"vim-webdevicons" +"css_color%5056" "CSApprox" "CheckAttach" "Gist" @@ -16,6 +18,8 @@ "YankRing" "commentary" "ctrlp" +"ctrlp-py-matcher" +"ctrlp-z" "extradite" "fugitive" "ghcmod" @@ -64,12 +68,14 @@ "github:vim-scripts/wombat256.vim" "github:wakatime/vim-wakatime" "github:wincent/command-t" +"goyo" "matchit.zip" "pathogen" "quickfixstatus" "rainbow_parentheses" "rust" "sensible" +"sensible" "sleuth" "snipmate" "sourcemap" @@ -100,6 +106,7 @@ "vim-latex-live-preview" "vim-multiple-cursors" "vim-signature" +"vim-signify" "vim-snippets" "vim2hs" "vimwiki" From 32dca6d3b2c2cbf7789852d5f557f6b753a83d85 Mon Sep 17 00:00:00 2001 From: Rok Garbas Date: Sat, 29 Aug 2015 21:22:29 +0200 Subject: [PATCH 33/46] pythonPackages.qscintilla: dont build on py3 and pypy because qscintilla is not a standard python package ``buildPythonPackage`` is not used and ``disabled`` does do anything. diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 93d40c3..925ceb0 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -11823,35 +11823,36 @@ let }; }; - qscintilla = pkgs.stdenv.mkDerivation rec { - # TODO: Qt5 support - name = "qscintilla-${version}"; - version = pkgs.qscintilla.version; - disabled = isPy3k || isPyPy; - - src = pkgs.qscintilla.src; - - buildInputs = with pkgs; [ xorg.lndir qt4 pyqt4 python ]; - - preConfigure = '' - mkdir -p $out - lndir ${pkgs.pyqt4} $out - cd Python - ${python.executable} ./configure-old.py \ - --destdir $out/lib/${python.libPrefix}/site-packages/PyQt4 \ - --apidir $out/api/${python.libPrefix} \ - -n ${pkgs.qscintilla}/include \ - -o ${pkgs.qscintilla}/lib \ - --sipdir $out/share/sip - ''; + qscintilla = if isPy3k || isPyPy + then throw "qscintilla-${pkgs.qscintilla.version} not supported for interpreter ${python.executable}" + else pkgs.stdenv.mkDerivation rec { + # TODO: Qt5 support + name = "qscintilla-${version}"; + version = pkgs.qscintilla.version; + + src = pkgs.qscintilla.src; + + buildInputs = with pkgs; [ xorg.lndir qt4 pyqt4 python ]; + + preConfigure = '' + mkdir -p $out + lndir ${pkgs.pyqt4} $out + cd Python + ${python.executable} ./configure-old.py \ + --destdir $out/lib/${python.libPrefix}/site-packages/PyQt4 \ + --apidir $out/api/${python.libPrefix} \ + -n ${pkgs.qscintilla}/include \ + -o ${pkgs.qscintilla}/lib \ + --sipdir $out/share/sip + ''; - meta = with stdenv.lib; { - description = "A Python binding to QScintilla, Qt based text editing control"; - license = licenses.lgpl21Plus; - maintainers = [ "abcz2.uprola@gmail.com" ]; - platforms = platforms.linux; + meta = with stdenv.lib; { + description = "A Python binding to QScintilla, Qt based text editing control"; + license = licenses.lgpl21Plus; + maintainers = [ "abcz2.uprola@gmail.com" ]; + platforms = platforms.linux; + }; }; - }; qserve = buildPythonPackage rec { --- pkgs/top-level/python-packages.nix | 49 +++++++++++++++--------------- 1 file changed, 25 insertions(+), 24 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 93d40c3cd3a..925ceb01d00 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -11823,35 +11823,36 @@ let }; }; - qscintilla = pkgs.stdenv.mkDerivation rec { - # TODO: Qt5 support - name = "qscintilla-${version}"; - version = pkgs.qscintilla.version; - disabled = isPy3k || isPyPy; + qscintilla = if isPy3k || isPyPy + then throw "qscintilla-${pkgs.qscintilla.version} not supported for interpreter ${python.executable}" + else pkgs.stdenv.mkDerivation rec { + # TODO: Qt5 support + name = "qscintilla-${version}"; + version = pkgs.qscintilla.version; - src = pkgs.qscintilla.src; + src = pkgs.qscintilla.src; - buildInputs = with pkgs; [ xorg.lndir qt4 pyqt4 python ]; + buildInputs = with pkgs; [ xorg.lndir qt4 pyqt4 python ]; - preConfigure = '' - mkdir -p $out - lndir ${pkgs.pyqt4} $out - cd Python - ${python.executable} ./configure-old.py \ - --destdir $out/lib/${python.libPrefix}/site-packages/PyQt4 \ - --apidir $out/api/${python.libPrefix} \ - -n ${pkgs.qscintilla}/include \ - -o ${pkgs.qscintilla}/lib \ - --sipdir $out/share/sip - ''; + preConfigure = '' + mkdir -p $out + lndir ${pkgs.pyqt4} $out + cd Python + ${python.executable} ./configure-old.py \ + --destdir $out/lib/${python.libPrefix}/site-packages/PyQt4 \ + --apidir $out/api/${python.libPrefix} \ + -n ${pkgs.qscintilla}/include \ + -o ${pkgs.qscintilla}/lib \ + --sipdir $out/share/sip + ''; - meta = with stdenv.lib; { - description = "A Python binding to QScintilla, Qt based text editing control"; - license = licenses.lgpl21Plus; - maintainers = [ "abcz2.uprola@gmail.com" ]; - platforms = platforms.linux; + meta = with stdenv.lib; { + description = "A Python binding to QScintilla, Qt based text editing control"; + license = licenses.lgpl21Plus; + maintainers = [ "abcz2.uprola@gmail.com" ]; + platforms = platforms.linux; + }; }; - }; qserve = buildPythonPackage rec { From 0b4bcaad9519d6971f99356a778cd1cb369f6309 Mon Sep 17 00:00:00 2001 From: Rok Garbas Date: Sat, 29 Aug 2015 21:38:25 +0200 Subject: [PATCH 34/46] pythonPackages.gcutil: fix pinning of google_apputils version also added some more metadata to the package --- pkgs/top-level/python-packages.nix | 18 ++++++++++++++++-- 1 file changed, 16 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 925ceb01d00..e1cb3a3fea1 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3513,20 +3513,34 @@ let gcutil = buildPythonPackage rec { name = "gcutil-1.16.1"; - meta.maintainers = with maintainers; [ phreedom ]; src = pkgs.fetchurl { url = https://dl.google.com/dl/cloudsdk/release/artifacts/gcutil-1.16.1.tar.gz; sha256 = "00jaf7x1ji9y46fbkww2sg6r6almrqfsprydz3q2swr4jrnrsx9x"; }; + propagatedBuildInputs = with self; [ + gflags + iso8601 + ipaddr + httplib2 + google_apputils + google_api_python_client + ]; + prePatch = '' + sed -i -e "s|google-apputils==0.4.0|google-apputils==0.4.1|g" setup.py substituteInPlace setup.py \ --replace "httplib2==0.8" "httplib2" \ --replace "iso8601==0.1.4" "iso8601" ''; - propagatedBuildInputs = with self; [ gflags iso8601 ipaddr httplib2 google_apputils google_api_python_client ]; + meta = { + description = "Command-line tool for interacting with Google Compute Engine."; + homepage = "https://cloud.google.com/compute/docs/gcutil/"; + license = licenses.asl20; + maintainers = with maintainers; [ phreedom ]; + }; }; gmpy = buildPythonPackage rec { From 83cf8b0cf89b2e3bb6a6ee9869f5cebc50563748 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Sat, 29 Aug 2015 12:55:52 -0700 Subject: [PATCH 35/46] goPackages: Split into multiple derivations This should reduce the closure size for end users who only need go binaries as well as reduce the size of closures hydra builders consume. --- nixos/modules/services/misc/confd.nix | 2 +- nixos/modules/services/monitoring/grafana.nix | 6 ++-- nixos/modules/services/security/hologram.nix | 2 +- .../go-modules/generic/default.nix | 25 ++++++++------- pkgs/top-level/all-packages.nix | 31 +++++++++++-------- pkgs/top-level/go-packages.nix | 17 +++++----- 6 files changed, 44 insertions(+), 39 deletions(-) diff --git a/nixos/modules/services/misc/confd.nix b/nixos/modules/services/misc/confd.nix index 98738b6497b..50532a8a16f 100644 --- a/nixos/modules/services/misc/confd.nix +++ b/nixos/modules/services/misc/confd.nix @@ -63,7 +63,7 @@ in { package = mkOption { description = "Confd package to use."; - default = pkgs.goPackages.confd; + default = pkgs.confd; type = types.package; }; }; diff --git a/nixos/modules/services/monitoring/grafana.nix b/nixos/modules/services/monitoring/grafana.nix index 6a1799dedc8..f987c4792e9 100644 --- a/nixos/modules/services/monitoring/grafana.nix +++ b/nixos/modules/services/monitoring/grafana.nix @@ -200,13 +200,13 @@ in { staticRootPath = mkOption { description = "Root path for static assets."; - default = "${cfg.package}/share/go/src/github.com/grafana/grafana/public"; + default = "${cfg.package.out}/share/go/src/github.com/grafana/grafana/public"; type = types.str; }; package = mkOption { description = "Package to use."; - default = pkgs.goPackages.grafana; + default = pkgs.grafana-backend; type = types.package; }; @@ -319,7 +319,7 @@ in { wantedBy = ["multi-user.target"]; after = ["networking.target"]; serviceConfig = { - ExecStart = "${cfg.package}/bin/grafana --config ${cfgFile} web"; + ExecStart = "${cfg.package-backend}/bin/grafana --config ${cfgFile} web"; WorkingDirectory = cfg.dataDir; User = "grafana"; }; diff --git a/nixos/modules/services/security/hologram.nix b/nixos/modules/services/security/hologram.nix index f9abf38942f..58f308df7a2 100644 --- a/nixos/modules/services/security/hologram.nix +++ b/nixos/modules/services/security/hologram.nix @@ -95,7 +95,7 @@ in { wantedBy = [ "multi-user.target" ]; serviceConfig = { - ExecStart = "${pkgs.goPackages.hologram}/bin/hologram-server --debug --conf ${cfgFile}"; + ExecStart = "${pkgs.hologram}/bin/hologram-server --debug --conf ${cfgFile}"; }; }; }; diff --git a/pkgs/development/go-modules/generic/default.nix b/pkgs/development/go-modules/generic/default.nix index 7842df6b58f..de4f0803c34 100644 --- a/pkgs/development/go-modules/generic/default.nix +++ b/pkgs/development/go-modules/generic/default.nix @@ -129,19 +129,17 @@ go.stdenv.mkDerivation ( runHook preInstall mkdir -p $out + pushd "$NIX_BUILD_TOP/go" + while read f; do + echo "$f" | grep -q '^./\(src\|pkg/[^/]*\)/${goPackagePath}' || continue + mkdir -p "$(dirname "$out/share/go/$f")" + cp "$NIX_BUILD_TOP/go/$f" "$out/share/go/$f" + done < <(find . -type f) + popd - if [ -z "$dontInstallSrc" ]; then - pushd "$NIX_BUILD_TOP/go" - while read f; do - echo "$f" | grep -q '^./\(src\|pkg/[^/]*\)/${goPackagePath}' || continue - mkdir -p "$(dirname "$out/share/go/$f")" - cp "$NIX_BUILD_TOP/go/$f" "$out/share/go/$f" - done < <(find . -type f) - popd - fi - + mkdir $bin dir="$NIX_BUILD_TOP/go/bin" - [ -e "$dir" ] && cp -r $dir $out + [ -e "$dir" ] && cp -r $dir $bin runHook postInstall ''; @@ -151,7 +149,7 @@ go.stdenv.mkDerivation ( cat $file ${removeExpr removeReferences} > $file.tmp mv $file.tmp $file chmod +x $file - done < <(find $out/bin -type f 2>/dev/null) + done < <(find $bin/bin -type f 2>/dev/null) ''; disallowedReferences = lib.optional (!allowGoReference) go @@ -161,6 +159,9 @@ go.stdenv.mkDerivation ( enableParallelBuilding = enableParallelBuilding; + # I prefer to call this dev but propagatedBuildInputs expects $out to exist + outputs = [ "out" "bin" ]; + meta = { # Add default meta information platforms = lib.platforms.all; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index fe194bdc3f7..cb68599c9d9 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -818,13 +818,13 @@ let clib = callPackage ../tools/package-management/clib { }; - consul = goPackages.consul; + consul = goPackages.consul.bin // { outputs = [ "bin" ]; }; consul-ui = callPackage ../servers/consul/ui.nix { }; - consul-alerts = goPackages.consul-alerts; + consul-alerts = goPackages.consul-alerts.bin // { outputs = [ "bin" ]; }; - consul-template = goPackages.consul-template; + consul-template = goPackages.consul-template.bin // { outputs = [ "bin" ]; }; corosync = callPackage ../servers/corosync { }; @@ -948,7 +948,7 @@ let mcrypt = callPackage ../tools/misc/mcrypt { }; - mongodb-tools = goPackages.mongo-tools; + mongodb-tools = goPackages.mongo-tools.bin // { outputs = [ "bin" ]; }; mstflint = callPackage ../tools/misc/mstflint { }; @@ -1701,7 +1701,8 @@ let gptfdisk = callPackage ../tools/system/gptfdisk { }; - grafana = callPackage ../development/tools/misc/grafana { }; + grafana-frontend = callPackage ../development/tools/misc/grafana { }; + grafana-backend = pkgs.goPackages.grafana.bin // { outputs = [ "bin" ]; }; grafx2 = callPackage ../applications/graphics/grafx2 {}; @@ -2153,7 +2154,7 @@ let lshw = callPackage ../tools/system/lshw { }; lxc = callPackage ../os-specific/linux/lxc { }; - lxd = goPackages.lxd; + lxd = goPackages.lxd.bin // { outputs = [ "bin" ]; }; lzip = callPackage ../tools/compression/lzip { }; @@ -4074,7 +4075,7 @@ let go-repo-root = callPackage ../development/tools/misc/go-repo-root { }; - gox = goPackages.gox; + gox = goPackages.gox.bin // { outputs = [ "bin" ]; }; gprolog = callPackage ../development/compilers/gprolog { }; @@ -8664,7 +8665,7 @@ let go = go_1_4; buildGoPackage = import ../development/go-modules/generic { go = go_1_4; - govers = go14Packages.govers; + govers = go14Packages.govers.bin; inherit parallel lib; }; overrides = (config.goPackageOverrides or (p: {})) pkgs; @@ -8674,7 +8675,7 @@ let go = go_1_5; buildGoPackage = import ../development/go-modules/generic { go = go_1_5; - govers = go15Packages.govers; + govers = go15Packages.govers.bin; inherit parallel lib; }; overrides = (config.goPackageOverrides or (p: {})) pkgs; @@ -8958,7 +8959,7 @@ let dovecot_pigeonhole = callPackage ../servers/mail/dovecot-pigeonhole { }; - etcd = goPackages.etcd; + etcd = goPackages.etcd.bin // { outputs = [ "bin" ]; }; ejabberd = callPackage ../servers/xmpp/ejabberd { erlang = erlangR16; @@ -8975,7 +8976,7 @@ let v8 = v8_3_24_10; }; - etcdctl = goPackages.etcd; + etcdctl = etcd; exim = callPackage ../servers/mail/exim { }; @@ -10084,7 +10085,7 @@ let gotags = callPackage ../development/tools/gotags { }; - golint = goPackages.lint; + golint = goPackages.lint.bin // { outputs = [ "bin" ]; }; godep = callPackage ../development/tools/godep { }; @@ -13668,6 +13669,8 @@ let chessdb = callPackage ../games/chessdb { }; + confd = pkgs.goPackages.conf.bin // { outputs = [ "bin" ]; }; + construoBase = lowPrio (callPackage ../games/construo { mesa = null; freeglut = null; @@ -14529,6 +14532,8 @@ let camlp5 = ocamlPackages.camlp5_strict; }; + hologram = pkgs.goPackages.bin // { outputs = [ "bin" ]; }; + isabelle = import ../applications/science/logic/isabelle { inherit (pkgs) stdenv fetchurl nettools perl polyml; inherit (pkgs.emacs24Packages) proofgeneral; @@ -15130,7 +15135,7 @@ let utf8proc = callPackage ../development/libraries/utf8proc { }; - vault = goPackages.vault; + vault = goPackages.vault.bin // { outputs = [ "bin" ]; }; vbam = callPackage ../misc/emulators/vbam { inherit (xlibs) libpthreadstubs; diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix index b69f3fd26b8..c32d7c865d1 100644 --- a/pkgs/top-level/go-packages.nix +++ b/pkgs/top-level/go-packages.nix @@ -130,12 +130,12 @@ let preConfigure = '' # Make the builtin tools available here - mkdir -p $out/bin + mkdir -p $bin/bin eval $(go env | grep GOTOOLDIR) find $GOTOOLDIR -type f | while read x; do - ln -sv "$x" "$out/bin" + ln -sv "$x" "$binbin" done - export GOTOOLDIR=$out/bin + export GOTOOLDIR=$bin/bin ''; excludedPackages = "\\(" @@ -381,11 +381,11 @@ let }; consul = buildFromGitHub { - rev = "a6317f2fb2ba9d5ae695f7fa703cfb30a1c59af1"; - date = "2015-07-24"; + rev = "4adc0b5c660919e3f21c9a60f567fd872b9e3d1e"; + date = "2015-08-27"; owner = "hashicorp"; repo = "consul"; - sha256 = "0jixpl9yksasqx9rkidx8qmqc59m34kiibsqfsv56g87wzyp89rs"; + sha256 = "1h4hbyr2c8yfmn5ijga5zx470mdplg231kbxbqfpvswrk69q89j3"; buildInputs = [ circbuf armon.go-metrics go-radix gomdb bolt consul-migrate go-checkpoint @@ -1326,7 +1326,6 @@ let repo = "lint"; sha256 = "1bj7zv534hyh87bp2vsbhp94qijc5nixb06li1dzfz9n0wcmlqw9"; excludedPackages = "testdata"; - dontInstallSrc = true; buildInputs = [ tools ]; }; @@ -1719,11 +1718,11 @@ let # Mongodb incorrectly names all of their binaries main # Let's work around this with our own installer installPhase = '' - mkdir -p $out/bin + mkdir -p $bin/bin while read b; do rm -f go/bin/main go install $goPackagePath/$b/main - cp go/bin/main $out/bin/$b + cp go/bin/main $bin/bin/$b done < <(find go/src/$goPackagePath -name main | xargs dirname | xargs basename -a) ''; }; From 07c4cbccf1a7311ce117bb6ca0a540d356d47d38 Mon Sep 17 00:00:00 2001 From: Rok Garbas Date: Sat, 29 Aug 2015 22:02:05 +0200 Subject: [PATCH 36/46] pythonPackages.pycdio: applied patch since driver_id can be also long type --- pkgs/top-level/python-packages.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index e1cb3a3fea1..45db6b66a03 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -10340,6 +10340,10 @@ let sha256 = "1mrh233pj584gf7la64d4xlmvdnfl4jwpxs95lnd3i4zd5drid14"; }; + prePatch = '' + sed -i -e "s|if type(driver_id)==int|if type(driver_id) in (int, long)|g" cdio.py + ''; + preConfigure = '' patchShebangs . ''; From 16b5d3f70be841d2428a8952e7b663f5a0d4ed86 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Sat, 29 Aug 2015 22:18:33 +0200 Subject: [PATCH 37/46] Fix eval Fallout from 83cf8b0cf (goPackages: Split into multiple derivations). --- pkgs/top-level/all-packages.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index cb68599c9d9..9037a2e2617 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13669,7 +13669,7 @@ let chessdb = callPackage ../games/chessdb { }; - confd = pkgs.goPackages.conf.bin // { outputs = [ "bin" ]; }; + confd = pkgs.goPackages.confd.bin // { outputs = [ "bin" ]; }; construoBase = lowPrio (callPackage ../games/construo { mesa = null; @@ -14532,7 +14532,7 @@ let camlp5 = ocamlPackages.camlp5_strict; }; - hologram = pkgs.goPackages.bin // { outputs = [ "bin" ]; }; + hologram = pkgs.goPackages.hologram.bin // { outputs = [ "bin" ]; }; isabelle = import ../applications/science/logic/isabelle { inherit (pkgs) stdenv fetchurl nettools perl polyml; From 06ed82677a84fae47f0ab87b89519ea1792af346 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= Date: Sun, 23 Aug 2015 12:39:44 +0200 Subject: [PATCH 38/46] qt5: embed path to mesa (libGL) in Qt mkspecs file Fixes this problem, when building apps in QtCreator: ...(compile output window) g++ -Wl,-rpath,/nix/store/1w7h7p6s2srfw2ady90k7072991lrnpp-qtbase-5.4.2/lib \ -o qt-test3 main.o mainwindow.o moc_mainwindow.o \ -L/nix/store/1w7h7p6s2srfw2ady90k7072991lrnpp-qtbase-5.4.2/lib \ -lQt5Widgets -lQt5Gui -lQt5Core -lGL -lpthread /nix/store/b8qhjrwf8sf9ggkjxqqav7f1m6w83bh0-binutils-2.23.1/bin/ld: cannot find -lGL collect2: error: ld returned 1 exit status mesa is already in the closure of Qt, so there is no size increase. The patch is copied into both qt-5.3 and qt-5.4 directories, like other patches are. Note that programs still can _run_ against a different libGL (e.g. one provided by nvidia) by configuring the dynamic linker. For instance, NixOS sets the LD_LIBRARY_PATH environment variable to /run/opengl-driver/lib/, meaning that whatever libGL is found there will be used instead of the default (mesa). --- .../libraries/qt-5/5.3/0014-mkspecs-libgl.patch | 15 +++++++++++++++ pkgs/development/libraries/qt-5/5.3/default.nix | 3 ++- .../libraries/qt-5/5.4/0014-mkspecs-libgl.patch | 15 +++++++++++++++ pkgs/development/libraries/qt-5/5.4/qtbase.nix | 3 ++- 4 files changed, 34 insertions(+), 2 deletions(-) create mode 100644 pkgs/development/libraries/qt-5/5.3/0014-mkspecs-libgl.patch create mode 100644 pkgs/development/libraries/qt-5/5.4/0014-mkspecs-libgl.patch diff --git a/pkgs/development/libraries/qt-5/5.3/0014-mkspecs-libgl.patch b/pkgs/development/libraries/qt-5/5.3/0014-mkspecs-libgl.patch new file mode 100644 index 00000000000..94a031d1257 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.3/0014-mkspecs-libgl.patch @@ -0,0 +1,15 @@ +Ensure Qt knows where libGL is. + +Author: Bjørn Forsman +diff -uNr qt-everywhere-opensource-src-5.3.2.orig/qtbase/mkspecs/common/linux.conf qt-everywhere-opensource-src-5.3.2/qtbase/mkspecs/common/linux.conf +--- qt-everywhere-opensource-src-5.3.2.orig/qtbase/mkspecs/common/linux.conf 2014-09-11 12:48:07.000000000 +0200 ++++ qt-everywhere-opensource-src-5.3.2/qtbase/mkspecs/common/linux.conf 2015-08-23 13:03:30.617473019 +0200 +@@ -13,7 +13,7 @@ + QMAKE_INCDIR_X11 = + QMAKE_LIBDIR_X11 = + QMAKE_INCDIR_OPENGL = +-QMAKE_LIBDIR_OPENGL = ++QMAKE_LIBDIR_OPENGL = @mesa@/lib + QMAKE_INCDIR_OPENGL_ES2 = $$QMAKE_INCDIR_OPENGL + QMAKE_LIBDIR_OPENGL_ES2 = $$QMAKE_LIBDIR_OPENGL + QMAKE_INCDIR_EGL = diff --git a/pkgs/development/libraries/qt-5/5.3/default.nix b/pkgs/development/libraries/qt-5/5.3/default.nix index 7f4e0b60c2d..d1a049d78a7 100644 --- a/pkgs/development/libraries/qt-5/5.3/default.nix +++ b/pkgs/development/libraries/qt-5/5.3/default.nix @@ -81,7 +81,8 @@ stdenv.mkDerivation rec { (substituteAll { src = ./0011-dlopen-openssl.patch; inherit openssl; }) (substituteAll { src = ./0012-dlopen-dbus.patch; dbus_libs = dbus; }) ./0013-qtwebkit-glib-2.44.patch - ]; + ] ++ optional mesaSupported + (substituteAll { src = ./0014-mkspecs-libgl.patch; inherit mesa; }); preConfigure = '' export LD_LIBRARY_PATH="$PWD/qtbase/lib:$PWD/qtbase/plugins/platforms:$PWD/qttools/lib:$LD_LIBRARY_PATH" diff --git a/pkgs/development/libraries/qt-5/5.4/0014-mkspecs-libgl.patch b/pkgs/development/libraries/qt-5/5.4/0014-mkspecs-libgl.patch new file mode 100644 index 00000000000..94a031d1257 --- /dev/null +++ b/pkgs/development/libraries/qt-5/5.4/0014-mkspecs-libgl.patch @@ -0,0 +1,15 @@ +Ensure Qt knows where libGL is. + +Author: Bjørn Forsman +diff -uNr qt-everywhere-opensource-src-5.3.2.orig/qtbase/mkspecs/common/linux.conf qt-everywhere-opensource-src-5.3.2/qtbase/mkspecs/common/linux.conf +--- qt-everywhere-opensource-src-5.3.2.orig/qtbase/mkspecs/common/linux.conf 2014-09-11 12:48:07.000000000 +0200 ++++ qt-everywhere-opensource-src-5.3.2/qtbase/mkspecs/common/linux.conf 2015-08-23 13:03:30.617473019 +0200 +@@ -13,7 +13,7 @@ + QMAKE_INCDIR_X11 = + QMAKE_LIBDIR_X11 = + QMAKE_INCDIR_OPENGL = +-QMAKE_LIBDIR_OPENGL = ++QMAKE_LIBDIR_OPENGL = @mesa@/lib + QMAKE_INCDIR_OPENGL_ES2 = $$QMAKE_INCDIR_OPENGL + QMAKE_LIBDIR_OPENGL_ES2 = $$QMAKE_LIBDIR_OPENGL + QMAKE_INCDIR_EGL = diff --git a/pkgs/development/libraries/qt-5/5.4/qtbase.nix b/pkgs/development/libraries/qt-5/5.4/qtbase.nix index 6ec57787e22..2e4a1c1c161 100644 --- a/pkgs/development/libraries/qt-5/5.4/qtbase.nix +++ b/pkgs/development/libraries/qt-5/5.4/qtbase.nix @@ -71,7 +71,8 @@ stdenv.mkDerivation { (substituteAll { src = ./0011-dlopen-openssl.patch; inherit openssl; }) (substituteAll { src = ./0012-dlopen-dbus.patch; dbus_libs = dbus; }) ./0013-xdg_config_dirs.patch - ] + ] ++ optional mesaSupported + (substituteAll { src = ./0014-mkspecs-libgl.patch; inherit mesa; }) ++ (optional decryptSslTraffic ./0100-ssl.patch); preConfigure = '' From 26f9ea6dd5d93e8d39303c31a757c42dc602b304 Mon Sep 17 00:00:00 2001 From: "William A. Kennington III" Date: Sat, 29 Aug 2015 13:25:00 -0700 Subject: [PATCH 39/46] goPackages: Fix tools --- pkgs/development/go-modules/generic/default.nix | 2 +- pkgs/top-level/go-packages.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/go-modules/generic/default.nix b/pkgs/development/go-modules/generic/default.nix index de4f0803c34..5d65fbc0dea 100644 --- a/pkgs/development/go-modules/generic/default.nix +++ b/pkgs/development/go-modules/generic/default.nix @@ -137,7 +137,7 @@ go.stdenv.mkDerivation ( done < <(find . -type f) popd - mkdir $bin + mkdir -p $bin dir="$NIX_BUILD_TOP/go/bin" [ -e "$dir" ] && cp -r $dir $bin diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix index c32d7c865d1..c2159581b82 100644 --- a/pkgs/top-level/go-packages.nix +++ b/pkgs/top-level/go-packages.nix @@ -133,7 +133,7 @@ let mkdir -p $bin/bin eval $(go env | grep GOTOOLDIR) find $GOTOOLDIR -type f | while read x; do - ln -sv "$x" "$binbin" + ln -sv "$x" "$bin/bin" done export GOTOOLDIR=$bin/bin ''; From e69a162ceda87e57ff73b58d67992d094e9739c4 Mon Sep 17 00:00:00 2001 From: Daniel Fox Franke Date: Sat, 29 Aug 2015 11:37:58 -0400 Subject: [PATCH 40/46] pythonPackages.gevent: works just fine on Darwin Closes #8569, #7275, and #5782. Obviates #8730. As asserted by @lethalman and observed by @aflatter and @ecyrb, this package is currently building just fine on Darwin. --- 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 45db6b66a03..3dc84c72c45 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6255,7 +6255,7 @@ let description = "Coroutine-based networking library"; homepage = http://www.gevent.org/; license = licenses.mit; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = with maintainers; [ bjornfor ]; }; }; From 04bb91bcceca5d571b06636f34c65ca8fca3e9bd Mon Sep 17 00:00:00 2001 From: Benjamin Staffin Date: Sat, 29 Aug 2015 13:47:43 -0700 Subject: [PATCH 41/46] consul: revert to stable 0.5.2 rather than a snapshot Follup to #9515: It appears that Prometheus doesn't actually require an unreleased version of Consul. --- pkgs/top-level/go-packages.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/top-level/go-packages.nix b/pkgs/top-level/go-packages.nix index c2159581b82..6b93b4ec244 100644 --- a/pkgs/top-level/go-packages.nix +++ b/pkgs/top-level/go-packages.nix @@ -380,12 +380,12 @@ let sha256 = "0xmxy8ay0wzd307x7xba3rmigvr6rjlpfk9fmn6ir2nc97ifv3i0"; }; - consul = buildFromGitHub { - rev = "4adc0b5c660919e3f21c9a60f567fd872b9e3d1e"; - date = "2015-08-27"; - owner = "hashicorp"; - repo = "consul"; - sha256 = "1h4hbyr2c8yfmn5ijga5zx470mdplg231kbxbqfpvswrk69q89j3"; + consul = buildFromGitHub rec { + rev = "v0.5.2"; + date = rev; + owner = "hashicorp"; + repo = "consul"; + sha256 = "0p3lc1p346a5ipvkf15l94gn1ml3m7zz6bx0viark3hsv0a7iij7"; buildInputs = [ circbuf armon.go-metrics go-radix gomdb bolt consul-migrate go-checkpoint From 3207b9f70f88040ec0873b5d8a50114c134c2f03 Mon Sep 17 00:00:00 2001 From: ro6 Date: Sat, 29 Aug 2015 16:59:00 -0300 Subject: [PATCH 42/46] urweb: 20150520 -> 20150819 --- pkgs/development/compilers/urweb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/urweb/default.nix b/pkgs/development/compilers/urweb/default.nix index bc1f9a9043d..861a12f1f09 100644 --- a/pkgs/development/compilers/urweb/default.nix +++ b/pkgs/development/compilers/urweb/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "urweb"; - version = "20150520"; + version = "20150819"; name = "${pname}-${version}"; src = fetchurl { url = "http://www.impredicative.com/ur/${name}.tgz"; - sha256 = "06pl6z4sh5fvh72drz4bp70yynr4i1rawc97ww5wag8976dirwrm"; + sha256 = "0gpdlq3aazx121k3ia94qfa4dyv04q7478x2p6hvcjamn18vk56n"; }; buildInputs = [ stdenv.cc file openssl mlton mysql postgresql sqlite ]; From da6b3690297df26a83862b39f8f75da79ca78e73 Mon Sep 17 00:00:00 2001 From: koral Date: Sat, 29 Aug 2015 10:29:19 +0000 Subject: [PATCH 43/46] xurls: 0.6.0 -> 0.7.0 --- pkgs/tools/text/xurls/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/text/xurls/default.nix b/pkgs/tools/text/xurls/default.nix index 15581744173..531af472cb4 100644 --- a/pkgs/tools/text/xurls/default.nix +++ b/pkgs/tools/text/xurls/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, go }: stdenv.mkDerivation rec { - version = "0.6.0"; + version = "0.7.0"; name = "xurls-${version}"; src = fetchFromGitHub { owner = "mvdan"; repo = "xurls"; rev = "v${version}"; - sha256 = "0v9qfvvwy0pq7wp5q19y4a61mcc1sj8vkhvhb8bk603gzprfs10z"; + sha256 = "1sdxz1vqm9kidva7lilway69n4fdkqa4kdldx47jriq2hr96s7n0"; }; buildInputs = [ go ]; From b873f5bd623ae1064a5c0c7c4edb374abf84d409 Mon Sep 17 00:00:00 2001 From: Thomas Tuegel Date: Sat, 29 Aug 2015 17:47:49 -0500 Subject: [PATCH 44/46] Add qtEnv --- pkgs/development/libraries/qt-5/qt-env.nix | 31 ++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 33 insertions(+) create mode 100644 pkgs/development/libraries/qt-5/qt-env.nix diff --git a/pkgs/development/libraries/qt-5/qt-env.nix b/pkgs/development/libraries/qt-5/qt-env.nix new file mode 100644 index 00000000000..01ddbf31428 --- /dev/null +++ b/pkgs/development/libraries/qt-5/qt-env.nix @@ -0,0 +1,31 @@ +{ runCommand, lndir }: + +{ paths, qtbase }: + +runCommand "qt-env" { inherit paths qtbase; } '' + +mkdir -p "$out/bin" "$out/mkspecs" "$out/include" "$out/lib" "$out/share" + +cp "$qtbase/bin/qmake" "$out/bin" +cat >"$out/bin/qt.conf" < Date: Sat, 29 Aug 2015 17:48:03 -0500 Subject: [PATCH 45/46] qt5Full: build from Qt 5.4 with qtEnv --- pkgs/top-level/all-packages.nix | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 170819dd278..1abac46ab6b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -7994,13 +7994,11 @@ let qt5 = qt54; - qt5Full = appendToName "full" (qt53.override { - buildDocs = true; - buildExamples = true; - buildTests = true; - developerBuild = true; qtEnv = callPackage ../development/libraries/qt-5/qt-env.nix {}; + qt5Full = appendToName "full" (qtEnv { + qtbase = qt5.base; + paths = lib.filter (x: !(builtins.isFunction x)) (lib.attrValues qt5); }); qt5SDK = qtcreator.override { From 36ac761340091925019575914d9c424b82aa4c97 Mon Sep 17 00:00:00 2001 From: Daniel Fox Franke Date: Sat, 29 Aug 2015 15:20:20 -0400 Subject: [PATCH 46/46] expect: fix Darwin linkage expect's build system doesn't seem to provide the proper linker flags for the expect programs to be able to find libexpect on Darwin. (Stuff like this should really just use libtool. *sigh*). Setting DYLD_LIBRARY_PATH is an inelegant hack, but it gets the job done without risking affecting other platforms. --- pkgs/tools/misc/expect/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/misc/expect/default.nix b/pkgs/tools/misc/expect/default.nix index c91d418d870..a50717d5399 100644 --- a/pkgs/tools/misc/expect/default.nix +++ b/pkgs/tools/misc/expect/default.nix @@ -1,8 +1,7 @@ { stdenv, fetchurl, tcl, makeWrapper }: -let version = "5.45"; -in -stdenv.mkDerivation { +stdenv.mkDerivation rec { + version = "5.45"; name = "expect-${version}"; src = fetchurl { @@ -27,7 +26,8 @@ stdenv.mkDerivation { for i in $out/bin/*; do wrapProgram $i \ --prefix PATH : "${tcl}/bin" \ - --prefix TCLLIBPATH ' ' $out/lib/* + --prefix TCLLIBPATH ' ' $out/lib/* \ + ${stdenv.lib.optionalString stdenv.isDarwin "--prefix DYLD_LIBRARY_PATH : $out/lib/expect${version}"} done ''; @@ -35,7 +35,7 @@ stdenv.mkDerivation { description = "A tool for automating interactive applications"; homepage = http://expect.nist.gov/; license = "Expect"; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = with maintainers; [ wkennington ]; }; }