diff options
Diffstat (limited to 'nixpkgs/pkgs/tools/networking')
4 files changed, 46 insertions, 8 deletions
diff --git a/nixpkgs/pkgs/tools/networking/networkmanager/dmenu/default.nix b/nixpkgs/pkgs/tools/networking/networkmanager/dmenu/default.nix index 8bf9af1ffbf9..d64985adbce2 100644 --- a/nixpkgs/pkgs/tools/networking/networkmanager/dmenu/default.nix +++ b/nixpkgs/pkgs/tools/networking/networkmanager/dmenu/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, glib, fetchFromGitHub, networkmanager, python3Packages -, gobject-introspection }: +, gobject-introspection, procps }: let inherit (python3Packages) python pygobject3; in stdenv.mkDerivation rec { @@ -14,7 +14,7 @@ in stdenv.mkDerivation rec { }; nativeBuildInputs = [ gobject-introspection ]; - buildInputs = [ glib python pygobject3 networkmanager python3Packages.wrapPython ]; + buildInputs = [ glib python pygobject3 networkmanager python3Packages.wrapPython procps ]; dontBuild = true; diff --git a/nixpkgs/pkgs/tools/networking/qcal/default.nix b/nixpkgs/pkgs/tools/networking/qcal/default.nix index efb06fd1be6d..31e800394954 100644 --- a/nixpkgs/pkgs/tools/networking/qcal/default.nix +++ b/nixpkgs/pkgs/tools/networking/qcal/default.nix @@ -18,12 +18,12 @@ buildGoModule rec { # to that config file in the nix store preBuild = '' substituteInPlace helpers.go \ - --replace " config-sample.json " " $out/share/config-sample.json " + --replace " config-sample.json " " $out/share/qcal/config-sample.json " ''; postInstall = '' - mkdir -p $out/share - cp config-sample.json $out/share/ + mkdir -p $out/share/qcal + cp config-sample.json $out/share/qcal/ ''; meta = with lib; { diff --git a/nixpkgs/pkgs/tools/networking/qcard/default.nix b/nixpkgs/pkgs/tools/networking/qcard/default.nix new file mode 100644 index 000000000000..16ffb5d686fe --- /dev/null +++ b/nixpkgs/pkgs/tools/networking/qcard/default.nix @@ -0,0 +1,38 @@ +{ lib +, buildGoModule +, fetchFromSourcehut +}: + +buildGoModule rec { + pname = "qcard"; + version = "0.7.1"; + + src = fetchFromSourcehut { + owner = "~psic4t"; + repo = "qcard"; + rev = version; + hash = "sha256-OwmJSeAOZTX7jMhoLHSIJa0jR8zCadISQF/PqFqltRY="; + }; + + vendorHash = null; + + # Replace "config-sample.json" in error message with the absolute path + # to that config file in the nix store + preBuild = '' + substituteInPlace helpers.go \ + --replace " config-sample.json " " $out/share/qcard/config-sample.json " + ''; + + postInstall = '' + mkdir -p $out/share/qcard + cp config-sample.json $out/share/qcard/ + ''; + + meta = { + description = "CLI addressbook application for CardDAV servers written in Go"; + homepage = "https://git.sr.ht/~psic4t/qcard"; + license = lib.licenses.gpl3Plus; + mainProgram = "qcard"; + maintainers = with lib.maintainers; [ antonmosich ]; + }; +} diff --git a/nixpkgs/pkgs/tools/networking/xray/default.nix b/nixpkgs/pkgs/tools/networking/xray/default.nix index d40754cd7911..6d810aaee62e 100644 --- a/nixpkgs/pkgs/tools/networking/xray/default.nix +++ b/nixpkgs/pkgs/tools/networking/xray/default.nix @@ -11,16 +11,16 @@ buildGoModule rec { pname = "xray"; - version = "1.8.3"; + version = "1.8.4"; src = fetchFromGitHub { owner = "XTLS"; repo = "Xray-core"; rev = "v${version}"; - hash = "sha256-j7lIRGO+hUYAM/FWCb8cNoh6lXXE0ZboWA/Hmi9w/Bc="; + hash = "sha256-Hu0BP4BzoELRjJ8WdF3JS/ffxd3bpH+kauWqaMh/o1I="; }; - vendorHash = "sha256-sBbidDvsYvFg3EqsA59MYZULim/LbrZcInixiKfwqqQ="; + vendorHash = "sha256-ihTOKtppOTYdulzwIwD8oWaS2OPs+QCdqPTvqucw7xY="; nativeBuildInputs = [ makeWrapper ]; |