Commit Graph

30 Commits

Author SHA1 Message Date
Felix Buehler
f3719756b5 treewide: use optionalString instead of 'then ""' 2023-06-24 20:19:19 +02:00
Sandro Jäckel
7163503e90
acl2: remove python2 usage 2022-12-02 02:22:40 +01:00
Artturin
f4ea1208ec treewide: *Flags convert to list from str
*Flags implies a list

slightly relevant:
> stdenv: start deprecating non-list configureFlags https://github.com/NixOS/nixpkgs/pull/173172

the makeInstalledTests function in `nixos/tests/installed-tests/default.nix` isn't available outside of nixpkgs so
it's not a breaking change
2022-10-10 15:30:59 +03:00
Rick van Schijndel
b315bd7e0d acl2: makeWrapper to nativeBuildInputs 2022-08-14 00:09:59 +03:00
Keshav Kini
bd44753d89 acl2: 8.4 -> 8.5 2022-07-27 13:10:17 -07: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
Robert Schütz
d5cceedbd1 python,pythonPackages: make aliases
Since aliases are disallowed in nixpkgs, this makes usage of Python 2
which is EOL more explicit.
2022-01-16 18:39:59 +00:00
Mario Rodas
21aea16159 acl2: fix build on darwin 2021-11-12 04:20:00 +00:00
Keshav Kini
e6a9fcd47c acl2: Fix typo in cleanup commands 2021-08-15 14:05:37 -07:00
Keshav Kini
3b32513767 acl2: 8.3 -> 8.4 2021-08-15 12:15:40 -07:00
Stéphan Kochen
873996595c acl2: fix darwin build 2021-05-16 14:59:44 -07:00
Ben Siraphob
001c0cbe54 pkgs/development/interpreters: stdenv.lib -> lib 2021-01-23 20:29:03 +07:00
Pavol Rusnak
2c931312ce treewide: simplify rev/repo arguments in src
+ use fetchFromGithub where possible
2020-11-01 23:02:24 -08:00
Patrick Hilhorst
f7e390e6d4 treewide: fix redirected urls (run 3)
Related:
 - 9fc5e7e473
 - 593e11fd94
 - 508ae42a0f

Since the last time I ran this script, the Repology API changed, so I had to
adapt the script used in the previous PR. The new API should be more robust, so
overall this is a positive (no more grepping the error messages for our relevant
data but just a nice json structure).

Here's the new script I used:

```sh
curl https://repology.org/api/v1/repository/nix_unstable/problems \
   | jq -r '.[] | select(.type == "homepage_permanent_https_redirect") | .data | "s@\(.url)@\(.target)@"' \
   | sort | uniq | tee script.sed
find -name '*.nix' | xargs -P4 -- sed -f script.sed -i
```

I will also add this script to `maintainers/scripts`.
2020-10-02 09:01:35 -07:00
Keshav Kini
9a32d3d136 acl2, acl2-minimal: build standard library, init
Before this commit, we only built the main ACL2 executable.  Most users
will also want the standard library (the "Community Books"), so after
this commit, we build the entire `make everything` suite, which includes
essentially everything provided in the ACL2 repository.

There's also a new top-level package called `acl2-minimal` which has
just the core ACL2 executable, for those who really only want that.

Future work: modularize the build so that we can support multiple
different subsets of the standard library.  A lot of the stuff in this
complete build is probably superfluous to almost all users.  Also,
because some of the books have unclear or idiosyncratic licenses, the
full build will not be cached on cache.nixos.org, and installing it will
mean spending a few hours building it.  So it would be good to have a
pared down build which excluded non-free books and things that people
rarely or never use.
2020-08-01 23:38:54 -07:00
Keshav Kini
7fb25b93a4 acl2: 8.2 -> 8.3 2020-04-23 17:15:41 -07:00
Michael Reilly
84cf00f980
treewide: Per RFC45, remove all unquoted URLs 2020-04-10 17:54:53 +01:00
volth
35d68ef143 treewide: remove redundant quotes 2019-08-26 21:40:19 +00:00
volth
46420bbaa3 treewide: name -> pname (easy cases) (#66585)
treewide replacement of

stdenv.mkDerivation rec {
  name = "*-${version}";
  version = "*";

to pname
2019-08-15 13:41:18 +01:00
R. RyanTM
c5d08e471c acl2: 8.1 -> 8.2
Semi-automatic update generated by
https://github.com/ryantm/nixpkgs-update tools. This update was made
based on information from
https://repology.org/metapackage/acl2/versions
2019-05-19 19:31:37 -07:00
Michael Raskin
60b6d5f8a8 acl2: 8.1.post.2018.09.20 -> 8.1; turns out there is a release 2018-09-21 19:09:47 +03:00
Michael Raskin
de764e65f0 acl2: 8.0 -> 8.0.post.2018.09.20; fixes build with fresher SBCL 2018-09-21 13:07:40 +03:00
Ryan Mulligan
81f04d6b49 acl2: 7.4 -> 8.0
Semi-automatic update; builds on NixOS
2018-02-25 16:18:46 +01:00
Keshav Kini
0094ca20cc acl2: 6.5 -> 7.4, refactor
The `make regression` line was failing because the expression was
downloading a core-system-only, no-libraries source tarball.  I
switched to using fetchFromGitHub, which downloads the full source
code -- the core system as well as the "community books",
i.e. libraries -- but the libraries unfortunately do not build yet
because they have more dependencies than the core system, and they
also run into some impurity problems during the build process.

This commit changes the ACL2 package so that at least the user will
obtain the latest version of the core system, even though they won't
get the community books.  In a later commit I hope to fix this; it
will require either changes to ACL2 itself, or a patch to be applied
to ACL2 in nixpkgs.

ACL2 7.4 has no trouble building on the current version of SBCL in
nixpkgs, so I let it do so instead of using the ancient SBCL version
1.2.0 from 2014.

I also added myself as a maintainer to this package, since I'm an
active contributor to the ACL2 project and am interested in seeing it
working on Nix.
2017-11-04 13:48:22 -07:00
Robin Gloster
2b430c9aa6 acl2: use mkDerivation 2016-01-30 20:31:02 +00:00
Michael Raskin
18ca33ee7c Adopt fix from ewemoa to give more memory to acl2 build 2014-09-20 12:13:43 +04:00
Michael Raskin
ef22c53905 Update ACL2 2014-09-01 09:11:32 +04:00
Eelco Dolstra
c556a6ea46 * "ensureDir" -> "mkdir -p". "ensureDir" is a rather pointless
function, so obsolete it.

svn path=/nixpkgs/branches/stdenv-updates/; revision=31644
2012-01-18 20:16:00 +00:00
Michael Raskin
e70276079f Add myself as a maintainer
svn path=/nixpkgs/trunk/; revision=19594
2010-01-21 10:07:25 +00:00
Michael Raskin
7ffff9d558 Adding ACL2.
ACL2 = A Computational Logic for Applicative Common Lisp. It is 
a Lisp sublanguage and a correctness prover for it.

svn path=/nixpkgs/trunk/; revision=16708
2009-08-13 14:32:52 +00:00