Commit graph

4528 commits

Author SHA1 Message Date
github-actions[bot] 49b8e6f7d4
Merge master into staging-next 2021-05-11 00:48:15 +00:00
maralorn 881d2af5ee
Merge pull request #122286 from NixOS/haskell-updates 2021-05-11 02:31:06 +02:00
Malte Brandy 39c0dd99a4
tamarin-prover: Mark broken 2021-05-11 01:56:48 +02:00
Sandro 0a3c566d56
Merge pull request #122396 from jbedo/octopus
octopus: 0.7.3 -> 0.7.4
2021-05-11 01:19:54 +02:00
Justin Bedo 40eeb2c6d3
octopus: 0.7.3 -> 0.7.4 2021-05-11 08:46:00 +10:00
Sandro d2ea330f62
Merge pull request #122482 from hjones2199/kstars353 2021-05-11 00:22:01 +02:00
Hunter Jones d4077929d6 kstars: 3.5.2 -> 3.5.3 2021-05-10 15:16:04 -05:00
github-actions[bot] 61fa3fdde8
Merge master into staging-next 2021-05-10 18:28:17 +00:00
Ryan Mulligan c72c9f46e2
Merge pull request #122391 from r-ryantm/auto-update/jmol
jmol: 14.31.36 -> 14.31.38
2021-05-10 10:17:33 -07:00
github-actions[bot] 1e3d91bd19
Merge master into staging-next 2021-05-10 00:48:32 +00:00
R. RyanTM 4ff0c782a3 jmol: 14.31.36 -> 14.31.38 2021-05-09 20:32:06 +00:00
Ben Siraphob 418a37d99c coq2html: 20170720 -> 1.2 2021-05-09 22:00:15 +02:00
Vladimír Čunát 5663b2b2d3
Merge branch 'master' into staging-next
(a trivial conflict in transmission)
2021-05-09 09:31:55 +02:00
R. RyanTM 2c143443f7 libpoly: 0.1.8 -> 0.1.9 2021-05-08 18:34:00 -07:00
R. RyanTM 5ab09faafb gretl: 2021a -> 2021b 2021-05-08 17:11:36 -07:00
Martin Weinelt 9651084620 Merge remote-tracking branch 'origin/master' into staging-next 2021-05-08 14:43:43 +02:00
Jonathan Ringer 1d85caaa26 root: fix build 2021-05-08 01:29:18 -07:00
Jan Tojnar 468cb5980b gnome: rename from gnome3
Since GNOME version is now 40, it no longer makes sense to use the old attribute name.
2021-05-08 09:47:42 +02:00
github-actions[bot] b4416b52c5
Merge master into staging-next 2021-05-08 00:46:50 +00:00
Malte Brandy 2a11f1f5cc
Merge branch 'master' into haskell-updates 2021-05-07 15:03:54 +02:00
github-actions[bot] 12193913a1
Merge staging-next into staging 2021-05-07 12:23:21 +00:00
Robert Hensing aaec26af39
Merge pull request #121896 from raboof/extract-version-test-to-utility
test-utilities: version test
2021-05-07 11:56:01 +02:00
Arnout Engelen b68130fd2c
test-utilities: version test
Extract 'version test' to a reusable test utility as discussed in
https://github.com/NixOS/nixpkgs/pull/119636#issuecomment-826137021 and
2021-05-07 09:53:35 +02:00
sternenseemann eaeb69862c petrinizer: restrict platforms by sbv
sbv has the most limited range of platforms of the dependencies.
2021-05-06 16:24:58 +02:00
sternenseemann 73c2dd4aa6 petrinizer: fix build
* take z3 haskell package from haskellPackages
* take sbv 7.13 from haskellPackages, apply patch fixing build
  with GHC >= 8.8.8
2021-05-06 11:43:59 +02:00
github-actions[bot] dbc1478d23
Merge staging-next into staging 2021-05-05 06:21:29 +00:00
R. RyanTM 59cd52dc40 gmsh: 4.8.3 -> 4.8.4 2021-05-05 01:26:49 -04:00
github-actions[bot] 98d7aac597
Merge staging-next into staging 2021-05-04 00:49:43 +00:00
Dmitry Kalinkin 1cfcfccc6e
Merge pull request #121411 from veprbl/pr/xfitter_darwin_fix
xfitter: fix for darwin
2021-05-03 17:37:34 -04:00
github-actions[bot] 5e177b16b1
Merge staging-next into staging 2021-05-03 18:25:49 +00:00
edef 4e4c45efac
Merge pull request #121375 from deviant/bump-rink
rink: 0.6.0 -> 0.6.1
2021-05-03 13:57:36 +00:00
github-actions[bot] a4c3a2d732
Merge staging-next into staging 2021-05-03 12:26:48 +00:00
Gabriel Ebner 62458574e3
Merge pull request #121361 from r-ryantm/auto-update/lean
lean: 3.29.0 -> 3.30.0
2021-05-03 11:13:53 +02:00
github-actions[bot] a7e07bddd5
Merge staging-next into staging 2021-05-02 12:24:53 +00:00
Luke Granger-Brown 884cf29501 dcm2niix: 1.0.20201102 -> 1.0.20210317 2021-05-02 11:10:40 +00:00
R. RyanTM ad5f251230 dcm2niix: 1.0.20200331 -> 1.0.20201102 2021-05-02 03:14:11 +00:00
github-actions[bot] e6037ce5fe
Merge staging-next into staging 2021-05-02 00:58:46 +00:00
Luke Granger-Brown ebf371726d sumorobot-manager: fix compilation 2021-05-02 00:12:19 +00:00
R. RyanTM 99f8bc3e03 sumorobot-manager: 0.9.0 -> 1.0.0 2021-05-02 00:02:46 +00:00
github-actions[bot] 49721bed32
Merge staging-next into staging 2021-05-01 18:26:21 +00:00
Dmitry Kalinkin c846fa1674
xfitter: fix for darwin
Fixes: 8984fc29 ('xfitter: fix build w/glibc-2.32')
2021-05-01 13:15:06 -04:00
Sandro 4b2c9640e7
Merge pull request #120613 from erikbackman/master 2021-05-01 18:42:40 +02:00
V 5a835e6e92 rink: 0.6.0 -> 0.6.1 2021-05-01 10:46:51 +02:00
R. RyanTM 96e1cc0768 lean: 3.29.0 -> 3.30.0 2021-05-01 05:49:45 +00:00
John Ericson 17305d2df0
Merge pull request #111487 from Ericson2314/llvm-outputs-and-cross-compile-tools
llvmPackages: Clean up outputs
2021-04-30 11:28:08 -04:00
github-actions[bot] d7882499f8
Merge staging-next into staging 2021-04-30 12:26:14 +00:00
Michael Raskin ee4684f052
Merge pull request #117716 from idontgetoutmuch/master
Fix https://github.com/NixOS/nixpkgs/issues/117715
2021-04-30 07:28:43 +00:00
Andrew Childs 7869d16545 llvmPackages: Multuple outputs for everythting
Also begin to start work on cross compilation, though that will have to
be finished later.

The patches are based on the first version of
https://reviews.llvm.org/D99484. It's very annoying to do the
back-porting but the review has uncovered nothing super major so I'm
fine sticking with what I've got.

Beyond making the outputs work, I also strove to re-sync the packages,
as they have been drifting pointlessly apart for some time.

----

Other misc notes, highly incomplete

- lvm-config-native and llvm-config are put in `dev` because they are
  tools just for build time.

- Clang no longer has an lld dep. That was introduced in
  db29857eb3, but if clang needs help
  finding lld when it is used we should just pass it flags / put in the
  resource dir. Providing it at build time increases critical path
  length for no good reason.

----

A note on `nativeCC`:

`stdenv` takes tools from the previous stage, so:

1. `pkgsBuildBuild`: `(?1, x, x)`
2. `pkgsBuildBuild.stdenv.cc`: `(?0, ?1, x)`

while:

1. `pkgsBuildBuild`: `(?1, x, x)`
2. `pkgsBuildBuild.targetPackages`: `(x, x, ?2)`
3. `pkgsBuildBuild.targetPackages.stdenv.cc`: `(?1, x, x)`
2021-04-30 05:41:00 +00:00
github-actions[bot] 3ad64733d9
Merge staging-next into staging 2021-04-29 18:28:08 +00:00
Dominic Steinitz 732ab3d4e2 Incorporate suggeston by collares 2021-04-29 17:34:34 +01:00