diff options
| author | Domen Kožar <domen@dev.si> | 2015-05-11 10:05:23 +0200 |
|---|---|---|
| committer | Domen Kožar <domen@dev.si> | 2015-05-11 10:05:23 +0200 |
| commit | bb4d658f646df61285d5b05ce0b407b7795f9045 (patch) | |
| tree | db55b600f0bbb1136f22dad0a34041a49fdd37ca /pkgs/development/tools | |
| parent | b7f15c43da7822f0def11b0cf1afbf4f45707204 (diff) | |
| parent | c3bdabca737c50b13b9db71476fdf1dc7e853b5b (diff) | |
| download | nixlib-bb4d658f646df61285d5b05ce0b407b7795f9045.tar nixlib-bb4d658f646df61285d5b05ce0b407b7795f9045.tar.gz nixlib-bb4d658f646df61285d5b05ce0b407b7795f9045.tar.bz2 nixlib-bb4d658f646df61285d5b05ce0b407b7795f9045.tar.lz nixlib-bb4d658f646df61285d5b05ce0b407b7795f9045.tar.xz nixlib-bb4d658f646df61285d5b05ce0b407b7795f9045.tar.zst nixlib-bb4d658f646df61285d5b05ce0b407b7795f9045.zip | |
Merge branch 'master' into staging
Conflicts: nixos/doc/manual/release-notes/rl-unstable.xml nixos/modules/services/printing/cupsd.nix pkgs/applications/misc/calibre/default.nix pkgs/development/haskell-modules/hackage-packages.nix pkgs/development/libraries/libsodium/default.nix pkgs/misc/emulators/wine/unstable.nix pkgs/top-level/all-packages.nix
Diffstat (limited to 'pkgs/development/tools')
| -rw-r--r-- | pkgs/development/tools/misc/intltool/default.nix | 40 | ||||
| -rw-r--r-- | pkgs/development/tools/misc/intltool/default.upstream | 2 |
2 files changed, 14 insertions, 28 deletions
diff --git a/pkgs/development/tools/misc/intltool/default.nix b/pkgs/development/tools/misc/intltool/default.nix index 40b7ea3b5782..761cd6edfc2c 100644 --- a/pkgs/development/tools/misc/intltool/default.nix +++ b/pkgs/development/tools/misc/intltool/default.nix @@ -1,33 +1,21 @@ -{ stdenv, fetchurl, perl, perlXMLParser, gettext }: -let - s = # Generated upstream information - rec { - baseName="intltool"; - version="0.51.0"; - name="${baseName}-${version}"; - hash="1karx4sb7bnm2j67q0q74hspkfn6lqprpy5r99vkn5bb36a4viv7"; - url="https://launchpad.net/intltool/trunk/0.51.0/+download/intltool-0.51.0.tar.gz"; - sha256="1karx4sb7bnm2j67q0q74hspkfn6lqprpy5r99vkn5bb36a4viv7"; - }; - propagatedBuildInputs = [perl perlXMLParser]; - buildInputs = []; - in -stdenv.mkDerivation { - inherit (s) name version; +{ stdenv, fetchurl, gettext, perl, perlXMLParser }: + +stdenv.mkDerivation rec { + name = "intltool-${version}"; + version = "0.51.0"; + src = fetchurl { - inherit (s) url sha256; + url = "https://launchpad.net/intltool/trunk/${version}/+download/${name}.tar.gz"; + sha256 = "1karx4sb7bnm2j67q0q74hspkfn6lqprpy5r99vkn5bb36a4viv7"; }; - inherit buildInputs; - # not needed by intltool itself but (probably) needed for its usage - propagatedBuildInputs = propagatedBuildInputs ++ [ gettext ]; + propagatedBuildInputs = [ gettext perl perlXMLParser ]; - meta = { + meta = with stdenv.lib; { description = "Translation helper tool"; - homepage = "http://launchpad.net/intltool/"; - license = stdenv.lib.licenses.gpl2Plus; - maintainers = [stdenv.lib.maintainers.raskin]; - platforms = stdenv.lib.platforms.unix; - inherit (s) version; + homepage = http://launchpad.net/intltool/; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ raskin ]; + platforms = platforms.unix; }; } diff --git a/pkgs/development/tools/misc/intltool/default.upstream b/pkgs/development/tools/misc/intltool/default.upstream deleted file mode 100644 index 323bf21f45a1..000000000000 --- a/pkgs/development/tools/misc/intltool/default.upstream +++ /dev/null @@ -1,2 +0,0 @@ -attribute_name intltool -url https://launchpad.net/intltool/+download |