Commit graph

7071 commits

Author SHA1 Message Date
Evils ef1b2ae152 appimage-run: add pciutils for FreeCAD 2023-09-28 19:15:01 +02:00
Jules Aguillon 187d777aad ocamlPackages.buildTopkgPackage: Added
This function helps building an OCaml package that builds with topkg.
There are currently many such packages in nixpkgs and this function
would greatly simplify adding more.

This is heavily inspired by `ocamlPackages.buildDunePackage`.
2023-09-28 12:03:20 +02:00
github-actions[bot] 81ae4e07a3
Merge master into staging-next 2023-09-27 12:01:06 +00:00
Dan Buch 14f76a96e8
fetch-yarn-deps: warn on undefined expected hash
instead of rejecting, given that the expected hash may not be known/provided.
2023-09-27 00:17:40 +00:00
github-actions[bot] 3bfcfd7eef
Merge master into staging-next 2023-09-26 06:01:00 +00:00
Pol Dellaiera f0dc8516ed
build-support/php/hooks: add cacert 2023-09-25 22:10:28 +02:00
github-actions[bot] fc1f757bf6
Merge master into staging-next 2023-09-25 18:01:06 +00:00
Yureka 5d20a2b99a buildPecl: pass hash attr to fetchurl 2023-09-25 19:24:40 +02:00
Pol Dellaiera a7b3106959
Merge pull request #256628 from alyssais/nix-prefetch-git-config
nix-prefetch-git: ignore global and user git config
2023-09-25 18:40:40 +02:00
github-actions[bot] 680b13891d
Merge master into staging-next 2023-09-25 00:02:13 +00:00
Hraban Luyat 1b26fc011a emacs: allow using as shebang on darwin 2023-09-24 19:50:52 -03:00
Hraban Luyat 949ea0426d emacs: remove unused makeWrapper dependency
As far as I can tell this is unused. The wrapper script is fully custom.
2023-09-24 19:50:52 -03:00
github-actions[bot] b6d5fc29bc
Merge master into staging-next 2023-09-24 12:01:00 +00:00
Atemu aa827460ae
Merge pull request #257049 from alyssais/buildFHSEnv-passthru
buildFHSEnv: add base paths to passthru
2023-09-24 11:41:22 +02:00
Alyssa Ross 00a28d0ed9
buildFHSEnv: add base paths to passthru
It's useful to be able to introspect all packages which are available
in the fhsenv.  I've renamed basePkgs and baseMultiPkgs to be
consistent with the naming scheme used for the bits that were
previously public — names ending in "Pkgs" are for functions, and
names ending in "Paths" are the results of those functions.
2023-09-24 08:43:20 +00:00
Pol Dellaiera bd3d5995d9
Merge pull request #256557 from NixOS/bump/build-support/php/composer-local-repo-plugin-1-0-3
build-support/php/composer-local-repo-plugin: 1.0.2 -> 1.0.3
2023-09-24 09:16:08 +02:00
github-actions[bot] 0e6413dbff
Merge master into staging-next 2023-09-24 00:02:23 +00:00
Silvan Mosberger 390a4247e0
Merge pull request #255512 from nbraud/sha512-to-hash
treewide: sha512 → hash
2023-09-24 00:03:31 +02:00
nicoo fab52fca51 treewide: sha512 → hash 2023-09-22 18:37:42 +02:00
Alyssa Ross 7d40fbbc04
nix-prefetch-git: ignore global and user git config
nix-prefetch-git is either run as part of a build, usually sandboxed,
or outside a build, unsandboxed, to prefetch something that will later
be used in a build.  It's important that the latter use produces
hashes that can be reproduced by the former.

One way that they can differ is if the user's git config does
something that changes the result of git clone.  I ran into this,
because my global git config automatically enables git-lfs, whereas
nix-prefetch-git otherwise only uses git-lfs if specifically
requested.  This led to very confusing hash mismatches.
2023-09-22 06:59:40 +00:00
Pol Dellaiera 9675e82ea1
build-support/php/composer-local-repo-plugin: 1.0.2 -> 1.0.3 2023-09-21 21:15:57 +02:00
github-actions[bot] 4c610adf95
Merge master into staging-next 2023-09-21 12:01:19 +00:00
Jörg Thalheim 53204fe466
Merge pull request #256423 from Artturin/fixwritecbin
writers.writeCBin: fix binary name when cross-compiling
2023-09-21 08:36:09 +02:00
github-actions[bot] 743d7baa31
Merge master into staging-next 2023-09-21 06:01:07 +00:00
Elis Hirwing edd1e27480
Merge pull request #256315 from NixOS/php/bump-composer-2-6-3
phpPackages.composer: 2.6.2 -> 2.6.3
2023-09-21 07:56:44 +02:00
Artturin 8a77757b7e writers.writeCBin: fix binary name when cross-compiling
`$name` contains cross-compilation info `bin/wrapped-argv0-aarch64-unknown-linux-gnu`

name should not be set directly.
2023-09-21 04:13:45 +03:00
github-actions[bot] 2b20c287ac
Merge master into staging-next 2023-09-21 00:02:13 +00:00
Maciej Krüger 6cecfa12b5
Merge pull request #239570 from hacker1024/feature/flutter-wrapper-gapps
flutter: Use wrapGAppsHook
2023-09-20 23:34:26 +02:00
Fabián Heredia Montiel b2f85dbf28 Merge remote-tracking branch 'origin/master' into staging-next 2023-09-20 15:08:16 -06:00
Pol Dellaiera c8b9e229e1
phpPackages.composer: 2.6.2 -> 2.6.3 2023-09-20 16:53:03 +02:00
ajs124 831148bf27 testers.testMetaPkgConfig: fix warning
follow-up to feabc3db0fa3c875a45116734aa4ae4751c6ef76
2023-09-19 16:11:42 +02:00
github-actions[bot] e22ad0ef4c
Merge master into staging-next 2023-09-19 12:01:22 +00:00
Pol Dellaiera 6e55577f33 build-support/php/composer-local-repo-plugin: 1.0.0 -> 1.0.2
Also fix https://github.com/NixOS/nixpkgs/issues/255860
2023-09-18 14:21:26 +02:00
github-actions[bot] d2fdbb7e40
Merge master into staging-next 2023-09-17 18:00:59 +00:00
Artturi 9466d15361
Merge pull request #255188 from NickCao/make-binary-wrapper
makeBinaryWrapper.extractCmd: fix use in cross compilation
2023-09-17 17:31:00 +03:00
Nick Cao c6e11d15ce
makeBinaryWrapper.extractCmd: fix use in cross compilation 2023-09-16 22:17:22 -04:00
Artturi 9acebc35f9
Merge pull request #235473 from szlend/fix-deterministic-uname-getops 2023-09-17 04:46:44 +03:00
Simon Žlender b485dd0036 deterministic-uname: fix default output 2023-09-17 00:08:43 +03:00
Atemu 88a0ff46e5
Merge pull request #253982 from rnhmjoj/pr-fhs
buildFHSEnv: disable security features by default
2023-09-16 21:09:24 +02:00
Elis Hirwing 28fd868e47
Merge pull request #255156 from NixOS/build-support/php/update-install-procedure
build-support/php: prevent the creation of symlinks
2023-09-15 08:39:55 +02:00
Pol Dellaiera a2f8623363
build-support/php: prevent the creation of symlinks
Using symbolic links create issues on Darwin, therefore, using `makeWrapper` fix this.
2023-09-14 21:40:33 +02:00
Weijia Wang 0cfc319f83 fetchDebianPatch: Require patch names with extensions
Otherwise the fetcher is unuseable with patches
whose filename (in Debian) doesn't end in `.patch`.
2023-09-14 18:55:30 +00:00
toonn 924efe5313
Merge pull request #249268 from Enzime/remmina-bundle
writeDarwinBundle: use binary wrapper
2023-09-14 15:05:13 +02:00
Elis Hirwing 350cac13cf
Merge pull request #248184 from NixOS/php/add-new-builder-only
php: add new Composer builder
2023-09-14 07:50:27 +02:00
Pol Dellaiera 3eb168da92
build-support/php: add composerNoDev, composerNoPlugins and composerNoScripts attributes 2023-09-13 17:08:04 +02:00
Pol Dellaiera 1173a34d15
build-support/php: move internal tools in php/build-support/php/pkgs 2023-09-13 17:07:48 +02:00
Elis Hirwing 1e238b8afe
php: Fix shellcheck string warnings in composer-install-hook 2023-09-13 15:00:04 +02:00
Elis Hirwing 2160ed2bcc
composer: Stop exposing composer built from a phar file 2023-09-13 15:00:04 +02:00
Elis Hirwing 9e701e6328
composer-local-repo-plugin: Stop exposing this internal tool 2023-09-13 15:00:03 +02:00
Pol Dellaiera b36ad2f517
php: add new builder buildComposerProject 2023-09-13 15:00:03 +02:00