Commit Graph

5861 Commits

Author SHA1 Message Date
Martin Weinelt
bf1914e12a Merge remote-tracking branch 'origin/staging-next' into staging 2022-04-05 04:05:02 +02:00
github-actions[bot]
120925b5cb
Merge master into staging-next 2022-04-05 00:02:06 +00:00
Ryan Mulligan
b56cf0ed6a
Merge pull request #167069 from r-ryantm/auto-update/bada-bib
bada-bib: 0.6.0 -> 0.6.1
2022-04-04 13:51:15 -07:00
Martin Weinelt
c6476294e1 Merge remote-tracking branch 'origin/master' into staging-next 2022-04-04 18:40:34 +02:00
ajs124
dcf19469a8
Merge pull request #167192 from jb55/remove-me
remove jb55 as maintainer from some packages
2022-04-04 17:36:00 +02:00
William Casarin
a1390787c3 remove jb55 as maintainer from some packages
I no longer use these and don't have much incentive to maintain them :(
2022-04-04 08:10:42 -07:00
ajs124
b52d39ee09 eagle7: drop 2022-04-04 15:10:44 +01:00
Martin Weinelt
f95a3d1140 Merge remote-tracking branch 'origin/staging-next' into staging 2022-04-04 00:46:25 +02:00
R. Ryantm
2a5b81d50f bada-bib: 0.6.0 -> 0.6.1 2022-04-03 19:11:54 +00:00
github-actions[bot]
c46200d454
Merge master into staging-next 2022-04-03 18:01:07 +00:00
ajs124
672ea43d0e otter: remove after being marked broken for over two years
It was marked in commit ca0e724266 by Tuomas Tynkkynen on 2016-04-27 (commited on 2016-04-27)
2022-04-03 16:14:59 +01:00
ajs124
64a3d95fc1 openspace: remove after being marked broken for over two years
It was marked in commit e6223c022b by Jonathan Ringer on 2019-07-14 (commited on 2019-07-14)
2022-04-03 16:14:56 +01:00
ajs124
f9ad6fb744 openmvs: remove after being marked broken for over two years
It was marked in commit 796050fedd by Michael Raskin on 2019-04-14 (commited on 2019-04-14)
2022-04-03 16:14:19 +01:00
ajs124
60f1e6ffe2 ncbi_tools: remove after being marked broken for over two years
It was marked in commit b9948fedc6 by Robin Gloster on 2017-03-30 (commited on 2017-03-30)
2022-04-03 16:14:18 +01:00
ajs124
33e8308dbc lean2: remove after being marked broken for over two years
It was marked in commit 5aa4b19946 by Linus Heckemann on 2019-10-07 (commited on 2019-10-08)
2022-04-03 16:14:16 +01:00
ajs124
90c42fa33f jonprl: remove after being marked broken for over two years
It was marked in commit 5aa4b19946 by Linus Heckemann on 2019-10-07 (commited on 2019-10-08)
2022-04-03 16:14:16 +01:00
github-actions[bot]
9aa014c46a
Merge staging-next into staging 2022-03-31 12:02:10 +00:00
Alyssa Ross
ac5a927919
Merge remote-tracking branch 'nixpkgs/master' into staging-next
Conflicts:
	pkgs/development/python-modules/einops/default.nix
	pkgs/development/python-modules/elegy/default.nix
2022-03-31 11:46:46 +00:00
Alyssa Ross
22c23dbb8d
Merge remote-tracking branch 'nixpkgs/staging-next' into staging
Conflicts:
	pkgs/development/python-modules/google-auth-oauthlib/default.nix
2022-03-31 11:42:24 +00:00
Ben Siraphob
5187709ff7
Merge pull request #166508 from siraben/automake-buildinputs 2022-03-31 03:15:41 -05:00
github-actions[bot]
3c526dbe2c
Merge master into staging-next 2022-03-31 06:01:18 +00:00
Ben Siraphob
cbbef27aa9
Merge pull request #166527 from siraben/nuxmv-darwin 2022-03-30 23:44:48 -05:00
Ben Siraphob
0535074d17
nuXmv: fix darwin build 2022-03-30 23:43:21 -05:00
Martin Weinelt
d0bfb3ccbb Merge remote-tracking branch 'origin/master' into staging-next 2022-03-31 03:49:37 +02:00
Ben Siraphob
21faf9fc29
treewide: move autoconf, automake to nativeBuildInputs 2022-03-30 20:17:24 -05:00
Oleksii Filonenko
cade4603c3
Merge pull request #166120 from r-ryantm/auto-update/rink 2022-03-30 20:24:36 +03:00
Sandro
71d8b69306
Merge pull request #166144 from alyaeanyx/gprojector-3.0.3 2022-03-30 02:17:50 +02:00
github-actions[bot]
5a9b6a3f1a
Merge master into staging-next 2022-03-29 12:06:05 +00:00
Sandro
1f6bdf4d93
Merge pull request #165458 from rbreslow/add-flywheel-cli 2022-03-29 13:33:54 +02:00
alyaeanyx
aa931a46e0
gprojector: 3.0.2 -> 3.0.3 2022-03-28 23:56:35 +02:00
Rocky Breslow
603e9d7b64
flywheel-cli: init at 16.2.0 2022-03-28 15:54:39 -04:00
R. Ryantm
53dff2f7c8 rink: 0.6.2 -> 0.6.3 2022-03-28 18:13:37 +00:00
Jan Tojnar
c8a5db3854 Merge branch 'staging-next' into staging
; Conflicts:
;	pkgs/tools/archivers/rar/default.nix
2022-03-28 17:56:38 +02:00
Jan Tojnar
997bb5e42c Merge branch 'master' into staging-next
; Conflicts:
;	pkgs/development/python-modules/dnspython/default.nix
;	pkgs/development/python-modules/googleapis-common-protos/default.nix
2022-03-28 17:55:31 +02:00
Sandro
a63a39e238
Merge pull request #165335 from willcohen/qwt-6.2 2022-03-28 14:19:09 +02:00
Sandro
2f1e03cb2b
Merge pull request #165691 from lucc/github-removed-unencrypted-git 2022-03-28 12:47:42 +02:00
Maximilian Bosch
f9dd150fbe
Merge pull request #165960 from Ma27/bump-stellarium
stellarium: 0.21.3 -> 0.22.0
2022-03-28 10:06:37 +02:00
7c6f434c
1dfd957336
Merge pull request #165570 from r-ryantm/auto-update/jmol
jmol: 14.32.33 -> 14.32.39
2022-03-28 07:52:03 +00:00
github-actions[bot]
36198fe197
Merge staging-next into staging 2022-03-27 18:01:40 +00:00
github-actions[bot]
e3d20dfaa5
Merge master into staging-next 2022-03-27 18:01:05 +00:00
Maximilian Bosch
c951914f43
stellarium: 0.21.3 -> 0.22.0
ChangeLog: https://github.com/Stellarium/stellarium/releases/tag/v0.22.0
2022-03-27 17:40:34 +02:00
Sandro
966dd84461
Merge pull request #165778 from Luz/ngspice 2022-03-27 16:13:39 +02:00
Martin Weinelt
d68657af92 Merge remote-tracking branch 'origin/master' into staging-next 2022-03-27 15:54:05 +02:00
Sandro
7d63d0891b
Merge pull request #156413 from numinit/klee-fixes 2022-03-27 13:36:16 +02:00
Sandro
08e8862bca
Merge pull request #159943 from evils/kicad-unstable 2022-03-27 11:58:39 +02:00
Sandro
2a581ac5e5
Merge pull request #164981 from evils/kicad-6.0.4 2022-03-27 11:58:31 +02:00
github-actions[bot]
77dc421883
Merge staging-next into staging 2022-03-26 18:01:56 +00:00
github-actions[bot]
3b6f03e497
Merge master into staging-next 2022-03-26 18:01:22 +00:00
Will Cohen
f405c59874 libsForQt5.qwt: 6.1.6 -> 6.2.0 2022-03-26 13:35:18 -04:00
Sandro
f338d0737c
Merge pull request #159997 from jvanbruegge/isabelle-linter 2022-03-26 15:58:08 +01:00