Daiderd Jordan
788f61cf3e
Merge pull request #85545 from LnL7/meta-available-flags
...
meta: expose availability flags in derivation metadata
2020-11-28 18:57:47 +01:00
Daiderd Jordan
d0ca6b396e
Merge pull request #103917 from badmutex/badi/update-plex
...
plex: 1.20.3.3483 -> 1.20.5.3600
2020-11-18 19:45:06 +01:00
Daiderd Jordan
aec155efb6
Merge pull request #104013 from thefloweringash/remove-darwin-bootstrap-test
...
release: disable darwin bootstrapped stdenv test
2020-11-17 18:45:34 +01:00
Daiderd Jordan
411f9e25d7
Merge pull request #98541 from thefloweringash/darwin-tapi-stdenv
...
darwin (Big Sur): tbd based stdenv
2020-11-13 00:14:25 +01:00
Daiderd Jordan
7f1a82d476
stdenv/darwin: bump bootstrap tools
...
This new version has tapi support, which is needed to build the new
stubs based libSystem, etc. and Big Sur support.
You can verify the provenance of these yourself by checking Hydra here:
https://hydra.nixos.org/build/128192471
2020-11-09 19:59:49 +09:00
Daiderd Jordan
76dc3ea89e
Merge pull request #101783 from elseym/plex
...
plex: 1.20.2.3402 -> 1.20.3.3483
2020-10-30 21:40:14 +01:00
Daiderd Jordan
bb0b872b61
Merge pull request #100388 from thefloweringash/darwin-dylib-names-hook
...
treewide: move fixDarwinDylibNames to nativeBuildInputs
2020-10-21 19:25:48 +02:00
Daiderd Jordan
a4bbb8a5af
Merge pull request #100051 from bachp/plex-1.20.2.3402
...
plex: 1.20.1.3252 -> 1.20.2.3402
2020-10-09 19:30:46 +02:00
Daiderd Jordan
d42e6e2e04
Merge pull request #98984 from marsam/update-vault
...
vault: 1.5.3 -> 1.5.4
2020-09-28 21:56:03 +02:00
Daiderd Jordan
80dfc6dc3c
python2.pkgs.ujson: use compatible version
2020-08-29 13:26:54 +02:00
Daiderd Jordan
ad6d9ad5b6
Merge pull request #95364 from siriobalmelli-foss/fix/neovim
...
neovim: fix build on Darwin
2020-08-17 17:14:44 +02:00
Daiderd Jordan
c3c258c6fd
Merge pull request #94182 from marsam/update-vault
...
vault: 1.4.3 -> 1.5.0
2020-07-29 22:18:25 +02:00
Daiderd Jordan
d42b366613
Merge pull request #93553 from risicle/ris-igraph-darwin
...
igraph: enable for darwin
2020-07-27 22:29:16 +02:00
Daiderd Jordan
5e4c9da4d9
Merge pull request #93490 from siriobalmelli-foss/fix/pc-ble-driver-py
...
python3Packages.pc-ble-driver-py: fix Darwin build
2020-07-27 22:22:04 +02:00
Daiderd Jordan
8ae686d1b2
Merge pull request #93585 from adrian-gierakowski/fix-dash-on-darwin
...
dash: fix compilation on darwin
2020-07-27 22:02:41 +02:00
Daiderd Jordan
31a5d076b1
Merge pull request #93718 from bachp/plex-1.19.5.3112
...
plex: 1.19.4.2935 -> 1.19.5.3112
2020-07-23 22:58:43 +02:00
Daiderd Jordan
e0604a9333
Merge pull request #92347 from LnL7/darwin-libxml2
...
libxml2: fix python2 build on darwin
2020-07-09 19:32:05 +02:00
Daiderd Jordan
7b2bdbea75
Merge pull request #91970 from LnL7/darwin-libwebsockets
...
libwebsockets: fix clang build
2020-07-05 17:52:43 +02:00
Daiderd Jordan
cc148a4b3e
libxml2: fix python2 build on darwin
2020-07-05 15:09:38 +02:00
Daiderd Jordan
730f86b722
Merge pull request #91532 from shajra/fix/ansifilter
...
ansifilter: extend build to include Darwin
2020-07-01 21:21:11 +02:00
Daiderd Jordan
e002920d8c
libwebsockets: fix clang build
2020-07-01 20:58:30 +02:00
Daiderd Jordan
70084e80a0
Merge pull request #90463 from mroi/patch-clamav
...
clamav: enable build on darwin
2020-06-23 22:11:52 +02:00
Daiderd Jordan
0697ad33c0
libxslt: fix darwin build
...
ld: library not found for -lintl
clang-7: error: linker command failed with exit code 1 (use -v to see invocation)
make[3]: *** [Makefile:544: libxsltmod.la] Error 1
2020-06-13 20:14:52 +02:00
Daiderd Jordan
9ef0636f15
Merge pull request #89273 from rileyinman/plex-update
...
plex: 1.19.2.2737-b69929dab -> 1.19.3.2852-219a9974e
2020-06-04 22:45:24 +02:00
Daiderd Jordan
7b3a2963d1
treewide: replace base64 encoded hashes
2020-06-03 18:35:19 +02:00
Daiderd Jordan
8d705d9f11
poetry2nix: translate hashes to sha256
2020-06-01 15:24:21 +02:00
Daiderd Jordan
b7ddbd52bd
treewide: replace SRI hashes
2020-06-01 15:24:19 +02:00
Daiderd Jordan
5958dd0e25
Merge pull request #86513 from r-ryantm/auto-update/bats
...
bats: 1.1.0 -> 1.2.0
2020-05-02 12:54:00 +02:00
Daiderd Jordan
727d9317fb
bats: fixup readlink reference
...
Using `readlink -f` requires coreutils, on platforms like darwin where
this isn't the GNU variant by default it would fail outide of a
nix-shell.
2020-05-02 11:46:37 +02:00
Daiderd Jordan
afc42a843d
Merge pull request #84750 from LnL7/darwin-pjsip
...
pjsip: enable and fix darwin build
2020-05-02 11:35:37 +02:00
Daiderd Jordan
64279cff00
Merge pull request #86557 from cmacrae/upgrade/yabai/3.0.0
...
yabai: 2.4.3 -> 3.0.0
2020-05-02 11:34:56 +02:00
Daiderd Jordan
fb9831c55d
Merge pull request #86559 from cmacrae/upgrade/skhd/0.3.5
...
skhd: 0.3.0 -> 0.3.5
2020-05-02 11:30:13 +02:00
Daiderd Jordan
a57cbb1c36
Merge pull request #86411 from cmacrae/pkgs/os-specific/darwin/yabai
...
yabai: init at 2.4.3
2020-05-01 19:40:59 +02:00
Daiderd Jordan
8b006cd3bf
Merge pull request #86327 from bachp/plex-1.19.2.2737
...
plex: 1.19.1.2645 -> 1.19.2.2737
2020-05-01 10:34:22 +02:00
Daiderd Jordan
cda586dd6b
Merge pull request #86434 from marsam/update-vault
...
vault: 1.4.0 -> 1.4.1
2020-05-01 10:20:23 +02:00
Daiderd Jordan
7e23a6021d
pjsip: enable and fix darwin build
2020-04-30 18:06:53 +02:00
Daiderd Jordan
5ae928e18f
lapack: fix darwin library identifiers
...
The build system already sets these properly to the absolute path so no
need to patch the libraries on darwin.
$ otool -D result/lib/liblapacke.dylib
result/lib/liblapacke.dylib:
/nix/store/k88gy5s765yn3dc5ws3jbykyvklm7z96-openblas-0.3.8/lib/libopenblasp-r0.3.8.dylib
Fixes #85713
2020-04-24 20:00:56 +02:00
Daiderd Jordan
950ac2bc8f
meta: expose availability flags in derivation metadata
...
Currently it's not possible to determine the reason why a package is
unavailable without evaluating nixpkgs multiple times with different
settings. eg.
nix-repl> :p android-studio.meta
{ available = false; broken = false; unfree = true; unsupported = true; ... }
The following snippet is an example that uses this information to query
the availability information of all packages in nixpkgs, giving an
overview of all the packages currently marked as broken, etc.
{ pkgs }:
with import <nixpkgs/lib>;
let
mapPkgs =
let mapPkgs' = path: f: mapAttrs (n: v:
let result = builtins.tryEval (v ? meta); in
if !result.success then {} else
if isDerivation v then f (path ++ [n]) v else
if isAttrs v && v.recurseForDerivations or false then mapPkgs' (path ++ [n]) f v else
{}
);
in mapPkgs' [];
getMeta = path: drv:
if drv.meta ? available then
let meta = {
pkg = concatStringsSep "." path;
inherit (drv.meta) broken unfree unsupported insecure;
};
in builtins.trace meta.pkg meta
else {};
metaToList = attrs: flatten (map (v: if v ? pkg then v else metaToList v) (attrValues attrs));
in metaToList (mapPkgs getMeta pkgs)
2020-04-19 12:53:04 +02:00
Daiderd Jordan
964700da44
lib/options: fix showOption example
2020-04-14 20:38:31 +02:00
Daiderd Jordan
31a03daa72
Revert "lib/options: Use escapeNixIdentifier for showOption"
...
This is used in in the manual generation for option identifiers that can
be linked. This, unike what the example describes, doesn't preserve
quotes which is needed for these identifiers to be valid.
This reverts commit 124cccbe3b .
2020-04-14 20:34:07 +02:00
Daiderd Jordan
6245f537d3
Merge pull request #84747 from bachp/plex-1.19.1.2630
...
plex: 1.18.9.2578 -> 1.19.1.2630
2020-04-08 22:28:44 +02:00
Daiderd Jordan
c77af3740b
Merge pull request #83873 from bachp/plex-1.18.9.2571
...
plex: 1.18.8.2527 -> 1.18.9.2571
2020-04-01 19:31:31 +02:00
Daiderd Jordan
f4da410f0c
Merge pull request #83532 from LnL7/darwin-neovim
...
Revert "luaPackages.luv: 1.30.0-0 -> 1.34.1-1"
2020-03-29 10:39:19 +02:00
Daiderd Jordan
c4ecf64b3a
Merge pull request #81521 from thefloweringash/git-gui-darwin
...
git: use tcl/tk from nixpkgs on darwin
2020-03-28 11:51:05 +01:00
Daiderd Jordan
67938c1bfd
Merge pull request #82097 from millerjason/bugfix/vim_configurable
...
vim_configurable: fix default gui for darwin
2020-03-28 11:50:32 +01:00
Daiderd Jordan
220636999b
Revert "luaPackages.luv: 1.30.0-0 -> 1.34.1-1"
...
This reverts commit eaa4728411 .
With 81461cff5f luv also needs to be
downgraded until luarocks can be updated to 3.3.1 again.
Fixes #82727
2020-03-27 22:19:25 +01:00
Daiderd Jordan
e7c3e277b6
mypy: 0.761 -> 0.770
2020-03-26 19:45:18 +01:00
Daiderd Jordan
ce12576dd0
Merge pull request #83079 from LnL7/darwin-gotools
...
gotools: fix darwin build
2020-03-22 14:41:16 +01:00
Daiderd Jordan
cb75c0f905
gotools: fix darwin build
2020-03-21 14:44:57 +01:00
Daiderd Jordan
110ec279ab
Merge pull request #82796 from bachp/plex-1.18.8.2527
...
plex: 1.18.7.2457 -> 1.18.8.2527
2020-03-19 17:54:08 +01:00
Daiderd Jordan
134590d0a3
Merge pull request #82675 from cole-h/zoxide
...
zoxide: 0.2.0 -> 0.2.1
2020-03-15 20:44:00 +01:00
Daiderd Jordan
bdd16df074
vaultenv: fix build
...
Don't hard fail on warnings, having eg. some redundant imports is fine.
2020-03-07 19:02:58 +01:00
Daiderd Jordan
82e27330cb
Merge pull request #81949 from marsam/update-vault
...
vault: 1.3.2 -> 1.3.3
2020-03-07 12:31:51 +01:00
Daiderd Jordan
d5bf022aa6
Merge pull request #81925 from bachp/plex-1.18.7.2457
...
plex: 1.18.7.2438 -> 1.18.7.2457
2020-03-06 22:38:32 +01:00
Daiderd Jordan
4c945ee64a
Merge pull request #81443 from tricktron/iterm2-fix
...
iterm2: 3.0.14 -> 3.3.9 & fix build
2020-03-03 19:21:16 +01:00
Daiderd Jordan
c6bbad4e87
Merge pull request #81165 from manveru/vaultenv-0.13.0
...
vaultenv: 0.8.0 -> 0.13.0
2020-02-27 19:03:29 +01:00
Daiderd Jordan
cc05b65a99
Merge pull request #81114 from cw789/elixir_update
...
elixir_1_10: 1.10.1 -> 1.10.2
2020-02-27 08:34:05 +01:00
Daiderd Jordan
1b5e9c4818
Merge pull request #79067 from strager/chatterino2-darwin
...
chatterino2: fix install on macOS
2020-02-25 08:46:34 +01:00
Daiderd Jordan
e4af779056
Merge pull request #80635 from marsam/fix-bazel-darwin
...
bazel: fix build on darwin
2020-02-22 08:52:58 +01:00
Daiderd Jordan
fd4df0bcbb
Merge pull request #80603 from eraserhd/plan9port-macos-ldflags
...
plan9port: fix linker flags for macosx
2020-02-22 08:51:31 +01:00
Daiderd Jordan
af1fffab5b
Merge pull request #79769 from virusdave/dnicponski/scratch/make_git_gui_work_on_modern_mac
...
git: Fix git-gui to work on Catalina
2020-02-19 20:25:41 +01:00
Daiderd Jordan
230ab62e10
Merge pull request #79344 from LnL7/darwin-mpv-swift
...
mpv: add flag for swift on darwin
2020-02-19 19:14:49 +01:00
Daiderd Jordan
e2c3b16f99
Merge pull request #79755 from sikmir/osm2pgsql
...
osm2pgsql: enable on darwin
2020-02-17 22:43:26 +01:00
Daiderd Jordan
408f36923d
mpv: call with frameworks
...
Referencing darwin.* directly makes overriding dependencies very
awkward.
2020-02-07 22:09:23 +01:00
Daiderd Jordan
3987ea9a9d
mpv: add flag for swift on darwin
...
While we currently don't have a pure swift build on macOS it's possible
to build mpv using the swift compiler from CLT. eg.
self: super:
let
CommandLineTools = "/Library/Developer/CommandLineTools";
in
{
swift = super.stdenv.mkDerivation {
name = "swift-CommandLineTools-0.0.0";
phases = [ "installPhase" "fixupPhase" ];
propagatedBuildInputs = [ self.darwin.DarwinTools ];
installPhase = ''
mkdir -p $out/bin $out/lib
ln -s ${CommandLineTools}/usr/bin/swift $out/bin
ln -s ${CommandLineTools}/usr/lib/swift $out/lib
ln -s ${CommandLineTools}/SDKs $out
'';
setupHook = builtins.toFile "hook" ''
addCommandLineTools() {
echo >&2
echo "WARNING: this is impure and unreliable, make sure the CommandLineTools are installed!" >&2
echo " $ xcode-select --install" >&2
echo >&2
[ -d ${CommandLineTools} ]
export NIX_LDFLAGS+=" -L@out@/lib/swift/macosx"
export SWIFT=swift
export SWIFT_LIB_DYNAMIC=@out@/lib/swift/macosx
export MACOS_SDK_VERSION=$(sw_vers -productVersion | awk -F. '{print $1 "." $2}')
export MACOS_SDK=@out@/SDKs/MacOSX$MACOS_SDK_VERSION.sdk
}
prePhases+=" addCommandLineTools"
'';
__impureHostDeps = [ CommandLineTools ];
};
mpv = super.mpv.override { swiftSupport = true; };
}
2020-02-06 14:15:35 +01:00
Daiderd Jordan
105ecf1e01
prometheus-xmpp-alerts: fix evaluation
...
https://hydra.nixos.org/build/111462401
callPackages adds override functions to each attribute rather than just
the top-level drv resulting drv.metadata that includes a function.
derivation 'prometheus-xmpp-alerts-0.4.2' has invalid meta attribute 'overrideDerivation'
2020-02-03 08:24:31 +01:00
Daiderd Jordan
9078ca6c01
Merge pull request #78820 from kirelagin/macos-gettext-warn
...
gettext: Add macOS warning patch
2020-01-31 22:34:43 +01:00
Daiderd Jordan
6f38c93e3c
Merge pull request #77632 from LnL7/darwin-macos-version-min
...
stdenv: make darwin builds reproducable
2020-01-31 22:34:20 +01:00
Daiderd Jordan
68513e4071
cmake: move CMAKE_OSX_ARCHITECTURES out of the stdenv
...
This was initially introduced in 92188d9d17 ,
not clear how relevant this still is but i686 isn't supported anymore so
disable it explicitly.
2020-01-31 21:52:13 +01:00
Daiderd Jordan
b984c227d2
cmake: remove CMAKE_OSX_DEPLOYMENT_TARGET overrides
...
We _do_ want minimum versions in our packages.
2020-01-31 21:52:12 +01:00
Daiderd Jordan
9b579843d4
treewide: use stdenv.macosVersionMin
2020-01-31 21:52:12 +01:00
Daiderd Jordan
6567823996
stdenv: introduce appleSdkVersion and macosVersionMin
2020-01-31 21:52:11 +01:00
Daiderd Jordan
a826b49c97
stdenv: make darwin builds reproducable
...
Fixes #21629
Passing these extra linker flags removes both the semi-random uuid
included in most binaries as well as making the sdk version consistent
instead of based on the current os version.
Load command 8
cmd LC_UUID
cmdsize 24
uuid 70FAF921-5DC8-371C-B814-4F121FADFDF4
Load command 9
cmd LC_VERSION_MIN_MACOSX
cmdsize 16
version 10.12
sdk 10.13
The -macosx_version_min flag isn't strictly necessary since that's
already handled by MACOSX_DEPLOYMENT_TARGET.
2020-01-31 21:52:07 +01:00
Daiderd Jordan
62bbc2abc1
Merge pull request #78404 from cust0dian/glances-darwin-build
...
pythonPackages.glances: fix darwin build
2020-01-31 08:50:28 +01:00
Daiderd Jordan
6e6c16f90e
Merge pull request #78429 from thefloweringash/llfuse-darwin
...
pythonPackages.llfuse: darwin support, use in borgbackup
2020-01-25 15:52:36 +01:00
Daiderd Jordan
778f317820
Merge pull request #77972 from LnL7/enable-rustc-dev
...
rustPackages: make rustc-dev optional
2020-01-20 13:36:48 +01:00
Daiderd Jordan
8df4338f51
rustPackages: make rustc-dev optional
...
This was only introduced in 1.40.0 and doesn't work on older versions.
thread 'main' panicked at 'Error: no rules matched rustc-dev.', src/bootstrap/builder.rs:231:21
note: run with `RUST_BACKTRACE=1` environment variable to display a backtrace.
failed to run: /build/rustc-1.38.0-src/build/bootstrap/debug/bootstrap dist rustc-dev
2020-01-18 10:57:13 +01:00
Daiderd Jordan
ef09cebc96
diffoscope: enable on darwin
2020-01-14 10:56:52 +01:00
Daiderd Jordan
c05efedd4d
darwin.iproute2mac: explicitly use python2
2020-01-13 11:41:23 +01:00
Daiderd Jordan
da6bc4b4cb
darwin.libtapi: python2 -> python3
2020-01-13 11:41:23 +01:00
Daiderd Jordan
6328518e98
stdenv: bootstrap darwin with python3
...
- Replaced python override from the final stdenv, instead we
propagate our bootstrap python to stage4 and override both
CF and xnu to use it.
- Removed CF argument from python interpreters, this is redundant
since it's not overidden anymore.
- Inherit CF from stage4, making it the same as the stdenv.
2020-01-13 11:34:36 +01:00
Daiderd Jordan
73db5d8c38
darwin.apple_sdk: python2 -> python3
2020-01-13 11:13:57 +01:00
Daiderd Jordan
d0a90de910
llvmPackages: python2 -> python3
2020-01-13 11:13:56 +01:00
Daiderd Jordan
453e009947
darwin.CF: python2 -> python3
2020-01-13 11:13:06 +01:00
Daiderd Jordan
587c66c877
ninja: python2 -> python3
2020-01-13 11:13:06 +01:00
Daiderd Jordan
96a0cada14
libxml2: python2 -> python3
2020-01-13 11:13:06 +01:00
Daiderd Jordan
c7d457c9da
darwin.xnu: python2 -> python3
2020-01-13 11:13:01 +01:00
Daiderd Jordan
05d4cdfad1
Merge pull request #77529 from symphorien/rls
...
rust: include the rustc-dev component
2020-01-12 10:26:46 +01:00
Daiderd Jordan
112eea6b90
Merge pull request #77445 from Infinisil/fix-lib-tests
...
lib/tests: Fix module tests
2020-01-10 16:17:38 +01:00
Daiderd Jordan
e0b00eda58
Merge pull request #77306 from gpevnev/reattach-to-user-namespace-2.8
...
reattach-to-user-namespace: 2.7 -> 2.8
2020-01-08 12:06:59 +01:00
Daiderd Jordan
1acf26126b
Merge pull request #77162 from bbigras/plex
...
plex: 1.18.3.2156 -> 1.18.4.2171
2020-01-07 13:19:22 +01:00
Daiderd Jordan
9d9bba120f
h3: fix darwin build
...
Disable linting as it uses clang-tidy, which isn't a cc-wrapper and
won't find our dependencies automatically.
2020-01-06 13:51:00 -08:00
Daiderd Jordan
7ac90533a1
nix: build using gcc8
...
Workaround for https://github.com/NixOS/nix/issues/3300 .
https://hydra.nixos.org/build/109304568
running tests
checking Nixpkgs on i686-linux
error: stack overflow (possible infinite recursion)
build time elapsed: 0m0.068s 0m0.029s 0m36.549s 0m6.187s
builder for '/nix/store/dr5kd28msqmqk3hkz0ayx10dww6s8dn9-nixpkgs-tarball-20.03pre207974.16c665911fb.drv' failed with exit code 1
2020-01-03 17:04:10 +01:00
Daiderd Jordan
dd5fd3b1ff
Merge pull request #76771 from dtzWill/update/llvm-9.0.1
...
llvm_9: 9.0.0 -> 9.0.1
2020-01-03 11:59:22 +01:00
Daiderd Jordan
1de5065375
plan9port: remove cf-private
...
No longer needed since #63381 .
2019-12-27 18:36:03 +01:00
Daiderd Jordan
7fafd45ad7
lorri: remove cf-private
...
No longer needded since #63381 .
2019-12-27 18:33:52 +01:00
Daiderd Jordan
116ef2a717
Merge pull request #76092 from terlar/fix-awscli
...
awscli: pin colorama to 0.4.1
2019-12-20 16:07:56 +01:00
Daiderd Jordan
0159151705
manual: specify interpreter in virtualenv shell
...
Without this virtualenv might try to setup an environment for a
different version of python then the one specified in the expression.
2019-12-17 16:42:18 +01:00
Daiderd Jordan
9fb0c2ea82
Merge pull request #75572 from shahrukh330/shahrukh330/aws-okta-fix-darwin-build
...
aws-okta: fix build on darwin
2019-12-12 23:18:57 +01:00
Daiderd Jordan
d5d8b3514d
darwin.CF: fix retry condition (close PR #75528 )
...
Using a function in an if condition when set -e is set doesn't seem to
break out or return false which means the workaround from 41ca86129f
never gets triggered.
2019-12-12 08:16:32 +01:00