Commit graph

7281 commits

Author SHA1 Message Date
Mario Rodas a468fac1c1
Merge pull request #167790 from samuela/upkeep-bot/vscode-1.66.1-1649376803
vscode: 1.66.0 -> 1.66.1
2022-04-08 20:40:13 -05:00
R. Ryantm f79ae01933 vscodium: 1.66.0 -> 1.66.1 2022-04-08 07:37:48 +00:00
nixpkgs-upkeep-bot af9cad4c94 vscode: 1.66.0 -> 1.66.1 2022-04-08 00:13:23 +00:00
Ryan Mulligan bc515fe2f7
Merge pull request #167581 from r-ryantm/auto-update/cudatext
cudatext: 1.159.2 -> 1.160.0
2022-04-07 13:13:56 -07:00
hadriencaron 79b72e2110
emacs.pkgs.control-lock: Add package (#166520)
* emacs.pkgs.control-lock: Add package

* emacs.pkgs.control-lock: Address PR comments
2022-04-07 23:09:33 +12:00
R. Ryantm f8b62b5b89 cudatext: 1.159.2 -> 1.160.0 2022-04-06 20:26:04 +00:00
Bobby Rong 78dfe05f04
Merge pull request #167275 from bobby285271/marker
marker: fix build with meson 0.61
2022-04-06 10:28:22 +08:00
Vladimír Čunát b4729bad3d
Merge #165406: staging-next 2022-03-23 2022-04-05 20:34:08 +02:00
André Vitor de Lima Matos 0a69aa9f8a
vimPlugins: update 2022-04-05 13:19:22 -03:00
Daniel Thwaites dd37fc3587 helix: use release tarball to fetch tree-sitter grammars 2022-04-05 08:28:59 -04:00
Daniel Thwaites fe982a28d0 helix: 0.6.0 -> 22.03 2022-04-05 08:28:59 -04:00
github-actions[bot] 27a4e52731
Merge master into staging-next 2022-04-05 12:05:41 +00:00
Matthieu Coudron d396c7d316
Merge pull request #166941 from teto/vim-plugins-toml 2022-04-05 09:33:40 +02:00
github-actions[bot] 444daea093
Merge master into staging-next 2022-04-05 06:01:45 +00:00
Bobby Rong 859b7c7d01
marker: fix build with meson 0.61 2022-04-05 12:37:21 +08:00
Anderson Torres 75ae1f3e11
Merge pull request #167112 from r-ryantm/auto-update/poke
poke: 2.2 -> 2.3
2022-04-04 21:56:48 -03:00
github-actions[bot] 120925b5cb
Merge master into staging-next 2022-04-05 00:02:06 +00:00
Robert Hensing a292213c44
Merge pull request #166792 from hercules-ci/pkgs-config-allowAliases-option
config.allowAliases: Define as option
2022-04-04 21:09:44 +02:00
Matt McHenry e3958c8098 eclipses: 2021-12 -> 2022-03 2022-04-04 21:06:10 +02:00
Martin Weinelt c6476294e1 Merge remote-tracking branch 'origin/master' into staging-next 2022-04-04 18:40:34 +02:00
R. Ryantm 36a7bc52fb apostrophe: 2.6.1 -> 2.6.2 2022-04-04 16:32:55 +02:00
github-actions[bot] ee8677862d
Merge master into staging-next 2022-04-04 12:01:25 +00:00
R. Ryantm eefbb7c566 poke: 2.2 -> 2.3 2022-04-04 02:02:14 +00:00
R. Ryantm 9ba99e6270 tiled: 1.8.2 -> 1.8.4 2022-04-03 22:23:46 +00:00
Matthieu Coudron d525753eac vimPlugins: update
vimPlugins: update

vimPlugins: update
2022-04-03 18:14:14 +02:00
Matthieu Coudron 69daee8243 kakounePlugins: update 2022-04-03 18:14:14 +02:00
github-actions[bot] fc17fe6417
Merge master into staging-next 2022-04-02 18:01:07 +00:00
7c6f434c 8188f10752
Merge pull request #166430 from alyssais/openssl-static-retry
treewide: use lib.getLib for OpenSSL libraries
2022-04-02 12:59:55 +00:00
github-actions[bot] 66754ae952
Merge master into staging-next 2022-04-02 12:01:10 +00:00
taku0 8b7daabf5b mozc: make mozc.el to find mozc_emacs_helper 2022-04-02 17:59:54 +09:00
github-actions[bot] 27e49cc5a4
Merge master into staging-next 2022-04-01 18:01:22 +00:00
Manuel Bärenz d625c265e3
Merge pull request #166565 from samuela/upkeep-bot/vscodium-1.66.0-1648728823
vscodium: 1.65.2 -> 1.66.0
2022-04-01 15:20:25 +02:00
github-actions[bot] 50497647fa
Merge master into staging-next 2022-04-01 12:01:21 +00:00
Robert Hensing 200175a701 config.allowAliases: Define as option
This simplifies usages and makes the default value consistent.

In a few cases, the default value was interpreted to be `false`,
but this is useless, because virtually nobody will explicitly
set `allowAliases = true;`.
2022-04-01 11:33:10 +02:00
Artturi 18f19c2bb8
Merge pull request #166275 from gador/pinegrow-fix-gsettings 2022-04-01 12:27:24 +03:00
Florian Brandes 58b6768280 pinegrow: bugfix for missing gsettings
Signed-off-by: Florian Brandes <florian.brandes@posteo.de>
2022-04-01 11:00:44 +03:00
github-actions[bot] 5e1c018e60
Merge master into staging-next 2022-04-01 06:01:23 +00:00
Anderson Torres ffa7483c97
Merge pull request #166375 from r-ryantm/auto-update/poke
poke: 2.1 -> 2.2
2022-03-31 21:25:36 -03:00
github-actions[bot] be4f006d3c
Merge master into staging-next 2022-03-31 18:01:13 +00:00
Ben Siraphob 4c38fcb192
treewide: move cmake into nativeBuildInputs 2022-03-31 12:35:21 -05:00
Ben Siraphob 61776f460f
treewide: remove stdenv from buildInputs 2022-03-31 11:19:30 -05:00
maxine [they] cd6ae307c5
Merge pull request #166500 from samuela/upkeep-bot/vscode-1.66.0-1648685386
vscode: 1.65.2 -> 1.66.0
2022-03-31 17:48:38 +02:00
Matthieu Coudron e98e3a2365
Merge pull request #166162 from teto/lua-checks-pr 2022-03-31 16:12:07 +02:00
nixpkgs-upkeep-bot cc6775822f vscodium: 1.65.2 -> 1.66.0 2022-03-31 12:13:44 +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
Ben Siraphob 5187709ff7
Merge pull request #166508 from siraben/automake-buildinputs 2022-03-31 03:15:41 -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
nixpkgs-upkeep-bot 78a6f5079e vscode: 1.65.2 -> 1.66.0 2022-03-31 00:09:46 +00:00
Alyssa Ross fd78240ac8
treewide: use lib.getLib for OpenSSL libraries
At some point, I'd like to make another attempt at
71f1f4884b ("openssl: stop static binaries referencing libs"), which
was reverted in 195c7da07d.  One problem with my previous attempt is
that I moved OpenSSL's libraries to a lib output, but many dependent
packages were hardcoding the out output as the location of the
libraries.  This patch fixes every such case I could find in the tree.
It won't have any effect immediately, but will mean these packages
will automatically use an OpenSSL lib output if it is reintroduced in
future.

This patch should cause very few rebuilds, because it shouldn't make
any change at all to most packages I'm touching.  The few rebuilds
that are introduced come from when I've changed a package builder not
to use variable names like openssl.out in scripts / substitution
patterns, which would be confusing since they don't hardcode the
output any more.

I started by making the following global replacements:

    ${pkgs.openssl.out}/lib -> ${lib.getLib pkgs.openssl}/lib
    ${openssl.out}/lib -> ${lib.getLib openssl}/lib

Then I removed the ".out" suffix when part of the argument to
lib.makeLibraryPath, since that function uses lib.getLib internally.

Then I fixed up cases where openssl was part of the -L flag to the
compiler/linker, since that unambigously is referring to libraries.

Then I manually investigated and fixed the following packages:

 - pycurl
 - citrix-workspace
 - ppp
 - wraith
 - unbound
 - gambit
 - acl2

I'm reasonably confindent in my fixes for all of them.

For acl2, since the openssl library paths are manually provided above
anyway, I don't think openssl is required separately as a build input
at all.  Removing it doesn't make a difference to the output size, the
file list, or the closure.

I've tested evaluation with the OfBorg meta checks, to protect against
introducing evaluation failures.
2022-03-30 15:10:00 +00:00