From 9d6ab791af07f4baeb84e116c0eb972f8b64ecf2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Benno=20F=C3=BCnfst=C3=BCck?= Date: Tue, 14 Jan 2014 21:33:11 +0100 Subject: [PATCH] Use version variables for easier upgrading --- pkgs/development/libraries/gupnp-av/default.nix | 9 +++++---- pkgs/development/libraries/gupnp/default.nix | 10 +++++----- pkgs/development/libraries/libsoup/default.nix | 9 +++++---- pkgs/tools/networking/gupnp-tools/default.nix | 6 ++++-- 4 files changed, 19 insertions(+), 15 deletions(-) diff --git a/pkgs/development/libraries/gupnp-av/default.nix b/pkgs/development/libraries/gupnp-av/default.nix index 0f4e783ff6e..3cbb13972d3 100644 --- a/pkgs/development/libraries/gupnp-av/default.nix +++ b/pkgs/development/libraries/gupnp-av/default.nix @@ -1,10 +1,11 @@ { stdenv, fetchurl, gupnp, pkgconfig }: -stdenv.mkDerivation { - name = "gupnp-av-0.12.4"; - version = "0.12.4"; +stdenv.mkDerivation rec { + name = "gupnp-av-${version}"; + majorVersion = "0.12"; + version = "${majorVersion}.4"; src = fetchurl { - url = mirror://gnome/sources/gupnp-av/0.12/gupnp-av-0.12.4.tar.xz; + url = "mirror://gnome/sources/gupnp-av/${majorVersion}/gupnp-av-${version}.tar.xz"; sha256 = "0nvsvpiyfslz54j4hjh2gsdjkbi2qj2f4k0aw8s7f05kibprr2jl"; }; diff --git a/pkgs/development/libraries/gupnp/default.nix b/pkgs/development/libraries/gupnp/default.nix index 84c2df9b817..bae0639a61c 100644 --- a/pkgs/development/libraries/gupnp/default.nix +++ b/pkgs/development/libraries/gupnp/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl, pkgconfig, glib, libxml2, gssdp, libsoup, libuuid }: -stdenv.mkDerivation { - name = "gupnp-0.20.9"; - version = "0.20.9"; - +stdenv.mkDerivation rec { + name = "gupnp-${version}"; + majorVersion = "0.20"; + version = "${majorVersion}.9"; src = fetchurl { - url = mirror://gnome/sources/gupnp/0.20/gupnp-0.20.9.tar.xz; + url = "mirror://gnome/sources/gupnp/${majorVersion}/gupnp-${version}.tar.xz"; sha256 = "0vicydn3f72x1rqql7857ans85mg7dfap7n7h8xrfyb9whxhlrb1"; }; diff --git a/pkgs/development/libraries/libsoup/default.nix b/pkgs/development/libraries/libsoup/default.nix index c9203ec34c6..99dc56722b9 100644 --- a/pkgs/development/libraries/libsoup/default.nix +++ b/pkgs/development/libraries/libsoup/default.nix @@ -3,12 +3,13 @@ , libintlOrEmpty , intltool, python }: -stdenv.mkDerivation { - name = "libsoup-2.45"; - version = "2.45"; +stdenv.mkDerivation rec { + name = "libsoup-${version}"; + majorVersion = "2.45"; + version = "${majorVersion}.3"; src = fetchurl { - url = mirror://gnome/sources/libsoup/2.45/libsoup-2.45.3.tar.xz; + url = "mirror://gnome/sources/libsoup/${majorVersion}/libsoup-${version}.tar.xz"; sha256 = "04ma47hcrrbjp90r8jjn686cngnbgac24wgarpwwzlpg66wighva"; }; diff --git a/pkgs/tools/networking/gupnp-tools/default.nix b/pkgs/tools/networking/gupnp-tools/default.nix index f9583e22340..54f3e860e0c 100644 --- a/pkgs/tools/networking/gupnp-tools/default.nix +++ b/pkgs/tools/networking/gupnp-tools/default.nix @@ -1,9 +1,11 @@ {fetchurl, stdenv, gupnp, gssdp, pkgconfig, gtk3, libuuid, intltool, gupnp_av, gnome3, makeWrapper}: stdenv.mkDerivation rec { - name = "gupnp-tools-0.6"; + name = "gupnp-tools-${version}"; + majorVersion = "0.8"; + version = "${majorVersion}.8"; src = fetchurl { - url = mirror://gnome/sources/gupnp-tools/0.8/gupnp-tools-0.8.8.tar.xz; + url = "mirror://gnome/sources/gupnp-tools/${majorVersion}/gupnp-tools-${version}.tar.xz"; sha256 = "160dgh9pmlb85qfavwqz46lqawpshs8514bx2b57f9rbiny8kbij"; };