From dfebb66f657240e5448a98d9efc90d4c66825274 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Tue, 30 May 2017 08:47:09 +0100 Subject: [PATCH 1/2] systemd: v232 -> v233 Changelog: https://github.com/systemd/systemd/blob/v233/NEWS Upgrade was pretty smooth. One notably change is the new hybrid cgroup mode: https://github.com/systemd/systemd/blob/v233/NEWS#L5 It should provide better compatibility with docker. --- pkgs/os-specific/linux/systemd/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/systemd/default.nix b/pkgs/os-specific/linux/systemd/default.nix index d1042723a71a..3092aba506b6 100644 --- a/pkgs/os-specific/linux/systemd/default.nix +++ b/pkgs/os-specific/linux/systemd/default.nix @@ -9,14 +9,14 @@ assert stdenv.isLinux; stdenv.mkDerivation rec { - version = "232"; + version = "233"; name = "systemd-${version}"; src = fetchFromGitHub { owner = "nixos"; repo = "systemd"; - rev = "66e778e851440fde7f20cff0c24d23538144be8d"; - sha256 = "1valz8v2q4cj0ipz2b6mh5p0rjxpy3m88gg9xa2rcc4gcmscndzk"; + rev = "a5af87e469ed3bd806d1ac34716d4f17ce9d3464"; + sha256 = "14slhk9p1f4ngxhhsmk8i1irl6jiffs1ln84ddcqc8iy22cyqvs3"; }; outputs = [ "out" "lib" "man" "dev" ]; From ea7e54be18510532458292c25263dfac53975db7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= Date: Tue, 30 May 2017 19:24:32 +0200 Subject: [PATCH 2/2] libuv: 1.11.0 -> 1.12.0 The changelog seems safe; I tried some reverse dependencies, too. --- pkgs/development/libraries/libuv/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/libuv/default.nix b/pkgs/development/libraries/libuv/default.nix index 941ab6710c2e..fdf5191bf720 100644 --- a/pkgs/development/libraries/libuv/default.nix +++ b/pkgs/development/libraries/libuv/default.nix @@ -2,19 +2,19 @@ , ApplicationServices, CoreServices }: stdenv.mkDerivation rec { - version = "1.11.0"; + version = "1.12.0"; name = "libuv-${version}"; src = fetchFromGitHub { owner = "libuv"; repo = "libuv"; rev = "v${version}"; - sha256 = "02sm7f3l0shpfz25b77q2jjvlypc1mmz4zpzfgfmiplhgxxaa6la"; + sha256 = "0m025i0sfm4iv3aiic88x4y4bbhhdb204pmd9r383fsl458fck2p"; }; postPatch = let toDisable = [ - "getnameinfo_basic" # probably network-dependent + "getnameinfo_basic" "udp_send_hang_loop" # probably network-dependent "spawn_setuid_fails" "spawn_setgid_fails" "fs_chown" # user namespaces "getaddrinfo_fail" "getaddrinfo_fail_sync" ]