Commit Graph

6244 Commits

Author SHA1 Message Date
Mario Rodas
faddaa7fb2
Merge pull request #161801 from thefloweringash/ruby-revision
ruby: specify RUBY_REVISION
2022-04-04 06:42:43 -05:00
Martin Weinelt
f95a3d1140 Merge remote-tracking branch 'origin/staging-next' into staging 2022-04-04 00:46:25 +02:00
github-actions[bot]
c46200d454
Merge master into staging-next 2022-04-03 18:01:07 +00:00
Martin Weinelt
eb40e8633a
Merge pull request #167027 from helsinki-systems/drop/broken 2022-04-03 18:29:26 +02:00
Lassulus
e75bb38033
Merge pull request #160850 from aaronjheng/starlark
starlark: init at unstable-2022-03-02
2022-04-03 16:55:14 +01:00
ajs124
ca81c78218 pure: remove after being marked broken for over two years
It was marked in commit ae2a5a91dd by Luka Blaskovic on 2020-01-18 (commited on 2020-01-31)
2022-04-03 16:15:00 +01:00
Rafael Fernández López
1865515d63 wasmtime: make derivation available only on linux for now 2022-04-03 08:11:58 -04:00
Rafael Fernández López
d233c169c7 Fix wasmtime build
Provide a specific path for the v8 project, so `wasmtime` dependency
`rusty_v8` can find it and does not need to download the static
library, what would break build hermetism.
2022-04-03 08:11:58 -04:00
Gabor Greif
a4b3bd08d9 wasmtime: 0.21.0 -> 0.35.2 2022-04-03 08:11:58 -04:00
github-actions[bot]
ffa96ab0c0
Merge staging-next into staging 2022-04-02 18:01:37 +00: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]
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
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
Sandro
0fa8cbf8de
Merge pull request #166277 from lourkeur/refactor-cosmopolitan 2022-03-30 17:28:47 +02: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
Louis Bettens
9f4b404b5c maintainers/teams: add cosmopolitan team 2022-03-30 10:33:17 +02:00
Louis Bettens
bd84351def python-cosmopolitan: init at 3.6.14 2022-03-30 10:33:17 +02:00
R. Ryantm
ebeae1436f janet: 1.21.0 -> 1.21.1 2022-03-30 14:19:07 +08:00
Martin Weinelt
630d5e1d0d Merge remote-tracking branch 'origin/master' into staging-next 2022-03-29 18:17:36 +02:00
Ben Siraphob
19c90d5f74
Merge pull request #166191 from siraben/picoc-darwin 2022-03-29 09:34:22 -05:00
Sandro
be561c7d0b
Merge pull request #166226 from Stunkymonkey/treewide-fetchFromGitHub-3 2022-03-29 16:02:21 +02:00
Nicolas Benes
2f027dff0b python: remove ncurses flag
It seems the additional linker flags were added in 9d3b0a2 (May 2008) as
a workaround for readline support. They were kept since then, but it
also means that `python3-config` outputs these flags

```console
$ python3-config --libs
 -lpthread -ldl -lcrypt -lncurses -lutil -lm -lm
```

while other GNU/Linux distros do not. For example, Debian 11:

```console
$ sudo apt install python3-dev
$ python3-config --libs
 -lcrypt -lpthread -ldl  -lutil -lm -lm
```

This change removes the `-lncurses` flag and aligns Nix/NixOS with other
distros.
2022-03-29 13:39:33 +02:00
Felix Buehler
35c43df711 scsh: switch to fetchFromGitHub 2022-03-29 12:59:08 +02:00
R. Ryantm
e4e8a630d7 clojure: 1.11.0.1097 -> 1.11.0.1100 2022-03-29 10:00:02 +00:00
Ben Siraphob
5b45f1458f
picoc: fix darwin build 2022-03-29 01:15:23 -05: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
2f1e03cb2b
Merge pull request #165691 from lucc/github-removed-unencrypted-git 2022-03-28 12:47:42 +02:00
Martin Weinelt
d68657af92 Merge remote-tracking branch 'origin/master' into staging-next 2022-03-27 15:54:05 +02:00
R. Ryantm
1dfd0c261d janet: 1.20.0 -> 1.21.0 2022-03-27 21:18:20 +08:00
Sandro
6773b4e5e6
Merge pull request #165448 from fgaz/jimtcl/0.81 2022-03-27 14:30:22 +02:00
Martin Weinelt
7be28200e2 Merge remote-tracking branch 'origin/master' into staging-next 2022-03-27 01:45:13 +01:00
R. Ryantm
1da79f049b clojure: 1.10.3.1093 -> 1.11.0.1097 2022-03-26 19:35:14 +00:00
Lucas Hoffmann
47190314df treewide: replace defunct git://github.com urls with https://
Github has removed support for git://github.com and recommends
https://github.com instead.

See https://github.blog/2021-09-01-improving-git-protocol-security-github/
2022-03-25 11:21:42 +01:00
Vladimír Čunát
0a8b4eddd2
Merge branch 'master' into staging-next 2022-03-25 10:16:56 +01:00
ajs124
d576772452
Merge pull request #164576 from drupol/php/bumps-march-2022
php80: 8.0.16 -> 8.0.17
2022-03-23 17:38:38 +01:00
Francesco Gazzetta
d8df466ed7 jimtcl: add fgaz to maintainers 2022-03-23 14:24:34 +01:00
Francesco Gazzetta
4bb5799ce9 jimtcl: 0.79 -> 0.81 2022-03-23 14:24:19 +01:00
github-actions[bot]
c80dabe3b1
Merge staging-next into staging 2022-03-23 06:01:55 +00:00
Sandro
4e33e493f7
Merge pull request #165182 from fleimgruber/master 2022-03-23 05:05:45 +01:00
zowoq
be98149597 Merge remote-tracking branch 'origin/staging-next' into staging
Conflicts:
	pkgs/servers/isso/default.nix
2022-03-23 10:04:17 +10:00
Alyssa Ross
3ff5f0eb76 spidermonkey: use the same LLVM as rustc
Spidermonkey depends on rustc, so we have the best chance at only
having a single LLVM in the build closure if we use the same LLVM that
rustc depends on.
2022-03-22 20:40:54 +00:00
github-actions[bot]
e452d308f5
Merge staging-next into staging 2022-03-22 12:02:02 +00:00
Thiago Kenji Okada
5b456050f8
Merge pull request #165199 from r-ryantm/auto-update/clojure
clojure: 1.10.3.1087 -> 1.10.3.1093
2022-03-22 10:55:56 +00:00
github-actions[bot]
c62314becb
Merge staging-next into staging 2022-03-22 06:01:42 +00:00
R. Ryantm
3c8312dfef clojure: 1.10.3.1087 -> 1.10.3.1093 2022-03-22 02:05:34 +00:00