Commit Graph
100 Commits
Author SHA1 Message Date
Graham Christensen ff42f461f0 Merge pull request #93161 from cole-h/rm-tmp
Remove tmp file from tarball job
2020-07-15 07:31:31 -04:00
Graham Christensen 0c10b75288 Merge pull request #93110 from grahamc/systemd-executable
stage-2: parameterized systemd executable
2020-07-14 15:45:00 -04:00
Graham Christensen 64dd9c1d6a stage-2: parameterized systemd executable
This lets users do sneaky things before systemd starts, and
permanently affect the environment in which systemd runs. For example,
we could start systemd in a non-default network namespace by setting
the systemdExecutable to a wrapper script containing:

    #!/bin/sh
    ip netns add virtual
    touch /var/run/netns/physical
    mount -o bind /proc/self/ns/net /var/run/netns/physical
    exec ip netns exec virtual systemd

_note: the above example does literally work, but there are unresolved
problems with udev and dhcp._
2020-07-14 13:18:14 -04:00
Graham Christensen cb330dafd5 Merge pull request #91908 from purcell/libpromhttp
libpromhttp: init at 0.1.1, build in combination with libprom
2020-07-08 21:24:23 -04:00
Graham Christensen 84ecbc9a19 libvirtd: don't start libvirtd-tcp.socket by default
Per upstream:

> libvirtd-tcp.socket - the unit file corresponding to the TCP 16509
> port for non-TLS remote access. This socket should not be configured
> to start on boot until the administrator has configured a suitable
> authentication mechanism.
2020-07-08 19:50:23 -04:00
Graham Christensen 8d2179a9c6 Merge pull request #91713 from delroth/diffoscope-149
diffoscope: 148 -> 150
2020-07-06 10:29:23 -04:00
Graham Christensen 353446511b Merge pull request #92456 from marenz2569/fix-firestarter-v1.7.4-hash
firestarter: v1.7.4 fix commit hash
2020-07-06 10:15:39 -04:00
Graham Christensen 9d335706a0 Merge pull request #92092 from ElvishJerricco/zfs-encryption-systemd-ask-password
ZFS: Update description for requestEncryptionCredentials
2020-07-02 17:25:53 -04:00
Graham Christensen 105e63469d Merge pull request #91344 from ElvishJerricco/zfs-encryption-systemd-ask-password
ZFS: Ask for stage 2 encryption passwords using systemd-ask-password
2020-07-02 14:15:18 -04:00
Graham Christensen 38060ee399 Merge pull request #91666 from Atemu/undervolt-warning
undervolt: clarify that the service is unofficial
2020-06-27 08:39:55 -04:00
Graham Christensen 00aebe9011 Merge pull request #89204 from andersk/musescore
musescore: Add missing inputs qtgraphicaleffects, qtquickcontrols2
2020-06-23 16:23:41 -04:00
Graham Christensen 740fa4dc5b Merge pull request #91165 from NixOS/revert-91160-nixos-hardware-merge
Revert "Merge nixos-hardware into nixpkgs under `/nixos/hardware`"
2020-06-20 08:34:57 -04:00
Graham Christensen 5d0725a063 Revert "Merge nixos-hardware into nixpkgs under /nixos/hardware" 2020-06-20 08:21:15 -04:00
Graham Christensen ac8f8bd752 Merge pull request #90336 from bachp/plex-1.19.4.2935
plex: 1.19.2.2737 -> 1.19.4.2935
2020-06-19 11:04:36 -04:00
Graham Christensen 38e990d520 Merge pull request #90673 from grahamc/google-chrome-path
google-chrome: add coreutils to PATH
2020-06-17 13:49:24 -04:00
Graham Christensen 5609f90c50 Merge pull request #90672 from grahamc/xdg-util-path
xdg_utils: xdg-open: add $out to PATH
2020-06-17 13:49:09 -04:00
Graham Christensen e8ddc0cfa7 google-chrome: add coreutils to PATH
google-chrome-stable can't run without coreutils in PATH
2020-06-17 08:32:34 -04:00
Graham Christensen 4b5880f015 xdg_utils: xdg-open: add $out to PATH
Otherwise, xdg-open cannot call xdg-mime and this does not work:

    "${pkgs.xdg_utils}/bin/xdg-open"
2020-06-17 08:27:55 -04:00
Graham Christensen 5a17473f0a Merge pull request #90192 from kraem/kraem/pkgs/facetimehd/remove-nixpkgs-patch
facetimehd: remove patch in nixpkgs, patched upstream
2020-06-12 11:46:35 -04:00
Graham Christensen 77dddf6a9d Merge pull request #90180 from kraem/kraem/pkgs/facetimehd/2020-04-16
facetimehd: 2019-12-10 -> 2020-04-16
2020-06-12 07:59:56 -04:00
Graham Christensen 80b39add79 Merge pull request #90095 from mgdm/add-rtl-ais
rtl-ais: init at 0.8.1
2020-06-11 16:15:04 -04:00
Graham Christensen 90c533d649 Merge pull request #89827 from romildo/upd.ibm-plex
ibm-plex: 4.0.2 -> 5.0.0
2020-06-09 09:24:56 -04:00
Graham Christensen ac44b7f958 Merge pull request #89797 from dali99/dandellion-mumble-1.3.1
mumble: 1.3.0 -> 1.3.1
2020-06-09 06:55:34 -04:00
Graham Christensen 4512cd1385 Merge pull request #60174 from exarkun/patch-2
Fix the rootPartitionUUID description
2020-06-02 08:54:51 -04:00
Graham Christensen fb587d7bb5 Merge pull request #85445 from manveru/crystal-all-llvm
crystal: use llvm 10 exclusively
2020-05-07 07:49:03 -04:00
Graham Christensen c2d814880a Merge pull request #86969 from prusnak/wxsqlite
wxsqlite3: 3.3.1 -> 4.5.1
2020-05-07 07:11:42 -04:00
Graham Christensen fadb044579 Merge pull request #86059 from AmineChikhaoui/20.03-amis
ec2-amis.nix: add NixOS 20.03 images
2020-04-26 10:01:56 -04:00
Graham Christensen a2e9965d74 Merge pull request #82414 from AmineChikhaoui/update-ec2-amis-19-09
ec2 amis: update 19.09 AMIs
2020-04-25 18:15:41 -04:00
Graham Christensen e42312e354 Merge pull request #85183 from Xe/zig-0.6.0
zig: upgrade to 0.6.0
2020-04-17 15:17:45 -04:00
Graham Christensen be9cc04925 Merge pull request #85453 from bqv/patch-1
sv-kalendar: fix meta
2020-04-17 14:16:34 -04:00
Graham Christensen b76e3eab18 Merge pull request #84153 from colemickens/nixpkgs-obs-v4lsink
obs-v4l2sink: init at unstable-20181012
2020-04-17 08:29:30 -04:00
Graham Christensen ff80d9c19b Merge pull request #77500 from Emantor/pkg/microcom
microcom: init at 2019.01.0
2020-04-13 07:46:07 -04:00
Graham Christensen 56c8b7eeda Merge pull request #84946 from bqv/nftables
nixos/nftables: fix typo in ruleset example
2020-04-12 09:38:55 -04:00
Graham Christensen 35d8514a91 Merge pull request #81848 from grahamc/nested-specialisation
specialisation: replace nesting with named configurations
2020-04-12 08:56:11 -04:00
Graham Christensenandworldofpeace ec2d28e323 specialisation: replace nesting with named configurations
Co-authored-by: worldofpeace <worldofpeace@protonmail.ch>
2020-04-12 08:12:50 -04:00
Graham Christensen ab931c607b Merge pull request #84732 from cleverca22/fix-rpi-platforms
device-tree_rpi: fix platforms
2020-04-08 12:43:30 -04:00
Graham Christensen 2bf8a722d5 Merge pull request #83249 from bennofs/fix-nixos-aarch64-eval-master
nixos/release-combined.nix: fix tested/supportedSystems (master version of #82886)
2020-04-08 08:50:47 -04:00
Graham Christensen eb036df54a Merge pull request #84620 from cleverca22/fix-kafka-test
nixos: kafka test: fix building for other arches
2020-04-07 12:31:56 -04:00
Graham Christensen 65d3a18576 Merge pull request #84387 from kraem/fix/facetimehd-linux-5.6
facetimehd: update src to build with linux >= 5.6
2020-04-05 16:28:50 -04:00
Graham Christensen be353eb83a Merge pull request #84369 from cleverca22/fix-k3s
k3s: fix https://hydra.nixos.org/build/116132269
2020-04-05 15:07:51 -04:00
Graham Christensen 4d226bad77 Merge pull request #83600 from Ma27/hydra-two-stage-deploy
hydra: 2020-02-06 -> 2020-03-{24,27}
2020-03-28 19:18:10 -04:00
Graham Christensen 4c94930554 Merge pull request #83235 from helsinki-systems/upd/memcached
memcached: 1.5.22 -> 1.6.2
2020-03-24 21:02:27 -04:00
Graham Christensen 66222ad555 Merge pull request #76824 from puzzlewolf/grandorgue/init
grandorgue: init at 0.3.1-r2333
2020-03-24 09:59:51 -04:00
Graham Christensen 28cb73749b Merge pull request #82696 from bhipple/u/ami
nixos-ami: update nvme_core.io_timeout for linux kernel >= 4.15
2020-03-22 07:18:53 -04:00
Graham Christensen 7f0a2998ef Merge pull request #82941 from flokli/systemd-network-link-no-networkd-without-lib-pushdown
nixos/systemd: apply .link even when networkd is disabled (without the lib refactor this time)
2020-03-19 09:53:38 -04:00
Graham Christensen 5e57beab9c Merge pull request #82051 from NixOS/arm-bootstrap
stdenv: update ARM bootstrap tarballs
2020-03-16 19:36:00 -04:00
Graham ChristensenandCole Helbling 6b361c3a31 armv{5tel,6l,7l}: bootstrap-files: quote URLs for rfc-45
Co-authored-by: Cole Helbling <cole.e.helbling@outlook.com>
2020-03-16 19:04:39 -04:00
Graham Christensen 11b54adeac armv{5tel,6l,7l}: update bootstrap tools after #80497 2020-03-16 18:11:59 -04:00
Graham Christensen 39aac70d74 pythonMinimal: don't include site-customise
Experimenting with patching the site-customize file causes mass
rebuilds for no reason.
2020-03-14 15:02:51 +01:00
Graham Christensen 244178e166 Merge pull request #82006 from emilazy/enable-linux-hardened-ia32-emulation
linuxPackages_{,_latest,_testing}_hardened: enable 32-bit emulation
2020-03-14 09:20:58 -04:00
Graham Christensen 10f625b3d2 Merge pull request #81402 from mmilata/firejail-example
nixos/firejail: add example for wrappedBinaries
2020-03-11 20:28:35 -04:00
Graham Christensen 47a7741cb2 Merge pull request #80497 from lopsided98/bootstrap-libssp
make-bootstrap-tools: add libssp to allow stack protector to work
2020-03-07 17:51:09 -05:00
Graham Christensen b6f8e00060 Merge pull request #80696 from deshaw/contrib/patroni
patroni: init at 1.6.4
2020-02-25 09:55:36 -05:00
Graham Christensen 75f604eb2c nixos release process: use rev-list --count like Hydra does. 2020-02-22 09:28:03 -05:00
Graham Christensen 4d66792aac Merge pull request #80446 from asymmetric/patchwork-3.17.3
ssb-patchwork: 3.17.2 -> 3.17.4
2020-02-21 09:36:28 -05:00
Graham Christensen f3f836bdc2 Merge pull request #80629 from grahamc/alacritty-xdg-open-again
alacritty: Correct xdg-open behavior
2020-02-20 08:41:14 -05:00
Graham Christensen a905deb826 alacritty: Correct xdg-open behavior 2020-02-20 08:12:47 -05:00
Graham Christensen ddd09101c5 Merge pull request #79967 from grahamc/nixos-enter-fd2
nixos-enter: redirect to fd2 instead of a file named /dev/stderr
2020-02-13 11:39:35 -05:00
Graham ChristensenandMichael Bishop 2d42fc240c nixos-enter: redirect to fd2 instead of a file named /dev/stderr
In some cases, /dev/stderr may not point to a sensible location. For
example, running nixos-enter inside a systemd unit where the unit's
StandardOutput and StandardError are set to be sockets. In these
cases, this line would fail.

Piping to fd2 directly works just as well, even under strange and
twisted executions.

Co-authored-by: Michael Bishop <michael.bishop@iohk.io>
2020-02-12 21:18:27 -05:00
Graham Christensen 943516a16a Merge pull request #79262 from tilpner/sudo-update
sudo: 1.8.30 -> 1.8.31
2020-02-05 09:37:22 -05:00
Graham Christensen ab94e9a83a Merge pull request #77565 from NilsIrl/wlrobs_2020
obs-wlrobs: 20191008 -> 20200111
2020-01-25 16:09:04 -05:00
Graham Christensen ebb644a980 Merge pull request #76585 from serokell/mkaito/amazon-userdata-multiple-channels
virtualization/amazon-init: log multiple nix channels, fix nix path.
2020-01-22 19:02:44 -05:00
Graham Christensen da9c031024 Merge pull request #77433 from curiousleo/patch-2
Document how to backport a change into a release channel
2020-01-20 08:35:33 -05:00
Graham Christensen 14aca32d26 Merge pull request #77888 from kraem/master
facetimehd: unstable-2016-10-09 -> unstable-2019-12-10 for kernels > 4.8
2020-01-19 15:44:48 -05:00
Graham Christensen 63dd084e4e Merge pull request #77768 from dhess/short-url-fix
Replace short URL from #63103 with full URL.
2020-01-15 14:35:11 -05:00
Graham Christensen 40e18bc75e Merge pull request #77773 from mrkkrp/buildkite-agent-fixup
Buildkite agent fixup
2020-01-15 12:35:34 -05:00
Graham Christensen 6ed0b0a86f Merge pull request #77683 from jtojnar/prompt-no-select
doc: Make callout marks & prompts unselectable
2020-01-14 14:39:52 -05:00
Graham Christensen a7635ad8b5 Merge pull request #77536 from lovesegfault/copying-2020
COPYING: include 2020
2020-01-11 18:21:39 -05:00
Graham Christensen 85bb15a662 Merge pull request #77530 from grahamc/python3/diceware
diceware: pythonPackages -> python3Packages
2020-01-11 18:03:19 -05:00
Graham Christensen 062615d96a diceware: pythonPackages -> python3Packages 2020-01-11 17:10:51 -05:00
Graham Christensen aafb982e03 Merge pull request #75438 from avnik/wine-update
wine: 4.0.2 -> 4.0.3, 4.17 -> 4.21
2020-01-11 17:06:55 -05:00
Graham Christensen 5a437278d0 Merge pull request #77458 from emilazy/tor-browser-bundle-bin-9.0.4
tor-browser-bundle-bin: 9.0.3 -> 9.0.4
2020-01-10 13:59:20 -05:00
Graham Christensen b1e9876a4a Merge pull request #76792 from freepotion/ivan-add-desktop-item
ivan: add icon and desktop item
2020-01-08 20:24:40 -05:00
Graham Christensen 3de5266b25 Merge pull request #77327 from curiousleo/toplevel-clippy
clippy: expose as top-level package
2020-01-08 12:13:51 -05:00
Graham Christensen 74be06649a Merge pull request #77244 from turboMaCk/gcolor2-sha1-to-sha256
gcolor2: sha1 -> sha256
2020-01-07 12:46:44 -05:00
Graham Christensen e0470e11c7 Merge pull request #76890 from LnL7/nix-gcc-8
nix: build using gcc8
2020-01-03 11:40:57 -05:00
Graham Christensen d08fc1a002 Merge pull request #76852 from lovesegfault/fix-manual-boot-console
nixos-manual: boot.extraTTYs -> console.extraTTYs
2020-01-02 20:28:45 -05:00
Graham Christensen 45a1974ab4 Merge pull request #76846 from lovesegfault/gegl-no-flaky-tests
gegl: remove flaky test
2020-01-02 18:50:03 -05:00
Graham Christensen 848a258c02 maintainer-list: cypherpunk2140 is now known as stefan-mihaila (github ID matches) 2019-12-23 22:40:43 -05:00
Graham Christensen 0afebfeb5a maintainer list: lattfein account was deleted
See: https://github.com/NixOS/nixpkgs/pull/69007 where this was added
but is now owned by a ghost.

Possibly the username lattfein (currently github ID 56827487) is
owned by the same person, but we should confirm before adding the
GitHub ID back.
2019-12-23 21:59:39 -05:00
Graham Christensen 3ec6f15997 maintainer-list: add back users unfairly removed due to missing github IDs 2019-12-23 21:52:24 -05:00
Graham Christensen 054633c965 Merge pull request #76331 from grahamc/fixup-user-ids
maintainter-list: fixup stringly user IDs
2019-12-23 19:05:42 -05:00
Graham Christensen d891abdc05 maintainter-list: fixup stringly user IDs 2019-12-23 18:42:42 -05:00
Graham Christensen b0a78e25bf Merge pull request #75719 from manveru/crystal-compiled-closure-size
crystal: reduce closure size of compiled exes by splitting outputs
2019-12-19 19:11:58 -05:00
Graham Christensen 35b56558a0 Merge pull request #75910 from grahamc/python3/hplip
hplip: python2 -> python3
2019-12-19 08:19:30 -05:00
Graham Christensen a52749e797 gnome2.GConf: python2 -> python3
Borrowing fedora's 2to3 trick:
https://src.fedoraproject.org/rpms/GConf2/blob/master/f/GConf2.spec#_90

(thank you, worldofpeace!)
2019-12-19 09:25:22 +01:00
Graham Christensen 821d50e304 hplip: add dbus-python to the deps 2019-12-18 23:12:23 -05:00
Graham Christensen 34e63b4615 hplip: python2 -> python3
Tested with a local HP printer
2019-12-18 23:12:19 -05:00
Graham Christensen 5782c395d3 Merge pull request #75916 from grahamc/python3/qtbase
qt5.qtbase: python2 -> python3
2019-12-18 22:59:09 -05:00
Graham Christensenandworldofpeace ef96a4ad78 qt5.qtbase: python2 -> python3
The only python reference in qtbase's dev output is a python script
which imports print from __future__ (mkspecs/features/uikit/devices.py).
It's not clear whether it depends on python or it just provides a python
script. But I believe it's still good to have in buildInputs so it has
a proper shebang.

Co-authored-by: worldofpeace <worldofpeace@protonmail.ch>
2019-12-18 21:47:05 -05:00
Graham Christensen 4e421aebfe kdeFrameworks.ki18n: python2 -> python3
Upstream has support: https://github.com/KDE/ki18n/blame/8f84d19aad04b2a925f2373ad26323bb8324b982/cmake/KF5I18nMacros.cmake.in#L34
2019-12-18 20:29:47 -05:00
Graham Christensen e19e95d86d mailutils: 3.2 -> 3.8 2019-12-18 20:05:57 -05:00
Graham Christensen 529cd9020f Merge pull request #75825 from grahamc/slack
slack: add xdg_utils to the PATH
2019-12-17 16:03:44 -05:00
Graham Christensen 64453c8dbd Merge pull request #75781 from grahamc/dockertools/remove-implementation-detail-layers
dockertools.buildLayeredImage: remove implementation detail layers
2019-12-17 16:03:11 -05:00
Graham Christensen 7e929390ae slack: add xdg_utils to the PATH
Otherwise it cannot log in to new workspaces.
2019-12-17 11:56:46 -05:00
Graham Christensen 75b8f3820d Merge pull request #75779 from grahamc/dockertools/fixup-max-layers
dockerTools.buildLayeredImage: update maxlayers from 24 to 100 to match documentation
2019-12-16 14:11:36 -05:00
Graham Christensen 2c4dff6ef2 Merge pull request #75780 from grahamc/dockertools/mark-api-stable
dockerTools: the API has basically never changed
2019-12-16 14:11:17 -05:00
Graham Christensen c3186349b7 Merge pull request #75778 from grahamc/dockertools/example-drop-unneeded-contents
docker examples: Drop unneeded contents list
2019-12-16 13:34:34 -05:00
Graham Christensen 310a028a0c dockerTools: the API has basically never changed 2019-12-16 13:18:28 -05:00
Graham Christensen 9c02760855 dockerTools.buildLayeredImage: update maxlayers from 24 to 100 to match documentation
mkManyPureLayers already was changed, and this function was not updated.
2019-12-16 13:14:21 -05:00