diff options
author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2022-04-07 00:12:41 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-04-07 00:12:41 +0000 |
commit | 3145737bc1450e77b19df682dd823a2a62fdc6dd (patch) | |
tree | ce4c2308c7931e0f2432f3cc3541db5d1ca32dcf | |
parent | 216f2754c5fc561d429342edbcb0ade6c56b010e (diff) | |
parent | 4e0d9f2b6016e2ae6295a35785a379f8023d3759 (diff) |
Merge master into haskell-updates
-rw-r--r-- | pkgs/development/python-modules/meshio/default.nix | 4 | ||||
-rw-r--r-- | pkgs/development/python-modules/ocrmypdf/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/networking/mosh/default.nix | 6 | ||||
-rw-r--r-- | pkgs/tools/text/ugrep/default.nix | 4 | ||||
-rw-r--r-- | pkgs/tools/video/harvid/default.nix | 4 |
5 files changed, 11 insertions, 11 deletions
diff --git a/pkgs/development/python-modules/meshio/default.nix b/pkgs/development/python-modules/meshio/default.nix index 1471ea5b1e5dd..1df5a7f478074 100644 --- a/pkgs/development/python-modules/meshio/default.nix +++ b/pkgs/development/python-modules/meshio/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "meshio"; - version = "5.3.2"; + version = "5.3.4"; format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "sha256-L1YNRAgoHBvf8SsM++J+k1UNciIw91W1s6IA26I/bYw="; + sha256 = "sha256-4kBpLX/yecErE8bl17QDYpqGrStE6SMJWLPwDB7DafA="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/ocrmypdf/default.nix b/pkgs/development/python-modules/ocrmypdf/default.nix index fe5211802807d..5d135a4731f0f 100644 --- a/pkgs/development/python-modules/ocrmypdf/default.nix +++ b/pkgs/development/python-modules/ocrmypdf/default.nix @@ -27,7 +27,7 @@ buildPythonPackage rec { pname = "ocrmypdf"; - version = "13.4.1"; + version = "13.4.2"; src = fetchFromGitHub { owner = "jbarlow83"; @@ -39,7 +39,7 @@ buildPythonPackage rec { extraPostFetch = '' rm "$out/.git_archival.txt" ''; - sha256 = "sha256-gxgeEwm3cYNllcmRTZhdyIWWGKXTewyVW314k732swE="; + sha256 = "sha256-P829Tv2848iMEFzweydGSkFEnkfX8Rvyqd6Yqu+2VXY="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/pkgs/tools/networking/mosh/default.nix b/pkgs/tools/networking/mosh/default.nix index 8331e3686dc9f..121ba4395b519 100644 --- a/pkgs/tools/networking/mosh/default.nix +++ b/pkgs/tools/networking/mosh/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchurl, fetchpatch, zlib, protobuf, ncurses, pkg-config -, makeWrapper, perlPackages, openssl, autoreconfHook, openssh, bash-completion +, makeWrapper, perl, openssl, autoreconfHook, openssh, bash-completion , withUtempter ? stdenv.isLinux, libutempter }: stdenv.mkDerivation rec { @@ -11,8 +11,8 @@ stdenv.mkDerivation rec { sha256 = "05hjhlp6lk8yjcy59zywpf0r6s0h0b9zxq0lw66dh9x8vxrhaq6s"; }; - nativeBuildInputs = [ autoreconfHook pkg-config makeWrapper protobuf perlPackages.perl ]; - buildInputs = [ protobuf ncurses zlib openssl bash-completion ] + nativeBuildInputs = [ autoreconfHook pkg-config makeWrapper protobuf perl ]; + buildInputs = [ protobuf ncurses zlib openssl bash-completion perl ] ++ lib.optional withUtempter libutempter; strictDeps = true; diff --git a/pkgs/tools/text/ugrep/default.nix b/pkgs/tools/text/ugrep/default.nix index 7a921bdd11f57..2511e0c88b215 100644 --- a/pkgs/tools/text/ugrep/default.nix +++ b/pkgs/tools/text/ugrep/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "ugrep"; - version = "3.7.6"; + version = "3.7.7"; src = fetchFromGitHub { owner = "Genivia"; repo = pname; rev = "v${version}"; - sha256 = "sha256-fOp+nf/xZKOw8CDI1RSl/DQH52ay/M/aeSMf6MdfKmQ="; + sha256 = "sha256-FucHivUd9WVQlTsBJbnSd2Q6WQpoFjm6dS0eb6z8SSs="; }; buildInputs = [ diff --git a/pkgs/tools/video/harvid/default.nix b/pkgs/tools/video/harvid/default.nix index 812457f35cbd2..729c26de57ea9 100644 --- a/pkgs/tools/video/harvid/default.nix +++ b/pkgs/tools/video/harvid/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "harvid"; - version = "0.8.3"; + version = "0.9.0"; src = fetchFromGitHub { owner = "x42"; repo = "harvid"; rev = "v${version}"; - sha256 = "0l1plfsfh2ixhlzg3hqqvjj42z7g422718a9kgbh7b4p882n71x7"; + sha256 = "sha256-qt6aep7iMF8/lnlT2wLqu6LkFDqzdfsGLZvrOlXttG8="; }; nativeBuildInputs = [ pkg-config ]; |