nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-24 07:53:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'staging'

Browse Source 
... to combine with the mass rebuilds that are on master already.
See discussion at https://github.com/NixOS/nixpkgs/commit/2050213c54a9
This commit is contained in:
Vladimír Čunát 2017-06-02 09:09:28 +02:00
commit b829bdca1d
No known key found for this signature in database
GPG Key ID: E747DF1F9575A3AA
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/development/libraries/libuv/default.nix
View File

@ -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"
]

6
pkgs/os-specific/linux/systemd/default.nix
View File

@ -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" ];