diff options
| author | Alyssa Ross <hi@alyssa.is> | 2023-12-01 19:00:09 +0100 |
|---|---|---|
| committer | Alyssa Ross <hi@alyssa.is> | 2023-12-01 19:00:09 +0100 |
| commit | 9e9b07490d5bab5d115c66b80bdb10ff0c11ed8d (patch) | |
| tree | 4368f9e4cb2d5b93a956c085337e45cb70f1e331 /nixpkgs/pkgs/development/libraries/json-glib | |
| parent | a9cbfb6941b47d6f50129e6e36927882392daed7 (diff) | |
| parent | 2344fe1da14cb08b0c18743b207995f9b8597915 (diff) | |
| download | nixlib-9e9b07490d5bab5d115c66b80bdb10ff0c11ed8d.tar nixlib-9e9b07490d5bab5d115c66b80bdb10ff0c11ed8d.tar.gz nixlib-9e9b07490d5bab5d115c66b80bdb10ff0c11ed8d.tar.bz2 nixlib-9e9b07490d5bab5d115c66b80bdb10ff0c11ed8d.tar.lz nixlib-9e9b07490d5bab5d115c66b80bdb10ff0c11ed8d.tar.xz nixlib-9e9b07490d5bab5d115c66b80bdb10ff0c11ed8d.tar.zst nixlib-9e9b07490d5bab5d115c66b80bdb10ff0c11ed8d.zip | |
Merge https://github.com/NixOS/nixpkgs
Diffstat (limited to 'nixpkgs/pkgs/development/libraries/json-glib')
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/json-glib/default.nix | 4 | ||||
| -rw-r--r-- | nixpkgs/pkgs/development/libraries/json-glib/meson-add-installed-tests-prefix-option.patch | 10 |
2 files changed, 7 insertions, 7 deletions
diff --git a/nixpkgs/pkgs/development/libraries/json-glib/default.nix b/nixpkgs/pkgs/development/libraries/json-glib/default.nix index 0ca03efca025..79075929c651 100644 --- a/nixpkgs/pkgs/development/libraries/json-glib/default.nix +++ b/nixpkgs/pkgs/development/libraries/json-glib/default.nix @@ -18,14 +18,14 @@ stdenv.mkDerivation rec { pname = "json-glib"; - version = "1.6.6"; + version = "1.8.0"; outputs = [ "out" "dev" "installedTests" ] ++ lib.optional withIntrospection "devdoc"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "luyYvnqR9t3jNjZyDj2i/27LuQ52zKpJSX8xpoVaSQ4="; + sha256 = "l+9euSyoEQOa1Qpl8GYz8armR5J4kwe+cXB5XYsxlFQ="; }; patches = [ diff --git a/nixpkgs/pkgs/development/libraries/json-glib/meson-add-installed-tests-prefix-option.patch b/nixpkgs/pkgs/development/libraries/json-glib/meson-add-installed-tests-prefix-option.patch index 626db09cd03f..ff09a0115587 100644 --- a/nixpkgs/pkgs/development/libraries/json-glib/meson-add-installed-tests-prefix-option.patch +++ b/nixpkgs/pkgs/development/libraries/json-glib/meson-add-installed-tests-prefix-option.patch @@ -15,13 +15,13 @@ index 1eb56c8..dca444e 100644 install_data(test_data, install_dir: installed_test_bindir) diff --git a/meson_options.txt b/meson_options.txt -index 068a03f..03f398a 100644 +index 5a96998..383aa6c 100644 --- a/meson_options.txt +++ b/meson_options.txt -@@ -10,3 +10,6 @@ option('man', - option('tests', - type: 'boolean', value: true, - description: 'Build the tests') +@@ -13,3 +13,6 @@ option('tests', + option('nls', + type: 'feature', value: 'auto', yield: true, + description: 'Enable native language support (translations)') +option('installed_test_prefix', + description: 'Prefix for installed tests', + type: 'string') |