diff --git a/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml
index b9f0456a953a2..0f974705558d6 100644
--- a/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml
+++ b/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml
@@ -479,6 +479,16 @@
RandomX benchmark.
+
+
+ Auto nice daemons
+ ananicy
+ and
+ ananicy-cpp.
+ Available as
+ services.ananicy.
+
+
diff --git a/nixos/doc/manual/release-notes/rl-2111.section.md b/nixos/doc/manual/release-notes/rl-2111.section.md
index 860ce7cc342e9..eeaff0eeda4b1 100644
--- a/nixos/doc/manual/release-notes/rl-2111.section.md
+++ b/nixos/doc/manual/release-notes/rl-2111.section.md
@@ -139,6 +139,8 @@ In addition to numerous new and upgraded packages, this release has the followin
- [xmrig](https://github.com/xmrig/xmrig), a high performance, open source, cross platform RandomX, KawPow, CryptoNight and AstroBWT unified CPU/GPU miner and RandomX benchmark.
+- Auto nice daemons [ananicy](https://github.com/Nefelim4ag/Ananicy) and [ananicy-cpp](https://gitlab.com/ananicy-cpp/ananicy-cpp/). Available as [services.ananicy](#opt-services.ananicy.enable).
+
## Backward Incompatibilities {#sec-release-21.11-incompatibilities}
- The NixOS VM test framework, `pkgs.nixosTest`/`make-test-python.nix`, now requires detaching commands such as `succeed("foo &")` and `succeed("foo | xclip -i")` to close stdout.
diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix
index c5f0b211ff840..c19dcd3293b64 100644
--- a/nixos/modules/module-list.nix
+++ b/nixos/modules/module-list.nix
@@ -485,6 +485,7 @@
./services/mail/roundcube.nix
./services/mail/sympa.nix
./services/mail/nullmailer.nix
+ ./services/misc/ananicy.nix
./services/misc/airsonic.nix
./services/misc/ankisyncd.nix
./services/misc/apache-kafka.nix
diff --git a/nixos/modules/services/misc/ananicy.nix b/nixos/modules/services/misc/ananicy.nix
new file mode 100644
index 0000000000000..f76f534fb4507
--- /dev/null
+++ b/nixos/modules/services/misc/ananicy.nix
@@ -0,0 +1,107 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+let
+ cfg = config.services.ananicy;
+ configFile = pkgs.writeText "ananicy.conf" (generators.toKeyValue { } cfg.settings);
+ extraRules = pkgs.writeText "extraRules" cfg.extraRules;
+ servicename = if ((lib.getName cfg.package) == (lib.getName pkgs.ananicy-cpp)) then "ananicy-cpp" else "ananicy";
+in
+{
+ options = {
+ services.ananicy = {
+ enable = mkEnableOption "Ananicy, an auto nice daemon";
+
+ package = mkOption {
+ type = types.package;
+ default = pkgs.ananicy;
+ defaultText = literalExpression "pkgs.ananicy";
+ example = literalExpression "pkgs.ananicy-cpp";
+ description = ''
+ Which ananicy package to use.
+ '';
+ };
+
+ settings = mkOption {
+ type = with types; attrsOf (oneOf [ int bool str ]);
+ default = { };
+ example = {
+ apply_nice = false;
+ };
+ description = ''
+ See
+ '';
+ };
+
+ extraRules = mkOption {
+ type = types.str;
+ default = "";
+ description = ''
+ Extra rules in json format on separate lines. See:
+
+
+ '';
+ example = literalExpression ''
+ '''
+ { "name": "eog", "type": "Image-View" }
+ { "name": "fdupes", "type": "BG_CPUIO" }
+ '''
+ '';
+
+ };
+ };
+ };
+
+ config = mkIf cfg.enable {
+ environment = {
+ systemPackages = [ cfg.package ];
+ etc."ananicy.d".source = pkgs.runCommandLocal "ananicyfiles" { } ''
+ mkdir -p $out
+ # ananicy-cpp does not include rules or settings on purpose
+ cp -r ${pkgs.ananicy}/etc/ananicy.d/* $out
+ rm $out/ananicy.conf
+ cp ${configFile} $out/ananicy.conf
+ ${optionalString (cfg.extraRules != "") "cp ${extraRules} $out/nixRules.rules"}
+ '';
+ };
+
+ # ananicy and ananicy-cpp have different default settings
+ services.ananicy.settings =
+ let
+ mkOD = mkOptionDefault;
+ in
+ {
+ cgroup_load = mkOD true;
+ type_load = mkOD true;
+ rule_load = mkOD true;
+ apply_nice = mkOD true;
+ apply_ioclass = mkOD true;
+ apply_ionice = mkOD true;
+ apply_sched = mkOD true;
+ apply_oom_score_adj = mkOD true;
+ apply_cgroup = mkOD true;
+ } // (if ((lib.getName cfg.package) == (lib.getName pkgs.ananicy-cpp)) then {
+ # https://gitlab.com/ananicy-cpp/ananicy-cpp/-/blob/master/src/config.cpp#L12
+ loglevel = mkOD "warn"; # default is info but its spammy
+ cgroup_realtime_workaround = mkOD true;
+ } else {
+ # https://github.com/Nefelim4ag/Ananicy/blob/master/ananicy.d/ananicy.conf
+ check_disks_schedulers = mkOD true;
+ check_freq = mkOD 5;
+ });
+
+ systemd = {
+ # https://gitlab.com/ananicy-cpp/ananicy-cpp/#cgroups applies to both ananicy and -cpp
+ enableUnifiedCgroupHierarchy = mkDefault false;
+ packages = [ cfg.package ];
+ services."${servicename}" = {
+ wantedBy = [ "default.target" ];
+ };
+ };
+ };
+
+ meta = {
+ maintainers = with maintainers; [ artturin ];
+ };
+}
diff --git a/pkgs/applications/blockchains/bitcoin/default.nix b/pkgs/applications/blockchains/bitcoin/default.nix
index 7a0237ed2b15a..7253d3dff3772 100644
--- a/pkgs/applications/blockchains/bitcoin/default.nix
+++ b/pkgs/applications/blockchains/bitcoin/default.nix
@@ -5,6 +5,7 @@
, pkg-config
, util-linux
, hexdump
+, autoSignDarwinBinariesHook
, wrapQtAppsHook ? null
, boost
, libevent
@@ -47,6 +48,7 @@ stdenv.mkDerivation rec {
[ autoreconfHook pkg-config ]
++ optionals stdenv.isLinux [ util-linux ]
++ optionals stdenv.isDarwin [ hexdump ]
+ ++ optionals (stdenv.isDarwin && stdenv.isAarch64) [ autoSignDarwinBinariesHook ]
++ optionals withGui [ wrapQtAppsHook ];
buildInputs = [ boost libevent miniupnpc zeromq zlib ]
diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json
index a36b160c5f94d..624dde9e1702e 100644
--- a/pkgs/applications/networking/browsers/chromium/upstream-info.json
+++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json
@@ -18,9 +18,9 @@
}
},
"beta": {
- "version": "96.0.4664.35",
- "sha256": "047zc1hl5iwhrgnypl7r5ga2cx1yz26lf1x5cnvdqmarmmkq380m",
- "sha256bin64": "1cw89fafxxhr85x4vzhxv3jkmqfnxjisc7gj9v8y2ixqpn190hjl",
+ "version": "96.0.4664.45",
+ "sha256": "01q4fsf2cbx6g9nnaihvc5jj3ap8jq2gf16pnhf7ixzbhgcnm328",
+ "sha256bin64": "1vaazcrlx0999xd9yp25i9kzb8y8g0yqd28xssw7jqwrhz033wgr",
"deps": {
"gn": {
"version": "2021-09-24",
diff --git a/pkgs/applications/networking/browsers/gmni/default.nix b/pkgs/applications/networking/browsers/gmni/default.nix
index 7baca62e67329..4bc4e360120fd 100644
--- a/pkgs/applications/networking/browsers/gmni/default.nix
+++ b/pkgs/applications/networking/browsers/gmni/default.nix
@@ -1,24 +1,24 @@
-{ stdenv, lib, fetchFromSourcehut, pkg-config, bearssl, scdoc }:
+{ stdenv, lib, fetchFromSourcehut, bearssl, scdoc }:
stdenv.mkDerivation rec {
pname = "gmni";
- version = "unstable-2021-03-26";
+ version = "1.0";
src = fetchFromSourcehut {
owner = "~sircmpwn";
repo = "gmni";
- rev = "77b73efbcd3ea7ed9e3e4c0aa19d9247e21d3c87";
- sha256 = "1wvnzyv7vyddcd39y6q5aflpnnsdl4k4y5aj5ssb7vgkld0h1b7r";
+ rev = version;
+ sha256 = "sha256-3MFNAI/SfFigNfitfFs3o9kkz7JeEflMHiH7iJpLfi4=";
};
- nativeBuildInputs = [ pkg-config ];
- buildInputs = [ bearssl scdoc ];
+ nativeBuildInputs = [ scdoc ];
+ buildInputs = [ bearssl ];
meta = with lib; {
description = "A Gemini client";
homepage = "https://git.sr.ht/~sircmpwn/gmni";
license = licenses.gpl3Only;
maintainers = with maintainers; [ bsima jb55 ];
- platforms = platforms.all;
+ platforms = platforms.linux;
};
}
diff --git a/pkgs/applications/networking/instant-messengers/whatsapp-for-linux/default.nix b/pkgs/applications/networking/instant-messengers/whatsapp-for-linux/default.nix
index 4e61f39cac58a..0d5355a1eb4d2 100644
--- a/pkgs/applications/networking/instant-messengers/whatsapp-for-linux/default.nix
+++ b/pkgs/applications/networking/instant-messengers/whatsapp-for-linux/default.nix
@@ -1,25 +1,26 @@
{ fetchFromGitHub
, lib
, stdenv
-, gtkmm3
-, webkitgtk
, cmake
-, pkg-config
-, libappindicator-gtk3
+, glib-networking
, gst_all_1
+, gtkmm3
+, libappindicator-gtk3
, pcre
+, pkg-config
+, webkitgtk
, wrapGAppsHook
}:
stdenv.mkDerivation rec {
pname = "whatsapp-for-linux";
- version = "1.2.1";
+ version = "1.3.0";
src = fetchFromGitHub {
owner = "eneshecan";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-dEJRufOqlY+DnJdUaG5WP9hR1qO7KxR6MjKWq1SJB8A=";
+ sha256 = "sha256-VdkCjzmZqP/ZVY1H9FxBGe5rN0nZEPZbMp3MVKL6WLc=";
};
nativeBuildInputs = [
@@ -29,14 +30,15 @@ stdenv.mkDerivation rec {
];
buildInputs = [
- gtkmm3
- webkitgtk
- libappindicator-gtk3
+ glib-networking
+ gst_all_1.gst-libav
+ gst_all_1.gst-plugins-bad
gst_all_1.gst-plugins-base
gst_all_1.gst-plugins-good
- gst_all_1.gst-plugins-bad
- gst_all_1.gst-libav
+ gtkmm3
+ libappindicator-gtk3
pcre
+ webkitgtk
];
meta = with lib; {
diff --git a/pkgs/applications/version-management/git-and-tools/glitter/default.nix b/pkgs/applications/version-management/git-and-tools/glitter/default.nix
index bee5ec58f47cb..ff781f471485f 100644
--- a/pkgs/applications/version-management/git-and-tools/glitter/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/glitter/default.nix
@@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "glitter";
- version = "1.5.0";
+ version = "1.5.1";
src = fetchFromGitHub {
owner = "milo123459";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-AEtew+oS66H1BNh71SqRuj8eXmBEA45dRmtc/9fem9s=";
+ sha256 = "sha256-AVHMDDvrSLg0OwoG4I5/W2ttWgBwzOG7553gr9bCDFs=";
};
- cargoSha256 = "sha256-bVYfmp0KcVuy0CbUOUoXYQ8BalaKXShitGXLdGWl+rQ=";
+ cargoSha256 = "sha256-vBzy4gnlJMQwvVieuWuiVOm/HAr6rHkHcLmzY7eklT4=";
# tests require it to be in a git repository
preCheck = ''
diff --git a/pkgs/build-support/build-dotnet-package/default.nix b/pkgs/build-support/build-dotnet-package/default.nix
index 440b10044f0fa..16dfd694ed3d3 100644
--- a/pkgs/build-support/build-dotnet-package/default.nix
+++ b/pkgs/build-support/build-dotnet-package/default.nix
@@ -3,7 +3,7 @@
attrsOrig @
{ baseName
, version
-, buildInputs ? []
+, nativeBuildInputs ? []
, xBuildFiles ? [ ]
, xBuildFlags ? [ "/p:Configuration=Release" ]
, outputFiles ? [ "bin/Release/*" ]
@@ -19,12 +19,12 @@ attrsOrig @
attrs = {
name = "${baseName}-${version}";
- nativeBuildInputs = [ pkg-config ];
- buildInputs = [
- mono
- dotnetbuildhelpers
+ nativeBuildInputs = [
+ pkg-config
makeWrapper
- ] ++ buildInputs;
+ dotnetbuildhelpers
+ mono
+ ] ++ nativeBuildInputs;
configurePhase = ''
runHook preConfigure
@@ -87,7 +87,7 @@ attrsOrig @
then
echo "$dll already exported by a buildInputs, not re-exporting"
else
- ${dotnetbuildhelpers}/bin/create-pkg-config-for-dll.sh "$out/lib/pkgconfig" "$dll"
+ create-pkg-config-for-dll.sh "$out/lib/pkgconfig" "$dll"
fi
done
done
@@ -113,4 +113,4 @@ attrsOrig @
'';
};
in
- stdenv.mkDerivation (attrs // (builtins.removeAttrs attrsOrig [ "buildInputs" ] ))
+ stdenv.mkDerivation (attrs // (builtins.removeAttrs attrsOrig [ "nativeBuildInputs" ] ))
diff --git a/pkgs/development/dhall-modules/dhall-grafana.nix b/pkgs/development/dhall-modules/dhall-grafana.nix
index e1ac161a15339..f06a994a9a4c2 100644
--- a/pkgs/development/dhall-modules/dhall-grafana.nix
+++ b/pkgs/development/dhall-modules/dhall-grafana.nix
@@ -4,8 +4,8 @@ buildDhallGitHubPackage {
name = "grafana";
owner = "weeezes";
repo = "dhall-grafana";
- # 2021-11-06
- rev = "9ee0bb643f01db6d9935cf7df1914c32a92730b4";
- sha256 = "0a123r5a33p8kaqs68rx2ycjr72xvxcpcmvpqxgb2jb05mnjj540";
+ # 2021-11-12
+ rev = "d5630dc55deacf5100a99802a4df1d9680b263b3";
+ sha256 = "01320hpqgr5r4grsydmdl9yznmly1ssnlc9gcwa8rj1ah0a8xlgz";
dependencies = [ dhallPackages.Prelude ];
}
diff --git a/pkgs/development/libraries/pcre/default.nix b/pkgs/development/libraries/pcre/default.nix
index c91d4e2bd0c29..d2fe9a84ac371 100644
--- a/pkgs/development/libraries/pcre/default.nix
+++ b/pkgs/development/libraries/pcre/default.nix
@@ -17,7 +17,7 @@ in stdenv.mkDerivation {
name = "${pname}-${version}";
src = fetchurl {
- url = "https://ftp.pcre.org/pub/pcre/pcre-${version}.tar.bz2";
+ url = "mirror://sourceforge/project/pcre/pcre/${version}/pcre-${version}.tar.bz2";
sha256 = "0v9nk51wh55pcbnf2jr36yarz8ayajn6d7ywiq2wagivn9c8c40r";
};
diff --git a/pkgs/development/libraries/xdg-desktop-portal/default.nix b/pkgs/development/libraries/xdg-desktop-portal/default.nix
index 71674a6c3886c..bb8950ca1ec95 100644
--- a/pkgs/development/libraries/xdg-desktop-portal/default.nix
+++ b/pkgs/development/libraries/xdg-desktop-portal/default.nix
@@ -1,6 +1,7 @@
{ stdenv
, lib
, fetchFromGitHub
+, fetchpatch
, nixosTests
, substituteAll
, autoreconfHook
@@ -38,6 +39,12 @@ stdenv.mkDerivation rec {
src = ./fix-paths.patch;
inherit flatpak;
})
+ # Fixes the issue in https://github.com/flatpak/xdg-desktop-portal/issues/636
+ # Remove it when the next stable release arrives
+ (fetchpatch {
+ url = "https://github.com/flatpak/xdg-desktop-portal/commit/d7622e15ff8fef114a6759dde564826d04215a9f.patch";
+ sha256 = "sha256-vmfxK4ddG6Xon//rpiz6OiBsDLtT0VG5XyBJG3E4PPs=";
+ })
];
nativeBuildInputs = [
diff --git a/pkgs/development/ocaml-modules/phylogenetics/default.nix b/pkgs/development/ocaml-modules/phylogenetics/default.nix
index b284f7ef5eba8..1a23a4d3e131f 100644
--- a/pkgs/development/ocaml-modules/phylogenetics/default.nix
+++ b/pkgs/development/ocaml-modules/phylogenetics/default.nix
@@ -1,30 +1,50 @@
-{ lib, buildDunePackage, fetchFromGitHub, ppx_deriving
-, alcotest, angstrom-unix, biocaml, gnuplot, gsl, lacaml, menhir, owl, printbox }:
+{ lib
+, buildDunePackage
+, fetchurl
+, ppx_deriving
+, bppsuite
+, alcotest
+, angstrom-unix
+, biocaml
+, core
+, gsl
+, lacaml
+, menhir
+, menhirLib
+, printbox
+}:
buildDunePackage rec {
pname = "phylogenetics";
- version = "unstable-2020-11-23";
+ version = "0.0.0";
useDune2 = true;
- src = fetchFromGitHub {
- owner = "biocaml";
- repo = pname;
- rev = "e6e10efa0a3a8fd61bf4ab69e91a09549cc1ded6";
- sha256 = "0pmypzp0rvlpzm8zpbcfkphwnhrpyfwfv44kshvx2f8nslmksh8c";
+ src = fetchurl {
+ url = "https://github.com/biocaml/phylogenetics/releases/download/v${version}/${pname}-${version}.tbz";
+ sha256 = "sha256:0knfh2s0jfnsc0vsq5yw5xla7m7i98xd0qv512dyh3jhkh7m00l9";
};
- minimumOCamlVersion = "4.08"; # e.g., uses Float.min
+ minimalOCamlVersion = "4.08";
- checkInputs = [ alcotest ];
+ checkInputs = [ alcotest bppsuite ];
buildInputs = [ menhir ];
- propagatedBuildInputs = [ angstrom-unix biocaml gnuplot gsl lacaml owl ppx_deriving printbox ];
+ propagatedBuildInputs = [
+ angstrom-unix
+ biocaml
+ core
+ gsl
+ lacaml
+ menhirLib
+ ppx_deriving
+ printbox
+ ];
- doCheck = false; # many tests require bppsuite
+ doCheck = true;
meta = with lib; {
- inherit (src.meta) homepage;
- description = "Bioinformatics library for Ocaml";
+ homepage = "https://github.com/biocaml/phylogenetics";
+ description = "Algorithms and datastructures for phylogenetics";
maintainers = [ maintainers.bcdarwin ];
license = licenses.cecill-b;
};
diff --git a/pkgs/development/python-modules/adafruit-platformdetect/default.nix b/pkgs/development/python-modules/adafruit-platformdetect/default.nix
index 70c2a93d46bd7..17e304b6802c3 100644
--- a/pkgs/development/python-modules/adafruit-platformdetect/default.nix
+++ b/pkgs/development/python-modules/adafruit-platformdetect/default.nix
@@ -6,19 +6,25 @@
buildPythonPackage rec {
pname = "adafruit-platformdetect";
- version = "3.17.1";
+ version = "3.17.2";
+ format = "setuptools";
src = fetchPypi {
pname = "Adafruit-PlatformDetect";
inherit version;
- sha256 = "sha256-M+0q1u/ZcAg2Pii/B2n0v+rw/zIAjeVej/VThi9NLwI=";
+ sha256 = "sha256-IA846zNFmBqSUc0oXJ0eA5wj6PzQ28jxO22z5WNOT24=";
};
- nativeBuildInputs = [ setuptools-scm ];
+ nativeBuildInputs = [
+ setuptools-scm
+ ];
# Project has not published tests yet
doCheck = false;
- pythonImportsCheck = [ "adafruit_platformdetect" ];
+
+ pythonImportsCheck = [
+ "adafruit_platformdetect"
+ ];
meta = with lib; {
description = "Platform detection for use by Adafruit libraries";
diff --git a/pkgs/development/python-modules/adax/default.nix b/pkgs/development/python-modules/adax/default.nix
index 867b08e28a3d5..c7b0dcb45b315 100644
--- a/pkgs/development/python-modules/adax/default.nix
+++ b/pkgs/development/python-modules/adax/default.nix
@@ -8,14 +8,16 @@
buildPythonPackage rec {
pname = "adax";
- version = "0.1.1";
+ version = "0.2.0";
+ format = "setuptools";
+
disabled = pythonOlder "3.5";
src = fetchFromGitHub {
owner = "Danielhiversen";
repo = "pyadax";
rev = version;
- sha256 = "sha256-ekpI5GTLbKjlbWH9GSmpp/3URurc7UN+agxMfyGxrVA=";
+ sha256 = "sha256-EMSX2acklwWOYiEeLHYG5mwdiGnWAUo5dGMiHCmZrko=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/bimmer-connected/default.nix b/pkgs/development/python-modules/bimmer-connected/default.nix
index 472e6a4707791..337d6951faf34 100644
--- a/pkgs/development/python-modules/bimmer-connected/default.nix
+++ b/pkgs/development/python-modules/bimmer-connected/default.nix
@@ -9,7 +9,8 @@
buildPythonPackage rec {
pname = "bimmer-connected";
- version = "0.7.21";
+ version = "0.7.22";
+ format = "setuptools";
disabled = pythonOlder "3.5";
@@ -17,7 +18,7 @@ buildPythonPackage rec {
owner = "bimmerconnected";
repo = "bimmer_connected";
rev = version;
- sha256 = "sha256-98K7FRB//WyCu6NPG0x4ViA8UdMuiANDXshLjx/Yehg=";
+ sha256 = "sha256-tAkgOZvf9nyrAfFRxGkp7O/2oIAdBx+hNZbK9den+5c=";
};
nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/cachecontrol/default.nix b/pkgs/development/python-modules/cachecontrol/default.nix
index 7a124bae2ec70..d074183e79d74 100644
--- a/pkgs/development/python-modules/cachecontrol/default.nix
+++ b/pkgs/development/python-modules/cachecontrol/default.nix
@@ -6,19 +6,22 @@
, mock
, msgpack
, pytestCheckHook
+, pythonOlder
, requests
}:
buildPythonPackage rec {
pname = "cachecontrol";
- version = "0.12.8";
+ version = "0.12.10";
format = "setuptools";
+ disabled = pythonOlder "3.6";
+
src = fetchFromGitHub {
owner = "ionrock";
repo = pname;
rev = "v${version}";
- sha256 = "0y15xbaqw2lxidwbyrgpy42v3cxgv4ys63fx2586h1szlrd4f3p4";
+ sha256 = "sha256-mgvL0q10UbPHY1H3tJprke5p8qNl3HNYoeLAERZTcTs=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/crownstone-core/default.nix b/pkgs/development/python-modules/crownstone-core/default.nix
index 35289cf1956c7..be23d054a4eb2 100644
--- a/pkgs/development/python-modules/crownstone-core/default.nix
+++ b/pkgs/development/python-modules/crownstone-core/default.nix
@@ -8,7 +8,7 @@
buildPythonPackage rec {
pname = "crownstone-core";
- version = "3.0.1";
+ version = "3.1.0";
format = "setuptools";
disabled = pythonOlder "3.8";
@@ -17,7 +17,7 @@ buildPythonPackage rec {
owner = "crownstone";
repo = "crownstone-lib-python-core";
rev = version;
- sha256 = "138lignv7c8kkqbqfkdcfpg39gm9x44h7r2j403m4ib7gq420hsn";
+ sha256 = "sha256-ujS4ho9io7KcoK5w1SCn7UPFg1ho3dgW0HS5HfsYsuU=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/crownstone-uart/default.nix b/pkgs/development/python-modules/crownstone-uart/default.nix
index fd1c2094335cf..b8ed7721f0642 100644
--- a/pkgs/development/python-modules/crownstone-uart/default.nix
+++ b/pkgs/development/python-modules/crownstone-uart/default.nix
@@ -8,7 +8,7 @@
buildPythonPackage rec {
pname = "crownstone-uart";
- version = "2.1.0";
+ version = "2.2.0";
format = "setuptools";
disabled = pythonOlder "3.8";
@@ -17,7 +17,7 @@ buildPythonPackage rec {
owner = "crownstone";
repo = "crownstone-lib-python-uart";
rev = version;
- sha256 = "0sdz131vmrfp6hrm9iwqw8mj9qazsxg7b85yadib1122w9f3b1zc";
+ sha256 = "sha256-5K7NzJ7fKOW4Uh1XIlicVkRZuM84qTM5RQc/DfP9OEc=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/cyclonedx-python-lib/default.nix b/pkgs/development/python-modules/cyclonedx-python-lib/default.nix
index cdbb1738b9b45..aec7d975a77c8 100644
--- a/pkgs/development/python-modules/cyclonedx-python-lib/default.nix
+++ b/pkgs/development/python-modules/cyclonedx-python-lib/default.nix
@@ -16,7 +16,7 @@
buildPythonPackage rec {
pname = "cyclonedx-python-lib";
- version = "0.11.0";
+ version = "0.11.1";
format = "pyproject";
disabled = pythonOlder "3.6";
@@ -25,7 +25,7 @@ buildPythonPackage rec {
owner = "CycloneDX";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-FNEtVTcmVyhAri55GjlzQbg21YByAJjmKQvWaYh3xRw=";
+ sha256 = "sha256-+Gu9WaGC2R5TC8XSqDNSJ3t7aMS69IeeKTzytYFcHvE=";
};
nativeBuildInputs = [
diff --git a/pkgs/development/python-modules/elgato/default.nix b/pkgs/development/python-modules/elgato/default.nix
index 6ee0cd019128c..d0c072901c351 100644
--- a/pkgs/development/python-modules/elgato/default.nix
+++ b/pkgs/development/python-modules/elgato/default.nix
@@ -1,26 +1,28 @@
{ lib
+, aiohttp
+, aresponses
, buildPythonPackage
-, pythonOlder
, fetchFromGitHub
-, aiohttp
, poetry-core
-, yarl
-, aresponses
+, pydantic
, pytest-asyncio
, pytestCheckHook
+, pythonOlder
+, yarl
}:
buildPythonPackage rec {
pname = "elgato";
- version = "2.1.1";
- disabled = pythonOlder "3.8";
+ version = "2.2.0";
format = "pyproject";
+ disabled = pythonOlder "3.8";
+
src = fetchFromGitHub {
owner = "frenck";
repo = "python-elgato";
rev = "v${version}";
- sha256 = "19z568jjyww7vi8s44anrb66qjz5l22nz4jqcz49ybhf22warmff";
+ sha256 = "sha256-xsIglJSnvtd3NKqwoRAonPRN+C9KWyar0mrYcC3hPpw=";
};
nativeBuildInputs = [
@@ -29,6 +31,7 @@ buildPythonPackage rec {
propagatedBuildInputs = [
aiohttp
+ pydantic
yarl
];
@@ -45,7 +48,9 @@ buildPythonPackage rec {
--replace "--cov" ""
'';
- pythonImportsCheck = [ "elgato" ];
+ pythonImportsCheck = [
+ "elgato"
+ ];
meta = with lib; {
description = "Python client for Elgato Key Lights";
diff --git a/pkgs/development/python-modules/hug/default.nix b/pkgs/development/python-modules/hug/default.nix
index 872798c6ced89..f19c7a9dd39fd 100644
--- a/pkgs/development/python-modules/hug/default.nix
+++ b/pkgs/development/python-modules/hug/default.nix
@@ -47,6 +47,7 @@ buildPythonPackage rec {
description = "A Python framework that makes developing APIs as simple as possible, but no simpler";
homepage = "https://github.com/hugapi/hug";
license = licenses.mit;
+ # Missing support for later falcon releases
+ broken = true;
};
-
}
diff --git a/pkgs/development/python-modules/jupyter-repo2docker/default.nix b/pkgs/development/python-modules/jupyter-repo2docker/default.nix
index b59b9adb2484b..4e66e332b079a 100644
--- a/pkgs/development/python-modules/jupyter-repo2docker/default.nix
+++ b/pkgs/development/python-modules/jupyter-repo2docker/default.nix
@@ -1,9 +1,16 @@
-{ lib, buildPythonPackage, fetchPypi, pythonOlder
+{ lib
+, bash
+, buildPythonPackage
+, chardet
, docker
+, entrypoints
, escapism
+, fetchFromGitHub
+, iso8601
, jinja2
, pkgs-docker
, python-json-logger
+, pythonOlder
, pyyaml
, ruamel-yaml
, semver
@@ -12,18 +19,24 @@
}:
buildPythonPackage rec {
- version = "2021.8.0";
+ version = "2021.08.0";
pname = "jupyter-repo2docker";
- disabled = pythonOlder "3.4";
+ format = "setuptools";
- src = fetchPypi {
- inherit pname version;
- sha256 = "9d1b3c3ec7944ea6b0a234d6fa77293a2d1ed1c080eba8466aba94f811b3465d";
+ disabled = pythonOlder "3.6";
+
+ src = fetchFromGitHub {
+ owner = "jupyterhub";
+ repo = "repo2docker";
+ rev = version;
+ sha256 = "10hcdag7ivyqyiqrmr9c48zynp8d81ic3px1ffgnaysih7lvkwb6";
};
propagatedBuildInputs = [
docker
+ entrypoints
escapism
+ iso8601
jinja2
pkgs-docker
python-json-logger
@@ -33,7 +46,7 @@ buildPythonPackage rec {
traitlets
];
- # tests not packaged with pypi release
+ # Tests require a running Docker instance
doCheck = false;
pythonImportsCheck = [
@@ -44,9 +57,9 @@ buildPythonPackage rec {
];
meta = with lib; {
- homepage = "https://repo2docker.readthedocs.io/en/latest/";
- description = "Repo2docker: Turn code repositories into Jupyter enabled Docker Images";
+ description = "Turn code repositories into Jupyter enabled Docker Images";
+ homepage = "https://repo2docker.readthedocs.io/";
license = licenses.bsdOriginal;
- maintainers = [ maintainers.costrouc ];
+ maintainers = with maintainers; [ costrouc ];
};
}
diff --git a/pkgs/development/python-modules/mill-local/default.nix b/pkgs/development/python-modules/mill-local/default.nix
new file mode 100644
index 0000000000000..9d00bb71c8bcc
--- /dev/null
+++ b/pkgs/development/python-modules/mill-local/default.nix
@@ -0,0 +1,41 @@
+{ lib
+, aiohttp
+, async-timeout
+, buildPythonPackage
+, fetchFromGitHub
+, pythonOlder
+}:
+
+buildPythonPackage rec {
+ pname = "mill-local";
+ version = "0.1.0";
+ format = "setuptools";
+
+ disabled = pythonOlder "3.8";
+
+ src = fetchFromGitHub {
+ owner = "Danielhiversen";
+ repo = "pyMillLocal";
+ rev = version;
+ sha256 = "0q0frwj9yxdmqi5axl7gxirfflgn8xh1932c6lhp9my2v1d0gdrk";
+ };
+
+ propagatedBuildInputs = [
+ aiohttp
+ async-timeout
+ ];
+
+ # Project has no tests
+ doCheck = false;
+
+ pythonImportsCheck = [
+ "mill_local"
+ ];
+
+ meta = with lib; {
+ description = "Python module to communicate locally with Mill heaters";
+ homepage = "https://github.com/Danielhiversen/pyMillLocal";
+ license = with licenses; [ mit ];
+ maintainers = with maintainers; [ fab ];
+ };
+}
diff --git a/pkgs/development/python-modules/nbclient/default.nix b/pkgs/development/python-modules/nbclient/default.nix
index e47af565bdc36..b6cfbc51cac06 100644
--- a/pkgs/development/python-modules/nbclient/default.nix
+++ b/pkgs/development/python-modules/nbclient/default.nix
@@ -6,12 +6,12 @@
buildPythonPackage rec {
pname = "nbclient";
- version = "0.5.4";
+ version = "0.5.8";
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
- sha256 = "6c8ad36a28edad4562580847f9f1636fe5316a51a323ed85a24a4ad37d4aefce";
+ sha256 = "sha256-NPUsycuDGl2MzXAxU341THXcYaJEh/mYcS0Sid4yCiU=";
};
inherit doCheck;
@@ -22,5 +22,6 @@ buildPythonPackage rec {
homepage = "https://github.com/jupyter/nbclient";
description = "A client library for executing notebooks";
license = licenses.bsd3;
+ maintainers = [ maintainers.erictapen ];
};
}
diff --git a/pkgs/development/python-modules/nettigo-air-monitor/default.nix b/pkgs/development/python-modules/nettigo-air-monitor/default.nix
index 6142972c0c942..ad591163f0813 100644
--- a/pkgs/development/python-modules/nettigo-air-monitor/default.nix
+++ b/pkgs/development/python-modules/nettigo-air-monitor/default.nix
@@ -12,14 +12,16 @@
buildPythonPackage rec {
pname = "nettigo-air-monitor";
- version = "1.1.1";
- disabled = pythonOlder "3.6";
+ version = "1.2.0";
+ format = "setuptools";
+
+ disabled = pythonOlder "3.8";
src = fetchFromGitHub {
owner = "bieniu";
repo = pname;
rev = version;
- sha256 = "sha256-OIB1d6XtstUr5P0q/dmyJS7+UbtkFQIiuSnzwcdP1mE=";
+ sha256 = "sha256-KPgBbYGbKpKEPMxywgRvJcSCEYSUQkiPEFqj+bB0g1s=";
};
propagatedBuildInputs = [
@@ -41,7 +43,9 @@ buildPythonPackage rec {
--replace "--cov --cov-report term-missing " ""
'';
- pythonImportsCheck = [ "nettigo_air_monitor" ];
+ pythonImportsCheck = [
+ "nettigo_air_monitor"
+ ];
meta = with lib; {
description = "Python module to get air quality data from Nettigo Air Monitor devices";
diff --git a/pkgs/development/python-modules/pg8000/default.nix b/pkgs/development/python-modules/pg8000/default.nix
index 8b8d2ed488b90..98750a917ca1b 100644
--- a/pkgs/development/python-modules/pg8000/default.nix
+++ b/pkgs/development/python-modules/pg8000/default.nix
@@ -8,12 +8,14 @@
buildPythonPackage rec {
pname = "pg8000";
- version = "1.22.0";
+ version = "1.22.1";
+ format = "setuptools";
+
disabled = pythonOlder "3.6";
src = fetchPypi {
inherit pname version;
- sha256 = "c5172252fc92142ec104cd5e7231be4580a1a0a814403707bafbf7bb8383a29a";
+ sha256 = "sha256-/WmtWvJ4HllgjLP02WayNNlhxi8JPt0xlKxF32W40dQ=";
};
propagatedBuildInputs = [
@@ -23,7 +25,10 @@ buildPythonPackage rec {
# Tests require a running PostgreSQL instance
doCheck = false;
- pythonImportsCheck = [ "pg8000" ];
+
+ pythonImportsCheck = [
+ "pg8000"
+ ];
meta = with lib; {
description = "Python driver for PostgreSQL";
diff --git a/pkgs/development/python-modules/pymetno/default.nix b/pkgs/development/python-modules/pymetno/default.nix
index 0115893700acb..f3dcdf6c45a73 100644
--- a/pkgs/development/python-modules/pymetno/default.nix
+++ b/pkgs/development/python-modules/pymetno/default.nix
@@ -9,14 +9,14 @@
buildPythonPackage rec {
pname = "pymetno";
- version = "0.8.3";
+ version = "0.9.0";
format = "setuptools";
src = fetchFromGitHub {
owner = "Danielhiversen";
repo = "PyMetno";
rev = version;
- sha256 = "sha256-dvZz+wv9B07yKM4E4fQ9VQOgeil9KxZxcGk6D0kWY4g=";
+ sha256 = "sha256-2LNDFQObGqxrzswnqbmvCGLxEI0j+cIdv8o+RZM/7sM=";
};
propagatedBuildInputs = [
@@ -30,7 +30,7 @@ buildPythonPackage rec {
"metno"
];
- # no tests
+ # Project has no tests
doCheck = false;
meta = with lib; {
diff --git a/pkgs/development/python-modules/twitterapi/default.nix b/pkgs/development/python-modules/twitterapi/default.nix
index cf3ec977d0ea9..313e408ca50d4 100644
--- a/pkgs/development/python-modules/twitterapi/default.nix
+++ b/pkgs/development/python-modules/twitterapi/default.nix
@@ -7,13 +7,14 @@
buildPythonPackage rec {
pname = "twitterapi";
- version = "2.7.5";
+ version = "2.7.7";
+ format = "setuptools";
src = fetchFromGitHub {
owner = "geduldig";
repo = "TwitterAPI";
rev = "v${version}";
- sha256 = "1s5q3gzd69syk8khlyy7ap8gpymvhgqrlv3vp6vdmwnaafjvvyy3";
+ sha256 = "sha256-KEJ0lAg6Zi2vps+ZPTkT6ts87qnIBL9pFe1tPEzviCI=";
};
propagatedBuildInputs = [
@@ -23,7 +24,10 @@ buildPythonPackage rec {
# Tests are interacting with the Twitter API
doCheck = false;
- pythonImportsCheck = [ "TwitterAPI" ];
+
+ pythonImportsCheck = [
+ "TwitterAPI"
+ ];
meta = with lib; {
description = "Python wrapper for Twitter's REST and Streaming APIs";
diff --git a/pkgs/development/tools/analysis/checkov/default.nix b/pkgs/development/tools/analysis/checkov/default.nix
index 49343c544a41f..7a6ced8b3062f 100644
--- a/pkgs/development/tools/analysis/checkov/default.nix
+++ b/pkgs/development/tools/analysis/checkov/default.nix
@@ -56,13 +56,13 @@ with py.pkgs;
buildPythonApplication rec {
pname = "checkov";
- version = "2.0.566";
+ version = "2.0.568";
src = fetchFromGitHub {
owner = "bridgecrewio";
repo = pname;
rev = version;
- sha256 = "sha256-Eah4dK23jdHK7s0VF8FLd6KJzHP5YpdLGcM7IXgB880=";
+ sha256 = "sha256-V1YHD0+gXx5wLfhrfze6kAgF1egxXbjf4c2zEc/oT1A=";
};
nativeBuildInputs = with py.pkgs; [
diff --git a/pkgs/misc/ananicy-cpp/default.nix b/pkgs/misc/ananicy-cpp/default.nix
new file mode 100644
index 0000000000000..25bcaec132677
--- /dev/null
+++ b/pkgs/misc/ananicy-cpp/default.nix
@@ -0,0 +1,46 @@
+{ lib
+, gcc11Stdenv
+, fetchFromGitLab
+, makeWrapper
+, cmake
+, spdlog
+, nlohmann_json
+, systemd
+}:
+
+gcc11Stdenv.mkDerivation rec {
+ pname = "ananicy-cpp";
+ version = "unstable-2021-10-13";
+
+ src = fetchFromGitLab {
+ owner = "ananicy-cpp";
+ repo = "ananicy-cpp";
+ rev = "6a14fe7353221c89347eddbbcafb35cf5fee4758";
+ sha256 = "sha256-V0QPXC17ZD2c4MK3DAkzoPgKOU5V5BjfQKUk7I6f8WM=";
+ };
+
+ nativeBuildInputs = [
+ makeWrapper
+ cmake
+ ];
+
+ buildInputs = [
+ spdlog
+ nlohmann_json
+ systemd
+ ];
+
+ cmakeFlags = [
+ "-DUSE_EXTERNAL_JSON=yON"
+ "-DUSE_EXTERNAL_SPDLOG=ON"
+ "-DUSE_EXTERNAL_FMTLIB=ON"
+ ];
+
+ meta = with lib; {
+ homepage = "https://gitlab.com/ananicy-cpp/ananicy-cpp";
+ description = "Rewrite of ananicy in c++ for lower cpu and memory usage";
+ license = licenses.gpl3Only;
+ platforms = platforms.linux;
+ maintainers = with maintainers; [ artturin ];
+ };
+}
diff --git a/pkgs/misc/ananicy/default.nix b/pkgs/misc/ananicy/default.nix
new file mode 100644
index 0000000000000..3c2392df731d5
--- /dev/null
+++ b/pkgs/misc/ananicy/default.nix
@@ -0,0 +1,58 @@
+{ lib, stdenv, python3, fetchFromGitHub, makeWrapper, schedtool, sysctl, util-linux, fetchpatch }:
+
+stdenv.mkDerivation rec {
+ pname = "ananicy";
+ version = "unstable-2021-11-05";
+
+ src = fetchFromGitHub {
+ owner = "nefelim4ag";
+ repo = "ananicy";
+ rev = "b8968e9b32b0e4e6a01dc2314e43de8fee9da691";
+ sha256 = "sha256-tlPY81xdUpZrDYdApXooZ0Mst0n7ARVHyUrmymqg0rk=";
+ };
+
+ patches = [
+ # https://github.com/Nefelim4ag/Ananicy/pull/437
+ # fix makefile destinations
+ (fetchpatch {
+ url = "https://github.com/Nefelim4ag/Ananicy/commit/dbda0f50670de3f249991706ef1cc107c5197a2f.patch";
+ sha256 = "sha256-vMcJxekg2QUbm253CLAv3tmo5kedSlw+/PI/LamNWwc=";
+ # only used for debian packaging. lets exclude it so the patch applies even when that file is changed
+ excludes = [ "package.sh" ];
+ })
+ # https://github.com/Nefelim4ag/Ananicy/pull/439
+ # fix syntax error
+ (fetchpatch {
+ url = "https://github.com/Nefelim4ag/Ananicy/commit/0f8b809298ccfd88d0e2ab952d6e4131865246da.patch";
+ sha256 = "sha256-PWE4F0G97gecgc9HnG7ScA78+QVc8u8aF9u74qVChX0=";
+ })
+ ];
+
+ nativeBuildInputs = [ makeWrapper ];
+ buildInputs = [ python3 ];
+
+ makeFlags = [
+ "PREFIX=$(out)"
+ "SYSCONFDIR=${placeholder "out"}/etc"
+ ];
+
+ dontConfigure = true;
+ dontBuild = true;
+
+ postInstall = ''
+ wrapProgram $out/bin/ananicy \
+ --prefix PATH : ${lib.makeBinPath [ schedtool util-linux ]}
+
+ substituteInPlace $out/lib/systemd/system/ananicy.service \
+ --replace "/sbin/sysctl" "${sysctl}/bin/sysctl" \
+ --replace "/usr/bin/ananicy" "$out/bin/ananicy"
+ '';
+
+ meta = with lib; {
+ homepage = "https://github.com/Nefelim4ag/Ananicy";
+ description = "Another auto nice daemon, with community rules support";
+ license = licenses.gpl3Only;
+ platforms = platforms.linux;
+ maintainers = with maintainers; [ artturin ];
+ };
+}
diff --git a/pkgs/misc/screensavers/xscreensaver/default.nix b/pkgs/misc/screensavers/xscreensaver/default.nix
index 81f37b0bc41a6..b90f75f6a0426 100644
--- a/pkgs/misc/screensavers/xscreensaver/default.nix
+++ b/pkgs/misc/screensavers/xscreensaver/default.nix
@@ -37,6 +37,9 @@ stdenv.mkDerivation rec {
"--with-app-defaults=${placeholder "out"}/share/xscreensaver/app-defaults"
];
+ # "marbling" has NEON code that mixes signed and unsigned vector types
+ NIX_CFLAGS_COMPILE = lib.optional (with stdenv.hostPlatform; isAarch64 || isAarch32) "-flax-vector-conversions";
+
postInstall = ''
for bin in $out/bin/*; do
wrapProgram "$bin" \
diff --git a/pkgs/misc/vim-plugins/generated.nix b/pkgs/misc/vim-plugins/generated.nix
index a2bbd5299c056..f1f61212f24dd 100644
--- a/pkgs/misc/vim-plugins/generated.nix
+++ b/pkgs/misc/vim-plugins/generated.nix
@@ -77,12 +77,12 @@ final: prev:
ale = buildVimPluginFrom2Nix {
pname = "ale";
- version = "2021-11-09";
+ version = "2021-11-12";
src = fetchFromGitHub {
owner = "dense-analysis";
repo = "ale";
- rev = "8b3b16d71c4c683da6f3ca39662d207a3e894901";
- sha256 = "1mdxgiin61630fimxm2l0zcr30br4q2ipp84l3iqxjbs0fqg11s5";
+ rev = "76c2293e68a6cad3b192062743d25b8daa082205";
+ sha256 = "1fcc3qy425fp5qrhcgi8gagl2b33wa5m8r9xzqqawk47rkpjx5d0";
};
meta.homepage = "https://github.com/dense-analysis/ale/";
};
@@ -351,6 +351,18 @@ final: prev:
meta.homepage = "https://github.com/euclidianAce/BetterLua.vim/";
};
+ blueballs-neovim = buildVimPluginFrom2Nix {
+ pname = "blueballs-neovim";
+ version = "2021-09-09";
+ src = fetchFromGitHub {
+ owner = "blueballs-theme";
+ repo = "blueballs-neovim";
+ rev = "e0d73d553f663a12539682d89130d71df2db9099";
+ sha256 = "02x374wgbw3fmqlyrlxspf1n3ajik5y53g232r44y6093ly8wsw1";
+ };
+ meta.homepage = "https://github.com/blueballs-theme/blueballs-neovim/";
+ };
+
bracey-vim = buildVimPluginFrom2Nix {
pname = "bracey.vim";
version = "2021-08-20";
@@ -461,12 +473,12 @@ final: prev:
chadtree = buildVimPluginFrom2Nix {
pname = "chadtree";
- version = "2021-11-11";
+ version = "2021-11-12";
src = fetchFromGitHub {
owner = "ms-jpq";
repo = "chadtree";
- rev = "8bf4553d1000b2c9189f1893ac5c737b61572791";
- sha256 = "1jk795a6r8yzbjbyx121qn65njs4j3l947x3n937kygqpb7paflm";
+ rev = "ba07c14d05f08853a1055c06f71ce5dec60a669f";
+ sha256 = "1ncac73d20sh0d8z0cbp5bv6xy98bm1zpld0164rdw626bmh5gx3";
};
meta.homepage = "https://github.com/ms-jpq/chadtree/";
};
@@ -809,12 +821,12 @@ final: prev:
coc-fzf = buildVimPluginFrom2Nix {
pname = "coc-fzf";
- version = "2021-10-23";
+ version = "2021-11-11";
src = fetchFromGitHub {
owner = "antoinemadec";
repo = "coc-fzf";
- rev = "9fc34a66e6744f52769bb0b95cba851723964faf";
- sha256 = "0lhvaygicayqpabgmdya6fq7yybch5nd7myjydmcdnpmivzh7mk8";
+ rev = "60828294b9ba846c78893389d4772021043d2fa1";
+ sha256 = "1y7rslksa558fdh3m4m626vpvs424pvxkkk70mr57is47cminm3m";
};
meta.homepage = "https://github.com/antoinemadec/coc-fzf/";
};
@@ -1122,12 +1134,12 @@ final: prev:
Coqtail = buildVimPluginFrom2Nix {
pname = "Coqtail";
- version = "2021-10-28";
+ version = "2021-11-11";
src = fetchFromGitHub {
owner = "whonore";
repo = "Coqtail";
- rev = "86b9aecfaeaed5db9064b58115ff6dc67b318f7e";
- sha256 = "10gjlxnga52f21r558xz7pqv63pbqqfw01yl71i0z46y33jnpy14";
+ rev = "91112aff209866d679fc89ca7d0697938f80e59f";
+ sha256 = "0gp0a56zd1pf31z99yzwjrjq8zhinr68izqx9klj70r0h61hsm2z";
};
meta.homepage = "https://github.com/whonore/Coqtail/";
};
@@ -1628,12 +1640,12 @@ final: prev:
diffview-nvim = buildVimPluginFrom2Nix {
pname = "diffview.nvim";
- version = "2021-10-22";
+ version = "2021-11-11";
src = fetchFromGitHub {
owner = "sindrets";
repo = "diffview.nvim";
- rev = "d4ee04c9eb8951dcf1aa83d7a896bededfc68228";
- sha256 = "0wfrbhnal7y82bhrf446igc6g9avavk2jx0idk5sbv24bqhi9b60";
+ rev = "a38306ddf893b95b55c6cd881605b3232c658e42";
+ sha256 = "1c55zhxzf3zps7fzqs4vsd81z9la2x3blvjwh45abs93rnqik8nx";
};
meta.homepage = "https://github.com/sindrets/diffview.nvim/";
};
@@ -2003,12 +2015,12 @@ final: prev:
friendly-snippets = buildVimPluginFrom2Nix {
pname = "friendly-snippets";
- version = "2021-11-10";
+ version = "2021-11-12";
src = fetchFromGitHub {
owner = "rafamadriz";
repo = "friendly-snippets";
- rev = "7d4a4c4e57b7aabb9e7d1f591c29e6d5e7e382e4";
- sha256 = "19z6yjdd7q9hydzx3bw2w8c573y0xjn9s7n780w65n34iirjbh7i";
+ rev = "05bfa7681b8f11b664fab657001c2efb6f3ec85e";
+ sha256 = "1133f32q4g990mmvdrbnjxggk8y96w0c5zlvh553cz9j626a4zks";
};
meta.homepage = "https://github.com/rafamadriz/friendly-snippets/";
};
@@ -2375,12 +2387,12 @@ final: prev:
gruvbox-nvim = buildVimPluginFrom2Nix {
pname = "gruvbox.nvim";
- version = "2021-10-27";
+ version = "2021-11-12";
src = fetchFromGitHub {
owner = "ellisonleao";
repo = "gruvbox.nvim";
- rev = "526439a61a859936fe85da27fffa927e2dccdb83";
- sha256 = "1zlvrfyas257j2iqanf4i2kvxa5cdj2n3kg9xk6g8bzsjcsqw4cw";
+ rev = "dc7c63320c523997610ced545007935c72d81942";
+ sha256 = "16nvlli0vmqxdbcx2d8p2nsl0865444l1d3ji23z9cbz4i171rsw";
};
meta.homepage = "https://github.com/ellisonleao/gruvbox.nvim/";
};
@@ -2603,12 +2615,12 @@ final: prev:
indent-blankline-nvim = buildVimPluginFrom2Nix {
pname = "indent-blankline.nvim";
- version = "2021-11-08";
+ version = "2021-11-12";
src = fetchFromGitHub {
owner = "lukas-reineke";
repo = "indent-blankline.nvim";
- rev = "bc8372815506066f3ca7885baca717cb986957be";
- sha256 = "0svhinr5qmhcskvakl71yykzxhm6m0ydymx7dp5w0jwsdcv9nnrx";
+ rev = "9f663d31d4ee0672f24cd5b26ca3863665048a25";
+ sha256 = "1lzdi3pgw9hf8pkmh3y8w3lrl27kac18hq4ryk0mghqyb8saabzw";
};
meta.homepage = "https://github.com/lukas-reineke/indent-blankline.nvim/";
};
@@ -2908,8 +2920,8 @@ final: prev:
src = fetchFromGitHub {
owner = "Julian";
repo = "lean.nvim";
- rev = "27a9bba67bc9114ba9a6f48686ac983f301dd4be";
- sha256 = "1vcd1i2w9vnkmlhan62s0raa8gigxpdyyzqvn2qqv1rifxzigpfw";
+ rev = "f8f64e9d6af3f054c1044831e689ee96a31ef3fb";
+ sha256 = "10jkibn2gzkzyvmib8zfsy5220hssk4f0rkgliqyjvbsnv1mxka6";
};
meta.homepage = "https://github.com/Julian/lean.nvim/";
};
@@ -4012,20 +4024,20 @@ final: prev:
src = fetchFromGitHub {
owner = "MunifTanjim";
repo = "nui.nvim";
- rev = "a07b754552008012f2d7d3602b7a233a29d92c66";
- sha256 = "19ffxpmq82f9qxbnb2lw2hvc9gqc1vfyvf553wpc439rpi98mxja";
+ rev = "e940b57f30f6035df690fb24b1e5c93ae6aafcd6";
+ sha256 = "0nvg3zsgqbk0gs978gzfkc57xn3wcn1mcsf6qrgc1xz4jxdd582m";
};
meta.homepage = "https://github.com/MunifTanjim/nui.nvim/";
};
null-ls-nvim = buildVimPluginFrom2Nix {
pname = "null-ls.nvim";
- version = "2021-11-11";
+ version = "2021-11-12";
src = fetchFromGitHub {
owner = "jose-elias-alvarez";
repo = "null-ls.nvim";
- rev = "2bf885dda0ecb669ef66d1c757287c98f6c16500";
- sha256 = "1303gpdr5yzxznx0djn5q09p1vibh15d0nmj1j6n2zqbjdx6bhfw";
+ rev = "8a99a75a1cf3243ebec09b1fa13be51ea56151ec";
+ sha256 = "1c2s3vp10km5x3q5n63ljlgyc7cmf72mjd31ybqzknfy8pfk7g6z";
};
meta.homepage = "https://github.com/jose-elias-alvarez/null-ls.nvim/";
};
@@ -4092,12 +4104,12 @@ final: prev:
nvim-bqf = buildVimPluginFrom2Nix {
pname = "nvim-bqf";
- version = "2021-11-03";
+ version = "2021-11-12";
src = fetchFromGitHub {
owner = "kevinhwang91";
repo = "nvim-bqf";
- rev = "3ef30d2a754f6b47d6c696add0276519f9a8a2cf";
- sha256 = "1rd18r4113fpg7ihw87l7xprh5dpddx8s7g68qazbrxgmf1xbmd7";
+ rev = "257b3ab8b78df52b2dc7f2ba3806a9bf2f1c4c08";
+ sha256 = "0crmb6prvyy6fnjf1axm9mqm282xhypmkvfzwyw508rm9xq3g7yk";
};
meta.homepage = "https://github.com/kevinhwang91/nvim-bqf/";
};
@@ -4260,24 +4272,24 @@ final: prev:
nvim-gps = buildVimPluginFrom2Nix {
pname = "nvim-gps";
- version = "2021-11-10";
+ version = "2021-11-12";
src = fetchFromGitHub {
owner = "smiteshp";
repo = "nvim-gps";
- rev = "14653c92c93b2e00a8cc742ee109f510350afc2a";
- sha256 = "13i1pyd5ibmczyw3r2wrhrislkych994487iv5202zv0jn6jaglm";
+ rev = "6ccc6b7853e24f1ba987c61e7a9dd7f1046b2af8";
+ sha256 = "1740xic22cd1lrpz1d6y55ab6s1phvqfp7iwg9bwj26x8x8gi392";
};
meta.homepage = "https://github.com/smiteshp/nvim-gps/";
};
nvim-highlite = buildVimPluginFrom2Nix {
pname = "nvim-highlite";
- version = "2021-11-06";
+ version = "2021-11-11";
src = fetchFromGitHub {
owner = "Iron-E";
repo = "nvim-highlite";
- rev = "61773fc76e0d78c1223f158605f1cd698dc83a94";
- sha256 = "1p3hz5ap16yf3720l682sclal4ycqmqa4kaiw5ljz57jg070ckz8";
+ rev = "c0f6d68ea245fd2efb527fe1b7874c48084d8150";
+ sha256 = "1nai09x1sc9wvz2m5j4rj6wjpdhwk88v4sapdmvb5pqvrqqylg60";
};
meta.homepage = "https://github.com/Iron-E/nvim-highlite/";
};
@@ -4344,12 +4356,12 @@ final: prev:
nvim-lspconfig = buildVimPluginFrom2Nix {
pname = "nvim-lspconfig";
- version = "2021-11-11";
+ version = "2021-11-12";
src = fetchFromGitHub {
owner = "neovim";
repo = "nvim-lspconfig";
- rev = "edca6c107027111ed02abe17a231d1cf0d353adf";
- sha256 = "13abx9r8p9admskallw3y1dqia288xm6l3l6idshih6wbmkx2jk2";
+ rev = "98db21bbd4ef6f2bcd30903e32529976c1db33c5";
+ sha256 = "18jnrnf6sgqmvsmql27yd8zi7n0plh69fiycw3gv7qf5fy29gvif";
};
meta.homepage = "https://github.com/neovim/nvim-lspconfig/";
};
@@ -5113,12 +5125,12 @@ final: prev:
refactoring-nvim = buildVimPluginFrom2Nix {
pname = "refactoring.nvim";
- version = "2021-11-11";
+ version = "2021-11-12";
src = fetchFromGitHub {
owner = "theprimeagen";
repo = "refactoring.nvim";
- rev = "c3fea5e8b377b07cd744579f8ca65e3f805ddaad";
- sha256 = "0rbn1mnyn9dhxv48qngs71n8pw25fmyaaffqgrk3qxfc1rxihf4a";
+ rev = "2fbbae64c6c27dfab5c9fae2e520bef9f778bdd8";
+ sha256 = "02mi4jbpiya3sdx1f69wyhilmjis5w7bqx562335xmw7z84ksmz7";
};
meta.homepage = "https://github.com/theprimeagen/refactoring.nvim/";
};
@@ -5233,12 +5245,12 @@ final: prev:
rust-tools-nvim = buildVimPluginFrom2Nix {
pname = "rust-tools.nvim";
- version = "2021-11-04";
+ version = "2021-11-12";
src = fetchFromGitHub {
owner = "simrat39";
repo = "rust-tools.nvim";
- rev = "488a79a053525fd1b3ceacb9b0675ebd0ed95dc0";
- sha256 = "13vks86lswp9xl934nqmgsdwx2jkjyz4qzm806ln2mz0mwmjk7zx";
+ rev = "edbaeefde4f1619e51c73a4d5126b09caf66c4e6";
+ sha256 = "0qzbbsqa1yxvldl3lw29pc4lwkylq4g2iymw9myfc2665b6ax4xb";
};
meta.homepage = "https://github.com/simrat39/rust-tools.nvim/";
};
@@ -5655,12 +5667,12 @@ final: prev:
stabilize-nvim = buildVimPluginFrom2Nix {
pname = "stabilize.nvim";
- version = "2021-11-10";
+ version = "2021-11-11";
src = fetchFromGitHub {
owner = "luukvbaal";
repo = "stabilize.nvim";
- rev = "fd74d2a9d2a384a530eba3a9771a5396b4ddad26";
- sha256 = "190mf9w344db5civ122l7zdr63l811qcqf7shh89zx4qfrsllf43";
+ rev = "10bb37c82e94122be082651ee6ee58b5b2e51cb5";
+ sha256 = "0667yh9yprym7vakm83x174srb2x2ch9q97137qlj28acks3wnqh";
};
meta.homepage = "https://github.com/luukvbaal/stabilize.nvim/";
};
@@ -6666,12 +6678,12 @@ final: prev:
vim-airline = buildVimPluginFrom2Nix {
pname = "vim-airline";
- version = "2021-11-11";
+ version = "2021-11-12";
src = fetchFromGitHub {
owner = "vim-airline";
repo = "vim-airline";
- rev = "47bf6b1716d599fa19756ce094309a3d551fac73";
- sha256 = "1c2sqkyd0zha9pchh1lbyww7v281rr488ff5b1c2rkc6inya9lcd";
+ rev = "4b96f58902a34abda87fd3105e9d47a08801a891";
+ sha256 = "05fn2485098kml90n5wc0qla7wwjcrz0lkhkr9qgdv4bvc9g3hyn";
};
meta.homepage = "https://github.com/vim-airline/vim-airline/";
};
@@ -7127,7 +7139,7 @@ final: prev:
owner = "flazz";
repo = "vim-colorschemes";
rev = "fd8f122cef604330c96a6a6e434682dbdfb878c9";
- sha256 = "1cg8q7w0vgl73aw1b9zz0zh5vw5d2pm8pm54fhfzva4azg56f416";
+ sha256 = "0kpsf6j20fgblc8vhqn7ymr52v2d1h52vc7rbxmxfwdm80nvv3g5";
};
meta.homepage = "https://github.com/flazz/vim-colorschemes/";
};
@@ -10366,12 +10378,12 @@ final: prev:
vim-tpipeline = buildVimPluginFrom2Nix {
pname = "vim-tpipeline";
- version = "2021-11-02";
+ version = "2021-11-12";
src = fetchFromGitHub {
owner = "vimpostor";
repo = "vim-tpipeline";
- rev = "065cf18295fa8d08ab2d458c67ea6281c81bbd26";
- sha256 = "0l0zp64jzhdyrlgfplqkpsl0jbpxkr4sijymqsiabjiyvc8p6qc7";
+ rev = "be9cd2c8cd007088f69019f18fb61aff457adb8c";
+ sha256 = "1r2wvkgziil4bik3g7b19cscg17skhx98pgsvm2m00czrrfdxq6v";
};
meta.homepage = "https://github.com/vimpostor/vim-tpipeline/";
};
@@ -10594,12 +10606,12 @@ final: prev:
vim-which-key = buildVimPluginFrom2Nix {
pname = "vim-which-key";
- version = "2021-09-22";
+ version = "2021-11-12";
src = fetchFromGitHub {
owner = "liuchengxu";
repo = "vim-which-key";
- rev = "2c915b6de918c073fbd83809e51343651f00f9a8";
- sha256 = "05jdjmpyczcgqsm5mznyb79bq10ianv7v3rhxy9wrklkama3jrgs";
+ rev = "7e3819a91a7710ce561a9c11a22a82b9437a2533";
+ sha256 = "0hx5ar663ai25jj7p44sl2nn2n0jj2iif5ybx5ic7cxz4qy477wn";
};
meta.homepage = "https://github.com/liuchengxu/vim-which-key/";
};
@@ -10859,12 +10871,12 @@ final: prev:
vimtex = buildVimPluginFrom2Nix {
pname = "vimtex";
- version = "2021-11-11";
+ version = "2021-11-12";
src = fetchFromGitHub {
owner = "lervag";
repo = "vimtex";
- rev = "c63adb6958458b62a7b9c0e4156d11a5da5f1a9f";
- sha256 = "07q4wmckz2a1x2l11pa1m5dqbk8wz0slk28p7wcapwfn5lxf48jq";
+ rev = "8dad88059f7d712c1f6ff83c6aaa2ef9645a3787";
+ sha256 = "0z9smsl20fag4h7iv7jsbh8sshkc97d53r2whl4hyllq04w1jjr7";
};
meta.homepage = "https://github.com/lervag/vimtex/";
};
diff --git a/pkgs/misc/vim-plugins/vim-plugin-names b/pkgs/misc/vim-plugins/vim-plugin-names
index ba6b140f29afa..938f02e1640be 100644
--- a/pkgs/misc/vim-plugins/vim-plugin-names
+++ b/pkgs/misc/vim-plugins/vim-plugin-names
@@ -47,6 +47,7 @@ bhurlow/vim-parinfer
bitc/vim-hdevtools
bkad/camelcasemotion
bling/vim-bufferline
+blueballs-theme/blueballs-neovim
blueyed/vim-diminactive
bogado/file-line
bohlender/vim-smt2
diff --git a/pkgs/os-specific/linux/displaylink/default.nix b/pkgs/os-specific/linux/displaylink/default.nix
index ca3e38c2e7076..6cc22c25602b7 100644
--- a/pkgs/os-specific/linux/displaylink/default.nix
+++ b/pkgs/os-specific/linux/displaylink/default.nix
@@ -20,17 +20,17 @@ let
in
stdenv.mkDerivation rec {
pname = "displaylink";
- version = "5.4.0-55.153";
+ version = "5.4.1-55.174";
src = requireFile rec {
name = "displaylink.zip";
- sha256 = "1m2l3bnlfwfp94w7khr05npsbysg9mcyi7hi85n78xkd0xdcxml8";
+ sha256 = "1biswvjz91gmx7xf9g05h3ra463hf2yv9mr2nkxclyrd283iiiqc";
message = ''
In order to install the DisplayLink drivers, you must first
comply with DisplayLink's EULA and download the binaries and
sources from here:
- https://www.synaptics.com/node/3751
+ https://www.synaptics.com/products/displaylink-graphics/downloads/ubuntu-5.4.1
Once you have downloaded the file, please use the following
commands and re-run the installation:
diff --git a/pkgs/os-specific/linux/libsemanage/default.nix b/pkgs/os-specific/linux/libsemanage/default.nix
index 11a6f2755d4cd..0f9f26c8c5b01 100644
--- a/pkgs/os-specific/linux/libsemanage/default.nix
+++ b/pkgs/os-specific/linux/libsemanage/default.nix
@@ -16,9 +16,11 @@ stdenv.mkDerivation rec {
outputs = [ "out" "dev" "man" ] ++ optional enablePython "py";
- nativeBuildInputs = [ bison flex pkg-config ];
+ strictDeps = true;
+
+ nativeBuildInputs = [ bison flex pkg-config ] ++ optional enablePython swig;
buildInputs = [ libsepol libselinux bzip2 audit ]
- ++ optionals enablePython [ swig python ];
+ ++ optional enablePython python;
makeFlags = [
"PREFIX=$(out)"
@@ -26,6 +28,7 @@ stdenv.mkDerivation rec {
"MAN3DIR=$(man)/share/man/man3"
"MAN5DIR=$(man)/share/man/man5"
"PYTHON=python"
+ "PYPREFIX=python"
"PYTHONLIBDIR=$(py)/${python.sitePackages}"
"DEFAULT_SEMANAGE_CONF_LOCATION=$(out)/etc/selinux/semanage.conf"
];
@@ -42,6 +45,8 @@ stdenv.mkDerivation rec {
installTargets = [ "install" ] ++ optionals enablePython [ "install-pywrap" ];
+ enableParallelBuilding = true;
+
meta = removeAttrs libsepol.meta ["outputsToInstall"] // {
description = "Policy management tools for SELinux";
license = lib.licenses.lgpl21;
diff --git a/pkgs/servers/gemini/gmnisrv/default.nix b/pkgs/servers/gemini/gmnisrv/default.nix
index e3b4179fcf59f..8d8ad16e78493 100644
--- a/pkgs/servers/gemini/gmnisrv/default.nix
+++ b/pkgs/servers/gemini/gmnisrv/default.nix
@@ -2,15 +2,20 @@
stdenv.mkDerivation rec {
pname = "gmnisrv";
- version = "unstable-2021-05-16";
+ version = "1.0";
src = fetchFromSourcehut {
owner = "~sircmpwn";
repo = "gmnisrv";
- rev = "b9a92193e96bbe621ebc8430d8308d45a5b86cef";
- sha256 = "sha256-eMKsoq3Y+eS20nxI7EoDLbdwdoB6shbGt6p8wS+uoPc=";
+ rev = version;
+ sha256 = "sha256-V9HXXYQIo3zeqZjJEn+dhemNg6AU+ee3FRmBmXgLuYQ=";
};
+ postPatch = ''
+ substituteInPlace config.sh \
+ --replace "pkg-config" "${stdenv.cc.targetPrefix}pkg-config"
+ '';
+
MIMEDB = "${mime-types}/etc/mime.types";
nativeBuildInputs = [ pkg-config scdoc ];
buildInputs = [ openssl mime-types ];
diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix
index ca03e68f57c7e..dbd447a41f8a3 100644
--- a/pkgs/servers/home-assistant/component-packages.nix
+++ b/pkgs/servers/home-assistant/component-packages.nix
@@ -2,7 +2,7 @@
# Do not edit!
{
- version = "2021.11.2";
+ version = "2021.11.3";
components = {
"abode" = ps: with ps; [ abodepy ];
"accuweather" = ps: with ps; [ accuweather ];
diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix
index 7da295cdc1d2d..da4332711b3f3 100644
--- a/pkgs/servers/home-assistant/default.nix
+++ b/pkgs/servers/home-assistant/default.nix
@@ -37,6 +37,19 @@ let
# Override the version of some packages pinned in Home Assistant's setup.py and requirements_all.txt
(mkOverride "python-slugify" "4.0.1" "69a517766e00c1268e5bbfc0d010a0a8508de0b18d30ad5a1ff357f8ae724270")
+ (self: super: {
+ huawei-lte-api = super.huawei-lte-api.overridePythonAttrs (oldAttrs: rec {
+ version = "1.4.18";
+ src = fetchFromGitHub {
+ owner = "Salamek";
+ repo = "huawei-lte-api";
+ rev = version;
+ sha256 = "1qaqxmh03j10wa9wqbwgc5r3ays8wfr7bldvsm45fycr3qfyn5fg";
+ };
+ propagatedBuildInputs = oldAttrs.propagatedBuildInputs ++ [ python3.pkgs.dicttoxml ];
+ });
+ })
+
# Pinned due to API changes in iaqualink>=2.0, remove after
# https://github.com/home-assistant/core/pull/48137 was merged
(self: super: {
@@ -127,7 +140,7 @@ let
extraBuildInputs = extraPackages py.pkgs;
# Don't forget to run parse-requirements.py after updating
- hassVersion = "2021.11.2";
+ hassVersion = "2021.11.3";
in with py.pkgs; buildPythonApplication rec {
pname = "homeassistant";
@@ -144,7 +157,7 @@ in with py.pkgs; buildPythonApplication rec {
owner = "home-assistant";
repo = "core";
rev = version;
- sha256 = "13212h67ijvir8rlr4gpd2945xx5f5c2lj3bwg7ncw55r23h6hma";
+ sha256 = "sha256-HycMb29niuUp7flRdWgrKSOcnr0l3PqjULCrgrwLrFw=";
};
# leave this in, so users don't have to constantly update their downstream patch handling
diff --git a/pkgs/servers/home-assistant/frontend.nix b/pkgs/servers/home-assistant/frontend.nix
index e073cf2fe1deb..bf614a11e027d 100644
--- a/pkgs/servers/home-assistant/frontend.nix
+++ b/pkgs/servers/home-assistant/frontend.nix
@@ -4,11 +4,11 @@ buildPythonPackage rec {
# the frontend version corresponding to a specific home-assistant version can be found here
# https://github.com/home-assistant/home-assistant/blob/master/homeassistant/components/frontend/manifest.json
pname = "home-assistant-frontend";
- version = "20211108.0";
+ version = "20211109.0";
src = fetchPypi {
inherit pname version;
- sha256 = "sha256-cMCjBhtPi73AB9bplUH8ZNQMt5WJ/NZFW4qLuHHo3+g=";
+ sha256 = "sha256-DXL+D58kS8q4we6/r6iRuXA/d9NOoYUp9A3vsHQ0KVg=";
};
# there is nothing to strip in this package
diff --git a/pkgs/tools/admin/google-cloud-sdk/default.nix b/pkgs/tools/admin/google-cloud-sdk/default.nix
index 8ab301eeb38c3..fd02e7ea418ee 100644
--- a/pkgs/tools/admin/google-cloud-sdk/default.nix
+++ b/pkgs/tools/admin/google-cloud-sdk/default.nix
@@ -99,6 +99,11 @@ in stdenv.mkDerivation rec {
mv $out/google-cloud-sdk/completion.bash.inc $out/share/bash-completion/completions/gcloud
ln -s $out/share/bash-completion/completions/gcloud $out/share/bash-completion/completions/gsutil
+ # setup zsh completion
+ mkdir -p $out/share/zsh/site-functions
+ mv $out/google-cloud-sdk/completion.zsh.inc $out/share/zsh/site-functions/_gcloud
+ ln -s $out/share/zsh/site-functions/_gcloud $out/share/zsh/site-functions/_gsutil
+
# This directory contains compiled mac binaries. We used crcmod from
# nixpkgs instead.
rm -r $out/google-cloud-sdk/platform/gsutil/third_party/crcmod \
diff --git a/pkgs/tools/inputmethods/skk/skk-dicts/default.nix b/pkgs/tools/inputmethods/skk/skk-dicts/default.nix
index d165f404f6cbe..385806e444c07 100644
--- a/pkgs/tools/inputmethods/skk/skk-dicts/default.nix
+++ b/pkgs/tools/inputmethods/skk/skk-dicts/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchurl, libiconv, skktools }:
+{ lib, stdenv, fetchurl, buildPackages, libiconv, skktools }:
let
# kana to kanji
@@ -33,6 +33,8 @@ stdenv.mkDerivation {
srcs = [ small medium large edict assoc ];
nativeBuildInputs = [ skktools ] ++ lib.optional stdenv.isDarwin libiconv;
+ strictDeps = true;
+
dontUnpack = true;
installPhase = ''
@@ -47,28 +49,30 @@ stdenv.mkDerivation {
for src in $srcs; do
dst=$out/share/$(dictname $src)
echo ";;; -*- coding: utf-8 -*-" > $dst # libskk requires this on the first line
- iconv -f EUC-JP -t UTF-8 $src |\
- ${skktools}/bin/skkdic-expr2 >> $dst
+ ${lib.getBin buildPackages.stdenv.cc.libc}/bin/iconv \
+ -f EUC-JP -t UTF-8 $src | skkdic-expr2 >> $dst
done
# combine .L .edict and .assoc for convenience
dst=$out/share/SKK-JISYO.combined
echo ";;; -*- coding: utf-8 -*-" > $dst
- ${skktools}/bin/skkdic-expr2 \
+ skkdic-expr2 \
$out/share/$(dictname ${large}) + \
$out/share/$(dictname ${edict}) + \
$out/share/$(dictname ${assoc}) >> $dst
'';
- meta = {
+ enableParallelBuilding = true;
+
+ meta = with lib; {
description = "A collection of standard SKK dictionaries";
longDescription = ''
This package provides a collection of standard kana-to-kanji
dictionaries for the SKK Japanese input method.
'';
homepage = "https://github.com/skk-dev/dict";
- license = lib.licenses.gpl2Plus;
- maintainers = with lib.maintainers; [ yuriaisaka ];
- platforms = with lib.platforms; linux ++ darwin;
+ license = licenses.gpl2Plus;
+ maintainers = with maintainers; [ yuriaisaka ];
+ platforms = platforms.all;
};
}
diff --git a/pkgs/tools/misc/flashrom/default.nix b/pkgs/tools/misc/flashrom/default.nix
index 03465d593ff4f..4c227cbe3f96a 100644
--- a/pkgs/tools/misc/flashrom/default.nix
+++ b/pkgs/tools/misc/flashrom/default.nix
@@ -1,4 +1,5 @@
{ fetchurl
+, fetchpatch
, gcc9Stdenv
, installShellFiles
, lib
@@ -20,11 +21,18 @@ gcc9Stdenv.mkDerivation rec {
};
nativeBuildInputs = [ pkg-config installShellFiles ];
- buildInputs = [ libftdi1 libusb1 ]
- # https://github.com/flashrom/flashrom/issues/125
- ++ lib.optional (!gcc9Stdenv.isAarch64) pciutils
+ buildInputs = [ libftdi1 libusb1 pciutils ]
++ lib.optional jlinkSupport libjaylink;
+ patches = [
+ # remove when updating from 1.2
+ (fetchpatch {
+ name = "fix-aarch64-build.patch";
+ url = "https://github.com/flashrom/flashrom/commit/da6b3b70cb852dd8e9f9e21aef95fa83e7f7ab0d.patch";
+ sha256 = "sha256-fXYDXgT/ik+qtxxFEyJ7/axtycbwLkEg0UD+hzsYEwg=";
+ })
+ ];
+
postPatch = ''
substituteInPlace util/z60_flashrom.rules \
--replace "plugdev" "flashrom"
diff --git a/pkgs/tools/misc/lighthouse-steamvr/default.nix b/pkgs/tools/misc/lighthouse-steamvr/default.nix
new file mode 100644
index 0000000000000..ac3c6bcf1ad0f
--- /dev/null
+++ b/pkgs/tools/misc/lighthouse-steamvr/default.nix
@@ -0,0 +1,27 @@
+{ fetchFromGitHub, lib, rustPlatform, pkg-config, dbus }:
+
+rustPlatform.buildRustPackage rec {
+ pname = "Lighthouse";
+ version = "unstable-2021-03-28";
+
+ src = fetchFromGitHub {
+ owner = "ShayBox";
+ repo = "Lighthouse";
+ rev = "a090889077557fe92610ca503979b5cfc0724d61";
+ sha256 = "0vfl4y61cdrah98x6xcnb3cyi8rwhlws8ps6vfdlmr3dv30mbnbb";
+ };
+
+ cargoSha256 = "0aqd9ixszwq6qmj751gxx453gwbhwqi16m72bkbkj9s6nfyqihql";
+
+ nativeBuildInputs = [ pkg-config ];
+
+ buildInputs = [ dbus ];
+
+ meta = with lib; {
+ description = "VR Lighthouse power state management";
+ homepage = "https://github.com/ShayBox/Lighthouse";
+ license = licenses.mit;
+ maintainers = with maintainers; [ expipiplus1 ];
+ };
+}
+
diff --git a/pkgs/tools/misc/topicctl/default.nix b/pkgs/tools/misc/topicctl/default.nix
new file mode 100644
index 0000000000000..9ecbbcba37af4
--- /dev/null
+++ b/pkgs/tools/misc/topicctl/default.nix
@@ -0,0 +1,31 @@
+{ lib, buildGoModule, fetchFromGitHub }:
+
+buildGoModule rec {
+ pname = "topicctl";
+ version = "1.1.1";
+
+ src = fetchFromGitHub {
+ owner = "segmentio";
+ repo = "topicctl";
+ rev = "v${version}";
+ sha256 = "sha256-LsMt2BHfO0I5N2C247fmoOgQ5EXMgk/3Kj/lI+vTRV0=";
+ };
+
+ vendorSha256 = "sha256-ur7qMm7l1CocQwX58fTL1PpdgIEJyRAzSlNJM1WTvM0=";
+
+ ldflags = [
+ "-X main.BuildVersion=${version}"
+ "-X main.BuildCommitSha=unknown"
+ "-X main.BuildDate=unknown"
+ ];
+
+ # needs a kafka server
+ doCheck = false;
+
+ meta = with lib; {
+ description = "A tool for easy, declarative management of Kafka topics";
+ inherit (src.meta) homepage;
+ license = licenses.mit;
+ maintainers = with maintainers; [ eskytthe srhb ];
+ };
+}
diff --git a/pkgs/tools/security/knockknock/default.nix b/pkgs/tools/security/knockknock/default.nix
index a3dd1b3c7d078..ed7f19065f053 100644
--- a/pkgs/tools/security/knockknock/default.nix
+++ b/pkgs/tools/security/knockknock/default.nix
@@ -16,7 +16,7 @@ python2Packages.buildPythonApplication rec {
# No tests
doCheck = false;
- patchPhase = ''
+ postPatch = ''
sed -i '/build\//d' setup.py
substituteInPlace setup.py --replace "/etc" "$out/etc"
substituteInPlace knockknock.py --replace 'existsInPath("hping3")' '"${hping}/bin/hping3"'
diff --git a/pkgs/tools/security/kubescape/default.nix b/pkgs/tools/security/kubescape/default.nix
index a191ea300470a..e68980cc9659c 100644
--- a/pkgs/tools/security/kubescape/default.nix
+++ b/pkgs/tools/security/kubescape/default.nix
@@ -6,20 +6,20 @@
buildGoModule rec {
pname = "kubescape";
- version = "1.0.130";
+ version = "1.0.131";
src = fetchFromGitHub {
owner = "armosec";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-NZqIqqDusfWMDLVtcdFAVOuIGMxr+I2xnNB3ckBI/cY=";
+ sha256 = "sha256-DcReo4pTdI8ssWH1IqD8gDUm4jQ0jBBJ+ltxSpdkxQE=";
};
nativeBuildInputs = [
installShellFiles
];
- vendorSha256 = "sha256-cOxjsujlpRbdw4098eMHe2oNAJXWGjKbPeYpKt0DCp8=";
+ vendorSha256 = "sha256-SxJnYJyKFed1c+zgeeXQQhsKHlaDevJGMwqA5gPef3s=";
ldflags = [
"-s"
diff --git a/pkgs/tools/text/cmigemo/default.nix b/pkgs/tools/text/cmigemo/default.nix
index 6787d68991d3d..3562d40bc3e3d 100644
--- a/pkgs/tools/text/cmigemo/default.nix
+++ b/pkgs/tools/text/cmigemo/default.nix
@@ -1,4 +1,7 @@
-{ lib, stdenv, fetchFromGitHub, fetchurl, gzip, libiconv, nkf, perl, skk-dicts, which }:
+{ lib, stdenv, fetchFromGitHub, fetchurl, buildPackages
+, gzip, libiconv, nkf, perl, which
+, skk-dicts
+}:
stdenv.mkDerivation {
pname = "cmigemo";
@@ -21,7 +24,11 @@ stdenv.mkDerivation {
makeFlags = [ "INSTALL=install" ];
- buildPhase = if stdenv.isDarwin then "make osx-all" else "make gcc-all";
+ preBuild = ''
+ makeFlagsArray+=(FILTER_UTF8="${lib.getBin buildPackages.stdenv.cc.libc}/bin/iconv -t utf-8 -f cp932")
+ '';
+
+ buildFlags = [ (if stdenv.isDarwin then "osx-all" else "gcc-all") ];
installTargets = [ (if stdenv.isDarwin then "osx-install" else "gcc-install") ];
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 35d12ac05f4be..62efca5b8d00e 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -474,6 +474,7 @@ mapAliases ({
linuxPackages_5_4 = linuxKernel.packages.linux_5_4;
linuxPackages_5_10 = linuxKernel.packages.linux_5_10;
linuxPackages_5_14 = linuxKernel.packages.linux_5_14;
+ linuxPackages_5_15 = linuxKernel.packages.linux_5_15;
linux_mptcp_95 = linuxKernel.kernels.linux_mptcp_95;
linux_rpi1 = linuxKernel.kernels.linux_rpi1;
@@ -490,6 +491,7 @@ mapAliases ({
linux-rt_5_10 = linuxKernel.kernels.linux_rt_5_10;
linux-rt_5_11 = linuxKernel.kernels.linux_rt_5_11;
linux_5_14 = linuxKernel.kernels.linux_5_14;
+ linux_5_15 = linuxKernel.kernels.linux_5_15;
# added 2020-04-04
linuxPackages_testing_hardened = throw "linuxPackages_testing_hardened has been removed, please use linuxPackages_latest_hardened";
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 550d28c3d9ecd..f700f2a1807ff 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -984,6 +984,8 @@ with pkgs;
tnat64 = callPackage ../tools/networking/tnat64 { };
+ topicctl = callPackage ../tools/misc/topicctl { };
+
veikk-linux-driver-gui = libsForQt5.callPackage ../tools/misc/veikk-linux-driver-gui { };
ventoy-bin = callPackage ../tools/cd-dvd/ventoy-bin { };
@@ -19620,13 +19622,13 @@ with pkgs;
sqlite-replication = sqlite.overrideAttrs (oldAttrs: rec {
name = "sqlite-${version}";
version = "3.27.2+replication3";
- src = pkgs.fetchFromGitHub {
+ src = fetchFromGitHub {
owner = "CanonicalLtd";
repo = "sqlite";
rev = "version-${version}";
sha256 = "1aw1naa5y25ial251f74h039pgcz92p4b3994jvfzqpjlz06qwvw";
};
- nativeBuildInputs = [ pkgs.tcl ];
+ nativeBuildInputs = [ tcl ];
configureFlags = oldAttrs.configureFlags ++ [
"--enable-replication"
"--disable-amalgamation"
@@ -20420,7 +20422,7 @@ with pkgs;
alerta-server = callPackage ../servers/monitoring/alerta { };
apacheHttpd_2_4 = callPackage ../servers/http/apache-httpd/2.4.nix { };
- apacheHttpd = pkgs.apacheHttpd_2_4;
+ apacheHttpd = apacheHttpd_2_4;
apacheHttpdPackagesFor = apacheHttpd: self: let callPackage = newScope self; in {
inherit apacheHttpd;
@@ -20458,7 +20460,7 @@ with pkgs;
subversion = pkgs.subversion.override { httpServer = true; inherit apacheHttpd; };
};
- apacheHttpdPackages_2_4 = recurseIntoAttrs (apacheHttpdPackagesFor pkgs.apacheHttpd_2_4 pkgs.apacheHttpdPackages_2_4);
+ apacheHttpdPackages_2_4 = recurseIntoAttrs (apacheHttpdPackagesFor apacheHttpd_2_4 apacheHttpdPackages_2_4);
apacheHttpdPackages = apacheHttpdPackages_2_4;
appdaemon = callPackage ../servers/home-assistant/appdaemon.nix { };
@@ -20802,18 +20804,18 @@ with pkgs;
mkchromecast = libsForQt5.callPackage ../applications/networking/mkchromecast { };
# Backwards compatibility.
- mod_dnssd = pkgs.apacheHttpdPackages.mod_dnssd;
- mod_fastcgi = pkgs.apacheHttpdPackages.mod_fastcgi;
- mod_python = pkgs.apacheHttpdPackages.mod_python;
- mod_wsgi = pkgs.apacheHttpdPackages.mod_wsgi;
- mod_ca = pkgs.apacheHttpdPackages.mod_ca;
- mod_crl = pkgs.apacheHttpdPackages.mod_crl;
- mod_csr = pkgs.apacheHttpdPackages.mod_csr;
- mod_ocsp = pkgs.apacheHttpdPackages.mod_ocsp;
- mod_scep = pkgs.apacheHttpdPackages.mod_scep;
- mod_spkac = pkgs.apacheHttpdPackages.mod_spkac;
- mod_pkcs12 = pkgs.apacheHttpdPackages.mod_pkcs12;
- mod_timestamp = pkgs.apacheHttpdPackages.mod_timestamp;
+ mod_dnssd = apacheHttpdPackages.mod_dnssd;
+ mod_fastcgi = apacheHttpdPackages.mod_fastcgi;
+ mod_python = apacheHttpdPackages.mod_python;
+ mod_wsgi = apacheHttpdPackages.mod_wsgi;
+ mod_ca = apacheHttpdPackages.mod_ca;
+ mod_crl = apacheHttpdPackages.mod_crl;
+ mod_csr = apacheHttpdPackages.mod_csr;
+ mod_ocsp = apacheHttpdPackages.mod_ocsp;
+ mod_scep = apacheHttpdPackages.mod_scep;
+ mod_spkac = apacheHttpdPackages.mod_spkac;
+ mod_pkcs12 = apacheHttpdPackages.mod_pkcs12;
+ mod_timestamp = apacheHttpdPackages.mod_timestamp;
inherit (callPackages ../servers/mpd {
stdenv = if stdenv.cc.isClang then llvmPackages_8.stdenv else stdenv;
@@ -21217,7 +21219,7 @@ with pkgs;
postgresqlPackages = recurseIntoAttrs postgresql.pkgs;
postgresql11Packages = recurseIntoAttrs postgresql_11.pkgs;
postgresql12Packages = recurseIntoAttrs postgresql_12.pkgs;
- postgresql13Packages = pkgs.postgresqlPackages;
+ postgresql13Packages = postgresqlPackages;
postgresql14Packages = recurseIntoAttrs postgresql_14.pkgs;
postgresql_jdbc = callPackage ../development/java-modules/postgresql_jdbc { };
@@ -21373,7 +21375,7 @@ with pkgs;
enableMDNS = true;
enableDomainController = true;
enableRegedit = true;
- enableCephFS = !pkgs.stdenv.hostPlatform.isAarch64;
+ enableCephFS = !stdenv.hostPlatform.isAarch64;
});
sambaFull = samba4Full;
@@ -21814,7 +21816,7 @@ with pkgs;
fatrace = callPackage ../os-specific/linux/fatrace { };
ffado = libsForQt5.callPackage ../os-specific/linux/ffado {
- inherit (pkgs.linuxPackages) kernel;
+ inherit (linuxPackages) kernel;
};
libffado = ffado;
@@ -22026,11 +22028,11 @@ with pkgs;
# This serves as a test for linuxPackages_custom
linuxPackages_custom_tinyconfig_kernel = let
- base = pkgs.linuxPackages.kernel;
+ base = linuxPackages.kernel;
tinyLinuxPackages = linuxKernel.customPackage {
inherit (base) version src;
allowImportFromDerivation = false;
- configfile = pkgs.linuxConfig {
+ configfile = linuxConfig {
makeTarget = "tinyconfig";
src = base.src;
};
@@ -22529,7 +22531,7 @@ with pkgs;
sysdig = callPackage ../os-specific/linux/sysdig {
kernel = null;
- }; # pkgs.sysdig is a client, for a driver look at linuxPackagesFor
+ }; # sysdig is a client, for a driver look at linuxPackagesFor
sysfsutils = callPackage ../os-specific/linux/sysfsutils { };
@@ -22792,6 +22794,10 @@ with pkgs;
anarchism = callPackage ../data/documentation/anarchism { };
+ ananicy = callPackage ../misc/ananicy { };
+
+ ananicy-cpp = callPackage ../misc/ananicy-cpp { };
+
andagii = callPackage ../data/fonts/andagii { };
andika = callPackage ../data/fonts/andika { };
@@ -24415,7 +24421,7 @@ with pkgs;
djvu2pdf = callPackage ../tools/typesetting/djvu2pdf { };
djview = libsForQt5.callPackage ../applications/graphics/djview { };
- djview4 = pkgs.djview;
+ djview4 = djview;
dmenu = callPackage ../applications/misc/dmenu { };
dmenu-wayland = callPackage ../applications/misc/dmenu/wayland.nix { };
@@ -25055,7 +25061,7 @@ with pkgs;
filezilla = callPackage ../applications/networking/ftp/filezilla { };
firefoxPackages = recurseIntoAttrs (callPackage ../applications/networking/browsers/firefox/packages.nix {
- callPackage = pkgs.newScope {
+ callPackage = newScope {
inherit (rustPackages) cargo rustc;
libpng = libpng_apng;
gnused = gnused_422;
@@ -26338,6 +26344,8 @@ with pkgs;
lighthouse = callPackage ../applications/misc/lighthouse { };
+ lighthouse-steamvr = callPackage ../tools/misc/lighthouse-steamvr { };
+
lighttable = callPackage ../applications/editors/lighttable {};
libdsk = callPackage ../misc/emulators/libdsk { };
@@ -26544,7 +26552,7 @@ with pkgs;
inherit (darwin.apple_sdk.frameworks) ApplicationServices;
};
- mercurialFull = appendToName "full" (pkgs.mercurial.override { fullBuild = true; });
+ mercurialFull = appendToName "full" (mercurial.override { fullBuild = true; });
merkaartor = libsForQt5.callPackage ../applications/misc/merkaartor { };
@@ -28161,7 +28169,7 @@ with pkgs;
inherit (callPackages ../applications/version-management/subversion { sasl = cyrus_sasl; })
subversion_1_10 subversion;
- subversionClient = appendToName "client" (pkgs.subversion.override {
+ subversionClient = appendToName "client" (subversion.override {
bdbSupport = false;
perlBindings = true;
pythonBindings = true;
@@ -28346,7 +28354,7 @@ with pkgs;
thonny = callPackage ../applications/editors/thonny { };
thunderbirdPackages = recurseIntoAttrs (callPackage ../applications/networking/mailreaders/thunderbird/packages.nix {
- callPackage = pkgs.newScope {
+ callPackage = newScope {
inherit (rustPackages) cargo rustc;
libpng = libpng_apng;
gnused = gnused_422;
@@ -28660,7 +28668,7 @@ with pkgs;
neovim-qt = libsForQt5.callPackage ../applications/editors/neovim/qt.nix { };
gnvim-unwrapped = callPackage ../applications/editors/neovim/gnvim {
- gtk = pkgs.gtk3;
+ gtk = gtk3;
};
gnvim = callPackage ../applications/editors/neovim/gnvim/wrapper.nix { };
@@ -29480,13 +29488,17 @@ with pkgs;
balanceofsatoshis = nodePackages.balanceofsatoshis;
bitcoin = libsForQt5.callPackage ../applications/blockchains/bitcoin {
+ boost = boost17x;
miniupnpc = miniupnpc_2;
withGui = true;
+ inherit (darwin) autoSignDarwinBinariesHook;
};
bitcoind = callPackage ../applications/blockchains/bitcoin {
+ boost = boost17x;
miniupnpc = miniupnpc_2;
withGui = false;
+ inherit (darwin) autoSignDarwinBinariesHook;
};
bitcoind-knots = callPackage ../applications/blockchains/bitcoin-knots { miniupnpc = miniupnpc_2; };
@@ -29814,9 +29826,9 @@ with pkgs;
chocolateDoom = callPackage ../games/chocolate-doom { };
- clonehero-unwrapped = pkgs.callPackage ../games/clonehero { };
+ clonehero-unwrapped = callPackage ../games/clonehero { };
- clonehero = pkgs.callPackage ../games/clonehero/fhs-wrapper.nix { };
+ clonehero = callPackage ../games/clonehero/fhs-wrapper.nix { };
crispyDoom = callPackage ../games/crispy-doom { };
@@ -30793,7 +30805,7 @@ with pkgs;
inherit (cinnamon) mint-x-icons mint-y-icons;
enlightenment = recurseIntoAttrs (callPackage ../desktops/enlightenment {
- callPackage = newScope pkgs.enlightenment;
+ callPackage = newScope enlightenment;
});
gnome2 = recurseIntoAttrs (callPackage ../desktops/gnome-2 { });
@@ -30850,7 +30862,7 @@ with pkgs;
};
arcan = recurseIntoAttrs (callPackage ../desktops/arcan {
- callPackage = newScope pkgs.arcan;
+ callPackage = newScope arcan;
});
xfce = recurseIntoAttrs (callPackage ../desktops/xfce { });
@@ -32385,8 +32397,8 @@ with pkgs;
nixos =
configuration:
let
- c = import (pkgs.path + "/nixos/lib/eval-config.nix") {
- inherit (pkgs.stdenv.hostPlatform) system;
+ c = import (path + "/nixos/lib/eval-config.nix") {
+ inherit (stdenv.hostPlatform) system;
modules =
[(
{ lib, ... }: {
@@ -32436,7 +32448,7 @@ with pkgs;
*/
nixosTesting =
(import ../../nixos/lib/testing-python.nix {
- inherit (pkgs.stdenv.hostPlatform) system;
+ inherit (stdenv.hostPlatform) system;
inherit pkgs;
extraConfigurations = [(
{ lib, ... }: {
@@ -32450,7 +32462,7 @@ with pkgs;
loadedTest = if builtins.typeOf test == "path"
then import test
else test;
- calledTest = if pkgs.lib.isFunction loadedTest
+ calledTest = if lib.isFunction loadedTest
then callPackage loadedTest {}
else loadedTest;
in
@@ -32694,7 +32706,7 @@ with pkgs;
redprl = callPackage ../applications/science/logic/redprl { };
- renderizer = pkgs.callPackage ../development/tools/renderizer {};
+ renderizer = callPackage ../development/tools/renderizer {};
retroarchBare = callPackage ../misc/emulators/retroarch {
inherit (darwin) libobjc;
diff --git a/pkgs/top-level/dotnet-packages.nix b/pkgs/top-level/dotnet-packages.nix
index 1ca8621b7114a..f0fcef7338373 100644
--- a/pkgs/top-level/dotnet-packages.nix
+++ b/pkgs/top-level/dotnet-packages.nix
@@ -6,7 +6,6 @@
, fetchFromGitHub
, fetchNuGet
, glib
-, pkg-config
, mono
, overrides ? {}
}:
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index c688ca380e5d4..8615aaae6f30b 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -4748,6 +4748,8 @@ in {
milksnake = callPackage ../development/python-modules/milksnake { };
+ mill-local = callPackage ../development/python-modules/mill-local { };
+
millheater = callPackage ../development/python-modules/millheater { };
miniaudio = callPackage ../development/python-modules/miniaudio { };