Commit Graph

2238 Commits

Author SHA1 Message Date
github-actions[bot]
120925b5cb
Merge master into staging-next 2022-04-05 00:02:06 +00:00
Martin Weinelt
c6476294e1 Merge remote-tracking branch 'origin/master' into staging-next 2022-04-04 18:40:34 +02:00
xrelkd
a6a606b032
eksctl: 0.89.0 -> 0.90.0 2022-04-05 00:24:06 +08:00
Bernardo Meurer
6caef52177
Merge pull request #167174 from cpcloud/fix-pulumi-hashes 2022-04-04 08:22:32 -07:00
ajs124
6e9e5dfd55 intecture-*: drop 2022-04-04 15:10:43 +01:00
Phillip Cloud
cb69b89d90
pulumi: fix hashes 2022-04-04 08:47:59 -04:00
github-actions[bot]
ee8677862d
Merge master into staging-next 2022-04-04 12:01:25 +00:00
Mario Rodas
c918dcd18d
Merge pull request #165832 from r-ryantm/auto-update/certigo
certigo: 1.15.0 -> 1.15.1
2022-04-04 06:05:27 -05:00
Bobby Rong
b77d73a1a1
Merge pull request #167100 from r-ryantm/auto-update/mycli
mycli: 1.24.4 -> 1.25.0
2022-04-04 18:20:22 +08:00
Fabian Affolter
d2345ac00f
Merge pull request #166795 from 06kellyjac/syft
syft: 0.42.4 -> 0.43.0
2022-04-04 10:28:35 +02:00
Timo Kaufmann
b44f7ed2c2
Merge pull request #166250 from gador/pgadmin-update-6.7
pgadimin4: 6.5 -> 6.7
2022-04-04 10:07:08 +02:00
R. Ryantm
59729543d0 mycli: 1.24.4 -> 1.25.0 2022-04-03 23:13:34 +00:00
github-actions[bot]
4ce2c22a6b
Merge master into staging-next 2022-04-03 06:01:19 +00:00
Bernardo Meurer
044cd99504 pulumi: 3.27.0 -> 3.28.0 2022-04-02 20:52:15 -07:00
github-actions[bot]
fc17fe6417
Merge master into staging-next 2022-04-02 18:01:07 +00:00
7c6f434c
8188f10752
Merge pull request #166430 from alyssais/openssl-static-retry
treewide: use lib.getLib for OpenSSL libraries
2022-04-02 12:59:55 +00:00
github-actions[bot]
50497647fa
Merge master into staging-next 2022-04-01 12:01:21 +00:00
06kellyjac
19315d0dde syft: 0.42.4 -> 0.43.0 2022-04-01 10:37:47 +01:00
Bernardo Meurer
ae79ae5805 pulumi: update plugins 2022-03-31 23:20:51 -07:00
github-actions[bot]
1652173e67
Merge master into staging-next 2022-04-01 00:02:15 +00:00
06kellyjac
91d09c7465 trivy: 0.24.4 -> 0.25.0 2022-03-31 14:18:14 +01:00
Martin Weinelt
d0bfb3ccbb Merge remote-tracking branch 'origin/master' into staging-next 2022-03-31 03:49:37 +02:00
Martin Weinelt
9bb92e48ef
pgadmin3: drop
The package version is 6y old and was last maintained in 2017. By now we
have pgadmin4 packaged so there is no reason to keep this around.
2022-03-30 23:44:18 +02:00
Malo Bourgon
3c25104d0e
stripe-cli: add meta.mainProgram (#166457) 2022-03-30 21:33:44 +02: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
Ryan Mulligan
0af8d48266
Merge pull request #166368 from r-ryantm/auto-update/mycli
mycli: 1.24.3 -> 1.24.4
2022-03-30 05:10:03 -07:00
R. Ryantm
88a70a935e mycli: 1.24.3 -> 1.24.4 2022-03-30 05:28:44 +00:00
Bernardo Meurer
5e3265af04 pulumi: 3.26.1 -> 3.27.0 2022-03-29 15:40:37 -07:00
Florian Brandes
4c1596384c
pgadimin4: 6.5 -> 6.7
Signed-off-by: Florian Brandes <florian.brandes@posteo.de>
2022-03-29 15:50:16 +02:00
github-actions[bot]
80ddf916da
Merge master into staging-next 2022-03-29 00:02:04 +00:00
Flakebi
3657f4033b
salt: 3004 -> 3004.1 2022-03-28 22:03:28 +02:00
github-actions[bot]
e3d20dfaa5
Merge master into staging-next 2022-03-27 18:01:05 +00:00
Sandro
7168385eca
Merge pull request #165809 from xrelkd/update/eksctl 2022-03-27 15:50:19 +02:00
R. Ryantm
4f85997362 certigo: 1.15.0 -> 1.15.1 2022-03-26 11:21:55 +00:00
Vladimír Čunát
a42ca0678b
Merge branch 'master' into staging-next 2022-03-26 09:20:38 +01:00
Bobby Rong
b2df1cda99
Merge pull request #165349 from r-ryantm/auto-update/aliyun-cli
aliyun-cli: 3.0.112 -> 3.0.113
2022-03-26 13:59:03 +08:00
xrelkd
332855974b eksctl: 0.88.0 -> 0.89.0 2022-03-26 13:07:06 +08:00
Vladimír Čunát
0a8b4eddd2
Merge branch 'master' into staging-next 2022-03-25 10:16:56 +01:00
Fabian Affolter
919a0dcc12
Merge pull request #165700 from 06kellyjac/syft
syft: 0.42.2 -> 0.42.4
2022-03-25 00:23:42 +01:00
Bernardo Meurer
b485b2ce3d pulumi: update plugins 2022-03-24 12:57:07 -07:00
06kellyjac
1336186976 syft: 0.42.2 -> 0.42.4 2022-03-24 16:28:51 +00:00
github-actions[bot]
c80dabe3b1
Merge staging-next into staging 2022-03-23 06:01:55 +00:00
Sandro
360a2296f4
Merge pull request #164614 from 06kellyjac/syft 2022-03-23 03:41:31 +01:00
R. Ryantm
7b7e648b80 aliyun-cli: 3.0.112 -> 3.0.113 2022-03-23 01:04:38 +00:00
zowoq
be98149597 Merge remote-tracking branch 'origin/staging-next' into staging
Conflicts:
	pkgs/servers/isso/default.nix
2022-03-23 10:04:17 +10:00
06kellyjac
40b9dfc739 syft: 0.41.6 -> 0.42.2 2022-03-22 19:06:30 +00:00
Pascal Bach
c8e0d9ec64
Merge pull request #165223 from NixOS/pulumi-3.26.1
pulumi: 3.25.1 -> 3.26.1
2022-03-22 19:54:38 +01:00
github-actions[bot]
e452d308f5
Merge staging-next into staging 2022-03-22 12:02:02 +00:00
Bernardo Meurer
dfc489e510 pulumi: 3.25.1 -> 3.26.1 2022-03-22 00:49:34 -07:00
Sandro
5b874cadbf
Merge pull request #163582 from Stunkymonkey/treewide-fetchFromGitHub-1 2022-03-22 07:27:54 +01:00