alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity
369254 commits 217 branches 121 tags 4.5 GiB
Commit graph

5340 commits

Author SHA1 Message Date
zowoq 3a70d5dc83 Merge remote-tracking branch 'origin/staging-next' into staging 
Conflicts:
	pkgs/development/compilers/go/2-dev.nix
 2022-04-07 22:12:13 +10:00
toonn 5eb21a55ee copyDesktopItems: Use variable for repeated path 
Co-authored-by: K900 <me@0upti.me>
 2022-04-07 11:04:11 +00:00
toonn d1bbb2b3d6 copyDesktopItems: Use bin output 
Desktop files are only useful when accompanied by the binaries they
specify. So it makes more sense to put them next to the binaries rather
than `$out` which only usually contains the binaries.
 2022-04-07 11:04:11 +00:00
github-actions[bot] 3dc8bd98b9
Merge staging-next into staging 2022-04-06 00:02:41 +00:00
Vladimír Čunát b4729bad3d
Merge #165406: staging-next 2022-03-23 2022-04-05 20:34:08 +02:00
Robert Hensing 559ac3c9e7
Merge pull request #166383 from hercules-ci/always-sanitize-derivation-name 
Always sanitize derivation name
 2022-04-05 20:05:33 +02:00
github-actions[bot] 3063a8ea39
Merge staging-next into staging 2022-04-05 12:10:46 +00:00
github-actions[bot] 27a4e52731
Merge master into staging-next 2022-04-05 12:05:41 +00:00
zowoq e65aba25f8 dockerTools: misc fixes 
- add nixosTests to `dockerTools.tests`
- don't use `pkgs` or `lib.singleton`
 2022-04-05 17:04:59 +10:00
Martin Weinelt bf1914e12a Merge remote-tracking branch 'origin/staging-next' into staging 2022-04-05 04:05:02 +02:00
zowoq 76636e0099 dockerTools: pkgs.system -> pkgs.stdenv.hostPlatform.system 
`pkgs.system` is an alias
 2022-04-05 10:19:40 +10:00
github-actions[bot] 120925b5cb
Merge master into staging-next 2022-04-05 00:02:06 +00:00
Robert Hensing a292213c44
Merge pull request #166792 from hercules-ci/pkgs-config-allowAliases-option 
config.allowAliases: Define as option
 2022-04-04 21:09:44 +02:00
Martin Weinelt f95a3d1140 Merge remote-tracking branch 'origin/staging-next' into staging 2022-04-04 00:46:25 +02:00
github-actions[bot] c46200d454
Merge master into staging-next 2022-04-03 18:01:07 +00:00
Janne Heß 7cdc4dd5d1
Merge pull request #164943 from ElvishJerricco/systemd-initrd-reuse-systemd-module 
initrd: Opt-in bare bones systemd-based initrd
 2022-04-03 15:53:02 +02:00
Alyssa Ross 8ba23e138d
Merge remote-tracking branch 'nixpkgs/staging-next' into staging 
Conflicts:
	pkgs/development/libraries/zlib/default.nix
	pkgs/development/lua-modules/overrides.nix
 2022-04-02 16:45:48 +00:00
github-actions[bot] 50497647fa
Merge master into staging-next 2022-04-01 12:01:21 +00:00
Robert Hensing 200175a701 config.allowAliases: Define as option 
This simplifies usages and makes the default value consistent.

In a few cases, the default value was interpreted to be `false`,
but this is useless, because virtually nobody will explicitly
set `allowAliases = true;`.
 2022-04-01 11:33:10 +02:00
Thiago Kenji Okada bdfff535f0 buildGraalvmNativeImage: allow usage of arbitrary graalvm derivation 
This will allow for easier overrides for specific systems (e.g.
`aarch64-linux` that is only supported in `graalvm17-ce`).
 2022-03-31 22:35:44 +01:00
Robert Hensing c39eff52dc testEqualDerivation: Rely on mkDerivation to sanitize name 2022-03-30 10:29:19 +02:00
Robert Hensing 225ca9088a runCommand*: Rely on mkDerivation to sanitize name 2022-03-30 10:29:19 +02:00
Jan Tojnar c8a5db3854 Merge branch 'staging-next' into staging 
; Conflicts:
;	pkgs/tools/archivers/rar/default.nix
 2022-03-28 17:56:38 +02:00
Jan Tojnar 997bb5e42c Merge branch 'master' into staging-next 
; Conflicts:
;	pkgs/development/python-modules/dnspython/default.nix
;	pkgs/development/python-modules/googleapis-common-protos/default.nix
 2022-03-28 17:55:31 +02:00
Vincent Laporte 15f220b07c ocamlPackages.buildDunePackage: add support for dune 3 2022-03-28 07:08:14 +02:00
Ben Siraphob ed863440b8
Merge pull request #163924 from OPNA2608/fix/autoPatchelfHook_isLinux 2022-03-26 16:01:56 -05:00
github-actions[bot] 84962daf66
Merge staging-next into staging 2022-03-25 18:01:48 +00:00
github-actions[bot] c6dd9fd65d
Merge master into staging-next 2022-03-25 18:01:14 +00:00
maralorn 0e0bb200ff
Merge pull request #165327 from ncfavier/fetchpatch-relative 
fetchpatch: add `preIncludes` and `relative`
 2022-03-25 16:32:14 +01:00
github-actions[bot] 8357b101a5
Merge staging-next into staging 2022-03-25 12:02:05 +00:00
Vladimír Čunát 0a8b4eddd2
Merge branch 'master' into staging-next 2022-03-25 10:16:56 +01:00
Ben Siraphob 3f1e23cf68
Merge pull request #165113 from toonn/darwin-bundle-fix-icon 2022-03-24 22:12:56 -05:00
José Romildo Malaquias eff8a32c29
Merge pull request #163623 from ilya-fedin/fix-mate-utils-inkscape 
nixos/wrap-gapps-hook: don't add data directories of icon dependencies into XDG_DATA_DIRS
 2022-03-24 21:34:23 -03:00
Naïm Favier bf7d13dc4f
fetchpatch: add relative 
Allows restricting patches to a specific subdirectory, à la
`git diff --relative=subdir`.

This cannot be done (cleanly) currently because the `includes` logic
happens *after* `stripLen` is applied, so we can't match on `subdir/*`.

This change adds a `relative` argument that makes this possible by
filtering files before doing any processing, and setting `stripLen` and
`extraPrefix` accordingly.
 2022-03-25 01:00:36 +01:00
Jonathan Ringer 44afbd4432 buildFHSUserEnvBubblewrap: append graphics share to XDG_DATA_DIR 2022-03-24 12:53:39 -07:00
Jonathan Ringer 1af1228c47 buildFHSUserEnv: append graphics share to XDG_DATA_DIR 2022-03-24 12:53:39 -07:00
Florian Klink 76d05dfa62 fakeNss: move to toplevel 
Make this reachable from pkgs.fakeNss. This is useful outside docker
contexts, too.

https://github.com/NixOS/nixpkgs/pull/164943#discussion_r833220769
 2022-03-24 18:47:30 +01:00
Doron Behar 4a02c56a7d
Merge pull request #164746 from ncfavier/makeWrapper-chdir 2022-03-24 13:51:27 +02:00
Vladimír Čunát a7ccddeb54
Revert "Merge #160259: separateDebugInfo: Use --strip-unneeded" 
This reverts commit 848091a52b, reversing
changes made to ab0e692ac7.

It caused issues with elfutils tests,
probably through over-stripping of glibc parts.
 2022-03-23 21:43:15 +01:00
Vladimír Čunát 848091a52b
Merge #160259: separateDebugInfo: Use --strip-unneeded 
...into staging
 2022-03-23 08:32:39 +01:00
OPNA2608 48034046bf autoPatchelfHook: Make Linux-exclusive 
After being rewritten in https://github.com/NixOS/nixpkgs/pull/149731, this hook
can fail on Mach-O binaries. Since patching ELF files on Darwin doesn't make
much sense anyway, we'll mark this as Linux-exclusive.
 2022-03-22 19:55:46 +01:00
github-actions[bot] 9d35f2cd19
Merge staging-next into staging 2022-03-22 18:10:54 +00:00
Artturi 6396adbdfa
Merge pull request #164420 from corngood/build-fhs-fix 2022-03-22 19:57:02 +02:00
github-actions[bot] e452d308f5
Merge staging-next into staging 2022-03-22 12:02:02 +00:00
Will Fancher d193ef8a57 make-initrd-ng: init 2022-03-22 07:02:22 -04:00
Alyssa Ross da450f6b1d treewide: clean up obsolete version checks 
These checks are all redundant with the check for Nix ≥2.2 in
default.nix.
 2022-03-22 10:54:11 +00:00
toonn 6aa5c53748
desktopToDarwinBundle: Fall back to scaling available 
Sometimes scalable icons or icons within the thresholds from the desired
resolutions aren't available. In this case it's still nicer to end up
with a blocky scaled icon rather than the generic default.
 2022-03-21 14:20:03 +01:00
toonn 08a2b83c96
desktopToDarwinBundle: Include TOC in generated ICNS file 
In order to compose a `.icns` file containing multiple icon sizes I had
to pass `--toc` to `icnsutil`. This did not seem to have a negative
effect on `.icns` containing only a single icon size.
 2022-03-21 14:20:03 +01:00
toonn c3d974e441
desktopToDarwinBundle: Simplify double negation 2022-03-21 14:20:03 +01:00
toonn 21fe5d3b8b
desktopToDarwinBundle: Drop 48x48 size 
On macOS 10.13 the 48x48 icon size is not supported. It results in a
corrupted image being displayed. I suspect the image data is being
truncated to what it expects for 32x32 or maybe data is read for
128x128, which would be a buffer overflow.
 2022-03-21 14:20:03 +01:00