diff options
| author | Lluís Batlle i Rossell <viric@viric.name> | 2012-12-28 23:28:16 +0100 |
|---|---|---|
| committer | Lluís Batlle i Rossell <viric@viric.name> | 2012-12-28 23:28:16 +0100 |
| commit | b58780c43de1f6463d753c4dbf2506641cf1c678 (patch) | |
| tree | 858337275f05e2bd2fdfcac5f6574e200b00fb44 /pkgs/development/python-modules | |
| parent | 88b11196c130b6bda5fd2e57729e876527c63377 (diff) | |
| parent | fde74242bf41d199ad68db90c5ce4d35f6c2c51b (diff) | |
| download | nixpkgs-b58780c43de1f6463d753c4dbf2506641cf1c678.tar nixpkgs-b58780c43de1f6463d753c4dbf2506641cf1c678.tar.gz nixpkgs-b58780c43de1f6463d753c4dbf2506641cf1c678.tar.bz2 nixpkgs-b58780c43de1f6463d753c4dbf2506641cf1c678.tar.lz nixpkgs-b58780c43de1f6463d753c4dbf2506641cf1c678.tar.xz nixpkgs-b58780c43de1f6463d753c4dbf2506641cf1c678.tar.zst nixpkgs-b58780c43de1f6463d753c4dbf2506641cf1c678.zip | |
Merge remote-tracking branch 'eelco/master' into stdenv-updates
Conflicts: pkgs/development/compilers/gcc/4.7/default.nix Trivial solution.
Diffstat (limited to 'pkgs/development/python-modules')
| -rw-r--r-- | pkgs/development/python-modules/recursive-pth-loader/default.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/development/python-modules/recursive-pth-loader/default.nix b/pkgs/development/python-modules/recursive-pth-loader/default.nix index 3452c62e216..959882be938 100644 --- a/pkgs/development/python-modules/recursive-pth-loader/default.nix +++ b/pkgs/development/python-modules/recursive-pth-loader/default.nix @@ -1,7 +1,7 @@ { stdenv, python }: stdenv.mkDerivation rec { - name = "resursive-pth-loader-1.0"; + name = "python-recursive-pth-loader-1.0"; unpackPhase = "true"; |