Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 37771e47ebac
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: b873eb731712
Choose a head ref
  • 1 commit
  • 1 file changed
  • 2 contributors

Commits on Jan 18, 2020

  1. packagekit: 1.1.12 -> 1.1.13 (#77498) 

    * packagekit: 1.1.12 -> 1.1.13

https://github.com/hughsie/PackageKit/blob/PACKAGEKIT_1_1_13/NEWS

* packagekit: set systemd user unit dir, minor touchups

While visiting:
* drop trailing slash in system unit dir
* prefer placeholder over escaping

* packagekit: dbus dir fixup (thanks @worldofpeace!)

Co-Authored-By: worldofpeace <worldofpeace@protonmail.ch>
    @dtzWill @worldofpeace
    dtzWill and worldofpeace committed Jan 18, 2020
    Copy the full SHA
    b873eb7 View commit details
Showing with 5 additions and 4 deletions.
  1. +5 −4 pkgs/tools/package-management/packagekit/default.nix
9 changes: 5 additions & 4 deletions pkgs/tools/package-management/packagekit/default.nix
View file
Original file line number Diff line number Diff line change
@@ -9,15 +9,15 @@

stdenv.mkDerivation rec {
pname = "packagekit";
version = "1.1.12";
version = "1.1.13";

outputs = [ "out" "dev" ];

src = fetchFromGitHub {
owner = "hughsie";
repo = "PackageKit";
rev = "PACKAGEKIT_${lib.replaceStrings ["."] ["_"] version}";
sha256 = "02wq3jw3mkdld90irh5vdfd5bri2g1p89mhrmj56kvif1fqak46x";
sha256 = "0xmgac27p5z8wr56yw3cqhywnlvaf8kvyv1g0nzxnq167xj5vxam";
};

buildInputs = [ glib polkit python3 gobject-introspection ]
@@ -40,7 +40,8 @@ stdenv.mkDerivation rec {
"--localstatedir=/var"
"--sysconfdir=/etc"
"--with-dbus-sys=${placeholder "out"}/share/dbus-1/system.d"
"--with-systemdsystemunitdir=${placeholder "out"}/lib/systemd/system/"
"--with-systemdsystemunitdir=${placeholder "out"}/lib/systemd/system"
"--with-systemduserunitdir=${placeholder "out"}/lib/systemd/user"
]
++ lib.optional enableNixBackend "--enable-nix"
++ lib.optional (!enableBashCompletion) "--disable-bash-completion"
@@ -49,7 +50,7 @@ stdenv.mkDerivation rec {
enableParallelBuilding = true;

installFlags = [
"sysconfdir=\${out}/etc"
"sysconfdir=${placeholder "out"}/etc"
"localstatedir=\${TMPDIR}"
];