Commit Graph

8619 Commits

Author SHA1 Message Date
Jan Tojnar
a821be7531
Merge branch 'master' into staging-next 2020-11-05 09:42:47 +01:00
Daniël de Kok
341aa3d3e0
Merge pull request #102602 from danieldk/rocm-3.9.0
Update ROCm to 3.9.0
2020-11-05 06:59:28 +01:00
Ryan Burns
33eb9cd961 rustc: enable on ppc64le 2020-11-04 20:56:54 -08:00
Tim Steinbach
41f017c564
Merge pull request #102360 from asbachb/update/openjdk8
openjdk: 1.8.0_265 -> 1.8.0_272
2020-11-04 10:00:42 -05:00
Tim Steinbach
0c2a0edf9e
Merge pull request #102293 from asbachb/update/openjdk
openjdk: 11.0.8 -> 11.0.9
2020-11-04 09:59:46 -05:00
Michael Weiss
58c76844d7
llvm_11: Add myself as maintainer
Because I maintain Chromium which always requires the most recent LLVM
release (would be good to get notified on any PRs/issues, especially
since I seem to end up merging most of the PRs anyway).

See #100725.
2020-11-04 13:23:08 +01:00
Frederik Rietdijk
10c57af49c Merge staging-next into staging 2020-11-04 09:28:07 +01:00
Frederik Rietdijk
9e6d7d3c74 Merge master into staging-next 2020-11-04 09:27:42 +01:00
R. RyanTM
39ed1364d4 owl-lisp: 0.1.19 -> 0.1.23 2020-11-04 11:13:06 +08:00
Kevin Cox
dc79731ae0
Merge pull request #99631 from glittershark/graalvm-ce
graalvm{8,11}-ce: init at 20.2.0
2020-11-03 18:39:11 -05:00
Kevin Cox
e031671e19
Merge pull request #100202 from OPNA2608/update/halide-10.0.0
halide: 2019.08.27 -> 10.0.0, enable on aarch64-linux
2020-11-03 18:19:40 -05:00
Vladimír Čunát
a31fd3cb7f
Merge #102614: haskell.compiler.ghc8102BinaryMinimal: init 2020-11-03 19:54:09 +01:00
R. RyanTM
f2c96ec734 gleam: 0.11.2 -> 0.12.0 2020-11-03 08:50:54 -08:00
Frederik Rietdijk
470f05cb5d Merge staging-next into staging 2020-11-03 12:06:41 +01:00
Frederik Rietdijk
237966224d Merge master into staging-next 2020-11-03 12:06:06 +01:00
Robert Hensing
f8ad73b9d8 haskell.compiler.ghc8102BinaryMinimal: init
To stay within hydra limit of 2^31 output size on aarch64-linux
2020-11-03 12:01:41 +01:00
Daniël de Kok
adcf19774c llvmPackages_rocm: 3.8.0 -> 3.9.0
Also fix lld path in the installed CMake files.
2020-11-03 08:47:50 +01:00
Pavol Rusnak
2c931312ce treewide: simplify rev/repo arguments in src
+ use fetchFromGithub where possible
2020-11-01 23:02:24 -08:00
Benjamin Asbach
5db66b2678 openjdk:openjdk8: 1.8.0_265 -> 1.8.0_272 2020-11-01 17:02:02 +01:00
Frederik Rietdijk
83dde6c52c Merge staging-next into staging 2020-11-01 10:11:12 +01:00
Benjamin Asbach
e65953742b openjdk: 11.0.8 -> 11.0.9 2020-11-01 01:00:13 +01:00
Vladimír Čunát
dfd3ede68d
Merge branch 'master' into staging-next 2020-10-31 14:30:44 +01:00
WORLDofPEACE
7bee257d88
Merge pull request #101438 from nora-puchreiner/patch-1
graalvm8-ee, graalvm11-ee: 20.0.0 -> 20.2.1
2020-10-31 04:01:19 -04:00
Mario Rodas
e250fef768
Merge pull request #99920 from ericdallo/add-dart-to-flutter
flutter: Bump and add dart cache to flutter
2020-10-30 08:56:54 -05:00
Eric Dallo
bee3fb885f
flutter: Add dart cache to flutter 2020-10-30 09:58:06 -03:00
Michael Raskin
193636b3ea
Merge pull request #102105 from r-ryantm/auto-update/abcl
abcl: 1.7.1 -> 1.8.0
2020-10-30 12:09:14 +00:00
R. RyanTM
6a9f56b82d abcl: 1.7.1 -> 1.8.0 2020-10-29 21:42:11 +00:00
Vincent Laporte
2ccfc2962e opa: build with OCaml 4.03 2020-10-29 06:35:15 +01:00
Vladimír Čunát
0b32140b34
Merge branch 'staging-next' into staging 2020-10-28 18:48:56 +01:00
Vladimír Čunát
31839c352e
Merge branch 'master' into staging-next 2020-10-28 18:48:18 +01:00
Andreas Rammhold
db0fe5c3eb
Merge branch master into staging to fix eval error
This fixes the eval error of the small (and "big"?) NixOS test set that
was fixed in 1088f05 & eba8f542.
2020-10-28 03:03:27 +01:00
Ben Siraphob
db74029e3e treewide: remove package names from prefix of descriptions 2020-10-27 09:15:07 -07:00
zowoq
8c9bb91c34 go_bootstrap: disable failing timezone tests 2020-10-28 00:37:40 +10:00
Ben Siraphob
5f0bf8d30e miranda: remove gcc as buildInput 2020-10-26 20:29:04 +07:00
WilliButz
c48a9a6b53
Merge pull request #101505 from TredwellGit/nasm
nasm: 2.14.02 -> 2.15.05 (CVE-2019-6290 CVE-2019-6291 CVE-2019-8343 CVE-2019-14248 CVE-2019-20334)
2020-10-26 14:09:53 +01:00
Ryan Mulligan
eaa1f5737b
Merge pull request #101700 from r-ryantm/auto-update/mlkit
mlkit: 4.5.0 -> 4.5.1
2020-10-26 05:38:06 -07:00
Vladimír Čunát
89023c38fc
Recover the complicated situation after my bad merge
I made a mistake merge.  Reverting it in c778945806 undid the state
on master, but now I realize it crippled the git merge mechanism.
As the merge contained a mix of commits from `master..staging-next`
and other commits from `staging-next..staging`, it got the
`staging-next` branch into a state that was difficult to recover.

I reconstructed the "desired" state of staging-next tree by:
 - checking out the last commit of the problematic range: 4effe769e2
 - `git rebase -i --preserve-merges a8a018ddc0` - dropping the mistaken
   merge commit and its revert from that range (while keeping
   reapplication from 4effe769e2)
 - merging the last unaffected staging-next commit (803ca85c20)
 - fortunately no other commits have been pushed to staging-next yet
 - applying a diff on staging-next to get it into that state
2020-10-26 09:01:04 +01:00
Vladimír Čunát
336bc8283b
Re-Revert "Merge #101508: libraw: 0.20.0 -> 0.20.2"
This reverts commit c778945806.

I believe this is exactly what brings the staging branch into
the right shape after the last merge from master (through staging-next);
otherwise part of staging changes would be lost
(due to being already reachable from master but reverted).
2020-10-26 08:19:17 +01:00
Jan Tojnar
3825e74193 treewide: drop gnome2.pango alias 2020-10-25 23:48:29 +01:00
R. RyanTM
317462428a mlkit: 4.5.0 -> 4.5.1 2020-10-25 21:59:26 +00:00
Alyssa Ross
f20b89d1d4 dtc,python.pkgs.libfdt: drop python buildInput
This doesn't seem to be necessary to build the library with
strictDeps = true, or when cross-compiling.
2020-10-25 10:55:52 -04:00
Ben Siraphob
c98962e1a3 treewide: remove periods from end of package descriptions 2020-10-25 20:13:18 +07:00
Vladimír Čunát
2f6b00b15e
Merge branch 'staging-next' into staging 2020-10-25 09:47:04 +01:00
Vladimír Čunát
4bd836b381
Merge branch 'master' into staging-next 2020-10-25 09:46:04 +01:00
Vladimír Čunát
c778945806
Revert "Merge #101508: libraw: 0.20.0 -> 0.20.2"
I'm sorry; I didn't notice it contained staging commits.

This reverts commit 17f5305b6c, reversing
changes made to a8a018ddc0.
2020-10-25 09:41:51 +01:00
Vladimír Čunát
17f5305b6c
Merge #101508: libraw: 0.20.0 -> 0.20.2 2020-10-25 09:28:53 +01:00
Michael Raskin
571d45fea6 sbcl: 2.0.0 -> 2.0.8 2020-10-24 12:52:16 +02:00
Michael Raskin
21ada4cf89 sbcl: add 2.0.9 2020-10-24 10:34:56 +02:00
Dennis Gosnell
81881f2a1d
Merge pull request #101214 from lostnet/ghcpr1a
ghc:8.10.2Binary bootstrap for 8.8 on aarch64 (NixOS#97407)
2020-10-24 17:33:55 +09:00
WORLDofPEACE
949f7f9227
Merge pull request #98316 from NixOS/gnome-3.38
GNOME 3.38
2020-10-23 20:02:38 -04:00