mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-25 23:20:55 +00:00
Code Issues Wiki Activity
339811 commits 224 branches 124 tags 7.2 GiB
Commit graph

5070 commits

Author SHA1 Message Date
github-actions[bot] f8cf67790e
Merge master into staging-next 2021-11-17 06:01:28 +00:00
Sandro e0d488f1a3
Merge pull request #140911 from sersorrel/copy-desktop-items 2021-11-17 02:40:57 +01:00
github-actions[bot] 90829d83e5
Merge master into staging-next 2021-11-17 00:01:49 +00:00
Robert Hensing 1023e5ea4c
Merge pull request #145511 from SuperSandro2000/fetchformgithub 
fetchgithub: fix eval when passing forceFetchGit
 2021-11-17 00:16:29 +01:00
github-actions[bot] 69a9c90876
Merge staging-next into staging 2021-11-16 00:02:03 +00:00
libjared badb5a1af2 fhs-userenv-bubblewrap: add ca-certificates to fhs 
In Arch Linux, many of the certs in /etc/ssl/certs/ are symlinks to
/etc/ca-certificates/extracted/. These symlinks are broken in the FHS
env.

This commit adds ca-certificates to the list of bind mounts, which fixes
connection issues with Steam, wget, etc on Arch Linux hosts.
 2021-11-15 15:29:33 -08:00
Robert Helgesson 3247e75741
emacs: resolve wrapper load-path at build time 
Since the included package set is determined at build time we can also
generate the `subdirs.el` file at build time. This improves startup
time somewhat since we don't have to traverse the directory to add to
`load-path`.

For example,

``` sh-session
$ bench './emacs-old -Q --batch --kill' './emacs-new -Q --batch --kill'
benchmarking bench/./emacs-old -Q --batch --kill
time                 72.77 ms   (71.66 ms .. 73.65 ms)
                     1.000 R²   (0.999 R² .. 1.000 R²)
mean                 72.49 ms   (72.06 ms .. 72.92 ms)
std dev              746.5 μs   (582.4 μs .. 1.008 ms)

benchmarking bench/./emacs-new -Q --batch --kill
time                 40.56 ms   (40.24 ms .. 40.86 ms)
                     1.000 R²   (0.999 R² .. 1.000 R²)
mean                 40.30 ms   (40.12 ms .. 40.51 ms)
std dev              401.9 μs   (311.1 μs .. 555.8 μs)
```

The change does not actually affect the content of `load-path`:

``` sh-session
$ diff -s <(./emacs-old --batch --eval '(prin1 load-path)' | sed -E 's!/nix/store/[[:alnum:]]{32}-!!g') \
          <(./emacs-new --batch --eval '(prin1 load-path)' | sed -E 's!/nix/store/[[:alnum:]]{32}-!!g')
Files /dev/fd/63 and /dev/fd/62 are identical
```

So in principle the only observable effect should be the improved
startup time.
 2021-11-14 22:31:48 +01:00
Victor Engmark 57b496ea98 misc: Replace tab indentation with spaces 
I've tried to be consistent, using four or eight spaces to line up
with existing code.
 2021-11-14 16:04:46 +13:00
John Ericson 5a7f6e1f18
Merge pull request #144839 from l0b0/fix-redirect 
pkgs/build-support: Redirect to standard error rather than file "2"
 2021-11-13 21:56:43 -05:00
github-actions[bot] 914defdc38
Merge staging-next into staging 2021-11-13 18:01:47 +00:00
github-actions[bot] 4db5f307b0
Merge master into staging-next 2021-11-13 18:01:11 +00:00
Alyssa Ross 26b89bcd16
Merge remote-tracking branch 'nixpkgs/staging-next' into staging 2021-11-13 15:30:01 +00:00
Sandro 594fa6aea6
Merge pull request #143994 from Stunkymonkey/ocaml-pname 2021-11-13 13:30:16 +01:00
sternenseemann 1a1e32f023 Merge remote-tracking branch 'origin/master' into staging-next 
Conflicts were caused by 2043dbb6fa
interacting with b2767b69dd.
 2021-11-13 12:35:55 +01:00
Uri Baghin 7111193ee6 writers: fix writeRust on darwin 2021-11-13 11:04:36 +11:00
github-actions[bot] e972a20a60
Merge staging-next into staging 2021-11-13 00:02:24 +00:00
github-actions[bot] c0c7fbda14
Merge master into staging-next 2021-11-13 00:01:45 +00:00
Artturi 69bdaa04d8
Merge pull request #145533 from Artturin/builddotnetpkgconfig 2021-11-13 01:27:33 +02:00
github-actions[bot] 40a54af057
Merge staging-next into staging 2021-11-12 00:01:59 +00:00
github-actions[bot] 026e6c328a
Merge master into staging-next 2021-11-12 00:01:22 +00:00
Artturin ffb9a309b6 buildDotnetPackage: move buildInputs to nativeBuildInputs 
they're run during the build so they belong there
 2021-11-11 22:26:23 +02:00
Artturin f77006c308 buildDotnetPackage: fix nativeBuildInputs 
the nativeBuildInputs of the derivation that uses buildDotnetPackage overshadowed the nativeBuildInputs of buildDotnetPackage
so pkg-config wasn't getting added to the path

dotnet-packages: remove unused arg
 2021-11-11 21:47:50 +02:00
markuskowa 26f5e6dd5f
Merge pull request #143237 from ck3d/fix-runInLinuxImage 
vmTools: Fix missing backing format in runInLinuxImage
 2021-11-11 20:39:17 +01:00
Sandro Jäckel 597e2ce523
fetchgithub: fix eval when passing forceFetchGit 2021-11-11 17:28:35 +01:00
Victor Engmark 8ed1104a4a pkgs/build-support: Redirect to standard error rather than file "2" 2021-11-11 18:14:21 +13:00
github-actions[bot] 62b9b0d9e8
Merge staging-next into staging 2021-11-11 00:02:20 +00:00
github-actions[bot] b199af176d
Merge master into staging-next 2021-11-11 00:01:45 +00:00
Dmitry Kalinkin 4af5e02055
Merge pull request #143079 from veprbl/pr/singularity_nonstd_store 
singularity-tools.buildImage: fix building from non-standard store paths
 2021-11-10 16:04:30 -05:00
github-actions[bot] d5964b8c81
Merge staging-next into staging 2021-11-10 00:02:09 +00:00
github-actions[bot] 6e4d2d1f10
Merge master into staging-next 2021-11-10 00:01:31 +00:00
Sandro 9975de2d4e
Merge pull request #144693 from mkg20001/fetchgit-hash 2021-11-09 22:22:19 +01:00
Victor Engmark 3ce3e50053
Quote variable references (#144838) 
* pkgs/build-support: Quote variable name

* pkgs/build-support: Quote variable reference

* pkgs/build-support: Quote variable references

Leads to a minor behavior change: there's no trailing space in the
output when `[[ "$linkType" == "static-pie" ]]` is true.
 2021-11-09 19:55:40 +09:00
Maciej Krüger 5c2b1b6a29
fetchgit: support hash parameter alongside sha256 
Co-authored-by: Sandro <sandro.jaeckel@gmail.com>
 2021-11-09 07:40:20 +01:00
Tobias Bergkvist 3a014be2f2 Assert that malloc does not return a NULL pointer for better error messages + to satisfy static analysis tools. 2021-11-09 02:56:32 +01:00
John Ericson 05efb8ed91 build-support/rust/sysroot/src: Use dont* instead of phase list 
Making this separate commit because the original was moved out just the
way it was done before.
 2021-11-08 21:38:58 +00:00
John Ericson c9c3de0131 Update script as rust-src layout has changed 
Use stub lib so `core` and `alloc` are handled symmetrically.
 2021-11-08 20:38:59 +00:00
John Ericson cbd00bab80 build-support/rust: Split out sysroot src derivation 
Hoping to make it usable for `buildRustCrate` too.
 2021-11-08 20:38:59 +00:00
Bernardo Meurer 174995d14f
writeShellApplication: set meta.mainProgram 2021-11-08 09:33:42 -08:00
Bernardo Meurer ba7b7357ac
writeTextFile: allow passing extra derivationArgs 2021-11-08 09:33:40 -08:00
Bernardo Meurer d8ec0eeab7
writeShellApplication: run pre/postCheck hooks 2021-11-08 09:33:38 -08:00
Bernardo Meurer 949182a4a2
writeShellApplication: document runtimeShell == stdenv.shell assumption 2021-11-08 09:33:37 -08:00
Bernardo Meurer 014b23232f
writeShellApplication: fix typo in inline docs 2021-11-08 09:33:36 -08:00
Bernardo Meurer 97de845b60
writeShellApplication: fix setting pipefail 2021-11-08 09:33:35 -08:00
Bernardo Meurer 21c299f077
writeShellApplication: get shellcheck from pkgsBuildHost 2021-11-08 09:33:34 -08:00
Bernardo Meurer 0e4f04b74c
writeShellApplication: buildInputs -> runtimeInputs 2021-11-08 09:33:33 -08:00
Bernardo Meurer 89979c9c5b
writeShellApplication: init 2021-11-08 09:33:32 -08:00
Victor Engmark 0383d1c760 pkgs/build-support: Remove unused local variable 2021-11-09 01:25:34 +09:00
John Ericson 4f81865aa1 Merge remote-tracking branch 'upstream/master' into staging-next 2021-11-07 20:51:04 +00:00
John Ericson 18ed048c7b build-support/rust: Organize 
- `toRustTarget` and friends pulled out from rust tools into rust
   library. Since they don't depend on any packages they can be more
   widely useable.

 - `build-rust-package` gets its own directory

 - `fetch-cargo-tarball` gets its own directory
 2021-11-07 14:16:49 -05:00
github-actions[bot] eeb7e66e97
Merge master into staging-next 2021-11-06 18:01:01 +00:00
Domen Kožar e57174c9d2
Merge pull request #144653 from stephank/fix/libredirect 
libredirect: fix on darwin
 2021-11-06 07:05:59 -06:00
github-actions[bot] a41ea4ced3
Merge master into staging-next 2021-11-06 06:01:07 +00:00
Alyssa Ross 4419e8ee8e
mirrors: prioritize HTTPS 2021-11-06 01:07:38 +00:00
Alyssa Ross 1b78d3720c
mirrors: use HTTPS where available 2021-11-06 01:07:36 +00:00
Alyssa Ross 246d34d57a
mirrors: remove inactive mirrors 2021-11-06 01:07:34 +00:00
Alyssa Ross 9c70596689
mirrors: update sunet base URLs 2021-11-06 00:45:08 +00:00
Stéphan Kochen 7acc0e054c libredirect: workaround dyld env not inherited 2021-11-05 20:47:11 +01:00
Stéphan Kochen d1a3b5c4cc libredirect: use __interpose on darwin 
DYLD_FORCE_FLAT_NAMESPACE was removed in recent versions of macOS.
 2021-11-05 08:24:22 +01:00
github-actions[bot] 3567177949
Merge staging-next into staging 2021-11-03 18:10:58 +00:00
Robert Hensing 455e7f19d0
Merge pull request #144052 from hercules-ci/improve-trivial-builders-test 
test.trivial-builders: Add test cases, fix test runner, rename
 2021-11-03 18:10:42 +01:00
Alyssa Ross 703ffa2f5d
Merge remote-tracking branch 'nixpkgs/staging-next' into staging 2021-11-03 07:34:33 +00:00
Lassulus 33f0c518f7
Merge pull request #143629 from sternenseemann/writers-fixes 
writers: fix writeHaskell* for darwin, bintools-related cleanup
 2021-11-02 20:21:00 +01:00
Felix Buehler e601787f7e buildOcaml: rename name to pname 2021-11-01 16:19:30 +01:00
github-actions[bot] 9e9ee310f8
Merge staging-next into staging 2021-11-01 12:01:37 +00:00
github-actions[bot] cc41bb5851
Merge master into staging-next 2021-11-01 12:01:00 +00:00
IvarWithoutBones af339c5cf8 buildDotnetModule: add support for running unit tests 2021-11-01 02:06:54 +01:00
Robert Hensing 51f7c15df9 test.trivial-builders: Add test cases, fix test runner, rename 
The writeStringReferencesToFile didn't handle non-unique references
to the same path correctly.
 2021-11-01 00:06:03 +01:00
github-actions[bot] 9a002bac35
Merge staging-next into staging 2021-10-29 18:01:38 +00:00
github-actions[bot] 6317a19147
Merge master into staging-next 2021-10-29 18:01:00 +00:00
IvarWithoutBones bc193f80c4 buildDotnetModule: create nuget source seperately && use stdenvNoCC 2021-10-29 08:27:51 -07:00
Sandro 31b495592f
Merge pull request #143347 from SuperSandro2000/appimage-wrapType2-pname-version 2021-10-29 16:42:01 +02:00
sternenseemann b1197ac729 writers: run fixupPhase for darwin bin writers 
mach-o executables we produce in writers are not always fully valid for
some reason. In normal derivation this is fixed in fixupPhase and we can
replicate this behavior here easily.

Resolves #132660.
 2021-10-29 12:34:48 +02:00
sternenseemann 3090ed3f40 writers: use platform's default strip 
bintools points to the default bintools (e. g. cctools, binutils,
llvmPackages.bintools) for the next stage. So instead of using GNU
binutils' strip which may not support the current platform, we need to
use buildPackages.bintools-unwrapped.

Additionally we need to use `-S` over `--strip-unneeded` as the latter
is a GNU binutils-specific flag and not supported by cctools.

Also add the correct targetPrefix in order to support cross-compilation
correctly here at least.
 2021-10-29 12:18:58 +02:00
github-actions[bot] 37b1afa489
Merge staging-next into staging 2021-10-28 18:02:03 +00:00
Martin Weinelt da1f248229 Merge remote-tracking branch 'origin/master' into staging-next 2021-10-28 19:51:45 +02:00
Yureka 842a0d94cb fetchYarnDeps: use fakeSha256 if no hash is given 2021-10-29 02:43:42 +09:00
Yureka 1565ab9717 prefetch-yarn-deps: ignore file: dependencies 2021-10-29 02:43:42 +09:00
Yureka 6c99b3d0b7 prefetch-yarn-deps: support git:// dependencies 2021-10-29 02:43:42 +09:00
Alyssa Ross 3f01b576af
Merge remote-tracking branch 'nixpkgs/staging-next' into staging 
Conflicts:
	nixos/doc/manual/from_md/release-notes/rl-2111.section.xml
	nixos/doc/manual/release-notes/rl-2111.section.md
 2021-10-28 16:07:38 +00:00
Sandro Jäckel db44b28a06
appimage: support pname+version for wrapType2 2021-10-28 15:21:32 +02:00
github-actions[bot] ea4da560ff
Merge master into staging-next 2021-10-28 12:01:32 +00:00
talyz aa22fa9c0b trivial-builders: Add writeStringReferencesToFile 
Add writeStringReferencesToFile, a builder which extracts a string's
references to derivations and paths and writes them to a text file,
removing the input string itself from the dependency graph. This is
useful when you want to make a derivation depend on the string's
references, but not its content (to avoid unnecessary rebuilds, for
example).
 2021-10-28 12:55:01 +02:00
github-actions[bot] a1e570b43e
Merge master into staging-next 2021-10-28 00:01:36 +00:00
Christian Kögler 9bf244964d runInLinuxImage: Add missing backing format 2021-10-28 00:05:27 +02:00
Christian Kögler 0625121793 buildInDebian: fix test 2021-10-28 00:03:27 +02:00
Kerstin Humm 5df2d4d345
default-crate-overrides: remove two crates that are probably irrelevant 2021-10-27 22:29:10 +02:00
Kerstin Humm f1bacf5b07 default-crate-overrides: expat-sys, glib-sys, libudev-sys, sdl2-sys, servo-fontconfig, skia-bindings 2021-10-28 03:07:33 +09:00
github-actions[bot] 22401dcc39
Merge master into staging-next 2021-10-27 18:01:02 +00:00
Ryan Burns f67d4dd9c1
Merge pull request #142616 from r-burns/toplevel-system 
treewide: remove toplevel `system` attr
 2021-10-27 10:03:24 -07:00
figsoda 5a08a28803 rustPlatform: add support for features 2021-10-27 08:08:03 -04:00
bb010g a1ed62e586 releaseTools.antBuild: remove 
The sole consumer in Nixpkgs of `releaseTools.antBuild` is
`pkgs/development/libraries/junit`, which has been broken since
2015-09-08. The sole consumer in Nixpkgs of `junit` is
`pkgs/development/libraries/junixsocket`, which hasn't built due to
`junit` since 2015-09-08. All three are removed due to their obvious
lack of use.

All other packages in Nixpkgs depending on junit consume
`pkgs/development/java-modules/junit`, which is not broken.

Any downstreams that have kept using these `junit` or `junixsocket`
packages since 2015-09-08 have basically already vendored the packages
via patching them, so no aliases are provided.
 2021-10-27 13:21:27 +03:00
bb010g 29fedf210f canonicalize-jars-hook: add 
A build hook to run functions previously only implemented privately in
`pkgs/build-support/release/functions.sh`.
 2021-10-27 13:21:27 +03:00
Dmitry Kalinkin 777a4ba508
singularity-tools.buildImage: fix building from non-standard store paths 2021-10-27 02:11:44 -04:00
github-actions[bot] a16b1b54b3
Merge staging-next into staging 2021-10-25 12:02:08 +00:00
github-actions[bot] 0336295c41
Merge master into staging-next 2021-10-25 12:01:31 +00:00
Robert Hensing 8ecfaf3543 dockerTools: Fix test 2021-10-25 12:25:01 +02:00
Artturi 44403b728b
patchutils: add 0.4.2 variant + remove meta.executable + enable tests + fix inter-dependencies by wrapping (#141567) 2021-10-25 13:13:22 +03:00
Pavol Rusnak 8e18c70837
Merge pull request #142218 from IvarWithoutBones/use/nbxporer-buildDotnetModule 
{btcpayserver,nbxplorer}: use buildDotnetModule
 2021-10-25 10:21:49 +02:00
Stefan Junker 445510ed69 rust/import-cargo-lock: hopefully make nested crate test work on macos 2021-10-25 01:11:45 +02:00
IvarWithoutBones 26cf7887b5 buildDotnetModule: fix variable handling 2021-10-25 00:24:09 +02:00
Stefan Junker f9a340a916 rust/import-cargo-lock: add test git-dependency-rev-non-workspace-nested-crate 2021-10-24 20:27:42 +02:00
John Ericson e2eccfc521
Merge pull request #141072 from r-burns/validatepkgconfig-cross 
[staging] validatePkgConfig: fix cross-compilation
 2021-10-23 23:09:42 -04:00
Stefan Junker b2aa19efe7 rust: find nested packages in git repositories 
this mimics the heuristic cargo uses for finding crates in their git
repositories ([cargo-issue-1462]).

[cargo-issue-1462]: https://github.com/rust-lang/cargo/issues/1462
 2021-10-24 01:52:44 +02:00
Ryan Burns 9fb1f66d30 validatePkgConfig: fix cross-compilation 
Fixes cross-compilation for duktape and pugixml
 2021-10-23 15:50:21 -07:00
github-actions[bot] c3a27b2a6c
Merge staging-next into staging 2021-10-23 18:01:53 +00:00
github-actions[bot] 50a5d0f17c
Merge master into staging-next 2021-10-23 18:01:15 +00:00
Yuka 49a5b293b9
prefetch-yarn-deps: add nix dependency (#142664) 
fixes "Error: spawn nix-hash ENOENT"
 2021-10-23 19:13:34 +02:00
Ryan Burns aed6bb336e build-support/docker: remove toplevel system attr 2021-10-22 14:04:05 -07:00
github-actions[bot] f9ab4de694
Merge staging-next into staging 2021-10-22 18:01:54 +00:00
Jonathan Ringer fc25d94010
Merge remote-tracking branch 'origin/master' into staging-next 
Conflicts:
	pkgs/development/python-modules/jupyter-client/default.nix
	pkgs/development/python-modules/jupyterlab-git/default.nix
 2021-10-22 09:33:07 -07:00
Silvan Mosberger 98f82e9c35
Merge pull request #141789 from pennae/eval-opt 
lib: make extendDerivation lighter on eval
 2021-10-21 20:17:32 +02:00
Pavol Rusnak e32dde36b0
Merge pull request #138033 from mikepurvis/allow-gitlab-protocol-override 
Allow overriding fetchFromGitLab protocol.
 2021-10-21 18:12:47 +02:00
github-actions[bot] eebbebca41
Merge staging-next into staging 2021-10-20 12:02:09 +00:00
github-actions[bot] cdc8393c04
Merge master into staging-next 2021-10-20 12:01:31 +00:00
Yureka 84e02be598 fetchYarnDeps, mkYarnModules: verify the FOD hash is up-to-date 2021-10-20 11:39:16 +02:00
Yureka d6e0195ccd prefetch-yarn-deps, fetchYarnDeps: init 2021-10-20 11:39:16 +02:00
github-actions[bot] 413d93fade
Merge staging-next into staging 2021-10-20 06:01:49 +00:00
github-actions[bot] 2d8f645c79
Merge master into staging-next 2021-10-20 06:01:15 +00:00
figsoda 5f33ded601
Merge pull request #142154 from figsoda/cargo-hash-default-null 
buildRustPackage,fetchCargoTarball: accept empty hashes
 2021-10-19 22:41:58 -04:00
figsoda f441e6b7f4 buildRustPackage,fetchCargoTarball: accept empty hashes 2021-10-19 20:56:46 -04:00
figsoda 836e6d3e02 buildRustPackage: remove unused arguments, minor styling changes 2021-10-19 20:11:28 -04:00
github-actions[bot] 2564b3d967
Merge staging-next into staging 2021-10-19 18:01:48 +00:00
Vladimír Čunát 01df3cd7dd
Merge branch 'master' into staging-next 2021-10-19 19:24:43 +02:00
Tobias Bergkvist 1218b82bce Move assertExecutable from makeCWrapper to makeBinaryWrapper to ensure that makeCWrapper is a pure function 2021-10-19 14:37:05 +02:00
Doron Behar c310cb0d94 makeBinaryWrapper: add wrapProgramBinary (like wrapProgram) 2021-10-19 05:30:42 -07:00
Doron Behar a45c5db391 makeBinaryWrapper: Assert $1 is executable 2021-10-19 05:30:42 -07:00
Manuel Bärenz 7a135abf60
Merge pull request #98214 from turion/dev_test_all_agda_packages 
Fix #98209. Test all agda packages
 2021-10-19 09:56:50 +02:00
Pavol Rusnak d31c9bd3f0
Merge pull request #139571 from prusnak/dotnet-cleanup 
dotnet: cleanup; point dotnet-sdk alias to 5.0; remove unsupported SDKs
 2021-10-19 09:16:11 +02:00
Pavol Rusnak eca667180b
dotnet: cleanup; point dotnet-sdk alias to 5_0; remove unsupported SDKs 2021-10-18 23:46:17 +02:00
github-actions[bot] 867080b0b6
Merge staging-next into staging 2021-10-18 12:01:57 +00:00
github-actions[bot] 8863d12326
Merge master into staging-next 2021-10-18 12:01:18 +00:00
Robert Hensing 3b9d05e114 dockerTools: Fix and test #118722 path in contents 2021-10-18 12:41:51 +02:00
Martin Weinelt f651d617a6 curl: use --with/without-openssl instead of --with/without-ssl 
This also migrates sslSupport to opensslSupport, which affects packages
overriding the curl package in that regard.
 2021-10-16 11:35:18 +01:00
pennae dc895fb281 lib: make extendDerivation lighter on eval 
the fix to extendDerivation in #140051 unwittingly worsened eval performance by
quite a bit. set elements alone needed over 1GB extra after the change, which
seems disproportionate to how small it was. if we flip the logic used to
determine which outputs to install around and keep a "this one exactly" flag in
the specific outputs instead of a "all of them" in the root we can avoid most
of that cost.
 2021-10-15 16:39:10 +02:00
Martin Weinelt adf4e67dd4 Merge remote-tracking branch 'origin/staging' into staging-next 2021-10-15 01:34:36 +02:00
Maximilian Bosch eb3a3725e4
Merge pull request #119638 from beardhatcode/feat/nextcloud-packages 
nextcloud: add option to set datadir and extensions
 2021-10-13 14:26:41 +02:00
github-actions[bot] 0cb186d33d
Merge staging-next into staging 2021-10-12 18:01:50 +00:00
Kevin Cox f6e161d60a
Merge pull request #139222 from IvarWithoutBones/init/buildDotnet 
buildDotnetModule: init
 2021-10-12 09:13:44 -04:00
figsoda d81f8fa0a4
Merge pull request #138822 from figsoda/fix-cargo-check-type 
[staging] rustPlatform.cargoCheckHook: respect cargoCheckType
 2021-10-11 15:54:00 -04:00
github-actions[bot] aac35c22db
Merge staging-next into staging 2021-10-10 18:01:41 +00:00
Timur Demin 1c9afc5a88
releaseTools.debBuild: fix invocation 
Somewhere after #110628, which replaced stdenv.lib with lib, up to
bug #134572, lib got removed from the argument list, breaking any
invocations of debBuild. This adds it back.
 2021-10-10 22:08:16 +05:00
github-actions[bot] 335de1a880
Merge staging-next into staging 2021-10-10 12:02:03 +00:00
Jörg Thalheim 07ee93716c
Merge pull request #140784 from bjornfor/libredirect-handle-mkdir 
libredirect: handle mkdir(2)
 2021-10-10 09:09:34 +01:00
Maximilian Bosch 1ee008fcb5
nixos/nextcloud: fixup #119638 
A few minor changes to get #119638 - nextcloud: add option to set
datadir and extensions - ready:

* `cfg.datadir` now gets `cfg.home` as default to make the type
  non-nullable.
* Enhanced the `basic` test to check the behavior with a custom datadir
  that's not `/var/lib/nextcloud`.
* Fix hashes for apps in option example.
* Simplify if/else for `appstoreenable` in override config.
* Simplify a few `mapAttrsToList`-expressions in
  `nextcloud-setup.service`.
 2021-10-09 22:45:31 +02:00
Robbert Gurdeep Singh 18b18929d7
nixos/nextcloud: add settings to manage nextcloud apps 
Note the appstoreEnable which will prevent nextcloud form updating
nix-managed apps. This is needed because nextcloud will store an other
version of the app in /var/lib/nextcloud/store-apps and it will
no longer be manageable.
 2021-10-09 20:33:16 +02:00
Bjørn Forsman 864f96cd7f libredirect: handle mkdir(2) + mkdirat(2) 
Fixes https://github.com/NixOS/nixpkgs/issues/140735.

Co-authored-by: Jörg Thalheim <Mic92@users.noreply.github.com>
 2021-10-09 19:58:45 +02:00
ash c6b0247067 copyDesktopItems: fix handling of plain paths 2021-10-08 01:36:13 +01:00
github-actions[bot] b4569f7a81
Merge staging-next into staging 2021-10-08 00:02:10 +00:00
Sandro 628dbc979f
Merge pull request #136719 from r-burns/libgpg-error 2021-10-07 22:24:04 +02:00
github-actions[bot] c081bc394c
Merge staging-next into staging 2021-10-07 18:01:44 +00:00