Martin Weinelt
b041b2e1b2
Merge remote-tracking branch 'origin/python-unstable' into staging-next
2021-09-05 14:51:26 +02:00
github-actions[bot]
1cef000dad
Merge master into staging-next
2021-09-04 12:01:03 +00:00
Pascal Bach
1871c113f1
Merge pull request #124157 from nh2/libredirect-children
...
libredirect: Fix redirects not working for subprocesses
2021-09-04 13:19:08 +02:00
github-actions[bot]
2c7fe86720
Merge master into staging-next
2021-09-04 06:01:06 +00:00
happysalada
c9f0c6f115
build-rust-crate: add global libiconv darwin buildInputs
2021-09-04 12:03:36 +09:00
happysalada
0585c981f1
build-rust-crate: nixpkgs-fmt
2021-09-04 12:03:36 +09:00
happysalada
0e8d59e3cb
default-crate-overrides: nixpkgs-fmt
2021-09-04 12:03:36 +09:00
Pascal Bach
fc5196c2f0
libredirect: add subprocess test
2021-09-03 23:45:46 +02:00
Niklas Hambüchen
4961547d05
libredirect: Fix redirects not working for subprocesses
2021-09-03 22:26:22 +02:00
Niklas Hambüchen
0afbd6c86a
libredirect: Enable debug symbols
2021-09-03 22:26:21 +02:00
Niklas Hambüchen
5ca0265505
libredirect: Add missing phase hooks
2021-09-03 22:26:20 +02:00
github-actions[bot]
ba543de038
Merge master into staging-next
2021-09-02 06:01:01 +00:00
Matt Votava
ea4b37e679
buildFhsUserenv: inherit mounts from parent namespace
2021-09-01 18:37:54 -07:00
happysalada
5b86e637d7
move-docs.sh: simplify redundant conditional
...
remove impossible check for empty variable after it's been set twice
2021-08-30 10:27:45 +09:00
github-actions[bot]
57ced08965
Merge staging-next into staging
2021-08-28 12:01:44 +00:00
github-actions[bot]
dbad333a72
Merge master into staging-next
2021-08-28 12:01:06 +00:00
Bjørn Forsman
9bd51f0db9
nix-prefetch-git: add fetchLFS flag to the JSON output
...
Similarly to the other flags (e.g. fetchSubmodules).
2021-08-28 10:14:48 +02:00
Bjørn Forsman
f43829a1d8
nix-prefetch-git: provide fallback for $TMPDIR
...
$TMPDIR is not set by default in NixOS (nor Ubuntu), so without this
change nix-prefetch-git fails when using git-lfs.
2021-08-28 10:14:48 +02:00
github-actions[bot]
1ed959d5eb
Merge staging-next into staging
2021-08-26 12:01:41 +00:00
github-actions[bot]
b13b005f0e
Merge master into staging-next
2021-08-26 12:01:09 +00:00
Jörg Thalheim
eafa8276d5
Merge pull request #135642 from Mic92/writers
...
writers: drop writeC
2021-08-26 11:48:23 +01:00
github-actions[bot]
1be90c9374
Merge staging-next into staging
2021-08-26 06:01:55 +00:00
Dmitry Kalinkin
262fd63a72
Merge branch 'master' into staging-next
...
Conflicts:
pkgs/tools/networking/inetutils/default.nix
2021-08-26 00:57:08 -04:00
davidak
6f42a23a0c
Merge pull request #135004 from Stunkymonkey/vm-phases
...
vm: deprecate phases
2021-08-26 02:24:23 +02:00
Jörg Thalheim
982f46985e
writers: drop writeC
...
This function is fundamentally broken.
Not even the ncurses example will compile.
The interface needs to be rethought for it to work (i.e. don't
unconditionally include all pc files, set include path and ld path and
rpath).
Since it is unlikely that in the current this has any user, just drop it for now.
2021-08-25 20:16:31 +02:00
github-actions[bot]
90fa603351
Merge staging-next into staging
2021-08-25 18:01:39 +00:00
Vladimír Čunát
70e05c1003
Merge branch 'master' into staging-next
2021-08-25 19:42:15 +02:00
Florian Klink
14b61efa87
dockerTools.usrBinEnv: add
...
This provides a /usr/bin/env, for shell scripts using the
"/usr/bin/env executable" shebang.
2021-08-25 16:08:39 +02:00
Sandro
e1e367ca31
Merge pull request #134347 from Stunkymonkey/emacs-elpa-package-phases
2021-08-25 14:01:54 +02:00
Sandro
be10cbd81f
Merge pull request #135493 from veprbl/pr/blas_id_fix
...
blas: fix library id on darwin
2021-08-24 23:37:10 +02:00
Sandro
da497034d8
Merge pull request #135464 from baloo/baloo/mirror-list/2021
2021-08-24 10:39:02 +02:00
Dmitry Kalinkin
de4c61a515
blas: fix library id on darwin
...
dyld: lazy symbol binding failed: Symbol not found: _dsyevd_
Referenced from: /nix/store/lr8grz1knmh6vc7j830gni0ka68qf1lk-xfitter-2.0.1/bin/xfitter
Expected in: /System/Library/Frameworks/Accelerate.framework/Versions/A/Frameworks/vecLib.framework/Versions/A/libBLAS.dylib
2021-08-23 21:33:50 -04:00
Arthur Gautier
1825aae278
mirrors: get a second mirror for metalab
...
Signed-off-by: Arthur Gautier <baloo@superbaloo.net>
2021-08-23 20:47:58 +00:00
Arthur Gautier
91db7bb1d0
mirrors: refresh the mirrors list
...
Some mirrors are gone, some migrated to http instead of ftp.
Signed-off-by: Arthur Gautier <baloo@superbaloo.net>
2021-08-23 18:56:15 +00:00
Arthur Gautier
9d143d5a3b
mirrors: oldsuse mirrors have been discontinued
...
Signed-off-by: Arthur Gautier <baloo@superbaloo.net>
2021-08-23 18:45:15 +00:00
github-actions[bot]
095df456c2
Merge staging-next into staging
2021-08-22 06:01:44 +00:00
Gabriella Gonzalez
9a8850aea9
dhallToNix: Permit inputs referring to derivations ( #134459 )
...
Fixes https://github.com/dhall-lang/dhall-haskell/issues/2267
`pkgs.dhallToNix` currently fails when a Dhall package is
interpolated into the input source code, like this:
```nix
let
pkgs = import <nixpkgs> { };
f = { buildDhallPackage }: buildDhallPackage {
name = "not";
code = "λ(x : Bool) → x == False";
source = true;
};
not = pkgs.dhallPackages.callPackage f {};
in
pkgs.dhallToNix "${not}/source.dhall True"
```
This is because `dhallToNix` was using `builtins.toFile`, which
does not permit inputs with interpolated derivations. However,
`pkgs.writeText` does not have this limitation, so we can switch
to using that instead.
2021-08-21 19:25:01 -07:00
Jan Tojnar
7a04c2ad68
Merge branch 'staging-next' into staging
...
- boost 171 removed on staging-next
- re-generated node-packages.nix
; Conflicts:
; pkgs/development/java-modules/m2install.nix
; pkgs/development/node-packages/node-packages.nix
; pkgs/top-level/all-packages.nix
2021-08-22 01:13:41 +02:00
Sandro
20a82c1281
Merge pull request #135007 from Stunkymonkey/fetchgx-phases
...
fetchgx: deprecate phases
2021-08-21 15:13:32 +02:00
Sandro
4372fb396e
Merge pull request #134416 from Stunkymonkey/nix-template-rpm-phases
2021-08-21 02:19:24 +02:00
Felix Buehler
b5c8a485c6
fetchgx: deprecate phases
2021-08-20 23:47:21 +02:00
Felix Buehler
ae9337179b
vm: deprecate phases
2021-08-20 23:31:26 +02:00
Florian Klink
f8031c60b7
dockerTools.fakeNss: add /etc/nsswitch.conf ( #134958 )
...
Apparently, a non-existent nsswitch.conf causes a very misleading host
resolution, differing from the defaults people are used to.
According to
https://github.com/golang/go/issues/22846#issuecomment-346377144 , glibc
says the default is "dns [!UNAVAIL=return] files".
This means, `/etc/hosts` isn't really honored, causing all sorts of
unexpected behaviour.
Let's prevent this, and first ask `/etc/hosts` before querying DNS, like
we do on NixOS too.
2021-08-20 19:44:17 +02:00
Peter Ferenczy
1ec54d2fba
buildenv: fix regression introduced by #134215
2021-08-20 15:47:47 +03:00
Robin Stumm
3bdfca4491
buildRustPackage: remove unused parameter
2021-08-20 12:46:05 +02:00
John Ericson
a54bafe50a
Merge pull request #133008 from symphorien/ocaml-static
...
Misc static improvements (mainly ocaml and a regression linked to b0b5ef7286
)
2021-08-20 01:56:16 -04:00
Robert Hensing
dac87fa350
Merge pull request #134215 from ggPeti/fix-buildenv
...
buildEnv: better warning and error messages
2021-08-19 13:28:41 +02:00
Guillaume Girol
a17fc03375
pkgsStatic.ocaml-ng: migrate static adapter to derivations themselves
2021-08-19 09:32:03 +02:00
Guillaume Girol
856fa067c5
buildDunePackage: use nativeBuildInputs for build tools
2021-08-19 09:29:55 +02:00
Guillaume Girol
ddd479fe7c
ocamlPackages.mkDerivation: use nativeBuildInputs for build tools
2021-08-19 09:29:55 +02:00