Commit graph

61 commits

Author SHA1 Message Date
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
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
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
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
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 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
Samuel Gräfenstein 052c06bf05
lisp-modules/*: gdk_pixbuf -> gdk-pixbuf
Fix building with `config.allowAliases = false;`.
2021-03-17 00:00:17 +01:00
Michael White d405d89727 lisp-packages: Fix whitespace
Replace a tab with spaces to fix a failing EditorConfig check.
2021-01-11 18:44:47 -07:00
Michael White 02f9353c90 clfswm: Add fresh CLFSWM built via lisp-packages, based on StumpWM 2021-01-11 17:19:05 -07:00
Michael Raskin 665597f50b lispPackages: add some more, mainly from Quicklisp top 100 2020-10-25 18:32:33 +01:00
Michael Raskin 619173b237 lispPackages.nyxt: init, based on code from bqv 2020-10-24 23:24:50 +02:00
Michael Raskin 6c76bc2949 lispPackages.cl-webkit2: init 2020-10-24 20:31:59 +02:00
Michael Raskin d97a71865e lispPackages: more Nyxt deps 2020-10-24 20:14:01 +02:00
Michael Raskin da2a4ce7f4 lispPackages.dbi: break test-only dependency loops 2020-10-24 13:25:53 +02:00
Michael Raskin a84b759e99 lispPackages.uiop: drop obsolete uiop/version reference 2020-10-24 13:05:11 +02:00
Michael Raskin 5660c077df lispPackages.cl-store: fix build 2020-02-04 17:22:12 +01:00
Taylor Viti 418b80bd88 lispPackages: add serapeum
Adds common-lisp package serapeum (a dependency for Next browser as of
Next v1.4.0), using the quicklisp-to-nix mechanism.

src is overridden and pinned to 65837f8 to deal with
https://github.com/ruricolist/serapeum/issues/42
2020-01-20 18:35:49 -10:00
Joachim Fasting b8193bd0b0
lispPackages.cl-mysql: fix build
For [ZHF](https://github.com/NixOS/nixpkgs/issues/68361)
2019-10-05 23:22:23 +02:00
Vladimír Čunát eab41878ac
Merge branch 'master' into staging-next 2019-09-24 08:14:34 +02:00
Vladimír Čunát 22a216849b
Re-Revert "Merge branch 'staging-next'"
This reverts commit f8a8fc6c7c.
2019-09-22 09:38:09 +02:00
Vladimír Čunát f8a8fc6c7c
Revert "Merge branch 'staging-next'"
This reverts commit 41af38f372, reversing
changes made to f0fec244ca.

Let's delay this.  We have some serious regressions.
2019-09-21 20:05:09 +02:00
Antoine Eiche 6309561d39 lispPackages: add 11 packages
The following packages has been added:
- cl-css
- dbus
- log4cl
- mk-string-metrics
- prove-asdf
- sqlite
- str
- swank
- trivia
- trivial-clipboard
- unix-opts
2019-09-11 09:18:27 +02:00
Antoine Eiche 70ca8dab45 lispPackages.iolib: patch lisp files to use the libfixposix library 2019-09-11 09:18:26 +02:00
Izorkin 329a88efa7 treewide: replace mysql.connector-c to libmysqlclient 2019-09-09 15:55:34 +03:00
volth 08f68313a4 treewide: remove redundant rec 2019-08-28 11:07:32 +00:00
Michael Raskin e6878f36d8 lispPackages: update to Quicklisp release 2019-07-11
Fixes:

Survive empty ASDF description (UIOP)
Patch "split-sequence" that misses :serial
2019-08-25 22:53:27 +03:00
Michael Raskin 83cb84ebc3 lispPackages.stumpwm: mimic Query-FS tricks for adding extra deps 2019-03-25 13:29:45 +01:00
Michael Raskin 5048b0d1f9 lispPackages.quicklisp: 2018-04-30 -> 2018-08-31 ; regenerate packages
Added a wrapper package that creates symlinks to OpenSSL libraries with
the actual versions, because we have 1.0.2 with .so-suffix .1.0.0 and
cl-async-ssl is unhappy because of that.

I continue to dislike cl-postgres and simple-date upstream packaging.
2018-09-12 11:52:43 +03:00
volth 52f53c69ce pkgs/*: remove unreferenced function arguments 2018-07-21 02:48:04 +00:00
volth 87f5930c3f [bot]: remove unreferenced code 2018-07-20 18:48:37 +00:00
xeji a13945e1a2 lispPackages.postmodern: mark as broken 2018-04-12 23:04:01 +02:00
Michael Raskin 140b163602 lispPackages: add a few more, escape + 2018-02-25 18:10:58 +01:00
Michael Raskin fb8379cc76 lispPackages, lispPackages.quicklisp-to-nix: 2017-07-25 -> 2018-01-31
* update Quicklisp distinfo
* regenerate packages
* add cl-html-parse and closure-html
* add proper mariadb library path to fix cl-mysql
* escape memoization filenames for systems
* lispPackages.cl-postgres: keep simple-date in the same package
2018-02-12 20:45:33 +01:00
Michael Raskin 0a70f37275 lispPackages.clwrapper: build helper; saving dynamic library search path from NIX_LISP_ 2018-01-29 15:15:51 +01:00
Izorkin 2bbb4810f4 lisp-modules: mysql -> mysql.connector-c 2017-12-29 02:18:35 +01:00
Robin Gloster 572b2bda4e treewide: generalise for both mysql & mariadb 2017-12-29 02:18:35 +01:00
Robin Gloster d75ae56f3f mariadb: replace to connector-c 2017-12-29 02:18:35 +01:00
Michael Raskin e618aad27e lispPackages.cl-fuse: compile the small wrapper library manually, because for some reason NIX_LDFLAGS get lost with the new binutils wrapper 2017-12-19 16:43:18 +01:00
Michael Raskin 4db842f465 lispPackages: A less aggressive way to manipulate ASDF search path, as suggested by Fare 2017-11-22 07:56:17 +01:00
Michael Raskin f01f86c5ca lispPackages.query-fs: Kill build-with-lisp.sh reference 2017-09-04 21:39:07 +02:00
Brad Jensen d1e11cd41e Regenerate quicklisp-to-nix
Note: Changes to overrides were necessary
2017-08-31 20:10:19 -07:00
Brad Jensen f0c8027ae3 Overhaul quicklisp-to-nix
1. Detect (and automatically handle) parasitic systems.
2. Each nix package has only one asd, and (almost) every parasitic
   package inside it builds.
3. Ensure that parasitic systems are compiled.
4. Remove unnecessary testnames lisp override mechanism (the
   testnae/testSystem is replaced by parasites/buildSystems).
5. Parasitic systems (if included in the system closure) become
   aliases to their host package.
6. Support caching fasl files in a known directory (for faster
   re-generation after modifying quicklisp-to-nix-system-info).
7. Eliminate unnecessary overrides.  We're going to determine ALL
   lisp dependencies correctly.
8. Don't try to "build" lisp packages with make.  lispPackages should
   be about bringing in a lisp library.
9. Eliminate the hand-maintained list of aliases.  Parasites should
   become aliases.  Everything else should be a real package.
2017-08-31 20:10:18 -07:00
Michael Raskin efc95339c0 Do an ASDF build of StumpWM in quicklisp-converted version 2017-08-18 02:22:04 +02:00
Michael Raskin 1ec12e2016 paper over more dependency issues 2017-08-17 21:49:39 +02:00
Michael Raskin 338be9dbd4 Fresh SBCL is not compatible with not-fresh iolib 2017-06-28 22:18:25 +02:00
Michael Raskin 744bdac78e Re-add iolib subsystems 2017-06-22 09:31:41 +02:00
Michael Raskin bc47794ab5 quicklispPackages: update
Escape things by default in derivation names (i.e. digit cannot be the
first character etc.)

Update Quicklisp (tracking upstream); list new missing dependencies

Add some minimal README about ql-to-nix
2017-06-21 22:17:48 +02:00