Commit graph

8587 commits

Author SHA1 Message Date
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
Doron Behar
10944d9701
vala_0_48: 0.48.7 -> 0.48.9 2020-10-24 01:14:04 +02:00
Jan Tojnar
8317c630af
Merge branch 'staging-next' into staging 2020-10-24 01:10:37 +02:00
Jan Tojnar
c252654584
Merge branch 'master' into staging-next 2020-10-24 01:10:07 +02:00
TredwellGit
3b7f2b006e nasm: 2.14.02 -> 2.15.05
https://nasm.us/doc/nasmdocc.html
https://nvd.nist.gov/vuln/detail/CVE-2019-6290
https://nvd.nist.gov/vuln/detail/CVE-2019-6291
https://nvd.nist.gov/vuln/detail/CVE-2019-8343
https://nvd.nist.gov/vuln/detail/CVE-2019-14248
https://nvd.nist.gov/vuln/detail/CVE-2019-20334
2020-10-23 22:12:18 +00:00
Masanori Ogino
b57fc1fc48 ecl: 16.1.3 -> 20.4.24, eql-git: fix build
Signed-off-by: Masanori Ogino <167209+omasanori@users.noreply.github.com>
2020-10-23 07:53:09 +09:00
Jan Tojnar
3e01d383ee
Merge branch 'staging-next' into staging 2020-10-22 21:20:32 +02:00
Jan Tojnar
d13fc932cd
Merge branch 'master' into staging-next 2020-10-22 21:20:14 +02:00
Will Young
1c2ee215ab ghc:8.10.2Binary bootstrap for 8.8 on aarch64 (NixOS#97407) 2020-10-21 21:13:22 +02:00
Austin Seipp
4a020671f1
chez-scheme: 9.5.2 -> 9.5.4
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2020-10-21 13:05:34 -05:00
Daiderd Jordan
bb0b872b61
Merge pull request #100388 from thefloweringash/darwin-dylib-names-hook
treewide: move fixDarwinDylibNames to nativeBuildInputs
2020-10-21 19:25:48 +02:00
Andrew Childs
722d02a720 treewide: move fixDarwinDylibNames to nativeBuildInputs
This hook runs at build time and depends on executing
install_name_tool from binutils.
2020-10-21 13:26:53 +09:00
Frederik Rietdijk
23890fc236 Merge staging-next into staging 2020-10-20 20:55:46 +02:00
Austin Seipp
a7e87bdd58
yosys: 2020.08.22 -> 2020.10.20
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2020-10-20 09:52:41 -05:00
Austin Seipp
232a0c2a90
picat: 3.0 -> 3.0p2
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2020-10-20 09:52:41 -05:00
Jared Ramirez
8545f5d1b8 elmPackages: update 2020-10-19 21:47:39 -07:00
Jan Tojnar
5c766c5c24
Merge branch 'staging-next' into staging 2020-10-18 21:21:03 +02:00
Vladimír Čunát
5aca3498a6
Merge #92704: gcc: Improve manpage symlinks 2020-10-18 11:56:39 +02:00
Vladimír Čunát
04821fbe46
Merge #93333: julia: Remove version 0.7 and 1.1 2020-10-18 10:29:04 +02:00
Ben Siraphob
683a87dbeb treewide: remove periods from end of package descriptions 2020-10-17 08:22:31 -07:00
Emery Hemingway
bce139db2b Revert "nim: 1.2.6 -> 1.4.0"
Source tarball has changed.

This reverts commit bb99a0d9a8.
2020-10-17 14:58:58 +02:00
Gabor Greif
35f62abdf8
lldb_{10, 11}: polish the cmakeFlags (#100070)
disable RTTI in a more idiomatic way
2020-10-16 19:42:37 +02:00
Emery Hemingway
bb99a0d9a8 nim: 1.2.6 -> 1.4.0 2020-10-16 16:07:50 +02:00
Michael Weiss
86a4a50e10
Merge pull request #99984 from ggreif/darwin-llvm11
llvmPackages_11: 11.0.0rc5 -> 11.0.0 and various fixes/improvements:
- llvmPackages_11 now compiles on Darwin
- libcxx now compiles on Linux
- Ported #91293 to 11.0.0
- Try to anticipate #100388
2020-10-16 14:57:33 +02:00
Holger Wünsche
6948875e73
llvmPackages_11.compiler-rt: enable support for i486 i586 i686
compiler-rt (and as a result clang) can't be build for i686 (as noticed here: #99984).
The patch adds the required variables and should result in the same behavior as in the nixpkgs-llvm10. It essentially forces to use i386 buildins when using i486, i586 or i686, which are not supported.

Fixes #100392
2020-10-16 14:35:22 +02:00
Timo Kaufmann
5dcc786fb5
Merge pull request #100612 from timokau/swiProlog-8.3.9
swiProlog: 8.1.15 -> 8.3.9
2020-10-15 23:46:26 +02:00
Timo Kaufmann
959b818a89 swiProlog: 8.1.26 -> 8.3.9 2020-10-15 17:25:55 +02:00
Timo Kaufmann
8c6fe8eb61 swiProlog: 8.1.15 -> 8.1.26 2020-10-15 17:19:36 +02:00
Gabor Greif
7a30df9225 clang_11: forward-port #91293 2020-10-15 15:00:55 +02:00