diff options
| author | Alex Ameen <alex.ameen.tx@gmail.com> | 2022-02-18 21:13:48 -0600 |
|---|---|---|
| committer | Alex Ameen <alex.ameen.tx@gmail.com> | 2022-02-18 21:13:48 -0600 |
| commit | 2854d286310003ca466753c4ff45df5c8e7e7028 (patch) | |
| tree | c768b64d328983f4cb2eee6ac02b10c7bed65d74 /pkgs/tools/package-management | |
| parent | 059e01c69f8a134c8f72afbf9fbf49388babc70b (diff) | |
| download | nixpkgs-2854d286310003ca466753c4ff45df5c8e7e7028.tar nixpkgs-2854d286310003ca466753c4ff45df5c8e7e7028.tar.gz nixpkgs-2854d286310003ca466753c4ff45df5c8e7e7028.tar.bz2 nixpkgs-2854d286310003ca466753c4ff45df5c8e7e7028.tar.lz nixpkgs-2854d286310003ca466753c4ff45df5c8e7e7028.tar.xz nixpkgs-2854d286310003ca466753c4ff45df5c8e7e7028.tar.zst nixpkgs-2854d286310003ca466753c4ff45df5c8e7e7028.zip | |
packagekit: 1.2.5pre -> 1.2.5.1pre
Diffstat (limited to 'pkgs/tools/package-management')
| -rw-r--r-- | pkgs/tools/package-management/packagekit/default.nix | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/pkgs/tools/package-management/packagekit/default.nix b/pkgs/tools/package-management/packagekit/default.nix index 25ad5be89e8..15f94aceaa4 100644 --- a/pkgs/tools/package-management/packagekit/default.nix +++ b/pkgs/tools/package-management/packagekit/default.nix @@ -11,6 +11,7 @@ , vala , gtk-doc , nix +, nlohmann_json ? null , boost , meson , ninja @@ -26,18 +27,24 @@ , 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"; - version = "1.2.5pre"; + version = "1.2.5.1pre"; outputs = [ "out" "dev" "devdoc" ]; src = fetchFromGitHub { owner = "PackageKit"; repo = "PackageKit"; - rev = "9c2ef9cddf39ebde587907561f8e7ac99ed6be1a"; - sha256 = "05z1ds240kcmigygkbgjasr4spn7vd7cbpsbfrghhgnmszx9bjgl"; + rev = "33b847c49b4a42499e3c0f10fef62830c874e086"; + sha256 = "UDpMswf0EBwcoHTqoWiztXnIAwM69nM+S9MPsR24amw="; }; buildInputs = [ @@ -52,6 +59,7 @@ stdenv.mkDerivation rec { nix boost ] ++ lib.optional enableSystemd systemd + ++ lib.optional useNlohmann nlohmann_json ++ lib.optional enableBashCompletion bash-completion; nativeBuildInputs = [ vala |