nordic-dev.net/nixpkgs
nordic-dev.net/nixpkgs
2
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-19 20:23:02 +00:00
Code Issues Packages Projects Releases Wiki Activity
473,938 Commits 188 Branches 125 Tags 7.7 GiB
5de5912954
Commit Graph

60 Commits

Author SHA1 Message Date
Shawn8901
a59dda942c treewide: remove global with lib; statements in pkgs/development 2023-01-26 18:31:02 +01:00
Franz Pletz
77a7b43e62
aprutil: fix build with libxcrypt 2022-10-09 18:09:42 +02:00
Artturin
0734f54ef2 treewide: move pkg-config, autoreconfHook, intltool to nativeBuildInputs 
found with nixpkgs-lint
 2022-09-26 17:53:26 +03: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
Guillaume Girol
8481553b61
Merge pull request #151823 from Mindavi/apr-util/eval 
aprutil: fix evaluation, support cross-compilation
 2022-02-16 21:04:01 +00:00
Renaud
944a2dc835
Treewide: fix some permanent redirects on homepages 
(#153213)
Issue #60004
 2022-01-03 16:53:12 +01:00
Rick van Schijndel
bca64be893 apr-util: support cross-compilation 
Requires a small hack to get to work, I don't know how to read autotools scripts :(.
 2021-12-22 21:25:10 +01:00
Rick van Schijndel
66b3c56bb7 apr-util: fix eval for cross-compilation 
makeWrapper was in the wrong place, it's moved to the correct place now.

Note that it doesn't cross-compile since db is passed in as an argument,
causing splicing to be broken.
 2021-12-22 20:53:40 +01:00
Felix Buehler
3c12e95ad1 development: /s/name/pname&version/ 2021-06-30 09:45:11 +02:00
Ben Siraphob
66e44425c6 pkgs/development/libraries: stdenv.lib -> lib 2021-01-21 19:11:02 -08:00
Michael Reilly
84cf00f980
treewide: Per RFC45, remove all unquoted URLs 2020-04-10 17:54:53 +01:00
Jan Malakhovski
c1ee0a4980 aprutil: move defaults to package file 2019-02-03 15:30:31 +00:00
Markus Kowalewski
70087c5cfb
apr: add license 2018-09-30 19:11:21 +02:00
Tuomas Tynkkynen
20c2fd73ca apr-util: Fixup apu-1-config 
apu-1-config --ldflags is giving broken output on the fixed-output
dependencies. This broke serf build since db was split to multiple
outputs.

https://nix-cache.s3.amazonaws.com/log/q35s5jba6p6dpdqlfn9qgy5w0hpa506v-serf-1.3.9.drv
 2018-05-23 01:14:51 +03:00
Josef Kemetmüller
7c8705256c aprutil: fix db dependency 
This fixes a regression introduced in 4b06383.

[dezgeg squashed in to fit the changes introduced in "db: Use more
conventional outputs, also split bin", also patch .la file]
 2018-05-22 18:19:27 +03:00
Robin Gloster
0f9cf03432
aprutil: 1.6.0 -> 1.6.1 2018-01-25 19:35:46 +01:00
Eelco Dolstra
222c2b34d9
apr-util: 1.5.4 -> 1.6.0 2017-07-12 16:43:03 +02:00
Eelco Dolstra
6abfb2bd64 apr-util: Drop dependency on openssl.dev in out 2016-09-26 19:57:41 +02:00
Tuomas Tynkkynen
a17216af4c treewide: Shuffle outputs 
Make either 'bin' or 'out' the first output.
 2016-08-29 14:49:51 +03:00
Tuomas Tynkkynen
21f17d69f6 treewide: Add lots of meta.platforms 
Build-tested on x86_64 Linux & Mac.
 2016-08-02 21:42:43 +03:00
Tuomas Tynkkynen
2a73de6e6c treewide: Make explicit that 'dev' output of openssl is used 2016-05-19 10:02:23 +02:00
Tuomas Tynkkynen
8bbc3fe801 treewide: Make explicit that 'dev' output of expat is used 2016-05-19 10:00:30 +02:00
Tuomas Tynkkynen
29694b43b6 treewide: Make explicit that 'dev' output of apr is used 2016-05-19 10:00:24 +02:00
Vladimír Čunát
716aac2519 Merge branch 'staging' into closure-size 2016-01-19 09:55:31 +01:00
Vladimír Čunát
aa4562596f apr-util: refactor options 2016-01-05 09:42:56 +01:00
janus
a472d836f6 FreeBSD: apr-util, cyrus-sasl, berkeley db, glib, gnutls, kerberos, libelf-freebsd, openldap, serf, guile, tet, shishi, gawk, gnugrep 2016-01-01 17:01:13 +00:00
Tuomas Tynkkynen
44742f836d apr-util: Split into multiple outputs 
Also fixup more .la files to avoid unnecessary -dev dependencies.
 2015-10-28 10:22:59 +01:00
Tuomas Tynkkynen
1a66da9757 apr-util: Fix path to expat in .la file 2015-10-28 10:17:09 +01:00
Vladimír Čunát
5227fb1dd5 Merge commit staging+systemd into closure-size 
Many non-conflict problems weren't (fully) resolved in this commit yet.
 2015-10-03 13:33:37 +02:00
Rok Garbas
dbdc9eee05 cygwin: apr-util now also building on cygwin 2015-06-24 15:49:59 +02:00
Rok Garbas
7c67c350a3 cygwin: turn off ldap and crypt for apr-util to make it build 2015-06-12 12:17:12 +02:00
Vladimír Čunát
bf414c9d4f Merge 'staging' into closure-size 
- there were many easy merge conflicts
- cc-wrapper needed nontrivial changes

Many other problems might've been created by interaction of the branches,
but stdenv and a few other packages build fine now.
 2015-04-18 11:22:20 +02:00
Eric Seidel
e08b9ab8d3 kill libiconvOr* 
Conflicts:
	pkgs/applications/networking/mailreaders/sup/default.nix
	pkgs/development/compilers/ghc/7.8.3-binary.nix
	pkgs/development/interpreters/php/5.3.nix
	pkgs/development/interpreters/ruby/patches.nix
	pkgs/development/libraries/cairo/default.nix
	pkgs/development/libraries/poppler/default.nix
	pkgs/top-level/all-packages.nix
 2015-02-07 20:29:28 -08:00
Eelco Dolstra
811de3bfaa Merge remote-tracking branch 'origin/staging' into darwin-clang-stdenv 
Conflicts:
	pkgs/tools/security/gnupg/default.nix
 2014-10-09 10:57:57 +02:00
Eelco Dolstra
64982966dc apr-util: Update to 1.5.4 2014-09-24 21:03:40 +02:00
Eelco Dolstra
a007647bfb apr-util: Purify iconv dependency on Darwin 2014-09-24 18:46:08 +02:00
Vladimír Čunát
96cec2a7bd Merge 'staging' into multiple-outputs 
Conflicts:
	pkgs/applications/audio/flac/default.nix
	pkgs/build-support/gcc-wrapper/builder.sh
	pkgs/development/libraries/apr-util/default.nix
	pkgs/development/libraries/apr/default.nix
	pkgs/development/libraries/atk/default.nix
	pkgs/development/libraries/freetype/default.nix
	pkgs/development/libraries/gdk-pixbuf/default.nix
	pkgs/development/libraries/glib/default.nix
	pkgs/development/libraries/glibc/2.17/builder.sh
	pkgs/development/libraries/glibc/2.17/locales.nix
	pkgs/development/libraries/libjpeg/default.nix
	pkgs/development/libraries/libogg/default.nix
	pkgs/development/libraries/libsamplerate/default.nix
	pkgs/development/libraries/libtiff/default.nix
	pkgs/development/libraries/libvorbis/default.nix
	pkgs/development/libraries/mesa/default.nix
	pkgs/development/libraries/pango/default.nix
	pkgs/development/web/nodejs/default.nix
	pkgs/os-specific/linux/pam/default.nix
	pkgs/os-specific/linux/systemd/default.nix
	pkgs/stdenv/generic/setup.sh
	pkgs/stdenv/linux/default.nix
	pkgs/top-level/all-packages.nix
	pkgs/top-level/release-small.nix
 2014-08-23 16:04:53 +02:00
William A. Kennington III
bdb842d5eb Move all db4 packages to the default db5 2014-02-15 12:03:02 +01:00
William A. Kennington III
844ab16b90 apr-util: Cleanup 
Add the required packages to buildInputs. Create a wrapper around
apr-1-config so that internal sed commands succeed.
 2013-12-31 08:00:21 -06:00
Nixpkgs Monitor
7375a3f7dd aprutil: update from 1.5.2 to 1.5.3 2013-12-09 10:48:41 +02:00
Eelco Dolstra
10cb4a8cf2 Merge remote-tracking branch 'origin/master' into multiple-outputs 
Conflicts:
	pkgs/development/libraries/gtk+/2.x.nix
	pkgs/development/libraries/libsamplerate/default.nix
	pkgs/development/libraries/libsndfile/default.nix
	pkgs/misc/cups/default.nix
	pkgs/top-level/all-packages.nix
 2013-08-21 17:05:30 +02:00
Eelco Dolstra
32b036a430 apr-util: Update to 1.5.2 2013-07-31 15:02:54 +02:00
Eelco Dolstra
edff23e591 apr: Split into multiple outputs 
This is important because apr stores a copy of libtool, which in turn
contains a reference to GCC.
 2013-06-13 11:32:55 +02:00
Eelco Dolstra
8497455143 apr-util: Update to 1.5.1 2013-01-14 14:38:24 +01:00
Sander van der Burg
eecb135cad apr-util: Reenabling openldap support again 2013-01-07 16:58:09 +01:00
Sander van der Burg
5b0ca88d97 - Added xcodeenv: experimental support to build iOS apps through Nix 
- Moved mobile development tools into a separate folder
 2013-01-07 16:52:42 +01:00
Peter Simons
2659c3be45 apr-util: enable SSL support by default and enable ldapSupport on Darwin, too 2012-07-07 08:47:19 +02:00
Eelco Dolstra
0b0f44b117 * Updated apr to 1.4.6 and apr-util to 1.4.1. 
svn path=/nixpkgs/trunk/; revision=32303
 2012-02-15 16:21:33 +00:00
Eelco Dolstra
c81069e9d5 * apr updated to 1.4.5. 
* apr-util updated to 1.3.12.
* httpd updated to 2.2.19.

svn path=/nixpkgs/trunk/; revision=27487
 2011-06-16 15:19:53 +00:00
Marco Maggesi
3c99107e82 Fix compilation of apr-util on darwin by removing dependence on openldap 
svn path=/nixpkgs/trunk/; revision=27283
 2011-05-20 17:00:49 +00:00