Unverified Commit 898c3061 authored by Thomas Gerbet's avatar Thomas Gerbet Committed by GitHub
Browse files

Merge pull request #279253 from risicle/ris-packagekit-1.2.8 

packagekit: 1.2.5.1pre -> 1.2.8
parents 0c5967de 19b3ab3f

nixos/modules/services/misc/packagekit.nix

+2 −2
Original line number Diff line number Diff line
@@ -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 = {

pkgs/tools/package-management/packagekit/default.nix

+8 −3
Original line number Diff line number Diff line
@@ -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 = ''