colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
533,277 Commits 125 Branches 0 Tags 3.4 GiB
8bc5104a6e
Commit Graph

30045 Commits

Author SHA1 Message Date
Maximilian Bosch
8bc5104a6e
treewide: refactor .attrs.sh detection 
When specifying the `builder` attribute in `stdenv.mkDerivation`, this
will be effectively transformed into

    builtins.derivation {
      builder = stdenv.shell;
      args = [ "-e" builder ];
    }

This also means that `default-builder.sh` is never sourced and as a
result it's not guaranteed that `$NIX_ATTRS_SH_FILE` is set to a correct
location[1].

Also, we need to source `.attrs.sh` to source `$stdenv`. So, the
following is done now:

* If `$NIX_ATTRS_SH_FILE` points to a correct location, then use it.
  Directly using `.attrs.sh` is problematic for `nix-shell(1)` usage
  (see previous commit for more context), so prefer the environment
  variable if possible.

* Otherwise, if `.attrs.sh` exists, then use it. See [1] for when this
  can happen.

* If neither applies, it can be assumed that `__structuredAttrs` is
  turned off and thus nothing needs to be done.

[1] It's possible that it doesn't exist at all - in case of Nix 2.3 or
    it can point to a wrong location on older Nix versions with a bug in
    `__structuredAttrs`.
 2023-10-04 18:36:57 +02:00
Nick Cao
31a4c3f2e2
Merge pull request #258841 from NickCao/x11-security 
xorg.libX11: 1.8.6 -> 1.8.7, xorg.libXpm: 3.5.16 -> 3.5.17
 2023-10-04 09:24:16 -04:00
github-actions[bot]
c7a3c2d71b
Merge master into staging-next 2023-10-04 12:01:01 +00:00
Franz Pletz
fb0b874a51
Merge pull request #258724 from mfrw/mfrw/prometheus-2.47.0 2023-10-04 10:20:25 +02:00
github-actions[bot]
0f2514516b
Merge master into staging-next 2023-10-04 06:00:56 +00:00
Artturi
d1c9180c6d
Merge pull request #258425 from NickCao/xf86videosiliconmotion 2023-10-04 05:19:08 +03:00
github-actions[bot]
4b71f780ea
Merge master into staging-next 2023-10-04 00:02:21 +00:00
Weijia Wang
c96a78b5a3
Merge pull request #256047 from r-ryantm/auto-update/mysql_jdbc 
mysql_jdbc: 8.0.33 -> 8.1.0
 2023-10-04 01:44:02 +02:00
Artturi
0612b612f0
Merge pull request #257087 from pasqui23/discord-puppet-node-18 2023-10-03 23:28:15 +03:00
Martin Weinelt
e29e5077fc
Merge remote-tracking branch 'origin/master' into staging-next 
Conflicts:
- pkgs/development/python-modules/podcastparser/default.nix
 2023-10-03 21:13:27 +02:00
Nick Cao
6a935b14c1
xorg.libXpm: 3.5.16 -> 3.5.17 2023-10-03 13:43:11 -04:00
Nick Cao
efdba2d7be
xorg.libX11: 1.8.6 -> 1.8.7 2023-10-03 13:42:15 -04:00
Nick Cao
dbcae9f958
Merge pull request #258712 from jmbaur/coredns-fix-cross 
coredns: Fix cross-compile
 2023-10-03 10:03:10 -04:00
Nick Cao
eaccf998c6
Merge pull request #258732 from r-ryantm/auto-update/prometheus-pushgateway 
prometheus-pushgateway: 1.6.0 -> 1.6.2
 2023-10-03 09:56:07 -04:00
Alyssa Ross
b369092b3b xorg.libxcvt.meta.homepage: init 2023-10-03 12:05:52 +00:00
Alyssa Ross
d8469ef08c pkgsStatic.xorg.libxcvt: mark unsupported 
Uses shared_library in Meson.
 2023-10-03 12:05:52 +00:00
Mario Rodas
ae2ba7eb45
Merge pull request #258753 from marsam/postgresql-age-support-more-versions 
postgresqlPackages.age: support more PostgreSQL versions
 2023-10-03 05:10:54 -05:00
Fabian Affolter
75ef5c8764
Merge pull request #258721 from elohmeier/checksslcert-darwin 
checkSSLCert: add darwin support
 2023-10-03 11:08:05 +02:00
Martin Weinelt
b135595213
Merge remote-tracking branch 'origin/master' into staging-next 2023-10-03 10:17:45 +02:00
lewo
326215986a
Merge pull request #257376 from trofi/postfix-leaner-closure 
postfix: mangle store paths in /etc/postfix/makedefs.out
 2023-10-03 08:39:07 +02:00
Fabián Heredia Montiel
bc5e2a537d
Merge pull request #258708 from r-ryantm/auto-update/gobgpd 
gobgpd: 3.18.0 -> 3.19.0
 2023-10-03 00:37:38 -06:00
R. Ryantm
5ab0f73463 prometheus-pushgateway: 1.6.0 -> 1.6.2 2023-10-03 06:20:16 +00:00
github-actions[bot]
560e64fc7a
Merge master into staging-next 2023-10-03 06:01:08 +00:00
Muhammad Falak R Wani
78204e9206 prometheus: 2.46.0 -> 2.47.0 
Diff: https://github.com/prometheus/prometheus/compare/v2.46.0...v2.47.0
Changelog: https://github.com/prometheus/prometheus/blob/v2.47.0/CHANGELOG.md
Signed-off-by: Muhammad Falak R Wani <falakreyaz@gmail.com>
 2023-10-03 10:36:28 +05:30
Enno Richter
8d58b64400 checkSSLCert: add darwin support 2023-10-03 06:52:59 +02:00
Mario Rodas
cf5cea07bd postgresqlPackages.age: support more PostgreSQL versions 2023-10-03 04:20:00 +00:00
Jared Baur
c10a190986
coredns: Fix cross-compile 
When running go generate, an intermediate binary is built called
`directives_generate`, which will be built with whatever is defined in
GOARCH and GOOS.
 2023-10-02 20:46:10 -07:00
R. Ryantm
dc6deef51f gobgpd: 3.18.0 -> 3.19.0 2023-10-03 03:10:43 +00:00
Martin Weinelt
9d0b02be98 Merge remote-tracking branch 'origin/master' into staging-next 
Conflicts:
- pkgs/development/python-modules/python-ndn/default.nix
 2023-10-02 23:59:00 +02:00
seth
b206b0817c
tailscale: 1.50.0 -> 1.50.1 
Diff: https://github.com/tailscale/tailscale/compare/v1.50.0...v1.50.1
 2023-10-02 17:33:39 -04:00
Fabian Affolter
4984613adb
Merge pull request #251812 from LeSuisse/licenses-elv2 
lib/licenses: add Elastic License 2.0, drop Elastic License
 2023-10-02 22:11:16 +02:00
Pascal Bach
c5a0edad40
Merge pull request #256830 from r-ryantm/auto-update/minio 
minio: 2023-09-07T02-05-02Z -> 2023-09-20T22-49-55Z
 2023-10-02 21:25:17 +02:00
Weijia Wang
f9442f4226
Merge pull request #258410 from wegank/wordpress-bump-2 
wordpress: update languages and plugins
 2023-10-02 21:07:44 +02:00
github-actions[bot]
23a7292114
Merge master into staging-next 2023-10-02 18:01:04 +00:00
markuskowa
1af7a07ae9
Merge pull request #258214 from markuskowa/split-rdma-core 
rdma-core: split outputs -> out, man, dev
 2023-10-02 17:30:40 +02:00
Maximilian Bosch
615d3c49dc
Merge pull request #258545 from alyssais/prosody-cross 
prosody: fix cross
 2023-10-02 17:29:12 +02:00
Nick Cao
8da3ff7d35
Merge pull request #258503 from SuperSandro2000/mobilizon-cleanup 
mobilizon: cleanup code a bit
 2023-10-02 09:37:16 -04:00
ajs124
b5e505b440 exim: 4.96 -> 4.96.1 
Fixes CVE-2023-42114, CVE-2023-42115, CVE-2023-42116
See https://exim.org/static/doc/security/CVE-2023-zdi.txt for details.
 2023-10-02 15:22:39 +02:00
Weijia Wang
ccdb43a66a Merge branch 'master' into staging-next 2023-10-02 14:49:01 +02:00
Alyssa Ross
0692b3e52a
prosody: fix cross 2023-10-02 08:24:37 +00:00
Emery Hemingway
24dad2c1d6 nitter: depend on openssl with buildInputs 2023-10-02 08:20:14 +01:00
Cabia Rangris
6f7933059d
Merge pull request #237404 from cab404/cab/moonraker-gpiod 
moonraker: add useGpiod
 2023-10-02 06:45:16 +04:00
Vladimir Serov
5edabf7c0b
moonraker: add useGpiod 2023-10-02 06:09:58 +04:00
Sandro Jäckel
204e0caee0
mobilizon: cleanup code a bit 2023-10-02 03:12:26 +02:00
Pol Dellaiera
c8ea41a26a
Merge pull request #258452 from shyim/update-opensearch 
opensearch: 2.9.0 -> 2.10.0
 2023-10-01 22:22:28 +02:00
maxine
d964622da5
Merge pull request #256056 from r-ryantm/auto-update/plexRaw 
plexRaw: 1.32.6.7468-07e0d4a7e -> 1.32.6.7557-1cf77d501
 2023-10-01 21:58:43 +02:00
Soner Sayakci
a1a26d0185
opensearch: 2.9.0 -> 2.10.0 2023-10-01 20:28:51 +02:00
github-actions[bot]
708561b6ea
Merge master into staging-next 2023-10-01 18:01:08 +00:00
Alyssa Ross
09fed847aa pkgsStatic.pulseaudio: mark unsupported 
Looks like getting it supported would just be a case of somebody
changing the Meson files and testing that it works!
 2023-10-01 15:49:31 +00:00
Nick Cao
6eb49b7201
xorg.xf86videosiliconmotion: 1.7.9 -> 1.7.10 2023-10-01 11:32:39 -04:00