colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
506,106 Commits 126 Branches 0 Tags 3.1 GiB
f46c8c1bcd
Commit Graph

491 Commits

Author SHA1 Message Date
Artturin
f46c8c1bcd setup-hooks/strip: Exit if cmd or ranlibCmd are empty 2023-07-21 21:57:44 +03:00
Artturin
2ae18b7e10 setup-hooks/strip: Add -- before $cmd 2023-07-21 21:57:44 +03:00
Artturin
5093766f79 setup-hooks/strip: Print strip stderr if command fails 
This is easiest to do through a file.

mktemp needs six X because busybox only accepts exactly six X.
 2023-07-21 21:57:44 +03:00
Linus Heckemann
70945eb79b setup-hooks/strip: parallelise stripping 
This makes bootstrapping to GNU hello ~1-2% faster on an 8-core
machine and ~3-4% faster on a 64-core machine.
 2023-07-10 12:24:13 +02:00
James Kay
40fbc97988 makeWrapper: fix flag handling 
When `--add-flags` is not used, `flagsBefore` is unset.  This causes an error when invoking `makeWrapper` from a context that sets `-o nounset`, as is done in `buildDotnetModule`.
This change makes `makeWrapper` safe for use in these conditions.
 2023-06-11 23:14:54 +03:00
fetsorn
3565fdf30c pkgs/build-support: fix typos 2023-05-31 04:00:14 +04:00
Guillaume Maudoux
dd0dee4c97 autoPatchelfHook: Add support for single files 2023-05-30 13:48:30 +02:00
Vladimír Čunát
50983f16a3
Merge #229154: staging: make wrapProgram<Type> use the right wrapper 
...into staging
 2023-05-01 10:17:18 +02:00
github-actions[bot]
fa2258cd02
Merge master into staging-next 2023-05-01 00:02:46 +00:00
Artturi
e6090800bd
Merge pull request #224178 from Yarny0/patch-ppd-files-meta 2023-04-30 21:15:46 +03:00
K900
a3cad4378e pkgs/build-support: call the right makeWrapper function from wrapProgram<Type> 2023-04-30 20:35:27 +03:00
github-actions[bot]
3f176be544
Merge staging-next into staging 2023-04-25 18:01:56 +00:00
github-actions[bot]
2e27a36b4b
Merge master into staging-next 2023-04-25 18:01:17 +00:00
toonn
acc386e521
Merge pull request #223759 from 2xsaiko/outgoing/darwin-bundle 
desktopToDarwinBundle: Parsing & icon conversion fixes
 2023-04-25 15:38:05 +02:00
Guillaume Girol
56009de17d
Merge pull request #227762 from raboof/separate-debug-info-deterministically 
setup-hooks/separate-debug-info.sh: make deterministic
 2023-04-23 13:41:09 +00:00
Arnout Engelen
9156daa547
setup-hooks/separate-debug-info.sh: make deterministic 
If multiple files with the same build id were found, we silently randomly
overwrote one with the other.

Change the order to make the output deterministic, and emit a
warning when overwriting.
 2023-04-23 11:53:47 +02:00
github-actions[bot]
5f6ff7e8cf
Merge staging-next into staging 2023-04-15 00:02:38 +00:00
Weijia Wang
ddd8604a3b moveBuildTree: init 2023-04-14 21:08:27 +03:00
Someone Serge
b612fe36b2
autoPatchelfHook: add appendRunpaths argument 2023-04-13 19:12:37 +03:00
Yarny0
fcbf9c6415 patch-ppd-files: use meta and passthru directly 
When I authored the nix file in
335a9083b0,
`makeSetupHook` didn't know about `passthru` or `meta`.
So I foisted these attributes on the
derivation with `.overrideAttrs`.

Commits ba895a7da8 and
48034046bf enabled
`makeSetupHook` to receive these attributes directly.
It seems advisable to use that instead of `.overrideAttrs`.
 2023-04-11 16:58:18 +02:00
Sandro
4806f62694
Merge pull request #224669 from raboof/preserve-dates-while-stripping 2023-04-09 03:28:06 +02:00
Arnout Engelen
112150ec70
setup-hooks/strip.sh: preserve file dates 
AFAIK this doesn't have a noticable effect for typical
Linux executables, but will avoid setting the timestamp
inside the file for Windows executables to the build
date.
 2023-04-04 18:52:39 +02:00
Marco Rebhan
f78175ad35 desktopToDarwinBundle: Fix icon selection algorithm 
Now, the fallback icon is only used after considering all possible icons
instead of only the first one.
 2023-03-29 16:42:57 +02:00
Marco Rebhan
d9a07bcd41 desktopToDarwinBundle: Add debug outputs for icon conversion 2023-03-29 16:42:57 +02:00
Marco Rebhan
b48f6118c4
desktopToDarwinBundle: Return at most 1 literal match from desktop file 
This fixes multiple entries being returned from getDesktopParam, e.g. in the
case of localized key names: 'Name', 'Name[de]', and makes this function to
match this key exactly instead of a pattern for the same reason.
 2023-03-26 12:47:52 +02:00
Sergei Trofimovich
22b935ace8
Merge pull request #219683 from symphorien/separatedebuginfo_static 
separate-debug-info.sh: succeed when output only contains static libs
 2023-03-12 17:02:03 +00:00
Guillaume Girol
94c7bf576a separate-debug-info.sh: succeed when output does not contain elf files 
Currently, separate-debug-info adds a debug output, and the build fail when it is
not created. the output is only created when at least one elf file is
stripped.
As a result, adding separateDebugInfo = true on a lib will break the
static build (unless the lib also contains an executable). In order to
not have to remember to add an exception every time, let's just create
the debug output unconditionally.
 2023-03-12 12:00:00 +00:00
Artturi
3b7e0ed336
Merge pull request #219182 from Artturin/multipleoutputsshdirnotempty 2023-03-10 23:46:23 +02:00
Artturin
9c72ea8725 multiple-outputs.sh: silence 'rmdir: failed to remove ... Directory not empty' 
++ rmdir /nix/store/6f233lsgbqv87w4nmzpsdaydwhyapps6-at-spi2-core-aarch64-unknown-linux-gnu-2.46.0/lib
rmdir: failed to remove '/nix/store/6f233lsgbqv87w4nmzpsdaydwhyapps6-at-spi2-core-aarch64-unknown-linux-gnu-2.46.0/lib': Directory not empty
 2023-03-04 14:43:38 +02:00
Robert Hensing
c8b7048233 multiple-outputs.sh: Make _assignFirst message more accurate 2023-02-26 09:57:19 +01:00
Robert Hensing
6e91cb046e multiple-outputs.sh: Do not leak _var variable from _assignFirst 2023-02-26 09:57:00 +01:00
Robert Hensing
71abb2c085 multiple-outputs.sh: Allow var as an output name 2023-02-26 09:55:45 +01:00
Artturi
cdcca1cdcd
Merge pull request #215715 from Artturin/removegirworkarounds2 2023-02-18 20:12:57 +02:00
Artturi
76844dfcfd
Merge pull request #211187 from Artturin/movetestpatchshenbag 2023-02-18 19:13:17 +02:00
Sergei Trofimovich
f488b617ab
setup-hooks/reproducible-builds.sh: NIX_OUTPATH_USED_AS_RANDOM_SEED (take 2) (#216967) 
This time the change targets `staging`.

This reverts commit e1f1c7eb79.
 2023-02-18 15:53:42 +01:00
Yureka
e1f1c7eb79
Revert "setup-hooks/reproducible-builds.sh: NIX_OUTPATH_USED_AS_RANDOM_SEED" (#216935) 
This is a stdenv rebuild and should have gone to staging
 2023-02-18 11:33:13 +01:00
Sergei Trofimovich
c8ca871429
Merge pull request #216016 from amjoseph-nixpkgs/pr/setup/NIX_OUTPATH_USED_AS_RANDOM_SEED 
setup-hooks/reproducible-builds.sh: NIX_OUTPATH_USED_AS_RANDOM_SEED
 2023-02-18 09:20:26 +00:00
Timothy DeHerrera
792907e3bf patch-shebangs: handle env -S shebangs 
`env -S` allows one to set more than one argument in a shebang. This
small patch allows the patch-shebangs hook to handle this case
appropriately.
 2023-02-17 22:22:26 +02:00
Artturin
2c471e6479 wrapGAppsHook: add gtk3 to depsTargetTargetPropagated 
for typelibs and girs
 2023-02-17 21:38:20 +02:00
Artturin
2168611677 wrapGAppsHook: run tests with strictDeps 
'nix build -f . "wrapGAppsHook.tests"' pass
 2023-02-17 21:34:59 +02:00
Artturin
c4e7fb1036 wrapGAppsHook: move dconf.lib to depsTargetTargetPropagated 
luckily the lib output does not contain binaries therefore its safe to
remove it from propagatedBuildInputs
 2023-02-17 21:32:48 +02:00
Adam Joseph
07942cdbdf setup-hooks/reproducible-builds.sh: NIX_OUTPATH_USED_AS_RANDOM_SEED 
For reproducibility, nixpkgs sets `-frandom-seed` to the first 10
characters of the outpath of the derivation being built.

This PR allows to manually select from which outpath the
10-character prefix is taken, by setting
`NIX_OUTPATH_USED_AS_RANDOM_SEED` as a derivation attribute (or
directly as an environment variable).

For an example use of this functionality, see:

  https://github.com/NixOS/nixpkgs/pull/209870
 2023-02-12 07:55:59 -08:00
Artturin
4e3dcf364e treewide: makeSetupHook deps -> propagatedBuildInputs 2023-02-07 21:02:00 +02:00
Artturin
8be7ab60b1 wrapGAppsHook: make it work with strictDeps 
remove unused input

add test for GDK_PIXBUF_MODULE_FILE

run tests with strictDeps

if the tests work with strictDeps then they work with non strictDeps
 2023-02-07 21:00:18 +02:00
Artturi
e42cdd2383
Merge pull request #212286 from Artturin/runonall 
make-symlinks-relative: run on all outputs
 2023-01-25 15:51:53 +02:00
github-actions[bot]
20df8d00cc
Merge master into staging-next 2023-01-25 12:01:34 +00:00
Nick Cao
0ea2d480e4
postgresqlTestHook: run postgresqlTestSetupPost hook after setting up 2023-01-25 18:46:27 +08:00
Artturin
cfb543a532 make-symlinks-relative: run on all outputs 2023-01-23 20:11:41 +02:00
Guillaume Girol
33afbf39f6 treewide: switch to nativeCheckInputs 
checkInputs used to be added to nativeBuildInputs. Now we have
nativeCheckInputs to do that instead. Doing this treewide change allows
to keep hashes identical to before the introduction of
nativeCheckInputs.
 2023-01-21 12:00:00 +00:00
Guillaume Girol
25193e2732 postgresqlTestHook: adapt comment to nativeCheckInputs 2023-01-21 16:42:10 +01:00