diff --git a/nixos/modules/services/desktops/pipewire/pipewire-media-session.nix b/nixos/modules/services/desktops/pipewire/pipewire-media-session.nix
index 539a4cf4469..17a2d49bb1f 100644
--- a/nixos/modules/services/desktops/pipewire/pipewire-media-session.nix
+++ b/nixos/modules/services/desktops/pipewire/pipewire-media-session.nix
@@ -4,6 +4,7 @@
with lib;
let
+ json = pkgs.formats.json {};
cfg = config.services.pipewire.media-session;
enable32BitAlsaPlugins = cfg.alsa.support32Bit
&& pkgs.stdenv.isx86_64
@@ -17,24 +18,13 @@ let
media-session = (builtins.fromJSON (builtins.readFile ./media-session.conf.json));
v4l2-monitor = (builtins.fromJSON (builtins.readFile ./v4l2-monitor.conf.json));
};
- # Helpers for generating the pipewire JSON config file
- mkSPAValueString = v:
- if builtins.isList v then "[${lib.concatMapStringsSep " " mkSPAValueString v}]"
- else if lib.types.attrs.check v then
- "{${lib.concatStringsSep " " (mkSPAKeyValue v)}}"
- else if builtins.isString v then "\"${lib.generators.mkValueStringDefault { } v}\""
- else lib.generators.mkValueStringDefault { } v;
- mkSPAKeyValue = attrs: map (def: def.content) (
- lib.sortProperties
- (
- lib.mapAttrsToList
- (k: v: lib.mkOrder (v._priority or 1000) "${lib.escape [ "=" ":" ] k} = ${mkSPAValueString (v._content or v)}")
- attrs
- )
- );
-
- toSPAJSON = attrs: lib.concatStringsSep "\n" (mkSPAKeyValue attrs);
+ configs = {
+ alsa-monitor = recursiveUpdate defaults.alsa-monitor cfg.config.alsa-monitor;
+ bluez-monitor = recursiveUpdate defaults.bluez-monitor cfg.config.bluez-monitor;
+ media-session = recursiveUpdate defaults.media-session cfg.config.media-session;
+ v4l2-monitor = recursiveUpdate defaults.v4l2-monitor cfg.config.v4l2-monitor;
+ };
in {
meta = {
@@ -62,7 +52,7 @@ in {
config = {
media-session = mkOption {
- type = types.attrs;
+ type = json.type;
description = ''
Configuration for the media session core. For details see
https://gitlab.freedesktop.org/pipewire/pipewire/-/blob/${cfg.package.version}/src/daemon/media-session.d/media-session.conf
@@ -71,7 +61,7 @@ in {
};
alsa-monitor = mkOption {
- type = types.attrs;
+ type = json.type;
description = ''
Configuration for the alsa monitor. For details see
https://gitlab.freedesktop.org/pipewire/pipewire/-/blob/${cfg.package.version}/src/daemon/media-session.d/alsa-monitor.conf
@@ -80,7 +70,7 @@ in {
};
bluez-monitor = mkOption {
- type = types.attrs;
+ type = json.type;
description = ''
Configuration for the bluez5 monitor. For details see
https://gitlab.freedesktop.org/pipewire/pipewire/-/blob/${cfg.package.version}/src/daemon/media-session.d/bluez-monitor.conf
@@ -89,7 +79,7 @@ in {
};
v4l2-monitor = mkOption {
- type = types.attrs;
+ type = json.type;
description = ''
Configuration for the V4L2 monitor. For details see
https://gitlab.freedesktop.org/pipewire/pipewire/-/blob/${cfg.package.version}/src/daemon/media-session.d/v4l2-monitor.conf
@@ -106,15 +96,34 @@ in {
systemd.packages = [ cfg.package ];
systemd.user.services.pipewire-media-session.wantedBy = [ "pipewire.service" ];
- environment.etc."pipewire/media-session.d/media-session.conf" = { text = toSPAJSON (recursiveUpdate defaults.media-session cfg.config.media-session); };
- environment.etc."pipewire/media-session.d/v4l2-monitor.conf" = { text = toSPAJSON (recursiveUpdate defaults.v4l2-monitor cfg.config.v4l2-monitor); };
+ environment.etc."pipewire/media-session.d/media-session.conf" = {
+ source = json.generate "media-session.conf" configs.media-session;
+ };
+ environment.etc."pipewire/media-session.d/v4l2-monitor.conf" = {
+ source = json.generate "v4l2-monitor.conf" configs.v4l2-monitor;
+ };
- environment.etc."pipewire/media-session.d/with-alsa" = mkIf config.services.pipewire.alsa.enable { text = ""; };
- environment.etc."pipewire/media-session.d/alsa-monitor.conf" = mkIf config.services.pipewire.alsa.enable { text = toSPAJSON (recursiveUpdate defaults.alsa-monitor cfg.config.alsa-monitor); };
+ environment.etc."pipewire/media-session.d/with-alsa" =
+ mkIf config.services.pipewire.alsa.enable {
+ text = "";
+ };
+ environment.etc."pipewire/media-session.d/alsa-monitor.conf" =
+ mkIf config.services.pipewire.alsa.enable {
+ source = json.generate "alsa-monitor.conf" configs.alsa-monitor;
+ };
- environment.etc."pipewire/media-session.d/with-pulseaudio" = mkIf config.services.pipewire.pulse.enable { text = ""; };
- environment.etc."pipewire/media-session.d/bluez-monitor.conf" = mkIf config.services.pipewire.pulse.enable { text = toSPAJSON (recursiveUpdate defaults.bluez-monitor cfg.config.bluez-monitor); };
+ environment.etc."pipewire/media-session.d/with-pulseaudio" =
+ mkIf config.services.pipewire.pulse.enable {
+ text = "";
+ };
+ environment.etc."pipewire/media-session.d/bluez-monitor.conf" =
+ mkIf config.services.pipewire.pulse.enable {
+ source = json.generate "bluez-monitor.conf" configs.bluez-monitor;
+ };
- environment.etc."pipewire/media-session.d/with-jack" = mkIf config.services.pipewire.jack.enable { text = ""; };
+ environment.etc."pipewire/media-session.d/with-jack" =
+ mkIf config.services.pipewire.jack.enable {
+ text = "";
+ };
};
}
diff --git a/nixos/modules/services/desktops/pipewire/pipewire.nix b/nixos/modules/services/desktops/pipewire/pipewire.nix
index 7cf19706a63..dbd6c5d87e1 100644
--- a/nixos/modules/services/desktops/pipewire/pipewire.nix
+++ b/nixos/modules/services/desktops/pipewire/pipewire.nix
@@ -4,6 +4,7 @@
with lib;
let
+ json = pkgs.formats.json {};
cfg = config.services.pipewire;
enable32BitAlsaPlugins = cfg.alsa.support32Bit
&& pkgs.stdenv.isx86_64
@@ -29,24 +30,13 @@ let
pipewire-pulse = builtins.fromJSON (builtins.readFile ./pipewire-pulse.conf.json);
};
- # Helpers for generating the pipewire JSON config file
- mkSPAValueString = v:
- if builtins.isList v then "[${lib.concatMapStringsSep " " mkSPAValueString v}]"
- else if lib.types.attrs.check v then
- "{${lib.concatStringsSep " " (mkSPAKeyValue v)}}"
- else if builtins.isString v then "\"${lib.generators.mkValueStringDefault { } v}\""
- else lib.generators.mkValueStringDefault { } v;
-
- mkSPAKeyValue = attrs: map (def: def.content) (
- lib.sortProperties
- (
- lib.mapAttrsToList
- (k: v: lib.mkOrder (v._priority or 1000) "${lib.escape [ "=" ] k} = ${mkSPAValueString (v._content or v)}")
- attrs
- )
- );
-
- toSPAJSON = attrs: lib.concatStringsSep "\n" (mkSPAKeyValue attrs);
+ configs = {
+ client = recursiveUpdate defaults.client cfg.config.client;
+ client-rt = recursiveUpdate defaults.client-rt cfg.config.client-rt;
+ jack = recursiveUpdate defaults.jack cfg.config.jack;
+ pipewire = recursiveUpdate defaults.pipewire cfg.config.pipewire;
+ pipewire-pulse = recursiveUpdate defaults.pipewire-pulse cfg.config.pipewire-pulse;
+ };
in {
meta = {
@@ -78,7 +68,7 @@ in {
config = {
client = mkOption {
- type = types.attrs;
+ type = json.type;
default = {};
description = ''
Configuration for pipewire clients. For details see
@@ -87,7 +77,7 @@ in {
};
client-rt = mkOption {
- type = types.attrs;
+ type = json.type;
default = {};
description = ''
Configuration for realtime pipewire clients. For details see
@@ -96,7 +86,7 @@ in {
};
jack = mkOption {
- type = types.attrs;
+ type = json.type;
default = {};
description = ''
Configuration for the pipewire daemon's jack module. For details see
@@ -105,7 +95,7 @@ in {
};
pipewire = mkOption {
- type = types.attrs;
+ type = json.type;
default = {};
description = ''
Configuration for the pipewire daemon. For details see
@@ -114,7 +104,7 @@ in {
};
pipewire-pulse = mkOption {
- type = types.attrs;
+ type = json.type;
default = {};
description = ''
Configuration for the pipewire-pulse daemon. For details see
@@ -187,11 +177,21 @@ in {
source = "${cfg.package}/share/alsa/alsa.conf.d/99-pipewire-default.conf";
};
- environment.etc."pipewire/client.conf" = { text = toSPAJSON (recursiveUpdate defaults.client cfg.config.client); };
- environment.etc."pipewire/client-rt.conf" = { text = toSPAJSON (recursiveUpdate defaults.client-rt cfg.config.client-rt); };
- environment.etc."pipewire/jack.conf" = { text = toSPAJSON (recursiveUpdate defaults.jack cfg.config.jack); };
- environment.etc."pipewire/pipewire.conf" = { text = toSPAJSON (recursiveUpdate defaults.pipewire cfg.config.pipewire); };
- environment.etc."pipewire/pipewire-pulse.conf" = { text = toSPAJSON (recursiveUpdate defaults.pipewire-pulse cfg.config.pipewire-pulse); };
+ environment.etc."pipewire/client.conf" = {
+ source = json.generate "client.conf" configs.client;
+ };
+ environment.etc."pipewire/client-rt.conf" = {
+ source = json.generate "client-rt.conf" configs.client-rt;
+ };
+ environment.etc."pipewire/jack.conf" = {
+ source = json.generate "jack.conf" configs.jack;
+ };
+ environment.etc."pipewire/pipewire.conf" = {
+ source = json.generate "pipewire.conf" configs.pipewire;
+ };
+ environment.etc."pipewire/pipewire-pulse.conf" = {
+ source = json.generate "pipewire-pulse.conf" configs.pipewire-pulse;
+ };
environment.sessionVariables.LD_LIBRARY_PATH =
lib.optional cfg.jack.enable "/run/current-system/sw/lib/pipewire";
diff --git a/nixos/modules/tasks/filesystems/zfs.nix b/nixos/modules/tasks/filesystems/zfs.nix
index 59676e99678..97fab6f11ea 100644
--- a/nixos/modules/tasks/filesystems/zfs.nix
+++ b/nixos/modules/tasks/filesystems/zfs.nix
@@ -302,7 +302,7 @@ in
};
services.zfs.autoScrub = {
- enable = mkEnableOption "Enables periodic scrubbing of ZFS pools.";
+ enable = mkEnableOption "periodic scrubbing of ZFS pools";
interval = mkOption {
default = "Sun, 02:00";
diff --git a/nixos/tests/croc.nix b/nixos/tests/croc.nix
index c1b6fc7232d..75a8fc991d4 100644
--- a/nixos/tests/croc.nix
+++ b/nixos/tests/croc.nix
@@ -6,7 +6,7 @@ let
pass = pkgs.writeText "pass" "PassRelay";
in {
name = "croc";
- meta = with pkgs.stdenv.lib.maintainers; {
+ meta = with pkgs.lib.maintainers; {
maintainers = [ hax404 julm ];
};
diff --git a/pkgs/applications/misc/jekyll/basic/Gemfile.lock b/pkgs/applications/misc/jekyll/basic/Gemfile.lock
index 161aeb7720b..15ef5d3b4c6 100644
--- a/pkgs/applications/misc/jekyll/basic/Gemfile.lock
+++ b/pkgs/applications/misc/jekyll/basic/Gemfile.lock
@@ -1,7 +1,7 @@
GEM
remote: https://rubygems.org/
specs:
- activesupport (6.1.3)
+ activesupport (6.1.3.1)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 1.6, < 2)
minitest (>= 5.1)
@@ -15,14 +15,14 @@ GEM
eventmachine (>= 0.12.9)
http_parser.rb (~> 0.6.0)
eventmachine (1.2.7)
- ffi (1.14.2)
+ ffi (1.15.0)
forwardable-extended (2.6.0)
gemoji (3.0.1)
html-pipeline (2.14.0)
activesupport (>= 2)
nokogiri (>= 1.4)
http_parser.rb (0.6.0)
- i18n (1.8.9)
+ i18n (1.8.10)
concurrent-ruby (~> 1.0)
jekyll (4.2.0)
addressable (~> 2.4)
@@ -56,18 +56,18 @@ GEM
gemoji (~> 3.0)
html-pipeline (~> 2.2)
jekyll (>= 3.0, < 5.0)
- kramdown (2.3.0)
+ kramdown (2.3.1)
rexml
kramdown-parser-gfm (1.1.0)
kramdown (~> 2.0)
liquid (4.0.3)
- listen (3.4.1)
+ listen (3.5.1)
rb-fsevent (~> 0.10, >= 0.10.3)
rb-inotify (~> 0.9, >= 0.9.10)
mercenary (0.4.0)
mini_portile2 (2.5.0)
minitest (5.14.4)
- nokogiri (1.11.1)
+ nokogiri (1.11.2)
mini_portile2 (~> 2.5.0)
racc (~> 1.4)
pathutil (0.16.2)
diff --git a/pkgs/applications/misc/jekyll/basic/gemset.nix b/pkgs/applications/misc/jekyll/basic/gemset.nix
index bda211e6f7a..fadbf8e32ba 100644
--- a/pkgs/applications/misc/jekyll/basic/gemset.nix
+++ b/pkgs/applications/misc/jekyll/basic/gemset.nix
@@ -5,10 +5,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "00a4db64g8w5yyk6hzak2nqrmdfvyh5zc9cvnm9gglwbi87ss28h";
+ sha256 = "0l0khgrb7zn611xjnmygv5wdxh7wq645f613wldn5397q5w3l9lc";
type = "gem";
};
- version = "6.1.3";
+ version = "6.1.3.1";
};
addressable = {
dependencies = ["public_suffix"];
@@ -67,10 +67,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "15hgiy09i8ywjihyzyvjvk42ivi3kmy6dm21s5sgg9j7y3h3zkkx";
+ sha256 = "0nq1fb3vbfylccwba64zblxy96qznxbys5900wd7gm9bpplmf432";
type = "gem";
};
- version = "1.14.2";
+ version = "1.15.0";
};
forwardable-extended = {
groups = ["default"];
@@ -119,10 +119,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "08p6b13p99j1rrcrw1l3v0kb9mxbsvy6nk31r8h4rnszdgzpga32";
+ sha256 = "0g2fnag935zn2ggm5cn6k4s4xvv53v2givj1j90szmvavlpya96a";
type = "gem";
};
- version = "1.8.9";
+ version = "1.8.10";
};
jekyll = {
dependencies = ["addressable" "colorator" "em-websocket" "i18n" "jekyll-sass-converter" "jekyll-watch" "kramdown" "kramdown-parser-gfm" "liquid" "mercenary" "pathutil" "rouge" "safe_yaml" "terminal-table"];
@@ -218,10 +218,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1vmw752c26ny2jwl0npn0gbyqwgz4hdmlpxnsld9qi9xhk5b1qh7";
+ sha256 = "0jdbcjv4v7sj888bv3vc6d1dg4ackkh7ywlmn9ln2g9alk7kisar";
type = "gem";
};
- version = "2.3.0";
+ version = "2.3.1";
};
kramdown-parser-gfm = {
dependencies = ["kramdown"];
@@ -250,10 +250,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0imzd0cb9vlkc3yggl4rph1v1wm4z9psgs4z6aqsqa5hgf8gr9hj";
+ sha256 = "0h2v34xhi30w0d9gfzds2w6v89grq2gkpgvmdj9m8x1ld1845xnj";
type = "gem";
};
- version = "3.4.1";
+ version = "3.5.1";
};
mercenary = {
groups = ["default"];
@@ -291,10 +291,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1ajwkqr28hwqbyl1l3czx4a34c88acxywyqp8cjyy0zgsd6sbhj2";
+ sha256 = "0b51df8fwadak075cvi17w0nch6qz1r66564qp29qwfj67j9qp0p";
type = "gem";
};
- version = "1.11.1";
+ version = "1.11.2";
};
pathutil = {
dependencies = ["forwardable-extended"];
diff --git a/pkgs/applications/misc/jekyll/full/Gemfile.lock b/pkgs/applications/misc/jekyll/full/Gemfile.lock
index e93f78e83c0..b3d3b9ca499 100644
--- a/pkgs/applications/misc/jekyll/full/Gemfile.lock
+++ b/pkgs/applications/misc/jekyll/full/Gemfile.lock
@@ -1,7 +1,7 @@
GEM
remote: https://rubygems.org/
specs:
- activesupport (6.1.3)
+ activesupport (6.1.3.1)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 1.6, < 2)
minitest (>= 5.1)
@@ -29,14 +29,14 @@ GEM
ruby2_keywords
faraday-net_http (1.0.1)
fast-stemmer (1.0.2)
- ffi (1.14.2)
+ ffi (1.15.0)
forwardable-extended (2.6.0)
gemoji (3.0.1)
html-pipeline (2.14.0)
activesupport (>= 2)
nokogiri (>= 1.4)
http_parser.rb (0.6.0)
- i18n (1.8.9)
+ i18n (1.8.10)
concurrent-ruby (~> 1.0)
jekyll (4.2.0)
addressable (~> 2.4)
@@ -82,7 +82,7 @@ GEM
gemoji (~> 3.0)
html-pipeline (~> 2.2)
jekyll (>= 3.0, < 5.0)
- kramdown (2.3.0)
+ kramdown (2.3.1)
rexml
kramdown-parser-gfm (1.1.0)
kramdown (~> 2.0)
@@ -92,7 +92,7 @@ GEM
liquid (4.0.3)
liquid-c (4.0.0)
liquid (>= 3.0.0)
- listen (3.4.1)
+ listen (3.5.1)
rb-fsevent (~> 0.10, >= 0.10.3)
rb-inotify (~> 0.9, >= 0.9.10)
mercenary (0.4.0)
@@ -102,7 +102,7 @@ GEM
mini_portile2 (2.5.0)
minitest (5.14.4)
multipart-post (2.1.1)
- nokogiri (1.11.1)
+ nokogiri (1.11.2)
mini_portile2 (~> 2.5.0)
racc (~> 1.4)
octokit (4.20.0)
diff --git a/pkgs/applications/misc/jekyll/full/gemset.nix b/pkgs/applications/misc/jekyll/full/gemset.nix
index ee348a80c4a..7a6814aaa32 100644
--- a/pkgs/applications/misc/jekyll/full/gemset.nix
+++ b/pkgs/applications/misc/jekyll/full/gemset.nix
@@ -5,10 +5,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "00a4db64g8w5yyk6hzak2nqrmdfvyh5zc9cvnm9gglwbi87ss28h";
+ sha256 = "0l0khgrb7zn611xjnmygv5wdxh7wq645f613wldn5397q5w3l9lc";
type = "gem";
};
- version = "6.1.3";
+ version = "6.1.3.1";
};
addressable = {
dependencies = ["public_suffix"];
@@ -174,10 +174,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "15hgiy09i8ywjihyzyvjvk42ivi3kmy6dm21s5sgg9j7y3h3zkkx";
+ sha256 = "0nq1fb3vbfylccwba64zblxy96qznxbys5900wd7gm9bpplmf432";
type = "gem";
};
- version = "1.14.2";
+ version = "1.15.0";
};
forwardable-extended = {
groups = ["default"];
@@ -226,10 +226,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "08p6b13p99j1rrcrw1l3v0kb9mxbsvy6nk31r8h4rnszdgzpga32";
+ sha256 = "0g2fnag935zn2ggm5cn6k4s4xvv53v2givj1j90szmvavlpya96a";
type = "gem";
};
- version = "1.8.9";
+ version = "1.8.10";
};
jekyll = {
dependencies = ["addressable" "colorator" "em-websocket" "i18n" "jekyll-sass-converter" "jekyll-watch" "kramdown" "kramdown-parser-gfm" "liquid" "mercenary" "pathutil" "rouge" "safe_yaml" "terminal-table"];
@@ -390,10 +390,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1vmw752c26ny2jwl0npn0gbyqwgz4hdmlpxnsld9qi9xhk5b1qh7";
+ sha256 = "0jdbcjv4v7sj888bv3vc6d1dg4ackkh7ywlmn9ln2g9alk7kisar";
type = "gem";
};
- version = "2.3.0";
+ version = "2.3.1";
};
kramdown-parser-gfm = {
dependencies = ["kramdown"];
@@ -468,10 +468,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "0imzd0cb9vlkc3yggl4rph1v1wm4z9psgs4z6aqsqa5hgf8gr9hj";
+ sha256 = "0h2v34xhi30w0d9gfzds2w6v89grq2gkpgvmdj9m8x1ld1845xnj";
type = "gem";
};
- version = "3.4.1";
+ version = "3.5.1";
};
mercenary = {
groups = ["default"];
@@ -540,10 +540,10 @@
platforms = [];
source = {
remotes = ["https://rubygems.org"];
- sha256 = "1ajwkqr28hwqbyl1l3czx4a34c88acxywyqp8cjyy0zgsd6sbhj2";
+ sha256 = "0b51df8fwadak075cvi17w0nch6qz1r66564qp29qwfj67j9qp0p";
type = "gem";
};
- version = "1.11.1";
+ version = "1.11.2";
};
octokit = {
dependencies = ["faraday" "sawyer"];
diff --git a/pkgs/applications/misc/pure-maps/default.nix b/pkgs/applications/misc/pure-maps/default.nix
index 14141ca1ea3..3f964824e6d 100644
--- a/pkgs/applications/misc/pure-maps/default.nix
+++ b/pkgs/applications/misc/pure-maps/default.nix
@@ -6,13 +6,13 @@
mkDerivation rec {
pname = "pure-maps";
- version = "2.6.0";
+ version = "2.6.5";
src = fetchFromGitHub {
owner = "rinigus";
repo = "pure-maps";
rev = version;
- sha256 = "1nviq2pavyxwh9k4kyzqpbzmx1wybwdax4pyd017izh9h6gqnjhs";
+ sha256 = "17gfb7rdaadmcdba4mhish0jrz9lmiban6fpzwhyvn8z1rc43zx9";
fetchSubmodules = true;
};
diff --git a/pkgs/applications/misc/sc-im/default.nix b/pkgs/applications/misc/sc-im/default.nix
index 523dc6aab83..9084aa0dff1 100644
--- a/pkgs/applications/misc/sc-im/default.nix
+++ b/pkgs/applications/misc/sc-im/default.nix
@@ -1,7 +1,6 @@
{ lib
, stdenv
, fetchFromGitHub
-, fetchpatch
, makeWrapper
, pkg-config
, which
@@ -15,31 +14,17 @@
stdenv.mkDerivation rec {
pname = "sc-im";
- version = "0.8.0";
+ version = "0.8.1";
src = fetchFromGitHub {
owner = "andmarti1424";
repo = "sc-im";
rev = "v${version}";
- sha256 = "sha256-/eG2BdkyfEGoSzPu6jT+Bn1RZTGT1D3etGj1tYchm1M=";
+ sha256 = "sha256-AIYa3d1ml1f5GNLKijeFPX+UabgEqzdXiP60BGvBPsQ=";
};
sourceRoot = "${src.name}/src";
- # make default colors readable on dark background
- patches = [
- (fetchpatch {
- url = "https://github.com/andmarti1424/sc-im/commit/78d2fdaaf2c578691e68fb5bd773803cb967ddba.patch";
- sha256 = "09716zsqa9qdsj2qpkji8wlzsmp9gl66ggvrg7lmrwwnvli2zn2w";
- })
- (fetchpatch {
- url = "https://github.com/andmarti1424/sc-im/commit/f29d6605c8170febcec0dea7bda9613bee3b7011.patch";
- sha256 = "1zs1sb23g0k6lig4d0qdzq1wdhcdzl424ch567zyjl191lyhsjyg";
- })
- ];
-
- patchFlags = [ "-p2" ];
-
nativeBuildInputs = [
makeWrapper
pkg-config
diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json
index bf3d02fc823..ab29c88ff2a 100644
--- a/pkgs/applications/networking/browsers/chromium/upstream-info.json
+++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json
@@ -31,15 +31,15 @@
}
},
"dev": {
- "version": "91.0.4455.2",
- "sha256": "0nqw1jxysyl72dg2bqls7w9cm366j6i1p4sadf3s5vc0i7yr7h3i",
- "sha256bin64": "0d7s7bg58489ph4i92yj4vkww0cl7473pk9sir64gcmm9z18yjc3",
+ "version": "91.0.4464.5",
+ "sha256": "1djwlb74cgfc5ns7w2m10qcd2d2fz0i90k5szcfsm899c7x3zgyf",
+ "sha256bin64": "0kqr5mlbq23ahmyg67lh15j5sqa29wi301s8rvfgh0gxf10vgc2l",
"deps": {
"gn": {
- "version": "2021-03-12",
+ "version": "2021-03-30",
"url": "https://gn.googlesource.com/gn",
- "rev": "64b3b9401c1c3ed5f3c43c1cac00b91f83597ab8",
- "sha256": "14whk4gyx21cqxy1560xm8p1mc1581dh9g7xy120g8vvcylknjlm"
+ "rev": "5667cc61018864b17542e0baff8b790f245583b0",
+ "sha256": "0mr7jqk1r46ngrx4hrg8gxnzqxfxc1c9a966gpsjlgc00k390m5s"
}
}
},
diff --git a/pkgs/applications/networking/browsers/qutebrowser/default.nix b/pkgs/applications/networking/browsers/qutebrowser/default.nix
index 6fa585e7ded..6cb947cb816 100644
--- a/pkgs/applications/networking/browsers/qutebrowser/default.nix
+++ b/pkgs/applications/networking/browsers/qutebrowser/default.nix
@@ -31,12 +31,12 @@ let
in mkDerivationWith python3Packages.buildPythonApplication rec {
pname = "qutebrowser";
- version = "2.1.0";
+ version = "2.1.1";
# the release tarballs are different from the git checkout!
src = fetchurl {
url = "https://github.com/qutebrowser/qutebrowser/releases/download/v${version}/${pname}-${version}.tar.gz";
- sha256 = "0fz6rbacy9sbzx0jsvwkrcyv2849ia8pj1w716l6pw9i9wx3gp8x";
+ sha256 = "sha256-txsArX1JiRGXjlu9FTpt0EUKxq3j5b85j8luFTKDQs4=";
};
# Needs tox
@@ -110,17 +110,18 @@ in mkDerivationWith python3Packages.buildPythonApplication rec {
done
'';
- postFixup = ''
- wrapProgram $out/bin/qutebrowser \
- "''${gappsWrapperArgs[@]}" \
- "''${qtWrapperArgs[@]}" \
+ preFixup = ''
+ makeWrapperArgs+=(
+ "''${gappsWrapperArgs[@]}"
+ "''${qtWrapperArgs[@]}"
--add-flags '--backend ${backend}'
+ )
'';
meta = with lib; {
homepage = "https://github.com/The-Compiler/qutebrowser";
description = "Keyboard-focused browser with a minimal GUI";
license = licenses.gpl3Plus;
- maintainers = with maintainers; [ jagajaga rnhmjoj ebzzry ];
+ maintainers = with maintainers; [ jagajaga rnhmjoj ebzzry dotlambda ];
};
}
diff --git a/pkgs/applications/networking/cluster/kubelogin/default.nix b/pkgs/applications/networking/cluster/kubelogin/default.nix
index 31eb3371038..0a928ac9299 100644
--- a/pkgs/applications/networking/cluster/kubelogin/default.nix
+++ b/pkgs/applications/networking/cluster/kubelogin/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "kubelogin";
- version = "0.0.8";
+ version = "0.0.9";
src = fetchFromGitHub {
owner = "Azure";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-iR+DomoCErzl9GEE8qTWEkJvbCnw4Ob7R66eluMBNcQ=";
+ sha256 = "sha256-0+4hrC7A60dbf+1uvTVU2JRynvA3O/lXfgcra1fV9bI=";
};
- vendorSha256 = "sha256-HXSvZoOX22poOYGghCpXX9BSSR9L6YMqw+7x4WZS39o=";
+ vendorSha256 = "sha256-erGqCpWlAQanY1ghpNVRhzUEIXv3lCiBGRs888MmHN8=";
buildFlagsArray = ''
-ldflags=
diff --git a/pkgs/applications/networking/mailreaders/mblaze/default.nix b/pkgs/applications/networking/mailreaders/mblaze/default.nix
index b7527d04cb6..278561e0e5f 100644
--- a/pkgs/applications/networking/mailreaders/mblaze/default.nix
+++ b/pkgs/applications/networking/mailreaders/mblaze/default.nix
@@ -16,6 +16,8 @@ stdenv.mkDerivation rec {
makeFlags = [ "PREFIX=$(out)" ];
+ enableParallelBuilding = true;
+
postInstall = ''
installShellCompletion contrib/_mblaze
'' + lib.optionalString (ruby != null) ''
diff --git a/pkgs/applications/science/machine-learning/vowpal-wabbit/default.nix b/pkgs/applications/science/machine-learning/vowpal-wabbit/default.nix
index 771d6227a86..de6f9212983 100644
--- a/pkgs/applications/science/machine-learning/vowpal-wabbit/default.nix
+++ b/pkgs/applications/science/machine-learning/vowpal-wabbit/default.nix
@@ -1,27 +1,33 @@
-{ lib, stdenv, fetchFromGitHub, cmake, boost169, rapidjson, zlib }:
+{ lib, stdenv, fetchFromGitHub, cmake, boost169, flatbuffers, fmt, rapidjson, spdlog, zlib }:
stdenv.mkDerivation rec {
pname = "vowpal-wabbit";
- version = "8.9.2";
+ version = "8.10.0";
src = fetchFromGitHub {
owner = "VowpalWabbit";
repo = "vowpal_wabbit";
rev = version;
- sha256 = "0ng1kip7sh3br85691xvszxd6lhv8nhfkgqkpwxd89wy85znzhmd";
+ sha256 = "1vxnwanflsx6zf8m9mrxms28ii7rl61xfxp3556y3iawmy11d6pl";
};
nativeBuildInputs = [ cmake ];
buildInputs = [
boost169
+ flatbuffers
+ fmt
rapidjson
+ spdlog
zlib
];
# -DBUILD_TESTS=OFF is set as both it saves time in the build and the default
# cmake flags appended by the builder include -DBUILD_TESTING=OFF for which
# this is the equivalent flag.
+ # Flatbuffers are an optional feature.
+ # BUILD_FLATBUFFERS=ON turns it on. This will still consume Flatbuffers as a
+ # system dependency
cmakeFlags = [
"-DVW_INSTALL=ON"
"-DBUILD_TESTS=OFF"
@@ -29,10 +35,12 @@ stdenv.mkDerivation rec {
"-DBUILD_PYTHON=OFF"
"-DUSE_LATEST_STD=ON"
"-DRAPIDJSON_SYS_DEP=ON"
+ "-DFMT_SYS_DEP=ON"
+ "-DSPDLOG_SYS_DEP=ON"
+ "-DBUILD_FLATBUFFERS=ON"
];
meta = with lib; {
- broken = stdenv.isAarch32 || stdenv.isAarch64;
description = "Machine learning system focused on online reinforcement learning";
homepage = "https://github.com/VowpalWabbit/vowpal_wabbit/";
license = licenses.bsd3;
diff --git a/pkgs/build-support/fetchurl/default.nix b/pkgs/build-support/fetchurl/default.nix
index c65738aef41..8ce69a7f187 100644
--- a/pkgs/build-support/fetchurl/default.nix
+++ b/pkgs/build-support/fetchurl/default.nix
@@ -104,7 +104,9 @@ let
if urls != [] && url == "" then
(if lib.isList urls then urls
else throw "`urls` is not a list")
- else if urls == [] && url != "" then [url]
+ else if urls == [] && url != "" then
+ (if lib.isString url then [url]
+ else throw "`url` is not a string")
else throw "fetchurl requires either `url` or `urls` to be set";
hash_ =
diff --git a/pkgs/data/misc/cacert/default.nix b/pkgs/data/misc/cacert/default.nix
index fec2dfa9001..9357a60a91f 100644
--- a/pkgs/data/misc/cacert/default.nix
+++ b/pkgs/data/misc/cacert/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation {
certdata2pem = fetchurl {
name = "certdata2pem.py";
- url = [
+ urls = [
"https://salsa.debian.org/debian/ca-certificates/raw/debian/20170717/mozilla/certdata2pem.py"
"https://git.launchpad.net/ubuntu/+source/ca-certificates/plain/mozilla/certdata2pem.py?id=47e49e1e0a8a1ca74deda27f88fe181191562957"
];
diff --git a/pkgs/development/libraries/oneDNN/default.nix b/pkgs/development/libraries/oneDNN/default.nix
index c7b8339e710..93da285e824 100644
--- a/pkgs/development/libraries/oneDNN/default.nix
+++ b/pkgs/development/libraries/oneDNN/default.nix
@@ -5,13 +5,13 @@
# https://github.com/oneapi-src/oneDNN#oneapi-deep-neural-network-library-onednn
stdenv.mkDerivation rec {
pname = "oneDNN";
- version = "2.1.2";
+ version = "2.1.3";
src = fetchFromGitHub {
owner = "oneapi-src";
repo = "oneDNN";
rev = "v${version}";
- sha256 = "sha256-8nXzsY4+XnhKbuYyDWehiWqQEWoEcDBF4KagOg1WlN8=";
+ sha256 = "sha256-xByu0HWeyDg5WV/zVO4HO/uwZ2RPrud0FlZHPfFom1E=";
};
outputs = [ "out" "dev" "doc" ];
diff --git a/pkgs/development/libraries/pipewire/default.nix b/pkgs/development/libraries/pipewire/default.nix
index 955a4d9da6e..d685bde35ed 100644
--- a/pkgs/development/libraries/pipewire/default.nix
+++ b/pkgs/development/libraries/pipewire/default.nix
@@ -75,6 +75,11 @@ let
./0070-installed-tests-path.patch
# Add flag to specify configuration directory (different from the installation directory).
./0080-pipewire-config-dir.patch
+ # Fix JSON parser.
+ (fetchpatch {
+ url = "https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/34800dc0191a4ee7a329eeb361a6f2ccf4a75176.diff";
+ sha256 = "0dzxzr408qqzf0252nwg14709p1lb2k826i3kdzg6djq8w98d5aj";
+ })
];
nativeBuildInputs = [
diff --git a/pkgs/development/ocaml-modules/mirage-crypto/default.nix b/pkgs/development/ocaml-modules/mirage-crypto/default.nix
index ab48e01950e..1ecd71fe77f 100644
--- a/pkgs/development/ocaml-modules/mirage-crypto/default.nix
+++ b/pkgs/development/ocaml-modules/mirage-crypto/default.nix
@@ -1,14 +1,17 @@
-{ lib, fetchurl, buildDunePackage, ounit, cstruct, dune-configurator, eqaf, pkg-config }:
+{ lib, fetchurl, buildDunePackage, ounit, cstruct, dune-configurator, eqaf, pkg-config
+, withFreestanding ? false
+, ocaml-freestanding
+}:
buildDunePackage rec {
minimumOCamlVersion = "4.08";
pname = "mirage-crypto";
- version = "0.8.10";
+ version = "0.9.0";
src = fetchurl {
url = "https://github.com/mirage/mirage-crypto/releases/download/v${version}/mirage-crypto-v${version}.tbz";
- sha256 = "8a5976fe7837491d2fbd1917b77524776f70ae590e9f55cf757cc8951b5481fc";
+ sha256 = "716684f8a70031f16115e3c84d42141c75fb1e688b7a699bbd09166176ed5217";
};
useDune2 = true;
@@ -17,12 +20,20 @@ buildDunePackage rec {
checkInputs = [ ounit ];
nativeBuildInputs = [ dune-configurator pkg-config ];
- propagatedBuildInputs = [ cstruct eqaf ];
+ propagatedBuildInputs = [
+ cstruct eqaf
+ ] ++ lib.optionals withFreestanding [
+ ocaml-freestanding
+ ];
meta = with lib; {
homepage = "https://github.com/mirage/mirage-crypto";
description = "Simple symmetric cryptography for the modern age";
- license = licenses.isc;
+ license = [
+ licenses.isc # default license
+ licenses.bsd2 # mirage-crypto-rng-mirage
+ licenses.mit # mirage-crypto-ec
+ ];
maintainers = with maintainers; [ sternenseemann ];
};
}
diff --git a/pkgs/development/ocaml-modules/mirage-crypto/ec.nix b/pkgs/development/ocaml-modules/mirage-crypto/ec.nix
new file mode 100644
index 00000000000..bcd7a1f04f2
--- /dev/null
+++ b/pkgs/development/ocaml-modules/mirage-crypto/ec.nix
@@ -0,0 +1,55 @@
+{ lib
+, buildDunePackage
+, mirage-crypto
+, dune-configurator
+, pkg-config
+, cstruct
+, mirage-crypto-rng
+, mirage-crypto-pk
+, hex
+, alcotest
+, asn1-combinators
+, ppx_deriving_yojson
+, ppx_deriving
+, yojson
+, withFreestanding ? false
+, ocaml-freestanding
+}:
+
+buildDunePackage {
+ pname = "mirage-crypto-ec";
+
+ inherit (mirage-crypto)
+ minimumOCamlVersion
+ src
+ version
+ useDune2
+ ;
+
+ nativeBuildInputs = [
+ pkg-config
+ dune-configurator
+ ];
+ propagatedBuildInputs = [
+ cstruct
+ mirage-crypto
+ mirage-crypto-rng
+ ] ++ lib.optionals withFreestanding [
+ ocaml-freestanding
+ ];
+
+ doCheck = true;
+ checkInputs = [
+ hex
+ alcotest
+ asn1-combinators
+ ppx_deriving_yojson
+ ppx_deriving
+ yojson
+ mirage-crypto-pk
+ ];
+
+ meta = mirage-crypto.meta // {
+ description = "Elliptic Curve Cryptography with primitives taken from Fiat";
+ };
+}
diff --git a/pkgs/development/python-modules/airly/default.nix b/pkgs/development/python-modules/airly/default.nix
index e75653fb684..40cb085a17e 100644
--- a/pkgs/development/python-modules/airly/default.nix
+++ b/pkgs/development/python-modules/airly/default.nix
@@ -1,29 +1,40 @@
{ lib
+, aiohttp
+, aioresponses
+, aiounittest
, buildPythonPackage
, fetchFromGitHub
-, aiohttp
, pytestCheckHook
}:
buildPythonPackage rec {
pname = "airly";
- version = "1.0.0";
+ version = "1.1.0";
src = fetchFromGitHub {
owner = "ak-ambi";
repo = "python-airly";
rev = "v${version}";
- sha256 = "0an6nbl0i5pahxm6x4z03s9apzgqrw9zf7srjcs0r3y1ppicb4s6";
+ sha256 = "sha256-weliT/FYnRX+pzVAyRWFly7lfj2z7P+hpq5SIhyIgmI=";
};
propagatedBuildInputs = [ aiohttp ];
- checkInputs = [ pytestCheckHook ];
+ checkInputs = [
+ aioresponses
+ aiounittest
+ pytestCheckHook
+ ];
+
+ preCheck = ''
+ cd tests
+ '';
disabledTests = [
"InstallationsLoaderTestCase"
"MeasurementsSessionTestCase"
];
+
pythonImportsCheck = [ "airly" ];
meta = with lib; {
diff --git a/pkgs/development/python-modules/rapidfuzz/default.nix b/pkgs/development/python-modules/rapidfuzz/default.nix
index 225f743904d..8743e5014e0 100644
--- a/pkgs/development/python-modules/rapidfuzz/default.nix
+++ b/pkgs/development/python-modules/rapidfuzz/default.nix
@@ -9,7 +9,7 @@
buildPythonPackage rec {
pname = "rapidfuzz";
- version = "1.3.3";
+ version = "1.4.1";
disabled = pythonOlder "3.5";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
repo = "RapidFuzz";
rev = "v${version}";
fetchSubmodules = true;
- sha256 = "1k28mycf945zp5kkdm4anjqac8ysmp0pabyjg96xww8hnlwmqcnf";
+ sha256 = "sha256-uZdD25ATJgRrDAHYSQNp7NvEmW7p3LD9vNmxAbf5Mwk=";
};
checkInputs = [
diff --git a/pkgs/development/python-modules/supervisor/default.nix b/pkgs/development/python-modules/supervisor/default.nix
index 10c8f28e446..93569fe3da7 100644
--- a/pkgs/development/python-modules/supervisor/default.nix
+++ b/pkgs/development/python-modules/supervisor/default.nix
@@ -1,6 +1,5 @@
{ stdenv, lib, buildPythonPackage, isPy3k, fetchPypi
, mock
-, meld3
, pytest
, setuptools
}:
@@ -22,7 +21,7 @@ buildPythonPackage rec {
pytest
'';
- propagatedBuildInputs = [ meld3 setuptools ];
+ propagatedBuildInputs = [ setuptools ];
meta = with lib; {
description = "A system for controlling process state under UNIX";
diff --git a/pkgs/development/tools/devpi-client/default.nix b/pkgs/development/tools/devpi-client/default.nix
index 5905e05d071..5bca8733771 100644
--- a/pkgs/development/tools/devpi-client/default.nix
+++ b/pkgs/development/tools/devpi-client/default.nix
@@ -32,9 +32,9 @@ buildPythonApplication rec {
sha256 = "74ff365efeaa7b78c9eb7f6d7bd349ccd6252a6cdf879bcb4137ee5ff0fb127a";
};
- buildInputs = [ glibcLocales pkginfo check-manifest ];
+ buildInputs = [ glibcLocales ];
- propagatedBuildInputs = [ py devpi-common pluggy setuptools ];
+ propagatedBuildInputs = [ py devpi-common pluggy setuptools check-manifest pkginfo ];
checkInputs = [
pytest pytest-flake8 webtest mock
diff --git a/pkgs/development/tools/misc/intltool/default.nix b/pkgs/development/tools/misc/intltool/default.nix
index 7a3379d5921..967fc442a73 100644
--- a/pkgs/development/tools/misc/intltool/default.nix
+++ b/pkgs/development/tools/misc/intltool/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
# fix "unescaped left brace" errors when using intltool in some cases
patches = [(fetchpatch {
name = "perl5.26-regex-fixes.patch";
- url = [
+ urls = [
"https://sources.debian.org/data/main/i/intltool/0.51.0-5/debian/patches/perl5.26-regex-fixes.patch"
"https://src.fedoraproject.org/rpms/intltool/raw/d8d2ef29fb122a42a6b6678eb1ec97ae56902af2/f/intltool-perl5.26-regex-fixes.patch"
];
diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix
index 7ba05d13293..c90dbd73f2f 100644
--- a/pkgs/os-specific/linux/kernel/common-config.nix
+++ b/pkgs/os-specific/linux/kernel/common-config.nix
@@ -533,7 +533,7 @@ let
KVM_VFIO = yes;
KSM = yes;
VIRT_DRIVERS = yes;
- # We nneed 64 GB (PAE) support for Xen guest support
+ # We need 64 GB (PAE) support for Xen guest support
HIGHMEM64G = { optional = true; tristate = mkIf (!stdenv.is64bit) "y";};
VFIO_PCI_VGA = mkIf stdenv.is64bit yes;
diff --git a/pkgs/os-specific/linux/pam_krb5/default.nix b/pkgs/os-specific/linux/pam_krb5/default.nix
index 8abfe5fee9d..c0b8ce272d7 100644
--- a/pkgs/os-specific/linux/pam_krb5/default.nix
+++ b/pkgs/os-specific/linux/pam_krb5/default.nix
@@ -1,11 +1,11 @@
{ lib, stdenv, fetchurl, pam, kerberos }:
stdenv.mkDerivation rec {
- name = "pam-krb5-4.9";
+ name = "pam-krb5-4.10";
src = fetchurl {
url = "https://archives.eyrie.org/software/kerberos/${name}.tar.gz";
- sha256 = "0kzz6mjkzw571pkv684vyczhl874f6p7lih3dj7s764gxdxnv4y5";
+ sha256 = "09wzxd5zrj5bzqpb01qf148npj5k8hmd2bx2ij1qsy40hdxqyq79";
};
buildInputs = [ pam kerberos ];
diff --git a/pkgs/os-specific/linux/rtw88/default.nix b/pkgs/os-specific/linux/rtw88/default.nix
index c89125a920d..6b5e3211a9e 100644
--- a/pkgs/os-specific/linux/rtw88/default.nix
+++ b/pkgs/os-specific/linux/rtw88/default.nix
@@ -5,13 +5,13 @@ let
in
stdenv.mkDerivation {
pname = "rtw88";
- version = "unstable-2021-03-21";
+ version = "unstable-2021-04-01";
src = fetchFromGitHub {
owner = "lwfinger";
repo = "rtw88";
- rev = "fb2d8d2be9b33328eaf391926c502b34f6367b01";
- hash = "sha256-NjB0eooI6j6IDtD572ZkairPdJwc/x+pxITLb7ujoS8=";
+ rev = "689ce370b0c2da207bb092065697f6cb455a00dc";
+ hash = "sha256-gdfQxpzYJ9bEObc2iEapA0TPMZuXndBvEu6qwKqdhyo=";
};
makeFlags = [ "KSRC=${kernel.dev}/lib/modules/${kernel.modDirVersion}/build" ];
diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix
index 5b5c63ee13d..88dde650e5a 100644
--- a/pkgs/servers/home-assistant/default.nix
+++ b/pkgs/servers/home-assistant/default.nix
@@ -177,6 +177,7 @@ in with py.pkgs; buildPythonApplication rec {
# its dependencies packaged and listed in ./component-packages.nix.
componentTests = [
"accuweather"
+ "airly"
"alert"
"api"
"auth"
diff --git a/pkgs/servers/mautrix-whatsapp/default.nix b/pkgs/servers/mautrix-whatsapp/default.nix
index a17d8a55acc..934ce797d50 100644
--- a/pkgs/servers/mautrix-whatsapp/default.nix
+++ b/pkgs/servers/mautrix-whatsapp/default.nix
@@ -2,18 +2,18 @@
buildGoModule rec {
pname = "mautrix-whatsapp";
- version = "0.1.5";
+ version = "0.1.6";
src = fetchFromGitHub {
owner = "tulir";
repo = "mautrix-whatsapp";
rev = "v${version}";
- sha256 = "sha256-RkMgzYu6r30uqUCtCS/FuvJQiTInRYWiWhlTtDQQh5g=";
+ sha256 = "sha256-0nwE3+GkJAvz5s8G23TvLVO8ykQK0ZIwEWAaTWHHOuU=";
};
buildInputs = [ olm ];
- vendorSha256 = "sha256-p6TW5ACXjqCR5IAVleMEIWYW4SHI1ZRL5KJFZpPc7yU=";
+ vendorSha256 = "sha256-FRXG0HmYfum9G/LYm6oWLLx1ZYQ3Jq7qV/mq6ofN9f5=";
doCheck = false;
diff --git a/pkgs/servers/monitoring/grafana/default.nix b/pkgs/servers/monitoring/grafana/default.nix
index 9bf10165e00..364d2e44353 100644
--- a/pkgs/servers/monitoring/grafana/default.nix
+++ b/pkgs/servers/monitoring/grafana/default.nix
@@ -2,7 +2,7 @@
buildGoModule rec {
pname = "grafana";
- version = "7.4.5";
+ version = "7.5.2";
excludedPackages = [ "release_publisher" ];
@@ -10,15 +10,15 @@ buildGoModule rec {
rev = "v${version}";
owner = "grafana";
repo = "grafana";
- sha256 = "10pnwd4d19ry7w2x46acc3j8gjn73b45fzc579gz1hc8hx2b3s0s";
+ sha256 = "sha256-8Qy5YgJZpvaAjeBAi092Jxg4yAD1fYmMteTRm5b0Q+g=";
};
srcStatic = fetchurl {
url = "https://dl.grafana.com/oss/release/grafana-${version}.linux-amd64.tar.gz";
- sha256 = "1x9jx3ww37cn6r6cn6gqlavmllxydks23vm8w4934bv8zppj1zwz";
+ sha256 = "sha256-yVswMNOLX/AFtv45TXm8WcHEytyYgtjvi7V0dRewDdc=";
};
- vendorSha256 = "0ig0f9pa3l0nj2fs8yz8h42y1j07xi9imk7kzmla6vav6s889grc";
+ vendorSha256 = "sha256-oh3GB6Iaqy05IS2MU5LJqTXnlr0vtkACZA6wpmW7W2Q=";
postPatch = ''
substituteInPlace pkg/cmd/grafana-server/main.go \
diff --git a/pkgs/tools/inputmethods/lisgd/default.nix b/pkgs/tools/inputmethods/lisgd/default.nix
new file mode 100644
index 00000000000..02344d153db
--- /dev/null
+++ b/pkgs/tools/inputmethods/lisgd/default.nix
@@ -0,0 +1,49 @@
+{ lib
+, stdenv
+, fetchFromSourcehut
+, writeText
+, libinput
+, libX11
+, conf ? null
+, patches ? [ ]
+}:
+
+stdenv.mkDerivation rec {
+ pname = "lisgd";
+ version = "0.3.0";
+
+ src = fetchFromSourcehut {
+ owner = "~mil";
+ repo = "lisgd";
+ rev = version;
+ sha256 = "0g2pwff2c6ipxz83l26kx4rs3vah9qlm4h0n4x1k80mzqzf15hb6";
+ };
+
+ inherit patches;
+
+ postPatch = let
+ configFile = if lib.isDerivation conf || lib.isPath conf then
+ conf
+ else
+ writeText "config.def.h" conf;
+ in lib.optionalString (conf != null) ''
+ cp ${configFile} config.def.h
+ '';
+
+ buildInputs = [
+ libinput
+ libX11
+ ];
+
+ makeFlags = [
+ "PREFIX=${placeholder "out"}"
+ ];
+
+ meta = with lib; {
+ description = "Bind gestures via libinput touch events";
+ homepage = "https://git.sr.ht/~mil/lisgd";
+ license = licenses.mit;
+ platforms = platforms.linux;
+ maintainers = with maintainers; [ dotlambda ];
+ };
+}
diff --git a/pkgs/tools/misc/diffoscope/default.nix b/pkgs/tools/misc/diffoscope/default.nix
index 9437ef12f4b..086c1a2b540 100644
--- a/pkgs/tools/misc/diffoscope/default.nix
+++ b/pkgs/tools/misc/diffoscope/default.nix
@@ -16,11 +16,11 @@ let
in
python3Packages.buildPythonApplication rec {
pname = "diffoscope";
- version = "166";
+ version = "171";
src = fetchurl {
url = "https://diffoscope.org/archive/diffoscope-${version}.tar.bz2";
- sha256 = "sha256-6VhHG3MxmIczolOYqU4D1m00h8w2n0ku4dy/dFEYqk0=";
+ sha256 = "sha256-8PUFKwSWf84ics4w9yrCWMYgzzNF5z1kNn7LnksfCtA=";
};
outputs = [ "out" "man" ];
@@ -70,6 +70,8 @@ python3Packages.buildPythonApplication rec {
disabledTests = [
"test_android_manifest"
"test_sbin_added_to_path"
+ "test_diff_meta"
+ "test_diff_meta2"
];
meta = with lib; {
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 7e8eddc2099..d0c7c0ee93c 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -414,7 +414,7 @@ mapAliases ({
memtest86 = memtest86plus; # added 2019-05-08
mesa_noglu = mesa; # added 2019-05-28
# NOTE: 2018-07-12: legacy alias:
- # gcsecurity bussiness is done: https://www.theregister.co.uk/2018/02/08/bruce_perens_grsecurity_anti_slapp/
+ # grsecurity business is done: https://www.theregister.co.uk/2018/02/08/bruce_perens_grsecurity_anti_slapp/
# floating point textures patents are expired,
# so package reduced to alias
mesa_drivers = mesa.drivers;
@@ -702,7 +702,7 @@ mapAliases ({
net_snmp = net-snmp; # added 2019-12-21
oracleXE = throw "oracleXE has been removed, as it's heavily outdated and unmaintained."; # added 2020-10-09
- spaceOrbit = space-orbit; # addewd 2016-05-23
+ spaceOrbit = space-orbit; # added 2016-05-23
speech_tools = speech-tools; # added 2018-04-25
speedtest_cli = speedtest-cli; # added 2015-02-17
spice_gtk = spice-gtk; # added 2018-02-25
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 94b6a644443..fef7f5b1d75 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2658,6 +2658,8 @@ in
linuxptp = callPackage ../os-specific/linux/linuxptp { };
+ lisgd = callPackage ../tools/inputmethods/lisgd { };
+
lite = callPackage ../applications/editors/lite { };
loadwatch = callPackage ../tools/system/loadwatch { };
diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix
index ee11ffdac21..826f7cf8e45 100644
--- a/pkgs/top-level/ocaml-packages.nix
+++ b/pkgs/top-level/ocaml-packages.nix
@@ -691,6 +691,8 @@ let
mirage-crypto = callPackage ../development/ocaml-modules/mirage-crypto { };
+ mirage-crypto-ec = callPackage ../development/ocaml-modules/mirage-crypto/ec.nix { };
+
mirage-crypto-pk = callPackage ../development/ocaml-modules/mirage-crypto/pk.nix { };
mirage-crypto-rng = callPackage ../development/ocaml-modules/mirage-crypto/rng.nix { };