Commit graph

5362 commits

Author SHA1 Message Date
github-actions[bot]
784572e7cf
Merge master into staging-next 2021-12-13 18:01:18 +00:00
Dmitry Kalinkin
8f0a587d4a
z3: fix darwin build 2021-12-13 07:42:47 -05:00
Oleksii Filonenko
a400948064
Merge pull request #149167 from r-ryantm/auto-update/rink
rink: 0.6.1 -> 0.6.2
2021-12-13 14:40:57 +02:00
Martin Weinelt
423119b70b
Merge branch 'master' into staging-next 2021-12-13 12:20:07 +01:00
Felix Buehler
4cc23f2b1e why3.withProvers: add dontUnpack 2021-12-12 20:33:14 +01:00
Dmitry Kalinkin
1dcb22acc9
Merge branch 'master' into staging-next
Conflicts:
	pkgs/development/python-modules/gdown/default.nix
2021-12-12 00:00:04 -05:00
Mario Rodas
e09a539ccb
Merge pull request #150166 from r-ryantm/auto-update/gmsh
gmsh: 4.8.4 -> 4.9.0
2021-12-11 22:52:19 -05:00
Ryan Mulligan
9e570d0034
Merge pull request #150031 from r-ryantm/auto-update/jmol
jmol: 14.31.49 -> 14.32.2
2021-12-11 16:23:05 -08:00
Dmitry Kalinkin
b6b59334bb
Merge branch 'master' into staging-next
Conflicts:
	pkgs/development/python-modules/celery/default.nix
	pkgs/development/python-modules/kombu/default.nix
2021-12-11 13:15:49 -05:00
Jörg Thalheim
453b06c677
Merge pull request #150121 from markuskowa/fix-cp2k
cp2k: make elpa optional
2021-12-11 14:04:41 +00:00
Jörg Thalheim
4e5d03cd21
Merge pull request #150111 from r-ryantm/auto-update/gretl
gretl: 2021b -> 2021d
2021-12-11 13:34:40 +00:00
Jörg Thalheim
953bdd43bf
Merge pull request #150124 from r-ryantm/auto-update/gwyddion
gwyddion: 2.59 -> 2.60
2021-12-11 13:31:59 +00:00
Jörg Thalheim
2a322411ff
Merge pull request #150217 from r-ryantm/auto-update/cryptoverif
cryptoverif: 2.04 -> 2.05
2021-12-11 12:53:42 +00:00
R. Ryantm
50554a43cf cryptoverif: 2.04 -> 2.05 2021-12-11 10:05:51 +00:00
R. Ryantm
2d939d3262 gmsh: 4.8.4 -> 4.9.0 2021-12-11 01:08:58 +00:00
R. Ryantm
7bbf6a048b gwyddion: 2.59 -> 2.60 2021-12-10 20:19:55 +00:00
Markus Kowalewski
6d1f54dc5d
cp2k: make elpa optional 2021-12-10 20:56:21 +01:00
R. Ryantm
7abc2f38b4 gretl: 2021b -> 2021d 2021-12-10 19:06:52 +00:00
github-actions[bot]
cc51bd619c
Merge master into staging-next 2021-12-10 18:01:06 +00:00
Ryan Mulligan
76d64cf517
Merge pull request #149908 from r-ryantm/auto-update/marvin
marvin: 21.9.0 -> 21.18.0
2021-12-10 06:36:30 -08:00
R. Ryantm
a1fa86e691 jmol: 14.31.49 -> 14.32.2 2021-12-10 10:13:57 +00:00
github-actions[bot]
b2a2a5759e
Merge master into staging-next 2021-12-10 06:01:17 +00:00
Maximilian Bosch
c87f93843c
Merge pull request #148905 from r-ryantm/auto-update/calc
calc: 2.13.0.1 -> 2.14.0.8
2021-12-10 01:22:16 +01:00
github-actions[bot]
92aabc6576
Merge master into staging-next 2021-12-10 00:01:53 +00:00
7c6f434c
26b52ea6a6
Merge pull request #149596 from r-ryantm/auto-update/polymake
polymake: 4.4 -> 4.5
2021-12-09 22:48:21 +00:00
R. Ryantm
806d3e25cd marvin: 21.9.0 -> 21.18.0 2021-12-09 19:20:04 +00:00
github-actions[bot]
379c22dbb3
Merge master into staging-next 2021-12-09 18:01:06 +00:00
Vincent Laporte
a2dc97cd5c proverif: 2.03 → 2.04 2021-12-09 17:45:15 +01:00
Vincent Laporte
a160defe64 coq_8_15: init at 8.15+rc1 2021-12-09 15:46:06 +01:00
Alyssa Ross
c9a581b05f
Merge remote-tracking branch 'nixpkgs/master' into staging-next
CONFLICT (rename/add): Rename pkgs/development/python-modules/jsonwatch/default.nix->pkgs/tools/misc/jsonwatch/default.nix in nixpkgs/master.  Added pkgs/tools/misc/jsonwatch/default.nix in HEAD
2021-12-09 01:43:58 +00:00
Jörg Thalheim
2808a3bc74
Merge pull request #149465 from r-ryantm/auto-update/openmvg
openmvg: 1.6 -> 2.0
2021-12-08 15:15:48 +00:00
R. Ryantm
5a5f052be8 polymake: 4.4 -> 4.5 2021-12-08 10:49:07 +00:00
Alyssa Ross
16fb150e03
Merge remote-tracking branch 'nixpkgs/master' into staging-next
Conflicts:
	pkgs/development/libraries/libunwind/default.nix
2021-12-07 23:56:16 +00:00
R. Ryantm
3112fe2ace openmvg: 1.6 -> 2.0 2021-12-07 20:17:43 +00:00
R. Ryantm
817561795f logisim-evolution: 3.7.1 -> 3.7.2 2021-12-07 12:21:37 +00:00
Jonathan Ringer
9dd8bffe92
Merge remote-tracking branch 'origin/master' into staging-next
Conflicts:
	pkgs/development/python-modules/aiocron/default.nix
2021-12-07 00:11:07 -08:00
Artturi
84bd0d6b7b
Merge pull request #147023 from wackbyte/fix-groove
groove: 5.7.4 -> 5.8.1 and jre -> jre8
2021-12-07 05:12:15 +02:00
R. Ryantm
5517f74759 rink: 0.6.1 -> 0.6.2 2021-12-06 23:57:17 +00:00
github-actions[bot]
ffbac7335b
Merge master into staging-next 2021-12-06 18:01:23 +00:00
7c6f434c
67f094f56b
Merge pull request #149043 from 7c6f434c/golly-update
golly: 3.3 -> 4.1
2021-12-06 16:17:35 +00:00
Michael Raskin
65b2df8b45 golly: 3.3 -> 4.1 2021-12-06 16:27:09 +01:00
R. Ryantm
d5368e3bdb clingo: 5.5.0 -> 5.5.1 2021-12-06 09:34:25 +00:00
R. Ryantm
6c000f4835 calc: 2.13.0.1 -> 2.14.0.8 2021-12-06 07:03:08 +00:00
github-actions[bot]
5a1288f93b
Merge master into staging-next 2021-12-05 00:01:53 +00:00
Justin Bedő
711ef56370
Merge pull request #148514 from jbedo/picard
picard-tools: 2.26.4 -> 2.26.6
2021-12-05 06:56:25 +11:00
github-actions[bot]
67691cf506
Merge master into staging-next 2021-12-04 00:01:30 +00:00
markuskowa
660a7744c6
Merge pull request #148303 from markuskowa/add-elpa
elpa: init at 2021.05.002_bugfix
2021-12-03 22:52:58 +01:00
markuskowa
0016232876
Merge pull request #148350 from jbedo/genmap
genmap: init 1.3.0
2021-12-03 21:55:44 +01:00
Justin Bedo
17e3b75414
picard-tools: 2.26.4 -> 2.26.6 2021-12-04 07:51:31 +11:00
Justin Bedo
1a768ef4da
genmap: init 1.3.0 2021-12-04 06:51:16 +11:00