1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-04 19:45:54 +00:00
Commit graph

4445 commits

Author SHA1 Message Date
github-actions[bot] 0d97d9f23b
Merge staging-next into staging 2021-04-23 00:15:42 +00:00
github-actions[bot] 481a9bc47c
Merge master into staging-next 2021-04-23 00:15:39 +00:00
R. RyanTM e230004975 calc: 2.12.9.1 -> 2.13.0.1 2021-04-22 06:59:52 +00:00
github-actions[bot] a260b67879
Merge staging-next into staging 2021-04-21 12:06:26 +00:00
github-actions[bot] 9b3e698b14
Merge master into staging-next 2021-04-21 12:06:23 +00:00
Sandro 59f840f3d5
Merge pull request #119055 from eduardosm/kicad 2021-04-21 06:28:21 +02:00
Mario Rodas 8b2b6e4e11
Merge pull request #119682 from marsam/update-beluga
beluga: 2020-03-11 -> 1.0
2021-04-20 22:22:02 -05:00
github-actions[bot] 6929a896cf
Merge staging-next into staging 2021-04-20 12:06:48 +00:00
github-actions[bot] 960439e003
Merge master into staging-next 2021-04-20 12:06:46 +00:00
Maximilian Bosch 8389dcb67d
Merge pull request #119911 from jbedo/octopus
octopus: 0.7.1 -> 0.7.3
2021-04-20 10:58:42 +02:00
github-actions[bot] cf0edc0dea
Merge staging-next into staging 2021-04-20 06:06:28 +00:00
github-actions[bot] e605a07cc0
Merge master into staging-next 2021-04-20 06:06:25 +00:00
R. RyanTM 44a83a3cb6 gmsh: 4.8.0 -> 4.8.1 2021-04-19 22:37:39 -04:00
Justin Bedo def7c82f88
octopus: 0.7.1 -> 0.7.3 2021-04-20 10:13:25 +10:00
Jörg Thalheim b2a1e04eed
Merge remote-tracking branch 'upstream/staging-next' into HEAD 2021-04-17 16:37:04 +02:00
github-actions[bot] f620e30ca4
Merge master into staging-next 2021-04-17 00:15:03 +00:00
Vincent Laporte ab16ad8764 coq_8_13: 8.13.1 → 8.13.2 2021-04-16 22:32:31 +02:00
Alyssa Ross e459db3f81 glsurf: fix license
The README says GPL 2 or any later version, not LGPL.
2021-04-16 14:06:10 +00:00
Alyssa Ross 70e33e3ae3 glsurf: use current giflib
This requires bumping the version of camlimages used by glsurf to a
version that supports current giflib.  The most recent versions of
camlimages (even of 4.x) don't support ocaml 4.01 any more, so I've
upgraded to 4.1.2 here, the last version that supports ocaml 4.01 (and
which happily supports current giflib).
2021-04-16 14:06:10 +00:00
Alyssa Ross 6e3b5fd046 libungif: remove in favour of giflib
libungif was merged into giflib in 2006, and hasn't been updated
since.  All non-broken packages still using it build fine with giflib.

See <http://giflib.sourceforge.net/history.html>.
2021-04-16 14:06:10 +00:00
Martin Weinelt 7cf67850c0
Merge branch 'master' into staging-next 2021-04-15 01:01:26 +02:00
Sandro 28fb287d4b
Merge pull request #118610 from GregorySchwartz/init/macs2 2021-04-14 21:15:38 +02:00
Gregory W. Schwartz b7763a8287 macs2: init at 2.2.7.1
Update pkgs/applications/science/biology/macs2/default.nix

Co-authored-by: Sandro <sandro.jaeckel@gmail.com>

Update pkgs/applications/science/biology/macs2/default.nix

Co-authored-by: Sandro <sandro.jaeckel@gmail.com>

Update pkgs/applications/science/biology/macs2/default.nix

Co-authored-by: Sandro <sandro.jaeckel@gmail.com>

Update pkgs/applications/science/biology/macs2/default.nix

Co-authored-by: Sandro <sandro.jaeckel@gmail.com>

Renamed package, updated version, set pypi, and added import test.

Update pkgs/applications/science/biology/MACS2/default.nix

Co-authored-by: Sandro <sandro.jaeckel@gmail.com>

Add comment about error for checking.

Two spaces indent.
2021-04-14 10:17:53 -04:00
Vladimír Čunát d2eb7a7887
Merge branch 'staging' into staging-next
A few conflicts but relatively clear ones (I think).
2021-04-14 10:08:25 +02:00
Dmitry Kalinkin a469a7be55
sherpa: compile with --enable-pythia flag 2021-04-13 09:34:42 -04:00
Luke Granger-Brown 08b22e605b Merge remote-tracking branch 'upstream/staging-next' into down-integrate-staging 2021-04-12 18:49:01 +00:00
hjones2199 79c3609603
celestia: 1.6.1 -> 1.6.2.2 (#117999)
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
2021-04-12 20:17:17 +02:00
Fabian Affolter e4149e6e0b
rink: specify license 2021-04-11 23:18:32 +02:00
R. RyanTM 12518ff683 rink: 0.5.1 -> 0.6.0 2021-04-11 14:49:45 +00:00
Eduardo Sánchez Muñoz b5c90bb4da kicad: fix license
https://kicad.org/about/licenses/
2021-04-10 20:39:02 +02:00
Eduardo Sánchez Muñoz 427edc8b5a kicad: include desktop, icon and mime files
Fixes https://github.com/NixOS/nixpkgs/issues/106295.
2021-04-10 18:55:04 +02:00
Jan Tojnar 625ce6c7f6 Merge branch 'staging-next' into staging
In python-packages.nix, resolve conflict between 50d604314e and 187d0371ab.
2021-04-08 17:14:31 +02:00
Sandro 32b567d9e6
Merge pull request #118775 from lopsided98/qgroundcontrol-update
qgroundcontrol: 4.1.1 -> 4.1.2
2021-04-08 09:57:15 +02:00
Ben Wolsieffer 1e52d002bb qgroundcontrol: 4.1.1 -> 4.1.2 2021-04-08 00:04:07 -04:00
github-actions[bot] 1bd1969867
Merge staging-next into staging 2021-04-06 18:15:33 +00:00
Jan Tojnar 70babe5bcf Merge branch 'staging-next' into staging 2021-04-06 16:25:41 +02:00
voidless b6c315b4fb geogebra6: 6_0_620_0 -> 6_0_631_0 2021-04-06 10:52:30 +02:00
Dmitry Kalinkin 1d93243467
root: 6.22.06 -> 6.22.08 2021-04-06 02:41:06 -04:00
Gregory Schwartz 9bf867612d
meme-suite: init at 5.1.1 (#118603)
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
2021-04-05 22:43:27 +02:00
Sandro Jäckel 3453b89f4b
lzma: deprecate alias 2021-04-04 19:49:52 +02:00
Frederik Rietdijk 1e7ed8b2f3
Merge branch 'staging' into python-unstable 2021-04-04 12:59:12 +02:00
Sandro Jäckel 33a395f195
yacc: deprecate alias
and add a new line after the alphabetically sorting to please my inner monk
2021-04-04 03:18:58 +02:00
Frederik Rietdijk c12ef05bda sage: keep cypari2 at 2.1.1 2021-04-03 17:49:44 +02:00
Frederik Rietdijk d20a05e963 libpoly: use python3 2021-04-03 17:06:22 +02:00
Frederik Rietdijk 7865ac1046 lean2: stay with python2
broken, so who knows...
2021-04-03 17:06:21 +02:00
Frederik Rietdijk 7368564f99 gurobi: stay with python2 2021-04-03 17:06:08 +02:00
Frederik Rietdijk ee258981bf ginac: use python3 2021-04-03 17:06:07 +02:00
Jack Gerrits dfab218b9b vowpal-wabbit: 8.9.2 -> 8.10.0 2021-04-01 13:46:09 -04:00
Mario Rodas d2275796d1 beluga: 2020-03-11 -> 1.0 2021-04-01 04:20:00 +00:00
Sandro 498cb76bdf
Merge pull request #117799 from LeSuisse/aliza-1.98.57
aliza: 1.98.43 -> 1.98.57
2021-03-30 17:18:15 +02:00