summary refs log tree commit diff
path: root/pkgs/tools/package-management
diff options
context:
space:
mode:
authorFrederik Rietdijk <fridh@fridh.nl>2020-01-07 20:06:22 +0100
committerFrederik Rietdijk <fridh@fridh.nl>2020-01-07 20:06:22 +0100
commita823616723c44700a1c976fee77aafb470388e19 (patch)
tree08c996bb7f020cda3aa27ef881b61b0d3807b383 /pkgs/tools/package-management
parent7f8111955082b4aa7dce2718b9ef4d8ad0f4584b (diff)
parentc425a7e694ef48513e35b60a124587ef382b2fa6 (diff)
downloadnixpkgs-a823616723c44700a1c976fee77aafb470388e19.tar
nixpkgs-a823616723c44700a1c976fee77aafb470388e19.tar.gz
nixpkgs-a823616723c44700a1c976fee77aafb470388e19.tar.bz2
nixpkgs-a823616723c44700a1c976fee77aafb470388e19.tar.lz
nixpkgs-a823616723c44700a1c976fee77aafb470388e19.tar.xz
nixpkgs-a823616723c44700a1c976fee77aafb470388e19.tar.zst
nixpkgs-a823616723c44700a1c976fee77aafb470388e19.zip
Merge master into staging-next
Diffstat (limited to 'pkgs/tools/package-management')
-rw-r--r--pkgs/tools/package-management/home-manager/default.nix6
-rw-r--r--pkgs/tools/package-management/opkg/default.nix4
2 files changed, 5 insertions, 5 deletions
diff --git a/pkgs/tools/package-management/home-manager/default.nix b/pkgs/tools/package-management/home-manager/default.nix
index f093f442e52..21b2fad1caa 100644
--- a/pkgs/tools/package-management/home-manager/default.nix
+++ b/pkgs/tools/package-management/home-manager/default.nix
@@ -6,13 +6,13 @@
 stdenv.mkDerivation rec {
 
   pname = "home-manager";
-  version = "2019-11-17";
+  version = "2020-01-04";
 
   src = fetchFromGitHub {
     owner = "rycee";
     repo = "home-manager";
-    rev = "286dd9b3088298e5a4625b517f8e72b1c62e4f74";
-    sha256 = "0p3ba287h9a7mpj8chdgvz5qryc15qxdis3fdmv9jvl0hwsr738d";
+    rev = "1b7b1bc294e99ab1795fe7dad183c1d2ae58a099";
+    sha256 = "02kwym8n41d5ba9lccnl5q3y10sw35p1da5b66mxldfr6d930pbj";
   };
 
   nativeBuildInputs = [ makeWrapper ];
diff --git a/pkgs/tools/package-management/opkg/default.nix b/pkgs/tools/package-management/opkg/default.nix
index 05f43cf29b1..1aae0290d5a 100644
--- a/pkgs/tools/package-management/opkg/default.nix
+++ b/pkgs/tools/package-management/opkg/default.nix
@@ -2,11 +2,11 @@
 , autoreconfHook }:
 
 stdenv.mkDerivation rec {
-  version = "0.4.1";
+  version = "0.4.2";
   pname = "opkg";
   src = fetchurl {
     url = "https://downloads.yoctoproject.org/releases/opkg/opkg-${version}.tar.gz";
-    sha256 = "0hqa4lqxs3w9fmn9idzfscjkm23jw5asby43v0szcxrqgl1ixb25";
+    sha256 = "01p1a7hw9q9ixfk01djyy9axs71z1x9dkdnqz7zysmrlqi97i246";
   };
 
   nativeBuildInputs = [ pkgconfig autoreconfHook ];