diff --git a/pkgs/data/misc/shared-mime-info/0.22.nix b/pkgs/data/misc/shared-mime-info/0.22.nix deleted file mode 100644 index 399b3296d382..000000000000 --- a/pkgs/data/misc/shared-mime-info/0.22.nix +++ /dev/null @@ -1,2 +0,0 @@ -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 deleted file mode 100644 index 38617dfe8e3f..000000000000 --- a/pkgs/data/misc/shared-mime-info/0.23.nix +++ /dev/null @@ -1,2 +0,0 @@ -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 deleted file mode 100644 index 8c2ff363c6af..000000000000 --- a/pkgs/data/misc/shared-mime-info/common.nix +++ /dev/null @@ -1,16 +0,0 @@ -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 new file mode 100644 index 000000000000..b151570c7f11 --- /dev/null +++ b/pkgs/data/misc/shared-mime-info/default.nix @@ -0,0 +1,17 @@ +{stdenv, fetchurl, pkgconfig, gettext, intltool, libxml2, glib}: + +stdenv.mkDerivation rec { + name = "shared-mime-info-0.51"; + + src = fetchurl { + url = "http://freedesktop.org/~hadess/${name}.tar.bz2"; + sha256 = "1n7fn3vnqdq5c4xjyflwryxdb75cwsmw39hdpjy90swd841pw90w"; + }; + + buildInputs = [pkgconfig gettext intltool libxml2 glib]; + + meta = { + description = "A database of common MIME types"; + homepage = http://freedesktop.org/wiki/Software/shared-mime-info; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index da5c2f1dfce7..637a26461a41 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4286,15 +4286,18 @@ let }; perlCatalystRuntime = buildPerlPackage rec{ - name = "Catalyst-Runtime-5.71000"; + name = "Catalyst-Runtime-5.8000_06"; src = fetchurl { url = "mirror://cpan/authors/id/M/MR/MRAMBERG/${name}.tar.gz"; - sha256 = "0j9kwp2ylah0qsvgv08lnv49dlykx94bivwngw3zwn3g9qfbq26c"; + sha256 = "181fynr72q73xs78rk2hmlgqhx2n35ysv73rfd69780na1j3gkzf"; }; propagatedBuildInputs = [ perlLWP perlClassAccessor perlClassDataInheritable perlClassInspector perlCGISimple perlDataDump perlFileModified perlHTTPBody perlHTTPRequestAsCGI perlPathClass perlTextSimpleTable perlTreeSimple perlTreeSimpleVisitorFactory + perlSubExporter perlMROCompat perlTestMockObject perlClassMOP perlMoose + perlNamespaceClean perlScopeUpper perlMooseXEmulateClassAccessorFast + perlClassC3 perlClassC3AdoptNEXT ]; }; @@ -4492,6 +4495,15 @@ let }; }; + perlClassC3AdoptNEXT = buildPerlPackage rec { + name = "Class-C3-Adopt-NEXT-0.06"; + src = fetchurl { + url = "mirror://cpan/authors/id/F/FL/FLORA/${name}.tar.gz"; + sha256 = "0jxwli7452nmdws437hv235b6p97rraz00mgxmf7dsx96ym4xm1y"; + }; + propagatedBuildInputs = [perlMROCompat perlTestException]; + }; + perlClassC3Componentised = buildPerlPackage { name = "Class-C3-Componentised-1.0003"; src = fetchurl { @@ -5292,6 +5304,15 @@ let ]; }; + perlMooseXEmulateClassAccessorFast = buildPerlPackage rec { + name = "MooseX-Emulate-Class-Accessor-Fast-0.00800"; + src = fetchurl { + url = "mirror://cpan/authors/id/G/GR/GRODITI/${name}.tar.gz"; + sha256 = "1z2sld2sw1mlwxwzxxanik3086cw14rdsx2wwnzrfy7prsnigcl2"; + }; + propagatedBuildInputs = [perlMoose perlNamespaceClean]; + }; + perlMouse = buildPerlPackage { name = "Mouse-0.09"; src = fetchurl { @@ -5494,6 +5515,14 @@ let }; }; + perlScopeUpper = buildPerlPackage rec { + name = "Scope-Upper-0.06"; + src = fetchurl { + url = "mirror://cpan/authors/id/V/VP/VPIT/${name}.tar.gz"; + sha256 = "1qaf310wbfpjb0lmg3fpmhbfnjxqw3j47rj0w0f0cy4bgihi8l43"; + }; + }; + perlSetObject = buildPerlPackage { name = "Set-Object-1.26"; src = fetchurl { @@ -7287,8 +7316,8 @@ let inherit fetchurl stdenv unzip; }; - shared_mime_info = selectVersion ../data/misc/shared-mime-info "0.23" { - inherit fetchurl stdenv perl perlXMLParser pkgconfig gettext libxml2; + shared_mime_info = import ../data/misc/shared-mime-info { + inherit fetchurl stdenv pkgconfig gettext intltool libxml2; inherit (gtkLibs) glib; };