From 67d2344120dadeb69b5070552058ab489c5f931e Mon Sep 17 00:00:00 2001 From: Luca Bruno Date: Thu, 17 Sep 2015 17:01:59 +0200 Subject: [PATCH] gnome-shell: use src.nix --- maintainers/scripts/gnome.sh | 2 +- .../desktops/gnome-3/3.16/core/gnome-shell/default.nix | 7 +------ pkgs/desktops/gnome-3/3.16/core/gnome-shell/src.nix | 10 ++++++++++ 3 files changed, 12 insertions(+), 7 deletions(-) create mode 100644 pkgs/desktops/gnome-3/3.16/core/gnome-shell/src.nix diff --git a/maintainers/scripts/gnome.sh b/maintainers/scripts/gnome.sh index 9f2f976354f..cd2c5777403 100755 --- a/maintainers/scripts/gnome.sh +++ b/maintainers/scripts/gnome.sh @@ -111,7 +111,7 @@ for ext in ${extensions[@]}; do done echo "Chosen ${ext_pref}, hash is ${sha256}" >&2 -src="# Autogenerated by maintainers/scripts/gnome-latest.sh +src="# Autogenerated by maintainers/scripts/gnome.sh update fetchurl: { name = \"${project}-${version}\"; diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-shell/default.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-shell/default.nix index ca50cf8218d..899efc5443b 100644 --- a/pkgs/desktops/gnome-3/3.16/core/gnome-shell/default.nix +++ b/pkgs/desktops/gnome-3/3.16/core/gnome-shell/default.nix @@ -8,12 +8,7 @@ # http://sources.gentoo.org/cgi-bin/viewvc.cgi/gentoo-x86/gnome-base/gnome-shell/gnome-shell-3.10.2.1.ebuild?revision=1.3&view=markup stdenv.mkDerivation rec { - name = "gnome-shell-${gnome3.version}.1"; - - src = fetchurl { - url = "mirror://gnome/sources/gnome-shell/${gnome3.version}/${name}.tar.xz"; - sha256 = "00gjdfaznpnspb4jmjc19axiz6snd9drvqmzpq4sw0xh1ysgpncv"; - }; + inherit (import ./src.nix fetchurl) name src; # Needed to find /etc/NetworkManager/VPN configureFlags = [ "--sysconfdir=/etc" ]; diff --git a/pkgs/desktops/gnome-3/3.16/core/gnome-shell/src.nix b/pkgs/desktops/gnome-3/3.16/core/gnome-shell/src.nix new file mode 100644 index 00000000000..782e18e4a9d --- /dev/null +++ b/pkgs/desktops/gnome-3/3.16/core/gnome-shell/src.nix @@ -0,0 +1,10 @@ +# Autogenerated by maintainers/scripts/gnome.sh update + +fetchurl: { + name = "gnome-shell-3.16.1"; + + src = fetchurl { + url = mirror://gnome/sources/gnome-shell/3.16/gnome-shell-3.16.1.tar.xz; + sha256 = "9bd9fbb40fb003ae09bebfe29d5b6a569b1fbb4a81c92ac9bada5efb956bf201"; + }; +}