Commit Graph
100 Commits
Author SHA1 Message Date
Matthew Bauer e003ae1874 Merge pull request #83159 from khumba/pydf
pydf: install man page and default config file
2020-03-26 11:00:40 -05:00
Matthew Bauer 1efa4c4f39 Merge pull request #83246 from r-ryantm/auto-update/rgbds
rgbds: 0.3.9 -> 0.3.10
2020-03-23 19:12:58 -04:00
Matthew Bauer 11f8bb71f8 Merge pull request #83240 from kolbycrouch/picodrive-fix
retroarch: fix picodrive on aarch64
2020-03-23 17:03:34 -04:00
Matthew Bauer e7dc153109 Merge pull request #83117 from Ninlives/netease-music-fix
netease-cloud-music: do not set QT_AUTO_SCREEN_SCALE_FACTOR
2020-03-22 14:47:12 -04:00
Matthew Bauer 082afb21f2 Merge pull request #79704 from rnhmjoj/powerline-fonts
powerline-fonts: install psf to share/consolefonts
2020-03-22 14:45:47 -04:00
Matthew Bauer bacccb7823 Merge pull request #80784 from enolan/fix-eatmydata
libeatmydata: fix launcher script - find shell library properly
2020-03-22 14:42:52 -04:00
Matthew Bauer b94300945a Merge pull request #75940 from davidtwco/wooting-init
wooting: init wootility, wooting-udev-rules and module
2020-03-22 02:03:52 -04:00
Matthew Bauer c08d6d55dc Merge pull request #82781 from DieGoldeneEnte/llvm10-rc4
llvmPackages_10: rc3 -> rc4 -> rc5, polly enabled by default
2020-03-22 02:00:41 -04:00
Matthew Bauer 81d84153c7 Merge pull request #82633 from kolbycrouch/master
retroarch: 1.8.1 -> 1.8.5
2020-03-21 23:49:01 -04:00
Matthew Bauer ed46adb48b retroarch/cores.nix: use correct license for gw
This should be zlib the license, not zlib the package.
2020-03-21 23:38:58 -04:00
Matthew Bauer a8a0cb147f retroarch: remove macOS app support
This is badly out of date so requires extra work to get working.

Anyway, you can still use it without the menu, with no problem.
2020-03-21 23:36:54 -04:00
Matthew Bauer 9d8d66baf5 nixos/nixpkgs.nix: Allow just using config in system (#80818)
* nixos/nixpkgs.nix: Allow just using config in system

This assertion requires system to work properly. We might not have
this in cases where the user just sets config and wants Nixpkgs to
infer system from that. This adds a default for when this happens,
using doubleFromSystem.

* parens
2020-03-21 23:23:24 -04:00
Matthew Bauer 6b95893a6d Merge pull request #81042 from KoviRobi/zhf-20.03-fix-noweb
noweb: fix installation of manpages, use placeholders
2020-03-21 23:21:19 -04:00
Matthew Bauer 0127594a93 Merge pull request #80778 from expipiplus1/restic-cross
restic: fix cross compilation
2020-03-21 23:18:51 -04:00
Matthew Bauer 4327049a1c Merge pull request #82708 from hamishmack/openssl-musl
openssl: Fix openssl build for x86_64-unknown-linux-musl
2020-03-21 23:10:53 -04:00
Matthew Bauer 293b16aae9 Merge remote-tracking branch 'origin/master' into retroarch-update 2020-03-21 23:01:45 -04:00
Matthew Bauer f094e132e2 retroarch/cores.nix: cleanup
- Avoid using overrides unless necessary
- Set platform and ARCH by default
- Don’t set dontConfigure unless absolutely necessary
- Use preBuild instead of overriding entire configurePhase
2020-03-21 23:01:01 -04:00
Matthew Bauer d513980ea6 retroarch: 1.8.4 -> 1.8.5 2020-03-21 22:59:18 -04:00
Matthew Bauer e1cab10dcd Revert " Fix init"
This reverts commit e68a4094d2.
2020-03-21 22:58:58 -04:00
Matthew Bauer 078b222dc6 Merge pull request #83010 from volth/patch-393
$toplevel/system: use kernel's architecture
2020-03-20 14:05:00 -04:00
Matthew Bauer bd15dfa21b Merge pull request #82853 from sepiabrown/patch-2
glib-networking for TLS/SSL network (https://) in xwidget
2020-03-18 13:48:35 -04:00
Matthew Bauer acb24b4cc4 lib/systems: Assume newlib when no kernel and no libc is provided
newlib is the default for most tools when no kernel is provided. Other
exist, but this seems like a safe default.

(cherry picked from commit 8009c20711)
2020-03-12 02:22:19 -04:00
Matthew Bauer 8d72e6bd5f util-linux: use $bin output for umount
This wasn’t updated when adding the bin output.
2020-03-06 07:14:20 +01:00
Matthew Bauer dfbe76a681 waf: move binary to $out/bin/
Originally this was just the executable, but this breaks nix-shell
usage. Instead, just do a normal directory.

Fixes #79909
2020-03-06 07:06:01 +01:00
Matthew Bauer b8102aa32e Merge pull request #81844 from lopsided98/gcc-separate-output-cross
gcc: place cross-compiled target libraries in lib output
2020-03-05 20:30:35 -05:00
Matthew BauerandFlorian Klink e0e4d591cc nixos/cage: init
Add a cage module to nixos. This can be used to make kiosk-style
systems that boot directly to a single application. The user (demo by
default) is automatically logged in by this service and the
program (xterm by default) is automatically started.

This is useful for some embedded, single-user systems where we want
automatic booting. To keep the system secure, the user should have
limited privileges.

Based on the service provided in the Cage wiki here:

https://github.com/Hjdskes/cage/wiki/Starting-Cage-on-boot-with-systemd

Co-Authored-By: Florian Klink <flokli@flokli.de>
2020-03-02 13:43:20 -08:00
Matthew Bauer 8009c20711 lib/systems: Assume newlib when no kernel and no libc is provided
newlib is the default for most tools when no kernel is provided. Other
exist, but this seems like a safe default.
2020-02-22 12:37:46 -05:00
Matthew Bauer 95f735008a Merge pull request #80107 from phryneas/fix-build-tools
androidenv build-tools: fix old versions under linux
2020-02-14 13:35:04 -05:00
Matthew Bauer ba30ee3389 Merge pull request #79708 from saschagrunert/unused-ldflags-var
cri-o: remove unused ldflags variable
2020-02-10 14:28:12 -05:00
Matthew Bauer e0595054e3 Merge pull request #79168 from helsinki-systems/fix/gnustep-base
gnustep/base: replace libbfd with binutils-unwrapped
2020-02-03 15:02:36 -05:00
Matthew Bauer fb36553584 Merge pull request #78397 from sternenseemann/uberwriter-bugfix
uberwriter: add shared-mime-info to environment and update
2020-01-28 14:44:08 -05:00
Matthew Bauer 3eb6e3f5ef v8: remove duplicate libs, cflags entries
This was an oversight, and unnecessary in the .pc file.
2020-01-28 11:37:15 -05:00
Matthew Bauer db29857eb3 Re-Revert "clang_7,clang_8,clang_9: fix compilation of HIP-code"
This reverts commit f14a4d60b7, and thus
applying 558af6fbc7.
2020-01-28 11:35:19 -05:00
Matthew Bauer f14a4d60b7 Revert "clang_7,clang_8,clang_9: fix compilation of HIP-code"
This reverts commit 558af6fbc7.

This was meant for staging. Will apply there.
2020-01-27 23:24:35 -05:00
Matthew Bauer d4ad868aaa Merge pull request #78308 from DieGoldeneEnte/clang-hip-patch
clang_7,clang_8,clang_9: fix compilation of HIP-code
2020-01-27 23:15:19 -05:00
Matthew Bauer 3a7fe07e3c Merge pull request #69057 from volth/ld-linux
add config.environment.ld-linux
2020-01-27 20:08:12 -05:00
Matthew Bauer 07db0b248c Merge remote-tracking branch 'obsidiansystems/work-on-multi-shellFor' 2020-01-17 18:00:27 -05:00
Matthew Bauer f23ad86d6f openssl: don’t separate debug info on useLLVM
fixes #77779
2020-01-15 13:16:10 -05:00
Matthew Bauer d7627dd2df Merge pull request #77520 from thefloweringash/libretro-snes9x-src
libretro.snes9x: 29b78d -> 04692e
2020-01-13 11:47:32 -05:00
Matthew Bauer 0ab7cf72c3 Merge pull request #77147 from hamishmack/email-sender-macos
perlPackages.EmailSender: Fix for macOS
2020-01-08 15:25:54 -05:00
Matthew Bauer 063935621c Merge pull request #77336 from matthewbauer/fix-missing-xmemdup-in-gnustep
gnustep/base: add libiberty to linker flags
2020-01-08 15:11:06 -05:00
Matthew Bauer 2c6eaef83e gnustep/base: add libiberty to linker flags
In https://github.com/NixOS/nixpkgs/issues/76927, we found that
xmemdup is missing when compiling some conftest for gnustep-base. It’s
unclear why this happens but it appears to be from the update to gcc9.
Adding libiberty gives us that symbol and fixes things. What’s less
clear is why this happens to begin with.

Fixes #76927
2020-01-08 15:05:57 -05:00
Matthew Bauer 4612d9cd57 Merge pull request #77243 from nomeata/joachim/wasmtime
wasmtime: 20191111 -> v0.8.0
2020-01-07 14:27:16 -05:00
Matthew Bauer 8316134618 Merge pull request #77218 from Abdillah/patch-1
androidenv.lldb: Fix libssl not found
2020-01-07 11:19:27 -05:00
Matthew Bauer ddcaa0cd2f Merge pull request #76842 from matthewbauer/add-doc-to-ghc-wrapper
haskell/with-packages-wrapper.nix: install "doc" outputs
2020-01-07 00:23:15 -05:00
Matthew Bauer 7743eba511 Merge pull request #76718 from matthewbauer/fix-etc-sconfigdir
linux-pam: set sconfigdir to /etc for usage at runtime
2020-01-07 00:22:43 -05:00
Matthew Bauer 93aabab760 haskell/with-packages-wrapper.nix: remove /bin symlink if it exists
The wrapper need a writable directory to work, so remove the symlink
to a read-only one if it occurs.
2020-01-06 18:25:50 -05:00
Matthew Bauer cc669a18fb Merge pull request #76669 from xbreak/clang-cmake-fix
clang_9: Correct ClangTargets-release.cmake
2020-01-06 15:42:34 -05:00
Matthew Bauer 04000331c1 Merge pull request #74284 from matthewbauer/ios-with-xcode-11
Update iOS for XCode 11
2020-01-03 15:35:41 -05:00
Matthew Bauer 9c1a2ac51e Merge remote-tracking branch 'origin/master' into ios-with-xcode-11 2020-01-03 15:34:20 -05:00
Matthew Bauer 8b41b16a9f cctools: fixup gnu-config detection 2020-01-03 15:20:55 -05:00
Matthew Bauer 6f8b2f3961 cctools: only add libtool on native builds
libtool is not really needed and it interferes with
updateAutotoolsGnuConfigScriptsHook. So remove it when
cross-compiling, but leave it in native to preserve hashes.
2020-01-03 15:20:54 -05:00
Matthew Bauer 010d2f4aa2 lib/systems: use newer ios sdk 2020-01-03 15:20:54 -05:00
Matthew Bauer 036cef9473 ghc: always use llvm with iOS
Even when building for the simulator.
2020-01-03 15:19:37 -05:00
Matthew Bauer 3432b1baa8 xcode: don’t use libstdc++ on iOS
Apple no longer ships with it, so best to avoid forcing it into use.
2020-01-03 15:19:34 -05:00
Matthew Bauer e915608618 haskell/with-packages-wrapper.nix: install "doc" outputs
We were previously just installing the "out" output which broke when
we recently changed to generating multiple outputs.

Fixes #76837
2020-01-02 16:12:46 -05:00
Matthew Bauer 81daa1e5dc Merge pull request #76546 from matthewbauer/nvidia-fix-udev-rules
nvidia: fix $ substitution in udev rules
2020-01-02 15:04:33 -05:00
Matthew Bauer 699e1b41f1 Merge pull request #76830 from ericnorris/master
Disable NS in emacs-nox
2020-01-02 12:38:04 -05:00
Matthew Bauer 13b0141486 powershell: set shellPath
Fixes #45830
2019-12-31 13:25:47 -05:00
Matthew Bauer ddce47c38e Merge pull request #76729 from mox-mox/master
Adding passthru to ion shell to allow using it as a login shell as ad…
2019-12-31 13:24:19 -05:00
Matthew Bauer f746d8eb6e linux-pam: set sconfigdir to /etc for usage at runtime
So users don’t need to override the $out/etc/security files, we need
to manually set this to /etc. Override it in the install phase so that
we still get the example $out/etc/security files .

Fixes #76713
2019-12-30 16:25:16 -05:00
Matthew Bauer b43479d49f nixos/nvidia: add nvidia-uvm-tools device
Related to https://bugs.launchpad.net/ubuntu/+source/nvidia-graphics-drivers-390/+bug/1767777
2019-12-30 13:15:10 -05:00
Matthew Bauer 6689a385d1 nvidia: fix $ substitution in udev rules
This fixes a harmless error from systemd-udevd that looks like:

  Dec 23 15:35:23 dellbook systemd-udevd[696]:
  /nix/store/iixya3ni5whybpq9zz1h7f4pyw7nhd19-udev-rules/99-local.rules:25
  Invalid value "..." for RUN (char 101: invalid substitution type),
  ignoring, but please fix it.

Using $$ fixes it using the escaping documented at https://www.freedesktop.org/software/systemd/man/udev.html.
2019-12-26 12:54:43 -05:00
Matthew Bauer 24f38780dd Merge pull request #68400 from angerman/feature/fix-gmp
[gmp] Fix shared windows cross compilation
2019-12-22 12:56:32 -06:00
Matthew Bauer a3b15e50ce Merge pull request #75702 from risicle/ris-allow-insecure-predicate-name-fix
allowInsecureDefaultPredicate: fix to use getName
2019-12-17 16:22:59 -05:00
Matthew Bauer b39bc2943b Merge pull request #74860 from alyssais/minijail
minijail: install .pc files and scoped_minijail.h
2019-12-17 14:48:02 -05:00
Matthew Bauer 2afbe7d87f Merge pull request #75788 from puckipedia/cups-dymo-fix
cups-dymo: fix build
2019-12-17 14:47:08 -05:00
Matthew Bauer a90d3d9e0c Merge pull request #75621 from gabibbo97/helm-completion
kubernetes-helm: Add shell completion
2019-12-17 14:45:29 -05:00
Matthew Bauer 8f3ca4ec16 Merge pull request #75157 from bergey/nano-fix-build-MacOS
nano: upstream patch fixes build on MacOS
2019-12-10 15:32:27 -05:00
Matthew Bauer ceb1e92173 Merge pull request #75107 from matthewbauer/disable-native-tests-john
Disable native tests for john the ripper
2019-12-06 15:32:04 -05:00
Matthew Bauer a36c36a87b john: update meta
- set platforms to unix
- add myself as maintainer
2019-12-06 10:47:29 -05:00
Matthew Bauer 73cf5d961b john: use proper configure flags
- need --disable-native-tests not --disable-native-macro
- --with-systemwide is better than -DJOHN_SYSTEMWIDE=1

Fixes #74918
2019-12-06 10:43:45 -05:00
Matthew Bauer 5f6b8d48e9 Merge pull request #74855 from matthewbauer/libffi-3.3
libffi: 3.2.1 -> 3.3
2019-12-03 14:45:02 -05:00
Matthew Bauer 49df3e3ea4 Merge pull request #74882 from lopsided98/grpc-armv6l
grpc: fix build on armv6l
2019-12-03 14:38:08 -05:00
Matthew Bauer 224737f0f7 Merge pull request #74625 from r-ryantm/auto-update/rgbds
rgbds: 0.3.8 -> 0.3.9
2019-12-03 13:11:30 -05:00
Matthew Bauer 00cdf80d6a ghc: don’t use gold when useLLVM = true
When using the llvm-based linker, we don’t have a .gold flavor to
pick. So just fall back to the normal “ld” command.
2019-12-03 11:15:20 -05:00
Matthew Bauer 7c1539baa6 libffi: update meta
- add myself as maintainer
- license is mit
2019-12-02 16:23:49 -05:00
Matthew Bauer 53a04a2df0 libffi: 3.2.1 -> 3.3 2019-12-02 16:21:09 -05:00
Matthew Bauer 162a935d3c Merge pull request #74226 from bhpdt/fix/idirafter-stdenv
stdenv: Fix gcc -idirafter shell glob in cc-wrapper
2019-12-02 13:41:28 -05:00
Matthew Bauer 099e7759f1 Merge pull request #73855 from OlivierMarty/i3blocks
i3blocks: unstable-2019-02-07 -> 1.5
2019-12-02 13:35:32 -05:00
Matthew Bauer 785a0e775e Merge pull request #73858 from kirelagin/multitime
multitime: init at 1.4
2019-12-02 13:35:13 -05:00
Matthew Bauer 18848aa605 Merge pull request #73820 from serokell/static-fixes
Fix static building for ocaml-ng
2019-12-02 13:34:41 -05:00
Matthew Bauer 0505c5125c Merge branch 'master' into static-fixes 2019-12-02 13:34:24 -05:00
Matthew Bauer f97746ba27 Merge pull request #74715 from baloo/baloo/no-x-libs/polkit
environment.noXlibs: do not pull gobject-introspection
2019-11-30 13:32:29 -06:00
Matthew Bauer fa383dcb7c cctools: fixup gnu-config detection
Use autoreconfHook instead of preConfigure autogen.sh. This avoids
getting the bad version of the gnu-config script and makes the newish
iOS triples work.
2019-11-27 10:04:32 -05:00
Matthew Bauer 848d4a08a0 cctools: readd ld-rpath-nonfinal patch
This patch is needed to build ghc, which adds -rpath flags for some
reason. Updated patch for newest cctools and reapplied.
2019-11-27 10:01:57 -05:00
Matthew Bauer 886fd8dfe8 Merge pull request #74125 from nomeata/joachim/wasmtime
wasmtime: 20191018 -> 20191111
2019-11-26 09:23:17 -06:00
Matthew Bauer e010c1b031 Merge pull request #74092 from veprbl/pr/applgrid_fix
applgrid: fix build
2019-11-25 22:22:48 -06:00
Matthew Bauer a6ea6e20cc Merge pull request #74223 from bhpdt/fix/irony-server
irony-server: Fix failing build with 1.4.0 cmake files
2019-11-25 22:18:54 -06:00
Matthew Bauer 9d56a06ff9 Merge pull request #73721 from virusdave/dnicponski/scratch/update_darwin_cctools
darwin.cctools: 895 -> 927.0.2
2019-11-25 21:01:20 -06:00
Matthew Bauer 08d6c4019d Merge remote-tracking branch 'origin/staging' into dnicponski/scratch/update_darwin_cctools 2019-11-25 22:00:13 -05:00
Matthew Bauer 0c6a0c817a cctools: only add libtool on native builds
libtool is not really needed and it interferes with
updateAutotoolsGnuConfigScriptsHook. So remove it when
cross-compiling, but leave it in native to preserve hashes.
2019-11-25 21:57:56 -05:00
Matthew Bauer f0f4f90847 libtapi: bump to 1000.10.8 2019-11-25 21:57:39 -05:00
Matthew Bauer 1c3deb9642 Merge pull request #73084 from lopsided98/llvm-7-armv6l
llvm_7: disable failing test on armv6l
2019-11-13 17:20:13 -05:00
Matthew Bauer 56c309f953 Merge pull request #73083 from lopsided98/llvm-9-arm
llvm_9: disable failing tests on 32-bit ARM
2019-11-13 17:19:45 -05:00
Matthew Bauer b2a7c252c0 Merge pull request #71007 from moaxcp/ttygif
ttygif init at 1.4.0
2019-11-12 12:52:38 -05:00
Matthew Bauer 93fd7d8888 Merge pull request #73291 from obsidiansystems/fix-gcj
GCC 6: Fix java support
2019-11-12 11:10:34 -05:00
Matthew Bauer 85a94a2578 Merge pull request #73020 from lodi/libco
libco-canonical: fix pkgconfig includedir
2019-11-08 15:04:29 -05:00
Matthew Bauer 5e955e3ec4 Merge pull request #70172 from eadwu/init/update-systemd-resolved
update-systemd-resolved: init at 1.3.0
2019-11-07 17:51:47 -05:00
Matthew Bauer ba205556e3 Merge pull request #69843 from doronbehar/units_cur
units: Add units_cur python script to $out
2019-11-07 17:39:59 -05:00