diff options
| author | Daiderd Jordan <daiderd@gmail.com> | 2018-06-08 18:06:47 +0200 |
|---|---|---|
| committer | Daiderd Jordan <daiderd@gmail.com> | 2018-06-08 18:06:47 +0200 |
| commit | fcdcfe2de1ab7c3507c8bb68b5fd347ab7f80c74 (patch) | |
| tree | fc80390e190e04aeb8330522f475be313feac4b8 /pkgs/development/tools/misc | |
| parent | 9dfb0b2db04a42815356e6eabba9fac92ccf4cc4 (diff) | |
| parent | b9565143eaa17b7b7e03612769ebc6ca24eddae0 (diff) | |
| download | nixlib-fcdcfe2de1ab7c3507c8bb68b5fd347ab7f80c74.tar nixlib-fcdcfe2de1ab7c3507c8bb68b5fd347ab7f80c74.tar.gz nixlib-fcdcfe2de1ab7c3507c8bb68b5fd347ab7f80c74.tar.bz2 nixlib-fcdcfe2de1ab7c3507c8bb68b5fd347ab7f80c74.tar.lz nixlib-fcdcfe2de1ab7c3507c8bb68b5fd347ab7f80c74.tar.xz nixlib-fcdcfe2de1ab7c3507c8bb68b5fd347ab7f80c74.tar.zst nixlib-fcdcfe2de1ab7c3507c8bb68b5fd347ab7f80c74.zip | |
Merge branch 'master' into staging
Diffstat (limited to 'pkgs/development/tools/misc')
| -rw-r--r-- | pkgs/development/tools/misc/intltool/default.nix | 8 | ||||
| -rw-r--r-- | pkgs/development/tools/misc/lttng-tools/default.nix | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/pkgs/development/tools/misc/intltool/default.nix b/pkgs/development/tools/misc/intltool/default.nix index cb64bd602b79..67180b08f026 100644 --- a/pkgs/development/tools/misc/intltool/default.nix +++ b/pkgs/development/tools/misc/intltool/default.nix @@ -11,10 +11,10 @@ stdenv.mkDerivation rec { # fix "unescaped left brace" errors when using intltool in some cases patches = [(fetchpatch { - name = "perl-5.22.patch"; - url = "https://anonscm.debian.org/viewvc/pkg-gnome/desktop/unstable/intltool" - + "/debian/patches/perl5.22-regex-fixes?revision=47258&view=co&pathrev=47258"; - sha256 = "17clqczb9fky7hp8czxa0fy82b5478irvz4f3fnans3sqxl95hx3"; + name = "perl5.26-regex-fixes.patch"; + url = "https://sources.debian.org/data/main/i/intltool/0.51.0-5" + + "/debian/patches/perl5.26-regex-fixes.patch"; + sha256 = "12q2140867r5d0dysly72khi7b0mm2gd7nlm1k81iyg7fxgnyz45"; })]; propagatedBuildInputs = [ gettext perl perlXMLParser ]; diff --git a/pkgs/development/tools/misc/lttng-tools/default.nix b/pkgs/development/tools/misc/lttng-tools/default.nix index 8294b68126fc..6be23c171a6a 100644 --- a/pkgs/development/tools/misc/lttng-tools/default.nix +++ b/pkgs/development/tools/misc/lttng-tools/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "lttng-tools-${version}"; - version = "2.10.3"; + version = "2.10.4"; src = fetchurl { url = "https://lttng.org/files/lttng-tools/${name}.tar.bz2"; - sha256 = "0x3b6jps053s9pxc7bslj5qsn2z53yf0fk9pcrmxjf9yri17n3qr"; + sha256 = "1p3y7p8m5i5f8qvsib4da2m41rkw7pamvsngplh7wspgvg0zxvay"; }; nativeBuildInputs = [ pkgconfig ]; |