diff options
author | Vladimír Čunát <v@cunat.cz> | 2019-09-04 11:00:56 +0200 |
---|---|---|
committer | Vladimír Čunát <v@cunat.cz> | 2019-09-04 11:00:56 +0200 |
commit | 4aad2947f8d680f18e5b01e115cf8cff22186998 (patch) | |
tree | a7a3d020efc6ec7be822bc06e08eca3ac311c9e2 /pkgs/applications/networking | |
parent | 2c5835b09a1d4966756212902d36b1b8ab242da6 (diff) | |
parent | 1d8a3973f46a2d1360f855eaa0f3a19859771793 (diff) | |
download | nixlib-4aad2947f8d680f18e5b01e115cf8cff22186998.tar nixlib-4aad2947f8d680f18e5b01e115cf8cff22186998.tar.gz nixlib-4aad2947f8d680f18e5b01e115cf8cff22186998.tar.bz2 nixlib-4aad2947f8d680f18e5b01e115cf8cff22186998.tar.lz nixlib-4aad2947f8d680f18e5b01e115cf8cff22186998.tar.xz nixlib-4aad2947f8d680f18e5b01e115cf8cff22186998.tar.zst nixlib-4aad2947f8d680f18e5b01e115cf8cff22186998.zip |
Merge branch 'master' into staging-next
Diffstat (limited to 'pkgs/applications/networking')
4 files changed, 7 insertions, 9 deletions
diff --git a/pkgs/applications/networking/browsers/links2/default.nix b/pkgs/applications/networking/browsers/links2/default.nix index f2cc277f3dac..7bb443e22c33 100644 --- a/pkgs/applications/networking/browsers/links2/default.nix +++ b/pkgs/applications/networking/browsers/links2/default.nix @@ -8,12 +8,12 @@ }: stdenv.mkDerivation rec { - version = "2.19"; + version = "2.20"; pname = "links2"; src = fetchurl { url = "${meta.homepage}/download/links-${version}.tar.bz2"; - sha256 = "02ls11c02p7xvsdjyb43rrzr850i1yly003r812z0w5vv5yqqxbh"; + sha256 = "0bchwqa87dc8cb55spyybkqpc456pp4x2n9aw587wr7pn96cvp9v"; }; buildInputs = with stdenv.lib; diff --git a/pkgs/applications/networking/cluster/kubectl/default.nix b/pkgs/applications/networking/cluster/kubectl/default.nix index 40d42408679e..fed40523a9b7 100644 --- a/pkgs/applications/networking/cluster/kubectl/default.nix +++ b/pkgs/applications/networking/cluster/kubectl/default.nix @@ -9,8 +9,6 @@ stdenv.mkDerivation { outputs = [ "out" "man" ]; - doBuild = false; - installPhase = '' mkdir -p \ "$out/bin" \ diff --git a/pkgs/applications/networking/dropbox/cli.nix b/pkgs/applications/networking/dropbox/cli.nix index 54ed0f2eea04..9b3b99708dfc 100644 --- a/pkgs/applications/networking/dropbox/cli.nix +++ b/pkgs/applications/networking/dropbox/cli.nix @@ -53,11 +53,11 @@ stdenv.mkDerivation { ]; configureFlags = [ - "--with-nautilus-extension-dir=${placeholder ''nautilusExtension''}/lib/nautilus/extensions-3.0" + "--with-nautilus-extension-dir=${placeholder "nautilusExtension"}/lib/nautilus/extensions-3.0" ]; makeFlags = [ - "EMBLEM_DIR=${placeholder ''nautilusExtension''}/share/nautilus-dropbox/emblems" + "EMBLEM_DIR=${placeholder "nautilusExtension"}/share/nautilus-dropbox/emblems" ]; meta = { diff --git a/pkgs/applications/networking/syncthing/default.nix b/pkgs/applications/networking/syncthing/default.nix index 5b847163a2a7..7bfe697105eb 100644 --- a/pkgs/applications/networking/syncthing/default.nix +++ b/pkgs/applications/networking/syncthing/default.nix @@ -3,19 +3,19 @@ let common = { stname, target, postInstall ? "" }: buildGoModule rec { - version = "1.2.1"; + version = "1.2.2"; name = "${stname}-${version}"; src = fetchFromGitHub { owner = "syncthing"; repo = "syncthing"; rev = "v${version}"; - sha256 = "0q1x6kd5kaij8mvs6yll2vqfzrbb31y5hpg6g5kjc8gngwv4rl6v"; + sha256 = "0zkyjnjrla0vpvidwwr4z4kxc9cyjcfbjdzsr34xz7rw3jswswm9"; }; goPackagePath = "github.com/syncthing/syncthing"; - modSha256 = "1daixrpdj97ck02853hwp8l158sja5a7a37h0gdbwb1lgf5hsn05"; + modSha256 = "0pp2gjx227crggph924q7sg6ak8nyl8nlsffpmawq4zl1908lsrd"; patches = [ ./add-stcli-target.patch |