public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
216,168 Commits 1 Branch 0 Tags
a2437c37af33dabdc4e8588905ba2dd6292b94de
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Daiderd Jordan 5e7e4c93a9 gfortran: use 8.x on darwin 
The conditional was introduced in 982d8599fb,
but the build has been fixed since then.
 2019-12-10 18:58:28 +01:00
Daiderd Jordan 7da9844fde Merge pull request #73826 from LnL7/darwin-git 
git: disable failing test on darwin
 2019-11-22 21:27:49 +01:00
Daiderd Jordan 185e30c664 git: disable failing test on darwin 
The tests for null patterns where changed in 25754125cef278c7e9492fbd6dc4a28319b01f18,
it's possible utf-8 normalisation is causing different behaviour here.

    not ok 54 - LC_ALL='C' git grep -P -f f -i 'Æ<NUL>[Ð]' a
    not ok 57 - LC_ALL='C' git grep -P -f f -i '[Æ]<NUL>Ð' a
    not ok 60 - LC_ALL='C' git grep -P -f f -i '[Æ]<NUL>ð' a
    not ok 63 - LC_ALL='C' git grep -P -f f -i 'Æ<NUL>Ð' a
    Dubious, test returned 1 (wstat 256, 0x100)
    Failed 4/145 subtests
            (less 48 skipped subtests: 93 okay)
 2019-11-22 21:02:21 +01:00
Daiderd Jordan f89fff0154 Merge pull request #73457 from cw789/erlang_update 
erlangR22: 22.0.4 -> 22.1.7
 2019-11-18 23:17:44 +01:00
Daiderd Jordan 41ca86129f darwin.CF: workaround intermittent CFRuntime.c failures 
Based on testing this issue seems to only occur with clang_7, so
we should be able to revert this when the default llvm versions are
updated.

Fixes #66811
 2019-11-17 14:55:00 +01:00
Daiderd Jordan 27313767b8 gettext: fix darwin build 
The CF configure flags broke with the last update but based on
fa9c81f694 and the comment it seems like
these are not necessary anymore.

    $ nix-build -A stdenv.__bootPackages.stdenv.__bootPackages.gettext
    /nix/store/dii9p8717rjnbzar4kh1q3sxk77dbbkd-gettext-0.20.1

    $ nix-store -qR /nix/store/dii9p8717rjnbzar4kh1q3sxk77dbbkd-gettext-0.20.1
    /nix/store/2ws9cmamvr7xyvdg4d2nnd1bmr1zjrrq-bootstrap-tools
    /nix/store/2yn28axagwyifnvdm8npy2f982jxr986-libiconv-osx-10.12.6
    /nix/store/dii9p8717rjnbzar4kh1q3sxk77dbbkd-gettext-0.20.1
 2019-11-15 18:54:47 +01:00
Daiderd Jordan 8e1380b981 vimPlugins.youcompleteme: fix python interpreter 2019-11-09 10:38:30 -08:00
Daiderd Jordan 518b5c1ae4 rustracerd: fix build 2019-11-09 10:38:30 -08:00
Daiderd Jordan 7fb0d95ca1 Merge pull request #71318 from tricktron/fixOpenConnectOnCatalina 
openconnect: Add darwin support
 2019-11-08 20:36:48 +01:00
Daiderd Jordan f48ecbf850 Merge pull request #72624 from witkamp/master 
muparser: add darwin support
 2019-11-06 00:38:38 +01:00
Daiderd Jordan 9b773fd98a inkscape: fix darwin build 
Cairo is also a dependency now.

    /tmp/nix-build-inkscape-0.92.4.drv-0/inkscape-0.92.4/src/display/drawing-context.h:20:10: fatal error: 'cairo.h' file not found
    #include <cairo.h>
             ^~~~~~~~~
    1 error generated.
 2019-11-04 16:03:18 +01:00
Daiderd Jordan 80a5dd7f02 gegl: fix darwin build 
../gegl/opencl/cl_gl.h:37:10: fatal error: 'OpenGL/CGLDevice.h' file not found
    #include <OpenGL/CGLDevice.h>
 2019-11-03 18:59:24 +01:00
Daiderd Jordan 10875a75aa Merge pull request #71926 from DzmitrySudnik/jdk_darwin 
java-darwin: upgrade 8.0_121 -> 8.0_222
 2019-11-02 16:43:02 +01:00
Daiderd Jordan 4d5fae0faa Merge pull request #70349 from bachp/plex-1.17.0.1841 
plex: 1.16.6.1592 -> 1.17.0.1841
 2019-10-04 00:01:58 +02:00
Daiderd Jordan c819648a68 neovim: link against libluv on darwin 2019-10-02 00:30:42 +02:00
Daiderd Jordan fc408c8690 lua.pkgs.luv.libluv: fix linking against lua on darwin 
[ 50%] Building C object CMakeFiles/luv.dir/src/luv.c.o
    [100%] Linking C shared library libluv.dylib
    Undefined symbols for architecture x86_64:
      "_luaL_addlstring", referenced from:
          _thread_dump in luv.c.o
      ...
 2019-10-02 00:08:13 +02:00
Daiderd Jordan 98c40b132d Merge pull request #69179 from uri-canva/algebraic-data-types 
pythonPackages.algebraic-data-types: init at 0.1.1
 2019-09-21 13:52:29 +02:00
Daiderd Jordan b5f406cb6a Merge pull request #68689 from B4dM4n/uvloop-darwin 
uvloop: fix darwin build
 2019-09-20 22:21:53 +02:00
Daiderd Jordan a6dcdf9ed4 Merge pull request #68681 from B4dM4n/h11-darwin 
pythonPackages.h11: fix darwin build
 2019-09-20 22:17:43 +02:00
Daiderd Jordan 51bd8395d3 Merge pull request #68691 from B4dM4n/trustme-darwin 
pythonPackages.trustme: fix darwin build
 2019-09-20 22:15:32 +02:00
Daiderd Jordan 1803573281 Merge pull request #68782 from B4dM4n/portend-darwin 
pythonPackages.portend: fix darwin build
 2019-09-20 22:05:39 +02:00
Daiderd Jordan 4bc107b06e Merge pull request #68823 from B4dM4n/notebook-darwin 
notebook: fix darwin sandbox build + dependencies
 2019-09-20 22:03:54 +02:00
Daiderd Jordan 463703c213 Merge pull request #68883 from B4dM4n/cheroot-darwin 
cheroot: fix darwin sandbox build
 2019-09-20 22:01:15 +02:00
Daiderd Jordan 3d2d695657 Merge pull request #69116 from bachp/plex-1.16.6.1592 
plex: 1.16.5.1554 -> 1.16.6.1592
 2019-09-19 22:22:38 +02:00
Daiderd Jordan db131371ef minio-client: remove go 1.10 override 2019-09-01 10:14:04 +02:00
Daiderd Jordan 7f1356c00a Merge pull request #65384 from averelld/plex-upgrade 
plex: 1.16.2.1321 -> 1.16.3.1402
 2019-08-04 11:09:04 +02:00
Daiderd Jordan 04b3ad82f8 Merge pull request #65038 from LnL7/erlang-wx 
erlang: remove wx conditional
 2019-07-19 00:04:04 +02:00
Daiderd Jordan 6fb8e5c453 Merge pull request #65025 from cw789/update_elixir 
elixir_1_9: 1.9.0 -> 1.9.1
 2019-07-19 00:03:43 +02:00
Daiderd Jordan 89083ccf85 Merge pull request #64803 from serokell/elixir19 
elixir: default 1.7.4 -> 1.9.0
 2019-07-19 00:03:29 +02:00
Daiderd Jordan 8c4152dac3 Merge pull request #64801 from serokell/beam-erlangR21 
beam-packages: default erlangR20 -> erlangR22
 2019-07-19 00:03:07 +02:00
Daiderd Jordan 574cb4a8df erlang: remove wx conditional 
The wxmac build has been fixed and there's erlang_nox now.
 2019-07-18 23:42:32 +02:00
Daiderd Jordan f1070eec27 stdenv: MACOSX_DEPLOYMENT_TARGET 10.10 -> 10.12 2019-07-08 21:56:40 +02:00
Daiderd Jordan ed27ba064c cmake: update ApplicationServices patch 2019-07-08 21:48:19 +02:00
Daiderd Jordan ec88794cd3 Merge pull request #64060 from LnL7/python-language-server 
pythonPackages.python-language-server: fix python2.7 build
 2019-07-07 09:33:02 +02:00
Daiderd Jordan 10f3980f95 Merge pull request #63381 from LnL7/darwin-frameworks 
darwin-frameworks: remove CF references
 2019-07-03 22:40:28 +02:00
Daiderd Jordan 42705e70a7 lldb: fix darwin sandboxed build 2019-07-03 22:20:25 +02:00
Daiderd Jordan a17c03cb7b python-watchdog: remove cf-private 2019-07-03 22:20:25 +02:00
Daiderd Jordan 3a57f5095f tk: remove cf-private 2019-07-03 22:20:25 +02:00
Daiderd Jordan b74a025f7f glib: remove cf-private 2019-07-03 22:20:24 +02:00
Daiderd Jordan ea4f282128 watchexec: remove cf-private 2019-07-03 22:20:24 +02:00
Daiderd Jordan 5ecbcc0886 mdbook: remove cf-private 2019-07-03 22:20:24 +02:00
Daiderd Jordan 4e7695fc69 darwin.trash: remove cf-private 2019-07-03 22:20:23 +02:00
Daiderd Jordan df23db8956 jack2: remove cf-private 2019-07-03 22:20:23 +02:00
Daiderd Jordan da7bcec42f root: remove cf-private 2019-07-03 22:20:22 +02:00
Daiderd Jordan 56127c23c2 gargoyle: remove cf-private 2019-07-03 22:20:22 +02:00
Daiderd Jordan bbf5f7e3da zola: remove cf-private 2019-07-03 22:20:22 +02:00
Daiderd Jordan b0e201f349 vim: remove cf-private 2019-07-03 22:20:21 +02:00
Daiderd Jordan 1fc3bbcb06 aminal: remove cf-private 2019-07-03 22:20:21 +02:00
Daiderd Jordan 29e68d765b synergy: fix darwin build 2019-07-03 22:20:20 +02:00
Daiderd Jordan a73bfdf3a7 kitty: remove cf-private 2019-07-03 22:20:20 +02:00
Daiderd Jordan bea56ef8ba gimp: remove cf-private 2019-07-03 22:20:20 +02:00
Daiderd Jordan f2d2381838 emacs: remove cf-private 2019-07-03 22:20:19 +02:00