github-actions[bot]
47de0ebf63
Merge master into staging-next
2021-06-06 06:23:08 +00:00
Sandro
27978c0ae9
Merge pull request #125829 from KarlJoad/verilator-license
...
verilator: specify lgpl3Only license
2021-06-06 03:34:59 +02:00
Karl Hallsby
38db89df05
verilator: specify lgpl3Only and artistic2 licenses
2021-06-05 20:14:54 -05:00
github-actions[bot]
51ecdeca84
Merge master into staging-next
2021-06-06 00:15:19 +00:00
Sandro
2e7cde1ba1
Merge pull request #125679 from polygon/dsview
2021-06-05 21:29:16 +02:00
github-actions[bot]
d9d6f71e43
Merge master into staging-next
2021-06-05 18:30:28 +00:00
Robert Scott
16f5b7fc92
Merge pull request #125697 from KarlJoad/update-verilator
...
verilator: 4.110 -> 4.202
2021-06-05 19:13:29 +01:00
Sandro
c037394f5f
Merge pull request #117606 from bgamari/graphia
2021-06-05 16:31:10 +02:00
github-actions[bot]
68272fcebd
Merge master into staging-next
2021-06-05 12:14:47 +00:00
Vincent Laporte
5ca9831cb1
ocamlPackages.menhir: 20190626 → 20210419
...
ocamlPackages.menhirLib: init at 20210419
ocamlPackages.menhirSdk: init at 20210419
2021-06-05 13:38:01 +02:00
github-actions[bot]
ad63c3d31f
Merge master into staging-next
2021-06-04 19:40:59 +00:00
Karl Hallsby
45288e9fec
verilator: 4.110 -> 4.202
2021-06-04 10:48:19 -05:00
Stephen Morgan
f12d58f223
geogebra6: 6-0-631-0 -> 6-0-644-0
2021-06-04 23:49:04 +10:00
Stephen Morgan
b6f4313e4a
geogebra: 5-0-620-0 -> 5-0-644-0
2021-06-04 23:48:27 +10:00
polygon
da5278cbd5
dsview: fix build
...
Unneeded extern-C scopes around glib-includes would cause build
failures. Upstream has this fixed, but the fixes are not yet part
of a new release. Apply the fixing commit from upstream master
selectively. This should be removed once there is a new upstream
release.
2021-06-04 15:44:27 +02:00
github-actions[bot]
9e56e764cd
Merge master into staging-next
2021-06-02 13:08:13 +00:00
Ben Gamari
dcfaa98677
graphia: init at 2.2
...
Graphia is a relatively new tool for graph visualisation and analysis,
in the same vain as gephi.
2021-06-02 09:07:32 -04:00
Markus Kowalewski
dd9bc408af
lammps: update GPL2 license field
2021-06-02 13:23:09 +02:00
Markus Kowalewski
ed22820646
lammps: stable_22Aug2018 -> stable_29Oct2020
2021-06-02 13:23:09 +02:00
github-actions[bot]
be7141706d
Merge master into staging-next
2021-05-31 02:05:27 +00:00
Sandro
6094bec3c3
Merge pull request #124997 from veprbl/pr/xfitter_format
...
xfitter: remove `hardeningDisable = [ "format" ];`
2021-05-31 00:56:26 +02:00
Dmitry Kalinkin
b72b3c5571
xfitter: remove hardeningDisable = [ "format" ];
...
Not needed after f42aa7e1
('cc-wrapper: set FC when langFortran is on')
2021-05-30 18:34:35 -04:00
github-actions[bot]
2867d5301f
Merge master into staging-next
2021-05-30 19:15:10 +00:00
Mauricio Collares
2c7d2ce295
sageWithDoc: fix documentation symlinks
2021-05-30 13:51:15 -03:00
github-actions[bot]
f385b431a7
Merge master into staging-next
2021-05-27 06:45:59 +00:00
R. RyanTM
089915f634
bowtie2: 2.4.3 -> 2.4.4
2021-05-26 23:43:08 -07:00
R. RyanTM
14018b71dd
mavproxy: 1.8.36 -> 1.8.37
2021-05-26 23:42:35 -07:00
github-actions[bot]
0e7ab2d48d
Merge master into staging-next
2021-05-26 18:54:42 +00:00
Gabriel Ebner
4aa2e32246
Merge pull request #124507 from collares/olean-cache-misses
...
lean: substitute release commit sha1 (so upstream oleans are compatible with nixpkgs lean)
2021-05-26 18:34:56 +02:00
Mauricio Collares
cbaf78cdaa
lean: substitute release commit sha1
2021-05-26 11:53:55 -03:00
github-actions[bot]
6d73490cb4
Merge master into staging-next
2021-05-26 01:11:31 +00:00
Pavol Rusnak
2c3cbef68d
Merge pull request #120840 from prusnak/viennarna
...
ViennaRNA: 2.4.17 -> 2.4.18
2021-05-26 00:03:55 +02:00
Pavol Rusnak
4bda49e963
ViennaRNA: 2.4.17 -> 2.4.18
2021-05-26 00:01:06 +02:00
Ryan Mulligan
e2d59eee64
Merge pull request #124094 from r-ryantm/auto-update/marvin
...
marvin: 21.3.0 -> 21.9.0
2021-05-25 12:42:45 -07:00
R. RyanTM
cb70ce62ab
marvin: 21.3.0 -> 21.9.0
2021-05-23 02:24:31 +00:00
Jonathan Ringer
b9b9cdb87c
Merge remote-tracking branch 'origin/staging' into staging-next
2021-05-22 19:23:14 -07:00
Jonathan Ringer
11a9ac00fc
Merge remote-tracking branch 'origin/master' into staging-next
...
Conflicts:
pkgs/tools/networking/xh/default.nix
2021-05-22 18:19:10 -07:00
Sandro Jäckel
d6ff646b3f
pythonPackages.smart_open: rename to smart-open
2021-05-22 15:02:50 -07:00
Stéphan Kochen
c47425a230
sambamba: fix darwin build
2021-05-22 20:56:09 +02:00
github-actions[bot]
d5714df652
Merge staging-next into staging
2021-05-22 06:21:58 +00:00
github-actions[bot]
cc35c7fc85
Merge master into staging-next
2021-05-22 06:21:55 +00:00
Robert Scott
bcc99b83d0
libpoly: fix darwin build
...
issue reported upstream
2021-05-21 20:21:20 -07:00
Michael Raskin
d0fd8a029d
Merge pull request #123281 from r-ryantm/auto-update/jmol
...
jmol: 14.31.38 -> 14.31.39
2021-05-21 19:42:56 +00:00
Jonathan Ringer
6b15fdce86
Merge remote-tracking branch 'origin/master' into staging-next
...
Conflicts:
pkgs/shells/ion/default.nix
pkgs/tools/misc/cicero-tui/default.nix
2021-05-20 22:11:42 -07:00
Mauricio Collares
22c86a0466
sageWithDoc: fix static asset deduplication
2021-05-20 18:29:02 -07:00
Mauricio Collares
874d1aba74
sageWithDoc: update sagedoc.py test for sphinx 3.5
2021-05-20 18:29:02 -07:00
Mauricio Collares
cd9e8e284c
sage: fix deprecation warning from matplotlib upgrade
2021-05-20 18:29:02 -07:00
Jonathan Ringer
14f3686af1
Merge remote-tracking branch 'origin/master' into staging-next
...
Conflicts:
pkgs/applications/terminal-emulators/alacritty/default.nix
pkgs/servers/clickhouse/default.nix
2021-05-20 09:12:42 -07:00
markuskowa
b0b97660af
Merge pull request #123667 from markuskowa/upd-molcas
...
openmolcas: 20.10 -> 21.02
2021-05-19 23:17:31 +02:00
Jonathan Ringer
c1f8a15dac
Merge remote-tracking branch 'origin/master' into staging-next
...
Conflicts:
nixos/doc/manual/release-notes/rl-2105.xml
pkgs/tools/security/sequoia/default.nix
2021-05-19 10:39:54 -07:00