git.iko.soy/typeable/nixpkgs
on master help sign in
Merge branch 'master' into staging-next

Conflicts: pkgs/development/python-modules/gradient-utils/default.nix pkgs/development/python-modules/gradient/default.nix

commit477540469ecaa78e0f5a90d6a2479a3e3a521f4e authorDmitry Kalinkin <dmitry.kalinkin@gmail.com> dateSat 8 Jan 2022, 02:39 (5 years ago) parentfe00d4597864e9
84 files changed+937−394
doc/builders/special/mkshell.section.md+26−6 maintainers/maintainer-list.nix+13 nixos/modules/installer/sd-card/sd-image-riscv64-qemu.nix+32 nixos/modules/installer/sd-card/sd-image-x86_64.nix+27 nixos/modules/installer/sd-card/sd-image.nix+1−1 nixos/modules/module-list.nix+1 nixos/modules/profiles/all-hardware.nix+2−2 nixos/modules/services/cluster/kubernetes/addon-manager.nix+1 nixos/modules/services/cluster/kubernetes/addons/dns.nix+2 nixos/modules/services/cluster/kubernetes/apiserver.nix+1 nixos/modules/services/cluster/kubernetes/controller-manager.nix+5−4 nixos/modules/services/cluster/kubernetes/default.nix+3−6 nixos/modules/services/cluster/kubernetes/flannel.nix+2 nixos/modules/services/cluster/kubernetes/kubelet.nix+5−6 nixos/modules/services/cluster/kubernetes/pki.nix+6−5 nixos/modules/services/cluster/kubernetes/proxy.nix+5−4 nixos/modules/services/cluster/kubernetes/scheduler.nix+5−4 nixos/modules/services/desktops/gnome/gnome-settings-daemon.nix+4−18 nixos/modules/services/desktops/pipewire/wireplumber.nix+41 nixos/modules/system/boot/loader/generic-extlinux-compatible/default.nix+18−1 nixos/modules/system/boot/loader/generic-extlinux-compatible/extlinux-conf-builder.sh+9−3 nixos/tests/boot.nix+40−4 nixos/tests/kubernetes/base.nix−7 pkgs/applications/blockchains/go-ethereum/default.nix+3−3 pkgs/applications/graphics/feh/default.nix+2−2 pkgs/applications/misc/obinskit/default.nix+5−5 pkgs/applications/networking/browsers/chromium/upstream-info.json+8−8 pkgs/applications/networking/cluster/terraform-providers/default.nix+5−1 pkgs/applications/networking/cluster/terraform-providers/libvirt/default.nix−56 pkgs/applications/networking/cluster/terraform-providers/providers.json+9 pkgs/applications/office/timedoctor/default.nix+1−1 pkgs/applications/science/logic/lean/default.nix+3−3 pkgs/applications/science/math/gmsh/default.nix+4−4 pkgs/applications/window-managers/dwm/default.nix+2−2 pkgs/build-support/mkshell/default.nix+16−11 pkgs/data/themes/graphite/default.nix+87 pkgs/development/compilers/go/1.17.nix+2−2 pkgs/development/libraries/lensfun/default.nix+3−3 pkgs/development/libraries/libcamera/default.nix+18−4 pkgs/development/libraries/ncurses/default.nix+28−31 pkgs/development/libraries/opencv/4.x.nix+21−1 pkgs/development/libraries/pipewire/default.nix+16−30 pkgs/development/libraries/pipewire/wireplumber.nix+82 pkgs/development/python-modules/django-allauth/default.nix+2−2 pkgs/development/python-modules/django-oauth-toolkit/default.nix+43−7 pkgs/development/python-modules/django_guardian/default.nix+2−2 pkgs/development/python-modules/gql/default.nix+77 pkgs/development/python-modules/gradient-utils/default.nix+16−15 pkgs/development/python-modules/gradient/default.nix+13−6 pkgs/development/python-modules/makefun/default.nix+2−2 pkgs/development/python-modules/oauthlib/default.nix+20−11 pkgs/development/python-modules/pydub/default.nix+24−13 pkgs/development/python-modules/pylgnetcast/default.nix+2−2 pkgs/development/python-modules/pynetbox/default.nix+2−2 pkgs/development/python-modules/pytest-cases/default.nix+2−2 pkgs/development/tools/kubepug/default.nix+8−6 pkgs/development/tools/kubepug/skip-external-network-tests.patch+12 pkgs/development/tools/rust/cargo-llvm-lines/default.nix+3−3 pkgs/misc/uboot/default.nix+20 pkgs/misc/vscode-extensions/default.nix+9−4 pkgs/misc/vscode-extensions/terraform/default.nix+2−2 pkgs/os-specific/linux/kernel/hardened/patches.json+15−15 pkgs/os-specific/linux/kernel/linux-4.14.nix+2−2 pkgs/os-specific/linux/kernel/linux-4.19.nix+2−2 pkgs/os-specific/linux/kernel/linux-4.4.nix+2−2 pkgs/os-specific/linux/kernel/linux-4.9.nix+2−2 pkgs/os-specific/linux/kernel/linux-5.10.nix+2−2 pkgs/os-specific/linux/kernel/linux-5.15.nix+2−2 pkgs/os-specific/linux/kernel/linux-5.4.nix+2−2 pkgs/os-specific/linux/kernel/linux-rt-5.10.nix+3−3 pkgs/os-specific/linux/nixos-rebuild/default.nix+1−2 pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh−5 pkgs/servers/etcd/default.nix → pkgs/servers/etcd/3.3.nix pkgs/servers/web-apps/wordpress/default.nix+2−2 pkgs/tools/misc/dialog/default.nix+1−1 pkgs/tools/misc/spigot/default.nix+34−16 pkgs/tools/security/exploitdb/default.nix+2−2 pkgs/tools/system/fio/default.nix+9−4 pkgs/tools/system/netdata/default.nix+2−2 pkgs/tools/system/netdata/go.d.plugin.nix+3−3 pkgs/tools/system/netdata/no-files-in-etc-and-var.patch+18−6 pkgs/top-level/all-packages.nix+6−1 pkgs/top-level/python-aliases.nix+1 pkgs/top-level/python-packages.nix+3−1
doc/builders/special/mkshell.section.md+26−6
@@ -1,17 +1,37 @@
11# pkgs.mkShell {#sec-pkgs-mkShell}
22
3−`pkgs.mkShell` is a special kind of derivation that is only useful when using
4−it combined with `nix-shell`. It will in fact fail to instantiate when invoked
5−with `nix-build`.
3+`pkgs.mkShell` is a specialized `stdenv.mkDerivation` that removes some
4+repetition when using it with `nix-shell` (or `nix develop`).
65
76## Usage {#sec-pkgs-mkShell-usage}
87
8+Here is a common usage example:
9+
910```nix
1011{ pkgs ? import <nixpkgs> {} }:
1112pkgs.mkShell {
12− # specify which packages to add to the shell environment
1313 packages = [ pkgs.gnumake ];
14− # add all the dependencies, of the given packages, to the shell environment
15− inputsFrom = with pkgs; [ hello gnutar ];
14+
15+ inputsFrom = [ pkgs.hello pkgs.gnutar ];
16+
17+ shellHook = ''
18+ export DEBUG=1
19+ '';
1620}
1721```
22+
23+## Attributes
24+
25+* `name` (default: `nix-shell`). Set the name of the derivation.
26+* `packages` (default: `[]`). Add executable packages to the `nix-shell` environment.
27+* `inputsFrom` (default: `[]`). Add build dependencies of the listed derivations to the `nix-shell` environment.
28+* `shellHook` (default: `""`). Bash statements that are executed by `nix-shell`.
29+
30+... all the attributes of `stdenv.mkDerivation`.
31+
32+## Building the shell
33+
34+This derivation output will contain a text file that contains a reference to
35+all the build inputs. This is useful in CI where we want to make sure that
36+every derivation, and its dependencies, build properly. Or when creating a GC
37+root so that the build dependencies don't get garbage-collected.
maintainers/maintainer-list.nix+13
@@ -3188,6 +3188,12 @@
31883188 githubId = 24791219;
31893189 name = "Jakob Neufeld";
31903190 };
3191+ dsalaza4 = {
3192+ email = "podany270895@gmail.com";
3193+ github = "dsalaza4";
3194+ githubId = 11205987;
3195+ name = "Daniel Salazar";
3196+ };
31913197 dschrempf = {
31923198 name = "Dominik Schrempf";
31933199 email = "dominik.schrempf@gmail.com";
@@ -6049,6 +6055,13 @@
60496055 github = "k4leg";
60506056 githubId = 39882583;
60516057 };
6058+ k900 = {
6059+ name = "Ilya K.";
6060+ email = "me@0upti.me";
6061+ github = "K900";
6062+ githubId = 386765;
6063+ matrix = "@k900:0upti.me";
6064+ };
60526065 kaction = {
60536066 name = "Dmitry Bogatov";
60546067 email = "KAction@disroot.org";
nixos/modules/installer/sd-card/sd-image-riscv64-qemu.nixnew file+32
@@ -0,0 +1,32 @@
1+# To build, use:
2+# nix-build nixos -I nixos-config=nixos/modules/installer/sd-card/sd-image-riscv64-qemu.nix -A config.system.build.sdImage
3+{ config, lib, pkgs, ... }:
4+
5+{
6+ imports = [
7+ ../../profiles/base.nix
8+ ./sd-image.nix
9+ ];
10+
11+ boot.loader = {
12+ grub.enable = false;
13+ generic-extlinux-compatible = {
14+ enable = true;
15+
16+ # Don't even specify FDTDIR - We do not have the correct DT
17+ # The DTB is generated by QEMU at runtime
18+ useGenerationDeviceTree = false;
19+ };
20+ };
21+
22+ boot.consoleLogLevel = lib.mkDefault 7;
23+ boot.kernelParams = [ "console=tty0" "console=ttyS0,115200n8" ];
24+
25+ sdImage = {
26+ populateFirmwareCommands = "";
27+ populateRootCommands = ''
28+ mkdir -p ./files/boot
29+ ${config.boot.loader.generic-extlinux-compatible.populateCmd} -c ${config.system.build.toplevel} -d ./files/boot
30+ '';
31+ };
32+}
nixos/modules/installer/sd-card/sd-image-x86_64.nixnew file+27
@@ -0,0 +1,27 @@
1+# To build, use:
2+# nix-build nixos -I nixos-config=nixos/modules/installer/sd-card/sd-image-x86_64.nix -A config.system.build.sdImage
3+
4+# This image is primarily used in NixOS tests (boot.nix) to test `boot.loader.generic-extlinux-compatible`.
5+{ config, lib, pkgs, ... }:
6+
7+{
8+ imports = [
9+ ../../profiles/base.nix
10+ ./sd-image.nix
11+ ];
12+
13+ boot.loader = {
14+ grub.enable = false;
15+ generic-extlinux-compatible.enable = true;
16+ };
17+
18+ boot.consoleLogLevel = lib.mkDefault 7;
19+
20+ sdImage = {
21+ populateFirmwareCommands = "";
22+ populateRootCommands = ''
23+ mkdir -p ./files/boot
24+ ${config.boot.loader.generic-extlinux-compatible.populateCmd} -c ${config.system.build.toplevel} -d ./files/boot
25+ '';
26+ };
27+}
nixos/modules/installer/sd-card/sd-image.nix+1−1
@@ -176,7 +176,7 @@ in
176176
177177 nativeBuildInputs = [ dosfstools e2fsprogs mtools libfaketime util-linux zstd ];
178178
179− inherit (config.sdImage) compressImage;
179+ inherit (config.sdImage) imageName compressImage;
180180
181181 buildCommand = ''
182182 mkdir -p $out/nix-support $out/sd-image
nixos/modules/module-list.nix+1
@@ -364,6 +364,7 @@
364364 ./services/desktops/malcontent.nix
365365 ./services/desktops/pipewire/pipewire.nix
366366 ./services/desktops/pipewire/pipewire-media-session.nix
367+ ./services/desktops/pipewire/wireplumber.nix
367368 ./services/desktops/gnome/at-spi2-core.nix
368369 ./services/desktops/gnome/chrome-gnome-shell.nix
369370 ./services/desktops/gnome/evolution-data-server.nix
nixos/modules/profiles/all-hardware.nix+2−2
@@ -44,12 +44,12 @@ in
4444 "ohci1394" "sbp2"
4545
4646 # Virtio (QEMU, KVM etc.) support.
47− "virtio_net" "virtio_pci" "virtio_blk" "virtio_scsi" "virtio_balloon" "virtio_console"
47+ "virtio_net" "virtio_pci" "virtio_mmio" "virtio_blk" "virtio_scsi" "virtio_balloon" "virtio_console"
4848
4949 # VMware support.
5050 "mptspi" "vmxnet3" "vsock"
5151 ] ++ lib.optional platform.isx86 "vmw_balloon"
52− ++ lib.optionals (!platform.isAarch64 && !platform.isAarch32) [ # not sure where else they're missing
52+ ++ lib.optionals (pkgs.stdenv.isi686 || pkgs.stdenv.isx86_64) [
5353 "vmw_vmci" "vmwgfx" "vmw_vsock_vmci_transport"
5454
5555 # Hyper-V support.
nixos/modules/services/cluster/kubernetes/addon-manager.nix+1
@@ -167,4 +167,5 @@ in
167167 };
168168 };
169169
170+ meta.buildDocsInSandbox = false;
170171}
nixos/modules/services/cluster/kubernetes/addons/dns.nix+2
@@ -363,4 +363,6 @@ in {
363363
364364 services.kubernetes.kubelet.clusterDns = mkDefault cfg.clusterIp;
365365 };
366+
367+ meta.buildDocsInSandbox = false;
366368}
nixos/modules/services/cluster/kubernetes/apiserver.nix+1
@@ -496,4 +496,5 @@ in
496496
497497 ];
498498
499+ meta.buildDocsInSandbox = false;
499500}
nixos/modules/services/cluster/kubernetes/controller-manager.nix+5−4
@@ -6,7 +6,6 @@ let
66 top = config.services.kubernetes;
77 otop = options.services.kubernetes;
88 cfg = top.controllerManager;
9− klib = options.services.kubernetes.lib.default;
109in
1110{
1211 imports = [
@@ -57,7 +56,7 @@ in
5756 type = int;
5857 };
5958
60− kubeconfig = klib.mkKubeConfigOptions "Kubernetes controller manager";
59+ kubeconfig = top.lib.mkKubeConfigOptions "Kubernetes controller manager";
6160
6261 leaderElect = mkOption {
6362 description = "Whether to start leader election before executing main loop.";
@@ -130,7 +129,7 @@ in
130129 "--cluster-cidr=${cfg.clusterCidr}"} \
131130 ${optionalString (cfg.featureGates != [])
132131 "--feature-gates=${concatMapStringsSep "," (feature: "${feature}=true") cfg.featureGates}"} \
133− --kubeconfig=${klib.mkKubeConfig "kube-controller-manager" cfg.kubeconfig} \
132+ --kubeconfig=${top.lib.mkKubeConfig "kube-controller-manager" cfg.kubeconfig} \
134133 --leader-elect=${boolToString cfg.leaderElect} \
135134 ${optionalString (cfg.rootCaFile!=null)
136135 "--root-ca-file=${cfg.rootCaFile}"} \
@@ -157,7 +156,7 @@ in
157156 path = top.path;
158157 };
159158
160− services.kubernetes.pki.certs = with klib; {
159+ services.kubernetes.pki.certs = with top.lib; {
161160 controllerManager = mkCert {
162161 name = "kube-controller-manager";
163162 CN = "kube-controller-manager";
@@ -172,4 +171,6 @@ in
172171
173172 services.kubernetes.controllerManager.kubeconfig.server = mkDefault top.apiserverAddress;
174173 };
174+
175+ meta.buildDocsInSandbox = false;
175176}
nixos/modules/services/cluster/kubernetes/default.nix+3−6
@@ -26,10 +26,7 @@ let
2626
2727 containerd.runtimes.runc = {
2828 runtime_type = "io.containerd.runc.v2";
29− };
30−
31− containerd.runtimes."io.containerd.runc.v2".options = {
32− SystemdCgroup = true;
29+ options.SystemdCgroup = true;
3330 };
3431 };
3532 };
@@ -193,8 +190,6 @@ in {
193190 inherit mkKubeConfigOptions;
194191 };
195192 type = types.attrs;
196− readOnly = true;
197− internal = true;
198193 };
199194
200195 secretsPath = mkOption {
@@ -315,4 +310,6 @@ in {
315310 else "${cfg.masterAddress}:${toString cfg.apiserver.securePort}"}");
316311 })
317312 ];
313+
314+ meta.buildDocsInSandbox = false;
318315}
nixos/modules/services/cluster/kubernetes/flannel.nix+2
@@ -95,4 +95,6 @@ in
9595
9696 };
9797 };
98+
99+ meta.buildDocsInSandbox = false;
98100}
nixos/modules/services/cluster/kubernetes/kubelet.nix+5−6
@@ -6,7 +6,6 @@ let
66 top = config.services.kubernetes;
77 otop = options.services.kubernetes;
88 cfg = top.kubelet;
9− klib = options.services.kubernetes.lib.default;
109
1110 cniConfig =
1211 if cfg.cni.config != [] && cfg.cni.configDir != null then
@@ -28,7 +27,7 @@ let
2827 config.Cmd = ["/bin/pause"];
2928 };
3029
31− kubeconfig = klib.mkKubeConfig "kubelet" cfg.kubeconfig;
30+ kubeconfig = top.lib.mkKubeConfig "kubelet" cfg.kubeconfig;
3231
3332 manifestPath = "kubernetes/manifests";
3433
@@ -178,7 +177,7 @@ in
178177 type = str;
179178 };
180179
181− kubeconfig = klib.mkKubeConfigOptions "Kubelet";
180+ kubeconfig = top.lib.mkKubeConfigOptions "Kubelet";
182181
183182 manifests = mkOption {
184183 description = "List of manifests to bootstrap with kubelet (only pods can be created as manifest entry)";
@@ -265,8 +264,6 @@ in
265264 "net.bridge.bridge-nf-call-ip6tables" = 1;
266265 };
267266
268− systemd.enableUnifiedCgroupHierarchy = false; # true breaks node memory metrics
269−
270267 systemd.services.kubelet = {
271268 description = "Kubernetes Kubelet Service";
272269 wantedBy = [ "kubernetes.target" ];
@@ -359,7 +356,7 @@ in
359356 services.kubernetes.kubelet.hostname = with config.networking;
360357 mkDefault (hostName + optionalString (domain != null) ".${domain}");
361358
362− services.kubernetes.pki.certs = with klib; {
359+ services.kubernetes.pki.certs = with top.lib; {
363360 kubelet = mkCert {
364361 name = "kubelet";
365362 CN = top.kubelet.hostname;
@@ -396,4 +393,6 @@ in
396393 })
397394
398395 ];
396+
397+ meta.buildDocsInSandbox = false;
399398}
nixos/modules/services/cluster/kubernetes/pki.nix+6−5
@@ -1,11 +1,10 @@
1−{ config, options, lib, pkgs, ... }:
1+{ config, lib, pkgs, ... }:
22
33with lib;
44
55let
66 top = config.services.kubernetes;
77 cfg = top.pki;
8− klib = options.services.kubernetes.lib;
98
109 csrCA = pkgs.writeText "kube-pki-cacert-csr.json" (builtins.toJSON {
1110 key = {
@@ -30,7 +29,7 @@ let
3029 cfsslAPITokenLength = 32;
3130
3231 clusterAdminKubeconfig = with cfg.certs.clusterAdmin;
33− klib.mkKubeConfig "cluster-admin" {
32+ top.lib.mkKubeConfig "cluster-admin" {
3433 server = top.apiserverAddress;
3534 certFile = cert;
3635 keyFile = key;
@@ -251,7 +250,7 @@ in
251250 # - it would be better with a more Nix-oriented way of managing addons
252251 systemd.services.kube-addon-manager = mkIf top.addonManager.enable (mkMerge [{
253252 environment.KUBECONFIG = with cfg.certs.addonManager;
254− klib.mkKubeConfig "addon-manager" {
253+ top.lib.mkKubeConfig "addon-manager" {
255254 server = top.apiserverAddress;
256255 certFile = cert;
257256 keyFile = key;
@@ -344,7 +343,7 @@ in
344343 '';
345344
346345 services.flannel = with cfg.certs.flannelClient; {
347− kubeconfig = klib.mkKubeConfig "flannel" {
346+ kubeconfig = top.lib.mkKubeConfig "flannel" {
348347 server = top.apiserverAddress;
349348 certFile = cert;
350349 keyFile = key;
@@ -402,4 +401,6 @@ in
402401 };
403402 };
404403 });
404+
405+ meta.buildDocsInSandbox = false;
405406}
nixos/modules/services/cluster/kubernetes/proxy.nix+5−4
@@ -6,7 +6,6 @@ let
66 top = config.services.kubernetes;
77 otop = options.services.kubernetes;
88 cfg = top.proxy;
9− klib = options.services.kubernetes.lib.default;
109in
1110{
1211 imports = [
@@ -44,7 +43,7 @@ in
4443 type = str;
4544 };
4645
47− kubeconfig = klib.mkKubeConfigOptions "Kubernetes proxy";
46+ kubeconfig = top.lib.mkKubeConfigOptions "Kubernetes proxy";
4847
4948 verbosity = mkOption {
5049 description = ''
@@ -73,7 +72,7 @@ in
7372 ${optionalString (cfg.featureGates != [])
7473 "--feature-gates=${concatMapStringsSep "," (feature: "${feature}=true") cfg.featureGates}"} \
7574 --hostname-override=${cfg.hostname} \
76− --kubeconfig=${klib.mkKubeConfig "kube-proxy" cfg.kubeconfig} \
75+ --kubeconfig=${top.lib.mkKubeConfig "kube-proxy" cfg.kubeconfig} \
7776 ${optionalString (cfg.verbosity != null) "--v=${toString cfg.verbosity}"} \
7877 ${cfg.extraOpts}
7978 '';
@@ -89,7 +88,7 @@ in
8988 services.kubernetes.proxy.hostname = with config.networking; mkDefault hostName;
9089
9190 services.kubernetes.pki.certs = {
92− kubeProxyClient = klib.mkCert {
91+ kubeProxyClient = top.lib.mkCert {
9392 name = "kube-proxy-client";
9493 CN = "system:kube-proxy";
9594 action = "systemctl restart kube-proxy.service";
@@ -98,4 +97,6 @@ in
9897
9998 services.kubernetes.proxy.kubeconfig.server = mkDefault top.apiserverAddress;
10099 };
100+
101+ meta.buildDocsInSandbox = false;
101102}
nixos/modules/services/cluster/kubernetes/scheduler.nix+5−4
@@ -6,7 +6,6 @@ let
66 top = config.services.kubernetes;
77 otop = options.services.kubernetes;
88 cfg = top.scheduler;
9− klib = options.services.kubernetes.lib.default;
109in
1110{
1211 ###### interface
@@ -33,7 +32,7 @@ in
3332 type = listOf str;
3433 };
3534
36− kubeconfig = klib.mkKubeConfigOptions "Kubernetes scheduler";
35+ kubeconfig = top.lib.mkKubeConfigOptions "Kubernetes scheduler";
3736
3837 leaderElect = mkOption {
3938 description = "Whether to start leader election before executing main loop.";
@@ -70,7 +69,7 @@ in
7069 --address=${cfg.address} \
7170 ${optionalString (cfg.featureGates != [])
7271 "--feature-gates=${concatMapStringsSep "," (feature: "${feature}=true") cfg.featureGates}"} \
73− --kubeconfig=${klib.mkKubeConfig "kube-scheduler" cfg.kubeconfig} \
72+ --kubeconfig=${top.lib.mkKubeConfig "kube-scheduler" cfg.kubeconfig} \
7473 --leader-elect=${boolToString cfg.leaderElect} \
7574 --port=${toString cfg.port} \
7675 ${optionalString (cfg.verbosity != null) "--v=${toString cfg.verbosity}"} \
@@ -88,7 +87,7 @@ in
8887 };
8988
9089 services.kubernetes.pki.certs = {
91− schedulerClient = klib.mkCert {
90+ schedulerClient = top.lib.mkCert {
9291 name = "kube-scheduler-client";
9392 CN = "system:kube-scheduler";
9493 action = "systemctl restart kube-scheduler.service";
@@ -97,4 +96,6 @@ in
9796
9897 services.kubernetes.scheduler.kubeconfig.server = mkDefault top.apiserverAddress;
9998 };
99+
100+ meta.buildDocsInSandbox = false;
100101}
nixos/modules/services/desktops/gnome/gnome-settings-daemon.nix+4−18
@@ -57,26 +57,12 @@ in
5757 pkgs.gnome.gnome-settings-daemon
5858 ];
5959
60− systemd.user.targets."gnome-session-initialized".wants = [
61− "gsd-color.target"
62− "gsd-datetime.target"
63− "gsd-keyboard.target"
64− "gsd-media-keys.target"
65− "gsd-print-notifications.target"
66− "gsd-rfkill.target"
67− "gsd-screensaver-proxy.target"
68− "gsd-sharing.target"
69− "gsd-smartcard.target"
70− "gsd-sound.target"
71− "gsd-wacom.target"
72− "gsd-wwan.target"
73− "gsd-a11y-settings.target"
74− "gsd-housekeeping.target"
75− "gsd-power.target"
60+ systemd.user.targets."gnome-session-x11-services".wants = [
61+ "org.gnome.SettingsDaemon.XSettings.service"
7662 ];
7763
78− systemd.user.targets."gnome-session-x11-services".wants = [
79− "gsd-xsettings.target"
64+ systemd.user.targets."gnome-session-x11-services-ready".wants = [
65+ "org.gnome.SettingsDaemon.XSettings.service"
8066 ];
8167
8268 };
nixos/modules/services/desktops/pipewire/wireplumber.nixnew file+41
@@ -0,0 +1,41 @@
1+{ config, lib, pkgs, ... }:
2+
3+let
4+ cfg = config.services.pipewire.wireplumber;
5+in
6+{
7+ meta.maintainers = [ lib.maintainers.k900 ];
8+
9+ options = {
10+ services.pipewire.wireplumber = {
11+ enable = lib.mkEnableOption "A modular session / policy manager for PipeWire";
12+
13+ package = lib.mkOption {
14+ type = lib.types.package;
15+ default = pkgs.wireplumber;
16+ defaultText = lib.literalExpression "pkgs.wireplumber";
17+ description = ''
18+ The wireplumber derivation to use.
19+ '';
20+ };
21+ };
22+ };
23+
24+ config = lib.mkIf cfg.enable {
25+ assertions = [
26+ {
27+ assertion = !config.services.pipewire.media-session.enable;
28+ message = "WirePlumber and pipewire-media-session can't be enabled at the same time.";
29+ }
30+ ];
31+
32+ environment.systemPackages = [ cfg.package ];
33+ systemd.packages = [ cfg.package ];
34+
35+ systemd.services.wireplumber.enable = config.services.pipewire.systemWide;
36+ systemd.user.services.wireplumber.enable = !config.services.pipewire.systemWide;
37+
38+ systemd.services.wireplumber.wantedBy = [ "pipewire.service" ];
39+ systemd.user.services.wireplumber.wantedBy = [ "pipewire.service" ];
40+ };
41+}
nixos/modules/system/boot/loader/generic-extlinux-compatible/default.nix+18−1
@@ -30,6 +30,21 @@ in
3030 '';
3131 };
3232
33+ useGenerationDeviceTree = mkOption {
34+ default = true;
35+ type = types.bool;
36+ description = ''
37+ Whether to generate Device Tree-related directives in the
38+ extlinux configuration.
39+
40+ When enabled, the bootloader will attempt to load the device
41+ tree binaries from the generation's kernel.
42+
43+ Note that this affects all generations, regardless of the
44+ setting value used in their configurations.
45+ '';
46+ };
47+
3348 configurationLimit = mkOption {
3449 default = 20;
3550 example = 10;
@@ -54,7 +69,9 @@ in
5469 };
5570
5671 config = let
57− builderArgs = "-g ${toString cfg.configurationLimit} -t ${timeoutStr}" + lib.optionalString (dtCfg.name != null) " -n ${dtCfg.name}";
72+ builderArgs = "-g ${toString cfg.configurationLimit} -t ${timeoutStr}"
73+ + lib.optionalString (dtCfg.name != null) " -n ${dtCfg.name}"
74+ + lib.optionalString (!cfg.useGenerationDeviceTree) " -r";
5875 in
5976 mkIf cfg.enable {
6077 system.build.installBootLoader = "${builder} ${builderArgs} -c";
nixos/modules/system/boot/loader/generic-extlinux-compatible/extlinux-conf-builder.sh+9−3
@@ -6,7 +6,7 @@ export PATH=/empty
66for i in @path@; do PATH=$PATH:$i/bin; done
77
88usage() {
9− echo "usage: $0 -t <timeout> -c <path-to-default-configuration> [-d <boot-dir>] [-g <num-generations>] [-n <dtbName>]" >&2
9+ echo "usage: $0 -t <timeout> -c <path-to-default-configuration> [-d <boot-dir>] [-g <num-generations>] [-n <dtbName>] [-r]" >&2
1010 exit 1
1111}
1212
@@ -15,7 +15,7 @@ default= # Default configuration
1515target=/boot # Target directory
1616numGenerations=0 # Number of other generations to include in the menu
1717
18−while getopts "t:c:d:g:n:" opt; do
18+while getopts "t:c:d:g:n:r" opt; do
1919 case "$opt" in
2020 t) # U-Boot interprets '0' as infinite and negative as instant boot
2121 if [ "$OPTARG" -lt 0 ]; then
@@ -30,6 +30,7 @@ while getopts "t:c:d:g:n:" opt; do
3030 d) target="$OPTARG" ;;
3131 g) numGenerations="$OPTARG" ;;
3232 n) dtbName="$OPTARG" ;;
33+ r) noDeviceTree=1 ;;
3334 \?) usage ;;
3435 esac
3536done
@@ -96,6 +97,12 @@ addEntry() {
9697 fi
9798 echo " LINUX ../nixos/$(basename $kernel)"
9899 echo " INITRD ../nixos/$(basename $initrd)"
100+ echo " APPEND init=$path/init $extraParams"
101+
102+ if [ -n "$noDeviceTree" ]; then
103+ return
104+ fi
105+
99106 if [ -d "$dtbDir" ]; then
100107 # if a dtbName was specified explicitly, use that, else use FDTDIR
101108 if [ -n "$dtbName" ]; then
@@ -109,7 +116,6 @@ addEntry() {
109116 exit 1
110117 fi
111118 fi
112− echo " APPEND init=$path/init $extraParams"
113119}
114120
115121tmpFile="$target/extlinux/extlinux.conf.tmp.$$"
nixos/tests/boot.nix+40−4
@@ -12,12 +12,22 @@ let
1212 iso =
1313 (import ../lib/eval-config.nix {
1414 inherit system;
15− modules =
16− [ ../modules/installer/cd-dvd/installation-cd-minimal.nix
17− ../modules/testing/test-instrumentation.nix
18− ];
15+ modules = [
16+ ../modules/installer/cd-dvd/installation-cd-minimal.nix
17+ ../modules/testing/test-instrumentation.nix
18+ ];
1919 }).config.system.build.isoImage;
2020
21+ sd =
22+ (import ../lib/eval-config.nix {
23+ inherit system;
24+ modules = [
25+ ../modules/installer/sd-card/sd-image-x86_64.nix
26+ ../modules/testing/test-instrumentation.nix
27+ { sdImage.compressImage = false; }
28+ ];
29+ }).config.system.build.sdImage;
30+
2131 pythonDict = params: "\n {\n ${concatStringsSep ",\n " (mapAttrsToList (name: param: "\"${name}\": \"${param}\"") params)},\n }\n";
2232
2333 makeBootTest = name: extraConfig:
@@ -110,4 +120,30 @@ in {
110120 };
111121
112122 biosNetboot = makeNetbootTest "bios" {};
123+
124+ ubootExtlinux = let
125+ sdImage = "${sd}/sd-image/${sd.imageName}";
126+ mutableImage = "/tmp/linked-image.qcow2";
127+
128+ machineConfig = pythonDict {
129+ bios = "${pkgs.ubootQemuX86}/u-boot.rom";
130+ qemuFlags = "-m 768 -machine type=pc,accel=tcg -drive file=${mutableImage},if=ide,format=qcow2";
131+ };
132+ in makeTest {
133+ name = "boot-uboot-extlinux";
134+ nodes = { };
135+ testScript = ''
136+ import os
137+
138+ # Create a mutable linked image backed by the read-only SD image
139+ if os.system("qemu-img create -f qcow2 -F raw -b ${sdImage} ${mutableImage}") != 0:
140+ raise RuntimeError("Could not create mutable linked image")
141+
142+ machine = create_machine(${machineConfig})
143+ machine.start()
144+ machine.wait_for_unit("multi-user.target")
145+ machine.succeed("nix store verify -r --no-trust --option experimental-features nix-command /run/current-system")
146+ machine.shutdown()
147+ '';
148+ };
113149}
nixos/tests/kubernetes/base.nix−7
@@ -60,13 +60,6 @@ let
6060 advertiseAddress = master.ip;
6161 };
6262 masterAddress = "${masterName}.${config.networking.domain}";
63− # workaround for:
64− # https://github.com/kubernetes/kubernetes/issues/102676
65− # (workaround from) https://github.com/kubernetes/kubernetes/issues/95488
66− kubelet.extraOpts = ''\
67− --cgroups-per-qos=false \
68− --enforce-node-allocatable="" \
69− '';
7063 };
7164 }
7265 (optionalAttrs (any (role: role == "master") machine.roles) {
pkgs/applications/blockchains/go-ethereum/default.nix+3−3
@@ -9,16 +9,16 @@ let
99
1010in buildGoModule rec {
1111 pname = "go-ethereum";
12− version = "1.10.14";
12+ version = "1.10.15";
1313
1414 src = fetchFromGitHub {
1515 owner = "ethereum";
1616 repo = pname;
1717 rev = "v${version}";
18− sha256 = "sha256-0DQrcei3FM+X4BYokou7dPNVCcJTbY05YsTvzdtsas8=";
18+ sha256 = "0f6n9rg42ph47mvykc9f0lf99yzwqy4jm7mlzyks4l6i6fl1g3q1";
1919 };
2020
21− vendorSha256 = "sha256-zQOpWtQrdn+E1tRWmtEScQ7DDMzNCSr5H+5YL+Z1vug=";
21+ vendorSha256 = "1s5yfpk2yn7f3zwjl2fdrh6c63ki2b8rlmnlss27yxibsidaj0yd";
2222
2323 doCheck = false;
2424
pkgs/applications/graphics/feh/default.nix+2−2
@@ -7,11 +7,11 @@ with lib;
77
88stdenv.mkDerivation rec {
99 pname = "feh";
10− version = "3.7.2";
10+ version = "3.8";
1111
1212 src = fetchurl {
1313 url = "https://feh.finalrewind.org/${pname}-${version}.tar.bz2";
14− sha256 = "sha256-hHGP0nIM9UDSRXaElP4OtOWY9Es54jJrrow2ioKcglg=";
14+ sha256 = "1a9bsq5j9sl2drzkab0hdhnamalpaszw9mz2prz6scrr5dak8g3z";
1515 };
1616
1717 outputs = [ "out" "man" "doc" ];
pkgs/applications/misc/obinskit/default.nix+5−5
@@ -4,7 +4,7 @@
44, libxkbcommon
55, systemd
66, xorg
7−, electron_11
7+, electron_13
88, makeWrapper
99, makeDesktopItem
1010}:
@@ -17,15 +17,15 @@ let
1717 genericName = "Obinskit keyboard configurator";
1818 categories = "Utility";
1919 };
20− electron = electron_11;
20+ electron = electron_13;
2121in
2222stdenv.mkDerivation rec {
2323 pname = "obinskit";
24− version = "1.1.8";
24+ version = "1.2.11";
2525
2626 src = fetchurl {
27− url = "http://releases.obins.net/occ/linux/tar/ObinsKit_${version}_x64.tar.gz";
28− sha256 = "MgasbgexOdscQrUte/6OzCSrc74RvaBq44oHplQA/Gc=";
27+ url = "https://s3.hexcore.xyz/occ/linux/tar/ObinsKit_${version}_x64.tar.gz";
28+ sha256 = "1kcn41wmwcx6q70spa9a1qh7wfrj1sk4v4i58lbnf9kc6vasw41a";
2929 };
3030
3131 unpackPhase = "tar -xzf $src";
pkgs/applications/networking/browsers/chromium/upstream-info.json+8−8
@@ -45,19 +45,19 @@
4545 }
4646 },
4747 "ungoogled-chromium": {
48− "version": "96.0.4664.110",
49− "sha256": "1s3ilq0ik36qgqp7l88gfd1yx97zscn8yr2kprsrjfp9q8lrva9n",
50− "sha256bin64": "17cyj1jx47fz6y26f196xhlngrw5gnjgcvapvgkgswlwd7y67jcb",
48+ "version": "97.0.4692.71",
49+ "sha256": "0z7ximvm4a78kxyp4j0i2jzklxazpw6jcqi9jkaf8bvq9ga8kqca",
50+ "sha256bin64": "1z1d50i5pvqaw6hjdxwasbznzgqwrnd1z8jmy2x05b6i49vd7r9j",
5151 "deps": {
5252 "gn": {
53− "version": "2021-09-24",
53+ "version": "2021-11-03",
5454 "url": "https://gn.googlesource.com/gn",
55− "rev": "0153d369bbccc908f4da4993b1ba82728055926a",
56− "sha256": "0y4414h8jqsbz5af6pn91c0vkfp4s281s85g992xfyl785c5zbsi"
55+ "rev": "90294ccdcf9334ed25a76ac9b67689468e506342",
56+ "sha256": "0n0jml8s00ayy186jzrf207hbz70pxiq426znxwxd4gjcp60scsa"
5757 },
5858 "ungoogled-patches": {
59− "rev": "96.0.4664.110-1",
60− "sha256": "098mfcd1lr2hhlic0i1l5gxsq71axvqnn4gayr4r9j6nbj9byf4h"
59+ "rev": "97.0.4692.71-1",
60+ "sha256": "0a1172kj93lg3ip4im1s5s7bdm2q41w4m6ylyxc92w29rbhbxjxp"
6161 }
6262 }
6363 }
pkgs/applications/networking/cluster/terraform-providers/default.nix+5−1
@@ -3,6 +3,8 @@
33, fetchFromGitHub
44, callPackage
55, config
6+
7+, cdrtools # libvirt
68}:
79let
810 list = lib.importJSON ./providers.json;
@@ -41,7 +43,9 @@ let
4143 special-providers = let archived = throw "the provider has been archived by upstream"; in {
4244 # Packages that don't fit the default model
4345 gandi = callPackage ./gandi { };
44− libvirt = callPackage ./libvirt { };
46+ # mkisofs needed to create ISOs holding cloud-init data,
47+ # and wrapped to terraform via deecb4c1aab780047d79978c636eeb879dd68630
48+ libvirt = automated-providers.libvirt.overrideAttrs (_: { propagatedBuildInputs = [ cdrtools ]; });
4549 teleport = callPackage ./teleport { };
4650 vpsadmin = callPackage ./vpsadmin { };
4751 } // (lib.optionalAttrs (config.allowAliases or false) {
pkgs/applications/networking/cluster/terraform-providers/libvirt/default.nixdeleted−56
@@ -1,56 +0,0 @@
1−{ buildGoModule, cdrtools, fetchFromGitHub, lib, libvirt, makeWrapper, pkg-config }:
2−
3−# USAGE:
4−# install the following package globally or in nix-shell:
5−#
6−# (terraform.withPlugins (p: [p.libvirt]))
7−#
8−# configuration.nix:
9−#
10−# virtualisation.libvirtd.enable = true;
11−#
12−# pick an example from (i.e ubuntu):
13−# https://github.com/dmacvicar/terraform-provider-libvirt/tree/main/examples
14−
15−let
16− sha256 = "sha256-1l+ARrXHxtSdnQfYV/6gw3BYHVH8NN4pi+Ttk1nwF88=";
17− vendorSha256 = "sha256-OJa8pQgf5PlECZZkFV9fyCOdh6CrregY1BWycx7JPFE=";
18− version = "0.6.12";
19−in buildGoModule {
20− inherit version;
21− inherit vendorSha256;
22−
23− pname = "terraform-provider-libvirt";
24−
25− src = fetchFromGitHub {
26− inherit sha256;
27−
28− owner = "dmacvicar";
29− repo = "terraform-provider-libvirt";
30− rev = "v${version}";
31− };
32−
33− nativeBuildInputs = [ pkg-config makeWrapper ];
34−
35− buildInputs = [ libvirt ];
36−
37− # mkisofs needed to create ISOs holding cloud-init data,
38− # and wrapped to terraform via deecb4c1aab780047d79978c636eeb879dd68630
39− propagatedBuildInputs = [ cdrtools ];
40−
41− # Terraform allow checking the provider versions, but this breaks
42− # if the versions are not provided via file paths.
43− postBuild = "mv $GOPATH/bin/terraform-provider-libvirt{,_v${version}}";
44−
45− ldflags = [ "-X main.version=${version}" ];
46− passthru.provider-source-address = "registry.terraform.io/dmacvicar/libvirt";
47−
48− doCheck = false;
49−
50− meta = with lib; {
51− homepage = "https://github.com/dmacvicar/terraform-provider-libvirt";
52− description = "Terraform provider for libvirt";
53− license = licenses.asl20;
54− maintainers = with maintainers; [ mic92 ];
55− };
56−}
pkgs/applications/networking/cluster/terraform-providers/providers.json+9
@@ -579,6 +579,15 @@
579579 "vendorSha256": "05gx87dwh49zc5mlqnzcqn46pjf9q4wsv9l15pjr3spczzi11cnz",
580580 "version": "2.2.0"
581581 },
582+ "libvirt": {
583+ "owner": "dmacvicar",
584+ "provider-source-address": "registry.terraform.io/dmacvicar/libvirt",
585+ "repo": "terraform-provider-libvirt",
586+ "rev": "v0.6.12",
587+ "sha256": "1kqpy1cr7vg4iclxwd7wa4fmhw63l3z5gn07knfx9in7nm380pyn",
588+ "vendorSha256": "0l9wr4g77chmshcfibdbl23rs8y8bxgiar4n152gkr0z12jvr5iq",
589+ "version": "0.6.12"
590+ },
582591 "linode": {
583592 "owner": "linode",
584593 "provider-source-address": "registry.terraform.io/linode/linode",
pkgs/applications/office/timedoctor/default.nix+1−1
@@ -117,7 +117,7 @@ appimageTools.wrapType2 {
117117 description = "Employee time tracking software";
118118 homepage = "https://www.timedoctor.com";
119119 license = licenses.unfree;
120− maintainers = with maintainers; [ kamadorueda ];
120+ maintainers = with maintainers; [ dsalaza4 ];
121121 platforms = [ "x86_64-linux" ];
122122 # gpgme for i686-linux failed to build.
123123 broken = true;
pkgs/applications/science/logic/lean/default.nix+3−3
@@ -2,7 +2,7 @@
22
33stdenv.mkDerivation rec {
44 pname = "lean";
5− version = "3.36.0";
5+ version = "3.37.0";
66
77 src = fetchFromGitHub {
88 owner = "leanprover-community";
@@ -11,8 +11,8 @@ stdenv.mkDerivation rec {
1111 # from. this is then used to check whether an olean file should be
1212 # rebuilt. don't use a tag as rev because this will get replaced into
1313 # src/githash.h.in in preConfigure.
14− rev = "e948149d3d1bbdb8eac9cd103d58626a59fae3b9";
15− sha256 = "1lcjif29lfj3myc6j63ifk8fdvylyv8g82g2dv0d85nz7mpbq47b";
14+ rev = "e69ab934262eb6f141344fdaec98ede68a9102b6";
15+ sha256 = "19sigzbrdl90jqk7lvl3q8j6n4nnidzwp9zzmzgq3zxxgywa2ghp";
1616 };
1717
1818 nativeBuildInputs = [ cmake ];
pkgs/applications/science/math/gmsh/default.nix+4−4
@@ -5,11 +5,11 @@ assert (!blas.isILP64) && (!lapack.isILP64);
55
66stdenv.mkDerivation rec {
77 pname = "gmsh";
8− version = "4.9.0";
8+ version = "4.9.2";
99
1010 src = fetchurl {
11− url = "http://gmsh.info/src/gmsh-${version}-source.tgz";
12− sha256 = "sha256-uO8TPJtm/+Et8XR+ctSs8Z8esenNlesPV3y8QIHZvqM=";
11+ url = "https://gmsh.info/src/gmsh-${version}-source.tgz";
12+ sha256 = "sha256-26KB4DNYT12gfi2Y1656PcSBcjyybCxye2X8ILMBYYw=";
1313 };
1414
1515 buildInputs = [ blas lapack gmm fltk libjpeg zlib libGLU libGL
@@ -22,7 +22,7 @@ stdenv.mkDerivation rec {
2222
2323 meta = {
2424 description = "A three-dimensional finite element mesh generator";
25− homepage = "http://gmsh.info/";
25+ homepage = "https://gmsh.info/";
2626 platforms = [ "x86_64-linux" ];
2727 license = lib.licenses.gpl2Plus;
2828 };
pkgs/applications/window-managers/dwm/default.nix+2−2
@@ -2,11 +2,11 @@
22
33stdenv.mkDerivation rec {
44 pname = "dwm";
5− version = "6.2";
5+ version = "6.3";
66
77 src = fetchurl {
88 url = "https://dl.suckless.org/dwm/${pname}-${version}.tar.gz";
9− sha256 = "03hirnj8saxnsfqiszwl2ds7p0avg20izv9vdqyambks00p2x44p";
9+ sha256 = "utqgKFKbH7of1/moTztk8xGQRmyFgBG1Pi97cMajB40=";
1010 };
1111
1212 buildInputs = [ libX11 libXinerama libXft ];
pkgs/build-support/mkshell/default.nix+16−11
@@ -1,9 +1,9 @@
1−{ lib, stdenv }:
1+{ lib, stdenv, buildEnv }:
22
33# A special kind of derivation that is only meant to be consumed by the
44# nix-shell.
5−{
6− # a list of packages to add to the shell environment
5+{ name ? "nix-shell"
6+, # a list of packages to add to the shell environment
77 packages ? [ ]
88, # propagate all the inputs from the given derivations
99 inputsFrom ? [ ]
@@ -15,10 +15,11 @@
1515}@attrs:
1616let
1717 mergeInputs = name:
18− (attrs.${name} or []) ++
18+ (attrs.${name} or [ ]) ++
1919 (lib.subtractLists inputsFrom (lib.flatten (lib.catAttrs name inputsFrom)));
2020
2121 rest = builtins.removeAttrs attrs [
22+ "name"
2223 "packages"
2324 "inputsFrom"
2425 "buildInputs"
@@ -30,8 +31,7 @@ let
3031in
3132
3233stdenv.mkDerivation ({
33− name = "nix-shell";
34− phases = [ "nobuildPhase" ];
34+ inherit name;
3535
3636 buildInputs = mergeInputs "buildInputs";
3737 nativeBuildInputs = packages ++ (mergeInputs "nativeBuildInputs");
@@ -41,10 +41,15 @@ stdenv.mkDerivation ({
4141 shellHook = lib.concatStringsSep "\n" (lib.catAttrs "shellHook"
4242 (lib.reverseList inputsFrom ++ [ attrs ]));
4343
44− nobuildPhase = ''
45− echo
46− echo "This derivation is not meant to be built, aborting";
47− echo
48− exit 1
44+ phases = [ "buildPhase" ];
45+
46+ buildPhase = ''
47+ echo "------------------------------------------------------------" >>$out
48+ echo " WARNING: the existence of this path is not guaranteed." >>$out
49+ echo " It is an internal implementation detail for pkgs.mkShell." >>$out
50+ echo "------------------------------------------------------------" >>$out
51+ echo >> $out
52+ # Record all build inputs as runtime dependencies
53+ export >> $out
4954 '';
5055} // rest)
pkgs/data/themes/graphite/default.nixnew file+87
@@ -0,0 +1,87 @@
1+{ lib
2+, stdenvNoCC
3+, fetchFromGitHub
4+, gnome-themes-extra
5+, gtk-engine-murrine
6+, jdupes
7+, sassc
8+, themeVariants ? [] # default: blue
9+, colorVariants ? [] # default: all
10+, sizeVariants ? [] # default: standard
11+, tweaks ? []
12+, wallpapers ? false
13+}:
14+
15+let
16+ pname = "graphite-gtk-theme";
17+
18+ throwIfNotSubList = name: given: valid:
19+ let
20+ unexpected = lib.subtractLists valid given;
21+ in
22+ lib.throwIfNot (unexpected == [])
23+ "${name}: ${builtins.concatStringsSep ", " (builtins.map builtins.toString unexpected)} unexpected; valid ones: ${builtins.concatStringsSep ", " (builtins.map builtins.toString valid)}";
24+
25+in
26+throwIfNotSubList "${pname}: theme variants" themeVariants [ "default" "purple" "pink" "red" "orange" "yellow" "green" "teal" "blue" "all" ]
27+throwIfNotSubList "${pname}: color variants" colorVariants [ "standard" "light" "dark" ]
28+throwIfNotSubList "${pname}: size variants" sizeVariants [ "standard" "compact" ]
29+throwIfNotSubList "${pname}: tweaks" tweaks [ "nord" "black" "midblack" "rimless" "normal" ]
30+
31+stdenvNoCC.mkDerivation {
32+ inherit pname;
33+ version = "unstable-2022-01-04";
34+
35+ src = fetchFromGitHub {
36+ owner = "vinceliuice";
37+ repo = pname;
38+ rev = "947cac4966377d8f5b5a4e2966ec2b9a6041d205";
39+ sha256 = "11pl8hzk4fwniqdib0ffvjilpspr1n5pg1gw39kal13wxh4sdg28";
40+ };
41+
42+ nativeBuildInputs = [
43+ jdupes
44+ sassc
45+ ];
46+
47+ buildInputs = [
48+ gnome-themes-extra
49+ ];
50+
51+ propagatedUserEnvPkgs = [
52+ gtk-engine-murrine
53+ ];
54+
55+ installPhase = ''
56+ runHook preInstall
57+
58+ patchShebangs install.sh
59+
60+ name= ./install.sh \
61+ ${lib.optionalString (themeVariants != []) "--theme " + builtins.toString themeVariants} \
62+ ${lib.optionalString (colorVariants != []) "--color " + builtins.toString colorVariants} \
63+ ${lib.optionalString (sizeVariants != []) "--size " + builtins.toString sizeVariants} \
64+ ${lib.optionalString (tweaks != []) "--tweaks " + builtins.toString tweaks} \
65+ --dest $out/share/themes
66+
67+ ${lib.optionalString wallpapers ''
68+ mkdir -p $out/share/backgrounds
69+ cp -a wallpaper/Graphite-normal/*.png $out/share/backgrounds/
70+ ${lib.optionalString (builtins.elem "nord" tweaks) ''
71+ cp -a wallpaper/Graphite-nord/*.png $out/share/backgrounds/
72+ ''}
73+ ''}
74+
75+ jdupes -L -r $out/share
76+
77+ runHook postInstall
78+ '';
79+
80+ meta = with lib; {
81+ description = "Flat Gtk+ theme based on Elegant Design";
82+ homepage = "https://github.com/vinceliuice/Graphite-gtk-theme";
83+ license = licenses.gpl3Only;
84+ platforms = platforms.unix;
85+ maintainers = [ maintainers.romildo ];
86+ };
87+}
pkgs/development/compilers/go/1.17.nix+2−2
@@ -54,11 +54,11 @@ in
5454
5555stdenv.mkDerivation rec {
5656 pname = "go";
57− version = "1.17.5";
57+ version = "1.17.6";
5858
5959 src = fetchurl {
6060 url = "https://dl.google.com/go/go${version}.src.tar.gz";
61− sha256 = "sha256-Pe+5oJvtBCQDGV6HLcvIxvrhSFljMyJ5Zo7FLoCpWi0=";
61+ sha256 = "sha256-TcG78/9h8MH/Kxk1Xm2IFRpwEmJopHx2FHdobvlHSMg=";
6262 };
6363
6464 # perl is used for testing go vet
pkgs/development/libraries/lensfun/default.nix+3−3
@@ -25,9 +25,9 @@ stdenv.mkDerivation {
2525 };
2626
2727 # replace database with a more recent snapshot
28− postUnpack = ''
29− rm -R source/data/db
30− cp -R ${lensfunDatabase}/data/db source/data
28+ prePatch = ''
29+ rm -R ./data/db
30+ cp -R ${lensfunDatabase}/data/db ./data
3131 '';
3232
3333 nativeBuildInputs = [ cmake pkg-config ];
pkgs/development/libraries/libcamera/default.nix+18−4
@@ -4,9 +4,11 @@
44, meson
55, ninja
66, pkg-config
7+, makeFontsConf
78, boost
89, gnutls
910, openssl
11+, libdrm
1012, libevent
1113, lttng-ust
1214, gst_all_1
@@ -15,16 +17,17 @@
1517, doxygen
1618, python3
1719, python3Packages
20+, systemd # for libudev
1821}:
1922
2023stdenv.mkDerivation {
2124 pname = "libcamera";
22− version = "unstable-2021-09-24";
25+ version = "unstable-2022-01-03";
2326
2427 src = fetchgit {
2528 url = "https://git.libcamera.org/libcamera/libcamera.git";
26− rev = "40f5fddca7f774944a53f58eeaebc4db79c373d8";
27− sha256 = "0jklgdv5ma4nszxibms5lkf5d2ips7ncynwa1flglrhl5bl4wkzz";
29+ rev = "1db1e31e664c1f613dc964d8519fe75d67b154b6";
30+ hash = "sha256-pXYPIU9xDWA870Gp1Jgizi5xnUHRvTqEq/ofFXdVZdg=";
2831 };
2932
3033 postPatch = ''
@@ -44,6 +47,10 @@ stdenv.mkDerivation {
4447
4548 # cam integration
4649 libevent
50+ libdrm
51+
52+ # hotplugging
53+ systemd
4754
4855 # lttng tracing
4956 lttng-ust
@@ -65,11 +72,18 @@ stdenv.mkDerivation {
6572 openssl
6673 ];
6774
68− mesonFlags = [ "-Dv4l2=true" "-Dqcam=disabled" ];
75+ mesonFlags = [
76+ "-Dv4l2=true"
77+ "-Dqcam=disabled"
78+ "-Dlc-compliance=disabled" # tries unconditionally to download gtest when enabled
79+ ];
6980
7081 # Fixes error on a deprecated declaration
7182 NIX_CFLAGS_COMPILE = "-Wno-error=deprecated-declarations";
7283
84+ # Silence fontconfig warnings about missing config
85+ FONTCONFIG_FILE = makeFontsConf { fontDirectories = []; };
86+
7387 meta = with lib; {
7488 description = "An open source camera stack and framework for Linux, Android, and ChromeOS";
7589 homepage = "https://libcamera.org";
pkgs/development/libraries/ncurses/default.nix+28−31
@@ -1,15 +1,13 @@
1−{ lib, stdenv, fetchurl, pkg-config
2−
1+{ lib
2+, stdenv
3+, fetchurl
4+, buildPackages
5+, pkg-config
36, abiVersion ? "6"
4−, mouseSupport ? false
5−, unicode ? true
67, enableStatic ? stdenv.hostPlatform.isStatic
7−, enableShared ? !enableStatic
88, withCxx ? !stdenv.hostPlatform.useAndroidPrebuilt
9−
10−, gpm
11−
12−, buildPackages
9+, mouseSupport ? false, gpm
10+, unicodeSupport ? true
1311}:
1412
1513stdenv.mkDerivation rec {
@@ -31,13 +29,13 @@ stdenv.mkDerivation rec {
3129 setOutputFlags = false; # some aren't supported
3230
3331 configureFlags = [
34− (lib.withFeature enableShared "shared")
32+ (lib.withFeature (!enableStatic) "shared")
3533 "--without-debug"
3634 "--enable-pc-files"
3735 "--enable-symlinks"
3836 "--with-manpage-format=normal"
3937 "--disable-stripping"
40− ] ++ lib.optional unicode "--enable-widec"
38+ ] ++ lib.optional unicodeSupport "--enable-widec"
4139 ++ lib.optional (!withCxx) "--without-cxx"
4240 ++ lib.optional (abiVersion == "5") "--with-abi-version=5"
4341 ++ lib.optional stdenv.hostPlatform.isNetBSD "--enable-rpath"
@@ -49,12 +47,16 @@ stdenv.mkDerivation rec {
4947 # Only the C compiler, and explicitly not C++ compiler needs this flag on solaris:
5048 CFLAGS = lib.optionalString stdenv.isSunOS "-D_XOPEN_SOURCE_EXTENDED";
5149
52− depsBuildBuild = [ buildPackages.stdenv.cc ];
50+ depsBuildBuild = [
51+ buildPackages.stdenv.cc
52+ ];
53+
5354 nativeBuildInputs = [
5455 pkg-config
5556 ] ++ lib.optionals (stdenv.buildPlatform != stdenv.hostPlatform) [
5657 buildPackages.ncurses
5758 ];
59+
5860 buildInputs = lib.optional (mouseSupport && stdenv.isLinux) gpm;
5961
6062 preConfigure = ''
@@ -147,31 +149,26 @@ stdenv.mkDerivation rec {
147149 rm "$out"/lib/*.a
148150 '';
149151
150− meta = {
152+ meta = with lib; {
153+ homepage = "https://www.gnu.org/software/ncurses/";
151154 description = "Free software emulation of curses in SVR4 and more";
152−
153155 longDescription = ''
154− The Ncurses (new curses) library is a free software emulation of
155− curses in System V Release 4.0, and more. It uses Terminfo
156− format, supports pads and color and multiple highlights and
157− forms characters and function-key mapping, and has all the other
158− SYSV-curses enhancements over BSD Curses.
159−
160− The ncurses code was developed under GNU/Linux. It has been in
161− use for some time with OpenBSD as the system curses library, and
162− on FreeBSD and NetBSD as an external package. It should port
163− easily to any ANSI/POSIX-conforming UNIX. It has even been
164− ported to OS/2 Warp!
156+ The Ncurses (new curses) library is a free software emulation of curses in
157+ System V Release 4.0, and more. It uses Terminfo format, supports pads and
158+ color and multiple highlights and forms characters and function-key
159+ mapping, and has all the other SYSV-curses enhancements over BSD Curses.
160+
161+ The ncurses code was developed under GNU/Linux. It has been in use for
162+ some time with OpenBSD as the system curses library, and on FreeBSD and
163+ NetBSD as an external package. It should port easily to any
164+ ANSI/POSIX-conforming UNIX. It has even been ported to OS/2 Warp!
165165 '';
166−
167− homepage = "https://www.gnu.org/software/ncurses/";
168−
169− license = lib.licenses.mit;
170− platforms = lib.platforms.all;
166+ license = licenses.mit;
167+ platforms = platforms.all;
171168 };
172169
173170 passthru = {
174171 ldflags = "-lncurses";
175− inherit unicode abiVersion;
172+ inherit unicodeSupport abiVersion;
176173 };
177174}
pkgs/development/libraries/opencv/4.x.nix+21−1
@@ -275,7 +275,12 @@ stdenv.mkDerivation {
275275 propagatedBuildInputs = lib.optional enablePython pythonPackages.numpy
276276 ++ lib.optionals enableCuda [ cudatoolkit nvidia-optical-flow-sdk ];
277277
278− nativeBuildInputs = [ cmake pkg-config unzip ];
278+ nativeBuildInputs = [ cmake pkg-config unzip ]
279+ ++ lib.optionals enablePython [
280+ pythonPackages.pip
281+ pythonPackages.wheel
282+ pythonPackages.setuptools
283+ ];
279284
280285 NIX_CFLAGS_COMPILE = lib.optionalString enableEXR "-I${ilmbase.dev}/include/OpenEXR";
281286
@@ -333,6 +338,21 @@ stdenv.mkDerivation {
333338 postInstall = ''
334339 sed -i "s|{exec_prefix}/$out|{exec_prefix}|;s|{prefix}/$out|{prefix}|" \
335340 "$out/lib/pkgconfig/opencv4.pc"
341+ ''
342+ # install python distribution information, so other packages can `import opencv`
343+ + lib.optionalString enablePython ''
344+ pushd $NIX_BUILD_TOP/$sourceRoot/modules/python/package
345+ python -m pip wheel --verbose --no-index --no-deps --no-clean --no-build-isolation --wheel-dir dist .
346+
347+ pushd dist
348+ python -m pip install ./*.whl --no-index --no-warn-script-location --prefix="$out" --no-cache
349+
350+ # the cv2/__init__.py just tries to check provide "nice user feedback" if the installation is bad
351+ # however, this also causes infinite recursion when used by other packages
352+ rm -r $out/${pythonPackages.python.sitePackages}/cv2
353+
354+ popd
355+ popd
336356 '';
337357
338358 passthru = lib.optionalAttrs enablePython { pythonPath = [ ]; };
pkgs/development/libraries/pipewire/default.nix+16−30
@@ -60,16 +60,12 @@
6060}:
6161
6262let
63− fontsConf = makeFontsConf {
64− fontDirectories = [ ];
65− };
66−
67− mesonEnable = b: if b then "enabled" else "disabled";
63+ mesonEnableFeature = b: if b then "enabled" else "disabled";
6864 mesonList = l: "[" + lib.concatStringsSep "," l + "]";
6965
7066 self = stdenv.mkDerivation rec {
7167 pname = "pipewire";
72− version = "0.3.42";
68+ version = "0.3.43";
7369
7470 outputs = [
7571 "out"
@@ -87,7 +83,7 @@ let
8783 owner = "pipewire";
8884 repo = "pipewire";
8985 rev = version;
90− sha256 = "sha256-Iyd5snOt+iCT7W0+FlfvhMUZo/gF+zr9JX4HIGVdHto=";
86+ sha256 = "sha256-vjMA9dQvZe7dPbF9BNtCYf1V240RUBdtxeyqFjWA4j4=";
9187 };
9288
9389 patches = [
@@ -103,15 +99,6 @@ let
10399 ./0090-pipewire-config-template-paths.patch
104100 # Place SPA data files in lib output to avoid dependency cycles
105101 ./0095-spa-data-dir.patch
106− # Fix attempt to put system service units into pkgs.systemd.
107− (fetchpatch {
108− url = "https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/b666edde787b167c6e19b9356257d48007357acc.diff";
109− sha256 = "1pmnyyvrjykr46ld4a5frq3cc739f8h4jwvfj414lyx8c6ybm63s";
110− })
111− (fetchpatch {
112− url = "https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/5054b48c9de655b4b48f7c801cb305d9eb122520.diff";
113− sha256 = "0myhb7h4g7x2nr08dpx8d7nqhsmzp90yanmkvm627r1xxnnr3ivn";
114− })
115102 ];
116103
117104 nativeBuildInputs = [
@@ -159,33 +146,32 @@ let
159146 "-Dinstalled_test_prefix=${placeholder "installedTests"}"
160147 "-Dpipewire_pulse_prefix=${placeholder "pulse"}"
161148 "-Dlibjack-path=${placeholder "jack"}/lib"
162− "-Dlibcamera=${mesonEnable libcameraSupport}"
163− "-Droc=${mesonEnable rocSupport}"
164− "-Dlibpulse=${mesonEnable pulseTunnelSupport}"
165− "-Davahi=${mesonEnable zeroconfSupport}"
166− "-Dgstreamer=${mesonEnable gstreamerSupport}"
149+ "-Dlibcamera=${mesonEnableFeature libcameraSupport}"
150+ "-Droc=${mesonEnableFeature rocSupport}"
151+ "-Dlibpulse=${mesonEnableFeature pulseTunnelSupport}"
152+ "-Davahi=${mesonEnableFeature zeroconfSupport}"
153+ "-Dgstreamer=${mesonEnableFeature gstreamerSupport}"
167154 "-Dsystemd-system-service=enabled"
168− "-Dffmpeg=${mesonEnable ffmpegSupport}"
169− "-Dbluez5=${mesonEnable bluezSupport}"
170− "-Dbluez5-backend-hsp-native=${mesonEnable nativeHspSupport}"
171− "-Dbluez5-backend-hfp-native=${mesonEnable nativeHfpSupport}"
172− "-Dbluez5-backend-ofono=${mesonEnable ofonoSupport}"
173− "-Dbluez5-backend-hsphfpd=${mesonEnable hsphfpdSupport}"
155+ "-Dffmpeg=${mesonEnableFeature ffmpegSupport}"
156+ "-Dbluez5=${mesonEnableFeature bluezSupport}"
157+ "-Dbluez5-backend-hsp-native=${mesonEnableFeature nativeHspSupport}"
158+ "-Dbluez5-backend-hfp-native=${mesonEnableFeature nativeHfpSupport}"
159+ "-Dbluez5-backend-ofono=${mesonEnableFeature ofonoSupport}"
160+ "-Dbluez5-backend-hsphfpd=${mesonEnableFeature hsphfpdSupport}"
174161 "-Dsysconfdir=/etc"
175162 "-Dpipewire_confdata_dir=${placeholder "lib"}/share/pipewire"
176163 "-Dsession-managers="
177164 "-Dvulkan=enabled"
178165 ];
179166
180− FONTCONFIG_FILE = fontsConf; # Fontconfig error: Cannot load default config file
167+ # Fontconfig error: Cannot load default config file
168+ FONTCONFIG_FILE = makeFontsConf { fontDirectories = [ ]; };
181169
182170 doCheck = true;
183171
184172 postUnpack = ''
185− patchShebangs source/doc/strip-static.sh
186173 patchShebangs source/doc/input-filter.sh
187174 patchShebangs source/doc/input-filter-h.sh
188− patchShebangs source/spa/tests/gen-cpp-test.py
189175 '';
190176
191177 postInstall = ''
pkgs/development/libraries/pipewire/wireplumber.nixnew file+82
@@ -0,0 +1,82 @@
1+{ lib
2+, stdenv
3+, fetchFromGitLab
4+, nix-update-script
5+, # base build deps
6+ meson
7+, pkg-config
8+, ninja
9+, # docs build deps
10+ python3
11+, doxygen
12+, graphviz
13+, # GI build deps
14+ gobject-introspection
15+, # runtime deps
16+ glib
17+, systemd
18+, lua5_4
19+, pipewire
20+, # options
21+ enableDocs ? true
22+, enableGI ? stdenv.hostPlatform == stdenv.buildPlatform
23+}:
24+let
25+ mesonEnableFeature = b: if b then "enabled" else "disabled";
26+in
27+stdenv.mkDerivation rec {
28+ pname = "wireplumber";
29+ version = "0.4.6";
30+
31+ outputs = [ "out" "dev" ] ++ lib.optional enableDocs "doc";
32+
33+ src = fetchFromGitLab {
34+ domain = "gitlab.freedesktop.org";
35+ owner = "pipewire";
36+ repo = "wireplumber";
37+ rev = version;
38+ sha256 = "sha256-y+Gj9EZn67W3U81zXgp+6JAFxZSZTwwT0TB3Kueb/Tw=";
39+ };
40+
41+ nativeBuildInputs = [
42+ meson
43+ pkg-config
44+ ninja
45+ ] ++ lib.optionals enableDocs [
46+ graphviz
47+ ] ++ lib.optionals enableGI [
48+ gobject-introspection
49+ ] ++ lib.optionals (enableDocs || enableGI) [
50+ doxygen
51+ (python3.withPackages (ps: with ps;
52+ lib.optionals enableDocs [ sphinx sphinx_rtd_theme breathe ] ++
53+ lib.optionals enableGI [ lxml ]
54+ ))
55+ ];
56+
57+ buildInputs = [
58+ glib
59+ systemd
60+ lua5_4
61+ pipewire
62+ ];
63+
64+ mesonFlags = [
65+ "-Dsystem-lua=true"
66+ "-Delogind=disabled"
67+ "-Ddoc=${mesonEnableFeature enableDocs}"
68+ "-Dintrospection=${mesonEnableFeature enableGI}"
69+ ];
70+
71+ passthru.updateScript = nix-update-script {
72+ attrPath = pname;
73+ };
74+
75+ meta = with lib; {
76+ description = "A modular session / policy manager for PipeWire";
77+ homepage = "https://pipewire.org";
78+ license = licenses.mit;
79+ platforms = platforms.linux;
80+ maintainers = with maintainers; [ k900 ];
81+ };
82+}
pkgs/development/python-modules/django-allauth/default.nix+2−2
@@ -3,14 +3,14 @@
33
44buildPythonPackage rec {
55 pname = "django-allauth";
6− version = "0.40.0";
6+ version = "0.47.0";
77
88 # no tests on PyPI
99 src = fetchFromGitHub {
1010 owner = "pennersr";
1111 repo = pname;
1212 rev = version;
13− sha256 = "10id4k01p1hg5agb8cmllg8mv4kc7ryl75br10idwxabqqp4vla1";
13+ sha256 = "sha256-wKrsute6TCl331UrxNEBf/zTtGnyGHsOZQwdiicbg2o=";
1414 };
1515
1616 propagatedBuildInputs = [ requests requests_oauthlib django python3-openid ];
pkgs/development/python-modules/django-oauth-toolkit/default.nix+43−7
@@ -1,22 +1,58 @@
1−{ lib, buildPythonPackage, fetchFromGitHub
2−, django, requests, oauthlib
1+{ lib
2+, buildPythonPackage
3+, fetchFromGitHub
4+
5+# propagates
6+, django
7+, jwcrypto
8+, requests
9+, oauthlib
10+
11+# tests
12+, djangorestframework
13+, pytest-django
14+, pytest-xdist
15+, pytest-mock
16+, pytestCheckHook
317}:
418
519buildPythonPackage rec {
620 pname = "django-oauth-toolkit";
7− version = "1.2.0";
21+ version = "1.6.1";
22+ format = "setuptools";
823
924 src = fetchFromGitHub {
1025 owner = "jazzband";
1126 repo = pname;
1227 rev = version;
13− sha256 = "1zbksxrcxlqnapmlvx4rgvpqc4plgnq0xnf45cjwzwi1626zs8g6";
28+ sha256 = "sha256-TOrFxQULwiuwpVFqRwRkfTW+GRudLNy6F/gIjUYjZhI=";
1429 };
1530
16− propagatedBuildInputs = [ django requests oauthlib ];
31+ postPatch = ''
32+ sed -i '/cov/d' tox.ini
33+ '';
34+
35+ propagatedBuildInputs = [
36+ django
37+ jwcrypto
38+ oauthlib
39+ requests
40+ ];
41+
42+ DJANGO_SETTINGS_MODULE = "tests.settings";
43+
44+ checkInputs = [
45+ djangorestframework
46+ pytest-django
47+ pytest-xdist
48+ pytest-mock
49+ pytestCheckHook
50+ ];
1751
18− # django.core.exceptions.ImproperlyConfigured: Requested setting OAUTH2_PROVIDER, but settings are not configured. You must either define the environment variable DJANGO_SETTINGS_MODULE or call settings.configure() before accessing settings
19− doCheck = false;
52+ disabledTests = [
53+ # Failed to get a valid response from authentication server. Status code: 404, Reason: Not Found.
54+ "test_response_when_auth_server_response_return_404"
55+ ];
2056
2157 meta = with lib; {
2258 description = "OAuth2 goodies for the Djangonauts";
pkgs/development/python-modules/django_guardian/default.nix+2−2
@@ -1,5 +1,5 @@
11{ lib, buildPythonPackage, fetchPypi
2−, django_environ, mock, django
2+, django-environ, mock, django
33, pytest, pytest-runner, pytest-django
44}:
55buildPythonPackage rec {
@@ -11,7 +11,7 @@ buildPythonPackage rec {
1111 sha256 = "c58a68ae76922d33e6bdc0e69af1892097838de56e93e78a8361090bcd9f89a0";
1212 };
1313
14− checkInputs = [ pytest pytest-runner pytest-django django_environ mock ];
14+ checkInputs = [ pytest pytest-runner pytest-django django-environ mock ];
1515 propagatedBuildInputs = [ django ];
1616
1717 meta = with lib; {
pkgs/development/python-modules/gql/default.nixnew file+77
@@ -0,0 +1,77 @@
1+{ lib
2+, aiofiles
3+, aiohttp
4+, botocore
5+, buildPythonPackage
6+, fetchFromGitHub
7+, graphql-core
8+, mock
9+, parse
10+, pytest-asyncio
11+, pytestCheckHook
12+, pythonOlder
13+, requests
14+, requests-toolbelt
15+, urllib3
16+, vcrpy
17+, websockets
18+, yarl
19+}:
20+
21+buildPythonPackage rec {
22+ pname = "gql";
23+ version = "3.0.0rc0";
24+ format = "setuptools";
25+
26+ disabled = pythonOlder "3.6";
27+
28+ src = fetchFromGitHub {
29+ owner = "graphql-python";
30+ repo = pname;
31+ rev = "v${version}";
32+ hash = "sha256-yr1DyMj/0C9XPTyGdbQbn7nMRKr4JwItFDsqvl/goqU=";
33+ };
34+
35+ propagatedBuildInputs = [
36+ aiohttp
37+ botocore
38+ graphql-core
39+ requests
40+ requests-toolbelt
41+ urllib3
42+ websockets
43+ yarl
44+ ];
45+
46+ checkInputs = [
47+ aiofiles
48+ mock
49+ parse
50+ pytest-asyncio
51+ pytestCheckHook
52+ vcrpy
53+ ];
54+
55+ disabledTests = [
56+ # Tests requires network access
57+ "test_execute_result_error"
58+ "test_http_transport"
59+ ];
60+
61+ disabledTestPaths = [
62+ # Exclude linter tests
63+ "gql-checker/tests/test_flake8_linter.py"
64+ "gql-checker/tests/test_pylama_linter.py"
65+ ];
66+
67+ pythonImportsCheck = [
68+ "gql"
69+ ];
70+
71+ meta = with lib; {
72+ description = "GraphQL client in Python";
73+ homepage = "https://github.com/graphql-python/gql";
74+ license = with licenses; [ mit ];
75+ maintainers = with maintainers; [ fab ];
76+ };
77+}
pkgs/development/python-modules/gradient-utils/default.nix+16−15
@@ -7,6 +7,7 @@
77, poetry-core
88, prometheus-client
99, pytestCheckHook
10+, pythonOlder
1011, requests
1112}:
1213
@@ -15,6 +16,8 @@ buildPythonPackage rec {
1516 version = "0.5.0";
1617 format = "pyproject";
1718
19+ disabled = pythonOlder "3.6";
20+
1821 src = fetchFromGitHub {
1922 owner = "Paperspace";
2023 repo = pname;
@@ -22,15 +25,9 @@ buildPythonPackage rec {
2225 sha256 = "19plkgwwfs6298vjplgsvhirixi3jbngq5y07x9c0fjxk39fa2dk";
2326 };
2427
25− postPatch = ''
26− substituteInPlace pyproject.toml \
27− --replace 'numpy = "1.18.5"' 'numpy = "^1.18.5"' \
28− --replace 'hyperopt = "0.1.2"' 'hyperopt = ">=0.1.2"' \
29− --replace 'wheel = "^0.35.1"' 'wheel = "*"' \
30− --replace 'prometheus-client = ">=0.8,<0.10"' 'prometheus-client = "*"'
31− '';
32−
33− nativeBuildInputs = [ poetry-core ];
28+ nativeBuildInputs = [
29+ poetry-core
30+ ];
3431
3532 propagatedBuildInputs = [
3633 hyperopt
@@ -44,20 +41,24 @@ buildPythonPackage rec {
4441 pytestCheckHook
4542 ];
4643
44+ postPatch = ''
45+ substituteInPlace pyproject.toml \
46+ --replace 'wheel = "^0.35.1"' 'wheel = "*"' \
47+ --replace 'prometheus-client = ">=0.8,<0.10"' 'prometheus-client = "*"'
48+ '';
49+
4750 preCheck = ''
4851 export HOSTNAME=myhost-experimentId
4952 '';
5053
51− disabledTests = [
52− "test_add_metrics_pushes_metrics" # requires a working prometheus push gateway
53− ];
54−
5554 disabledTestPaths = [
56− # needs network access
55+ # Requires a working Prometheus push gateway
5756 "tests/integration/test_metrics.py"
5857 ];
5958
60− pythonImportsCheck = [ "gradient_utils" ];
59+ pythonImportsCheck = [
60+ "gradient_utils"
61+ ];
6162
6263 meta = with lib; {
6364 description = "Python utils and helpers library for Gradient";
pkgs/development/python-modules/gradient/default.nix+13−6
@@ -9,6 +9,7 @@
99, fetchPypi
1010, gradient_statsd
1111, gradient-utils
12+, gql
1213, halo
1314, marshmallow
1415, progressbar2
@@ -22,17 +23,19 @@
2223
2324buildPythonPackage rec {
2425 pname = "gradient";
25− version = "1.9.0";
26+ version = "1.9.1";
27+ format = "setuptools";
2628
2729 src = fetchPypi {
2830 inherit pname version;
29− sha256 = "47be02511d7ea66a13559598851cb435d435fb3f7676f6de17292d06daad8947";
31+ hash = "sha256-zimOh4bc9EQGpqMky/etwnAF04onJ2m/KAl29IaAeAY=";
3032 };
3133
3234 postPatch = ''
3335 substituteInPlace setup.py \
3436 --replace 'attrs<=' 'attrs>=' \
3537 --replace 'colorama==' 'colorama>=' \
38+ --replace 'gql[requests]==3.0.0a6' 'gql' \
3639 --replace 'PyYAML==' 'PyYAML>=' \
3740 --replace 'marshmallow<' 'marshmallow>=' \
3841 --replace 'websocket-client==' 'websocket-client>='
@@ -45,6 +48,7 @@ buildPythonPackage rec {
4548 click-didyoumean
4649 click-help-colors
4750 colorama
51+ gql
4852 gradient_statsd
4953 gradient-utils
5054 halo
@@ -58,17 +62,20 @@ buildPythonPackage rec {
5862 websocket-client
5963 ];
6064
61− # tries to use /homeless-shelter to mimic container usage, etc
65+ # Tries to use /homeless-shelter to mimic container usage, etc
6266 doCheck = false;
6367
68+ # marshmallow.exceptions.StringNotCollectionError: "only" should be a collection of strings.
69+ # Support for marshmallow > 3
70+ # pythonImportsCheck = [
71+ # "gradient"
72+ # ];
73+
6474 meta = with lib; {
6575 description = "The command line interface for Gradient";
6676 homepage = "https://github.com/Paperspace/gradient-cli";
6777 license = licenses.isc;
6878 platforms = platforms.unix;
6979 maintainers = with maintainers; [ thoughtpolice ];
70− # There is no support for click > 8
71− # https://github.com/Paperspace/gradient-cli/issues/368
72− broken = true;
7380 };
7481}
pkgs/development/python-modules/makefun/default.nix+2−2
@@ -7,11 +7,11 @@
77
88buildPythonPackage rec {
99 pname = "makefun";
10− version = "1.13.0";
10+ version = "1.13.1";
1111
1212 src = fetchPypi {
1313 inherit pname version;
14− sha256 = "2c673d2b4f0ef809347513cb45e3b23a04228588af7c9ac859e99247abac516a";
14+ sha256 = "985bb8b670ffbbb95d2a8aa996d318e6e9a3f26fc6f3ef2da93ebdf8f9c616bf";
1515 };
1616
1717 postPatch = ''
pkgs/development/python-modules/oauthlib/default.nix+20−11
@@ -1,31 +1,40 @@
11{ lib
22, buildPythonPackage
33, fetchFromGitHub
4−, mock
5−, pytest
6−, cryptography
4+
5+# propagates
76, blinker
7+, cryptography
88, pyjwt
9+
10+# test
11+, mock
12+, pytestCheckHook
913}:
1014
1115buildPythonPackage rec {
1216 pname = "oauthlib";
13− version = "unstable-2020-05-08";
17+ version = "3.1.1";
18+ format = "setuptools";
1419
1520 # master supports pyjwt==1.7.1
1621 src = fetchFromGitHub {
1722 owner = pname;
1823 repo = pname;
19− rev = "46647402896db5f0d979eba9594623e889739060";
20− sha256 = "1wrdjdvlfcd74lckcgascnasrffg8sip0z673si4ag5kv4afiz3l";
24+ rev = "v${version}";
25+ hash = "sha256:1bgxpzh11i0x7h9py3a29cz5z714b3p498b62znnn5ciy0cr80sv";
2126 };
2227
23− checkInputs = [ mock pytest ];
24− propagatedBuildInputs = [ cryptography blinker pyjwt ];
28+ propagatedBuildInputs = [
29+ blinker
30+ cryptography
31+ pyjwt
32+ ];
2533
26− checkPhase = ''
27− py.test tests/
28− '';
34+ checkInputs = [
35+ mock
36+ pytestCheckHook
37+ ];
2938
3039 meta = with lib; {
3140 homepage = "https://github.com/idan/oauthlib";
pkgs/development/python-modules/pydub/default.nix+24−13
@@ -1,8 +1,18 @@
1−{ lib, stdenv, buildPythonPackage, fetchFromGitHub, scipy, ffmpeg-full }:
1+{ lib
2+, stdenv
3+, buildPythonPackage
4+, fetchFromGitHub
5+
6+# tests
7+, ffmpeg-full
8+, python
9+}:
210
311buildPythonPackage rec {
412 pname = "pydub";
513 version = "0.25.1";
14+ format = "setuptools";
15+
616 # pypi version doesn't include required data files for tests
717 src = fetchFromGitHub {
818 owner = "jiaaro";
@@ -11,23 +21,24 @@ buildPythonPackage rec {
1121 sha256 = "0xskllq66wqndjfmvp58k26cv3w480sqsil6ifwp4gghir7hqc8m";
1222 };
1323
24+ pythonImportsCheck = [
25+ "pydub"
26+ "pydub.audio_segment"
27+ "pydub.playback"
28+ ];
1429
15− # disable a test that fails on aarch64 due to rounding errors
16− postPatch = lib.optionalString stdenv.isAarch64 ''
17− substituteInPlace test/test.py \
18− --replace "test_overlay_with_gain_change" "notest_overlay_with_gain_change"
19− '';
20−
21− checkInputs = [ scipy ffmpeg-full ];
30+ checkInputs = [
31+ ffmpeg-full
32+ ];
2233
2334 checkPhase = ''
24− python test/test.py
35+ ${python.interpreter} test/test.py
2536 '';
2637
2738 meta = with lib; {
28− description = "Manipulate audio with a simple and easy high level interface.";
29− homepage = "http://pydub.com/";
30− license = licenses.mit;
31− platforms = platforms.all;
39+ description = "Manipulate audio with a simple and easy high level interface";
40+ homepage = "http://pydub.com";
41+ license = licenses.mit;
42+ maintainers = with maintainers; [ hexa ];
3243 };
3344}
pkgs/development/python-modules/pylgnetcast/default.nix+2−2
@@ -7,7 +7,7 @@
77
88buildPythonPackage rec {
99 pname = "pylgnetcast";
10− version = "0.3.5";
10+ version = "0.3.7";
1111 format = "setuptools";
1212
1313 disabled = pythonOlder "3.6";
@@ -16,7 +16,7 @@ buildPythonPackage rec {
1616 owner = "Drafteed";
1717 repo = "python-lgnetcast";
1818 rev = "v${version}";
19− sha256 = "11g7ya4ppqxjiv3fkz9mi6h1afw9icy6xyn4jzm63kjvxqhrwnw4";
19+ sha256 = "0pmz52k2sfxj5x2wcwdjks2lqh1gb5zfrjgc6xij8jal4l9xd2dz";
2020 };
2121
2222 propagatedBuildInputs = [
pkgs/development/python-modules/pynetbox/default.nix+2−2
@@ -10,13 +10,13 @@
1010
1111buildPythonPackage rec {
1212 pname = "pynetbox";
13− version = "6.4.1";
13+ version = "6.5.0";
1414
1515 src = fetchFromGitHub {
1616 owner = "netbox-community";
1717 repo = pname;
1818 rev = "v${version}";
19− sha256 = "08k2zxfz23gzbk49r3hmh6r3m5rgx1gk7w83qxi1v4gbm4wr0v9m";
19+ sha256 = "1fk64bi7aswsmfqsciamml2wydgfg464h6i7479xfim4mwmkkik4";
2020 };
2121
2222 SETUPTOOLS_SCM_PRETEND_VERSION = version;
pkgs/development/python-modules/pytest-cases/default.nix+2−2
@@ -10,14 +10,14 @@
1010
1111buildPythonPackage rec {
1212 pname = "pytest-cases";
13− version = "3.6.7";
13+ version = "3.6.8";
1414 format = "setuptools";
1515
1616 disabled = pythonOlder "3.6";
1717
1818 src = fetchPypi {
1919 inherit pname version;
20− sha256 = "sha256-ZUAXmIww/tdm7nDAj2VDXq0B6raHeDX1ywxnnv3EVIE=";
20+ sha256 = "d423e87b30e1080cc162d86c72bfa35861cccfe3539125e81c68ba142ab974bc";
2121 };
2222
2323 nativeBuildInputs = [
pkgs/development/tools/kubepug/default.nix+8−6
@@ -1,23 +1,25 @@
1−{ lib, buildGoModule, fetchFromGitHub }:
1+{ lib, buildGo117Module, fetchFromGitHub }:
22
3−buildGoModule rec {
3+buildGo117Module rec {
44 pname = "kubepug";
5− version = "1.2.2";
5+ version = "1.3.2";
66
77 src = fetchFromGitHub {
88 owner = "rikatz";
99 repo = "kubepug";
1010 rev = "v${version}";
11− sha256 = "sha256-jQ/LzwxYxfCKiu+2VhjQ3YWwLEqZkYrH7+olBOMUA1A=";
11+ sha256 = "sha256-cjL718xTgtYev/lYL24vwZcB+joY3wIY4ixRCwAHQ4E=";
1212 };
1313
14− vendorSha256 = "sha256-P5HoU9AAGFrSrp9iymjW+r8w5L90KUOrmaXM8p+Wn44=";
14+ vendorSha256 = "0hynxj3q4aa1gx3w4ak56z6j5iplxi2hzqzsjkgz20fy34nfd41s";
1515
1616 ldflags = [
1717 "-s" "-w" "-X=github.com/rikatz/kubepug/version.Version=${src.rev}"
1818 ];
1919
20− subPackages = [ "cmd/kubepug.go" ];
20+ patches = [
21+ ./skip-external-network-tests.patch
22+ ];
2123
2224 meta = with lib; {
2325 description = "Checks a Kubernetes cluster for objects using deprecated API versions";
pkgs/development/tools/kubepug/skip-external-network-tests.patchnew file+12
@@ -0,0 +1,12 @@
1+diff --git a/pkg/utils/downloader_test.go b/pkg/utils/downloader_test.go
2+index b227760..b72dee9 100644
3+--- a/pkg/utils/downloader_test.go
4++++ b/pkg/utils/downloader_test.go
5+@@ -7,6 +7,7 @@ import (
6+ )
7+
8+ func TestDownloadSwaggerFile(t *testing.T) {
9++ t.Skipf("Nix sandbox does not have networking")
10+ var tmpdir string
11+ // Github actions does not have a temporary dir :/
12+ tmpdir = os.Getenv("RUNNER_TEMP")
pkgs/development/tools/rust/cargo-llvm-lines/default.nix+3−3
@@ -2,16 +2,16 @@
22
33rustPlatform.buildRustPackage rec {
44 pname = "cargo-llvm-lines";
5− version = "0.4.12";
5+ version = "0.4.13";
66
77 src = fetchFromGitHub {
88 owner = "dtolnay";
99 repo = pname;
1010 rev = version;
11− sha256 = "sha256-D4blt8kGD0mxysedRMZo/VNfwfYdJs8T2zoNjHRi0ng=";
11+ sha256 = "sha256-sN0i2oo0XuxneIK/w+jpxkcdm2rtqhyH2Y3CMPnH+ro=";
1212 };
1313
14− cargoSha256 = "sha256-H2APBu9oHmtRGSB+VQT9V5C36awPy8fi6A2Qf1RsIbU=";
14+ cargoSha256 = "sha256-Gv7C4NFThNawhT+IYO0ZbpOh6w/yPeIJKZjzTyM/GJw=";
1515
1616 meta = with lib; {
1717 description = "Count the number of lines of LLVM IR across all instantiations of a generic function";
pkgs/misc/uboot/default.nix+20
@@ -352,6 +352,26 @@ in {
352352 filesToInstall = ["u-boot.bin"];
353353 };
354354
355+ ubootQemuX86 = buildUBoot {
356+ defconfig = "qemu-x86_defconfig";
357+ extraConfig = ''
358+ CONFIG_USB_UHCI_HCD=y
359+ CONFIG_USB_EHCI_HCD=y
360+ CONFIG_USB_EHCI_GENERIC=y
361+ CONFIG_USB_XHCI_HCD=y
362+ '';
363+ extraPatches = [
364+ # https://patchwork.ozlabs.org/project/uboot/list/?series=268007&state=%2A&archive=both
365+ # Remove when upgrading to 2022.01
366+ (fetchpatch {
367+ url = "https://patchwork.ozlabs.org/series/268007/mbox/";
368+ sha256 = "sha256-xn4Q959dgoB63zlmJepI41AXAf1kCycIGcmu4IIVjmE=";
369+ })
370+ ];
371+ extraMeta.platforms = [ "i686-linux" "x86_64-linux" ];
372+ filesToInstall = [ "u-boot.rom" ];
373+ };
374+
355375 ubootRaspberryPi = buildUBoot {
356376 defconfig = "rpi_defconfig";
357377 extraMeta.platforms = ["armv6l-linux"];
pkgs/misc/vscode-extensions/default.nix+9−4
@@ -1285,11 +1285,16 @@ let
12851285 mktplcRef = {
12861286 name = "color-highlight";
12871287 publisher = "naumovs";
1288− version = "2.3.0";
1289− sha256 = "1syzf43ws343z911fnhrlbzbx70gdn930q67yqkf6g0mj8lf2za2";
1288+ version = "2.5.0";
1289+ sha256 = "sha256-dYMDV84LEGXUjt/fbsSy3BVM5SsBHcPaDDll8KjPIWY=";
12901290 };
1291− meta = {
1292− license = lib.licenses.mit;
1291+ meta = with lib; {
1292+ changelog = "https://marketplace.visualstudio.com/items/naumovs.color-highlight/changelog";
1293+ description = "Highlight web colors in your editor";
1294+ downloadPage = "https://marketplace.visualstudio.com/items?itemName=naumovs.color-highlight";
1295+ homepage = "https://github.com/enyancc/vscode-ext-color-highlight";
1296+ license = licenses.gpl3Only;
1297+ maintainers = with maintainers; [ datafoo ];
12931298 };
12941299 };
12951300
pkgs/misc/vscode-extensions/terraform/default.nix+2−2
@@ -3,8 +3,8 @@ vscode-utils.buildVscodeMarketplaceExtension rec {
33 mktplcRef = {
44 name = "terraform";
55 publisher = "hashicorp";
6− version = "2.17.0";
7− sha256 = "sha256-IZlw1lYibbBw3rcSiWEKP8rObxnMCE1ppogwmigNgwE=";
6+ version = "2.18.0";
7+ sha256 = "sha256-jQ4fwsAwuGDbfSb/qCV58ETtH+2e7zD/jGISGNYPxZk=";
88 };
99
1010 patches = [ ./fix-terraform-ls.patch ];
pkgs/os-specific/linux/kernel/hardened/patches.json+15−15
@@ -2,22 +2,22 @@
22 "4.14": {
33 "patch": {
44 "extra": "-hardened1",
5− "name": "linux-hardened-4.14.260-hardened1.patch",
6− "sha256": "13r6lx3rcbaz2wvhwa950gsjharzq1n61bl9l3nm8v66j7gab3l0",
7− "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.260-hardened1/linux-hardened-4.14.260-hardened1.patch"
5+ "name": "linux-hardened-4.14.261-hardened1.patch",
6+ "sha256": "0m5bb9lpaxw1kq01s9hqsxkmmsyj4ag8s5swrgdca1cf6q84r7bb",
7+ "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.261-hardened1/linux-hardened-4.14.261-hardened1.patch"
88 },
9− "sha256": "1bylxn6hsq17cann2w02ggz6xz3b3synrapcwlwfcfydf71hzj9f",
10− "version": "4.14.260"
9+ "sha256": "08s7idxpsjb29ccj0gkrj87xhbdqj9nc417qc7gd2kmbjd6amymz",
10+ "version": "4.14.261"
1111 },
1212 "4.19": {
1313 "patch": {
1414 "extra": "-hardened1",
15− "name": "linux-hardened-4.19.223-hardened1.patch",
16− "sha256": "1jrg8fkb8kc3m1zcgyw99mnmgvyxi3yp33x9jh1s4babxcr7w4g3",
17− "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.223-hardened1/linux-hardened-4.19.223-hardened1.patch"
15+ "name": "linux-hardened-4.19.224-hardened1.patch",
16+ "sha256": "0sma7hwznyf8h3fr7r63nbfb85120nz8xq95ynp6m0lxayj5alxs",
17+ "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.224-hardened1/linux-hardened-4.19.224-hardened1.patch"
1818 },
19− "sha256": "1cnjk49g8sxsbzk375ji47lnx36drqh1x2pbfiqdwgrbjcb043sz",
20− "version": "4.19.223"
19+ "sha256": "0c8h457n52qzpw4kgr16ndhsl35si99amc6fadb31fy32csgrk01",
20+ "version": "4.19.224"
2121 },
2222 "5.10": {
2323 "patch": {
@@ -42,11 +42,11 @@
4242 "5.4": {
4343 "patch": {
4444 "extra": "-hardened1",
45− "name": "linux-hardened-5.4.169-hardened1.patch",
46− "sha256": "19mghwh66rmbjd7i0hxhysabarpz8l4wadw8schwc8q9kxy33py4",
47− "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.169-hardened1/linux-hardened-5.4.169-hardened1.patch"
45+ "name": "linux-hardened-5.4.170-hardened1.patch",
46+ "sha256": "0sy1114vw8lrbf4a1p3skg67am1f9bvl15d81mplx2bd98cpx0y8",
47+ "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.170-hardened1/linux-hardened-5.4.170-hardened1.patch"
4848 },
49− "sha256": "068sw1p50vcygi422bfjpahf2fxy3ifyp4ljnkwxbbvibzcq4hsm",
50− "version": "5.4.169"
49+ "sha256": "0b1qdmp2q0lpngfvvnwb248cnqn9akk2z4xawrfwziszrzh797xh",
50+ "version": "5.4.170"
5151 }
5252}
pkgs/os-specific/linux/kernel/linux-4.14.nix+2−2
@@ -3,7 +3,7 @@
33with lib;
44
55buildLinux (args // rec {
6− version = "4.14.260";
6+ version = "4.14.261";
77
88 # modDirVersion needs to be x.y.z, will automatically add .0 if needed
99 modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
1313
1414 src = fetchurl {
1515 url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
16− sha256 = "1bylxn6hsq17cann2w02ggz6xz3b3synrapcwlwfcfydf71hzj9f";
16+ sha256 = "08s7idxpsjb29ccj0gkrj87xhbdqj9nc417qc7gd2kmbjd6amymz";
1717 };
1818} // (args.argsOverride or {}))
pkgs/os-specific/linux/kernel/linux-4.19.nix+2−2
@@ -3,7 +3,7 @@
33with lib;
44
55buildLinux (args // rec {
6− version = "4.19.223";
6+ version = "4.19.224";
77
88 # modDirVersion needs to be x.y.z, will automatically add .0 if needed
99 modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
1313
1414 src = fetchurl {
1515 url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
16− sha256 = "1cnjk49g8sxsbzk375ji47lnx36drqh1x2pbfiqdwgrbjcb043sz";
16+ sha256 = "0c8h457n52qzpw4kgr16ndhsl35si99amc6fadb31fy32csgrk01";
1717 };
1818} // (args.argsOverride or {}))
pkgs/os-specific/linux/kernel/linux-4.4.nix+2−2
@@ -1,12 +1,12 @@
11{ buildPackages, fetchurl, perl, buildLinux, nixosTests, stdenv, ... } @ args:
22
33buildLinux (args // rec {
4− version = "4.4.297";
4+ version = "4.4.298";
55 extraMeta.branch = "4.4";
66 extraMeta.broken = stdenv.isAarch64;
77
88 src = fetchurl {
99 url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
10− sha256 = "116346nkbhaz8jc1118gh40y6pw1kq7c7hm74f8bjga1p0gjqn0c";
10+ sha256 = "1q56ch8p53in5rl5i7mvsyf0jimchrh48w3l416x3yi0n5cyvjc6";
1111 };
1212} // (args.argsOverride or {}))
pkgs/os-specific/linux/kernel/linux-4.9.nix+2−2
@@ -1,12 +1,12 @@
11{ buildPackages, fetchurl, perl, buildLinux, nixosTests, stdenv, ... } @ args:
22
33buildLinux (args // rec {
4− version = "4.9.295";
4+ version = "4.9.296";
55 extraMeta.branch = "4.9";
66 extraMeta.broken = stdenv.isAarch64;
77
88 src = fetchurl {
99 url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz";
10− sha256 = "095am71hl7qryrcn1blvxsq5zsy0gixmj7062p7vvz5ypcvqcd52";
10+ sha256 = "1a5ws21dk5wp397zmd7msl4zbhzm2xxgbxd09wrdcwilpv4dnjzx";
1111 };
1212} // (args.argsOverride or {}))
pkgs/os-specific/linux/kernel/linux-5.10.nix+2−2
@@ -3,7 +3,7 @@
33with lib;
44
55buildLinux (args // rec {
6− version = "5.10.89";
6+ version = "5.10.90";
77
88 # modDirVersion needs to be x.y.z, will automatically add .0 if needed
99 modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
1313
1414 src = fetchurl {
1515 url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
16− sha256 = "0c5v8fsv9sazdmdw4m1canm54x2p8777yavxq2gcpw8q98d8n8cj";
16+ sha256 = "0997ijkmvf9iz4hn8m8naiagphhyvl4r6qx4q3gxk8qlq1j44pll";
1717 };
1818} // (args.argsOverride or {}))
pkgs/os-specific/linux/kernel/linux-5.15.nix+2−2
@@ -3,7 +3,7 @@
33with lib;
44
55buildLinux (args // rec {
6− version = "5.15.12";
6+ version = "5.15.13";
77
88 # modDirVersion needs to be x.y.z, will automatically add .0 if needed
99 modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
1313
1414 src = fetchurl {
1515 url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
16− sha256 = "182iwy2288layl2290cxla0k6y436lxlx43yaa8par325dviksbx";
16+ sha256 = "0shmrx33crnhi0wr5v6ly85pza1mmdcm8arkrdzf6plz5xm1n4qa";
1717 };
1818} // (args.argsOverride or { }))
pkgs/os-specific/linux/kernel/linux-5.4.nix+2−2
@@ -3,7 +3,7 @@
33with lib;
44
55buildLinux (args // rec {
6− version = "5.4.169";
6+ version = "5.4.170";
77
88 # modDirVersion needs to be x.y.z, will automatically add .0 if needed
99 modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg;
@@ -13,6 +13,6 @@ buildLinux (args // rec {
1313
1414 src = fetchurl {
1515 url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz";
16− sha256 = "068sw1p50vcygi422bfjpahf2fxy3ifyp4ljnkwxbbvibzcq4hsm";
16+ sha256 = "0b1qdmp2q0lpngfvvnwb248cnqn9akk2z4xawrfwziszrzh797xh";
1717 };
1818} // (args.argsOverride or {}))
pkgs/os-specific/linux/kernel/linux-rt-5.10.nix+3−3
@@ -6,7 +6,7 @@
66, ... } @ args:
77
88let
9− version = "5.10.87-rt59"; # updated by ./update-rt.sh
9+ version = "5.10.90-rt60"; # updated by ./update-rt.sh
1010 branch = lib.versions.majorMinor version;
1111 kversion = builtins.elemAt (lib.splitString "-" version) 0;
1212in buildLinux (args // {
@@ -18,14 +18,14 @@ in buildLinux (args // {
1818
1919 src = fetchurl {
2020 url = "mirror://kernel/linux/kernel/v5.x/linux-${kversion}.tar.xz";
21− sha256 = "0jz6xhph7x0x11cjmypaw5gh8z4d53dcgx2gmg7k6d06ydq8n4h3";
21+ sha256 = "0997ijkmvf9iz4hn8m8naiagphhyvl4r6qx4q3gxk8qlq1j44pll";
2222 };
2323
2424 kernelPatches = let rt-patch = {
2525 name = "rt";
2626 patch = fetchurl {
2727 url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz";
28− sha256 = "04sr3n3ilvqq0dl59l92qmn3p7fjlsxxvbs3qls7b4pncb2xyyj3";
28+ sha256 = "0533s01ckjjw45b08zs9nhpszdcrqgfpwvnjs2dfjmc6yg9d13pi";
2929 };
3030 }; in [ rt-patch ] ++ kernelPatches;
3131
pkgs/os-specific/linux/nixos-rebuild/default.nix+1−2
@@ -3,7 +3,6 @@
33, coreutils
44, gnused
55, gnugrep
6−, jq
76, nix
87, lib
98}:
@@ -19,5 +18,5 @@ substituteAll {
1918 nix_x86_64_linux = fallback.x86_64-linux;
2019 nix_i686_linux = fallback.i686-linux;
2120 nix_aarch64_linux = fallback.aarch64-linux;
22− path = lib.makeBinPath [ coreutils jq gnused gnugrep ];
21+ path = lib.makeBinPath [ coreutils gnused gnugrep ];
2322}
pkgs/os-specific/linux/nixos-rebuild/nixos-rebuild.sh−5
@@ -343,11 +343,6 @@ if [[ -n $flake ]]; then
343343 fi
344344fi
345345
346−# Resolve the flake.
347−if [[ -n $flake ]]; then
348− flake=$(nix "${flakeFlags[@]}" flake metadata --json "${extraBuildFlags[@]}" "${lockFlags[@]}" -- "$flake" | jq -r .url)
349−fi
350−
351346# Find configuration.nix and open editor instead of building.
352347if [ "$action" = edit ]; then
353348 if [[ -z $flake ]]; then
pkgs/servers/etcd/default.nix → pkgs/servers/etcd/3.3.nixrenamed

The content is the same.

pkgs/servers/web-apps/wordpress/default.nix+2−2
@@ -2,11 +2,11 @@
22
33stdenv.mkDerivation rec {
44 pname = "wordpress";
5− version = "5.8.2";
5+ version = "5.8.3";
66
77 src = fetchurl {
88 url = "https://wordpress.org/${pname}-${version}.tar.gz";
9− sha256 = "sha256-o9KeTmZXTHtqa/Z2KOo1n6gVCFuna42dFrvf9OBC8v8=";
9+ sha256 = "sha256-1OuhoP+QRZrbdThI/npWbOchLR3MnrH7+lFRf5oVPaU=";
1010 };
1111
1212 installPhase = ''
pkgs/tools/misc/dialog/default.nix+1−1
@@ -8,7 +8,7 @@
88}:
99
1010assert withLibrary -> libtool != null;
11−assert unicodeSupport -> ncurses.unicode && ncurses != null;
11+assert unicodeSupport -> ncurses.unicodeSupport && ncurses != null;
1212
1313stdenv.mkDerivation rec {
1414 pname = "dialog";
pkgs/tools/misc/spigot/default.nix+34−16
@@ -1,36 +1,54 @@
11{ lib
22, stdenv
3−, buildPackages
4−, fetchgit
5−, autoreconfHook
3+, fetchurl
4+, cmake
65, gmp
7−, ncurses
86, halibut
7+, ncurses
98, perl
109}:
1110
1211stdenv.mkDerivation rec {
1312 pname = "spigot";
14− version = "20200901";
15− src = fetchgit {
16− url = "https://git.tartarus.org/simon/spigot.git";
17− rev = "9910e5bdc203bae6b7bbe1ed4a93f13755c1cae";
18− sha256 = "1az6v9gk0g2k197lr288nmr9jv20bvgc508vn9ic3v7mav7hf5bf";
13+ version = "20210527";
14+ srcVersion = "20210527.7dd3cfd";
15+
16+ src = fetchurl {
17+ url = "https://www.chiark.greenend.org.uk/~sgtatham/spigot/${pname}-${srcVersion}.tar.gz";
18+ hash = "sha256-EBS3lgfLtsyBQ8mzoJPyZhRBJNmkVSeF5XecGgcvqtw=";
1919 };
2020
21− nativeBuildInputs = [ autoreconfHook halibut perl ];
21+ nativeBuildInputs = [
22+ cmake
23+ halibut
24+ perl
25+ ];
2226
23− configureFlags = [ "--with-gmp" ];
27+ buildInputs = [
28+ gmp
29+ ncurses
30+ ];
2431
25− buildInputs = [ gmp ncurses ];
32+ outputs = [ "out" "man" ];
2633
2734 strictDeps = true;
2835
36+ doInstallCheck = true;
37+ installCheckPhase = ''
38+ runHook preInstallCheck
39+
40+ [ `$out/bin/spigot -b 10 -d 10 e` == "2.7182818284" ] || exit 1
41+ [ `$out/bin/spigot -b 10 -d 10 pi` == "3.1415926535" ] || exit 1
42+ [ `$out/bin/spigot -b 10 -d 10 sqrt\(2\)` == "1.4142135623" ] || exit 1
43+
44+ runHook postInstallCheck
45+ '';
46+
2947 meta = with lib; {
30− description = "A command-line exact real calculator";
3148 homepage = "https://www.chiark.greenend.org.uk/~sgtatham/spigot/";
32− license = lib.licenses.mit;
33− platforms = lib.platforms.all;
34− maintainers = with maintainers; [ mcbeth ];
49+ description = "A command-line exact real calculator";
50+ license = licenses.mit;
51+ maintainers = with maintainers; [ AndersonTorres mcbeth ];
52+ platforms = platforms.unix;
3553 };
3654}
pkgs/tools/security/exploitdb/default.nix+2−2
@@ -2,13 +2,13 @@
22
33stdenv.mkDerivation rec {
44 pname = "exploitdb";
5− version = "2021-12-21";
5+ version = "2022-01-06";
66
77 src = fetchFromGitHub {
88 owner = "offensive-security";
99 repo = pname;
1010 rev = version;
11− sha256 = "sha256-HTs8dGDSYU/Ih/8CS+4C4AtERxQHwlmpfrA0YrrKoyY=";
11+ sha256 = "sha256-SvzrUVuOzqcc4YzBYxuE8S0tFNb2Pr2FEj8KSpuKKGU=";
1212 };
1313
1414 nativeBuildInputs = [ makeWrapper ];
pkgs/tools/system/fio/default.nix+9−4
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
1616 buildInputs = [ python3 zlib ]
1717 ++ lib.optional (!stdenv.isDarwin) libaio;
1818
19− nativeBuildInputs = [ makeWrapper ];
19+ nativeBuildInputs = [ makeWrapper python3.pkgs.wrapPython ];
2020
2121 strictDeps = true;
2222
@@ -29,9 +29,14 @@ stdenv.mkDerivation rec {
2929 substituteInPlace tools/plot/fio2gnuplot --replace /usr/share/fio $out/share/fio
3030 '';
3131
32− postInstall = lib.optionalString withGnuplot ''
33− wrapProgram $out/bin/fio2gnuplot \
34− --prefix PATH : ${lib.makeBinPath [ gnuplot ]}
32+ pythonPath = [ python3.pkgs.six ];
33+
34+ makeWrapperArgs = lib.optional withGnuplot [
35+ "--prefix PATH : ${lib.makeBinPath [ gnuplot ]}"
36+ ];
37+
38+ postInstall = ''
39+ wrapPythonProgramsIn "$out/bin" "$out $pythonPath"
3540 '';
3641
3742 meta = with lib; {
pkgs/tools/system/netdata/default.nix+2−2
@@ -16,14 +16,14 @@ with lib;
1616let
1717 go-d-plugin = callPackage ./go.d.plugin.nix {};
1818in stdenv.mkDerivation rec {
19− version = "1.31.0";
19+ version = "1.32.1";
2020 pname = "netdata";
2121
2222 src = fetchFromGitHub {
2323 owner = "netdata";
2424 repo = "netdata";
2525 rev = "v${version}";
26− sha256 = "0735cxmljrp8zlkcq7hcxizy4j4xiv7vf782zkz5chn06n38mcik";
26+ sha256 = "sha256-DbuR3x7d6synJELOxI+frK4LY9zFgPKmY7hGY8B5z7o=";
2727 fetchSubmodules = true;
2828 };
2929
pkgs/tools/system/netdata/go.d.plugin.nix+3−3
@@ -2,16 +2,16 @@
22
33buildGoModule rec {
44 pname = "netdata-go.d.plugin";
5− version = "0.28.1";
5+ version = "0.31.0";
66
77 src = fetchFromGitHub {
88 owner = "netdata";
99 repo = "go.d.plugin";
1010 rev = "v${version}";
11− sha256 = "0i77nvqi3dcby0gr3b06bai170q2ibp5390qfjijrk1yqz6x6sd5";
11+ sha256 = "sha256-wS8+C03K/qn8zKIAQvZ7nF7CmFfIvKU/dtm80bTeniM=";
1212 };
1313
14− vendorSha256 = "1q8z4smaxzqd5iwvbnkkr33c3b94rjwa3xjirwlr595g0wn93wc7";
14+ vendorSha256 = "sha256-17/f6tAxDD5TgjmwnqAlnQSxDhnFidjsN55/sUMDej8=";
1515
1616 doCheck = false;
1717
pkgs/tools/system/netdata/no-files-in-etc-and-var.patch+18−6
@@ -25,10 +25,10 @@ index 03c7f0a94..01985db01 100644
2525
2626 chartsconfigdir=$(libconfigdir)/charts.d
2727diff --git a/collectors/ebpf.plugin/Makefile.am b/collectors/ebpf.plugin/Makefile.am
28−index 18b1fc6c8..b4b0c7852 100644
28+index 2d5f92a6b..8b11c7502 100644
2929--- a/collectors/ebpf.plugin/Makefile.am
3030+++ b/collectors/ebpf.plugin/Makefile.am
31−@@ -13,7 +13,7 @@ SUFFIXES = .in
31+@@ -9,7 +9,7 @@ SUFFIXES = .in
3232 userebpfconfigdir=$(configdir)/ebpf.d
3333
3434 # Explicitly install directories to avoid permission issues due to umask
@@ -36,7 +36,7 @@ index 18b1fc6c8..b4b0c7852 100644
3636+no-install-exec-local:
3737 $(INSTALL) -d $(DESTDIR)$(userebpfconfigdir)
3838
39− dist_plugins_SCRIPTS = \
39+ dist_noinst_DATA = \
4040diff --git a/collectors/node.d.plugin/Makefile.am b/collectors/node.d.plugin/Makefile.am
4141index c3142d433..95e324455 100644
4242--- a/collectors/node.d.plugin/Makefile.am
@@ -75,7 +75,7 @@ index 71f2d468d..2c9ced2bf 100644
7575+no-install-exec-local:
7676 $(INSTALL) -d $(DESTDIR)$(userstatsdconfigdir)
7777diff --git a/health/Makefile.am b/health/Makefile.am
78−index b963ea0cd..6979e69bf 100644
78+index 349b86d61..514f1874f 100644
7979--- a/health/Makefile.am
8080+++ b/health/Makefile.am
8181@@ -19,7 +19,7 @@ dist_userhealthconfig_DATA = \
@@ -88,16 +88,28 @@ index b963ea0cd..6979e69bf 100644
8888
8989 healthconfigdir=$(libconfigdir)/health.d
9090diff --git a/system/Makefile.am b/system/Makefile.am
91−index 5323738c9..06e1b6a73 100644
91+index a88ccab65..bda6ee2b6 100644
9292--- a/system/Makefile.am
9393+++ b/system/Makefile.am
94−@@ -20,11 +20,10 @@ include $(top_srcdir)/build/subst.inc
94+@@ -3,7 +3,6 @@
95+
96+ MAINTAINERCLEANFILES = $(srcdir)/Makefile.in
97+ CLEANFILES = \
98+- edit-config \
99+ netdata-openrc \
100+ netdata.logrotate \
101+ netdata.service \
102+@@ -20,15 +19,13 @@ include $(top_srcdir)/build/subst.inc
95103 SUFFIXES = .in
96104
97105 dist_config_SCRIPTS = \
98106- edit-config \
99107 $(NULL)
100108
109+ dist_config_DATA = \
110+- .install-type \
111+ $(NULL)
112+
101113 # Explicitly install directories to avoid permission issues due to umask
102114-install-exec-local:
103115+no-install-exec-local:
pkgs/top-level/all-packages.nix+6−1
@@ -13762,6 +13762,7 @@ with pkgs;
1376213762 pipewire = callPackage ../development/libraries/pipewire {};
1376313763 pipewire-media-session = callPackage ../development/libraries/pipewire/media-session.nix {};
1376413764 pipewire_0_2 = callPackage ../development/libraries/pipewire/0.2.nix {};
13765+ wireplumber = callPackage ../development/libraries/pipewire/wireplumber.nix {};
1376513766
1376613767 pyradio = callPackage ../applications/audio/pyradio {};
1376713768
@@ -20936,7 +20937,8 @@ with pkgs;
2093620937 gn = gn1924;
2093720938 };
2093820939
20939− etcd = callPackage ../servers/etcd { };
20940+ etcd = etcd_3_3;
20941+ etcd_3_3 = callPackage ../servers/etcd/3.3.nix { };
2094020942 etcd_3_4 = callPackage ../servers/etcd/3.4.nix { };
2094120943
2094220944 ejabberd = callPackage ../servers/xmpp/ejabberd { };
@@ -23045,6 +23047,7 @@ with pkgs;
2304523047 ubootQemuAarch64
2304623048 ubootQemuArm
2304723049 ubootQemuRiscv64Smode
23050+ ubootQemuX86
2304823051 ubootRaspberryPi
2304923052 ubootRaspberryPi2
2305023053 ubootRaspberryPi3_32bit
@@ -23447,6 +23450,8 @@ with pkgs;
2344723450
2344823451 go-font = callPackage ../data/fonts/go-font { };
2344923452
23453+ graphite-gtk-theme = callPackage ../data/themes/graphite { };
23454+
2345023455 greybird = callPackage ../data/themes/greybird { };
2345123456
2345223457 gruvbox-dark-gtk = callPackage ../data/themes/gruvbox-dark-gtk { };
pkgs/top-level/python-aliases.nix+1
@@ -44,6 +44,7 @@ mapAliases ({
4444 diff_cover = diff-cover; # added 2021-07-02
4545 discogs_client = discogs-client; # added 2021-07-02
4646 djangorestframework-jwt = drf-jwt; # added 2021-07-20
47+ django_environ = django-environ; # added 2021-12-25
4748 django_redis = django-redis; # added 2021-10-11
4849 django_taggit = django-taggit; # added 2021-10-11
4950 dns = dnspython; # added 2017-12-10
pkgs/top-level/python-packages.nix+3−1
@@ -2208,7 +2208,7 @@ in {
22082208
22092209 django-dynamic-preferences = callPackage ../development/python-modules/django-dynamic-preferences { };
22102210
2211− django_environ = callPackage ../development/python-modules/django_environ { };
2211+ django-environ = callPackage ../development/python-modules/django_environ { };
22122212
22132213 django_extensions = callPackage ../development/python-modules/django-extensions { };
22142214
@@ -3429,6 +3429,8 @@ in {
34293429
34303430 gpyopt = callPackage ../development/python-modules/gpyopt { };
34313431
3432+ gql = callPackage ../development/python-modules/gql { };
3433+
34323434 gradient = callPackage ../development/python-modules/gradient { };
34333435
34343436 gradient-utils = callPackage ../development/python-modules/gradient-utils { };