From 0c32d209ca923923bf42666c612f51fb0ed93287 Mon Sep 17 00:00:00 2001 From: Florian Friesdorf Date: Fri, 23 Sep 2011 17:00:13 +0000 Subject: [PATCH 1/6] python wrapper that sets PYTHONHOME to the profile it is in svn path=/nixpkgs/trunk/; revision=29462 --- .../python/pythonhome-wrapper.nix | 21 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 23 insertions(+) create mode 100644 pkgs/development/interpreters/python/pythonhome-wrapper.nix diff --git a/pkgs/development/interpreters/python/pythonhome-wrapper.nix b/pkgs/development/interpreters/python/pythonhome-wrapper.nix new file mode 100644 index 000000000000..2afbafe7b914 --- /dev/null +++ b/pkgs/development/interpreters/python/pythonhome-wrapper.nix @@ -0,0 +1,21 @@ +{ stdenv }: + +stdenv.mkDerivation { + name = "pythonhome-wrapper"; + + unpackPhase = "true"; + installPhase = '' + ensureDir $out/bin + echo ' +#!/bin/sh + +BINDIR=`dirname $0` +PYTHONHOME=`dirname $BINDIR` +PYTHONHOME=`(cd $PYTHONHOME && pwd)` +export PYTHONHOME + +$BINDIR/python "$@" + ' > $out/bin/py + chmod +x $out/bin/py + ''; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6d6ffa692752..04f97b06a954 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2585,6 +2585,8 @@ let extraLibs = lib.attrValues python.modules; }; + pythonhomeWrapper = callPackage ../development/interpreters/python/pythonhome-wrapper.nix { }; + pyrex = pyrex095; pyrex095 = callPackage ../development/interpreters/pyrex/0.9.5.nix { }; From b6a786f0977c63183367ecb6fecaeee7247b7c29 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Fri, 23 Sep 2011 20:03:52 +0000 Subject: [PATCH 2/6] linux-3.1: Bump to rc7 svn path=/nixpkgs/trunk/; revision=29463 --- pkgs/os-specific/linux/kernel/linux-3.1.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/kernel/linux-3.1.nix b/pkgs/os-specific/linux/kernel/linux-3.1.nix index ff421bc9cf7c..a87554ae71a3 100644 --- a/pkgs/os-specific/linux/kernel/linux-3.1.nix +++ b/pkgs/os-specific/linux/kernel/linux-3.1.nix @@ -200,13 +200,13 @@ in import ./generic.nix ( rec { - version = "3.1-rc6"; + version = "3.1-rc7"; - modDirVersion = "3.1.0-rc6"; + modDirVersion = "3.1.0-rc7"; src = fetchurl { url = "https://github.com/torvalds/linux/tarball/v${version}"; - sha256 = "047a5qkcghn0q9b611vpdwbl87qb0k0q9x0bdpywlpy644l5dfwy"; + sha256 = "05zlg522svyym6cab7lrqpihzrk8j356dyahyc321nd8yw0qfv2x"; name = "v${version}.tar.gz"; }; From 62a77eb641f79da2f77b7d594340c3cb8d1883e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andres=20L=C3=B6h?= Date: Sat, 24 Sep 2011 02:48:40 +0000 Subject: [PATCH 3/6] Added maintainers for haskell-numInstances. svn path=/nixpkgs/trunk/; revision=29464 --- pkgs/development/libraries/haskell/NumInstances/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/libraries/haskell/NumInstances/default.nix b/pkgs/development/libraries/haskell/NumInstances/default.nix index 7c5262edafe0..8aa6dec08cb5 100644 --- a/pkgs/development/libraries/haskell/NumInstances/default.nix +++ b/pkgs/development/libraries/haskell/NumInstances/default.nix @@ -8,5 +8,9 @@ cabal.mkDerivation (self: { description = "Instances of numeric classes for functions and tuples"; license = self.stdenv.lib.licenses.bsd3; platforms = self.ghc.meta.platforms; + maintainers = [ + self.stdenv.lib.maintainers.andres + self.stdenv.lib.maintainers.simons + ]; }; }) From a154670250be3af57ca56bdf93fb847e19ea5ce3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andres=20L=C3=B6h?= Date: Sat, 24 Sep 2011 02:49:04 +0000 Subject: [PATCH 4/6] Added haskell-derp. svn path=/nixpkgs/trunk/; revision=29465 --- .../libraries/haskell/derp/default.nix | 16 ++++++++++++++++ pkgs/top-level/haskell-packages.nix | 2 ++ 2 files changed, 18 insertions(+) create mode 100644 pkgs/development/libraries/haskell/derp/default.nix diff --git a/pkgs/development/libraries/haskell/derp/default.nix b/pkgs/development/libraries/haskell/derp/default.nix new file mode 100644 index 000000000000..99b072b63a49 --- /dev/null +++ b/pkgs/development/libraries/haskell/derp/default.nix @@ -0,0 +1,16 @@ +{ cabal }: + +cabal.mkDerivation (self: { + pname = "derp"; + version = "0.1.5"; + sha256 = "0mpc4hav5iqrcjns5sz8q0v2c0d7nb2hbzn58cmbl7cma2kp36li"; + meta = { + description = "Derivative Parsing"; + license = self.stdenv.lib.licenses.bsd3; + platforms = self.ghc.meta.platforms; + maintainers = [ + self.stdenv.lib.maintainers.andres + self.stdenv.lib.maintainers.simons + ]; + }; +}) diff --git a/pkgs/top-level/haskell-packages.nix b/pkgs/top-level/haskell-packages.nix index acdf78684bdd..f7edf77d32a4 100644 --- a/pkgs/top-level/haskell-packages.nix +++ b/pkgs/top-level/haskell-packages.nix @@ -517,6 +517,8 @@ let result = let callPackage = x : y : modifyPrio (newScope result.final x y); derive = callPackage ../development/libraries/haskell/derive {}; + derp = callPackage ../development/libraries/haskell/derp {}; + Diff = callPackage ../development/libraries/haskell/Diff {}; digest = callPackage ../development/libraries/haskell/digest { From 0a5f021abd22da25b6c835b30d137563ad8f0eaa Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 24 Sep 2011 07:27:07 +0000 Subject: [PATCH 5/6] haskell-uuagc-cabal: updated to version 1.0.0.7 svn path=/nixpkgs/trunk/; revision=29466 --- pkgs/development/tools/haskell/uuagc/cabal.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/haskell/uuagc/cabal.nix b/pkgs/development/tools/haskell/uuagc/cabal.nix index f25afb170e8b..b8e1ca46f578 100644 --- a/pkgs/development/tools/haskell/uuagc/cabal.nix +++ b/pkgs/development/tools/haskell/uuagc/cabal.nix @@ -2,8 +2,8 @@ cabal.mkDerivation (self: { pname = "uuagc-cabal"; - version = "1.0.0.6"; - sha256 = "1ij84n2pjhqyz10vsa9qxk4k227wg1c96rq5sylvcwdkzciww81d"; + version = "1.0.0.7"; + sha256 = "1ciypx0rrisjbwx8fc9bzkkv975646951ibqpvbxipxzvv5npy9y"; buildDepends = [ mtl uulib ]; meta = { homepage = "http://www.cs.uu.nl/wiki/HUT/WebHome"; From 3e09798bf4693cdda805a029f88423721d82874f Mon Sep 17 00:00:00 2001 From: Peter Simons Date: Sat, 24 Sep 2011 07:58:19 +0000 Subject: [PATCH 6/6] pkgs/shells/bash/default.nix: revert my earlier revision 29244 Including the bash-completion package in bash itself sounded like a good idea at the time, but it wasn't. After having actually integrated completion support into NixOS, it has become obvious that this property isn't required at all. Keeping bash-completion separate from bash works just fine. Anyone who wants completion support can just install that package. svn path=/nixpkgs/trunk/; revision=29467 --- pkgs/shells/bash/default.nix | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/pkgs/shells/bash/default.nix b/pkgs/shells/bash/default.nix index e289395bc995..3a0515199b6e 100644 --- a/pkgs/shells/bash/default.nix +++ b/pkgs/shells/bash/default.nix @@ -1,4 +1,4 @@ -{stdenv, fetchurl, readline ? null, interactive ? false, texinfo ? null, bison, bashCompletion ? null}: +{ stdenv, fetchurl, readline ? null, interactive ? false, texinfo ? null, bison }: assert interactive -> readline != null; @@ -52,10 +52,7 @@ stdenv.mkDerivation rec { # Add an `sh' -> `bash' symlink. ln -s bash "$out/bin/sh" - '' + (if interactive && bashCompletion != null then '' - ensureDir "$out/etc" - echo >"$out/etc/bash_completion" '. "${bashCompletion}/etc/bash_completion"' - '' else '' + '' + (if interactive then "" else '' # Install the completion examples. ensureDir "$out/etc" cp -v "examples/complete/bash_completion" "$out/etc"