diff options
author | John Ericson <John.Ericson@Obsidian.Systems> | 2020-04-17 18:40:51 -0400 |
---|---|---|
committer | John Ericson <John.Ericson@Obsidian.Systems> | 2020-04-17 18:40:51 -0400 |
commit | 33c2a76c5e1dac06d2963ad626d1083ed4b96f06 (patch) | |
tree | 90e5ce60f3d7ea83f41f54c86971e19aae6b3594 /pkgs/tools/networking | |
parent | d1009f4d99dbb6600f08ab0ef214806acc675670 (diff) | |
parent | cdfda4b455d0d904428fd157fba323f131fe8f6f (diff) | |
download | nixlib-33c2a76c5e1dac06d2963ad626d1083ed4b96f06.tar nixlib-33c2a76c5e1dac06d2963ad626d1083ed4b96f06.tar.gz nixlib-33c2a76c5e1dac06d2963ad626d1083ed4b96f06.tar.bz2 nixlib-33c2a76c5e1dac06d2963ad626d1083ed4b96f06.tar.lz nixlib-33c2a76c5e1dac06d2963ad626d1083ed4b96f06.tar.xz nixlib-33c2a76c5e1dac06d2963ad626d1083ed4b96f06.tar.zst nixlib-33c2a76c5e1dac06d2963ad626d1083ed4b96f06.zip |
Merge remote-tracking branch 'upstream/master' into staging
Diffstat (limited to 'pkgs/tools/networking')
-rw-r--r-- | pkgs/tools/networking/findomain/default.nix | 6 | ||||
-rw-r--r-- | pkgs/tools/networking/megatools/default.nix | 10 |
2 files changed, 8 insertions, 8 deletions
diff --git a/pkgs/tools/networking/findomain/default.nix b/pkgs/tools/networking/findomain/default.nix index d5e801a6f920..e19442576988 100644 --- a/pkgs/tools/networking/findomain/default.nix +++ b/pkgs/tools/networking/findomain/default.nix @@ -9,16 +9,16 @@ rustPlatform.buildRustPackage rec { pname = "findomain"; - version = "1.4.5"; + version = "1.5.0"; src = fetchFromGitHub { owner = "Edu4rdSHL"; repo = pname; rev = version; - sha256 = "1p4ddyqg1v27hf19n1ksmfvj5s6z2c8i13syb0anhlyzqy576hwb"; + sha256 = "1w3parmk3836v5ghn3cgcxyk0alk05r5ljl3j1fpnly5xvl131rd"; }; - cargoSha256 = "0mdcj4almwziq1ph3imfdx41a96xq19sbjm7wsm9lxlzhvv256br"; + cargoSha256 = "1cs076cgkzjan6y78a3bhriv2q2s83hp5vzhkjwz4dqn83r6b8hx"; nativeBuildInputs = [ installShellFiles perl ]; buildInputs = lib.optional stdenv.isDarwin Security; diff --git a/pkgs/tools/networking/megatools/default.nix b/pkgs/tools/networking/megatools/default.nix index 76ce71ac9c8a..b729e9961857 100644 --- a/pkgs/tools/networking/megatools/default.nix +++ b/pkgs/tools/networking/megatools/default.nix @@ -1,18 +1,18 @@ -{ stdenv, fetchgit, autoreconfHook, pkgconfig, glib, fuse, curl, glib-networking +{ stdenv, fetchgit, autoreconfHook, pkg-config, glib, fuse, curl, glib-networking , asciidoc, libxml2, docbook_xsl, docbook_xml_dtd_45, libxslt, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "megatools"; - version = "1.10.2"; + version = "1.10.3"; src = fetchgit { url = "https://megous.com/git/megatools"; - rev = version; - sha256 = "001hw8j36ld03wwaphq3xdaazf2dpl36h84k8xmk524x8vlia8lk"; + rev = "5581d06e447b84d0101d36dc96ab72920eec1017"; + sha256 = "1fh456kjsmdvpmvklkpi06h720yvhahd4rxa6cm5x818pl44p1r4"; }; nativeBuildInputs = [ - autoreconfHook pkgconfig wrapGAppsHook asciidoc libxml2 + autoreconfHook pkg-config wrapGAppsHook asciidoc libxml2 docbook_xsl docbook_xml_dtd_45 libxslt ]; buildInputs = [ glib glib-networking curl ] |