diff options
| author | Vladimír Čunát <v@cunat.cz> | 2022-04-28 18:04:16 +0200 |
|---|---|---|
| committer | Vladimír Čunát <v@cunat.cz> | 2022-04-28 18:04:16 +0200 |
| commit | 8caa1418f67e7b49496889e723784e09b028cd3a (patch) | |
| tree | c85b0152cbd871f9f7a076e43bda4d44806e65d2 /pkgs/tools/package-management/packagekit/default.nix | |
| parent | 51554cbbdbe6086da3b31fb803e9d725647052c3 (diff) | |
| parent | 0cd6f99f9506e31044a320a8223b59a81323d940 (diff) | |
Merge branch 'master' into staging-next-2022-04-23
Diffstat (limited to 'pkgs/tools/package-management/packagekit/default.nix')
| -rw-r--r-- | pkgs/tools/package-management/packagekit/default.nix | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/pkgs/tools/package-management/packagekit/default.nix b/pkgs/tools/package-management/packagekit/default.nix index 15f94aceaa4e7..66064139f3800 100644 --- a/pkgs/tools/package-management/packagekit/default.nix +++ b/pkgs/tools/package-management/packagekit/default.nix @@ -11,7 +11,6 @@ , vala , gtk-doc , nix -, nlohmann_json ? null , boost , meson , ninja @@ -27,12 +26,6 @@ , enableSystemd ? stdenv.isLinux , systemd }: -let - nix_version = lib.removeSuffix nix.VERSION_SUFFIX nix.version; - useNlohmann = lib.versionAtLeast "2.7" nix_version; -in - -assert useNlohmann -> nlohmann_json != null; stdenv.mkDerivation rec { pname = "packagekit"; @@ -43,8 +36,8 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "PackageKit"; repo = "PackageKit"; - rev = "33b847c49b4a42499e3c0f10fef62830c874e086"; - sha256 = "UDpMswf0EBwcoHTqoWiztXnIAwM69nM+S9MPsR24amw="; + rev = "30bb82da8d4161330a6d7a20c9989149303421a1"; + sha256 = "k2osc2v0OuGrNjwxdqn785RsbHEJP3p79PG9YqnVE3U="; }; buildInputs = [ @@ -59,7 +52,6 @@ stdenv.mkDerivation rec { nix boost ] ++ lib.optional enableSystemd systemd - ++ lib.optional useNlohmann nlohmann_json ++ lib.optional enableBashCompletion bash-completion; nativeBuildInputs = [ vala |