Commit graph

6821 commits

Author SHA1 Message Date
github-actions[bot] 17a15a50ab
Merge master into staging-next 2023-07-21 06:01:05 +00:00
Theodore Ni 02ce2e9c86
fetchsvnssh: clean up md5 references 2023-07-20 21:24:13 -07:00
Theodore Ni 63804228e5
fetchgit: clean up md5 references 2023-07-20 21:24:13 -07:00
Theodore Ni a96b466396
fetchdarcs: clean up md5 references 2023-07-20 21:24:13 -07:00
Theodore Ni 4c9ed3189c
fetchhg: clean up md5 references 2023-07-20 21:24:13 -07:00
Theodore Ni eadaf81055
fetchsvn: clean up md5 references 2023-07-20 21:24:07 -07:00
Theodore Ni 6f30e0a906
fetchurl: clean up md5 references 2023-07-20 21:23:04 -07:00
github-actions[bot] da1f279ece
Merge master into staging-next 2023-07-20 18:01:17 +00:00
Sandro 081d7a5712
Merge pull request #243568 from tjni/fetchsvn 2023-07-20 17:08:53 +02:00
github-actions[bot] 8717af0ce1
Merge staging-next into staging 2023-07-17 18:01:56 +00:00
Ryan Lahfa 8fbe8379b3
Merge pull request #240808 from nrabulinski/fetchpijul 2023-07-17 19:31:53 +02:00
Nikodem Rabuliński 080e97c7f9
build-support: Add fetchpijul function. 2023-07-17 18:44:06 +02:00
github-actions[bot] fad49da923
Merge staging-next into staging 2023-07-17 06:02:22 +00:00
Lily Foster 249efd2271
Merge pull request #223457 from lilyinstarlight/fix/fetch-yarn-deps-pulsar
fetchYarnDeps: account for more yarn.lock spec edge cases
2023-07-16 20:24:16 -04:00
github-actions[bot] 5b36eb4172
Merge staging-next into staging 2023-07-17 00:03:32 +00:00
Lily Foster eb8c6ca753
Merge pull request #243604 from stasjok/remove-redundant-passthru
buildNpmPackage: remove redundant passthru.npmDeps
2023-07-16 19:23:39 -04:00
github-actions[bot] 034c3854f0
Merge staging-next into staging 2023-07-16 18:01:40 +00:00
Naïm Favier 4dadd7ef86
Merge pull request #242099 from ncfavier/runCommand-meta-position
runCommand: don't set meta.position if meta is given
2023-07-16 14:50:23 +02:00
Stanislav Asunkin 38ca04ed64 buildNpmPackage: remove redundant passthru.npmDeps 2023-07-15 10:29:55 +03:00
Theodore Ni 4cbdf0d1fc
fetchsvn: support hash parameter alongside sha256 2023-07-14 18:07:07 -07:00
Artturi c831e7939f
Merge pull request #242905 from Artturin/gomodu1 2023-07-14 01:36:16 +03:00
Artturin 1c29673fcc treewide: go-modules -> goModules
In 787af0f79f
I had to change ${go-modules} to $goModules to allow overrideAttrs to work;
However, env vars cannot contain -, so  i had to change go-modules too.
This in turn broke nix-update because it uses the go-modules attr.

Instead of making nix-update more complicated, make go-modules naming match cargoDeps.

`fd --type f | xargs sd '\bgo-modules\b' 'goModules'`
and revert change to pkgs/applications/misc/dstask/default.nix
and pkgs/servers/http/dave/default.nix
and pkgs/os-specific/darwin/plistwatch/default.nix

release note added
2023-07-14 00:18:06 +03:00
github-actions[bot] ddce1ebd78
Merge staging-next into staging 2023-07-12 12:02:00 +00:00
github-actions[bot] bc41da4eb9
Merge master into staging-next 2023-07-12 12:01:23 +00:00
Pol Dellaiera 99152c0f2e
Merge pull request #240939 from PedroHLC/nix-prefetch-git-sri
nix-prefetch-git: add sri-hash to output
2023-07-12 13:17:08 +02:00
Felix Buehler bec27fabee treewide: use lib.optional instead of 'then []' 2023-07-12 09:36:28 +01:00
Artturi de5a74e9bf
Merge pull request #242532 from league/builder-info-bug
fixes #242394
2023-07-10 20:48:02 +03:00
Christopher League ef2d657a01 buildenv: Limit exclusion of info/dir
While trying to exclude a generated `/share/info/dir` in a package
from symlinking into a profile, we also ended up excluding the Emacs
info manual for `dired-x`.  This change excludes only the dir file.
2023-07-09 22:06:26 -04:00
PedroHLC ☭ 0142902fc4
nix-prefetch-git: add sri-hash to output 2023-07-09 14:46:58 -03:00
github-actions[bot] e949ec41bd
Merge master into staging-next 2023-07-08 18:01:04 +00:00
Lily Foster bee82b47b5
Merge pull request #240419 from lilyinstarlight/feature/prefetch-npm-deps-isahc
prefetch-npm-deps: use isahc instead of ureq
2023-07-08 14:18:07 +02:00
github-actions[bot] 3ab86b3cfa
Merge master into staging-next 2023-07-08 12:01:04 +00:00
Atemu 67eec418ab
Merge pull request #240860 from Atemu/fhsenv-no-multiarch
buildFHSEnv: disable multiArch by default
2023-07-08 13:53:41 +02:00
Mario Rodas 43b091f45c
Merge pull request #233804 from lilyinstarlight/feature/npm-workspaces
buildNpmPackage: add npmWorkspace and npmPruneFlags args
2023-07-08 06:45:46 -05:00
Atemu 67ac4b83ec buildFHSEnv: disable multiArch by default
Most FHSEnv-wrapped packages in Nixpkgs wrap a x86_64-linux binary; making
multiArch unnecessary bloat closure size. Saves about 1G in anki-bin.

This makes multiArch FHSEnvs the exception rather than the rule.
2023-07-07 21:33:04 +02:00
Naïm Favier 9be0bfb5e0
runCommand: don't set meta.position if meta is given
Fixes #242093 without breaking #237589

If `meta` is given we probably already have position information, so no
need to get it from the arguments.
2023-07-07 19:12:35 +02:00
github-actions[bot] 1a76e12ddc
Merge master into staging-next 2023-07-06 18:01:11 +00:00
Robert Hensing fcea105698 buildEnv: Nix's buildEnv should be stable
It's mostly used by nix-env, but Nix should remain simple and small
for reproducibility.
2023-07-06 16:13:38 +02:00
Vladimír Čunát 58392652f0
Merge #224822: hardening flags: enable fortify3 by default
...into staging
2023-07-06 10:33:24 +02:00
Artturi 8bf1b878cf
Merge pull request #239331 from pwaller/fix-pie-hardening 2023-07-06 02:14:35 +03:00
Jan Tojnar 2819e547d3 Merge branch 'staging-next' into staging
; Conflicts:
;	pkgs/development/libraries/nss/generic.nix

- bb53634671 removed the conditionals since firefox-esr-91 and nss <3.69 has been dropped a while ago.
- cb3762857d updated the conditionals to always partition the tests based on the nss_latest version. Chosen that since it will remain future proof.
2023-07-05 02:22:26 +02:00
Artturi 359e1136a6
Merge pull request #239120 from LibreCybernetics/arch-stuff 2023-07-05 00:20:25 +03:00
Lily Foster fb9252fa48
prefetch-npm-deps: use exponential backoff 2023-07-04 14:47:13 -04:00
github-actions[bot] f5a8109c46
Merge staging-next into staging 2023-07-02 00:03:47 +00:00
Atemu 62b2adc753 buildFHSEnv: add multiArch flag
The intention is to allow the user control over whether 32bit deps are supposed
to be included in the fhsenv
2023-07-01 13:41:14 +02:00
Atemu 167264179b buildFHSEnv: cleanup 2023-07-01 13:41:09 +02:00
Artturin fb8fdc33e8 makeSetupHook: unbreak structuredAttrsByDefault 2023-06-30 19:38:26 +03:00
github-actions[bot] c3cfd4a6c8
Merge staging-next into staging 2023-06-30 06:01:55 +00:00
Nick Cao d1ff959a99
Merge pull request #240613 from SuperSandro2000/binary-cache
binary-cache: use lib.makeBinPath
2023-06-30 09:14:07 +08:00
github-actions[bot] f6242f9557
Merge staging-next into staging 2023-06-30 00:03:00 +00:00