public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
241,714 Commits 1 Branch 0 Tags
2cbc3f0aeccab2b882ade1200f672e6178bd3ddc
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Matthew Bauer fc726e3494 Revert "nixos/nix-daemon.nix: assert distributedBuilds and buildMachines!=[]" 
This reverts commit 67b6e56391.
This reverts commit 250885d0ca.

Causes issues for some configs, see https://github.com/NixOS/nixpkgs/commit/67b6e5639126ab6e8ec5d2b303aa9736a626b609
 2020-08-29 22:39:24 -05:00
Matthew Bauer 10ee14442d Merge pull request #95864 from obsidiansystems/nvidia-x11-no32bit 
nvidia-x11: add disable32Bit arg to not include 32-bit nvidia
 2020-08-29 22:09:58 -05:00
Matthew Bauer d0e52b6b32 Merge pull request #95309 from obsidiansystems/mobile-fixes 
Support Android 29 in cross-compilation
 2020-08-28 14:59:37 -05:00
Matthew Bauer 0daf71f97f nixos/cage: supply pamEnvironment 
Without this, you don’t get any of the sessionVariables in the cage
application. Things like XDG_DATA_DIRS, XCURSOR_PATH, etc. are
missing.
 2020-08-28 14:09:31 +02:00
Matthew Bauer 3814422afa Merge pull request #96218 from matthewbauer/cage-supply-pam-environment 
nixos/cage: supply pamEnvironment
 2020-08-27 10:15:29 -05:00
Matthew Bauer fe8d0c2e0b nixos/cage: supply pamEnvironment 
Without this, you don’t get any of the sessionVariables in the cage
application. Things like XDG_DATA_DIRS, XCURSOR_PATH, etc. are
missing.
 2020-08-27 10:11:45 -05:00
Matthew Bauer 25ac498482 Merge pull request #96404 from matthewbauer/gcc-cross 
Fix cycle detected in Darwin->Linux cross GCC
 2020-08-26 16:17:14 -05:00
Matthew Bauer 0b8312660a gcc10: fix building darwin->linux cross compiler 
same as 459c60dda2 but for gcc10
 2020-08-26 16:15:05 -05:00
Matthew Bauer 872b23d214 Merge remote-tracking branch 'origin/master' into gcc-cross 2020-08-26 16:10:02 -05:00
Matthew Bauer ca3fa9c32a Merge pull request #95956 from matthewbauer/qemu-cpu-max 
runInLinuxVM, test-driver: use -cpu max instead of -cpu host
 2020-08-26 12:59:57 -05:00
Matthew Bauer 47b56e7c19 runInLinuxVM, test-driver: use -cpu max instead of -cpu host 
This appears to avoid requiring KVM when it’s not available. This is
what I originally though -cpu host did. Unfortunately not much
documentation available from the QEMU side on this, but this appears
to square with help:

$ qemu-system-x86 -cpu help
...
x86 host                  KVM processor with all supported host features
x86 max                   Enables all features supported by the accelerator in the current host
...

Whether we actually want to support this not clear, since this only
happens when your CPU doesn’t have full KVM support. Some Nix builders
are lying about kvm support though. Things aren’t too slow without it
though.

Fixes https://github.com/NixOS/nixpkgs/issues/85394

Alternative to https://github.com/NixOS/nixpkgs/pull/83920
 2020-08-21 23:42:07 -05:00
Matthew Bauer bc0a6b113b nccl: remove nccl_cudatoolkit_9 
This doesn’t work with latest nccl anymore.
 2020-08-20 10:44:23 -05:00
Matthew Bauer 31d8669a72 nvidia-x11: add disable32Bit arg to not include 32-bit nvidia 
In some contexts, we don’t want to have to build the whole i686 stdenv
just to use the x86_64 nvidia driver. It’s hard to know ahead of time
what we want, so it’s best to leave this as an overridable option.
 2020-08-20 10:29:28 -05:00
Matthew Bauer e57df5816d undmg: use file name instead of pipe 
There’s some issue in really big files with pipes that doesn’t occur
in filename decompression.
 2020-08-19 19:35:29 -05:00
Matthew Bauer 4694b671b1 undmg: 1.0.5 -> 1.1.0 2020-08-19 19:35:14 -05:00
Matthew Bauer e7d1b6b59b Merge pull request #95779 from matthewbauer/lzfse-shared 
lzfse: use cmake build system
 2020-08-19 19:32:18 -05:00
Matthew Bauer d1c2a9ed97 lzfse: use cmake build system 
this builds .so correctly
 2020-08-19 19:31:30 -05:00
Matthew Bauer a378ae61e2 Merge pull request #95129 from aaronjanse/aj-fix-llvm-for-redox 
mkDerivation: use `Generic` as system name for Redox in cmakeFlags
 2020-08-19 15:07:20 -05:00
Matthew Bauer abba9a2154 nccl: 2.4.8-1 -> 2.7.8-1 2020-08-19 13:34:56 -05:00
Matthew Bauer 164f8024e9 cudatoolkit: init v11.0.3 2020-08-19 13:34:52 -05:00
Matthew Bauer c5617381bc ghc: document Stage1Only setting 2020-08-17 23:51:59 -05:00
Matthew Bauer ff33855bf0 android: readd 18b ndk 
This is referenced in all-packages.nix, so might as well leave it
heref or now.
 2020-08-17 23:51:59 -05:00
Matthew Bauer 4cbca0893a androidenv: remove duplicate addons.nix entries 2020-08-17 23:51:59 -05:00
Matthew Bauer 0be29459d6 ghc: set Stage1Only = YES on iOS 
We want stage1Only here even if system == system, since we can’t run
the native arch simulator binaries locally.
 2020-08-17 23:51:59 -05:00
Matthew Bauer d2fce26c40 Merge pull request #95363 from lopsided98/crda-cross 
crda: fix cross compilation
 2020-08-17 16:24:35 -05:00
Matthew Bauer 21d0eb3b32 Merge pull request #95680 from helsinki-systems/feat/john/perl 
john: ship internal perl modules
 2020-08-17 16:22:08 -05:00
Matthew Bauer a4fd659299 Merge pull request #95702 from Thra11/fix-llvm-10-aarch32 
llvm_10: disable failing test on 32-bit ARM
 2020-08-17 16:21:37 -05:00
Matthew Bauer 6fffd50623 Merge pull request #95220 from obsidiansystems/ipfs-quic-socket-activated 
nixos/ipfs: Allow QUIC connections to socket activate too
 2020-08-12 13:47:29 -05:00
Matthew Bauer e707f1f72c Merge pull request #95200 from matthewbauer/emacs-macport-27 
emacs-macport: 26.3-7.7 -> 27.1-8.0
 2020-08-11 15:00:00 -05:00
Matthew Bauer 669f0d3f36 emacs-macport: 26.3-7.7 -> 27.1-8.0 2020-08-11 11:51:24 -05:00
Matthew Bauer d0468f86e8 nss: set install name correctly 2020-08-02 22:35:30 -05:00
Matthew Bauer 203538bd4f lzfse: supports unix 2020-08-02 21:01:41 -05:00
Matthew Bauer dab2ed10e1 gyp: update no-xcode.patch 2020-08-02 21:01:12 -05:00
Matthew Bauer d0677e6d45 treewide: add warning comment to “boot” packages 
This adds a warning to the top of each “boot” package that reads:

  Note: this package is used for bootstrapping fetchurl, and thus cannot
  use fetchpatch! All mutable patches (generated by GitHub or cgit) that
  are needed here should be included directly in Nixpkgs as files.

This makes it clear to maintainer that they may need to treat this
package a little differently than others. Importantly, we can’t use
fetchpatch here due to using <nix/fetchurl.nix>. To avoid having stale
hashes, we need to include patches that are subject to changing
overtime (for instance, gitweb’s patches contain a version number at
the bottom).
 2020-07-31 08:56:53 +02:00
Matthew Bauer f36899e118 attr: inline syscall patch 
Unfortunately the output of git.savannah.nongnu.org changes with each
gitweb update. This means that the current has
“0gja54fz79a9ma6b4mprnjxq77l5yg2z9xknlwhmkcrfnam02qxp” is no longer
correct:

$ nix-prefetch-url
https://git.savannah.nongnu.org/cgit/attr.git/patch/\?id=14adc898a36948267bfe5c63b399996879e94c98
1g8sky52rjg9fpmrddza1af89s9qd4bzsbxqb7mc5bv8gyh10s1k

Normally, we use fetchpatch to strip this out, but unfortunately attr
cannot use fetchpatch due to being used in bootstrapping fetchurl.
That is, it can’t use a custom postFetch since <nix/fetchurl.nix>
doesn’t support that.

To solve this problem, just inline the patch for now.
 2020-07-31 08:56:53 +02:00
Matthew Bauer 67b6e56391 nixos/nix-daemon.nix: fix nix.distributedBuilds assertion 2020-07-30 21:38:24 -05:00
Matthew Bauer ed1423b03c Merge pull request #92415 from matthewbauer/nix-daemon-distributed-builds 
Add assertion on distributedBuilds & buildMachines != []
 2020-07-30 19:56:23 -05:00
Matthew Bauer d861d3b505 Merge pull request #94106 from matthewbauer/undmg-1-0-5 
undmg: 1.0.3 -> 1.0.5
 2020-07-30 19:56:08 -05:00
Matthew Bauer 5a741d16ff Merge pull request #93541 from matthewbauer/ios-deploy-update 
ios-deploy: move out of nodePackages
 2020-07-30 19:55:52 -05:00
Matthew Bauer 250885d0ca nixos/nix-daemon.nix: assert distributedBuilds and buildMachines!=[] 
Without distributedBuilds, you can’t use buildMachines flag.

Fixes #56593
 2020-07-30 19:55:12 -05:00
Matthew Bauer 1a3b07cf8e Merge commit 'b53902f535f2c63d71e916b9de22dbcfeec9d99e' into staging 2020-07-29 18:24:08 -05:00
Matthew Bauer 22f82fc8ca Revert "Merge pull request #94090 from sikmir/fix-cmake-hook" 
This reverts commit e36b1d4ad1, reversing
changes made to c2ea7318be.

Should go to staging.
 2020-07-29 18:20:56 -05:00
Matthew Bauer e36b1d4ad1 Merge pull request #94090 from sikmir/fix-cmake-hook 
cmake: fix CMAKE_FIND_FRAMEWORK
 2020-07-29 18:19:57 -05:00
Matthew Bauer c2ea7318be Merge pull request #68488 from B4dM4n/xmlsec-dlsearchdir 
xmlsec: add library path to lt_dladdsearchdir
 2020-07-29 18:02:22 -05:00
Matthew Bauer ec80ae2550 undmg: 1.0.3 -> 1.0.5 2020-07-28 16:42:35 -05:00
Matthew Bauer b331c72f03 llvm: setup some symlinks for compatibility with binutils 
This is needed for cross-compiling for LLVM.

After https://github.com/NixOS/nixpkgs/pull/94088, we still need some
of these, so I’ve whitelisted those that are in binutils.

/cc @DavidTruby
 2020-07-28 15:08:46 -05:00
Matthew Bauer ea842a7467 Merge pull request #88248 from ggreif/master 
llvmPackages_10: 10.0.0 -> 10.0.1
 2020-07-28 14:55:16 -05:00
Matthew Bauer 81bb09571f Merge pull request #94061 from DieGoldeneEnte/llvm-manpage-disable 
llvmPackages_{8..10}: comment out broken manpages
 2020-07-28 14:54:28 -05:00
Matthew Bauer a5659d3605 Merge pull request #94088 from DavidTruby/master 
llvm*: remove symlinks to llvm-diff, llvm-as and LLVM IR utilities
 2020-07-28 14:50:48 -05:00
Matthew Bauer da3be4a38b Merge pull request #93959 from r-ryantm/auto-update/wla-dx 
wla-dx: 9.8 -> 9.11
 2020-07-28 14:50:21 -05:00
Matthew Bauer b22fc7f03b Merge pull request #91682 from DieGoldeneEnte/clang_rtti 
clang_{5..10}: add RTTI
 2020-07-28 14:47:54 -05:00
Matthew Bauer 10aa776340 ios-deploy: move out of nodePackages 
This doesn’t need nodePackages to work, so we can move it to
pkgs/os-specific/darwin. Note that it still requires xcodebuild to
work.
 2020-07-21 10:24:53 -05:00
Matthew Bauer a2c2a86488 Merge pull request #89885 from matthewbauer/fetchurl-no-hash 
fetchurl: allow empty hash
 2020-07-06 14:41:57 -04:00
Matthew Bauer 669eb09bd5 Merge branch 'master' into fetchurl-no-hash 2020-07-06 14:40:49 -04:00
Matthew Bauer 89d4142fc8 Merge pull request #92416 from matthewbauer/fix-elfutils 
Fix elfutils
 2020-07-06 12:27:27 -04:00
Matthew Bauer 985071630e Merge pull request #92414 from matthewbauer/nix-cross 
Fix nix cross compilatino
 2020-07-06 10:41:16 -04:00
Matthew Bauer 80ca70b0e1 elfutils: add argp-standalone for musl 
https://hydra.nixos.org/build/123111192
 2020-07-06 01:51:46 -04:00
Matthew Bauer f2cafb1626 argp-standalone: support all linux architectures 2020-07-06 01:50:55 -04:00
Matthew Bauer 00be3fac9f nix: gmock is a library 
https://hydra.nixos.org/build/123111516
 2020-07-06 01:46:43 -04:00
Matthew Bauer 01ede8c615 nix: don’t precompile headers on cross compilation 
avoids this error:

  mk/precompiled-headers.mk:38: *** Don't know how to precompile headers on aarch64-unknown-linux-gnu-g++.  Stop.
 2020-07-06 01:46:10 -04:00
Matthew Bauer 8a525d6a2b arpack: add blas, lapack to library path 
Fixes #89215
 2020-07-06 01:30:10 -04:00
Matthew Bauer e7ea3de835 blas: use $NM instead of nm 
This is the right one on cross compilation.
 2020-07-06 00:25:32 -04:00
Matthew Bauer f42aa7e1d7 cc-wrapper: set FC when langFortran is on 
We need to set FC so that CMake and other tools can find the fortran
compiler. Also we need to limit the hardening flags since fortify and
format don’t work with fortran.

Fixes #88449
 2020-07-06 00:22:19 -04:00
Matthew Bauer c34507d795 Merge pull request #90431 from euank/nixos-install-warn 
nixos-install: error out if $mountPoint has bad permissions
 2020-07-05 18:55:43 -04:00
Matthew Bauer cee7631c08 Merge pull request #91221 from iblech/patch-dsniff2 
Unbreak dsniff by partially reverting a commit to libpcap
 2020-06-27 19:33:41 -04:00
Matthew Bauer 3f41da9b38 strace: use host perl 
perl needs to be in buildInputs for patchShebangs to work properly
 2020-06-25 00:09:22 -04:00
Matthew Bauer 1a835f911b SDL2: get native wayland-scanner 2020-06-25 00:09:22 -04:00
Matthew Bauer 34e4d0fd98 avahi: use prefixed pkg-config 2020-06-25 00:09:22 -04:00
Matthew Bauer 95930fe857 openldap: set CC for cross compilation 2020-06-25 00:09:22 -04:00
Matthew Bauer 8f0c1adda2 pulseaudio: use prefixed pkg-config 2020-06-25 00:09:22 -04:00
Matthew Bauer da8e991836 crda: use prefixed pkg-config 2020-06-25 00:09:22 -04:00
Matthew Bauer 7a8b3b8b64 perl-NetDBus: use prefixed pkg-config 
needed for c71ab32a67
 2020-06-25 00:09:22 -04:00
Matthew Bauer 96f72f94ad retroarch: use prefixed pkg-config 
retroarch knows how to use the correct pkg-config, so this is no
longer needed.
 2020-06-25 00:09:21 -04:00
Matthew Bauer 74c8e34ece Merge pull request #91114 from danieldk/clojure-man-pages 
clojure: install man pages
 2020-06-21 21:33:20 -04:00
Matthew Bauer ae423cfeab Merge pull request #90028 from ggreif/wasmtime 
wasmtime: 0.16.0 -> 0.17.0
 2020-06-19 16:54:02 -04:00
Matthew Bauer d07451fb5c Merge pull request #84315 from r-ryantm/auto-update/rgbds 
rgbds: 0.3.10 -> 0.4.0
 2020-06-17 23:15:03 -04:00
Matthew Bauer 834272d0d6 Merge pull request #90506 from mroi/patch-libgcc 
libgcc: fix Darwin cross compile
 2020-06-15 19:36:05 -04:00
Matthew Bauer 2c2f6c0b38 nixos/ipfs: only set listenstream when gateway/api is default 2020-06-12 17:15:34 -05:00
Matthew Bauer 982a17a48e nixos/ipfs: always expose sockets 2020-06-12 17:15:34 -05:00
Matthew Bauer fa06d8f961 nixos/ipfs: actually use upstream systemd units 2020-06-12 17:15:34 -05:00
Matthew BauerandFlorian Klink b36ef706fb nixos/ipfs: add startWhenNeeded option 
This makes it possible to only start IPFS when needed. So a user’s
IPFS daemon only starts when they actually use it.

A few important warnings though:

  - This probably shouldn’t be mixed with services.ipfs.autoMount
    since you want /ipfs and /ipns aren’t activated like this
  - ipfs.socket assumes that you are using ports 5001 and 8080 for the
    API and gateway respectively. We could do some parsing to figure
    out what is in apiAddress and gatewayAddress, but that’s kind of
    difficult given the nonstandard address format.
  - Apparently? this doesn’t work with the --api commands used in the tests.

Of course you can always start automatically with startWhenNeeded =
false, or just running ‘systemctl start ipfs.service’.

Tested with the following test (modified from tests/ipfs.nix):

  import ./make-test-python.nix ({ pkgs, ...} : {
    name = "ipfs";

    nodes.machine = { ... }: {
      services.ipfs = {
        enable = true;
        startWhenNeeded = true;
      };
    };

    testScript = ''
      start_all()

      machine.wait_until_succeeds("ipfs id")
      ipfs_hash = machine.succeed("echo fnord | ipfs add | awk '{ print $2 }'")

      machine.succeed(f"ipfs cat /ipfs/{ipfs_hash.strip()} | grep fnord")
    '';
  })

Fixes #90145

Update nixos/modules/services/network-filesystems/ipfs.nix

Co-authored-by: Florian Klink <flokli@flokli.de>
 2020-06-12 17:15:27 -05:00
Matthew Bauer ed6e598747 Merge pull request #89112 from eadwu/musl/libc-arch 
musl: include libc.musl-$arch
 2020-06-12 14:29:22 -05:00
Matthew Bauer c5f40198f3 nixos/ipfs: consolidate services into one ipfs.service 
Previously we had three services for different config flavors. This is
confusing because only one instance of IPFS can run on a host / port
combination at once. So move all into ipfs.service, which contains the
configuration specified in services.ipfs.

Also remove the env wrapper and just use systemd env configuration.
 2020-06-11 15:27:22 -05:00
Matthew Bauer 74ff433320 nixos/ipfs: remove unused auto migrate feature 2020-06-11 14:32:06 -05:00
Matthew Bauer c8a2e63242 ipfs: copy systemd support files to output 2020-06-11 14:16:16 -05:00
Matthew Bauer 0daaed8730 Revert "Merge pull request #89726 from doronbehar/ruby-gcc-ref" 
This reverts commit 6590c33850, reversing
changes made to d659f968ba.
 2020-06-11 12:05:14 -05:00
Matthew Bauer f6243aba72 Merge pull request #90070 from sikmir/mp3blaster 
mp3blaster: fix build on darwin
 2020-06-11 11:02:23 -05:00
Matthew Bauer 6590c33850 Merge pull request #89726 from doronbehar/ruby-gcc-ref 
rubyMinimal: don't reference stdenv.cc
 2020-06-11 11:01:39 -05:00
Matthew Bauer d659f968ba Merge pull request #88075 from mroi/patch-libmilter 
libmilter: fix compilation on Darwin
 2020-06-11 10:59:39 -05:00
Matthew Bauer f5c1ab06af Merge pull request #89351 from dwarfmaster/fix-emacs-build 
Fix building of emacsWithPackages not findind subdirs.el
 2020-06-11 10:52:25 -05:00
Matthew Bauer 656783a3d1 Merge pull request #89540 from Patryk27/fixes/lxd-lxcfs 
Fix `lxd`, so that it works with `lxcfs`
 2020-06-11 10:49:40 -05:00
Matthew Bauer 2c7ec299fa Merge pull request #89980 from sikmir/clex 
clex: enable on darwin
 2020-06-11 10:44:44 -05:00
Matthew Bauer a4959d36ef Merge pull request #90128 from vcunat/p/locales-priority 
nixos i18n.supportedLocales: increase systemPackages priority
 2020-06-11 10:44:35 -05:00
Matthew Bauer 0046802ab6 fetchurl: only allow empty hash when cacert is available 
We can use cacert to validate that the data passes SSL certificates.
Normally, this doesn’t happen because we already have the hash, but in
the hash = "" case we don’t.
 2020-06-09 12:56:27 -05:00
Matthew Bauer a528cc1bca arduino: error on wrong architecture 2020-06-09 11:23:15 -05:00
Matthew Bauer f2e9046de5 fetchurl: allow empty hash 
Meant as a companion to https://github.com/NixOS/nix/pull/3674

This just resets outputHash if nothing is passed in.
 2020-06-09 01:37:10 -05:00
Matthew Bauer 5f11c0ad81 Merge pull request #70024 from NixOS/nix-static 
nix: allow static compilation
 2020-06-08 17:55:40 -05:00
Matthew Bauer a9924d7ab8 libexecinfo: fix building statically 2020-06-08 17:47:51 -05:00
Matthew Bauer 6231dc774d Merge pull request #88692 from Aver1y/libusb-pkgsMusl 
libusb1: Fix for pkgsMusl
 2020-06-08 17:38:42 -05:00
Matthew Bauer 59616b291d openssh: don’t include fido2 on musl 
libselinux pulls in openssh transitively, so can’t use fido here

Fixes #89246
 2020-06-08 17:37:38 -05:00