github-actions[bot]
cf8441dd85
Merge staging-next into staging
2021-06-09 18:14:53 +00:00
Alyssa Ross
4de8cbfb16
bmake.passthru.setupHook: set some defaults
...
These are all read from the environment by the default bmake
stdlib (e.g. <bsd.prog.mk>, <bsd.own.mk>). Some of the default
values (like building cat pages instead of man pages, or stripping
binaries when installing) don't really make sense for Nixpkgs, so we
override them here for every build using bmake.
Eventually I'd like to unify the bmake setupHook and the NetBSD make
setupHook, but not today.
2021-06-09 12:44:43 +00:00
github-actions[bot]
59ab4de3e0
Merge staging-next into staging
2021-06-08 00:19:01 +00:00
Luke Granger-Brown
137fcc6cf0
pomerium: 0.13.3 -> 0.14.4
2021-06-07 20:59:01 +00:00
Luke Granger-Brown
00e54055e1
envoy: 1.16.2 -> 1.17.3
2021-06-07 20:58:56 +00:00
github-actions[bot]
c06baac6ff
Merge staging-next into staging
2021-06-04 19:41:02 +00:00
Elis Hirwing
c76bebc549
unit: Add php80 and use it as default
2021-06-04 09:27:07 +02:00
Elis Hirwing
68eb5305ac
php: Drop PHP 7.3 support
...
PHP 7.3 won't be supported by upstream for the entire life cycle of
the 21.11 release.
Also drop the pcre' alias since it isn't needed anymore since we don't
need different pcre versions anymore.
2021-06-04 09:26:54 +02:00
github-actions[bot]
2908f0cd18
Merge staging-next into staging
2021-06-02 02:32:54 +00:00
ajs124
b6e6f1dddd
Merge pull request #125194 from Izorkin/update-unit
...
unit: 1.22.0 -> 1.24.0
2021-06-01 23:27:06 +02:00
Luke Granger-Brown
93e08b2e47
Merge pull request #124210 from liclac/bozohttpd
...
bozohttpd: init
2021-06-01 22:23:38 +01:00
Izorkin
79a477b1c6
unit: 1.22.0 -> 1.24.0
2021-06-01 13:29:20 +03:00
embr
a75c0a7f87
bozohttpd: experimental darwin compat patch
...
As far as I can tell, libSystem on darwin provides a libm compatibility
symlink, but not a libcrypt one.
Prior art (eg. CPython) appears to use `stdenv.isDarwin` as a proxy for
`stdenv.hostPlatform.libc == "libSystem"`, but the latter also works in
cases where we're building on Darwin, but with eg. musl for some reason.
2021-05-31 11:03:17 +02:00
embr
ee4b583ae8
bozohttpd: minor formatting
...
The Nix style guide isn't exactly comprehensive, but this at least seems
slightly closer to the examples:
https://nixos.org/manual/nixpkgs/stable/#sec-syntax
I'm annoyed that nixpkgs-fmt as of writing won't accept:
COPTS = [
# ...
] ++ optional (...) "..."
++ optional (...) "...";
...which seems to be the actual convention, looking at eg. pkgs.nginx.
2021-05-31 10:47:49 +02:00
R. RyanTM
ed56d5e2af
apacheHttpd: 2.4.47 -> 2.4.48
2021-05-26 10:48:42 +00:00
embr
f4f05481e3
bozohttpd: add bozohttpd-minimal target
2021-05-26 11:38:57 +02:00
embr
dc9165346e
bozohttpd: resolve warnings, serve >2GB files on 32bit host
...
-D_DEFAULT_SOURCE *and* -D_GNU_SOURCE together resolve all warnings
about implicitly defined functions.
-D_LARGEFILE_SOURCE and -D_FILE_OFFSET_BITS=64 enable gcc's Large File
Extensions to allow a 32-bit host to serve files larger than 2GB.
Based on what Makefile.boot does, for platforms without bmake:
http://cvsweb.netbsd.org/bsdweb.cgi/src/libexec/httpd/Makefile.boot
2021-05-26 11:21:01 +02:00
Ryan Mulligan
abe9683e5b
Merge pull request #123563 from r-ryantm/auto-update/jetty
...
jetty: 9.4.39.v20210325 -> 9.4.41.v20210516
2021-05-25 12:55:11 -07:00
Izorkin
0a7feef809
nginxMainline: 1.20.0 -> 1.21.0
2021-05-25 19:54:05 +03:00
Izorkin
919dd5497a
nginxStable: 1.20.0 -> 1.20.1
2021-05-25 19:53:58 +03:00
embr
77acedc33b
bozohttpd: remove unnecessary checkFlags
2021-05-24 13:35:38 +02:00
embr
28508dce6a
bozohttpd: use bmake flags instead of a custom installPhase
2021-05-24 13:35:09 +02:00
embr
caaee8a55e
bozohttpd: init
2021-05-24 00:41:45 +02:00
Samuel Ainsworth
02c595ebdb
Prefer pname
and version
in mkDerivation
s instead of name
( #123438 )
...
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
Co-authored-by: nixpkgs-review <nixpkgs-review@example.com>
2021-05-23 17:07:31 +02:00
Mario Rodas
96d42f122f
Merge pull request #123248 from r-ryantm/auto-update/gitlab-pages
...
gitlab-pages: 1.38.0 -> 1.39.0
2021-05-19 05:00:10 -05:00
R. RyanTM
8bfc237eb3
jetty: 9.4.39.v20210325 -> 9.4.41.v20210516
2021-05-18 18:36:30 +00:00
Ben Siraphob
c5a669d3f7
treewide: remove unzip where not needed
2021-05-16 19:29:28 -07:00
github-actions[bot]
8c6d819143
Merge master into staging-next
2021-05-16 18:32:41 +00:00
midchildan
2b7ed5deef
trafficserver: remove joaquinito2051 as maintainer
...
This reverts commit da69e884b8
.
2021-05-17 00:42:57 +09:00
R. RyanTM
d36d679838
gitlab-pages: 1.38.0 -> 1.39.0
2021-05-16 14:29:35 +00:00
github-actions[bot]
f214722172
Merge master into staging-next
2021-05-12 18:32:26 +00:00
Stéphan Kochen
34d988e673
apacheHttpdPackages.mod_python: fix darwin build
2021-05-11 19:55:13 +02:00
Vladimír Čunát
5663b2b2d3
Merge branch 'master' into staging-next
...
(a trivial conflict in transmission)
2021-05-09 09:31:55 +02:00
R. RyanTM
5fbb4944bc
apt-cacher-ng: 3.6.1 -> 3.6.3
2021-05-08 17:50:59 -07:00
Léo Gaspard
f93396bf52
nginx: add link to acme nixos test
2021-05-08 21:42:04 +02:00
Léo Gaspard
58c16121e6
apacheHttpd: add link to acme nixos test
2021-05-08 21:41:55 +02:00
Martin Weinelt
9651084620
Merge remote-tracking branch 'origin/master' into staging-next
2021-05-08 14:43:43 +02:00
Vladimír Čunát
080cd658ca
Merge #121780 : treewide meta.maintainers tweaks
2021-05-08 10:47:08 +02:00
github-actions[bot]
1ae6d3d02f
Merge master into staging-next
2021-05-07 18:24:29 +00:00
ajs124
cd609e7a1c
Merge pull request #117094 from helsinki-systems/drop/spidermonkey_1_8_5
...
spidermonkey_1_8_5: drop
2021-05-07 18:55:49 +02:00
Vladimír Čunát
73e17a3594
treewide: remove lethalman from meta.maintainers
...
He hasn't been heard of for years.
2021-05-07 15:36:40 +02:00
ajs124
29bcaf04cb
couchdb2: drop
2021-05-03 15:41:42 +02:00
ajs124
b8caf0847c
couchdb: drop
2021-05-03 15:41:42 +02:00
github-actions[bot]
a4c3a2d732
Merge staging-next into staging
2021-05-03 12:26:48 +00:00
Luke Granger-Brown
d922cad4d6
Merge pull request #119172 from midchildan/package/trafficserver
...
nixos/trafficserver: init
2021-05-03 09:48:07 +01:00
github-actions[bot]
20ebbe6b59
Merge staging-next into staging
2021-04-30 18:26:34 +00:00
ajs124
cd349a4a62
Merge pull request #121019 from r-ryantm/auto-update/gitlab-pages
...
gitlab-pages: 1.35.0 -> 1.38.0
2021-04-30 15:12:10 +02:00
R. RyanTM
fe563d71a3
apacheHttpd: 2.4.46 -> 2.4.47
2021-04-30 04:07:35 +00:00
ajs124
a3c00f232b
gitlab-pages: add myself as maintainer
...
and add meta.changelog
2021-04-28 17:42:45 +02:00
ajs124
ae24119639
gitlab-pages: enable tests
2021-04-28 17:42:22 +02:00