diff options
Diffstat (limited to 'pkgs/tools/misc')
-rw-r--r-- | pkgs/tools/misc/papis/default.nix | 28 | ||||
-rw-r--r-- | pkgs/tools/misc/progress/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/misc/yubikey-manager/default.nix | 5 |
3 files changed, 25 insertions, 12 deletions
diff --git a/pkgs/tools/misc/papis/default.nix b/pkgs/tools/misc/papis/default.nix index 49c57ab8dc90..20fafff587c5 100644 --- a/pkgs/tools/misc/papis/default.nix +++ b/pkgs/tools/misc/papis/default.nix @@ -1,12 +1,24 @@ { buildPythonApplication, lib, fetchFromGitHub, bashInteractive -, argcomplete, arxiv2bib, beautifulsoup4, bibtexparser -, configparser, dmenu-python, habanero, papis-python-rofi -, pylibgen, prompt_toolkit, pyparser, pytest, python_magic -, pyyaml, requests, unidecode, urwid, vobject, tkinter -, vim +, python3, vim }: -buildPythonApplication rec { +let + python = python3.override { + packageOverrides = self: super: { + + # https://github.com/eventable/vobject/issues/112 + python-dateutil = super.python-dateutil.overridePythonAttrs (oldAttrs: rec { + version = "2.6.1"; + src = oldAttrs.src.override { + inherit version; + sha256 = "891c38b2a02f5bb1be3e4793866c8df49c7d19baabf9c1bad62547e0b4866aca"; + }; + }); + + }; + }; + +in python.pkgs.buildPythonApplication rec { pname = "papis"; version = "0.5.3"; @@ -23,7 +35,7 @@ buildPythonApplication rec { patchShebangs tests ''; - propagatedBuildInputs = [ + propagatedBuildInputs = with python.pkgs; [ argcomplete arxiv2bib beautifulsoup4 bibtexparser configparser dmenu-python habanero papis-python-rofi pylibgen prompt_toolkit pyparser python_magic pyyaml @@ -31,7 +43,7 @@ buildPythonApplication rec { vim ]; - checkInputs = [ pytest ]; + checkInputs = with python.pkgs; [ pytest ]; # Papis tries to create the config folder under $HOME during the tests checkPhase = '' diff --git a/pkgs/tools/misc/progress/default.nix b/pkgs/tools/misc/progress/default.nix index 0b48a5a66c6e..b29d0eafcc9e 100644 --- a/pkgs/tools/misc/progress/default.nix +++ b/pkgs/tools/misc/progress/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { name = "progress-${version}"; - version = "0.13.1"; + version = "0.14"; src = fetchFromGitHub { owner = "Xfennec"; repo = "progress"; rev = "v${version}"; - sha256 = "13nhczzb0zqg5zfpf5vcfi6aahyb8lrr52pvpjgi1zfkh2m9vnig"; + sha256 = "1lk2v4b767klib93an4g3f7z5qrv9kdk9jf7545vw1immc4kamrl"; }; nativeBuildInputs = [ pkgconfig which ]; diff --git a/pkgs/tools/misc/yubikey-manager/default.nix b/pkgs/tools/misc/yubikey-manager/default.nix index c7fbeddd13a4..c8c0ba706c36 100644 --- a/pkgs/tools/misc/yubikey-manager/default.nix +++ b/pkgs/tools/misc/yubikey-manager/default.nix @@ -2,11 +2,11 @@ yubikey-personalization, libu2f-host, libusb1 }: pythonPackages.buildPythonPackage rec { - name = "yubikey-manager-0.4.0"; + name = "yubikey-manager-0.7.0"; srcs = fetchurl { url = "https://developers.yubico.com/yubikey-manager/Releases/${name}.tar.gz"; - sha256 = "0dc0mqg8r6kjh0s2rmrggfxbx9imslajjrj80rffcvg64a2vgsgb"; + sha256 = "13vvl3jc5wg6d4h5cpaf969apsbf72dxad560d02ly061ss856zr"; }; propagatedBuildInputs = @@ -18,6 +18,7 @@ pythonPackages.buildPythonPackage rec { pyusb pyopenssl six + fido2 ] ++ [ libu2f-host libusb1 |