diff options
author | Orivej Desh <orivej@gmx.fr> | 2017-11-17 18:06:22 +0000 |
---|---|---|
committer | Orivej Desh <orivej@gmx.fr> | 2017-11-17 18:06:22 +0000 |
commit | 1161741351cbc60581eaecb4df2e1036b1fafd55 (patch) | |
tree | 6c39e36cc3ebeb91d502900c95d33cc26aec7b22 /pkgs/development/compilers | |
parent | eb3653482008bf791da71613714294ed4dbfef52 (diff) | |
parent | 73598e3787b34385d04e46830e9a7fdf89cc8ede (diff) | |
download | nixlib-1161741351cbc60581eaecb4df2e1036b1fafd55.tar nixlib-1161741351cbc60581eaecb4df2e1036b1fafd55.tar.gz nixlib-1161741351cbc60581eaecb4df2e1036b1fafd55.tar.bz2 nixlib-1161741351cbc60581eaecb4df2e1036b1fafd55.tar.lz nixlib-1161741351cbc60581eaecb4df2e1036b1fafd55.tar.xz nixlib-1161741351cbc60581eaecb4df2e1036b1fafd55.tar.zst nixlib-1161741351cbc60581eaecb4df2e1036b1fafd55.zip |
Merge branch 'master' into staging
* master: (28 commits) go_1_9: skip flaky TestWaitGroupMisuse2 erlangR18: fix patch hashes with fetchpatch xml2: replace dead links nixos/pam: fix docs about path to u2f_keys file cinelerra: add a note about parallel building msmtp: install docs and examples (#31769) kernel: Fix out-of-tree modules on aarch64 nixos/tests/acme: update terms of service to fix test gixy: init at 0.1.8 pythonPackages.ConfigArgParse: 0.9.3 -> 0.12.0, refactor, move to python-modules mono: init at 4.8 wal-g: fix license so not to break evaluation wal-g: init at 0.1.2 maintainers: add backuitist nixos/prometheus: Correct documentation for external_labels spidermonkey: replace broken links vagrant: removed custom rake gem vagrant: 2.0.0 -> 2.0.1 nixos/prometheus: add external_labels option nixos/prometheus: add scrape_configs.honor_labels ...
Diffstat (limited to 'pkgs/development/compilers')
-rw-r--r-- | pkgs/development/compilers/go/1.9.nix | 1 | ||||
-rw-r--r-- | pkgs/development/compilers/go/go-1.9-skip-flaky-20072.patch | 20 | ||||
-rw-r--r-- | pkgs/development/compilers/mono/4.8.nix | 7 | ||||
-rw-r--r-- | pkgs/development/compilers/rust/rust-src.nix | 11 |
4 files changed, 39 insertions, 0 deletions
diff --git a/pkgs/development/compilers/go/1.9.nix b/pkgs/development/compilers/go/1.9.nix index b8660008d941..007b81d995b7 100644 --- a/pkgs/development/compilers/go/1.9.nix +++ b/pkgs/development/compilers/go/1.9.nix @@ -119,6 +119,7 @@ stdenv.mkDerivation rec { ./creds-test.patch ./remove-test-pie-1.9.patch ./go-1.9-skip-flaky-19608.patch + ./go-1.9-skip-flaky-20072.patch ]; postPatch = optionalString stdenv.isDarwin '' diff --git a/pkgs/development/compilers/go/go-1.9-skip-flaky-20072.patch b/pkgs/development/compilers/go/go-1.9-skip-flaky-20072.patch new file mode 100644 index 000000000000..13db40ababc3 --- /dev/null +++ b/pkgs/development/compilers/go/go-1.9-skip-flaky-20072.patch @@ -0,0 +1,20 @@ +diff --git a/src/sync/waitgroup_test.go b/src/sync/waitgroup_test.go +index e3e3096..f80d1e2 100644 +--- a/src/sync/waitgroup_test.go ++++ b/src/sync/waitgroup_test.go +@@ -6,6 +6,7 @@ package sync_test + + import ( + "internal/race" ++ "internal/testenv" + "runtime" + . "sync" + "sync/atomic" +@@ -73,6 +74,7 @@ func TestWaitGroupMisuse2(t *testing.T) { + if runtime.NumCPU() <= 4 { + t.Skip("NumCPU<=4, skipping: this test requires parallelism") + } ++ testenv.SkipFlaky(t, 20072) + defer func() { + err := recover() + if err != "sync: negative WaitGroup counter" && diff --git a/pkgs/development/compilers/mono/4.8.nix b/pkgs/development/compilers/mono/4.8.nix new file mode 100644 index 000000000000..6d870ae30680 --- /dev/null +++ b/pkgs/development/compilers/mono/4.8.nix @@ -0,0 +1,7 @@ +{ stdenv, callPackage, Foundation, libobjc }: + +callPackage ./generic-cmake.nix (rec { + inherit Foundation libobjc; + version = "4.8.1.0"; + sha256 = "1vyvp2g28ihcgxgxr8nhzyzdmzicsh5djzk8dk1hj5p5f2k3ijqq"; +}) diff --git a/pkgs/development/compilers/rust/rust-src.nix b/pkgs/development/compilers/rust/rust-src.nix new file mode 100644 index 000000000000..1b819a7f6068 --- /dev/null +++ b/pkgs/development/compilers/rust/rust-src.nix @@ -0,0 +1,11 @@ +{ stdenv, rustc }: + +stdenv.mkDerivation { + name = "rust-src"; + src = rustc.src; + phases = [ "unpackPhase" "installPhase" ]; + installPhase = '' + mv src $out + rm -rf $out/{ci,doc,driver,etc,grammar,llvm,rt,rtstartup,rustllvm,test,tools,vendor} + ''; +} |