Commit Graph

4111 Commits

Author SHA1 Message Date
Michael Raskin
d714c53f17
fix mis-merge 2021-01-14 15:26:10 +00:00
Michael Raskin
f2210b7287
Merge branch 'master' into remove-opensmt 2021-01-14 14:22:22 +00:00
Sandro Jäckel
55444ed07f
nasc: Fix compilation with gcc10 2021-01-11 12:08:20 +01:00
Profpatsch
4a7f99d55d treewide: with stdenv.lib; in meta -> with lib;
Part of: https://github.com/NixOS/nixpkgs/issues/108938

meta = with stdenv.lib;

is a widely used pattern. We want to slowly remove
the `stdenv.lib` indirection and encourage people
to use `lib` directly. Thus let’s start with the meta
field.

This used a rewriting script to mostly automatically
replace all occurances of this pattern, and add the
`lib` argument to the package header if it doesn’t
exist yet.

The script in its current form is available at
https://cs.tvl.fyi/depot@2f807d7f141068d2d60676a89213eaa5353ca6e0/-/blob/users/Profpatsch/nixpkgs-rewriter/default.nix
2021-01-11 10:38:22 +01:00
Jan Tojnar
dd72357155
Merge branch 'master' into staging-next 2021-01-10 23:24:33 +01:00
John Ericson
05b5b5491e
Merge pull request #108507 from Ericson2314/ott-mode
ott-mode: Factor our from ott
2021-01-10 14:30:59 -05:00
github-actions[bot]
433c7b069c
Merge master into staging-next 2021-01-10 01:03:35 +00:00
Markus Kowalewski
14caa4b2bf
octopus: 10.0 -> 10.3 2021-01-09 16:32:49 +01:00
Markus Kowalewski
0961d5b998
octopus: update licenses 2021-01-09 16:32:49 +01:00
Michael Weiss
8ae8602bf7
Merge branch 'master' into staging-next
Manually resolved a conflict in
pkgs/development/libraries/libbladeRF/default.nix.
2021-01-09 12:16:11 +01:00
Cyril Cohen
9ffd16b385 coqPackages: refactor 2021-01-09 11:56:17 +01:00
github-actions[bot]
ecebf82121
Merge master into staging-next 2021-01-08 12:29:36 +00:00
Gabriel Ebner
5000e5707b
Merge pull request #108717 from Dyazz/libqalculate
libqalculate: 3.14.0 -> 3.16.0
2021-01-08 11:23:31 +01:00
Dyazz
8cdefb6995 qalculate-gtk: 3.15.0 -> 3.16.0 2021-01-08 08:43:39 +01:00
Jan Tojnar
e6c0c98940
Merge branch 'master' into staging-next
zynaddsubfx conflict has been updated to 3.0.1, which conflicted with rewrite after 3.0.5 update on a different branch.
2021-01-08 02:07:34 +01:00
Evils
0448f1c082 kicad-unstable: 2020-12-01 -> 2020-12-23 2021-01-07 16:17:41 -05:00
Evils
9be551c1d8 kicad: 5.1.8 -> 5.1.9 2021-01-07 16:17:41 -05:00
Evils
86e29a0b72 kicad: fix update.sh multiple tag reply handling
and fix tabs in update.sh
2021-01-07 16:17:41 -05:00
Sandro
7ae17783a7
Merge pull request #108432 from jbedo/fastp
fastp: init 0.20.1
2021-01-07 21:44:33 +01:00
github-actions[bot]
5c072a088d
Merge master into staging-next 2021-01-07 18:40:50 +00:00
Sandro
ec56bf6ede
Merge pull request #106456 from eduardosm/diylc 2021-01-07 17:24:42 +01:00
Jan Tojnar
f19eb635b4
Merge branch 'master' into staging-next
b04fc593e7 seems to have accidentally changed mkDerivation function for dfilemanager and solarus-quest-editor so I have reverted that here.
2021-01-07 13:04:31 +01:00
Eduardo Sánchez Muñoz
0d84b3f540 diylc: init at 4.15.1 2021-01-07 12:53:35 +01:00
Justin Bedo
bdf3d727ca
fastp: init 0.20.1 2021-01-07 18:24:19 +11:00
Devon Richards
7a16349789
lean: 3.23.0 -> 3.24.0
We have to update to be able to use the current version of mathlib.
2021-01-06 21:38:04 -06:00
Сухарик
4746e1717f
sympy: 1.6.2 -> 1.7.1 (#107663)
* sympy: 1.6.2 -> 1.7.1

* sage: adapt tests to sympy 1.7

Co-authored-by: Mauricio Collares <mauricio@collares.org>
2021-01-06 17:10:30 +00:00
Sandro
0af4d59732
Merge pull request #108437 from jbedo/varscan
varscan: 2.4.2 -> 2.4.4
2021-01-06 00:19:30 +01:00
Sandro
31d6b1cd06
Merge pull request #108435 from jbedo/last
last: 1145 -> 1170
2021-01-06 00:18:41 +01:00
Guillaume Girol
f3e84c4d42
Merge pull request #107416 from hjones2199/phd2wrap
phd2: add GApps wrapper to fix breakage on non-nixos wayland systems
2021-01-05 20:09:24 +00:00
John Ericson
4eb13669a0 ott: Don't also install emacs mode
There is now a separate package for that.
2021-01-05 14:41:52 -05:00
Anderson Torres
0972bbc12d
Merge pull request #108445 from AndersonTorres/updates
Misc updates
2021-01-05 11:54:15 -03:00
AndersonTorres
e8183d4687 magic-vlsi: 8.3.80 -> 8.3.109
Also, add myself to maintainers list.
2021-01-05 10:49:00 -03:00
Sandro
f53c431645
Merge pull request #108379 from SuperSandro2000/cleanups 2021-01-05 02:19:24 +01:00
Justin Bedo
56dd3fa172
varscan: 2.4.2 -> 2.4.4 2021-01-05 10:55:28 +11:00
Justin Bedo
62432c855f
last: 1145 -> 1170 2021-01-05 10:29:31 +11:00
Frederik Rietdijk
b20838eb4a Merge staging-next into staging 2021-01-04 20:51:32 +01:00
Pavol Rusnak
bf77245202
Merge pull request #108219 from prusnak/viennarna
ViennaRNA: init at 2.4.17
2021-01-04 18:04:56 +01:00
markuskowa
d480c86858
Merge pull request #107223 from markuskowa/upd-qe
quantum-espresso: 6.5 -> 6.6
2021-01-04 14:33:37 +01:00
Sandro
6ac4c2d1f6
Merge pull request #107962 from flyfloh/colmap-36 2021-01-04 14:25:21 +01:00
Sandro Jäckel
a8d360eca3
raxml: cleanup 2021-01-04 11:02:16 +01:00
github-actions[bot]
07165c7226
Merge staging-next into staging 2021-01-03 18:38:32 +00:00
John Ericson
b03fdcc7f9
Merge pull request #108300 from siraben/parallel-cmake
treewide: remove enableParallelBuilding = true if using cmake
2021-01-03 13:22:09 -05:00
Pavol Rusnak
77364ac7c0
Merge pull request #108251 from prusnak/bowtie2
bowtie2: 2.3.5.1 -> 2.4.2
2021-01-03 13:47:45 +01:00
github-actions[bot]
0649757570
Merge staging-next into staging 2021-01-03 12:24:59 +00:00
Ben Siraphob
3ae5e6ce03 treewide: remove enableParallelBuilding = true if using cmake 2021-01-03 18:37:40 +07:00
Sandro
6ae069c990
Merge pull request #108249 from prusnak/bowtie
bowtie: init at at 1.3.0
2021-01-03 10:03:24 +01:00
zowoq
fb2311d430 Merge staging-next into staging 2021-01-03 16:33:28 +10:00
Pavol Rusnak
9139eb5aee bowtie2: 2.3.5.1 -> 2.4.2 2021-01-02 22:18:32 +01:00
Pavol Rusnak
03b99f0721 bowtie: init at at 1.3.0 2021-01-02 19:46:59 +01:00
Maximilian Bosch
097cd34db0
Merge pull request #108126 from Ma27/cleanup-maintained-pkgs
treewide: remove maintainership of `ma27` from a few packages
2021-01-02 18:58:26 +01:00