From bcb28f63a0597d4680da4c1f2b125c55dd88878e Mon Sep 17 00:00:00 2001 From: "Yury G. Kudryashov" Date: Mon, 18 Feb 2008 20:50:49 +0000 Subject: [PATCH] shared-mime-info: 0.23 added svn path=/nixpkgs/branches/stdenv-updates/; revision=10738 --- pkgs/data/misc/shared-mime-info/0.22.nix | 2 ++ pkgs/data/misc/shared-mime-info/0.23.nix | 2 ++ pkgs/data/misc/shared-mime-info/common.nix | 16 ++++++++++++++++ pkgs/data/misc/shared-mime-info/default.nix | 12 ------------ pkgs/top-level/all-packages.nix | 2 +- 5 files changed, 21 insertions(+), 13 deletions(-) create mode 100644 pkgs/data/misc/shared-mime-info/0.22.nix create mode 100644 pkgs/data/misc/shared-mime-info/0.23.nix create mode 100644 pkgs/data/misc/shared-mime-info/common.nix delete mode 100644 pkgs/data/misc/shared-mime-info/default.nix diff --git a/pkgs/data/misc/shared-mime-info/0.22.nix b/pkgs/data/misc/shared-mime-info/0.22.nix new file mode 100644 index 00000000000..399b3296d38 --- /dev/null +++ b/pkgs/data/misc/shared-mime-info/0.22.nix @@ -0,0 +1,2 @@ +args: +import ./common.nix "1chz63v9jr009z9jhs07klybmhyf58i8vxipigf5gkdabjiclcyr" args diff --git a/pkgs/data/misc/shared-mime-info/0.23.nix b/pkgs/data/misc/shared-mime-info/0.23.nix new file mode 100644 index 00000000000..38617dfe8e3 --- /dev/null +++ b/pkgs/data/misc/shared-mime-info/0.23.nix @@ -0,0 +1,2 @@ +args: +import ./common.nix "080ny2vy00202hxcm7xm72j1zmyfs15dbsnqipwni6b2dg2am3q3" args diff --git a/pkgs/data/misc/shared-mime-info/common.nix b/pkgs/data/misc/shared-mime-info/common.nix new file mode 100644 index 00000000000..8c2ff363c6a --- /dev/null +++ b/pkgs/data/misc/shared-mime-info/common.nix @@ -0,0 +1,16 @@ +hash: args: with args; + +stdenv.mkDerivation rec { + name = "shared-mime-info-" + version; + + src = fetchurl { + url = "http://freedesktop.org/~hadess/${name}.tar.bz2"; + sha256 = hash; + }; + + buildInputs = [perl perlXMLParser pkgconfig gettext libxml2 glib]; + + meta = { + homepage = http://freedesktop.org/wiki/Software/shared-mime-info; + }; +} diff --git a/pkgs/data/misc/shared-mime-info/default.nix b/pkgs/data/misc/shared-mime-info/default.nix deleted file mode 100644 index 0b82782d31d..00000000000 --- a/pkgs/data/misc/shared-mime-info/default.nix +++ /dev/null @@ -1,12 +0,0 @@ -{stdenv, fetchurl, perl, perlXMLParser, pkgconfig, gettext, libxml2, glib}: - -stdenv.mkDerivation { - name = "shared-mime-info-0.22"; - - src = fetchurl { - url = http://freedesktop.org/~hadess/shared-mime-info-0.22.tar.bz2; - sha256 = "1chz63v9jr009z9jhs07klybmhyf58i8vxipigf5gkdabjiclcyr"; - }; - - buildInputs = [perl perlXMLParser pkgconfig gettext libxml2 glib]; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3b76d1eabd5..dc39f053da1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3857,7 +3857,7 @@ rec { inherit fetchurl stdenv; }; - shared_mime_info = import ../data/misc/shared-mime-info { + shared_mime_info = selectVersion ../data/misc/shared-mime-info "0.23" { inherit fetchurl stdenv perl perlXMLParser pkgconfig gettext libxml2; inherit (gtkLibs) glib; };