Author: viric
Date: Sun Aug 1 21:01:54 2010
New Revision: 22842
URL: https://svn.nixos.org/websvn/nix/?rev=22842&sc=1
Log:
Updating gettext to that decided in nixpkgs trunk (0.17 to 0.18)
Deleted:
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/gettext/0.18.nix
Modified:
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/gettext/default.nix
nixpkgs/branches/stdenv-updates/pkgs/top-level/all-packages.nix
Modified:
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/gettext/default.nix
==============================================================================
---
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/gettext/default.nix
Sun Aug 1 21:00:22 2010 (r22841)
+++
nixpkgs/branches/stdenv-updates/pkgs/development/libraries/gettext/default.nix
Sun Aug 1 21:01:54 2010 (r22842)
@@ -1,11 +1,13 @@
+# XXX: Remove me when `stdenv-updates' is merged.
+
{ stdenv, fetchurl, libiconv }:
stdenv.mkDerivation (rec {
- name = "gettext-0.18";
+ name = "gettext-0.18.1.1";
src = fetchurl {
url = "mirror://gnu/gettext/${name}.tar.gz";
- sha256 = "1rbgm6sxgq218pridn2vji5nlj3hdf4vs75rz00wc0wcw4fjqd02";
+ sha256 = "1sa3ch12qxa4h3ya6hkz119yclcccmincl9j20dhrdx5mykp3b4k";
};
configureFlags = "--disable-csharp";
Modified: nixpkgs/branches/stdenv-updates/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/branches/stdenv-updates/pkgs/top-level/all-packages.nix Sun Aug
1 21:00:22 2010 (r22841)
+++ nixpkgs/branches/stdenv-updates/pkgs/top-level/all-packages.nix Sun Aug
1 21:01:54 2010 (r22842)
@@ -3890,14 +3890,7 @@
use_svn = stdenv.system == "x86_64-linux";
};
- gettext_0_17 = import ../development/libraries/gettext {
- inherit fetchurl stdenv libiconv;
- };
-
- gettext = gettext_0_18;
-
- # XXX: Remove me when `stdenv-updates' is merged.
- gettext_0_18 = import ../development/libraries/gettext/0.18.nix {
+ gettext = import ../development/libraries/gettext/default.nix {
inherit fetchurl stdenv libiconv;
};
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
