diff options
| author | Thomas Gerbet <thomas@gerbet.me> | 2024-01-30 23:37:46 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-01-30 23:37:46 +0100 |
| commit | 898c3061fe986764e0d12e2aef45984317c6f6d8 (patch) | |
| tree | fb2a49ea66745a580f9436fe9bcc71e745ed18ca | |
| parent | 0c5967de59073bbeab0bf746bf2f715cb8b1cfcb (diff) | |
| parent | 19b3ab3fe467bc1ec5cb06f7e5ca4b6bcdea548b (diff) | |
| download | nixlib-898c3061fe986764e0d12e2aef45984317c6f6d8.tar nixlib-898c3061fe986764e0d12e2aef45984317c6f6d8.tar.gz nixlib-898c3061fe986764e0d12e2aef45984317c6f6d8.tar.bz2 nixlib-898c3061fe986764e0d12e2aef45984317c6f6d8.tar.lz nixlib-898c3061fe986764e0d12e2aef45984317c6f6d8.tar.xz nixlib-898c3061fe986764e0d12e2aef45984317c6f6d8.tar.zst nixlib-898c3061fe986764e0d12e2aef45984317c6f6d8.zip | |
Merge pull request #279253 from risicle/ris-packagekit-1.2.8
packagekit: 1.2.5.1pre -> 1.2.8
| -rw-r--r-- | nixos/modules/services/misc/packagekit.nix | 4 | ||||
| -rw-r--r-- | pkgs/tools/package-management/packagekit/default.nix | 11 |
2 files changed, 10 insertions, 5 deletions
diff --git a/nixos/modules/services/misc/packagekit.nix b/nixos/modules/services/misc/packagekit.nix index 5a0d314d25cd..f4191a4453ca 100644 --- a/nixos/modules/services/misc/packagekit.nix +++ b/nixos/modules/services/misc/packagekit.nix @@ -13,7 +13,7 @@ let (iniFmt.generate "PackageKit.conf" (recursiveUpdate { Daemon = { - DefaultBackend = "nix"; + DefaultBackend = "test_nop"; KeepCache = false; }; } @@ -35,7 +35,7 @@ let in { imports = [ - (mkRemovedOptionModule [ "services" "packagekit" "backend" ] "Always set to Nix.") + (mkRemovedOptionModule [ "services" "packagekit" "backend" ] "Always set to test_nop, Nix backend is broken see #177946.") ]; options.services.packagekit = { diff --git a/pkgs/tools/package-management/packagekit/default.nix b/pkgs/tools/package-management/packagekit/default.nix index b51a51da84f5..2e150f692ae9 100644 --- a/pkgs/tools/package-management/packagekit/default.nix +++ b/pkgs/tools/package-management/packagekit/default.nix @@ -24,19 +24,20 @@ , bash-completion ? null , enableSystemd ? lib.meta.availableOn stdenv.hostPlatform systemd , systemd +, nixosTests }: stdenv.mkDerivation rec { pname = "packagekit"; - version = "1.2.5.1pre"; + version = "1.2.8"; outputs = [ "out" "dev" "devdoc" ]; src = fetchFromGitHub { owner = "PackageKit"; repo = "PackageKit"; - rev = "30bb82da8d4161330a6d7a20c9989149303421a1"; - sha256 = "k2osc2v0OuGrNjwxdqn785RsbHEJP3p79PG9YqnVE3U="; + rev = "v${version}"; + hash = "sha256-k51uQHar/uvdTDj/Ud60Oh6H7rfjEc9bfQnH5cvg8hc="; }; buildInputs = [ @@ -92,6 +93,10 @@ stdenv.mkDerivation rec { --replace "install_dir: join_paths(get_option('localstatedir'), 'lib', 'PackageKit')," "install_dir: join_paths('$out', 'var', 'lib', 'PackageKit')," ''; + passthru.tests = { + nixos-test = nixosTests.packagekit; + }; + meta = with lib; { description = "System to facilitate installing and updating packages"; longDescription = '' |