Commit Graph

53 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
Ben Siraphob
acc5f7b18a pkgs/development/compilers: stdenv.lib -> lib 2021-01-23 08:57:37 +07:00
R. RyanTM
2a975873d8 urweb: 20190217 -> 20200209 2020-02-12 13:28:40 -06:00
Marek Fajkus
6d1e9c08e0 urweb: Fix icu headers include path
Since https://github.com/NixOS/nixpkgs/pull/62266
urweb fails to resolve <unicode/utypepes.h> in runtime (during
compilation of project).
upstream commit: c2a217f912

resolves #79218
2020-02-04 19:30:15 -06: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
Izorkin
329a88efa7 treewide: replace mysql.connector-c to libmysqlclient 2019-09-09 15:55:34 +03: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
Yurii Rashkovskii
a41b38eb26 urweb: 20180616 -> 20190217 2019-05-31 16:04:24 -05:00
Yurii Rashkovskii
4c1d199a12
urweb: 20170720 -> 20180616 2018-11-23 15:42:23 +07:00
John Ericson
db965063b3 treewide: Make configureFlags lists 2018-08-03 17:06:03 -04:00
volth
52f53c69ce pkgs/*: remove unreferenced function arguments 2018-07-21 02:48:04 +00:00
Robin Gloster
d357734637 urweb: fix build 2017-12-29 02:18:35 +01:00
Orivej Desh
0978d59c76 urweb: do not use removed postgres.dev output
postgres.dev output was reverted by 6b05651c20
2017-09-28 03:59:18 +00:00
Peter Brottveit Bock
76245e0b9d urweb: support darwin, depend on gcc, fix paths.
1. Add support for the darwing platform.
2. Depend on gcc, since the urweb executable will
   call gcc when it compiles an urweb-project.
3. Fix include path and link path for the dependencies.
2017-09-27 17:06:01 +02:00
Evan Danaher
b769a94153 urweb: 20170105 -> 20170720 2017-08-05 22:28:19 -04:00
Aistis Raulinaitis
b2444e25ef UrWeb version bump 2017-05-16 11:43:23 -07:00
Vladimír Čunát
950feb70b2 treewide: fixup various mysql ocurrences after re-split 2016-08-07 20:46:37 +02:00
Kranium Gikos Mendoza
2c169f83e7 urweb: 20151220 -> 20160621 2016-07-14 23:14:15 +08:00
Tuomas Tynkkynen
2a73de6e6c treewide: Make explicit that 'dev' output of openssl is used 2016-05-19 10:02:23 +02:00
Vladimír Čunát
ae74c356d9 Merge recent 'staging' into closure-size
Let's get rid of those merge conflicts.
2016-02-03 16:57:19 +01:00
Sergey Mironov
f9ab62431c urweb: version bump 2016-01-27 23:13:13 +03:00
Vladimír Čunát
333d69a5f0 Merge staging into closure-size
The most complex problems were from dealing with switches reverted in
the meantime (gcc5, gmp6, ncurses6).
It's likely that darwin is (still) broken nontrivially.
2015-11-20 14:32:58 +01:00
Vladimír Čunát
261961c97d postgresql: split and fixup some referrers 2015-10-28 10:09:32 +01:00
Sergey Mironov
2cfa1e8f98 urweb: bump to 20151018 2015-10-26 21:48:33 +03:00
Luca Bruno
acfe53e61f urweb: add back openssl configure flags to fix build, cc @aseipp 2015-10-26 21:48:33 +03:00
Vladimír Čunát
90d5e87862 sqlite: split dev and bin outputs 2015-10-14 14:27:07 +02:00
Luca Bruno
af011439b7 urweb: add back openssl configure flags to fix build, cc @aseipp 2015-09-21 10:45:22 +02:00
Austin Seipp
3cff7030c0 nixpkgs: clean up, adopt urweb package
Signed-off-by: Austin Seipp <aseipp@pobox.com>
2015-09-09 07:40:35 -05:00
ro6
3207b9f70f urweb: 20150520 -> 20150819 2015-08-29 23:41:22 +02:00
ro6
15ef1f3a7e urweb: 20150214 -> 20150520 2015-08-17 21:00:49 -03:00
William A. Kennington III
a604b42480 mysql: Use libs in place of the binary mysql 2015-04-01 16:46:53 -07:00
Aistis Raulinaitis
9adb387327 Ur/Web version bump 2015-02-23 02:40:27 -08:00
John Wiegley
28b6fb61e6 Change occurrences of gcc to the more general cc
This is done for the sake of Yosemite, which does not have gcc, and yet
this change is also compatible with Linux.
2014-12-26 11:06:21 -06:00
Maciek Starzyk
c77ae0ced7 urweb: updated to version 20141206 2014-12-06 23:35:51 +01:00
Robert M. Mather
98a4675581 Ur/Web compiler: new release, 20140531 -> 20140830 2014-09-06 11:05:10 +02:00
Robert M. Mather
2d6d52bb2a Ur/Web compiler: new release, 20140426 -> 20140531 2014-06-13 18:22:34 -07:00
Robert M. Mather
3729ead3af Ur/Web compiler: new release, 20130421 -> 20140426 2014-05-10 20:42:35 -07:00
Bjørn Forsman
083d0890f5 More description fixes
* Remove package name
* Start with upper case letter
* Remove trailing period

Also reword some descriptions and move some long descriptions to
longDescription.

I'm not touching generated packages.
2013-10-06 12:01:38 +02:00
Sergey Mironov
190dcbbc7a Ur/Web: Version bump 2013-09-07 00:36:40 +04:00
aszlig
ca3f140e9b urweb: Use lib.licenses.bsd3 in meta attributes. 2012-08-25 16:08:01 +02:00
aszlig
9dace1124e urweb: Update to version 20120807.
The previous version seemed rather old and not even the examples from the
official site compile with that fossil. As there are no reverse dependencies,
this update should be trivial and hopefully doesn't hurt someones personal
feelings.
2012-08-25 16:06:21 +02:00
Karn Kallio
9663bdebde Advance version of Ur/Web compiler to 20120110
svn path=/nixpkgs/trunk/; revision=31467
2012-01-10 15:23:05 +00:00
Karn Kallio
c13ff671a2 Update urweb compiler to release 20111127.
svn path=/nixpkgs/trunk/; revision=30582
2011-11-28 15:12:02 +00:00
Karn Kallio
637e57fc93 Advance version of ur/web compiler to 20110917
svn path=/nixpkgs/trunk/; revision=29448
2011-09-23 02:46:05 +00:00
Karn Kallio
abbf22c397 Update version of urweb compiler.
svn path=/nixpkgs/trunk/; revision=27801
2011-07-15 18:54:43 +00:00
Karn Kallio
b6acdba7fa Update Ur/Web to latest release 2011057.
svn path=/nixpkgs/trunk/; revision=27276
2011-05-17 21:36:55 +00:00
Karn Kallio
fca3859da8 Update urweb to latest released version.
svn path=/nixpkgs/trunk/; revision=25680
2011-01-24 15:27:07 +00:00
Peter Simons
0460e3f2f7 Enable building of static libraries so that urweb can build statically
linked binaries.

svn path=/nixpkgs/trunk/; revision=24692
2010-11-15 17:47:36 +00:00
Peter Simons
95c614def0 Advance urweb to latest release version 20101102.
svn path=/nixpkgs/trunk/; revision=24619
2010-11-08 10:40:25 +00:00