diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2023-07-11 15:29:06 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-07-11 15:29:06 +0200 |
| commit | d04bbe9c81c3d9ba0aff94fb5a376d2f650a4a0a (patch) | |
| tree | 53950fd1132f4eb8f0548345ad5fc56bac165f34 /pkgs/development/tools | |
| parent | 170b6714ad98897c95ba26b58e1e693e1274a903 (diff) | |
| parent | 48ae1081ebe48452dc83e5f496fefd3d13c1b4ed (diff) | |
| download | nixlib-d04bbe9c81c3d9ba0aff94fb5a376d2f650a4a0a.tar nixlib-d04bbe9c81c3d9ba0aff94fb5a376d2f650a4a0a.tar.gz nixlib-d04bbe9c81c3d9ba0aff94fb5a376d2f650a4a0a.tar.bz2 nixlib-d04bbe9c81c3d9ba0aff94fb5a376d2f650a4a0a.tar.lz nixlib-d04bbe9c81c3d9ba0aff94fb5a376d2f650a4a0a.tar.xz nixlib-d04bbe9c81c3d9ba0aff94fb5a376d2f650a4a0a.tar.zst nixlib-d04bbe9c81c3d9ba0aff94fb5a376d2f650a4a0a.zip | |
Merge pull request #241586 from jtojnar/gnome
GNOME updates 2023-07-04
Diffstat (limited to 'pkgs/development/tools')
| -rw-r--r-- | pkgs/development/tools/misc/msitools/default.nix | 22 |
1 files changed, 3 insertions, 19 deletions
diff --git a/pkgs/development/tools/misc/msitools/default.nix b/pkgs/development/tools/misc/msitools/default.nix index 84a9a1135b51..84d699311b5e 100644 --- a/pkgs/development/tools/misc/msitools/default.nix +++ b/pkgs/development/tools/misc/msitools/default.nix @@ -1,7 +1,6 @@ { lib , stdenv , fetchurl -, fetchpatch , meson , ninja , vala @@ -19,28 +18,13 @@ stdenv.mkDerivation rec { pname = "msitools"; - version = "0.101"; + version = "0.102"; src = fetchurl { - url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "DMTS4NEI+m8rQIW5qX3VvG2fyt7N2TPyCU+Guv2+hf4="; + url = "mirror://gnome/sources/msitools/${lib.versions.majorMinor version}/msitools-${version}.tar.xz"; + hash = "sha256-+khaQhOX71/gLfWrk/ztkav2hXMPQPlMcVe0MNJKNJg="; }; - patches = [ - # Fix executable bit on tools (regression in Meson migration). - (fetchpatch { - url = "https://gitlab.gnome.org/GNOME/msitools/commit/25c4353cf173cddeb76c0a2dd6621bcb753cabf8.patch"; - sha256 = "VknfZCCn4jxwn9l9noXdGczv2kV+IbOsw9cNBE67P1U="; - }) - - # Fix failure on big-endian platforms. - # https://gitlab.gnome.org/GNOME/msitools/issues/31 - (fetchpatch { - url = "https://gitlab.gnome.org/skitt/msitools/commit/3668c8288085d5beefae7c1387330ce9599b8365.patch"; - sha256 = "x3Mp+9TRqBAJIdzVn68HyYt0lujyMk5h5xSBUQHe9Oo="; - }) - ]; - nativeBuildInputs = [ meson ninja |