mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-21 13:10:33 +00:00
Code Issues Wiki Activity
248917 commits 312 branches 124 tags 6.5 GiB
Commit graph

4004 commits

Author SHA1 Message Date
Vladimír Čunát 89023c38fc
Recover the complicated situation after my bad merge 
I made a mistake merge.  Reverting it in c778945806 undid the state
on master, but now I realize it crippled the git merge mechanism.
As the merge contained a mix of commits from `master..staging-next`
and other commits from `staging-next..staging`, it got the
`staging-next` branch into a state that was difficult to recover.

I reconstructed the "desired" state of staging-next tree by:
 - checking out the last commit of the problematic range: 4effe769e2
 - `git rebase -i --preserve-merges a8a018ddc0` - dropping the mistaken
   merge commit and its revert from that range (while keeping
   reapplication from 4effe769e2)
 - merging the last unaffected staging-next commit (803ca85c20)
 - fortunately no other commits have been pushed to staging-next yet
 - applying a diff on staging-next to get it into that state
 2020-10-26 09:01:04 +01:00
Vladimír Čunát c778945806
Revert "Merge #101508: libraw: 0.20.0 -> 0.20.2" 
I'm sorry; I didn't notice it contained staging commits.

This reverts commit 17f5305b6c, reversing
changes made to a8a018ddc0.
 2020-10-25 09:41:51 +01:00
Frederik Rietdijk 23890fc236 Merge staging-next into staging 2020-10-20 20:55:46 +02:00
Jan Tojnar 5c766c5c24
Merge branch 'staging-next' into staging 2020-10-18 21:21:03 +02:00
Daniël de Kok 48a20e9337 validatePkgConfig: fix variable scope 
validatePkgConfig failed due to a wrong variable scope, as reported in
issue #100834. This change corrects the variable scoping.
 2020-10-18 14:00:05 +02:00
Leon Vack f275b320d9
make-desktopitem: name was being used instead of desktopName 
Name should be used as filename and desktopName for the name attribute of the desktop entry (according to docs).
 2020-10-15 14:29:32 +02:00
maralorn ae2630c96a
Merge pull request #91790 from piegamesde/improve-makedesktopitem 
make-desktopitem: refactoring, documentation and improvement
 2020-10-15 02:42:12 +02:00
piegames 3a76d4caea make-desktopitem: minor fixes and code style 2020-10-14 01:19:43 +02:00
Frederik Rietdijk dc0aeee5db Merge staging-next into staging 2020-10-13 19:35:37 +02:00
Frederik Rietdijk 9e1943edc0 Merge master into staging-next 2020-10-13 19:34:34 +02:00
John Ericson d3d55bcc81
Merge pull request #99066 from lopsided98/buildrustcrate-target-vars 
buildRustCrate: fix target config environment variables on 32-bit ARM
 2020-10-11 16:46:29 -04:00
Lily Ballard 03c9f6a647 installShellFiles: Add test suite 2020-10-08 15:08:40 -07:00
Lily Ballard 866a7de409 Fix doc comment for installManPage 2020-10-08 15:08:40 -07:00
Lily Ballard 7e1e8543fc installShellFiles: Enhance installShellCompletion 
Teach installShellCompletion how to install completions from a named
pipe. Also add a convenience flag `--cmd NAME` that synthesizes the name
for each completion instead of requiring repeated `--name` flags.

Usage looks something like

    installShellCompletion --cmd foobar \
      --bash <($out/bin/foobar --bash-completion) \
      --fish <($out/bin/foobar --fish-completion) \
      --zsh <($out/bin/foobar --zsh-completion)

Fixes #83284
 2020-10-08 15:08:40 -07:00
Frederik Rietdijk 692d219a93 Merge staging-next into staging 2020-10-06 10:25:58 +02:00
Ben Wolsieffer 91bc6128b9 buildRustCrateTests: support cross-compilation 2020-09-29 14:33:49 -04:00
Ben Wolsieffer f0fdecfbb4 buildRustCrate: fix target config environment variables on 32-bit ARM 2020-09-29 01:40:06 -04:00
John Ericson cffc0eaa98
Merge pull request #99050 from lopsided98/buildrustcrate-cross 
buildRustCrate: support cross compilation
 2020-09-29 00:13:26 -04:00
Ben Wolsieffer a0e7613509 defaultCrateOverrides: move pkgconfig to nativeBuildInputs 
This fixes cross-compiling.
 2020-09-28 19:47:52 -04:00
Ben Wolsieffer 295a6690f9 buildRustCrate: support cross compilation 2020-09-28 19:46:04 -04:00
Jan Tojnar 32b4375f10
Merge branch 'staging-next' into staging 2020-09-29 00:12:29 +02:00
Jan Tojnar d471c5d1f3
Merge branch 'staging-next' into staging 2020-09-24 23:09:00 +02:00
Vladimír Čunát a8cda11090
Merge #97597: stdenv wrappers: improve purity checking 2020-09-24 10:58:10 +02:00
zowoq e4c71e6c6c buildRustPackage: support setting test-threads 2020-09-24 07:19:58 +10:00
Shea Levy b694eb6e6a
firmware-manager: Init at 0.1.1 2020-09-23 06:01:05 -04:00
WORLDofPEACE 978e419abe Merge branch 'staging-next' into staging 2020-09-20 18:43:38 -04:00
WORLDofPEACE 34aaac6d7c Merge branch 'staging-next' into staging 2020-09-20 18:41:15 -04:00
zowoq 4482e5ec2c dotnetenv: editorconfig fixes 2020-09-21 08:30:58 +10:00
Lars Jellema 7ea5b08cfc gnat: fix build 2020-09-19 20:54:27 -07:00
Anderson Torres 6740a5998b
Merge pull request #93082 from cfhammill/cfh/fix-singularity-shell-copy 
singularity-tools: Check for /bin/sh existence before symlink
 2020-09-19 00:42:29 -03:00
Vladimír Čunát 372f89cc44
Merge branch 'master' into staging-next 2020-09-16 17:58:45 +02:00
Anderson Torres a5931fa6e3
Merge pull request #95409 from utdemir/stream_layered_image_fix 
dockerTools.streamLayeredImage: Store the customisation layer as a tarball
 2020-09-14 11:05:48 -03:00
WORLDofPEACE 4085eee678
Merge pull request #97801 from rycee/user-session-dbus2 
Make socket activated user dbus session mandatory
 2020-09-14 00:37:09 -04:00
WORLDofPEACE f5fdc6b240
Merge pull request #97894 from TethysSvensson/fixBusybox 
busybox: Fix 404 error by using git instead
 2020-09-13 14:25:22 -04:00
Tethys Svensson 43cd431b44 fetchgitlab: Escape a few more characters in the revision 2020-09-13 12:34:08 +02:00
Maximilian Bosch 25e60944c6
python3Packages.python-engineio: fix build w/glibc-2.32 
Also had to wrap `__nss_files_fopen` in `libredirect` as this is the way
now `nss` uses to retrieve file-databases[1].

[1] https://sourceware.org/git/?p=glibc.git;a=commitdiff;h=299210c1fa67e2dfb564475986fce11cd33db9ad;hp=469c03907b116c37c98d8ad7a9edac2bdbf3e934
 2020-09-12 23:04:50 +02:00
Robert Helgesson fbc5093649
hooks: add moveSystemdUserUnitsHook 
This hook moves systemd user service file from `lib/systemd/user` to
`share/systemd/user`. This is to allow systemd to find the user
services when installed into a user profile. The `lib/systemd/user`
path does not work since `lib` is not in `XDG_DATA_DIRS`.
 2020-09-12 18:29:46 +02:00
Vladimír Čunát e88e14ec8d
Merge branch 'master' into staging-next 
A few thousand rebuilds per platform have arrived in the meantime.
 2020-09-11 14:24:13 +02:00
Tyson Whitehead 5796715bb7
Accept $TMP, $TMPDIR, $TEMP, and $TEMPDIR paths in purity check 2020-09-10 12:39:08 -04:00
John Ericson 5fd27509cf
Merge pull request #97387 from Ericson2314/fix-android-prebuilt 
cc-wrapper: Fix for prebuilt android
 2020-09-08 20:24:50 -04:00
John Ericson 204dc3a88b cc-wrapper: Fix for prebuilt android 
We don't want to use Nix-built GCC's libs with prebuilt clang in this
case.
 2020-09-07 15:08:11 -04:00
Dominik Xaver Hörl b20ec4f719 pkgs/build-support/writers: allow passing ghc arguments in writeHaskell 2020-09-07 19:36:58 +02:00
Frederik Rietdijk 5ceea5705a Revert "utils.bash: also "fix" cc-wrapper and pkg-config-wrapper" 
Follow up to the revert in e560459c5b.

This reverts commit 1936b11f63.
 2020-09-07 16:31:59 +02:00
Frederik Rietdijk be61518b91 Merge staging-next into staging 2020-09-07 16:31:37 +02:00
Frederik Rietdijk 1936b11f63 utils.bash: also "fix" cc-wrapper and pkg-config-wrapper 2020-09-07 07:19:26 +02:00
Frederik Rietdijk e560459c5b Revert "utils.bash: revert #93560 for darwin, unblocks channels" 
Revert the hack and the original faulty commit.

This reverts commit 48264ee506.

Revert "Purity checking should accept $TMP and not just /tmp"

This reverts commit fb777be7d2.
 2020-09-06 18:16:14 +02:00
Frederik Rietdijk 1d881848f8 Merge staging-next into staging 2020-09-06 18:15:07 +02:00
Frederik Rietdijk d362c0e54e Merge master into staging-next 2020-09-06 18:14:23 +02:00
Frederik Rietdijk 08eb704bc3 utils.bash: revert #93560 for darwin, unblocks channels 
Temporary fix. We definitely do not want to have two separate
implementations.
 2020-09-06 18:14:08 +02:00
Evan Stoll 19cb34b04b
buildSupport.rust: fix typo in verifyCargoDeps message (#97058) 2020-09-05 17:04:32 -04:00