Commit Graph

12906 Commits

Author SHA1 Message Date
github-actions[bot]
55db28db36
Merge staging-next into staging 2022-04-09 18:01:56 +00:00
Alexander Bantyev
7bbf0f0ec9
Merge pull request #166756 from ilya-fedin/mate-fixes
mate: fix inactive settings and make session work without display managers
2022-04-09 17:47:48 +03:00
Artturi
aab655c554
Merge pull request #166997 from Artturin/udiskss 2022-04-09 16:09:11 +03:00
github-actions[bot]
f303d4de3b
Merge staging-next into staging 2022-04-09 12:02:07 +00:00
Frederik Rietdijk
1d63f89caa cudaPackages: overhaul of how we package cuda packages
There are many different versions of the `cudatoolkit` and related
cuda packages, and it can be tricky to ensure they remain compatible.

- `cudaPackages` is now a package set with `cudatoolkit`, `cudnn`, `cutensor`, `nccl`, as well as `cudatoolkit` split into smaller packages ("redist");
- expressions should now use `cudaPackages` as parameter instead of the individual cuda packages;
- `makeScope` is now used, so it is possible to use `.overrideScope'` to set e.g. a different `cudnn` version;
- `release-cuda.nix` is introduced to easily evaluate cuda packages using hydra.
2022-04-09 08:50:22 +02:00
github-actions[bot]
c57af6e8b0
Merge staging-next into staging 2022-04-08 18:11:40 +00:00
Sandro
45b9690a75
Merge pull request #147975 from andersk/mozillavpn 2022-04-08 15:32:45 +02:00
github-actions[bot]
a36cec68d4
Merge staging-next into staging 2022-04-08 12:02:01 +00:00
Alyssa Ross
c099ec6aff nixos/klogd: remove
This module only has an effect for ancient kernel versions we don't
support.
2022-04-08 09:56:09 +00:00
github-actions[bot]
fef4299129
Merge staging-next into staging 2022-04-07 18:01:52 +00:00
pennae
3838b7e07e
Merge pull request #166894 from CameronNemo/nixos-mod-envoy
nixos/envoy: init
2022-04-07 16:23:12 +00:00
Cameron Nemo
1b4b16e1bd nixos/envoy: init 2022-04-07 14:43:53 +00:00
Martin Weinelt
cc774b5792 Merge remote-tracking branch 'origin/staging-next' into staging 2022-04-07 12:12:57 +02:00
github-actions[bot]
42ec765901
Merge master into haskell-updates 2022-04-06 00:11:25 +00:00
github-actions[bot]
3dc8bd98b9
Merge staging-next into staging 2022-04-06 00:02:41 +00:00
pennae
04ce3788d3
Merge pull request #167381 from jonringer/qtile-module-fixes
nixos/qtile: fixes
2022-04-05 22:08:56 +00:00
sternenseemann
fb2fc3b4a4 Merge remote-tracking branch 'origin/master' into haskell-updates 2022-04-05 21:21:42 +02:00
Jonathan Ringer
f8002a6687
nixos/qtile: expose package option 2022-04-05 12:11:27 -07:00
Vladimír Čunát
b4729bad3d
Merge #165406: staging-next 2022-03-23 2022-04-05 20:34:08 +02:00
Jonathan Ringer
c2828e8479
nixos/qtile: expose unwrapped package to systemPackages 2022-04-05 10:43:15 -07:00
Robert Hensing
39e0bd705b
Merge pull request #165259 from Luflosi/ipfs-recursiveUpdate
nixos/ipfs: use lib.recursiveUpdate instead of // operator
2022-04-05 19:16:39 +02:00
Martin Weinelt
bf1914e12a Merge remote-tracking branch 'origin/staging-next' into staging 2022-04-05 04:05:02 +02:00
github-actions[bot]
789aea7658
Merge master into haskell-updates 2022-04-05 00:11:09 +00:00
github-actions[bot]
5844b1c2fa
Merge master into staging-next 2022-04-04 18:01:27 +00:00
Bjørn Forsman
c1af79c69d nixos/ethminer: only pull in nvidia_x11 when needed
Only people using CUDA need it.
2022-04-04 19:27:20 +02:00
github-actions[bot]
17eb9da14b
Merge staging-next into staging 2022-04-04 12:06:26 +00:00
github-actions[bot]
ee8677862d
Merge master into staging-next 2022-04-04 12:01:25 +00:00
Bjørn Forsman
966953354c nixos/ethminer: fix option types for maxPower, recheckInterval
Neither power nor time intervals can be negative, let's use unsigned
int.
2022-04-04 11:50:24 +02:00
Bjørn Forsman
5e38d36a6b nixos/ethminer: only pull in cudatoolkit when needed 2022-04-04 11:50:24 +02:00
github-actions[bot]
493d6516dd
Merge master into haskell-updates 2022-04-04 00:11:26 +00:00
Martin Weinelt
f95a3d1140 Merge remote-tracking branch 'origin/staging-next' into staging 2022-04-04 00:46:25 +02:00
github-actions[bot]
c46200d454
Merge master into staging-next 2022-04-03 18:01:07 +00:00
Lassulus
f465a5cdf8
Merge pull request #137335 from dsg22/feature-jupyter-create-system-user
jupyter: Create jupyter user as system user
2022-04-03 18:22:04 +01:00
Martin Weinelt
eb40e8633a
Merge pull request #167027 from helsinki-systems/drop/broken 2022-04-03 18:29:26 +02:00
Guillaume Girol
23bcd51fd5
Merge pull request #161075 from symphorien/collectd-interval
nixos/collectd: put extraconfig before plugins
2022-04-03 15:59:49 +00:00
Martin Weinelt
f2a00b4079
Merge pull request #163658 from dminuoso/kea-changes 2022-04-03 17:44:19 +02:00
Victor Nawothnig
799bda94db nixos/kea: Allow specifying custom config file 2022-04-03 17:34:00 +02:00
Guillaume Girol
44a3d91e5f nixos/collectd: put extraconfig before plugins
this is necessary to override the global option Interval.
If set after the plugins, it has no effect.
2022-04-03 17:25:26 +02:00
ajs124
eb13e249f0 openfire: remove after being marked broken for over two years
It was marked in commit 567c1a360f by Michael Raskin on 2017-01-04 (commited on 2017-01-04)
2022-04-03 16:14:18 +01:00
Guillaume Girol
f9fe536c8f
Merge pull request #165873 from symphorien/rkjnsn-master
xfce4-screensaver: init at 4.16.0
2022-04-03 15:09:08 +00:00
sternenseemann
103d171526
Merge pull request #166548 from sternenseemann/fix-ghclibdir-computation
[haskell-updates] ghcWithPackages: fix ghclibdir computation with variantSuffix
2022-04-03 14:22:34 +02:00
Artturin
4d49c7e6d8 nixos/udisks2: add freeform settings 2022-04-03 09:40:53 +03:00
Alyssa Ross
8ba23e138d
Merge remote-tracking branch 'nixpkgs/staging-next' into staging
Conflicts:
	pkgs/development/libraries/zlib/default.nix
	pkgs/development/lua-modules/overrides.nix
2022-04-02 16:45:48 +00:00
github-actions[bot]
66754ae952
Merge master into staging-next 2022-04-02 12:01:10 +00:00
Jan Solanti
f665340b6c pipewire: 0.3.48 -> 0.3.49 2022-04-02 12:10:35 +02:00
github-actions[bot]
fd5d77aa66
Merge master into staging-next 2022-04-02 06:01:21 +00:00
github-actions[bot]
8b4f11bb87
Merge master into staging-next 2022-04-02 00:02:09 +00:00
Florian Klink
c57c5c42a4 prometheus-bird-exporter: update birdSocket default path
a5276e1fbd updated bird to use
/run/bird/bird.ctl, but didn't update the default used for
prometheus-bird-exporter.

Reported-In: https://github.com/NixOS/nixpkgs/pull/161193#issuecomment-1086228985
2022-04-01 22:59:48 +02:00
P. R. d. O
eeb3206a29 nixos/jenkinsSlave: install java
Installs Java into the Jenkins agent and allows specifying the JDK/JRE package to use. This is necessary as Jenkins verifies if the agent contains Java installed through the java -fullversion command, which if not, the connection will fail.
2022-04-01 22:11:18 +02:00
github-actions[bot]
27e49cc5a4
Merge master into staging-next 2022-04-01 18:01:22 +00:00