diff --git a/doc/languages-frameworks/perl.section.md b/doc/languages-frameworks/perl.section.md
index dcb7dcb77b65..c992b9d658bb 100644
--- a/doc/languages-frameworks/perl.section.md
+++ b/doc/languages-frameworks/perl.section.md
@@ -122,7 +122,7 @@ ImageExifTool = buildPerlPackage {
};
buildInputs = lib.optional stdenv.isDarwin shortenPerlShebang;
- postInstall = lib.optional stdenv.isDarwin ''
+ postInstall = lib.optionalString stdenv.isDarwin ''
shortenPerlShebang $out/bin/exiftool
'';
};
diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix
index 50aff175e6b1..568f00696f78 100644
--- a/maintainers/maintainer-list.nix
+++ b/maintainers/maintainer-list.nix
@@ -4247,6 +4247,16 @@
githubId = 147689;
name = "Hans-Christian Esperer";
};
+ hdhog = {
+ name = "Serg Larchenko";
+ email = "hdhog@hdhog.ru";
+ github = "hdhog";
+ githubId = 386666;
+ keys = [{
+ longkeyid = "rsa496/952EACB76703BA63";
+ fingerprint = "A25F 6321 AAB4 4151 4085 9924 952E ACB7 6703 BA63";
+ }];
+ };
hectorj = {
email = "hector.jusforgues+nixos@gmail.com";
github = "hectorj";
@@ -5358,7 +5368,7 @@
};
juaningan = {
email = "juaningan@gmail.com";
- github = "juaningan";
+ github = "uningan";
githubId = 810075;
name = "Juan Rodal";
};
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 37dfc3987341..8651d6805934 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
@@ -880,6 +880,14 @@ Superuser created successfully.
New In Python 3.9 post for more information.
+
+
+ qtile hase been updated from
+ 0.16.0
to 0.18.0
, please check
+ qtile
+ changelog for changes.
+
+
The claws-mail package now references the
diff --git a/nixos/doc/manual/release-notes/rl-2111.section.md b/nixos/doc/manual/release-notes/rl-2111.section.md
index 2c1886a4deb2..631e84b823af 100644
--- a/nixos/doc/manual/release-notes/rl-2111.section.md
+++ b/nixos/doc/manual/release-notes/rl-2111.section.md
@@ -254,6 +254,8 @@ To be able to access the web UI this port needs to be opened in the firewall.
- `python3` now defaults to Python 3.9. Python 3.9 introduces many deprecation warnings, please look at the [What's New In Python 3.9 post](https://docs.python.org/3/whatsnew/3.9.html) for more information.
+- `qtile` hase been updated from '0.16.0' to '0.18.0', please check [qtile changelog](https://github.com/qtile/qtile/blob/master/CHANGELOG) for changes.
+
- The `claws-mail` package now references the new GTK+ 3 release branch, major version 4. To use the GTK+ 2 releases, one can install the `claws-mail-gtk2` package.
- The wordpress module provides a new interface which allows to use different webservers with the new option [`services.wordpress.webserver`](options.html#opt-services.wordpress.webserver). Currently `httpd` and `nginx` are supported. The definitions of wordpress sites should now be set in [`services.wordpress.sites`](options.html#opt-services.wordpress.sites).
diff --git a/nixos/modules/services/x11/window-managers/qtile.nix b/nixos/modules/services/x11/window-managers/qtile.nix
index cadc316bbc4f..835b41d4ada9 100644
--- a/nixos/modules/services/x11/window-managers/qtile.nix
+++ b/nixos/modules/services/x11/window-managers/qtile.nix
@@ -15,7 +15,7 @@ in
services.xserver.windowManager.session = [{
name = "qtile";
start = ''
- ${pkgs.qtile}/bin/qtile &
+ ${pkgs.qtile}/bin/qtile start &
waitPID=$!
'';
}];
diff --git a/pkgs/applications/audio/zynaddsubfx/default.nix b/pkgs/applications/audio/zynaddsubfx/default.nix
index 986e3215b93f..4b3cbb171bd0 100644
--- a/pkgs/applications/audio/zynaddsubfx/default.nix
+++ b/pkgs/applications/audio/zynaddsubfx/default.nix
@@ -91,7 +91,7 @@ in stdenv.mkDerivation rec {
# When building with zest GUI, patch plugins
# and standalone executable to properly locate zest
- postFixup = lib.optional (guiModule == "zest") ''
+ postFixup = lib.optionalString (guiModule == "zest") ''
patchelf --set-rpath "${mruby-zest}:$(patchelf --print-rpath "$out/lib/lv2/ZynAddSubFX.lv2/ZynAddSubFX_ui.so")" \
"$out/lib/lv2/ZynAddSubFX.lv2/ZynAddSubFX_ui.so"
diff --git a/pkgs/applications/blockchains/bitcoin/default.nix b/pkgs/applications/blockchains/bitcoin/default.nix
index 00727d294df2..8bbeda2e0d4e 100644
--- a/pkgs/applications/blockchains/bitcoin/default.nix
+++ b/pkgs/applications/blockchains/bitcoin/default.nix
@@ -53,7 +53,7 @@ stdenv.mkDerivation rec {
++ optionals withWallet [ db48 sqlite ]
++ optionals withGui [ qrencode qtbase qttools ];
- postInstall = optional withGui ''
+ postInstall = optionalString withGui ''
install -Dm644 ${desktop} $out/share/applications/bitcoin-qt.desktop
substituteInPlace $out/share/applications/bitcoin-qt.desktop --replace "Icon=bitcoin128" "Icon=bitcoin"
install -Dm644 share/pixmaps/bitcoin256.png $out/share/pixmaps/bitcoin.png
diff --git a/pkgs/applications/editors/jetbrains/common.nix b/pkgs/applications/editors/jetbrains/common.nix
index 985c36ee052a..3992fc5c2ec4 100644
--- a/pkgs/applications/editors/jetbrains/common.nix
+++ b/pkgs/applications/editors/jetbrains/common.nix
@@ -1,5 +1,5 @@
{ stdenv, lib, makeDesktopItem, makeWrapper, patchelf, writeText
-, coreutils, gnugrep, which, git, unzip, libsecret, libnotify
+, coreutils, gnugrep, which, git, unzip, libsecret, libnotify, e2fsprogs
, vmopts ? null
}:
@@ -78,7 +78,7 @@ with stdenv; lib.makeOverridable mkDerivation rec {
--prefix PATH : "$out/libexec/${name}:${lib.optionalString (stdenv.isDarwin) "${jdk}/jdk/Contents/Home/bin:"}${lib.makeBinPath [ jdk coreutils gnugrep which git ]}" \
--prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath ([
# Some internals want libstdc++.so.6
- stdenv.cc.cc.lib libsecret
+ stdenv.cc.cc.lib libsecret e2fsprogs
libnotify
] ++ extraLdPath)}" \
--set JDK_HOME "$jdk" \
diff --git a/pkgs/applications/graphics/dosage/default.nix b/pkgs/applications/graphics/dosage/default.nix
index db0012a184be..e5e77dccbbb4 100644
--- a/pkgs/applications/graphics/dosage/default.nix
+++ b/pkgs/applications/graphics/dosage/default.nix
@@ -1,28 +1,30 @@
-{ lib, python3Packages, fetchFromGitHub }:
+{ lib, python3Packages }:
python3Packages.buildPythonApplication rec {
pname = "dosage";
- version = "2018.04.08";
- PBR_VERSION = version;
+ version = "2.17";
- src = fetchFromGitHub {
- owner = "webcomics";
- repo = "dosage";
- rev = "b2fdc13feb65b93762928f7e99bac7b1b7b31591";
- sha256 = "1p6vllqaf9s6crj47xqp97hkglch1kd4y8y4lxvzx3g2shhhk9hh";
+ src = python3Packages.fetchPypi {
+ inherit pname version;
+ sha256 = "0vmxgn9wd3j80hp4gr5iq06jrl4gryz5zgfdd2ah30d12sfcfig0";
};
- checkInputs = with python3Packages; [ pytest responses ];
- propagatedBuildInputs = with python3Packages; [ colorama lxml requests pbr setuptools ];
+
+ checkInputs = with python3Packages; [
+ pytestCheckHook pytest-xdist responses
+ ];
+
+ nativeBuildInputs = with python3Packages; [ setuptools-scm ];
+
+ propagatedBuildInputs = with python3Packages; [
+ colorama imagesize lxml requests setuptools six
+ ];
disabled = python3Packages.pythonOlder "3.3";
- checkPhase = ''
- py.test tests/
- '';
-
meta = {
description = "A comic strip downloader and archiver";
homepage = "https://dosage.rocks/";
license = lib.licenses.mit;
+ maintainers = with lib.maintainers; [ toonn ];
};
}
diff --git a/pkgs/applications/graphics/rx/default.nix b/pkgs/applications/graphics/rx/default.nix
index a40371ddb466..fe3d10bae635 100644
--- a/pkgs/applications/graphics/rx/default.nix
+++ b/pkgs/applications/graphics/rx/default.nix
@@ -29,7 +29,7 @@ rustPlatform.buildRustPackage rec {
# FIXME: GLFW (X11) requires DISPLAY env variable for all tests
doCheck = false;
- postInstall = optional stdenv.isLinux ''
+ postInstall = optionalString stdenv.isLinux ''
mkdir -p $out/share/applications
cp $src/rx.desktop $out/share/applications
wrapProgram $out/bin/rx --prefix LD_LIBRARY_PATH : ${libGL}/lib
diff --git a/pkgs/applications/misc/anytype/default.nix b/pkgs/applications/misc/anytype/default.nix
index 5574caad9021..c479820ba08e 100644
--- a/pkgs/applications/misc/anytype/default.nix
+++ b/pkgs/applications/misc/anytype/default.nix
@@ -15,9 +15,8 @@ in
appimageTools.wrapType2 {
inherit name src;
- extraPkgs = { pkgs, ... }@args: [
- pkgs.gnome3.libsecret
- ] ++ appimageTools.defaultFhsEnvArgs.multiPkgs args;
+ extraPkgs = pkgs: (appimageTools.defaultFhsEnvArgs.multiPkgs pkgs)
+ ++ [ pkgs.libsecret ];
extraInstallCommands = ''
mv $out/bin/${name} $out/bin/${pname}
diff --git a/pkgs/applications/misc/moonlight-embedded/default.nix b/pkgs/applications/misc/moonlight-embedded/default.nix
index 854714f6636b..d711f43ad570 100644
--- a/pkgs/applications/misc/moonlight-embedded/default.nix
+++ b/pkgs/applications/misc/moonlight-embedded/default.nix
@@ -18,10 +18,10 @@ stdenv.mkDerivation rec {
outputs = [ "out" "man" ];
- nativeBuildInputs = [ cmake perl ];
+ nativeBuildInputs = [ cmake perl pkg-config ];
buildInputs = [
alsa-lib libevdev libopus udev SDL2
- ffmpeg pkg-config xorg.libxcb libvdpau libpulseaudio libcec
+ ffmpeg xorg.libxcb libvdpau libpulseaudio libcec
xorg.libpthreadstubs curl expat avahi libuuid libva
];
diff --git a/pkgs/applications/misc/pwsafe/default.nix b/pkgs/applications/misc/pwsafe/default.nix
index 6aa1099c35c8..534f6adecdf8 100644
--- a/pkgs/applications/misc/pwsafe/default.nix
+++ b/pkgs/applications/misc/pwsafe/default.nix
@@ -6,13 +6,13 @@
stdenv.mkDerivation rec {
pname = "pwsafe";
- version = "3.55.0";
+ version = "3.56.0";
src = fetchFromGitHub {
owner = pname;
repo = pname;
rev = version;
- sha256 = "sha256-+Vfwz8xGmSzFNdiN5XYkRqGmFuBVIgexXdH3B+XYY3o=";
+ sha256 = "sha256-ZLX/3cs1cdia5+32QEwE6q3V0uFNkkmiIGboKW6Xej8=";
};
nativeBuildInputs = [
diff --git a/pkgs/applications/misc/surface-control/default.nix b/pkgs/applications/misc/surface-control/default.nix
index d78904f59880..e4b354845dde 100644
--- a/pkgs/applications/misc/surface-control/default.nix
+++ b/pkgs/applications/misc/surface-control/default.nix
@@ -31,7 +31,7 @@ rustPlatform.buildRustPackage rec {
"Control various aspects of Microsoft Surface devices on Linux from the Command-Line";
homepage = "https://github.com/linux-surface/surface-control";
license = licenses.mit;
- maintainers = with maintainers; [ winterqt ];
+ maintainers = with maintainers; [ ];
platforms = platforms.linux;
};
}
diff --git a/pkgs/applications/misc/waybar/default.nix b/pkgs/applications/misc/waybar/default.nix
index 88f0e13e91ba..a38c1002a01f 100644
--- a/pkgs/applications/misc/waybar/default.nix
+++ b/pkgs/applications/misc/waybar/default.nix
@@ -78,7 +78,7 @@ stdenv.mkDerivation rec {
"-Dman-pages=enabled"
];
- preFixup = lib.optional withMediaPlayer ''
+ preFixup = lib.optionalString withMediaPlayer ''
cp $src/resources/custom_modules/mediaplayer.py $out/bin/waybar-mediaplayer.py
wrapProgram $out/bin/waybar-mediaplayer.py \
diff --git a/pkgs/applications/misc/wmname/default.nix b/pkgs/applications/misc/wmname/default.nix
index d501869770e0..cb4f5ec34425 100644
--- a/pkgs/applications/misc/wmname/default.nix
+++ b/pkgs/applications/misc/wmname/default.nix
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
buildInputs = [ libX11 ];
- preConfigure = [ ''sed -i "s@PREFIX = /usr/local@PREFIX = $out@g" config.mk'' ];
+ preConfigure = ''sed -i "s@PREFIX = /usr/local@PREFIX = $out@g" config.mk'';
meta = {
description = "Prints or set the window manager name property of the root window";
diff --git a/pkgs/applications/networking/cluster/bosh-cli/default.nix b/pkgs/applications/networking/cluster/bosh-cli/default.nix
index 2354a41a6a66..90105b1c4ebb 100644
--- a/pkgs/applications/networking/cluster/bosh-cli/default.nix
+++ b/pkgs/applications/networking/cluster/bosh-cli/default.nix
@@ -8,13 +8,13 @@
buildGoModule rec {
pname = "bosh-cli";
- version = "6.4.4";
+ version = "6.4.5";
src = fetchFromGitHub {
owner = "cloudfoundry";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-N7GrxePNewxhHnkQP/XBdUIEL5FsFD4avouZaIO+BKc=";
+ sha256 = "sha256-/1JRje7SNrIsb3V1tq5ZW5zsURaQUzM/Jp3TMR0MfKw=";
};
vendorSha256 = null;
diff --git a/pkgs/applications/networking/cluster/cilium/default.nix b/pkgs/applications/networking/cluster/cilium/default.nix
new file mode 100644
index 000000000000..1ee8f31ed890
--- /dev/null
+++ b/pkgs/applications/networking/cluster/cilium/default.nix
@@ -0,0 +1,23 @@
+{ lib, buildGoModule, fetchFromGitHub }:
+
+buildGoModule rec {
+ pname = "cilium-cli";
+ version = "0.8.6";
+
+ src = fetchFromGitHub {
+ owner = "cilium";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "07p62zifycw7gnwkd3230jsjns80k2q9fbj8drzp84s9cp7ddpa9";
+ };
+
+ vendorSha256 = null;
+
+ meta = with lib; {
+ description = "CLI to install, manage & troubleshoot Kubernetes clusters running Cilium";
+ license = licenses.asl20;
+ homepage = "https://www.cilium.io/";
+ maintainers = with maintainers; [ humancalico ];
+ mainProgram = "cilium";
+ };
+}
diff --git a/pkgs/applications/networking/cluster/cloudfoundry-cli/default.nix b/pkgs/applications/networking/cluster/cloudfoundry-cli/default.nix
index a251886ebdd7..287640bf5a54 100644
--- a/pkgs/applications/networking/cluster/cloudfoundry-cli/default.nix
+++ b/pkgs/applications/networking/cluster/cloudfoundry-cli/default.nix
@@ -2,17 +2,17 @@
buildGoModule rec {
pname = "cloudfoundry-cli";
- version = "7.2.0";
+ version = "7.3.0";
src = fetchFromGitHub {
owner = "cloudfoundry";
repo = "cli";
rev = "v${version}";
- sha256 = "0cf5vshyz6j70sv7x43r1404hdcmkzxgdb7514kjilp5z6wsr1nv";
+ sha256 = "sha256-I+4tFAMmmsmi5WH9WKXIja1vVWsPHNGkWbvjWGUCmkU=";
};
# vendor directory stale
deleteVendor = true;
- vendorSha256 = "0p0s0dr7kpmmnim4fps62vj4zki2qxxdq5ww0fzrf1372xbl4kp2";
+ vendorSha256 = null;
subPackages = [ "." ];
diff --git a/pkgs/applications/networking/mumble/default.nix b/pkgs/applications/networking/mumble/default.nix
index d93fea1f702a..c7500d903288 100644
--- a/pkgs/applications/networking/mumble/default.nix
+++ b/pkgs/applications/networking/mumble/default.nix
@@ -104,7 +104,7 @@ let
server = source: generic {
type = "murmur";
- postPatch = lib.optional iceSupport ''
+ postPatch = lib.optionalString iceSupport ''
grep -Rl '/usr/share/Ice' . | xargs sed -i 's,/usr/share/Ice/,${zeroc-ice.dev}/share/ice/,g'
'';
diff --git a/pkgs/applications/networking/onionshare/default.nix b/pkgs/applications/networking/onionshare/default.nix
index 529b871d20c8..f80fb3a73953 100644
--- a/pkgs/applications/networking/onionshare/default.nix
+++ b/pkgs/applications/networking/onionshare/default.nix
@@ -23,12 +23,12 @@
}:
let
- version = "2.3.2";
+ version = "2.3.3";
src = fetchFromGitHub {
owner = "micahflee";
repo = "onionshare";
rev = "v${version}";
- sha256 = "sha256-mzLDvvpO82iGDnzY42wx1KCNmAxUgVhpaDVprtb+YOI=";
+ sha256 = "sha256-wU2020RNXlwJ2y9uzcLxIX4EECev1Z9YvNyiBalLj/Y=";
};
meta = with lib; {
description = "Securely and anonymously send and receive files";
@@ -94,6 +94,11 @@ in rec {
# Tests use the home directory
export HOME="$(mktemp -d)"
'';
+
+ disabledTests = [
+ "test_firefox_like_behavior"
+ "test_if_unmodified_since"
+ ];
};
onionshare-gui = buildPythonApplication {
diff --git a/pkgs/applications/science/biology/neuron/default.nix b/pkgs/applications/science/biology/neuron/default.nix
index 7bfef3a82fed..804407968e1c 100644
--- a/pkgs/applications/science/biology/neuron/default.nix
+++ b/pkgs/applications/science/biology/neuron/default.nix
@@ -60,13 +60,13 @@ stdenv.mkDerivation rec {
else ["--without-mpi"]);
- postInstall = lib.optionals (python != null) [ ''
+ postInstall = lib.optionalString (python != null) ''
## standardise python neuron install dir if any
if [[ -d $out/lib/python ]]; then
mkdir -p ''${out}/${python.sitePackages}
mv ''${out}/lib/python/* ''${out}/${python.sitePackages}/
fi
- ''];
+ '';
propagatedBuildInputs = [ readline ncurses which libtool ];
diff --git a/pkgs/applications/science/electronics/kicad/base.nix b/pkgs/applications/science/electronics/kicad/base.nix
index 596083c27098..d7398f39ec43 100644
--- a/pkgs/applications/science/electronics/kicad/base.nix
+++ b/pkgs/applications/science/electronics/kicad/base.nix
@@ -64,7 +64,7 @@ assert lib.assertMsg (!(sanitizeAddress && sanitizeThreads))
"'sanitizeAddress' and 'sanitizeThreads' are mutually exclusive, use one.";
let
- inherit (lib) optional optionals;
+ inherit (lib) optional optionals optionalString;
in
stdenv.mkDerivation rec {
pname = "kicad-base";
@@ -172,7 +172,7 @@ stdenv.mkDerivation rec {
dontStrip = debug;
- postInstall = optional (withI18n) ''
+ postInstall = optionalString (withI18n) ''
mkdir -p $out/share
lndir ${i18n}/share $out/share
'';
diff --git a/pkgs/applications/science/physics/sherpa/default.nix b/pkgs/applications/science/physics/sherpa/default.nix
index ba519cc2d032..eb718be12e4a 100644
--- a/pkgs/applications/science/physics/sherpa/default.nix
+++ b/pkgs/applications/science/physics/sherpa/default.nix
@@ -9,7 +9,7 @@ stdenv.mkDerivation rec {
sha256 = "1iwa17s8ipj6a2b8zss5csb1k5y9s5js38syvq932rxcinbyjsl4";
};
- postPatch = lib.optional (stdenv.hostPlatform.libc == "glibc") ''
+ postPatch = lib.optionalString (stdenv.hostPlatform.libc == "glibc") ''
sed -ie '/sys\/sysctl.h/d' ATOOLS/Org/Run_Parameter.C
'';
diff --git a/pkgs/applications/system/glances/default.nix b/pkgs/applications/system/glances/default.nix
index 8ddee9c0b49c..6c2e5a8443b8 100644
--- a/pkgs/applications/system/glances/default.nix
+++ b/pkgs/applications/system/glances/default.nix
@@ -31,7 +31,7 @@ buildPythonApplication rec {
];
doCheck = true;
- preCheck = lib.optional stdenv.isDarwin ''
+ preCheck = lib.optionalString stdenv.isDarwin ''
export DYLD_FRAMEWORK_PATH=/System/Library/Frameworks
'';
diff --git a/pkgs/applications/window-managers/qtile/0001-Substitution-vars-for-absolute-paths.patch b/pkgs/applications/window-managers/qtile/0001-Substitution-vars-for-absolute-paths.patch
deleted file mode 100644
index ed22ed99b078..000000000000
--- a/pkgs/applications/window-managers/qtile/0001-Substitution-vars-for-absolute-paths.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-diff --git a/libqtile/backend/x11/xcursors.py b/libqtile/backend/x11/xcursors.py
-index 24454b83..ef37875c 100644
---- a/libqtile/backend/x11/xcursors.py
-+++ b/libqtile/backend/x11/xcursors.py
-@@ -107,7 +107,7 @@ class Cursors(dict):
-
- def _setup_xcursor_binding(self):
- try:
-- xcursor = ffi.dlopen('libxcb-cursor.so.0')
-+ xcursor = ffi.dlopen('@xcb-cursor@/lib/libxcb-cursor.so.0')
- except OSError:
- logger.warning("xcb-cursor not found, fallback to font pointer")
- return False
-diff --git a/libqtile/pangocffi.py b/libqtile/pangocffi.py
-index dbae27ed..54c2c35f 100644
---- a/libqtile/pangocffi.py
-+++ b/libqtile/pangocffi.py
-@@ -52,10 +52,9 @@ try:
- except ImportError:
- raise ImportError("No module named libqtile._ffi_pango, be sure to run `./scripts/ffibuild`")
-
--gobject = ffi.dlopen('libgobject-2.0.so.0')
--pango = ffi.dlopen('libpango-1.0.so.0')
--pangocairo = ffi.dlopen('libpangocairo-1.0.so.0')
--
-+gobject = ffi.dlopen('@glib@/lib/libgobject-2.0.so.0')
-+pango = ffi.dlopen('@pango@/lib/libpango-1.0.so.0')
-+pangocairo = ffi.dlopen('@pango@/lib/libpangocairo-1.0.so.0')
-
- def patch_cairo_context(cairo_t):
- def create_layout():
diff --git a/pkgs/applications/window-managers/qtile/0002-Restore-PATH-and-PYTHONPATH.patch b/pkgs/applications/window-managers/qtile/0002-Restore-PATH-and-PYTHONPATH.patch
deleted file mode 100644
index 1eaa5b84174c..000000000000
--- a/pkgs/applications/window-managers/qtile/0002-Restore-PATH-and-PYTHONPATH.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-diff --git a/bin/qshell b/bin/qshell
-index 5c652b7a..2d169eb2 100755
---- a/bin/qshell
-+++ b/bin/qshell
-@@ -28,5 +28,6 @@ base_dir = os.path.abspath(os.path.join(this_dir, ".."))
- sys.path.insert(0, base_dir)
-
- if __name__ == '__main__':
-+ __import__("importlib").import_module("libqtile.utils").restore_os_environment()
- from libqtile.scripts import qshell
- qshell.main()
-diff --git a/bin/qtile b/bin/qtile
-index ebc8fab5..08a965ef 100755
---- a/bin/qtile
-+++ b/bin/qtile
-@@ -29,5 +29,6 @@ base_dir = os.path.abspath(os.path.join(this_dir, ".."))
- sys.path.insert(0, base_dir)
-
- if __name__ == '__main__':
-+ __import__("importlib").import_module("libqtile.utils").restore_os_environment()
- from libqtile.scripts import qtile
- qtile.main()
-diff --git a/bin/qtile-cmd b/bin/qtile-cmd
-index a2136ee6..3d37a6d9 100755
---- a/bin/qtile-cmd
-+++ b/bin/qtile-cmd
-@@ -8,5 +8,6 @@ base_dir = os.path.abspath(os.path.join(this_dir, ".."))
- sys.path.insert(0, base_dir)
-
- if __name__ == '__main__':
-+ __import__("importlib").import_module("libqtile.utils").restore_os_environment()
- from libqtile.scripts import qtile_cmd
- qtile_cmd.main()
-diff --git a/bin/qtile-run b/bin/qtile-run
-index ac4cb1fd..74c589cb 100755
---- a/bin/qtile-run
-+++ b/bin/qtile-run
-@@ -8,5 +8,6 @@ base_dir = os.path.abspath(os.path.join(this_dir, ".."))
- sys.path.insert(0, base_dir)
-
- if __name__ == '__main__':
-+ __import__("importlib").import_module("libqtile.utils").restore_os_environment()
- from libqtile.scripts import qtile_run
- qtile_run.main()
-diff --git a/bin/qtile-top b/bin/qtile-top
-index a6251f27..0d524b1d 100755
---- a/bin/qtile-top
-+++ b/bin/qtile-top
-@@ -8,5 +8,6 @@ base_dir = os.path.abspath(os.path.join(this_dir, ".."))
- sys.path.insert(0, base_dir)
-
- if __name__ == '__main__':
-+ __import__("importlib").import_module("libqtile.utils").restore_os_environment()
- from libqtile.scripts import qtile_top
- qtile_top.main()
-diff --git a/libqtile/utils.py b/libqtile/utils.py
-index 2628c898..05117be7 100644
---- a/libqtile/utils.py
-+++ b/libqtile/utils.py
-@@ -270,3 +270,10 @@ def guess_terminal():
- return terminal
-
- logger.error('Default terminal has not been found.')
-+
-+def restore_os_environment():
-+ pythonpath = os.environ.pop("QTILE_SAVED_PYTHONPATH", "")
-+ os.environ["PYTHONPATH"] = pythonpath
-+ path = os.environ.pop("QTILE_SAVED_PATH", None)
-+ if path:
-+ os.environ["PATH"] = path
-
diff --git a/pkgs/applications/window-managers/qtile/0003-Restart-executable.patch b/pkgs/applications/window-managers/qtile/0003-Restart-executable.patch
deleted file mode 100644
index c04d8a83c1a2..000000000000
--- a/pkgs/applications/window-managers/qtile/0003-Restart-executable.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/libqtile/core/manager.py b/libqtile/core/manager.py
-index c22eeb6a..2ffe4eab 100644
---- a/libqtile/core/manager.py
-+++ b/libqtile/core/manager.py
-@@ -278,7 +278,7 @@ class Qtile(CommandObject):
- logger.error("Unable to pickle qtile state")
- argv = [s for s in argv if not s.startswith('--with-state')]
- argv.append('--with-state=' + buf.getvalue().decode())
-- self._restart = (sys.executable, argv)
-+ self._restart = (os.environ.get("QTILE_WRAPPER", "@out@/bin/qtile"), argv[1:])
- self.stop()
-
- async def finalize(self):
diff --git a/pkgs/applications/window-managers/qtile/default.nix b/pkgs/applications/window-managers/qtile/default.nix
index 08b3a9834b6a..cd7b5a159e2a 100644
--- a/pkgs/applications/window-managers/qtile/default.nix
+++ b/pkgs/applications/window-managers/qtile/default.nix
@@ -1,66 +1,66 @@
-{ lib, fetchFromGitHub, python37Packages, glib, cairo, pango, pkg-config, libxcb, xcbutilcursor }:
+{ lib, fetchFromGitHub, python3, glib, cairo, pango, pkg-config, libxcb, xcbutilcursor }:
-let cairocffi-xcffib = python37Packages.cairocffi.override {
+let
+ enabled-xcffib = cairocffi-xcffib: cairocffi-xcffib.override {
withXcffib = true;
};
+
+ # make it easier to reference python
+ python = python3;
+ pythonPackages = python.pkgs;
+
+ unwrapped = pythonPackages.buildPythonPackage rec {
+ name = "qtile-${version}";
+ version = "0.18.0";
+
+ src = fetchFromGitHub {
+ owner = "qtile";
+ repo = "qtile";
+ rev = "v${version}";
+ sha256 = "sha256-S9G/EI18p9EAyWgI1ajDrLimeE+ETBC9feUDb/QthqI=";
+ };
+
+ postPatch = ''
+ substituteInPlace libqtile/pangocffi.py \
+ --replace libgobject-2.0.so.0 ${glib.out}/lib/libgobject-2.0.so.0 \
+ --replace libpangocairo-1.0.so.0 ${pango.out}/lib/libpangocairo-1.0.so.0 \
+ --replace libpango-1.0.so.0 ${pango.out}/lib/libpango-1.0.so.0
+ substituteInPlace libqtile/backend/x11/xcursors.py \
+ --replace libxcb-cursor.so.0 ${xcbutilcursor.out}/lib/libxcb-cursor.so.0
+ '';
+
+ SETUPTOOLS_SCM_PRETEND_VERSION = version;
+
+ nativeBuildInputs = [
+ pkg-config
+ ] ++ (with pythonPackages; [
+ setuptools-scm
+ ]);
+
+ propagatedBuildInputs = with pythonPackages; [
+ xcffib
+ (enabled-xcffib cairocffi)
+ setuptools
+ python-dateutil
+ dbus-python
+ mpd2
+ psutil
+ pyxdg
+ pygobject3
+ ];
+
+ doCheck = false; # Requires X server #TODO this can be worked out with the existing NixOS testing infrastructure.
+
+ meta = with lib; {
+ homepage = "http://www.qtile.org/";
+ license = licenses.mit;
+ description = "A small, flexible, scriptable tiling window manager written in Python";
+ platforms = platforms.linux;
+ maintainers = with maintainers; [ kamilchm ];
+ };
+ };
in
-
-python37Packages.buildPythonApplication rec {
- name = "qtile-${version}";
- version = "0.16.0";
-
- src = fetchFromGitHub {
- owner = "qtile";
- repo = "qtile";
- rev = "v${version}";
- sha256 = "1klv1k9847nyx71sfrhqyl1k51k2w8phqnp2bns4dvbqii7q125l";
- };
-
- patches = [
- ./0001-Substitution-vars-for-absolute-paths.patch
- ./0002-Restore-PATH-and-PYTHONPATH.patch
- ./0003-Restart-executable.patch
- ];
-
- postPatch = ''
- substituteInPlace libqtile/core/manager.py --subst-var-by out $out
- substituteInPlace libqtile/pangocffi.py --subst-var-by glib ${glib.out}
- substituteInPlace libqtile/pangocffi.py --subst-var-by pango ${pango.out}
- substituteInPlace libqtile/backend/x11/xcursors.py --subst-var-by xcb-cursor ${xcbutilcursor.out}
- '';
-
- SETUPTOOLS_SCM_PRETEND_VERSION = version;
-
- nativeBuildInputs = [ pkg-config ];
- buildInputs = [ glib libxcb cairo pango python37Packages.xcffib ];
-
- pythonPath = with python37Packages; [
- xcffib
- cairocffi-xcffib
- setuptools
- setuptools-scm
- python-dateutil
- dbus-python
- mpd2
- psutil
- pyxdg
- pygobject3
- ];
-
- postInstall = ''
- wrapProgram $out/bin/qtile \
- --run 'export QTILE_WRAPPER=$0' \
- --run 'export QTILE_SAVED_PYTHONPATH=$PYTHONPATH' \
- --run 'export QTILE_SAVED_PATH=$PATH'
- '';
-
- doCheck = false; # Requires X server #TODO this can be worked out with the existing NixOS testing infrastructure.
-
- meta = with lib; {
- homepage = "http://www.qtile.org/";
- license = licenses.mit;
- description = "A small, flexible, scriptable tiling window manager written in Python";
- platforms = platforms.linux;
- maintainers = with maintainers; [ kamilchm ];
- };
-}
+ (python.withPackages (ps: [ unwrapped ])).overrideAttrs (_: {
+ # export underlying qtile package
+ passthru = { inherit unwrapped; };
+ })
diff --git a/pkgs/build-support/fetchgx/default.nix b/pkgs/build-support/fetchgx/default.nix
index 3ccf5d273fc5..93f60c0a9cac 100644
--- a/pkgs/build-support/fetchgx/default.nix
+++ b/pkgs/build-support/fetchgx/default.nix
@@ -12,7 +12,9 @@ stdenvNoCC.mkDerivation {
outputHashMode = "recursive";
outputHash = sha256;
- phases = [ "unpackPhase" "buildPhase" "installPhase" ];
+ dontConfigure = true;
+ doCheck = false;
+ doInstallCheck = false;
buildPhase = ''
export GOPATH=$(pwd)/vendor
diff --git a/pkgs/data/fonts/libertinus/default.nix b/pkgs/data/fonts/libertinus/default.nix
index 7d95b6a26ff3..8f58cb92baa4 100644
--- a/pkgs/data/fonts/libertinus/default.nix
+++ b/pkgs/data/fonts/libertinus/default.nix
@@ -1,29 +1,29 @@
-{ lib, fetchFromGitHub }:
+{ lib, fetchurl }:
let
- version = "6.9";
-in fetchFromGitHub rec {
+ version = "7.040";
+in fetchurl rec {
name = "libertinus-${version}";
+ url = "https://github.com/alerque/libertinus/releases/download/v${version}/Libertinus-${version}.tar.xz";
+ sha256 = "0z658r88p52dyrcslv0wlccw0sw7m5jz8nbqizv95nf7bfw96iyk";
- owner = "alif-type";
- repo = "libertinus";
- rev = "v${version}";
+ downloadToTemp = true;
+ recursiveHash = true;
postFetch = ''
tar xf $downloadedFile --strip=1
- install -m444 -Dt $out/share/fonts/opentype *.otf
- install -m444 -Dt $out/share/doc/${name} *.txt
+ install -m644 -Dt $out/share/fonts/opentype static/OTF/*.otf
'';
- sha256 = "0765a7w0askkhrjmjk638gcm9h6fcm1jpaza8iw9afr3sz1s0xlq";
meta = with lib; {
- description = "A fork of the Linux Libertine and Linux Biolinum fonts";
+ description = "The Libertinus font family";
longDescription = ''
- Libertinus fonts is a fork of the Linux Libertine and Linux Biolinum fonts
- that started as an OpenType math companion of the Libertine font family,
- but grown as a full fork to address some of the bugs in the fonts.
+ The Libertinus font project began as a fork of the Linux Libertine and
+ Linux Biolinum fonts. The original impetus was to add an OpenType math
+ companion to the Libertine font families. Over time it grew into to a
+ full-fledged fork addressing many of the bugs in the Libertine fonts.
'';
- homepage = "https://github.com/alif-type/libertinus";
+ homepage = "https://github.com/alerque/libertinus";
license = licenses.ofl;
maintainers = with maintainers; [ siddharthist ];
platforms = platforms.all;
diff --git a/pkgs/desktops/gnome/core/gnome-shell/default.nix b/pkgs/desktops/gnome/core/gnome-shell/default.nix
index aa7efdf51c83..6a7cb1742ba6 100644
--- a/pkgs/desktops/gnome/core/gnome-shell/default.nix
+++ b/pkgs/desktops/gnome/core/gnome-shell/default.nix
@@ -66,13 +66,13 @@ let
in
stdenv.mkDerivation rec {
pname = "gnome-shell";
- version = "40.3";
+ version = "40.4";
outputs = [ "out" "devdoc" ];
src = fetchurl {
url = "mirror://gnome/sources/gnome-shell/${lib.versions.major version}/${pname}-${version}.tar.xz";
- sha256 = "sha256-erEMbulpmCjdch6/jOHeRk3KqpHUlYI79LhMiTmejCs=";
+ sha256 = "160z8bz2kqmrs6a4cs2gakv0rl9ba69p3ij2xjakqav50n9r3i9b";
};
patches = [
diff --git a/pkgs/development/compilers/mono/6.nix b/pkgs/development/compilers/mono/6.nix
index 04028648a255..1a7297af918e 100644
--- a/pkgs/development/compilers/mono/6.nix
+++ b/pkgs/development/compilers/mono/6.nix
@@ -2,8 +2,8 @@
callPackage ./generic.nix ({
inherit Foundation libobjc;
- version = "6.12.0.90";
+ version = "6.12.0.122";
srcArchiveSuffix = "tar.xz";
- sha256 = "1b6d0926rd0nkmsppwjgmwsxx1479jjvr1gm7zwk64siml15rpji";
+ sha256 = "sha256-KcJ3Zg/F51ExB67hy/jFBXyTcKTN/tovx4G+aYbYnSM=";
enableParallelBuilding = true;
})
diff --git a/pkgs/development/compilers/vala/default.nix b/pkgs/development/compilers/vala/default.nix
index bd001d5a10e8..8f93a6746ea2 100644
--- a/pkgs/development/compilers/vala/default.nix
+++ b/pkgs/development/compilers/vala/default.nix
@@ -69,7 +69,7 @@ let
# so that it can be used to regenerate documentation.
patches = lib.optionals disableGraphviz [ graphvizPatch ./gvc-compat.patch ];
configureFlags = lib.optional disableGraphviz "--disable-graphviz";
- preBuild = lib.optional disableGraphviz "buildFlagsArray+=(\"VALAC=$(pwd)/compiler/valac\")";
+ preBuild = lib.optionalString disableGraphviz "buildFlagsArray+=(\"VALAC=$(pwd)/compiler/valac\")";
outputs = [ "out" "devdoc" ];
diff --git a/pkgs/development/libraries/SDL2_image/default.nix b/pkgs/development/libraries/SDL2_image/default.nix
index a0f770178cc9..3c7c13319991 100644
--- a/pkgs/development/libraries/SDL2_image/default.nix
+++ b/pkgs/development/libraries/SDL2_image/default.nix
@@ -12,8 +12,18 @@ stdenv.mkDerivation rec {
buildInputs = [ SDL2 libpng libjpeg libtiff giflib libwebp libXpm zlib ]
++ lib.optional stdenv.isDarwin Foundation;
-
- configureFlags = lib.optional stdenv.isDarwin "--disable-sdltest";
+ configureFlags = [
+ # Disable dynamically loaded dependencies
+ "--disable-jpg-shared"
+ "--disable-png-shared"
+ "--disable-tif-shared"
+ "--disable-webp-shared"
+ ] ++ lib.optionals stdenv.isDarwin [
+ # Darwin headless will hang when trying to run the SDL test program
+ "--disable-sdltest"
+ # Don't use native macOS frameworks
+ "--disable-imageio"
+ ];
enableParallelBuilding = true;
diff --git a/pkgs/development/libraries/codec2/default.nix b/pkgs/development/libraries/codec2/default.nix
index 88b35f16c308..a860470af317 100644
--- a/pkgs/development/libraries/codec2/default.nix
+++ b/pkgs/development/libraries/codec2/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "codec2";
- version = "0.9.2";
+ version = "1.0.0";
src = fetchFromGitHub {
owner = "drowe67";
repo = "codec2";
rev = "v${version}";
- sha256 = "1jpvr7bra8srz8jvnlbmhf8andbaavq5v01qjnp2f61za93rzwba";
+ sha256 = "sha256-R4H6gwmc8nPgRfhNms7n7jMCHhkzX7i/zfGT4CYSsY8=";
};
nativeBuildInputs = [ cmake ];
diff --git a/pkgs/development/libraries/flatbuffers/1.12.nix b/pkgs/development/libraries/flatbuffers/1.12.nix
index df2980ba204f..1ad490d3a01b 100644
--- a/pkgs/development/libraries/flatbuffers/1.12.nix
+++ b/pkgs/development/libraries/flatbuffers/1.12.nix
@@ -20,7 +20,7 @@ callPackage ./generic.nix {
})
];
- preConfigure = lib.optional stdenv.buildPlatform.isDarwin ''
+ preConfigure = lib.optionalString stdenv.buildPlatform.isDarwin ''
rm BUILD
'';
}
diff --git a/pkgs/development/libraries/libantlr3c/default.nix b/pkgs/development/libraries/libantlr3c/default.nix
index aac75fcc2257..f61c0bfafc7b 100644
--- a/pkgs/development/libraries/libantlr3c/default.nix
+++ b/pkgs/development/libraries/libantlr3c/default.nix
@@ -8,7 +8,10 @@ stdenv.mkDerivation rec {
sha256 ="0lpbnb4dq4azmsvlhp6khq1gy42kyqyjv8gww74g5lm2y6blm4fa";
};
- configureFlags = lib.optional stdenv.is64bit "--enable-64bit";
+ configureFlags = lib.optional stdenv.is64bit "--enable-64bit"
+ # libantlr3c wrongly emits the abi flags -m64 and -m32 which imply x86 archs
+ # https://github.com/antlr/antlr3/issues/205
+ ++ lib.optional (!stdenv.hostPlatform.isx86) "--disable-abiflags";
meta = with lib; {
description = "C runtime libraries of ANTLR v3";
@@ -16,12 +19,5 @@ stdenv.mkDerivation rec {
license = licenses.bsd3;
platforms = platforms.unix;
maintainers = with maintainers; [ vbgl ];
- # The package failed to build with error:
- # gcc: error: unrecognized command line option '-m64'
- #
- # See:
- # https://gist.github.com/r-rmcgibbo/15bf2ca9b297e8357887e146076fff7d
- # https://gist.github.com/r-rmcgibbo/a362535e4b174d4bfb68112503a49fcd
- broken = stdenv.hostPlatform.isAarch64;
};
}
diff --git a/pkgs/development/libraries/libfm/default.nix b/pkgs/development/libraries/libfm/default.nix
index 255ddfa22ad7..5d7389b6d188 100644
--- a/pkgs/development/libraries/libfm/default.nix
+++ b/pkgs/development/libraries/libfm/default.nix
@@ -13,7 +13,7 @@
let
gtk = if withGtk3 then gtk3 else gtk2;
- inherit (lib) optional;
+ inherit (lib) optional optionalString;
in
stdenv.mkDerivation rec {
pname = if extraOnly
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
installFlags = [ "sysconfdir=${placeholder "out"}/etc" ];
# libfm-extra is pulled in by menu-cache and thus leads to a collision for libfm
- postInstall = optional (!extraOnly) ''
+ postInstall = optionalString (!extraOnly) ''
rm $out/lib/libfm-extra.so $out/lib/libfm-extra.so.* $out/lib/libfm-extra.la $out/lib/pkgconfig/libfm-extra.pc
'';
diff --git a/pkgs/development/libraries/mbedtls/default.nix b/pkgs/development/libraries/mbedtls/default.nix
index 90e2c9bd9a73..9210f18ed962 100644
--- a/pkgs/development/libraries/mbedtls/default.nix
+++ b/pkgs/development/libraries/mbedtls/default.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
strictDeps = true;
- postConfigure = lib.optionals enableThreading ''
+ postConfigure = lib.optionalString enableThreading ''
perl scripts/config.pl set MBEDTLS_THREADING_C # Threading abstraction layer
perl scripts/config.pl set MBEDTLS_THREADING_PTHREAD # POSIX thread wrapper layer for the threading layer.
'';
diff --git a/pkgs/development/libraries/s2n-tls/default.nix b/pkgs/development/libraries/s2n-tls/default.nix
index 944c3477fbf1..be4b9710533b 100644
--- a/pkgs/development/libraries/s2n-tls/default.nix
+++ b/pkgs/development/libraries/s2n-tls/default.nix
@@ -20,6 +20,7 @@ stdenv.mkDerivation rec {
cmakeFlags = [
"-DBUILD_SHARED_LIBS=ON"
"-DCMAKE_SKIP_BUILD_RPATH=OFF"
+ "-DUNSAFE_TREAT_WARNINGS_AS_ERRORS=OFF" # disable -Werror
];
propagatedBuildInputs = [ openssl ]; # s2n-config has find_dependency(LibCrypto).
diff --git a/pkgs/development/libraries/silgraphite/graphite2.nix b/pkgs/development/libraries/silgraphite/graphite2.nix
index 25f4b5e13177..b047d6870746 100644
--- a/pkgs/development/libraries/silgraphite/graphite2.nix
+++ b/pkgs/development/libraries/silgraphite/graphite2.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation rec {
# Remove a test that fails to statically link (undefined reference to png and
# freetype symbols)
- postConfigure = lib.optionals static ''
+ postConfigure = lib.optionalString static ''
sed -e '/freetype freetype.c/d' -i ../tests/examples/CMakeLists.txt
'';
diff --git a/pkgs/development/libraries/t1lib/default.nix b/pkgs/development/libraries/t1lib/default.nix
index 495993a64ab6..5bd4b02b61d9 100644
--- a/pkgs/development/libraries/t1lib/default.nix
+++ b/pkgs/development/libraries/t1lib/default.nix
@@ -28,7 +28,7 @@ stdenv.mkDerivation {
buildInputs = [ libX11 libXaw ];
buildFlags = [ "without_doc" ];
- postInstall = lib.optional (!stdenv.isDarwin) "chmod +x $out/lib/*.so.*"; # ??
+ postInstall = lib.optionalString (!stdenv.isDarwin) "chmod +x $out/lib/*.so.*"; # ??
meta = with lib; {
description = "A type 1 font rasterizer library for UNIX/X11";
diff --git a/pkgs/development/libraries/zeroc-ice/3.6.nix b/pkgs/development/libraries/zeroc-ice/3.6.nix
index 896973e32eb8..725af51487c8 100644
--- a/pkgs/development/libraries/zeroc-ice/3.6.nix
+++ b/pkgs/development/libraries/zeroc-ice/3.6.nix
@@ -21,7 +21,7 @@ stdenv.mkDerivation rec {
sourceRoot=$sourceRoot/cpp
'';
- prePatch = lib.optional stdenv.isDarwin ''
+ prePatch = lib.optionalString stdenv.isDarwin ''
substituteInPlace config/Make.rules.Darwin \
--replace xcrun ""
'';
diff --git a/pkgs/development/libraries/zeroc-ice/default.nix b/pkgs/development/libraries/zeroc-ice/default.nix
index ef16e381bcfd..f522c1810397 100644
--- a/pkgs/development/libraries/zeroc-ice/default.nix
+++ b/pkgs/development/libraries/zeroc-ice/default.nix
@@ -35,7 +35,7 @@ in stdenv.mkDerivation rec {
NIX_CFLAGS_COMPILE = "-Wno-error=class-memaccess -Wno-error=deprecated-copy";
- prePatch = lib.optional stdenv.isDarwin ''
+ prePatch = lib.optionalString stdenv.isDarwin ''
substituteInPlace Make.rules.Darwin \
--replace xcrun ""
'';
diff --git a/pkgs/development/python-modules/arcam-fmj/default.nix b/pkgs/development/python-modules/arcam-fmj/default.nix
index 55e629d9358e..8d74db04d1fa 100644
--- a/pkgs/development/python-modules/arcam-fmj/default.nix
+++ b/pkgs/development/python-modules/arcam-fmj/default.nix
@@ -12,7 +12,7 @@
buildPythonPackage rec {
pname = "arcam-fmj";
- version = "0.10.0";
+ version = "0.11.1";
disabled = pythonOlder "3.8";
@@ -20,7 +20,7 @@ buildPythonPackage rec {
owner = "elupus";
repo = "arcam_fmj";
rev = version;
- sha256 = "sha256-pPPBeOwB2HgyxxMnR5yU3ZwDaJVP0v7/fkeDkeGGhPM=";
+ sha256 = "sha256-Vs32LGRN6kxG8sswvuUwuUbLv9GXuhJeK0CUGoo2EgE=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/cassandra-driver/default.nix b/pkgs/development/python-modules/cassandra-driver/default.nix
index e5b1a4c4fb0f..1243aad64cc4 100644
--- a/pkgs/development/python-modules/cassandra-driver/default.nix
+++ b/pkgs/development/python-modules/cassandra-driver/default.nix
@@ -35,6 +35,10 @@ buildPythonPackage rec {
sha256 = "1dn7iiavsrhh6i9hcyw0mk8j95r5ym0gbrvdca998hx2rnz5ark6";
};
+ postPatch = ''
+ substituteInPlace setup.py --replace 'geomet>=0.1,<0.3' 'geomet'
+ '';
+
nativeBuildInputs = [ cython ];
buildInputs = [ libev ];
propagatedBuildInputs = [ six geomet ]
@@ -80,6 +84,8 @@ buildPythonPackage rec {
"_PoolTests"
# attempts to make connection to localhost
"test_connection_initialization"
+ # time-sensitive
+ "test_nts_token_performance"
];
meta = with lib; {
diff --git a/pkgs/development/python-modules/cmd2/default.nix b/pkgs/development/python-modules/cmd2/default.nix
index dee6c2ab499e..b5bbc88c341f 100644
--- a/pkgs/development/python-modules/cmd2/default.nix
+++ b/pkgs/development/python-modules/cmd2/default.nix
@@ -15,7 +15,7 @@ buildPythonPackage rec {
LC_ALL="en_US.UTF-8";
- postPatch = lib.optional stdenv.isDarwin ''
+ postPatch = lib.optionalString stdenv.isDarwin ''
# Fake the impure dependencies pbpaste and pbcopy
mkdir bin
echo '#!${stdenv.shell}' > bin/pbpaste
diff --git a/pkgs/development/python-modules/cvxpy/default.nix b/pkgs/development/python-modules/cvxpy/default.nix
index 9068814ffd79..b7b5c7f55af0 100644
--- a/pkgs/development/python-modules/cvxpy/default.nix
+++ b/pkgs/development/python-modules/cvxpy/default.nix
@@ -36,7 +36,7 @@ buildPythonPackage rec {
];
# Required flags from https://github.com/cvxgrp/cvxpy/releases/tag/v1.1.11
- preBuild = lib.optional useOpenmp ''
+ preBuild = lib.optionalString useOpenmp ''
export CFLAGS="-fopenmp"
export LDFLAGS="-lgomp"
'';
diff --git a/pkgs/development/python-modules/dpkt/default.nix b/pkgs/development/python-modules/dpkt/default.nix
index a64ed8e2dc40..74817e60cbcf 100644
--- a/pkgs/development/python-modules/dpkt/default.nix
+++ b/pkgs/development/python-modules/dpkt/default.nix
@@ -1,4 +1,7 @@
-{ lib, fetchPypi, buildPythonPackage }:
+{ lib
+, fetchPypi
+, buildPythonPackage
+}:
buildPythonPackage rec {
pname = "dpkt";
@@ -9,6 +12,11 @@ buildPythonPackage rec {
sha256 = "74899d557ec4e337db29cecc80548b23a1205384d30ee407397cfb9ab178e3d4";
};
+ # Project has no tests
+ doCheck = false;
+
+ pythonImportsCheck = [ "dpkt" ];
+
meta = with lib; {
description = "Fast, simple packet creation / parsing, with definitions for the basic TCP/IP protocols";
homepage = "https://github.com/kbandla/dpkt";
diff --git a/pkgs/development/python-modules/geomet/default.nix b/pkgs/development/python-modules/geomet/default.nix
index a4df450098df..bace792ee84a 100644
--- a/pkgs/development/python-modules/geomet/default.nix
+++ b/pkgs/development/python-modules/geomet/default.nix
@@ -1,31 +1,22 @@
{ lib
, buildPythonPackage
, fetchFromGitHub
-, fetchpatch
, click
, six
}:
buildPythonPackage rec {
pname = "geomet";
- version = "0.2.1";
+ version = "0.3.0";
# pypi tarball doesn't include tests
src = fetchFromGitHub {
owner = "geomet";
repo = "geomet";
rev = version;
- sha256 = "0fdi26glsmrsyqk86rnsfcqw79svn2b0ikdv89pq98ihrpwhn85y";
+ sha256 = "1lb0df78gkivsb7hy3ix0xccvcznvskip11hr5sgq5y76qnfc8p0";
};
- patches = [
- (fetchpatch {
- name = "python-3.8-support.patch";
- url = "https://github.com/geomet/geomet/commit/dc4cb4a856d3ad814b57b4b7487d86d9e0f0fad4.patch";
- sha256 = "1f1cdfqyp3z01jdjvax77219l3gc75glywqrisqpd2k0m0g7fwh3";
- })
- ];
-
propagatedBuildInputs = [ click six ];
meta = with lib; {
diff --git a/pkgs/development/python-modules/google-cloud-resource-manager/default.nix b/pkgs/development/python-modules/google-cloud-resource-manager/default.nix
index 8e7953384eaa..a18872d562ba 100644
--- a/pkgs/development/python-modules/google-cloud-resource-manager/default.nix
+++ b/pkgs/development/python-modules/google-cloud-resource-manager/default.nix
@@ -11,11 +11,11 @@
buildPythonPackage rec {
pname = "google-cloud-resource-manager";
- version = "1.0.2";
+ version = "1.1.0";
src = fetchPypi {
inherit pname version;
- sha256 = "sha256-5njC5yO7NTU81i9vmJoe1RBYPS1fU/3K5tgH7twyT+I=";
+ sha256 = "a88f21b7a110dc9b5fd8e5bc9c07330fafc9ef150921505250aec0f0b25cf5e8";
};
propagatedBuildInputs = [ google-api-core google-cloud-core grpc-google-iam-v1 proto-plus ];
diff --git a/pkgs/development/python-modules/influxdb-client/default.nix b/pkgs/development/python-modules/influxdb-client/default.nix
index 5f94d61c7fda..437c10c3d849 100644
--- a/pkgs/development/python-modules/influxdb-client/default.nix
+++ b/pkgs/development/python-modules/influxdb-client/default.nix
@@ -14,14 +14,14 @@
buildPythonPackage rec {
pname = "influxdb-client";
- version = "1.19.0";
+ version = "1.20.0";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "influxdata";
repo = "influxdb-client-python";
rev = "v${version}";
- sha256 = "0k1qcwd2qdw8mcr8ywy3wi1x9j6i57axgcps5kmkbx773s8qf155";
+ sha256 = "sha256-VBKGzoLn71BQ5drbdiDjbpfHuYKGqHhuSwq0iNwdfh4=";
};
propagatedBuildInputs = [
diff --git a/pkgs/development/python-modules/libagent/default.nix b/pkgs/development/python-modules/libagent/default.nix
index 24d8ada58902..a485bf3a604b 100644
--- a/pkgs/development/python-modules/libagent/default.nix
+++ b/pkgs/development/python-modules/libagent/default.nix
@@ -2,6 +2,8 @@
unidecode, mock, pytest , backports-shutil-which, configargparse,
python-daemon, pymsgbox }:
+# XXX: when changing this package, please test the package onlykey-agent.
+
buildPythonPackage rec {
pname = "libagent";
version = "0.14.1";
diff --git a/pkgs/development/python-modules/pyclipper/default.nix b/pkgs/development/python-modules/pyclipper/default.nix
index 0fe3998b3e89..0dbcdfbc260a 100644
--- a/pkgs/development/python-modules/pyclipper/default.nix
+++ b/pkgs/development/python-modules/pyclipper/default.nix
@@ -3,16 +3,18 @@
, buildPythonPackage
, setuptools-scm
, cython
+, pytestCheckHook
+, unittest2
}:
buildPythonPackage rec {
pname = "pyclipper";
- version = "1.2.1";
+ version = "1.3.0";
src = fetchPypi {
inherit pname version;
extension = "zip";
- sha256 = "ca3751e93559f0438969c46f17459d07f983281dac170c3479de56492e152855";
+ sha256 = "48a1b5c585aea10e5b9c0b82d6abe2642fafd9ef158b9921852bc4af815ca20c";
};
nativeBuildInputs = [
@@ -20,10 +22,7 @@ buildPythonPackage rec {
cython
];
- # Requires pytest_runner to perform tests, which requires deprecated
- # features of setuptools. Seems better to not run tests. This should
- # be fixed upstream.
- doCheck = false;
+ checkInputs = [ pytestCheckHook unittest2 ];
pythonImportsCheck = [ "pyclipper" ];
meta = with lib; {
diff --git a/pkgs/development/python-modules/pygame/default.nix b/pkgs/development/python-modules/pygame/default.nix
index bcdce070c633..7ae4c96702ad 100644
--- a/pkgs/development/python-modules/pygame/default.nix
+++ b/pkgs/development/python-modules/pygame/default.nix
@@ -1,6 +1,6 @@
-{ lib, fetchPypi, buildPythonPackage, python, pkg-config, libX11
-, SDL2, SDL2_image, SDL2_mixer, SDL2_ttf, libpng, libjpeg, portmidi, freetype
-, fontconfig
+{ stdenv, lib, substituteAll, fetchPypi, buildPythonPackage, python, pkg-config, libX11
+, SDL2, SDL2_image, SDL2_mixer, SDL2_ttf, libpng, libjpeg, portmidi, freetype, fontconfig
+, AppKit, CoreMIDI
}:
buildPythonPackage rec {
@@ -12,6 +12,27 @@ buildPythonPackage rec {
sha256 = "8b1e7b63f47aafcdd8849933b206778747ef1802bd3d526aca45ed77141e4001";
};
+ patches = [
+ # Patch pygame's dependency resolution to let it find build inputs
+ (substituteAll {
+ src = ./fix-dependency-finding.patch;
+ buildinputs_include = builtins.toJSON (builtins.concatMap (dep: [
+ "${lib.getDev dep}/"
+ "${lib.getDev dep}/include"
+ ]) buildInputs);
+ buildinputs_lib = builtins.toJSON (builtins.concatMap (dep: [
+ "${lib.getLib dep}/"
+ "${lib.getLib dep}/lib"
+ ]) buildInputs);
+ })
+ ];
+
+ postPatch = ''
+ substituteInPlace src_py/sysfont.py \
+ --replace 'path="fc-list"' 'path="${fontconfig}/bin/fc-list"' \
+ --replace /usr/X11/bin/fc-list ${fontconfig}/bin/fc-list
+ '';
+
nativeBuildInputs = [
pkg-config SDL2
];
@@ -19,37 +40,33 @@ buildPythonPackage rec {
buildInputs = [
SDL2 SDL2_image SDL2_mixer SDL2_ttf libpng libjpeg
portmidi libX11 freetype
+ ] ++ lib.optionals stdenv.isDarwin [
+ AppKit CoreMIDI
];
preConfigure = ''
- sed \
- -e "s/origincdirs = .*/origincdirs = []/" \
- -e "s/origlibdirs = .*/origlibdirs = []/" \
- -e "/linux-gnu/d" \
- -i buildconfig/config_unix.py
- ${lib.concatMapStrings (dep: ''
- sed \
- -e "/origincdirs =/a\ origincdirs += ['${lib.getDev dep}/include']" \
- -e "/origlibdirs =/a\ origlibdirs += ['${lib.getLib dep}/lib']" \
- -i buildconfig/config_unix.py
- '') buildInputs
- }
LOCALBASE=/ ${python.interpreter} buildconfig/config.py
'';
- checkInputs = [ fontconfig ];
+ checkPhase = ''
+ runHook preCheck
- preCheck = ''
# No audio or video device in test environment
export SDL_VIDEODRIVER=dummy
export SDL_AUDIODRIVER=disk
export SDL_DISKAUDIOFILE=/dev/null
+
+ ${python.interpreter} -m pygame.tests -v --exclude opengl,timing --time_out 300
+
+ runHook postCheck
'';
+ pythonImportsCheck = [ "pygame" ];
meta = with lib; {
description = "Python library for games";
homepage = "https://www.pygame.org/";
license = licenses.lgpl21Plus;
- platforms = platforms.linux;
+ maintainers = with maintainers; [ angustrau ];
+ platforms = platforms.unix;
};
}
diff --git a/pkgs/development/python-modules/pygame/fix-dependency-finding.patch b/pkgs/development/python-modules/pygame/fix-dependency-finding.patch
new file mode 100644
index 000000000000..11b705f1b1ad
--- /dev/null
+++ b/pkgs/development/python-modules/pygame/fix-dependency-finding.patch
@@ -0,0 +1,64 @@
+diff --git a/buildconfig/config_darwin.py b/buildconfig/config_darwin.py
+index 8d84683f..70df8f9c 100644
+--- a/buildconfig/config_darwin.py
++++ b/buildconfig/config_darwin.py
+@@ -56,10 +56,10 @@ class Dependency:
+ class FrameworkDependency(Dependency):
+ def configure(self, incdirs, libdirs):
+ BASE_DIRS = '/', os.path.expanduser('~/'), '/System/'
+- for n in BASE_DIRS:
++ for n in incdirs + libdirs:
+ n += 'Library/Frameworks/'
+ fmwk = n + self.libs + '.framework/Versions/Current/'
+- if os.path.isfile(fmwk + self.libs):
++ if os.path.isfile(fmwk + self.libs + '.tbd'):
+ print ('Framework ' + self.libs + ' found')
+ self.found = 1
+ self.inc_dir = fmwk + 'Headers'
+@@ -158,19 +158,8 @@ def main(sdl2=False):
+ ])
+
+ print ('Hunting dependencies...')
+- incdirs = ['/usr/local/include']
+- if sdl2:
+- incdirs.append('/usr/local/include/SDL2')
+- else:
+- incdirs.append('/usr/local/include/SDL')
+-
+- incdirs.extend([
+- #'/usr/X11/include',
+- '/opt/local/include',
+- '/opt/local/include/freetype2/freetype']
+- )
+- #libdirs = ['/usr/local/lib', '/usr/X11/lib', '/opt/local/lib']
+- libdirs = ['/usr/local/lib', '/opt/local/lib']
++ incdirs = @buildinputs_include@
++ libdirs = @buildinputs_lib@
+
+ for d in DEPS:
+ if isinstance(d, (list, tuple)):
+diff --git a/buildconfig/config_unix.py b/buildconfig/config_unix.py
+index f6a4ea4b..f7f5be76 100644
+--- a/buildconfig/config_unix.py
++++ b/buildconfig/config_unix.py
+@@ -224,18 +224,8 @@ def main(sdl2=False):
+ if not DEPS[0].found:
+ raise RuntimeError('Unable to run "sdl-config". Please make sure a development version of SDL is installed.')
+
+- incdirs = []
+- libdirs = []
+- for extrabase in extrabases:
+- incdirs += [extrabase + d for d in origincdirs]
+- libdirs += [extrabase + d for d in origlibdirs]
+- incdirs += ["/usr"+d for d in origincdirs]
+- libdirs += ["/usr"+d for d in origlibdirs]
+- incdirs += ["/usr/local"+d for d in origincdirs]
+- libdirs += ["/usr/local"+d for d in origlibdirs]
+- if localbase:
+- incdirs = [localbase+d for d in origincdirs]
+- libdirs = [localbase+d for d in origlibdirs]
++ incdirs = @buildinputs_include@
++ libdirs = @buildinputs_lib@
+
+ for arg in DEPS[0].cflags.split():
+ if arg[:2] == '-I':
diff --git a/pkgs/development/python-modules/pyupgrade/default.nix b/pkgs/development/python-modules/pyupgrade/default.nix
index 411aa23254ce..f5b338680bdf 100644
--- a/pkgs/development/python-modules/pyupgrade/default.nix
+++ b/pkgs/development/python-modules/pyupgrade/default.nix
@@ -8,14 +8,14 @@
buildPythonPackage rec {
pname = "pyupgrade";
- version = "2.23.3";
+ version = "2.24.0";
disabled = pythonOlder "3.6";
src = fetchFromGitHub {
owner = "asottile";
repo = pname;
rev = "v${version}";
- sha256 = "sha256-Z17Bs3Mr1PJ9bYP2vsXTaJ85jOoIIlKLWR6D6s7enFs=";
+ sha256 = "sha256-vWju0D5O3RtDiv9uYQqd9kEwTIcV9QTHYXM/icB/rM0=";
};
checkInputs = [ pytestCheckHook ];
diff --git a/pkgs/development/python-modules/sagemaker/default.nix b/pkgs/development/python-modules/sagemaker/default.nix
index b61d8e969915..2b16b99bea73 100644
--- a/pkgs/development/python-modules/sagemaker/default.nix
+++ b/pkgs/development/python-modules/sagemaker/default.nix
@@ -16,11 +16,11 @@
buildPythonPackage rec {
pname = "sagemaker";
- version = "2.46.0";
+ version = "2.54.0";
src = fetchPypi {
inherit pname version;
- sha256 = "4f66f8c56b870e7a6f9a3882790a4074f2df26a0fe9605bc5d71e186db193525";
+ sha256 = "sha256-uLsBHqzpcuTugRXBihdbib64l396m+os39OhP+tLLCM=";
};
pythonImportsCheck = [
diff --git a/pkgs/development/python-modules/spacy/models.nix b/pkgs/development/python-modules/spacy/models.nix
index c34bbdfb83d8..0e0f1f19640f 100644
--- a/pkgs/development/python-modules/spacy/models.nix
+++ b/pkgs/development/python-modules/spacy/models.nix
@@ -25,7 +25,7 @@ let
++ lib.optionals (lang == "ru") [ pymorphy2 ]
++ lib.optionals (pname == "fr_dep_news_trf") [ sentencepiece ];
- postPatch = lib.optionals (pname == "fr_dep_news_trf") ''
+ postPatch = lib.optionalString (pname == "fr_dep_news_trf") ''
substituteInPlace meta.json \
--replace "sentencepiece==0.1.91" "sentencepiece>=0.1.91"
'';
diff --git a/pkgs/development/tools/build-managers/cmake/default.nix b/pkgs/development/tools/build-managers/cmake/default.nix
index 2de586f97cbf..a29ac38eb136 100644
--- a/pkgs/development/tools/build-managers/cmake/default.nix
+++ b/pkgs/development/tools/build-managers/cmake/default.nix
@@ -102,7 +102,7 @@ stdenv.mkDerivation rec {
];
# make install attempts to use the just-built cmake
- preInstall = lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) ''
+ preInstall = lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) ''
sed -i 's|bin/cmake|${buildPackages.cmakeMinimal}/bin/cmake|g' Makefile
'';
diff --git a/pkgs/development/tools/parsing/flex/2.5.35.nix b/pkgs/development/tools/parsing/flex/2.5.35.nix
index b2245ff9c9b9..ec2c9eeb2d1c 100644
--- a/pkgs/development/tools/parsing/flex/2.5.35.nix
+++ b/pkgs/development/tools/parsing/flex/2.5.35.nix
@@ -16,10 +16,10 @@ stdenv.mkDerivation {
propagatedBuildInputs = [ m4 ];
- preConfigure = lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
- "ac_cv_func_malloc_0_nonnull=yes"
- "ac_cv_func_realloc_0_nonnull=yes"
- ];
+ preConfigure = lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) ''
+ ac_cv_func_malloc_0_nonnull=yes
+ ac_cv_func_realloc_0_nonnull=yes
+ '';
doCheck = false; # fails 2 out of 46 tests
diff --git a/pkgs/development/tools/parsing/flex/2.6.1.nix b/pkgs/development/tools/parsing/flex/2.6.1.nix
index cc0ecb148c44..aeb141649772 100644
--- a/pkgs/development/tools/parsing/flex/2.6.1.nix
+++ b/pkgs/development/tools/parsing/flex/2.6.1.nix
@@ -18,10 +18,10 @@ stdenv.mkDerivation {
propagatedBuildInputs = [ m4 ];
- preConfigure = lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
- "ac_cv_func_malloc_0_nonnull=yes"
- "ac_cv_func_realloc_0_nonnull=yes"
- ];
+ preConfigure = lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) ''
+ ac_cv_func_malloc_0_nonnull=yes
+ ac_cv_func_realloc_0_nonnull=yes
+ '';
postConfigure = lib.optionalString (stdenv.isDarwin || stdenv.isCygwin) ''
sed -i Makefile -e 's/-no-undefined//;'
diff --git a/pkgs/development/tools/parsing/flex/default.nix b/pkgs/development/tools/parsing/flex/default.nix
index 0bc26db57504..e0895bab68d8 100644
--- a/pkgs/development/tools/parsing/flex/default.nix
+++ b/pkgs/development/tools/parsing/flex/default.nix
@@ -33,10 +33,10 @@ stdenv.mkDerivation rec {
buildInputs = [ bison ];
propagatedBuildInputs = [ m4 ];
- preConfigure = lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
- "export ac_cv_func_malloc_0_nonnull=yes"
- "export ac_cv_func_realloc_0_nonnull=yes"
- ];
+ preConfigure = lib.optionalString (stdenv.hostPlatform != stdenv.buildPlatform) ''
+ export ac_cv_func_malloc_0_nonnull=yes
+ export ac_cv_func_realloc_0_nonnull=yes
+ '';
postConfigure = lib.optionalString (stdenv.isDarwin || stdenv.isCygwin) ''
sed -i Makefile -e 's/-no-undefined//;'
diff --git a/pkgs/development/tools/parsing/ragel/default.nix b/pkgs/development/tools/parsing/ragel/default.nix
index 6bbcf36cd2c2..c23b352decea 100644
--- a/pkgs/development/tools/parsing/ragel/default.nix
+++ b/pkgs/development/tools/parsing/ragel/default.nix
@@ -15,7 +15,7 @@ let
buildInputs = lib.optional build-manual [ transfig ghostscript tex ];
- preConfigure = lib.optional build-manual ''
+ preConfigure = lib.optionalString build-manual ''
sed -i "s/build_manual=no/build_manual=yes/g" DIST
'';
diff --git a/pkgs/development/tools/pscale/default.nix b/pkgs/development/tools/pscale/default.nix
index 657b1965012e..477827b75a14 100644
--- a/pkgs/development/tools/pscale/default.nix
+++ b/pkgs/development/tools/pscale/default.nix
@@ -2,16 +2,16 @@
buildGoModule rec {
pname = "pscale";
- version = "0.63.0";
+ version = "0.65.0";
src = fetchFromGitHub {
owner = "planetscale";
repo = "cli";
rev = "v${version}";
- sha256 = "sha256-LYVR8vcMS6ErYH4sGRi1JT9E4ElYe5mloc3C1TudzSE=";
+ sha256 = "sha256-RIyxO2nTysJLdYQvlmhZpS8R2kkwN+XeTlk4Ocbk9C8=";
};
- vendorSha256 = "sha256-3LuzdvwLYSL7HaGbKDfrqBz2FV2yr6YUdI5kXXiIvbU=";
+ vendorSha256 = "sha256-8zgWM5e+aKggGbLoL/Fmy7AuALVlLa74eHBxNGjTSy4=";
meta = with lib; {
homepage = "https://www.planetscale.com/";
diff --git a/pkgs/development/tools/qtcreator/default.nix b/pkgs/development/tools/qtcreator/default.nix
index 5926b3fda5eb..9df547308f56 100644
--- a/pkgs/development/tools/qtcreator/default.nix
+++ b/pkgs/development/tools/qtcreator/default.nix
@@ -68,7 +68,7 @@ mkDerivation rec {
--replace 'LLVM_CXXFLAGS ~= s,-gsplit-dwarf,' '${lib.concatStringsSep "\n" ["LLVM_CXXFLAGS ~= s,-gsplit-dwarf," " LLVM_CXXFLAGS += -fno-rtti"]}'
'';
- preBuild = optional withDocumentation ''
+ preBuild = optionalString withDocumentation ''
ln -s ${getLib qtbase}/$qtDocPrefix $NIX_QT5_TMP/share
'';
diff --git a/pkgs/development/tools/rust/sqlx-cli/default.nix b/pkgs/development/tools/rust/sqlx-cli/default.nix
index 48af8f957b34..15b6b085bb05 100644
--- a/pkgs/development/tools/rust/sqlx-cli/default.nix
+++ b/pkgs/development/tools/rust/sqlx-cli/default.nix
@@ -2,16 +2,16 @@
rustPlatform.buildRustPackage rec {
pname = "sqlx-cli";
- version = "0.5.6";
+ version = "0.5.7";
src = fetchFromGitHub {
owner = "launchbadge";
repo = "sqlx";
rev = "v${version}";
- sha256 = "sha256-Ir9n2Z3+dKCe2GLrVLV1dnxeKKtPJk/kd5wbtsKHtbw=";
+ sha256 = "sha256-BYTAAzex3h9iEKFuPCyCXKokPLcgA0k9Zk6aMcWac+c=";
};
- cargoSha256 = "sha256-MfLxzulcQSEcNGmer8m2ph2+lK2M3MN1PwAHDGzn3NQ=";
+ cargoSha256 = "sha256-3Fdoo8gvoLXe9fEAzKh7XY0LDVGsYsqB6NRlU8NqCMI=";
doCheck = false;
cargoBuildFlags = [ "-p sqlx-cli" ];
diff --git a/pkgs/development/tools/skopeo/default.nix b/pkgs/development/tools/skopeo/default.nix
index 6bfd2354a79c..b162861f1512 100644
--- a/pkgs/development/tools/skopeo/default.nix
+++ b/pkgs/development/tools/skopeo/default.nix
@@ -14,13 +14,13 @@
buildGoModule rec {
pname = "skopeo";
- version = "1.4.0";
+ version = "1.4.1";
src = fetchFromGitHub {
rev = "v${version}";
owner = "containers";
repo = "skopeo";
- sha256 = "sha256-ocbZs4z6jxLC4l6po07QPyM7R5vFowK7hsMRfwALfoY=";
+ sha256 = "sha256-K+Zn+L7yylUj+iMrsXocWRD4O8HmxdsIsjO36SCkWiU=";
};
outputs = [ "out" "man" ];
diff --git a/pkgs/games/spring/default.nix b/pkgs/games/spring/default.nix
index 21aca5730628..b6e6505fd088 100644
--- a/pkgs/games/spring/default.nix
+++ b/pkgs/games/spring/default.nix
@@ -7,9 +7,9 @@
stdenv.mkDerivation rec {
pname = "spring";
- version = "104.0.1-${buildId}-g${shortRev}";
+ version = "105.0.1-${buildId}-g${shortRev}";
# usually the latest in https://github.com/spring/spring/commits/maintenance
- rev = "f266c8107b3e5dda5a78061ef00ca0ed8736d6f2";
+ rev = "8581792eac65e07cbed182ccb1e90424ce3bd8fc";
shortRev = builtins.substring 0 7 rev;
buildId = "1486";
@@ -18,7 +18,7 @@ stdenv.mkDerivation rec {
owner = "spring";
repo = pname;
inherit rev;
- sha256 = "1nx68d894yfmqc6df72hmk75ph26fqdvlmmq58cca0vbwpz9hf5v";
+ sha256 = "05lvd8grqmv7vl8rrx02rhl0qhmm58dyi6s78b64j3fkia4sfj1r";
fetchSubmodules = true;
};
@@ -60,7 +60,5 @@ stdenv.mkDerivation rec {
license = licenses.gpl2;
maintainers = with maintainers; [ phreedom qknight domenkozar sorki ];
platforms = platforms.linux;
- # error: 'snprintf' was not declared in this scope
- broken = true;
};
}
diff --git a/pkgs/misc/vim-plugins/overrides.nix b/pkgs/misc/vim-plugins/overrides.nix
index bd977960f42e..f26258de3ba4 100644
--- a/pkgs/misc/vim-plugins/overrides.nix
+++ b/pkgs/misc/vim-plugins/overrides.nix
@@ -834,7 +834,7 @@ self: super: {
});
vim-xdebug = super.vim-xdebug.overrideAttrs (old: {
- postInstall = false;
+ postInstall = null;
});
vim-xkbswitch = super.vim-xkbswitch.overrideAttrs (old: {
diff --git a/pkgs/os-specific/linux/iptables/default.nix b/pkgs/os-specific/linux/iptables/default.nix
index 912d9078c947..fe0e82c4a8e6 100644
--- a/pkgs/os-specific/linux/iptables/default.nix
+++ b/pkgs/os-specific/linux/iptables/default.nix
@@ -32,7 +32,7 @@ stdenv.mkDerivation rec {
outputs = [ "out" "dev" ];
- postInstall = optional nftablesCompat ''
+ postInstall = optionalString nftablesCompat ''
rm $out/sbin/{iptables,iptables-restore,iptables-save,ip6tables,ip6tables-restore,ip6tables-save}
ln -sv xtables-nft-multi $out/bin/iptables
ln -sv xtables-nft-multi $out/bin/iptables-restore
diff --git a/pkgs/os-specific/linux/wooting-udev-rules/default.nix b/pkgs/os-specific/linux/wooting-udev-rules/default.nix
index f1ae20692353..f34e106727c1 100644
--- a/pkgs/os-specific/linux/wooting-udev-rules/default.nix
+++ b/pkgs/os-specific/linux/wooting-udev-rules/default.nix
@@ -2,7 +2,7 @@
stdenv.mkDerivation rec {
pname = "wooting-udev-rules";
- version = "20190601";
+ version = "20210525";
# Source: https://wooting.helpscoutdocs.com/article/68-wootility-configuring-device-access-for-wootility-under-linux-udev-rules
src = [ ./wooting.rules ];
diff --git a/pkgs/os-specific/linux/wooting-udev-rules/wooting.rules b/pkgs/os-specific/linux/wooting-udev-rules/wooting.rules
index d906df3d4c6a..fa4148d87438 100644
--- a/pkgs/os-specific/linux/wooting-udev-rules/wooting.rules
+++ b/pkgs/os-specific/linux/wooting-udev-rules/wooting.rules
@@ -7,3 +7,8 @@ SUBSYSTEM=="hidraw", ATTRS{idVendor}=="03eb", ATTRS{idProduct}=="2402", MODE:="0
SUBSYSTEM=="hidraw", ATTRS{idVendor}=="03eb", ATTRS{idProduct}=="ff02", MODE:="0660", GROUP="input"
# Wooting Two update mode
SUBSYSTEM=="hidraw", ATTRS{idVendor}=="03eb", ATTRS{idProduct}=="2403", MODE:="0660", GROUP="input"
+
+# Wooting Two Lekker Edition
+SUBSYSTEM=="hidraw", ATTRS{idVendor}=="31e3", ATTRS{idProduct}=="1210", MODE:="0660", GROUP="input"
+# Wooting Two Lekker Edition update mode
+SUBSYSTEM=="hidraw", ATTRS{idVendor}=="31e3", ATTRS{idProduct}=="121f", MODE:="0660", GROUP="input"
diff --git a/pkgs/servers/klipper/default.nix b/pkgs/servers/klipper/default.nix
index f120454ac84a..aa933b0fb660 100644
--- a/pkgs/servers/klipper/default.nix
+++ b/pkgs/servers/klipper/default.nix
@@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
};
# We have no LTO on i686 since commit 22284b0
- postPatch = lib.optional stdenv.isi686 ''
+ postPatch = lib.optionalString stdenv.isi686 ''
substituteInPlace chelper/__init__.py \
--replace "-flto -fwhole-program " ""
'';
diff --git a/pkgs/servers/rpiplay/default.nix b/pkgs/servers/rpiplay/default.nix
new file mode 100644
index 000000000000..672c6746abcb
--- /dev/null
+++ b/pkgs/servers/rpiplay/default.nix
@@ -0,0 +1,49 @@
+{ lib, stdenv, pkg-config, fetchFromGitHub, fetchpatch, cmake, wrapGAppsHook, avahi, avahi-compat, openssl, gst_all_1, libplist }:
+
+stdenv.mkDerivation rec {
+ pname = "rpiplay";
+ version = "unstable-2021-06-14";
+
+ src = fetchFromGitHub {
+ owner = "FD-";
+ repo = "RPiPlay";
+ rev = "35dd995fceed29183cbfad0d4110ae48e0635786";
+ sha256 = "sha256-qe7ZTT45NYvzgnhRmz15uGT/FnGi9uppbKVbmch5B9A=";
+ };
+
+ patches = [
+ # allow rpiplay to be used with firewall enabled.
+ # sets static ports 7000 7100 (tcp) and 6000 6001 7011 (udp)
+ (fetchpatch {
+ name = "use-static-ports.patch";
+ url = "https://github.com/FD-/RPiPlay/commit/2ffc287ba822e1d2b2ed0fc0e41a2bb3d9dab105.patch";
+ sha256 = "08dy829gyhyzw2n54zn5m3176cmd24k5hij24vpww5bhbwkbabww";
+ })
+ ];
+
+ nativeBuildInputs = [
+ cmake
+ openssl
+ libplist
+ pkg-config
+ wrapGAppsHook
+ ];
+
+ buildInputs = [
+ avahi
+ avahi-compat
+ gst_all_1.gstreamer
+ gst_all_1.gst-plugins-base
+ gst_all_1.gst-plugins-good
+ gst_all_1.gst-plugins-bad
+ gst_all_1.gst-plugins-ugly
+ ];
+
+ meta = with lib; {
+ homepage = "https://github.com/FD-/RPiPlay";
+ description = "An open-source implementation of an AirPlay mirroring server.";
+ license = licenses.gpl3Plus;
+ maintainers = with maintainers; [ mschneider ];
+ platforms = platforms.unix;
+ };
+}
diff --git a/pkgs/servers/sql/mysql/5.7.x.nix b/pkgs/servers/sql/mysql/5.7.x.nix
index 36e26d38fc48..c1ce4d9e1e14 100644
--- a/pkgs/servers/sql/mysql/5.7.x.nix
+++ b/pkgs/servers/sql/mysql/5.7.x.nix
@@ -16,7 +16,7 @@ self = stdenv.mkDerivation rec {
sha256 = "1fhv16zr46pxm1j8vb8x8mh3nwzglg01arz8gnazbmjqldr5idpq";
};
- preConfigure = lib.optional stdenv.isDarwin ''
+ preConfigure = lib.optionalString stdenv.isDarwin ''
ln -s /bin/ps $TMPDIR/ps
export PATH=$PATH:$TMPDIR
'';
diff --git a/pkgs/tools/admin/nomachine-client/default.nix b/pkgs/tools/admin/nomachine-client/default.nix
index 0daa65cc9804..be4bef1e1609 100644
--- a/pkgs/tools/admin/nomachine-client/default.nix
+++ b/pkgs/tools/admin/nomachine-client/default.nix
@@ -1,9 +1,9 @@
{ lib, stdenv, file, fetchurl, makeWrapper,
autoPatchelfHook, jsoncpp, libpulseaudio }:
let
- versionMajor = "7.4";
- versionMinor = "1";
- versionBuild_x86_64 = "1";
+ versionMajor = "7.6";
+ versionMinor = "2";
+ versionBuild_x86_64 = "4";
versionBuild_i686 = "1";
in
stdenv.mkDerivation rec {
@@ -14,12 +14,12 @@ in
if stdenv.hostPlatform.system == "x86_64-linux" then
fetchurl {
url = "https://download.nomachine.com/download/${versionMajor}/Linux/nomachine_${version}_${versionBuild_x86_64}_x86_64.tar.gz";
- sha256 = "1qir9ii0h5ali87mjzjl72dm1ky626d7y59jfpglakqxzqhjamdz";
+ sha256 = "1kkdf9dlp4j453blnwp1sds4r3h3fy863pvhdh466mrq3f10qca8";
}
else if stdenv.hostPlatform.system == "i686-linux" then
fetchurl {
url = "https://download.nomachine.com/download/${versionMajor}/Linux/nomachine_${version}_${versionBuild_i686}_i686.tar.gz";
- sha256 = "1gxiysc09k3jz1pkkyfqgw2fygcnmrnskk6b9vn4fjnvsab4py60";
+ sha256 = "0h4c90hzhbg0qdb585bc9gry9cf9hd8r53m2jha4fdqhzd95ydln";
}
else
throw "NoMachine client is not supported on ${stdenv.hostPlatform.system}";
@@ -90,4 +90,3 @@ in
platforms = [ "x86_64-linux" "i686-linux" ];
};
}
-
diff --git a/pkgs/tools/filesystems/moosefs/default.nix b/pkgs/tools/filesystems/moosefs/default.nix
index e07ca270b5c8..dc1d77bfa7ed 100644
--- a/pkgs/tools/filesystems/moosefs/default.nix
+++ b/pkgs/tools/filesystems/moosefs/default.nix
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
"/usr/local/lib/pkgconfig" "/nonexistent"
'';
- preBuild = lib.optional stdenv.isDarwin ''
+ preBuild = lib.optionalString stdenv.isDarwin ''
substituteInPlace config.h --replace \
"#define HAVE_STRUCT_STAT_ST_BIRTHTIME 1" \
"#undef HAVE_STRUCT_STAT_ST_BIRTHTIME"
diff --git a/pkgs/tools/inputmethods/emote/default.nix b/pkgs/tools/inputmethods/emote/default.nix
new file mode 100644
index 000000000000..d65831d5202e
--- /dev/null
+++ b/pkgs/tools/inputmethods/emote/default.nix
@@ -0,0 +1,56 @@
+{ lib, fetchFromGitHub, python3Packages, wrapGAppsHook, gobject-introspection, gtk3, keybinder3, xdotool, pango, gdk-pixbuf, atk, librsvg }:
+
+python3Packages.buildPythonApplication rec {
+ pname = "emote";
+ version = "2.0.0";
+
+ src = fetchFromGitHub {
+ owner = "tom-james-watson";
+ repo = "Emote";
+ rev = "v${version}";
+ sha256 = "kYXFD6VBnuEZ0ZMsF6ZmN4V0JN83puxRILpNlllVsKQ=";
+ };
+
+ postPatch = ''
+ substituteInPlace setup.py --replace "pygobject==3.36.0" "pygobject"
+ substituteInPlace emote/config.py --replace 'os.environ.get("SNAP")' "'$out/share/emote'"
+ substituteInPlace snap/gui/emote.desktop --replace "Icon=\''${SNAP}/usr/share/icons/emote.svg" "Icon=emote.svg"
+ '';
+
+ nativeBuildInputs = [
+ wrapGAppsHook
+ gobject-introspection
+ keybinder3
+ pango
+ gdk-pixbuf
+ atk
+ ];
+
+ propagatedBuildInputs = [
+ python3Packages.pygobject3
+ gtk3
+ xdotool
+ librsvg
+ ];
+
+ postInstall = ''
+ install -D snap/gui/emote.desktop $out/share/applications/emote.desktop
+ install -D snap/gui/emote.svg $out/share/pixmaps/emote.svg
+ install -D -t $out/share/emote/static static/{emojis.json,logo.svg,style.css}
+ '';
+
+ dontWrapGApps = true;
+ preFixup = ''
+ makeWrapperArgs+=("''${gappsWrapperArgs[@]}")
+ '';
+
+ doCheck = false;
+
+ meta = with lib; {
+ description = "A modern emoji picker for Linux";
+ homepage = "https://github.com/tom-james-watson/emote";
+ license = licenses.gpl3Plus;
+ maintainers = with maintainers; [ angustrau ];
+ platforms = platforms.linux;
+ };
+}
diff --git a/pkgs/tools/misc/traefik-certs-dumper/default.nix b/pkgs/tools/misc/traefik-certs-dumper/default.nix
new file mode 100644
index 000000000000..fc0062185b23
--- /dev/null
+++ b/pkgs/tools/misc/traefik-certs-dumper/default.nix
@@ -0,0 +1,23 @@
+{ fetchFromGitHub, buildGoModule, lib }:
+
+buildGoModule rec {
+ pname = "traefik-certs-dumper";
+ version = "2.7.4";
+
+ src = fetchFromGitHub {
+ owner = "ldez";
+ repo = pname;
+ rev = "v${version}";
+ sha256 = "sha256-exkBDrNGvpOz/VD6yfE1PKL4hzs/oZ+RxMwm/ytuV/0=";
+ };
+
+ vendorSha256 = "sha256-NmYfdX5BKHZvFzlkh/kkK0voOzNj1EPn53Mz/B7eLd0=";
+ excludedPackages = "integrationtest";
+
+ meta = with lib; {
+ description = "dump ACME data from traefik to certificates";
+ homepage = "https://github.com/ldez/traefik-certs-dumper";
+ license = licenses.asl20;
+ maintainers = with maintainers; [ nickcao ];
+ };
+}
diff --git a/pkgs/tools/networking/aria2/default.nix b/pkgs/tools/networking/aria2/default.nix
index 7e4f06302f2e..db239e034f51 100644
--- a/pkgs/tools/networking/aria2/default.nix
+++ b/pkgs/tools/networking/aria2/default.nix
@@ -6,13 +6,13 @@
stdenv.mkDerivation rec {
pname = "aria2";
- version = "1.35.0";
+ version = "1.36.0";
src = fetchFromGitHub {
owner = "aria2";
repo = "aria2";
rev = "release-${version}";
- sha256 = "195r3711ly3drf9jkygwdc2m7q99hiqlfrig3ip1127b837gzsf9";
+ sha256 = "sha256-ErjFfSJDIgZq0qy0Zn5uZ9bZS2AtJq4FuBVuUuQgPTI=";
};
nativeBuildInputs = [ pkg-config autoreconfHook sphinx ];
diff --git a/pkgs/tools/networking/dhcpcd/default.nix b/pkgs/tools/networking/dhcpcd/default.nix
index cc1bad106f75..0962335ad1a3 100644
--- a/pkgs/tools/networking/dhcpcd/default.nix
+++ b/pkgs/tools/networking/dhcpcd/default.nix
@@ -44,7 +44,7 @@ stdenv.mkDerivation rec {
installFlags = [ "DBDIR=$(TMPDIR)/db" "SYSCONFDIR=${placeholder "out"}/etc" ];
# Check that the udev plugin got built.
- postInstall = lib.optional (udev != null) "[ -e ${placeholder "out"}/lib/dhcpcd/dev/udev.so ]";
+ postInstall = lib.optionalString (udev != null) "[ -e ${placeholder "out"}/lib/dhcpcd/dev/udev.so ]";
meta = with lib; {
description = "A client for the Dynamic Host Configuration Protocol (DHCP)";
diff --git a/pkgs/tools/networking/mu/default.nix b/pkgs/tools/networking/mu/default.nix
index 468bc127228a..694c1f5e721f 100644
--- a/pkgs/tools/networking/mu/default.nix
+++ b/pkgs/tools/networking/mu/default.nix
@@ -7,13 +7,13 @@
stdenv.mkDerivation rec {
pname = "mu";
- version = "1.6.3";
+ version = "1.6.4";
src = fetchFromGitHub {
owner = "djcb";
repo = "mu";
rev = version;
- sha256 = "hmP2bcoBWMd2GZBE8XtJ5QePpWnkJV5pu69aDmL5V4g=";
+ sha256 = "rRBi6bgxkVQ94wLBqVQikIE0jVkvm1fjtEzFMsQTJz8=";
};
postPatch = lib.optionalString (batchSize != null) ''
diff --git a/pkgs/tools/networking/ofono/default.nix b/pkgs/tools/networking/ofono/default.nix
index 93e1415b91c4..c1d6b7615471 100644
--- a/pkgs/tools/networking/ofono/default.nix
+++ b/pkgs/tools/networking/ofono/default.nix
@@ -46,6 +46,10 @@ stdenv.mkDerivation rec {
"--enable-external-ell"
];
+ installFlags = [
+ "SYSCONFDIR=${placeholder "out"}/etc"
+ ];
+
postInstall = ''
rm -r $out/etc/ofono
ln -s /etc/ofono $out/etc/ofono
diff --git a/pkgs/tools/security/onlykey-agent/default.nix b/pkgs/tools/security/onlykey-agent/default.nix
new file mode 100644
index 000000000000..84c65b913458
--- /dev/null
+++ b/pkgs/tools/security/onlykey-agent/default.nix
@@ -0,0 +1,61 @@
+{ lib
+, python3Packages
+, onlykey-cli
+}:
+
+let
+ # onlykey requires a patched version of libagent
+ lib-agent = with python3Packages; libagent.overridePythonAttrs (oa: rec{
+ version = "1.0.2";
+ src = fetchPypi {
+ inherit version;
+ pname = "lib-agent";
+ sha256 = "sha256-NAimivO3m4UUPM4JgLWGq2FbXOaXdQEL/DqZAcy+kEw=";
+ };
+ propagatedBuildInputs = oa.propagatedBuildInputs or [ ] ++ [
+ pynacl
+ docutils
+ pycryptodome
+ wheel
+ ];
+
+ # turn off testing because I can't get it to work
+ doCheck = false;
+ pythonImportsCheck = [ "libagent" ];
+
+ meta = oa.meta // {
+ description = "Using OnlyKey as hardware SSH and GPG agent";
+ homepage = "https://github.com/trustcrypto/onlykey-agent/tree/ledger";
+ maintainers = with maintainers; [ kalbasit ];
+ };
+ });
+in
+python3Packages.buildPythonApplication rec {
+ pname = "onlykey-agent";
+ version = "1.1.11";
+
+ src = python3Packages.fetchPypi {
+ inherit pname version;
+ sha256 = "sha256-YH/cqQOVy5s6dTp2JwxM3s4xRTXgwhOr00whtHAwZZI=";
+ };
+
+ propagatedBuildInputs = with python3Packages; [ lib-agent onlykey-cli ];
+
+ # move the python library into the sitePackages.
+ postInstall = ''
+ mkdir $out/${python3Packages.python.sitePackages}/onlykey_agent
+ mv $out/bin/onlykey_agent.py $out/${python3Packages.python.sitePackages}/onlykey_agent/__init__.py
+ chmod a-x $out/${python3Packages.python.sitePackages}/onlykey_agent/__init__.py
+ '';
+
+ # no tests
+ doCheck = false;
+ pythonImportsCheck = [ "onlykey_agent" ];
+
+ meta = with lib; {
+ description = " The OnlyKey agent is essentially middleware that lets you use OnlyKey as a hardware SSH/GPG device.";
+ homepage = "https://github.com/trustcrypto/onlykey-agent";
+ license = licenses.lgpl3Only;
+ maintainers = with maintainers; [ kalbasit ];
+ };
+}
diff --git a/pkgs/tools/system/battop/battery.patch b/pkgs/tools/system/battop/battery.patch
new file mode 100644
index 000000000000..218359d904fe
--- /dev/null
+++ b/pkgs/tools/system/battop/battery.patch
@@ -0,0 +1,588 @@
+diff --git a/Cargo.lock b/Cargo.lock
+index 57ee609..d156cd2 100644
+--- a/Cargo.lock
++++ b/Cargo.lock
+@@ -1,430 +1,429 @@
+ # This file is automatically @generated by Cargo.
+ # It is not intended for manual editing.
++version = 3
++
+ [[package]]
+ name = "autocfg"
+ version = "0.1.4"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "0e49efa51329a5fd37e7c79db4621af617cd4e3e5bc224939808d076077077bf"
+
+ [[package]]
+ name = "battery"
+-version = "0.7.4"
++version = "0.7.8"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "b4b624268937c0e0a3edb7c27843f9e547c320d730c610d3b8e6e8e95b2026e4"
+ dependencies = [
+- "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
+- "core-foundation 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)",
+- "lazycell 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)",
+- "libc 0.2.58 (registry+https://github.com/rust-lang/crates.io-index)",
+- "mach 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)",
+- "nix 0.14.0 (registry+https://github.com/rust-lang/crates.io-index)",
+- "num-traits 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
+- "uom 0.23.1 (registry+https://github.com/rust-lang/crates.io-index)",
+- "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
++ "cfg-if 1.0.0",
++ "core-foundation",
++ "lazycell",
++ "libc",
++ "mach",
++ "nix",
++ "num-traits",
++ "uom",
++ "winapi",
+ ]
+
+ [[package]]
+ name = "battop"
+ version = "0.2.4"
+ dependencies = [
+- "battery 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)",
+- "humantime 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)",
+- "itertools 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
+- "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
+- "stderrlog 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)",
+- "structopt 0.2.17 (registry+https://github.com/rust-lang/crates.io-index)",
+- "termion 1.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
+- "tui 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "battery",
++ "humantime",
++ "itertools",
++ "log",
++ "stderrlog",
++ "structopt",
++ "termion",
++ "tui",
+ ]
+
+ [[package]]
+ name = "bitflags"
+-version = "1.0.4"
++version = "1.2.1"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693"
+
+ [[package]]
+ name = "cassowary"
+ version = "0.3.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "df8670b8c7b9dae1793364eafadf7239c40d669904660c5960d74cfd80b46a53"
+
+ [[package]]
+ name = "cc"
+ version = "1.0.37"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "39f75544d7bbaf57560d2168f28fd649ff9c76153874db88bdbdfd839b1a7e7d"
+
+ [[package]]
+ name = "cfg-if"
+ version = "0.1.9"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "b486ce3ccf7ffd79fdeb678eac06a9e6c09fc88d33836340becb8fffe87c5e33"
++
++[[package]]
++name = "cfg-if"
++version = "1.0.0"
++source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
+
+ [[package]]
+ name = "chrono"
+ version = "0.4.6"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "45912881121cb26fad7c38c17ba7daa18764771836b34fab7d3fbd93ed633878"
+ dependencies = [
+- "num-integer 0.1.41 (registry+https://github.com/rust-lang/crates.io-index)",
+- "num-traits 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
+- "time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)",
++ "num-integer",
++ "num-traits",
++ "time",
+ ]
+
+ [[package]]
+ name = "clap"
+ version = "2.33.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "5067f5bb2d80ef5d68b4c87db81601f0b75bca627bc2ef76b141d7b846a3c6d9"
+ dependencies = [
+- "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
+- "textwrap 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)",
+- "unicode-width 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
++ "bitflags",
++ "textwrap",
++ "unicode-width",
+ ]
+
+ [[package]]
+ name = "core-foundation"
+-version = "0.6.4"
++version = "0.7.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "57d24c7a13c43e870e37c1556b74555437870a04514f7685f5b354e090567171"
+ dependencies = [
+- "core-foundation-sys 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)",
+- "libc 0.2.58 (registry+https://github.com/rust-lang/crates.io-index)",
++ "core-foundation-sys",
++ "libc",
+ ]
+
+ [[package]]
+ name = "core-foundation-sys"
+-version = "0.6.2"
++version = "0.7.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "b3a71ab494c0b5b860bdc8407ae08978052417070c2ced38573a9157ad75b8ac"
+
+ [[package]]
+ name = "either"
+ version = "1.5.2"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "5527cfe0d098f36e3f8839852688e63c8fff1c90b2b405aef730615f9a7bcf7b"
+
+ [[package]]
+ name = "heck"
+ version = "0.3.1"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "20564e78d53d2bb135c343b3f47714a56af2061f1c928fdb541dc7b9fdd94205"
+ dependencies = [
+- "unicode-segmentation 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "unicode-segmentation",
+ ]
+
+ [[package]]
+ name = "humantime"
+ version = "1.2.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "3ca7e5f2e110db35f93b837c81797f3714500b81d517bf20c431b16d3ca4f114"
+ dependencies = [
+- "quick-error 1.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "quick-error",
+ ]
+
+ [[package]]
+ name = "itertools"
+ version = "0.8.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "5b8467d9c1cebe26feb08c640139247fac215782d35371ade9a2136ed6085358"
+ dependencies = [
+- "either 1.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "either",
+ ]
+
+ [[package]]
+ name = "lazy_static"
+ version = "1.3.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "bc5729f27f159ddd61f4df6228e827e86643d4d3e7c32183cb30a1c08f604a14"
+
+ [[package]]
+ name = "lazycell"
+-version = "1.2.1"
++version = "1.3.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55"
+
+ [[package]]
+ name = "libc"
+-version = "0.2.58"
++version = "0.2.98"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "320cfe77175da3a483efed4bc0adc1968ca050b098ce4f2f1c13a56626128790"
+
+ [[package]]
+ name = "log"
+ version = "0.4.6"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "c84ec4b527950aa83a329754b01dbe3f58361d1c5efacd1f6d68c494d08a17c6"
+ dependencies = [
+- "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
++ "cfg-if 0.1.9",
+ ]
+
+ [[package]]
+ name = "mach"
+-version = "0.2.3"
++version = "0.3.2"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "b823e83b2affd8f40a9ee8c29dbc56404c1e34cd2710921f2801e2cf29527afa"
+ dependencies = [
+- "libc 0.2.58 (registry+https://github.com/rust-lang/crates.io-index)",
++ "libc",
+ ]
+
+ [[package]]
+ name = "nix"
+-version = "0.14.0"
++version = "0.19.1"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "b2ccba0cfe4fdf15982d1674c69b1fd80bad427d293849982668dfe454bd61f2"
+ dependencies = [
+- "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
+- "cc 1.0.37 (registry+https://github.com/rust-lang/crates.io-index)",
+- "cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)",
+- "libc 0.2.58 (registry+https://github.com/rust-lang/crates.io-index)",
+- "void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)",
++ "bitflags",
++ "cc",
++ "cfg-if 1.0.0",
++ "libc",
+ ]
+
+ [[package]]
+ name = "num-integer"
+ version = "0.1.41"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "b85e541ef8255f6cf42bbfe4ef361305c6c135d10919ecc26126c4e5ae94bc09"
+ dependencies = [
+- "autocfg 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
+- "num-traits 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
++ "autocfg",
++ "num-traits",
+ ]
+
+ [[package]]
+ name = "num-traits"
+ version = "0.2.8"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "6ba9a427cfca2be13aa6f6403b0b7e7368fe982bfa16fccc450ce74c46cd9b32"
+ dependencies = [
+- "autocfg 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)",
++ "autocfg",
+ ]
+
+ [[package]]
+ name = "numtoa"
+ version = "0.1.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "b8f8bdf33df195859076e54ab11ee78a1b208382d3a26ec40d142ffc1ecc49ef"
+
+ [[package]]
+ name = "proc-macro2"
+ version = "0.4.30"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "cf3d2011ab5c909338f7887f4fc896d35932e29146c12c8d01da6b22a80ba759"
+ dependencies = [
+- "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "unicode-xid",
+ ]
+
+ [[package]]
+ name = "quick-error"
+ version = "1.2.2"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "9274b940887ce9addde99c4eee6b5c44cc494b182b97e73dc8ffdcb3397fd3f0"
+
+ [[package]]
+ name = "quote"
+ version = "0.6.12"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "faf4799c5d274f3868a4aae320a0a182cbd2baee377b378f080e16a23e9d80db"
+ dependencies = [
+- "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)",
++ "proc-macro2",
+ ]
+
+ [[package]]
+ name = "redox_syscall"
+ version = "0.1.54"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "12229c14a0f65c4f1cb046a3b52047cdd9da1f4b30f8a39c5063c8bae515e252"
+
+ [[package]]
+ name = "redox_termios"
+ version = "0.1.1"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "7e891cfe48e9100a70a3b6eb652fef28920c117d366339687bd5576160db0f76"
+ dependencies = [
+- "redox_syscall 0.1.54 (registry+https://github.com/rust-lang/crates.io-index)",
++ "redox_syscall",
+ ]
+
+ [[package]]
+ name = "stderrlog"
+ version = "0.4.1"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "61dc66b7ae72b65636dbf36326f9638fb3ba27871bb737a62e2c309b87d91b70"
+ dependencies = [
+- "chrono 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
+- "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
+- "termcolor 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
+- "thread_local 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)",
++ "chrono",
++ "log",
++ "termcolor",
++ "thread_local",
+ ]
+
+ [[package]]
+ name = "structopt"
+ version = "0.2.17"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "c767a8971f53d7324583085deee2e230903be09e52fb27df9af94c5cb2b43c31"
+ dependencies = [
+- "clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)",
+- "structopt-derive 0.2.17 (registry+https://github.com/rust-lang/crates.io-index)",
++ "clap",
++ "structopt-derive",
+ ]
+
+ [[package]]
+ name = "structopt-derive"
+ version = "0.2.17"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "c57a30c87454ced2186f62f940e981746e8cbbe026d52090c8c4352b636f8235"
+ dependencies = [
+- "heck 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)",
+- "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)",
+- "quote 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)",
+- "syn 0.15.34 (registry+https://github.com/rust-lang/crates.io-index)",
++ "heck",
++ "proc-macro2",
++ "quote",
++ "syn",
+ ]
+
+ [[package]]
+ name = "syn"
+ version = "0.15.34"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "a1393e4a97a19c01e900df2aec855a29f71cf02c402e2f443b8d2747c25c5dbe"
+ dependencies = [
+- "proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)",
+- "quote 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)",
+- "unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "proc-macro2",
++ "quote",
++ "unicode-xid",
+ ]
+
+ [[package]]
+ name = "termcolor"
+ version = "0.3.6"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "adc4587ead41bf016f11af03e55a624c06568b5a19db4e90fde573d805074f83"
+ dependencies = [
+- "wincolor 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)",
++ "wincolor",
+ ]
+
+ [[package]]
+ name = "termion"
+ version = "1.5.2"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "dde0593aeb8d47accea5392b39350015b5eccb12c0d98044d856983d89548dea"
+ dependencies = [
+- "libc 0.2.58 (registry+https://github.com/rust-lang/crates.io-index)",
+- "numtoa 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+- "redox_syscall 0.1.54 (registry+https://github.com/rust-lang/crates.io-index)",
+- "redox_termios 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
++ "libc",
++ "numtoa",
++ "redox_syscall",
++ "redox_termios",
+ ]
+
+ [[package]]
+ name = "textwrap"
+ version = "0.11.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060"
+ dependencies = [
+- "unicode-width 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
++ "unicode-width",
+ ]
+
+ [[package]]
+ name = "thread_local"
+ version = "0.3.6"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "c6b53e329000edc2b34dbe8545fd20e55a333362d0a321909685a19bd28c3f1b"
+ dependencies = [
+- "lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "lazy_static",
+ ]
+
+ [[package]]
+ name = "time"
+ version = "0.1.42"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "db8dcfca086c1143c9270ac42a2bbd8a7ee477b78ac8e45b19abfb0cbede4b6f"
+ dependencies = [
+- "libc 0.2.58 (registry+https://github.com/rust-lang/crates.io-index)",
+- "redox_syscall 0.1.54 (registry+https://github.com/rust-lang/crates.io-index)",
+- "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
++ "libc",
++ "redox_syscall",
++ "winapi",
+ ]
+
+ [[package]]
+ name = "tui"
+ version = "0.6.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "8896d3a5cb81557cddef234cdeaa2a219d2af5fa9ccbb3cbdfbb52a576feb86f"
+ dependencies = [
+- "bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)",
+- "cassowary 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
+- "either 1.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
+- "itertools 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)",
+- "log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)",
+- "termion 1.5.2 (registry+https://github.com/rust-lang/crates.io-index)",
+- "unicode-segmentation 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)",
+- "unicode-width 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)",
++ "bitflags",
++ "cassowary",
++ "either",
++ "itertools",
++ "log",
++ "termion",
++ "unicode-segmentation",
++ "unicode-width",
+ ]
+
+ [[package]]
+ name = "typenum"
+ version = "1.10.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "612d636f949607bdf9b123b4a6f6d966dedf3ff669f7f045890d3a4a73948169"
+
+ [[package]]
+ name = "unicode-segmentation"
+ version = "1.3.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "1967f4cdfc355b37fd76d2a954fb2ed3871034eb4f26d60537d88795cfc332a9"
+
+ [[package]]
+ name = "unicode-width"
+ version = "0.1.5"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "882386231c45df4700b275c7ff55b6f3698780a650026380e72dabe76fa46526"
+
+ [[package]]
+ name = "unicode-xid"
+ version = "0.1.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc"
+
+ [[package]]
+ name = "uom"
+-version = "0.23.1"
++version = "0.30.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "e76503e636584f1e10b9b3b9498538279561adcef5412927ba00c2b32c4ce5ed"
+ dependencies = [
+- "num-traits 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
+- "typenum 1.10.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "num-traits",
++ "typenum",
+ ]
+
+-[[package]]
+-name = "void"
+-version = "1.0.2"
+-source = "registry+https://github.com/rust-lang/crates.io-index"
+-
+ [[package]]
+ name = "winapi"
+ version = "0.3.7"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "f10e386af2b13e47c89e7236a7a14a086791a2b88ebad6df9bf42040195cf770"
+ dependencies = [
+- "winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
+- "winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)",
++ "winapi-i686-pc-windows-gnu",
++ "winapi-x86_64-pc-windows-gnu",
+ ]
+
+ [[package]]
+ name = "winapi-i686-pc-windows-gnu"
+ version = "0.4.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
+
+ [[package]]
+ name = "winapi-x86_64-pc-windows-gnu"
+ version = "0.4.0"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
+
+ [[package]]
+ name = "wincolor"
+ version = "0.1.6"
+ source = "registry+https://github.com/rust-lang/crates.io-index"
++checksum = "eeb06499a3a4d44302791052df005d5232b927ed1a9658146d842165c4de7767"
+ dependencies = [
+- "winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)",
++ "winapi",
+ ]
+-
+-[metadata]
+-"checksum autocfg 0.1.4 (registry+https://github.com/rust-lang/crates.io-index)" = "0e49efa51329a5fd37e7c79db4621af617cd4e3e5bc224939808d076077077bf"
+-"checksum battery 0.7.4 (registry+https://github.com/rust-lang/crates.io-index)" = "7a6d6fe5630049e900227cd89afce4c1204b88ec8e61a2581bb96fcce26f047b"
+-"checksum bitflags 1.0.4 (registry+https://github.com/rust-lang/crates.io-index)" = "228047a76f468627ca71776ecdebd732a3423081fcf5125585bcd7c49886ce12"
+-"checksum cassowary 0.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "df8670b8c7b9dae1793364eafadf7239c40d669904660c5960d74cfd80b46a53"
+-"checksum cc 1.0.37 (registry+https://github.com/rust-lang/crates.io-index)" = "39f75544d7bbaf57560d2168f28fd649ff9c76153874db88bdbdfd839b1a7e7d"
+-"checksum cfg-if 0.1.9 (registry+https://github.com/rust-lang/crates.io-index)" = "b486ce3ccf7ffd79fdeb678eac06a9e6c09fc88d33836340becb8fffe87c5e33"
+-"checksum chrono 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "45912881121cb26fad7c38c17ba7daa18764771836b34fab7d3fbd93ed633878"
+-"checksum clap 2.33.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5067f5bb2d80ef5d68b4c87db81601f0b75bca627bc2ef76b141d7b846a3c6d9"
+-"checksum core-foundation 0.6.4 (registry+https://github.com/rust-lang/crates.io-index)" = "25b9e03f145fd4f2bf705e07b900cd41fc636598fe5dc452fd0db1441c3f496d"
+-"checksum core-foundation-sys 0.6.2 (registry+https://github.com/rust-lang/crates.io-index)" = "e7ca8a5221364ef15ce201e8ed2f609fc312682a8f4e0e3d4aa5879764e0fa3b"
+-"checksum either 1.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "5527cfe0d098f36e3f8839852688e63c8fff1c90b2b405aef730615f9a7bcf7b"
+-"checksum heck 0.3.1 (registry+https://github.com/rust-lang/crates.io-index)" = "20564e78d53d2bb135c343b3f47714a56af2061f1c928fdb541dc7b9fdd94205"
+-"checksum humantime 1.2.0 (registry+https://github.com/rust-lang/crates.io-index)" = "3ca7e5f2e110db35f93b837c81797f3714500b81d517bf20c431b16d3ca4f114"
+-"checksum itertools 0.8.0 (registry+https://github.com/rust-lang/crates.io-index)" = "5b8467d9c1cebe26feb08c640139247fac215782d35371ade9a2136ed6085358"
+-"checksum lazy_static 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "bc5729f27f159ddd61f4df6228e827e86643d4d3e7c32183cb30a1c08f604a14"
+-"checksum lazycell 1.2.1 (registry+https://github.com/rust-lang/crates.io-index)" = "b294d6fa9ee409a054354afc4352b0b9ef7ca222c69b8812cbea9e7d2bf3783f"
+-"checksum libc 0.2.58 (registry+https://github.com/rust-lang/crates.io-index)" = "6281b86796ba5e4366000be6e9e18bf35580adf9e63fbe2294aadb587613a319"
+-"checksum log 0.4.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c84ec4b527950aa83a329754b01dbe3f58361d1c5efacd1f6d68c494d08a17c6"
+-"checksum mach 0.2.3 (registry+https://github.com/rust-lang/crates.io-index)" = "86dd2487cdfea56def77b88438a2c915fb45113c5319bfe7e14306ca4cd0b0e1"
+-"checksum nix 0.14.0 (registry+https://github.com/rust-lang/crates.io-index)" = "0d10caafde29a846a82ae0af70414e4643e072993441033b2c93217957e2f867"
+-"checksum num-integer 0.1.41 (registry+https://github.com/rust-lang/crates.io-index)" = "b85e541ef8255f6cf42bbfe4ef361305c6c135d10919ecc26126c4e5ae94bc09"
+-"checksum num-traits 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "6ba9a427cfca2be13aa6f6403b0b7e7368fe982bfa16fccc450ce74c46cd9b32"
+-"checksum numtoa 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "b8f8bdf33df195859076e54ab11ee78a1b208382d3a26ec40d142ffc1ecc49ef"
+-"checksum proc-macro2 0.4.30 (registry+https://github.com/rust-lang/crates.io-index)" = "cf3d2011ab5c909338f7887f4fc896d35932e29146c12c8d01da6b22a80ba759"
+-"checksum quick-error 1.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "9274b940887ce9addde99c4eee6b5c44cc494b182b97e73dc8ffdcb3397fd3f0"
+-"checksum quote 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)" = "faf4799c5d274f3868a4aae320a0a182cbd2baee377b378f080e16a23e9d80db"
+-"checksum redox_syscall 0.1.54 (registry+https://github.com/rust-lang/crates.io-index)" = "12229c14a0f65c4f1cb046a3b52047cdd9da1f4b30f8a39c5063c8bae515e252"
+-"checksum redox_termios 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "7e891cfe48e9100a70a3b6eb652fef28920c117d366339687bd5576160db0f76"
+-"checksum stderrlog 0.4.1 (registry+https://github.com/rust-lang/crates.io-index)" = "61dc66b7ae72b65636dbf36326f9638fb3ba27871bb737a62e2c309b87d91b70"
+-"checksum structopt 0.2.17 (registry+https://github.com/rust-lang/crates.io-index)" = "c767a8971f53d7324583085deee2e230903be09e52fb27df9af94c5cb2b43c31"
+-"checksum structopt-derive 0.2.17 (registry+https://github.com/rust-lang/crates.io-index)" = "c57a30c87454ced2186f62f940e981746e8cbbe026d52090c8c4352b636f8235"
+-"checksum syn 0.15.34 (registry+https://github.com/rust-lang/crates.io-index)" = "a1393e4a97a19c01e900df2aec855a29f71cf02c402e2f443b8d2747c25c5dbe"
+-"checksum termcolor 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "adc4587ead41bf016f11af03e55a624c06568b5a19db4e90fde573d805074f83"
+-"checksum termion 1.5.2 (registry+https://github.com/rust-lang/crates.io-index)" = "dde0593aeb8d47accea5392b39350015b5eccb12c0d98044d856983d89548dea"
+-"checksum textwrap 0.11.0 (registry+https://github.com/rust-lang/crates.io-index)" = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060"
+-"checksum thread_local 0.3.6 (registry+https://github.com/rust-lang/crates.io-index)" = "c6b53e329000edc2b34dbe8545fd20e55a333362d0a321909685a19bd28c3f1b"
+-"checksum time 0.1.42 (registry+https://github.com/rust-lang/crates.io-index)" = "db8dcfca086c1143c9270ac42a2bbd8a7ee477b78ac8e45b19abfb0cbede4b6f"
+-"checksum tui 0.6.0 (registry+https://github.com/rust-lang/crates.io-index)" = "8896d3a5cb81557cddef234cdeaa2a219d2af5fa9ccbb3cbdfbb52a576feb86f"
+-"checksum typenum 1.10.0 (registry+https://github.com/rust-lang/crates.io-index)" = "612d636f949607bdf9b123b4a6f6d966dedf3ff669f7f045890d3a4a73948169"
+-"checksum unicode-segmentation 1.3.0 (registry+https://github.com/rust-lang/crates.io-index)" = "1967f4cdfc355b37fd76d2a954fb2ed3871034eb4f26d60537d88795cfc332a9"
+-"checksum unicode-width 0.1.5 (registry+https://github.com/rust-lang/crates.io-index)" = "882386231c45df4700b275c7ff55b6f3698780a650026380e72dabe76fa46526"
+-"checksum unicode-xid 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)" = "fc72304796d0818e357ead4e000d19c9c174ab23dc11093ac919054d20a6a7fc"
+-"checksum uom 0.23.1 (registry+https://github.com/rust-lang/crates.io-index)" = "3ef5bbe8385736e498dbb0033361f764ab43a435192513861447b9f7714b3fec"
+-"checksum void 1.0.2 (registry+https://github.com/rust-lang/crates.io-index)" = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d"
+-"checksum winapi 0.3.7 (registry+https://github.com/rust-lang/crates.io-index)" = "f10e386af2b13e47c89e7236a7a14a086791a2b88ebad6df9bf42040195cf770"
+-"checksum winapi-i686-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
+-"checksum winapi-x86_64-pc-windows-gnu 0.4.0 (registry+https://github.com/rust-lang/crates.io-index)" = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
+-"checksum wincolor 0.1.6 (registry+https://github.com/rust-lang/crates.io-index)" = "eeb06499a3a4d44302791052df005d5232b927ed1a9658146d842165c4de7767"
+diff --git a/Cargo.toml b/Cargo.toml
+index 3d3df77..34b9bc5 100644
+--- a/Cargo.toml
++++ b/Cargo.toml
+@@ -17,7 +17,7 @@ travis-ci = { repository = "svartalf/rust-battop", branch = "master" }
+ maintenance = { status = "actively-developed" }
+
+ [dependencies]
+-battery = "^0.7"
++battery = "^0.7.7"
+ structopt = { version = "0.2", default-features = false }
+ log = "0.4.6"
+ stderrlog = "0.4.1"
diff --git a/pkgs/tools/system/battop/default.nix b/pkgs/tools/system/battop/default.nix
new file mode 100644
index 000000000000..e28789b835ec
--- /dev/null
+++ b/pkgs/tools/system/battop/default.nix
@@ -0,0 +1,25 @@
+{ lib, fetchFromGitHub, rustPlatform }:
+
+rustPlatform.buildRustPackage rec {
+ pname = "battop";
+ version = "0.2.4";
+
+ src = fetchFromGitHub {
+ owner = "svartalf";
+ repo = "rust-battop";
+ rev = "v${version}";
+ sha256 = "0p53jl3r2p1w9m2fvhzzrj8d9gwpzs22df5sbm7wwja4pxn7ay1w";
+ };
+
+ # https://github.com/svartalf/rust-battop/issues/11
+ cargoPatches = [ ./battery.patch ];
+
+ cargoSha256 = "0ipmnrn6lmf6rqzsqmaxzy9lblrxyrxzkji968356nxxmwzfbfvh";
+
+ meta = with lib; {
+ description = "is an interactive battery viewer";
+ homepage = "https://github.com/svartalf/rust-battop";
+ license = licenses.asl20;
+ maintainers = with maintainers; [ hdhog ];
+ };
+}
diff --git a/pkgs/tools/system/throttled/default.nix b/pkgs/tools/system/throttled/default.nix
index 9b92635d1d78..2729a16b8687 100644
--- a/pkgs/tools/system/throttled/default.nix
+++ b/pkgs/tools/system/throttled/default.nix
@@ -2,13 +2,13 @@
stdenv.mkDerivation rec {
pname = "throttled";
- version = "0.8";
+ version = "0.9.2";
src = fetchFromGitHub {
owner = "erpalma";
repo = pname;
rev = "v${version}";
- sha256 = "0qw124gdgjqij3xhgg8j1mdsg6j0xg340as5qf8hd3gwc38sqi9x";
+ sha256 = "sha256-4aDa6REDHO7gr1czIv6NlepeMVJI93agxJjE2vHiEmk=";
};
nativeBuildInputs = [ python3Packages.wrapPython ];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index bb9fdd9d2df4..ee05325ae6ba 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2180,6 +2180,8 @@ with pkgs;
traefik = callPackage ../servers/traefik { };
+ traefik-certs-dumper = callPackage ../tools/misc/traefik-certs-dumper { };
+
calamares = libsForQt514.callPackage ../tools/misc/calamares {
python = python3;
boost = pkgs.boost.override { python = python3; };
@@ -3701,6 +3703,8 @@ with pkgs;
cicero-tui = callPackage ../tools/misc/cicero-tui { };
+ cilium-cli = callPackage ../applications/networking/cluster/cilium { };
+
cipherscan = callPackage ../tools/security/cipherscan {
openssl = if stdenv.hostPlatform.system == "x86_64-linux"
then openssl-chacha
@@ -4448,6 +4452,8 @@ with pkgs;
autoreconfHook = buildPackages.autoreconfHook269;
};
+ emote = callPackage ../tools/inputmethods/emote { };
+
engauge-digitizer = libsForQt5.callPackage ../applications/science/math/engauge-digitizer { };
epubcheck = callPackage ../tools/text/epubcheck { };
@@ -7687,6 +7693,8 @@ with pkgs;
onioncircuits = callPackage ../tools/security/onioncircuits { };
+ onlykey-agent = callPackage ../tools/security/onlykey-agent { };
+
onlykey-cli = callPackage ../tools/security/onlykey-cli { };
onlykey = callPackage ../tools/security/onlykey { node_webkit = nwjs; };
@@ -20470,6 +20478,8 @@ with pkgs;
roon-bridge = callPackage ../servers/roon-bridge { };
+ rpiplay = callPackage ../servers/rpiplay { };
+
roon-server = callPackage ../servers/roon-server { };
s6 = skawarePackages.s6;
diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix
index 41dac96b4899..eed731fcaebe 100644
--- a/pkgs/top-level/perl-packages.nix
+++ b/pkgs/top-level/perl-packages.nix
@@ -16905,12 +16905,16 @@ let
sha256 = "2ad194f91ef24df4698369c2562d4164e9bf74f2d5565c681841abf79789ed82";
};
buildInputs = [ TestDeep ];
+ nativeBuildInputs = lib.optional stdenv.isDarwin shortenPerlShebang;
propagatedBuildInputs = [ BKeywords ConfigTiny FileWhich ListMoreUtils ModulePluggable PPIxQuoteLike PPIxRegexp PPIxUtilities PerlTidy PodSpell StringFormat ];
meta = {
homepage = "http://perlcritic.com";
description = "Critique Perl source code for best-practices";
license = with lib.licenses; [ artistic1 gpl1Plus ];
};
+ postInstall = lib.optionalString stdenv.isDarwin ''
+ shortenPerlShebang $out/bin/perlcritic
+ '';
};
PerlCriticCommunity = buildPerlModule {
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 86042f35b2b2..d69614c78f3a 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -6079,7 +6079,9 @@ in {
pygal = callPackage ../development/python-modules/pygal { };
- pygame = callPackage ../development/python-modules/pygame { };
+ pygame = callPackage ../development/python-modules/pygame {
+ inherit (pkgs.darwin.apple_sdk.frameworks) AppKit CoreMIDI;
+ };
pygame_sdl2 = callPackage ../development/python-modules/pygame_sdl2 { };