Author: urkud
Date: Sat Jan 7 10:19:39 2012
New Revision: 31395
URL: https://nixos.org/websvn/nix/?rev=31395&sc=1
Log:
glib-2.30, glibmm-2.30 in gtk-2.x
Deleted:
nixpkgs/branches/glib-2.30/pkgs/development/libraries/glib/2.28.x.nix
nixpkgs/branches/glib-2.30/pkgs/development/libraries/glibmm/2.28.x.nix
Modified:
nixpkgs/branches/glib-2.30/pkgs/development/libraries/glibmm/2.30.x.nix
nixpkgs/branches/glib-2.30/pkgs/top-level/all-packages.nix
Modified:
nixpkgs/branches/glib-2.30/pkgs/development/libraries/glibmm/2.30.x.nix
==============================================================================
--- nixpkgs/branches/glib-2.30/pkgs/development/libraries/glibmm/2.30.x.nix
Sat Jan 7 09:50:53 2012 (r31394)
+++ nixpkgs/branches/glib-2.30/pkgs/development/libraries/glibmm/2.30.x.nix
Sat Jan 7 10:19:39 2012 (r31395)
@@ -1,12 +1,11 @@
-{ stdenv, fetchurl_gnome, pkgconfig, glib, libsigcxx, xz }:
+{ stdenv, fetchurl, pkgconfig, glib, libsigcxx, xz }:
-stdenv.mkDerivation rec {
- name = src.pkgname;
+stdenv.mkDerivation {
+ name = "glibmm-2.30.1";
- src = fetchurl_gnome {
- project = "glibmm";
- major = "2"; minor = "30"; patchlevel = "0"; extension = "xz";
- sha256 = "1d0dxq4iamch8igrnbvbfwkfpvcnjfzyr9iq2x8hi89b9k1kzbd7";
+ src = fetchurl {
+ url = mirror://gnome/sources/glibmm/2.30/glibmm-2.30.1.tar.xz;
+ sha256 = "15zqgx6rashyhxk89qjqq05p6m40akpgzyjk8bfb3jk68rc2nn39";
};
buildNativeInputs = [pkgconfig xz];
Modified: nixpkgs/branches/glib-2.30/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/branches/glib-2.30/pkgs/top-level/all-packages.nix Sat Jan 7
09:50:53 2012 (r31394)
+++ nixpkgs/branches/glib-2.30/pkgs/top-level/all-packages.nix Sat Jan 7
10:19:39 2012 (r31395)
@@ -3627,9 +3627,9 @@
gtkLibs224 = recurseIntoAttrs (let callPackage = pkgs.newScope
pkgs.gtkLibs224; in {
- glib = callPackage ../development/libraries/glib/2.28.x.nix { };
+ glib = callPackage ../development/libraries/glib/2.30.x.nix { };
- glibmm = callPackage ../development/libraries/glibmm/2.28.x.nix { };
+ glibmm = callPackage ../development/libraries/glibmm/2.30.x.nix { };
atk = callPackage ../development/libraries/atk/2.2.x.nix { };
_______________________________________________
nix-commits mailing list
[email protected]
http://lists.science.uu.nl/mailman/listinfo/nix-commits
