diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2020-01-10 10:34:04 +0100 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2020-01-10 10:34:04 +0100 |
| commit | 5ad16cb27fd81cb67db4da80283e147bea4e1c25 (patch) | |
| tree | ad648118454028113d3b5236b27754151dc498b5 /pkgs/tools/package-management | |
| parent | eb1369670b5a4e616ff0cf4100616479b1fa3064 (diff) | |
| parent | 773494d0ea6fdf3a40561b44b805b90ae1949292 (diff) | |
| download | nixpkgs-5ad16cb27fd81cb67db4da80283e147bea4e1c25.tar nixpkgs-5ad16cb27fd81cb67db4da80283e147bea4e1c25.tar.gz nixpkgs-5ad16cb27fd81cb67db4da80283e147bea4e1c25.tar.bz2 nixpkgs-5ad16cb27fd81cb67db4da80283e147bea4e1c25.tar.lz nixpkgs-5ad16cb27fd81cb67db4da80283e147bea4e1c25.tar.xz nixpkgs-5ad16cb27fd81cb67db4da80283e147bea4e1c25.tar.zst nixpkgs-5ad16cb27fd81cb67db4da80283e147bea4e1c25.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/tools/package-management')
| -rw-r--r-- | pkgs/tools/package-management/emplace/default.nix | 6 | ||||
| -rw-r--r-- | pkgs/tools/package-management/pacman/default.nix | 4 |
2 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/tools/package-management/emplace/default.nix b/pkgs/tools/package-management/emplace/default.nix index 67829330844..bb361fd97c3 100644 --- a/pkgs/tools/package-management/emplace/default.nix +++ b/pkgs/tools/package-management/emplace/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "emplace"; - version = "0.2.8"; + version = "0.2.10"; src = fetchFromGitHub { owner = "tversteeg"; repo = pname; rev = "v${version}"; - sha256 = "0s04hi0i1ssg9dp75f9qdglnvqmh0cxmbk8nnhd4w45v9m5sadph"; + sha256 = "1y77cla6bgy8pjb21cawx7cb69hhri4r7gyjkhnjyiixkh945mwj"; }; - cargoSha256 = "10y7lpgj9mxrh3rmc15km4rfzspwdjr8dcdh0747rjn6dcpfhcdq"; + cargoSha256 = "119llsc8m7qda2cjnd45ndml148z8074f76xygkz6fp3m1c2z3pw"; meta = with lib; { description = "Mirror installed software on multiple machines"; diff --git a/pkgs/tools/package-management/pacman/default.nix b/pkgs/tools/package-management/pacman/default.nix index 3353704cb36..cdd0c83574a 100644 --- a/pkgs/tools/package-management/pacman/default.nix +++ b/pkgs/tools/package-management/pacman/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, pkgconfig, perl, libarchive, openssl, zlib, bzip2, +{ stdenv, lib, fetchurl, pkgconfig, m4, perl, libarchive, openssl, zlib, bzip2, lzma, curl, runtimeShell }: stdenv.mkDerivation rec { @@ -23,7 +23,7 @@ stdenv.mkDerivation rec { installFlags = [ "sysconfdir=${placeholder "out"}/etc" ]; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig m4 ]; buildInputs = [ curl perl libarchive openssl zlib bzip2 lzma ]; postFixup = '' |