Commit graph

3567 commits

Author SHA1 Message Date
Sandro
20b4edc772
Merge pull request #109715 from zakame/updates/act-0.2.18
act: 0.2.17 -> 0.2.18
2021-01-18 10:54:09 +01:00
Zak B. Elep
c6aab40c9d act: 0.2.17 -> 0.2.18 2021-01-18 16:42:56 +08:00
Jörg Thalheim
1279bf812c
Merge remote-tracking branch 'upstream/master' into HEAD 2021-01-17 18:08:59 +01:00
Guillaume Girol
47d121591c
Merge pull request #97093 from kampka/texi2html
texi2html: Fix cross-platform build
2021-01-17 15:41:34 +00:00
github-actions[bot]
9f69dadafd
Merge master into staging-next 2021-01-15 01:16:33 +00:00
Alyssa Ross
3893d6c6d7 gitAndTools: move everything to the top level
The comment at the top of git-and-tools/default.nix said:

    /* All git-relates tools live here, in a separate attribute set so that users
     * can get a fast overview over what's available.

but unfortunately that hasn't actually held up in practice.

Git-related packages have continued to be added to the top level, or
into gitAndTools, or sometimes both, basically at random, so having
gitAndTools is just confusing.  In fact, until I looked as part of
working on getting rid of gitAndTools, one program (ydiff) was
packaged twice independently, once in gitAndTools and once at the top
level (I fixed this in 98c3490196).

So I think it's for the best if we move away from gitAndTools, and
just put all the packages it previously contained at the top level.
I've implemented this here by just making gitAndTools an alias for the
top level -- this saves having loads of lines in aliases.nix.  This
means that people can keep referring to gitAndTools in their
configuration, but it won't be allowed to be used within Nixpkgs, and
it won't be presented to new users by e.g. nix search.

The only other change here that I'm aware of is that
appendToName "minimal" is not longer called on the default git
package, because doing that would have necessitated having a private
gitBase variable like before.  I think it makes more sense not to do
that anyway, and reserve the "minimal" suffix only for gitMinimal.
2021-01-14 21:27:48 +00:00
Sandro
7cb3bffc34
Merge pull request #103030 from tadfisher/remarkable-2-toolchain
remarkable2-toolchain: init at 2.5.2
2021-01-14 21:03:32 +01:00
Jan Tojnar
b813710c04
Merge branch 'master' into staging-next 2021-01-14 02:24:17 +01:00
Tad Fisher
cf20c83c41
remarkable2-toolchain: init at 2.5.2 2021-01-13 15:39:31 -08:00
06kellyjac
859a64428d tokei: 12.1.1 -> 12.1.2 2021-01-13 11:26:09 +00:00
Christian Kampka
0fd3afc1b2
texi2html: Fix cross-platform build 2021-01-12 20:45:24 +01:00
github-actions[bot]
f47a1ddfe4
Merge master into staging-next 2021-01-12 18:47:24 +00:00
Jörg Thalheim
3364d09e4c
strace: mpers check always
this fix pkgsStatic on x86 build where we don't support 32bit yet.
2021-01-12 13:10:38 +01:00
Jan Tojnar
88c998fb21
Merge branch 'staging-next' into staging 2021-01-10 23:24:57 +01:00
Jan Tojnar
dd72357155
Merge branch 'master' into staging-next 2021-01-10 23:24:33 +01:00
Doron Behar
d68b34650f
Merge pull request #108965 from MetaDark/texlab 2021-01-10 23:56:03 +02:00
Dominik Xaver Hörl
25bef2d8f9 treewide: simplify pkgs.stdenv.lib -> pkgs.lib
The library does not depend on stdenv, that `stdenv` exposes `lib` is
an artifact of the ancient origins of nixpkgs.
2021-01-10 20:12:06 +01:00
Kira Bruneau
f0e9d7e658 texlab: 2.2.1 -> 2.2.2 2021-01-10 11:55:02 -05:00
Bernardo Meurer
306aefd9fc binutils: 2.34 -> 2.35.1 2021-01-10 16:09:25 +01:00
Frederik Rietdijk
0c42bb5027 Merge master into staging-next 2021-01-10 15:50:49 +01:00
Sandro
eeee857ef8
Merge pull request #108875 from dbueno/fix/cflow-darwin-update
cflow: include darwin
2021-01-10 08:11:16 +01:00
github-actions[bot]
add2d89082
Merge master into staging-next 2021-01-10 06:32:12 +00:00
Mario Rodas
3eb5fb31ac
Merge pull request #108896 from onsails/terraform-ls
terraform-ls: 0.11.0 -> 0.12.0
2021-01-09 20:19:37 -05:00
github-actions[bot]
433c7b069c
Merge master into staging-next 2021-01-10 01:03:35 +00:00
Andrey Kuznetsov
823848a6d6
terraform-ls: 0.11.0 -> 0.12.0 2021-01-09 23:52:38 +00:00
zowoq
e39dd05e66 editorconfig-checker: 2.2.0 -> 2.3.1
https://github.com/editorconfig-checker/editorconfig-checker/releases/tag/2.3.0
https://github.com/editorconfig-checker/editorconfig-checker/releases/tag/2.3.1
2021-01-10 06:45:55 +10:00
Denis Bueno
d5eb22ffe3 cflow: include darwin
cflow no longer errors out on darwin
2021-01-09 10:24:46 -07:00
github-actions[bot]
ecebf82121
Merge master into staging-next 2021-01-08 12:29:36 +00:00
Mario Rodas
0946f962f4 nimlsp: init at 0.2.6
Co-authored-by: nbonfils <nbonfils@users.noreply.github.com>
2021-01-08 11:04:25 +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
Sandro
4e56648708
Merge pull request #108682 from NobbZ/lttng-ust-python3 2021-01-07 23:00:00 +01:00
github-actions[bot]
5c072a088d
Merge master into staging-next 2021-01-07 18:40:50 +00:00
Doron Behar
f211631c1c
Merge pull request #108690 from MetaDark/texlab
texlab: 2.2.0 -> 2.2.1
2021-01-07 19:50:35 +02:00
Kira Bruneau
5383c549b7 texlab: 2.2.0 -> 2.2.1 2021-01-07 11:09:48 -05:00
Norbert Melzer
701ece608b lttng-ust: python2 => python3
whitespace cleanup
2021-01-07 16:13:07 +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
Timo Kaufmann
313816590b
Merge pull request #108328 from ericdallo/bump-clojure-lsp
clojure-lsp: 20201228T020543 -> 2021.01.03-00.42.23
2021-01-06 17:58:13 +01:00
Orivej Desh
de753c64f9 hydraUnstable: patch to support nixUnstable 2.4pre20201205_a5d85d0
Upstream PR: https://github.com/NixOS/hydra/pull/840
2021-01-06 06:05:52 +00:00
AndersonTorres
5ccb5d4ca3 dialog: 1.3-20190211 -> 1.3-20201126 2021-01-03 23:16:18 -03:00
github-actions[bot]
581059aed4
Merge staging-next into staging 2021-01-04 00:57:38 +00:00
John Ericson
f52263ced0 treewide: Start to break up static overlay
We can use use `stdenv.hostPlatform.isStatic` instead, and move the
logic per package. The least opionated benefit of this is that it makes
it much easier to replace packages with modified ones, as there is no
longer any issue of overlay order.

CC @FRidh @matthewbauer
2021-01-03 19:18:16 +00:00
github-actions[bot]
07165c7226
Merge staging-next into staging 2021-01-03 18:38:32 +00:00
Eric Dallo
b12b7f96ad
clojure-lsp: 20201228T020543 -> 2021.01.03-00.42.23 2021-01-03 12:52:48 -03:00
06kellyjac
418f4e11d6 tokei: 12.0.4 -> 12.1.1 2021-01-03 15:26:03 +00:00
Ben Siraphob
3ae5e6ce03 treewide: remove enableParallelBuilding = true if using cmake 2021-01-03 18:37:40 +07:00
Doron Behar
d4a76b1f5f
Merge pull request #106688 from alyssais/autoconf-license
autoconf: license is GPLv3+
2021-01-01 10:02:57 +02:00
Ben Siraphob
b04fc593e7 treewide: cmake buildInputs to nativeBuildInputs, minor cleanups 2021-01-01 11:52:33 +07:00
Frederik Rietdijk
e823016e66 Merge master into staging-next 2020-12-31 13:29:32 +01:00
Sandro
cb3972bc3b
Merge pull request #108014 from evils/openocd
openocd: unstable-2020-11-11 -> 0.11.0-rc1
2020-12-31 05:58:49 +01:00
Evils
f7c194204d openocd: unstable-2020-11-11 -> 0.11.0-rc1 2020-12-31 03:38:55 +01:00