Commit Graph

261 Commits

Author SHA1 Message Date
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
Ben Siraphob
61776f460f
treewide: remove stdenv from buildInputs 2022-03-31 11:19:30 -05: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
Felix Buehler
339ccbe933 lispPackages.quicklisp: switch to fetchFromGitHub 2022-03-16 00:45:13 +01:00
Daniel Nagy
8dc3d9e152
lispPackages: add nbd package 2022-03-11 12:31:06 +01:00
Daniel Nagy
751945feae
lispPackages: add flow 2022-03-11 12:30:57 +01:00
Daniel Nagy
5914dc2929
lispPackages: add legit 2022-03-11 12:30:48 +01:00
Daniel Nagy
74f880ab58
lispPackages.slynk: init at sly-20210411-git 2022-02-22 10:56:38 +01:00
Daniel Nagy
95ca2ce47a
lispPackages.mmap: init at 20201220-git 2022-02-22 10:55:27 +01:00
Felix Buehler
70ee115571 from-quicklisp: move urls-from-page.sh to its directory 2022-01-30 23:34:40 +01:00
Daniel Nagy
5239058d52
lispPackages: add lisp-binary and quasiquote-2.0 2022-01-29 17:49:49 +01:00
Daniel Nagy
0047897994
lispPackages: add float-features 2022-01-29 17:49:49 +01:00
7c6f434c
ad80b50646
Merge pull request #154749 from sternenseemann/cl-mustache-init
lispPackages.cl-mustache: init at 20200325-git
2022-01-12 12:01:21 +00:00
7c6f434c
754afda4c9
Merge pull request #154738 from sternenseemann/quicklisp-help-screen
quicklisp-to-nix: document --cacheFaslDir option in help screen
2022-01-12 12:00:12 +00:00
sternenseemann
861f4e4c01 lispPackages.cl-mustache: init at 20200325-git 2022-01-12 12:25:53 +01:00
sternenseemann
4f15ea2f31 quicklisp-to-nix: fix trailing whitespace 2022-01-12 11:16:22 +01:00
sternenseemann
54d4b7079b quicklisp-to-nix: document --cacheFaslDir option in help screen 2022-01-12 11:04:30 +01:00
Nick Cao
509a9f5f14
asdf: fix cross compilation and set strictDeps 2022-01-09 09:50:32 +08:00
7c6f434c
63b7c8bda8
Merge pull request #151221 from sternenseemann/quicklisp-2021-12-09
quicklispPackages: 2021-10-21 -> 2021-12-09
2021-12-24 17:19:26 +00:00
sternenseemann
9f166940e4 nyxt: 2.0.0 -> 2.2.3 2021-12-24 17:30:24 +01:00
sternenseemann
5acf832654 quicklispPackages.spinneret: init at 20211020-git 2021-12-24 17:06:06 +01:00
Felix Buehler
31a706d0db asdf: refactor 2021-12-21 12:52:15 +01:00
sternenseemann
16c4d72e1d lispPackages.quicklisp: distinfo 2021-10-21 -> 2021-12-09
lispPackages.uax-15: drop upstreamed patch

lispPackages.mgl-mat: add missing dependency cl-fad

lispPackages.cl-qrencode: init in preparation for nyxt 2.2.3
2021-12-18 18:27:36 +01:00
github-actions[bot]
017d32f216
Merge master into staging-next 2021-11-28 18:00:57 +00:00
Daniel Nagy
c80cb3ca81
lispPackages: add cl-shellwords 2021-11-28 13:49:59 +01:00
Victor Engmark
57b496ea98 misc: Replace tab indentation with spaces
I've tried to be consistent, using four or eight spaces to line up
with existing code.
2021-11-14 16:04:46 +13:00
xaverdh
03a257e5a3
treewide: quote urls according to rfc 0045 (#145260)
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
2021-11-10 11:37:56 +01:00
Michael Raskin
9679be6d87
Merge pull request #142445 from nuddyco/quicklisp-2021-10-21
quicklisp: 2021-08-07 -> 2021-10-21
2021-10-21 09:22:56 +00:00
Daniel Nagy
c82af6b2a9
lispPackages.hunchensocket: init at 20180711-git (#139905) 2021-10-21 09:20:56 +00:00
Luke Gorrie
47e8e39791 quicklisp: 2021-08-07 -> 2021-10-21
Add patch on UAX-15 to fix missing dependency in ASDF system.

Remove patch on ESRAP that are obsoleted by upstream fix.
2021-10-21 08:16:17 +02:00
Luke Gorrie
4f9ca7c565
Common lisp update (#142209)
quicklisp: 2021-02-13 -> 2021-08-07
lispPackages: regenerate from fresher Quicklisp
sbcl: 2.1.2 -> 2.1.9 (switch default version)
lispPackages.mgl, lispPackages.mgl-mat: init
lispPackages.iolib: suppress network-reliant tests
lispPackages.esrap: apply upstream SBCL 2.1.9 compatibility patch

Removed packages caveman and clack-v1-compat that are removed.

Added more packages from Quicklisp.

* lisp-modules/shell.nix: Add openblas for MGL

* lisp-modules: Update README.txt

Mention that shell.nix needs to be updated when adding packages that
have external dependencies during package analysis, e.g. package :LLA that specifically wants to load libblas.so at compile-time.

* lisp-modules/define-package.nix: Fix package path deduplication

The deduplication of NIX_LISP_ASDF_PATHS was not working, apparently
due to a shell quoting bug causing the sort/uniq pipeline to run at
the wrong time. This is now deduplicated in a separate step.

This fixes a series problem where environments with many Lisp packages
would exhasut the available environment space on Linux, causing
obscure "too many arguments" error messages from the shell, because
the NIX_LISP_ASDF_PATHS list was bloated with ~90% duplicates.

Co-authored-by: Luke Gorrie <luke@nuddy.co>
2021-10-20 14:30:31 +00:00
Daniel Nagy
fec3f49bfe
lispPackages: add varjo package and dependencies 2021-09-06 22:12:45 +02:00
Daniel Nagy
7a6bddc19d
lispPackages: sort quicklisp packages alphabetically 2021-09-06 22:10:51 +02:00
Kasper Gałkowski
024414f501 lisp-modules: use lib.makeSearchPath in shell.nix 2021-08-16 22:12:57 +02:00
Felix Buehler
ea1d43b12f cl-wrapper-script: deprecate phases 2021-08-08 12:38:41 +02:00
Bastien Rivière
8147b87980
fix editorconfig 2021-05-25 19:21:51 +02:00
Bastien Rivière
5937dcdf36
lispPackages: fix darwin builds 2021-05-25 19:17:43 +02:00
remedialchaos
2557094202
nyxt: v2_pre-release-7 -> 2.0.0 (#124024) 2021-05-22 15:32:47 -04:00
Nathan Ringo
813b889fbb lispPackages: add --pure to README 2021-05-18 17:59:15 -05:00
Nathan Ringo
d00a9f089b lispPackages.generic-cl: init from Quicklisp,
lispPackages.trivial-arguments: init from Quicklisp,
quicklispPackages: regenerate
2021-05-18 17:51:55 -05:00
Michael Raskin
3fde66cd0c lispPackages.quicklisp: distinfo 2021-02-28 -> 2021-04-11,
quicklispPackages: regenerate,
lispPackages.nyxt: 2021-03-27 -> 2021-05-06, use upstream Makefile
2021-05-10 18:17:21 +02:00
Michael Raskin
331bfb7e2b quick-lisp-to-nix: change template to use more double-quotes 2021-03-28 23:55:54 +02:00
Michael Raskin
be2cb07963 nyxt: 2020-10-23 -> 2021-03-27 2021-03-28 23:47:25 +02:00
Michael Raskin
3f6be2ae8f quicklispPackages: give names to all somewhat-working versions 2021-03-28 18:34:29 +02:00
Michael Raskin
85b6efff7c quicklispPackages: improve non-SBCL support 2021-03-28 18:19:29 +02:00
Michael Raskin
850862ffac lispPackages: pass lib explicitly 2021-03-28 16:41:37 +02:00
Michael Raskin
fad53e2961 quicklispPackages: regenerate 2021-03-28 14:57:54 +02:00
Michael Raskin
e96cae7e3c quicklisp-to-nix: ban serapeum/docs due to weird issues 2021-03-28 14:57:05 +02:00
Michael Raskin
1331b90c9b lispPackages.quicklisp: 2019-02-16 -> 2021-02-13, dist info 2020-10-16 -> 2021-02-28 2021-03-28 14:55:57 +02:00
Samuel Gräfenstein
052c06bf05
lisp-modules/*: gdk_pixbuf -> gdk-pixbuf
Fix building with `config.allowAliases = false;`.
2021-03-17 00:00:17 +01:00